nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check that the systems are started before trying to stop them, duh.

Browse Source
This commit is contained in:
Mike Brady
2019-02-05 15:51:16 +00:00
parent 916edea5a1
commit 79e22063ef
5 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
activity_monitor.c
+9 -4
View File
@@ -45,6 +45,8 @@
enum am_state { am_inactive, am_active, am_timing_out } state;
enum ps_state { ps_inactive, ps_active } player_state;
int activity_monitor_running = 0;
pthread_t activity_monitor_thread;
pthread_mutex_t activity_monitor_mutex;
pthread_cond_t activity_monitor_cv;
@@ -218,11 +220,14 @@ void *activity_monitor_thread_code(void *arg) {
void activity_monitor_start() {
// debug(1,"activity_monitor_start");
pthread_create(&activity_monitor_thread, NULL, activity_monitor_thread_code, NULL);
activity_monitor_running = 1;
}
void activity_monitor_stop() {
debug(1, "activity_monitor_stop start...");
pthread_cancel(activity_monitor_thread);
pthread_join(activity_monitor_thread, NULL);
debug(1, "activity_monitor_stop complete");
if (activity_monitor_running) {
debug(1, "activity_monitor_stop start...");
pthread_cancel(activity_monitor_thread);
pthread_join(activity_monitor_thread, NULL);
debug(1, "activity_monitor_stop complete");
}
}