diff options
Diffstat (limited to 'src')
37 files changed, 107 insertions, 97 deletions
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 52dd0568f..fa64bca05 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux.h,v 1.31 2003/05/20 13:50:56 mroi Exp $ + * $Id: demux.h,v 1.32 2003/07/25 21:02:04 miguelfreitas Exp $ */ #ifndef HAVE_DEMUX_H @@ -35,7 +35,7 @@ # include <xine/xine_internal.h> #endif -#define DEMUXER_PLUGIN_IFACE_VERSION 21 +#define DEMUXER_PLUGIN_IFACE_VERSION 22 #define DEMUX_OK 0 #define DEMUX_FINISHED 1 @@ -109,7 +109,7 @@ struct demux_plugin_s { * for seekable streams, a start position can be specified * * start_pos : position in input source - * start_time : position measured in seconds from stream start + * start_time : position measured in miliseconds from stream start * * if both parameters are !=0 start_pos will be used * for non-seekable streams both values will be ignored diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 14731fb1b..49621e5ce 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_asf.c,v 1.125 2003/07/19 00:18:49 tmattern Exp $ + * $Id: demux_asf.c,v 1.126 2003/07/25 21:02:04 miguelfreitas Exp $ * * demultiplexer for asf streams * @@ -1776,6 +1776,8 @@ static int demux_asf_seek (demux_plugin_t *this_gen, int i, state; int64_t ts; + start_time /= 1000; + #ifdef LOG printf ("demux_asf: demux_asf_seek: start_pos = %lld, start_time=%d\n", start_pos, start_time); @@ -2125,6 +2127,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "asf", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_DEMUX, 22, "asf", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 4af2f5ed3..02a198b7d 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.165 2003/07/19 19:11:45 tmattern Exp $ + * $Id: demux_avi.c,v 1.166 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for avi streams * @@ -1566,7 +1566,7 @@ static int demux_avi_seek (demux_plugin_t *this_gen, if (start_pos) { idx_grow(this, start_pos_stopper, &start_pos); } else if (start_time) { - video_pts = start_time * 90000; + video_pts = start_time * 90; idx_grow(this, start_time_stopper, &video_pts); } @@ -1826,6 +1826,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "avi", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_DEMUX, 22, "avi", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index c265a02d1..c0da5d57f 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -24,7 +24,7 @@ * linear PCM "decoder" (which in turn sends them directly to the audio * output target; this is a really fancy CD-playing architecture). * - * $Id: demux_cdda.c,v 1.9 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_cdda.c,v 1.10 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -134,6 +134,7 @@ static void demux_cdda_send_headers(demux_plugin_t *this_gen) { static int demux_cdda_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { demux_cdda_t *this = (demux_cdda_t *) this_gen; + start_time /= 1000; if (start_pos) this->input->seek(this->input, start_pos, SEEK_SET); diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index c1c5de639..3949d2a5c 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_eawve.c,v 1.18 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_eawve.c,v 1.19 2003/07/25 21:02:05 miguelfreitas Exp $ * * demux_eawve.c, Demuxer plugin for Electronic Arts' WVE file format * @@ -439,7 +439,7 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data){ #if 0 plugin_info_t xine_plugin_info[] = { - { PLUGIN_DEMUX, 21, "wve", XINE_VERSION_CODE, NULL, (void*)demux_eawve_init_plugin}, + { PLUGIN_DEMUX, 22, "wve", XINE_VERSION_CODE, NULL, (void*)demux_eawve_init_plugin}, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index ca34413a9..d324f4d61 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_elem.c,v 1.73 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_elem.c,v 1.74 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for elementary mpeg streams */ @@ -287,6 +287,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "elem", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "elem", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 62fff9232..38542de69 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.63 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_film.c,v 1.64 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -757,7 +757,7 @@ static int demux_film_seek (demux_plugin_t *this_gen, off_t start_pos, int start best_index = middle; } } else { - int64_t pts = 90000 * start_time; + int64_t pts = 90 * start_time; if (pts <= this->sample_table[0].pts) best_index = 0; diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 3d354cfb0..4d91a21da 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -24,7 +24,7 @@ * avoid while programming a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_fli.c,v 1.43 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_fli.c,v 1.44 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -389,6 +389,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "fli", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "fli", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index 93ecd20e1..37cd096cb 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -65,7 +65,7 @@ * - if any bytes exceed 63, do not shift the bytes at all before * transmitting them to the video decoder * - * $Id: demux_idcin.c,v 1.41 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_idcin.c,v 1.42 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -562,7 +562,7 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) { #if 0 plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "idcin", XINE_VERSION_CODE, NULL, demux_idcin_init_plugin }, + { PLUGIN_DEMUX, 22, "idcin", XINE_VERSION_CODE, NULL, demux_idcin_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index e8adde119..89e3f26f6 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_image.c,v 1.5 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_image.c,v 1.6 2003/07/25 21:02:05 miguelfreitas Exp $ * * image dummy demultiplexer */ @@ -234,6 +234,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "image", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_DEMUX, 22, "image", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index b8ee737fc..a99727e66 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -23,7 +23,7 @@ * For more information regarding the Interplay MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_ipmovie.c,v 1.11 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_ipmovie.c,v 1.12 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -740,7 +740,7 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { #if 0 plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "ipmovie", XINE_VERSION_CODE, NULL, demux_ipmovie_init_plugin }, + { PLUGIN_DEMUX, 22, "ipmovie", XINE_VERSION_CODE, NULL, demux_ipmovie_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 1880cd1da..6c0858ab6 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mng.c,v 1.10 2003/07/16 14:14:17 andruil Exp $ + * $Id: demux_mng.c,v 1.11 2003/07/25 21:02:05 miguelfreitas Exp $ * * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format * @@ -367,6 +367,6 @@ static void *init_plugin(xine_t *xine, void *data){ } plugin_info_t xine_plugin_info[] = { - { PLUGIN_DEMUX, 21, "mng", XINE_VERSION_CODE, NULL, (void*)init_plugin}, + { PLUGIN_DEMUX, 22, "mng", XINE_VERSION_CODE, NULL, (void*)init_plugin}, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 70d3cc5b8..ad9bf5ca1 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mpeg.c,v 1.121 2003/07/16 14:14:17 andruil Exp $ + * $Id: demux_mpeg.c,v 1.122 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -913,6 +913,7 @@ static int demux_mpeg_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { demux_mpeg_t *this = (demux_mpeg_t *) this_gen; + start_time /= 1000; if (INPUT_IS_SEEKABLE(this->input)) { @@ -1152,6 +1153,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "mpeg", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "mpeg", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 648e23507..8f187edcc 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.192 2003/06/18 13:03:45 mroi Exp $ + * $Id: demux_mpeg_block.c,v 1.193 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -1198,6 +1198,7 @@ static int demux_mpeg_block_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen; + start_time /= 1000; if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) { @@ -1529,6 +1530,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "mpeg_block", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "mpeg_block", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 827b92497..5f305d2e5 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_pes.c,v 1.5 2003/07/12 00:45:04 jcdutton Exp $ + * $Id: demux_mpeg_pes.c,v 1.6 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -1200,6 +1200,7 @@ static int demux_mpeg_pes_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { demux_mpeg_pes_t *this = (demux_mpeg_pes_t *) this_gen; + start_time /= 1000; if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) { @@ -1491,6 +1492,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "mpeg_pes", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "mpeg_pes", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 4b60d2f7b..a72c0ec7f 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpgaudio.c,v 1.102 2003/04/26 20:16:16 guenter Exp $ + * $Id: demux_mpgaudio.c,v 1.103 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -565,6 +565,7 @@ static int demux_mpgaudio_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { demux_mpgaudio_t *this = (demux_mpgaudio_t *) this_gen; + start_time /= 1000; if ((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) { @@ -817,7 +818,7 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) { #if 0 plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "mp3", XINE_VERSION_CODE, NULL, demux_mpgaudio_init_class }, + { PLUGIN_DEMUX, 22, "mp3", XINE_VERSION_CODE, NULL, demux_mpgaudio_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index c1641681c..51d24f09a 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -23,7 +23,7 @@ * For more information regarding the NSV file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_nsv.c,v 1.3 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_nsv.c,v 1.4 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -499,6 +499,6 @@ void *demux_nsv_init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "nsv", XINE_VERSION_CODE, NULL, demux_nsv_init_plugin }, + { PLUGIN_DEMUX, 22, "nsv", XINE_VERSION_CODE, NULL, demux_nsv_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index 87d6e5050..3dfa307ae 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.105 2003/07/17 16:07:52 heinchen Exp $ + * $Id: demux_ogg.c,v 1.106 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for ogg streams * @@ -1318,6 +1318,7 @@ static int demux_ogg_seek (demux_plugin_t *this_gen, demux_ogg_t *this = (demux_ogg_t *) this_gen; int i; + start_time /= 1000; /* * seek to start position */ @@ -1624,6 +1625,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "ogg", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_DEMUX, 22, "ogg", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c index e05c627c0..c6a62da0a 100644 --- a/src/demuxers/demux_pes.c +++ b/src/demuxers/demux_pes.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_pes.c,v 1.45 2003/04/26 20:16:20 guenter Exp $ + * $Id: demux_pes.c,v 1.46 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -644,6 +644,6 @@ static void *init_demuxer_plugin(xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "mpeg-pes", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_DEMUX, 22, "mpeg-pes", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 9d423d55b..4caffdc30 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -23,7 +23,7 @@ * For more information regarding the PVA file format, refer to this PDF: * http://www.technotrend.de/download/av_format_v1.pdf * - * $Id: demux_pva.c,v 1.10 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_pva.c,v 1.11 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -517,6 +517,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "pva", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "pva", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index e1efc0578..81124885d 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.163 2003/07/21 19:28:05 hadess Exp $ + * $Id: demux_qt.c,v 1.164 2003/07/25 21:02:05 miguelfreitas Exp $ * */ @@ -2570,7 +2570,7 @@ static int binary_seek(qt_trak *trak, off_t start_pos, int start_time) { best_index = middle; } } else { - int64_t pts = 90000 * start_time; + int64_t pts = 90 * start_time; if (pts <= trak->frames[0].pts) best_index = 0; @@ -2852,6 +2852,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "quicktime", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "quicktime", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index d94f0555a..11e26309c 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_rawdv.c,v 1.10 2003/07/19 11:57:29 mroi Exp $ + * $Id: demux_rawdv.c,v 1.11 2003/07/25 21:02:05 miguelfreitas Exp $ * * demultiplexer for raw dv streams */ @@ -292,7 +292,7 @@ static int demux_raw_dv_seek (demux_plugin_t *this_gen, } if( !start_pos && start_time ) { - start_pos = (start_time * 90000 / this->duration) * this->frame_size; + start_pos = (start_time * 90 / this->duration) * this->frame_size; } start_pos = start_pos - (start_pos % this->frame_size); @@ -425,6 +425,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "rawdv", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "rawdv", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index c317b269c..fe5dbb6c1 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -30,7 +30,7 @@ * * Based on FFmpeg's libav/rm.c. * - * $Id: demux_real.c,v 1.64 2003/07/22 20:36:51 jstembridge Exp $ + * $Id: demux_real.c,v 1.65 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -1199,7 +1199,6 @@ static int demux_real_seek (demux_plugin_t *this_gen, while((index[i+1].offset < start_pos) && (i < entries - 1)) i++; } else if(start_time) { - start_time *= 1000; while((index[i+1].timestamp < start_time) && (i < entries - 1)) i++; } @@ -1411,6 +1410,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "real", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_DEMUX, 22, "real", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index da3abddb7..83b097b7f 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -23,7 +23,7 @@ * For more information regarding the RoQ file format, visit: * http://www.csse.monash.edu.au/~timf/ * - * $Id: demux_roq.c,v 1.40 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_roq.c,v 1.41 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -494,7 +494,7 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) { #if 0 plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "roq", XINE_VERSION_CODE, NULL, demux_roq_init_plugin }, + { PLUGIN_DEMUX, 22, "roq", XINE_VERSION_CODE, NULL, demux_roq_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index a828549e2..331adc7fe 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -21,7 +21,7 @@ */ /* - * $Id: demux_slave.c,v 1.4 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_slave.c,v 1.5 2003/07/25 21:02:05 miguelfreitas Exp $ * * demuxer for slave "protocol" * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is, @@ -440,6 +440,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "slave", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "slave", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index ea3d3779f..bc3d45377 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -24,7 +24,7 @@ * This demuxer handles either raw STR files (which are just a concatenation * of raw compact disc sectors) or STR files with RIFF headers. * - * $Id: demux_str.c,v 1.13 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_str.c,v 1.14 2003/07/25 21:02:05 miguelfreitas Exp $ */ /* @@ -651,7 +651,7 @@ void *demux_str_init_plugin (xine_t *xine, void *data) { #if 0 plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "str", XINE_VERSION_CODE, NULL, demux_str_init_plugin }, + { PLUGIN_DEMUX, 22, "str", XINE_VERSION_CODE, NULL, demux_str_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 9ec706a8f..2e89db7fa 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_ts.c,v 1.85 2003/06/26 21:57:46 jcdutton Exp $ + * $Id: demux_ts.c,v 1.86 2003/07/25 21:02:05 miguelfreitas Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -1706,6 +1706,7 @@ static int demux_ts_seek (demux_plugin_t *this_gen, demux_ts_t *this = (demux_ts_t *) this_gen; int i; + start_time /= 1000; if (this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) { @@ -2002,6 +2003,6 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "mpeg-ts", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_DEMUX, 22, "mpeg-ts", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index f1468a64c..4c007b149 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -29,7 +29,7 @@ * block needs information from the previous audio block in order to be * decoded, thus making random seeking difficult. * - * $Id: demux_vqa.c,v 1.30 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_vqa.c,v 1.31 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -432,7 +432,7 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) { #if 0 plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "vqa", XINE_VERSION_CODE, NULL, demux_vqa_init_plugin }, + { PLUGIN_DEMUX, 22, "vqa", XINE_VERSION_CODE, NULL, demux_vqa_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index e41e65a5b..d25a74476 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -24,7 +24,7 @@ * For more information on the MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_wc3movie.c,v 1.38 2003/07/16 00:52:45 andruil Exp $ + * $Id: demux_wc3movie.c,v 1.39 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -538,6 +538,7 @@ static int demux_mve_seek (demux_plugin_t *this_gen, unsigned int chunk_size; int new_shot = -1; + start_time /= 1000; this->status = DEMUX_OK; xine_demux_flush_engine(this->stream); this->seek_flag = 1; @@ -755,7 +756,7 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { #if 0 plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "wc3movie", XINE_VERSION_CODE, NULL, demux_wc3movie_init_plugin }, + { PLUGIN_DEMUX, 22, "wc3movie", XINE_VERSION_CODE, NULL, demux_wc3movie_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 822a0d517..320afb62c 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -24,7 +24,7 @@ * tools, visit: * http://mjpeg.sourceforge.net/ * - * $Id: demux_yuv4mpeg2.c,v 1.23 2003/07/16 00:52:46 andruil Exp $ + * $Id: demux_yuv4mpeg2.c,v 1.24 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -245,6 +245,7 @@ static int demux_yuv4mpeg2_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { demux_yuv4mpeg2_t *this = (demux_yuv4mpeg2_t *) this_gen; + start_time /= 1000; if (INPUT_IS_SEEKABLE(this->input)) { @@ -405,6 +406,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "yuv4mpeg2", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 22, "yuv4mpeg2", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 3a09ebafb..8628dd0c1 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -20,7 +20,7 @@ */ /* - * $Id: demux_yuv_frames.c,v 1.7 2003/07/16 00:52:46 andruil Exp $ + * $Id: demux_yuv_frames.c,v 1.8 2003/07/25 21:02:05 miguelfreitas Exp $ * * dummy demultiplexer for raw yuv frames (delivered by v4l) */ @@ -260,7 +260,7 @@ static void *init_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "yuv_frames", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_DEMUX, 22, "yuv_frames", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c index 537d15f0e..2880f587c 100644 --- a/src/demuxers/group_audio.c +++ b/src/demuxers/group_audio.c @@ -19,7 +19,7 @@ * * This file contains plugin entries for several demuxers used in games * - * $Id: group_audio.c,v 1.6 2003/04/26 20:16:30 guenter Exp $ + * $Id: group_audio.c,v 1.7 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -48,16 +48,16 @@ void *demux_wav_init_plugin (xine_t *xine, void *data); plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "ac3", XINE_VERSION_CODE, NULL, demux_ac3_init_plugin }, - { PLUGIN_DEMUX, 21, "aud", XINE_VERSION_CODE, NULL, demux_aud_init_plugin }, - { PLUGIN_DEMUX, 21, "aiff", XINE_VERSION_CODE, NULL, demux_aiff_init_plugin }, - { PLUGIN_DEMUX, 21, "cdda", XINE_VERSION_CODE, NULL, demux_cdda_init_plugin }, - { PLUGIN_DEMUX, 21, "mp3", XINE_VERSION_CODE, NULL, demux_mpgaudio_init_class }, - { PLUGIN_DEMUX, 21, "nsf", XINE_VERSION_CODE, NULL, demux_nsf_init_plugin }, - { PLUGIN_DEMUX, 21, "realaudio", XINE_VERSION_CODE, NULL, demux_realaudio_init_plugin }, - { PLUGIN_DEMUX, 21, "snd", XINE_VERSION_CODE, NULL, demux_snd_init_plugin }, - { PLUGIN_DEMUX, 21, "voc", XINE_VERSION_CODE, NULL, demux_voc_init_plugin }, - { PLUGIN_DEMUX, 21, "vox", XINE_VERSION_CODE, NULL, demux_vox_init_plugin }, - { PLUGIN_DEMUX, 21, "wav", XINE_VERSION_CODE, NULL, demux_wav_init_plugin }, + { PLUGIN_DEMUX, 22, "ac3", XINE_VERSION_CODE, NULL, demux_ac3_init_plugin }, + { PLUGIN_DEMUX, 22, "aud", XINE_VERSION_CODE, NULL, demux_aud_init_plugin }, + { PLUGIN_DEMUX, 22, "aiff", XINE_VERSION_CODE, NULL, demux_aiff_init_plugin }, + { PLUGIN_DEMUX, 22, "cdda", XINE_VERSION_CODE, NULL, demux_cdda_init_plugin }, + { PLUGIN_DEMUX, 22, "mp3", XINE_VERSION_CODE, NULL, demux_mpgaudio_init_class }, + { PLUGIN_DEMUX, 22, "nsf", XINE_VERSION_CODE, NULL, demux_nsf_init_plugin }, + { PLUGIN_DEMUX, 22, "realaudio", XINE_VERSION_CODE, NULL, demux_realaudio_init_plugin }, + { PLUGIN_DEMUX, 22, "snd", XINE_VERSION_CODE, NULL, demux_snd_init_plugin }, + { PLUGIN_DEMUX, 22, "voc", XINE_VERSION_CODE, NULL, demux_voc_init_plugin }, + { PLUGIN_DEMUX, 22, "vox", XINE_VERSION_CODE, NULL, demux_vox_init_plugin }, + { PLUGIN_DEMUX, 22, "wav", XINE_VERSION_CODE, NULL, demux_wav_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c index e0dc1d6fd..4f8e7d309 100644 --- a/src/demuxers/group_games.c +++ b/src/demuxers/group_games.c @@ -19,7 +19,7 @@ * * This file contains plugin entries for several demuxers used in games * - * $Id: group_games.c,v 1.4 2003/05/26 21:06:01 tmmm Exp $ + * $Id: group_games.c,v 1.5 2003/07/25 21:02:05 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -47,15 +47,15 @@ void *demux_fourxm_init_plugin (xine_t *xine, void *data); plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "wve", XINE_VERSION_CODE, NULL, demux_eawve_init_plugin}, - { PLUGIN_DEMUX, 21, "idcin", XINE_VERSION_CODE, NULL, demux_idcin_init_plugin }, - { PLUGIN_DEMUX, 21, "ipmovie", XINE_VERSION_CODE, NULL, demux_ipmovie_init_plugin }, - { PLUGIN_DEMUX, 21, "vqa", XINE_VERSION_CODE, NULL, demux_vqa_init_plugin }, - { PLUGIN_DEMUX, 21, "wc3movie", XINE_VERSION_CODE, NULL, demux_wc3movie_init_plugin }, - { PLUGIN_DEMUX, 21, "roq", XINE_VERSION_CODE, NULL, demux_roq_init_plugin }, - { PLUGIN_DEMUX, 21, "str", XINE_VERSION_CODE, NULL, demux_str_init_plugin }, - { PLUGIN_DEMUX, 21, "film", XINE_VERSION_CODE, NULL, demux_film_init_plugin }, - { PLUGIN_DEMUX, 21, "smjpeg", XINE_VERSION_CODE, NULL, demux_smjpeg_init_plugin }, - { PLUGIN_DEMUX, 21, "fourxm", XINE_VERSION_CODE, NULL, demux_fourxm_init_plugin }, + { PLUGIN_DEMUX, 22, "wve", XINE_VERSION_CODE, NULL, demux_eawve_init_plugin}, + { PLUGIN_DEMUX, 22, "idcin", XINE_VERSION_CODE, NULL, demux_idcin_init_plugin }, + { PLUGIN_DEMUX, 22, "ipmovie", XINE_VERSION_CODE, NULL, demux_ipmovie_init_plugin }, + { PLUGIN_DEMUX, 22, "vqa", XINE_VERSION_CODE, NULL, demux_vqa_init_plugin }, + { PLUGIN_DEMUX, 22, "wc3movie", XINE_VERSION_CODE, NULL, demux_wc3movie_init_plugin }, + { PLUGIN_DEMUX, 22, "roq", XINE_VERSION_CODE, NULL, demux_roq_init_plugin }, + { PLUGIN_DEMUX, 22, "str", XINE_VERSION_CODE, NULL, demux_str_init_plugin }, + { PLUGIN_DEMUX, 22, "film", XINE_VERSION_CODE, NULL, demux_film_init_plugin }, + { PLUGIN_DEMUX, 22, "smjpeg", XINE_VERSION_CODE, NULL, demux_smjpeg_init_plugin }, + { PLUGIN_DEMUX, 22, "fourxm", XINE_VERSION_CODE, NULL, demux_fourxm_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libflac/decoder_flac.c b/src/libflac/decoder_flac.c index 00f26742b..14ef172da 100644 --- a/src/libflac/decoder_flac.c +++ b/src/libflac/decoder_flac.c @@ -425,7 +425,7 @@ void *demux_flac_init_class (xine_t *xine, void *data); plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class }, + { PLUGIN_DEMUX, 22, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class }, { PLUGIN_AUDIO_DECODER, 13, "flacdec", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libflac/demux_flac.c b/src/libflac/demux_flac.c index 80af4630e..6c83715d9 100644 --- a/src/libflac/demux_flac.c +++ b/src/libflac/demux_flac.c @@ -423,7 +423,7 @@ demux_flac_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { } else { - double distance = (double)start_time*1000.0; + double distance = (double)start_time; uint64_t target_sample = (uint64_t)(distance * this->total_samples); FLAC__bool s = false; @@ -667,7 +667,7 @@ demux_flac_init_class (xine_t *xine, void *data) { #if 0 plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class }, + { PLUGIN_DEMUX, 22, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; #endif diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 9ecccc993..d2e3e1a5b 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_sputext.c,v 1.18 2003/06/22 16:53:04 mroi Exp $ + * $Id: demux_sputext.c,v 1.19 2003/07/25 21:02:05 miguelfreitas Exp $ * * code based on old libsputext/xine_decoder.c * @@ -1010,6 +1010,6 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 21, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, + { PLUGIN_DEMUX, 22, "sputext", XINE_VERSION_CODE, NULL, &init_sputext_demux_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index be062b470..38195c7b5 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.250 2003/06/20 20:57:28 andruil Exp $ + * $Id: xine.c,v 1.251 2003/07/25 21:02:04 miguelfreitas Exp $ */ /* @@ -963,9 +963,9 @@ int xine_play (xine_stream_t *stream, int start_pos, int start_time) { pthread_mutex_lock (&stream->frontend_lock); - ret = xine_play_internal (stream, start_pos, start_time/1000); + ret = xine_play_internal (stream, start_pos, start_time); if( stream->slave && (stream->slave_affection & XINE_MASTER_SLAVE_PLAY) ) - xine_play (stream->slave, start_pos, start_time/1000); + xine_play (stream->slave, start_pos, start_time); pthread_mutex_unlock (&stream->frontend_lock); |