April 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r37181 - trunk/gui/interface.c
by ib 28 Apr '14

28 Apr '14

Author: ib Date: Mon Apr 28 18:08:54 2014 New Revision: 37181 Log: Copy subsequent video filter settings at once. Count the existing settings following the deleted one and copy them all at once. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Mon Apr 28 18:02:20 2014 (r37180) +++ trunk/gui/interface.c Mon Apr 28 18:08:54 2014 (r37181) @@ -170,14 +170,19 @@ static void remove_vf(char *vf) while (vf_settings[i].name) { if (strcmp(vf_settings[i].name, vf) == 0) { + int j; + mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingVideoFilter, vf); free(vf_settings[i].name); listFree(&vf_settings[i].attribs); - do - memcpy(&vf_settings[i], &vf_settings[i + 1], sizeof(*vf_settings)); - while (vf_settings[++i].name); + j = i + 1; + + while (vf_settings[j].name) + j++; + + memmove(&vf_settings[i], &vf_settings[i + 1], (j - i) * sizeof(*vf_settings)); break; }

1 0

r37180 - trunk/gui/interface.c
by ib 28 Apr '14

28 Apr '14

Author: ib Date: Mon Apr 28 18:02:20 2014 New Revision: 37180 Log: Determine size from variable declaration. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Sat Apr 26 18:32:53 2014 (r37179) +++ trunk/gui/interface.c Mon Apr 28 18:02:20 2014 (r37180) @@ -116,7 +116,7 @@ static void add_vf(const char *vf, const vf_settings = settings; vf_settings[i].name = strdup(vf); vf_settings[i].attribs = listDup(argvf); - memset(&vf_settings[i + 1], 0, sizeof(m_obj_settings_t)); + memset(&vf_settings[i + 1], 0, sizeof(*vf_settings)); } } else { vf_settings = calloc(2, sizeof(*vf_settings)); @@ -176,7 +176,7 @@ static void remove_vf(char *vf) listFree(&vf_settings[i].attribs); do - memcpy(&vf_settings[i], &vf_settings[i + 1], sizeof(m_obj_settings_t)); + memcpy(&vf_settings[i], &vf_settings[i + 1], sizeof(*vf_settings)); while (vf_settings[++i].name); break;

1 0

r37179 - in trunk/gui: app/cfg.c dialog/playlist.c dialog/url.c interface.c ui/main.c util/list.c
by ib 26 Apr '14

26 Apr '14

Author: ib Date: Sat Apr 26 18:32:53 2014 New Revision: 37179 Log: Determine size from variable declaration. Modified: trunk/gui/app/cfg.c trunk/gui/dialog/playlist.c trunk/gui/dialog/url.c trunk/gui/interface.c trunk/gui/ui/main.c trunk/gui/util/list.c Modified: trunk/gui/app/cfg.c ============================================================================== --- trunk/gui/app/cfg.c Sat Apr 26 18:30:54 2014 (r37178) +++ trunk/gui/app/cfg.c Sat Apr 26 18:32:53 2014 (r37179) @@ -294,7 +294,7 @@ void cfg_read(void) if (!*line) continue; - item = calloc(1, sizeof(plItem)); + item = calloc(1, sizeof(*item)); if (!item) { gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed); @@ -329,7 +329,7 @@ void cfg_read(void) if (!*line) continue; - item = calloc(1, sizeof(urlItem)); + item = calloc(1, sizeof(*item)); if (!item) { gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed); Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Sat Apr 26 18:30:54 2014 (r37178) +++ trunk/gui/dialog/playlist.c Sat Apr 26 18:32:53 2014 (r37179) @@ -143,7 +143,7 @@ static void plButtonReleased( GtkButton for ( i=0;i<NrOfSelected;i++ ) { char * text[2]; - item=calloc( 1,sizeof( plItem ) ); + item=calloc( 1,sizeof( *item ) ); gtk_clist_get_text( GTK_CLIST( CLSelected ),i,2,&text[0] ); gtk_clist_get_text( GTK_CLIST( CLSelected ),i,3,&text[1] ); item->name = strdup( text[0] ); @@ -361,7 +361,7 @@ static void plCTree( GtkCTree * ctree,Gt if ( stat( path,&statbuf ) != -1 && S_ISDIR( statbuf.st_mode ) && dirent->d_name[0] != '.' ) { - DirNode=malloc( sizeof( DirNodeType ) ); DirNode->scaned=False; DirNode->path=strdup( path ); + DirNode=malloc( sizeof( *DirNode ) ); DirNode->scaned=False; DirNode->path=strdup( path ); subdir=check_for_subdir( path ); node=gtk_ctree_insert_node( ctree,parent_node,NULL,&utf8name,4,pxOpenedBook,msOpenedBook,pxClosedBook,msClosedBook,!subdir,FALSE ); gtk_ctree_node_set_row_data_full( ctree,node,DirNode,NULL ); @@ -479,7 +479,7 @@ static GtkWidget * CreatePlaylist( void if ( !pxClosedBook ) pxClosedBook=gdk_pixmap_create_from_xpm_d( Playlist->window,&msClosedBook,&transparent,(gchar **)open2_xpm ); parent=gtk_ctree_insert_node( GTK_CTREE( CTDirTree ),NULL,NULL,&root,4,pxOpenedBook,msOpenedBook,pxClosedBook,msClosedBook,FALSE,FALSE ); - DirNode=malloc( sizeof( DirNodeType ) ); + DirNode=malloc( sizeof( *DirNode ) ); DirNode->scaned=False; DirNode->path=strdup( root ); gtk_ctree_node_set_row_data_full(GTK_CTREE( CTDirTree ),parent,DirNode,NULL ); sibling=gtk_ctree_insert_node( GTK_CTREE( CTDirTree ),parent,NULL,&dummy,4,NULL,NULL,NULL,NULL,TRUE,TRUE ); Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Sat Apr 26 18:30:54 2014 (r37178) +++ trunk/gui/dialog/url.c Sat Apr 26 18:32:53 2014 (r37179) @@ -74,7 +74,7 @@ static void button_clicked(GtkButton *bu listMgr(PLAYLIST_DELETE, 0); add_to_gui_playlist(str, PLAYLIST_ITEM_APPEND); - item = calloc(1, sizeof(urlItem)); + item = calloc(1, sizeof(*item)); if (item) { item->url = str; Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Sat Apr 26 18:30:54 2014 (r37178) +++ trunk/gui/interface.c Sat Apr 26 18:32:53 2014 (r37179) @@ -108,7 +108,7 @@ static void add_vf(const char *vf, const listFree(&vf_settings[i].attribs); vf_settings[i].attribs = listDup(argvf); } else { - void *settings = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t)); + void *settings = realloc(vf_settings, (i + 2) * sizeof(*vf_settings)); if (!settings) return; @@ -119,7 +119,7 @@ static void add_vf(const char *vf, const memset(&vf_settings[i + 1], 0, sizeof(m_obj_settings_t)); } } else { - vf_settings = calloc(2, sizeof(m_obj_settings_t)); + vf_settings = calloc(2, sizeof(*vf_settings)); if (!vf_settings) return; Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Sat Apr 26 18:30:54 2014 (r37178) +++ trunk/gui/ui/main.c Sat Apr 26 18:32:53 2014 (r37179) @@ -353,7 +353,7 @@ static void uiMainDND(int num,char** fil listMgr(PLAYLIST_DELETE,0); } - item = calloc(1,sizeof(plItem)); + item = calloc(1,sizeof(*item)); s = strrchr( str,'/' ); Modified: trunk/gui/util/list.c ============================================================================== --- trunk/gui/util/list.c Sat Apr 26 18:30:54 2014 (r37178) +++ trunk/gui/util/list.c Sat Apr 26 18:32:53 2014 (r37179) @@ -407,7 +407,7 @@ int add_to_gui_playlist(const char *what else strcpy(path, "."); - item = calloc(1, sizeof(plItem)); + item = calloc(1, sizeof(*item)); if (!item) { free(path);

1 0

r37178 - trunk/gui/skin/skin.c
by ib 26 Apr '14

26 Apr '14

Author: ib Date: Sat Apr 26 18:30:54 2014 New Revision: 37178 Log: Remove pointless statement. The 'menu' item doesn't have an image, so no need to care about Bitmap.Image. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Apr 24 16:41:04 2014 (r37177) +++ trunk/gui/skin/skin.c Sat Apr 26 18:30:54 2014 (r37178) @@ -584,8 +584,6 @@ static int item_menu(char *in) mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] item #%d: %d,%d %dx%d\n", *currWinItemIdx, x, y, w, h); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", msg, message); - item->Bitmap.Image = NULL; - return 0; }

1 0

r37176 - in trunk: gui/interface.c help/help_mp-de.h help/help_mp-en.h
by ib 26 Apr '14

26 Apr '14

Author: ib Date: Thu Apr 24 15:51:20 2014 New Revision: 37176 Log: Add remove_vf(). (Currently unused, but we will need it soon.) Modified: trunk/gui/interface.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/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 15:36:22 2014 (r37175) +++ trunk/gui/interface.c Thu Apr 24 15:51:20 2014 (r37176) @@ -158,6 +158,35 @@ static char **get_vf(const char *vf) return attribs; } +/** + * @brief Remove a video filter. + * + * @param vf video filter to be removed + */ +static void remove_vf(char *vf) +{ + if (vf_settings) { + int i = 0; + + while (vf_settings[i].name) { + if (strcmp(vf_settings[i].name, vf) == 0) { + mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingVideoFilter, vf); + + free(vf_settings[i].name); + listFree(&vf_settings[i].attribs); + + do + memcpy(&vf_settings[i], &vf_settings[i + 1], sizeof(m_obj_settings_t)); + while (vf_settings[++i].name); + + break; + } + + i++; + } + } +} + /* MPlayer -> GUI */ /**

2 1

r37168 - trunk/gui/interface.c
by ib 26 Apr '14

26 Apr '14

Author: ib Date: Thu Apr 24 14:50:14 2014 New Revision: 37168 Log: Rewrite add_vf(). Prefer calloc() to malloc(). As a result, vf_settings[1] doesn't need to be cleared. Additionally, check the result of the allocation. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 14:44:33 2014 (r37167) +++ trunk/gui/interface.c Thu Apr 24 14:50:14 2014 (r37168) @@ -299,10 +299,13 @@ static void add_vf(const char *vf) memset(&vf_settings[i + 1], 0, sizeof(m_obj_settings_t)); } } else { - vf_settings = malloc(2 * sizeof(m_obj_settings_t)); + vf_settings = calloc(2, sizeof(m_obj_settings_t)); + + if (!vf_settings) + return; + vf_settings[0].name = strdup(vf); vf_settings[0].attribs = NULL; - vf_settings[1].name = NULL; } mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, vf);

2 1

r37177 - in trunk: Changelog DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/app/app.c gui/app/app.h gui/dialog/menu.c gui/dialog/pixmaps/rotate.xpm gui/dialog/pixmaps/rotate0.xpm gui/dialog/pixmaps/...
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 16:41:04 2014 New Revision: 37177 Log: New GUI feature: Rotate a video. It is accessible from the context menu. Based on a complain by Linus about video players that don't easily allow rotating a video. (Thanks to compn for pointing that out.) Realize the feature by adding and/or removing appropriate video filters. Additionally, add new GUI message evSetRotation and update documentation. Added: trunk/gui/dialog/pixmaps/rotate.xpm trunk/gui/dialog/pixmaps/rotate0.xpm trunk/gui/dialog/pixmaps/rotate180.xpm trunk/gui/dialog/pixmaps/rotate90ccw.xpm trunk/gui/dialog/pixmaps/rotate90cw.xpm Modified: trunk/Changelog trunk/gui/app/app.c trunk/gui/app/app.h trunk/gui/dialog/menu.c trunk/gui/interface.c trunk/gui/interface.h trunk/gui/ui/actions.c trunk/gui/win32/skinload.c trunk/gui/win32/skinload.h Changes in other areas also in this revision: Modified: trunk/DOCS/xml/de/skin.xml trunk/DOCS/xml/en/skin.xml trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/Changelog Thu Apr 24 16:41:04 2014 (r37177) @@ -46,6 +46,8 @@ MPlayer * Updated skins (avifile, Blue, Blue-small, Clearlooks, Corelian, disappearer, mentalic, mplayer_red, nativeRed, neutron, phony, plastic, slim, softgrip, standard, trium, tvisor, xanim) + * Video can be rotated + * New GUI message: evSetRotation 1.1: "We gave up on 1.0" Modified: trunk/gui/app/app.c ============================================================================== --- trunk/gui/app/app.c Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/gui/app/app.c Thu Apr 24 16:41:04 2014 (r37177) @@ -75,6 +75,7 @@ static const evName evNames[] = { { evFullScreen, "evFullScreen" }, { evNormalSize, "evNormalSize" }, { evSetAspect, "evSetAspect" }, + { evSetRotation, "evSetRotation" }, { evIncVolume, "evIncVolume" }, { evDecVolume, "evDecVolume" }, { evSetVolume, "evSetVolume" }, Modified: trunk/gui/app/app.h ============================================================================== --- trunk/gui/app/app.h Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/gui/app/app.h Thu Apr 24 16:41:04 2014 (r37177) @@ -55,6 +55,7 @@ enum { evFullScreen, evNormalSize, evSetAspect, + evSetRotation, evIncVolume, evDecVolume, evSetVolume, Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/gui/dialog/menu.c Thu Apr 24 16:41:04 2014 (r37177) @@ -98,6 +98,11 @@ #include "pixmaps/tv.xpm" #endif #include "pixmaps/empty1px.xpm" +#include "pixmaps/rotate.xpm" +#include "pixmaps/rotate0.xpm" +#include "pixmaps/rotate180.xpm" +#include "pixmaps/rotate90ccw.xpm" +#include "pixmaps/rotate90cw.xpm" int gtkPopupMenu; int gtkPopupMenuParam; @@ -442,6 +447,7 @@ GtkWidget * DVDChapterMenu; GtkWidget * DVDAudioLanguageMenu; GtkWidget * DVDSubtitleLanguageMenu; GtkWidget * AspectMenu; +GtkWidget * RotationMenu; GtkWidget * VCDSubMenu; GtkWidget * VCDTitleMenu; GtkWidget * CDSubMenu; @@ -614,8 +620,26 @@ GtkWidget * CreatePopUpMenu( void ) if ( guiInfo.VideoWindow ) { - int a11 = False, a169 = False, a43 = False, a235 = False; AddSeparator( Menu ); + RotationMenu=AddSubMenu( window1, (const char*)rotate_xpm, Menu,MSGTR_GUI_Rotation ); + N=AddMenuCheckItem( window1, (const char*)rotate0_xpm, RotationMenu,MSGTR_GUI__none_, guiInfo.Rotation == -1, evSetRotation ); + D=AddMenuCheckItem( window1, (const char*)rotate90cw_xpm, RotationMenu,MSGTR_GUI_Rotation90CW, guiInfo.Rotation == 1, evSetRotation + ( 90 << 16 ) ); + F=AddMenuCheckItem( window1, (const char*)rotate90ccw_xpm, RotationMenu,MSGTR_GUI_Rotation90CCW, guiInfo.Rotation == 2, evSetRotation + ( -90 << 16 ) ); + H=AddMenuCheckItem( window1, (const char*)rotate180_xpm, RotationMenu,MSGTR_GUI_Rotation180, guiInfo.Rotation == 8, evSetRotation + ( 180 << 16 ) ); + + if ( !guiInfo.Playing ) + { + gtk_widget_set_sensitive( N,FALSE ); + gtk_widget_set_sensitive( D,FALSE ); + gtk_widget_set_sensitive( F,FALSE ); + gtk_widget_set_sensitive( H,FALSE ); + } + } + + if ( guiInfo.VideoWindow ) + { + int a11 = False, a169 = False, a43 = False, a235 = False; + if (movie_aspect == -1.0f) a11 = True; else { Added: trunk/gui/dialog/pixmaps/rotate.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/dialog/pixmaps/rotate.xpm Thu Apr 24 16:41:04 2014 (r37177) @@ -0,0 +1,70 @@ +/* XPM */ +static const char * const rotate_xpm[] = { +"16 16 50 1 0 0", +" c #000000", +"! c #6E6E70", +"# c #8C99A6", +"$ c #929FAB", +"% c #97A2AE", +"& c #9AA4AF", +"' c #9FA8B1", +"( c #A3AAB2", +") c #A8AEB5", +"* c #A0A4AA", +"+ c #A4B4C3", +", c #A9B7C7", +"- c #ADB9C8", +". c #AFBBC8", +"/ c #B2BDC9", +"0 c #B6BEC9", +"1 c #B8C1CA", +"2 c #A0B0C2", +"3 c #A6B5C7", +"4 c #A9B7C8", +"5 c #B0BBC8", +"6 c #B1B9C3", +"7 c #9EAEC1", +"8 c #A3B4C7", +"9 c #A7B5C7", +": c #B4BDC9", +"; c #AEB7C1", +"< c #9CAEC3", +"= c #A0B1C5", +"> c #AAB7C8", +"? c #A9B4BF", +"@ c #9CAFC4", +"A c #9EB0C5", +"B c #A1B1C5", +"C c #A7B6C7", +"D c #AEBBC8", +"E c #A6B1BD", +"F c #9AAEC4", +"G c #A4B4C7", +"H c #AAB8C8", +"I c #A1AEBB", +"J c #91A2B6", +"K c #8C9EB2", +"L c #8FA0B4", +"M c #8FA0B2", +"N c #91A1B1", +"O c #95A3B2", +"P c #9AA7B5", +"Q c #95A1AD", +"R c None", +"RRRRRRRRRR RRR", +"RRRRRRRRR R !RR", +"RRRRRRRR RRRR RR", +"RRR!!!!!!!!!! RR", +"RRR!#$%&'()*! RR", +"RRR!+,-./01 ", +"RRR!234-5/06 R", +"RRR!7894-5:;! RR", +"RR !<=89>-5?!RRR", +"R @AB8C>DE!RRR", +" FA=GCHI!RRR", +"RR !JKLMNOPQ!RRR", +"RR !!!!!!!!!!RRR", +"RR RRRR RRRRRRRR", +"RR! R RRRRRRRRR", +"RRR RRRRRRRRRR" +}; Added: trunk/gui/dialog/pixmaps/rotate0.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/dialog/pixmaps/rotate0.xpm Thu Apr 24 16:41:04 2014 (r37177) @@ -0,0 +1,23 @@ +/* XPM */ +static const char * const rotate0_xpm[] = { +"16 16 3 1 0 0", +" c #6E6E70", +"! c #4E4E50", +"# c None", +"################", +"################", +"####### #######", +"###### !! ######", +"##### !!!! #####", +"#### !!!!!! ####", +"### !!!!!!!! ###", +"####!# !! #!####", +"###### !! ######", +"###### !! ######", +"###### !! ######", +"###### !! ######", +"###### !! ######", +"###### !! ######", +"####### #######", +"################" +}; Added: trunk/gui/dialog/pixmaps/rotate180.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/dialog/pixmaps/rotate180.xpm Thu Apr 24 16:41:04 2014 (r37177) @@ -0,0 +1,22 @@ +/* XPM */ +static const char * const rotate180_xpm[] = { +"16 16 2 1 0 0", +" c #4E4E50", +"! c None", +"!!!!!!! !!!!!!!!", +"!!!!!!! !!!!!!!", +"!!!!!!! !!!!!!", +"!!!!! ! !!", +"!!! ! !", +"!! !! !!! ", +"! !!!! !!!!! ", +" !!!! !!!!!! ", +" !!!!!! !!!! ", +" !!!!! !!!! !", +" !!! !! !!", +"! ! !!!", +"!! ! !!!!!", +"!!!!!! !!!!!!!", +"!!!!!!! !!!!!!!", +"!!!!!!!! !!!!!!!" +}; Added: trunk/gui/dialog/pixmaps/rotate90ccw.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/dialog/pixmaps/rotate90ccw.xpm Thu Apr 24 16:41:04 2014 (r37177) @@ -0,0 +1,25 @@ +/* XPM */ +static const char * const rotate90ccw_xpm[] = { +"16 16 5 1 0 0", +" c #4E4E50", +"! c #4E4E51", +"# c #4F4F50", +"$ c #4F4F51", +"% c None", +"%%%%%%%%%%%%%%%%", +"%%%%%%%%%%%%%%%%", +"%%%%%%%% %%%%", +"%%%%%% %%", +"%%%%% %%%%!%", +"%%%% %%%%%%%%", +"%%%% #%%%%%%%%", +"%%% %%%%%%%%%", +"%%% %%%%%%%%%", +"%$% %$%%%%%%%", +"%$ $%%%%%%%", +"%% %%%%%%%%", +"%%% %%%%%%%%%", +"%%%%$$%%%%%%%%%%", +"%%%%%%%%%%%%%%%%", +"%%%%%%%%%%%%%%%%" +}; Added: trunk/gui/dialog/pixmaps/rotate90cw.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/dialog/pixmaps/rotate90cw.xpm Thu Apr 24 16:41:04 2014 (r37177) @@ -0,0 +1,25 @@ +/* XPM */ +static const char * const rotate90cw_xpm[] = { +"16 16 5 1 0 0", +" c #4E4E50", +"! c #4E4E51", +"# c #4F4F50", +"$ c #4F4F51", +"% c None", +"%%%%%%%%%%%%%%%%", +"%%%%%%%%%%%%%%%%", +"%%%% %%%%%%%%", +"%% %%%%%%", +"%!%%%% %%%%%", +"%%%%%%%% %%%%", +"%%%%%%%%# %%%%", +"%%%%%%%%% %%%", +"%%%%%%%%% %%%", +"%%%%%%%$% %$%", +"%%%%%%%$ $%", +"%%%%%%%% %%", +"%%%%%%%%% %%%", +"%%%%%%%%%%$$%%%%", +"%%%%%%%%%%%%%%%%", +"%%%%%%%%%%%%%%%%" +}; Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/gui/interface.c Thu Apr 24 16:41:04 2014 (r37177) @@ -194,6 +194,7 @@ static void remove_vf(char *vf) */ void guiInit(void) { + char **argvf; int ret; plItem *playlist; @@ -226,6 +227,9 @@ void guiInit(void) gtkASS.top_margin = ass_top_margin; gtkASS.bottom_margin = ass_bottom_margin; + argvf = get_vf("rotate"); + guiInfo.Rotation = (argvf && argvf[1] ? atoi(argvf[1]) : -1); + /* initialize graphical user interfaces */ wsInit(mDisplay); @@ -576,6 +580,36 @@ int gui(int what, void *data) if (gtkVfPP) add_vf("pp", NULL); + switch (guiInfo.Rotation) { + static const char *argvf[] = { "_oldargs_", NULL, NULL }; + + case -1: + remove_vf("rotate"); + remove_vf("flip"); + remove_vf("mirror"); + break; + + case 1: + argvf[1] = "1"; + add_vf("rotate", argvf); + remove_vf("flip"); + remove_vf("mirror"); + break; + + case 2: + argvf[1] = "2"; + add_vf("rotate", argvf); + remove_vf("flip"); + remove_vf("mirror"); + break; + + case 8: + remove_vf("rotate"); + add_vf("flip", NULL); + add_vf("mirror", NULL); + break; + } + /* audio opts */ // if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; } Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/gui/interface.h Thu Apr 24 16:41:04 2014 (r37177) @@ -103,6 +103,8 @@ typedef struct { int VideoWidth; int VideoHeight; + int Rotation; + char *CodecName; int StreamType; Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/gui/ui/actions.c Thu Apr 24 16:41:04 2014 (r37177) @@ -466,6 +466,31 @@ play: break; + case evSetRotation: + + switch (iparam) { + case 90: + guiInfo.Rotation = 1; + break; + + case -90: + guiInfo.Rotation = 2; + break; + + case 180: + guiInfo.Rotation = 8; + break; + + case 0: + default: + guiInfo.Rotation = -1; + break; + } + + guiInfo.MediumChanged = GUI_MEDIUM_SAME; + + break; + /* timer events */ case ivRedraw: { Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/gui/win32/skinload.c Thu Apr 24 16:41:04 2014 (r37177) @@ -81,6 +81,7 @@ static const evName evNames[] = { evFullScreen, "evFullScreen" }, { evNormalSize, "evNormalSize" }, { evSetAspect, "evSetAspect" }, + { evSetRotation, "evSetRotation" }, { evIncVolume, "evIncVolume" }, { evDecVolume, "evDecVolume" }, { evSetVolume, "evSetVolume" }, Modified: trunk/gui/win32/skinload.h ============================================================================== --- trunk/gui/win32/skinload.h Thu Apr 24 15:51:20 2014 (r37176) +++ trunk/gui/win32/skinload.h Thu Apr 24 16:41:04 2014 (r37177) @@ -168,6 +168,7 @@ enum evFullScreen, evNormalSize, evSetAspect, + evSetRotation, evIncVolume, evDecVolume, evSetVolume,

1 0

r37175 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 15:36:22 2014 New Revision: 37175 Log: Add get_vf(). (Currently unused, but we will need it soon.) Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 15:31:52 2014 (r37174) +++ trunk/gui/interface.c Thu Apr 24 15:36:22 2014 (r37175) @@ -131,6 +131,33 @@ static void add_vf(const char *vf, const mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, vf); } +/** + * @brief Get a video filter's array of parameter/value pairs. + * + * @param vf video filter in question + * + * @return pointer to the array of parameter/value pairs + */ +static char **get_vf(const char *vf) +{ + char **attribs = NULL; + + if (vf_settings) { + int i = 0; + + while (vf_settings[i].name) { + if (strcmp(vf_settings[i].name, vf) == 0) { + attribs = vf_settings[i].attribs; + break; + } + + i++; + } + } + + return attribs; +} + /* MPlayer -> GUI */ /**

1 0

r37174 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 15:31:52 2014 New Revision: 37174 Log: Relocate add_vf(). Additionally, add doxygen comment. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 15:22:38 2014 (r37173) +++ trunk/gui/interface.c Thu Apr 24 15:31:52 2014 (r37174) @@ -85,6 +85,52 @@ static void set_fontconfig(void) font_fontconfig = (font_name && strchr(font_name, '/') ? -1 : orig_fontconfig); } +/** + * @brief Add a video filter + * (or change the parameter/value pairs of an existing one). + * + * @param vf video filter to be added or changed + * @param argvf pointer to an array of (new) parameter/value pairs + */ +static void add_vf(const char *vf, const char *const *argvf) +{ + if (vf_settings) { + int i = 0; + + while (vf_settings[i].name) { + if (strcmp(vf_settings[i].name, vf) == 0) + break; + + i++; + } + + if (vf_settings[i].name) { + listFree(&vf_settings[i].attribs); + vf_settings[i].attribs = listDup(argvf); + } else { + void *settings = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t)); + + if (!settings) + return; + + vf_settings = settings; + vf_settings[i].name = strdup(vf); + vf_settings[i].attribs = listDup(argvf); + memset(&vf_settings[i + 1], 0, sizeof(m_obj_settings_t)); + } + } else { + vf_settings = calloc(2, sizeof(m_obj_settings_t)); + + if (!vf_settings) + return; + + vf_settings[0].name = strdup(vf); + vf_settings[0].attribs = listDup(argvf); + } + + mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, vf); +} + /* MPlayer -> GUI */ /** @@ -275,45 +321,6 @@ void guiDone(void) mp_msg(MSGT_GPLAYER, MSGL_V, "GUI done.\n"); } -static void add_vf(const char *vf, const char *const *argvf) -{ - if (vf_settings) { - int i = 0; - - while (vf_settings[i].name) { - if (strcmp(vf_settings[i].name, vf) == 0) - break; - - i++; - } - - if (vf_settings[i].name) { - listFree(&vf_settings[i].attribs); - vf_settings[i].attribs = listDup(argvf); - } else { - void *settings = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t)); - - if (!settings) - return; - - vf_settings = settings; - vf_settings[i].name = strdup(vf); - vf_settings[i].attribs = listDup(argvf); - memset(&vf_settings[i + 1], 0, sizeof(m_obj_settings_t)); - } - } else { - vf_settings = calloc(2, sizeof(m_obj_settings_t)); - - if (!vf_settings) - return; - - vf_settings[0].name = strdup(vf); - vf_settings[0].attribs = listDup(argvf); - } - - mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, vf); -} - /** * @brief Issue a command to the GUI. *

1 0

r37173 - trunk/gui/interface.c
by ib 24 Apr '14

24 Apr '14

Author: ib Date: Thu Apr 24 15:22:38 2014 New Revision: 37173 Log: Improve add_vf(). Allow changing the options of an existing video filter. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu Apr 24 15:20:58 2014 (r37172) +++ trunk/gui/interface.c Thu Apr 24 15:22:38 2014 (r37173) @@ -287,7 +287,10 @@ static void add_vf(const char *vf, const i++; } - if (!vf_settings[i].name) { + if (vf_settings[i].name) { + listFree(&vf_settings[i].attribs); + vf_settings[i].attribs = listDup(argvf); + } else { void *settings = realloc(vf_settings, (i + 2) * sizeof(m_obj_settings_t)); if (!settings)

1 0