[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-114-gdb94409
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-114-gdb94409
|
From: Thilo G. <tux...@ne...> - 2013-04-20 14:52:31
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via db94409e9100a7cac7f438cbd8aebce09c7b1126 (commit)
via decf127fbd8238669a220f8b8fb8eb0c347f72d0 (commit)
via 8a9877685eac6dfcb369666ee618a91566c32a87 (commit)
via 4a990011083f3edaa4766cf2fe21a2e1b92b74aa (commit)
via 14d932a2a82a2790ea5593d9319ac6b5d034fb8d (commit)
via 0bc7146dde19443cf74b25947fdad32af11ef60a (commit)
via 812420d89cfdff064a4ed95dd31672027a748c76 (commit)
via 25661a8ec03b6e358f3faedca629077f3301bfa0 (commit)
via 6dfc4a10ddee54d1243cb3d6ef0b0068054e9043 (commit)
via 8fce27f9f3bac0c2936dcb9cdf7758b812ccb741 (commit)
via aa9ed3a250e2199ae5926311bf96cf9d42edeadf (commit)
via 9d41be2229f2ddd54fdf91e70bdd1e0945d624b5 (commit)
via c71ced00b4b79a26748db8abfff073c0e2c4972b (commit)
via 0d8e87d0dd0d18733e718a672354c67f0ab23c52 (commit)
via 57fee374147866531f505b9e37980dd10cf6e9dd (commit)
via 0c6cca5f974ff1f8e1841ed9e69832a0094fa230 (commit)
via 35932730de5d5ef0a146422343614607a948e6af (commit)
via 2f44ca87959f0753f39be138bb83c04d454d8e80 (commit)
via 138640a39419b848f95aa3a1c404dcdc7df574ee (commit)
via 11be07035e47084cf84c49c08356568fca112a37 (commit)
via ffbe3fcb336710de2109934507a2c68378ac4c40 (commit)
via 9b99f1d5df316d295f3c3904eca50697bac6d92d (commit)
via fc737402d3d23b5ba0bb7dd9f4442860fa33536e (commit)
via 375f222b69f8e6a689a37b5913acd65d724f2074 (commit)
via 80ed9f3b85e299e0b8e5308ceba8133a0bac8b5c (commit)
from cf53e3b3fd4f361346e0d57cabea8cd0ffbb9622 (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 db94409e9100a7cac7f438cbd8aebce09c7b1126
Author: Christian Schuett <Gau...@ho...>
Date: Fri Apr 19 22:20:56 2013 +0200
Neutrino infoviewer: remove newline from the end of infotext
this avoids paragraph sign in infotext line
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 5a75a0f..f76a6fb 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -1836,13 +1836,16 @@ void CInfoViewer::showInfoFile()
return;
cnt = read(fd, infotext, 79);
- if (cnt < 0) {
+ if (cnt < 1) {
fprintf(stderr, "CInfoViewer::showInfoFile: could not read from infobar.txt: %m");
close(fd);
return;
}
close(fd);
- infotext[cnt] = '\0';
+ if (infotext[cnt-1] == '\n')
+ infotext[cnt-1] = '\0';
+ else
+ infotext[cnt] = '\0';
xStart = BoxStartX + ChanWidth + 40; // right of record icon
xEnd = BoxEndX - 125; // left of progressbar
commit decf127fbd8238669a220f8b8fb8eb0c347f72d0
Author: Christian Schuett <Gau...@ho...>
Date: Thu Apr 18 21:07:32 2013 +0200
Neutrino EPG Viewer: properly encode extended information
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index eaeb54b..1d9f964 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -552,7 +552,9 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
std::vector<std::string>::iterator description;
std::vector<std::string>::iterator item;
for (description = epgData.itemDescriptions.begin(), item = epgData.items.begin(); description != epgData.itemDescriptions.end(); ++description, ++item) {
- sprintf(line, "%s: %s", (*(description)).c_str(), (*(item)).c_str());
+ sprintf(line, "%s: %s",
+ (isUTF8(*description) ? (*description) : Latin1_to_UTF8(*description)).c_str(),
+ Latin1_to_UTF8(*item).c_str());
processTextToArray(line);
}
}
commit 8a9877685eac6dfcb369666ee618a91566c32a87
Author: Christian Schuett <Gau...@ho...>
Date: Thu Apr 18 20:07:01 2013 +0200
Neutrino: fix getting width of UTF-8 strings in some classes
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index addd988..27702cb 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -1737,7 +1737,7 @@ void CChannelList::processTextToArray(std::string text) // UTF-8
aktWord += *text_;
int aktWordWidth = g_Font[eventFont]->getRenderWidth(aktWord, true);
- if ((aktWordWidth+aktWidth)<(infozone_width - 20))
+ if ((aktWordWidth+aktWidth)<=(infozone_width - 20))
{//space ok, add
aktWidth += aktWordWidth;
aktLine += aktWord;
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 7fd692c..eaeb54b 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -180,8 +180,8 @@ void CEpgData::processTextToArray(std::string text, int screening) // UTF-8
aktWord += *text_;
// check the wordwidth - add to this line if size ok
- int aktWordWidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(aktWord);
- if((aktWordWidth+aktWidth)<(ox- 10- 15))
+ int aktWordWidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(aktWord, true);
+ if((aktWordWidth+aktWidth)<=(ox- 15- 15))
{//space ok, add
aktWidth += aktWordWidth;
aktLine += aktWord;
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index d4a733a..91edf50 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -850,7 +850,7 @@ void EventList::showFunctionBar (bool show)
}
frameBuffer->getIconSize(icon, &iconw, &iconh);
- cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption));
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption, true));
// paint 1st button
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[0]);
@@ -866,7 +866,7 @@ void EventList::showFunctionBar (bool show)
btncaption = g_Locale->getText(LOCALE_EVENTFINDER_SEARCH);
frameBuffer->getIconSize(icon, &iconw, &iconh);
- cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption));
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption, true));
// paint second button
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[1]);
@@ -891,7 +891,7 @@ void EventList::showFunctionBar (bool show)
}
frameBuffer->getIconSize(icon, &iconw, &iconh);
- cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption));
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption, true));
// paint 3rd button
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[2]);
@@ -907,7 +907,7 @@ void EventList::showFunctionBar (bool show)
btncaption = g_Locale->getText(LOCALE_EVENTLISTBAR_EVENTSORT);
frameBuffer->getIconSize(icon, &iconw, &iconh);
- cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption));
+ cellwidth = std::min(ButtonWidth, iconw + 4 + space + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(btncaption, true));
// paint 4th button
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, bx, by, ButtonWidth, 1, &EventListButtons[3]);
diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index edbd680..def4cb8 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -1345,13 +1345,13 @@ void CFileBrowser::paintHead()
/* too long? Leave out the "Filebrowser" or "Shoutcast" prefix
* the allocated space is sufficient since it is surely shorter than before */
- if (fnt_title->getRenderWidth(l_name) > width - 11)
+ if (fnt_title->getRenderWidth(l_name, true) > width - 11)
l = sprintf(l_name, "%s", FILESYSTEM_ENCODING_TO_UTF8_STRING(name).c_str());
if (l_name[l - 1] == '/')
l_name[--l] = '\0';
/* still too long? the last part is probably more interesting than the first part... */
- while ((fnt_title->getRenderWidth(&l_name[i]) > width - 11)
+ while ((fnt_title->getRenderWidth(&l_name[i], true) > width - 11)
&& (i < l))
i++;
@@ -1425,7 +1425,7 @@ void CFileBrowser::paintFoot()
char cKey[2] = {m_SMSKeyInput.getOldKey(), 0};
cKey[0] = toupper(cKey[0]);
int len = fnt_small->getRenderWidth(cKey);
- fnt_small->RenderString(x + width - 10 - len, by2 + foheight, len, cKey, COL_MENUHEAD, 0, true);
+ fnt_small->RenderString(x + width - 10 - len, by2 + foheight, len, cKey, COL_MENUHEAD);
}
}
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index bc50465..5a75a0f 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -1268,7 +1268,7 @@ void CInfoViewer::showMotorMoving(int duration)
strcat(text, buffer);
strcat(text, " s)");
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, text, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(text) + 10, duration); // UTF-8
+ ShowHintUTF(LOCALE_MESSAGEBOX_INFO, text, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(text, true) + 10, duration); // UTF-8
}
#ifdef ENABLE_RADIOTEXT
diff --git a/tuxbox/neutrino/src/gui/upnpbrowser.cpp b/tuxbox/neutrino/src/gui/upnpbrowser.cpp
index 06d7ff2..0600a55 100644
--- a/tuxbox/neutrino/src/gui/upnpbrowser.cpp
+++ b/tuxbox/neutrino/src/gui/upnpbrowser.cpp
@@ -917,7 +917,7 @@ void CUpnpBrowserGui::paintDevicePos(unsigned int pos)
std::string name = m_devices[pos + m_indexdevice].friendlyname;
- int w = g_Font[SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM]->getRenderWidth(name) + 5;
+ int w = g_Font[SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM]->getRenderWidth(name, true) + 5; // UTF-8
g_Font[SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM]->RenderString(m_x + 10, ypos + m_fheight, m_width - 30 - w,
num, color, m_fheight, true); // UTF-8
g_Font[SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM]->RenderString(m_x + m_width - 15 - w, ypos + m_fheight,
diff --git a/tuxbox/neutrino/src/gui/widget/textbox.cpp b/tuxbox/neutrino/src/gui/widget/textbox.cpp
index 663f2c2..585e630 100644
--- a/tuxbox/neutrino/src/gui/widget/textbox.cpp
+++ b/tuxbox/neutrino/src/gui/widget/textbox.cpp
@@ -404,7 +404,7 @@ void CTextBox::refreshTextLineArray(void)
}
aktWord = m_cText.substr(pos_prev, pos - pos_prev + 1);
- aktWordWidth = m_pcFontText->getRenderWidth(aktWord);
+ aktWordWidth = m_pcFontText->getRenderWidth(aktWord, true);
pos_prev = pos + 1;
//if(aktWord.find(""") == )
if(1)
@@ -558,7 +558,7 @@ void CTextBox::refreshText(void)
if( m_nMode & CENTER )
{
- x_center = (m_cFrameTextRel.iWidth - m_pcFontText->getRenderWidth(m_cLineArray[i]))>>1;
+ x_center = (m_cFrameTextRel.iWidth - m_pcFontText->getRenderWidth(m_cLineArray[i]), true)>>1;
}
m_pcWindow->RenderString( m_pcFontText,
commit 4a990011083f3edaa4766cf2fe21a2e1b92b74aa
Author: Christian Schuett <Gau...@ho...>
Date: Thu Apr 18 19:13:29 2013 +0200
Neutrino file browser: fix typo in SMS key input
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index a1c3571..edbd680 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -184,7 +184,7 @@ unsigned char SMSKeyInput::handleMsg(const neutrino_msg_t msg)
else if(m_oldKey == 'r' && timeoutNotReached)
key = 's';
else if(m_oldKey == 's' && timeoutNotReached)
- key = 's';
+ key = '7';
else
key = 'p';
}
commit 14d932a2a82a2790ea5593d9319ac6b5d034fb8d
Author: Christian Schuett <Gau...@ho...>
Date: Wed Apr 17 18:37:42 2013 +0200
Neutrino infoviewer: satfind values are not UTF-8 encoded
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 43330c1..bc50465 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -186,24 +186,24 @@ void CInfoViewer::showSatfind()
frameBuffer->paintBoxRel(ChanInfoX, BoxEndY, BoxEndX-ChanInfoX, 30, COL_INFOBAR_PLUS_0);
sprintf (percent, "sig %d%%", sig);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 10, BoxEndY+ 25, BoxEndX- ChanInfoX- 10, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 10, BoxEndY+ 25, BoxEndX- ChanInfoX- 10, percent, COL_INFOBAR_PLUS_0);
percent_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(percent);
pbsig.paintProgressBar(ChanInfoX+ 10+ percent_width+ 5, BoxEndY+ 7, 60, 15, sig, 100, 0, 0, COL_INFOBAR_PLUS_0, 0, "", COL_INFOBAR);
sprintf (percent, "snr %d%%", snr);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 140, BoxEndY+ 25, BoxEndX- ChanInfoX- 140, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 140, BoxEndY+ 25, BoxEndX- ChanInfoX- 140, percent, COL_INFOBAR_PLUS_0);
percent_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(percent);
pbsnr.paintProgressBar(ChanInfoX+ 140+ percent_width+ 5, BoxEndY+ 7, 60, 15, snr, 100, 0, 0, COL_INFOBAR_PLUS_0, 0, "", COL_INFOBAR);
sprintf (percent, "ber %d%%", ber);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 270, BoxEndY+ 25, BoxEndX- ChanInfoX- 270, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 270, BoxEndY+ 25, BoxEndX- ChanInfoX- 270, percent, COL_INFOBAR_PLUS_0);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 350, BoxEndY+ 25, BoxEndX- ChanInfoX- 350, freq, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 350, BoxEndY+ 25, BoxEndX- ChanInfoX- 350, freq, COL_INFOBAR_PLUS_0);
if (satpos != 0 && (g_info.delivery_system == DVB_S))
{
sprintf (pos, "%d.%d%c", satpos < 0 ? -satpos / 10 : satpos / 10, satpos < 0 ? -satpos % 10 : satpos % 10, satpos < 0 ? 'W' : 'E');
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(BoxEndX- 60, BoxEndY+ 25, 60, pos, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(BoxEndX- 60, BoxEndY+ 25, 60, pos, COL_INFOBAR_PLUS_0);
}
}
}
commit 0bc7146dde19443cf74b25947fdad32af11ef60a
Author: Christian Schuett <Gau...@ho...>
Date: Tue Apr 16 21:12:09 2013 +0200
sectionsd: remove unnecessary SIevent creation
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
index 0e2cdf2..0fb246a 100644
--- a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
@@ -706,24 +706,15 @@ static void addEvent(const SIevent &evt, const time_t zeit, bool cn = false)
if (evt.get_channel_id() == messaging_current_servicekey && // but only if it is the current channel...
(messaging_got_CN != 0x03)) { // ...and if we don't have them already.
unlockMessaging();
- SIevent *eptr = new SIevent(evt);
- if (!eptr)
- {
- printf("[sectionsd::addEvent] new SIevent1 failed.\n");
- throw std::bad_alloc();
- }
-
- SIeventPtr e(eptr);
-
writeLockEvents();
- if (e->runningStatus() > 2) { // paused or currently running
- if (!myCurrentEvent || (myCurrentEvent && (*myCurrentEvent).uniqueKey() != e->uniqueKey())) {
+ if (evt.runningStatus() > 2) { // paused or currently running
+ if (!myCurrentEvent || (myCurrentEvent && (*myCurrentEvent).uniqueKey() != evt.uniqueKey())) {
if (myCurrentEvent)
delete myCurrentEvent;
myCurrentEvent = new SIevent(evt);
writeLockMessaging();
messaging_got_CN |= 0x01;
- if (myNextEvent && (*myNextEvent).uniqueKey() == e->uniqueKey()) {
+ if (myNextEvent && (*myNextEvent).uniqueKey() == evt.uniqueKey()) {
dprintf("addevent-cn: removing next-event\n");
/* next got "promoted" to current => trigger re-read */
delete myNextEvent;
@@ -732,17 +723,17 @@ static void addEvent(const SIevent &evt, const time_t zeit, bool cn = false)
}
unlockMessaging();
dprintf("addevent-cn: added running (%d) event 0x%04x '%s'\n",
- e->runningStatus(), e->eventID, e->getName().c_str());
+ evt.runningStatus(), evt.eventID, evt.getName().c_str());
} else {
writeLockMessaging();
messaging_got_CN |= 0x01;
unlockMessaging();
dprintf("addevent-cn: not add runn. (%d) event 0x%04x '%s'\n",
- e->runningStatus(), e->eventID, e->getName().c_str());
+ evt.runningStatus(), evt.eventID, evt.getName().c_str());
}
} else {
- if ((!myNextEvent || (myNextEvent && (*myNextEvent).uniqueKey() != e->uniqueKey() && (*myNextEvent).times.begin()->startzeit < e->times.begin()->startzeit)) &&
- (!myCurrentEvent || (myCurrentEvent && (*myCurrentEvent).uniqueKey() != e->uniqueKey()))) {
+ if ((!myNextEvent || (myNextEvent && (*myNextEvent).uniqueKey() != evt.uniqueKey() && (*myNextEvent).times.begin()->startzeit < evt.times.begin()->startzeit)) &&
+ (!myCurrentEvent || (myCurrentEvent && (*myCurrentEvent).uniqueKey() != evt.uniqueKey()))) {
if (myNextEvent)
delete myNextEvent;
myNextEvent = new SIevent(evt);
@@ -750,10 +741,10 @@ static void addEvent(const SIevent &evt, const time_t zeit, bool cn = false)
messaging_got_CN |= 0x02;
unlockMessaging();
dprintf("addevent-cn: added next (%d) event 0x%04x '%s'\n",
- e->runningStatus(), e->eventID, e->getName().c_str());
+ evt.runningStatus(), evt.eventID, evt.getName().c_str());
} else {
dprintf("addevent-cn: not added next(%d) event 0x%04x '%s'\n",
- e->runningStatus(), e->eventID, e->getName().c_str());
+ evt.runningStatus(), evt.eventID, evt.getName().c_str());
writeLockMessaging();
messaging_got_CN |= 0x02;
unlockMessaging();
commit 812420d89cfdff064a4ed95dd31672027a748c76
Author: Christian Schuett <Gau...@ho...>
Date: Tue Apr 16 20:47:02 2013 +0200
Neutrino infoviewer: move global vars into class
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 2f4b427..43330c1 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -91,13 +91,8 @@ extern "C" int tuxtxt_start(int tpid);
extern "C" int tuxtxt_stop();
#endif
-int time_left_width;
-int time_dot_width;
-int time_width;
-int time_height;
-char old_timestr[10];
/* hack: remember the last shown event IDs to reduce flickering */
-static event_id_t last_curr_id = 0, last_next_id = 0;
+event_id_t CInfoViewer::last_curr_id = 0, CInfoViewer::last_next_id = 0;
extern CZapitClient::SatelliteList satList;
diff --git a/tuxbox/neutrino/src/gui/infoviewer.h b/tuxbox/neutrino/src/gui/infoviewer.h
index 3fbcde5..18e1520 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.h
+++ b/tuxbox/neutrino/src/gui/infoviewer.h
@@ -90,6 +90,14 @@ class CInfoViewer
CSectionsdClient::CurrentNextInfo oldinfo;
t_channel_id channel_id;
+ int time_left_width;
+ int time_dot_width;
+ int time_width;
+ int time_height;
+ char old_timestr[10];
+
+ static event_id_t last_curr_id, last_next_id;
+
char aspectRatio;
uint sec_timer_id;
commit 25661a8ec03b6e358f3faedca629077f3301bfa0
Author: Christian Schuett <Gau...@ho...>
Date: Tue Apr 16 20:12:09 2013 +0200
Neutrino timer list: calculate width of time column
with smaller horizontal font scale factor the space between time
column and other infos grows unnecessary
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index 94c1c7b..94217a9 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -439,6 +439,7 @@ int CTimerList::show()
frameBuffer->getIconSize(NEUTRINO_ICON_TIMER, &iconw, &iconh);
theight = std::max(iconh, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight());
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
+ time_width = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth("00.00. 00:00 ");
neutrino_msg_t msg;
neutrino_msg_data_t data;
@@ -617,12 +618,12 @@ void CTimerList::paintItem(int pos)
char zStopTime[25] = {0};
struct tm *stopTime = localtime(&(timer.stopTime));
strftime(zStopTime,20,"%d.%m. %H:%M",stopTime);
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+fheight, 150, zAlarmTime, color, fheight, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, ypos+fheight, time_width, zAlarmTime, color, fheight, true); // UTF-8
if(timer.stopTime != 0)
{
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10,ypos+2*fheight, 150, zStopTime, color, fheight, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10, ypos+2*fheight, time_width, zStopTime, color, fheight, true); // UTF-8
}
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+160,ypos+fheight, (real_width-160)/2-5, convertTimerRepeat2String(timer.eventRepeat), color, fheight, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10+time_width, ypos+fheight, (real_width-10-time_width)/2-5, convertTimerRepeat2String(timer.eventRepeat), color, fheight, true); // UTF-8
if (timer.eventRepeat != CTimerd::TIMERREPEAT_ONCE)
{
@@ -633,9 +634,9 @@ void CTimerList::paintItem(int pos)
sprintf(srepeatcount,"00");
else
sprintf(srepeatcount,"%ux",timer.repeatCount);
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+160+(real_width-300)/2,ypos+fheight, (real_width-160)/2-5, srepeatcount, color, fheight, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10+time_width+(real_width-10-time_width-140)/2, ypos+fheight, (real_width-10-time_width)/2-5, srepeatcount, color, fheight, true); // UTF-8
}
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+160+(real_width-160)/2,ypos+fheight, (real_width-160)/2-5, convertTimerType2String(timer.eventType), color, fheight, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10+time_width+(real_width-10-time_width)/2, ypos+fheight, (real_width-10-time_width)/2-5, convertTimerType2String(timer.eventType), color, fheight, true); // UTF-8
std::string zAddData("");
switch(timer.eventType)
{
@@ -706,7 +707,7 @@ void CTimerList::paintItem(int pos)
break;
default:{}
}
- g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+160,ypos+2*fheight, real_width-165, zAddData, color, fheight, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+10+time_width, ypos+2*fheight, real_width-10-time_width-5, zAddData, color, fheight, true); // UTF-8
// LCD Display
if(liststart+pos==selected)
{
diff --git a/tuxbox/neutrino/src/gui/timerlist.h b/tuxbox/neutrino/src/gui/timerlist.h
index 4c62aef..716d613 100644
--- a/tuxbox/neutrino/src/gui/timerlist.h
+++ b/tuxbox/neutrino/src/gui/timerlist.h
@@ -51,6 +51,7 @@ class CTimerList : public CMenuTarget
unsigned int listmaxshow;
int fheight; //fontheight timerlist-content (text)
int theight; //fontheight timerlist-title
+ int time_width;
bool visible;
CTimerdClient *Timer;
commit 6dfc4a10ddee54d1243cb3d6ef0b0068054e9043
Author: Stefan Seyfried <se...@tu...>
Date: Mon Apr 15 17:59:50 2013 +0200
auto-enumerate FONT_TYPE_COUNT instead of defining it
Signed-off-by: GetAway <get...@t-...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/global.h b/tuxbox/neutrino/src/global.h
index 496bd1e..3033576 100644
--- a/tuxbox/neutrino/src/global.h
+++ b/tuxbox/neutrino/src/global.h
@@ -68,7 +68,7 @@ NEUTRINO_CPP CTimerdClient *g_Timerd;
NEUTRINO_CPP FBFontRenderClass *g_fontRenderer;
-NEUTRINO_CPP Font *g_Font[FONT_TYPE_COUNT];
+NEUTRINO_CPP Font *g_Font[SNeutrinoSettings::FONT_TYPE_COUNT];
NEUTRINO_CPP CRCInput *g_RCInput;
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index 904126f..7c3f292 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -288,7 +288,7 @@ CNeutrinoApp* CNeutrinoApp::getInstance()
}
-const font_sizes_struct neutrino_font[FONT_TYPE_COUNT] =
+const font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
{
{LOCALE_FONTSIZE_MENU , 20, FONT_STYLE_BOLD , 0},
{LOCALE_FONTSIZE_MENU_TITLE , 30, FONT_STYLE_BOLD , 0},
@@ -1766,7 +1766,7 @@ void CNeutrinoApp::SetupFonts()
else
style[2] = g_fontRenderer->AddFont(font.filename[2]);
- for (int i = 0; i < FONT_TYPE_COUNT; i++)
+ for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++)
{
g_Font[i] = g_fontRenderer->getFont(fontname, style[neutrino_font[i].style], configfile.getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize) + neutrino_font[i].size_offset * font.size_offset);
}
diff --git a/tuxbox/neutrino/src/system/settings.h b/tuxbox/neutrino/src/system/settings.h
index 9b961ff..b78ecac 100644
--- a/tuxbox/neutrino/src/system/settings.h
+++ b/tuxbox/neutrino/src/system/settings.h
@@ -369,31 +369,31 @@ struct SNeutrinoSettings
// Font sizes
-#define FONT_TYPE_COUNT 23
enum FONT_TYPES {
- FONT_TYPE_MENU = 0,
- FONT_TYPE_MENU_TITLE = 1,
- FONT_TYPE_MENU_INFO = 2,
- FONT_TYPE_EPG_TITLE = 3,
- FONT_TYPE_EPG_INFO1 = 4,
- FONT_TYPE_EPG_INFO2 = 5,
- FONT_TYPE_EPG_DATE = 6,
- FONT_TYPE_EVENTLIST_TITLE = 7,
- FONT_TYPE_EVENTLIST_ITEMLARGE = 8,
- FONT_TYPE_EVENTLIST_ITEMSMALL = 9,
- FONT_TYPE_EVENTLIST_DATETIME = 10,
- FONT_TYPE_GAMELIST_ITEMLARGE = 11,
- FONT_TYPE_GAMELIST_ITEMSMALL = 12,
- FONT_TYPE_CHANNELLIST = 13,
- FONT_TYPE_CHANNELLIST_DESCR = 14,
- FONT_TYPE_CHANNELLIST_NUMBER = 15,
- FONT_TYPE_CHANNELLIST_EVENT = 16,
- FONT_TYPE_CHANNEL_NUM_ZAP = 17,
- FONT_TYPE_INFOBAR_NUMBER = 18,
- FONT_TYPE_INFOBAR_CHANNAME = 19,
- FONT_TYPE_INFOBAR_INFO = 20,
- FONT_TYPE_INFOBAR_SMALL = 21,
- FONT_TYPE_FILEBROWSER_ITEM = 22
+ FONT_TYPE_MENU = 0,
+ FONT_TYPE_MENU_TITLE,
+ FONT_TYPE_MENU_INFO,
+ FONT_TYPE_EPG_TITLE,
+ FONT_TYPE_EPG_INFO1,
+ FONT_TYPE_EPG_INFO2,
+ FONT_TYPE_EPG_DATE,
+ FONT_TYPE_EVENTLIST_TITLE,
+ FONT_TYPE_EVENTLIST_ITEMLARGE,
+ FONT_TYPE_EVENTLIST_ITEMSMALL,
+ FONT_TYPE_EVENTLIST_DATETIME,
+ FONT_TYPE_GAMELIST_ITEMLARGE,
+ FONT_TYPE_GAMELIST_ITEMSMALL,
+ FONT_TYPE_CHANNELLIST,
+ FONT_TYPE_CHANNELLIST_DESCR,
+ FONT_TYPE_CHANNELLIST_NUMBER,
+ FONT_TYPE_CHANNELLIST_EVENT,
+ FONT_TYPE_CHANNEL_NUM_ZAP,
+ FONT_TYPE_INFOBAR_NUMBER,
+ FONT_TYPE_INFOBAR_CHANNAME,
+ FONT_TYPE_INFOBAR_INFO,
+ FONT_TYPE_INFOBAR_SMALL,
+ FONT_TYPE_FILEBROWSER_ITEM,
+ FONT_TYPE_COUNT
};
// lcdd
commit 8fce27f9f3bac0c2936dcb9cdf7758b812ccb741
Author: Christian Schuett <Gau...@ho...>
Date: Sun Apr 14 21:24:14 2013 +0200
Neutrino infoviewer: fix paint of satfind progressbars
with smaller horizontal font scale factor it looks like the progressbars
belong to the value on its right instead of its left
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index 67d9eb4..2f4b427 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -163,6 +163,7 @@ void CInfoViewer::showSatfind()
char freq[20];
char percent[10];
char pos[6];
+ int percent_width;
int sig;
int snr;
int ber;
@@ -191,11 +192,13 @@ void CInfoViewer::showSatfind()
sprintf (percent, "sig %d%%", sig);
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 10, BoxEndY+ 25, BoxEndX- ChanInfoX- 10, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
- pbsig.paintProgressBar(ChanInfoX+ 72, BoxEndY+ 7, 60, 15, sig, 100, 0, 0, COL_INFOBAR_PLUS_0, 0, "", COL_INFOBAR);
+ percent_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(percent);
+ pbsig.paintProgressBar(ChanInfoX+ 10+ percent_width+ 5, BoxEndY+ 7, 60, 15, sig, 100, 0, 0, COL_INFOBAR_PLUS_0, 0, "", COL_INFOBAR);
sprintf (percent, "snr %d%%", snr);
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 140, BoxEndY+ 25, BoxEndX- ChanInfoX- 140, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
- pbsnr.paintProgressBar(ChanInfoX+202 , BoxEndY+ 7, 60, 15, snr, 100, 0, 0, COL_INFOBAR_PLUS_0, 0, "", COL_INFOBAR);
+ percent_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(percent);
+ pbsnr.paintProgressBar(ChanInfoX+ 140+ percent_width+ 5, BoxEndY+ 7, 60, 15, snr, 100, 0, 0, COL_INFOBAR_PLUS_0, 0, "", COL_INFOBAR);
sprintf (percent, "ber %d%%", ber);
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX+ 270, BoxEndY+ 25, BoxEndX- ChanInfoX- 270, percent, COL_INFOBAR_PLUS_0, 0, true); // UTF-8
commit aa9ed3a250e2199ae5926311bf96cf9d42edeadf
Author: GetAway <get...@t-...>
Date: Sat Apr 13 10:51:52 2013 +0200
yWeb: improve LiveTV udpstreaming
use deamonized 'udpstreamts'
Thanks arno-neutrinoTV for reporting.
Thread: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=46095&start=25&hilit=udpstreamts
fix switching streamts <-> udpstreamts
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
index 9127d39..8cd0489 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.js
@@ -4,17 +4,20 @@
*/
/*globals*/
var V2 = null;
-var IsUDP = false;
+var isUDP = false;
+var haveUDP = false;
var IsTimeshift = true; //TEST
var IsLocked = false;
var IsMute = false;
+var isDeinterlace = true;
var vlc_width = 384;
var vlc_height = 288;
var Window_delta_w = 0;
var Window_delta_h = 0;
var Mode = "tv";
var AudioChannel = 0;
-var isSubs=false;
+var isSubs = false;
+var cachetime = 0;
/*resize,init*/
function do_onload()
{
@@ -22,11 +25,16 @@ function do_onload()
Mode = "tv";
set_controls("disable");
if(isUDP && Mode == "tv")
- id('udp').checked = true;
+ change_button_img('udp',"udp_switch_off");
else if(Mode == "tv")
- id('udp').checked = false;
+ change_button_img('udp',"udp_switch_on");
window.setTimeout("do_init()",300);
}
+function do_unload()
+{
+ if(isUDP)
+ loadXMLDoc("/control/exec?api&udp_stream&stop", dummy);
+}
function do_onresize()
{
if((vlc_width+Window_delta_w != window.innerWidth) || (vlc_height+Window_delta_h != window.innerHeight)){
@@ -139,7 +147,7 @@ function set_controls(state)
obj_enable('transcode', play && opt);
}
if(Mode == "tv"){
- show_obj('have_udp',haveUDP);
+ show_obj('udp',haveUDP);
obj_enable('udp', go);
obj_enable('fullscreen', play);
show_obj('snapshot',(plugin != "moz3"));
@@ -156,12 +164,12 @@ function do_play()
options.push(":vout-filter=deinterlace");
options.push(":deinterlace-mode=bob");
}
- if(id('udp').checked && Mode == "tv"){
+ if(isUDP && Mode == "tv"){
options.push(":access-filter=timeshift");
}
- else
- if(cachetime > 0)
+ else if(cachetime > 0){
options.push(":http-caching="+cachetime);
+ }
if(AudioChannel != 0)
options.push(":audio-track="+AudioChannel);
}
@@ -170,7 +178,7 @@ function do_play()
function start_udp_server()
{
var pids = loadSyncURL("/control/yweb?video_stream_pids=0&no_commas=true");
- var args = ClientAddr+" 31330 0 "+pids;
+ var args = "-b /dev/null "+ClientAddr+" 31330 0 "+pids;
var _cmd = "udp_stream start "+args;
var __cmd = _cmd.replace(/ /g, "&");
loadXMLDoc("/control/exec?Y_Live&"+__cmd, dummy);
@@ -180,6 +188,8 @@ function do_stop()
V2.stop();
while(V2.is_playing())
;
+ if(isUDP)
+ loadXMLDoc("/control/exec?api&udp_stream&stop", dummy);
change_button_img('PlayOrPause',"play");
set_controls("stop");
}
@@ -197,15 +207,22 @@ function do_play_state(_state, _options)
_options.push(":input-repeat=1");
V2.options = _options;
var mrl = "";
- if(Mode == "tv" && id('udp').checked)
+ if(Mode == "tv" && isUDP)
mrl = "udp://@:31330";
- else
+ else {
+ if(Mode == "tv") {
+ loadXMLDoc("/control/exec?Y_Live&udp_stream&stop", dummy);
+ }
mrl = loadSyncURL("/control/build_live_url");
+ }
V2.set_actual_mrl(mrl);
V2.play();
V2.next();
set_controls("play");
- if(Mode == "tv" && id('udp').checked)
+ if(isDeinterlace && V2.plugin=="moz2"){
+ V2.vlc.video.deinterlace.enable("bob");
+ }
+ if(Mode == "tv" && isUDP)
window.setTimeout("start_udp_server()",1000);
}
function do_play_or_pause()
@@ -218,7 +235,7 @@ function do_play_or_pause()
change_button_img('PlayOrPause',"pause");
V2.play();
set_controls("play");
- if(id('udp').checked)
+ if(isUDP)
window.setTimeout("start_udp_server()",1000);
}
}
@@ -298,6 +315,7 @@ function build_subchannels()
}
function change_channel_play()
{
+ insert_vlc_control();
do_play();
if (V2.have_options() && Mode == "tv") {
build_audio_pid_list();
@@ -329,6 +347,13 @@ function do_mute_toggle()
IsMute = !IsMute;
V2.toggle_mute();
}
+function do_udp_toggle()
+{
+ change_button_img('udp', (isUDP)?"udp_switch_on":"udp_switch_off");
+ isUDP = !isUDP;
+ do_stop();
+ do_play();
+}
function view_streaminfo()
{
window.open("/fb/info.dbox2","streaminfo","width=400,height=400");
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
index 80e3199..df26a17 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
@@ -50,7 +50,7 @@ function view_transcode_mode()
//]]>
</script>
</head>
-<body>
+<body onunload="do_unload()">
{=var-set:wait_text=Streaming-Informationen<br/>werden ermittelt.=}{=include-block:Y_Blocks.txt;snip_wait=}
<div id="live_panel">
<form name="x" action="" method="get">
@@ -118,7 +118,8 @@ function view_transcode_mode()
<img src="/images/livelock.png"></button>
{=if-equal:{=mode=}~tv~
- <span id="have_udp" style="visibility:hidden"><input type="checkbox" id="udp" title="UDP Streaming"/>UDP</span>
+ <button class="y_live_button" type="button" value="set" title="UDP Streaming" id="udp" onclick="do_udp_toggle()" style="visibility:hidden">
+ <img src="/images/udp_switch_on.png"/></button>
<button class="y_live_button" type="button" value="set" title="LiveView settings" id="settings" onclick="view_settings_mode()">
<img src="/images/properties.png"></button>
<button class="y_live_button" type="button" value="S" title="create snapshot picture" id="snapshot" onclick="V2.snapshot()" style="visibility:hidden">
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 9707a05..e4675dd 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,5 +1,5 @@
-version=2.7.0.23
-date=04.09.2013
+version=2.7.0.24
+date=12.04.2013
type=Release
info=
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Live.sh b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Live.sh
index 877dae8..c74e346 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Live.sh
+++ b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Live.sh
@@ -95,15 +95,16 @@ case "$1" in
killall udpstreamts
if [ -e /var/bin/udpstreamts ]
then
- /var/bin/udpstreamts $* &
+ /var/bin/udpstreamts $*
else
- udpstreamts $* &
+ udpstreamts $*
fi
pidof udpstreamts >/tmp/udpstreamts.pid
fi
if [ "$2" = "stop" ]
then
killall udpstreamts
+ rm /tmp/udpstreamts.pid
fi
;;
commit 9d41be2229f2ddd54fdf91e70bdd1e0945d624b5
Author: GetAway <get...@t-...>
Date: Fri Apr 12 21:46:33 2013 +0200
yWeb LiveTV: add two new icons-> udp on/off
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/udp_switch_off.png b/tuxbox/neutrino/daemons/nhttpd/web/images/udp_switch_off.png
new file mode 100644
index 0000000..66217f5
Binary files /dev/null and b/tuxbox/neutrino/daemons/nhttpd/web/images/udp_switch_off.png differ
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/udp_switch_on.png b/tuxbox/neutrino/daemons/nhttpd/web/images/udp_switch_on.png
new file mode 100644
index 0000000..a2c5124
Binary files /dev/null and b/tuxbox/neutrino/daemons/nhttpd/web/images/udp_switch_on.png differ
commit c71ced00b4b79a26748db8abfff073c0e2c4972b
Author: GetAway <get...@t-...>
Date: Fri Apr 12 21:01:08 2013 +0200
fontrenderer: init colors and make it static
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/driver/fontrenderer.cpp b/tuxbox/neutrino/src/driver/fontrenderer.cpp
index aefeb31..459f1c1 100644
--- a/tuxbox/neutrino/src/driver/fontrenderer.cpp
+++ b/tuxbox/neutrino/src/driver/fontrenderer.cpp
@@ -392,7 +392,7 @@ void Font::RenderString(int x, int y, const int width, const char *text, const u
#ifdef FB_USE_PALETTE
#define PRE_CALC_TRANSLATION_TABLE
#ifdef PRE_CALC_TRANSLATION_TABLE
- fb_pixel_t colors[256];
+ static fb_pixel_t colors[256] = {0};
int coff = 7 - ((color + 2) & 7);
for (int i = (256 - 32); i >= 0; i -= 32)
@@ -429,7 +429,7 @@ void Font::RenderString(int x, int y, const int width, const char *text, const u
int deltab = (((int)bgcolor >> bo) & ((1 << bl) - 1)) - fgb;
int deltat = (((int)bgcolor >> to) & ((1 << tl) - 1)) - fgt;
- fb_pixel_t colors[256];
+ static fb_pixel_t colors[256] = {0};
for (int i = 0; i < 256; i++)
{
commit 0d8e87d0dd0d18733e718a672354c67f0ab23c52
Author: Christian Schuett <Gau...@ho...>
Date: Fri Apr 12 19:41:05 2013 +0200
Neutrino channel list: fix height calculation if font sizes differ
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 517f883..addd988 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -155,11 +155,12 @@ void CChannelList::calcSize()
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &icol_h);
theight = std::max(theight, icol_h);
- fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
- if (fheight == 0)
- fheight = 1; /* avoid crash on invalid font */
+ fheight = std::max(g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight(),
+ std::max(g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight(),
+ std::max(g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getHeight(),
+ 1))); /* min 1 to avoid crash on invalid font */
- info_height = 2*fheight + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight() + 10;
+ info_height = 3*fheight + 10;
height = h_max(576, info_height);
listmaxshow = (height - theight - footerHeight -0)/fheight;
commit 57fee374147866531f505b9e37980dd10cf6e9dd
Author: Christian Schuett <Gau...@ho...>
Date: Fri Apr 12 19:35:26 2013 +0200
Neutrino OSD setup: fix count of entries in font sizes groups
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/osd_setup.cpp b/tuxbox/neutrino/src/gui/osd_setup.cpp
index 4890d30..70b1bf8 100644
--- a/tuxbox/neutrino/src/gui/osd_setup.cpp
+++ b/tuxbox/neutrino/src/gui/osd_setup.cpp
@@ -102,8 +102,8 @@ const SNeutrinoSettings::FONT_TYPES other_font_sizes[4] =
font_sizes_groups font_sizes_groups[6] =
{
- {LOCALE_FONTMENU_CHANNELLIST, 4, channellist_font_sizes, "fontsize.dcha"},
- {LOCALE_FONTMENU_EVENTLIST , 5, eventlist_font_sizes , "fontsize.deve"},
+ {LOCALE_FONTMENU_CHANNELLIST, 5, channellist_font_sizes, "fontsize.dcha"},
+ {LOCALE_FONTMENU_EVENTLIST , 4, eventlist_font_sizes , "fontsize.deve"},
{LOCALE_FONTMENU_EPG , 4, epg_font_sizes , "fontsize.depg"},
{LOCALE_FONTMENU_INFOBAR , 4, infobar_font_sizes , "fontsize.dinf"},
{LOCALE_FONTMENU_GAMELIST , 2, gamelist_font_sizes , "fontsize.dgam"},
commit 0c6cca5f974ff1f8e1841ed9e69832a0094fa230
Author: Christian Schuett <Gau...@ho...>
Date: Wed Apr 10 19:45:48 2013 +0200
Neutrino EPG Viewer: add missing hide() if no epg info found
this scales big fonts back to normal
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index e1f12a3..7fd692c 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -476,6 +476,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
if (epgData.title.empty()) /* no epg info found */
{
ShowLocalizedHint(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NOTFOUND);
+ hide();
return res;
}
commit 35932730de5d5ef0a146422343614607a948e6af
Author: Christian Schuett <Gau...@ho...>
Date: Wed Apr 10 19:12:42 2013 +0200
Neutrino EPG Plus: remove duplicate code
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/epgplus.cpp b/tuxbox/neutrino/src/gui/epgplus.cpp
index 4e422b5..68fad22 100644
--- a/tuxbox/neutrino/src/gui/epgplus.cpp
+++ b/tuxbox/neutrino/src/gui/epgplus.cpp
@@ -604,15 +604,6 @@ void EpgPlus::Footer::paintButtons(button_label* _buttonLabels, int numberOfButt
EpgPlus::EpgPlus()
{
frameBuffer = CFrameBuffer::getInstance();
-
- currentViewMode = ViewMode_Scroll;
- currentSwapMode = SwapMode_ByPage;
-
- // this->usableScreenWidth = 580;
- // this->usableScreenHeight = 480;
- usableScreenWidth = w_max(720, 4);
- usableScreenHeight = h_max(576, 4);
-
selectedChannelEntry = NULL;
init();
}
commit 2f44ca87959f0753f39be138bb83c04d454d8e80
Author: Christian Schuett <Gau...@ho...>
Date: Tue Apr 9 20:54:11 2013 +0200
Neutrino: change locale string recordingmenu.choose_direct_rec_dir
the setting 'recording_choose_direct_rec_dir' is not only used for
immediate recordings but also for adding recording timers in event
list, EPG Viewer and EPG Plus
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_neutrino_Blocks.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_neutrino_Blocks.txt
index 516e7fd..cdc0b74 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_neutrino_Blocks.txt
@@ -1398,8 +1398,8 @@ start-block~neutrino_form-data_direct_recording
<input type="radio" name="recordingmenu_gen_psi" value="true"/>AN
</td>
</tr>
- <tr title="Choose directory on record: off/on">
- <td>Bei Sofortaufn. Verzeichnisauswahl</td>
+ <tr title="Choose directory: off/on">
+ <td>Verzeichnisauswahl anzeigen</td>
<td>
<input type="radio" name="recording_choose_direct_rec_dir" value="0"/>AUS
<input type="radio" name="recording_choose_direct_rec_dir" value="1"/>AN
diff --git a/tuxbox/neutrino/data/locale/deutsch.locale b/tuxbox/neutrino/data/locale/deutsch.locale
index ad099db..217ee0e 100644
--- a/tuxbox/neutrino/data/locale/deutsch.locale
+++ b/tuxbox/neutrino/data/locale/deutsch.locale
@@ -1175,7 +1175,7 @@ recordingmenu.apids Voreinstellung für Tonspuren
recordingmenu.apids_ac3 AC3 Tonspuren aufnehmen
recordingmenu.apids_alt Alternative Tonspuren aufn.
recordingmenu.apids_std Standard Tonspur aufnehmen
-recordingmenu.choose_direct_rec_dir Bei Sofortaufn. Verzeichnisauswahl
+recordingmenu.choose_direct_rec_dir Verzeichnisauswahl anzeigen
recordingmenu.defdir Aufnahmeverzeichnis
recordingmenu.dir Verzeichnis
recordingmenu.dir_permissions Verzeichnisrechte
diff --git a/tuxbox/neutrino/data/locale/english.locale b/tuxbox/neutrino/data/locale/english.locale
index cdbb5d5..f6fa95e 100644
--- a/tuxbox/neutrino/data/locale/english.locale
+++ b/tuxbox/neutrino/data/locale/english.locale
@@ -1175,7 +1175,7 @@ recordingmenu.apids Default Audio Streams
recordingmenu.apids_ac3 Record AC3 Streams
recordingmenu.apids_alt Record Alternative Streams
recordingmenu.apids_std Record Standard Stream
-recordingmenu.choose_direct_rec_dir Choose Directory on Recording
+recordingmenu.choose_direct_rec_dir Choose Directory
recordingmenu.defdir Recording Directory
recordingmenu.dir Directory
recordingmenu.dir_permissions Directory Permissions
commit 138640a39419b848f95aa3a1c404dcdc7df574ee
Author: Christian Schuett <Gau...@ho...>
Date: Tue Apr 9 20:32:00 2013 +0200
Neutrino event list: fix paint after choosing recording directory
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index dcd87c0..d4a733a 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -398,7 +398,9 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
hide();
recDirs.exec(NULL,"");
+ paintHead();
paint();
+ showFunctionBar(true);
recDir = recDirs.get_selected_dir();
}
commit 11be07035e47084cf84c49c08356568fca112a37
Author: Jacek Jendrzej <cra...@go...>
Date: Tue Apr 9 18:09:05 2013 +0200
Y-Web/Y_VLC.js: fix vlc version parse
Signed-off-by: GetAway <get...@t-...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
index d0f7bfd..88bfd11 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_VLC.js
@@ -1,6 +1,6 @@
/* VLC abstraction by yj...@on...
- $Date: 2008/11/13 16:45:38 $
- $Revision: 1.4 $
+ $Date: $
+ $Revision: $
*/
/*ie1=ActiveC, moz1=Mozilla<0.8.5.1, moz2>= 0.8.5.1*/
var CyVLC = function(_id, masterid, width, height) {
@@ -51,15 +51,26 @@ CyVLC.prototype = {
return words[0];
}
else
- if(navigator.plugins) {
- var plug = navigator.plugins['VLC multimedia plugin'];
- if(typeof plug == 'undefined')
- var plug = navigator.plugins['VLC Multimedia Plugin'];
- if(typeof plug == 'undefined')
- var plug = navigator.plugins['VLC Multimedia Plug-in'];
- var ex = /^.*[vV]ersion [\"]*([^ \"]*)[\"]*.*$/;
- var ve = ex.exec(plug.description);
- if(ve[1])
+ if (navigator.plugins && (navigator.plugins.length > 0)) {
+ var name = "VLC";
+ for(var i=0;i<navigator.plugins.length;++i)
+ if (navigator.plugins[i].name.indexOf(name) != -1)
+ var plug = navigator.plugins[navigator.plugins[i].name];
+
+ if(typeof plug != 'undefined') {
+ var Suche = /(PLUGIN)/gi;
+ var Ergebnis = Suche.test(plug.description);
+ if (Ergebnis == true){
+ var ex = /^.*[pP]lugin [\"]*([^ \"]*)[\"]*.*$/;
+ var ve = ex.exec(plug.description);
+ }else{
+ var ex = /^.*[vV]ersion [\"]*([^ \"]*)[\"]*.*$/;
+ var ve = ex.exec(plug.description);
+ }
+ }
+ var Suche = /([0-9])/g;
+ var Ergebnis = Suche.test(ve);
+ if (Ergebnis == true)
return ve[1];
else
return "0.0.0";
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 1650fee..9707a05 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,5 +1,5 @@
-version=2.7.0.22
-date=04.04.2013
+version=2.7.0.23
+date=04.09.2013
type=Release
info=
commit ffbe3fcb336710de2109934507a2c68378ac4c40
Author: Christian Schuett <Gau...@ho...>
Date: Mon Apr 8 19:59:23 2013 +0200
Neutrino EPG Viewer: reset scroll position after rec dir selection
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index dc18466..e1f12a3 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -739,6 +739,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
}
bigFonts = g_settings.bigFonts;
show(channel_id, id, &startzeit, false, call_fromfollowlist);
+ showPos = 0;
recDir = recDirs.get_selected_dir();
}
commit 9b99f1d5df316d295f3c3904eca50697bac6d92d
Author: Stefan Seyfried <se...@tu...>
Date: Mon Apr 8 18:42:31 2013 +0200
audioplayer: don't free curl_handle too early
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/audioplayer.cpp b/tuxbox/neutrino/src/gui/audioplayer.cpp
index 06c3227..8b6ffe4 100644
--- a/tuxbox/neutrino/src/gui/audioplayer.cpp
+++ b/tuxbox/neutrino/src/gui/audioplayer.cpp
@@ -1006,9 +1006,6 @@ void CAudioPlayerGui::processPlaylistUrl(const char *url, const char *name, cons
/* get it! */
curl_easy_perform(curl_handle);
- /* cleanup curl stuff */
- curl_easy_cleanup(curl_handle);
-
/*
* Now, our chunk.memory points to a memory block that is chunk.size
* bytes big and contains the remote file.
@@ -1049,6 +1046,9 @@ void CAudioPlayerGui::processPlaylistUrl(const char *url, const char *name, cons
}
}
+ /* cleanup curl stuff */
+ curl_easy_cleanup(curl_handle);
+
if(chunk.memory)
free(chunk.memory);
commit fc737402d3d23b5ba0bb7dd9f4442860fa33536e
Author: Christian Schuett <Gau...@ho...>
Date: Sun Apr 7 16:12:48 2013 +0200
Neutrino: rework big font code in ShowMsg2UTF()
this removes an unnecessary call of Font::setSize() if normal
font size is used
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/widget/msgbox.cpp b/tuxbox/neutrino/src/gui/widget/msgbox.cpp
index 910f620..8b76a5d 100644
--- a/tuxbox/neutrino/src/gui/widget/msgbox.cpp
+++ b/tuxbox/neutrino/src/gui/widget/msgbox.cpp
@@ -868,8 +868,6 @@ int ShowMsg2UTF( const char * const Title,
bigfonts = !bigfonts;
if (bigfonts)
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize * 15 / 10);
- else
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize);
CMsgBox* msgBox = new CMsgBox( Text,
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2],
@@ -885,10 +883,11 @@ int ShowMsg2UTF( const char * const Title,
res = msgBox->result();
delete msgBox;
+
+ if (bigfonts)
+ g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize);
} while (ret == -1);
- if (bigfonts)
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize);
g_settings.bigFonts = bigfonts;
return res;
commit 375f222b69f8e6a689a37b5913acd65d724f2074
Author: GetAway <get...@t-...>
Date: Sun Apr 7 15:41:43 2013 +0200
fix gcc4 warnings break-strict-aliasing rules
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/audioplayer.cpp b/tuxbox/neutrino/src/gui/audioplayer.cpp
index bf51ed9..06c3227 100644
--- a/tuxbox/neutrino/src/gui/audioplayer.cpp
+++ b/tuxbox/neutrino/src/gui/audioplayer.cpp
@@ -629,7 +629,7 @@ int CAudioPlayerGui::show()
{
// keylevel 2 can only be reached if the currently played file
// is no stream, so we do not have to test for this case
- long seconds=0;
+ int seconds=0;
CIntInput secondsInput(LOCALE_AUDIOPLAYER_JUMP_DIALOG_TITLE,
seconds,
5,
@@ -727,7 +727,7 @@ int CAudioPlayerGui::show()
{
// keylevel 2 can only be reached if the currently played file
// is no stream, so we do not have to test for this case
- long seconds=0;
+ int seconds=0;
CIntInput secondsInput(LOCALE_AUDIOPLAYER_JUMP_DIALOG_TITLE,
seconds,
5,
diff --git a/tuxbox/neutrino/src/gui/moviebrowser.cpp b/tuxbox/neutrino/src/gui/moviebrowser.cpp
index e00ea28..93b6bba 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/moviebrowser.cpp
@@ -2967,9 +2967,9 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
CMenuForwarderNonLocalized* pBookItemMenuForwarder[MAX_NUMBER_OF_BOOKMARK_ITEMS];
CBookItemMenuForwarderNotifier* pBookItemMenuForwarderNotifier[MAX_NUMBER_OF_BOOKMARK_ITEMS];
- CIntInput bookStartIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&)movie_info->bookmarks.start, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
- CIntInput bookLastIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&)movie_info->bookmarks.lastPlayStop, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
- CIntInput bookEndIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&)movie_info->bookmarks.end, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
+ CIntInput bookStartIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&)movie_info->bookmarks.start, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
+ CIntInput bookLastIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&)movie_info->bookmarks.lastPlayStop, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
+ CIntInput bookEndIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&)movie_info->bookmarks.end, 5, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
CMenuWidget bookmarkMenu(LOCALE_MOVIEBROWSER_INFO_HEAD, NEUTRINO_ICON_STREAMING);
bookmarkMenu.addIntroItems(LOCALE_MOVIEBROWSER_BOOK_HEAD);
@@ -2985,8 +2985,8 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
pBookItemMenuForwarderNotifier[i] = new CBookItemMenuForwarderNotifier();
pBookNameInput[i] = new CStringInputSMS (LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[i].name, 20, true, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ", pBookItemMenuForwarderNotifier[i]);
- pBookPosIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&) movie_info->bookmarks.user[i].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
- pBookTypeIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&) movie_info->bookmarks.user[i].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2);
+ pBookPosIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&) movie_info->bookmarks.user[i].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
+ pBookTypeIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (int&) movie_info->bookmarks.user[i].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2);
pBookItemMenu[i] = new CMenuWidget(LOCALE_MOVIEBROWSER_INFO_HEAD, NEUTRINO_ICON_STREAMING);
pBookItemMenu[i]->addIntroItems(LOCALE_MOVIEBROWSER_BOOK_HEAD);
@@ -3051,9 +3051,9 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
CStringInputSMS epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1, &movie_info->epgInfo1, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
CDateInput dateUserDateInput(LOCALE_MOVIEBROWSER_INFO_LENGTH, &movie_info->dateOfLastPlay, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
CDateInput recUserDateInput(LOCALE_MOVIEBROWSER_INFO_LENGTH, &movie_info->file.Time, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
- CIntInput lengthUserIntInput(LOCALE_MOVIEBROWSER_INFO_LENGTH, (long&)movie_info->length, 3, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
+ CIntInput lengthUserIntInput(LOCALE_MOVIEBROWSER_INFO_LENGTH, (int&)movie_info->length, 3, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
CStringInputSMS countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY, &movie_info->productionCountry, 11, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
- CIntInput yearUserIntInput(LOCALE_MOVIEBROWSER_INFO_PRODYEAR, (long&)movie_info->productionDate, 4, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
+ CIntInput yearUserIntInput(LOCALE_MOVIEBROWSER_INFO_PRODYEAR, (int&)movie_info->productionDate, 4, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
CMenuWidget movieInfoMenu(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD, NEUTRINO_ICON_STREAMING, m_cBoxFrame.iWidth);
movieInfoMenu.addIntroItems(LOCALE_MOVIEBROWSER_INFO_HEAD);
@@ -3159,13 +3159,13 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/)
/********************************************************************/
/** optionsMenuBrowser **************************************************/
- CIntInput playMaxUserIntInput(LOCALE_MOVIEBROWSER_LAST_PLAY_MAX_ITEMS, (long&) m_settings.lastPlayMaxItems, 3, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
- CIntInput recMaxUserIntInput(LOCALE_MOVIEBROWSER_LAST_RECORD_MAX_ITEMS, (long&) m_settings.lastRecordMaxItems, 3, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
- CIntInput browserFrameUserIntInput(LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH, (long&) m_settings.browserFrameHeight, 4, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
- CIntInput browserRowNrIntInput(LOCALE_MOVIEBROWSER_BROWSER_ROW_NR, (long&) m_settings.browserRowNr, 1, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
+ CIntInput playMaxUserIntInput(LOCALE_MOVIEBROWSER_LAST_PLAY_MAX_ITEMS, (int&) m_settings.lastPlayMaxItems, 3, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
+ CIntInput recMaxUserIntInput(LOCALE_MOVIEBROWSER_LAST_RECORD_MAX_ITEMS, (int&) m_settings.lastRecordMaxItems, 3, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
+ CIntInput browserFrameUserInt...
[truncated message content] |
