Changeset a5ee53f77453343410be793192b3a7cacb2ce08d

Timestamp:

04/20/04 17:05:24 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1082473524 +0000

git-parent:

[1741388f379b2de3feb921233c1d929d73ddd06c]

git-author:

Gildas Bazin <gbazin@videolan.org> 1082473524 +0000

Message:

* include/vlc/vlc.h: added a b_play parameter to the libvlc VLC_AddIntf() prototype.

When true, the interface will automatically start playing the playlist when (and only when) it is ready. (particularly useful for embedded vouts).

* src/libvlc.c, src/vlc.c: new VLC_AddIntf() prototype.
* src/interface/interface.c: if the interface doesn't support "playing on start", do it ourselves.
* modules/gui/wxwindows/wxwindows.cpp: implement "play on start".

Files:

• include/vlc/vlc.h (modified) (1 diff)
• include/vlc_interface.h (modified) (1 diff)
• modules/gui/wxwindows/wxwindows.cpp (modified) (2 diffs)
• src/interface/interface.c (modified) (1 diff)
• src/libvlc.c (modified) (4 diffs)
• src/vlc.c (modified) (2 diffs)

include/vlc/vlc.h

@@ -227 +227 @@
-int     VLC_Get          ( int, char const *, vlc_value_t * );
-
-
+, vlc_bool_t
-int     VLC_AddTarget    ( int, char const *, const char **, int, int, int );
-

include/vlc_interface.h

@@ -51 +51 @@
-    /* Thread properties and locks */
-    vlc_bool_t          b_block;
+    vlc_bool_t          b_play;
-
-    /* Specific interfaces */

modules/gui/wxwindows/wxwindows.cpp

@@ -149 +149 @@
-    p_intf->pf_show_dialog = NULL;
-
+    /* We support play on start */
+    p_intf->b_play = VLC_TRUE;
+
-    return VLC_SUCCESS;
-}
@@ -307 +310 @@
-    vlc_thread_ready( p_intf );
-
+    /* Check if we need to start playing */
+    if( p_intf->b_play )
+    {
+        playlist_t *p_playlist =
+            (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                           FIND_ANYWHERE );
+        if( p_playlist )
+        {
+            playlist_Play( p_playlist );
+            vlc_object_release( p_playlist );
+        }
+    }
+
-    /* Return TRUE to tell program to continue (FALSE would terminate) */
-    return TRUE;

src/interface/interface.c

@@ -279 +279 @@
-    p_intf->pf_run( p_intf );
-
+    /* Reset play on start status */
+    p_intf->b_play = VLC_FALSE;
+
-    /* Provide ability to switch the main interface on the fly */
-    while( p_intf->psz_switch_intf )

src/libvlc.c

@@ -617 +617 @@
-        {
-            sprintf( psz_temp, "%s,none", psz_module );
-
+, VLC_FALSE
-            free( psz_temp );
-        }
@@ -629 +629 @@
-     * Allways load the hotkeys interface if it exists
-     */
-
+, VLC_FALSE
-
-    /*
@@ -662 +662 @@
- * to 0, VLC_AddIntf will return immediately and let the interface run in a
- * separate thread. If b_block is set to 1, VLC_AddIntf will continue until
-
-
-
+
+
+
+
+
-{
-    int i_err;
@@ -685 +687 @@
-    }
-
+    /* Interface doesn't handle play on start so do it ourselves */
+    if( !p_intf->b_play && b_play ) VLC_Play( i_object );
+
-    /* Try to run the interface */
+    p_intf->b_play = b_play;
-    p_intf->b_block = b_block;
-    i_err = intf_RunThread( p_intf );

src/vlc.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
-: vlc.c,v 1.21 2004/01/25 17:16:05 zorglub Exp 
+
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -99 +99 @@
-    }
-
-
-
-
-
-
+
+
-
-    /* Finish the threads */