From 8e64b9c7b1d58ba2a5416423c56eeaef18872c09 Mon Sep 17 00:00:00 2001
From: martii <m4rtii@gmx.de>
Date: Mon, 10 Jun 2013 15:49:38 +0200
Subject: [PATCH] libeplayer3: vorbis can easily be handled by the mp3 writer

---
 libeplayer3/output/writer/vorbis.c | 149 -----------------------------
 1 file changed, 149 deletions(-)
 delete mode 100644 libeplayer3/output/writer/vorbis.c

diff --git a/libeplayer3/output/writer/vorbis.c b/libeplayer3/output/writer/vorbis.c
deleted file mode 100644
index ea71f49..0000000
--- a/libeplayer3/output/writer/vorbis.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * linuxdvb output/writer handling.
- *
- * konfetti 2010 based on linuxdvb.c code from libeplayer2
- *
- * 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
- *
- */
-
-/* ***************************** */
-/* Includes                      */
-/* ***************************** */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#include <linux/dvb/video.h>
-#include <linux/dvb/audio.h>
-#include <memory.h>
-#include <asm/types.h>
-#include <pthread.h>
-#include <errno.h>
-
-#include "common.h"
-#include "output.h"
-#include "debug.h"
-#include "stm_ioctls.h"
-#include "misc.h"
-#include "pes.h"
-#include "writer.h"
-
-/* ***************************** */
-/* Makros/Constants              */
-/* ***************************** */
-#define VORBIS_DEBUG
-
-#ifdef VORBIS_DEBUG
-static const char *FILENAME = "vorbis.c";
-
-static short debug_level = 0;
-
-#define vorbis_printf(level, fmt, x...) do { \
-if (debug_level >= level) printf("[%s:%s] " fmt, FILENAME, __FUNCTION__, ## x); } while (0)
-#else
-#define vorbis_printf(level, fmt, x...)
-#endif
-
-#ifndef VORBIS_SILENT
-#define vorbis_err(fmt, x...) do { printf("[%s:%s] " fmt, FILENAME, __FUNCTION__, ## x); } while (0)
-#else
-#define vorbis_err(fmt, x...)
-#endif
-
-/* ***************************** */
-/* Types                         */
-/* ***************************** */
-
-/* ***************************** */
-/* Varaibles                     */
-/* ***************************** */
-
-/* ***************************** */
-/* Prototypes                    */
-/* ***************************** */
-
-/* ***************************** */
-/* MISC Functions                */
-/* ***************************** */
-
-static int reset()
-{
-    return 0;
-}
-
-static int writeData(void* _call)
-{
-    WriterAVCallData_t* call = (WriterAVCallData_t*) _call;
-
-    unsigned char  PesHeader[PES_MAX_HEADER_SIZE];
-
-    vorbis_printf(10, "\n");
-
-    if (call == NULL)
-    {
-        vorbis_err("call data is NULL...\n");
-        return 0;
-    }
-
-    vorbis_printf(10, "AudioPts %lld\n", call->Pts);
-
-    if ((call->data == NULL) || (call->len <= 0))
-    {
-        vorbis_err("parsing NULL Data. ignoring...\n");
-        return 0;
-    }
-
-    if (call->fd < 0)
-    {
-        vorbis_err("file pointer < 0. ignoring ...\n");
-        return 0;
-    }
-
-    struct iovec iov[2];
-    iov[0].iov_base = PesHeader;
-    iov[0].iov_len = InsertPesHeader (PesHeader, call->len , MPEG_AUDIO_PES_START_CODE, call->Pts, 0);
-    iov[1].iov_base = call->data;
-    iov[1].iov_len = call->len;
-
-    int len = writev(call->fd, iov, 2);
-
-    vorbis_printf(10, "vorbis_Write-< len=%d\n", len);
-    return len;
-}
-
-/* ***************************** */
-/* Writer  Definition            */
-/* ***************************** */
-
-static WriterCaps_t caps_vorbis = {
-    "vorbis",
-    eAudio,
-    "A_VORBIS",
-    AUDIO_ENCODING_VORBIS
-};
-
-struct Writer_s WriterAudioVORBIS = {
-    &reset,
-    &writeData,
-    NULL,
-    &caps_vorbis
-};