summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dxr3.c2
-rw-r--r--dxr3audiodecoder.c1
-rw-r--r--dxr3demuxdevice.h1
-rw-r--r--dxr3device.h1
-rw-r--r--dxr3dolbydigital.h3
-rw-r--r--dxr3interface.h3
-rw-r--r--dxr3interface_spu_encoder.h2
-rw-r--r--dxr3multichannelaudio.c3
-rw-r--r--dxr3multichannelaudio.h3
-rw-r--r--dxr3nextpts.h2
-rw-r--r--dxr3osd.c1
-rw-r--r--dxr3osd.h1
-rw-r--r--dxr3output.h1
-rw-r--r--dxr3spudecoder.h3
-rw-r--r--dxr3spuencoder.h2
-rw-r--r--dxr3syncbuffer.h2
-rw-r--r--dxr3sysclock.h3
-rw-r--r--dxr3tools.h3
-rw-r--r--dxr3vdrincludes.h58
19 files changed, 21 insertions, 74 deletions
diff --git a/dxr3.c b/dxr3.c
index bfa715b..999a6f2 100644
--- a/dxr3.c
+++ b/dxr3.c
@@ -7,7 +7,7 @@
*
*/
-#include "dxr3vdrincludes.h"
+#include <vdr/plugin.h>
#include "dxr3device.h"
#include "dxr3syncbuffer.h"
#include "dxr3configdata.h"
diff --git a/dxr3audiodecoder.c b/dxr3audiodecoder.c
index 311abf5..25a5c8e 100644
--- a/dxr3audiodecoder.c
+++ b/dxr3audiodecoder.c
@@ -27,6 +27,7 @@
*/
#include <stdio.h>
+#include <algorithm>
#include "dxr3audiodecoder.h"
#include "dxr3pesframe.h"
diff --git a/dxr3demuxdevice.h b/dxr3demuxdevice.h
index 8874ae1..42c6b53 100644
--- a/dxr3demuxdevice.h
+++ b/dxr3demuxdevice.h
@@ -22,7 +22,6 @@
#ifndef __DXR3_DEMUX_DEVICE_H
#define __DXR3_DEMUX_DEVICE_H
-#include "dxr3vdrincludes.h"
#include "dxr3generaldefines.h"
#include "dxr3syncbuffer.h"
#include "dxr3audiodecoder.h"
diff --git a/dxr3device.h b/dxr3device.h
index d679998..7206d35 100644
--- a/dxr3device.h
+++ b/dxr3device.h
@@ -27,6 +27,7 @@
#include "dxr3demuxdevice.h"
#include "dxr3spudecoder.h"
#include <string>
+#include <vdr/device.h>
// ==================================
// our device :)
diff --git a/dxr3dolbydigital.h b/dxr3dolbydigital.h
index c9c66be..60c33a7 100644
--- a/dxr3dolbydigital.h
+++ b/dxr3dolbydigital.h
@@ -22,7 +22,8 @@
#ifndef _DXR3_DOLBYDIGITAL_H_
#define _DXR3_DOLBYDIGITAL_H_
-#include "dxr3vdrincludes.h"
+#include <vdr/thread.h>
+#include <vdr/audio.h>
// ==================================
//! interface to vdr to output dolby digital via dxr3
diff --git a/dxr3interface.h b/dxr3interface.h
index 04809c3..4f13bee 100644
--- a/dxr3interface.h
+++ b/dxr3interface.h
@@ -27,8 +27,9 @@
#include <stdint.h>
#include <linux/em8300.h>
#include <sys/ioctl.h>
+#include <linux/limits.h>
-#include "dxr3vdrincludes.h"
+#include <vdr/tools.h>
#include "dxr3configdata.h"
#include "dxr3sysclock.h"
#include "dxr3configdata.h"
diff --git a/dxr3interface_spu_encoder.h b/dxr3interface_spu_encoder.h
index b3f75cc..c3c8420 100644
--- a/dxr3interface_spu_encoder.h
+++ b/dxr3interface_spu_encoder.h
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <linux/dvb/osd.h>
-#include "dxr3vdrincludes.h"
+#include <vdr/osd.h>
#include "dxr3colormanager.h"
#include "dxr3interface.h"
#include "dxr3singleton.h"
diff --git a/dxr3multichannelaudio.c b/dxr3multichannelaudio.c
index abab4b8..ed4541f 100644
--- a/dxr3multichannelaudio.c
+++ b/dxr3multichannelaudio.c
@@ -7,8 +7,9 @@
*/
#include <malloc.h>
-#include "dxr3multichannelaudio.h"
+#include <algorithm>
#include <vdr/ringbuffer.h>
+#include "dxr3multichannelaudio.h"
//#define DEBUG(x...) printf(x)
#define DEBUG(x...)
diff --git a/dxr3multichannelaudio.h b/dxr3multichannelaudio.h
index d2dd40c..c9ac9c7 100644
--- a/dxr3multichannelaudio.h
+++ b/dxr3multichannelaudio.h
@@ -1,7 +1,8 @@
#ifndef _DXR3MULTICHANNELAUDIO_H_
#define _DXR3MULTICHANNELAUDIO_H_
-#include "dxr3vdrincludes.h"
+#include <vdr/tools.h>
+#include <vdr/thread.h>
class cAudioEncapsulator;
class cRingBufferFrame;
diff --git a/dxr3nextpts.h b/dxr3nextpts.h
index 668515f..6dc3ed3 100644
--- a/dxr3nextpts.h
+++ b/dxr3nextpts.h
@@ -24,7 +24,7 @@
#include <unistd.h>
#include <stdint.h>
-#include "dxr3vdrincludes.h"
+#include <vdr/thread.h>
#include "dxr3singleton.h"
// ==================================
diff --git a/dxr3osd.c b/dxr3osd.c
index 70503d7..a335da9 100644
--- a/dxr3osd.c
+++ b/dxr3osd.c
@@ -25,7 +25,6 @@
#include <sys/ioctl.h>
#include <sys/unistd.h>
-#include "dxr3vdrincludes.h"
#include "dxr3interface.h"
#include "dxr3osd.h"
diff --git a/dxr3osd.h b/dxr3osd.h
index 8514252..1ef1d9d 100644
--- a/dxr3osd.h
+++ b/dxr3osd.h
@@ -1,7 +1,6 @@
#ifndef _DXR3_OSD_H_
#define _DXR3_OSD_H_
-#include "dxr3vdrincludes.h"
#include "dxr3interface_spu_encoder.h"
// ==================================
diff --git a/dxr3output.h b/dxr3output.h
index bbf1cc4..7afccc2 100644
--- a/dxr3output.h
+++ b/dxr3output.h
@@ -22,7 +22,6 @@
#ifndef _DXR3OUTPUTTHREAD_H_
#define _DXR3OUTPUTTHREAD_H_
-#include "dxr3vdrincludes.h"
#include "dxr3syncbuffer.h"
#include "dxr3audiodecoder.h"
diff --git a/dxr3spudecoder.h b/dxr3spudecoder.h
index 4c617fc..e0e5795 100644
--- a/dxr3spudecoder.h
+++ b/dxr3spudecoder.h
@@ -22,7 +22,8 @@
#ifndef _DXR3SPUDECODER_H_
#define _DXR3SPUDECODER_H_
-#include "dxr3vdrincludes.h"
+#include <vdr/osd.h>
+#include <vdr/spu.h>
#include <inttypes.h>
// ==================================
diff --git a/dxr3spuencoder.h b/dxr3spuencoder.h
index be67d1c..4e8ec53 100644
--- a/dxr3spuencoder.h
+++ b/dxr3spuencoder.h
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <linux/dvb/osd.h>
-#include "dxr3vdrincludes.h"
+#include <vdr/osd.h>
#include "dxr3palettemanager.h"
#include "dxr3colormanager.h"
#include "dxr3interface.h"
diff --git a/dxr3syncbuffer.h b/dxr3syncbuffer.h
index adb774e..70f1632 100644
--- a/dxr3syncbuffer.h
+++ b/dxr3syncbuffer.h
@@ -24,7 +24,7 @@
#include <stdint.h>
-#include "dxr3vdrincludes.h"
+#include <vdr/ringbuffer.h>
#include "dxr3interface.h"
#include "dxr3generaldefines.h"
#include "dxr3nextpts.h"
diff --git a/dxr3sysclock.h b/dxr3sysclock.h
index 168907b..372117e 100644
--- a/dxr3sysclock.h
+++ b/dxr3sysclock.h
@@ -22,8 +22,9 @@
#ifndef _DXR3_SYSCLOCK_H_
#define _DXR3_SYSCLOCK_H_
-#include "dxr3vdrincludes.h"
+#include <stdint.h>
#include <linux/em8300.h>
+#include <vdr/thread.h>
// ==================================
// work with dxr3's clock
diff --git a/dxr3tools.h b/dxr3tools.h
index 971859c..a4818d5 100644
--- a/dxr3tools.h
+++ b/dxr3tools.h
@@ -22,7 +22,8 @@
#ifndef _DXR3TOOLS_H_
#define _DXR3TOOLS_H_
-#include "dxr3vdrincludes.h"
+#include <string>
+#include <vdr/status.h>
namespace Tools
{
diff --git a/dxr3vdrincludes.h b/dxr3vdrincludes.h
deleted file mode 100644
index 56a062a..0000000
--- a/dxr3vdrincludes.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * dxr3vdrincludes.h
- *
- * Copyright (C) 2002-2004 Kai Möller
- * Copyright (C) 2004 Christian Gmeiner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * 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 Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifndef _DXR3_VDRINCLUDES_H_
-#define _DXR3_VDRINCLUDES_H_
-
-#include <string>
-#include <algorithm>
-#include <vector>
-
-#ifndef __STL_CONFIG_H
-#define __STL_CONFIG_H
-#define __DXR3_UNDEF_STL_CONFIG_AFTERWARDS
-#endif
-
-// all includes from vdr
-#include <vdr/osd.h>
-#include <vdr/config.h>
-#include <vdr/thread.h>
-#include <vdr/ringbuffer.h>
-#include <vdr/spu.h>
-#include <vdr/tools.h>
-#include <vdr/device.h>
-#include <vdr/status.h>
-#include <vdr/plugin.h>
-#include <vdr/audio.h>
-
-#ifdef __DXR3_UNDEF_STL_CONFIG_AFTERWARDS
-#undef __STL_CONFIG_H
-#endif
-
-#endif /*_DXR3_VDRINCLUDES_H_*/
-
-// Local variables:
-// mode: c++
-// c-file-style: "stroustrup"
-// c-file-offsets: ((inline-open . 0))
-// indent-tabs-mode: t
-// End:
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 23:36:04 +0000