mirror of
https://github.com/mpv-player/mpv
synced 2025-01-12 01:49:33 +00:00
- fix fuckin' locale (?:)
- fix msg box layer handling git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6899 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e31043bcb9
commit
432de7091c
@ -8,10 +8,6 @@
|
||||
#include "../mplayer.h"
|
||||
#include "../cfgparser.h"
|
||||
|
||||
#ifdef USE_I18N
|
||||
#include <locale.h>
|
||||
#endif
|
||||
|
||||
#include "../../libvo/video_out.h"
|
||||
|
||||
#include "cfg.h"
|
||||
@ -166,10 +162,6 @@ int cfg_write( void )
|
||||
FILE * f;
|
||||
int i;
|
||||
|
||||
#ifdef USE_I18N
|
||||
setlocale( LC_ALL,"" );
|
||||
#endif
|
||||
|
||||
// -- save configuration
|
||||
if ( (f=fopen( cfg,"wt+" )) )
|
||||
{
|
||||
|
@ -79,11 +79,18 @@ void gset( char ** str,char * what )
|
||||
void guiInit( void )
|
||||
{
|
||||
memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) );
|
||||
guiIntfStruct.Balance=50.0f;
|
||||
guiIntfStruct.StreamType=-1;
|
||||
|
||||
memset( >kEquChannels,0,sizeof( gtkEquChannels ) );
|
||||
gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
|
||||
gtkAOOSSDevice=strdup( PATH_DEV_DSP );
|
||||
// cfg_read(); // !!! moved to Gui/mplayer/mplayer.c::mplInit() after gtkInit()
|
||||
|
||||
gtkInit();
|
||||
|
||||
cfg_read();
|
||||
appInit( (void*)mDisplay );
|
||||
|
||||
if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name );
|
||||
#if defined( USE_OSD ) || defined( USE_SUB )
|
||||
guiLoadFont();
|
||||
|
@ -16,9 +16,8 @@ int gtkVMessageBox = 0;
|
||||
|
||||
void ShowMessageBox( char * msg )
|
||||
{
|
||||
if ( gtkVMessageBox ) gtkActive( MessageBox );
|
||||
else MessageBox=create_MessageBox( 0 );
|
||||
gtkSetLayer( MessageBox );
|
||||
if ( gtkVMessageBox ) { gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); }
|
||||
MessageBox=create_MessageBox( 0 );
|
||||
if ( strlen( msg ) < 20 ) gtk_widget_set_usize( MessageBox,196,-1 );
|
||||
gtkIncVisible();
|
||||
}
|
||||
|
@ -45,6 +45,7 @@ void mplInit( void * disp )
|
||||
{
|
||||
int i;
|
||||
|
||||
#if 0
|
||||
// init fields of this struct to default values
|
||||
guiIntfStruct.Balance=50.0f;
|
||||
guiIntfStruct.StreamType=-1;
|
||||
@ -53,6 +54,7 @@ void mplInit( void * disp )
|
||||
|
||||
// read gui.conf, gui.pl
|
||||
cfg_read();
|
||||
#endif
|
||||
|
||||
// opens X display, checks for extensions (XShape, DGA etc)
|
||||
wsXInit( disp );
|
||||
@ -113,7 +115,7 @@ void mplInit( void * disp )
|
||||
if ( !appMPlayer.mainDecoration ) wsWindowDecoration( &appMPlayer.mainWindow,0 );
|
||||
|
||||
wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
|
||||
#if 0
|
||||
#if 1
|
||||
wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
|
||||
|
||||
{
|
||||
|
@ -148,6 +148,7 @@ void gtkMessageBox( int type,gchar * str )
|
||||
}
|
||||
gtk_widget_show( MessageBox );
|
||||
gtkSetLayer( MessageBox );
|
||||
gtkActive( MessageBox );
|
||||
if ( type == GTK_MB_FATAL )
|
||||
while ( gtkVMessageBox ) gtk_main_iteration_do( 0 );
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user