[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/xine
From:       Mark Kretschmann <markey () web ! de>
Date:       2007-04-16 17:28:21
Message-ID: 1176744501.786100.27171.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 654644 by markey:

deprecated--

 M  +22 -26    xine-engine.cpp  
 M  +6 -6      xine-engine.h  


--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.cpp #654643:654644
@@ -19,28 +19,24 @@
 #include "xine-engine.h"
 #include "amarok.h"
 #include "amarokconfig.h"
+#include "debug.h"
 //these files are from libamarok
-#include "playlist.h"
 #include "enginecontroller.h"
-//Added by qt3to4:
-#include <QTimerEvent>
-#include <Q3ValueList>
-#include <QCustomEvent>
-#include <QByteArray>
-#include <QEvent>
+#include "playlist.h"
 
 AMAROK_EXPORT_PLUGIN( XineEngine )
 
 #include <climits>
 #include <cmath>
-#include "debug.h"
 
+#include <QApplication>
+#include <QByteArray>
+#include <QDir>
+
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
-#include <QApplication>
-#include <QDir>
 
 extern "C"
 {
@@ -610,14 +606,14 @@
    post: (1..200) - (1 = down, 100 = middle, 200 = up, 0 = off)
  */
 void
-XineEngine::setEqualizerParameters( int preamp, const Q3ValueList<int> &gains )
+XineEngine::setEqualizerParameters( int preamp, const QList<int> &gains )
 {
     if ( !m_stream )
         return;
 
     m_equalizerGains = gains;
     m_intPreamp = preamp;
-    Q3ValueList<int>::ConstIterator it = gains.begin();
+    QList<int>::ConstIterator it = gains.begin();
 
     xine_set_param( m_stream, XINE_PARAM_EQ_30HZ,    int( (*it  )*0.995 + 100 ) );
     xine_set_param( m_stream, XINE_PARAM_EQ_60HZ,    int( (*++it)*0.995 + 100 ) );
@@ -641,22 +637,22 @@
     if(list.isEmpty())
     {
         char* exts = xine_get_file_extensions( m_xine );
-        list = QStringList::split( ' ', exts );
-        free( exts ); exts = NULL;
+        list = QString( exts ).split( ' ' );
+        free( exts );
         //images
-        list.remove("png");
-        list.remove("jpg");
-        list.remove("jpeg");
-        list.remove("gif");
-        list.remove("ilbm");
-        list.remove("iff");
+        list.removeAll("png");
+        list.removeAll("jpg");
+        list.removeAll("jpeg");
+        list.removeAll("gif");
+        list.removeAll("ilbm");
+        list.removeAll("iff");
         //subtitles
-        list.remove("asc");
-        list.remove("txt");
-        list.remove("sub");
-        list.remove("srt");
-        list.remove("smi");
-        list.remove("ssa");
+        list.removeAll("asc");
+        list.removeAll("txt");
+        list.removeAll("sub");
+        list.removeAll("srt");
+        list.removeAll("smi");
+        list.removeAll("ssa");
 //HACK we also check for m4a because xine plays them but
 //for some reason doesn't return the extension
         if(!list.contains("m4a"))
--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.h #654643:654644
@@ -13,12 +13,12 @@
 
 #include "amarok_engines_export.h"
 #include "enginebase.h"
+
+#include <QList>
 #include <QThread>
-//Added by qt3to4:
-#include <QCustomEvent>
-#include <Q3ValueList>
-#include <QTimerEvent>
 
+class QTimerEvent;
+
 extern "C"
 {
     #include <sys/types.h>
@@ -56,7 +56,7 @@
 
     virtual Amarok::PluginConfig *configure() const;
     virtual void setEqualizerEnabled( bool );
-    virtual void setEqualizerParameters( int preamp, const Q3ValueList<int>& );
+    virtual void setEqualizerParameters( int preamp, const QList<int>& );
     virtual void setVolumeSW( uint );
     virtual void fadeOut( uint fadeLength, bool* terminate, bool exiting = false );
 
@@ -90,7 +90,7 @@
     //need to save these for when the audio plugin is changed and xine reloaded
     bool                m_equalizerEnabled;
     int                 m_intPreamp;
-    Q3ValueList<int>     m_equalizerGains;
+    QList<int>          m_equalizerGains;
 
     mutable Engine::SimpleMetaBundle m_currentBundle;
 

[prev in list] [next in list] [prev in thread] [next in thread]