diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-07-16 06:53:49 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-07-16 06:53:49 +0000 |
| commit | 8195a135768b85c7deb03272efdaf2b90085702e (patch) | |
| tree | 1b86e80a0c0a518163a43711ee2bc0261c7c1f89 | |
| parent | 6247dd72364b35e986e2cef0c7ad543af82763be (diff) | |
| download | qmmp-8195a135768b85c7deb03272efdaf2b90085702e.tar.gz qmmp-8195a135768b85c7deb03272efdaf2b90085702e.tar.bz2 qmmp-8195a135768b85c7deb03272efdaf2b90085702e.zip | |
enabled mplayer support, added mkv extension
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1041 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Input/Input.pro | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mplayer/decoder_mplayer.cpp | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index 7d8e4ad65..403ce0725 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -57,7 +57,7 @@ add_subdirectory(cue) ENDIF(USE_CUE) IF(USE_MPLAYER) -#add_subdirectory(mplayer) +add_subdirectory(mplayer) ENDIF(USE_MPLAYER) IF(USE_CDA) diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro index dd13c80d7..9bd6f6dcd 100644 --- a/src/plugins/Input/Input.pro +++ b/src/plugins/Input/Input.pro @@ -41,7 +41,7 @@ contains(CONFIG, AAC_PLUGIN){ } contains(CONFIG, MPLAYER_PLUGIN){ - #SUBDIRS += mplayer + SUBDIRS += mplayer message(**************************) message(* Mplayer plugin enabled *) message(**************************) diff --git a/src/plugins/Input/mplayer/decoder_mplayer.cpp b/src/plugins/Input/mplayer/decoder_mplayer.cpp index 9037960a6..862bc3c90 100644 --- a/src/plugins/Input/mplayer/decoder_mplayer.cpp +++ b/src/plugins/Input/mplayer/decoder_mplayer.cpp @@ -18,7 +18,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <qmmp/constants.h> #include <qmmp/buffer.h> #include <qmmp/output.h> #include <qmmp/recycler.h> @@ -81,7 +80,7 @@ QStringList MplayerInfo::filters() { QStringList filters; filters << "*.avi" << "*.mpg" << "*.mpeg" << "*.divx" << "*.qt" << "*.mov" << "*.wmv" << "*.asf" - << "*.flv" << "*.3gp"; + << "*.flv" << "*.3gp" << "*.mkv"; return filters; } @@ -155,10 +154,13 @@ void DecoderMplayer::pause() void DecoderMplayer::setEQ(double bands[10], double preamp) { + Q_UNUSED(bands[10]); + Q_UNUSED(preamp); } void DecoderMplayer::setEQEnabled(bool on) { + Q_UNUSED(on); } void DecoderMplayer::run() @@ -178,7 +180,6 @@ void DecoderMplayer::readStdOut() StateHandler::instance()->dispatch(Qmmp::Playing); m_currentTime = (qint64) rx_av.cap(1).toDouble(); StateHandler::instance()->dispatch(m_currentTime * 1000, - m_length * 1000, m_bitrate, m_samplerate, m_bitsPerSample, |