[Mplayer-cvslog] CVS: main/libmpdemux demux_xmms.c,NONE,1.1 demux_xmms_plugin.h,NONE,1.1 Makefile,1.42,1.43 demuxer.c,1.125,1.126 demuxer.h,1.51,1.52 open.c,1.63,1.64
Arpi of Ize
arpi at mplayerhq.hu
Sun Dec 22 22:01:05 CET 2002
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv16813/libmpdemux
Modified Files:
Makefile demuxer.c demuxer.h open.c
Added Files:
demux_xmms.c demux_xmms_plugin.h
Log Message:
XMMS Input plugin support
based on patches by Balatoni Denes <pnis at coder.hu>
changes by me: glib dependency removed, files merged, code simplified, some bugfixes
--- NEW FILE ---
// This is not reentrant (because of global variables shared with demux_xmms_output.c)
// and the plugins are not reentrant either perhaps
#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <pthread.h>
#include <dlfcn.h>
#include <dirent.h>
#include <inttypes.h>
#include "../cfgparser.h"
#include "../libao2/afmt.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include <dirent.h>
#include <string.h>
#include <sys/stat.h>
//#include <glib.h>
#define XMMS_PACKETSIZE 65536 // some plugins won't play if this is too small
#include "demux_xmms_plugin.h"
//#include "demux_xmms_pluginenum.h"
//#include "demux_xmms_input.h"
//extern OutputPlugin xmms_output_plugin;
static pthread_mutex_t xmms_mutex;
static int format = 0x1; // Raw PCM
static char xmms_audiobuffer[XMMS_PACKETSIZE];
static uint32_t xmms_channels;
static uint32_t xmms_samplerate;
static uint32_t xmms_afmt;
static int xmms_length;
static char *xmms_title=NULL;
static uint32_t xmms_audiopos=0;
static uint64_t written = 0;
static void disk_close(void) {}
static void disk_flush(int time) {}
static void disk_pause(short p) {}
static void disk_init(void) {}
static int disk_free(void) { // vqf plugin sends more than it should
return (XMMS_PACKETSIZE-xmms_audiopos<XMMS_PACKETSIZE/4 ? 0:XMMS_PACKETSIZE-xmms_audiopos-XMMS_PACKETSIZE/4);
}
static int disk_playing(void) {
return 0; //??
}
static int disk_get_output_time(void) {
return 10;
}
static int disk_open(AFormat fmt, int rate, int nch) {
switch (fmt) {
case FMT_U8:
xmms_afmt=AFMT_U8;
break;
case FMT_S8:
xmms_afmt=AFMT_S8;
break;
case FMT_U16_LE:
xmms_afmt=AFMT_U16_LE;
break;
case FMT_U16_NE:
#if WORDS_BIGENDIAN
xmms_afmt=AFMT_U16_BE;
#else
xmms_afmt=AFMT_U16_LE;
#endif
break;
case FMT_U16_BE:
xmms_afmt=AFMT_U16_BE;
break;
case FMT_S16_NE:
xmms_afmt=AFMT_S16_NE;
break;
case FMT_S16_LE:
xmms_afmt=AFMT_S16_LE;
break;
case FMT_S16_BE:
xmms_afmt=AFMT_S16_BE;
break;
}
xmms_samplerate=rate;
xmms_channels=nch;
return 1;
}
static void disk_write(void *ptr, int length) {
pthread_mutex_lock(&xmms_mutex);
written += length;
memcpy(&xmms_audiobuffer[xmms_audiopos],ptr,length);
xmms_audiopos+=length;
pthread_mutex_unlock(&xmms_mutex);
}
static OutputPlugin xmms_output_plugin =
{
NULL,
NULL,
"Mplayer output interface Plugin ", /* Description */
disk_init,
NULL, /* about */
NULL, /* configure */
NULL, /* get_volume */
NULL, /* set_volume */
disk_open,
disk_write,
disk_close,
disk_flush,
disk_pause,
disk_free,
disk_playing,
disk_get_output_time,
disk_get_output_time
};
typedef struct {
uint32_t spos;
InputPlugin* ip;
} xmms_priv_t;
static InputPlugin* input_plugins[100];
static int no_plugins=0;
/* Dummy functions */
static int input_get_vis_type(){return 0;}
//static void input_add_vis(int time, unsigned char *s, InputVisType type){}
static void input_add_vis_pcm(int time, AFormat fmt, int nch, int length, void *ptr){}
//static void input_update_vis(gint time){}
//static gchar *input_get_info_text(void){return NULL;}
static void input_set_info_text(char * text){}
static void input_set_info(char* ha,int a, int b, int c, int d){};
/* Dummy functions END*/
static void init_plugins(){
DIR *dir;
struct dirent *ent;
no_plugins=0;
dir = opendir(XMMS_INPUT_PLUGIN_DIR);
if (!dir) return;
while ((ent = readdir(dir)) != NULL){
char filename[strlen(XMMS_INPUT_PLUGIN_DIR)+strlen(ent->d_name)+4];
void* handle;
sprintf(filename,XMMS_INPUT_PLUGIN_DIR "/%s",ent->d_name);
handle=dlopen(filename, RTLD_NOW);
if(handle){
void *(*gpi) (void);
gpi=dlsym(handle, "get_iplugin_info");
if(gpi){
InputPlugin *p=gpi();
printf("XMMS: found plugin: %s (%s)\n",ent->d_name,p->description);
p->handle = handle;
p->filename = strdup(filename);
p->get_vis_type = input_get_vis_type;
p->add_vis_pcm = input_add_vis_pcm;
p->set_info = input_set_info;
p->set_info_text = input_set_info_text;
if(p->init) p->init();
input_plugins[no_plugins++]=p;
} else
dlclose(handle);
}
}
closedir(dir);
}
static void cleanup_plugins(){
while(no_plugins>0){
--no_plugins;
printf("XMMS: Closing plugin %s\n",input_plugins[no_plugins]->filename);
if(input_plugins[no_plugins]->cleanup)
input_plugins[no_plugins]->cleanup();
dlclose(input_plugins[no_plugins]->handle);
}
}
extern void resync_audio_stream(sh_audio_t *sh_audio);
int demux_xmms_open(demuxer_t* demuxer) {
InputPlugin* ip = NULL;
sh_audio_t* sh_audio;
WAVEFORMATEX* w;
xmms_priv_t *priv;
int i;
init_plugins();
for(i=0;i<no_plugins;i++){
if (input_plugins[i]->is_our_file(demuxer->stream->url)){
ip=input_plugins[i]; break;
}
}
if(!ip) return 0; // no plugin to handle this...
pthread_mutex_init(&xmms_mutex,NULL);
priv=(xmms_priv_t *)malloc(sizeof(xmms_priv_t));
memset(priv,0,sizeof(xmms_priv_t));
priv->ip=ip;
memset(xmms_audiobuffer,0,XMMS_PACKETSIZE);
xmms_channels=0;
sh_audio = new_sh_audio(demuxer,0);
sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX));
w->wFormatTag = sh_audio->format = format;
demuxer->movi_start = 0;
demuxer->movi_end = 100;
demuxer->audio->id = 0;
demuxer->audio->sh = sh_audio;
demuxer->priv=priv;
sh_audio->ds = demuxer->audio;
xmms_output_plugin.init();
ip->get_song_info(demuxer->stream->url,&xmms_title,&xmms_length);
if (xmms_length<=0) demuxer->seekable=0;
// printf("XMMS song title='%s' length=%d\n",xmms_title,xmms_length);
// input_play(demuxer->stream->url);
ip->output = &xmms_output_plugin;
ip->play_file(demuxer->stream->url);
mp_msg(MSGT_DEMUX,MSGL_INFO,"Waiting for the XMMS plugin to start playback of '%s'...\n",demuxer->stream->url);
while (xmms_channels==0) {
usleep(10000);
if(ip->get_time()<0) return 0;
}
sh_audio->sample_format= xmms_afmt;
switch (xmms_afmt) {
case AFMT_S16_LE:
case AFMT_S16_BE:
case AFMT_U16_LE:
case AFMT_U16_BE:
sh_audio->samplesize = 2;
break;
default:
sh_audio->samplesize = 1;
}
w->wBitsPerSample = sh_audio->samplesize*8;
w->nChannels = sh_audio->channels = xmms_channels;
w->nSamplesPerSec = sh_audio->samplerate = xmms_samplerate;
w->nAvgBytesPerSec = xmms_samplerate*sh_audio->channels*sh_audio->samplesize;
w->nBlockAlign = sh_audio->samplesize*sh_audio->channels;
w->cbSize = 0;
return 1;
}
int demux_xmms_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
sh_audio_t *sh_audio = demuxer->audio->sh;
xmms_priv_t *priv=demuxer->priv;
demux_packet_t* dp;
while (xmms_audiopos<XMMS_PACKETSIZE/2) {
if(priv->ip->get_time()<0) return 0;
usleep(1000);
}
pthread_mutex_lock(&xmms_mutex);
dp = new_demux_packet(XMMS_PACKETSIZE/2);
ds->pts = priv->spos / (float)(sh_audio->wf->nAvgBytesPerSec);
ds->pos = priv->spos;
priv->spos+=XMMS_PACKETSIZE/2;
memcpy(dp->buffer,xmms_audiobuffer,XMMS_PACKETSIZE/2);
memcpy(xmms_audiobuffer,&xmms_audiobuffer[XMMS_PACKETSIZE/2],xmms_audiopos-XMMS_PACKETSIZE/2);
xmms_audiopos-=XMMS_PACKETSIZE/2;
pthread_mutex_unlock(&xmms_mutex);
ds_add_packet(ds,dp);
return 1;
}
void demux_xmms_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
stream_t* s = demuxer->stream;
sh_audio_t* sh_audio = demuxer->audio->sh;
xmms_priv_t *priv=demuxer->priv;
float pos;
if(priv->ip->get_time()<0) return;
pos = (flags & 1) ? 0 : priv->spos / (float)(sh_audio->wf->nAvgBytesPerSec);
if (flags & 2)
pos+= rel_seek_secs*xmms_length;
else
pos+= rel_seek_secs;
if (pos<0) pos=0;
if (pos>=xmms_length) pos=xmms_length-1;
priv->ip->seek((pos<0)?0:(int)pos);
priv->spos=pos * (float)(sh_audio->wf->nAvgBytesPerSec);;
}
int demux_close_xmms(demuxer_t* demuxer) {
xmms_priv_t *priv=demuxer->priv;
priv->ip->stop();
free(priv); demuxer->priv=NULL;
cleanup_plugins();
return 1;
}
int demux_xmms_control(demuxer_t *demuxer,int cmd, void *arg){
demux_stream_t *d_video=demuxer->video;
sh_audio_t *sh_audio=demuxer->audio->sh;
xmms_priv_t *priv=demuxer->priv;
switch(cmd) {
case DEMUXER_CTRL_GET_TIME_LENGTH:
if (xmms_length<=0) return DEMUXER_CTRL_DONTKNOW;
*((unsigned long *)arg)=(unsigned long)xmms_length/1000;
return DEMUXER_CTRL_GUESS;
case DEMUXER_CTRL_GET_PERCENT_POS:
if (xmms_length<=0)
return DEMUXER_CTRL_DONTKNOW;
*((int *)arg)=(int)( priv->spos / (float)(sh_audio->wf->nAvgBytesPerSec) / xmms_length );
return DEMUXER_CTRL_OK;
default:
return DEMUXER_CTRL_NOTIMPL;
}
}
--- NEW FILE ---
/* XMMS - Cross-platform multimedia player
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. 2.
* Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef PLUGIN_H
#define PLUGIN_H
typedef enum
{
FMT_U8, FMT_S8, FMT_U16_LE, FMT_U16_BE, FMT_U16_NE, FMT_S16_LE, FMT_S16_BE, FMT_S16_NE
}
AFormat;
typedef struct
{
void *handle; /* Filled in by xmms */
char *filename; /* Filled in by xmms */
char *description; /* The description that is shown in the preferences box */
void (*init) (void);
void (*about) (void); /* Show the about box */
void (*configure) (void); /* Show the configuration dialog */
void (*get_volume) (int *l, int *r);
void (*set_volume) (int l, int r); /* Set the volume */
int (*open_audio) (AFormat fmt, int rate, int nch); /* Open the device, if the device can't handle the given
parameters the plugin is responsible for downmixing
the data to the right format before outputting it */
void (*write_audio) (void *ptr, int length); /* The input plugin calls this to write data to the output
buffer */
void (*close_audio) (void); /* No comment... */
void (*flush) (int time); /* Flush the buffer and set the plugins internal timers to time */
void (*pause) (short paused); /* Pause or unpause the output */
int (*buffer_free) (void); /* Return the amount of data that can be written to the buffer,
two calls to this without a call to write_audio should make
the plugin output audio directly */
int (*buffer_playing) (void); /* Returns TRUE if the plugin currently is playing some audio,
otherwise return FALSE */
int (*output_time) (void); /* Return the current playing time */
int (*written_time) (void); /* Return the length of all the data that has been written to
the buffer */
}
OutputPlugin;
typedef struct
{
void *handle; /* Filled in by xmms */
char *filename; /* Filled in by xmms */
char *description; /* The description that is shown in the preferences box */
void (*init) (void); /* Called when the plugin is loaded */
void (*cleanup) (void); /* Called when the plugin is unloaded */
void (*about) (void); /* Show the about box */
void (*configure) (void); /* Show the configure box */
int (*mod_samples) (void *data, int length, AFormat fmt, int srate, int nch); /* Modify samples */
void (*query_format) (AFormat *fmt,int *rate, int *nch);
}
EffectPlugin;
typedef enum
{
INPUT_VIS_ANALYZER, INPUT_VIS_SCOPE, INPUT_VIS_VU, INPUT_VIS_OFF
}
InputVisType;
typedef struct
{
void *handle; /* Filled in by xmms */
char *filename; /* Filled in by xmms */
char *description; /* The description that is shown in the preferences box */
void (*init) (void); /* Called when the plugin is loaded */
void (*about) (void); /* Show the about box */
void (*configure) (void);
int (*is_our_file) (char *filename); /* Return 1 if the plugin can handle the file */
void *(*scan_dir) (char *dirname); /* Look in Input/cdaudio/cdaudio.c to see how */
/* to use this */
void (*play_file) (char *filename); /* Guess what... */
void (*stop) (void); /* Tricky one */
void (*pause) (short paused); /* Pause or unpause */
void (*seek) (int time); /* Seek to the specified time */
void (*set_eq) (int on, float preamp, float *bands); /* Set the equalizer, most plugins won't be able to do this */
int (*get_time) (void); /* Get the time, usually returns the output plugins output time */
void (*get_volume) (int *l, int *r); /* Input-plugin specific volume functions, just provide a NULL if */
void (*set_volume) (int l, int r); /* you want the output plugin to handle it */
void (*cleanup) (void); /* Called when xmms exit */
InputVisType (*get_vis_type) (void); /* OBSOLETE, DO NOT USE! */
void (*add_vis_pcm) (int time, AFormat fmt, int nch, int length, void *ptr); /* Send data to the visualization plugins
Preferably 512 samples/block */
void (*set_info) (char *title, int length, int rate, int freq, int nch); /* Fill in the stuff that is shown in the player window
set length to -1 if it's unknown. Filled in by xmms */
void (*set_info_text) (char *text); /* Show some text in the song title box in the main window,
call it with NULL as argument to reset it to the song title.
Filled in by xmms */
void (*get_song_info) (char *filename, char **title, int *length); /* Function to grab the title string */
void (*file_info_box) (char *filename); /* Bring up an info window for the filename passed in */
OutputPlugin *output; /* Handle to the current output plugin. Filled in by xmms */
}
InputPlugin;
/* So that input plugins can get the title formatting information */
char *xmms_get_gentitle_format(void);
/* So that output plugins can communicate with effect plugins */
EffectPlugin *get_current_effect_plugin(void);
int effects_enabled(void);
typedef struct
{
void *handle; /* Filled in by xmms */
char *filename; /* Filled in by xmms */
int xmms_session; /* The session ID for attaching to the control socket */
char *description; /* The description that is shown in the preferences box */
void (*init) (void); /* Called when the plugin is enabled */
void (*about) (void); /* Show the about box */
void (*configure) (void);
void (*cleanup) (void); /* Called when the plugin is disabled or when xmms exits */
}
GeneralPlugin;
typedef struct _VisPlugin
{
void *handle; /* Filled in by xmms */
char *filename; /* Filled in by xmms */
int xmms_session; /* The session ID for attaching to the control socket */
char *description; /* The description that is shown in the preferences box */
int num_pcm_chs_wanted; /* Numbers of PCM channels wanted in the call to render_pcm */
int num_freq_chs_wanted; /* Numbers of freq channels wanted in the call to render_freq */
void (*init)(void); /* Called when the plugin is enabled */
void (*cleanup)(void); /* Called when the plugin is disabled */
void (*about)(void); /* Show the about box */
void (*configure)(void); /* Show the configure box */
void (*disable_plugin)(struct _VisPlugin *); /* Call this with a pointer to your plugin to disable the plugin */
void (*playback_start)(void); /* Called when playback starts */
void (*playback_stop)(void); /* Called when playback stops */
void (*render_pcm)(short pcm_data[2][512]); /* Render the PCM data, don't do anything time consuming in here */
void (*render_freq)(short freq_data[2][256]); /* Render the freq data, don't do anything time consuming in here */
} VisPlugin;
#endif
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile 23 Oct 2002 18:20:13 -0000 1.42
+++ Makefile 22 Dec 2002 21:01:01 -0000 1.43
@@ -4,6 +4,9 @@
include ../config.mak
SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c demux_smjpeg.c
+ifeq ($(XMMS_PLUGINS),yes)
+SRCS += demux_xmms.c
+endif
ifeq ($(STREAMING),yes)
SRCS += asf_streaming.c url.c http.c network.c asf_mmst_streaming.c
ifeq ($(STREAMING_LIVE_DOT_COM),yes)
@@ -20,7 +23,7 @@
OBJS = $(SRCS:.c=.o)
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC)
-CFLAGS = $(OPTFLAGS) $(INCLUDE)
+CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE)
CPLUSPLUS = $(CC)
Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- demuxer.c 11 Dec 2002 20:48:51 -0000 1.125
+++ demuxer.c 22 Dec 2002 21:01:01 -0000 1.126
@@ -132,6 +132,7 @@
extern void demux_close_rawdv(demuxer_t* demuxer);
extern void demux_close_pva(demuxer_t* demuxer);
extern void demux_close_smjpeg(demuxer_t* demuxer);
+extern void demux_close_xmms(demuxer_t* demuxer);
#ifdef USE_TV
#include "tv.h"
@@ -194,6 +195,11 @@
case DEMUXER_TYPE_AVI_NI:
case DEMUXER_TYPE_AVI_NINI:
demux_close_avi(demuxer); return;
+#ifdef HAVE_XMMS
+ case DEMUXER_TYPE_XMMS:
+ demux_close_xmms(demuxer); break;
+#endif
+
}
// free streams:
for(i=0;i<256;i++){
@@ -269,6 +275,7 @@
int demux_y4m_fill_buffer(demuxer_t *demux);
int demux_audio_fill_buffer(demux_stream_t *ds);
int demux_pva_fill_buffer(demuxer_t *demux);
+int demux_xmms_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
extern int demux_ogg_fill_buffer(demuxer_t *d);
@@ -303,6 +310,9 @@
#endif
case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux);
case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds);
+#ifdef HAVE_XMMS
+ case DEMUXER_TYPE_XMMS: return demux_xmms_fill_buffer(demux,ds);
+#endif
case DEMUXER_TYPE_DEMUXERS: return demux_demuxers_fill_buffer(demux,ds);
#ifdef HAVE_OGGVORBIS
case DEMUXER_TYPE_OGG: return demux_ogg_fill_buffer(demux);
@@ -533,6 +543,7 @@
extern int smjpeg_check_file(demuxer_t *demuxer);
extern int demux_open_smjpeg(demuxer_t* demuxer);
extern int bmp_check_file(demuxer_t *demuxer);
+extern int demux_xmms_open(demuxer_t* demuxer);
extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
@@ -850,6 +861,19 @@
demuxer = NULL;
}
}
+#ifdef HAVE_XMMS
+//=============== Try to open as XMMS file: =================
+if(file_format==DEMUXER_TYPE_UNKNOWN){
+ demuxer=new_demuxer(stream,DEMUXER_TYPE_XMMS,audio_id,video_id,dvdsub_id);
+ if(demux_xmms_open(demuxer)){
+ mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedAudiofile);
+ file_format=DEMUXER_TYPE_XMMS;
+ } else {
+ free_demuxer(demuxer);
+ demuxer = NULL;
+ }
+}
+#endif
//=============== Try to open as a RTP stream: ===========
if(file_format==DEMUXER_TYPE_RTP) {
demuxer=new_demuxer(stream,DEMUXER_TYPE_RTP,audio_id,video_id,dvdsub_id);
@@ -1107,6 +1131,7 @@
extern void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
extern void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
extern void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
+extern void demux_xmms_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
demux_stream_t *d_audio=demuxer->audio;
@@ -1188,6 +1213,10 @@
#endif
case DEMUXER_TYPE_RAWAUDIO:
demux_rawaudio_seek(demuxer,rel_seek_secs,flags); break;
+#ifdef HAVE_XMMS
+ case DEMUXER_TYPE_XMMS:
+ demux_xmms_seek(demuxer,rel_seek_secs,flags); break;
+#endif
} // switch(demuxer->file_format)
@@ -1248,6 +1277,7 @@
extern int demux_mpg_control(demuxer_t *demuxer, int cmd, void *arg);
extern int demux_asf_control(demuxer_t *demuxer, int cmd, void *arg);
extern int demux_avi_control(demuxer_t *demuxer, int cmd, void *arg);
+extern int demux_xmms_control(demuxer_t *demuxer, int cmd, void *arg);
int demux_control(demuxer_t *demuxer, int cmd, void *arg) {
switch(demuxer->type) {
@@ -1260,7 +1290,10 @@
case DEMUXER_TYPE_AVI_NI:
case DEMUXER_TYPE_AVI_NINI:
return demux_avi_control(demuxer,cmd,arg);
-
+#ifdef HAVE_XMMS
+ case DEMUXER_TYPE_XMMS:
+ return demux_xmms_control(demuxer,cmd,arg);
+#endif
default:
return DEMUXER_CTRL_NOTIMPL;
}
Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- demuxer.h 16 Nov 2002 03:42:14 -0000 1.51
+++ demuxer.h 22 Dec 2002 21:01:01 -0000 1.52
@@ -33,6 +33,7 @@
#define DEMUXER_TYPE_RAWDV 22
#define DEMUXER_TYPE_PVA 23
#define DEMUXER_TYPE_SMJPEG 24
+#define DEMUXER_TYPE_XMMS 25
// This should always match the higest demuxer type number.
// Unless you want to disallow users to force the demuxer to some types
Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- open.c 6 Nov 2002 23:54:26 -0000 1.63
+++ open.c 22 Dec 2002 21:01:01 -0000 1.64
@@ -526,6 +526,7 @@
stream=new_stream(f,STREAMTYPE_FILE);
stream->end_pos=len;
+ stream->url=filename?strdup(filename):NULL;
return stream;
}
More information about the MPlayer-cvslog
mailing list