# HG changeset patch
# User pontscho
# Date 1033247772 0
# Node ID f51e76c3882e9ebca5c47737d44701e11d23db34
# Parent  2a1766fec13ee6abaf5c2075cd726b8f011c5f21
add aspect changing support

diff -r 2a1766fec13e -r f51e76c3882e Gui/events.c
--- a/Gui/events.c	Sat Sep 28 20:33:56 2002 +0000
+++ b/Gui/events.c	Sat Sep 28 21:16:12 2002 +0000
@@ -48,7 +48,8 @@
   { evPlayVCD,		 "evPlayVCD"	       },
   { evSetURL,		 "evSetURL"	       },
   { evLoadAudioFile,	 "evLoadAudioFile"     },
-  { evDropSubtitle,      "evDropSubtitle"      }
+  { evDropSubtitle,      "evDropSubtitle"      },
+  { evSetAspect,	 "evSetAspect"	       }
  };
 
 int evBoxs = sizeof( evNames ) / sizeof( evName );
diff -r 2a1766fec13e -r f51e76c3882e Gui/events.h
--- a/Gui/events.h	Sat Sep 28 20:33:56 2002 +0000
+++ b/Gui/events.h	Sat Sep 28 21:16:12 2002 +0000
@@ -52,7 +52,8 @@
 #define evPlayVCD	    40
 #define evPlayNetwork       41
 #define evLoadAudioFile	    42
-// 44 ...
+#define evSetAspect         44
+// 45 ...
 
 #define evExit              1000
 
diff -r 2a1766fec13e -r f51e76c3882e Gui/mplayer/gtk/menu.c
--- a/Gui/mplayer/gtk/menu.c	Sat Sep 28 20:33:56 2002 +0000
+++ b/Gui/mplayer/gtk/menu.c	Sat Sep 28 21:16:12 2002 +0000
@@ -258,7 +258,7 @@
 GtkWidget * DVDChapterMenu;
 GtkWidget * DVDAudioLanguageMenu;
 GtkWidget * DVDSubtitleLanguageMenu;
-
+GtkWidget * AspectMenu;
 GtkWidget * VCDSubMenu;
 GtkWidget * VCDTitleMenu;
 
@@ -388,6 +388,12 @@
         gtk_widget_set_sensitive( MenuItem,FALSE );
        }
 #endif
+  AspectMenu=AddSubMenu( Menu,"Aspect ratio" );
+  AddMenuItem( AspectMenu,"Original",( 1 << 16 ) + evSetAspect );
+  AddMenuItem( AspectMenu,"16:9",( 2 << 16 ) + evSetAspect );
+  AddMenuItem( AspectMenu,"4:3",( 3 << 16 ) + evSetAspect );
+  AddMenuItem( AspectMenu,"2.35",( 4 << 16 ) + evSetAspect );
+
   AddSeparator( Menu );
   AddMenuItem( Menu,"Mute", evMute );
   AddMenuItem( Menu,MSGTR_MENU_PlayList, evPlayList );
diff -r 2a1766fec13e -r f51e76c3882e Gui/mplayer/mw.h
--- a/Gui/mplayer/mw.h	Sat Sep 28 20:33:56 2002 +0000
+++ b/Gui/mplayer/mw.h	Sat Sep 28 21:16:12 2002 +0000
@@ -447,6 +447,19 @@
         mplFullScreen();
         break;
 
+   case evSetAspect:
+	switch ( (int)param )
+	 {
+	  case 2:  movie_aspect=16.0f / 9.0f; break;
+	  case 3:  movie_aspect=4.0f / 3.0f;  break;
+	  case 4:  movie_aspect=2.35;         break;
+	  case 1:
+	  default: movie_aspect=-1;
+	 }
+	guiIntfStruct.FilenameChanged=1;
+	wsClearWindow( appMPlayer.subWindow );
+	break;
+
 // --- timer events
    case evRedraw:
         mplMainRender=1;
diff -r 2a1766fec13e -r f51e76c3882e mplayer.h
--- a/mplayer.h	Sat Sep 28 20:33:56 2002 +0000
+++ b/mplayer.h	Sat Sep 28 21:16:12 2002 +0000
@@ -21,6 +21,7 @@
 
 extern char * font_name;
 extern float  font_factor;
+extern float movie_aspect;
 
 extern char * sub_name;
 extern float  sub_delay;