diff options
| author | phintuka <phintuka> | 2007-10-28 18:45:39 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2007-10-28 18:45:39 +0000 |
| commit | fc87661bf934298d595658a9315371eab4ab801a (patch) | |
| tree | 8ff14767019308fef1a8ca57c3b31f3189a52f96 | |
| parent | c377326fd5f2f109a701804cd5a0a4c83c7fc767 (diff) | |
| download | xineliboutput-fc87661bf934298d595658a9315371eab4ab801a.tar.gz xineliboutput-fc87661bf934298d595658a9315371eab4ab801a.tar.bz2 | |
Compile fix for xine-lib 1.2 branch: _x_ao_new_port is not available for frontends
| -rw-r--r-- | xine_frontend.c | 10 | ||||
| -rw-r--r-- | xine_sxfe_frontend.c | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/xine_frontend.c b/xine_frontend.c index 15f04362..cae7de49 100644 --- a/xine_frontend.c +++ b/xine_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.c,v 1.40 2007-06-21 09:35:13 phintuka Exp $ + * $Id: xine_frontend.c,v 1.41 2007-10-28 18:45:39 phintuka Exp $ * */ @@ -580,7 +580,11 @@ static int fe_xine_init(frontend_t *this_gen, const char *audio_driver, if(audio_driver && !strcmp(audio_driver, "auto")) { this->audio_port = xine_open_audio_driver (this->xine, NULL, NULL); } else if(audio_driver && !strcmp(audio_driver, "none")) { +#if XINE_VERSION_CODE < 10190 this->audio_port = _x_ao_new_port (this->xine, NULL, 1); +#else + this->audio_port = xine_new_framegrab_audio_port(this->xine); +#endif this->audio_port->set_property(this->audio_port, AO_PROP_DISCARD_BUFFERS, 1); } else { this->audio_port = xine_open_audio_driver (this->xine, audio_driver, NULL); @@ -728,7 +732,11 @@ static void init_dummy_ports(fe_t *this, int on) this->video_port_none = NULL; } else { if(! this->audio_port_none) +#if XINE_VERSION_CODE < 10190 this->audio_port_none = _x_ao_new_port (this->xine, NULL, 1); +#else + this->audio_port = xine_new_framegrab_audio_port(this->xine); +#endif if(this->audio_port_none) this->audio_port_none->set_property(this->audio_port_none, AO_PROP_DISCARD_BUFFERS, 1); /*LOGMSG("initialized dummy audio port %x", this->audio_port_none);*/ diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c index 8485f1ac..f4f6593f 100644 --- a/xine_sxfe_frontend.c +++ b/xine_sxfe_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_sxfe_frontend.c,v 1.27 2007-07-18 11:34:25 phintuka Exp $ + * $Id: xine_sxfe_frontend.c,v 1.28 2007-10-28 18:45:39 phintuka Exp $ * */ @@ -47,6 +47,9 @@ #include <jpeglib.h> #undef boolean +/* framegrab ports */ +#define XINE_ENABLE_EXPERIMENTAL_FEATURES + #include <xine.h> #ifndef XINE_ENGINE_INTERNAL # define XINE_ENGINE_INTERNAL |