[vlc-commits] libvlc: stub device_type functions

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec 15 17:40:53 2012 +0200| [605d95f95c088a3dc929b363d56716c854ffdf18] | committer: Rémi Denis-Courmont

libvlc: stub device_type functions

They stopped working in version 2.0 and never made much sense.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=605d95f95c088a3dc929b363d56716c854ffdf18
---

 include/vlc/libvlc_media_player.h |   19 +++++++------------
 lib/audio.c                       |   21 ++-------------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 497db9a..53e9f9c 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1487,23 +1487,18 @@ LIBVLC_API void libvlc_audio_output_device_set( libvlc_media_player_t *p_mi,
                                                 const char *psz_device_id );
 
 /**
- * Get current audio device type. Device type describes something like
- * character of output sound - stereo sound, 2.1, 5.1 etc
- *
- * \param p_mi media player
- * \return the audio devices type \see libvlc_audio_output_device_types_t
+ * Stub for backward compatibility.
+ * \return always -1.
  */
+LIBVLC_DEPRECATED
 LIBVLC_API int libvlc_audio_output_get_device_type( libvlc_media_player_t *p_mi );
 
 /**
- * Set current audio device type.
- *
- * \param p_mi vlc instance
- * \param device_type the audio device type,
-          according to \see libvlc_audio_output_device_types_t
+ * Stub for backward compatibility.
  */
-LIBVLC_API void libvlc_audio_output_set_device_type( libvlc_media_player_t *p_mi,
-                                                         int device_type );
+LIBVLC_DEPRECATED
+LIBVLC_API void libvlc_audio_output_set_device_type( libvlc_media_player_t *,
+                                                     int );
 
 
 /**
diff --git a/lib/audio.c b/lib/audio.c
index 799bdc8..5513772 100644
--- a/lib/audio.c
+++ b/lib/audio.c
@@ -217,33 +217,16 @@ void libvlc_audio_output_device_set( libvlc_media_player_t *mp,
     free( psz_config_name );
 }
 
-/*****************************************************************************
- * libvlc_audio_output_get_device_type : Get the current audio device type
- *****************************************************************************/
 int libvlc_audio_output_get_device_type( libvlc_media_player_t *mp )
 {
-    audio_output_t *p_aout = GetAOut( mp );
-    if( p_aout )
-    {
-        int i_device_type = var_GetInteger( p_aout, "audio-device" );
-        vlc_object_release( p_aout );
-        return i_device_type;
-    }
+    (void) mp;
     return libvlc_AudioOutputDevice_Error;
 }
 
-/*****************************************************************************
- * libvlc_audio_output_set_device_type : Set the audio device type
- *****************************************************************************/
 void libvlc_audio_output_set_device_type( libvlc_media_player_t *mp,
                                           int device_type )
 {
-    audio_output_t *p_aout = GetAOut( mp );
-    if( !p_aout )
-        return;
-    if( var_SetInteger( p_aout, "audio-device", device_type ) < 0 )
-        libvlc_printerr( "Error setting audio device" );
-    vlc_object_release( p_aout );
+    (void) mp; (void) device_type;
 }
 
 void libvlc_audio_toggle_mute( libvlc_media_player_t *mp )