February 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r32983 - trunk/gui/mplayer/mw.c
by ib 28 Feb '11

28 Feb '11

Author: ib Date: Mon Feb 28 14:05:01 2011 New Revision: 32983 Log: Add required include file. wskeys.h is currently included in app.h but not required there, therefore it is going to be removed there. Modified: trunk/gui/mplayer/mw.c Modified: trunk/gui/mplayer/mw.c ============================================================================== --- trunk/gui/mplayer/mw.c Mon Feb 28 11:51:56 2011 (r32982) +++ trunk/gui/mplayer/mw.c Mon Feb 28 14:05:01 2011 (r32983) @@ -31,6 +31,7 @@ #include "gui/skin/font.h" #include "gui/skin/skin.h" #include "gui/wm/ws.h" +#include "gui/wm/wskeys.h" #include "help_mp.h" #include "libvo/x11_common.h"

1 0

r32980 - in trunk/gui: mplayer/gtk/sb.c mplayer/play.c skin/skin.c skin/skin.h
by ib 28 Feb '11

28 Feb '11

Author: ib Date: Sun Feb 27 18:41:05 2011 New Revision: 32980 Log: Get rid of needless listItems variable and pointer. The tmpList structure variable was only used to check whether a skin can be read without error. After the check tmpList was erased and the same skin read once again into another structure - the appropriate target structure. Now error checking is done with skin reading into the target structure. The separate skinAppMPlayer pointer was needless, because a skin will only be read into the one global listItems structure appMPlayer, so that its address can be used right away. Freeing the listItems was done twice before and is now performed at a single place, where the fonts are freed now as well - in skinRead() right before skin reading starts. As a result there is now only one listItems variable - the global appMPlayer; memory is saved, passing around global variables and pointless double actions are avoided. Modified: trunk/gui/mplayer/gtk/sb.c trunk/gui/mplayer/play.c trunk/gui/skin/skin.c trunk/gui/skin/skin.h Modified: trunk/gui/mplayer/gtk/sb.c ============================================================================== --- trunk/gui/mplayer/gtk/sb.c Sun Feb 27 16:25:20 2011 (r32979) +++ trunk/gui/mplayer/gtk/sb.c Sun Feb 27 18:41:05 2011 (r32980) @@ -98,7 +98,7 @@ static void prButton( GtkObject * object if ( strcmp( sbSelectedSkin,gtkOldSkin ) ) ChangeSkin( gtkOldSkin ); break; case 1: // ok - ChangeSkin( sbSelectedSkin ); + ChangeSkin( sbSelectedSkin ); // NOTE TO MYSELF: skin already changed! free( skinName ); skinName=strdup( sbSelectedSkin ); break; Modified: trunk/gui/mplayer/play.c ============================================================================== --- trunk/gui/mplayer/play.c Sun Feb 27 16:25:20 2011 (r32979) +++ trunk/gui/mplayer/play.c Sun Feb 27 18:41:05 2011 (r32980) @@ -194,32 +194,20 @@ void mplAbsSeek(float s) abs_seek_pos = 3; } -listItems tmpList; - void ChangeSkin(char *name) { - int prev, bprev, ret; + int prev, bprev; prev = appMPlayer.menuIsPresent; bprev = appMPlayer.barIsPresent; mainVisible = 0; - appInitStruct(&tmpList); - skinAppMPlayer = &tmpList; - fntFreeFont(); - ret = skinRead(name); - - appInitStruct(&tmpList); - skinAppMPlayer = &appMPlayer; - appInitStruct(&appMPlayer); - - if (ret) - name = skinName; - - if (skinRead(name)) { + if (skinRead(name) != 0) { + if (skinRead(skinName) != 0) { mainVisible = 1; return; + } } // reload menu window Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Sun Feb 27 16:25:20 2011 (r32979) +++ trunk/gui/skin/skin.c Sun Feb 27 18:41:05 2011 (r32980) @@ -22,6 +22,7 @@ #include "skin.h" #include "cut.h" #include "font.h" +#include "gui/app.h" #include "gui/mplayer/widgets.h" #include "config.h" @@ -34,7 +35,6 @@ typedef struct { int (*func)(char *in); } _item; -listItems *skinAppMPlayer = &appMPlayer; static listItems *defList; static int linenumber; @@ -152,7 +152,7 @@ static int cmd_section(char *in) defList = NULL; if (!strcmp(in, "movieplayer")) - defList = skinAppMPlayer; + defList = &appMPlayer; mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "\n[skin] sectionname: %s\n", in); @@ -185,19 +185,19 @@ static int cmd_window(char *in) av_strlcpy(window_name, strlower(in), sizeof(window_name)); if (!strncmp(in, "main", 4)) { - currSection = &skinAppMPlayer->main; - currSubItem = &skinAppMPlayer->NumberOfItems; - currSubItems = skinAppMPlayer->Items; + currSection = &appMPlayer.main; + currSubItem = &appMPlayer.NumberOfItems; + currSubItems = appMPlayer.Items; } else if (!strncmp(in, "sub", 3)) - currSection = &skinAppMPlayer->sub; + currSection = &appMPlayer.sub; else if (!strncmp(in, "playbar", 7)) { - currSection = &skinAppMPlayer->bar; - currSubItem = &skinAppMPlayer->NumberOfBarItems; - currSubItems = skinAppMPlayer->barItems; + currSection = &appMPlayer.bar; + currSubItem = &appMPlayer.NumberOfBarItems; + currSubItems = appMPlayer.barItems; } else if (!strncmp(in, "menu", 4)) { - currSection = &skinAppMPlayer->menuBase; - currSubItem = &skinAppMPlayer->NumberOfMenuItems; - currSubItems = skinAppMPlayer->MenuItems; + currSection = &appMPlayer.menuBase; + currSubItem = &appMPlayer.NumberOfMenuItems; + currSubItems = appMPlayer.MenuItems; } else ERRORMESSAGE(MSGTR_UNKNOWNWINDOWTYPE); @@ -885,7 +885,8 @@ int skinRead(char *dname) mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] file: %s\n", fn); - appInitStruct(skinAppMPlayer); + appInitStruct(&appMPlayer); + fntFreeFont(); linenumber = 0; Modified: trunk/gui/skin/skin.h ============================================================================== --- trunk/gui/skin/skin.h Sun Feb 27 16:25:20 2011 (r32979) +++ trunk/gui/skin/skin.h Sun Feb 27 18:41:05 2011 (r32980) @@ -19,9 +19,7 @@ #ifndef MPLAYER_GUI_SKIN_H #define MPLAYER_GUI_SKIN_H -#include "gui/app.h" - -extern listItems *skinAppMPlayer; +#include "gui/bitmap.h" int skinBPRead(char *, txSample *); int skinRead(char *);

2 1

r32982 - trunk/stream/stream_dvdnav.c
by cehoyos 28 Feb '11

28 Feb '11

Author: cehoyos Date: Mon Feb 28 11:51:56 2011 New Revision: 32982 Log: Add ID_DVD_TITLE_x_CHAPTERS and ID_DVD_CURRENT_TITLE to the output of dvdnav:// -identify. Patch by Mike Castle, dalgoda+mplayer A gmail Modified: trunk/stream/stream_dvdnav.c Modified: trunk/stream/stream_dvdnav.c ============================================================================== --- trunk/stream/stream_dvdnav.c Sun Feb 27 18:43:02 2011 (r32981) +++ trunk/stream/stream_dvdnav.c Mon Feb 28 11:51:56 2011 (r32982) @@ -509,7 +509,9 @@ static void identify_chapters(dvdnav_t * if(parts) { t = duration / 90; mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title, t / 1000, t % 1000); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_TITLE_%d_CHAPTERS=%d\n", title, n); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "TITLE %u, CHAPTERS: ", title); + for(i=0; i<n; i++) { t = parts[i] / 90000; mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02d:%02d:%02d,", t/3600, (t/60)%60, t%60); @@ -600,6 +602,7 @@ static int open_s(stream_t *stream,int m mp_msg(MSGT_OPEN,MSGL_FATAL,"dvdnav_stream, couldn't select title %d, error '%s'\n", p->track, dvdnav_err_to_string(priv->dvdnav)); return STREAM_UNSUPPORTED; } + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_CURRENT_TITLE=%d\n", p->track); } else if (p->track == 0) { if(dvdnav_menu_call(priv->dvdnav, DVD_MENU_Root) != DVDNAV_STATUS_OK) dvdnav_menu_call(priv->dvdnav, DVD_MENU_Title);

1 0

r32981 - trunk/gui/mplayer/play.c
by ib 27 Feb '11

27 Feb '11

Author: ib Date: Sun Feb 27 18:43:02 2011 New Revision: 32981 Log: Cosmetic: Adjust indent. Modified: trunk/gui/mplayer/play.c Modified: trunk/gui/mplayer/play.c ============================================================================== --- trunk/gui/mplayer/play.c Sun Feb 27 18:41:05 2011 (r32980) +++ trunk/gui/mplayer/play.c Sun Feb 27 18:43:02 2011 (r32981) @@ -205,8 +205,8 @@ void ChangeSkin(char *name) if (skinRead(name) != 0) { if (skinRead(skinName) != 0) { - mainVisible = 1; - return; + mainVisible = 1; + return; } }

1 0

r32979 - trunk/configure
by reimar 27 Feb '11

27 Feb '11

Author: reimar Date: Sun Feb 27 16:25:20 2011 New Revision: 32979 Log: Fix compilation for systems where vorbis encode is split out into libvorbisenc. Note that vorbis support will be completely disabled for systems that use the split libraries but do not have libvorbisenc installed. That should be ok since there shouldn't be a real need to use libvorbis for decoding. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Feb 27 16:14:23 2011 (r32978) +++ trunk/configure Sun Feb 27 16:25:20 2011 (r32979) @@ -6295,7 +6295,9 @@ elif test "$_tremor" = auto; then fi if test "$_libvorbis" = auto; then _libvorbis=no - statement_check vorbis/codec.h 'vorbis_packet_blocksize(0, 0)' -lvorbis -logg $_ld_lm && _libvorbis=yes + for vorbislibs in '-lvorbis -logg' '-lvorbis -lvorbisenc -logg' ; do + statement_check vorbis/vorbisenc.h 'vorbis_encode_ctl(0, 0, 0)' $vorbislibs $_ld_lm && _libvorbis=yes && break + done fi if test "$_tremor_internal" = yes ; then _vorbis=yes @@ -6319,7 +6321,7 @@ elif test "$_libvorbis" = yes ; then def_vorbis='#define CONFIG_OGGVORBIS 1' codecmodules="libvorbis $codecmodules" res_comment="libvorbis" - extra_ldflags="$extra_ldflags -lvorbis -logg" + extra_ldflags="$extra_ldflags $vorbislibs" libavencoders="$libavencoders LIBVORBIS_ENCODER" else _vorbis=no

1 0

r32978 - trunk/version.sh
by reimar 27 Feb '11

27 Feb '11

Author: reimar Date: Sun Feb 27 16:14:23 2011 New Revision: 32978 Log: Do not run svn or otherwise try to extract the svn revision when we have a VERSION file we'll be using anyway. Modified: trunk/version.sh Modified: trunk/version.sh ============================================================================== --- trunk/version.sh Sun Feb 27 15:32:24 2011 (r32977) +++ trunk/version.sh Sun Feb 27 16:14:23 2011 (r32978) @@ -2,6 +2,10 @@ test "$1" && extra="-$1" +# releases extract the version number from the VERSION file +version=$(cat VERSION 2> /dev/null) + +if test -z $version ; then # Extract revision number from file used by daily tarball snapshots # or from the places different Subversion versions have it. svn_revision=$(cat snapshot_version 2> /dev/null) @@ -10,10 +14,8 @@ test $svn_revision || svn_revision=$(gre test $svn_revision || svn_revision=$(sed -n -e '/^dir$/{n;p;q;}' .svn/entries 2>/dev/null) test $svn_revision && svn_revision=SVN-r$svn_revision test $svn_revision || svn_revision=UNKNOWN - -# releases extract the version number from the VERSION file -version=$(cat VERSION 2> /dev/null) -test $version || version=$svn_revision +version=$svn_revision +fi NEW_REVISION="#define VERSION \"${version}${extra}\"" OLD_REVISION=$(head -n 1 version.h 2> /dev/null)

1 0

r32977 - trunk/stream/stream.c
by reimar 27 Feb '11

27 Feb '11

Author: reimar Date: Sun Feb 27 15:32:24 2011 New Revision: 32977 Log: Improve stream reset on read error, should now fix bug #1841 in more cases, e.g. also with -cache. Modified: trunk/stream/stream.c Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c Sun Feb 27 11:30:04 2011 (r32976) +++ trunk/stream/stream.c Sun Feb 27 15:32:24 2011 (r32977) @@ -309,9 +309,14 @@ int stream_read_internal(stream_t *s, vo if (!s->eof) { // just in case this is an error e.g. due to network // timeout reset and retry + // Seeking is used as a hack to make network streams + // reopen the connection, ideally they would implement + // e.g. a STREAM_CTRL_RECONNECT to do this off_t pos = s->pos; + s->eof=1; stream_reset(s); stream_seek_internal(s, pos); + // make sure EOF is set to ensure no endless loops s->eof=1; return stream_read_internal(s, buf, orig_len); }

1 0

r32976 - trunk/mplayer.c
by cboesch 27 Feb '11

27 Feb '11

Author: cboesch Date: Sun Feb 27 11:30:04 2011 New Revision: 32976 Log: 10l: forgot mp_strings.h header include with mp_asprintf prototype. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Feb 26 22:42:31 2011 (r32975) +++ trunk/mplayer.c Sun Feb 27 11:30:04 2011 (r32976) @@ -112,6 +112,7 @@ #include "mp_core.h" #include "mp_fifo.h" #include "mp_msg.h" +#include "mp_strings.h" #include "mpcommon.h" #include "mplayer.h" #include "osdep/getch2.h"

1 0

[propchange]: r32943 - svn:log
by ib 27 Feb '11

27 Feb '11

Author: ib Revision: 32943 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Cosmetic: Use more natural notations. +Cosmetic: Use more natural notations for the conditions.

1 0

[propchange]: r32925 - svn:log
by ib 27 Feb '11

27 Feb '11

Author: ib Revision: 32925 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Cosmetic: Use more natural notations. +Cosmetic: Use more natural notations for the conditions.

1 0