frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed editing channel parameters

Browse Source
This commit is contained in:
Klaus Schmidinger 2010-03-06 15:19:17 +01:00
parent d01a497a09
commit 2f16565bc8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -6394,3 +6394,4 @@ Video Disk Recorder Revision History
This obsoletes the ATSC patch. This obsoletes the ATSC patch.
- The "Source" item in the "Edit channel" menu now wraps around the list of sources - The "Source" item in the "Edit channel" menu now wraps around the list of sources
(suggested by Halim Sahin). (suggested by Halim Sahin).
- Fixed editing channel parameters.

14
dvbdevice.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: dvbdevice.c 2.30 2010/03/06 11:07:05 kls Exp $ * $Id: dvbdevice.c 2.31 2010/03/06 15:19:17 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -576,7 +576,7 @@ void cDvbTuner::Action(void)
class cDvbSourceParam : public cSourceParam { class cDvbSourceParam : public cSourceParam {
private: private:
int param; int param;
cChannel data; int srate;
cDvbTransponderParameters dtp; cDvbTransponderParameters dtp;
public: public:
cDvbSourceParam(char Source, const char *Description); cDvbSourceParam(char Source, const char *Description);
@ -589,19 +589,19 @@ cDvbSourceParam::cDvbSourceParam(char Source, const char *Description)
:cSourceParam(Source, Description) :cSourceParam(Source, Description)
{ {
param = 0; param = 0;
srate = 0;
} }
void cDvbSourceParam::SetData(cChannel *Channel) void cDvbSourceParam::SetData(cChannel *Channel)
{ {
data = *Channel; srate = Channel->Srate();
dtp.Parse(data.Parameters()); dtp.Parse(Channel->Parameters());
param = 0; param = 0;
} }
void cDvbSourceParam::GetData(cChannel *Channel) void cDvbSourceParam::GetData(cChannel *Channel)
{ {
data.SetTransponderData(Channel->Source(), Channel->Frequency(), data.Srate(), dtp.ToString(Source()), true); Channel->SetTransponderData(Channel->Source(), Channel->Frequency(), srate, dtp.ToString(Source()), true);
*Channel = data;
} }
cOsdItem *cDvbSourceParam::GetOsdItem(void) cOsdItem *cDvbSourceParam::GetOsdItem(void)
@ -612,7 +612,7 @@ cOsdItem *cDvbSourceParam::GetOsdItem(void)
switch (param++) { switch (param++) {
case 0: ST(" S ") return new cMenuEditChrItem( tr("Polarization"), &dtp.polarization, "hvlr"); else return GetOsdItem(); case 0: ST(" S ") return new cMenuEditChrItem( tr("Polarization"), &dtp.polarization, "hvlr"); else return GetOsdItem();
case 1: ST(" S ") return new cMenuEditMapItem( tr("System"), &dtp.system, SystemValues); else return GetOsdItem(); case 1: ST(" S ") return new cMenuEditMapItem( tr("System"), &dtp.system, SystemValues); else return GetOsdItem();
case 2: ST(" CS ") return new cMenuEditIntItem( tr("Srate"), &data.srate); else return GetOsdItem(); case 2: ST(" CS ") return new cMenuEditIntItem( tr("Srate"), &srate); else return GetOsdItem();
case 3: ST("ACST") return new cMenuEditMapItem( tr("Inversion"), &dtp.inversion, InversionValues); else return GetOsdItem(); case 3: ST("ACST") return new cMenuEditMapItem( tr("Inversion"), &dtp.inversion, InversionValues); else return GetOsdItem();
case 4: ST(" CST") return new cMenuEditMapItem( tr("CoderateH"), &dtp.coderateH, CoderateValues); else return GetOsdItem(); case 4: ST(" CST") return new cMenuEditMapItem( tr("CoderateH"), &dtp.coderateH, CoderateValues); else return GetOsdItem();
case 5: ST(" T") return new cMenuEditMapItem( tr("CoderateL"), &dtp.coderateL, CoderateValues); else return GetOsdItem(); case 5: ST(" T") return new cMenuEditMapItem( tr("CoderateL"), &dtp.coderateL, CoderateValues); else return GetOsdItem();