playlist: use playlist audio functions

[vlc] / src / playlist / engine.c

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 8ba33837d26daf5041059b09cc2b1ed2db90c05b..63c22f1cf94ea2f5cfbe5c0d782ddcd0a3b991be 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -323,7 +323,6 @@ void playlist_Destroy( playlist_t *p_playlist )
 
     /* Already cleared when deactivating (if activated anyway) */
     assert( !p_sys->p_input );
-    assert( !p_sys->p_input_resource );
 
     vlc_cond_destroy( &p_sys->signal );
     vlc_mutex_destroy( &p_sys->lock );
@@ -410,12 +409,6 @@ void set_current_status_node( playlist_t * p_playlist,
     pl_priv(p_playlist)->status.p_node = p_node;
 }
 
-static input_thread_t *playlist_FindInput( vlc_object_t *object )
-{
-    assert( object == VLC_OBJECT(pl_Get(object)) );
-    return playlist_CurrentInput( (playlist_t *)object );
-}
-
 static void VariablesInit( playlist_t *p_playlist )
 {
     /* These variables control updates */
@@ -468,9 +461,6 @@ static void VariablesInit( playlist_t *p_playlist )
     var_Create( p_playlist, "mute", VLC_VAR_BOOL );
     var_Create( p_playlist, "volume", VLC_VAR_FLOAT );
     var_SetFloat( p_playlist, "volume", -1.f );
-    /* FIXME: horrible hack for audio output interface code */
-    var_Create( p_playlist, "find-input-callback", VLC_VAR_ADDRESS );
-    var_SetAddress( p_playlist, "find-input-callback", playlist_FindInput );
 }
 
 playlist_item_t * playlist_CurrentPlayingItem( playlist_t * p_playlist )