diff options
Diffstat (limited to 'src/demuxers/demux_elem.c')
| -rw-r--r-- | src/demuxers/demux_elem.c | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index eb3bccec7..572c2ca15 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.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: demux_elem.c,v 1.30 2001/11/30 00:53:51 f1rmb Exp $ + * $Id: demux_elem.c,v 1.31 2001/12/27 14:30:29 f1rmb Exp $ * * demultiplexer for elementary mpeg streams * @@ -45,10 +45,32 @@ #define VALID_ENDS ".mpv" +#ifdef __GNUC__ +#define LOG_MSG_STDERR(xine, message, args...) { \ + xine_log(xine, XINE_LOG_DEMUX, message, ##args); \ + fprintf(stderr, message, ##args); \ + } +#define LOG_MSG(xine, message, args...) { \ + xine_log(xine, XINE_LOG_DEMUX, message, ##args); \ + printf(message, ##args); \ + } +#else +#define LOG_MSG_STDERR(xine, ...) { \ + xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__); \ + fprintf(stderr, __VA_ARGS__); \ + } +#define LOG_MSG(xine, ...) { \ + xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__); \ + printf(__VA_ARGS__); \ + } +#endif + typedef struct { demux_plugin_t demux_plugin; + xine_t *xine; + config_values_t *config; fifo_buffer_t *video_fifo; @@ -225,8 +247,8 @@ static void demux_mpeg_elem_start (demux_plugin_t *this_gen, if ((err = pthread_create (&this->thread, NULL, demux_mpeg_elem_loop, this)) != 0) { - fprintf (stderr, "demux_elem: can't create new thread (%s)\n", - strerror(err)); + LOG_MSG_STDERR(this->xine, _("demux_elem: can't create new thread (%s)\n"), + strerror(err)); exit (1); } } @@ -337,15 +359,17 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_mpeg_elem_t *this; if (iface != 6) { - printf( "demux_elem: plugin doesn't support plugin API version %d.\n" - "demux_elem: this means there's a version mismatch between xine and this " - "demux_elem: demuxer plugin.\nInstalling current demux plugins should help.\n", + LOG_MSG(xine, + _("demux_elem: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } - + this = malloc (sizeof (demux_mpeg_elem_t)); this->config = xine->config; + this->xine = xine; (void*) this->config->register_string(this->config, "mrl.ends_elem", VALID_ENDS, |