diff --git a/build.sh b/build.sh index 1ead070..c4535c2 100755 --- 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 index 836d4a5..245ac61 100644 --- 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 index f1fe34c..e85d6fe 100644 --- 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 index 70011cf..a32dfa4 100644 --- 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 index b8511c1..34c7930 100644 --- 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 }