Don't leak vlc_bool_t through libvlc-control

This restores the ABI. It also avoids nasty issues with determining
what a native boolean is from language bindings.

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index c96b407f306ebbc1795d0cee4f999f6a977b18ff..88ecc4af27eb2c32191f44d4deb8193bcca9cea7 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -236,7 +236,7 @@ VLC_PUBLIC_API libvlc_time_t
    libvlc_media_descriptor_get_duration( libvlc_media_descriptor_t * p_md,
                                          libvlc_exception_t * p_e );
 
-VLC_PUBLIC_API vlc_bool_t
+VLC_PUBLIC_API int
    libvlc_media_descriptor_is_preparsed( libvlc_media_descriptor_t * p_md,
                                          libvlc_exception_t * p_e );
 
@@ -262,7 +262,7 @@ VLC_PUBLIC_API void *
 /**
  * Set loop variable
  */
-VLC_PUBLIC_API void libvlc_playlist_loop( libvlc_instance_t* , vlc_bool_t,
+VLC_PUBLIC_API void libvlc_playlist_loop( libvlc_instance_t* , int,
                                           libvlc_exception_t * );
 
 /**
@@ -384,11 +384,11 @@ VLC_PUBLIC_API int libvlc_playlist_delete_item( libvlc_instance_t *, int,
 VLC_PUBLIC_API libvlc_media_instance_t * libvlc_playlist_get_media_instance(
                                 libvlc_instance_t *, libvlc_exception_t * );
 
-VLC_PUBLIC_API vlc_bool_t libvlc_media_instance_is_seekable(
+VLC_PUBLIC_API int libvlc_media_instance_is_seekable(
                                  libvlc_media_instance_t *p_mi,
                                  libvlc_exception_t *p_e );
 
-VLC_PUBLIC_API vlc_bool_t libvlc_media_instance_can_pause(
+VLC_PUBLIC_API int libvlc_media_instance_can_pause(
                                  libvlc_media_instance_t *p_mi,
                                  libvlc_exception_t *p_e );
 
@@ -457,7 +457,7 @@ VLC_PUBLIC_API void          libvlc_media_instance_set_position   ( libvlc_media
 VLC_PUBLIC_API void          libvlc_media_instance_set_chapter    ( libvlc_media_instance_t *, int, libvlc_exception_t *);
 VLC_PUBLIC_API int           libvlc_media_instance_get_chapter    (libvlc_media_instance_t *, libvlc_exception_t *);
 VLC_PUBLIC_API int           libvlc_media_instance_get_chapter_count( libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API vlc_bool_t    libvlc_media_instance_will_play      ( libvlc_media_instance_t *, libvlc_exception_t *);
+VLC_PUBLIC_API int    libvlc_media_instance_will_play      ( libvlc_media_instance_t *, libvlc_exception_t *);
 VLC_PUBLIC_API float         libvlc_media_instance_get_rate       ( libvlc_media_instance_t *, libvlc_exception_t *);
 VLC_PUBLIC_API void          libvlc_media_instance_set_rate       ( libvlc_media_instance_t *, float, libvlc_exception_t *);
 VLC_PUBLIC_API libvlc_state_t libvlc_media_instance_get_state   ( libvlc_media_instance_t *, libvlc_exception_t *);
@@ -467,7 +467,7 @@ VLC_PUBLIC_API libvlc_state_t libvlc_media_instance_get_state   ( libvlc_media_i
  * \param p_input the input
  * \param p_exception an initialized exception
  */
-VLC_PUBLIC_API vlc_bool_t  libvlc_media_instance_has_vout( libvlc_media_instance_t *, libvlc_exception_t *);
+VLC_PUBLIC_API int  libvlc_media_instance_has_vout( libvlc_media_instance_t *, libvlc_exception_t *);
 VLC_PUBLIC_API float       libvlc_media_instance_get_fps( libvlc_media_instance_t *, libvlc_exception_t *);
 
 
@@ -496,7 +496,7 @@ VLC_PUBLIC_API void
                                             char * psz_tag_key,
                                             libvlc_exception_t * );
 
-VLC_PUBLIC_API vlc_bool_t
+VLC_PUBLIC_API int
     libvlc_tag_query_match( libvlc_tag_query_t *, libvlc_media_descriptor_t *,
                             libvlc_exception_t * );
 
@@ -559,7 +559,7 @@ VLC_PUBLIC_API int
                                      libvlc_exception_t * );
 
 /* This indicates if this media list is read-only from a user point of view */
-VLC_PUBLIC_API vlc_bool_t
+VLC_PUBLIC_API int
     libvlc_media_list_is_readonly( libvlc_media_list_t * p_mlist );
 
 VLC_PUBLIC_API void
@@ -740,7 +740,7 @@ VLC_PUBLIC_API void
     libvlc_media_list_player_pause( libvlc_media_list_player_t * p_mlp,
                                    libvlc_exception_t * p_e );
 
-VLC_PUBLIC_API vlc_bool_t
+VLC_PUBLIC_API int
     libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp,
                                          libvlc_exception_t * p_e );
 
@@ -986,7 +986,7 @@ VLC_PUBLIC_API void libvlc_audio_toggle_mute( libvlc_instance_t *, libvlc_except
  * \param p_exception an initialized exception
  * \return the mute status (boolean)
  */
-VLC_PUBLIC_API vlc_bool_t libvlc_audio_get_mute( libvlc_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_audio_get_mute( libvlc_instance_t *, libvlc_exception_t * );
 
 /**
  * Set mute status
@@ -995,7 +995,7 @@ VLC_PUBLIC_API vlc_bool_t libvlc_audio_get_mute( libvlc_instance_t *, libvlc_exc
  * \param p_exception an initialized exception
  * \return void
  */
-VLC_PUBLIC_API void libvlc_audio_set_mute( libvlc_instance_t *, vlc_bool_t , libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_audio_set_mute( libvlc_instance_t *, int , libvlc_exception_t * );
 
 /**
  * Get current audio level
@@ -1076,7 +1076,7 @@ VLC_PUBLIC_API libvlc_media_list_t * libvlc_media_discoverer_media_list( libvlc_
 VLC_PUBLIC_API libvlc_event_manager_t *
         libvlc_media_discoverer_event_manager( libvlc_media_discoverer_t * p_mdis );
 
-VLC_PUBLIC_API vlc_bool_t
+VLC_PUBLIC_API int
         libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis );
 
 /**@} */

diff --git a/src/control/audio.c b/src/control/audio.c
index d6be7a64f6f5000a1ddd948b9bbcc8658b502fc3..3744d784309c410fd42baf31267ece75c761d14f 100644 (file)
--- a/src/control/audio.c
+++ b/src/control/audio.c
@@ -60,8 +60,8 @@ void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance,
     aout_VolumeMute( p_instance->p_libvlc_int, NULL );
 }
 
-vlc_bool_t libvlc_audio_get_mute( libvlc_instance_t *p_instance,
-                                  libvlc_exception_t *p_e )
+int libvlc_audio_get_mute( libvlc_instance_t *p_instance,
+                           libvlc_exception_t *p_e )
 {
     /*
      * If the volume level is 0, then the channel is muted
@@ -74,7 +74,7 @@ vlc_bool_t libvlc_audio_get_mute( libvlc_instance_t *p_instance,
     return VLC_FALSE;
 }
 
-void libvlc_audio_set_mute( libvlc_instance_t *p_instance, vlc_bool_t mute,
+void libvlc_audio_set_mute( libvlc_instance_t *p_instance, int mute,
                             libvlc_exception_t *p_e )
 {
     if ( mute ^ libvlc_audio_get_mute( p_instance, p_e ) )

diff --git a/src/control/media_descriptor.c b/src/control/media_descriptor.c
index 3dee389c46815d8ad07752ef46658e6f56b0e39f..3ba789bff032ebebe204ec2307595d4101234414 100644 (file)
--- a/src/control/media_descriptor.c
+++ b/src/control/media_descriptor.c
@@ -655,7 +655,7 @@ libvlc_media_descriptor_get_duration( libvlc_media_descriptor_t * p_md,
 /**************************************************************************
  * Get preparsed status for media_descriptor object.
  **************************************************************************/
-vlc_bool_t
+int
 libvlc_media_descriptor_is_preparsed( libvlc_media_descriptor_t * p_md,
                                        libvlc_exception_t * p_e )
 {

diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c
index 527626bac3d207f2338a47f07c9d4462b39b1437..0a1d1a28c02642b4e37e6f5bb4dbed198c3830b9 100644 (file)
--- a/src/control/media_discoverer.c
+++ b/src/control/media_discoverer.c
@@ -264,7 +264,7 @@ libvlc_media_discoverer_event_manager( libvlc_media_discoverer_t * p_mdis )
 /**************************************************************************
  * running (Public)
  **************************************************************************/
-vlc_bool_t
+int
 libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis )
 {
     return p_mdis->running;

diff --git a/src/control/media_instance.c b/src/control/media_instance.c
index e7dc33d3aa09b231b8df190713f4124daa266684..c11d733d4744f55a2a895706840c975e7d60c11d 100644 (file)
--- a/src/control/media_instance.c
+++ b/src/control/media_instance.c
@@ -836,9 +836,8 @@ float libvlc_media_instance_get_fps(
     return f_fps;
 }
 
-vlc_bool_t libvlc_media_instance_will_play(
-                                 libvlc_media_instance_t *p_mi,
-                                 libvlc_exception_t *p_e)
+int libvlc_media_instance_will_play( libvlc_media_instance_t *p_mi,
+                                     libvlc_exception_t *p_e)
 {
     input_thread_t *p_input_thread =
                             libvlc_get_input_thread ( p_mi, p_e);
@@ -914,9 +913,8 @@ libvlc_state_t libvlc_media_instance_get_state(
     return vlc_to_libvlc_state(val.i_int);
 }
 
-vlc_bool_t libvlc_media_instance_is_seekable(
-                                 libvlc_media_instance_t *p_mi,
-                                 libvlc_exception_t *p_e )
+int libvlc_media_instance_is_seekable( libvlc_media_instance_t *p_mi,
+                                       libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread;
     vlc_value_t val;
@@ -935,9 +933,8 @@ vlc_bool_t libvlc_media_instance_is_seekable(
     return val.b_bool;
 }
 
-vlc_bool_t libvlc_media_instance_can_pause(
-                                 libvlc_media_instance_t *p_mi,
-                                 libvlc_exception_t *p_e )
+int libvlc_media_instance_can_pause( libvlc_media_instance_t *p_mi,
+                                     libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread;
     vlc_value_t val;

diff --git a/src/control/media_list.c b/src/control/media_list.c
index ae5a72aa108689d2f3263a497bd02d7e892341ee..a88ed8c4794605d5f70ffb96552c24d08dd51249 100644 (file)
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -456,7 +456,7 @@ int libvlc_media_list_index_of_item( libvlc_media_list_t * p_mlist,
  *
  * This indicates if this media list is read-only from a user point of view
  **************************************************************************/
-vlc_bool_t libvlc_media_list_is_readonly( libvlc_media_list_t * p_mlist )
+int libvlc_media_list_is_readonly( libvlc_media_list_t * p_mlist )
 {
     return p_mlist->b_read_only;
 }

diff --git a/src/control/media_list_player.c b/src/control/media_list_player.c
index 1d1167a686f22ceb7997b86e3b21e6e41ceaf51a..75b467b2cd4ec2c771e8d5045c34e8fe399857d0 100644 (file)
--- a/src/control/media_list_player.c
+++ b/src/control/media_list_player.c
@@ -342,7 +342,7 @@ void libvlc_media_list_player_pause( libvlc_media_list_player_t * p_mlp,
 /**************************************************************************
  *        is_playing (Public)
  **************************************************************************/
-vlc_bool_t
+int
 libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp,
                                      libvlc_exception_t * p_e )
 {

diff --git a/src/control/playlist.c b/src/control/playlist.c
index 7ab506372bc89f64c1534bfeb8a5f2c85a5f2973..74af3f50edf9055741677d7ba369f87545ee004c 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -49,7 +49,7 @@ static inline void playlist_mark_locked( libvlc_instance_t *p_instance,
     vlc_mutex_unlock( &p_instance->instance_lock );
 }
 
-void libvlc_playlist_loop( libvlc_instance_t *p_instance, vlc_bool_t loop,
+void libvlc_playlist_loop( libvlc_instance_t *p_instance, int loop,
                            libvlc_exception_t *p_e)
 {
     VLC_UNUSED(p_e);

diff --git a/src/control/tag_query.c b/src/control/tag_query.c
index 5b495398b0704ac73063abf0c26995bd824bbb3e..d1497bc6ada41ce19f50604280931a2b7ef383d6 100644 (file)
--- a/src/control/tag_query.c
+++ b/src/control/tag_query.c
@@ -109,7 +109,7 @@ void libvlc_tag_query_set_match_tag_and_key( libvlc_tag_query_t * p_q,
  *
  * Return true if the query p_q is matched in p_md
  **************************************************************************/
-vlc_bool_t
+int
 libvlc_tag_query_match( libvlc_tag_query_t * p_q,
                         libvlc_media_descriptor_t * p_md,
                         libvlc_exception_t * p_e )

diff --git a/src/control/video.c b/src/control/video.c
index 4ba2d3d0325f802d7f946cc441d8118e0c733056..4ebb4e6a363e4c876ed4f2a6f654eb2d0f415729 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -186,8 +186,8 @@ int libvlc_video_get_width( libvlc_media_instance_t *p_mi,
     return p_vout1->i_window_width;
 }
 
-vlc_bool_t libvlc_media_instance_has_vout( libvlc_media_instance_t *p_mi,
-                                  libvlc_exception_t *p_e )
+int libvlc_media_instance_has_vout( libvlc_media_instance_t *p_mi,
+                                     libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi, p_e);
     vlc_bool_t has_vout = VLC_FALSE;