fixed alac support (Closes issue 472)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2188 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 6 insertions, 7 deletions

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index d243e2ba3..9bce3d8c3 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -120,6 +120,7 @@ bool DecoderFFmpeg::initialize()
         return false;
     }
     qDebug("DecoderFFmpeg: detected format: %s", fmt->long_name);
+    qDebug("=%s=", fmt->name);
 
 #if (LIBAVFORMAT_VERSION_INT >= ((52<<16)+(105<<8)+0))
     m_stream = avio_alloc_context(m_input_buf, INPUT_BUFFER_SIZE, 0, this, ffmpeg_read, NULL, ffmpeg_seek);
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 6f7bed6db..ae0e8a4a6 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -96,6 +96,7 @@ const DecoderProperties DecoderFFmpegFactory::properties() const
     {
         properties.contentTypes << "audio/3gpp" << "audio/3gpp2" << "audio/mp4";
         properties.contentTypes << "audio/MP4A-LATM" << "audio/mpeg4-generic";
+        properties.contentTypes << "audio/m4a";
     }
     if(filters.contains("*.ac3"))
         properties.contentTypes << "audio/ac3";
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp
index 3d6a9c56f..3046967a4 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.cpp
+++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp
@@ -48,14 +48,13 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.apeCheckBox->setChecked(filters.contains("*.ape") && avcodec_find_decoder(CODEC_ID_APE));
     ui.ttaCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_TTA));
     ui.ttaCheckBox->setChecked(filters.contains("*.tta") && avcodec_find_decoder(CODEC_ID_TTA));
-    ui.alacCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_ALAC));
-    ui.alacCheckBox->setChecked(filters.contains("*.alac") && avcodec_find_decoder(CODEC_ID_ALAC));
     ui.aacCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AAC));
     ui.aacCheckBox->setChecked(filters.contains("*.aac") && avcodec_find_decoder(CODEC_ID_AAC));
     ui.mp3CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_MP3));
     ui.mp3CheckBox->setChecked(filters.contains("*.mp3") && avcodec_find_decoder(CODEC_ID_MP3));
     ui.mp4CheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_AAC));
-    ui.mp4CheckBox->setChecked(filters.contains("*.m4a") && avcodec_find_decoder(CODEC_ID_AAC));
+    ui.mp4CheckBox->setChecked(filters.contains("*.m4a") && (avcodec_find_decoder(CODEC_ID_AAC)
+                                                             || avcodec_find_decoder(CODEC_ID_ALAC)));
     ui.raCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_RA_288));
     ui.raCheckBox->setChecked(filters.contains("*.ra") && avcodec_find_decoder(CODEC_ID_RA_288));
     ui.shCheckBox->setChecked(filters.contains("*.shn") && avcodec_find_decoder(CODEC_ID_SHORTEN));
@@ -78,8 +77,6 @@ void SettingsDialog::accept()
         filters << "*.ape";
     if (ui.ttaCheckBox->isChecked())
         filters << "*.tta";
-    if (ui.alacCheckBox->isChecked())
-        filters << "*.alac";
     if (ui.aacCheckBox->isChecked())
         filters << "*.aac";
     if (ui.mp4CheckBox->isChecked())
diff --git a/src/plugins/Input/ffmpeg/settingsdialog.ui b/src/plugins/Input/ffmpeg/settingsdialog.ui
index ff2b81e35..39a806f70 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.ui
+++ b/src/plugins/Input/ffmpeg/settingsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>308</width>
-    <height>373</height>
+    <height>297</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -100,7 +100,7 @@
       <item>
        <widget class="QCheckBox" name="mp4CheckBox">
         <property name="text">
-         <string>MPEG-4 AAC</string>
+         <string>MPEG-4 AAC/ALAC</string>
         </property>
        </widget>
       </item>