Changeset 9b21679c04e34024ed9e83c7f40670f715d8d471

Timestamp:

02/06/02 14:16:31 (6 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

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

git-parent:

[b73f6722b19f7e553f7516d7533eeed6074b6ea3]

git-author:

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

Message:

* New Loop menu item in OS X interface.

Files:

• extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• plugins/macosx/intf_controller.h (modified) (4 diffs)
• plugins/macosx/intf_controller.m (modified) (3 diffs)
• plugins/macosx/intf_macosx.m (modified) (2 diffs)
• plugins/macosx/intf_vlc_wrapper.h (modified) (2 diffs)
• plugins/macosx/intf_vlc_wrapper.m (modified) (10 diffs)
• plugins/macosx/macosx.h (modified) (2 diffs)

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

@@ -7 +7 @@
-                faster = id; 
-                fullscreen = id; 
+                loop = id; 
-                maxvolume = id; 
-                mute = id; 

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

@@ -20 +20 @@
-    <key>IBOpenObjects</key>
-    <array>
+        <integer>528</integer>
-        <integer>29</integer>
-        <integer>528</integer>
-        <integer>21</integer>
-    </array>
-    <key>IBSystem Version</key>

plugins/macosx/intf_controller.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-9 2002/06/02 01:20:52
+10 2002/06/02 12:16:31
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -69 +69 @@
-- (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename;
-
-e
+a
-- (IBAction)pause:(id)sender;
-- (IBAction)play:(id)sender;
@@ -79 +79 @@
-- (IBAction)prevChannel:(id)sender;
-- (IBAction)nextChannel:(id)sender;
+- (IBAction)loop:(id)sender;
-- (IBAction)mute:(id)sender;
-- (IBAction)fullscreen:(id)fullscreen;
@@ -86 +87 @@
-- (IBAction)quit:(id)sender;
-
+- (BOOL)validateMenuItem:(id)sender;
+
-@end

plugins/macosx/intf_controller.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-6 2002/06/02 01:20:52
+7 2002/06/02 12:16:31
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -176 +176 @@
-}
-
+- (IBAction)loop:(id)sender
+{
+    NSMenuItem * item = (NSMenuItem *)sender;
+
+    [o_intf loop];
+
+    if( p_main->p_intf->p_sys->b_loop )
+    {
+        [item setState:NSOnState];
+    }
+    else
+    {
+        [item setState:NSOffState];
+    }
+}
+
-- (IBAction)mute:(id)sender
-{
@@ -230 +246 @@
-}
-
+- (BOOL)validateMenuItem:(id)sender
+{
+    NSMenuItem * o_item = (NSMenuItem *)sender;
+
+    if ( [o_item tag] == 12 || [o_item tag] == 13 )
+    {
+        if( !config_GetIntVariable( "network-channel" ) )
+        {
+            return NO;
+        }
+    }
+        
+    return YES;
+}
+
-@end
-

plugins/macosx/intf_macosx.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-3 2002/06/02 01:20:52
+4 2002/06/02 12:16:31
- *
- * Authors: Colin Delacroix <colin@zoy.org>
@@ -70 +70 @@
-    p_intf->p_sys->i_part = 0;
-    p_intf->p_sys->b_disabled_menus = 0; 
+    p_intf->p_sys->b_loop = 0; 
-    p_intf->p_sys->>i_channel = 0; 
-

plugins/macosx/intf_vlc_wrapper.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-9 2002/06/02 01:20:52
+10 2002/06/02 12:16:31
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -45 +45 @@
-- (void)channelNext;
-- (void)channelPrev;
+- (void)loop;
-
-- (void)playSlower;

plugins/macosx/intf_vlc_wrapper.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-0 2002/06/02 01:20:52
+1 2002/06/02 12:16:31
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -276 +276 @@
-}
-
+- (void)loop
+{
+    intf_thread_t * p_intf = p_main->p_intf;
+
+    if ( p_intf->p_sys->b_loop )
+    {
+        intf_PlaylistDelete( p_main->p_playlist,
+                             p_main->p_playlist->i_size - 1 );
+    }
+    else
+    {
+        intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, 
+                          "vlc:loop" );
+    }
+    p_intf->p_sys->b_loop = !p_intf->p_sys->b_loop;
+}
+
-- (void)playSlower
-{
@@ -500 +517 @@
-    int i_end = p_main->p_playlist->i_size;
-    NSEnumerator *o_enum = [o_files objectEnumerator];
+    intf_thread_t * p_intf = p_main->p_intf;
+
+    if ( p_intf->p_sys->b_loop )
+    {
+        intf_PlaylistDelete( p_main->p_playlist,
+                             p_main->p_playlist->i_size - 1 );
+    }
-
-    while( ( o_file = (NSString *)[o_enum nextObject] ) )
@@ -514 +538 @@
-
-    intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 );
+
+    if ( p_intf->p_sys->b_loop )
+    {
+        intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, 
+                          "vlc:loop" );
+    }
-}
-
@@ -520 +550 @@
-    NSString *o_source;
-    int i_end = p_main->p_playlist->i_size;
+    intf_thread_t * p_intf = p_main->p_intf;
-
-    o_source = [NSString stringWithFormat: @"%@:%@@%d,%d", 
-                    o_type, o_device, i_title, i_chapter];
-
+    if ( p_intf->p_sys->b_loop )
+    {
+        intf_PlaylistDelete( p_main->p_playlist,
+                             p_main->p_playlist->i_size - 1 );
+    }
+
-    intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
-                      [o_source fileSystemRepresentation] );
@@ -534 +571 @@
-
-    intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 );
+
+    if ( p_intf->p_sys->b_loop )
+    {
+        intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, 
+                          "vlc:loop" );
+    }
-}
-
@@ -540 +583 @@
-    NSString *o_source;
-    int i_end = p_main->p_playlist->i_size;
+    intf_thread_t * p_intf = p_main->p_intf;
-
-    if( p_input_bank->pp_input[0] != NULL )
@@ -559 +603 @@
-    }
-
+    if ( p_intf->p_sys->b_loop )
+    {
+        intf_PlaylistDelete( p_main->p_playlist,
+                             p_main->p_playlist->i_size - 1 );
+    }
+
-    intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END,
-                      [o_source fileSystemRepresentation] );
-
-    intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 );
+
+    if ( p_intf->p_sys->b_loop )
+    {
+        intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, 
+                          "vlc:loop" );
+    }
-}
-
@@ -738 +794 @@
-    o_language_item = [[o_controls_item submenu] itemWithTitle: @"Language"]; 
-    o_subtitle_item = [[o_controls_item submenu] itemWithTitle: @"Subtitles"]; 
-2
-
+13
+2
-
-    if( p_input == NULL )
@@ -1008 +1064 @@
-        p_input->stream.b_changed = 0;
-    }
-
-    if( config_GetIntVariable( "network-channel" ) )
-    {
-        [o_next_channel_item setEnabled: 1];
-        [o_prev_channel_item setEnabled: 1];
-    }
-    else
-    {
-        [o_next_channel_item setEnabled: 0];
-        [o_prev_channel_item setEnabled: 0];
-    }
-}
-

plugins/macosx/macosx.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2002/06/02 01:20:52
+2 2002/06/02 12:16:31
- *
- * Authors: Colin Delacroix <colin@zoy.org>
@@ -44 +44 @@
-    int i_part;
-    vlc_bool_t b_disabled_menus;
+    vlc_bool_t b_loop;
-    int i_channel;
-};