Renamed source files.

Makefile

@@ -72,8 +72,7 @@ all-redirect: all
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o femonosd.o femonreceiver.o femonconfig.o femontools.o femonmpeg.o \
-	femonac3.o femonaac.o femonlatm.o femonh264.o femonsetup.o femonsymbol.o
+OBJS = $(PLUGIN).o aac.o ac3.o config.o h264.o latm.o mpeg.o osd.o receiver.o setup.o symbol.o tools.o
 
 ### The main target:
 

aac.c

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * aac.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#include "femontools.h"
-#include "femonaac.h"
+#include "tools.h"
+#include "aac.h"
 
 #define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0))
 

aac.h

@@ -1,14 +1,14 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * aac.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONAAC_H
-#define __FEMONAAC_H
+#ifndef __FEMON_AAC_H
+#define __FEMON_AAC_H
 
-#include "femonaudio.h"
+#include "audio.h"
 
 class cFemonAAC {
 private:
@@ -23,4 +23,4 @@ public:
   bool processAudio(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONAAC_H
+#endif //__FEMON_AAC_H

ac3.c

@@ -1,13 +1,13 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * ac3.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  * AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf
  */
 
-#include "femontools.h"
-#include "femonac3.h"
+#include "tools.h"
+#include "ac3.h"
 
 int cFemonAC3::bitrateS[32] =
 {

ac3.h

@@ -1,14 +1,14 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * ac3.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONAC3_H
-#define __FEMONAC3_H
+#ifndef __FEMON_AC3_H
+#define __FEMON_AC3_H
 
-#include "femonaudio.h"
+#include "audio.h"
 
 class cFemonAC3 {
 private:
@@ -25,4 +25,4 @@ public:
   bool processAudio(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONAC3_H
+#endif //__FEMON_AC3_H

audio.h

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the AUDIO Disk Recorder
+ * audio.h: Frontend Status Monitor plugin for the AUDIO Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONAUDIO_H
-#define __FEMONAUDIO_H
+#ifndef __FEMON_AUDIO_H
+#define __FEMON_AUDIO_H
 
 enum eAudioCodec {
   AUDIO_CODEC_INVALID = -1,
@@ -147,4 +147,4 @@ public:
   virtual void SetAC3LFE(bool onoffP) = 0;
   };
 
-#endif //__FEMONAUDIO_H
+#endif //__FEMON_AUDIO_H

config.c

@@ -1,5 +1,5 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * config.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -7,8 +7,8 @@
 
 #include <string.h>
 
-#include "femontools.h"
-#include "femonconfig.h"
+#include "tools.h"
+#include "config.h"
 
 cFemonConfig FemonConfig;
 

config.h

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * config.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONCONFIG_H
-#define __FEMONCONFIG_H
+#ifndef __FEMON_CONFIG_H
+#define __FEMON_CONFIG_H
 
 #define MaxSvdrpIp 15 // xxx.xxx.xxx.xxx
 
@@ -133,4 +133,4 @@ struct cFemonTheme
 
 extern const cFemonTheme FemonTheme[eFemonThemeMaxNumber];
 
-#endif // __FEMONCONFIG_H
+#endif // __FEMON_CONFIG_H

femon.c

@@ -1,5 +1,5 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * femon.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -10,12 +10,12 @@
 #include <vdr/remote.h>
 #include <vdr/player.h>
 
-#include "femonconfig.h"
-#include "log.h"
-#include "femonosd.h"
-#include "femonsetup.h"
+#include "config.h"
 #include "femonservice.h"
-#include "femontools.h"
+#include "log.h"
+#include "osd.h"
+#include "tools.h"
+#include "setup.h"
 
 #if defined(APIVERSNUM) && APIVERSNUM < 20200
 #error "VDR-2.2.0 API version or greater is required!"

h264.c

@@ -1,13 +1,13 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * h264.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
 #include "log.h"
-#include "femontools.h"
-#include "femonh264.h"
+#include "tools.h"
+#include "h264.h"
 
 const cFemonH264::t_DAR cFemonH264::darS[] =
 {

h264.h

@@ -1,14 +1,14 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * h264.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONH264_H
-#define __FEMONH264_H
+#ifndef __FEMON_H264_H
+#define __FEMON_H264_H
 
-#include "femonvideo.h"
+#include "video.h"
 
 class cFemonH264 {
 private:
@@ -61,4 +61,4 @@ public:
   bool processVideo(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONH264_H
+#endif //__FEMON_H264_H

latm.c

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * latm.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#include "femontools.h"
-#include "femonlatm.h"
+#include "tools.h"
+#include "latm.h"
 
 int cFemonLATM::bitrateS[3][16] =
 {

latm.h

@@ -1,14 +1,14 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * latm.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONLATM_H
-#define __FEMONLATM_H
+#ifndef __FEMON_LATM_H
+#define __FEMON_LATM_H
 
-#include "femonaudio.h"
+#include "audio.h"
 
 class cFemonLATM {
 private:
@@ -24,4 +24,4 @@ public:
   bool processAudio(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONLATM_H
+#endif //__FEMON_LATM_H

log.h

@@ -8,7 +8,7 @@
 #ifndef __FEMON_LOG_H
 #define __FEMON_LOG_H
 
-#include "femonconfig.h"
+#include "config.h"
 
 #define error(x...)   esyslog("FEMON-ERROR: " x)
 #define info(x...)    isyslog("FEMON: " x)

mpeg.c

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * mpeg.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#include "femontools.h"
-#include "femonmpeg.h"
+#include "tools.h"
+#include "mpeg.h"
 
 #define IS_EXTENSION_START(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB5))
 

mpeg.h

@@ -1,15 +1,15 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * mpeg.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONMPEG_H
-#define __FEMONMPEG_H
+#ifndef __FEMON_MPEG_H
+#define __FEMON_MPEG_H
 
-#include "femonvideo.h"
-#include "femonaudio.h"
+#include "video.h"
+#include "audio.h"
 
 class cFemonMPEG {
 private:
@@ -28,4 +28,4 @@ public:
   bool processAudio(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONMPEG_H
+#endif //__FEMON_MPEG_H

osd.c

@@ -1,5 +1,5 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * osd.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -12,13 +12,13 @@
 #include <ctype.h>
 #include <math.h>
 
+#include "config.h"
 #include "iptvservice.h"
-#include "femonconfig.h"
 #include "log.h"
-#include "femonreceiver.h"
-#include "femontools.h"
-#include "femonsymbol.h"
-#include "femonosd.h"
+#include "receiver.h"
+#include "symbol.h"
+#include "tools.h"
+#include "osd.h"
 
 #define CHANNELINPUT_TIMEOUT      1000
 #define SVDRPPLUGIN               "svdrpservice"

osd.h

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * osd.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONOSD_H
-#define __FEMONOSD_H
+#ifndef __FEMON_OSD_H
+#define __FEMON_OSD_H
 
 #include <linux/dvb/frontend.h>
 #include <sys/time.h>
@@ -19,7 +19,7 @@
 #include <vdr/transfer.h>
 #include <vdr/tools.h>
 
-#include "femonreceiver.h"
+#include "receiver.h"
 #include "svdrpservice.h"
 
 #define MAX_BM_NUMBER 8
@@ -98,5 +98,5 @@ public:
   double  GetDolbyBitrate(void);
 };
 
-#endif //__FEMONOSD_H
+#endif //__FEMON_OSD_H
 

receiver.c

@@ -1,15 +1,16 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * receiver.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
 #include <unistd.h>
-#include "femonconfig.h"
+
+#include "config.h"
 #include "log.h"
-#include "femontools.h"
-#include "femonreceiver.h"
+#include "tools.h"
+#include "receiver.h"
 
 cFemonReceiver::cFemonReceiver(const cChannel *channelP, int aTrackP, int dTrackP)
 : cReceiver(channelP),

receiver.h

@@ -1,24 +1,24 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * receiver.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONRECEIVER_H
-#define __FEMONRECEIVER_H
+#ifndef __FEMON_RECEIVER_H
+#define __FEMON_RECEIVER_H
 
 #include <vdr/thread.h>
 #include <vdr/receiver.h>
 
-#include "femonh264.h"
-#include "femonmpeg.h"
-#include "femonaac.h"
-#include "femonlatm.h"
-#include "femonac3.h"
-#include "femonaudio.h"
-#include "femonvideo.h"
-#include "femontools.h"
+#include "aac.h"
+#include "ac3.h"
+#include "audio.h"
+#include "h264.h"
+#include "latm.h"
+#include "mpeg.h"
+#include "tools.h"
+#include "video.h"
 
 class cFemonReceiver : public cReceiver, public cThread, public cFemonVideoIf, public cFemonAudioIf, public cFemonAC3If {
 private:
@@ -174,5 +174,5 @@ public:
                                       return ac3InfoM.lfe; };                 // boolean
   };
 
-#endif //__FEMONRECEIVER_H
+#endif //__FEMON_RECEIVER_H
 

setup.c

@@ -1,15 +1,16 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * setup.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
 #include <vdr/menu.h>
-#include "femonconfig.h"
+
+#include "config.h"
 #include "log.h"
-#include "femontools.h"
-#include "femonsetup.h"
+#include "tools.h"
+#include "setup.h"
 
 cMenuFemonSetup::cMenuFemonSetup()
 : hideMenuM(FemonConfig.GetHideMenu()),

setup.h

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * setup.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONSETUP_H
-#define __FEMONSETUP_H
+#ifndef __FEMON_SETUP_H
+#define __FEMON_SETUP_H
 
 class cMenuFemonSetup : public cMenuSetupPage {
 private:
@@ -38,4 +38,4 @@ public:
   cMenuFemonSetup();
 };
 
-#endif // __FEMONSETUP_H
+#endif // __FEMON_SETUP_H

symbol.c

@@ -1,14 +1,15 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * symbol.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
 #include <vdr/device.h>
+
 #include "log.h"
-#include "femontools.h"
-#include "femonsymbol.h"
+#include "tools.h"
+#include "symbol.h"
 
 #include "symbols/stereo.xpm"
 #include "symbols/monoleft.xpm"

symbol.h

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * symbol.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONSYMBOL_H
-#define __FEMONSYMBOL_H
+#ifndef __FEMON_SYMBOL_H
+#define __FEMON_SYMBOL_H
 
 #include <vdr/tools.h>
 #include <vdr/osd.h>
@@ -84,4 +84,4 @@ public:
 
 extern cFemonSymbolCache femonSymbols;
 
-#endif // __FEMONSYMBOL_H
+#endif // __FEMON_SYMBOL_H

tools.c

@@ -1,5 +1,5 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * tools.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -15,9 +15,10 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <linux/dvb/frontend.h>
-#include "femonreceiver.h"
-#include "femonosd.h"
-#include "femontools.h"
+
+#include "osd.h"
+#include "receiver.h"
+#include "tools.h"
 
 static cString getCA(int valueP)
 {

tools.h

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * tools.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONTOOLS_H
-#define __FEMONTOOLS_H
+#ifndef __FEMON_COMMON_H
+#define __FEMON_COMMON_H
 
 #include <stdint.h>
 #include <vdr/channels.h>
@@ -80,4 +80,4 @@ public:
   void           SkipSeGolomb() { SkipGolomb(); }
   };
 
-#endif // __FEMONTOOLS_H
+#endif // __FEMON_COMMON_H

video.h

@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * video.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONVIDEO_H
-#define __FEMONVIDEO_H
+#ifndef __FEMON_VIDEO_H
+#define __FEMON_VIDEO_H
 
 enum eVideoCodec {
   VIDEO_CODEC_INVALID = -1,
@@ -90,4 +90,4 @@ public:
   virtual void SetVideoBitrate(double bitRateP) = 0;
   };
 
-#endif //__FEMONVIDEO_H
+#endif //__FEMON_VIDEO_H