- get rid of an unused variable

- use same name than in menus for random, repeat and loop options
- random, loop, repeat checkboxes are nom updated accordingliy to the state set in the menu. (not sure I've done that the proper way ;-)

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index aa2e3abbcd36ad383a0cd9f16975849a569bf67a..ebb8d00144fd8ff4df48328129cf085358ccb3a9 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index e8f95a02163bb2ccf1ff28a0c1047934d3457966..71f9877e07cace0250f68b0d4ae2033504ff3677 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -2,7 +2,7 @@
  * controls.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: controls.m,v 1.54 2003/11/15 22:42:16 hartman Exp $
+ * $Id: controls.m,v 1.55 2003/11/19 19:00:16 bigben Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -177,6 +177,8 @@
         vout_OSDMessage( (vlc_object_t *)p_intf, _( "Shuffle Off" ) );
     }    
 
+    p_intf->p_sys->b_playlist_update = VLC_TRUE;
+    p_intf->p_sys->b_intf_update = VLC_TRUE;
     vlc_object_release( p_playlist );
 }
 
@@ -201,8 +203,10 @@
     else
     {
         vout_OSDMessage( (vlc_object_t *)p_intf, _( "Repeat Off" ) );
-    }    
+    }
 
+    p_intf->p_sys->b_playlist_update = VLC_TRUE;    
+    p_intf->p_sys->b_intf_update = VLC_TRUE;
     vlc_object_release( p_playlist );
 }
 
@@ -229,6 +233,8 @@
         vout_OSDMessage( (vlc_object_t *)p_intf, _( "Loop Off" ) );
     }    
 
+    p_intf->p_sys->b_playlist_update = VLC_TRUE;
+    p_intf->p_sys->b_intf_update = VLC_TRUE;
     vlc_object_release( p_playlist );
 }
 

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index a37e55c1e56a29c7f37cb016b8d08bc38ad3d6df..4686e77e82d73c470ec7f63a65ba62c3169112d3 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -2,7 +2,7 @@
  * playlist.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: playlist.m,v 1.44 2003/11/19 14:58:54 bigben Exp $
+ * $Id: playlist.m,v 1.45 2003/11/19 19:00:16 bigben Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -141,13 +141,13 @@
     [o_mi_selectall setTitle: _NS("Select All")];
     [[o_tc_name headerCell] setStringValue:_NS("Name")];
     [[o_tc_author headerCell] setStringValue:_NS("Author")];
-    [o_random_ckb setTitle: _NS("Random")];
-    [o_loop_ckb setTitle: _NS("Repeat All")];
-    [o_repeat_ckb setTitle: _NS("Repeat One")];
+    [o_random_ckb setTitle: _NS("Shuffle")];
+    [o_loop_ckb setTitle: _NS("Repeat Playlist")];
+    [o_repeat_ckb setTitle: _NS("Repeat Item")];
     [o_search_button setTitle: _NS("Search")];
 
 
-    vlc_value_t val;
+    /*vlc_value_t val;
     intf_thread_t * p_intf = [NSApp getIntf];
     playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
                                                        FIND_ANYWHERE );
@@ -163,7 +163,7 @@
         [o_repeat_ckb setState: val.b_bool];
 
         vlc_object_release( p_playlist );
-    }
+    }*/
 }
 
 - (BOOL)tableView:(NSTableView *)o_tv 
@@ -284,7 +284,7 @@
 
 - (IBAction)searchItem:(id)sender
 {
-    int i_current = 0, i_counter;
+    int i_current = 0;
     NSString *o_current_name;
     NSString *o_current_author;
 
@@ -426,7 +426,27 @@
 
 - (void)playlistUpdated
 {
+
+    vlc_value_t val;
+
     [o_table_view reloadData];
+
+    intf_thread_t * p_intf = [NSApp getIntf];
+    playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                                       FIND_ANYWHERE );
+    if( p_playlist != NULL )
+    {
+        var_Get( p_playlist, "random", &val );
+        [o_random_ckb setState: val.b_bool];
+
+        var_Get( p_playlist, "loop", &val );
+        [o_loop_ckb setState: val.b_bool];
+
+        var_Get( p_playlist, "repeat", &val );
+        [o_repeat_ckb setState: val.b_bool];
+
+        vlc_object_release( p_playlist );
+    }
 }
 
 - (void)updateRowSelection