Add conversion specifiers for sound alerts

Author: Mr-Dave

doc/motionplus_config.html

@@ -671,8 +671,17 @@ <h3><a name="conversion_specifiers"></a>Conversion Specifiers</h3>
              </tr>
              <tr>
                <td bgcolor="#edf4f9" >%{ver}</a> </td>
-               <td bgcolor="#edf4f9" >The version of MotionPlus</a> </td>
+               <td bgcolor="#edf4f9" >version of MotionPlus</a> </td>
+               <td bgcolor="#edf4f9" >%{trig_nbr}</a> </td>
+               <td bgcolor="#edf4f9" >sound alert number that was triggered</a> </td>
+               <td bgcolor="#edf4f9" >%{trig_nm}</a> </td>
+               <td bgcolor="#edf4f9" >sound alert name that was triggered</a> </td>
              </tr>
+             <tr>
+               <td bgcolor="#edf4f9" >%{trig_freq}</a> </td>
+               <td bgcolor="#edf4f9" >frequency that triggered the sound alert</a> </td>
+             </tr>
+
             </tbody>
         </table>
         </div>

src/motionplus.hpp

@@ -379,6 +379,9 @@ struct ctx_snd_info {
     int                         buffer_size;
     int                         frames;
     std::string                 pulse_server;
+    std::string                 trig_freq;
+    std::string                 trig_nbr;
+    std::string                 trig_nm;
 };
 
 struct ctx_dev {

src/sound.cpp

@@ -758,7 +758,6 @@ static void snd_check_alerts(ctx_dev *snd)
     float pImaginaryNbr;
     float pIntensity;
     bool trigger;
-    std::string pcmd;
     std::list<ctx_snd_alert>::iterator it;
     struct timespec trig_ts;
 
@@ -826,10 +825,10 @@ static void snd_check_alerts(ctx_dev *snd)
                     , it->volume_level, chkcnt
                     , info->vol_max);
                 if (snd->conf->on_sound_alert != "") {
-                    pcmd = snd->conf->on_sound_alert;
-                    pcmd = pcmd + " " + std::to_string(it->alert_id);
-                    pcmd = pcmd + " " + std::to_string(freq_value);
-                    util_exec_command(snd, pcmd.c_str(), NULL, 0);
+                    info->trig_freq =std::to_string(freq_value);
+                    info->trig_nbr = std::to_string(it->alert_id);
+                    info->trig_nm = it->alert_nm;
+                    util_exec_command(snd, snd->conf->on_sound_alert.c_str(), NULL, 0);
                 }
             }
         }

src/util.cpp

@@ -335,6 +335,27 @@ 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,