Less information when compiling with compile

[vlc] / src / control / media_player.c

diff --git a/src/control/media_player.c b/src/control/media_player.c
index f8968a51fb5b43fce5220bbbad7566332d099b8c..a38df319e7b810a2af647fc7bbb2c2411452cee4 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -149,19 +149,19 @@ input_state_changed( vlc_object_t * p_this, char const * psz_cmd,
     {
         case END_S:
             libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
-            event.type = libvlc_MediaInstanceReachedEnd;
+            event.type = libvlc_MediaPlayerEndReached;
             break;
         case PAUSE_S:
             libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL);
-            event.type = libvlc_MediaInstancePaused;
+            event.type = libvlc_MediaPlayerPaused;
             break;
         case PLAYING_S:
             libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL);
-            event.type = libvlc_MediaInstancePlayed;
+            event.type = libvlc_MediaPlayerPlayed;
             break;
         case ERROR_S:
             libvlc_media_set_state( p_mi->p_md, libvlc_Error, NULL);
-            event.type = libvlc_MediaInstanceEncounteredError;
+            event.type = libvlc_MediaPlayerEncounteredError;
             break;
         default:
             return VLC_SUCCESS;
@@ -183,7 +183,7 @@ input_seekable_changed( vlc_object_t * p_this, char const * psz_cmd,
     libvlc_event_t event;
 
     libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
-    event.type = libvlc_MediaInstanceSeekableChanged;
+    event.type = libvlc_MediaPlayerSeekableChanged;
     event.u.media_player_seekable_changed.new_seekable = newval.b_bool;
 
     libvlc_event_send( p_mi->p_event_manager, &event );
@@ -202,7 +202,7 @@ input_pausable_changed( vlc_object_t * p_this, char const * psz_cmd,
     libvlc_event_t event;
 
     libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
-    event.type = libvlc_MediaInstancePausableChanged;
+    event.type = libvlc_MediaPlayerPausableChanged;
     event.u.media_player_pausable_changed.new_pausable = newval.b_bool;
 
     libvlc_event_send( p_mi->p_event_manager, &event );
@@ -235,7 +235,7 @@ input_position_changed( vlc_object_t * p_this, char const * psz_cmd,
         val.i_time = newval.i_time;
 
     libvlc_event_t event;
-    event.type = libvlc_MediaInstancePositionChanged;
+    event.type = libvlc_MediaPlayerPositionChanged;
     event.u.media_player_position_changed.new_position = val.f_float;
 
     libvlc_event_send( p_mi->p_event_manager, &event );
@@ -268,7 +268,7 @@ input_time_changed( vlc_object_t * p_this, char const * psz_cmd,
         val.i_time = newval.i_time;
 
     libvlc_event_t event;
-    event.type = libvlc_MediaInstanceTimeChanged;
+    event.type = libvlc_MediaPlayerTimeChanged;
     event.u.media_player_time_changed.new_time = val.i_time;
     libvlc_event_send( p_mi->p_event_manager, &event );
     return VLC_SUCCESS;
@@ -300,13 +300,12 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance,
      *   operation the refcount is 0, the object is destroyed.
      * - Accessor _retain increase the refcount by 1 (XXX: to implement) */
     p_mi->i_refcount = 1;
-    p_mi->b_own_its_input_thread = VLC_TRUE;
+    p_mi->b_own_its_input_thread = true;
     /* object_lock strategy:
      * - No lock held in constructor
      * - Lock when accessing all variable this lock is held
      * - Lock when attempting to destroy the object the lock is also held */
-    vlc_mutex_init( p_mi->p_libvlc_instance->p_libvlc_int,
-                    &p_mi->object_lock );
+    vlc_mutex_init( &p_mi->object_lock );
     p_mi->p_event_manager = libvlc_event_manager_new( p_mi,
             p_libvlc_instance, p_e );
     if( libvlc_exception_raised( p_e ) )
@@ -314,23 +313,25 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance,
         free( p_mi );
         return NULL;
     }
- 
+
+    libvlc_event_manager_register_event_type( p_mi->p_event_manager,
+            libvlc_MediaPlayerEndReached, p_e );
     libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstanceReachedEnd, p_e );
+            libvlc_MediaPlayerStopped, p_e );
     libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstanceEncounteredError, p_e );
+            libvlc_MediaPlayerEncounteredError, p_e );
     libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstancePaused, p_e );
+            libvlc_MediaPlayerPaused, p_e );
     libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstancePlayed, p_e );
+            libvlc_MediaPlayerPlayed, p_e );
     libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstancePositionChanged, p_e );
+            libvlc_MediaPlayerPositionChanged, p_e );
     libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstanceTimeChanged, p_e );
+            libvlc_MediaPlayerTimeChanged, p_e );
     libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstanceSeekableChanged, p_e );
+            libvlc_MediaPlayerSeekableChanged, p_e );
     libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstancePausableChanged, p_e );
+            libvlc_MediaPlayerPausableChanged, p_e );
 
     return p_mi;
 }
@@ -390,7 +391,7 @@ libvlc_media_player_t * libvlc_media_player_new_from_input_thread(
     vlc_object_yield( p_input );
 
     p_mi->p_input_thread = p_input;
-    p_mi->b_own_its_input_thread = VLC_FALSE;
+    p_mi->b_own_its_input_thread = false;
 
     return p_mi;
 }
@@ -641,6 +642,12 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi,
         input_StopThread( p_input_thread );
         vlc_object_release( p_input_thread );
     }
+
+    /* Send a stop notification event */
+    libvlc_event_t event;
+    libvlc_media_set_state( p_mi->p_md, libvlc_Stopped, NULL);
+    event.type = libvlc_MediaPlayerStopped;
+    libvlc_event_send( p_mi->p_event_manager, &event );
 }
 
 /**************************************************************************
@@ -824,15 +831,15 @@ int libvlc_media_player_will_play( libvlc_media_player_t *p_mi,
     input_thread_t *p_input_thread =
                             libvlc_get_input_thread ( p_mi, p_e);
     if ( !p_input_thread )
-        return VLC_FALSE;
+        return false;
 
     if ( !p_input_thread->b_die && !p_input_thread->b_dead )
     {
         vlc_object_release( p_input_thread );
-        return VLC_TRUE;
+        return true;
     }
     vlc_object_release( p_input_thread );
-    return VLC_FALSE;
+    return false;
 }
 
 void libvlc_media_player_set_rate(
@@ -907,7 +914,7 @@ int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi,
         /* We do return the right value, no need to throw an exception */
         if( libvlc_exception_raised( p_e ) )
             libvlc_exception_clear( p_e );
-        return VLC_FALSE;
+        return false;
     }
     var_Get( p_input_thread, "seekable", &val );
     vlc_object_release( p_input_thread );
@@ -927,7 +934,7 @@ int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi,
         /* We do return the right value, no need to throw an exception */
         if( libvlc_exception_raised( p_e ) )
             libvlc_exception_clear( p_e );
-        return VLC_FALSE;
+        return false;
     }
     var_Get( p_input_thread, "can-pause", &val );
     vlc_object_release( p_input_thread );