From e074e252a8c3e8fdfba2f52757673ed57100f3e3 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Mon, 4 Jan 2010 07:49:00 +0100 Subject: rename dxr3configdata.[ch] to settings.[ch] --- Makefile | 2 +- dxr3audio-alsa.c | 2 +- dxr3configdata.c | 46 ---------------------------- dxr3configdata.h | 92 -------------------------------------------------------- dxr3interface.h | 2 +- settings.c | 46 ++++++++++++++++++++++++++++ settings.h | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 141 insertions(+), 141 deletions(-) delete mode 100644 dxr3configdata.c delete mode 100644 dxr3configdata.h create mode 100644 settings.c create mode 100644 settings.h diff --git a/Makefile b/Makefile index dd4d5bb..07403a7 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ DEFINES += -DMICROCODE=\"/lib/firmware/em8300.bin\" OBJS = $(PLUGIN).o dxr3multichannelaudio.o \ dxr3syncbuffer.o dxr3audiodecoder.o dxr3blackframe.o dxr3audio.o \ - dxr3pesframe.o dxr3demuxdevice.o dxr3configdata.o \ + dxr3pesframe.o dxr3demuxdevice.o settings.o \ dxr3interface.o dxr3device.o \ dxr3output.o dxr3output-video.o dxr3output-audio.o dxr3osd.o dxr3spudecoder.o \ dxr3audio-oss.o dxr3audio-alsa.o spuencoder.o spuregion.o scaler.o diff --git a/dxr3audio-alsa.c b/dxr3audio-alsa.c index 70ed3c9..71fbfbf 100644 --- a/dxr3audio-alsa.c +++ b/dxr3audio-alsa.c @@ -22,7 +22,7 @@ using namespace std; #include "dxr3audio-alsa.h" -#include "dxr3configdata.h" +#include "settings.h" void cAudioAlsa::openDevice() { diff --git a/dxr3configdata.c b/dxr3configdata.c deleted file mode 100644 index 9fd053a..0000000 --- a/dxr3configdata.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * dxr3configdata.c - * - * Copyright (C) 2002-2004 Kai Möller - * Copyright (C) 2004 Christian Gmeiner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include "dxr3configdata.h" - -// ================================== -//! constructor -cDxr3ConfigData::cDxr3ConfigData() -{ - m_digitaloutput = 0; - m_card = 0; - m_forceletterbox = 0; - m_videomode = PAL; - m_brightness = 500; - m_contrast = 500; - m_saturation = 500; - m_hidemenu = 0; - m_usewss = 0; -} - -// Local variables: -// mode: c++ -// c-file-style: "stroustrup" -// c-file-offsets: ((inline-open . 0)) -// tab-width: 4; -// indent-tabs-mode: nil -// End: diff --git a/dxr3configdata.h b/dxr3configdata.h deleted file mode 100644 index 289d045..0000000 --- a/dxr3configdata.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * dxr3configdata.h - * - * Copyright (C) 2002-2004 Kai Möller - * Copyright (C) 2004 Christian Gmeiner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifndef _DXR3_CONFIGDATA_H_ -#define _DXR3_CONFIGDATA_H_ - -#include "singleton.h" -#include - -// ================================== -//! possible video modes -enum eVideoMode -{ - PAL = EM8300_VIDEOMODE_PAL, - PAL60 = EM8300_VIDEOMODE_PAL60, - NTSC = EM8300_VIDEOMODE_NTSC -}; - -// ================================== -//! global interface to access all config datas of this plugin -/* - With this singleton you can access very easy all possible - config settings of the plugin. -*/ -class cDxr3ConfigData : public Singleton -{ -public: - cDxr3ConfigData(); - - int GetUseDigitalOut() const { return m_digitaloutput; } - int SetUseDigitalOut(int value) { return m_digitaloutput = value; } - int GetDxr3Card() const { return m_card; } - int SetDxr3Card(int value) { return m_card = value; } - int GetForceLetterBox() const { return m_forceletterbox; } - int SetForceLetterBox(int value) { return m_forceletterbox = value; } - - eVideoMode GetVideoMode() const { return m_videomode; } - eVideoMode SetVideoMode(eVideoMode m) { return m_videomode = m; } - - int GetBrightness() const { return m_brightness; } - int SetBrightness(int value) { return m_brightness = value; } - int GetContrast() const { return m_contrast; } - int SetContrast(int value) { return m_contrast = value; } - int GetSaturation() const { return m_saturation; } - int SetSaturation(int value) { return m_saturation = value; } - - int GetHideMenu() const { return m_hidemenu; } - int SetHideMenu(int value) { return m_hidemenu = value; } - - int GetUseWSS() const { return m_usewss; } - int SetUseWSS(int value) { return m_usewss = value; } - -private: - eVideoMode m_videomode; - int m_usewss; - int m_digitaloutput; - int m_card; - int m_forceletterbox; - int m_brightness; - int m_contrast; - int m_saturation; - int m_hidemenu; -}; - -#endif /*_DXR3_CONFIGDATA_H_*/ - -// Local variables: -// mode: c++ -// c-file-style: "stroustrup" -// c-file-offsets: ((inline-open . 0)) -// tab-width: 4; -// indent-tabs-mode: nil -// End: diff --git a/dxr3interface.h b/dxr3interface.h index 8112470..cc5b354 100644 --- a/dxr3interface.h +++ b/dxr3interface.h @@ -28,7 +28,7 @@ #include #include -#include "dxr3configdata.h" +#include "settings.h" // ================================== class cFixedLengthFrame; diff --git a/settings.c b/settings.c new file mode 100644 index 0000000..a199320 --- /dev/null +++ b/settings.c @@ -0,0 +1,46 @@ +/* + * dxr3configdata.c + * + * Copyright (C) 2002-2004 Kai Möller + * Copyright (C) 2004 Christian Gmeiner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "settings.h" + +// ================================== +//! constructor +cDxr3ConfigData::cDxr3ConfigData() +{ + m_digitaloutput = 0; + m_card = 0; + m_forceletterbox = 0; + m_videomode = PAL; + m_brightness = 500; + m_contrast = 500; + m_saturation = 500; + m_hidemenu = 0; + m_usewss = 0; +} + +// Local variables: +// mode: c++ +// c-file-style: "stroustrup" +// c-file-offsets: ((inline-open . 0)) +// tab-width: 4; +// indent-tabs-mode: nil +// End: diff --git a/settings.h b/settings.h new file mode 100644 index 0000000..289d045 --- /dev/null +++ b/settings.h @@ -0,0 +1,92 @@ +/* + * dxr3configdata.h + * + * Copyright (C) 2002-2004 Kai Möller + * Copyright (C) 2004 Christian Gmeiner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef _DXR3_CONFIGDATA_H_ +#define _DXR3_CONFIGDATA_H_ + +#include "singleton.h" +#include + +// ================================== +//! possible video modes +enum eVideoMode +{ + PAL = EM8300_VIDEOMODE_PAL, + PAL60 = EM8300_VIDEOMODE_PAL60, + NTSC = EM8300_VIDEOMODE_NTSC +}; + +// ================================== +//! global interface to access all config datas of this plugin +/* + With this singleton you can access very easy all possible + config settings of the plugin. +*/ +class cDxr3ConfigData : public Singleton +{ +public: + cDxr3ConfigData(); + + int GetUseDigitalOut() const { return m_digitaloutput; } + int SetUseDigitalOut(int value) { return m_digitaloutput = value; } + int GetDxr3Card() const { return m_card; } + int SetDxr3Card(int value) { return m_card = value; } + int GetForceLetterBox() const { return m_forceletterbox; } + int SetForceLetterBox(int value) { return m_forceletterbox = value; } + + eVideoMode GetVideoMode() const { return m_videomode; } + eVideoMode SetVideoMode(eVideoMode m) { return m_videomode = m; } + + int GetBrightness() const { return m_brightness; } + int SetBrightness(int value) { return m_brightness = value; } + int GetContrast() const { return m_contrast; } + int SetContrast(int value) { return m_contrast = value; } + int GetSaturation() const { return m_saturation; } + int SetSaturation(int value) { return m_saturation = value; } + + int GetHideMenu() const { return m_hidemenu; } + int SetHideMenu(int value) { return m_hidemenu = value; } + + int GetUseWSS() const { return m_usewss; } + int SetUseWSS(int value) { return m_usewss = value; } + +private: + eVideoMode m_videomode; + int m_usewss; + int m_digitaloutput; + int m_card; + int m_forceletterbox; + int m_brightness; + int m_contrast; + int m_saturation; + int m_hidemenu; +}; + +#endif /*_DXR3_CONFIGDATA_H_*/ + +// Local variables: +// mode: c++ +// c-file-style: "stroustrup" +// c-file-offsets: ((inline-open . 0)) +// tab-width: 4; +// indent-tabs-mode: nil +// End: -- cgit v1.2.3