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

Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into valgrind

Browse Source
This commit is contained in:
[CST] Focus
2012-05-03 16:03:18 +04:00
parent 02492c44a0 6248f11807
commit 0d09cd0ad4
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/satellites.xml
View File

@@ -1406,6 +1406,7 @@
<transponder frequency="11508000" symbol_rate="27500000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11508000" symbol_rate="27500000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11526000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/> <transponder frequency="11526000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="11541000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11541000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11564000" symbol_rate="27500000" polarization="0" fec_inner="4" system="1" modulation="1"/>
<transponder frequency="11566000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/> <transponder frequency="11566000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="11585000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/> <transponder frequency="11585000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="11604000" symbol_rate="27500000" polarization="0" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11604000" symbol_rate="27500000" polarization="0" fec_inner="4" system="0" modulation="1"/>
@@ -1575,18 +1576,23 @@
<transponder frequency="11243000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11243000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11302000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/> <transponder frequency="11302000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11317000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11317000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11347000" symbol_rate="22000000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11361000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/> <transponder frequency="11361000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11376000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11376000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11420000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11420000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11435000" symbol_rate="22000000" polarization="1" fec_inner="2" system="1" modulation="2"/> <transponder frequency="11435000" symbol_rate="22000000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11464000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/> <transponder frequency="11464000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11479000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11479000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11493000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11508000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11508000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11523000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11538000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11538000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11567000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11567000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11582000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11597000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11597000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11611000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11611000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11626000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11626000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11641000" symbol_rate="22000000" polarization="0" fec_inner="3" system="1" modulation="2"/>
<transponder frequency="11670000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/> <transponder frequency="11670000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11685000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/> <transponder frequency="11685000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11719000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/> <transponder frequency="11719000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
@@ -1616,7 +1622,7 @@
<transponder frequency="12187000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/> <transponder frequency="12187000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12207000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/> <transponder frequency="12207000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="12226000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/> <transponder frequency="12226000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12246000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/> <transponder frequency="12246000" symbol_rate="29700000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="12265000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/> <transponder frequency="12265000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12285000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/> <transponder frequency="12285000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12304000" symbol_rate="27500000" polarization="0" fec_inner="9" system="1" modulation="1"/> <transponder frequency="12304000" symbol_rate="27500000" polarization="0" fec_inner="9" system="1" modulation="1"/>

2
src/gui/moviebrowser.cpp
View File

@@ -2575,7 +2575,7 @@ bool CMovieBrowser::delFile_std(CFile& file)
{ {
bool result = true; bool result = true;
char buf[FILENAME_MAX]={0}; char buf[FILENAME_MAX]={0};
snprintf(buf,sizeof(buf), "nice -n 20 rm -f %s &", file.Name.c_str()); snprintf(buf,sizeof(buf), "nice -n 20 rm -f \"%s\" &", file.Name.c_str());
system(buf); system(buf);
TRACE(" delete file: %s\r\n",file.Name.c_str()); TRACE(" delete file: %s\r\n",file.Name.c_str());
return(result); return(result);

5
src/gui/pictureviewer.cpp
View File

@@ -430,7 +430,9 @@ int CPictureViewerGui::show()
} }
else if (msg==CRCInput::RC_blue) else if (msg==CRCInput::RC_blue)
{ {
if ((m_state == MENU) && (!playlist.empty())) if(!playlist.empty())
{
if (m_state == MENU)
{ {
m_time=(long)time(NULL); m_time=(long)time(NULL);
view(selected); view(selected);
@@ -442,6 +444,7 @@ int CPictureViewerGui::show()
m_state = SLIDESHOW; m_state = SLIDESHOW;
} }
} }
}
else if (msg==CRCInput::RC_help) else if (msg==CRCInput::RC_help)
{ {
if (m_state == MENU) if (m_state == MENU)