mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-06-12 07:44:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add cls_sound

Browse Source
This commit is contained in:
Mr-Dave
2024-08-12 01:02:33 -06:00
parent 390c653a4d
commit 8fdf8026b3
12 changed files with 841 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/util.cpp
View File

@@ -21,7 +21,8 @@
#include "conf.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "alg_sec.hpp" /* For sec detect in format output */
#include "alg_sec.hpp"
#include "sound.hpp"
/** Non case sensitive equality check for strings*/
@@ -280,7 +281,6 @@ static void mystrftime_long (const ctx_dev *cam,
sprintf(out, "%*s", width, cam->action_user);
return;
}
if (SPECIFIERWORD("secdetect")) {
if (cam->algsec->method != "none") {
if (cam->algsec->detected) {
@@ -294,27 +294,6 @@ static void mystrftime_long (const ctx_dev *cam,
return;
}
if (SPECIFIERWORD("trig_freq")) {
if (cam->snd_info != NULL) {
snprintf (out, PATH_MAX, "%*s", width, cam->snd_info->trig_freq.c_str() );
}
return;
}
if (SPECIFIERWORD("trig_nbr")) {
if (cam->snd_info != NULL) {
snprintf (out, PATH_MAX, "%*s", width, cam->snd_info->trig_nbr.c_str() );
}
return;
}
if (SPECIFIERWORD("trig_nm")) {
if (cam->snd_info != NULL) {
snprintf (out, PATH_MAX, "%*s", width, cam->snd_info->trig_nm.c_str() );
}
return;
}
// Not a valid modifier keyword. Log the error and ignore.
MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
@@ -327,6 +306,53 @@ static void mystrftime_long (const ctx_dev *cam,
out[0] = '~'; out[1] = 0;
}
void mystrftime(cls_sound *snd, std::string &dst, std::string fmt)
{
char tmp[PATH_MAX];
struct tm timestamp_tm;
timespec curr_ts;
std::string user_fmt;
uint indx;
clock_gettime(CLOCK_REALTIME, &curr_ts);
localtime_r(&curr_ts.tv_sec, &timestamp_tm);
if (fmt == "") {
dst = "";
return;
}
user_fmt = "";
for (indx=0;indx<fmt.length();indx++){
memset(tmp, 0, sizeof(tmp));
if (fmt.substr(indx,2) == "%t") {
sprintf(tmp, "%d", snd->device_id);
user_fmt.append(tmp);
indx++;
} else if (fmt.substr(indx,2) == "%$") {
user_fmt.append(snd->device_name);
indx++;
} else if (fmt.substr(indx,strlen("%{ver}")) == "%{ver}") {
user_fmt.append(VERSION);
indx += (strlen("%{ver}")-1);
} else if (fmt.substr(indx,strlen("%{trig_freq}")) == "%{trig_freq}") {
user_fmt.append(snd->snd_info->trig_freq);
indx += (strlen("%{trig_freq}")-1);
} else if (fmt.substr(indx,strlen("%{trig_nbr}")) == "%{trig_nbr}") {
user_fmt.append(snd->snd_info->trig_nbr);
indx += (strlen("%{trig_nbr}")-1);
} else if (fmt.substr(indx,strlen("%{trig_nm}")) == "%{trig_nm}") {
user_fmt.append(snd->snd_info->trig_nm);
indx += (strlen("%{trig_nm}")-1);
} else {
user_fmt.append(fmt.substr(indx,1));
}
}
memset(tmp, 0, sizeof(tmp));
strftime(tmp, sizeof(tmp),user_fmt.c_str(), &timestamp_tm);
dst.assign(tmp);
}
size_t mystrftime_base(ctx_dev *cam, char *s, size_t max
, const char *userformat, const char *filename)
{
@@ -684,15 +710,6 @@ AVPacket *mypacket_alloc(AVPacket *pkt)
}
/*********************************************/
/**
* util_exec_command
* Execute 'command' with 'arg' as its argument.
* if !arg command is started with no arguments
* Before we call execl we need to close all the file handles
* that the fork inherited from the parent in order not to pass
* the open handles on to the shell
*/
void util_exec_command(ctx_dev *cam, const char *command, const char *filename)
{
char stamp[PATH_MAX];
@@ -725,6 +742,38 @@ void util_exec_command(ctx_dev *cam, const char *command, const char *filename)
,_("Executing external command '%s'"), stamp);
}
void util_exec_command(cls_sound *snd, std::string cmd)
{
std::string dst;
int pid;
mystrftime(snd, dst, cmd);
pid = fork();
if (!pid) {
/* Detach from parent */
setsid();
execl("/bin/sh", "sh", "-c", dst.c_str(), " &",(char*)NULL);
/* if above function succeeds the program never reach here */
MOTPLS_LOG(ALR, TYPE_EVENTS, SHOW_ERRNO
,_("Unable to start external command '%s'"),dst.c_str());
exit(1);
}
if (pid > 0) {
waitpid(pid, NULL, 0);
} else {
MOTPLS_LOG(ALR, TYPE_EVENTS, SHOW_ERRNO
,_("Unable to start external command '%s'"), dst.c_str());
}
MOTPLS_LOG(DBG, TYPE_EVENTS, NO_ERRNO
,_("Executing external command '%s'"), dst.c_str());
}
/*********************************************/
static void util_parms_file(ctx_params *params, std::string params_file)
{