[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk about.c,1.14,1.15 eq.c,1.11,1.12 fs.c,1.36,1.37 mb.c,1.14,1.15 menu.c,1.21,1.22 opts.c,1.26,1.27 pl.c,1.11,1.12 sb.c,1.13,1.14 url.c,1.8,1.9
Zoltan Ponekker
pontscho at mplayerhq.hu
Sat Nov 2 17:09:08 CET 2002
- Previous message: [Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.34,1.35 mw.h,1.85,1.86 widgets.c,1.39,1.40 widgets.h,1.18,1.19
- Next message: [Mplayer-cvslog] CVS: main configure,1.594,1.595
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mail:/var/tmp.root/cvs-serv886/Gui/mplayer/gtk
Modified Files:
about.c eq.c fs.c mb.c menu.c opts.c pl.c sb.c url.c
Log Message:
cleanup
Index: about.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/about.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- about.c 28 Sep 2002 18:26:50 -0000 1.14
+++ about.c 2 Nov 2002 16:09:05 -0000 1.15
@@ -1,5 +1,5 @@
-#include "../../events.h"
+#include "../../app.h"
#include "../../../config.h"
#include "../../../help_mp.h"
Index: eq.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/eq.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eq.c 1 Sep 2002 11:28:18 -0000 1.11
+++ eq.c 2 Nov 2002 16:09:05 -0000 1.12
@@ -9,7 +9,7 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "../../events.h"
+#include "../../app.h"
#include "../../cfg.h"
#include "../../help_mp.h"
#include "../../../config.h"
@@ -290,7 +290,7 @@
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 @@
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 );
Index: fs.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/fs.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fs.c 10 Oct 2002 14:06:48 -0000 1.36
+++ fs.c 2 Nov 2002 16:09:05 -0000 1.37
@@ -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"
Index: mb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/mb.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mb.c 14 Aug 2002 23:02:44 -0000 1.14
+++ mb.c 2 Nov 2002 16:09:05 -0000 1.15
@@ -1,5 +1,5 @@
-#include "../../events.h"
+#include "../../app.h"
#include "../../../config.h"
#include "../../../help_mp.h"
Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- menu.c 21 Oct 2002 11:11:38 -0000 1.21
+++ menu.c 2 Nov 2002 16:09:05 -0000 1.22
@@ -7,7 +7,7 @@
#include "../../../help_mp.h"
#include "../../../mplayer.h"
-#include "../../events.h"
+#include "../../app.h"
#include "menu.h"
#include "../widgets.h"
Index: opts.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- opts.c 16 Oct 2002 15:35:28 -0000 1.26
+++ opts.c 2 Nov 2002 16:09:05 -0000 1.27
@@ -425,7 +425,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 * 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 @@
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 @@
{
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 );
Index: pl.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/pl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pl.c 30 Aug 2002 19:11:03 -0000 1.11
+++ pl.c 2 Nov 2002 16:09:05 -0000 1.12
@@ -423,7 +423,7 @@
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 );
Index: sb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/sb.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sb.c 4 Aug 2002 19:23:58 -0000 1.13
+++ sb.c 2 Nov 2002 16:09:05 -0000 1.14
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "sb.h"
-#include "../../events.h"
+#include "../../app.h"
#include "../../../config.h"
#include "../../../help_mp.h"
@@ -135,7 +135,7 @@
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 );
Index: url.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/url.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- url.c 5 Sep 2002 17:13:03 -0000 1.8
+++ url.c 2 Nov 2002 16:09:05 -0000 1.9
@@ -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 @@
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 );
- Previous message: [Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.34,1.35 mw.h,1.85,1.86 widgets.c,1.39,1.40 widgets.h,1.18,1.19
- Next message: [Mplayer-cvslog] CVS: main configure,1.594,1.595
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list