[vlc-devel] commit: Double clicking for fullscreen in a video output only sets fullscreen for the current playlist item . (Jean-Paul Saman )

git version control git at videolan.org
Tue Nov 11 14:44:48 CET 2008


vlc | branch: 0.8.6-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Mon Nov  3 21:57:46 2008 +0100| [c493bd1a5b6f92cbd8cbf3ea2b395bd99ecd814f] | committer: Jean-Paul Saman 

Double clicking for fullscreen in a video output only sets fullscreen for the current playlist item.

Going to fullscreen from a video output only changes the current playlist item to go to fullscreen. It no longer makes the fullscreen global. If you want global fullscreen then add --fullscreen to the commandline of vlc or make this your default option in the preference.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c493bd1a5b6f92cbd8cbf3ea2b395bd99ecd814f
---

 src/playlist/playlist.c      |    7 ++++++-
 src/video_output/vout_intf.c |   16 +++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 0636425..d96c693 100644
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -100,7 +100,6 @@ playlist_t * __playlist_Create ( vlc_object_t *p_parent )
     p_playlist = vlc_object_create( p_parent, VLC_OBJECT_PLAYLIST );
     if( !p_playlist )
     {
-        msg_Err( p_parent, "out of memory" );
         return NULL;
     }
 
@@ -136,6 +135,9 @@ playlist_t * __playlist_Create ( vlc_object_t *p_parent )
     var_CreateGetBool( p_playlist, "repeat" );
     var_CreateGetBool( p_playlist, "loop" );
 
+    var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL );
+    var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL );
+
     /* Initialise data structures */
     vlc_mutex_init( p_playlist, &p_playlist->gc_lock );
     p_playlist->i_last_id = 0;
@@ -249,6 +251,9 @@ int playlist_Destroy( playlist_t * p_playlist )
 
     vlc_object_detach( p_playlist->p_preparse );
 
+    var_Destroy( p_playlist, "fullscreen" );
+    var_Destroy( p_playlist, "video-on-top" );
+
     var_Destroy( p_playlist, "intf-change" );
     var_Destroy( p_playlist, "item-change" );
     var_Destroy( p_playlist, "playlist-current" );
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 3a5baf5..fd7e2dd 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -40,8 +40,11 @@
 
 #include <snapshot.h>
 
+#if defined(HAVE_WIN32) || defined(HAVE_WINCE)
 #define DIR_SEP "\\"
+#else
 #define DIR_SEP "/"
+#endif
 
 /*****************************************************************************
  * Local prototypes
@@ -1062,7 +1065,6 @@ static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
     if( p_playlist )
     {
         /* Modify playlist as well because the vout might have to be restarted */
-        var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL );
         var_Set( p_playlist, "video-on-top", newval );
 
         vlc_object_release( p_playlist );
@@ -1074,22 +1076,10 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    playlist_t *p_playlist;
     vlc_value_t val;
 
     p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
 
-    p_playlist = (playlist_t *)vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
-                                                 FIND_PARENT );
-    if( p_playlist )
-    {
-        /* Modify playlist as well because the vout might have to be restarted */
-        var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL );
-        var_Set( p_playlist, "fullscreen", newval );
-
-        vlc_object_release( p_playlist );
-    }
-
     /* Disable "always on top" in fullscreen mode */
     var_Get( p_vout, "video-on-top", &val );
     if( newval.b_bool && val.b_bool )




More information about the vlc-devel mailing list