Audio file format plugins: set channels information

Author: iDarkTemplar

src/aac/aac.cc

@@ -269,6 +269,8 @@ bool AACDecoder::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
         tuple.set_int (Tuple::Length, length);
     if (bitrate > 0)
         tuple.set_int (Tuple::Bitrate, bitrate);
+    if (channels > 0)
+        tuple.set_int (Tuple::Channels, channels);
 
     tuple.fetch_stream_info (file);
 

src/adplug/adplug-xmms.cc

@@ -166,6 +166,7 @@ bool AdPlugXMMS::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
   tuple.set_str (Tuple::Codec, p->gettype().c_str());
   tuple.set_str (Tuple::Quality, _("sequenced"));
   tuple.set_int (Tuple::Length, p->songlength (plr.subsong));
+  tuple.set_int (Tuple::Channels, 2);
   delete p;
 
   return true;

src/amidiplug/amidi-plug.cc

@@ -148,8 +148,15 @@ bool AMIDIPlug::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
     if (! mf.parse_from_file (filename, file))
         return false;
 
+    int channels;
+    int bitdepth;
+    int samplerate;
+
+    backend_audio_info (& channels, & bitdepth, & samplerate);
+
     tuple.set_str (Tuple::Codec, "MIDI");
     tuple.set_int (Tuple::Length, mf.length / 1000);
+    tuple.set_int (Tuple::Channels, channels);
 
     return true;
 }

src/cdaudio/cdaudio-ng.cc

@@ -399,6 +399,7 @@ bool CDAudio::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
         tuple.set_int (Tuple::Track, trackno);
         tuple.set_int (Tuple::Length, calculate_track_length
          (trackinfo[trackno].startlsn, trackinfo[trackno].endlsn));
+        tuple.set_int (Tuple::Channels, 2);
 
         if (trackinfo[trackno].name)
             tuple.set_str (Tuple::Title, trackinfo[trackno].name);

src/console/Audacious_Driver.cc

@@ -192,6 +192,7 @@ bool ConsolePlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple,
         tuple.set_subtunes(info.track_count, nullptr);
 
     tuple.set_int (Tuple::Length, get_track_length (info));
+    tuple.set_int (Tuple::Channels, 2);
 
     return true;
 }

src/flac/metadata.cc

@@ -337,6 +337,9 @@ bool FLACng::read_tag (const char * filename, VFSFile & file, Tuple & tuple, Ind
 
                     tuple.set_int (Tuple::Bitrate, (bitrate + 500) / 1000);
                 }
+
+                if (metadata->data.stream_info.channels > 0)
+                    tuple.set_int(Tuple::Channels, metadata->data.stream_info.channels);
                 break;
             }
 

src/metronom/metronom.cc

@@ -227,6 +227,7 @@ bool Metronome::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Inde
         return false;
 
     tuple.set_str(Tuple::Title, desc);
+    tuple.set_int(Tuple::Channels, 1);
     return true;
 }
 

src/modplug/modplugbmp.cc

@@ -320,6 +320,7 @@ bool ModplugXMMS::read_tag (const char * filename, VFSFile & file, Tuple & tuple
     tuple.set_str (Tuple::Codec, tmps);
     tuple.set_str (Tuple::Quality, _("sequenced"));
     tuple.set_int (Tuple::Length, lSoundFile->GetSongTime() * 1000);
+    tuple.set_int (Tuple::Channels, lSoundFile->GetNumChannels());
 
     const char *tmps2 = lSoundFile->GetTitle();
     // Chop any leading spaces off. They are annoying in the playlist.

src/mpg123/mpg123.cc

@@ -249,6 +249,7 @@ static bool read_mpg123_info(const char * filename, VFSFile & file,
 
     tuple.set_int(Tuple::Bitrate, s.info.bitrate);
     tuple.set_str(Tuple::Codec, make_format_string(&s.info));
+    tuple.set_int(Tuple::Channels, s.channels);
 
     const char * chan_str = (s.channels == 2)
                                 ? _("Stereo")

src/openmpt/mpt.cc

@@ -91,6 +91,7 @@ class MPTPlugin : public InputPlugin
 
         tuple.set_int(Tuple::Length, mpt.duration());
         tuple.set_str(Tuple::Title, mpt.title());
+        tuple.set_int(Tuple::Channels, mpt.channels());
 
         return true;
     }