Mercurial > hg > simscene-py
changeset 15:69410ac2a50d
upadte simscene audioread
| author | GregoireLafay <gregoire.lafay@irccyn.ec-nantes.fr> |
|---|---|
| date | Tue, 08 Dec 2015 10:45:15 +0100 |
| parents | b1901e8d8f5f |
| children | 92f73423eb37 |
| files | nonExposed/generateScene.m nonExposed/getSampleInfo.m simScene.m |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/nonExposed/generateScene.m Tue Mar 17 09:34:13 2015 +0100 +++ b/nonExposed/generateScene.m Tue Dec 08 10:45:15 2015 +0100 @@ -47,7 +47,8 @@ % this test is necessary because mp3 conversion does not % always maintain exact length, and wavread will crash if asked to % read too many samples. - waves{i}{j}= wavread([path sample(sampleId(j)).name]); +% waves{i}{j}= wavread([path sample(sampleId(j)).name]); + waves{i}{j}= audioread([path sample(sampleId(j)).name]); if(size(waves{i}{j},2)==2) waves{i}{j}= mean(waves{i}{j},2); end
--- a/nonExposed/getSampleInfo.m Tue Mar 17 09:34:13 2015 +0100 +++ b/nonExposed/getSampleInfo.m Tue Dec 08 10:45:15 2015 +0100 @@ -32,7 +32,11 @@ samplesInd = find(cellfun('isempty',regexpi({samples.name},query,'match'))==0); for ii=1:length(samplesInd) - [sampleSize,sr]=wavread([path,'/',samples(samplesInd(ii)).name],'size'); +% [sampleSize,sr]=wavread([path,'/',samples(samplesInd(ii)).name],'size'); + samplesInfo=audioinfo([path,'/',samples(samplesInd(ii)).name]); + sampleSize = samplesInfo.TotalSamples'; + sr = samplesInfo.SampleRate; + o.startTimes(end+1) = 0; o.endTimes(end+1) = sampleSize(1)/sr; end
--- a/simScene.m Tue Mar 17 09:34:13 2015 +0100 +++ b/simScene.m Tue Dec 08 10:45:15 2015 +0100 @@ -203,6 +203,6 @@ end %% Generate Sound -wavwrite(simsSceneWav,44100,[outputPath,'sound/',outputFileName,'.wav']); - +% wavwrite(simsSceneWav,44100,[outputPath,'sound/',outputFileName,'.wav']); +audiowrite([outputPath,'sound/',outputFileName,'.wav'],simsSceneWav,44100); end