Skip to content

V
vlc
Commit c05cb268 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/gui/wxwindows/*: a whole bunch of bug-fixes spotted by running the debug build of wxWindows.
parent a8d51df7
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 42 deletions
modules/gui/wxwindows/menus.cpp
View file @ c05cb268
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* menus.cpp : wxWindows plugin for vlc * menus.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: menus.cpp,v 1.31 2004/02/24 22:15:41 gbazin Exp $ * $Id: menus.cpp,v 1.32 2004/02/26 00:23:04 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -646,7 +646,8 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object, ...@@ -646,7 +646,8 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object,
menu->Append( menuitem ); menu->Append( menuitem );
if( !strcmp( val.psz_string, if( !(i_type & VLC_VAR_ISCOMMAND) &&
!strcmp( val.psz_string,
val_list.p_list->p_values[i].psz_string ) ) val_list.p_list->p_values[i].psz_string ) )
menu->Check( i_item_id, TRUE ); menu->Check( i_item_id, TRUE );
break; break;
...@@ -667,7 +668,8 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object, ...@@ -667,7 +668,8 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object,
menu->Append( menuitem ); menu->Append( menuitem );
if( val_list.p_list->p_values[i].i_int == val.i_int ) if( !(i_type & VLC_VAR_ISCOMMAND) &&
val_list.p_list->p_values[i].i_int == val.i_int )
menu->Check( i_item_id, TRUE ); menu->Check( i_item_id, TRUE );
break; break;
......
modules/gui/wxwindows/playlist.cpp
View file @ c05cb268
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc * playlist.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: playlist.cpp,v 1.43 2004/02/24 18:19:44 zorglub Exp $ * $Id: playlist.cpp,v 1.44 2004/02/26 00:23:04 gbazin Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* *
...@@ -171,10 +171,11 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): ...@@ -171,10 +171,11 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
wxFrame( p_parent, -1, wxU(_("Playlist")), wxDefaultPosition, wxFrame( p_parent, -1, wxU(_("Playlist")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE ) wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{ {
vlc_value_t val;
/* Initializations */ /* Initializations */
iteminfo_dialog = NULL; iteminfo_dialog = NULL;
p_intf = _p_intf; p_intf = _p_intf;
vlc_value_t val;
i_update_counter = 0; i_update_counter = 0;
i_sort_mode = MODE_NONE; i_sort_mode = MODE_NONE;
b_need_update = VLC_FALSE; b_need_update = VLC_FALSE;
...@@ -186,7 +187,6 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): ...@@ -186,7 +187,6 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
i_group_sorted = 0; i_group_sorted = 0;
i_duration_sorted = 0; i_duration_sorted = 0;
var_Create( p_intf, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_intf, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_intf, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_intf, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_intf, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );; var_Create( p_intf, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );;
...@@ -340,8 +340,10 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): ...@@ -340,8 +340,10 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
top_sizer->Layout(); top_sizer->Layout();
wxBoxSizer *bottom_sizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *bottom_sizer = new wxBoxSizer( wxHORIZONTAL );
bottom_sizer->Add( updown_sizer, 0, wxEXPAND |wxRIGHT | wxLEFT | wxALIGN_LEFT, 4); bottom_sizer->Add( updown_sizer, 0,
bottom_sizer->Add( button_sizer , 0, wxEXPAND|wxLEFT | wxRIGHT | wxALIGN_RIGHT, 4 ); wxEXPAND |wxRIGHT | wxLEFT | wxALIGN_LEFT, 4 );
bottom_sizer->Add( button_sizer , 0,
wxEXPAND|wxLEFT | wxRIGHT | wxALIGN_RIGHT, 4 );
bottom_sizer->Layout(); bottom_sizer->Layout();
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
...@@ -411,6 +413,8 @@ Playlist::~Playlist() ...@@ -411,6 +413,8 @@ Playlist::~Playlist()
**********************************************************************/ **********************************************************************/
void Playlist::UpdateItem( int i ) void Playlist::UpdateItem( int i )
{ {
if( i < 0 ) return; /* Sanity check */
playlist_t *p_playlist = playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
...@@ -494,12 +498,12 @@ void Playlist::Rebuild() ...@@ -494,12 +498,12 @@ void Playlist::Rebuild()
} }
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
if( i_focused ) if( i_focused >= 0 && i_focused < p_playlist->i_size )
{ {
listview->Focus( i_focused ); listview->Focus( i_focused );
listview->Select( i_focused ); listview->Select( i_focused );
} }
else else if( p_playlist->i_index >= 0 )
{ {
listview->Focus( p_playlist->i_index ); listview->Focus( p_playlist->i_index );
} }
...@@ -524,7 +528,7 @@ void Playlist::UpdatePlaylist() ...@@ -524,7 +528,7 @@ void Playlist::UpdatePlaylist()
vlc_mutex_lock( &lock ); vlc_mutex_lock( &lock );
if( this->b_need_update ) if( this->b_need_update )
{ {
b_need_update =VLC_TRUE; b_need_update = VLC_TRUE;
this->b_need_update = VLC_FALSE; this->b_need_update = VLC_FALSE;
} }
vlc_mutex_unlock( &lock ); vlc_mutex_unlock( &lock );
...@@ -546,7 +550,6 @@ void Playlist::UpdatePlaylist() ...@@ -546,7 +550,6 @@ void Playlist::UpdatePlaylist()
} }
/* Update the colour of items */ /* Update the colour of items */
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
if( p_intf->p_sys->i_playing != p_playlist->i_index ) if( p_intf->p_sys->i_playing != p_playlist->i_index )
{ {
...@@ -564,6 +567,7 @@ void Playlist::UpdatePlaylist() ...@@ -564,6 +567,7 @@ void Playlist::UpdatePlaylist()
p_intf->p_sys->i_playing = p_playlist->i_index; p_intf->p_sys->i_playing = p_playlist->i_index;
} }
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
...@@ -641,8 +645,8 @@ void Playlist::OnOpen( wxCommandEvent& WXUNUSED(event) ) ...@@ -641,8 +645,8 @@ void Playlist::OnOpen( wxCommandEvent& WXUNUSED(event) )
return; return;
} }
wxFileDialog dialog( this, wxU(_("Open playlist")), wxFileDialog dialog( this, wxU(_("Open playlist")), wxT(""), wxT(""),
wxT(""), wxT(""), wxT("All playlists|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"), wxOPEN ); wxT("All playlists|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"), wxOPEN );
if( dialog.ShowModal() == wxID_OK ) if( dialog.ShowModal() == wxID_OK )
{ {
...@@ -673,7 +677,7 @@ void Playlist::OnAddMRL( wxCommandEvent& WXUNUSED(event) ) ...@@ -673,7 +677,7 @@ void Playlist::OnAddMRL( wxCommandEvent& WXUNUSED(event) )
/******************************************************************** /********************************************************************
* Move functions * Move functions
********************************************************************/ ********************************************************************/
void Playlist::OnUp( wxCommandEvent& event) void Playlist::OnUp( wxCommandEvent& event )
{ {
playlist_t *p_playlist = playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
...@@ -684,25 +688,18 @@ void Playlist::OnUp( wxCommandEvent& event) ...@@ -684,25 +688,18 @@ void Playlist::OnUp( wxCommandEvent& event)
} }
/* We use the first selected item, so find it */ /* We use the first selected item, so find it */
long i_item = listview->GetNextItem( i_item, wxLIST_NEXT_ALL, long i_item = listview->GetNextItem( -1, wxLIST_NEXT_ALL,
wxLIST_STATE_SELECTED); wxLIST_STATE_SELECTED);
if( i_item > 0 && i_item < p_playlist->i_size ) if( i_item > 0 && i_item < p_playlist->i_size )
{ {
playlist_Move( p_playlist , i_item, i_item - 1); playlist_Move( p_playlist, i_item, i_item - 1 );
if( i_item > 1 )
{
listview->Focus( i_item - 1 ); listview->Focus( i_item - 1 );
} }
else
{
listview->Focus(0);
}
}
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return; return;
} }
void Playlist::OnDown( wxCommandEvent& event) void Playlist::OnDown( wxCommandEvent& event )
{ {
playlist_t *p_playlist = playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
...@@ -713,7 +710,7 @@ void Playlist::OnDown( wxCommandEvent& event) ...@@ -713,7 +710,7 @@ void Playlist::OnDown( wxCommandEvent& event)
} }
/* We use the first selected item, so find it */ /* We use the first selected item, so find it */
long i_item = listview->GetNextItem( i_item, wxLIST_NEXT_ALL, long i_item = listview->GetNextItem( -1, wxLIST_NEXT_ALL,
wxLIST_STATE_SELECTED ); wxLIST_STATE_SELECTED );
if( i_item >= 0 && i_item < p_playlist->i_size - 1 ) if( i_item >= 0 && i_item < p_playlist->i_size - 1 )
{ {
...@@ -846,23 +843,23 @@ void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -846,23 +843,23 @@ void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) )
void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) ) void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) )
{ {
wxString search_string= search_text->GetValue(); wxString search_string = search_text->GetValue();
int i_current; int i_current;
int i_first = 0 ; int i_first = 0 ;
int i_item = -1; int i_item = -1;
for( i_current = 0 ; i_current <= listview->GetItemCount() ; i_current++ ) for( i_current = 0; i_current < listview->GetItemCount(); i_current++ )
{ {
if( listview->GetItemState( i_current, wxLIST_STATE_SELECTED ) if( listview->GetItemState( i_current, wxLIST_STATE_SELECTED ) ==
== wxLIST_STATE_SELECTED ) wxLIST_STATE_SELECTED )
{ {
i_first = i_current; i_first = i_current;
break; break;
} }
} }
for ( i_current = i_first + 1; i_current <= listview->GetItemCount() ; for( i_current = i_first + 1; i_current < listview->GetItemCount();
i_current++ ) i_current++ )
{ {
wxListItem listitem; wxListItem listitem;
...@@ -874,6 +871,9 @@ void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) ) ...@@ -874,6 +871,9 @@ void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) )
break; break;
} }
} }
if( i_item < 0 || i_item >= listview->GetItemCount() ) return;
for( long item = 0; item < listview->GetItemCount(); item++ ) for( long item = 0; item < listview->GetItemCount(); item++ )
{ {
listview->Select( item, FALSE ); listview->Select( item, FALSE );
...@@ -1118,7 +1118,6 @@ void Playlist::OnPopup( wxListEvent& event ) ...@@ -1118,7 +1118,6 @@ void Playlist::OnPopup( wxListEvent& event )
Playlist::PopupMenu( popup_menu , ScreenToClient( wxGetMousePosition() ) ); Playlist::PopupMenu( popup_menu , ScreenToClient( wxGetMousePosition() ) );
} }
void Playlist::OnPopupPlay( wxMenuEvent& event ) void Playlist::OnPopupPlay( wxMenuEvent& event )
{ {
playlist_t *p_playlist = playlist_t *p_playlist =
...@@ -1206,9 +1205,9 @@ int PlaylistNext( vlc_object_t *p_this, const char *psz_variable, ...@@ -1206,9 +1205,9 @@ int PlaylistNext( vlc_object_t *p_this, const char *psz_variable,
wxCommandEvent event( wxEVT_PLAYLIST, UpdateItem_Event ); wxCommandEvent event( wxEVT_PLAYLIST, UpdateItem_Event );
event.SetInt( old_val.i_int ); event.SetInt( old_val.i_int );
p_playlist_dialog->ProcessEvent( event ); p_playlist_dialog->AddPendingEvent( event );
event.SetInt( new_val.i_int ); event.SetInt( new_val.i_int );
p_playlist_dialog->ProcessEvent( event ); p_playlist_dialog->AddPendingEvent( event );
return 0; return 0;
} }
...@@ -1223,7 +1222,7 @@ int ItemChanged( vlc_object_t *p_this, const char *psz_variable, ...@@ -1223,7 +1222,7 @@ int ItemChanged( vlc_object_t *p_this, const char *psz_variable,
wxCommandEvent event( wxEVT_PLAYLIST, UpdateItem_Event ); wxCommandEvent event( wxEVT_PLAYLIST, UpdateItem_Event );
event.SetInt( new_val.i_int ); event.SetInt( new_val.i_int );
p_playlist_dialog->ProcessEvent( event ); p_playlist_dialog->AddPendingEvent( event );
return 0; return 0;
} }
......
modules/gui/wxwindows/preferences.cpp
View file @ c05cb268
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* preferences.cpp : wxWindows plugin for vlc * preferences.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: preferences.cpp,v 1.47 2004/02/06 03:52:09 hartman Exp $ * $Id: preferences.cpp,v 1.48 2004/02/26 00:23:04 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -459,8 +459,8 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf, ...@@ -459,8 +459,8 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
i_child_index < GetChildrenCount( plugins_item, FALSE ); i_child_index < GetChildrenCount( plugins_item, FALSE );
i_child_index++ ) i_child_index++ )
{ {
capability_item = GetNextChild( plugins_item, cookie );
SortChildren( capability_item ); SortChildren( capability_item );
capability_item = GetNextChild( plugins_item, cookie );
} }
/* Clean-up everything */ /* Clean-up everything */
...@@ -627,8 +627,9 @@ ConfigTreeData *PrefsTreeCtrl::FindModuleConfig( ConfigTreeData *config_data ) ...@@ -627,8 +627,9 @@ ConfigTreeData *PrefsTreeCtrl::FindModuleConfig( ConfigTreeData *config_data )
void PrefsTreeCtrl::OnSelectTreeItem( wxTreeEvent& event ) void PrefsTreeCtrl::OnSelectTreeItem( wxTreeEvent& event )
{ {
ConfigTreeData *config_data; ConfigTreeData *config_data = NULL;
if( event.GetOldItem() )
config_data = FindModuleConfig( (ConfigTreeData *)GetItemData( config_data = FindModuleConfig( (ConfigTreeData *)GetItemData(
event.GetOldItem() ) ); event.GetOldItem() ) );
if( config_data && config_data->panel ) if( config_data && config_data->panel )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment