frodovdr
/
vdr-plugin-femon
mirror of https://github.com/rofafor/vdr-plugin-femon.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed channel switching. 

Cleaned up compilation warnings.
This commit is contained in:
Rolf Ahrenberg 2012-03-12 21:59:34 +02:00
parent 905b7c0870
commit 66eca7f8b5
23 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY
View File

@ -436,3 +436,8 @@ VDR Plugin 'femon' Revision History
2012-03-10: Version 1.7.14 2012-03-10: Version 1.7.14
- Updated for vdr-1.7.26. - Updated for vdr-1.7.26.
2012-03-12: Version 1.7.15
- Cleaned up compilation warnings.
- Fixed channel switching.

2
femon.c
View File

@ -22,7 +22,7 @@
#define GITVERSION "" #define GITVERSION ""
#endif #endif
static const char VERSION[] = "1.7.14" GITVERSION; static const char VERSION[] = "1.7.15" GITVERSION;
static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)"); static const char DESCRIPTION[] = trNOOP("DVB Signal Information Monitor (OSD)");
static const char MAINMENUENTRY[] = trNOOP("Signal Information"); static const char MAINMENUENTRY[] = trNOOP("Signal Information");

2
femonaac.c
View File

@ -10,7 +10,7 @@
#define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0)) #define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0))
unsigned int cFemonAAC::s_Samplerates[16] = int cFemonAAC::s_Samplerates[16] =
{ {
96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, -1, -1, -1, -1 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, -1, -1, -1, -1
}; };

2
femonaac.h
View File

@ -14,7 +14,7 @@ class cFemonAAC {
private: private:
cFemonAudioIf *m_AudioHandler; cFemonAudioIf *m_AudioHandler;
static unsigned int s_Samplerates[16]; static int s_Samplerates[16];
public: public:
cFemonAAC(cFemonAudioIf *audiohandler); cFemonAAC(cFemonAudioIf *audiohandler);

6
femonac3.c
View File

@ -9,17 +9,17 @@
#include "femontools.h" #include "femontools.h"
#include "femonac3.h" #include "femonac3.h"
unsigned int cFemonAC3::s_Bitrates[32] = int cFemonAC3::s_Bitrates[32] =
{ {
32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}; };
unsigned int cFemonAC3::s_Frequencies[4] = int cFemonAC3::s_Frequencies[4] =
{ {
480, 441, 320, 0 480, 441, 320, 0
}; };
unsigned int cFemonAC3::s_Frames[3][32] = int cFemonAC3::s_Frames[3][32] =
{ {
{64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768, 896, 1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768, 896, 1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{69, 87, 104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835, 975, 1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {69, 87, 104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835, 975, 1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},

6
femonac3.h
View File

@ -14,9 +14,9 @@ class cFemonAC3 {
private: private:
cFemonAC3If *m_AudioHandler; cFemonAC3If *m_AudioHandler;
static unsigned int s_Bitrates[32]; static int s_Bitrates[32];
static unsigned int s_Frequencies[4]; static int s_Frequencies[4];
static unsigned int s_Frames[3][32]; static int s_Frames[3][32];
public: public:
cFemonAC3(cFemonAC3If *audiohandler); cFemonAC3(cFemonAC3If *audiohandler);

18
femoncfg.h
View File

@ -64,15 +64,15 @@ enum eFemonThemes
struct cFemonTheme struct cFemonTheme
{ {
int bpp; unsigned int bpp;
int clrBackground; unsigned int clrBackground;
int clrTitleBackground; unsigned int clrTitleBackground;
int clrTitleText; unsigned int clrTitleText;
int clrActiveText; unsigned int clrActiveText;
int clrInactiveText; unsigned int clrInactiveText;
int clrRed; unsigned int clrRed;
int clrYellow; unsigned int clrYellow;
int clrGreen; unsigned int clrGreen;
}; };
extern const cFemonTheme femonTheme[eFemonThemeMaxNumber]; extern const cFemonTheme femonTheme[eFemonThemeMaxNumber];

4
femonlatm.c
View File

@ -8,14 +8,14 @@
#include "femontools.h" #include "femontools.h"
#include "femonlatm.h" #include "femonlatm.h"
unsigned int cFemonLATM::s_Bitrates[3][16] = int cFemonLATM::s_Bitrates[3][16] =
{ {
{0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I {0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I
{0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1}, // MPEG-2 Layer II/III {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1}, // MPEG-2 Layer II/III
{0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1} // MPEG-2 Layer II/III {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1} // MPEG-2 Layer II/III
}; };
unsigned int cFemonLATM::s_Samplerates[4] = int cFemonLATM::s_Samplerates[4] =
{ {
22050, 24000, 16000, -1 22050, 24000, 16000, -1
}; };

4
femonlatm.h
View File

@ -14,8 +14,8 @@ class cFemonLATM {
private: private:
cFemonAudioIf *m_AudioHandler; cFemonAudioIf *m_AudioHandler;
static unsigned int s_Bitrates[3][16]; static int s_Bitrates[3][16];
static unsigned int s_Samplerates[4]; static int s_Samplerates[4];
public: public:
cFemonLATM(cFemonAudioIf *audiohandler); cFemonLATM(cFemonAudioIf *audiohandler);

4
femonmpeg.c
View File

@ -10,7 +10,7 @@
#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))
unsigned int cFemonMPEG::s_Bitrates[2][3][16] = int cFemonMPEG::s_Bitrates[2][3][16] =
{ {
{ {
{0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I {0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I
@ -24,7 +24,7 @@ unsigned int cFemonMPEG::s_Bitrates[2][3][16] =
} }
}; };
unsigned int cFemonMPEG::s_Samplerates[2][4] = int cFemonMPEG::s_Samplerates[2][4] =
{ {
{22050, 24000, 16000, -1}, // MPEG-2 {22050, 24000, 16000, -1}, // MPEG-2
{44100, 48000, 32000, -1} // MPEG-1 {44100, 48000, 32000, -1} // MPEG-1

6
femonmpeg.h
View File

@ -16,9 +16,9 @@ private:
cFemonVideoIf *m_VideoHandler; cFemonVideoIf *m_VideoHandler;
cFemonAudioIf *m_AudioHandler; cFemonAudioIf *m_AudioHandler;
static unsigned int s_Bitrates[2][3][16]; static int s_Bitrates[2][3][16];
static unsigned int s_Samplerates[2][4]; static int s_Samplerates[2][4];
static eAudioCodec s_Formats[2][4]; static eAudioCodec s_Formats[2][4];
public: public:
cFemonMPEG(cFemonVideoIf *videohandler, cFemonAudioIf *audiohandler); cFemonMPEG(cFemonVideoIf *videohandler, cFemonAudioIf *audiohandler);

2
femonosd.c
View File

@ -731,7 +731,7 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool li
eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack(); eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
if (!liveView || !device->IsPrimaryDevice() || !channelNumber || !channel || channel->Number() != channelNumber) if (!liveView || !channelNumber || !channel || channel->Number() != channelNumber)
return; return;
m_DeviceSource = DEVICESOURCE_DVBAPI; m_DeviceSource = DEVICESOURCE_DVBAPI;

2
po/de_DE.po
View File

@ -7,7 +7,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/es_ES.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/et_EE.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/fi_FI.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/fr_FR.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/hu_HU.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0200\n" "POT-Creation-Date: 2010-10-10 10:10+0200\n"
"PO-Revision-Date: 2010-10-10 10:10+0200\n" "PO-Revision-Date: 2010-10-10 10:10+0200\n"

2
po/it_IT.po
View File

@ -6,7 +6,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/lt_LT.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/ru_RU.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/zh_CN.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"

2
po/zh_TW.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-femon 1.7.14\n" "Project-Id-Version: vdr-femon 1.7.15\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2010-10-10 10:10+0300\n" "POT-Creation-Date: 2010-10-10 10:10+0300\n"
"PO-Revision-Date: 2010-10-10 10:10+0300\n" "PO-Revision-Date: 2010-10-10 10:10+0300\n"