summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Make.config.template2
-rw-r--r--Makefile.1.62
-rw-r--r--Makefile.1.7.x2
-rw-r--r--run.c19
-rw-r--r--run.h3
-rwxr-xr-xscript/uactivity/key/#10-syslog_demo34
-rwxr-xr-xscript/uactivity/key/#20-toggle_demo18
-rwxr-xr-xscript/uactivity/watchdog/#10-syslog_demo42
-rwxr-xr-xscript/uactivity/watchdog/#20-yaUSBir_watchdog3
-rwxr-xr-x[-rw-r--r--]script/vdr-uactivity53
-rw-r--r--uactivity.c12
11 files changed, 103 insertions, 87 deletions
diff --git a/Make.config.template b/Make.config.template
index eaa22fa..c3d5c30 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
# The shell command used
-PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r %1$$s -o %2$$s -v %3$$s -C %4$$s -c %5$$s -R %6$$s
+PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r \"%1$$s\" -o \"%2$$s\" -C \"%3$$s\" -c \"%4$$s\" -R \"%5$$s\" -A \"%6$$s\" -K \"%7$$s\" -V \"%8$$s\"
diff --git a/Makefile.1.6 b/Makefile.1.6
index af6c6cc..e9e884c 100644
--- a/Makefile.1.6
+++ b/Makefile.1.6
@@ -43,7 +43,7 @@ TMPDIR ?= /tmp
### Default values:
-PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r %1$$s -o %2$$s -v %3$$s -C %4$$s -c %5$$s -R %6$$s
+PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r \"%1$$s\" -o \"%2$$s\" -C \"%3$$s\" -c \"%4$$s\" -R \"%5$$s\" -A \"%6$$s\" -K \"%7$$s\" -V \"%8$$s\"
### The version number of VDR's plugin API (taken from VDR's "config.h"):
diff --git a/Makefile.1.7.x b/Makefile.1.7.x
index b22528e..beeb73e 100644
--- a/Makefile.1.7.x
+++ b/Makefile.1.7.x
@@ -49,7 +49,7 @@ APIVERSION = $(call PKGCFG,apiversion)
### Default values:
-PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r %1$$s -o %2$$s -v %3$$s -C %4$$s -c %5$$s -R %6$$s
+PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r \"%1$$s\" -o \"%2$$s\" -C \"%3$$s\" -c \"%4$$s\" -R \"%5$$s\" -A \"%6$$s\" -K \"%7$$s\" -V \"%8$$s\"
### The name of the distribution archive:
diff --git a/run.c b/run.c
index c8bcead..4f47dae 100644
--- a/run.c
+++ b/run.c
@@ -1,8 +1,9 @@
#include "run.h"
#include <vdr/thread.h>
+#include <vdr/videodir.h>
-cRun Run;
+cRun uactivityRun;
cRun::~cRun()
{
@@ -33,6 +34,14 @@ const char *cRun::ActivityStatusToString(bool Active)
return ActivityStatusStr;
}
+const char *cRun::KeyToString(eKeys Key)
+{
+ if (Key == kNone)
+ return "";
+ else
+ return myKey.ToString(Key);
+}
+
void cRun::SetConfigDirectory(const char *Directory)
{
myConfigDirectory = strdup(Directory);
@@ -51,15 +60,15 @@ void cRun::SetResourceDirectory(const char *Directory)
void cRun::CallActivity(eOrgin Orgin, bool Active)
{
char *buffer;
- asprintf(&buffer, UACTIVITY_COMMAND, "activity", OrginToString(Orgin), ActivityStatusToString(Active), myConfigDirectory, myCacheDirectory, myResourceDirectory);
+ asprintf(&buffer, UACTIVITY_COMMAND, "activity", OrginToString(Orgin), myConfigDirectory, myCacheDirectory, myResourceDirectory, ActivityStatusToString(Active), KeyToString(kNone), VideoDirectory);
SystemExec(buffer, true);
free(buffer);
}
-void cRun::CallKey(eOrgin Orgin, eKeys Key)
+void cRun::CallKey(eOrgin Orgin, bool Active, eKeys Key)
{
char *buffer;
- asprintf(&buffer, UACTIVITY_COMMAND, "key", OrginToString(Orgin), myKey.ToString(Key), myConfigDirectory, myCacheDirectory, myResourceDirectory);
+ asprintf(&buffer, UACTIVITY_COMMAND, "key", OrginToString(Orgin), myConfigDirectory, myCacheDirectory, myResourceDirectory, ActivityStatusToString(Active), KeyToString(Key), VideoDirectory);
SystemExec(buffer, true);
free(buffer);
}
@@ -67,7 +76,7 @@ void cRun::CallKey(eOrgin Orgin, eKeys Key)
void cRun::CallWatchdog(eOrgin Orgin, bool Active)
{
char *buffer;
- asprintf(&buffer, UACTIVITY_COMMAND, "watchdog", OrginToString(Orgin), ActivityStatusToString(Active), myConfigDirectory, myCacheDirectory, myResourceDirectory);
+ asprintf(&buffer, UACTIVITY_COMMAND, "watchdog", OrginToString(Orgin), myConfigDirectory, myCacheDirectory, myResourceDirectory, ActivityStatusToString(Active), KeyToString(kNone), VideoDirectory);
SystemExec(buffer, true);
free(buffer);
}
diff --git a/run.h b/run.h
index 4be6a6e..831e5a3 100644
--- a/run.h
+++ b/run.h
@@ -13,6 +13,7 @@ private:
cKey myKey;
static const char *OrginToString(eOrgin Orgin);
static const char *ActivityStatusToString(bool Active);
+ const char *KeyToString(eKeys Key);
public:
cRun() { };
~cRun();
@@ -20,7 +21,7 @@ public:
void SetCacheDirectory(const char *Directory);
void SetResourceDirectory(const char *Directory);
void CallActivity(eOrgin Orgin, bool Active);
- void CallKey(eOrgin Orgin, eKeys Key);
+ void CallKey(eOrgin Orgin, bool Active, eKeys Key);
void CallWatchdog(eOrgin Orgin, bool Active);
};
diff --git a/script/uactivity/key/#10-syslog_demo b/script/uactivity/key/#10-syslog_demo
index ee794a7..767ee55 100755
--- a/script/uactivity/key/#10-syslog_demo
+++ b/script/uactivity/key/#10-syslog_demo
@@ -1,29 +1,37 @@
#!/bin/sh
-case "${1}" in
+case "${UACTIVITY_ORGIN}" in
startup)
logger -t "uactivity [key/$(basename ${0})]" "key starting up"
- logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}"
- logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}"
- logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
+ logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}"
+ logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}"
;;
started)
logger -t "uactivity [key/$(basename ${0})]" "key started"
- logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}"
- logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}"
- logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
+ logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}"
+ logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}"
;;
shutdown)
logger -t "uactivity [key/$(basename ${0})]" "key shutting down"
- logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}"
- logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}"
- logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
+ logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}"
+ logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}"
;;
running)
logger -t "uactivity [key/$(basename ${0})]" "key \"${2}\" pressed"
- logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${3}"
- logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${4}"
- logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
+ logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+ logger -t "uactivity [key/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}"
+ logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}"
;;
esac
diff --git a/script/uactivity/key/#20-toggle_demo b/script/uactivity/key/#20-toggle_demo
index 3ec3cfb..1127a2e 100755
--- a/script/uactivity/key/#20-toggle_demo
+++ b/script/uactivity/key/#20-toggle_demo
@@ -1,27 +1,29 @@
#!/bin/sh
# do not use names starting with [0-9][0-9] for data files
-FLAG="${4}/key/flag.$(basename ${0})"
+FLAG_DIR="${UACTIVITY_CACHEDIRECTORY}/key/$(basename ${0}).data"
+FLAG_FILE="${FLAG_DIR}/flag"
+
-case "${1}" in
+case "${UACTIVITY_ORGIN}" in
startup)
# create flag directory (using cache directory)
- mkdir -p "${4}/key/"
+ mkdir -p "${FLAG_DIR}"
# delete flag (may leftover from previus vdr crash)
# kepp the flag if toggle state should be keep over vdr sessions
- rm -f "${FLAG}"
+ rm -f "${FLAG_FILE}"
;;
running)
# we are interested in Key "1"
- if [ "${2}" = "1" ]; then
- if [ -f "${FLAG}" ]; then
+ if [ "${UACTIVITY_INFO_KEY}" = "1" ]; then
+ if [ -f "${FLAG_FILE}" ]; then
# here we do our "off" action
logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) off"
- rm -f "${FLAG}"
+ rm -f "${FLAG_FILE}"
else
# here we do our "on" action
logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) on"
- touch "${FLAG}"
+ touch "${FLAG_FILE}"
fi
fi
;;
diff --git a/script/uactivity/watchdog/#10-syslog_demo b/script/uactivity/watchdog/#10-syslog_demo
index 8ff6ca3..bcb36b7 100755
--- a/script/uactivity/watchdog/#10-syslog_demo
+++ b/script/uactivity/watchdog/#10-syslog_demo
@@ -1,41 +1,49 @@
#!/bin/sh
-case "${1}" in
+case "${UACTIVITY_ORGIN}" in
startup)
logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog starting up"
- [ "${2}" = "true" ] \
+ [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \
&& logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \
|| logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\""
- logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}"
- logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}"
- logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}"
;;
started)
logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog started"
- [ "${2}" = "true" ] \
+ [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \
&& logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \
|| logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\""
- logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}"
- logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}"
- logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}"
;;
shutdown)
logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog shutting down"
- [ "${2}" = "true" ] \
+ [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \
&& logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \
|| logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\""
- logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}"
- logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}"
- logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}"
;;
running)
logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog triggered"
- [ "${2}" = "true" ] \
+ [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \
&& logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \
|| logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\""
- logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}"
- logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}"
- logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}"
+ logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}"
;;
esac
diff --git a/script/uactivity/watchdog/#20-yaUSBir_watchdog b/script/uactivity/watchdog/#20-yaUSBir_watchdog
index d6e70dc..4307a55 100755
--- a/script/uactivity/watchdog/#20-yaUSBir_watchdog
+++ b/script/uactivity/watchdog/#20-yaUSBir_watchdog
@@ -13,6 +13,7 @@ IRSEND="irsend -d /var/run/lirc/ya_usbir SEND_ONCE yaUsbIR_control C_WATCHDOG %s
trigger_watchdog(){
# Calculate n1, n2 and n3 values
+ OK=false
eval $(bc <<EOF 2> /dev/null
watchdog = ${WATCHDOG_TIME}
@@ -57,7 +58,7 @@ deactivate_watchdog(){
-case "${1}" in
+case "${UACTIVITY_ORGIN}" in
startup)
trigger_watchdog || exit 1
;;
diff --git a/script/vdr-uactivity b/script/vdr-uactivity
index eecdc3e..f4203cc 100644..100755
--- a/script/vdr-uactivity
+++ b/script/vdr-uactivity
@@ -9,70 +9,57 @@ mylog() {
}
usage(){
- ${LOG} "Usage: $(basename $0) -r <reason activity|key|watchdog> -o <orgin startup|shutdown|running> -v <value>"
+ ${LOG} "Usage: $(basename $0) -r <reason activity|key|watchdog> -o <orgin startup|started|shutdown|running>"
${LOG} " -C <ConfigDirectory> -c <CacheDirectory> -R <ResourceDirectory>"
+ ${LOG} " -A <activity> -K <Key> -V <Video Directory>"
${LOG} "$cmd_error"
exit 1
}
cmd_error=""
-while getopts ":r:o:v:C:c:R:" opt; do
+while getopts "r:o:C:c:R:A:K:V:" opt; do
case "$opt" in
r) PARAM_REASON="$OPTARG";;
o) PARAM_ORGIN="$OPTARG";;
- v) PARAM_VALUE="$OPTARG";;
C) PARAM_CONFIGDIRECTORY="$OPTARG";;
c) PARAM_CACHEDIRECTORY="$OPTARG";;
R) PARAM_RESOURCEDIRECTORY="$OPTARG";;
+ A) PARAM_ACTIVITY="$OPTARG";;
+ K) PARAM_KEY="$OPTARG";;
+ V) PARAM_VIDEODIR="$OPTARG";;
--) break;;
- \?) cmd_error="$(gettext 'Error: Error parsing Commandline')"; break;;
+ \?) cmd_error="Error: Error parsing Commandline"; break;;
esac
done
[ -n "$cmd_error" ] && usage
-# could ovveride the directories for FHS
+# we could ovveride the directories for FHS
[ -r "${PARAM_CONFIGDIRECTORY}/directories.conf" ] && . "${PARAM_CONFIGDIRECTORY}/directories.conf"
+# Exit if nothing to do
[ -d "${PARAM_CONFIGDIRECTORY}/${PARAM_REASON}" ] || exit 0
+# Export the Values for the activity scripts
+UACTIVITY_ORGIN="${PARAM_ORGIN}"
+export UACTIVITY_ORGIN
+
UACTIVITY_CONFIGDIRECTORY="${PARAM_CONFIGDIRECTORY}"
UACTIVITY_CACHEDIRECTORY="${PARAM_CACHEDIRECTORY}"
UACTIVITY_RESOURCEDIRECTORY="${PARAM_RESOURCEDIRECTORY}"
export UACTIVITY_CONFIGDIRECTORY UACTIVITY_CACHEDIRECTORY UACTIVITY_RESOURCEDIRECTORY
-UACTIVITY_ORGIN="${PARAM_ORGIN}"
-export UACTIVITY_ORGIN
-
-case "${PARAM_REASON}" in
- activity)
- commandline="${PARAM_ORGIN} ${PARAM_VALUE}"
- UACTIVITY_ACTIVITY="${PARAM_VALUE}"
- export UACTIVITY_ACTIVITY
- ;;
- key)
- if [ "${PARAM_VALUE}" != "_Setup" ]; then
- commandline="${PARAM_ORGIN} ${PARAM_VALUE}"
- UACTIVITY_KEY="${PARAM_VALUE}"
- else
- commandline="${PARAM_ORGIN} ''"
- UACTIVITY_KEY=""
- fi
- export UACTIVITY_KEY
- ;;
- watchdog)
- commandline="${PARAM_ORGIN} ${PARAM_VALUE}"
- UACTIVITY_ACTIVITY="${PARAM_VALUE}"
- export UACTIVITY_ACTIVITY
- ;;
-esac
+UACTIVITY_INFO_ACTIVITY="${PARAM_ACTIVITY}"
+UACTIVITY_INFO_KEY="${PARAM_KEY}"
+UACTIVITY_INFO_VIDEODIR="${PARAM_VIDEODIR}"
+export UACTIVITY_INFO_ACTIVITY UACTIVITY_INFO_KEY UACTIVITY_INFO_VIDEODIR
hooks="$(find "${PARAM_CONFIGDIRECTORY}/${PARAM_REASON}" -maxdepth 1 -xtype f -name '[0-9][0-9]*' | sort)"
for hook in ${hooks}; do
- if [ -x $hook ]; then
- eval $hook $commandline "$PARAM_CONFIGDIRECTORY" "$PARAM_CACHEDIRECTORY" "$PARAM_RESOURCEDIRECTORY"
+ if [ -x "${hook}" ]; then
+ eval "${hook}"
else
- eval /bin/sh $hook $commandline "$PARAM_CONFIGDIRECTORY" "$PARAM_CACHEDIRECTORY" "$PARAM_RESOURCEDIRECTORY"
+ eval /bin/sh "${hook}"
fi
[ $? -ne 0 ] && ${LOG} "error when executing ${hook}"
done
diff --git a/uactivity.c b/uactivity.c
index 554c602..5a0c724 100644
--- a/uactivity.c
+++ b/uactivity.c
@@ -58,7 +58,7 @@ protected:
eOSState state = cOsdMenu::ProcessKey(Key);
if (state == osUnknown)
if ((Key >= kUp) && (Key < kNone)) {
- uactivityRun.CallKey(oRunning, Key);
+ uactivityRun.CallKey(oRunning, !ShutdownHandler.IsUserInactive(), Key);
return osEnd;
}
return state;
@@ -118,7 +118,7 @@ bool cPluginUactivity::Start(void)
if (ResourceDirectory(PLUGIN_NAME_I18N) != NULL)
uactivityRun.SetResourceDirectory(ResourceDirectory(PLUGIN_NAME_I18N));
else
- uactivityRun.SetResourceDirectory("''");
+ uactivityRun.SetResourceDirectory("");
#else
uactivityRun.SetCacheDirectory(ConfigDirectory(PLUGIN_NAME_I18N));
uactivityRun.SetResourceDirectory(ConfigDirectory(PLUGIN_NAME_I18N));
@@ -126,12 +126,12 @@ bool cPluginUactivity::Start(void)
time(&Alive);
- uactivityRun.CallKey(oStartUp, k_Setup);
-
bool ActivityStatus = !ShutdownHandler.IsUserInactive();
LastActivity = ActivityStatus;
uactivityRun.CallActivity(oStartUp, ActivityStatus);
+ uactivityRun.CallKey(oStartUp, ActivityStatus, kNone);
+
time(&LastTime);
if (WatchdogTimer > 0) uactivityRun.CallWatchdog(oStartUp, ActivityStatus);
@@ -142,7 +142,7 @@ void cPluginUactivity::Stop(void)
{
// Stop any background activities the plugin is performing.
bool ActivityStatus = !ShutdownHandler.IsUserInactive();
- uactivityRun.CallKey(oShutDown, k_Setup);
+ uactivityRun.CallKey(oShutDown, ActivityStatus, kNone);
uactivityRun.CallActivity(oShutDown, ActivityStatus);
uactivityRun.CallWatchdog(oShutDown, ActivityStatus);
}
@@ -158,7 +158,7 @@ void cPluginUactivity::MainThreadHook(void)
bool ActivityStatus = !ShutdownHandler.IsUserInactive();
if (FirstMainThreadHook) {
- uactivityRun.CallKey(oStarted, k_Setup);
+ uactivityRun.CallKey(oStarted, ActivityStatus, kNone);
uactivityRun.CallActivity(oStarted, ActivityStatus);
uactivityRun.CallWatchdog(oStarted, ActivityStatus);
FirstMainThreadHook = false;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-04 15:53:19 +0000