diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-18 03:53:23 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-18 03:53:23 +0000 |
| commit | 4c71c84391e9a607394b7f7a23877ba15dffbf67 (patch) | |
| tree | 53bf6a2b06b97cde43a11cafda54942a3a9bea45 /src/xine-engine/xine.c | |
| parent | 4b36ff207a52ea90bfd9b8c34c97f14963f0960d (diff) | |
| download | xine-lib-4c71c84391e9a607394b7f7a23877ba15dffbf67.tar.gz xine-lib-4c71c84391e9a607394b7f7a23877ba15dffbf67.tar.bz2 | |
new configfile interface, code cleanup, xprintf is gone
CVS patchset: 1064
CVS date: 2001/11/18 03:53:23
Diffstat (limited to 'src/xine-engine/xine.c')
| -rw-r--r-- | src/xine-engine/xine.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 70eaadf45..89329a9e8 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.75 2001/11/17 22:40:01 miguelfreitas Exp $ + * $Id: xine.c,v 1.76 2001/11/18 03:53:25 guenter Exp $ * * top-level xine functions * @@ -57,9 +57,6 @@ #define __FUNCTION__ __func__ #endif -/* debugging purposes only */ -uint32_t xine_debug; - void * xine_notify_stream_finished_thread (void * this_gen) { xine_t *this = this_gen; xine_event_t event; @@ -386,11 +383,12 @@ xine_t *xine_init (vo_driver_t *vo, config_values_t *config) { xine_t *this = xine_xmalloc (sizeof (xine_t)); + static char *demux_strategies[] = {"default", "reverse", "content", + "extension", NULL}; + printf("xine_init entered\n"); this->config = config; - xine_debug = config->lookup_int (config, "xine_debug", 0); - /* probe for optimized memcpy or config setting */ xine_probe_fast_memcpy(config); @@ -425,7 +423,9 @@ xine_t *xine_init (vo_driver_t *vo, load_input_plugins (this, config, INPUT_PLUGIN_IFACE_VERSION); - this->demux_strategy = config->lookup_int (config, "demux_strategy", 0); + this->demux_strategy = config->register_enum (config, "misc.demux_strategy", 0, + demux_strategies, "demuxer selection strategy", + NULL, NULL, NULL); load_demux_plugins(this, config, DEMUXER_PLUGIN_IFACE_VERSION); @@ -487,7 +487,7 @@ int xine_get_current_position (xine_t *this) { pthread_mutex_lock (&this->xine_lock); if (!this->cur_input_plugin) { - xprintf (VERBOSE|INPUT, "xine_get_current_position: no input source\n"); + printf ("xine: xine_get_current_position: no input source\n"); pthread_mutex_unlock (&this->xine_lock); return 0; } |