summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/load_plugins.c16
-rw-r--r--src/xine-engine/video_decoder.c8
-rw-r--r--src/xine-engine/xine.c13
-rw-r--r--src/xine-engine/xine_interface.c10
-rw-r--r--src/xine-engine/xine_internal.h4
5 files changed, 35 insertions, 16 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 4b0e423b4..71d7a8750 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.106 2002/10/26 16:16:04 mroi Exp $
+ * $Id: load_plugins.c,v 1.107 2002/10/27 01:52:15 guenter Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -129,8 +129,9 @@ static void _insert_plugin (xine_t *this,
int i;
if (info->API != api_version) {
- printf ("load_plugins: ignoring plugin %s, wrong iface version %d (should be %d)\n",
- info->id, info->API, api_version);
+ if (this->verbosity)
+ printf ("load_plugins: ignoring plugin %s, wrong iface version %d (should be %d)\n",
+ info->id, info->API, api_version);
return;
}
@@ -246,14 +247,13 @@ static void collect_plugins(xine_t *this, char *path){
if(!(lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL))) {
-/*#ifdef LOG*/
- {
+
+ if (this->verbosity) {
char *dl_error_msg = dlerror();
/* too noisy -- but good to catch unresolved references */
printf ("load_plugins: cannot open plugin lib %s:\n%s\n",
str, dl_error_msg);
}
-/*#endif*/
}
else {
@@ -1109,7 +1109,9 @@ video_decoder_t *get_video_decoder (xine_stream_t *stream, uint8_t stream_type)
if (!node->plugin_class) {
/* remove non working plugin from catalog */
- printf("load_plugins: plugin %s failed to init its class.\n", node->info->id);
+ if (stream->xine->verbosity)
+ printf("load_plugins: plugin %s failed to init its class.\n",
+ node->info->id);
for (j = i + 1; j < PLUGINS_PER_TYPE; j++)
catalog->video_decoder_map[stream_type][j - 1] =
catalog->video_decoder_map[stream_type][j];
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index a7dcddfdf..90915ef3d 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.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_decoder.c,v 1.104 2002/10/26 02:12:27 jcdutton Exp $
+ * $Id: video_decoder.c,v 1.105 2002/10/27 01:52:15 guenter Exp $
*
*/
@@ -183,8 +183,10 @@ void *video_decoder_loop (void *stream_gen) {
stream->finished_count_video++;
+#ifdef LOG
printf ("video_decoder: reached end marker # %d\n",
stream->finished_count_video);
+#endif
pthread_cond_broadcast (&stream->counter_changed);
@@ -229,7 +231,9 @@ void *video_decoder_loop (void *stream_gen) {
break;
case BUF_CONTROL_DISCONTINUITY:
+#ifdef LOG
printf ("video_decoder: discontinuity ahead\n");
+#endif
stream->video_in_discontinuity = 1;
@@ -239,7 +243,9 @@ void *video_decoder_loop (void *stream_gen) {
break;
case BUF_CONTROL_NEWPTS:
+#ifdef LOG
printf ("video_decoder: new pts %lld\n", buf->disc_off);
+#endif
stream->video_in_discontinuity = 1;
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 90afd3f0a..a4560e658 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.176 2002/10/26 22:08:08 guenter Exp $
+ * $Id: xine.c,v 1.177 2002/10/27 01:52:15 guenter Exp $
*
* top-level xine functions
*
@@ -606,7 +606,8 @@ xine_t *xine_new (void) {
printf ("xine: failed to malloc xine_t\n");
abort();
}
-
+
+ this->verbosity = 0;
#ifdef ENABLE_NLS
/*
@@ -875,11 +876,13 @@ void xine_log (xine_t *this, int buf, const char *format, ...) {
this->log_buffers[buf]->scratch_printf (this->log_buffers[buf], format, argp);
va_end (argp);
- va_start (argp, format);
+ if (this->verbosity) {
+ va_start (argp, format);
- vprintf (format, argp);
+ vprintf (format, argp);
- va_end (argp);
+ va_end (argp);
+ }
}
const char *const *xine_get_log (xine_t *this, int buf) {
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 3f6017947..534674990 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.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_interface.c,v 1.25 2002/10/24 19:37:29 guenter Exp $
+ * $Id: xine_interface.c,v 1.26 2002/10/27 01:52:15 guenter Exp $
*
* convenience/abstraction layer, functions to implement
* libxine's public interface
@@ -357,6 +357,9 @@ void xine_set_param (xine_stream_t *stream, int param, int value) {
stream->audio_out->set_property (stream->audio_out, AO_PROP_COMPRESSOR, value);
break;
+ case XINE_PARAM_VERBOSITY:
+ stream->xine->verbosity = value;
+
case XINE_PARAM_VO_DEINTERLACE:
case XINE_PARAM_VO_ASPECT_RATIO:
case XINE_PARAM_VO_HUE:
@@ -408,6 +411,9 @@ int xine_get_param (xine_stream_t *stream, int param) {
return -1;
return stream->audio_out->get_property (stream->audio_out, AO_PROP_COMPRESSOR);
+ case XINE_PARAM_VERBOSITY:
+ return stream->xine->verbosity;
+
case XINE_PARAM_VO_DEINTERLACE:
case XINE_PARAM_VO_ASPECT_RATIO:
case XINE_PARAM_VO_HUE:
@@ -420,7 +426,7 @@ int xine_get_param (xine_stream_t *stream, int param) {
case XINE_PARAM_VO_TVMODE:
return stream->video_driver->get_property(stream->video_driver, param & 0xffffff);
break;
-
+
default:
printf ("xine_interface: unknown param %d\n", param);
}
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index bf5ffe6d3..74f0a1db2 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.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: xine_internal.h,v 1.106 2002/10/23 21:52:16 guenter Exp $
+ * $Id: xine_internal.h,v 1.107 2002/10/27 01:52:15 guenter Exp $
*
*/
@@ -104,6 +104,8 @@ struct xine_s {
/* log output that may be presented to the user */
scratch_buffer_t *log_buffers[XINE_LOG_NUM];
+ int verbosity;
+
xine_list_t *streams;
pthread_mutex_t streams_lock;
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 01:21:56 +0000