July 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r35961 - in trunk: Changelog input/input.c libvo/x11_common.c osdep/getch2.c osdep/keycodes.h
by reimar 13 Feb '14

13 Feb '14

Author: reimar Date: Thu Mar 14 20:59:35 2013 New Revision: 35961 Log: Add support for binding any key in UTF-8 range. X11 part is a bit hackish since we need to use setlocale to get desired behaviour for XLookupString. Modified: trunk/Changelog trunk/input/input.c trunk/libvo/x11_common.c trunk/osdep/getch2.c trunk/osdep/keycodes.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/Changelog Thu Mar 14 20:59:35 2013 (r35961) @@ -13,6 +13,7 @@ MPlayer better than -vo gl (it is in many ways worse). * Fixes for DVB, teletext and closed-caption based subtitles. * Support teletext and CC subtitles in WTV. + * Support binding keys corresponding to non-ASCII characters. 1.1: "We gave up on 1.0" Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/input/input.c Thu Mar 14 20:59:35 2013 (r35961) @@ -38,6 +38,7 @@ #include "osdep/getch2.h" #include "osdep/keycodes.h" #include "osdep/timer.h" +#include "libavutil/common.h" #include "libavutil/avstring.h" #include "mp_msg.h" #include "help_mp.h" @@ -1474,6 +1475,7 @@ mp_input_get_key_name(int key) { int mp_input_get_key_from_name(const char *name) { + uint32_t utf8 = 0; int i,ret = 0,len = strlen(name); if(len == 1) { // Direct key code ret = (unsigned char)name[0]; @@ -1486,6 +1488,10 @@ mp_input_get_key_from_name(const char *n return key_names[i].key; } + GET_UTF8(utf8, (uint8_t)*name++, return -1;) + if (*name == 0 && utf8 < KEY_BASE) + return utf8; + return -1; } Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/libvo/x11_common.c Thu Mar 14 20:59:35 2013 (r35961) @@ -21,6 +21,7 @@ #include <math.h> #include <inttypes.h> #include <limits.h> +#include <locale.h> #include "config.h" #include "mp_msg.h" @@ -427,6 +428,9 @@ int vo_init(void) return 1; // already called } + // Required so that XLookupString returns UTF-8 + if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) + mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will no be handled.\n"); XSetErrorHandler(x11_errorhandler); dispName = XDisplayName(mDisplayName); @@ -810,11 +814,22 @@ static int check_resize(void) return rc; } +static int to_utf8(const uint8_t *in) +{ + uint32_t v = 0; + GET_UTF8(v, *in++, goto err;) + if (*in || v >= KEY_BASE) + goto err; + return v; +err: + return 0; +} + int vo_x11_check_events(Display * mydisplay) { int ret = 0; XEvent Event; - char buf[100]; + uint8_t buf[16] = {0}; KeySym keySym; static XComposeStatus stat; static int ctrl_state; @@ -852,7 +867,7 @@ int vo_x11_check_events(Display * mydisp case KeyPress: case KeyRelease: { - int key; + int key, utf8; #ifdef CONFIG_GUI if ( use_gui ) { break; } @@ -863,6 +878,8 @@ int vo_x11_check_events(Display * mydisp key = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym)); + utf8 = to_utf8(buf); + if (utf8) key = 0; if (key == wsLeftCtrl || key == wsRightCtrl) { ctrl_state = Event.type == KeyPress; mplayer_put_key(KEY_CTRL | @@ -880,7 +897,8 @@ int vo_x11_check_events(Display * mydisp (ctrl_state ? MP_KEY_DOWN : 0)); } if (!vo_x11_putkey_ext(keySym)) { - vo_x11_putkey(key); + if (utf8) mplayer_put_key(utf8); + else vo_x11_putkey(key); } ret |= VO_EVENT_KEYPRESS; } Modified: trunk/osdep/getch2.c ============================================================================== --- trunk/osdep/getch2.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/getch2.c Thu Mar 14 20:59:35 2013 (r35961) @@ -60,6 +60,7 @@ #include "mp_fifo.h" #include "keycodes.h" #include "getch2.h" +#include "libavutil/common.h" #ifdef HAVE_TERMIOS static struct termios tio_orig; @@ -201,6 +202,14 @@ void getch2(void) len = 2; } code = KEY_ENTER; + } else if (code >= 0xc0) { + uint32_t utf8 = 0; + i = 0; + GET_UTF8(utf8, (i < getch2_len ? getch2_buf[i++] : 0), goto not_utf8;) + if (utf8 < KEY_BASE) { + code = utf8; + len = i; + } } } else if (getch2_len > 1) { @@ -262,6 +271,7 @@ void getch2(void) } } } + not_utf8: found: getch2_len -= len; for (i = 0; i < getch2_len; i++) Modified: trunk/osdep/keycodes.h ============================================================================== --- trunk/osdep/keycodes.h Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/keycodes.h Thu Mar 14 20:59:35 2013 (r35961) @@ -23,7 +23,7 @@ #ifndef MPLAYER_KEYCODES_H #define MPLAYER_KEYCODES_H -#define KEY_BASE 0x100 +#define KEY_BASE 0x1000000 enum { KEY_TAB = 9, @@ -76,7 +76,7 @@ enum { KEY_VOLUME_DOWN, KEY_MUTE, /* Special internal/virtual keys */ - KEY_CLOSE_WIN = 0x1000, + KEY_CLOSE_WIN = KEY_BASE + 0x1000, }; /* Control keys short name */

3 10

r36380 - trunk/gui/dialog/equalizer.c
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 21:36:43 2013 New Revision: 36380 Log: Simplify sign change of variable. Modified: trunk/gui/dialog/equalizer.c Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Tue Jul 30 15:16:49 2013 (r36379) +++ trunk/gui/dialog/equalizer.c Tue Jul 30 21:36:43 2013 (r36380) @@ -76,16 +76,16 @@ void ShowEquConfig( void ); static void eqSetBands( int channel ) { if ( channel < 0 ) channel=0; - gtk_adjustment_set_value( A3125adj,0.0f - gtkEquChannels[channel][0] ); - gtk_adjustment_set_value( A6250adj,0.0f - gtkEquChannels[channel][1] ); - gtk_adjustment_set_value( A125adj,0.0f - gtkEquChannels[channel][2] ); - gtk_adjustment_set_value( A250adj,0.0f - gtkEquChannels[channel][3] ); - gtk_adjustment_set_value( A500adj,0.0f - gtkEquChannels[channel][4] ); - gtk_adjustment_set_value( A1000adj,0.0f - gtkEquChannels[channel][5] ); - gtk_adjustment_set_value( A2000adj,0.0f - gtkEquChannels[channel][6] ); - gtk_adjustment_set_value( A4000adj,0.0f - gtkEquChannels[channel][7] ); - gtk_adjustment_set_value( A8000adj,0.0f - gtkEquChannels[channel][8] ); - gtk_adjustment_set_value( A16000adj,0.0f - gtkEquChannels[channel][9] ); + gtk_adjustment_set_value( A3125adj,-gtkEquChannels[channel][0] ); + gtk_adjustment_set_value( A6250adj,-gtkEquChannels[channel][1] ); + gtk_adjustment_set_value( A125adj,-gtkEquChannels[channel][2] ); + gtk_adjustment_set_value( A250adj,-gtkEquChannels[channel][3] ); + gtk_adjustment_set_value( A500adj,-gtkEquChannels[channel][4] ); + gtk_adjustment_set_value( A1000adj,-gtkEquChannels[channel][5] ); + gtk_adjustment_set_value( A2000adj,-gtkEquChannels[channel][6] ); + gtk_adjustment_set_value( A4000adj,-gtkEquChannels[channel][7] ); + gtk_adjustment_set_value( A8000adj,-gtkEquChannels[channel][8] ); + gtk_adjustment_set_value( A16000adj,-gtkEquChannels[channel][9] ); if ( guiInfo.sh_video ) { @@ -147,7 +147,7 @@ static gboolean eqHScaleMotion( GtkWidge case 9: eq.gain=A16000adj->value; break; default: return FALSE; } - eq.gain=0.0f - eq.gain; + eq.gain=-eq.gain; eq.band=(int)user_data; if ( Channel == -1 ) {

1 0

r36379 - in trunk/gui/ui: main.c playbar.c
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 15:16:49 2013 New Revision: 36379 Log: Increase precision of calculation by using constants of type double. Modified: trunk/gui/ui/main.c trunk/gui/ui/playbar.c Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Tue Jul 30 15:07:43 2013 (r36378) +++ trunk/gui/ui/main.c Tue Jul 30 15:16:49 2013 (r36379) @@ -148,12 +148,12 @@ static void uiMainMouse( int Button,int { case itPotmeter: case itHPotmeter: - btnModify( item->message,(float)( X - item->x ) / item->width * 100.0f ); + btnModify( item->message,(float)( X - item->x ) / item->width * 100.0 ); uiEvent( item->message,item->value ); value=item->value; break; case itVPotmeter: - btnModify( item->message, ( 1.0 - (float)( Y - item->y ) / item->height) * 100.0f ); + btnModify( item->message, ( 1.0 - (float)( Y - item->y ) / item->height) * 100.0 ); uiEvent( item->message,item->value ); value=item->value; break; @@ -194,13 +194,13 @@ rollerhandled: if (guiApp.menuIsPresent) guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 ); break; case itPotmeter: - item->value=(float)( X - item->x ) / item->width * 100.0f; + item->value=(float)( X - item->x ) / item->width * 100.0; goto potihandled; case itVPotmeter: - item->value=(1.0 - (float)( Y - item->y ) / item->height) * 100.0f; + item->value=(1.0 - (float)( Y - item->y ) / item->height) * 100.0; goto potihandled; case itHPotmeter: - item->value=(float)( X - item->x ) / item->width * 100.0f; + item->value=(float)( X - item->x ) / item->width * 100.0; potihandled: if ( item->value > 100.0f ) item->value=100.0f; if ( item->value < 0.0f ) item->value=0.0f; Modified: trunk/gui/ui/playbar.c ============================================================================== --- trunk/gui/ui/playbar.c Tue Jul 30 15:07:43 2013 (r36378) +++ trunk/gui/ui/playbar.c Tue Jul 30 15:16:49 2013 (r36379) @@ -177,12 +177,12 @@ static void uiPlaybarMouse( int Button, { case itPotmeter: case itHPotmeter: - btnModify( item->message,(float)( X - item->x ) / item->width * 100.0f ); + btnModify( item->message,(float)( X - item->x ) / item->width * 100.0 ); uiEvent( item->message,item->value ); value=item->value; break; case itVPotmeter: - btnModify( item->message, ( 1.0 - (float)( Y - item->y ) / item->height) * 100.0f ); + btnModify( item->message, ( 1.0 - (float)( Y - item->y ) / item->height) * 100.0 ); uiEvent( item->message,item->value ); value=item->value; break; @@ -215,13 +215,13 @@ rollerhandled: if (guiApp.menuIsPresent) guiApp.menuWindow.MouseHandler( 0,RX,RY,0,0 ); break; case itPotmeter: - item->value=(float)( X - item->x ) / item->width * 100.0f; + item->value=(float)( X - item->x ) / item->width * 100.0; goto potihandled; case itVPotmeter: - item->value=(1.0 - (float)( Y - item->y ) / item->height) * 100.0f; + item->value=(1.0 - (float)( Y - item->y ) / item->height) * 100.0; goto potihandled; case itHPotmeter: - item->value=(float)( X - item->x ) / item->width * 100.0f; + item->value=(float)( X - item->x ) / item->width * 100.0; potihandled: if ( item->value > 100.0f ) item->value=100.0f; if ( item->value < 0.0f ) item->value=0.0f;

1 0

r36378 - in trunk/gui: dialog/preferences.c interface.c
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 15:07:43 2013 New Revision: 36378 Log: Increase precision of calculation by using constants of type double. Additionally: Rearrange calculation for clarity and add comments. Modified: trunk/gui/dialog/preferences.c trunk/gui/interface.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Tue Jul 30 14:31:49 2013 (r36377) +++ trunk/gui/dialog/preferences.c Tue Jul 30 15:07:43 2013 (r36378) @@ -1203,8 +1203,8 @@ void ShowPreferences( void ) #ifndef CONFIG_FREETYPE gtk_adjustment_set_value( HSFontFactoradj,font_factor ); #else - gtk_adjustment_set_value( HSFontBluradj,( subtitle_font_radius / 8.0f ) * 100.0f ); - gtk_adjustment_set_value( HSFontOutLineadj,( subtitle_font_thickness / 8.0f ) * 100.0f ); + gtk_adjustment_set_value( HSFontBluradj,subtitle_font_radius / 8.0 * 100.0); // transform 0..8 to 0..100 + gtk_adjustment_set_value( HSFontOutLineadj,subtitle_font_thickness / 8.0 * 100.0); // transform 0..8 to 0..100 gtk_adjustment_set_value( HSFontTextScaleadj,text_font_scale_factor ); gtk_adjustment_set_value( HSFontOSDScaleadj,osd_font_scale_factor ); if ( subtitle_font_encoding ) Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Tue Jul 30 14:31:49 2013 (r36377) +++ trunk/gui/interface.c Tue Jul 30 15:07:43 2013 (r36378) @@ -936,12 +936,12 @@ void mplayer(int what, float value, void break; case MPLAYER_SET_FONT_OUTLINE: - subtitle_font_thickness = (8.0f / 100.0f) * value; + subtitle_font_thickness = 8.0 * value / 100.0; // transform 0..100 to 0..8 mplayerLoadFont(); break; case MPLAYER_SET_FONT_BLUR: - subtitle_font_radius = (8.0f / 100.0f) * value; + subtitle_font_radius = 8.0 * value / 100.0; // transform 0..100 to 0..8 mplayerLoadFont(); break;

1 0

r36377 - in trunk/gui/ui: main.c playbar.c
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 14:31:49 2013 New Revision: 36377 Log: Cosmetic: Don't shorten floating point constants that way. Modified: trunk/gui/ui/main.c trunk/gui/ui/playbar.c Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Tue Jul 30 13:54:04 2013 (r36376) +++ trunk/gui/ui/main.c Tue Jul 30 14:31:49 2013 (r36377) @@ -153,7 +153,7 @@ static void uiMainMouse( int Button,int value=item->value; break; case itVPotmeter: - btnModify( item->message, ( 1. - (float)( Y - item->y ) / item->height) * 100.0f ); + btnModify( item->message, ( 1.0 - (float)( Y - item->y ) / item->height) * 100.0f ); uiEvent( item->message,item->value ); value=item->value; break; @@ -197,7 +197,7 @@ rollerhandled: item->value=(float)( X - item->x ) / item->width * 100.0f; goto potihandled; case itVPotmeter: - item->value=(1. - (float)( Y - item->y ) / item->height) * 100.0f; + item->value=(1.0 - (float)( Y - item->y ) / item->height) * 100.0f; goto potihandled; case itHPotmeter: item->value=(float)( X - item->x ) / item->width * 100.0f; Modified: trunk/gui/ui/playbar.c ============================================================================== --- trunk/gui/ui/playbar.c Tue Jul 30 13:54:04 2013 (r36376) +++ trunk/gui/ui/playbar.c Tue Jul 30 14:31:49 2013 (r36377) @@ -182,7 +182,7 @@ static void uiPlaybarMouse( int Button, value=item->value; break; case itVPotmeter: - btnModify( item->message, ( 1. - (float)( Y - item->y ) / item->height) * 100.0f ); + btnModify( item->message, ( 1.0 - (float)( Y - item->y ) / item->height) * 100.0f ); uiEvent( item->message,item->value ); value=item->value; break; @@ -218,7 +218,7 @@ rollerhandled: item->value=(float)( X - item->x ) / item->width * 100.0f; goto potihandled; case itVPotmeter: - item->value=(1. - (float)( Y - item->y ) / item->height) * 100.0f; + item->value=(1.0 - (float)( Y - item->y ) / item->height) * 100.0f; goto potihandled; case itHPotmeter: item->value=(float)( X - item->x ) / item->width * 100.0f;

1 0

r36376 - in trunk/gui: dialog/preferences.c ui/menu.c
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 13:54:04 2013 New Revision: 36376 Log: Remove unnecessary type conversions. Modified: trunk/gui/dialog/preferences.c trunk/gui/ui/menu.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Tue Jul 30 13:52:47 2013 (r36375) +++ trunk/gui/dialog/preferences.c Tue Jul 30 13:54:04 2013 (r36376) @@ -1162,8 +1162,8 @@ void ShowPreferences( void ) #ifdef CONFIG_ASS gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBUseASS ),gtkASS.enabled ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBASSUseMargins ),gtkASS.use_margins ); - gtk_spin_button_set_value( (GtkSpinButton *)SBASSTopMargin,(gdouble)gtkASS.top_margin ); - gtk_spin_button_set_value( (GtkSpinButton *)SBASSBottomMargin,(gdouble)gtkASS.bottom_margin ); + gtk_spin_button_set_value( (GtkSpinButton *)SBASSTopMargin,gtkASS.top_margin ); + gtk_spin_button_set_value( (GtkSpinButton *)SBASSBottomMargin,gtkASS.bottom_margin ); if ( !gtkASS.enabled ) { Modified: trunk/gui/ui/menu.c ============================================================================== --- trunk/gui/ui/menu.c Tue Jul 30 13:52:47 2013 (r36375) +++ trunk/gui/ui/menu.c Tue Jul 30 13:54:04 2013 (r36376) @@ -177,6 +177,6 @@ void uiMenuHide( int mx,int my,int w ) guiApp.menuItems[i].x+guiApp.menuItems[i].width, guiApp.menuItems[i].y+guiApp.menuItems[i].height ) ) { - uiEvent( guiApp.menuItems[i].message,(float)w ); + uiEvent( guiApp.menuItems[i].message,w ); } }

1 0

r36375 - trunk/gui/interface.c
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 13:52:47 2013 New Revision: 36375 Log: Be more pedantic about type of the constant. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Tue Jul 30 13:26:52 2013 (r36374) +++ trunk/gui/interface.c Tue Jul 30 13:52:47 2013 (r36375) @@ -818,7 +818,7 @@ int gui(int what, void *data) } guiInfo.ElapsedTime = 0; - guiInfo.Position = 0; + guiInfo.Position = 0.0f; if (gtkShowVideoWindow) { guiInfo.VideoWindow = True;

1 0

r36374 - in trunk: gui/dialog/menu.c gui/win32/gui.c help/help_mp-de.h help/help_mp-en.h
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 13:26:52 2013 New Revision: 36374 Log: Enable localization of ratio text. Modified: trunk/gui/dialog/menu.c trunk/gui/win32/gui.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Tue Jul 30 13:02:15 2013 (r36373) +++ trunk/gui/dialog/menu.c Tue Jul 30 13:26:52 2013 (r36374) @@ -596,7 +596,7 @@ GtkWidget * CreatePopUpMenu( void ) H=AddMenuCheckItem( window1, (const char*)aspect11_xpm, AspectMenu,MSGTR_MENU_Original, a11, evSetAspect + ( 1 << 16 ) ); N=AddMenuCheckItem( window1, (const char*)aspect169_xpm, AspectMenu,"16:9", a169, evSetAspect + ( 2 << 16 ) ); D=AddMenuCheckItem( window1, (const char*)aspect43_xpm, AspectMenu,"4:3", a43, evSetAspect + ( 3 << 16 ) ); - F=AddMenuCheckItem( window1, (const char*)aspect235_xpm, AspectMenu,"2.35:1", a235, evSetAspect + ( 4 << 16 ) ); + F=AddMenuCheckItem( window1, (const char*)aspect235_xpm, AspectMenu,MSGTR_MENU_235, a235, evSetAspect + ( 4 << 16 ) ); if ( !guiInfo.Playing ) { Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Tue Jul 30 13:02:15 2013 (r36373) +++ trunk/gui/win32/gui.c Tue Jul 30 13:26:52 2013 (r36374) @@ -1273,7 +1273,7 @@ static void create_videomenu(gui_t *gui) AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_CYCLE, acp(MSGTR_MENU_SubtitleLanguages)); AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT1, "16:9"); AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT2, "4:3"); - AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT3, "2.35:1"); + AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT3, acp(MSGTR_MENU_235)); AppendMenu(gui->aspectmenu, MF_SEPARATOR, 0, 0); AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT4, acp(MSGTR_MENU_Original)); AppendMenu(gui->videomenu, MF_SEPARATOR, 0, 0);

1 0

r36373 - in trunk/gui: dialog/menu.c win32/gui.c
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 13:02:15 2013 New Revision: 36373 Log: Revise ratio text. Modified: trunk/gui/dialog/menu.c trunk/gui/win32/gui.c Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Tue Jul 30 12:57:57 2013 (r36372) +++ trunk/gui/dialog/menu.c Tue Jul 30 13:02:15 2013 (r36373) @@ -596,7 +596,7 @@ GtkWidget * CreatePopUpMenu( void ) H=AddMenuCheckItem( window1, (const char*)aspect11_xpm, AspectMenu,MSGTR_MENU_Original, a11, evSetAspect + ( 1 << 16 ) ); N=AddMenuCheckItem( window1, (const char*)aspect169_xpm, AspectMenu,"16:9", a169, evSetAspect + ( 2 << 16 ) ); D=AddMenuCheckItem( window1, (const char*)aspect43_xpm, AspectMenu,"4:3", a43, evSetAspect + ( 3 << 16 ) ); - F=AddMenuCheckItem( window1, (const char*)aspect235_xpm, AspectMenu,"2.35", a235, evSetAspect + ( 4 << 16 ) ); + F=AddMenuCheckItem( window1, (const char*)aspect235_xpm, AspectMenu,"2.35:1", a235, evSetAspect + ( 4 << 16 ) ); if ( !guiInfo.Playing ) { Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Tue Jul 30 12:57:57 2013 (r36372) +++ trunk/gui/win32/gui.c Tue Jul 30 13:02:15 2013 (r36373) @@ -1273,7 +1273,7 @@ static void create_videomenu(gui_t *gui) AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_CYCLE, acp(MSGTR_MENU_SubtitleLanguages)); AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT1, "16:9"); AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT2, "4:3"); - AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT3, "2.35"); + AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT3, "2.35:1"); AppendMenu(gui->aspectmenu, MF_SEPARATOR, 0, 0); AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT4, acp(MSGTR_MENU_Original)); AppendMenu(gui->videomenu, MF_SEPARATOR, 0, 0);

1 0

r36372 - in trunk/gui: dialog/menu.c ui/actions.c win32/gui.c
by ib 30 Jul '13

30 Jul '13

Author: ib Date: Tue Jul 30 12:57:57 2013 New Revision: 36372 Log: Be more pedantic about type of the constant. Modified: trunk/gui/dialog/menu.c trunk/gui/ui/actions.c trunk/gui/win32/gui.c Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Tue Jul 30 12:41:53 2013 (r36371) +++ trunk/gui/dialog/menu.c Tue Jul 30 12:57:57 2013 (r36372) @@ -589,7 +589,7 @@ GtkWidget * CreatePopUpMenu( void ) { a169 = (FFABS(movie_aspect - 16.0f / 9.0f) <= 0.01f); a43 = (FFABS(movie_aspect - 4.0f / 3.0f) <= 0.01f); - a235 = (FFABS(movie_aspect - 2.35) <= 0.01f); + a235 = (FFABS(movie_aspect - 2.35f) <= 0.01f); } AspectMenu=AddSubMenu( window1, (const char*)aspect_xpm, Menu,MSGTR_MENU_AspectRatio ); Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Tue Jul 30 12:41:53 2013 (r36371) +++ trunk/gui/ui/actions.c Tue Jul 30 12:57:57 2013 (r36372) @@ -435,7 +435,7 @@ play: break; case 4: - aspect = 2.35; + aspect = 2.35f; break; case 1: Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Tue Jul 30 12:41:53 2013 (r36371) +++ trunk/gui/win32/gui.c Tue Jul 30 12:57:57 2013 (r36372) @@ -482,7 +482,7 @@ static LRESULT CALLBACK VideoProc(HWND h aspect = 4.0f / 3.0f; break; case ID_ASPECT3: - aspect = 2.35; + aspect = 2.35f; break; default: aspect = -1;

1 0