Renamed source files.

This commit is contained in:
Rolf Ahrenberg 2015-03-07 22:32:58 +02:00
parent 9d9a8f5a49
commit 2bcf1bbadc
27 changed files with 118 additions and 115 deletions

View File

@ -72,8 +72,7 @@ all-redirect: all
### The object files (add further files here): ### The object files (add further files here):
OBJS = $(PLUGIN).o femonosd.o femonreceiver.o femonconfig.o femontools.o femonmpeg.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
femonac3.o femonaac.o femonlatm.o femonh264.o femonsetup.o femonsymbol.o
### The main target: ### The main target:

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#include "femontools.h" #include "tools.h"
#include "femonaac.h" #include "aac.h"
#define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0)) #define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0))

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONAAC_H #ifndef __FEMON_AAC_H
#define __FEMONAAC_H #define __FEMON_AAC_H
#include "femonaudio.h" #include "audio.h"
class cFemonAAC { class cFemonAAC {
private: private:
@ -23,4 +23,4 @@ public:
bool processAudio(const uint8_t *bufP, int lenP); bool processAudio(const uint8_t *bufP, int lenP);
}; };
#endif //__FEMONAAC_H #endif //__FEMON_AAC_H

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
* AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf * AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf
*/ */
#include "femontools.h" #include "tools.h"
#include "femonac3.h" #include "ac3.h"
int cFemonAC3::bitrateS[32] = int cFemonAC3::bitrateS[32] =
{ {

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONAC3_H #ifndef __FEMON_AC3_H
#define __FEMONAC3_H #define __FEMON_AC3_H
#include "femonaudio.h" #include "audio.h"
class cFemonAC3 { class cFemonAC3 {
private: private:
@ -25,4 +25,4 @@ public:
bool processAudio(const uint8_t *bufP, int lenP); bool processAudio(const uint8_t *bufP, int lenP);
}; };
#endif //__FEMONAC3_H #endif //__FEMON_AC3_H

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONAUDIO_H #ifndef __FEMON_AUDIO_H
#define __FEMONAUDIO_H #define __FEMON_AUDIO_H
enum eAudioCodec { enum eAudioCodec {
AUDIO_CODEC_INVALID = -1, AUDIO_CODEC_INVALID = -1,
@ -147,4 +147,4 @@ public:
virtual void SetAC3LFE(bool onoffP) = 0; virtual void SetAC3LFE(bool onoffP) = 0;
}; };
#endif //__FEMONAUDIO_H #endif //__FEMON_AUDIO_H

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
@ -7,8 +7,8 @@
#include <string.h> #include <string.h>
#include "femontools.h" #include "tools.h"
#include "femonconfig.h" #include "config.h"
cFemonConfig FemonConfig; cFemonConfig FemonConfig;

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONCONFIG_H #ifndef __FEMON_CONFIG_H
#define __FEMONCONFIG_H #define __FEMON_CONFIG_H
#define MaxSvdrpIp 15 // xxx.xxx.xxx.xxx #define MaxSvdrpIp 15 // xxx.xxx.xxx.xxx
@ -133,4 +133,4 @@ struct cFemonTheme
extern const cFemonTheme FemonTheme[eFemonThemeMaxNumber]; extern const cFemonTheme FemonTheme[eFemonThemeMaxNumber];
#endif // __FEMONCONFIG_H #endif // __FEMON_CONFIG_H

12
femon.c
View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
@ -10,12 +10,12 @@
#include <vdr/remote.h> #include <vdr/remote.h>
#include <vdr/player.h> #include <vdr/player.h>
#include "femonconfig.h" #include "config.h"
#include "log.h"
#include "femonosd.h"
#include "femonsetup.h"
#include "femonservice.h" #include "femonservice.h"
#include "femontools.h" #include "log.h"
#include "osd.h"
#include "tools.h"
#include "setup.h"
#if defined(APIVERSNUM) && APIVERSNUM < 20200 #if defined(APIVERSNUM) && APIVERSNUM < 20200
#error "VDR-2.2.0 API version or greater is required!" #error "VDR-2.2.0 API version or greater is required!"

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#include "log.h" #include "log.h"
#include "femontools.h" #include "tools.h"
#include "femonh264.h" #include "h264.h"
const cFemonH264::t_DAR cFemonH264::darS[] = const cFemonH264::t_DAR cFemonH264::darS[] =
{ {

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONH264_H #ifndef __FEMON_H264_H
#define __FEMONH264_H #define __FEMON_H264_H
#include "femonvideo.h" #include "video.h"
class cFemonH264 { class cFemonH264 {
private: private:
@ -61,4 +61,4 @@ public:
bool processVideo(const uint8_t *bufP, int lenP); bool processVideo(const uint8_t *bufP, int lenP);
}; };
#endif //__FEMONH264_H #endif //__FEMON_H264_H

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#include "femontools.h" #include "tools.h"
#include "femonlatm.h" #include "latm.h"
int cFemonLATM::bitrateS[3][16] = int cFemonLATM::bitrateS[3][16] =
{ {

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONLATM_H #ifndef __FEMON_LATM_H
#define __FEMONLATM_H #define __FEMON_LATM_H
#include "femonaudio.h" #include "audio.h"
class cFemonLATM { class cFemonLATM {
private: private:
@ -24,4 +24,4 @@ public:
bool processAudio(const uint8_t *bufP, int lenP); bool processAudio(const uint8_t *bufP, int lenP);
}; };
#endif //__FEMONLATM_H #endif //__FEMON_LATM_H

2
log.h
View File

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

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#include "femontools.h" #include "tools.h"
#include "femonmpeg.h" #include "mpeg.h"
#define IS_EXTENSION_START(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB5)) #define IS_EXTENSION_START(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB5))

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONMPEG_H #ifndef __FEMON_MPEG_H
#define __FEMONMPEG_H #define __FEMON_MPEG_H
#include "femonvideo.h" #include "video.h"
#include "femonaudio.h" #include "audio.h"
class cFemonMPEG { class cFemonMPEG {
private: private:
@ -28,4 +28,4 @@ public:
bool processAudio(const uint8_t *bufP, int lenP); bool processAudio(const uint8_t *bufP, int lenP);
}; };
#endif //__FEMONMPEG_H #endif //__FEMON_MPEG_H

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
@ -12,13 +12,13 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include "config.h"
#include "iptvservice.h" #include "iptvservice.h"
#include "femonconfig.h"
#include "log.h" #include "log.h"
#include "femonreceiver.h" #include "receiver.h"
#include "femontools.h" #include "symbol.h"
#include "femonsymbol.h" #include "tools.h"
#include "femonosd.h" #include "osd.h"
#define CHANNELINPUT_TIMEOUT 1000 #define CHANNELINPUT_TIMEOUT 1000
#define SVDRPPLUGIN "svdrpservice" #define SVDRPPLUGIN "svdrpservice"

View File

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

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#include <unistd.h> #include <unistd.h>
#include "femonconfig.h"
#include "config.h"
#include "log.h" #include "log.h"
#include "femontools.h" #include "tools.h"
#include "femonreceiver.h" #include "receiver.h"
cFemonReceiver::cFemonReceiver(const cChannel *channelP, int aTrackP, int dTrackP) cFemonReceiver::cFemonReceiver(const cChannel *channelP, int aTrackP, int dTrackP)
: cReceiver(channelP), : cReceiver(channelP),

View File

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

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#include <vdr/menu.h> #include <vdr/menu.h>
#include "femonconfig.h"
#include "config.h"
#include "log.h" #include "log.h"
#include "femontools.h" #include "tools.h"
#include "femonsetup.h" #include "setup.h"
cMenuFemonSetup::cMenuFemonSetup() cMenuFemonSetup::cMenuFemonSetup()
: hideMenuM(FemonConfig.GetHideMenu()), : hideMenuM(FemonConfig.GetHideMenu()),

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONSETUP_H #ifndef __FEMON_SETUP_H
#define __FEMONSETUP_H #define __FEMON_SETUP_H
class cMenuFemonSetup : public cMenuSetupPage { class cMenuFemonSetup : public cMenuSetupPage {
private: private:
@ -38,4 +38,4 @@ public:
cMenuFemonSetup(); cMenuFemonSetup();
}; };
#endif // __FEMONSETUP_H #endif // __FEMON_SETUP_H

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#include <vdr/device.h> #include <vdr/device.h>
#include "log.h" #include "log.h"
#include "femontools.h" #include "tools.h"
#include "femonsymbol.h" #include "symbol.h"
#include "symbols/stereo.xpm" #include "symbols/stereo.xpm"
#include "symbols/monoleft.xpm" #include "symbols/monoleft.xpm"

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONSYMBOL_H #ifndef __FEMON_SYMBOL_H
#define __FEMONSYMBOL_H #define __FEMON_SYMBOL_H
#include <vdr/tools.h> #include <vdr/tools.h>
#include <vdr/osd.h> #include <vdr/osd.h>
@ -84,4 +84,4 @@ public:
extern cFemonSymbolCache femonSymbols; extern cFemonSymbolCache femonSymbols;
#endif // __FEMONSYMBOL_H #endif // __FEMON_SYMBOL_H

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
@ -15,9 +15,10 @@
#include <unistd.h> #include <unistd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/dvb/frontend.h> #include <linux/dvb/frontend.h>
#include "femonreceiver.h"
#include "femonosd.h" #include "osd.h"
#include "femontools.h" #include "receiver.h"
#include "tools.h"
static cString getCA(int valueP) static cString getCA(int valueP)
{ {

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONTOOLS_H #ifndef __FEMON_COMMON_H
#define __FEMONTOOLS_H #define __FEMON_COMMON_H
#include <stdint.h> #include <stdint.h>
#include <vdr/channels.h> #include <vdr/channels.h>
@ -80,4 +80,4 @@ public:
void SkipSeGolomb() { SkipGolomb(); } void SkipSeGolomb() { SkipGolomb(); }
}; };
#endif // __FEMONTOOLS_H #endif // __FEMON_COMMON_H

View File

@ -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. * See the README file for copyright information and how to reach the author.
* *
*/ */
#ifndef __FEMONVIDEO_H #ifndef __FEMON_VIDEO_H
#define __FEMONVIDEO_H #define __FEMON_VIDEO_H
enum eVideoCodec { enum eVideoCodec {
VIDEO_CODEC_INVALID = -1, VIDEO_CODEC_INVALID = -1,
@ -90,4 +90,4 @@ public:
virtual void SetVideoBitrate(double bitRateP) = 0; virtual void SetVideoBitrate(double bitRateP) = 0;
}; };
#endif //__FEMONVIDEO_H #endif //__FEMON_VIDEO_H