[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-541-g3b19f1b

[GetAway <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  3b19f1bdf4736b1d9a711d7be2e789eda67cbbac (commit)
      from  6ac05e3530827615f677f9c0e1d867e559a0fcb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b19f1bdf4736b1d9a711d7be2e789eda67cbbac
Author: GetAway <get...@t-...>
Date:   Tue May 5 21:35:22 2015 +0200

    yWeb Live: move selection of apid to neutrinoyparser
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
index f38a1af..0378b0e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -530,9 +530,13 @@ std::string  CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler */*
 	std::string yresult;
 	static bool init_iso=true;
 	bool idx_as_id=true;
+	unsigned int selected_apid = 0;
 	
 	if(para == "apid") 
 		idx_as_id=false;
+	else if (!para.empty()) {
+		sscanf(para.c_str(), "audio=%i:", &selected_apid);
+	}
 	if(init_iso)
 	{
 		if(initialize_iso639_map())
@@ -559,8 +563,9 @@ std::string  CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler */*
 				{
  					if(!tags[i].component.empty())
 					{
-						yresult += string_printf("<option value=%05u>%s%s</option>\r\n",
+						yresult += string_printf("<option value=%05u %s>%s%s</option>\r\n",
 							idx_as_id ? j : pids.APIDs[j].pid,
+							(j==selected_apid) ? "selected=\"selected\"" : "",
 							encodeString(tags[i].component).c_str(),
 							pids.APIDs[j].is_ac3 && tags[i].component.find("AC3") == std::string::npos ? " (AC3)": "");
 						eit_not_ok = false;
@@ -576,8 +581,9 @@ std::string  CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler */*
 					strncpy( pids.APIDs[j].desc, getISO639Description( pids.APIDs[j].desc ), desc_maxlen );
 					pids.APIDs[j].desc[desc_maxlen] = 0;
 				}
-	 			yresult += string_printf("<option value=%05u>%s%s</option>\r\n",
+	 			yresult += string_printf("<option value=%05u %s>%s%s</option>\r\n",
 					idx_as_id ? j : pids.APIDs[j].pid,
+					(j==selected_apid) ? "selected=\"selected\"" : "",
 					encodeString(std::string(pids.APIDs[j].desc)).c_str(),
 					pids.APIDs[j].is_ac3 && strstr(pids.APIDs[j].desc, "AC3") == NULL ? " (AC3)": "");
 			}
@@ -594,8 +600,9 @@ std::string  CNeutrinoYParser::func_get_audio_pids_as_dropdown(CyhookHandler */*
 				strncpy( it->desc, getISO639Description( it->desc ), desc_maxlen );
 				it->desc[desc_maxlen] = 0;
 			}
- 			yresult += string_printf("<option value=%05u>%s%s</option>\r\n",
+ 			yresult += string_printf("<option value=%05u %s>%s%s</option>\r\n",
 				idx_as_id ? i : it->pid,
+				(i==selected_apid) ? "selected=\"selected\"" : "",
 				encodeString(std::string(it->desc)).c_str(),
 				it->is_ac3 && strstr(it->desc, "AC3") == NULL ? " (AC3)": "");
 			i++;
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index 15d3698..d3f9f3a 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -368,11 +368,10 @@ function doChangeAudioPid()
 }
 function build_audio_pid_list()
 {
-	var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown";
+	var audio_pids_url = "/y/cgi?execute=func:get_audio_pids_as_dropdown%20audio="+AudioChannel+":";
 	var audio_pid_list = loadSyncURL(audio_pids_url);
 	audio_pid_list = "<select size=\"1\" class=\"y_live_audio_pids\" id=\"audiopid\" onchange=\"doChangeAudioPid()\">"
 			+ audio_pid_list
 			+ "</select>";
 	obj_update('audio_pid_list', audio_pid_list);
-	id("audiopid").selectedIndex = AudioChannel;
 }
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 646463b..7e41467 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.2.26
-date=04.05.2015
+version=2.8.2.27
+date=05.05.2015
 type=Release
 info=Tuxbox

-----------------------------------------------------------------------

Summary of changes:
 .../daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp   |   13 ++++++++++---
 tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js       |    3 +--
 tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt   |    4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)


-- 
Tuxbox-GIT: apps