aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/mplayer/decoder_mplayer.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-07-16 06:53:49 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-07-16 06:53:49 +0000
commit8195a135768b85c7deb03272efdaf2b90085702e (patch)
tree1b86e80a0c0a518163a43711ee2bc0261c7c1f89 /src/plugins/Input/mplayer/decoder_mplayer.cpp
parent6247dd72364b35e986e2cef0c7ad543af82763be (diff)
downloadqmmp-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
Diffstat (limited to 'src/plugins/Input/mplayer/decoder_mplayer.cpp')
-rw-r--r--src/plugins/Input/mplayer/decoder_mplayer.cpp7
1 files changed, 4 insertions, 3 deletions
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,