Changeset 3527f69d9fbbbd8327c80354c4ad3122df521ee8

Timestamp:

01/06/08 21:19:23 (4 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1212347963 +0200

git-parent:

[65f35e28ead51530840e0c4b488a8b219a019fe7]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1212347836 +0200

Message:

libvlccore: "intf-show" is now a libvlc var instead of a playlist var. This removes a vout->playlist dependency.

Files:

• modules/control/hotkeys.c (modified) (1 diff)
• modules/control/showintf.c (modified) (1 diff)
• modules/gui/macosx/intf.m (modified) (1 diff)
• modules/gui/qt4/main_interface.cpp (modified) (3 diffs)
• modules/gui/skins2/src/vlcproc.cpp (modified) (2 diffs)
• modules/gui/wxwidgets/timer.cpp (modified) (4 diffs)
• modules/video_output/sdl.c (modified) (1 diff)
• modules/video_output/x11/xcommon.c (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)
• src/playlist/engine.c (modified) (1 diff)
• src/video_output/video_output.c (modified) (2 diffs)

modules/control/hotkeys.c

@@ -227 +227 @@
-        /* Interface showing */
-        else if( i_action == ACTIONID_INTF_SHOW )
-playlist
+intf->p_libvlc
-        else if( i_action == ACTIONID_INTF_HIDE )
-playlist
+intf->p_libvlc
-        /* Video Output actions */
-        else if( i_action == ACTIONID_SNAPSHOT )

modules/control/showintf.c

@@ -128 +128 @@
-        if( p_intf->p_sys->b_triggered )
-        {
-
-
-
+
-            p_intf->p_sys->b_triggered = false;
-        }

modules/gui/macosx/intf.m

@@ -570 +570 @@
-
-    var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
-playlist
+intf->p_libvlc
-
-    vlc_object_release( p_playlist );

modules/gui/qt4/main_interface.cpp

@@ -223 +223 @@
-    p_intf->b_interaction = true;
-
+    var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
+
-    /* Register callback for the intf-popupmenu variable */
-    playlist_t *p_playlist = pl_Yield( p_intf );
-    var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
-    var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
-    pl_Release( p_intf );
-
@@ -285 +286 @@
-    delete settings;
-
+    var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
+
-    /* Unregister callback for the intf-popupmenu variable */
-    playlist_t *p_playlist = pl_Yield( p_intf );
-    var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
-    var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
-    pl_Release( p_intf );
-
@@ -1212 +1214 @@
-
-/*****************************************************************************
-playlist
+libvlc
- *****************************************************************************/
-static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,

modules/gui/skins2/src/vlcproc.cpp

@@ -149 +149 @@
-                     onItemDelete, this );
-    // Called when the "interface shower" wants us to show the skin
-sys->p_playlist
+libvlc
-                     onIntfShow, this );
-    // Called when the current played item changes
@@ -194 +194 @@
-    var_DelCallback( getIntf()->p_sys->p_playlist, "item-deleted",
-                     onItemDelete, this );
-sys->p_playlist
+libvlc
-                     onIntfShow, this );
-    var_DelCallback( getIntf()->p_sys->p_playlist, "playlist-current",

modules/gui/wxwidgets/timer.cpp

@@ -47 +47 @@
-    b_init = 0;
-
+    var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
+
-    /* Register callback for the intf-popupmenu variable */
-    playlist_t *p_playlist =
@@ -54 +56 @@
-    {
-        var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
-        var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
-        vlc_object_release( p_playlist );
-    }
@@ -63 +64 @@
-Timer::~Timer()
-{
+    var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
+
-    /* Unregister callback */
-    playlist_t *p_playlist =
@@ -70 +73 @@
-    {
-        var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
-        var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
-        vlc_object_release( p_playlist );
-    }

modules/video_output/sdl.c

@@ -460 +460 @@
-                    var_Set( p_vout, "mouse-button-down", val );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                }
-                break;

modules/video_output/x11/xcommon.c

@@ -1319 +1319 @@
-                        var_Set( p_vout, "mouse-button-down", val );
-
-
-
-
-
-
-
-
-
-
+
+
+
-                    }
-                    break;

src/libvlc.c

@@ -896 +896 @@
-    /* Create volume callback system. */
-    var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
+
+    /* Create a variable for showing the interface (moved from playlist). */
+    var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
+    var_SetBool( p_playlist, "intf-show", true );
-
-    /*

src/playlist/engine.c

@@ -665 +665 @@
-    var_Create( p_playlist, "intf-popupmenu", VLC_VAR_BOOL );
-
-    var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
-    val.b_bool = true;
-    var_Set( p_playlist, "intf-show", val );
-
-    var_Create( p_playlist, "activity", VLC_VAR_INTEGER );
-    var_SetInteger( p_playlist, "activity", 0 );

src/video_output/video_output.c

@@ -494 +494 @@
-    vout_thread_t *p_another_vout;
-
-    playlist_t *p_playlist = pl_Yield( p_this );
-    if( !p_playlist )
-        return;
-
-    /* This is a dirty hack mostly for Linux, where there is no way to get the
-     * GUI back if you closed it while playing video. This is solved in
@@ -506 +502 @@
-                                      VLC_OBJECT_VOUT, FIND_ANYWHERE );
-    if( p_another_vout == NULL )
-playlist
+this->p_libvlc
-    else
-        vlc_object_release( p_another_vout );
-    pl_Release( p_playlist );
-#endif
-}