mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

CTimerList: Fix eventType CTimerd::TIMER_EXEC_PLUGIN

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8505e1c6d7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-03-04 (Tue, 04 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2014-03-04 07:07:45 +01:00
parent dc88ba25cc
commit f3c99f7a44
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/timerlist.cpp
View File

@@ -263,6 +263,7 @@ CTimerList::CTimerList()
Timer = new CTimerdClient(); Timer = new CTimerdClient();
skipEventID=0; skipEventID=0;
timerNew_message = ""; timerNew_message = "";
timerNew_pluginName = "";
/* most probable default */ /* most probable default */
saved_dispmode = (int)CVFD::MODE_TVRADIO; saved_dispmode = (int)CVFD::MODE_TVRADIO;
@@ -343,9 +344,9 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
data = (void*)timerNew_message.c_str(); data = (void*)timerNew_message.c_str();
else if (timerNew.eventType==CTimerd::TIMER_EXEC_PLUGIN) else if (timerNew.eventType==CTimerd::TIMER_EXEC_PLUGIN)
{ {
if (strcmp(timerNew.pluginName, "---") == 0) if (timerNew_pluginName == "---")
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
data= timerNew.pluginName; data = (void*)timerNew_pluginName.c_str();
} }
if (timerNew.eventRepeat >= CTimerd::TIMERREPEAT_WEEKDAYS) if (timerNew.eventRepeat >= CTimerd::TIMERREPEAT_WEEKDAYS)
Timer->getWeekdaysFromStr(&timerNew.eventRepeat, m_weekdaysStr); Timer->getWeekdaysFromStr(&timerNew.eventRepeat, m_weekdaysStr);
@@ -1224,13 +1225,13 @@ int CTimerList::newTimer()
CStringInputSMS timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.,:!?/ "); CStringInputSMS timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.,:!?/ ");
CMenuForwarder *m9 = new CMenuForwarder(LOCALE_TIMERLIST_MESSAGE, false, timerNew_message, &timerSettings_msg ); CMenuForwarder *m9 = new CMenuForwarder(LOCALE_TIMERLIST_MESSAGE, false, timerNew_message, &timerSettings_msg );
std::string timerNew_pluginName("---"); timerNew_pluginName = "---";
CPluginChooser plugin_chooser(LOCALE_TIMERLIST_PLUGIN, CPlugins::P_TYPE_SCRIPT | CPlugins::P_TYPE_TOOL CPluginChooser plugin_chooser(LOCALE_TIMERLIST_PLUGIN, CPlugins::P_TYPE_SCRIPT | CPlugins::P_TYPE_TOOL
#if ENABLE_LUA #if ENABLE_LUA
| CPlugins::P_TYPE_LUA | CPlugins::P_TYPE_LUA
#endif #endif
, timerNew_pluginName); , timerNew_pluginName);
CMenuForwarder *m10 = new CMenuForwarder(LOCALE_TIMERLIST_PLUGIN, false, timerNew.pluginName, &plugin_chooser); CMenuForwarder *m10 = new CMenuForwarder(LOCALE_TIMERLIST_PLUGIN, false, timerNew_pluginName, &plugin_chooser);
CTimerListNewNotifier notifier2((int *)&timerNew.eventType, CTimerListNewNotifier notifier2((int *)&timerNew.eventType,

3
src/gui/timerlist.h
View File

@@ -66,7 +66,8 @@ class CTimerList : public CMenuTarget
std::string timerNew_channel_name; std::string timerNew_channel_name;
std::string m_weekdaysStr; std::string m_weekdaysStr;
std::string timerNew_message; std::string timerNew_message;
std::string timerNew_pluginName;
int timer_apids_dflt; int timer_apids_dflt;
int timer_apids_std; int timer_apids_std;
int timer_apids_ac3; int timer_apids_ac3;