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

fix conflict

Browse Source
This commit is contained in:
[CST] Focus
2012-03-16 14:11:06 +04:00
parent b060b88605 e7f4a0a9cc
commit 68201bad9e
6 changed files with 81 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
data/cables.xml
View File

@@ -390,28 +390,42 @@
<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
</cable>
<cable name="FAKS" satfeed="true" flags="9">
<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="468000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="722000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="754000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="762000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="770000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable>
<cable name="WTC SN" satfeed="true" flags="9">
<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -447,6 +461,20 @@
<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable>
<cable name="Goeltzschtalbruecke" satfeed="true" flags="9">
<transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="242000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="250000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="258000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="266000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="274000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="282000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="290000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="298000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="346000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="354000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="362000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
@@ -463,22 +491,16 @@
<transponder frequency="450000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="458000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
<transponder frequency="466000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="498000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="674000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="690000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
<transponder frequency="698000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="714000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="722000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="738000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="506000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="514000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="538000" symbol_rate="6790000" fec_inner="0" modulation="3"/>
<transponder frequency="540000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
</cable>
<cable name="M-net Muenchen" satfeed="true" flags="9">
<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

2
src/gui/channellist.cpp
View File

@@ -146,7 +146,7 @@ void CChannelList::putChannel(CZapitChannel* channel)
{
int num = channel->number - 1;
if(num < 0) {
printf("CChannelList::addChannel error inserting at %d : %s\n", num, channel->name.c_str());
printf("%s error inserting at %d\n", __FUNCTION__, num);
return;
}
if(num >= (int) chanlist.size()) {

9
src/gui/infoviewer.cpp
View File

@@ -111,6 +111,7 @@ void CInfoViewer::Init()
newfreq = true;
chanready = 1;
fileplay = 0;
SDT_freq_update = false;
/* maybe we should not tie this to the blinkenlights settings? */
if (g_settings.casystem_display < 2)
@@ -1538,16 +1539,15 @@ void CInfoViewer::showSNR ()
return;
char percent[10];
uint16_t ssig, ssnr;
/* right now, infobar_show_channellogo == 3 is the trigger for signal bars etc.
TODO: decouple this */
if (! fileplay && ( g_settings.infobar_show_channellogo == 3 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6 )) {
int chanH = g_SignalFont->getHeight();
int freqStartY = BoxStartY + 2 * chanH - 3;
if (newfreq && chanready) {
if ((newfreq && chanready) || SDT_freq_update) {
char freq[20];
newfreq = false;
CZapitClient::CCurrentServiceInfo si = g_Zapit->getCurrentServiceInfo ();
std::string polarisation;
if (g_info.delivery_system == DVB_S)
@@ -1557,7 +1557,8 @@ void CInfoViewer::showSNR ()
snprintf (freq, sizeof(freq), "%d.%d MHz %s", si.tsfrequency / 1000, si.tsfrequency % 1000, polarisation.c_str());
int satNameWidth = g_SignalFont->getRenderWidth (freq);
g_SignalFont->RenderString (3 + BoxStartX + ((ChanWidth - satNameWidth) / 2), BoxStartY + 2 * chanH - 3, satNameWidth, freq, COL_INFOBAR);
g_SignalFont->RenderString (3 + BoxStartX + ((ChanWidth - satNameWidth) / 2), BoxStartY + 2 * chanH - 3, satNameWidth, freq, SDT_freq_update ? COL_COLORED_EVENTS_INFOBAR:COL_INFOBAR);
SDT_freq_update = false;
}
int sw, snr, sig, posx, posy;

1
src/gui/infoviewer.h
View File

@@ -186,6 +186,7 @@ class CInfoViewer
int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);
void clearVirtualZapMode() {virtual_zap_mode = false;}
void changePB();
bool SDT_freq_update;
};
class CInfoViewerHandler : public CMenuTarget

21
src/neutrino.cpp
View File

@@ -2861,6 +2861,11 @@ _repeat:
}
else if (msg == NeutrinoMessages::EVT_SERVICES_UPD) {
SDTreloadChannels = true;
g_InfoViewer->SDT_freq_update = true;
if( !g_InfoViewer->is_visible && !autoshift){
g_RCInput->postMsg(NeutrinoMessages::SHOW_INFOBAR , 0);
}
return messages_return::handled;
// ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_EXTRA_ZAPIT_SDT_CHANGED),
// CMessageBox::mbrBack,CMessageBox::mbBack, NEUTRINO_ICON_INFO);
}
@@ -2902,7 +2907,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg");
if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) {
saveEpg();
saveEpg(true);// true CVFD::MODE_SHUTDOWN
}
stop_daemons(true /*retcode*/);//need here for timer_is_rec before saveSetup
@@ -3043,18 +3048,26 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
}
}
void CNeutrinoApp::saveEpg()
void CNeutrinoApp::saveEpg(bool cvfd_mode)
{
struct stat my_stat;
if(stat(g_settings.epg_dir.c_str(), &my_stat) == 0){
printf("Saving EPG to %s....\n", g_settings.epg_dir.c_str());
const char *save_txt = "Saving EPG";
printf("%s to %s....\n",save_txt, g_settings.epg_dir.c_str());
neutrino_msg_t msg;
neutrino_msg_data_t data;
CVFD::getInstance()->Clear();
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
CVFD::getInstance ()->ShowText(save_txt);
g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str());
while( true ) {
g_RCInput->getMsg(&msg, &data, 1200); // 120 secs..
if (( msg == CRCInput::RC_timeout ) || (msg == NeutrinoMessages::EVT_SI_FINISHED)) {
//printf("Msg %x timeout %d EVT_SI_FINISHED %x\n", msg, CRCInput::RC_timeout, NeutrinoMessages::EVT_SI_FINISHED);
CVFD::getInstance()->Clear();
CVFD::getInstance()->setMode(cvfd_mode ? CVFD::MODE_SHUTDOWN : CVFD::MODE_STANDBY);// true CVFD::MODE_SHUTDOWN , false CVFD::MODE_STANDBY
break;
}
}
@@ -3351,7 +3364,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
if(!CRecordManager::getInstance()->RecordingStatus()) {
//only save epg when not recording
if(g_settings.epg_save) {
saveEpg();
saveEpg(false);//false CVFD::MODE_STANDBY
}
}

2
src/neutrino.h
View File

@@ -156,7 +156,7 @@ private:
void standbyMode( bool bOnOff );
void AudioMute( int newValue, bool isEvent= false );
void setvol(int vol);
void saveEpg();
void saveEpg(bool cvfd_mode);
void ExitRun(const bool write_si = true, int retcode = 0);
void RealRun(CMenuWidget &mainSettings);