no time to fix the playlist save&restore issue before the release (and

wouldn't be wise anyway), so deactivated it in the win32 interface.

diff --git a/modules/gui/win32/playlist.cpp b/modules/gui/win32/playlist.cpp
index 204df11af63565ea1a8b332e0416a9c91099fbff..dc2d710338897268f45d9361ad8a36f523ef71bc 100644 (file)
--- a/modules/gui/win32/playlist.cpp
+++ b/modules/gui/win32/playlist.cpp
@@ -428,7 +428,7 @@ void __fastcall TPlaylistDlg::MenuFileOpenClick(TObject *Sender)
 {\r
     if ( PlaylistOpenDlg->Execute() )\r
     {\r
-        playlist_LoadFile ( p_playlist , PlaylistOpenDlg->FileName.c_str() );\r
+//        playlist_LoadFile ( p_playlist , PlaylistOpenDlg->FileName.c_str() );\r
         UpdateGrid();\r
     }\r
 }\r
@@ -438,7 +438,7 @@ void __fastcall TPlaylistDlg::MenuFileSaveClick(TObject *Sender)
 {\r
     if ( PlaylistSaveDlg->Execute() )\r
     {\r
-        playlist_SaveFile ( p_playlist , PlaylistSaveDlg->FileName.c_str() );\r
+//        playlist_SaveFile ( p_playlist , PlaylistSaveDlg->FileName.c_str() );\r
     }\r
 }\r
 //---------------------------------------------------------------------------\r

diff --git a/modules/gui/win32/playlist.dfm b/modules/gui/win32/playlist.dfm
index 0a13c11f3baa67743c6f4e33f1e4481b3854b0ae..d9a01d799debb381dcbbacfd9a51331c4e20c0ee 100644 (file)
--- a/modules/gui/win32/playlist.dfm
+++ b/modules/gui/win32/playlist.dfm
@@ -59,24 +59,6 @@ object PlaylistDlg: TPlaylistDlg
   object MainMenuPlaylist: TMainMenu\r
     Left = 8\r
     Top = 8\r
-    object MenuFile: TMenuItem\r
-      Caption = '&File'\r
-      object MenuFileOpen: TMenuItem\r
-        Caption = '&Open...'\r
-        OnClick = MenuFileOpenClick\r
-      end\r
-      object MenuFileSave: TMenuItem\r
-        Caption = '&Save...'\r
-        OnClick = MenuFileSaveClick\r
-      end\r
-      object N3: TMenuItem\r
-        Caption = '-'\r
-      end\r
-      object MenuFileClose: TMenuItem\r
-        Caption = '&Close'\r
-        OnClick = MenuFileCloseClick\r
-      end\r
-    end\r
     object MenuAdd: TMenuItem\r
       Tag = 3\r
       Caption = '&Add'\r

diff --git a/modules/gui/win32/playlist.h b/modules/gui/win32/playlist.h
index 3a859fc98bd76511ae7fbf41b317327c6d02e3b3..0de786b816dd181f195c59bed22d1261840e14f1 100644 (file)
--- a/modules/gui/win32/playlist.h
+++ b/modules/gui/win32/playlist.h
@@ -73,11 +73,6 @@ __published: // IDE-managed Components
     TAction *DeleteSelectionAction;\r
     TAction *DeleteAllAction;\r
     TAction *PlayStreamAction;\r
-    TMenuItem *MenuFile;\r
-    TMenuItem *MenuFileOpen;\r
-    TMenuItem *MenuFileSave;\r
-   TMenuItem *N3;\r
-    TMenuItem *MenuFileClose;\r
     TOpenDialog *PlaylistOpenDlg;\r
     TSaveDialog *PlaylistSaveDlg;\r
     void __fastcall FormShow( TObject *Sender );\r