From 4173f771256083109339bdaf26736d770023e506 Mon Sep 17 00:00:00 2001 From: pontscho Date: Sat, 2 Nov 2002 16:09:05 +0000 Subject: cleanup git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8044 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/mplayer/gtk/about.c | 2 +- Gui/mplayer/gtk/eq.c | 6 +++--- Gui/mplayer/gtk/fs.c | 2 +- Gui/mplayer/gtk/mb.c | 2 +- Gui/mplayer/gtk/menu.c | 2 +- Gui/mplayer/gtk/opts.c | 57 +++++++++++++++++++++++++++++-------------------- Gui/mplayer/gtk/pl.c | 2 +- Gui/mplayer/gtk/sb.c | 4 ++-- Gui/mplayer/gtk/url.c | 4 ++-- Gui/mplayer/mplayer.c | 16 -------------- Gui/mplayer/mw.h | 4 +++- Gui/mplayer/widgets.c | 21 +++--------------- Gui/mplayer/widgets.h | 1 - 13 files changed, 52 insertions(+), 71 deletions(-) (limited to 'Gui/mplayer') diff --git a/Gui/mplayer/gtk/about.c b/Gui/mplayer/gtk/about.c index b30ba3e051..b828219cee 100644 --- a/Gui/mplayer/gtk/about.c +++ b/Gui/mplayer/gtk/about.c @@ -1,5 +1,5 @@ -#include "../../events.h" +#include "../../app.h" #include "../../../config.h" #include "../../../help_mp.h" diff --git a/Gui/mplayer/gtk/eq.c b/Gui/mplayer/gtk/eq.c index 9d460cb401..4d3ff11618 100644 --- a/Gui/mplayer/gtk/eq.c +++ b/Gui/mplayer/gtk/eq.c @@ -9,7 +9,7 @@ #include #include -#include "../../events.h" +#include "../../app.h" #include "../../cfg.h" #include "../../help_mp.h" #include "../../../config.h" @@ -290,7 +290,7 @@ GtkWidget * create_Equalizer( void ) accel_group=gtk_accel_group_new(); - Equalizer=gtk_window_new( GTK_WINDOW_DIALOG ); + Equalizer=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_name( Equalizer,MSGTR_Equalizer ); gtk_object_set_data( GTK_OBJECT( Equalizer ),MSGTR_Equalizer,Equalizer ); gtk_widget_set_usize( Equalizer,550,256 ); @@ -846,7 +846,7 @@ GtkWidget * create_EquConfig( void ) accel_group=gtk_accel_group_new(); - EquConfig=gtk_window_new( GTK_WINDOW_DIALOG ); + EquConfig=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_name( EquConfig,"EquConfig" ); gtk_object_set_data( GTK_OBJECT( EquConfig ),"EquConfig",EquConfig ); gtk_widget_set_usize( EquConfig,350,198 ); diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c index e363cd142c..a4ed811010 100644 --- a/Gui/mplayer/gtk/fs.c +++ b/Gui/mplayer/gtk/fs.c @@ -12,7 +12,7 @@ #include "mplayer/pixmaps/dir.xpm" #include "mplayer/pixmaps/file.xpm" -#include "../../events.h" +#include "../../app.h" #include "../../interface.h" #include "../../../config.h" #include "../../../help_mp.h" diff --git a/Gui/mplayer/gtk/mb.c b/Gui/mplayer/gtk/mb.c index 2593c21d6e..6b5ddc8bb3 100644 --- a/Gui/mplayer/gtk/mb.c +++ b/Gui/mplayer/gtk/mb.c @@ -1,5 +1,5 @@ -#include "../../events.h" +#include "../../app.h" #include "../../../config.h" #include "../../../help_mp.h" diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c index 638cd78494..093ab95f84 100644 --- a/Gui/mplayer/gtk/menu.c +++ b/Gui/mplayer/gtk/menu.c @@ -7,7 +7,7 @@ #include "../../../help_mp.h" #include "../../../mplayer.h" -#include "../../events.h" +#include "../../app.h" #include "menu.h" #include "../widgets.h" diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 35f0592342..ec15ae681d 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -425,7 +425,7 @@ void prButton( GtkButton * button,gpointer user_data ) gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) ); gtkAONoSound=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoSound ) ); gtkSet( gtkSetExtraStereo,HSExtraStereoMuladj->value,NULL ); - gtkSet( gtkSetAudioDelay,HSAudioDelayadj->value,NULL ); + audio_delay=HSAudioDelayadj->value; gaddlist( &audio_driver_list,ao_driver[0] ); gaddlist( &video_driver_list,vo_driver[0] ); @@ -442,13 +442,13 @@ void prButton( GtkButton * button,gpointer user_data ) if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBFlip ) ) ) flip=1; // -- 3. page - gtkSet( gtkSetSubAuto,!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) ),NULL ); + sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) ); gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) ); gtkSubDumpSrt=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpSrt ) ); sub_unicode=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubUnicode ) ); - gtkSet( gtkSetSubDelay,HSSubDelayadj->value,NULL ); - gtkSet( gtkSetSubFPS,HSSubFPSadj->value,NULL ); - gtkSet( gtkSetSubPos,HSSubPositionadj->value,NULL ); + sub_delay=HSSubDelayadj->value; + sub_fps=HSSubFPSadj->value; + sub_pos=(int)HSSubPositionadj->value; if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDNone ) ) ) osd_level=0; if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDIndicator ) ) ) osd_level=1; if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTandP ) ) ) osd_level=2; @@ -475,8 +475,8 @@ void prButton( GtkButton * button,gpointer user_data ) gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) ); gtkSet( gtkSetAutoq,HSPPQualityadj->value,NULL ); - if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) gtkSet( gtkSetCacheSize,SBCacheadj->value,NULL ); - else gtkSet( gtkSetCacheSize,0,NULL ); + if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) stream_cache_size=SBCacheadj->value; + else stream_cache_size=0; { int i; @@ -529,16 +529,16 @@ static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer u gtkSet( gtkSetExtraStereo,HSExtraStereoMuladj->value,NULL ); break; case 1: // audio delay - gtkSet( gtkSetAudioDelay,HSAudioDelayadj->value,NULL ); + audio_delay=HSAudioDelayadj->value; break; case 2: // panscan gtkSet( gtkSetPanscan,HSPanscanadj->value,NULL ); break; case 3: // sub delay - gtkSet( gtkSetSubDelay,HSSubDelayadj->value,NULL ); + sub_delay=HSSubDelayadj->value; break; case 4: // sub position - gtkSet( gtkSetSubPos,HSSubPositionadj->value,NULL ); + sub_pos=(int)HSSubPositionadj->value; break; case 5: // font factor #ifndef HAVE_FREETYPE @@ -682,14 +682,9 @@ GtkWidget * create_Preferences( void ) accel_group=gtk_accel_group_new(); - Preferences=gtk_window_new( GTK_WINDOW_DIALOG ); + Preferences=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_name( Preferences,"Preferences" ); gtk_object_set_data( GTK_OBJECT( Preferences ),"Preferences",Preferences ); -//#ifndef HAVE_FREETYPE -// gtk_widget_set_usize( Preferences,512,400 ); -//#else -// gtk_widget_set_usize( Preferences,612,565 ); -//#endif gtk_window_set_title( GTK_WINDOW( Preferences ),MSGTR_Preferences ); gtk_window_set_position( GTK_WINDOW( Preferences ),GTK_WIN_POS_CENTER ); // gtk_window_set_policy( GTK_WINDOW( Preferences ),FALSE,FALSE,FALSE ); @@ -2000,7 +1995,7 @@ GtkWidget * create_OSSConfig( void ) accel_group=gtk_accel_group_new(); - OSSConfig=gtk_window_new( GTK_WINDOW_DIALOG ); + OSSConfig=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_name( OSSConfig,"OSSConfig" ); gtk_object_set_data( GTK_OBJECT( OSSConfig ),"OSSConfig",OSSConfig ); gtk_widget_set_usize( OSSConfig,270,92 ); @@ -2184,8 +2179,12 @@ static GtkWidget * DXR3Config; static GtkWidget * CBDevice; static GtkWidget * CEDXR3Device; static GtkWidget * RBVNone; -static GtkWidget * RBVLavc; -static GtkWidget * RBVFame; +#ifdef USE_LIBAVCODEC + static GtkWidget * RBVLavc; +#endif +#ifdef USE_LIBFAME + static GtkWidget * RBVFame; +#endif static GtkWidget * dxr3BOk; static GtkWidget * dxr3BCancel; @@ -2201,8 +2200,12 @@ void ShowDXR3Config( void ) gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),gtkDXR3Device ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVNone ),TRUE ); +#ifdef USE_LIBAVCODEC if ( gtkVopLAVC ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVLavc ),TRUE ); +#endif +#ifdef USE_LIBFAME if ( gtkVopFAME ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVFame ),TRUE ); +#endif gtk_widget_show( DXR3Config ); gtkSetLayer( DXR3Config ); @@ -2223,8 +2226,12 @@ static void dxr3Button( GtkButton * button,gpointer user_data ) { case 0: // Ok gfree( (void **)>kDXR3Device ); gtkDXR3Device=strdup( gtk_entry_get_text( GTK_ENTRY( CEDXR3Device ) ) ); +#ifdef USE_LIBAVCODEC gtkVopLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) ); +#endif +#ifdef USE_LIBFAME gtkVopFAME=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVFame ) ); +#endif case 2: // Destroy case 1: // Cancel HideDXR3Config(); @@ -2259,10 +2266,10 @@ GtkWidget * create_DXR3Config( void ) accel_group=gtk_accel_group_new(); - DXR3Config=gtk_window_new( GTK_WINDOW_DIALOG ); + DXR3Config=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_name( DXR3Config,"DXR3Config" ); gtk_object_set_data( GTK_OBJECT( DXR3Config ),"DXR3Config",DXR3Config ); - gtk_widget_set_usize( DXR3Config,300,156 ); +// gtk_widget_set_usize( DXR3Config,300,156 ); GTK_WIDGET_SET_FLAGS( DXR3Config,GTK_CAN_DEFAULT ); gtk_window_set_title( GTK_WINDOW( DXR3Config ),"DXR3/H+" ); gtk_window_set_position( GTK_WINDOW( DXR3Config ),GTK_WIN_POS_CENTER ); @@ -2357,6 +2364,7 @@ GtkWidget * create_DXR3Config( void ) gtk_widget_show( CEDXR3Device ); gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),"/dev/em8300" ); +#if defined( USE_LIBAVCODEC ) || defined( USE_LIBFAME ) hseparator2=gtk_hseparator_new(); gtk_widget_set_name( hseparator2,"hseparator2" ); gtk_widget_ref( hseparator2 ); @@ -2390,6 +2398,7 @@ GtkWidget * create_DXR3Config( void ) gtk_box_pack_start( GTK_BOX( vbox3 ),RBVNone,FALSE,FALSE,0 ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVNone ),TRUE ); +#ifdef USE_LIBAVCODEC RBVLavc=gtk_radio_button_new_with_label( VEncoder_group,MSGTR_PREFERENCES_DXR3_LAVC ); VEncoder_group=gtk_radio_button_group( GTK_RADIO_BUTTON( RBVLavc ) ); gtk_widget_set_name( RBVLavc,"RBVLavc" ); @@ -2397,7 +2406,9 @@ GtkWidget * create_DXR3Config( void ) gtk_object_set_data_full( GTK_OBJECT( DXR3Config ),"RBVLavc",RBVLavc,(GtkDestroyNotify)gtk_widget_unref ); gtk_widget_show( RBVLavc ); gtk_box_pack_start( GTK_BOX( vbox3 ),RBVLavc,FALSE,FALSE,0 ); +#endif +#ifdef USE_LIBFAME RBVFame=gtk_radio_button_new_with_label( VEncoder_group,MSGTR_PREFERENCES_DXR3_FAME ); VEncoder_group=gtk_radio_button_group( GTK_RADIO_BUTTON( RBVFame ) ); gtk_widget_set_name( RBVFame,"RBVFame" ); @@ -2405,6 +2416,8 @@ GtkWidget * create_DXR3Config( void ) gtk_object_set_data_full( GTK_OBJECT( DXR3Config ),"RBVFame",RBVFame,(GtkDestroyNotify)gtk_widget_unref ); gtk_widget_show( RBVFame ); gtk_box_pack_start( GTK_BOX( vbox3 ),RBVFame,FALSE,FALSE,0 ); +#endif +#endif hseparator1=gtk_hseparator_new(); gtk_widget_set_name( hseparator1,"hseparator1" ); @@ -2431,7 +2444,6 @@ GtkWidget * create_DXR3Config( void ) gtk_object_set_data_full( GTK_OBJECT( DXR3Config ),"dxr3BOk",dxr3BOk,(GtkDestroyNotify)gtk_widget_unref ); gtk_widget_show( dxr3BOk ); gtk_container_add( GTK_CONTAINER( hbuttonbox1 ),dxr3BOk ); -// GTK_WIDGET_UNSET_FLAGS( bOk,GTK_CAN_FOCUS ); dxr3BCancel=gtk_button_new_with_label( MSGTR_Cancel ); gtk_widget_set_name( dxr3BCancel,"dxr3BCancel" ); @@ -2439,7 +2451,6 @@ GtkWidget * create_DXR3Config( void ) gtk_object_set_data_full( GTK_OBJECT( DXR3Config ),"dxr3BCancel",dxr3BCancel,(GtkDestroyNotify)gtk_widget_unref ); gtk_widget_show( dxr3BCancel ); gtk_container_add( GTK_CONTAINER( hbuttonbox1 ),dxr3BCancel ); -// GTK_WIDGET_UNSET_FLAGS( bCancel,GTK_CAN_FOCUS ); gtk_widget_add_accelerator( dxr3BOk,"released",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( dxr3BCancel,"released",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); diff --git a/Gui/mplayer/gtk/pl.c b/Gui/mplayer/gtk/pl.c index bfaab179e8..196cd8fc93 100644 --- a/Gui/mplayer/gtk/pl.c +++ b/Gui/mplayer/gtk/pl.c @@ -423,7 +423,7 @@ GtkWidget * create_PlayList( void ) accel_group=gtk_accel_group_new(); - PlayList=gtk_window_new( GTK_WINDOW_DIALOG ); + PlayList=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_object_set_data( GTK_OBJECT( PlayList ),"PlayList",PlayList ); gtk_widget_set_usize( PlayList,512,300 ); gtk_window_set_title( GTK_WINDOW( PlayList ),MSGTR_PlayList ); diff --git a/Gui/mplayer/gtk/sb.c b/Gui/mplayer/gtk/sb.c index c9647fd503..d99e6e5cf0 100644 --- a/Gui/mplayer/gtk/sb.c +++ b/Gui/mplayer/gtk/sb.c @@ -7,7 +7,7 @@ #include #include "sb.h" -#include "../../events.h" +#include "../../app.h" #include "../../../config.h" #include "../../../help_mp.h" @@ -135,7 +135,7 @@ GtkWidget * create_SkinBrowser( void ) accel_group = gtk_accel_group_new (); - SkinBrowser=gtk_window_new( GTK_WINDOW_DIALOG ); + SkinBrowser=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_name( SkinBrowser,MSGTR_SkinBrowser ); gtk_object_set_data( GTK_OBJECT( SkinBrowser ),MSGTR_SkinBrowser,SkinBrowser ); gtk_widget_set_usize( SkinBrowser,256,320 ); diff --git a/Gui/mplayer/gtk/url.c b/Gui/mplayer/gtk/url.c index f4d7f1669b..017efc834b 100644 --- a/Gui/mplayer/gtk/url.c +++ b/Gui/mplayer/gtk/url.c @@ -11,7 +11,7 @@ #include "url.h" #include "../../interface.h" -#include "../../events.h" +#include "../../app.h" #include "../widgets.h" #include "../../help_mp.h" @@ -113,7 +113,7 @@ GtkWidget * create_URL( void ) accel_group=gtk_accel_group_new(); - URL=gtk_window_new( GTK_WINDOW_DIALOG ); + URL=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_name( URL,"URL" ); gtk_object_set_data( GTK_OBJECT( URL ),"URL",URL ); gtk_widget_set_usize( URL,384,70 ); diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index 90f33a82be..543384837b 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -8,7 +8,6 @@ #include #include "./mplayer.h" -#include "../events.h" #include "../app.h" #include "../cfg.h" #include "../interface.h" @@ -34,7 +33,6 @@ #define mplRedrawTimerConst 5 int mplRedrawTimer = mplRedrawTimerConst; -int mplTimer = 0; void mplEventHandling( int msg,float param ); @@ -49,20 +47,6 @@ void mplInit( void * disp ) { int i; -#if 0 - // init fields of this struct to default values - guiIntfStruct.Balance=50.0f; - guiIntfStruct.StreamType=-1; - - gtkInit(); - - // read gui.conf, gui.pl - cfg_read(); - - // opens X display, checks for extensions (XShape, DGA etc) - wsXInit( disp ); -#endif - if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) { fprintf( stderr,MSGTR_NEMDB ); diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index 8c9a62f077..fd0656bd7a 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -6,6 +6,8 @@ #include "../../libvo/sub.h" #include "../../mplayer.h" +extern unsigned int GetTimerMS( void ); + unsigned char * mplDrawBuffer = NULL; int mplMainRender = 1; @@ -195,7 +197,7 @@ void mplMainDraw( wsParamDisplay ) { char * t = Translate( item->label ); int l = fntTextWidth( item->fontid,t ); - image=fntRender( item->fontid,mplTimer%(l?l:item->width),item->width,"%s",t ); + image=fntRender( item->fontid,(GetTimerMS() / 20)%(l?l:item->width),item->width,"%s",t ); } drawrenderedtext: if ( image ) diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index 81ab285246..7c9d367be2 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -18,7 +18,6 @@ #include "widgets.h" #include "./mplayer.h" -#include "../events.h" #include "../app.h" #include "../wm/ws.h" @@ -63,7 +62,6 @@ void gtkInit( void ) { mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init gtk ...\n" ); gtk_set_locale(); -// gtk_init( &argc,&argv ); gtk_init( 0,NULL ); // gdk_set_use_xshm( TRUE ); @@ -83,15 +81,8 @@ void gtkInit( void ) gtkInited=1; } -void gtkDone( void ) -{ -} - void gtkAddIcon( GtkWidget * window ) -{ - GdkWindowPrivate * win = (GdkWindowPrivate *)window->window; - wsSetIcon( gdk_display,win->xwindow,guiIcon,guiIconMask ); -} +{ wsSetIcon( gdk_display,GDK_WINDOW_XWINDOW( window->window ),guiIcon,guiIconMask ); } void gtkClearList( GtkWidget * list ) { gtk_clist_clear( GTK_CLIST( list ) ); } @@ -159,16 +150,10 @@ void gtkMessageBox( int type,gchar * str ) } void gtkSetLayer( GtkWidget * wdg ) -{ - GdkWindowPrivate * win = (GdkWindowPrivate *)wdg->window; - wsSetLayer( gdk_display,win->xwindow,appMPlayer.subWindow.isFullScreen ); -} +{ wsSetLayer( gdk_display,GDK_WINDOW_XWINDOW( wdg->window ),appMPlayer.subWindow.isFullScreen ); } void gtkActive( GtkWidget * wdg ) -{ - GdkWindowPrivate * win = (GdkWindowPrivate *)wdg->window; - wsMoveTopWindow( gdk_display,win->xwindow ); -} +{ wsMoveTopWindow( gdk_display,GDK_WINDOW_XWINDOW( wdg->window )); } void gtkShow( int type,char * param ) { diff --git a/Gui/mplayer/widgets.h b/Gui/mplayer/widgets.h index fa11836e94..60daa827d8 100644 --- a/Gui/mplayer/widgets.h +++ b/Gui/mplayer/widgets.h @@ -44,7 +44,6 @@ extern Pixmap guiIconMask; extern void widgetsCreate( void ); extern void gtkInit( void ); -extern void gtkDone( void ); extern void gtkAddIcon( GtkWidget * window ); extern int gtkFillSkinList( gchar * dir ); -- cgit v1.2.3