mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

use ENABLE_PIP for pip code

Browse Source
This commit is contained in:
[CST] Focus
2013-03-05 18:34:47 +04:00
parent 57cdcd8379
commit cbfa6f88c5
7 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/channellist.cpp
View File

@@ -778,18 +778,16 @@ int CChannelList::show()
loop=false;
}
}
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
else if ( msg == CRCInput::RC_play) {
if(SameTP() && CRecordManager::getInstance()->GetRecordMode(chanlist[selected]->channel_id) == CRecordManager::RECMODE_OFF) {
if (CZapit::getInstance()->GetPipChannelID() == chanlist[selected]->getChannelID()) {
CZapit::getInstance()->StopPip();
paint();
} else {
if (CZapit::getInstance()->StartPip(chanlist[selected]->getChannelID()))
paint();
else
if (!CZapit::getInstance()->StartPip(chanlist[selected]->getChannelID()))
DisplayErrorMessage(g_Locale->getText(LOCALE_VIDEOMENU_PIP_ERROR));
}
paint();
}
}
#endif
@@ -1876,7 +1874,7 @@ void CChannelList::paintItem(int pos)
rec_icon = NEUTRINO_ICON_REC;
else if (rec_mode & CRecordManager::RECMODE_TSHIFT)
rec_icon = NEUTRINO_ICON_AUTO_SHIFT;
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
else if (chanlist[curr]->channel_id == CZapit::getInstance()->GetPipChannelID()) {
int h;
frameBuffer->getIconSize(NEUTRINO_ICON_PIP, &ChannelList_Rec, &h);

5
src/gui/pipsetup.cpp
View File

@@ -12,12 +12,13 @@
#include <global.h>
#include <neutrino.h>
#include <gui/pipsetup.h>
#include <video.h>
#define PERCENT 5
#define XMOVE 10
#define YMOVE 10
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
extern cVideo *pipDecoder;
@@ -216,4 +217,4 @@ void CPipSetup::paint()
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+5, y+mheight*4, mwidth, hpos, COL_MENUCONTENT);
}
#endif //BOXMODEL_APOLLO
#endif //#ifdef ENABLE_PIP

2
src/gui/scan.cpp
View File

@@ -200,7 +200,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
CRecordManager::getInstance()->StopAutoRecord();
g_Zapit->stopPlayBack();
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
CZapit::getInstance()->StopPip();
#endif

15
src/gui/videosettings.cpp
View File

@@ -54,7 +54,7 @@
#include <video.h>
extern cVideo *videoDecoder;
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
extern cVideo *pipDecoder;
#include <gui/pipsetup.h>
#endif
@@ -309,7 +309,8 @@ int CVideoSettings::showVideoSetup()
videosetup->addItem(bcont);
videosetup->addItem(ccont);
videosetup->addItem(scont);
#endif
#ifdef ENABLE_PIP
CPipSetup pip;
CMenuForwarder * pipsetup = new CMenuForwarder(LOCALE_VIDEOMENU_PIP, true, NULL, &pip);
pipsetup->setHint("", LOCALE_MENU_HINT_VIDEO_PIP);
@@ -344,7 +345,7 @@ void CVideoSettings::setVideoSettings()
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
#endif
videoDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
pipDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
#endif
@@ -355,6 +356,8 @@ void CVideoSettings::setVideoSettings()
changeNotify(LOCALE_VIDEOMENU_BRIGHTNESS, NULL);
changeNotify(LOCALE_VIDEOMENU_CONTRAST, NULL);
changeNotify(LOCALE_VIDEOMENU_SATURATION, NULL);
#endif
#ifdef ENABLE_PIP
pipDecoder->Pig(g_settings.pip_x, g_settings.pip_y, g_settings.pip_width, g_settings.pip_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
#endif
}
@@ -413,7 +416,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
if (g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2)
g_settings.video_Format = 3;
videoDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
pipDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
#endif
}
@@ -468,7 +471,7 @@ void CVideoSettings::next43Mode(void)
text = VIDEOMENU_43MODE_OPTIONS[curmode].value;
g_settings.video_43mode = VIDEOMENU_43MODE_OPTIONS[curmode].key;
videoDecoder->setAspectRatio(-1, g_settings.video_43mode);
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
pipDecoder->setAspectRatio(-1, g_settings.video_43mode);
#endif
ShowHintUTF(LOCALE_VIDEOMENU_43MODE, g_Locale->getText(text), 450, 2);
@@ -494,7 +497,7 @@ void CVideoSettings::SwitchFormat()
g_settings.video_Format = VIDEOMENU_VIDEOFORMAT_OPTIONS[curmode].key;
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
#ifdef BOXMODEL_APOLLO
#ifdef ENABLE_PIP
pipDecoder->setAspectRatio(g_settings.video_Format, -1);
#endif
ShowHintUTF(LOCALE_VIDEOMENU_VIDEOFORMAT, g_Locale->getText(text), 450, 2);