[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-37-g528bc82
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-37-g528bc82
|
From: Thilo G. <tux...@ne...> - 2013-02-10 20:07:41
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 528bc8294ab60342a76363c364cbd47d5d7baeaa (commit)
via b61dad0924b53bce8a7e397cfc22aee23e128ea6 (commit)
via 3785fcf2b1b5a92b8482a693e362f0097bb0dff1 (commit)
from 80c346b0c142ecbcc11f5399b00db3d2311f5d14 (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 528bc8294ab60342a76363c364cbd47d5d7baeaa
Author: Christian Schuett <Gau...@ho...>
Date: Mon Feb 4 18:25:44 2013 +0100
fix migrate errors
The CVS commit "Remove unused Neutrino icons, use defines instead of
strings for icon filenames" from 9 Nov 2009 21:38 GMT cannot be found
in Git commit history. Some changes of that commit are missing. So
let's add them.
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/data/icons/movie.raw b/tuxbox/neutrino/data/icons/movie.raw
deleted file mode 100644
index ea1085a..0000000
Binary files a/tuxbox/neutrino/data/icons/movie.raw and /dev/null differ
diff --git a/tuxbox/neutrino/data/icons/network.raw b/tuxbox/neutrino/data/icons/network.raw
deleted file mode 100644
index f551a53..0000000
Binary files a/tuxbox/neutrino/data/icons/network.raw and /dev/null differ
diff --git a/tuxbox/neutrino/src/gui/favorites.cpp b/tuxbox/neutrino/src/gui/favorites.cpp
index 984882f..f0983fb 100644
--- a/tuxbox/neutrino/src/gui/favorites.cpp
+++ b/tuxbox/neutrino/src/gui/favorites.cpp
@@ -115,7 +115,7 @@ int CFavorites::exec(CMenuTarget* parent, const std::string &)
parent->hide();
if (!bouquetList) {
- ShowLocalizedMessage(LOCALE_FAVORITES_BOUQUETNAME, LOCALE_FAVORITES_NOBOUQUETS, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw");
+ ShowLocalizedMessage(LOCALE_FAVORITES_BOUQUETNAME, LOCALE_FAVORITES_NOBOUQUETS, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
return res;
}
@@ -137,7 +137,7 @@ int CFavorites::exec(CMenuTarget* parent, const std::string &)
if (status) str += g_Locale->getText(LOCALE_FAVORITES_FINALHINT);
- ShowMsgUTF(LOCALE_FAVORITES_BOUQUETNAME, str, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw"); // UTF-8
+ ShowMsgUTF(LOCALE_FAVORITES_BOUQUETNAME, str, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8
// if (status) {
// g_RCInput->postMsg( NeutrinoMessages::EVT_BOUQUETSCHANGED, 0 );
diff --git a/tuxbox/neutrino/src/gui/widget/hintbox.h b/tuxbox/neutrino/src/gui/widget/hintbox.h
index c291aa6..e647b5e 100644
--- a/tuxbox/neutrino/src/gui/widget/hintbox.h
+++ b/tuxbox/neutrino/src/gui/widget/hintbox.h
@@ -63,7 +63,7 @@ class CHintBox
public:
// Text is UTF-8 encoded
- CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = "info.raw");
+ CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
~CHintBox(void);
bool has_scrollbar(void);
diff --git a/tuxbox/neutrino/src/gui/widget/hintboxext.h b/tuxbox/neutrino/src/gui/widget/hintboxext.h
index 24124d5..05f9c3a 100644
--- a/tuxbox/neutrino/src/gui/widget/hintboxext.h
+++ b/tuxbox/neutrino/src/gui/widget/hintboxext.h
@@ -37,6 +37,7 @@
#include <system/localize.h>
#include <gui/widget/drawable.h>
+#include <gui/widget/icons.h>
#include <string>
#include <vector>
@@ -67,7 +68,7 @@ class CHintBoxExt
public:
CHintBoxExt(const neutrino_locale_t Caption, const char * const Text, const int Width, const char * const Icon);
- CHintBoxExt(const neutrino_locale_t Caption, ContentLines& lines, const int Width = 450, const char * const Icon = "info.raw");
+ CHintBoxExt(const neutrino_locale_t Caption, ContentLines& lines, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
~CHintBoxExt(void);
commit b61dad0924b53bce8a7e397cfc22aee23e128ea6
Author: Christian Schuett <Gau...@ho...>
Date: Mon Feb 4 19:07:44 2013 +0100
Neutrino bookmark manager: use bookmarkmanager icon
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/data/icons/Makefile.am b/tuxbox/neutrino/data/icons/Makefile.am
index d674db0..ae071a8 100644
--- a/tuxbox/neutrino/data/icons/Makefile.am
+++ b/tuxbox/neutrino/data/icons/Makefile.am
@@ -4,7 +4,7 @@ install_DATA = \
0.raw 1.raw 2.raw 3.raw 4.raw 5.raw 6.raw 7.raw 8.raw 9.raw \
16_9_gray.raw 16_9.raw \
audio.raw \
- blau.raw border_lr.raw border_ul.raw \
+ blau.raw bookmarkmanager.raw border_lr.raw border_ul.raw \
ca.raw colors.raw conflict.raw \
dd_avail.raw dd_gray.raw dd.raw down.raw \
epginfo.raw error.raw \
diff --git a/tuxbox/neutrino/src/gui/bookmarkmanager.cpp b/tuxbox/neutrino/src/gui/bookmarkmanager.cpp
index 07a221a..bed2988 100644
--- a/tuxbox/neutrino/src/gui/bookmarkmanager.cpp
+++ b/tuxbox/neutrino/src/gui/bookmarkmanager.cpp
@@ -234,7 +234,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
width=g_settings.screen_EndX-g_settings.screen_StartX-10;
int iconw = 0, iconh = 0;
- frameBuffer->getIconSize(NEUTRINO_ICON_TIMER, &iconw, &iconh);
+ frameBuffer->getIconSize(NEUTRINO_ICON_BOOKMARKMANAGER, &iconw, &iconh);
theight = std::max(iconh, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight());
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
x = getScreenStartX (width);
@@ -435,10 +435,10 @@ void CBookmarkManager::paintHead()
int theight_mid = theight / 2;
int iconw = 0, iconh = 0;
- frameBuffer->getIconSize(NEUTRINO_ICON_TIMER, &iconw, &iconh);
+ frameBuffer->getIconSize(NEUTRINO_ICON_BOOKMARKMANAGER, &iconw, &iconh);
int ypos = y + theight_mid - (iconh / 2);
- frameBuffer->paintIcon(NEUTRINO_ICON_TIMER, x + 5, ypos);
+ frameBuffer->paintIcon(NEUTRINO_ICON_BOOKMARKMANAGER, x + 5, ypos);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + 5 + iconw + 10, y + theight + 2, width - 5 - iconw - 10, g_Locale->getText(LOCALE_BOOKMARKMANAGER_NAME), COL_MENUHEAD, 0, true); // UTF-8
#if 0
diff --git a/tuxbox/neutrino/src/gui/widget/icons.h b/tuxbox/neutrino/src/gui/widget/icons.h
index afbe877..2abb283 100644
--- a/tuxbox/neutrino/src/gui/widget/icons.h
+++ b/tuxbox/neutrino/src/gui/widget/icons.h
@@ -60,6 +60,7 @@
#define NEUTRINO_ICON_16_9 "16_9.raw"
#define NEUTRINO_ICON_16_9_GREY "16_9_gray.raw"
#define NEUTRINO_ICON_AUDIO "audio.raw"
+#define NEUTRINO_ICON_BOOKMARKMANAGER "bookmarkmanager.raw"
#define NEUTRINO_ICON_BORDER_LR "border_lr.raw"
#define NEUTRINO_ICON_BORDER_UL "border_ul.raw"
#define NEUTRINO_ICON_CA "ca.raw"
commit 3785fcf2b1b5a92b8482a693e362f0097bb0dff1
Author: GetAway <get...@t-...>
Date: Sun Dec 30 22:18:40 2012 +0100
nhttpd: add command 'reloadplugins' to controlapi
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 7fbc3cf..3376076 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.cpp
@@ -159,6 +159,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
{"rcem", &CControlAPI::RCEmCGI, "text/plain"},
// Start skripts, plugins
{"startplugin", &CControlAPI::StartPluginCGI, "text/plain"},
+ {"reloadplugins", &CControlAPI::ReloadPluginsCGI, "text/plain"},
{"exec", &CControlAPI::ExecCGI, "+xml"},
{"yweb", &CControlAPI::YWebCGI, "text/plain"},
// video handling
@@ -1385,6 +1386,18 @@ void CControlAPI::StartPluginCGI(CyhookHandler *hh)
}
//-----------------------------------------------------------------------------
+void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
+{
+ if (hh->ParamList.empty())
+ {
+ NeutrinoAPI->EventServer->sendEvent(NeutrinoMessages::RELOAD_PLUGINS, CEventServer::INITID_HTTPD);
+ hh->SendOk();
+ }
+ else
+ hh->SendError();
+}
+
+//-----------------------------------------------------------------------------
void CControlAPI::LCDAction(CyhookHandler *hh)
{
int tval;
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.h b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.h
index c6c9b54..7657a73 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.h
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/controlapi.h
@@ -76,6 +76,7 @@ private:
void VersionCGI(CyhookHandler *hh);
void ZaptoCGI(CyhookHandler *hh);
void StartPluginCGI(CyhookHandler *hh);
+ void ReloadPluginsCGI(CyhookHandler *hh);
void LCDAction(CyhookHandler *hh);
void YWebCGI(CyhookHandler *hh);
void RebootCGI(CyhookHandler *hh);
@@ -109,7 +110,7 @@ public:
// virtual functions for HookHandler/Hook
virtual std::string getHookName(void) {return std::string("mod_ControlAPI");}
- virtual std::string getHookVersion(void) {return std::string("$Revision: 1.7 $");}
+ virtual std::string getHookVersion(void) {return std::string("$Revision: 1.8 $");}
virtual THandleStatus Hook_SendResponse(CyhookHandler *hh);
virtual THandleStatus Hook_PrepareResponse(CyhookHandler *hh);
};
diff --git a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
index 67d3f36..172e67d 100644
--- a/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/tuxboxapi/neutrinoapi.cpp
@@ -97,6 +97,7 @@ CNeutrinoAPI::CNeutrinoAPI()
EventServer->registerEvent2( NeutrinoMessages::EVT_POPUP, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
EventServer->registerEvent2( NeutrinoMessages::EVT_EXTMSG, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
EventServer->registerEvent2( NeutrinoMessages::CHANGEMODE, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
+ EventServer->registerEvent2( NeutrinoMessages::RELOAD_PLUGINS, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
EventServer->registerEvent2( NeutrinoMessages::EVT_START_PLUGIN, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
EventServer->registerEvent2( NeutrinoMessages::LOCK_RC, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
EventServer->registerEvent2( NeutrinoMessages::UNLOCK_RC, CEventServer::INITID_HTTPD, "/tmp/neutrino.sock");
diff --git a/tuxbox/neutrino/src/driver/rcinput.cpp b/tuxbox/neutrino/src/driver/rcinput.cpp
index 434174f..fd11cda 100644
--- a/tuxbox/neutrino/src/driver/rcinput.cpp
+++ b/tuxbox/neutrino/src/driver/rcinput.cpp
@@ -1278,6 +1278,10 @@ void CRCInput::getMsg_us(neutrino_msg_t *msg, neutrino_msg_data_t *data, unsigne
*msg = NeutrinoMessages::ESOUND_OFF;
*data = 0;
break;
+ case NeutrinoMessages::RELOAD_PLUGINS :
+ *msg = NeutrinoMessages::RELOAD_PLUGINS;
+ *data = 0;
+ break;
case NeutrinoMessages::EVT_START_PLUGIN :
*msg = NeutrinoMessages::EVT_START_PLUGIN;
*data = (neutrino_msg_data_t)p;
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index cd50364..3c43a0d 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -3292,6 +3292,11 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t m, neutrino_msg_data_t data)
scartMode( false );
}
}
+ else if (msg == NeutrinoMessages::RELOAD_PLUGINS)
+ {
+ g_PluginList->loadPlugins();
+ return messages_return::handled;
+ }
else if (msg == NeutrinoMessages::EVT_START_PLUGIN)
{
g_PluginList->startPlugin((const char *)data);
diff --git a/tuxbox/neutrino/src/neutrinoMessages.h b/tuxbox/neutrino/src/neutrinoMessages.h
index 8cba123..591f868 100644
--- a/tuxbox/neutrino/src/neutrinoMessages.h
+++ b/tuxbox/neutrino/src/neutrinoMessages.h
@@ -73,6 +73,7 @@ struct NeutrinoMessages {
UNLOCK_RC = CRCInput::RC_Messages + 20,
ESOUND_ON = CRCInput::RC_Messages + 21,
ESOUND_OFF = CRCInput::RC_Messages + 22,
+ RELOAD_PLUGINS = CRCInput::RC_Messages + 23,
EVT_VOLCHANGED = CRCInput::RC_Events + 1,
EVT_MUTECHANGED = CRCInput::RC_Events + 2,
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/tuxboxapi/controlapi.cpp | 13 +++++++++++++
.../neutrino/daemons/nhttpd/tuxboxapi/controlapi.h | 3 ++-
.../daemons/nhttpd/tuxboxapi/neutrinoapi.cpp | 1 +
tuxbox/neutrino/data/icons/Makefile.am | 2 +-
tuxbox/neutrino/data/icons/movie.raw | Bin 133 -> 0 bytes
tuxbox/neutrino/data/icons/network.raw | Bin 293 -> 0 bytes
tuxbox/neutrino/src/driver/rcinput.cpp | 4 ++++
tuxbox/neutrino/src/gui/bookmarkmanager.cpp | 6 +++---
tuxbox/neutrino/src/gui/favorites.cpp | 4 ++--
tuxbox/neutrino/src/gui/widget/hintbox.h | 2 +-
tuxbox/neutrino/src/gui/widget/hintboxext.h | 3 ++-
tuxbox/neutrino/src/gui/widget/icons.h | 1 +
tuxbox/neutrino/src/neutrino.cpp | 5 +++++
tuxbox/neutrino/src/neutrinoMessages.h | 1 +
14 files changed, 36 insertions(+), 9 deletions(-)
delete mode 100644 tuxbox/neutrino/data/icons/movie.raw
delete mode 100644 tuxbox/neutrino/data/icons/network.raw
--
Tuxbox-GIT: apps
|
