Changeset 2c595f3810f717639fd1a1666c77b6e176d9ec53

Show
Ignore:
Timestamp:
06/28/08 19:03:26 (2 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1214672606 +0200
git-parent:

[6d6c549c4be66337c41293be64cb04fcf151300b]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1214672525 +0200
Message:

Move intf-popupmenu and video-on-top variables from playlist to libvlc.
Should fix assertion errors.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/main_interface.cpp

    r8c6064c r2c595f3  
    212212 
    213213    /* Register callback for the intf-popupmenu variable */ 
    214     playlist_t *p_playlist = pl_Yield( p_intf ); 
    215     var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf ); 
    216     pl_Release( p_intf ); 
     214    var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); 
    217215 
    218216    /* VideoWidget connect mess to avoid different threads speaking to each other */ 
    …… 
    283281 
    284282    /* Unregister callback for the intf-popupmenu variable */ 
    285     playlist_t *p_playlist = pl_Yield( p_intf ); 
    286     var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf ); 
    287     pl_Release( p_intf ); 
     283    var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); 
    288284 
    289285    p_intf->b_interaction = false; 

  • modules/gui/wxwidgets/timer.cpp

    ra2174f0 r2c595f3  
    5050 
    5151    /* Register callback for the intf-popupmenu variable */ 
    52     playlist_t *p_playlist = pl_Yield( p_intf ); 
    53     if( p_playlist != NULL ) 
    54     { 
    55         var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf ); 
    56         pl_Release( p_playlist ); 
    57     } 
     52    var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); 
    5853 
    5954    Start( 100 /*milliseconds*/, wxTIMER_CONTINUOUS ); 
    …… 
    6560 
    6661    /* Unregister callback */ 
    67     playlist_t *p_playlist = pl_Yield( p_intf ); 
    68     if( p_playlist != NULL ) 
    69     { 
    70         var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf ); 
    71         pl_Release( p_playlist ); 
    72     } 
     62    var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); 
    7363} 
    7464 

  • modules/video_output/msw/events.c

    r172e22c r2c595f3  
    7878static void DirectXPopupMenu( event_thread_t *p_event, bool b_open ) 
    7979{ 
    80     playlist_t *p_playlist = vlc_object_find( p_event, 
    81                                              VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); 
    82     if( p_playlist ) 
    83     { 
    84         vlc_value_t val; 
    85         val.b_bool = b_open; 
    86         var_Set( p_playlist, "intf-popupmenu", val ); 
    87         vlc_object_release( p_playlist ); 
    88     } 
     80    vlc_value_t val; 
     81    val.b_bool = b_open; 
     82    var_Set( p_event->p_libvlc, "intf-popupmenu", val ); 
    8983} 
    9084 

  • modules/video_output/sdl.c

    r7f9999d r2c595f3  
    434434                { 
    435435                    playlist_t *p_playlist; 
     436                    vlc_value_t val; 
    436437 
    437438                    var_Get( p_vout, "mouse-button-down", &val ); 
    …… 
    442443                    var_Set( p_vout, "mouse-clicked", val ); 
    443444 
    444                     p_playlist = pl_Yield( p_vout ); 
    445  
    446                     if( p_playlist != NULL ) 
    447                     { 
    448                         vlc_value_t val; 
    449                         val.b_bool = false; 
    450                         var_Set( p_playlist, "intf-popupmenu", val ); 
    451                         pl_Release( p_playlist ); 
    452                     } 
     445                    val.b_bool = false; 
     446                    var_Set( p_vout->p_libvlc, "intf-popupmenu", val ); 
    453447                } 
    454448                break; 
    …… 
    485479                    } 
    486480 
    487                     p_playlist = pl_Yield( p_vout ); 
    488  
    489                     if( p_playlist != NULL ) 
    490                     { 
    491                         vlc_value_t val; 
    492                         val.b_bool = true; 
    493                         var_Set( p_playlist, "intf-popupmenu", val ); 
    494                         pl_Release( p_playlist ); 
    495                     } 
     481                    val.b_bool = true; 
     482                    var_Set( p_vout->p_libvlc, "intf-popupmenu", val ); 
    496483                } 
    497484                break; 
    …… 
    532519        case SDL_QUIT: 
    533520            { 
     521#if 0 
    534522                playlist_t *p_playlist = pl_Yield( p_vout ); 
    535523                if( p_playlist != NULL ) 
    …… 
    538526                    pl_Release( p_playlist ); 
    539527                } 
     528#else 
     529#warning FIXME FIXME ? 
     530#endif 
    540531            } 
    541532            break; 

  • modules/video_output/x11/xcommon.c

    rba9ecc7 r2c595f3  
    13011301                        var_Set( p_vout, "mouse-clicked", val ); 
    13021302 
    1303                         p_playlist = pl_Yield( p_vout ); 
    1304                         if( p_playlist != NULL ) 
    1305                         { 
    1306                             vlc_value_t val; val.b_bool = false; 
    1307                             var_Set( p_playlist, "intf-popupmenu", val ); 
    1308                             pl_Release( p_playlist ); 
    1309                         } 
     1303                        vlc_value_t val; val.b_bool = false; 
     1304                        var_Set( p_vout->p_libvlc, "intf-popupmenu", val ); 
    13101305                    } 
    13111306                    break; 
    …… 
    13391334                        } 
    13401335 
    1341                         p_playlist = pl_Yield( p_vout ); 
    1342                         if( p_playlist != NULL ) 
    1343                         { 
    1344                             vlc_value_t val; val.b_bool = true; 
    1345                             var_Set( p_playlist, "intf-popupmenu", val ); 
    1346                             pl_Release( p_playlist ); 
    1347                         } 
     1336                        vlc_value_t val; val.b_bool = true; 
     1337                        var_Set( p_vout->p_libvlc, "intf-popupmenu", val ); 
    13481338                    } 
    13491339                    break; 
    …… 
    14751465        { 
    14761466            /* the user wants to close the window */ 
     1467#if 0 
    14771468            playlist_t * p_playlist = pl_Yield( p_vout ); 
    14781469            if( p_playlist != NULL ) 
    …… 
    14811472                pl_Release( p_playlist ); 
    14821473            } 
     1474#else 
     1475#warning FIXME FIXME FIXME 
     1476#endif 
    14831477        } 
    14841478    } 

  • src/libvlc.c

    r6465bbf r2c595f3  
    900900 
    901901    /* Create a variable for showing the interface (moved from playlist). */ 
    902     var_Create( p_playlist, "intf-show", VLC_VAR_BOOL ); 
    903     var_SetBool( p_playlist, "intf-show", true ); 
     902    var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL ); 
     903    var_SetBool( p_libvlc, "intf-show", true ); 
     904 
     905    var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL ); 
    904906 
    905907    /* 

  • src/playlist/engine.c

    rc71ebdc r2c595f3  
    694694    var_Set( p_playlist, "playlist-current", val ); 
    695695 
    696     var_Create( p_playlist, "intf-popupmenu", VLC_VAR_BOOL ); 
    697  
    698696    var_Create( p_playlist, "activity", VLC_VAR_INTEGER ); 
    699697    var_SetInteger( p_playlist, "activity", 0 ); 

  • src/video_output/vout_intf.c

    r6798d2c r2c595f3  
    11361136{ 
    11371137    vout_thread_t *p_vout = (vout_thread_t *)p_this; 
    1138     playlist_t *p_playlist = pl_Yield( p_this ); 
    11391138    vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, newval.b_bool ); 
    11401139    (void)psz_cmd; (void)oldval; (void)p_data; 
    11411140 
    1142     /* Modify playlist as well because the vout might have to be restarted */ 
    1143     var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL ); 
    1144     var_Set( p_playlist, "video-on-top", newval ); 
    1145  
    1146     pl_Release( p_this ); 
     1141    /* Modify libvlc as well because the vout might have to be restarted */ 
     1142    var_Create( p_vout->p_libvlc, "video-on-top", VLC_VAR_BOOL ); 
     1143    var_Set( p_vout->p_libvlc, "video-on-top", newval ); 
     1144 
    11471145    return VLC_SUCCESS; 
    11481146} 
    …… 
    11531151    vout_thread_t *p_vout = (vout_thread_t *)p_this; 
    11541152    vlc_value_t val; 
    1155     playlist_t *p_playlist = pl_Yield( p_this ); 
    11561153    (void)psz_cmd; (void)oldval; (void)p_data; 
    11571154 
    11581155    p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; 
    11591156 
    1160     /* Modify playlist as well because the vout might have to be restarted */ 
    1161     var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL ); 
    1162     var_Set( p_playlist, "fullscreen", newval ); 
    1163     pl_Release( p_playlist ); 
     1157    /* Modify libvlc as well because the vout might have to be restarted */ 
     1158    var_Create( p_vout->p_libvlc, "fullscreen", VLC_VAR_BOOL ); 
     1159    var_Set( p_vout->p_libvlc, "fullscreen", newval ); 
    11641160 
    11651161    val.b_bool = true;