[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-236-g70b7328
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-236-g70b7328
|
From: Thilo G. <tux...@ne...> - 2013-09-18 06:33:01
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 70b73286b2cb14b6609589b38a5c65bb0407b84c (commit)
via c4cea2baa889c59cc6221133583199fac25bfbd3 (commit)
via 36fad8db9cb7e22a5bad0ec7ae59fea6bfaa5e61 (commit)
via 8c39cdf259a902b2983f6609d6da48ec75ce4f50 (commit)
via 7772724dd2c7278c7c4d8c075825b9205163fb1d (commit)
via 9dd7c08dd86dad4f43b10562f6d70480446169b2 (commit)
via c394bb8445eb4daaec6812c9eeba7dc7f119b3b9 (commit)
via de5c2e36ecc34fa93c71d8d17433d89aefe46833 (commit)
via 9ccaa7057551db077573fc85b005b97ea856edf4 (commit)
via ee95c7976f52a542d87da5d126653d5da5807227 (commit)
via 76e09074197aa84b4fd50bdc5fc80721737b3a90 (commit)
via ae78557dff047b50ff66a5ed440670e5eb332e78 (commit)
via d1650a8e70132c16ca7a31a28da5bd19c2f29bf7 (commit)
from f40104ddf98ecec4d2915fa498460755035df921 (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 70b73286b2cb14b6609589b38a5c65bb0407b84c
Author: Christian Schuett <Gau...@ho...>
Date: Tue Sep 17 20:51:10 2013 +0200
Neutrino channel list: only show current tuning params on current channel
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 141e14c..81ee4d8 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -1135,7 +1135,7 @@ void CChannelList::paintDetails(unsigned int index)
else {
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ fheight, full_width - 20, g_Locale->getText(LOCALE_EPGLIST_NOEVENTS), COL_MENUCONTENTDARK, 0, true); // UTF-8
}
- if(g_settings.channellist_foot == FOOT_FREQ) {
+ if (g_settings.channellist_foot == FOOT_FREQ && g_Zapit->getCurrentServiceID() == getActiveChannel_ChannelID()) {
TP_params TP;
g_Zapit->get_current_TP(&TP);
std::string desc = "";
commit c4cea2baa889c59cc6221133583199fac25bfbd3
Author: Christian Schuett <Gau...@ho...>
Date: Tue Sep 17 20:49:09 2013 +0200
Neutrino channel list: remove bouquet name from details box
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 16ff4f5..141e14c 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -1191,9 +1191,8 @@ void CChannelList::paintDetails(unsigned int index)
}
#endif
- if (!(name.empty()))
- desc+= " (" + name + ")";
- else if (g_info.delivery_system == DVB_S) {
+ if (g_info.delivery_system == DVB_S)
+ {
char sstr[20];
for (CZapitClient::SatelliteList::const_iterator satList_it = satList.begin(); satList_it != satList.end(); ++satList_it)
{
commit 36fad8db9cb7e22a5bad0ec7ae59fea6bfaa5e61
Author: Christian Schuett <Gau...@ho...>
Date: Sun Sep 15 01:14:10 2013 +0200
Neutrino channel list: fix tripledragon build
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 9cf68e7..16ff4f5 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -1147,13 +1147,18 @@ void CChannelList::paintDetails(unsigned int index)
sprintf (buf, "%d", TP.feparams.frequency / 1000000);
desc = desc + buf + " ";
- if (g_info.delivery_system == DVB_S)
- sprintf(buf, "%d", TP.feparams.u.qpsk.symbol_rate / 1000);
- else
- sprintf(buf, "%d", TP.feparams.u.qam.symbol_rate / 1000);
+#ifdef HAVE_TRIPLEDRAGON
+ sprintf(buf, "%d", TP.feparams.symbolrate / 1000);
+#else
+ sprintf(buf, "%d", TP.feparams.u.qam.symbol_rate / 1000);
+#endif
desc = desc + buf + " ";
- switch(TP.feparams.u.qam.fec_inner)
+#ifdef HAVE_TRIPLEDRAGON
+ switch (TP.feparams.fec)
+#else
+ switch (TP.feparams.u.qam.fec_inner)
+#endif
{
case FEC_NONE: desc+= "NONE"; break;
case FEC_1_2: desc+= "1/2"; break;
@@ -1171,6 +1176,9 @@ void CChannelList::paintDetails(unsigned int index)
}
desc+= " DVB ";
+#ifdef HAVE_TRIPLEDRAGON
+ desc+= "QPSK";
+#else
switch (TP.feparams.u.qam.modulation)
{
case 0x00: desc+= "QPSK"; break;
@@ -1181,6 +1189,7 @@ void CChannelList::paintDetails(unsigned int index)
case 0x05: desc+= "QAM_256"; break;
default: desc+= "QAM_AUTO"; break;
}
+#endif
if (!(name.empty()))
desc+= " (" + name + ")";
@@ -1198,7 +1207,6 @@ void CChannelList::paintDetails(unsigned int index)
desc = desc + " (" + sstr + ")";
}
-
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 3*fheight, full_width - 30, desc.c_str(), COL_MENUCONTENTDARK, 0, true);
}
else if( !displayNext && g_settings.channellist_foot == FOOT_NEXT) {
commit 8c39cdf259a902b2983f6609d6da48ec75ce4f50
Author: Christian Schuett <Gau...@ho...>
Date: Sat Sep 14 20:29:33 2013 +0200
zapit: remove unnecessary #if HAVE_DVB_API_VERSION
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/dvb/zapit/src/zapit.cpp b/dvb/zapit/src/zapit.cpp
index 8f90097..68d03e6 100644
--- a/dvb/zapit/src/zapit.cpp
+++ b/dvb/zapit/src/zapit.cpp
@@ -1714,11 +1714,7 @@ bool parse_command(CBasicMessage::Header &rmsg, int connfd)
{
TP_params TP;
get_transponder(&TP);
-#if HAVE_DVB_API_VERSION < 3
- INFO("current frequency: %lu", (long unsigned int)TP.feparams.Frequency);
-#else
INFO("current frequency: %lu", (long unsigned int)TP.feparams.frequency);
-#endif
CBasicServer::send_data(connfd, &TP, sizeof(TP));
break;
}
commit 7772724dd2c7278c7c4d8c075825b9205163fb1d
Author: Christian Schuett <Gau...@ho...>
Date: Thu Sep 12 20:34:55 2013 +0200
Neutrino: fix dreambox build and move some duplicate defines to zapittypes.h
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/dvb/zapit/include/zapit/client/zapittypes.h b/dvb/zapit/include/zapit/client/zapittypes.h
index 5edc0e2..7e8b8b6 100644
--- a/dvb/zapit/include/zapit/client/zapittypes.h
+++ b/dvb/zapit/include/zapit/client/zapittypes.h
@@ -58,6 +58,18 @@
#define FE_SET_TONE SEC_SET_TONE
#define FE_SET_VOLTAGE SEC_SET_VOLTAGE
#define FE_DISEQC_RESET_OVERLOAD SEC_RESET_OVERLOAD
+#define frequency Frequency
+#define symbol_rate SymbolRate
+#define inversion Inversion
+#define fec_inner FEC_inner
+#define modulation QAM
+#define bandwidth bandWidth
+#define code_rate_LP LP_CodeRate
+#define code_rate_HP HP_CodeRate
+#define constellation Constellation
+#define transmission_mode TransmissionMode
+#define guard_interval guardInterval
+#define hierarchy_information HierarchyInformation
struct dvb_diseqc_master_cmd {
__u8 msg [6]; /* { framing, address, command, data [3] } */
diff --git a/dvb/zapit/src/getservices.cpp b/dvb/zapit/src/getservices.cpp
index f58edfb..d0412cc 100644
--- a/dvb/zapit/src/getservices.cpp
+++ b/dvb/zapit/src/getservices.cpp
@@ -29,21 +29,6 @@
#include <configfile.h>
#include <sys/stat.h>
-#if !defined HAVE_TRIPLEDRAGON && HAVE_DVB_API_VERSION < 3
-#define frequency Frequency
-#define symbol_rate SymbolRate
-#define inversion Inversion
-#define fec_inner FEC_inner
-#define modulation QAM
-#define bandwidth bandWidth
-#define code_rate_LP LP_CodeRate
-#define code_rate_HP HP_CodeRate
-#define constellation Constellation
-#define transmission_mode TransmissionMode
-#define guard_interval guardInterval
-#define hierarchy_information HierarchyInformation
-#endif
-
extern transponder_list_t transponders;
extern tallchans allchans;
diff --git a/dvb/zapit/src/scan.cpp b/dvb/zapit/src/scan.cpp
index 871cd80..9f6055a 100644
--- a/dvb/zapit/src/scan.cpp
+++ b/dvb/zapit/src/scan.cpp
@@ -40,21 +40,6 @@
#include <zapit/settings.h>
#include <xmltree/xmlinterface.h>
-#if !defined HAVE_TRIPLEDRAGON && HAVE_DVB_API_VERSION < 3
-#define frequency Frequency
-#define symbol_rate SymbolRate
-#define inversion Inversion
-#define fec_inner FEC_inner
-#define modulation QAM
-#define bandwidth bandWidth
-#define code_rate_LP LP_CodeRate
-#define code_rate_HP HP_CodeRate
-#define constellation Constellation
-#define transmission_mode TransmissionMode
-#define guard_interval guardInterval
-#define hierarchy_information HierarchyInformation
-#endif
-
short scan_runs;
short curr_sat;
static int status = 0;
diff --git a/dvb/zapit/src/zapost/frontend.cpp b/dvb/zapit/src/zapost/frontend.cpp
index 3433b13..e01fbb5 100644
--- a/dvb/zapit/src/zapost/frontend.cpp
+++ b/dvb/zapit/src/zapost/frontend.cpp
@@ -38,13 +38,6 @@
#define min(x,y) ((x < y) ? x : y)
#define max(x,y) ((x > y) ? x : y)
-#if HAVE_DVB_API_VERSION < 3
-#define frequency Frequency
-#define inversion Inversion
-#define modulation QAM
-#define FE_SET_VOLTAGE SEC_SET_VOLTAGE
-#endif
-
#define SOUTH 0
#define NORTH 1
#define EAST 0
diff --git a/dvb/zapit/src/zapsi/descriptors.cpp b/dvb/zapit/src/zapsi/descriptors.cpp
index e19a46e..9fe7fd4 100644
--- a/dvb/zapit/src/zapsi/descriptors.cpp
+++ b/dvb/zapit/src/zapsi/descriptors.cpp
@@ -39,14 +39,6 @@
#ifdef _DVBFRONTEND_H_
#error HAVE_TRIPLEDRAGON && _DVBFRONTEND_H_
#endif
-#else /* !TRIPLEDRAGON */
-#if HAVE_DVB_API_VERSION < 3
-#define frequency Frequency
-#define symbol_rate SymbolRate
-#define inversion Inversion
-#define fec_inner FEC_inner
-#define modulation QAM
-#endif
#endif
extern tallchans allchans; // defined in zapit.cpp
extern transponder_list_t transponders; // defined in zapit.cpp
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index ec411ba..9cf68e7 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -1159,10 +1159,13 @@ void CChannelList::paintDetails(unsigned int index)
case FEC_1_2: desc+= "1/2"; break;
case FEC_2_3: desc+= "2/3"; break;
case FEC_3_4: desc+= "3/4"; break;
- case FEC_4_5: desc+= "4/5"; break;
case FEC_5_6: desc+= "5/6"; break;
+ case FEC_7_8: desc+= "7/8"; break;
+#if HAVE_DVB_API_VERSION >= 3
+ case FEC_4_5: desc+= "4/5"; break;
case FEC_6_7: desc+= "6/7"; break;
case FEC_8_9: desc+= "8/9"; break;
+#endif
case FEC_AUTO: desc+= "AUTO"; break;
default: desc+= "UNKNOWN"; break;
}
diff --git a/tuxbox/neutrino/src/gui/scan_setup.cpp b/tuxbox/neutrino/src/gui/scan_setup.cpp
index a6b5872..2def724 100644
--- a/tuxbox/neutrino/src/gui/scan_setup.cpp
+++ b/tuxbox/neutrino/src/gui/scan_setup.cpp
@@ -103,25 +103,14 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
}
#define SATSETUP_SCANTP_FEC_COUNT 5
-#if HAVE_DVB_API_VERSION < 3
const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT] =
{
- { 1, LOCALE_SCANTP_FEC_1_2 },
- { 2, LOCALE_SCANTP_FEC_2_3 },
- { 3, LOCALE_SCANTP_FEC_3_4 },
- { 4, LOCALE_SCANTP_FEC_5_6 },
- { 5, LOCALE_SCANTP_FEC_7_8 }
+ { FEC_1_2, LOCALE_SCANTP_FEC_1_2 },
+ { FEC_2_3, LOCALE_SCANTP_FEC_2_3 },
+ { FEC_3_4, LOCALE_SCANTP_FEC_3_4 },
+ { FEC_5_6, LOCALE_SCANTP_FEC_5_6 },
+ { FEC_7_8, LOCALE_SCANTP_FEC_7_8 }
};
-#else
-const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT] =
-{
- { 1, LOCALE_SCANTP_FEC_1_2 },
- { 2, LOCALE_SCANTP_FEC_2_3 },
- { 3, LOCALE_SCANTP_FEC_3_4 },
- { 5, LOCALE_SCANTP_FEC_5_6 },
- { 7, LOCALE_SCANTP_FEC_7_8 }
-};
-#endif
#define CABLESETUP_SCANTP_MOD_COUNT 7
const CMenuOptionChooser::keyval CABLESETUP_SCANTP_MOD[CABLESETUP_SCANTP_MOD_COUNT] =
@@ -131,8 +120,10 @@ const CMenuOptionChooser::keyval CABLESETUP_SCANTP_MOD[CABLESETUP_SCANTP_MOD_COU
{ QAM_32 , LOCALE_SCANTP_MOD_QAM_32 },
{ QAM_64 , LOCALE_SCANTP_MOD_QAM_64 },
{ QAM_128 , LOCALE_SCANTP_MOD_QAM_128 },
- { QAM_256 , LOCALE_SCANTP_MOD_QAM_256 },
- { QAM_AUTO, LOCALE_SCANTP_MOD_QAM_AUTO }
+ { QAM_256 , LOCALE_SCANTP_MOD_QAM_256 }
+#if HAVE_DVB_API_VERSION >= 3
+ , { QAM_AUTO, LOCALE_SCANTP_MOD_QAM_AUTO }
+#endif
};
#define SATSETUP_SCANTP_POL_COUNT 2
commit 9dd7c08dd86dad4f43b10562f6d70480446169b2
Author: GetAway <get...@t-...>
Date: Tue Sep 10 09:09:39 2013 +0200
filebrowser: fix len of file description by using dots
diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index ae26658..e78a0ed 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -380,8 +380,8 @@ void CFileBrowser::commonInit()
selected = 0;
selections.clear();
- width = w_max(720, 40);
- height = h_max(576, 40);
+ width = w_max(720, 30);
+ height = h_max(576, 30);
theight = fnt_title->getHeight();
fheight = fnt_item->getHeight();
@@ -1226,8 +1226,8 @@ void CFileBrowser::paintItem(unsigned int pos)
colwidth2 = 0;
else
colwidth2 = fnt_item->getRenderWidth("rwxrwxrwx");
- colwidth3 = fnt_item->getRenderWidth("222.222G");
- colwidth1 = width - 35 - colwidth2 - colwidth3 - 10;
+ colwidth3 = fnt_item->getRenderWidth("200.200G"); // zero is mostly the bigger digit
+ colwidth1 = width - 35 - colwidth2 - colwidth3 - 25;
frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, bgcolor, c_rad_small);
@@ -1260,7 +1260,21 @@ void CFileBrowser::paintItem(unsigned int pos)
}
frameBuffer->paintIcon(fileicon, x+5 , ypos + (fheight-16) / 2 );
- fnt_item->RenderString(x + 35, ypos + fheight, colwidth1 - 10 , FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()), color, 0, true); // UTF-8
+ char f_name[256];
+ std::string FileName = FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName());
+ int i = FileName.length();
+ sprintf(f_name, "%s", FileName.c_str());
+
+ /* too long? cut it! */
+ while ((fnt_item->getRenderWidth(&f_name[0], true) >= colwidth1) && (i > 2)) {
+ f_name[--i] = '\0';
+ }
+
+ if ( i < FileName.length()) {
+ f_name[i-2] = '\0';
+ sprintf(f_name, "%s%s", &f_name[0], "...");
+ }
+ fnt_item->RenderString(x + 35, ypos + fheight, colwidth1, &f_name[0], color, 0, true); // UTF-8
if( S_ISREG(actual_file->Mode) )
{
commit c394bb8445eb4daaec6812c9eeba7dc7f119b3b9
Author: Christian Schuett <Gau...@ho...>
Date: Sat Sep 7 20:46:53 2013 +0200
Neutrino: don't stop movieplayer after pressing home key in infobar
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 6db652d..5f84ab8 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -785,7 +785,7 @@ requests to sectionsd.
}
else
{
- if (( msg != CRCInput::RC_timeout ) && (msg != CRCInput::RC_ok))
+ if (!tsmode && (msg != CRCInput::RC_timeout) && (msg != CRCInput::RC_ok))
g_RCInput->postMsg( msg, data );
res = messages_return::cancel_info;
}
commit de5c2e36ecc34fa93c71d8d17433d89aefe46833
Author: [CST] Focus <foc...@gm...>
Date: Fri Sep 6 18:34:17 2013 +0200
Neutrino netfile: fix crash, id3 struct not initialized
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/driver/netfile.cpp b/tuxbox/neutrino/src/driver/netfile.cpp
index f04123f..9547dfd 100644
--- a/tuxbox/neutrino/src/driver/netfile.cpp
+++ b/tuxbox/neutrino/src/driver/netfile.cpp
@@ -307,6 +307,7 @@ int request_file(URL *url)
char str[255], *ptr;
int slot;
ID3 id3;
+ memset(&id3, 0, sizeof(ID3));
/* get the cache slot for this stream. A negative return value */
/* indicates that no cache has been set up for this stream */
commit 9ccaa7057551db077573fc85b005b97ea856edf4
Author: [CST] Focus <foc...@gm...>
Date: Fri Sep 6 18:30:49 2013 +0200
libupnpclient: fix fd leak
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/misc/libs/libupnpclient/UPNPDevice.cpp b/misc/libs/libupnpclient/UPNPDevice.cpp
index 797536e..314d71f 100644
--- a/misc/libs/libupnpclient/UPNPDevice.cpp
+++ b/misc/libs/libupnpclient/UPNPDevice.cpp
@@ -438,6 +438,7 @@ std::string CUPnPDevice::HTTP(std::string url, std::string post, std::string act
buf[received] = 0;
reply << buf;
}
+ close(t_socket);
return reply.str();
}
commit ee95c7976f52a542d87da5d126653d5da5807227
Author: Christian Schuett <Gau...@ho...>
Date: Fri Aug 23 18:34:10 2013 +0200
Neutrino timerlist: change home button caption to clarify its purpose
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/data/locale/deutsch.locale b/tuxbox/neutrino/data/locale/deutsch.locale
index 997db14..5702189 100644
--- a/tuxbox/neutrino/data/locale/deutsch.locale
+++ b/tuxbox/neutrino/data/locale/deutsch.locale
@@ -1429,6 +1429,7 @@ timerlist.apids_dflt Voreingestellte Tonspuren aufn.
timerlist.bouquetselect Bouquet wählen
timerlist.channel Kanal
timerlist.channelselect Kanal wählen
+timerlist.close SchlieÃen
timerlist.delete Löschen
timerlist.menumodify Timer bearbeiten
timerlist.menunew Neuer Timer
diff --git a/tuxbox/neutrino/data/locale/english.locale b/tuxbox/neutrino/data/locale/english.locale
index b849e12..c8fd982 100644
--- a/tuxbox/neutrino/data/locale/english.locale
+++ b/tuxbox/neutrino/data/locale/english.locale
@@ -1429,6 +1429,7 @@ timerlist.apids_dflt record default audio streams
timerlist.bouquetselect choose bouquet
timerlist.channel Channel
timerlist.channelselect choose channel
+timerlist.close Exit
timerlist.delete Delete
timerlist.menumodify Modify timer
timerlist.menunew New timer
diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index 636d7ba..71e1ca4 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -764,7 +764,7 @@ const struct button_label TimerListButtons[5] =
{ NEUTRINO_ICON_BUTTON_RED , LOCALE_TIMERLIST_DELETE },
{ NEUTRINO_ICON_BUTTON_GREEN , LOCALE_TIMERLIST_NEW },
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TIMERLIST_RELOAD },
- { NEUTRINO_ICON_BUTTON_HOME , LOCALE_MENU_CANCEL },
+ { NEUTRINO_ICON_BUTTON_HOME , LOCALE_TIMERLIST_CLOSE },
{ NEUTRINO_ICON_BUTTON_OKAY , LOCALE_TIMERLIST_MODIFY }
};
diff --git a/tuxbox/neutrino/src/system/locals.h b/tuxbox/neutrino/src/system/locals.h
index e3568e6..7146d89 100644
--- a/tuxbox/neutrino/src/system/locals.h
+++ b/tuxbox/neutrino/src/system/locals.h
@@ -1456,6 +1456,7 @@ typedef enum
LOCALE_TIMERLIST_BOUQUETSELECT,
LOCALE_TIMERLIST_CHANNEL,
LOCALE_TIMERLIST_CHANNELSELECT,
+ LOCALE_TIMERLIST_CLOSE,
LOCALE_TIMERLIST_DELETE,
LOCALE_TIMERLIST_MENUMODIFY,
LOCALE_TIMERLIST_MENUNEW,
diff --git a/tuxbox/neutrino/src/system/locals_intern.h b/tuxbox/neutrino/src/system/locals_intern.h
index 48f7703..79344af 100644
--- a/tuxbox/neutrino/src/system/locals_intern.h
+++ b/tuxbox/neutrino/src/system/locals_intern.h
@@ -1456,6 +1456,7 @@ const char * locale_real_names[] =
"timerlist.bouquetselect",
"timerlist.channel",
"timerlist.channelselect",
+ "timerlist.close",
"timerlist.delete",
"timerlist.menumodify",
"timerlist.menunew",
commit 76e09074197aa84b4fd50bdc5fc80721737b3a90
Author: Christian Schuett <Gau...@ho...>
Date: Sat Aug 17 17:08:45 2013 +0200
Neutrino: only record configured APIDs if recording is restarted
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index 13321fa..043a178 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -1849,7 +1849,14 @@ bool CNeutrinoApp::doGuiRecord(char * preselectedDir, bool addTimer, char * file
eventinfo.epg_starttime = 0;
strcpy(eventinfo.epgTitle, "");
}
- eventinfo.apids = TIMERD_APIDS_CONF;
+ if (filename != NULL)
+ {
+ CTimerd::responseGetTimer timer;
+ g_Timerd->getTimer(timer, recording_id);
+ eventinfo.apids = timer.apids;
+ }
+ else
+ eventinfo.apids = TIMERD_APIDS_CONF;
bool doRecord = true;
if (g_settings.recording_type == RECORDING_FILE)
{
commit ae78557dff047b50ff66a5ed440670e5eb332e78
Author: Christian Schuett <Gau...@ho...>
Date: Sat Aug 17 15:12:51 2013 +0200
Neutrino streaminfo: only show PMT and PCR PID if not 0
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/streaminfo2.cpp b/tuxbox/neutrino/src/gui/streaminfo2.cpp
index 8e4d619..2cb3aae 100644
--- a/tuxbox/neutrino/src/gui/streaminfo2.cpp
+++ b/tuxbox/neutrino/src/gui/streaminfo2.cpp
@@ -665,13 +665,19 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
//pmtpid
ypos+= sheight+5; //blank line
- sprintf((char*) buf, "0x%04x", si.pmtpid);
+ if (si.pmtpid != 0)
+ sprintf((char*) buf, "0x%04x", si.pmtpid);
+ else
+ sprintf((char*) buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE));
g_Font[font_small]->RenderString(xpos, ypos, width-10, "PMTpid:", COL_MENUCONTENT, 0, true); // UTF-8
g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, width-10, buf, COL_MENUCONTENT, 0, true); // UTF-8
//pcrpid
ypos+= sheight;
- sprintf((char*) buf, "0x%04x", si.pcrpid);
+ if (si.pcrpid != 0)
+ sprintf((char*) buf, "0x%04x", si.pcrpid);
+ else
+ sprintf((char*) buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE));
g_Font[font_small]->RenderString(xpos, ypos, width-10, "PCRpid:", COL_MENUCONTENT, 0, true); // UTF-8
g_Font[font_small]->RenderString(xpos+spaceoffset, ypos, width-10, buf, COL_MENUCONTENT, 0, true); // UTF-8
@@ -688,7 +694,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
//apid
if (g_RemoteControl->current_PIDs.APIDs.empty()){
ypos+= sheight;
- sprintf((char*) buf, "Apid(s): %s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE));
+ sprintf((char*) buf, "Apid(s): %s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE));
g_Font[font_small]->RenderString(xpos, ypos, width-10, buf, COL_MENUCONTENT, 0, true); // UTF-8
} else {
unsigned int i;
commit d1650a8e70132c16ca7a31a28da5bd19c2f29bf7
Author: Christian Schuett <Gau...@ho...>
Date: Sat Aug 17 15:01:41 2013 +0200
Neutrino: only add PCR PID to direct recording and live streaming if not 0
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
index 2b70340..e87e8e5 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -1760,13 +1760,13 @@ void CControlAPI::YWeb_SendVideoStreamingPids(CyhookHandler *hh, int apid_no)
if(hh->ParamList["no_commas"] != "")
{
hh->printf("0x%04x 0x%04x 0x%04x",pids.PIDs.pmtpid,pids.PIDs.vpid,apid);
- if (pids.PIDs.pcrpid != pids.PIDs.vpid)
+ if (pids.PIDs.pcrpid != 0 && pids.PIDs.pcrpid != pids.PIDs.vpid)
hh->printf(" 0x%04x", pids.PIDs.pcrpid);
}
else
{
hh->printf("0x%04x,0x%04x,0x%04x",pids.PIDs.pmtpid,pids.PIDs.vpid,apid);
- if (pids.PIDs.pcrpid != pids.PIDs.vpid)
+ if (pids.PIDs.pcrpid != 0 && pids.PIDs.pcrpid != pids.PIDs.vpid)
hh->printf(",0x%04x", pids.PIDs.pcrpid);
}
}
@@ -2241,7 +2241,7 @@ void CControlAPI::build_live_url(CyhookHandler *hh)
if(!pids.APIDs.empty())
apid = pids.APIDs[apid_idx].pid;
xpids = string_printf("0x%04x,0x%04x,0x%04x",pids.PIDs.pmtpid,pids.PIDs.vpid,apid);
- if (pids.PIDs.pcrpid != pids.PIDs.vpid)
+ if (pids.PIDs.pcrpid != 0 && pids.PIDs.pcrpid != pids.PIDs.vpid)
xpids += string_printf(",0x%04x", pids.PIDs.pcrpid);
}
else if ( mode == CZapitClient::MODE_RADIO)
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
index 6e39a20..c6299ff 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -492,7 +492,7 @@ std::string CNeutrinoYParser::func_get_video_pids(CyhookHandler */*hh*/, std::s
if(!pids.APIDs.empty())
apid = pids.APIDs[apid_idx].pid;
yresult = string_printf("0x%04x,0x%04x,0x%04x", pids.PIDs.pmtpid, pids.PIDs.vpid, apid);
- if (pids.PIDs.pcrpid != pids.PIDs.vpid)
+ if (pids.PIDs.pcrpid != 0 && pids.PIDs.pcrpid != pids.PIDs.vpid)
yresult += string_printf(",0x%04x", pids.PIDs.pcrpid);
return yresult;
}
diff --git a/tuxbox/neutrino/src/driver/vcrcontrol.cpp b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
index 927949c..1acda13 100644
--- a/tuxbox/neutrino/src/driver/vcrcontrol.cpp
+++ b/tuxbox/neutrino/src/driver/vcrcontrol.cpp
@@ -765,7 +765,7 @@ bool CVCRControl::CFileDevice::Record(const t_channel_id channel_id, int mode, c
if (GenPsi && sptsmode)
transfer_pids(si.vpid, EN_TYPE_VIDEO, 0);
- if (si.pcrpid != si.vpid)
+ if (si.pcrpid != 0 && si.pcrpid != si.vpid)
{
pids[1] = si.pcrpid;
numpids = 2;
-----------------------------------------------------------------------
Summary of changes:
dvb/zapit/include/zapit/client/zapittypes.h | 12 +++++++
dvb/zapit/src/getservices.cpp | 15 ---------
dvb/zapit/src/scan.cpp | 15 ---------
dvb/zapit/src/zapit.cpp | 4 --
dvb/zapit/src/zapost/frontend.cpp | 7 ----
dvb/zapit/src/zapsi/descriptors.cpp | 8 -----
misc/libs/libupnpclient/UPNPDevice.cpp | 1 +
.../daemons/nhttpd/tuxboxapi/controlapi.cpp | 6 ++--
.../daemons/nhttpd/tuxboxapi/neutrinoyparser.cpp | 2 +-
tuxbox/neutrino/data/locale/deutsch.locale | 1 +
tuxbox/neutrino/data/locale/english.locale | 1 +
tuxbox/neutrino/src/driver/netfile.cpp | 1 +
tuxbox/neutrino/src/driver/vcrcontrol.cpp | 2 +-
tuxbox/neutrino/src/gui/channellist.cpp | 32 +++++++++++++-------
tuxbox/neutrino/src/gui/filebrowser.cpp | 24 ++++++++++++---
tuxbox/neutrino/src/gui/infoviewer.cpp | 2 +-
tuxbox/neutrino/src/gui/scan_setup.cpp | 27 +++++-----------
tuxbox/neutrino/src/gui/streaminfo2.cpp | 12 +++++--
tuxbox/neutrino/src/gui/timerlist.cpp | 2 +-
tuxbox/neutrino/src/neutrino.cpp | 9 +++++-
tuxbox/neutrino/src/system/locals.h | 1 +
tuxbox/neutrino/src/system/locals_intern.h | 1 +
22 files changed, 91 insertions(+), 94 deletions(-)
--
Tuxbox-GIT: apps
|
