Changeset ad14a89d0fbcca30225e6d33c6f40c35e7eb45e4

Timestamp:

03/04/02 01:22:32 (7 years ago)

Author:

Olivier Teulière <ipkiss@videolan.org>

git-committer:

Olivier Teulière <ipkiss@videolan.org> 1017789752 +0000

git-parent:

[75824aafc4f8fec873f148769a1fac53c6761a1f]

git-author:

Olivier Teulière <ipkiss@videolan.org> 1017789752 +0000

Message:

• ./include/config.h: fixed config directory name for windows
  
• ./plugins/win32: the network dialog now respects the preferences settings
  

Files:

• include/config.h (modified) (1 diff)
• plugins/win32/network.cpp (modified) (1 diff)
• plugins/win32/network.dfm (modified) (4 diffs)

include/config.h

@@ -50 +50 @@
-/* The configuration file and directory */
-#ifdef SYS_BEOS
-
+
+
+
-#else
-define CONFIG_DIR  
+  define CONFIG_DIR
-#endif
-#define CONFIG_FILE                     "vlcrc"

plugins/win32/network.cpp

@@ -47 +47 @@
-        : TForm( Owner )
-{
+        char *psz_channel_server;
+
+        /* server port */
+        UpDownPort->Position = config_GetIntVariable( "server_port" );
+
+        /* channel server */
+        if( config_GetIntVariable( "network_channel" ) )
+        {
+            CheckBoxChannel->Checked = true;
+        }
+
+        psz_channel_server = config_GetPszVariable( "channel_server" );
+        if( psz_channel_server )
+        {
+            ComboBoxChannel->Text = psz_channel_server;
+            free( psz_channel_server );
+        }
+
+        UpDownPortCS->Position = config_GetIntVariable( "channel_port" );
-}
-//---------------------------------------------------------------------------

plugins/win32/network.dfm

@@ -1 +1 @@
-object NetworkDlg: TNetworkDlg
-368
-66
+419
+81
-  BorderStyle = bsDialog
-  Caption = 'Open network'
@@ -307 +307 @@
-      TabOrder = 2
-      Text = '138.195.131.10'
+      Items.Strings = (
+        '138.195.131.10')
-    end
-    object ComboBoxBroadcast: TComboBox
@@ -317 +319 @@
-      TabOrder = 3
-      Text = '138.195.143.255'
+      Items.Strings = (
+        '138.195.143.255')
-    end
-    object UpDownPort: TUpDown
@@ -365 +369 @@
-      TabOrder = 1
-      Text = '138.195.156.232'
+      Items.Strings = (
+        '138.195.156.232')
-    end
-    object EditPortCS: TEdit