* ALL: the first libvlc commit.

[vlc] / plugins / win32 / preferences.cpp

diff --git a/plugins/win32/preferences.cpp b/plugins/win32/preferences.cpp
index aecdf5f60d924ba182d9bcc85620aa9696101a30..f7d9afbf0c1cddb111110f721b27b9943d68356d 100644 (file)
--- a/plugins/win32/preferences.cpp
+++ b/plugins/win32/preferences.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************\r
- * preferences.h: the "Preferences" dialog box\r
+ * preferences.cpp: the "Preferences" dialog box\r
  *****************************************************************************\r
  * Copyright (C) 2002 VideoLAN\r
  *\r
@@ -26,9 +26,8 @@
 #include <stdlib.h>                                      /* malloc(), free() */\r
 #include <string.h>                                                /* strcmp */\r
 \r
-#include <videolan/vlc.h>\r
-\r
-#include "interface.h"\r
+#include <vlc/vlc.h>\r
+#include <vlc/intf.h>\r
 \r
 #include "preferences.h"\r
 #include "win32_common.h"\r
@@ -38,7 +37,7 @@
 #pragma link "CSPIN"\r
 #pragma resource "*.dfm"\r
 \r
-extern struct intf_thread_s *p_intfGlobal;\r
+extern intf_thread_t *p_intfGlobal;\r
 \r
 \r
 /****************************************************************************\r
@@ -191,7 +190,7 @@ void __fastcall TGroupBoxPlugin::ListViewSelectItem( TObject *Sender,
     if( Name != "" )\r
     {\r
         /* look for module 'Name' */\r
-        for( p_module = p_module_bank->first ;\r
+        for( p_module = p_intfGlobal->p_vlc->module_bank.first ;\r
              p_module != NULL ;\r
              p_module = p_module->next )\r
         {\r
@@ -273,6 +272,10 @@ __fastcall TGroupBoxInteger::TGroupBoxInteger( TComponent* Owner,
     SpinEdit = CreateSpinEdit( this, 16, 164, 24, 21,\r
                                -1, 100000, p_config->i_value );\r
 \r
+    /* init updown */\r
+    UpDown = CreateUpDown( this, -1, 32767, p_config->i_value, false );\r
+    UpDown->Associate = Edit;\r
+\r
     /* vertical alignment */\r
     Height = LabelDesc->Height + 24;\r
     LabelDesc->Top = Top + ( Height - LabelDesc->Height ) / 2 + 4;\r
@@ -374,7 +377,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
     TListItem          *ListItem;\r
 \r
     /* Look for the selected module */\r
-    for( p_module = p_module_bank->first ; p_module != NULL ;\r
+    for( p_module = p_intfGlobal->p_vlc->module_bank.first ; p_module != NULL ;\r
          p_module = p_module->next )\r
     {\r
         if( psz_module_name && !strcmp( psz_module_name, p_module->psz_name ) )\r
@@ -420,7 +423,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
             ADD_PANEL;\r
 \r
             /* build a list of available plugins */\r
-            for( p_module_plugins = p_module_bank->first ;\r
+            for( p_module_plugins = p_intfGlobal->p_vlc->module_bank.first ;\r
                  p_module_plugins != NULL ;\r
                  p_module_plugins = p_module_plugins->next )\r
             {\r
@@ -526,7 +529,7 @@ void __fastcall TPreferencesDlg::ButtonApplyClick( TObject *Sender )
 void __fastcall TPreferencesDlg::ButtonSaveClick( TObject *Sender )\r
 {\r
     ButtonApplyClick( Sender );\r
-    config_SaveConfigFile( NULL );\r
+    config_SaveConfigFile( p_intfGlobal->p_this, NULL );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TPreferencesDlg::ButtonCancelClick( TObject *Sender )\r
@@ -541,12 +544,13 @@ void __fastcall TPreferencesDlg::SaveValue( module_config_t *p_config )
         case MODULE_CONFIG_ITEM_STRING:\r
         case MODULE_CONFIG_ITEM_FILE:\r
         case MODULE_CONFIG_ITEM_MODULE:\r
-            config_PutPszVariable( p_config->psz_name,\r
-                        *p_config->psz_value ? p_config->psz_value : NULL );\r
+            config_PutPsz( p_intfGlobal, p_config->psz_name,\r
+                           *p_config->psz_value ? p_config->psz_value : NULL );\r
             break;\r
         case MODULE_CONFIG_ITEM_INTEGER:\r
         case MODULE_CONFIG_ITEM_BOOL:\r
-            config_PutIntVariable( p_config->psz_name, p_config->i_value );\r
+            config_PutInt( p_intfGlobal, p_config->psz_name,\r
+                           p_config->i_value );\r
             break;\r
     }\r
 }\r