summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_dvd.c24
-rw-r--r--src/input/input_file.c4
-rw-r--r--src/input/input_http.c2
-rw-r--r--src/input/input_mms.c4
-rw-r--r--src/input/input_plugin.h4
-rw-r--r--src/input/input_stdin_fifo.c4
-rw-r--r--src/input/input_vcd.c4
-rw-r--r--src/input/net_buf_ctrl.c10
8 files changed, 35 insertions, 21 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 56b9ac80d..8d3ac5f48 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,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: input_dvd.c,v 1.117 2002/11/18 11:48:35 mroi Exp $
+ * $Id: input_dvd.c,v 1.118 2002/11/20 11:57:42 mroi Exp $
*
*/
@@ -790,9 +790,9 @@ static void flush_buffers(dvd_input_plugin_t *this) {
if (stream->audio_out) {
stream->audio_out->flush(stream->audio_out);
}
-
- stream->metronom->adjust_clock(stream->metronom,
- stream->metronom->get_current_time(stream->metronom) + 30 * 90000 );
+
+ this->stream->xine->clock->adjust_clock(this->stream->xine->clock,
+ this->stream->xine->clock->get_current_time(this->stream->xine->clock) + 30 * 90000 );
}
static void xine_dvd_send_button_update(dvd_input_plugin_t *this, int mode) {
@@ -1664,6 +1664,20 @@ static void *init_class (xine_t *xine, void *data) {
/*
* $Log: input_dvd.c,v $
+ * Revision 1.118 2002/11/20 11:57:42 mroi
+ * engine modifications to allow post plugin layer:
+ * * new public output interface xine_{audio,video}_port_t instead of
+ * xine_{ao,vo}_driver_t, old names kept as aliases for compatibility
+ * * modified the engine to allow multiple streams per output
+ * * renaming of some internal structures according to public changes
+ * * moving SCR out of per-stream-metronom into a global metronom_clock_t
+ * residing in xine_t and therefore easily available to the output layer
+ * * adapting all available plugins
+ * (note to external projects: the compiler will help you a lot, if a plugin
+ * compiles, it is adapted, because all changes add new parameters to some
+ * functions)
+ * * bump up all interface versions because of xine_t and xine_stream_t changes
+ *
* Revision 1.117 2002/11/18 11:48:35 mroi
* DVD input should now be initially unseekable
*
@@ -1892,6 +1906,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_INPUT, 9, "DVD", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 10, "DVD", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 75bec4f02..8da57ae65 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.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: input_file.c,v 1.68 2002/11/17 17:48:47 mroi Exp $
+ * $Id: input_file.c,v 1.69 2002/11/20 11:57:43 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -876,7 +876,7 @@ static void *init_plugin (xine_t *xine, void *data) {
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_INPUT, 9, "file", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_INPUT, 10, "file", XINE_VERSION_CODE, NULL, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_http.c b/src/input/input_http.c
index e7d27b1e4..1fbe13133 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -957,7 +957,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_INPUT, 9, "http", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 10, "http", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 593e5c9b7..87cc05b4b 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.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: input_mms.c,v 1.25 2002/11/17 17:48:47 mroi Exp $
+ * $Id: input_mms.c,v 1.26 2002/11/20 11:57:43 mroi Exp $
*
* mms input plugin based on work from major mms
*/
@@ -338,7 +338,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_INPUT, 9, "mms", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 10, "mms", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index eff5fd3d7..bccde4b57 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.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: input_plugin.h,v 1.38 2002/11/18 11:36:28 mroi Exp $
+ * $Id: input_plugin.h,v 1.39 2002/11/20 11:57:43 mroi Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -29,7 +29,7 @@
#include "buffer.h"
#include "configfile.h"
-#define INPUT_PLUGIN_IFACE_VERSION 9
+#define INPUT_PLUGIN_IFACE_VERSION 10
typedef struct input_class_s input_class_t ;
typedef struct input_plugin_s input_plugin_t;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index cfe8bf6b8..092c2b7b0 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.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: input_stdin_fifo.c,v 1.36 2002/11/17 17:48:47 mroi Exp $
+ * $Id: input_stdin_fifo.c,v 1.37 2002/11/20 11:57:43 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -393,6 +393,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_INPUT, 9, "stdin", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 10, "stdin", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index aca7d9cf9..c35a8ad66 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.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: input_vcd.c,v 1.58 2002/11/08 15:49:03 komadori Exp $
+ * $Id: input_vcd.c,v 1.59 2002/11/20 11:57:43 mroi Exp $
*
*/
@@ -1148,6 +1148,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_INPUT, 9, "VCD", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 10, "VCD", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index bedd061ba..12ede3d53 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -99,15 +99,15 @@ void nbc_check_buffers (nbc_t *this) {
}
}
- this->stream->metronom->set_speed (this->stream->metronom, XINE_SPEED_PAUSE);
- this->stream->metronom->set_option (this->stream->metronom, METRONOM_SCR_ADJUSTABLE, 0);
+ this->stream->xine->clock->set_speed (this->stream->xine->clock, XINE_SPEED_PAUSE);
+ this->stream->xine->clock->set_option (this->stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 0);
if (this->stream->audio_out)
this->stream->audio_out->audio_paused = 2;
this->buffering = 1;
} else if ( (fifo_fill>this->high_water_mark) && (this->buffering)) {
- this->stream->metronom->set_speed (this->stream->metronom, XINE_SPEED_NORMAL);
- this->stream->metronom->set_option (this->stream->metronom, METRONOM_SCR_ADJUSTABLE, 1);
+ this->stream->xine->clock->set_speed (this->stream->xine->clock, XINE_SPEED_NORMAL);
+ this->stream->xine->clock->set_option (this->stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1);
if (this->stream->audio_out)
this->stream->audio_out->audio_paused = 0;
this->buffering = 0;
@@ -116,7 +116,7 @@ void nbc_check_buffers (nbc_t *this) {
}
void nbc_close (nbc_t *this) {
- this->stream->metronom->set_option (this->stream->metronom, METRONOM_SCR_ADJUSTABLE, 1);
+ this->stream->xine->clock->set_option (this->stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 1);
free (this);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 19:20:59 +0000