Yosam02
diff --git a/‎AUDIOGUIDE.md
+5 b/‎AUDIOGUIDE.md
+5
diff --git a/‎Android.mk
+2-2 b/‎Android.mk
+2-2
diff --git a/‎CMakeLists.txt
+2-2 b/‎CMakeLists.txt
+2-2
diff --git a/‎Makefile
+5-3 b/‎Makefile
+5-3
diff --git a/‎config.ini.sample
-60 b/‎config.ini.sample
-60
diff --git a/‎macos/m8c.app/Contents/Info.plist ‎package/macos/m8c.app/Contents/Info.plist b/‎macos/m8c.app/Contents/Info.plist ‎package/macos/m8c.app/Contents/Info.plist
diff --git a/‎macos/m8c.app/Contents/PkgInfo ‎package/macos/m8c.app/Contents/PkgInfo b/‎macos/m8c.app/Contents/PkgInfo ‎package/macos/m8c.app/Contents/PkgInfo
diff --git a/‎macos/m8c.app/Contents/Resources/m8c.icns ‎package/macos/m8c.app/Contents/Resources/m8c.icns b/‎macos/m8c.app/Contents/Resources/m8c.icns ‎package/macos/m8c.app/Contents/Resources/m8c.icns
diff --git a/‎package/rpm/m8c.spec
+1-1 b/‎package/rpm/m8c.spec
+1-1
diff --git a/‎SDL2_inprint.h ‎src/SDL2_inprint.h b/‎SDL2_inprint.h ‎src/SDL2_inprint.h
diff --git a/‎audio.c ‎src/audio.c b/‎audio.c ‎src/audio.c
diff --git a/‎audio.h ‎src/audio.h b/‎audio.h ‎src/audio.h
diff --git a/‎command.c ‎src/command.c b/‎command.c ‎src/command.c
diff --git a/‎command.h ‎src/command.h b/‎command.h ‎src/command.h
diff --git a/‎config.c ‎src/config.c b/‎config.c ‎src/config.c
diff --git a/‎config.h ‎src/config.h b/‎config.h ‎src/config.h
diff --git a/‎fx_cube.c ‎src/fx_cube.c b/‎fx_cube.c ‎src/fx_cube.c
diff --git a/‎fx_cube.h ‎src/fx_cube.h b/‎fx_cube.h ‎src/fx_cube.h
diff --git a/‎ini.c ‎src/ini.c b/‎ini.c ‎src/ini.c
diff --git a/‎ini.h ‎src/ini.h b/‎ini.h ‎src/ini.h
diff --git a/‎inline_font.h ‎src/inline_font.h b/‎inline_font.h ‎src/inline_font.h
diff --git a/‎inline_font_large.h ‎src/inline_font_large.h b/‎inline_font_large.h ‎src/inline_font_large.h
diff --git a/‎inline_font_small.h ‎src/inline_font_small.h b/‎inline_font_small.h ‎src/inline_font_small.h
diff --git a/‎inprint2.c ‎src/inprint2.c b/‎inprint2.c ‎src/inprint2.c
diff --git a/‎input.c ‎src/input.c b/‎input.c ‎src/input.c
diff --git a/‎input.h ‎src/input.h b/‎input.h ‎src/input.h
diff --git a/‎main.c ‎src/main.c b/‎main.c ‎src/main.c
diff --git a/‎render.c ‎src/render.c b/‎render.c ‎src/render.c
diff --git a/‎render.h ‎src/render.h b/‎render.h ‎src/render.h
diff --git a/‎ringbuffer.c ‎src/ringbuffer.c b/‎ringbuffer.c ‎src/ringbuffer.c
diff --git a/‎ringbuffer.h ‎src/ringbuffer.h b/‎ringbuffer.h ‎src/ringbuffer.h
diff --git a/‎serial.c ‎src/serial.c b/‎serial.c ‎src/serial.c
diff --git a/‎serial.h ‎src/serial.h b/‎serial.h ‎src/serial.h
diff --git a/‎slip.c ‎src/slip.c b/‎slip.c ‎src/slip.c
diff --git a/‎slip.h ‎src/slip.h b/‎slip.h ‎src/slip.h
diff --git a/‎usb.c ‎src/usb.c b/‎usb.c ‎src/usb.c
diff --git a/‎usb.h ‎src/usb.h b/‎usb.h ‎src/usb.h
diff --git a/‎usb_audio.c ‎src/usb_audio.c b/‎usb_audio.c ‎src/usb_audio.c
@@ -1,5 +1,10 @@
 # Audio setup for M8 headless 
 
+Please note that the program includes SDL based audio routing built-in nowadays.
+
+Experimental audio routing support can be enabled by setting the config value `"audio_enabled"` to `"true"`. The audio buffer size can also be tweaked from the config file for possible lower latencies.
+If the right audio device is not picked up by default, you can use a specific audio device by using `"audio_output_device"` config parameter.
+
 ## Windows
 
 * Right click Sound in Taskbar
 
@@ -4,9 +4,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := m8c
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.c)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/src/*.c)
 
-LOCAL_EXPORT_C_INCLUDES := $(wildcard $(LOCAL_PATH)/*.h)
+LOCAL_EXPORT_C_INCLUDES := $(wildcard $(LOCAL_PATH)/src/*.h)
 
 LOCAL_CFLAGS += -DUSE_LIBUSB
 
 
@@ -16,9 +16,9 @@ else ()
     link_directories(${SDL2_LIBRARY_DIRS} ${LIBSERIALPORT_LIBRARY_DIRS})
 endif (USE_LIBUSB)
 
-file(GLOB m8c_SRC "*.h" "*.c")
+file(GLOB m8c_SRC "src/*.h" "src/*.c")
 
-set(MACOS_CONTENTS "${CMAKE_CURRENT_SOURCE_DIR}/macos/m8c.app/Contents")
+set(MACOS_CONTENTS "${CMAKE_CURRENT_SOURCE_DIR}/package/macos/m8c.app/Contents")
 
 set(APP_ICON ${MACOS_CONTENTS}/Resources/m8c.icns)
 set_source_files_properties(${APP_ICON} PROPERTIES
 
@@ -1,8 +1,8 @@
 #Set all your object files (the object files of all the .c files in your project, e.g. main.o my_sub_functions.o )
-OBJ = main.o serial.o slip.o command.o render.o ini.o config.o input.o fx_cube.o usb.o audio.o usb_audio.o ringbuffer.o inprint2.o
+OBJ = src/main.o src/serial.o src/slip.o src/command.o src/render.o src/ini.o src/config.o src/input.o src/fx_cube.o src/usb.o src/audio.o src/usb_audio.o src/ringbuffer.o src/inprint2.o
 
 #Set any dependant header files so that if they are edited they cause a complete re-compile (e.g. main.h some_subfunctions.h some_definitions_file.h ), or leave blank
-DEPS = serial.h slip.h command.h render.h ini.h config.h input.h fx_cube.h audio.h ringbuffer.h inline_font.h
+DEPS = src/serial.h src/slip.h src/command.h src/render.h src/ini.h src/config.h src/input.h src/fx_cube.h src/audio.h src/ringbuffer.h src/inline_font.h
 
 #Any special libraries you are using in your project (e.g. -lbcm2835 -lrt `pkg-config --libs gtk+-3.0` ), or leave blank
 INCLUDES = $(shell pkg-config --libs sdl2 libserialport)
@@ -16,6 +16,8 @@ CC = gcc
 #Set the filename extensiton of your C files (e.g. .c or .cpp )
 EXTENSION = .c
 
+SOURCE_DIR = src/
+
 #define a rule that applies to all files ending in the .o suffix, which says that the .o file depends upon the .c version of the file and all the .h files included in the DEPS macro.  Compile each object file
 %.o: %$(EXTENSION) $(DEPS)
 	$(CC) -c -o $@ $< $(local_CFLAGS)
@@ -33,7 +35,7 @@ libusb: m8c
 .PHONY: clean
 
 clean:
-	rm -f *.o *~ m8c
+	rm -f src/*.o *~ m8c
 
 # PREFIX is environment variable, but if it is not set, then set default value
 ifeq ($(PREFIX),)
 
@@ -1,5 +1,5 @@
 Name:           m8c
-Version:        1.5.3
+Version:        1.5.4
 Release:        1%{?dist}
 Summary:        m8c is a client for Dirtywave M8 music tracker's headless mode