Fix a couple of thinkos in the external audio code.

diff --git a/src/lib/external_audio_decoder.cc b/src/lib/external_audio_decoder.cc
index 768d32f6dfbac29bc8e51ff2f2aa0238091a3d82..89e10bfc0725a2dae4fb47ef8873216530ba0d90 100644 (file)
--- a/src/lib/external_audio_decoder.cc
+++ b/src/lib/external_audio_decoder.cc
@@ -54,12 +54,12 @@ ExternalAudioDecoder::pass ()
        sf_count_t frames = 0;
        
        vector<SNDFILE*> sndfiles;
-       for (vector<string>::const_iterator i = files.begin(); i != files.end(); ++i) {
-               if (i->empty ()) {
+       for (size_t i = 0; i < (size_t) N; ++i) {
+               if (files[i].empty ()) {
                        sndfiles.push_back (0);
                } else {
                        SF_INFO info;
-                       SNDFILE* s = sf_open (i->c_str(), SFM_READ, &info);
+                       SNDFILE* s = sf_open (files[i].c_str(), SFM_READ, &info);
                        if (!s) {
                                throw DecodeError ("could not open external audio file for reading");
                        }
@@ -72,7 +72,7 @@ ExternalAudioDecoder::pass ()
 
                        if (first) {
                                /* XXX: nasty magic value */
-                               AudioStream st ("DVDOMATIC-EXTERNAL", -1, info.samplerate, av_get_default_channel_layout (info.channels));
+                               AudioStream st ("DVDOMATIC-EXTERNAL", -1, info.samplerate, av_get_default_channel_layout (N));
                                _audio_streams.push_back (st);
                                _audio_stream = st;
                                frames = info.frames;