Renamed playlist "playlist-current" to "item-current".

[vlc] / modules / gui / beos / InterfaceWindow.cpp

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 555c6444adfd0f0ef64b1c6fc8ceb2f81d9cd24a..cddbc546bb2dc097fb73449571248d2764f13f29 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -41,7 +41,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>
 
@@ -203,14 +203,13 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame,
       fLastUpdateTime( system_time() ),
       fSettings( new BMessage( 'sett' ) )
 {
-    p_playlist = (playlist_t *)
-        vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+    p_playlist = pl_Hold( p_intf );
 
     var_AddCallback( p_playlist, "intf-change", PlaylistChanged, this );
     var_AddCallback( p_playlist, "item-change", PlaylistChanged, this );
     var_AddCallback( p_playlist, "item-append", PlaylistChanged, this );
     var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, this );
-    var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, this );
+    var_AddCallback( p_playlist, "item-current", PlaylistChanged, this );
 
     char psz_tmp[1024];
 #define ADD_ELLIPSIS( a ) \
@@ -1113,7 +1112,6 @@ InterfaceWindow::_StoreSettings()
 {
     /* Save the volume */
     config_PutInt( p_intf, "volume", p_mediaControl->GetVolume() );
-    config_SaveConfigFile( p_intf, "main" );
 
     /* Save the windows positions */
     if ( fSettings->ReplaceRect( "main frame", Frame() ) != B_OK )