Changeset b60815ca26a806295facb9d47bc0657ed39eb9b2

Timestamp:

06/03/02 00:32:46 (6 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1023057166 +0000

git-parent:

[5cfee5890e9e555105e4dcaae36980ef87943aac]

git-author:

Christophe Massiot <massiot@videolan.org> 1023057166 +0000

Message:

• ./plugins/macosx: rewrote the net panel for OS X
  

Files:

• ChangeLog (modified) (1 diff)
• extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• plugins/macosx/intf_controller.m (modified) (3 diffs)
• plugins/macosx/intf_open.h (modified) (3 diffs)
• plugins/macosx/intf_open.m (modified) (3 diffs)
• plugins/macosx/intf_vlc_wrapper.h (modified) (2 diffs)
• plugins/macosx/intf_vlc_wrapper.m (modified) (5 diffs)

ChangeLog

@@ -37 +37 @@
-Not released yet
-
+  * ./plugins/macosx: rewrote the net panel for OS X
-  * ./plugins/spudec/spu_decoder.c: fixed a margin bug in the SPU renderer
-    which caused subtitles to appear slanted in odd width windows.

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -42 +42 @@
-                openFile = id; 
-                openNet = id; 
-
-
+
-                panelCancel = id; 
-                panelOk = id; 
@@ -55 +54 @@
-                o_disc_title = id; 
-                o_disc_type = id; 
-                o_net_channel_addr = id; 
-                o_net_channel_checkbox = id; 
-                o_net_channel_port = id; 
-                o_net_channel_port_label = id; 
-                o_net_channel_pstepper = id; 
-                o_net_panel = id; 
-                o_net_protocol = id; 
-                o_net_server_addr = id; 
-                o_net_server_addr_label = id; 
-                o_net_server_baddr = id; 
-                o_net_server_bcheckbox = id; 
-                o_net_server_port = id; 
-                o_net_server_port_label = id; 

plugins/macosx/intf_controller.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-7 2002/06/02 12:16:31
+8 2002/06/02 22:31:52
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -249 +249 @@
-{
-    NSMenuItem * o_item = (NSMenuItem *)sender;
-
-
+
+
+
-    {
-        if( !config_GetIntVariable( "network-channel" ) )
@@ -256 +257 @@
-            return NO;
-        }
+        if ( tag == 12 && !p_main->p_intf->p_sys->i_channel )
+        {
+            return NO;
+        }
-    }
-        

plugins/macosx/intf_open.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-2 2002/05/06 22:59:46
+3 2002/06/02 22:31:52
- *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
@@ -42 +42 @@
-    IBOutlet id o_net_panel;
-    IBOutlet id o_net_protocol;
-    IBOutlet id o_net_channel_addr;
-    IBOutlet id o_net_channel_checkbox;
-    IBOutlet id o_net_channel_port;
-    IBOutlet id o_net_channel_port_label;
-    IBOutlet id o_net_channel_pstepper;
-    IBOutlet id o_net_server_addr;
-    IBOutlet id o_net_server_addr_label;
-    IBOutlet id o_net_server_baddr;
-    IBOutlet id o_net_server_bcheckbox;
-    IBOutlet id o_net_server_port;
-    IBOutlet id o_net_server_port_label;
@@ -66 +59 @@
-
-- (IBAction)openNet:(id)sender;
-
-
+
-
-- (IBAction)panelCancel:(id)sender;

plugins/macosx/intf_open.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-3 2002/05/23 22:18:55 jlj
+4 2002/06/02 22:31:52 massiot
- *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
@@ -140 +140 @@
-- (void)awakeFromNib
-{
-
-
-
-
-
-
+
+
+
-    [o_net_server_port setIntValue: 1234];
+    [o_net_server_pstepper setEnabled: NSOnState];
-    [o_net_server_pstepper setIntValue: [o_net_server_port intValue]];
-
-    [o_net_channel_addr setStringValue: @"vlcs"];
-    [o_net_channel_port setIntValue: 6010];
-    [o_net_channel_pstepper setIntValue: [o_net_channel_port intValue]];
-}
-
@@ -243 +237 @@
-    if( i_result )
-    {
-        BOOL b_channel;
-        BOOL b_broadcast;
-        NSString *o_protocol;
+        int i_port = [o_net_server_port intValue];
+        NSString *o_addr = [o_net_server_addr stringValue];
-
-        o_protocol = [[o_net_protocol selectedCell] title];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

plugins/macosx/intf_vlc_wrapper.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-0 2002/06/02 12:16:31
+1 2002/06/02 22:31:52
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -73 +73 @@
-- (void)openFiles:(NSArray*)o_files;
-- (void)openDisc:(NSString*)o_type device:(NSString*)o_device title:(int)i_title chapter:(int)i_chapter;
-protocol addr:(NSString*)o_addr port:(int)i_port baddr:(NSString*)o_baddr
+addr port:(int)i_port
-- (void)openNetChannel:(NSString*)o_addr port:(int)i_port;
+- (void)openNetHTTP:(NSString*)o_addr;
-
-/* menus management */

plugins/macosx/intf_vlc_wrapper.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2002/06/02 12:16:31
+2 2002/06/02 22:31:52
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -579 +579 @@
-}
-
-protocol addr:(NSString*)o_addr port:(int)i_port baddr:(NSString*)o_baddr
+addr port:(int)i_port
-{
-    NSString *o_source;
@@ -590 +590 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    if ( p_intf->p_sys->b_loop )
@@ -628 +620 @@
-    }
-
-_
+-
-
-    if( p_main->p_channel == NULL )
@@ -635 +627 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-