summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_cda.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers/demux_cda.c')
-rw-r--r--src/demuxers/demux_cda.c33
1 files changed, 6 insertions, 27 deletions
diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index d5fd46b0f..55e8b5be5 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.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_cda.c,v 1.7 2002/02/09 07:13:22 guenter Exp $
+ * $Id: demux_cda.c,v 1.8 2002/02/17 17:32:49 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -36,26 +36,6 @@
#include "compat.h"
#include "demux.h"
-#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, __VA_ARGS__); \
- fprintf(stderr, __VA_ARGS__); \
- }
-#define LOG_MSG(xine, ...) { \
- xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__); \
- printf(__VA_ARGS__); \
- }
-#endif
-
#define DEMUX_CDA_IFACE_VERSION 3
typedef struct {
@@ -152,7 +132,7 @@ static void demux_cda_stop (demux_plugin_t *this_gen) {
void *p;
if (this->status != DEMUX_OK) {
- LOG_MSG(this->xine, _("demux_cda: stop...ignored\n"));
+ printf ("demux_cda: stop...ignored\n");
return;
}
@@ -227,7 +207,7 @@ static void demux_cda_start (demux_plugin_t *this_gen,
if ((err = pthread_create (&this->thread,
NULL, demux_cda_loop, this)) != 0) {
- LOG_MSG_STDERR(this->xine, _("demux_cda: can't create new thread (%s)\n"), strerror(err));
+ printf ("demux_cda: can't create new thread (%s)\n", strerror(err));
exit(1);
}
}
@@ -302,10 +282,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
demux_cda_t *this;
if (iface != 6) {
- LOG_MSG(xine,
- _("demux_cda: 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"),
+ printf ("demux_cda: 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;
}