Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 82dd4747d7b54ffc0938d968f36008fe3e1f935e (commit)
via c679a8b741be8c017303abc9b3fb55a8388fdda4 (commit)
via 7af02ea5bc01492efc4121b3c4e69959daa22415 (commit)
via 830b4d63747354e0f5ab45f4e33a469117938d6a (commit)
via 47f57db509ee85139e2bf07e15b2015a04d2dc83 (commit)
via 750e94fc6c1ef0fcd43c1692416a38413b5ee1e3 (commit)
from 98a2a1858856304bf7bccd73d70cd09443805376 (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 82dd4747d7b54ffc0938d968f36008fe3e1f935e
Author: [CST] Focus <focus....@gmail.com>
Date: Tue Jun 2 16:44:43 2015 +0200
0 calls timer-list in event-list
Signed-off-by: GetAway <get-a...@t-online.de>
diff --git a/tuxbox/neutrino/data/locale/deutsch.locale
b/tuxbox/neutrino/data/locale/deutsch.locale
index aa19229..ea360ba 100644
--- a/tuxbox/neutrino/data/locale/deutsch.locale
+++ b/tuxbox/neutrino/data/locale/deutsch.locale
@@ -433,7 +433,7 @@ eventfinder.start_search Starte Suche
eventlistbar.channelswitch Umschalten
eventlistbar.eventsort Sortieren
eventlistbar.recordevent Aufnehmen
-eventlistbar.reload Aktualisieren
+eventlistbar.reload Aktual.
experimentalsettings Experimentelle Einstellungen
experimentalsettings.head Experimentelle Einstellungen
favorites.addchannel Der aktuelle Kanal wird dem Bouquet \n"Meine Favoriten"
hinzugefügt. \nDie Speicherung benötigt einen Moment...
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp
b/tuxbox/neutrino/src/gui/eventlist.cpp
index 24bca77..ad20c86 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -555,6 +555,20 @@ int EventList::exec(const t_channel_id channel_id, const
std::string& channelnam
{
loop= false;
}
+ else if (msg == CRCInput::RC_0) {
+ hide();
+
+ CTimerList *Timerlist = new CTimerList;
+ Timerlist->exec(NULL, "");
+ delete Timerlist;
+ timerlist.clear();
+ g_Timerd->getTimerList (timerlist);
+
+ paintHead();
+ paint();
+ showFunctionBar(true);
+ timeoutEnd =
CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
+ }
#ifdef ENABLE_EPGPLUS
else if (msg == CRCInput::RC_epg)
{
@@ -814,13 +828,14 @@ void EventList::updateSelection(unsigned int newpos)
// -- Just display/hide function bar
// -- 2004-04-12 rasc
//
-struct button_label EventListButtons[5] =
+struct button_label EventListButtons[6] =
{
{ "", LOCALE_GENERIC_EMPTY }, // timerlist delete / record
button
{ "", LOCALE_EVENTFINDER_SEARCH }, // search button
{ "", LOCALE_GENERIC_EMPTY }, // timerlist delete /
channelswitch
{ "", LOCALE_EVENTLISTBAR_EVENTSORT }, // sort button
- { "", LOCALE_EVENTLISTBAR_RELOAD } // reload button
+ { "", LOCALE_EVENTLISTBAR_RELOAD }, // reload button
+ { "", LOCALE_TIMERLIST_NAME } // Timerlist button
};
void EventList::showFunctionBar (bool show)
@@ -976,9 +991,17 @@ void EventList::showFunctionBar (bool show)
keyhelper.get(&dummy, &icon,
g_settings.key_channelList_reload);
EventListButtons[4].button = icon;
+ btncaption = g_Locale->getText(LOCALE_EVENTLISTBAR_RELOAD);
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space +
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption,
true));
+
// paint 5th button
::paintButtons(frameBuffer,
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by,
ButtonWidth, 1, &EventListButtons[4]);
+ bx += cellwidth;
}
+ // Button 6 Timerlist - show always
+ EventListButtons[5].locale = LOCALE_TIMERLIST_NAME;
+ EventListButtons[5].button = NEUTRINO_ICON_BUTTON_0;
+ ::paintButtons(frameBuffer,
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by,
ButtonWidth, 1, &EventListButtons[5]);
}
diff --git a/tuxbox/neutrino/src/gui/sleeptimer.cpp
b/tuxbox/neutrino/src/gui/sleeptimer.cpp
index 562a2f5..5bd42fd 100644
--- a/tuxbox/neutrino/src/gui/sleeptimer.cpp
+++ b/tuxbox/neutrino/src/gui/sleeptimer.cpp
@@ -85,9 +85,15 @@ int CSleepTimerWidget::exec(CMenuTarget* parent, const
std::string &)
sprintf(value, "%03d", g_settings.sleeptimer_min);
}
inbox = new CStringInput(LOCALE_SLEEPTIMERBOX_TITLE, value, 3,
LOCALE_SLEEPTIMERBOX_HINT1, LOCALE_SLEEPTIMERBOX_HINT2, "0123456789 ", this,
NEUTRINO_ICON_TIMER);
- inbox->exec (NULL, "");
+ int ret = inbox->exec (NULL, "");
delete inbox;
+
+ /* exit pressed, cancel timer setup */
+ if(ret == menu_return::RETURN_REPAINT)
+ {
+ return ret;
+ }
return res;
}
commit c679a8b741be8c017303abc9b3fb55a8388fdda4
Author: Jacek Jendrzej <crash...@googlemail.com>
Date: Tue Jun 2 09:33:04 2015 +0200
netfile: fix some possible errors with bufsize
Signed-off-by: GetAway <get-a...@t-online.de>
diff --git a/tuxbox/neutrino/src/driver/netfile.cpp
b/tuxbox/neutrino/src/driver/netfile.cpp
index f638c70..15d3f90 100644
--- a/tuxbox/neutrino/src/driver/netfile.cpp
+++ b/tuxbox/neutrino/src/driver/netfile.cpp
@@ -370,7 +370,7 @@ int request_file(URL *url)
/* if we have a entity, announce it to the
server */
if(url->entity[0])
{
- snprintf(str, sizeof(str)-1,
"Content-Length: %d\r\n", strlen(url->entity));
+ snprintf(str, sizeof(str)-1,
"Content-Length: %d\r\n", (int)strlen(url->entity));
dprintf(stderr, "> %s", str);
send(url->fd, str, strlen(str), 0);
}
@@ -548,7 +548,7 @@ void readln(int fd, char *buf)
int parse_response(URL *url, void *opt, CSTATE *state)
{
- char header[2049], /*str[255]*/ str[2048]; // combined with 2nd local
str from id3 part
+ char header[2048], /*str[255]*/ str[2048]; // combined with 2nd local
str from id3 part
char *ptr, chr=0, lastchr=0;
int hlen = 0, response;
int meta_interval = 0, rval;
diff --git a/tuxbox/neutrino/src/driver/netfile.h
b/tuxbox/neutrino/src/driver/netfile.h
index 5ea13bb..e5d157b 100644
--- a/tuxbox/neutrino/src/driver/netfile.h
+++ b/tuxbox/neutrino/src/driver/netfile.h
@@ -191,10 +191,10 @@ typedef struct
typedef struct
{
- char id[4];
+ char id[5];
uint32_t size;
char flags[3];
- char base[1024];
+ char base[2048];
} ID3_frame;
#define CRLFCut(a) \
commit 7af02ea5bc01492efc4121b3c4e69959daa22415
Author: Jacek Jendrzej <crash...@googlemail.com>
Date: Tue Jun 2 09:18:23 2015 +0200
netfile: fix bufsize
Signed-off-by: GetAway <get-a...@t-online.de>
diff --git a/tuxbox/neutrino/src/driver/netfile.cpp
b/tuxbox/neutrino/src/driver/netfile.cpp
index 8ff3788..f638c70 100644
--- a/tuxbox/neutrino/src/driver/netfile.cpp
+++ b/tuxbox/neutrino/src/driver/netfile.cpp
@@ -1040,6 +1040,7 @@ FILE *f_open(const char *filename, const char *acctype)
for(int i=0; ((ptr != NULL) && (i<25)); ptr =
strstr(ptr, "http://";) )
{
strncpy(servers[i], ptr, 1023);
+ servers[i][1023] = '\0';
ptr2 = strchr(servers[i], '\n');
if(ptr2) *ptr2 = 0;
// change ptr so that next strstr searches in
buf and not in servers[i]
@@ -1283,6 +1284,7 @@ const char *f_type(FILE *stream, const char *type)
{
stream_type[i].stream = stream;
strncpy(stream_type[i].type, type, 64);
+ stream_type[i].type[64] = '\0';
dprintf(stderr, "added entry (%s) for %p\n", type,
stream);
}
return type;
@@ -1700,7 +1702,8 @@ void ShoutCAST_ParseMetaData(char *md, CSTATE *state)
if(!ptr)
{
ptr = strchr(md, '=');
- strncpy(state->title, ptr + 2, 4096);
+ strncpy(state->title, ptr + 2, 4095);
+ state->title[4095] = '\0';
if ((ptr = strchr(state->title, '\n')) != NULL)
*(ptr - 1) = 0;
else if ((ptr = strchr(state->title, ';')) != NULL)
@@ -1718,7 +1721,8 @@ void ShoutCAST_ParseMetaData(char *md, CSTATE *state)
ptr = strstr(md, "StreamTitle=");
ptr = strchr(ptr, '\'');
- strncpy(state->artist, ptr + 1, 4096);
+ strncpy(state->artist, ptr + 1, 4095);
+ state->artist[4095] = '\0';
ptr = strstr(state->artist, " - ");
if(!ptr)
ptr = strstr(state->artist, ", ");
commit 830b4d63747354e0f5ab45f4e33a469117938d6a
Author: Jacek Jendrzej <crash...@googlemail.com>
Date: Tue Jun 2 09:12:13 2015 +0200
netfile: fix compile
Signed-off-by: GetAway <get-a...@t-online.de>
diff --git a/tuxbox/neutrino/src/driver/netfile.cpp
b/tuxbox/neutrino/src/driver/netfile.cpp
index 1fb571c..8ff3788 100644
--- a/tuxbox/neutrino/src/driver/netfile.cpp
+++ b/tuxbox/neutrino/src/driver/netfile.cpp
@@ -1082,7 +1082,7 @@ FILE *f_open(const char *filename, const char *acctype)
/* magic, if there is any */
for (int i = 0; i < known_magic_count; i++)
{
- if (((*(uint32_t *)&(magic[0])) &
*(uint32_t *)&(known_magic[i].mask[0])) == *(uint32_t
*)&(known_magic[i].mode[0]))
+ if (((*(unsigned char *)&(magic[0])) &
*(unsigned char *)&(known_magic[i].mask[0])) == *(unsigned char
*)&(known_magic[i].mode[0]))
{
f_type(fd, known_magic[i].type);
goto magic_found;
commit 47f57db509ee85139e2bf07e15b2015a04d2dc83
Author: GetAway <get-a...@t-online.de>
Date: Tue Jun 2 09:01:39 2015 +0200
netfile: small fix for caching
Signed-off-by: GetAway <get-a...@t-online.de>
diff --git a/tuxbox/neutrino/src/driver/netfile.cpp
b/tuxbox/neutrino/src/driver/netfile.cpp
index ea68226..1fb571c 100644
--- a/tuxbox/neutrino/src/driver/netfile.cpp
+++ b/tuxbox/neutrino/src/driver/netfile.cpp
@@ -1154,6 +1154,8 @@ int f_close(FILE *stream)
dprintf(stderr, "f_close: waiting for fill tread to finish\n");
pthread_join(cache[i].fill_thread, NULL);
+ cache[i].fill_thread = 0;
+
dprintf(stderr, "f_close: closing cache\n");
rval = fclose(cache[i].fd); /* close the stream */
free(cache[i].cache); /* free the cache */
commit 750e94fc6c1ef0fcd43c1692416a38413b5ee1e3
Author: GetAway <get-a...@t-online.de>
Date: Tue Jun 2 08:48:32 2015 +0200
netfile: never used value
Signed-off-by: GetAway <get-a...@t-online.de>
diff --git a/tuxbox/neutrino/src/driver/netfile.cpp
b/tuxbox/neutrino/src/driver/netfile.cpp
index 74b79ca..ea68226 100644
--- a/tuxbox/neutrino/src/driver/netfile.cpp
+++ b/tuxbox/neutrino/src/driver/netfile.cpp
@@ -1002,7 +1002,7 @@ FILE *f_open(const char *filename, const char *acctype)
case MODE_PLS: {
char *ptr2, /*buf[4096], use local buf from function */
servers[25][1024];
- int rval, retries = retry_num;
+ int /*rval,*/ retries = retry_num;
ptr = NULL;
/* fetch the playlist from the shoutcast directory with
our own */
@@ -1018,7 +1018,7 @@ FILE *f_open(const char *filename, const char *acctype)
/* operating system because we don't
need/want stream caching for */
/* this operation */
- rval = fread(buf, sizeof(char), 4096,
fd);
+ /*rval =*/fread(buf, sizeof(char),
4096, fd);
f_close(fd);
ptr = strstr(buf, "http://";);
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/data/locale/deutsch.locale | 2 +-
tuxbox/neutrino/src/driver/netfile.cpp | 20 +++++++++++++-------
tuxbox/neutrino/src/driver/netfile.h | 4 ++--
tuxbox/neutrino/src/gui/eventlist.cpp | 27 +++++++++++++++++++++++++--
tuxbox/neutrino/src/gui/sleeptimer.cpp | 8 +++++++-
5 files changed, 48 insertions(+), 13 deletions(-)
--
Tuxbox-GIT: apps
------------------------------------------------------------------------------
_______________________________________________
Tuxbox-cvs-commits mailing list
Tuxbox-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits
