Permalink
Browse files

reorganization of the source tree

  • Loading branch information...
1 parent 3841f8a commit ec9dcbeb11af79c5676b0db3e764f01b7a92f27e @pipelka committed Oct 6, 2011
Showing with 73 additions and 53 deletions.
  1. +27 −7 Makefile
  2. 0 { → src/config}/config.c
  3. 0 { → src/config}/config.h
  4. 0 { → src/demuxer}/bitstream.c
  5. 0 { → src/demuxer}/bitstream.h
  6. +3 −2 { → src/demuxer}/demuxer.c
  7. 0 { → src/demuxer}/demuxer.h
  8. 0 { → src/demuxer}/demuxer_AAC.c
  9. 0 { → src/demuxer}/demuxer_AAC.h
  10. +1 −1 { → src/demuxer}/demuxer_AC3.c
  11. 0 { → src/demuxer}/demuxer_AC3.h
  12. 0 { → src/demuxer}/demuxer_DTS.c
  13. 0 { → src/demuxer}/demuxer_DTS.h
  14. 0 { → src/demuxer}/demuxer_MPEGAudio.c
  15. 0 { → src/demuxer}/demuxer_MPEGAudio.h
  16. +3 −3 { → src/demuxer}/demuxer_MPEGVideo.c
  17. 0 { → src/demuxer}/demuxer_MPEGVideo.h
  18. 0 { → src/demuxer}/demuxer_Subtitle.c
  19. 0 { → src/demuxer}/demuxer_Subtitle.h
  20. +1 −1 { → src/demuxer}/demuxer_Teletext.c
  21. 0 { → src/demuxer}/demuxer_Teletext.h
  22. +3 −3 { → src/demuxer}/demuxer_h264.c
  23. 0 { → src/demuxer}/demuxer_h264.h
  24. +1 −1 { → src/live}/livepatfilter.c
  25. +1 −1 { → src/live}/livepatfilter.h
  26. +1 −1 { → src/live}/livereceiver.c
  27. 0 { → src/live}/livereceiver.h
  28. +5 −6 { → src/live}/livestreamer.c
  29. +1 −1 { → src/live}/livestreamer.h
  30. +1 −1 { → src/net}/cxsocket.c
  31. 0 { → src/net}/cxsocket.h
  32. +3 −2 { → src/net}/requestpacket.c
  33. 0 { → src/net}/requestpacket.h
  34. +4 −4 { → src/net}/responsepacket.c
  35. 0 { → src/net}/responsepacket.h
  36. +2 −2 { → src/recordings}/recordingscache.c
  37. 0 { → src/recordings}/recordingscache.h
  38. +2 −0 { → src/recordings}/recplayer.c
  39. +0 −2 { → src/recordings}/recplayer.h
  40. 0 { → src/scanner}/wirbelscanservice.h
  41. 0 { → src/tools}/hash.c
  42. 0 { → src/tools}/hash.h
  43. 0 { → src/xvdr}/xvdr.c
  44. 0 { → src/xvdr}/xvdr.h
  45. +9 −9 { → src/xvdr}/xvdrclient.c
  46. +4 −5 { → src/xvdr}/xvdrclient.h
  47. 0 { → src/xvdr}/xvdrcommand.h
  48. 0 { → src/xvdr}/xvdrserver.c
  49. +1 −1 { → src/xvdr}/xvdrserver.h
View
@@ -11,7 +11,7 @@ PLUGIN = xvdr
### The version number of this plugin (taken from the main source file):
-VERSION = $(shell grep 'static const char \*VERSION *=' xvdr.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char \*VERSION *=' src/xvdr/xvdr.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
### The C++ compiler and options:
@@ -41,7 +41,7 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here):
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR)
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR) -I./src -I.
DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DXVDR_VERSION='"$(VERSION)"'
ifeq ($(DEBUG),1)
@@ -53,17 +53,37 @@ endif
### The object files (add further files here):
-OBJS = xvdr.o bitstream.o xvdrclient.o config.o cxsocket.o demuxer.o demuxer_AAC.o \
- demuxer_AC3.o demuxer_DTS.o demuxer_h264.o demuxer_MPEGAudio.o demuxer_MPEGVideo.o \
- demuxer_Subtitle.o demuxer_Teletext.o livepatfilter.o livereceiver.o livestreamer.o recplayer.o requestpacket.o responsepacket.o \
- xvdrserver.o hash.o recordingscache.o
+OBJS = \
+ src/config/config.o \
+ src/demuxer/bitstream.o \
+ src/demuxer/demuxer.o \
+ src/demuxer/demuxer_AAC.o \
+ src/demuxer/demuxer_AC3.o \
+ src/demuxer/demuxer_DTS.o \
+ src/demuxer/demuxer_h264.o \
+ src/demuxer/demuxer_MPEGAudio.o \
+ src/demuxer/demuxer_MPEGVideo.o \
+ src/demuxer/demuxer_Subtitle.o \
+ src/demuxer/demuxer_Teletext.o \
+ src/live/livepatfilter.o \
+ src/live/livereceiver.o \
+ src/live/livestreamer.o \
+ src/net/cxsocket.o \
+ src/net/requestpacket.o \
+ src/net/responsepacket.o \
+ src/recordings/recordingscache.o \
+ src/recordings/recplayer.o \
+ src/tools/hash.o \
+ src/xvdr/xvdr.o \
+ src/xvdr/xvdrclient.o \
+ src/xvdr/xvdrserver.o
### Implicit rules:
all-redirect: all
%.o: %.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
# Dependencies:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -26,8 +26,9 @@
#include <assert.h>
#include <vdr/remux.h>
#include <vdr/channels.h>
-#include "config.h"
-#include "livestreamer.h"
+
+#include "config/config.h"
+#include "live/livestreamer.h"
#include "demuxer.h"
#include "demuxer_AAC.h"
#include "demuxer_AC3.h"
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -24,8 +24,8 @@
#include <stdlib.h>
#include <assert.h>
-#include "config.h"
+#include "config/config.h"
#include "demuxer_AC3.h"
#include "bitstream.h"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -24,10 +24,10 @@
#include <stdlib.h>
#include <assert.h>
-#include "config.h"
-#include "bitstream.h"
-#include "livestreamer.h"
+#include "config/config.h"
+#include "live/livestreamer.h"
+#include "bitstream.h"
#include "demuxer_MPEGVideo.h"
using namespace std;
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -23,8 +23,8 @@
*/
#include <stdlib.h>
-#include "config.h"
+#include "config/config.h"
#include "demuxer_Teletext.h"
cParserTeletext::cParserTeletext(cTSDemuxer *demuxer, cLiveStreamer *streamer, int streamIndex)
File renamed without changes.
@@ -24,10 +24,10 @@
#include <stdlib.h>
#include <assert.h>
-#include "config.h"
-#include "bitstream.h"
-#include "livestreamer.h"
+#include "config/config.h"
+#include "live/livestreamer.h"
+#include "bitstream.h"
#include "demuxer_h264.h"
static const int h264_lev2cpbsize[][2] =
File renamed without changes.
@@ -23,7 +23,7 @@
*
*/
-#include "config.h"
+#include "config/config.h"
#include "livepatfilter.h"
#include "livereceiver.h"
#include "livestreamer.h"
@@ -30,7 +30,7 @@
#include <libsi/section.h>
#include <libsi/descriptor.h>
-#include "demuxer.h"
+#include "demuxer/demuxer.h"
class cLiveStreamer;
@@ -23,7 +23,7 @@
*
*/
-#include "config.h"
+#include "config/config.h"
#include "livereceiver.h"
#include "livestreamer.h"
File renamed without changes.
@@ -26,17 +26,16 @@
#include <stdlib.h>
#include <sys/ioctl.h>
#include <time.h>
-
#include <map>
-
#include <vdr/remux.h>
#include <vdr/channels.h>
#include <asm/byteorder.h>
-#include "config.h"
-#include "cxsocket.h"
-#include "xvdrcommand.h"
-#include "responsepacket.h"
+#include "config/config.h"
+#include "net/cxsocket.h"
+#include "net/responsepacket.h"
+#include "xvdr/xvdrcommand.h"
+
#include "livestreamer.h"
#include "livepatfilter.h"
#include "livereceiver.h"
@@ -34,7 +34,7 @@
#include <vdr/thread.h>
#include <vdr/ringbuffer.h>
-#include "demuxer.h"
+#include "demuxer/demuxer.h"
class cxSocket;
class cChannel;
@@ -45,7 +45,7 @@
#include <vdr/config.h>
#include <vdr/tools.h>
-#include "config.h"
+#include "config/config.h"
#include "cxsocket.h"
cxSocket::~cxSocket()
File renamed without changes.
@@ -30,9 +30,10 @@
#include <asm/byteorder.h>
-#include "config.h"
+#include "xvdr/xvdrcommand.h"
+#include "config/config.h"
+
#include "requestpacket.h"
-#include "xvdrcommand.h"
cRequestPacket::cRequestPacket(uint32_t requestID, uint32_t opcode, uint8_t* data, uint32_t dataLength)
: userData(data), userDataLength(dataLength), opCode(opcode), requestID(requestID)
File renamed without changes.
@@ -31,13 +31,13 @@
#include <arpa/inet.h>
#include <stdlib.h>
#include <string.h>
-
#include <asm/byteorder.h>
+#include <zlib.h>
+
+#include "config/config.h"
+#include "xvdr/xvdrcommand.h"
#include "responsepacket.h"
-#include "xvdrcommand.h"
-#include "config.h"
-#include "zlib.h"
/* Packet format for an RR channel response:
File renamed without changes.
@@ -20,9 +20,9 @@
*
*/
-#include "config.h"
+#include "config/config.h"
#include "recordingscache.h"
-#include "hash.h"
+#include "tools/hash.h"
cRecordingsCache::cRecordingsCache() {
}
File renamed without changes.
@@ -34,6 +34,8 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "config/config.h"
+
cRecPlayer::cRecPlayer(cRecording* rec)
{
m_file = -1;
@@ -35,8 +35,6 @@
#include <vdr/recording.h>
#include <vdr/tools.h>
-#include "config.h"
-
class cSegment
{
public:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -34,18 +34,18 @@
#include <vdr/menu.h>
#include <vdr/device.h>
-#include "config.h"
+#include "config/config.h"
+#include "live/livestreamer.h"
+#include "net/requestpacket.h"
+#include "net/responsepacket.h"
+#include "recordings/recordingscache.h"
+#include "recordings/recplayer.h"
+#include "scanner/wirbelscanservice.h" /// copied from modified wirbelscan plugin
+#include "tools/hash.h"
+
#include "xvdrcommand.h"
-#include "recordingscache.h"
#include "xvdrclient.h"
-#include "livestreamer.h"
#include "xvdrserver.h"
-#include "recplayer.h"
-#include "requestpacket.h"
-#include "responsepacket.h"
-#include "hash.h"
-#include "wirbelscanservice.h" /// copied from modified wirbelscan plugin
- /// must be hold up to date with wirbelscan
static bool IsRadio(const cChannel* channel)
@@ -26,16 +26,15 @@
#ifndef XVDR_CLIENT_H
#define XVDR_CLIENT_H
+#include <map>
+#include <string>
+
#include <vdr/thread.h>
#include <vdr/tools.h>
#include <vdr/receiver.h>
#include <vdr/status.h>
-#include "config.h"
-#include "cxsocket.h"
-
-#include <map>
-#include <string>
+#include "net/cxsocket.h"
class cChannel;
class cDevice;
File renamed without changes.
File renamed without changes.
@@ -29,7 +29,7 @@
#include <list>
#include <vdr/thread.h>
-#include "config.h"
+#include "config/config.h"
class cXVDRClient;

0 comments on commit ec9dcbe

Please sign in to comment.