summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/Makefile.am1
-rw-r--r--src/xine-engine/load_plugins.c37
-rw-r--r--src/xine-engine/metronom.c20
-rw-r--r--src/xine-engine/video_out.c3
4 files changed, 27 insertions, 34 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 915e33677..b2442c571 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -11,7 +11,6 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c monitor.c \
audio_decoder.c video_out.c
libxine_la_DEPENDENCIES = libsdeps
libxine_la_LIBADD = \
- $(top_srcdir)/src/libmpg123/libmpg123.la \
## $(top_srcdir)/src/libspudec/libspudec.la \
$(THREAD_LIBS) \
$(DYNAMIC_LD_LIBS)
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 79e7486ae..0b073881a 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.18 2001/05/03 00:02:42 f1rmb Exp $
+ * $Id: load_plugins.c,v 1.19 2001/05/27 23:48:12 guenter Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -87,8 +87,8 @@ void load_demux_plugins (xine_t *this,
sprintf (str, "%s/%s", XINE_PLUGINDIR, pEntry->d_name);
if(!(plugin = dlopen (str, RTLD_LAZY))) {
- fprintf(stderr, "%s(%d): %s doesn't seem to be installed (%s)\n",
- __FILE__, __LINE__, str, dlerror());
+ fprintf(stderr, "load_plugins: cannot open demux plugin %s:\n%s\n",
+ str, dlerror());
exit(1);
}
else {
@@ -100,10 +100,8 @@ void load_demux_plugins (xine_t *this,
dxp = (demux_plugin_t *) initplug(iface_version, config);
this->demuxer_plugins[this->num_demuxer_plugins] = dxp;
- printf("demux plugin found : %s(ID: %s, iface: %d)\n",
- str,
- this->demuxer_plugins[this->num_demuxer_plugins]->get_identifier(),
- this->demuxer_plugins[this->num_demuxer_plugins]->interface_version);
+ printf("load_plugins: demux plugin found : %s\n",
+ this->demuxer_plugins[this->num_demuxer_plugins]->get_identifier());
this->num_demuxer_plugins++;
}
@@ -164,10 +162,8 @@ void load_input_plugins (xine_t *this,
sprintf (str, "%s/%s", XINE_PLUGINDIR, pEntry->d_name);
- printf ("load_plugins: trying to load input plugin >%s<\n",str);
-
if(!(plugin = dlopen (str, RTLD_LAZY))) {
- printf("load_plugins: cannot open input plugin %s: %s\n",
+ printf("load_plugins: cannot open input plugin %s:\n%s\n",
str, dlerror());
} else {
void *(*initplug) (int, config_values_t *);
@@ -178,10 +174,8 @@ void load_input_plugins (xine_t *this,
ip = (input_plugin_t *) initplug(iface_version, config);
this->input_plugins[this->num_input_plugins] = ip;
- printf("load_plugins: input plugin found : %s(ID: %s, iface: %d)\n",
- str,
- this->input_plugins[this->num_input_plugins]->get_identifier(this->input_plugins[this->num_input_plugins]),
- this->input_plugins[this->num_input_plugins]->interface_version);
+ printf("load_plugins: input plugin found : %s\n",
+ this->input_plugins[this->num_input_plugins]->get_identifier(this->input_plugins[this->num_input_plugins]));
this->num_input_plugins++;
} else {
@@ -435,9 +429,8 @@ void load_decoder_plugins (xine_t *this,
this->video_decoder_plugins[streamtype] = vdp;
}
- printf("video decoder plugin found : %s (ID: %s, iface: %d)\n",
- pEntry->d_name, vdp->get_identifier(),
- vdp->interface_version);
+ printf("video decoder plugin found : %s\n",
+ vdp->get_identifier());
}
@@ -514,8 +507,8 @@ char **xine_list_video_output_plugins (int visual_type) {
if(!(plugin = dlopen (str, RTLD_LAZY))) {
- /* printf("load_plugins: cannot load plugin %s (%s)\n",
- str, dlerror()); */
+ printf("load_plugins: cannot load plugin %s:\n%s\n",
+ str, dlerror());
} else {
@@ -585,7 +578,7 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config,
sprintf (str, "%s/%s", XINE_PLUGINDIR, dir_entry->d_name);
if(!(plugin = dlopen (str, RTLD_LAZY))) {
- printf("load_plugins: video output plugin %s failed to link: %s\n",
+ printf("load_plugins: video output plugin %s failed to link:\n%s\n",
str, dlerror());
return NULL;
} else {
@@ -604,7 +597,7 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config,
if (vod)
printf("load_plugins: video output plugin %s successfully"
- " loaded.\n", str);
+ " loaded.\n", id);
else
printf("load_plugins: video output plugin %s: "
"init_video_out_plugin failed.\n", str);
@@ -750,7 +743,7 @@ ao_functions_t *xine_load_audio_output_plugin(config_values_t *config,
if (aod)
printf("load_plugins: audio output plugin %s successfully"
- " loaded.\n", str);
+ " loaded.\n", id);
else
printf("load_plugins: audio output plugin %s: "
"init_audio_out_plugin failed.\n", str);
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index bcb4b80fd..24adfba3f 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.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: metronom.c,v 1.5 2001/05/24 21:41:28 guenter Exp $
+ * $Id: metronom.c,v 1.6 2001/05/27 23:48:12 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -36,9 +36,9 @@
#include "metronom.h"
#include "utils.h"
-#define MAX_PTS_TOLERANCE 5000
-#define MAX_VIDEO_DELTA 1600
-#define AUDIO_SAMPLE_NUM 32768
+#define MAX_PTS_TOLERANCE 5000
+#define MAX_VIDEO_DELTA 1600
+#define AUDIO_SAMPLE_NUM 32768
#define MAX_WRAP_TOLERANCE 180000
static void metronom_reset (metronom_t *this) {
@@ -106,6 +106,8 @@ static uint32_t metronom_got_video_frame (metronom_t *this, uint32_t pts) {
pthread_mutex_lock (&this->lock);
+ /* pts = 0; */
+
if (pts) {
/*
@@ -142,7 +144,6 @@ static uint32_t metronom_got_video_frame (metronom_t *this, uint32_t pts) {
this->video_pts_delta = 0;
this->num_video_vpts_guessed = 0;
- /* printf ("delta: %d\n", this->video_pts_delta); */
}
/*
@@ -163,11 +164,12 @@ static uint32_t metronom_got_video_frame (metronom_t *this, uint32_t pts) {
this->video_vpts, synced_vpts, vpts_diff, this->video_pts_delta);
if (abs(vpts_diff)>MAX_PTS_TOLERANCE) {
- if (synced_vpts>this->video_vpts) {
+ if ( synced_vpts>this->video_vpts ) {
this->video_vpts = synced_vpts;
}
- } else
+ } else {
xprintf (METRONOM | VERBOSE, "metronom: video tolerating diff\n");
+ }
} else
xprintf (METRONOM | VERBOSE, "metronom: video not synced on this one\n");
@@ -314,7 +316,7 @@ static uint32_t metronom_get_current_time (metronom_t *this) {
pts += this->start_pts;
if (this->stopped || (this->last_pts > pts)) {
- //printf("tm_current_pts(): timer STOPPED!\n");
+ /* printf("metronom: get_current_time(): timer STOPPED!\n"); */
pts = this->last_pts;
}
@@ -355,7 +357,7 @@ static void metronom_adjust_clock(metronom_t *this, uint32_t desired_pts)
delta = desired_pts;
delta -= current_time;
this->start_pts += delta;
- /* printf("adjusting start_pts to %d\n", this->start_pts); */
+ printf("adjusting start_pts to %d\n", this->start_pts);
pthread_mutex_unlock (&this->lock);
}
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 543e141fb..ce6092a0d 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.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: video_out.c,v 1.9 2001/05/26 00:48:47 guenter Exp $
+ * $Id: video_out.c,v 1.10 2001/05/27 23:48:12 guenter Exp $
*
*/
@@ -360,7 +360,6 @@ static int vo_frame_draw (vo_frame_t *img) {
xprintf (VERBOSE|VIDEO,"video_out: got image. vpts for picture is %d\n", pic_vpts);
- /* printf ("video_out: got image. vpts for picture is %d\n", pic_vpts); */
cur_vpts = this->metronom->get_current_time(this->metronom);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-25 16:58:14 +0000