summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--dxr3audio-alsa.c2
-rw-r--r--dxr3interface.h2
-rw-r--r--settings.c (renamed from dxr3configdata.c)2
-rw-r--r--settings.h (renamed from dxr3configdata.h)0
5 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index dd4d5bb..07403a7 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ DEFINES += -DMICROCODE=\"/lib/firmware/em8300.bin\"
OBJS = $(PLUGIN).o dxr3multichannelaudio.o \
dxr3syncbuffer.o dxr3audiodecoder.o dxr3blackframe.o dxr3audio.o \
- dxr3pesframe.o dxr3demuxdevice.o dxr3configdata.o \
+ dxr3pesframe.o dxr3demuxdevice.o settings.o \
dxr3interface.o dxr3device.o \
dxr3output.o dxr3output-video.o dxr3output-audio.o dxr3osd.o dxr3spudecoder.o \
dxr3audio-oss.o dxr3audio-alsa.o spuencoder.o spuregion.o scaler.o
diff --git a/dxr3audio-alsa.c b/dxr3audio-alsa.c
index 70ed3c9..71fbfbf 100644
--- a/dxr3audio-alsa.c
+++ b/dxr3audio-alsa.c
@@ -22,7 +22,7 @@
using namespace std;
#include "dxr3audio-alsa.h"
-#include "dxr3configdata.h"
+#include "settings.h"
void cAudioAlsa::openDevice()
{
diff --git a/dxr3interface.h b/dxr3interface.h
index 8112470..cc5b354 100644
--- a/dxr3interface.h
+++ b/dxr3interface.h
@@ -28,7 +28,7 @@
#include <linux/limits.h>
#include <vdr/tools.h>
-#include "dxr3configdata.h"
+#include "settings.h"
// ==================================
class cFixedLengthFrame;
diff --git a/dxr3configdata.c b/settings.c
index 9fd053a..a199320 100644
--- a/dxr3configdata.c
+++ b/settings.c
@@ -20,7 +20,7 @@
*
*/
-#include "dxr3configdata.h"
+#include "settings.h"
// ==================================
//! constructor
diff --git a/dxr3configdata.h b/settings.h
index 289d045..289d045 100644
--- a/dxr3configdata.h
+++ b/settings.h