Changeset d3d776685b767f1a4648d66e5ba00c495c69cb19

Timestamp:

05/07/08 20:38:43 (4 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210185523 +0300

git-parent:

[2b5eb3185ecd05444ce310ec33e0fdc0e5e69c90]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210185523 +0300

Message:

Remove pl_Get. This endorsed unyielded playlist access.

Files:

• include/vlc_playlist.h (modified) (1 diff)
• src/input/input.c (modified) (3 diffs)
• src/video_output/video_output.c (modified) (1 diff)

include/vlc_playlist.h

@@ -263 +263 @@
-#define PL_UNLOCK vlc_object_unlock( p_playlist )
-
-#define pl_Get( a ) a->p_libvlc->p_playlist
-
-VLC_EXPORT( playlist_t *, __pl_Yield, ( vlc_object_t * ) );
-#define pl_Yield( a ) __pl_Yield( VLC_OBJECT(a) )

src/input/input.c

@@ -554 +554 @@
-        /* We have finished */
-        p_input->b_eof = true;
-l_Get( p_input )
+_input->p_libvlc->p_playlist
-    }
-
@@ -2111 +2111 @@
-        access_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
-        InputUpdateMeta( p_input, p_meta );
-l_Get( p_input )
+_input->p_libvlc->p_playlist
-        p_access->info.i_update &= ~INPUT_UPDATE_META;
-    }
@@ -2154 +2154 @@
-    {
-        pl_Yield( p_input );
-l_Get( p_input )
+_input->p_libvlc->p_playlist
-                        p_input->p->input.p_item->i_id );
-        pl_Release( p_input );

src/video_output/video_output.c

@@ -510 +510 @@
-    vout_thread_t *p_another_vout;
-
-Get
- return;
-vlc_object_yield( p_playlist );
-
-back if you closed it while playing video. This is solved in Mac OS X,
-where we have this novelty called menubar, that will always allow you access
-to the applications main functionality. They should try that on linux sometime */
-   p_another_vout = vlc_object_find( p_this->p_libvlc,
-                                     VLC_OBJECT_VOUT, FIND_ANYWHERE );
-   if( p_another_vout == NULL )
-   {
-        vlc_value_t val;
-val.b_bool = true
-        var_Set( p_playlist, "intf-show", val );
-}
+Yield
+
+{
+
+     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
+* Mac OS X, where we have this novelty called menubar, that will always
+* allow you access to the applications main functionality. They should try
+* that on linux sometime. */
+p_another_vout = vlc_object_find( p_this->p_libvlc,
+                          VLC_OBJECT_VOUT, FIND_ANYWHERE )
+if( p_another_vout == NULL )
+    var_SetBool( p_playlist, "intf-show", true );
-    else
-    {
-        vlc_object_release( p_another_vout );
-
-
+
-#endif
-}