Commit 2db814a2 authored by Sam Hocevar's avatar Sam Hocevar
Browse files

* ./modules/gui/kde/kde.cpp: the interface rc file defaults to the one in

    DATA_PATH.
  * ./modules/gui/wxwindows/*.cpp: fixed minor warnings.
parent 9fec72f3
......@@ -387,7 +387,7 @@ void KInterface::slotUpdateLanguages()
p_audio_es = NULL;
p_spu_es = NULL;
for( int i = 0 ;
for( unsigned int i = 0 ;
i < p_intf->p_sys->p_input->stream.i_selected_es_number ;
i++
)
......@@ -440,7 +440,9 @@ void KInterface::languageMenus(KActionMenu *root, es_descriptor_t *p_es,
#define ES p_intf->p_sys->p_input->stream.pp_es[i]
/* create a set of language buttons and append them to the container */
for( int i = 0 ; i < p_intf->p_sys->p_input->stream.i_es_number ; i++ )
for( unsigned int i = 0 ;
i < p_intf->p_sys->p_input->stream.i_es_number ;
i++ )
{
if( ( ES->i_cat == i_cat ) &&
( !ES->p_pgrm ||
......
......@@ -2,7 +2,7 @@
* kde.cpp : KDE plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: kde.cpp,v 1.5 2003/01/15 13:16:39 sam Exp $
* $Id: kde.cpp,v 1.6 2003/01/28 21:08:29 sam Exp $
*
* Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
*
......@@ -50,17 +50,12 @@ static void run(intf_thread_t *p_intf);
* Module descriptor
*****************************************************************************/
vlc_module_begin();
#ifdef WIN32
int i = 90;
#else
int i = getenv( "DISPLAY" ) == NULL ? 8 : 85;
#endif
add_category_hint( "kde", NULL );
add_file( "kdeuirc", "", NULL, N_( "Path to ui.rc file" ), NULL );
add_file( "kdeuirc", DATA_PATH "/ui.rc", NULL, N_( "path to ui.rc file" ), NULL );
set_description( _("KDE interface module") );
set_capability( "interface", i );
set_program( "kvlc" );
//set_callbacks( E_(Open), E_(Close) );
set_callbacks( open, close );
vlc_module_end();
......
......@@ -32,7 +32,9 @@ void KTitleMenu::regenerateSlot()
int i_item = 0;
vlc_mutex_lock( &fInterfaceThread->p_sys->p_input->stream.stream_lock );
for( int i = 0 ; i < fInterfaceThread->p_sys->p_input->stream.i_es_number ; i++ )
for( unsigned int i = 0 ;
i < fInterfaceThread->p_sys->p_input->stream.i_es_number ;
i++ )
{
if( fInterfaceThread->p_sys->p_input->stream.pp_es[i]->i_cat /* == i_cat */ )
{
......
......@@ -2,7 +2,7 @@
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: fileinfo.cpp,v 1.1 2002/12/21 11:20:30 sigmunau Exp $
* $Id: fileinfo.cpp,v 1.2 2003/01/28 21:08:29 sam Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -76,7 +76,6 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
/* Initializations */
intf_thread_t *p_intf = _p_intf;
input_thread_t *p_input;
Interface *p_main_interface = _p_main_interface;
wxTreeCtrl *tree = new wxTreeCtrl( this, -1 );
p_input = p_intf->p_sys->p_input;
......
......@@ -2,7 +2,7 @@
* timer.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: timer.cpp,v 1.9 2003/01/26 10:36:10 gbazin Exp $
* $Id: timer.cpp,v 1.10 2003/01/28 21:08:29 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -97,8 +97,6 @@ static int wxSetupMenus( intf_thread_t * p_intf )
*****************************************************************************/
void Timer::Notify()
{
int i_stop;
vlc_mutex_lock( &p_intf->change_lock );
/* If the "display popup" flag has changed */
......
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