merge with mpd/trunk up to r3925

git-svn-id: https://svn.musicpd.org/mpd/trunk@3926 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 0 insertions, 420 deletions

diff --git a/src/inputPlugins/ogg_plugin.c b/src/inputPlugins/ogg_plugin.c
deleted file mode 100644
index abadca388..000000000
--- a/src/inputPlugins/ogg_plugin.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/* the Music Player Daemon (MPD)
- * (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
- * This project's homepage is: http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "../inputPlugin.h"
-
-#ifdef HAVE_OGG
-
-#include "../utils.h"
-#include "../audio.h"
-#include "../log.h"
-#include "../pcm_utils.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../replayGain.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef HAVE_TREMOR
-#include <vorbis/vorbisfile.h>
-#else
-#include <tremor/ivorbisfile.h>
-/* Macros to make Tremor's API look like libogg. Tremor always
-   returns host-byte-order 16-bit signed data, and uses integer
-   milliseconds where libogg uses double seconds. 
-*/
-#define ov_read(VF, BUFFER, LENGTH, BIGENDIANP, WORD, SGNED, BITSTREAM) \
-        ov_read(VF, BUFFER, LENGTH, BITSTREAM)
-#define ov_time_total(VF, I) ((double)ov_time_total(VF, I)/1000)
-#define ov_time_tell(VF) ((double)ov_time_tell(VF)/1000)
-#define ov_time_seek_page(VF, S) (ov_time_seek_page(VF, (S)*1000))
-#endif /* HAVE_TREMOR */
-
-#include <errno.h>
-
-#ifdef WORDS_BIGENDIAN
-#define OGG_DECODE_USE_BIGENDIAN	1
-#else
-#define OGG_DECODE_USE_BIGENDIAN	0
-#endif
-
-typedef struct _OggCallbackData {
-        InputStream * inStream;
-        DecoderControl * dc;
-} OggCallbackData;
-
-size_t ogg_read_cb(void * ptr, size_t size, size_t nmemb, void * vdata)
-{
-	size_t ret = 0;
-        OggCallbackData * data = (OggCallbackData *)vdata;
-
-        while(1) {
-	        ret = readFromInputStream(data->inStream,ptr,size,nmemb);
-                if(ret == 0 && !inputStreamAtEOF(data->inStream) && 
-                                !data->dc->stop) 
-                {
-                        my_usleep(10000);
-                }
-                else break;
-        }
-        errno = 0;
-	/*if(ret<0) errno = ((InputStream *)inStream)->error;*/
-
-	return ret;
-}
-
-int ogg_seek_cb(void * vdata, ogg_int64_t offset, int whence) {
-        OggCallbackData * data = (OggCallbackData *)vdata;
-
-	return seekInputStream(data->inStream,offset,whence);
-}
-
-int ogg_close_cb(void * vdata) {
-        OggCallbackData * data = (OggCallbackData *)vdata;
-
-	return closeInputStream(data->inStream);
-}
-
-long ogg_tell_cb(void * vdata) {
-        OggCallbackData * data = (OggCallbackData *)vdata;
-
-	return (long)(data->inStream->offset);
-}
-
-char * ogg_parseComment(char * comment, char * needle) {
-        int len = strlen(needle);
-
-        if(strncasecmp(comment, needle, len) == 0 && *(comment+len) == '=') {
-		return comment+len+1;
-	}
-
-        return NULL;
-}
-
-void ogg_getReplayGainInfo(char ** comments, ReplayGainInfo ** infoPtr) {
-        char * temp;
-	int found = 0;
-
-	if(*infoPtr) freeReplayGainInfo(*infoPtr);
-	*infoPtr = newReplayGainInfo();
-
-        while(*comments) {
-                if((temp = ogg_parseComment(*comments,"replaygain_track_gain"))) 
-                {
-                        (*infoPtr)->trackGain = atof(temp);
-			found = 1;
-                }
-                else if((temp = ogg_parseComment(*comments,
-                                        "replaygain_album_gain"))) 
-                {
-                        (*infoPtr)->albumGain = atof(temp);
-			found = 1;
-                }
-                else if((temp = ogg_parseComment(*comments,
-                                        "replaygain_track_peak"))) 
-                {
-                        (*infoPtr)->trackPeak = atof(temp);
-			found = 1;
-                }
-                else if((temp = ogg_parseComment(*comments,
-                                        "replaygain_album_peak"))) 
-                {
-                        (*infoPtr)->albumPeak = atof(temp);
-			found = 1;
-                }
-
-                comments++;
-        }
-
-	if(!found) {
-		freeReplayGainInfo(*infoPtr);
-		*infoPtr = NULL;
-	}
-}
-
-MpdTag * oggCommentsParse(char ** comments) {
-	MpdTag * ret = NULL;
-	char * temp;
-
-	while(*comments) {
-                if((temp = ogg_parseComment(*comments,"artist"))) {
-			if(!ret) ret = newMpdTag();
-			addItemToMpdTag(ret, TAG_ITEM_ARTIST, temp);
-		} 
-                else if((temp = ogg_parseComment(*comments,"title"))) {
-			if(!ret) ret = newMpdTag();
-			addItemToMpdTag(ret, TAG_ITEM_TITLE, temp);
-		}
-                else if((temp = ogg_parseComment(*comments,"album"))) {
-			if(!ret) ret = newMpdTag();
-			addItemToMpdTag(ret, TAG_ITEM_ALBUM, temp);
-		}
-                else if((temp = ogg_parseComment(*comments,"tracknumber"))) {
-			if(!ret) ret = newMpdTag();
-			addItemToMpdTag(ret, TAG_ITEM_TRACK, temp);
-		}
-                else if((temp = ogg_parseComment(*comments,"genre"))) {
-			if(!ret) ret = newMpdTag();
-			addItemToMpdTag(ret, TAG_ITEM_GENRE, temp);
-		}
-                else if((temp = ogg_parseComment(*comments,"date"))) {
-			if(!ret) ret = newMpdTag();
-			addItemToMpdTag(ret, TAG_ITEM_DATE, temp);
-		}
-                else if((temp = ogg_parseComment(*comments,"composer"))) {
-			if(!ret) ret = newMpdTag();
-			addItemToMpdTag(ret, TAG_ITEM_COMPOSER, temp);
-		}
-                else if((temp = ogg_parseComment(*comments,"performer"))) {
-			if(!ret) ret = newMpdTag();
-			addItemToMpdTag(ret, TAG_ITEM_PERFORMER, temp);
-		}
-
-		comments++;
-	}
-
-	return ret;
-}
-
-void putOggCommentsIntoOutputBuffer(OutputBuffer * cb, char * streamName,
-		char ** comments) 
-{
-	MpdTag * tag;
-
-	tag = oggCommentsParse(comments);
-	if(!tag && streamName) {
-		tag = newMpdTag();
-	}
-	if(!tag) return;
-
-	/*if(tag->artist) printf("Artist: %s\n", tag->artist);
-	if(tag->album) printf("Album: %s\n", tag->album);
-	if(tag->track) printf("Track: %s\n", tag->track);
-	if(tag->title) printf("Title: %s\n", tag->title);*/
-
-	if(streamName) {
-		clearItemsFromMpdTag(tag, TAG_ITEM_NAME);
-		addItemToMpdTag(tag, TAG_ITEM_NAME, streamName);
-	}
-
-	copyMpdTagToOutputBuffer(cb, tag);
-
-	freeMpdTag(tag);
-}
-
-int ogg_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
-{
-	OggVorbis_File vf;
-	ov_callbacks callbacks;
-        OggCallbackData data;
-	int current_section;
-	int prev_section = -1;
-	int eof = 0;
-	long ret;
-#define OGG_CHUNK_SIZE 4096
-	char chunk[OGG_CHUNK_SIZE];
-	int chunkpos = 0;
-	long bitRate = 0;
-	long test;
-        ReplayGainInfo * replayGainInfo = NULL;
-	char ** comments;
-
-        data.inStream = inStream;
-        data.dc = dc;
-
-	callbacks.read_func = ogg_read_cb;
-	callbacks.seek_func = ogg_seek_cb;
-	callbacks.close_func = ogg_close_cb;
-	callbacks.tell_func = ogg_tell_cb;
-	
-	if((ret = ov_open_callbacks(&data, &vf, NULL, 0, callbacks)) < 0) {
-		closeInputStream(inStream);
-		if(!dc->stop) {
-		        ERROR("Error decoding Ogg Vorbis stream: ");
-			switch(ret) {
-			case OV_EREAD:
-				ERROR("read error\n");
-				break;
-			case OV_ENOTVORBIS:
-				ERROR("not vorbis stream\n");
-				break;
-			case OV_EVERSION:
-				ERROR("vorbis version mismatch\n");
-				break;
-			case OV_EBADHEADER:
-				ERROR("invalid vorbis header\n");
-				break;
-			case OV_EFAULT:
-				ERROR("internal logic error\n");
-				break;
-			default:
-				ERROR("unknown error\n");
-				break;
-			}
-                        return -1;
-                }
-                else {
-                        dc->state = DECODE_STATE_STOP;
-                        dc->stop = 0;
-                }
-                return 0;
-	}
-	
-	dc->totalTime = ov_time_total(&vf,-1);
-       	if(dc->totalTime < 0) dc->totalTime = 0;
-
-	dc->audioFormat.bits = 16;
-
-	while(!eof) {
-		if(dc->seek) {
-			if(0 == ov_time_seek_page(&vf,dc->seekWhere)) {
-                                clearOutputBuffer(cb);
-			        chunkpos = 0;
-                        }
-                        else dc->seekError = 1;
-			dc->seek = 0;
-		}
-		ret = ov_read(&vf, chunk+chunkpos, 
-				OGG_CHUNK_SIZE-chunkpos,
-				OGG_DECODE_USE_BIGENDIAN,
-				2, 1, &current_section);
-
-		if(current_section!=prev_section) {
-			/*printf("new song!\n");*/
-			vorbis_info *vi=ov_info(&vf,-1);
-			dc->audioFormat.channels = vi->channels;
-			dc->audioFormat.sampleRate = vi->rate;
-			if(dc->state == DECODE_STATE_START) {
-        			getOutputAudioFormat(&(dc->audioFormat),
-					&(cb->audioFormat));
-				dc->state = DECODE_STATE_DECODE;
-			}
-			comments = ov_comment(&vf, -1)->user_comments;
-			putOggCommentsIntoOutputBuffer(cb, inStream->metaName,
-					comments);
-        		ogg_getReplayGainInfo(comments, &replayGainInfo);
-		}
-
-		prev_section = current_section;
-
-		if(ret <= 0 && ret != OV_HOLE) {
-			eof = 1;
-			break;
-		}
-                if(ret == OV_HOLE) ret = 0;
-
-		chunkpos+=ret;
-
-		if(chunkpos >= OGG_CHUNK_SIZE) {
-			if((test = ov_bitrate_instant(&vf))>0) {
-				bitRate = test/1000;
-			}
-			sendDataToOutputBuffer(cb, inStream, dc, 
-						inStream->seekable,  
-                                        	chunk, chunkpos, 
-						ov_pcm_tell(&vf)/
-						dc->audioFormat.sampleRate,
-						bitRate,
-						replayGainInfo);
-			chunkpos = 0;
-			if(dc->stop) break;
-		}
-	}
-
-	if(!dc->stop && chunkpos > 0) {
-		sendDataToOutputBuffer(cb, NULL, dc, inStream->seekable,
-				chunk, chunkpos,
-				ov_time_tell(&vf), bitRate, replayGainInfo);
-	}
-
-	if(replayGainInfo) freeReplayGainInfo(replayGainInfo);
-
-	ov_clear(&vf);
-
-	flushOutputBuffer(cb);
-
-	if(dc->stop) {
-		dc->state = DECODE_STATE_STOP;
-		dc->stop = 0;
-	}
-	else dc->state = DECODE_STATE_STOP;
-
-	return 0;
-}
-
-MpdTag * oggTagDup(char * file) {
-	MpdTag * ret = NULL;
-	FILE * fp;
-	OggVorbis_File vf;
-
-	fp = fopen(file,"r"); 
-	if(!fp)
-	{
-		DEBUG("oggTagDup: Failed to open file: '%s', %s\n", file, strerror(errno));
-		 return NULL;
-	}
-	if(ov_open(fp,&vf,NULL,0)<0) {
-		fclose(fp);
-		return NULL;
-	}
-
-	ret = oggCommentsParse(ov_comment(&vf,-1)->user_comments);
-
-	if(!ret) ret = newMpdTag();
-	ret->time = (int)(ov_time_total(&vf,-1)+0.5);
-
-	ov_clear(&vf);
-
-	return ret;	
-}
-
-char * oggSuffixes[] = {"ogg", NULL};
-char * oggMimeTypes[] = {"application/ogg", NULL};
-
-InputPlugin oggPlugin =
-{
-        "ogg",
-	NULL,
-	NULL,
-        ogg_decode,
-        NULL,
-        oggTagDup,
-        INPUT_PLUGIN_STREAM_URL | INPUT_PLUGIN_STREAM_FILE,
-        oggSuffixes,
-        oggMimeTypes
-};
-
-#else
-
-InputPlugin oggPlugin = 
-{
-	NULL,
-	NULL,
-	NULL,
-        NULL,
-        NULL,
-        NULL,
-        0,
-        NULL,
-        NULL
-};
-
-#endif