[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[230] mplayerxp

[<nic...@us...>]

Revision: 230
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=230&view=rev
Author:   nickols_k
Date:     2012-10-28 08:01:42 +0000 (Sun, 28 Oct 2012)
Log Message:
-----------
use playbackspeed_factor

Modified Paths:
--------------
    mplayerxp/cfg-mplayer.h
    mplayerxp/mplayer.c

Modified: mplayerxp/cfg-mplayer.h
===================================================================
--- mplayerxp/cfg-mplayer.h	2012-10-27 15:18:38 UTC (rev 229)
+++ mplayerxp/cfg-mplayer.h	2012-10-28 08:01:42 UTC (rev 230)
@@ -81,6 +81,7 @@
 	{"cache", &mp_conf.s_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL,"specifies amount of memory for precaching a file/URL"},
 	{"nocache", &mp_conf.s_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL,"disables precaching a file/URL"},
 	{"autoq", &mp_conf.autoq, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL, "dynamically changes the level of postprocessing depending on spare CPU time available"},
+	{"speed", &mp_conf.playbackspeed_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, NULL, "sets playback speed factor"},
 	{"benchmark", &mp_conf.benchmark, CONF_TYPE_FLAG, 0, 0, 1, NULL, "performs benchmarking to estimate performance of MPlayerXP"},
 	{NULL, NULL, 0, 0, 0, 0, NULL,NULL},
 };
@@ -246,7 +247,6 @@
 	{"zoom", &vo_conf.screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0, 4096, NULL, "scale output image by given factor"},
 	{"screenw", &vo_conf.screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL, "specifies the horizontal resolution of the screen (if supported)"},
 	{"screenh", &vo_conf.screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL, "specifies the vertical resolution of the screen (if supported)"},
-	{"speed", &mp_conf.playbackspeed_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, NULL, "sets playback speed factor"},
 	{"aspect", &vo_conf.movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL, "sets aspect-ratio of movies (autodetect)"},
 	{"noaspect", &vo_conf.movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL, "unsets aspect-ratio of movies"},
 	{"aspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL, "keeps aspect-ratio of the movie during window resize"},

Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c	2012-10-27 15:18:38 UTC (rev 229)
+++ mplayerxp/mplayer.c	2012-10-28 08:01:42 UTC (rev 230)
@@ -1161,7 +1161,7 @@
 	    goto nosound_model;
     } else {
 	nosound_model:
-	sleep_time=shva_prev->duration;
+	sleep_time=shva_prev->duration/mp_conf.playbackspeed_factor;
     }
     return sleep_time;
 }
@@ -2413,6 +2413,7 @@
     if(stream_dump_type==1) dump_stream(stream);
 
 //============ Open DEMUXERS --- DETECT file type =======================
+    if(mp_conf.playbackspeed_factor) mp_conf.has_audio=0;
     initial_audio_pts=HUGE;
     if(!mp_conf.has_audio) mp_conf.audio_id=-2;  // do NOT read audio packets...
     if(!mp_conf.has_video) mp_conf.video_id=-2;  // do NOT read video packets...

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.