build.sh script chaged to build with WITH_SYSTEMD=ON.

Changed default daemon configuration with HTTP streamer disabled. Additional cosmetic changes.
bondagit · Jul 7, 2024 · 107d36a · 107d36a
1 parent 49bf65a
commit 107d36a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/build.sh b/build.sh
@@ -43,7 +43,7 @@ cd ..
 
 cd daemon
 echo "Building aes67-daemon ..."
-cmake -DCPP_HTTPLIB_DIR="$TOPDIR"/3rdparty/cpp-httplib -DRAVENNA_ALSA_LKM_DIR="$TOPDIR"/3rdparty/ravenna-alsa-lkm -DENABLE_TESTS=ON -DWITH_AVAHI=ON -DFAKE_DRIVER=OFF -DWITH_SYSTEMD=OFF .
+cmake -DCPP_HTTPLIB_DIR="$TOPDIR"/3rdparty/cpp-httplib -DRAVENNA_ALSA_LKM_DIR="$TOPDIR"/3rdparty/ravenna-alsa-lkm -DENABLE_TESTS=ON -DWITH_AVAHI=ON -DFAKE_DRIVER=OFF -DWITH_SYSTEMD=ON .
 make
 cd ..
 
diff --git a/daemon/daemon.conf b/daemon/daemon.conf
@@ -24,6 +24,6 @@
   "streamer_files_num": 8,
   "streamer_file_duration": 1,
   "streamer_player_buffer_files_num": 1,
-  "streamer_enabled": true,
+  "streamer_enabled": false,
   "auto_sinks_update": true
 }
diff --git a/daemon/driver_manager.cpp b/daemon/driver_manager.cpp
@@ -258,7 +258,7 @@ std::error_code DriverManager::get_number_of_outputs(int32_t& outputs) {
 void DriverManager::on_command_done(enum MT_ALSA_msg_id id,
                                     size_t size,
                                     const uint8_t* data) {
-  BOOST_LOG_TRIVIAL(info) << "driver_manager:: cmd " << alsa_msg_str[id]
+  BOOST_LOG_TRIVIAL(debug) << "driver_manager:: cmd " << alsa_msg_str[id]
                           << " done data len " << size;
   memcpy(recv_data_, data, size);
   retcode_ = std::error_code{};

diff --git a/daemon/streamer.cpp b/daemon/streamer.cpp
@@ -446,7 +446,6 @@ void Streamer::close_files(uint8_t files_id) {
   }
 
   for (auto& res : ress) {
-    res.wait();
     (void)res.get();
   }
 }

diff --git a/systemd/daemon.conf b/systemd/daemon.conf
@@ -2,7 +2,7 @@
   "http_port": 8080,
   "rtsp_port": 8854,
   "http_base_dir": "/usr/local/share/aes67-daemon/webui/",
-  "log_severity": 2,
+  "log_severity": 1,
   "playout_delay": 0,
   "tic_frame_size_at_1fs": 64,
   "max_tic_frame_size": 1024,
@@ -24,6 +24,6 @@
   "streamer_files_num": 8,
   "streamer_file_duration": 1,
   "streamer_player_buffer_files_num": 1,
-  "streamer_enabled": true,
+  "streamer_enabled": false,
   "auto_sinks_update": true
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -446,7 +446,6 @@ void Streamer::close_files(uint8_t files_id) { @@
       }
       for (auto& res : ress) {
-        res.wait();
         (void)res.get();
       }
     }
@@ Expand Down @@