Changeset a6cb8953d4bb5d5b75eeeb6fb7c9009591ee8431

Timestamp:

04/12/05 16:41:47 (3 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1113316907 +0000

git-parent:

[44c6d658c95fc55d3f7a9129f9dea42ee1bdf067]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1113316907 +0000

Message:

* fixed fullscreen on osx with multiple vouts.
* different way to remember fullscreen state.
* update the playlist on item-append and item-deleted calls.
* fixed video-on-top with opengl vouts on OSX.

Files:

• AUTHORS (modified) (1 diff)
• TODO (modified) (1 diff)
• modules/gui/macosx/controls.m (modified) (13 diffs)
• modules/gui/macosx/intf.m (modified) (2 diffs)
• modules/gui/macosx/vout.m (modified) (4 diffs)

AUTHORS

@@ -174 +174 @@
-D: Dutch translation
-D: Directory input
+D: Mac OS X Video Output
+D: Mac OS X Audio Output
+D: Kasenna client support
-S: Netherlands
-

TODO

@@ -145 +145 @@
-   - *   Ability to save playlist on quit<br />
-   - ?   Represent navigation structure as "fake items" ?  <br />
-
+ (http://xspf.xiph.org/ looks like a good idea)
-- Helper modules<br />
-   - **  ASX and B4S parsers (see below)<br />

modules/gui/macosx/controls.m

@@ -275 +275 @@
-                                              FIND_ANYWHERE );
-
-    playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
-                                              FIND_ANYWHERE );
-
-    if( p_vout != NULL )
-    {
@@ -303 +300 @@
-                else
-                {
-
-
-
+
-                }
-                break;
@@ -311 +306 @@
-        }
-        vlc_object_release( (vlc_object_t *)p_vout );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        {
-            vlc_value_t val;
@@ -326 +319 @@
-            var_Set( p_playlist, "fullscreen", (vlc_value_t)!val.b_bool );
-        }
-
+    if( p_playlist ) 
-    }
-
@@ -567 +560 @@
-        vlc_mutex_lock( &p_playlist->object_lock );
-    }
+    else return FALSE;
-
-#define p_input p_playlist->p_input
@@ -573 +567 @@
-        [[o_mi title] isEqualToString: _NS("Slower")] )
-    {
-playlist != NULL && p_
+
-        {
-            bEnabled = p_input->input.b_can_pace_control;
@@ -584 +578 @@
-    else if( [[o_mi title] isEqualToString: _NS("Stop")] )
-    {
-playlist == NULL || p_
+
-        {
-            bEnabled = FALSE;
@@ -593 +587 @@
-             [[o_mi title] isEqualToString: _NS("Next")] )
-    {
-        if( p_playlist == NULL )
-        {
-            bEnabled = FALSE;
-        }
-        else
-        {
-            bEnabled = p_playlist->i_size > 1;
-        }
-    }
-    else if( [[o_mi title] isEqualToString: _NS("Random")] )
@@ -626 +613 @@
-             [[o_mi title] isEqualToString: _NS("Step Backward")] )
-    {
-
-
+
-        {
-            var_Get( p_input, "seekable", &val);
-
-
-
-
+
-        }
-    }
@@ -646 +629 @@
-                [[o_mi title] isEqualToString: _NS("Fit to Screen")] ||
-                [[o_mi title] isEqualToString: _NS("Snapshot")] ||
+                [[o_mi title] isEqualToString: _NS("Fullscreen")] ||
-                [[o_mi title] isEqualToString: _NS("Float on Top")] )
-    {
@@ -657 +641 @@
-        if( p_vout != NULL )
-        {
- 
+
-            {
-                var_Get( p_vout, "video-on-top", &val );
@@ -663 +647 @@
-            }
-
- (
+( 
-            {
-                if( [[o_window className] isEqualToString: @"VLCWindow"] )
@@ -673 +657 @@
-            vlc_object_release( (vlc_object_t *)p_vout );
-        }
-
-
-
-
-
-
+
+
+
-            [o_mi setState: val.b_bool];
-            bEnabled = TRUE;
-        }
-        else
-        {
-            bEnabled = FALSE;
-        }
-        [o_main setupMenus]; /* Make sure video menu is up to date */
-    }
-
-
-
-
-
-
-
+
+
-
-    return( bEnabled );

modules/gui/macosx/intf.m

@@ -773 +773 @@
-        var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
-        var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+        var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
+        var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
-        var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
-
@@ -885 +887 @@
-        playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                                   FIND_ANYWHERE );
-
-
-
+
+
-        vlc_object_release( p_playlist );
-

modules/gui/macosx/vout.m

@@ -366 +366 @@
-    vlc_value_t val;
-
-
+real_
-    {
-        val.b_bool = VLC_FALSE;
@@ -374 +374 @@
-        val.b_bool = VLC_TRUE;
-    }
-
+real_
-}
-
@@ -380 +380 @@
-{
-    vlc_value_t val;
-
+
+
-    var_Set( p_real_vout, "fullscreen", val );
-}
@@ -386 +387 @@
-- (BOOL)isFullscreen
-{
-
+
+
+
-}
-
-- (void)snapshot
-{
-
+real_
-}
-