Merge branch 'development'

AbdElhalim12 · Jul 26, 2019 · 3323b58 · 3323b58
2 parents b07e5ac + addc744
commit 3323b58
Show file tree

Hide file tree

Showing 22 changed files with 991 additions and 887 deletions.
diff --git a/README.md b/README.md
diff --git a/activity_monitor.c b/activity_monitor.c
@@ -46,7 +46,6 @@
 #include "dbus-service.h"
 #endif
 
-
 enum am_state state;
 enum ps_state { ps_inactive, ps_active } player_state;
 
@@ -73,10 +72,10 @@ void going_active(int block) {
 
   if (config.disable_standby_mode == disable_standby_auto) {
 #ifdef CONFIG_DBUS_INTERFACE
-  if (dbus_service_is_running())
-    shairport_sync_set_disable_standby(SHAIRPORT_SYNC(shairportSyncSkeleton), TRUE);
-  else
-    config.keep_dac_busy = 1;    
+    if (dbus_service_is_running())
+      shairport_sync_set_disable_standby(SHAIRPORT_SYNC(shairportSyncSkeleton), TRUE);
+    else
+      config.keep_dac_busy = 1;
 #else
     config.keep_dac_busy = 1;
 #endif
@@ -100,12 +99,12 @@ void going_inactive(int block) {
 
   if (config.disable_standby_mode == disable_standby_auto) {
 #ifdef CONFIG_DBUS_INTERFACE
-  if (dbus_service_is_running())
-    shairport_sync_set_disable_standby(SHAIRPORT_SYNC(shairportSyncSkeleton), FALSE);
-  else
-    config.keep_dac_busy = 0;  
+    if (dbus_service_is_running())
+      shairport_sync_set_disable_standby(SHAIRPORT_SYNC(shairportSyncSkeleton), FALSE);
+    else
+      config.keep_dac_busy = 0;
 #else
-  config.keep_dac_busy = 0;  
+    config.keep_dac_busy = 0;
 #endif
   }
 }
@@ -255,9 +254,7 @@ void *activity_monitor_thread_code(void *arg) {
   pthread_exit(NULL);
 }
 
-enum am_state activity_status() {
-  return (state);
-}
+enum am_state activity_status() { return (state); }
 
 void activity_monitor_start() {
   // debug(1,"activity_monitor_start");

diff --git a/activity_monitor.h b/activity_monitor.h
@@ -5,4 +5,4 @@ enum am_state { am_inactive, am_active, am_timing_out };
 void activity_monitor_start();
 void activity_monitor_stop();
 void activity_monitor_signify_activity(int active); // 0 means inactive, non-zero means active
-enum am_state activity_status(); // true if non inactive; false if inactive
+enum am_state activity_status();                    // true if non inactive; false if inactive
diff --git a/audio.c b/audio.c
@@ -116,7 +116,7 @@ void audio_ls_outputs(void) {
       printf("Settings and options for the audio backend \"%s\":\n", (*out)->name);
       (*out)->help();
     } else {
-      printf("There are no settings or options for the audio backend \"%s\".\n", (*out)->name);    
+      printf("There are no settings or options for the audio backend \"%s\".\n", (*out)->name);
     }
   }
 }

diff --git a/audio.h b/audio.h
@@ -18,7 +18,7 @@ typedef struct {
   int (*init)(int argc, char **argv);
   // at end of program
   void (*deinit)(void);
-  
+
   int (*prepare)(void); // looks and sets stuff in the config data structure
 
   void (*start)(int sample_rate, int sample_format);