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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Lightly tested only...
This commit is contained in:
Stefan Seyfried
2013-12-25 22:51:23 +01:00
parent 164ab9ab42 bc8b81a190
commit cdd065fc2e
90 changed files with 1583 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -1095,6 +1095,11 @@ void CControlAPI::GetBouquetsCGI(CyhookHandler *hh) {
fav = true;
int mode = NeutrinoAPI->Zapit->getMode();
if (hh->ParamList["mode"].compare("TV") == 0)
mode = CZapitClient::MODE_TV;
else if (hh->ParamList["mode"].compare("RADIO") == 0)
mode = CZapitClient::MODE_RADIO;
std::string bouquet;
for (int i = 0, size = (int) g_bouquetManager->Bouquets.size(); i < size; i++) {
std::string item = "";

1
src/nhttpd/web/Y_Blocks.txt
View File

@@ -73,7 +73,6 @@ start-block~video_audio_save_settings
{=ini-set:/var/tuxbox/config/neutrino.conf;audio_left_right_selectable;{=audio_left_right_selectable=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;audio_avs_Control;{=h_audio_avs_Control=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;audio_DolbyDigital;{=audio_DolbyDigital=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;audio_PCMOffset;{=audio_PCMOffset=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;audio_step;{=audio_step=}~save=}
{=ini-set:/var/tuxbox/config/controld.conf;vcroutput;{=h_vcroutput=}~open=}
{=ini-set:/var/tuxbox/config/controld.conf;videooutput;{=h_videooutput=}~save=}

7
src/nhttpd/web/Y_Settings_video_audio.yhtm
View File

@@ -33,8 +33,6 @@ function do_init()
obj_set_radio_value('audio_DolbyDigital', "{=ini-get:/var/tuxbox/config/neutrino.conf;audio_DolbyDigital;false~cache=}");
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;audio_avs_Control;1~cache=}";
document.f.audio_avs_Control.selectedIndex = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;audio_PCMOffset;0~cache=}"
document.f.audio_PCMOffset.value = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;audio_step;5~cache=}"
document.f.audio_step.value = val;
}
@@ -165,11 +163,6 @@ function do_submit()
<input type="hidden" name="h_audio_avs_Control"/>(*)
</td>
</tr>
<tr><td>Lautst&auml;rkeabsenkung PCM</td>
<td>
<input type="text" name="audio_PCMOffset" size="2" maxlength="2" title="pcm offset"/>
</td>
</tr>
<tr><td>Lautst&auml;rke Schrittweite</td>
<td>
<input type="text" name="audio_step" size="2" maxlength="2" title="audio step"/>