summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dxr3.c66
-rw-r--r--dxr3.h2
-rw-r--r--dxr3audio-alsa.c2
-rw-r--r--dxr3interface.c18
-rw-r--r--dxr3interface.h2
-rw-r--r--settings.c2
-rw-r--r--settings.h4
7 files changed, 48 insertions, 48 deletions
diff --git a/dxr3.c b/dxr3.c
index 44d3cb8..d341512 100644
--- a/dxr3.c
+++ b/dxr3.c
@@ -34,17 +34,17 @@ eOSState cDxr3OsdItem::ProcessKey(eKeys Key)
break;
case DXR3_FORCE_LETTER_BOX:
- cDxr3ConfigData::instance()->SetForceLetterBox(
- !cDxr3ConfigData::instance()->GetForceLetterBox());
+ cSettings::instance()->SetForceLetterBox(
+ !cSettings::instance()->GetForceLetterBox());
break;
case DXR3_ANALOG_OUT:
- cDxr3ConfigData::instance()->SetUseDigitalOut(0);
+ cSettings::instance()->SetUseDigitalOut(0);
//cDxr3Device::Instance().Reset();
break;
case DXR3_DIGITAL_OUT:
- cDxr3ConfigData::instance()->SetUseDigitalOut(1);
+ cSettings::instance()->SetUseDigitalOut(1);
//cDxr3Device::Instance().Reset();
break;
}
@@ -57,31 +57,31 @@ eOSState cDxr3OsdItem::ProcessKey(eKeys Key)
// setup menu
cMenuSetupDxr3::cMenuSetupDxr3(void)
{
- newBrightness = cDxr3ConfigData::instance()->GetBrightness();
+ newBrightness = cSettings::instance()->GetBrightness();
Add(new cMenuEditIntItem(tr("Brightness"),
&newBrightness, 0, 999));
- newContrast = cDxr3ConfigData::instance()->GetContrast();
+ newContrast = cSettings::instance()->GetContrast();
Add(new cMenuEditIntItem(tr("Contrast"),
&newContrast, 0, 999));
- newSaturation = cDxr3ConfigData::instance()->GetSaturation();
+ newSaturation = cSettings::instance()->GetSaturation();
Add(new cMenuEditIntItem(tr("Saturation"),
&newSaturation, 0, 999));
- newVideoMode = (int) cDxr3ConfigData::instance()->GetVideoMode();
+ newVideoMode = (int) cSettings::instance()->GetVideoMode();
menuVideoModes[0] = tr("PAL");
menuVideoModes[1] = tr("PAL60");
menuVideoModes[2] = tr("NTSC");
Add(new cMenuEditStraItem(tr("Video mode"),
&newVideoMode, 3, menuVideoModes));
- newUseWSS = cDxr3ConfigData::instance()->GetUseWSS();
+ newUseWSS = cSettings::instance()->GetUseWSS();
#ifdef EM8300_IOCTL_SET_WSS
Add(new cMenuEditBoolItem(tr("Use widescreen signaling (WSS)"),
&newUseWSS));
#endif
- newUseDigitalOut = cDxr3ConfigData::instance()->GetUseDigitalOut();
+ newUseDigitalOut = cSettings::instance()->GetUseDigitalOut();
Add(new cMenuEditBoolItem(tr("Digital audio output"), &newUseDigitalOut));
- newHideMenu = cDxr3ConfigData::instance()->GetHideMenu();
+ newHideMenu = cSettings::instance()->GetHideMenu();
Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &newHideMenu));
- newDxr3Card = cDxr3ConfigData::instance()->GetDxr3Card();
+ newDxr3Card = cSettings::instance()->GetDxr3Card();
Add(new cMenuEditIntItem(tr("Card number"),
&newDxr3Card, 0, DXR3_MAX_CARDS - 1));
}
@@ -91,22 +91,22 @@ cMenuSetupDxr3::cMenuSetupDxr3(void)
void cMenuSetupDxr3::Store(void)
{
SetupStore("Brightness",
- cDxr3ConfigData::instance()->SetBrightness(newBrightness));
+ cSettings::instance()->SetBrightness(newBrightness));
SetupStore("Contrast",
- cDxr3ConfigData::instance()->SetContrast(newContrast));
+ cSettings::instance()->SetContrast(newContrast));
SetupStore("Saturation",
- cDxr3ConfigData::instance()->SetSaturation(newSaturation));
+ cSettings::instance()->SetSaturation(newSaturation));
SetupStore("Dxr3VideoMode",
- cDxr3ConfigData::instance()->SetVideoMode(
+ cSettings::instance()->SetVideoMode(
(eVideoMode) newVideoMode));
SetupStore("UseWSS",
- cDxr3ConfigData::instance()->SetUseWSS(newUseWSS));
+ cSettings::instance()->SetUseWSS(newUseWSS));
SetupStore("UseDigitalOut",
- cDxr3ConfigData::instance()->SetUseDigitalOut(newUseDigitalOut));
+ cSettings::instance()->SetUseDigitalOut(newUseDigitalOut));
SetupStore("HideMenu",
- cDxr3ConfigData::instance()->SetHideMenu(newHideMenu));
+ cSettings::instance()->SetHideMenu(newHideMenu));
SetupStore("Dxr3Card",
- cDxr3ConfigData::instance()->SetDxr3Card(newDxr3Card));
+ cSettings::instance()->SetDxr3Card(newDxr3Card));
// Apply (some of the) settings
cDxr3Interface::instance()->updateBcsValues();
@@ -144,7 +144,7 @@ cPluginDxr3::cPluginDxr3()
// Initialize any member variables here.
// DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
// VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
- cDxr3ConfigData::instance();
+ cSettings::instance();
}
// ==================================
@@ -170,42 +170,42 @@ bool cPluginDxr3::SetupParse(const char *Name, const char *Value)
{
if (!strcasecmp(Name, "UseDigitalOut"))
{
- cDxr3ConfigData::instance()->SetUseDigitalOut(atoi(Value));
+ cSettings::instance()->SetUseDigitalOut(atoi(Value));
return true;
}
if (!strcasecmp(Name, "Dxr3Card"))
{
- cDxr3ConfigData::instance()->SetDxr3Card(atoi(Value));
+ cSettings::instance()->SetDxr3Card(atoi(Value));
return true;
}
if (!strcasecmp(Name, "Dxr3VideoMode"))
{
- cDxr3ConfigData::instance()->SetVideoMode((eVideoMode) atoi(Value));
+ cSettings::instance()->SetVideoMode((eVideoMode) atoi(Value));
return true;
}
if (!strcasecmp(Name, "UseWSS"))
{
- cDxr3ConfigData::instance()->SetUseWSS(atoi(Value));
+ cSettings::instance()->SetUseWSS(atoi(Value));
return true;
}
if (!strcasecmp(Name, "HideMenu"))
{
- cDxr3ConfigData::instance()->SetHideMenu(atoi(Value));
+ cSettings::instance()->SetHideMenu(atoi(Value));
return true;
}
if (!strcasecmp(Name, "Brightness"))
{
- cDxr3ConfigData::instance()->SetBrightness(atoi(Value));
+ cSettings::instance()->SetBrightness(atoi(Value));
return true;
}
if (!strcasecmp(Name, "Contrast"))
{
- cDxr3ConfigData::instance()->SetContrast(atoi(Value));
+ cSettings::instance()->SetContrast(atoi(Value));
return true;
}
if (!strcasecmp(Name, "Saturation"))
{
- cDxr3ConfigData::instance()->SetSaturation(atoi(Value));
+ cSettings::instance()->SetSaturation(atoi(Value));
return true;
}
@@ -215,7 +215,7 @@ bool cPluginDxr3::SetupParse(const char *Name, const char *Value)
// ==================================
const char* cPluginDxr3::MainMenuEntry()
{
- return cDxr3ConfigData::instance()->GetHideMenu() ?
+ return cSettings::instance()->GetHideMenu() ?
NULL : tr(MAINMENUENTRY);
}
@@ -260,17 +260,17 @@ cString cPluginDxr3::SVDRPCommand(const char *Command, const char *Option,
int value = atoi(Option);
if (!strcasecmp(Command, "BRI")) {
- cDxr3ConfigData::instance()->SetBrightness(value);
+ cSettings::instance()->SetBrightness(value);
cDxr3Interface::instance()->updateBcsValues();
return cString::sprintf("Brightness set to %d", value);
}
if (!strcasecmp(Command, "CON")) {
- cDxr3ConfigData::instance()->SetContrast(value);
+ cSettings::instance()->SetContrast(value);
cDxr3Interface::instance()->updateBcsValues();
return cString::sprintf("Contrast set to %d", value);
}
if (!strcasecmp(Command, "SAT")) {
- cDxr3ConfigData::instance()->SetSaturation(value);
+ cSettings::instance()->SetSaturation(value);
cDxr3Interface::instance()->updateBcsValues();
return cString::sprintf("Saturation set to %d", value);
}
diff --git a/dxr3.h b/dxr3.h
index b572a30..9bbceb9 100644
--- a/dxr3.h
+++ b/dxr3.h
@@ -69,7 +69,7 @@ public:
Add(new cDxr3OsdItem(hk(tr("Toggle force letterbox")),
DXR3_FORCE_LETTER_BOX));
- if (cDxr3ConfigData::instance()->GetUseDigitalOut())
+ if (cSettings::instance()->GetUseDigitalOut())
Add(new cDxr3OsdItem(hk(tr("Switch to analog audio output")),
DXR3_ANALOG_OUT));
else
diff --git a/dxr3audio-alsa.c b/dxr3audio-alsa.c
index 71fbfbf..2c411f9 100644
--- a/dxr3audio-alsa.c
+++ b/dxr3audio-alsa.c
@@ -30,7 +30,7 @@ void cAudioAlsa::openDevice()
return;
// generate alsa card name
- int card = cDxr3ConfigData::instance()->GetDxr3Card();
+ int card = cSettings::instance()->GetDxr3Card();
string cardname = "EM8300";
if (card > 0) {
diff --git a/dxr3interface.c b/dxr3interface.c
index 445195d..ff6066b 100644
--- a/dxr3interface.c
+++ b/dxr3interface.c
@@ -147,7 +147,7 @@ void cDxr3Interface::SetAspectRatio(uint32_t ratio)
Lock();
- if (cDxr3ConfigData::instance()->GetForceLetterBox())
+ if (cSettings::instance()->GetForceLetterBox())
ratio = EM8300_ASPECTRATIO_16_9;
if (ratio != UNKNOWN_ASPECT_RATIO)
@@ -158,7 +158,7 @@ void cDxr3Interface::SetAspectRatio(uint32_t ratio)
{
aspect = EM8300_ASPECTRATIO_4_3;
#ifdef EM8300_IOCTL_SET_WSS
- if (cDxr3ConfigData::Instance().GetUseWSS())
+ if (cSettings::Instance().GetUseWSS())
{
int wssmode;
if (ratio == EM8300_ASPECTRATIO_16_9)
@@ -490,7 +490,7 @@ void cDxr3Interface::UploadMicroCode()
//! config and setup device via ioctl calls
void cDxr3Interface::ConfigureDevice()
{
- uint32_t videomode = cDxr3ConfigData::instance()->GetVideoMode();
+ uint32_t videomode = cSettings::instance()->GetVideoMode();
switch (videomode) {
case PAL:
@@ -511,9 +511,9 @@ void cDxr3Interface::ConfigureDevice()
}
// set brightness/contrast/saturation
- m_bcs.brightness = cDxr3ConfigData::instance()->GetBrightness();
- m_bcs.contrast = cDxr3ConfigData::instance()->GetContrast();
- m_bcs.saturation = cDxr3ConfigData::instance()->GetSaturation();
+ m_bcs.brightness = cSettings::instance()->GetBrightness();
+ m_bcs.contrast = cSettings::instance()->GetContrast();
+ m_bcs.saturation = cSettings::instance()->GetSaturation();
dsyslog("dxr3: configure: brightness=%d,contrast=%d,saturation=%d",
m_bcs.brightness, m_bcs.contrast, m_bcs.saturation);
if (ioctl(m_fdControl, EM8300_IOCTL_SETBCS, &m_bcs) == -1) {
@@ -609,9 +609,9 @@ void cDxr3Interface::ResetHardware()
void cDxr3Interface::updateBcsValues()
{
// update m_bcs with values from settings
- m_bcs.brightness = cDxr3ConfigData::instance()->GetBrightness();
- m_bcs.contrast = cDxr3ConfigData::instance()->GetContrast();
- m_bcs.saturation = cDxr3ConfigData::instance()->GetSaturation();
+ m_bcs.brightness = cSettings::instance()->GetBrightness();
+ m_bcs.contrast = cSettings::instance()->GetContrast();
+ m_bcs.saturation = cSettings::instance()->GetSaturation();
// update bcs values in hardware
CHECK(ioctl(m_fdControl, EM8300_IOCTL_SETBCS, &m_bcs));
diff --git a/dxr3interface.h b/dxr3interface.h
index cc5b354..0392654 100644
--- a/dxr3interface.h
+++ b/dxr3interface.h
@@ -58,7 +58,7 @@ public:
~cDxr3Interface();
static int Dxr3Open(const char *name, int mode, bool report_error = true) {
- const char *filename = *cDxr3Name(name, cDxr3ConfigData::instance()->GetDxr3Card());
+ const char *filename = *cDxr3Name(name, cSettings::instance()->GetDxr3Card());
int fd = open(filename, mode);
if (report_error && (fd < 0)) {
diff --git a/settings.c b/settings.c
index a199320..be60c21 100644
--- a/settings.c
+++ b/settings.c
@@ -24,7 +24,7 @@
// ==================================
//! constructor
-cDxr3ConfigData::cDxr3ConfigData()
+cSettings::cSettings()
{
m_digitaloutput = 0;
m_card = 0;
diff --git a/settings.h b/settings.h
index 289d045..78486fd 100644
--- a/settings.h
+++ b/settings.h
@@ -41,10 +41,10 @@ enum eVideoMode
With this singleton you can access very easy all possible
config settings of the plugin.
*/
-class cDxr3ConfigData : public Singleton<cDxr3ConfigData>
+class cSettings : public Singleton<cSettings>
{
public:
- cDxr3ConfigData();
+ cSettings();
int GetUseDigitalOut() const { return m_digitaloutput; }
int SetUseDigitalOut(int value) { return m_digitaloutput = value; }
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 14:44:22 +0000