- menus disabled by default

- cosmetic changes

diff --git a/modules/gui/win32/disc.cpp b/modules/gui/win32/disc.cpp
index 6726f92df5fb57ae5e514cd65099c144748a1a7c..1aee5912b0cfb95f3dddacec5d1692a8fc2e0c11 100644 (file)
--- a/modules/gui/win32/disc.cpp
+++ b/modules/gui/win32/disc.cpp
@@ -62,22 +62,12 @@ void __fastcall TDiscDlg::ButtonCancelClick( TObject *Sender )
 //---------------------------------------------------------------------------\r
 void __fastcall TDiscDlg::ButtonOkClick( TObject *Sender )\r
 {\r
-    AnsiString  Device, Source, Method, Title, Chapter;\r
+    AnsiString  Device, Source;\r
 \r
     Hide();\r
 \r
     Device = EditDevice->Text;\r
 \r
-    /* Check which method was activated */\r
-    if( RadioGroupType->ItemIndex == 0 )\r
-        Method = "dvdold";\r
-    else\r
-        Method = "vcd";\r
-\r
-    /* Select title and chapter */\r
-    Title.sprintf( "%d", SpinEditTitle->Value );\r
-    Chapter.sprintf( "%d", SpinEditChapter->Value );\r
-\r
     /* Build source name and add it to playlist */\r
     if ( CheckBoxMenus->Checked && RadioGroupType->ItemIndex == 0 )\r
     {\r
@@ -85,8 +75,21 @@ void __fastcall TDiscDlg::ButtonOkClick( TObject *Sender )
     }\r
     else\r
     {\r
+        AnsiString Method, Title, Chapter;\r
+        /* Select title and chapter */\r
+        Title.sprintf( "%d", SpinEditTitle->Value );\r
+        Chapter.sprintf( "%d", SpinEditChapter->Value );\r
+\r
+        /* Select access method */\r
+        if( RadioGroupType->ItemIndex == 0 )\r
+            Method = "dvdold";\r
+        else\r
+            Method = "vcd";\r
+\r
+        /* build the MRL */\r
         Source = Method + "://" + Device + "@" + Title + "," + Chapter;\r
     }\r
+    msg_Dbg (p_intf , Source.c_str());\r
 \r
     p_intf->p_sys->p_playwin->Add( Source, PLAYLIST_APPEND\r
             | ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 ),\r

diff --git a/modules/gui/win32/disc.dfm b/modules/gui/win32/disc.dfm
index d8a622b9360804b804134553fae7ac004563dc61..2fce0408f5bc98e210a722a7f864fcb84d5ebed5 100644 (file)
--- a/modules/gui/win32/disc.dfm
+++ b/modules/gui/win32/disc.dfm
@@ -47,7 +47,6 @@ object DiscDlg: TDiscDlg
       Width = 23\r
       Height = 13\r
       Caption = '&Title:'\r
-      Enabled = False\r
     end\r
     object LabelChapter: TLabel\r
       Tag = 3\r
@@ -56,7 +55,6 @@ object DiscDlg: TDiscDlg
       Width = 40\r
       Height = 13\r
       Caption = '&Chapter:'\r
-      Enabled = False\r
     end\r
     object SpinEditTitle: TCSpinEdit\r
       Left = 56\r
@@ -64,8 +62,6 @@ object DiscDlg: TDiscDlg
       Width = 73\r
       Height = 22\r
       TabStop = True\r
-      Color = clBtnFace\r
-      Enabled = False\r
       Font.Charset = DEFAULT_CHARSET\r
       Font.Color = clWindowText\r
       Font.Height = -11\r
@@ -84,8 +80,6 @@ object DiscDlg: TDiscDlg
       Width = 73\r
       Height = 22\r
       TabStop = True\r
-      Color = clBtnFace\r
-      Enabled = False\r
       MaxValue = 65535\r
       MinValue = 1\r
       ParentColor = False\r
@@ -98,8 +92,6 @@ object DiscDlg: TDiscDlg
       Width = 97\r
       Height = 17\r
       Caption = '&Menus'\r
-      Checked = True\r
-      State = cbChecked\r
       TabOrder = 0\r
       OnClick = CheckBoxMenusClick\r
     end\r