diff options
| author | Johns <johns98@gmx.net> | 2012-05-13 16:58:45 +0200 |
|---|---|---|
| committer | Johns <johns98@gmx.net> | 2012-05-13 16:58:45 +0200 |
| commit | 43e70b6a3fea0112900507ddcbea43e34423ddd0 (patch) | |
| tree | 62205b0434cfef7abf8d77a881912d28b4e4a4ee /softhddevice.cpp | |
| parent | 541754a6190fe022f8e67b9ca08423c2e07db91d (diff) | |
| download | vdr-plugin-softhddevice-43e70b6a3fea0112900507ddcbea43e34423ddd0.tar.gz vdr-plugin-softhddevice-43e70b6a3fea0112900507ddcbea43e34423ddd0.tar.bz2 | |
Reduce errors during suspend mode.
Diffstat (limited to 'softhddevice.cpp')
| -rw-r--r-- | softhddevice.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/softhddevice.cpp b/softhddevice.cpp index 06b4f33..d5e69af 100644 --- a/softhddevice.cpp +++ b/softhddevice.cpp @@ -698,8 +698,8 @@ void cMenuSetupSoft::Create(void) audiodrift)); Add(new cMenuEditStraItem(tr("Audio pass-through"), &AudioPassthrough, 2, passthrough)); - Add(new cMenuEditBoolItem(tr("Enable AC-3 downmix"), &AudioDownmix, - trVDR("no"), trVDR("yes"))); + Add(new cMenuEditBoolItem(tr("Enable AC-3 (decoder) downmix"), + &AudioDownmix, trVDR("no"), trVDR("yes"))); Add(new cMenuEditBoolItem(tr("Volume control"), &AudioSoftvol, tr("Hardware"), tr("Software"))); Add(new cMenuEditBoolItem(tr("Enable normalize volume"), @@ -848,17 +848,15 @@ void cMenuSetupSoft::Store(void) if (Setup.VideoFormat != VideoFormat) { Setup.VideoFormat = VideoFormat; cDevice::PrimaryDevice()->SetVideoFormat(Setup.VideoFormat); - printf("video-format\n"); } - SetupStore("VideoFormat", Setup.VideoFormat); + //SetupStore("VideoFormat", Setup.VideoFormat); if (Setup.VideoDisplayFormat != VideoDisplayFormat) { Setup.VideoDisplayFormat = VideoDisplayFormat; cDevice:: PrimaryDevice()->SetVideoDisplayFormat(eVideoDisplayFormat (Setup.VideoDisplayFormat)); - printf("video-display-format\n"); } - SetupStore("VideoDisplayFormat", Setup.VideoDisplayFormat); + //SetupStore("VideoDisplayFormat", Setup.VideoDisplayFormat); ConfigVideoBackground = Background << 8 | (BackgroundAlpha & 0xFF); SetupStore("Background", ConfigVideoBackground); @@ -1686,6 +1684,10 @@ uchar *cSoftHdDevice::GrabImage(int &size, bool jpeg, int quality, int width, dsyslog("[softhddev]%s: %d, %d, %d, %dx%d\n", __FUNCTION__, size, jpeg, quality, width, height); + if (SuspendMode != NOT_SUSPENDED) { + return NULL; + } + return::GrabImage(&size, jpeg, quality, width, height); } @@ -2094,6 +2096,10 @@ bool cPluginSoftHdDevice::Service(const char *id, void *data) return true; } + if (SuspendMode != NOT_SUSPENDED) { + return false; + } + SoftHDDevice_AtmoGrabService_v1_0_t *r = (SoftHDDevice_AtmoGrabService_v1_0_t *) data; if (r->structSize != sizeof(SoftHDDevice_AtmoGrabService_v1_0_t) |