Commit 973409ad authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/wxwindows/*: don't forget to convert the filename/author fields in the playlist to the encoding in use by the wxWindows interface.
parent 65c5b28d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc * playlist.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001, 2003 VideoLAN * Copyright (C) 2000-2001, 2003 VideoLAN
* $Id: playlist.cpp,v 1.31 2003/12/22 02:24:52 sam Exp $ * $Id: playlist.cpp,v 1.32 2003/12/22 14:31:01 gbazin Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* *
...@@ -385,12 +385,12 @@ void Playlist::Rebuild() ...@@ -385,12 +385,12 @@ void Playlist::Rebuild()
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
for( int i = 0; i < p_playlist->i_size; i++ ) for( int i = 0; i < p_playlist->i_size; i++ )
{ {
wxString filename = wxU(p_playlist->pp_items[i]->psz_name); wxString filename = wxL2U(p_playlist->pp_items[i]->psz_name);
listview->InsertItem( i, filename ); listview->InsertItem( i, filename );
listview->SetItem( i, 1, wxU(p_playlist->pp_items[i]->psz_author)); listview->SetItem( i, 1, wxL2U(p_playlist->pp_items[i]->psz_author) );
listview->SetItem( i, 2, listview->SetItem( i, 2,
wxU(playlist_FindGroup(p_playlist,p_playlist-> wxL2U(playlist_FindGroup( p_playlist,
pp_items[i]->i_group))); p_playlist->pp_items[i]->i_group )) );
if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE ) if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE )
{ {
wxListItem listitem; wxListItem listitem;
...@@ -398,21 +398,13 @@ void Playlist::Rebuild() ...@@ -398,21 +398,13 @@ void Playlist::Rebuild()
listitem.SetTextColour( *wxLIGHT_GREY); listitem.SetTextColour( *wxLIGHT_GREY);
listview->SetItem(listitem); listview->SetItem(listitem);
} }
{
char psz_duration[MSTRTIME_MAX_SIZE]; char psz_duration[MSTRTIME_MAX_SIZE];
mtime_t dur = p_playlist->pp_items[i]->i_duration; mtime_t dur = p_playlist->pp_items[i]->i_duration;
if ( dur != -1 ) if( dur != -1 ) secstotimestr( psz_duration, dur/1000000 );
{ else memcpy( psz_duration , "-:--:--", sizeof("-:--:--") );
secstotimestr( psz_duration, dur/1000000 );
}
else
{
memcpy( psz_duration ,"-:--:--", sizeof("-:--:--"));
}
listview->SetItem( i, 3, wxU(psz_duration) ); listview->SetItem( i, 3, wxU(psz_duration) );
} }
}
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
/* Change the colour for the currenty played stream */ /* Change the colour for the currenty played stream */
...@@ -592,9 +584,7 @@ void Playlist::OnUp( wxCommandEvent& event) ...@@ -592,9 +584,7 @@ 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 = -1; long i_item = listview->GetNextItem( i_item, wxLIST_NEXT_ALL,
i_item = listview->GetNextItem(i_item,
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 )
{ {
...@@ -623,10 +613,8 @@ void Playlist::OnDown( wxCommandEvent& event) ...@@ -623,10 +613,8 @@ 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 = -1; long i_item = listview->GetNextItem( i_item, wxLIST_NEXT_ALL,
i_item = listview->GetNextItem(i_item, wxLIST_STATE_SELECTED );
wxLIST_NEXT_ALL,
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 )
{ {
playlist_Move( p_playlist , i_item, i_item + 2 ); playlist_Move( p_playlist , i_item, i_item + 2 );
...@@ -754,7 +742,7 @@ void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) ) ...@@ -754,7 +742,7 @@ void Playlist::OnSearch( wxCommandEvent& WXUNUSED(event) )
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;
...@@ -948,10 +936,8 @@ void Playlist::OnInfos( wxCommandEvent& WXUNUSED(event) ) ...@@ -948,10 +936,8 @@ void Playlist::OnInfos( wxCommandEvent& WXUNUSED(event) )
if( iteminfo_dialog == NULL ) if( iteminfo_dialog == NULL )
{ {
/* We use the first selected item, so find it */ /* We use the first selected item, so find it */
long i_item = -1; long i_item = listview->GetNextItem( i_item, wxLIST_NEXT_ALL,
i_item = listview->GetNextItem(i_item, wxLIST_STATE_SELECTED );
wxLIST_NEXT_ALL,
wxLIST_STATE_SELECTED);
if( i_item >= 0 && i_item < p_playlist->i_size ) if( i_item >= 0 && i_item < p_playlist->i_size )
{ {
iteminfo_dialog = new ItemInfoDialog( iteminfo_dialog = new ItemInfoDialog(
...@@ -975,10 +961,8 @@ void Playlist::OnEnDis( wxCommandEvent& event ) ...@@ -975,10 +961,8 @@ void Playlist::OnEnDis( wxCommandEvent& event )
return; return;
} }
long i_item = -1; long i_item = listview->GetNextItem( i_item, wxLIST_NEXT_ALL,
i_item = listview->GetNextItem(i_item, wxLIST_STATE_SELECTED );
wxLIST_NEXT_ALL,
wxLIST_STATE_SELECTED);
if( i_item >= 0 && i_item < p_playlist->i_size ) if( i_item >= 0 && i_item < p_playlist->i_size )
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description * wxwindows.h: private wxWindows interface description
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: wxwindows.h,v 1.81 2003/12/16 03:21:47 rocky Exp $ * $Id: wxwindows.h,v 1.82 2003/12/22 14:31:01 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -72,6 +72,14 @@ class FileInfo; ...@@ -72,6 +72,14 @@ class FileInfo;
#endif #endif
/* wxL2U (locale to unicode) is used to convert ansi strings to unicode
* strings (wchar_t) */
#if wxUSE_UNICODE
# define wxL2U(ansi) wxString(ansi, *wxConvCurrent)
#else
# define wxL2U(ansi) ansi
#endif
#define WRAPCOUNT 80 #define WRAPCOUNT 80
#define OPEN_NORMAL 0 #define OPEN_NORMAL 0
......
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