[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-292-gc213938
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-292-gc213938
|
From: Thilo G. <tux...@ne...> - 2013-12-13 07:22:20
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via c213938731574d429405adecb4c1d4881063d24c (commit)
via b1ed47162e1f22fa7b5d2bbcbb06414f0f124f56 (commit)
via 2cbe7020d18dac9a64b2b8ed4ee1454ce8becfb3 (commit)
via 238882091b3a2d36f4acac0acfd3795b265b9083 (commit)
via 4fd31489309280bd400c0e7cd0fab606688097f7 (commit)
from e5d7bf233791791d64b7dd0a5cbb7c60e7298ec7 (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 c213938731574d429405adecb4c1d4881063d24c
Author: Christian Schuett <Gau...@ho...>
Date: Thu Dec 12 21:46:51 2013 +0100
nhttpd yParser: speed up getting current bouquet number
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
index 06af831..9f9f45d 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -239,17 +239,18 @@ std::string CNeutrinoYParser::func_get_bouquets_as_templatelist(CyhookHandler *
std::string CNeutrinoYParser::func_get_actual_bouquet_number(CyhookHandler */*hh*/, std::string /*para*/)
{
CZapitClient::BouquetChannelList *bouquet;
- int actual=0;
+ int actual = 0;
int mode = CZapitClient::MODE_CURRENT;
+ t_channel_id current_channel_id = NeutrinoAPI->Zapit->getCurrentServiceID();
- for (unsigned int i = 0; i < NeutrinoAPI->BouquetList.size() && actual == 0;i++)
+ for (unsigned int i = 0; i < NeutrinoAPI->BouquetList.size() && actual == 0; i++)
{
bouquet = NeutrinoAPI->GetBouquet((NeutrinoAPI->BouquetList[i].bouquet_nr) + 1, mode);
CZapitClient::BouquetChannelList::iterator channel = bouquet->begin();
for (unsigned int j = 0; channel != bouquet->end() && actual == 0; ++channel, j++)
{
- if(channel->channel_id == NeutrinoAPI->Zapit->getCurrentServiceID())
- actual=i+1;
+ if (channel->channel_id == current_channel_id)
+ actual = i + 1;
}
}
return std::string(itoa(actual));
@@ -261,7 +262,6 @@ std::string CNeutrinoYParser::func_get_actual_bouquet_number(CyhookHandler */*h
std::string CNeutrinoYParser::func_get_channels_as_dropdown(CyhookHandler */*hh*/, std::string para)
{
CZapitClient::BouquetChannelList *bouquet;
- CZapitClient::BouquetList blist;
std::string abouquet, achannel_id, yresult, sel, sid;
int bnumber = 1;
commit b1ed47162e1f22fa7b5d2bbcbb06414f0f124f56
Author: Christian Schuett <Gau...@ho...>
Date: Wed Dec 11 22:21:53 2013 +0100
Neutrino english.locale: change 'menue' to 'menu'
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/data/locale/english.locale b/tuxbox/neutrino/data/locale/english.locale
index 425083f..f99c80b 100644
--- a/tuxbox/neutrino/data/locale/english.locale
+++ b/tuxbox/neutrino/data/locale/english.locale
@@ -791,9 +791,9 @@ motorcontrol.goto_reference_position Goto Reference Position
motorcontrol.head Motor-Setup
motorcontrol.increase_motor_position Increase Motor Position (a)
motorcontrol.increase_step_size Increase Step Size (c)
-motorcontrol.installer_menue Installer Menue
+motorcontrol.installer_menue Installer Menu
motorcontrol.not_defined Not Defined
-motorcontrol.rc_menuehead RC-Menue
+motorcontrol.rc_menuehead RC-Menu
motorcontrol.re_calculate_positions (Re)-Calculate Positions
motorcontrol.set_east_soft_limit Set East (soft) Limit
motorcontrol.set_west_soft_limit Set West (soft) Limit
@@ -804,7 +804,7 @@ motorcontrol.step_drive_motor_halt Halt Motor
motorcontrol.step_drive_motor_west Step/Drive Motor West (b,c)
motorcontrol.store_motor_position Store Motor Position
motorcontrol.switch_step_drive_mode Switch Step/Drive Mode (b)
-motorcontrol.user_menue User Menue
+motorcontrol.user_menue User Menu
moviebrowser.book_clear_all Clear all
moviebrowser.book_head Bookmarks
moviebrowser.book_lastmoviestop Last play stop:
commit 2cbe7020d18dac9a64b2b8ed4ee1454ce8becfb3
Author: Christian Schuett <Gau...@ho...>
Date: Wed Dec 11 21:33:53 2013 +0100
nhttpd controlapi: add possibility to get TV or radio bouquets only
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/doc/nhttpd_controlapi.html b/tuxbox/neutrino/daemons/nhttpd/doc/nhttpd_controlapi.html
index 9b336bf..8495f2f 100644
--- a/tuxbox/neutrino/daemons/nhttpd/doc/nhttpd_controlapi.html
+++ b/tuxbox/neutrino/daemons/nhttpd/doc/nhttpd_controlapi.html
@@ -988,10 +988,10 @@ Beispiel:<br>
<div class="title1"><a name="getbouquets"></a>15. Bouquetlist abfragen</div>
<div class="URL">Handler: http://dbox/control/getbouquets</div>
<br>
-<b>Parameter:</b> <br>
+<b>Parameter:</b> mode=current|TV|RADIO|all, showhidden=true|false<br>
<b>Rückgabe:</b><br>
<br>
-Es werden alle Bouquets zurückgeliefert<br>
+Es werden nur TV-, nur Radio- oder alle Bouquets zurückgeliefert.<br>
<div class="example">
Beispiel:<br>
<br>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index 3ff88f4..1c93020 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -1119,8 +1119,31 @@ void CControlAPI::GetBouquetCGI(CyhookHandler *hh)
//-----------------------------------------------------------------------------
void CControlAPI::GetBouquetsCGI(CyhookHandler *hh)
{
- for (unsigned int i = 0; i < NeutrinoAPI->BouquetList.size();i++)
- hh->printf("%u %s\n", (NeutrinoAPI->BouquetList[i].bouquet_nr) + 1, NeutrinoAPI->BouquetList[i].name);
+ int mode = CZapitClient::MODE_ALL;
+ if (!hh->ParamList["mode"].empty())
+ {
+ if (hh->ParamList["mode"].compare("current") == 0)
+ mode = CZapitClient::MODE_CURRENT;
+ else if (hh->ParamList["mode"].compare("TV") == 0)
+ mode = CZapitClient::MODE_TV;
+ else if (hh->ParamList["mode"].compare("RADIO") == 0)
+ mode = CZapitClient::MODE_RADIO;
+ }
+
+ bool show_hidden = true;
+ if (!hh->ParamList["showhidden"].empty() && hh->ParamList["showhidden"] == "false")
+ show_hidden = false;
+
+ unsigned int bouquet_nr;
+ for (unsigned int i = 0; i < NeutrinoAPI->BouquetList.size(); i++)
+ {
+ bouquet_nr = (NeutrinoAPI->BouquetList[i].bouquet_nr) + 1;
+ if ((show_hidden || !NeutrinoAPI->BouquetList[i].hidden) &&
+ (mode == CZapitClient::MODE_ALL || !NeutrinoAPI->GetBouquet(bouquet_nr, mode)->empty()))
+ {
+ hh->printf("%u %s\n", bouquet_nr, NeutrinoAPI->BouquetList[i].name);
+ }
+ }
}
//-----------------------------------------------------------------------------
commit 238882091b3a2d36f4acac0acfd3795b265b9083
Author: Christian Schuett <Gau...@ho...>
Date: Wed Dec 11 20:02:21 2013 +0100
nhttpd controlapi: speed up getting current bouquet number
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index 0148c55..3ff88f4 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -991,7 +991,6 @@ void CControlAPI::ChannellistCGI(CyhookHandler *hh)
void CControlAPI::GetBouquetCGI(CyhookHandler *hh)
{
CZapitClient::BouquetChannelList *bouquet;
- CZapitClient::BouquetList blist;
if (!(hh->ParamList.empty()))
{
@@ -1001,24 +1000,25 @@ void CControlAPI::GetBouquetCGI(CyhookHandler *hh)
{
if (hh->ParamList["mode"].compare("TV") == 0)
mode = CZapitClient::MODE_TV;
- if (hh->ParamList["mode"].compare("RADIO") == 0)
+ else if (hh->ParamList["mode"].compare("RADIO") == 0)
mode = CZapitClient::MODE_RADIO;
}
// Get Bouquet Number. First matching current channel
if (hh->ParamList["1"] == "actual")
{
- int actual=0;
+ int actual = 0;
+ t_channel_id current_channel_id = NeutrinoAPI->Zapit->getCurrentServiceID();
//easier?
- for (unsigned int i = 0; i < NeutrinoAPI->BouquetList.size() && actual == 0;i++)
+ for (unsigned int i = 0; i < NeutrinoAPI->BouquetList.size() && actual == 0; i++)
{
//hh->printf("%u %s\n", (NeutrinoAPI->BouquetList[i].bouquet_nr) + 1, NeutrinoAPI->BouquetList[i].name);
bouquet = NeutrinoAPI->GetBouquet((NeutrinoAPI->BouquetList[i].bouquet_nr) + 1, mode);
CZapitClient::BouquetChannelList::iterator channel = bouquet->begin();
for (unsigned int j = 0; channel != bouquet->end() && actual == 0; ++channel, j++)
{
- if(channel->channel_id == NeutrinoAPI->Zapit->getCurrentServiceID())
- actual=i+1;
+ if (channel->channel_id == current_channel_id)
+ actual = i + 1;
}
}
hh->printf("%d",actual);
@@ -1030,6 +1030,7 @@ void CControlAPI::GetBouquetCGI(CyhookHandler *hh)
hh->printf("<bouquet>\n\t<bnumber>%s</bnumber>\n</bouquet>\n",hh->ParamList["bouquet"].c_str());
bouquet = NeutrinoAPI->GetBouquet(atoi(hh->ParamList["bouquet"].c_str()), mode);
+ t_channel_id current_channel_id = NeutrinoAPI->Zapit->getCurrentServiceID();
CZapitClient::BouquetChannelList::iterator channel = bouquet->begin();
for (unsigned int i = 0; channel != bouquet->end(); ++channel, i++)
@@ -1045,7 +1046,7 @@ void CControlAPI::GetBouquetCGI(CyhookHandler *hh)
if (!(hh->ParamList["epg"].empty()))
{
hh->Write("\t<isActiveChannel>");
- hh->Write((channel->channel_id == NeutrinoAPI->Zapit->getCurrentServiceID()) ? "true" : "false");
+ hh->Write((channel->channel_id == current_channel_id) ? "true" : "false");
hh->WriteLn("</isActiveChannel>");
CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
commit 4fd31489309280bd400c0e7cd0fab606688097f7
Author: [CST] Focus <foc...@gm...>
Date: Thu Dec 5 19:03:55 2013 +0100
Neutrino CScanTs: fix memleak
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/scan.cpp b/tuxbox/neutrino/src/gui/scan.cpp
index e896052..ef3afc5 100644
--- a/tuxbox/neutrino/src/gui/scan.cpp
+++ b/tuxbox/neutrino/src/gui/scan.cpp
@@ -314,10 +314,10 @@ int CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
}
break;
default:
- if ((msg >= CRCInput::RC_WithData) && (msg < CRCInput::RC_WithData + 0x10000000))
- delete [] (unsigned char*) data;
break;
}
+ if ((msg >= CRCInput::RC_WithData) && (msg < CRCInput::RC_WithData + 0x10000000))
+ delete [] (unsigned char*) data;
return msg;
}
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/doc/nhttpd_controlapi.html | 4 +-
.../daemons/nhttpd/tuxboxapi/controlapi.cpp | 42 +++++++++++++++----
.../daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp | 10 ++--
tuxbox/neutrino/data/locale/english.locale | 6 +-
tuxbox/neutrino/src/gui/scan.cpp | 4 +-
5 files changed, 45 insertions(+), 21 deletions(-)
--
Tuxbox-GIT: apps
|
