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

List:       kde-commits
Subject:    KDE/kdemultimedia/phonon-xine
From:       Matthias Kretz <kretz () kde ! org>
Date:       2007-05-31 11:05:37
Message-ID: 1180609537.406181.31496.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 670123 by mkretz:

for my experiments with libxine


 M  +6 -3      net_buf_ctrl.c  
 M  +5 -2      xinestream.cpp  


--- trunk/KDE/kdemultimedia/phonon-xine/net_buf_ctrl.c #670122:670123
@@ -43,6 +43,9 @@
 #define FIFO_PUT                   0
 #define FIFO_GET                   1
 
+/*#define streamClock(stream) stream->clock*/
+#define streamClock(stream) stream->xine->clock
+
 struct nbc_s {
 
   xine_stream_t   *stream;
@@ -103,14 +106,14 @@
   xine_stream_t *stream = (xine_stream_t *)data;
   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: \
nbc_set_speed_pause\n");  _x_set_speed (stream, XINE_SPEED_PAUSE);
-  stream->xine->clock->set_option (stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 0);
+  streamClock(stream)->set_option (streamClock(stream), CLOCK_SCR_ADJUSTABLE, 0);
 }
 
 static void nbc_set_speed_normal (void *data) {
   xine_stream_t *stream = (xine_stream_t *)data;
   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: \
nbc_set_speed_normal\n");  _x_set_speed (stream, XINE_SPEED_NORMAL);
-  stream->xine->clock->set_option (stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1);
+  streamClock(stream)->set_option (streamClock(stream), CLOCK_SCR_ADJUSTABLE, 1);
 }
 
 int report_bufferstatus (nbc_t *this)
@@ -608,7 +611,7 @@
   audio_fifo->unregister_get_cb(audio_fifo, nbc_get_cb);
 
   /* now we are sure that nobody will call a callback */
-  this->stream->xine->clock->set_option (this->stream->xine->clock, \
CLOCK_SCR_ADJUSTABLE, 1); +  this->streamClock(stream)->set_option \
(this->streamClock(stream), CLOCK_SCR_ADJUSTABLE, 1);  
   pthread_mutex_destroy(&this->mutex);
   free (this);
--- trunk/KDE/kdemultimedia/phonon-xine/xinestream.cpp #670122:670123
@@ -37,6 +37,9 @@
 
 //#define DISABLE_FILE_MRLS
 
+//#define streamClock(stream) stream->clock
+#define streamClock(stream) stream->xine->clock
+
 namespace Phonon
 {
 namespace Xine
@@ -772,14 +775,14 @@
     case PauseForBuffering:
         ev->accept();
         xine_set_param(m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE); //_x_set_speed \
                (m_stream, XINE_SPEED_PAUSE);
-        m_stream->xine->clock->set_option (m_stream->xine->clock, \
CLOCK_SCR_ADJUSTABLE, 0); +        streamClock(m_stream)->set_option \
(streamClock(m_stream), CLOCK_SCR_ADJUSTABLE, 0);  return true;
     case UnpauseForBuffering:
         ev->accept();
         if (Phonon::PausedState != m_state) {
             xine_set_param(m_stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL); \
//_x_set_speed (m_stream, XINE_SPEED_NORMAL);  }
-        m_stream->xine->clock->set_option (m_stream->xine->clock, \
CLOCK_SCR_ADJUSTABLE, 1); +        streamClock(m_stream)->set_option \
(streamClock(m_stream), CLOCK_SCR_ADJUSTABLE, 1);  return true;
     case QuitEventLoop:
         ev->accept();


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