summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2009-05-25 11:33:16 +0000
committerphintuka <phintuka>2009-05-25 11:33:16 +0000
commitbbf0ac379c93dc56e56634989da13ba5a10b1b26 (patch)
tree0d4c29b2cd8b29a673fed71e574217ea67b6ddad
parent8012f7e6aa02eee5e00f65270801b7723d5da6df (diff)
downloadxineliboutput-bbf0ac379c93dc56e56634989da13ba5a10b1b26.tar.gz
xineliboutput-bbf0ac379c93dc56e56634989da13ba5a10b1b26.tar.bz2
Moved init stuff from get_instance() to open()
-rw-r--r--xine_input_vdr.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/xine_input_vdr.c b/xine_input_vdr.c
index 4288f3f4..fee778e7 100644
--- a/xine_input_vdr.c
+++ b/xine_input_vdr.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_input_vdr.c,v 1.251 2009-05-25 11:13:49 phintuka Exp $
+ * $Id: xine_input_vdr.c,v 1.252 2009-05-25 11:33:16 phintuka Exp $
*
*/
@@ -4563,6 +4563,19 @@ static int vdr_plugin_open(input_plugin_t *this_gen)
this->scr_tuning = SCR_TUNING_OFF;
this->curpos = 0;
+
+ /* buffer */
+ this->block_buffer = fifo_buffer_new(this->stream, 4, 0x10000+64); /* dummy buf to be used before first read and for big PES frames */
+
+ /* OSD */
+ this->osd_manager = init_osd_manager();
+
+ /* sync */
+ pthread_mutex_init (&this->lock, NULL);
+ pthread_mutex_init (&this->vdr_entry_lock, NULL);
+ pthread_mutex_init (&this->fd_control_lock, NULL);
+ pthread_cond_init (&this->engine_flushed, NULL);
+
return 1;
}
@@ -5274,18 +5287,6 @@ static input_plugin_t *vdr_class_get_instance (input_class_t *class_gen,
this->funcs.post_vdr_event = post_vdr_event;
}
- /* buffer */
- this->block_buffer = fifo_buffer_new(this->stream, 4, 0x10000+64); /* dummy buf to be used before first read and for big PES frames */
-
- /* OSD */
- this->osd_manager = init_osd_manager();
-
- /* sync */
- pthread_mutex_init (&this->lock, NULL);
- pthread_mutex_init (&this->vdr_entry_lock, NULL);
- pthread_mutex_init (&this->fd_control_lock, NULL);
- pthread_cond_init (&this->engine_flushed, NULL);
-
LOGDBG("vdr_class_get_instance done.");
return &this->input_plugin;
}