Branch: master

bcdd7a22 2014-10-01 10:53:04 Timothy Pearson
Fix prior commit
M xine_artsplugin/audio_fifo_out.c
diff --git a/xine_artsplugin/audio_fifo_out.c b/xine_artsplugin/audio_fifo_out.c
index f0372c4..9255ba2 100644
--- a/xine_artsplugin/audio_fifo_out.c
+++ b/xine_artsplugin/audio_fifo_out.c
@@ -356,8 +356,6 @@
 
 static void *_arts_plugin_class_init(xine_t *xine, void *data) {
 	fifo_class_t *cl;
-
-	printf("[RAJA DEBUG 320.0] In _arts_plugin_class_init\n\r"); fflush(stdout);
 	
 	cl = (fifo_class_t *) malloc(sizeof(fifo_class_t));
 	if (!cl) return NULL;
@@ -381,9 +379,6 @@
      { PLUGIN_AUDIO_OUT, AUDIO_OUT_IFACE_VERSION, "arts", XINE_VERSION_CODE, &_arts_info, _arts_plugin_class_init },
      { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
-
-// RAJA FIXME
-// OK, now we need to *load* the plugin instead of xine_new_framegrab_audio_port below...
 #endif
 
 xine_audio_port_t *init_audio_out_plugin( xine_t *xine, xine_arts_audio *audio,
be17159b 2014-10-01 10:53:21 Timothy Pearson
Fix prior commit
M xine_artsplugin/xinePlayObject_impl.cpp
diff --git a/xine_artsplugin/xinePlayObject_impl.cpp b/xine_artsplugin/xinePlayObject_impl.cpp
index 6fd108d..4057b57 100644
--- a/xine_artsplugin/xinePlayObject_impl.cpp
+++ b/xine_artsplugin/xinePlayObject_impl.cpp
@@ -361,13 +361,19 @@
 {
     poTime time;
     int pos_time;
+    int pos_stream;
+    int length_time;
 
     pthread_mutex_lock( &mutex );
 
     if (stream != 0 && !mrl.empty())
     {
-	if (xine_get_pos_length( stream, 0, &pos_time, 0 ))
+	if (xine_get_pos_length( stream, &pos_stream, &pos_time, &length_time ))
 	{
+printf("[RAJA DEBUG 430.0] In xinePlayObject_impl::currentTime xine returned pos_stream: %d pos_time: %d length_time: %d\n\r", pos_stream, pos_time, length_time); fflush(stdout);
+// RAJA FIXME
+// pos_stream goes from 0 to 65535
+// We need another accessor for position when overallTime returns 0 so that our progress slider works!
 	    streamPosition = pos_time;
 	}
 	else
@@ -385,6 +391,7 @@
     }
     pthread_mutex_unlock( &mutex );
 
+printf("[RAJA DEBUG 430.1] In xinePlayObject_impl::currentTime returning %d\n\r", pos_time); fflush(stdout);
     return time;
 }