diff options
| -rw-r--r-- | control-image.c | 213 | ||||
| -rw-r--r-- | control-image.h | 7 | ||||
| -rw-r--r-- | data.c | 7 | ||||
| -rw-r--r-- | i18n.c | 2 | ||||
| -rw-r--r-- | image.h | 21 | ||||
| -rw-r--r-- | liboutput/stillimage-player.c | 18 | ||||
| -rw-r--r-- | liboutput/stillimage-player.h | 1 | ||||
| -rw-r--r-- | liboutput/stillimage.c | 18 | ||||
| -rw-r--r-- | liboutput/stillimage.h | 2 | ||||
| -rw-r--r-- | menu-commands.c | 9 | ||||
| -rw-r--r-- | menu-commands.h | 4 | ||||
| -rw-r--r-- | player-image.c | 6 | ||||
| -rw-r--r-- | setup-image.c | 23 | ||||
| -rw-r--r-- | setup-image.h | 6 |
14 files changed, 19 insertions, 318 deletions
diff --git a/control-image.c b/control-image.c index fa7925c..294dfd0 100644 --- a/control-image.c +++ b/control-image.c @@ -35,35 +35,6 @@ #include <vdr/plugin.h> -#if VDRVERSNUM < 10307 -// --- cProgressBar ------------------------------------------------------------ -class cProgressBar:public cBitmap { - public: - cProgressBar(int nWidth, int nHeight, int nProgressBegin, int nProgressEnd, int nProgressRange) - :cBitmap(nWidth, nHeight,2) - { - if(nProgressRange > 0) - { - if(nProgressBegin>0) - { - int b = nProgressBegin * width / nProgressRange; - int p = nProgressEnd * width / nProgressRange; - Fill(0, 0, b, nHeight - 1, clrWhite); - Fill(b + 1, 0, p, nHeight - 1, clrGreen); - Fill(p + 1, 0, nHeight - 1, nHeight - 1, clrWhite); - } - else - { - int p = nProgressEnd * width / nProgressRange; - Fill(0, 0, p, nHeight - 1, clrGreen); - Fill(p + 1, 0, nWidth - 1, nHeight - 1, clrWhite); - } - } - } -}; -#endif - - // --- cImageControl --------------------------------------------------------- char* cImageControl::m_szLastShowStatusMsg = 0; @@ -85,9 +56,7 @@ void cImageControl::SetSlideShow(cSlideShow * pNewSlideShow) cImageControl::cImageControl(cSlideShow * pNewSlideShow) : cControl(player = new cImagePlayer(pNewSlideShow)) , m_pImageMenu(NULL) -#if VDRVERSNUM >= 10307 , m_pDisplayReplay(NULL) -#endif { // Notity all cStatusMonitor cStatus::MsgReplaying(this, "[image]"); @@ -121,12 +90,10 @@ cImageControl::~cImageControl() cStatus::MsgReplaying(this, NULL); // Hide OSD HideOSD(); -#if VDRVERSNUM >= 10307 if(m_pDisplayReplay) { delete m_pDisplayReplay; m_pDisplayReplay = NULL; } -#endif // Stop Playback Stop(); if(player) @@ -165,14 +132,10 @@ void cImageControl::ShowOSD() void cImageControl::HideOSD(void) { if(eDisplayNothing != m_eOSDStatusIsOpen) { -#if VDRVERSNUM < 10307 - Interface->Close(); -#else if(m_pDisplayReplay) { delete m_pDisplayReplay; m_pDisplayReplay = NULL; } -#endif m_eOSDStatusIsOpen = eDisplayNothing; } @@ -219,21 +182,11 @@ void cImageControl::ShowMode(void) { if(eDisplayModeOnly != m_eOSDStatusIsOpen) { -#if VDRVERSNUM < 10307 - Interface->Open(0, -1); -#else m_pDisplayReplay = Skins.Current()->DisplayReplay(m_eOSDStatusVisable==eDisplayModeOnly); -#endif m_eOSDStatusIsOpen = eDisplayModeOnly; } -#if VDRVERSNUM < 10307 - bool bFixFont = false; - int nMaxCharacter = Interface->Width(); //Get OSD-Display width -#else int nMaxCharacter = m_pDisplayReplay->EditableWidth(); //FIXME Get OSD-Display width -#endif - char *sz = MALLOC(char, nMaxCharacter + 1); if(IsConvertRunning()) // Display that convert is running @@ -248,19 +201,12 @@ void cImageControl::ShowMode(void) default: case ePlayModeNormal: { -#if VDRVERSNUM < 10307 - if(m_bSlideShowActiv) - { strn0cpy(sz, " > ", nMaxCharacter); bFixFont = true; } - else - { strn0cpy(sz, " || ", nMaxCharacter); bFixFont = true; } -#else // Get the current activ filename const char* szFileName = FileName(); if(!szFileName) return; snprintf(sz, nMaxCharacter, "%s", szFileName); -#endif - break; + break; } // Display jumpmode playstatus case ePlayModeJump: @@ -276,39 +222,12 @@ void cImageControl::ShowMode(void) } } -#if VDRVERSNUM < 10307 - if(bFixFont) { - eDvbFont OldFont; - OldFont = Interface->SetFont(fontFix); - DisplayAtBottom(sz); - Interface->SetFont(OldFont); - } - else { - DisplayAtBottom(sz); - } -#else m_pDisplayReplay->SetMode(m_ePlayMode == ePlayModeNormal && m_bSlideShowActiv, true, 1); if(m_eOSDStatusVisable!=eDisplayModeOnly) m_pDisplayReplay->SetTitle(sz); -#endif free(sz); } -#if VDRVERSNUM < 10307 -void cImageControl::DisplayAtBottom(const char *s) -{ - const int p = (eDisplayModeOnly == m_eOSDStatusVisable) ? 0 : 2;// ???? Unused - if(s) { - const int d = std::max(Width() - cOsd::WidthInCells(s), 0) / 2; - if(eDisplayModeOnly == m_eOSDStatusVisable) - Interface->Fill(0, p, Interface->Width(), 1, clrTransparent); - Interface->Write(d, p, s); - } - else - Interface->Fill(12, p, Width() - 22, 1, clrBackground); -} -#endif - void cImageControl::ShowProgress(void) { // Get the current activ filename @@ -318,21 +237,12 @@ void cImageControl::ShowProgress(void) if(eDisplayProgress != m_eOSDStatusIsOpen) { HideOSD(); -#if VDRVERSNUM < 10307 - Interface->Open(Setup.OSDwidth, -3); -#else m_pDisplayReplay = Skins.Current()->DisplayReplay(m_eOSDStatusVisable==eDisplayModeOnly); m_pDisplayReplay->SetMarks(&m_Marks); -#endif m_eOSDStatusIsOpen = eDisplayProgress; } -#if VDRVERSNUM < 10307 - Interface->Clear(); - int nMaxCharacter = Interface->Width(); //Get OSD-Display width -#else int nMaxCharacter = m_pDisplayReplay->EditableWidth(); //FIXME Get OSD-Display width -#endif //******************************************************************** // build first Line char *sz = MALLOC(char, nMaxCharacter + 1); @@ -343,17 +253,6 @@ void cImageControl::ShowProgress(void) } else { -#if VDRVERSNUM < 10307 - int n = strlen(szFileName); - if(n > nMaxCharacter) { //Clip long filenames - n = n - Width() + 4; - if(n < 0) n = 0; - snprintf(sz, nMaxCharacter, "... %s", szFileName + n); - } - else { - snprintf(sz, nMaxCharacter, "%s", szFileName); - } -#else switch(m_ePlayMode) { case ePlayModeJump: snprintf(sz, nMaxCharacter, "%s", @@ -369,34 +268,12 @@ void cImageControl::ShowProgress(void) snprintf(sz, nMaxCharacter, "%s", szFileName); break; } -#endif } -#if VDRVERSNUM < 10307 - Interface->Write(0, 0, sz); -#else m_pDisplayReplay->SetTitle(sz); -#endif //******************************************************************** // show on second line the progressbar -#if VDRVERSNUM < 10307 - { - int nProgressBegin = 0; - int nProgressEnd = ImageCurrent(); - int nProgressRange = ImageTotal(); - - if(ePlayModeJump == m_ePlayMode) // Show on Jump mode only the selected Range - { - nProgressBegin = std::max(0, nProgressEnd - 1); - nProgressEnd = std::min(nProgressBegin + 9,nProgressRange); - } - - cProgressBar ProgressBar(Width() * cOsd::CellWidth(), - cOsd::LineHeight(), nProgressBegin, nProgressEnd, nProgressRange); - Interface->SetBitmap(0, cOsd::LineHeight(), ProgressBar); - } -#else m_pDisplayReplay->SetProgress(ImageCurrent(), ImageTotal()); snprintf(sz, nMaxCharacter, "%3d", ImageCurrent()); @@ -406,96 +283,8 @@ void cImageControl::ShowProgress(void) std::min(ImageCurrent()+9,ImageTotal()) :ImageTotal()); m_pDisplayReplay->SetTotal(sz); - // Remember to me : SetTotal/SetCurrent need clean Screen if changed stringformat -#endif - -#if VDRVERSNUM < 10307 - //******************************************************************** - // show on third line a more information - switch(m_ePlayMode) - { - case ePlayModeJump: - { - snprintf(sz, nMaxCharacter, "%s", - tr("Select picture via key 1..9!")); - // center the Message - const int d = std::max(Width() - cOsd::WidthInCells(sz),0) / 2; - Interface->Write(d, 2,sz); - break; - } - case ePlayModeZoom: - { - snprintf(sz, nMaxCharacter, "%s: %dx (%dx%d)",tr("Zoom"), - m_nZoomFactor, - m_nRealImageWidth * m_nZoomFactor, - m_nRealImageHeight * m_nZoomFactor); - // center the Message - const int d = std::max(Width() - cOsd::WidthInCells(sz),0) / 2; - Interface->Write(d, 2,sz); - break; - } - case ePlayModeNormal: - { - char szSlideShowInfo[32]; - szSlideShowInfo[0] = '\0'; - - if(m_bSlideShowActiv && !IsConvertRunning()) - { - int t = time(NULL) - m_tStarted + 1; - snprintf(szSlideShowInfo, sizeof(szSlideShowInfo), " | %d/%d", - t, ImageSetup.m_nSSsec); - } - snprintf(sz,nMaxCharacter, "(%3d/%3d)%s", - ImageCurrent(), ImageTotal(), szSlideShowInfo); - Interface->Write(0, 2, sz); - - if(ImageSetup.m_bShowDate && !IsConvertRunning()) - { - struct stat stFile; - if(0 != stat(szFileName, &stFile)) { - char szErr[128]; - int nErr = errno; - szErr[sizeof(szErr)-1] = '\0'; - if(0 != strerror_r(nErr,szErr,sizeof(szErr)-1)) { - szErr[0] = '\0'; - } - esyslog("imageplugin: can't get filestate %s (%d)%s.\n",szFileName,nErr,szErr); - } - else - { - struct tm *timestr; - if((timestr = localtime(&(stFile.st_mtime)))) - { - snprintf(sz,nMaxCharacter, - "(%2.2d.%2.2d.%2.2d-%2.2d:%2.2d)", - (int)timestr->tm_mday, - (int)timestr->tm_mon + 1, - (int)timestr->tm_year % 100, - (int)timestr->tm_hour, - (int)timestr->tm_min); - - Interface->Write(nMaxCharacter - strlen(sz), 2, sz); - } - else { - char szErr[128]; - int nErr = errno; - szErr[sizeof(szErr)-1] = '\0'; - if(0 != strerror_r(nErr,szErr,sizeof(szErr)-1)) { - szErr[0] = '\0'; - } - esyslog("imageplugin: can't get mtime from %s (%d)%s.\n",szFileName,nErr,szErr); - } - } - } - } - } -#endif -#if VDRVERSNUM < 10307 - Interface->Flush(); -#else m_pDisplayReplay->Flush(); -#endif free(sz); } diff --git a/control-image.h b/control-image.h index fad7332..69ab0af 100644 --- a/control-image.h +++ b/control-image.h @@ -26,9 +26,7 @@ #define ___DVB_IMAGE_CONTROL_H #include <vdr/player.h> -#if VDRVERSNUM >= 10307 #include <vdr/osdbase.h> -#endif #define memberof(x) (sizeof(x)/sizeof(*x)) @@ -65,12 +63,10 @@ class cImageControl time_t m_tStarted; /** Last Message for Statusmonitor */ static char* m_szLastShowStatusMsg; -#if VDRVERSNUM >= 10307 /** Display replayprogress*/ cSkinDisplayReplay *m_pDisplayReplay; /** Faked Marks for Images*/ cMarks m_Marks; -#endif /** zoom factor on zoom mode */ int m_nZoomFactor; @@ -103,9 +99,6 @@ private: void ShowOSD(void); void HideOSD(void); void ShowMode(void); -#if VDRVERSNUM < 10307 - void DisplayAtBottom(const char *s); -#endif void ShowProgress(void); /** Send Message if changed to any statusmonitor */ void ShowStatusMsg(); @@ -1,6 +1,7 @@ /* * Image plugin to VDR (C++) * + * (C) 2004-2005 Andreas Brachold <vdr04-at-deltab.de> * (C) 2003 Kai Tobias Burwieck <kai@burwieck.net> * * based on MP3/MPlayer plugin to VDR (C++) @@ -215,18 +216,12 @@ bool cScanDir::ScanDir(cFileSource * src, const char *subdir, eScanType type, QuoteString(dir), tc, s?s:"", e?e:"", recursiv?"":"-maxdepth 1"); #endif //fprintf(stderr,"%s\n",cmd); -#if VDRVERSNUM >= 10318 cReadLine l; -#endif FILE *p = popen(cmd, "r"); if(p) { int len = strlen(dir); char *s; -#if VDRVERSNUM >= 10318 while((s = l.Read(p)) != 0) { -#else - while((s = readline(p)) != 0) { -#endif char *ss = strstr(s, dir); if(ss) { s = ss + len; @@ -483,7 +483,6 @@ const tI18nPhrase Phrases[] = { "", // TODO "", // TODO }, -#if VDRVERSNUM >= 10308 { "Live Audio from primary Device", "Live Audio vom primären Gerät", "", // TODO @@ -501,7 +500,6 @@ const tI18nPhrase Phrases[] = { "", // TODO "", // TODO }, -#endif { "Convert...", "Wandle...", "", // TODO @@ -1,7 +1,7 @@ /* * Image plugin to VDR (C++) * - * (C) 2004 Andreas Brachold <vdr04-at-deltab.de> + * (C) 2004-2005 Andreas Brachold <vdr04-at-deltab.de> * * This code is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,34 +23,25 @@ #define ___IMAGE_H #include <vdr/config.h> -#if VDRVERSNUM < 10307 -#include <vdr/osd.h> -#else #include <vdr/osdbase.h> #include <vdr/skins.h> -#endif #include <string.h> +#if VDRVERSNUM < 10328 + #error "For compiled are at the least VDR 1.3.28 required" +#endif + + inline void OSD_InfoMsg(const char* sz) { -#if VDRVERSNUM < 10307 - Interface->Info(sz); - Interface->Flush(); -#else Skins.Message(mtInfo,sz); Skins.Flush(); -#endif } inline void OSD_ErrorMsg(const char* sz) { -#if VDRVERSNUM < 10307 - Interface->Error(sz); - Interface->Flush(); -#else Skins.Message(mtError,sz); Skins.Flush(); -#endif } inline void OSD_ErrorNumMsg(int err, const char* szDef) diff --git a/liboutput/stillimage-player.c b/liboutput/stillimage-player.c index 947157e..f15ef8f 100644 --- a/liboutput/stillimage-player.c +++ b/liboutput/stillimage-player.c @@ -1,6 +1,6 @@ /*************************************************************************** * stillimage-player.c - * (C) Copyright 2004 Andreas Brachold <vdr04-at-deltab.de> + * (C) Copyright 2004-2005 Andreas Brachold <vdr04-at-deltab.de> * Created: Thu Aug 5 2004 * ****************************************************************************/ @@ -26,7 +26,6 @@ cStillImagePlayer::cStillImagePlayer(ePlayMode PlayMode) : cPlayer(PlayMode) - , m_bActive(false) , m_StillImage(this) { } @@ -36,23 +35,16 @@ cStillImagePlayer::~cStillImagePlayer() Detach(); } -void cStillImagePlayer::Activate(bool On) { - if (On) { - m_bActive=m_StillImage.Init(); +void cStillImagePlayer::Activate(bool bOn) { + if (bOn) { + m_StillImage.Start(); } else { - if (m_bActive) { - m_StillImage.Stop(); - m_bActive=false; - } + m_StillImage.Stop(); } } void cStillImagePlayer::Play(const uchar *Data, int Length) { -#if VDRVERSNUM < 10318 - PlayVideo(Data, Length); -#else PlayPes(Data, Length,true); -#endif } bool cStillImagePlayer::Wait() { diff --git a/liboutput/stillimage-player.h b/liboutput/stillimage-player.h index b3aa712..c0aa632 100644 --- a/liboutput/stillimage-player.h +++ b/liboutput/stillimage-player.h @@ -32,7 +32,6 @@ class cStillImagePlayer : public cPlayer { friend class cStillImage; - bool m_bActive; protected: cStillImage m_StillImage; public: diff --git a/liboutput/stillimage.c b/liboutput/stillimage.c index 12bd902..a83306d 100644 --- a/liboutput/stillimage.c +++ b/liboutput/stillimage.c @@ -34,7 +34,6 @@ cStillImage::cStillImage(cStillImagePlayer *pl) { - m_bThreadRun=false; m_bEncodeRequired = false; player=pl; } @@ -44,30 +43,20 @@ cStillImage::~cStillImage() } -bool cStillImage::Init() -{ - return Start(); -} - void cStillImage::Stop() { - if (!m_bThreadRun) - return; - m_bThreadRun=false; - Cancel(3); } void cStillImage::Action(void) { - m_bThreadRun=true; bool bMPEGValid = false; bool bQueueEmpty = false; bool bFreeze = true; unsigned int nFrame = 0,nFrameOff=0; int nMircoSekWait; - while (m_bThreadRun) { + while (Running()) { nMircoSekWait = 10000; bQueueEmpty = player->Worker(false); @@ -89,7 +78,7 @@ void cStillImage::Action(void) bMPEGValid = Encode(); Unlock(); - if (!m_bThreadRun) + if (!Running()) break; m_bEncodeRequired = false; nFrame = 0; @@ -145,13 +134,12 @@ void cStillImage::Action(void) nMircoSekWait = (1000000/(GetFrameRate()*4)); // Wait duration off 1/4 frame - if (!m_bThreadRun) + if (!Running()) break; } //Reduce CPU load!!! usleep(max(10000,nMircoSekWait)); } - m_bThreadRun=false; } diff --git a/liboutput/stillimage.h b/liboutput/stillimage.h index 453692c..eb6428b 100644 --- a/liboutput/stillimage.h +++ b/liboutput/stillimage.h @@ -35,7 +35,6 @@ class cStillImage , public cEncode { cStillImagePlayer *player; - volatile bool m_bThreadRun; volatile bool m_bEncodeRequired; protected: virtual void Action(void); @@ -45,7 +44,6 @@ public: cStillImage(cStillImagePlayer *); virtual ~cStillImage(); - bool Init(); void Stop(); bool EncodeRequired() const {return m_bEncodeRequired;} void EncodeRequired(bool b) {m_bEncodeRequired = b;} diff --git a/menu-commands.c b/menu-commands.c index 8aaaaec..0200082 100644 --- a/menu-commands.c +++ b/menu-commands.c @@ -1,7 +1,7 @@ /* * Image plugin to VDR (C++) * - * (C) 2004 Andreas Brachold <vdr04-at-deltab.de> + * (C) 2004-2005 Andreas Brachold <vdr04-at-deltab.de> * * This code is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -115,16 +115,12 @@ cImageMenuResult::cImageMenuResult(const char *szTitle, const char *szText, eDvb : cOsdMenu(szTitle) , m_szText(szText) { -#if VDRVERSNUM < 10307 - Add(new cMenuTextItem(szText, 1, 2, Setup.OSDwidth - 2, MAXOSDITEMS, clrWhite, clrBackground, Font)); -#endif SetHelp(NULL, NULL, NULL, tr("Back")); } eOSState cImageMenuResult::ProcessKey(eKeys nKey) { -#if VDRVERSNUM >= 10307 switch (nKey) { case kUp|k_Repeat: case kUp: @@ -138,7 +134,6 @@ eOSState cImageMenuResult::ProcessKey(eKeys nKey) return osContinue; default: break; } -#endif eOSState nState = cOsdMenu::ProcessKey(nKey); if (nState == osUnknown) { @@ -154,10 +149,8 @@ eOSState cImageMenuResult::ProcessKey(eKeys nKey) return nState; } -#if VDRVERSNUM >= 10307 void cImageMenuResult::Display(void) { cOsdMenu::Display(); DisplayMenu()->SetText(m_szText, true); } -#endif diff --git a/menu-commands.h b/menu-commands.h index 07b7c33..9796fcb 100644 --- a/menu-commands.h +++ b/menu-commands.h @@ -1,7 +1,7 @@ /* * Image plugin to VDR (C++) * - * (C) 2004 Andreas Brachold <vdr04-at-deltab.de> + * (C) 2004-2005 Andreas Brachold <vdr04-at-deltab.de> * * This code is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -48,9 +48,7 @@ class cImageMenuResult : public cOsdMenu { const char *m_szText; protected: -#if VDRVERSNUM >= 10307 virtual void Display(void); -#endif public: cImageMenuResult(const char *Title, const char *Text, eDvbFont Font = fontOsd); virtual eOSState ProcessKey(eKeys Key); diff --git a/player-image.c b/player-image.c index 6ab4bb5..e738c28 100644 --- a/player-image.c +++ b/player-image.c @@ -50,11 +50,7 @@ const char *g_szConvertScript = "imageplugin.sh"; cImagePlayer::cImagePlayer(cSlideShow *pCurSlideShow) : cStillImagePlayer( -#if VDRVERSNUM >= 10308 - (ImageSetup.m_bLiveAudio != 0)?pmVideoOnly: -#endif - pmAudioVideo - ) + (ImageSetup.m_bLiveAudio != 0)?pmVideoOnly:pmAudioVideo) , m_bConvertRunning(false) , m_szError(NULL) { diff --git a/setup-image.c b/setup-image.c index 4f523b1..b57e62c 100644 --- a/setup-image.c +++ b/setup-image.c @@ -52,14 +52,9 @@ cImageSetup::cImageSetup(void) m_bSlideShow = 0; m_nSSsec = 10; strncpy(m_szTempDir, "/tmp/image", sizeof(m_szTempDir)); -#if VDRVERSNUM < 10307 - m_bShowDate = 1; -#endif m_bAutoRepeat = 0; m_bShowNumbers = 1; -#if VDRVERSNUM >= 10308 m_bLiveAudio = 0; -#endif m_bHousekeeping = 1; m_nBorderHeight = 16; @@ -81,14 +76,9 @@ bool cImageSetup::SetupParse(const char *szName, const char *szValue) else ParseInteger("SSsec", m_nSSsec,m_cSSMin,m_cSSMax) else ParseInteger("BorderHeight", m_nBorderHeight,m_cnMinBorderHeight,m_cnMaxBorderHeight) else ParseInteger("BorderWidth", m_nBorderWidth,m_cnMinBorderWidth,m_cnMaxBorderWidth) -#if VDRVERSNUM < 10307 - else ParseInteger("ShowDate", m_bShowDate,0,1) -#endif else ParseInteger("AutoRepeat", m_bAutoRepeat,0,1) else ParseInteger("ShowNumbers", m_bShowNumbers,0,1) -#if VDRVERSNUM >= 10308 else ParseInteger("LiveAudio", m_bLiveAudio,0,1) -#endif else ParseInteger("Housekeeping", m_bHousekeeping,0,1) else if(!strcasecmp(szName, "TempDir")) { strn0cpy(m_szTempDir,szValue,sizeof(m_szTempDir)); @@ -104,14 +94,9 @@ void cMenuSetupImage::Store(void) SetupStore("SlideShow", ImageSetup.m_bSlideShow); SetupStore("SSsec", ImageSetup.m_nSSsec); SetupStore("TempDir", ImageSetup.m_szTempDir); -#if VDRVERSNUM < 10307 - SetupStore("ShowDate", ImageSetup.m_bShowDate); -#endif SetupStore("AutoRepeat", ImageSetup.m_bAutoRepeat); SetupStore("ShowNumbers", ImageSetup.m_bShowNumbers); -#if VDRVERSNUM >= 10308 SetupStore("LiveAudio", ImageSetup.m_bLiveAudio); -#endif SetupStore("Housekeeping", ImageSetup.m_bHousekeeping); SetupStore("BorderHeight", ImageSetup.m_nBorderHeight); SetupStore("BorderWidth", ImageSetup.m_nBorderWidth); @@ -134,21 +119,13 @@ cMenuSetupImage::cMenuSetupImage(void) &m_tmpSetup.m_bAutoRepeat, tr("no"), tr("yes"))); -#if VDRVERSNUM < 10307 - Add(new cMenuEditBoolItem(tr("Show Filedate on OSD"), - &m_tmpSetup.m_bShowDate, - tr("no"), tr("yes"))); -#endif - Add(new cMenuEditBoolItem(tr("Show Numbers on index image"), &m_tmpSetup.m_bShowNumbers, tr("no"), tr("yes"))); -#if VDRVERSNUM >= 10308 Add(new cMenuEditBoolItem(tr("Live Audio from primary Device"), &m_tmpSetup.m_bLiveAudio, tr("no"), tr("yes"))); -#endif Add(new cMenuEditStrItem (tr("Directory with temporary files"), m_tmpSetup.m_szTempDir,sizeof(m_tmpSetup.m_szTempDir), diff --git a/setup-image.h b/setup-image.h index 7878fc6..47ae885 100644 --- a/setup-image.h +++ b/setup-image.h @@ -40,18 +40,12 @@ public: int m_nSSsec; /* Where stored temp. files */ char m_szTempDir[MAX_PATH]; -#if VDRVERSNUM < 10307 - /* Should show file date on OSD */ - int m_bShowDate; -#endif /* Should slideshow automated repeat */ int m_bAutoRepeat; /* Should show overlay numbers on indexdump */ int m_bShowNumbers; -#if VDRVERSNUM >= 10308 /* Don't mute audio, on show images */ int m_bLiveAudio; -#endif /* Activate own house keeping system for temp. files, avoid pregenerated images */ int m_bHousekeeping; |