Removes trailing spaces. Removes tabs.

[vlc] / src / control / media_instance.c

diff --git a/src/control/media_instance.c b/src/control/media_instance.c
index b2c6a15dfdf84e37db0635559a30ca39cbd6a5e9..6f10e14f8d5aeb5ceb00ac8f9aa446aa9d2682ea 100644 (file)
--- a/src/control/media_instance.c
+++ b/src/control/media_instance.c
@@ -21,18 +21,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "libvlc_internal.h"
 #include <vlc/libvlc.h>
 #include <vlc_demux.h>
 #include <vlc_input.h>
 #include "input/input_internal.h"
+#include "libvlc_internal.h"
 
 /*
  * Release the associated input thread
  *
  * Object lock is NOT held.
  */
-static void release_input_thread( libvlc_media_instance_t *p_mi ) 
+static void release_input_thread( libvlc_media_instance_t *p_mi )
 {
     input_thread_t *p_input_thread;
     vlc_bool_t should_destroy;
@@ -48,7 +48,7 @@ static void release_input_thread( libvlc_media_instance_t *p_mi )
 
     if( !p_input_thread )
         return;
-    
+ 
     /* release for previous vlc_object_get */
     vlc_object_release( p_input_thread );
 
@@ -81,7 +81,7 @@ static void release_input_thread( libvlc_media_instance_t *p_mi )
  * Object lock is held.
  */
 input_thread_t *libvlc_get_input_thread( libvlc_media_instance_t *p_mi,
-                                         libvlc_exception_t *p_e ) 
+                                         libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread;
 
@@ -125,6 +125,12 @@ input_state_changed( vlc_object_t * p_this, char const * psz_cmd,
         case END_S:
             event.type = libvlc_MediaInstanceReachedEnd;
             break;
+        case PAUSE_S:
+            event.type = libvlc_MediaInstancePaused;
+            break;
+        case PLAYING_S:
+            event.type = libvlc_MediaInstancePlayed;
+            break;
         default:
             return VLC_SUCCESS;
     }
@@ -133,6 +139,40 @@ input_state_changed( vlc_object_t * p_this, char const * psz_cmd,
     return VLC_SUCCESS;
 }
 
+/*
+ * input_position_changed (Private) (input var "intf-change" Callback)
+ */
+static int
+input_position_changed( vlc_object_t * p_this, char const * psz_cmd,
+                     vlc_value_t oldval, vlc_value_t newval,
+                     void * p_userdata )
+{
+    libvlc_media_instance_t * p_mi = p_userdata;
+    vlc_value_t val;
+ 
+    if (!strcmp(psz_cmd, "intf" /* "-change" no need to go further */))
+    {
+        input_thread_t * p_input = (input_thread_t *)p_this;
+        var_Get( p_input, "position", &val );
+
+        if ((val.i_time % I64C(500000)) != 0)
+            return VLC_SUCCESS; /* No need to have a better precision */
+        var_Get( p_input, "state", &val );
+
+        if( val.i_int != PLAYING_S )
+            return VLC_SUCCESS; /* Don't send the position while stopped */
+    }
+    else
+        val.i_time = newval.i_time;
+
+    libvlc_event_t event;
+    event.type = libvlc_MediaInstancePositionChanged;
+    event.u.media_instance_position_changed.new_position = val.i_time;
+
+    libvlc_event_send( p_mi->p_event_manager, &event );
+    return VLC_SUCCESS;
+}
+
 /**************************************************************************
  * Create a Media Instance object
  **************************************************************************/
@@ -193,7 +233,8 @@ libvlc_media_instance_new_from_media_descriptor(
     if( !p_mi )
         return NULL;
 
-    p_mi->p_md = libvlc_media_descriptor_duplicate( p_md );
+    libvlc_media_descriptor_retain( p_md );
+    p_mi->p_md = p_md;
 
     return p_mi;
 }
@@ -230,7 +271,7 @@ libvlc_media_instance_t * libvlc_media_instance_new_from_input_thread(
     }
 
     p_mi->i_input_id = p_input->i_object_id;
-    
+ 
     /* will be released in media_instance_release() */
     vlc_object_yield( p_input );
 
@@ -282,7 +323,7 @@ void libvlc_media_instance_release( libvlc_media_instance_t *p_mi )
         return;
 
     vlc_mutex_lock( &p_mi->object_lock );
-    
+ 
     p_mi->i_refcount--;
 
     if( p_mi->i_refcount > 0 )
@@ -294,7 +335,7 @@ void libvlc_media_instance_release( libvlc_media_instance_t *p_mi )
     vlc_mutex_destroy( &p_mi->object_lock );
 
     libvlc_event_manager_release( p_mi->p_event_manager );
-    
+ 
     release_input_thread( p_mi );
 
     libvlc_media_descriptor_release( p_mi->p_md );
@@ -338,8 +379,9 @@ void libvlc_media_instance_set_media_descriptor(
         return; /* It is ok to pass a NULL md */
     }
 
-    p_mi->p_md = libvlc_media_descriptor_duplicate( p_md );
-    
+    libvlc_media_descriptor_retain( p_md );
+    p_mi->p_md = p_md;
+ 
     /* The policy here is to ignore that we were created using a different
      * libvlc_instance, because we don't really care */
     p_mi->p_libvlc_instance = p_md->p_libvlc_instance;
@@ -360,7 +402,8 @@ libvlc_media_instance_get_media_descriptor(
     if( !p_mi->p_md )
         return NULL;
 
-    return libvlc_media_descriptor_duplicate( p_mi->p_md );
+    libvlc_media_descriptor_retain( p_mi->p_md );
+    return p_mi->p_md;
 }
 
 /**************************************************************************
@@ -384,9 +427,9 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
 {
     input_thread_t * p_input_thread;
 
-    if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) ) 
+    if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) )
     {
-        /* A thread alread exists, send it a play message */        
+        /* A thread alread exists, send it a play message */
         vlc_value_t val;
         val.i_int = PLAYING_S;
 
@@ -399,7 +442,7 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
     libvlc_exception_clear( p_e );
 
     vlc_mutex_lock( &p_mi->object_lock );
-    
+ 
     if( !p_mi->p_md )
     {
         libvlc_exception_raise( p_e, "no associated media descriptor" );
@@ -419,6 +462,7 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
         var_Set( p_input_thread, "drawable", val );
     }
     var_AddCallback( p_input_thread, "state", input_state_changed, p_mi );
+    var_AddCallback( p_input_thread, "intf-change", input_position_changed, p_mi );
 
     /* will be released in media_instance_release() */
     vlc_object_yield( p_input_thread );
@@ -520,7 +564,7 @@ void libvlc_media_instance_set_time(
 void libvlc_media_instance_set_position(
                                 libvlc_media_instance_t *p_mi,
                                 float position,
-                                libvlc_exception_t *p_e ) 
+                                libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread;
     vlc_value_t val;
@@ -553,7 +597,7 @@ float libvlc_media_instance_get_position(
 
 float libvlc_media_instance_get_fps(
                                  libvlc_media_instance_t *p_mi,
-                                 libvlc_exception_t *p_e) 
+                                 libvlc_exception_t *p_e)
 {
     double f_fps = 0.0;
     input_thread_t *p_input_thread;
@@ -578,14 +622,14 @@ float libvlc_media_instance_get_fps(
 
 vlc_bool_t libvlc_media_instance_will_play(
                                  libvlc_media_instance_t *p_mi,
-                                 libvlc_exception_t *p_e) 
+                                 libvlc_exception_t *p_e)
 {
     input_thread_t *p_input_thread =
                             libvlc_get_input_thread ( p_mi, p_e);
     if ( !p_input_thread )
         return VLC_FALSE;
 
-    if ( !p_input_thread->b_die && !p_input_thread->b_dead ) 
+    if ( !p_input_thread->b_die && !p_input_thread->b_dead )
     {
         vlc_object_release( p_input_thread );
         return VLC_TRUE;
@@ -597,7 +641,7 @@ vlc_bool_t libvlc_media_instance_will_play(
 void libvlc_media_instance_set_rate(
                                  libvlc_media_instance_t *p_mi,
                                  float rate,
-                                 libvlc_exception_t *p_e ) 
+                                 libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread;
     vlc_value_t val;