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

List:       kde-commits
Subject:    kdenonbeta/kttsd
From:       Gary Cramblitt <garycramblitt () comcast ! net>
Date:       2004-12-08 0:35:36
Message-ID: 20041208003536.DBDE21B966 () office ! kde ! org
[Download RAW message or body]

CVS commit by cramblitt: 

Minor fixes plus patches from Juk.


  M +1 -0      ChangeLog   1.54
  M +1 -0      kcmkttsmgr/kcmkttsmgr.cpp   1.46
  M +2 -2      libkttsd/player.h   1.5
  M +3 -3      players/gstplayer/gstreamerplayer.cpp   1.4


--- kdenonbeta/kttsd/ChangeLog  #1.53:1.54
@@ -1,4 +1,5 @@
 2004-12-06  Gary Cramblitt (PhantomsDad)
         * Initial, but primitive support for SSML with Hadifix.
+        * Apply some Juk patches to GStreamerPlayer.
 
 2004-12-03  Gary Cramblitt (PhantomsDad)

--- kdenonbeta/kttsd/kcmkttsmgr/kcmkttsmgr.cpp  #1.45:1.46
@@ -131,4 +131,5 @@ KCMKttsMgr::KCMKttsMgr(QWidget *parent, 
         QStringList sinkList = player->getPluginList("Sink/Audio");
         kdDebug() << "KCMKttsMgr::KCMKttsMgr: GStreamer sinkList = " << sinkList << endl;
+        m_kttsmgrw->sinkComboBox->clear();
         m_kttsmgrw->sinkComboBox->insertStringList(sinkList);
     }

--- kdenonbeta/kttsd/libkttsd/player.h  #1.4:1.5
@@ -51,6 +51,6 @@ public:
 
 protected:
-    Player(QObject* parent = 0, const char* name = 0, const QStringList& args=QStringList()) :
-        QObject(parent, name) {}
+    Player(QObject* parent = 0, const char* name = 0, const QStringList& args=QStringList() ) :
+        QObject(parent, name) { if (args.isEmpty()); } // TODO: Avoid compiler WARNING.  Better way?
 
 };

--- kdenonbeta/kttsd/players/gstplayer/gstreamerplayer.cpp  #1.3:1.4
@@ -53,6 +53,6 @@ void GStreamerPlayer::startPlay(const QS
     if(!file.isNull()) {
         stop();
-        // g_object_set(G_OBJECT(m_source), "location", file.absFilePath().utf8().data(), 0);
-        g_object_set(G_OBJECT(m_source), "location", file.data(), 0);
+        // g_object_set(G_OBJECT(m_source), "location", file.absFilePath().local8Bit().data(), 0);
+        g_object_set(G_OBJECT(m_source), "location", file.local8Bit().data(), 0);
     }
 
@@ -119,5 +119,5 @@ void GStreamerPlayer::seekPosition(int p
     long long total = time(GST_QUERY_TOTAL);
     if(total > 0)
-        seek(double(position) / double(1000) * double(totalTime()) + 0.5);
+        seek(int(double(position) / double(1000) * double(totalTime()) + 0.5));
 }
 


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