summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-28 21:16:12 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-28 21:16:12 +0000
commitf73a875f011a53d73d189b51324095cd65221363 (patch)
treee8dafd93fc52beac321d5263f5371e8fe063c481 /Gui
parentfd0aba17d562ebfd23933875f82929323a97645a (diff)
downloadmpv-f73a875f011a53d73d189b51324095cd65221363.tar.bz2
mpv-f73a875f011a53d73d189b51324095cd65221363.tar.xz
add aspect changing support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7542 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/events.c3
-rw-r--r--Gui/events.h3
-rw-r--r--Gui/mplayer/gtk/menu.c8
-rw-r--r--Gui/mplayer/mw.h13
4 files changed, 24 insertions, 3 deletions
diff --git a/Gui/events.c b/Gui/events.c
index 8101eaf427..c210ef58d0 100644
--- a/Gui/events.c
+++ b/Gui/events.c
@@ -48,7 +48,8 @@ evName evNames[] =
{ evPlayVCD, "evPlayVCD" },
{ evSetURL, "evSetURL" },
{ evLoadAudioFile, "evLoadAudioFile" },
- { evDropSubtitle, "evDropSubtitle" }
+ { evDropSubtitle, "evDropSubtitle" },
+ { evSetAspect, "evSetAspect" }
};
int evBoxs = sizeof( evNames ) / sizeof( evName );
diff --git a/Gui/events.h b/Gui/events.h
index a75a5223d9..fcd723ab32 100644
--- a/Gui/events.h
+++ b/Gui/events.h
@@ -52,7 +52,8 @@
#define evPlayVCD 40
#define evPlayNetwork 41
#define evLoadAudioFile 42
-// 44 ...
+#define evSetAspect 44
+// 45 ...
#define evExit 1000
diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c
index f78ecc3dee..54ede49d82 100644
--- a/Gui/mplayer/gtk/menu.c
+++ b/Gui/mplayer/gtk/menu.c
@@ -258,7 +258,7 @@ GtkWidget * DVDTitleMenu;
GtkWidget * DVDChapterMenu;
GtkWidget * DVDAudioLanguageMenu;
GtkWidget * DVDSubtitleLanguageMenu;
-
+GtkWidget * AspectMenu;
GtkWidget * VCDSubMenu;
GtkWidget * VCDTitleMenu;
@@ -388,6 +388,12 @@ GtkWidget * create_PopUpMenu( void )
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 --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index 7500413456..f3eff2b12e 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -447,6 +447,19 @@ set_volume:
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;