diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ea222c52..398250632 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,7 @@ SET(BOOST_REQUIRED_COMPONENTS system program_options filesystem + log_setup log regex ) diff --git a/audioplayer.php b/audioplayer.php new file mode 100644 index 000000000..1b0e44013 --- /dev/null +++ b/audioplayer.php @@ -0,0 +1,125 @@ + + + +"; + +$talkgroups = array('ALL'=>"ALL", 1767=>"Example1", 1777=>"Example2") +?> + +Trunk Recorder audio player + +
+

on

+
Change: Month: Day: Channel(s):
+ +
+ +

Click on a row to begin sequential playback, click file size to download

+ +
+"; + echo date("H:i:s",$exploded[1]).""; + if (isset($talkgroups[$exploded[0]])) echo $talkgroups[$exploded[0]]; else echo $exploded[0]; + echo ""; + echo sprintf($exploded[2]/1000000)."".round(filesize($file) / 1024)."k
+"; } } } +else echo "Pick a different date"; +?> + + + diff --git a/trunk-recorder/systems/system.cc b/trunk-recorder/systems/system.cc index 6db02d3e1..b8191b34c 100644 --- a/trunk-recorder/systems/system.cc +++ b/trunk-recorder/systems/system.cc @@ -51,7 +51,9 @@ void System::update_status(TrunkMessage message) { sys_id = message.sys_id; wacn = message.wacn; nac = message.nac; - BOOST_LOG_TRIVIAL(info) << "[" << short_name << "]\tDecoding System ID " << std::dec << message.sys_id << " WACN: " << message.wacn << " NAC: " << message.nac << std::dec; + BOOST_LOG_TRIVIAL(info) << "[" << short_name << "]\tDecoding System ID " + << std::hex << std::uppercase << message.sys_id << " WACN: " + << std::hex << std::uppercase << message.wacn << " NAC: " << std::hex << std::uppercase << message.nac; if(sys_id && wacn && nac) { lfsr = new p25p2_lfsr(nac, sys_id, wacn); xor_mask = lfsr->getXorChars(xor_mask_len);