Changeset 138da1916eef4f4d0e30883a8c1ac999c355aca9

Timestamp:

06/20/08 15:40:27 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213969227 +0300

git-parent:

[a735127f42a2d108b8a26aa0594c2e0365b53935]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213960665 +0300

Message:

Remove the broken window embedding core code

Files:

• include/vlc_interface.h (modified) (1 diff)
• modules/gui/qt4/components/interface_widgets.cpp (modified) (1 diff)
• modules/gui/qt4/main_interface.cpp (modified) (4 diffs)
• src/interface/interface.c (modified) (1 diff)
• src/video_output/vout_intf.c (modified) (4 diffs)

include/vlc_interface.h

@@ -69 +69 @@
-    bool b_interaction;
-
-    /** Video window callbacks */
-    void * ( *pf_request_window ) ( intf_thread_t *, vout_thread_t *,
-                                    int *, int *,
-                                    unsigned int *, unsigned int * );
-    void   ( *pf_release_window ) ( intf_thread_t *, void * );
-    int    ( *pf_control_window ) ( intf_thread_t *, void *, int, va_list );
-
-    /* XXX: new message passing stuff will go here */
-    vlc_mutex_t  change_lock;

modules/gui/qt4/components/interface_widgets.cpp

@@ -53 +53 @@
- * This class handles resize issues
- **********************************************************************/
-static void *DoRequest( intf_thread_t *, vout_thread_t *, int*,int*,
-                        unsigned int *, unsigned int * );
-static void DoRelease( intf_thread_t *, void * );
-static int DoControl( intf_thread_t *, void *, int, va_list );
-
-VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )

modules/gui/qt4/main_interface.cpp

@@ -77 +77 @@
-static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
-                             vlc_value_t, void *);
-/* Video handling */
-static void *DoRequest( intf_thread_t *p_intf, vout_thread_t *p_vout,
-                        int *pi1, int *pi2, unsigned int*pi3,unsigned int*pi4)
-{
-    return p_intf->p_sys->p_mi->requestVideo( p_vout, pi1, pi2, pi3, pi4 );
-}
-
-static void *DoNotEmbeddedRequest( intf_thread_t *p_intf, vout_thread_t *p_vout,
-                        int *pi1, int *pi2, unsigned int*pi3,unsigned int*pi4)
-{
-    p_intf->p_sys->p_mi->requestNotEmbeddedVideo( p_vout );
-    return NULL;
-}
-
-static void DoRelease( intf_thread_t *p_intf, void *p_win )
-{
-    return p_intf->p_sys->p_mi->releaseVideo( p_win );
-}
-
-static int DoControl( intf_thread_t *p_intf, void *p_win, int i_q, va_list a )
-{
-    return p_intf->p_sys->p_mi->controlVideo( p_win, i_q, a );
-}
-
-MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
@@ -312 +289 @@
-    var_DelCallback( p_intf, "interaction", InteractCallback, this );
-
-    p_intf->pf_request_window = NULL;
-    p_intf->pf_release_window = NULL;
-    p_intf->pf_control_window = NULL;
-    p_intf->p_sys->p_mi = NULL;
-}
@@ -464 +438 @@
-        mainLayout->insertWidget( 0, videoWidget );
-
-        p_intf->pf_request_window  = ::DoRequest;
-        p_intf->pf_release_window  = ::DoRelease;
-        p_intf->pf_control_window  = ::DoControl;
-    }
-    else
-    {
-        p_intf->pf_request_window  = ::DoNotEmbeddedRequest;
-    }
-
@@ -746 +716 @@
-    videoWidget->hide();
-
-O
+
-        bgWidget->show();
-

src/interface/interface.c

@@ -94 +94 @@
-    if( !p_intf )
-        return NULL;
-    p_intf->pf_request_window = NULL;
-    p_intf->pf_release_window = NULL;
-    p_intf->pf_control_window = NULL;
-    p_intf->b_interaction = false;
-    p_intf->b_should_run_on_first_thread = false;

src/video_output/vout_intf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2007 the VideoLAN team
- * $Id$
- *
- * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -88 +87 @@
-                          unsigned int *pi_height_hint )
-{
-    intf_thread_t *p_intf = NULL;
-    vlc_list_t *p_list;
-    void *p_window;
-    vlc_value_t val;
-    int i;
-
-    /* Small kludge */
-    if( !var_Type( p_vout, "aspect-ratio" ) ) vout_IntfInit( p_vout );
@@ -108 +101 @@
-    if( drawable ) return (void *)(intptr_t)drawable;
-
-#if 0
-    /* FIXME:
-     * This code is utter crap w.r.t. threading. And it has always been.
-     * First, one cannot invoke callbacks from another thread's object.
-     * Not without a well-defined locking convention.
-     *
-     * Second, this would need to "wait" for the interface to be ready.
-     * Otherwise, the availability of the embded window would become
-     * time-dependent.
-     *
-     * In the past, this kind of things worked by accident. This time is over.
-     * -- Courmisch, 12 Jun 2008
-     */
-    /* Find if the main interface supports embedding */
-    p_list = vlc_list_find( p_vout, VLC_OBJECT_INTF, FIND_ANYWHERE );
-    if( !p_list ) return NULL;
-
-    for( i = 0; i < p_list->i_count; i++ )
-    {
-        p_intf = (intf_thread_t *)p_list->p_values[i].p_object;
-        if( p_intf->pf_request_window ) break;
-        p_intf = NULL;
-    }
-
-    if( !p_intf )
-    {
-        vlc_list_release( p_list );
-        return NULL;
-    }
-
-    vlc_object_yield( p_intf );
-    vlc_list_release( p_list );
-
-    p_window = p_intf->pf_request_window( p_intf, p_vout, pi_x_hint, pi_y_hint,
-                                          pi_width_hint, pi_height_hint );
-
-    if( !p_window ) vlc_object_release( p_intf );
-    else p_vout->p_parent_intf = p_intf;
-
-    return p_window;
-#else
-   return NULL;
-#endif
-}
-
-void vout_ReleaseWindow( vout_thread_t *p_vout, void *p_window )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -184 +112 @@
-                        int i_query, va_list args )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-