X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fwxwidgets%2Finterface.cpp;h=c78f6c5ff29dfcd4300eb667df84b54ec86775e9;hb=fe8c4673c5502dd03c26e673bd13d3232add8f9b;hp=f3135e65dc005744a4cc0e1565ce093392cc9608;hpb=756b42166e316a1b767d3d3f66d5e8f0497c5568;p=vlc diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp index f3135e65dc..c78f6c5ff2 100644 --- a/modules/gui/wxwidgets/interface.cpp +++ b/modules/gui/wxwidgets/interface.cpp @@ -157,7 +157,7 @@ private: p_intf->p_sys->p_video_sizer->GetMinSize() != wxSize(0,0) ) { if( !b_video ) i_delay = mdate() + 1000000; - b_video = VLC_TRUE; + b_video = true; SetSashSize( -1 ); @@ -173,7 +173,7 @@ private: wxSize size = GetWindow1()->GetSizer()->GetMinSize(); if( b_video ) i_delay = mdate() + 1000000; - b_video = VLC_FALSE; + b_video = false; if( event.GetSize().GetHeight() - size.GetHeight() ) { @@ -215,9 +215,9 @@ private: intf_thread_t *p_intf; int i_sash_position; int i_width; - vlc_bool_t b_video; + bool b_video; mtime_t i_delay; - vlc_bool_t b_show_on_start; + bool b_show_on_start; }; BEGIN_EVENT_TABLE(Splitter, wxSplitterWindow) @@ -348,7 +348,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ): { /* Initializations */ p_intf = _p_intf; - b_extra = VLC_FALSE; + b_extra = false; extra_frame = 0; playlist_manager = 0; i_update_counter = 0; @@ -471,7 +471,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ): var_Create( p_intf, "interaction", VLC_VAR_ADDRESS ); var_AddCallback( p_intf, "interaction", InteractCallback, this ); - p_intf->b_interaction = VLC_TRUE; + p_intf->b_interaction = true; /* Show embedded playlist if requested */ if( splitter->ShowOnStart() ) OnSmallPlaylist( dummy ); @@ -498,7 +498,7 @@ Interface::~Interface() #endif #endif - p_intf->b_interaction = VLC_FALSE; + p_intf->b_interaction = false; var_DelCallback( p_intf, "interaction", InteractCallback, this ); delete p_intf->p_sys->p_wxwindow; @@ -517,7 +517,6 @@ void Interface::Init() void Interface::Update() { /* Misc updates */ -// if( !(i_update_counter % 10) ) ((VLCVolCtrl *)volctrl)->UpdateVolume(); if( playlist_manager ) playlist_manager->Update(); @@ -1076,12 +1075,10 @@ void Interface::OnPlayStream( wxCommandEvent& WXUNUSED(event) ) void Interface::PlayStream() { wxCommandEvent dummy; - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t *p_playlist = pl_Yield( p_intf ); if( p_playlist == NULL ) return; - if( !playlist_IsEmpty(p_playlist) && p_playlist->i_enabled ) + if( !playlist_IsEmpty(p_playlist) ) { vlc_value_t state; @@ -1092,7 +1089,7 @@ void Interface::PlayStream() { /* No stream was playing, start one */ playlist_Play( p_playlist ); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); input_manager->Update(); return; } @@ -1111,13 +1108,13 @@ void Interface::PlayStream() var_Set( p_input, "state", state ); vlc_object_release( p_input ); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); input_manager->Update(); } else { /* If the playlist is empty, open a file requester instead */ - vlc_object_release( p_playlist ); + pl_Release( p_intf ); OnShowDialog( dummy ); GetToolBar()->ToggleTool( PlayStream_Event, false ); } @@ -1129,16 +1126,14 @@ void Interface::OnStopStream( wxCommandEvent& WXUNUSED(event) ) } void Interface::StopStream() { - playlist_t * p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_intf ); if( p_playlist == NULL ) { return; } playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); input_manager->Update(); } @@ -1149,16 +1144,14 @@ void Interface::OnPrevStream( wxCommandEvent& WXUNUSED(event) ) void Interface::PrevStream() { - playlist_t * p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_intf ); if( p_playlist == NULL ) { return; } playlist_Prev( p_playlist ); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } void Interface::OnNextStream( wxCommandEvent& WXUNUSED(event) ) @@ -1168,15 +1161,13 @@ void Interface::OnNextStream( wxCommandEvent& WXUNUSED(event) ) void Interface::NextStream() { - playlist_t * p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_intf ); if( p_playlist == NULL ) { return; } playlist_Next( p_playlist ); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } void Interface::OnSlowStream( wxCommandEvent& WXUNUSED(event) ) @@ -1186,7 +1177,7 @@ void Interface::OnSlowStream( wxCommandEvent& WXUNUSED(event) ) FIND_ANYWHERE ); if( p_input ) { - vlc_value_t val; val.b_bool = VLC_TRUE; + vlc_value_t val; val.b_bool = true; var_Set( p_input, "rate-slower", val ); vlc_object_release( p_input ); @@ -1200,7 +1191,7 @@ void Interface::OnFastStream( wxCommandEvent& WXUNUSED(event) ) FIND_ANYWHERE ); if( p_input ) { - vlc_value_t val; val.b_bool = VLC_TRUE; + vlc_value_t val; val.b_bool = true; var_Set( p_input, "rate-faster", val ); vlc_object_release( p_input ); @@ -1223,8 +1214,8 @@ void Interface::SyncVolume() audio_volume_t i_volume; aout_VolumeGet(p_intf, &i_volume); -// Updating the Mute Button... IF the slider is completely moved to the left, -// the mute icon is shown too. + /* Updating the Mute Button... IF the slider is completely moved to the left, + * the mute icon is shown too. */ p_tool->SetNormalBitmap( wxBitmap( i_volume ? speaker_xpm : speaker_mute_xpm ) ); GetToolBar()->Realize(); #if defined( __WXMSW__ ) @@ -1233,7 +1224,8 @@ void Interface::SyncVolume() GetToolBar()->GetSize().GetHeight() ); GetToolBar()->Update(); #endif -// the Toggle to true and false is nescessary; otherwise, the Icon is not repainted + /* the Toggle to true and false is nescessary; otherwise, the Icon + * is not repainted */ GetToolBar()->ToggleTool( ToggleMute_Event, true ); GetToolBar()->ToggleTool( ToggleMute_Event, false ); GetToolBar()->Update(); @@ -1313,7 +1305,7 @@ static int InteractCallback( vlc_object_t *p_this, /***************************************************************************** * Definition of DragAndDrop class. *****************************************************************************/ -DragAndDrop::DragAndDrop( intf_thread_t *_p_intf, vlc_bool_t _b_enqueue ) +DragAndDrop::DragAndDrop( intf_thread_t *_p_intf, bool _b_enqueue ) { p_intf = _p_intf; b_enqueue = _b_enqueue; @@ -1323,10 +1315,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord, const wxArrayString& filenames ) { /* Add dropped files to the playlist */ - - playlist_t *p_playlist = - (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t *p_playlist = pl_Yield( p_intf ); if( p_playlist == NULL ) { return FALSE; @@ -1340,11 +1329,11 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord, VLC_OBJECT_INPUT, FIND_ANYWHERE ); if( p_input ) { - if( input_AddSubtitles( p_input, psz_utf8, VLC_TRUE ) ) + if( input_AddSubtitles( p_input, psz_utf8, true ) ) { vlc_object_release( p_input ); wxDnDLocaleFree( psz_utf8 ); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); return TRUE; } vlc_object_release( p_input ); @@ -1358,12 +1347,11 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord, playlist_Add( p_playlist, psz_utf8, NULL, PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO), - PLAYLIST_END, VLC_TRUE, VLC_FALSE ); + PLAYLIST_END, true, false ); wxDnDLocaleFree( psz_utf8 ); } - - vlc_object_release( p_playlist ); + pl_Release( p_intf ); return TRUE; }