rename files to snake_case

client/CMakeLists.txt

@@ -4,7 +4,7 @@ set(CLIENT_SOURCES
     snapclient.cpp
     stream.cpp
     time_provider.cpp
-    decoder/pcmDecoder.cpp
+    decoder/pcm_decoder.cpp
     player/player.cpp)
 
 set(CLIENT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} common)
@@ -20,12 +20,12 @@ set(CLIENT_INCLUDE
 if(MACOSX)
     # Bonjour
     if (BONJOUR_FOUND)
-        list(APPEND CLIENT_SOURCES browseZeroConf/browseBonjour.cpp)
+        list(APPEND CLIENT_SOURCES browseZeroConf/browse_bonjour.cpp)
     endif (BONJOUR_FOUND)
 
     # CoreAudio
     add_definitions(-DHAS_COREAUDIO)
-    list(APPEND CLIENT_SOURCES player/coreAudioPlayer.cpp)
+    list(APPEND CLIENT_SOURCES player/coreaudio_player.cpp)
     find_library(COREAUDIO_LIB CoreAudio)
     find_library(COREFOUNDATION_LIB CoreFoundation)
     find_library(AUDIOTOOLBOX_LIB AudioToolbox)
@@ -33,14 +33,14 @@ if(MACOSX)
 else()
     # Avahi
     if (AVAHI_FOUND)
-        list(APPEND CLIENT_SOURCES browseZeroConf/browseAvahi.cpp)
+        list(APPEND CLIENT_SOURCES browseZeroConf/browse_avahi.cpp)
         list(APPEND CLIENT_LIBRARIES ${AVAHI_LIBRARIES})
         list(APPEND CLIENT_INCLUDE ${AVAHI_INCLUDE_DIRS})
     endif (AVAHI_FOUND)
 
     # ALSA
     if (ALSA_FOUND)
-        list(APPEND CLIENT_SOURCES player/alsaPlayer.cpp)
+        list(APPEND CLIENT_SOURCES player/alsa_player.cpp)
         list(APPEND CLIENT_LIBRARIES ${ALSA_LIBRARIES})
         list(APPEND CLIENT_INCLUDE ${ALSA_INCLUDE_DIRS})
     endif (ALSA_FOUND)
@@ -48,7 +48,7 @@ endif (MACOSX)
 
 # if OGG then tremor or vorbis
 if (OGG_FOUND)
-    list(APPEND CLIENT_SOURCES decoder/oggDecoder.cpp)
+    list(APPEND CLIENT_SOURCES decoder/ogg_decoder.cpp)
     list(APPEND CLIENT_LIBRARIES ${OGG_LIBRARIES})
     list(APPEND CLIENT_INCLUDE ${OGG_INCLUDE_DIRS})
 endif (OGG_FOUND)
@@ -63,7 +63,7 @@ elseif (VORBIS_FOUND)
 endif (TREMOR_FOUND)
 
 if (FLAC_FOUND)
-    list(APPEND CLIENT_SOURCES decoder/flacDecoder.cpp)
+    list(APPEND CLIENT_SOURCES decoder/flac_decoder.cpp)
     list(APPEND CLIENT_LIBRARIES ${FLAC_LIBRARIES})
     list(APPEND CLIENT_INCLUDE ${FLAC_INCLUDE_DIRS})
 endif (FLAC_FOUND)

client/Makefile

@@ -36,7 +36,7 @@ DEBUG=-O3
 
 CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wpedantic -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DVERSION=\"$(VERSION)\" -I. -I.. -I../common
 LDFLAGS   = $(ADD_LDFLAGS) -logg -lFLAC
-OBJ       = snapclient.o stream.o client_connection.o time_provider.o player/player.o decoder/pcmDecoder.o decoder/oggDecoder.o decoder/flacDecoder.o controller.o ../common/sampleFormat.o
+OBJ       = snapclient.o stream.o client_connection.o time_provider.o player/player.o decoder/pcm_decoder.o decoder/ogg_decoder.o decoder/flac_decoder.o controller.o ../common/sample_format.o
 
 
 ifneq (,$(TARGET))
@@ -53,20 +53,20 @@ CXX       = $(PROGRAM_PREFIX)clang++
 STRIP     = $(PROGRAM_PREFIX)strip
 CXXFLAGS += -pthread -fPIC -DHAS_TREMOR -DHAS_OPENSL -I$(NDK_DIR)/include
 LDFLAGS   = -L$(NDK_DIR)/lib -pie -lvorbisidec -logg -lFLAC -lOpenSLES -latomic -llog -static-libstdc++
-OBJ      += player/openslPlayer.o 
+OBJ      += player/opensl_player.o 
 
 else ifeq ($(TARGET), OPENWRT)
 
 STRIP     = echo
 CXXFLAGS += -pthread -DNO_CPP11_STRING -DHAS_TREMOR -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON
 LDFLAGS  += -lasound -lvorbisidec -lavahi-client -lavahi-common -latomic
-OBJ      += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o
+OBJ      += ../common/daemon.o player/alsa_player.o browseZeroConf/browse_avahi.o
 
 else ifeq ($(TARGET), BUILDROOT)
 
 CXXFLAGS += -pthread -DNO_CPP11_STRING -DHAS_TREMOR -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON
 LDFLAGS  += -lasound -lvorbisidec -lavahi-client -lavahi-common -latomic
-OBJ      += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o
+OBJ      += ../common/daemon.o player/alsa_player.o browseZeroConf/browse_avahi.o
 
 else ifeq ($(TARGET), MACOS)
 
@@ -74,7 +74,7 @@ CXX       = g++
 STRIP     = strip
 CXXFLAGS += -DHAS_COREAUDIO -DHAS_VORBIS -DFREEBSD -DHAS_BONJOUR -DHAS_DAEMON -I/usr/local/include -Wno-unused-local-typedef -Wno-deprecated
 LDFLAGS  += -lvorbis -lFLAC -L/usr/local/lib -framework AudioToolbox -framework CoreAudio -framework CoreFoundation -framework IOKit
-OBJ      += ../common/daemon.o player/coreAudioPlayer.o browseZeroConf/browseBonjour.o
+OBJ      += ../common/daemon.o player/coreaudio_player.o browseZeroConf/browse_bonjour.o
 
 else
 
@@ -82,7 +82,7 @@ CXX       = g++
 STRIP     = strip
 CXXFLAGS += -pthread -DHAS_VORBIS -DHAS_ALSA -DHAS_AVAHI -DHAS_DAEMON
 LDFLAGS  += -lrt -lasound -lvorbis -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ -latomic
-OBJ      += ../common/daemon.o player/alsaPlayer.o browseZeroConf/browseAvahi.o
+OBJ      += ../common/daemon.o player/alsa_player.o browseZeroConf/browse_avahi.o
 
 endif
 

client/browseZeroConf/browse_avahi.cpp

@@ -17,9 +17,9 @@
   USA.
 ***/
 
-#include "browseAvahi.h"
+#include "browse_avahi.hpp"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
+#include "common/snap_exception.hpp"
 #include <assert.h>
 #include <iostream>
 #include <stdio.h>

client/browseZeroConf/browse_avahi.hpp

@@ -27,7 +27,7 @@
 
 class BrowseAvahi;
 
-#include "browsemDNS.h"
+#include "browse_mdns.hpp"
 
 class BrowseAvahi : public BrowsemDNS
 {

client/browseZeroConf/browse_bonjour.cpp

@@ -12,7 +12,7 @@
 #endif
 
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
+#include "common/snap_exception.hpp"
 
 using namespace std;
 

client/browseZeroConf/browse_bonjour.hpp

@@ -5,7 +5,7 @@
 
 class BrowseBonjour;
 
-#include "browsemDNS.h"
+#include "browse_mdns.hpp"
 
 class BrowseBonjour : public BrowsemDNS
 {

client/browseZeroConf/browse_mdns.hpp

@@ -27,7 +27,7 @@ public:
 };
 
 #if defined(HAS_AVAHI)
-#include "browseAvahi.h"
+#include "browse_avahi.hpp"
 typedef BrowseAvahi BrowseZeroConf;
 #elif defined(HAS_BONJOUR)
 #include "browseBonjour.h"

client/client_connection.cpp

@@ -18,8 +18,8 @@
 
 #include "client_connection.hpp"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
 #include "message/hello.h"
 #include <iostream>
 #include <mutex>

client/client_connection.hpp

@@ -19,7 +19,7 @@
 #ifndef CLIENT_CONNECTION_H
 #define CLIENT_CONNECTION_H
 
-#include "common/timeDefs.h"
+#include "common/time_defs.hpp"
 #include "message/message.h"
 #include <atomic>
 #include <boost/asio.hpp>

client/controller.cpp

@@ -17,18 +17,18 @@
 ***/
 
 #include "controller.hpp"
-#include "decoder/pcmDecoder.h"
+#include "decoder/pcm_decoder.hpp"
 #include <iostream>
 #include <memory>
 #include <string>
 #if defined(HAS_OGG) && (defined(HAS_TREMOR) || defined(HAS_VORBIS))
-#include "decoder/oggDecoder.h"
+#include "decoder/ogg_decoder.hpp"
 #endif
 #if defined(HAS_FLAC)
-#include "decoder/flacDecoder.h"
+#include "decoder/flac_decoder.hpp"
 #endif
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
+#include "common/snap_exception.hpp"
 #include "message/hello.h"
 #include "message/time.h"
 #include "time_provider.hpp"

client/controller.hpp

@@ -23,11 +23,11 @@
 #include "message/message.h"
 #include "message/serverSettings.h"
 #include "message/streamTags.h"
-#include "player/pcmDevice.h"
+#include "player/pcm_device.hpp"
 #include <atomic>
 #include <thread>
 #ifdef HAS_ALSA
-#include "player/alsaPlayer.h"
+#include "player/alsa_player.hpp"
 #elif HAS_OPENSL
 #include "player/openslPlayer.h"
 #elif HAS_COREAUDIO

client/decoder/decoder.h

@@ -18,7 +18,7 @@
 
 #ifndef DECODER_H
 #define DECODER_H
-#include "common/sampleFormat.h"
+#include "common/sample_format.hpp"
 #include "message/codecHeader.h"
 #include "message/pcmChunk.h"
 #include <mutex>

client/decoder/flac_decoder.cpp

@@ -16,10 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "flacDecoder.h"
+#include "flac_decoder.hpp"
 #include "common/aixlog.hpp"
 #include "common/endian.hpp"
-#include "common/snapException.h"
+#include "common/snap_exception.hpp"
 #include <cmath>
 #include <cstring>
 #include <iostream>

client/decoder/ogg_decoder.cpp

@@ -22,8 +22,8 @@
 
 #include "common/aixlog.hpp"
 #include "common/endian.hpp"
-#include "common/snapException.h"
-#include "oggDecoder.h"
+#include "common/snap_exception.hpp"
+#include "ogg_decoder.hpp"
 
 
 using namespace std;

client/decoder/pcm_decoder.cpp

@@ -16,10 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "pcmDecoder.h"
+#include "pcm_decoder.hpp"
 #include "common/aixlog.hpp"
 #include "common/endian.hpp"
-#include "common/snapException.h"
+#include "common/snap_exception.hpp"
 
 
 #define ID_RIFF 0x46464952

client/player/alsa_player.cpp

@@ -16,10 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "alsaPlayer.h"
+#include "alsa_player.hpp"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
 
 //#define BUFFER_TIME 120000
 #define PERIOD_TIME 30000

client/player/alsa_player.hpp

@@ -19,7 +19,7 @@
 #ifndef ALSA_PLAYER_H
 #define ALSA_PLAYER_H
 
-#include "player.h"
+#include "player.hpp"
 #include <alsa/asoundlib.h>
 
 

client/player/coreaudio_player.hpp

@@ -23,7 +23,7 @@
 #include <CoreAudio/CoreAudioTypes.h>
 #include <CoreFoundation/CFRunLoop.h>
 
-#include "player.h"
+#include "player.hpp"
 
 /// Audio Player
 /**

client/player/opensl_player.cpp

@@ -20,8 +20,8 @@
 #include <iostream>
 
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
 #include "openslPlayer.h"
 
 using namespace std;

client/player/opensl_player.hpp

@@ -23,7 +23,7 @@
 #include <SLES/OpenSLES_Android.h>
 #include <string>
 
-#include "player.h"
+#include "player.hpp"
 
 typedef int (*AndroidAudioCallback)(short* buffer, int num_samples);
 

client/player/player.cpp

@@ -20,7 +20,7 @@
 #include <iostream>
 
 #include "common/aixlog.hpp"
-#include "player.h"
+#include "player.hpp"
 
 
 using namespace std;

client/player/player.hpp

@@ -21,7 +21,7 @@
 
 #include "common/aixlog.hpp"
 #include "common/endian.hpp"
-#include "pcmDevice.h"
+#include "pcm_device.hpp"
 #include "stream.hpp"
 #include <atomic>
 #include <string>

client/snapclient.cpp

@@ -19,20 +19,20 @@
 #include <iostream>
 #include <sys/resource.h>
 
-#include "browseZeroConf/browsemDNS.h"
+#include "browseZeroConf/browse_mdns.hpp"
 #include "common/popl.hpp"
 #include "controller.hpp"
 
 #ifdef HAS_ALSA
-#include "player/alsaPlayer.h"
+#include "player/alsa_player.hpp"
 #endif
 #ifdef HAS_DAEMON
-#include "common/daemon.h"
+#include "common/daemon.hpp"
 #endif
 #include "common/aixlog.hpp"
-#include "common/signalHandler.h"
-#include "common/strCompat.h"
-#include "common/utils.h"
+#include "common/signal_handler.hpp"
+#include "common/str_compat.hpp"
+#include "common/utils.hpp"
 #include "metadata.hpp"
 
 

client/stream.hpp

@@ -26,7 +26,7 @@
 //#include "common/timeUtils.h"
 
 #include "common/queue.h"
-#include "common/sampleFormat.h"
+#include "common/sample_format.hpp"
 #include "double_buffer.hpp"
 #include "message/message.h"
 #include "message/pcmChunk.h"

client/time_provider.hpp

@@ -19,7 +19,7 @@
 #ifndef TIME_PROVIDER_H
 #define TIME_PROVIDER_H
 
-#include "common/timeDefs.h"
+#include "common/time_defs.hpp"
 #include "double_buffer.hpp"
 #include "message/message.h"
 #include <atomic>

common/CMakeLists.txt

@@ -1 +1 @@
-add_library(common STATIC daemon.cpp sampleFormat.cpp)
+add_library(common STATIC daemon.cpp sample_format.cpp)

common/daemon.cpp

@@ -16,12 +16,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "daemon.h"
+#include "daemon.hpp"
 
-#include "common/snapException.h"
-#include "common/strCompat.h"
-#include "common/utils.h"
-#include "common/utils/file_utils.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
+#include "common/utils.hpp"
+#include "common/utils/file_utils.hpp"
 #include <fcntl.h>
 #include <grp.h>
 #include <iostream>

common/json.hpp

@@ -55,7 +55,7 @@ SOFTWARE.
 #include <string>  // string
 #include <vector>  // vector
 
-#include "strCompat.h"
+#include "str_compat.hpp"
 
 
 /*!

common/message/hello.h

@@ -19,8 +19,8 @@
 #ifndef HELLO_MSG_H
 #define HELLO_MSG_H
 
-#include "common/strCompat.h"
-#include "common/utils.h"
+#include "common/str_compat.hpp"
+#include "common/utils.hpp"
 #include "jsonMessage.h"
 #include <string>
 

common/message/message.h

@@ -20,7 +20,7 @@
 #define MESSAGE_H
 
 #include "common/endian.hpp"
-#include "common/timeDefs.h"
+#include "common/time_defs.hpp"
 #include <cstdlib>
 #include <cstring>
 #include <iostream>

common/message/pcmChunk.h

@@ -19,7 +19,7 @@
 #ifndef PCM_CHUNK_H
 #define PCM_CHUNK_H
 
-#include "common/sampleFormat.h"
+#include "common/sample_format.hpp"
 #include "message.h"
 #include "wireChunk.h"
 #include <chrono>

common/message/wireChunk.h

@@ -19,7 +19,7 @@
 #ifndef WIRE_CHUNK_H
 #define WIRE_CHUNK_H
 
-#include "common/timeDefs.h"
+#include "common/time_defs.hpp"
 #include "message.h"
 #include <chrono>
 #include <cstdlib>

common/sample_format.cpp

@@ -21,10 +21,10 @@
 #include <vector>
 
 #include "common/aixlog.hpp"
-#include "common/strCompat.h"
-#include "common/utils.h"
-#include "common/utils/string_utils.h"
-#include "sampleFormat.h"
+#include "common/str_compat.hpp"
+#include "common/utils.hpp"
+#include "common/utils/string_utils.hpp"
+#include "sample_format.hpp"
 
 
 using namespace std;

common/utils.hpp

@@ -19,8 +19,8 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include "common/strCompat.h"
-#include "common/utils/string_utils.h"
+#include "common/str_compat.hpp"
+#include "common/utils/string_utils.hpp"
 
 #include <cctype>
 #include <cerrno>

common/utils/file_utils.hpp

@@ -19,7 +19,7 @@
 #ifndef FILE_UTILS_H
 #define FILE_UTILS_H
 
-#include "string_utils.h"
+#include "string_utils.hpp"
 #include <fstream>
 #include <grp.h>
 #include <pwd.h>

server/CMakeLists.txt

@@ -6,18 +6,18 @@ set(SERVER_SOURCES
     snapserver.cpp
     stream_server.cpp
     stream_session.cpp
-    encoder/encoderFactory.cpp
-    encoder/pcmEncoder.cpp
+    encoder/encoder_factory.cpp
+    encoder/pcm_encoder.cpp
     streamreader/base64.cpp
-    streamreader/streamUri.cpp
-    streamreader/streamManager.cpp
-    streamreader/pcmStream.cpp
-    streamreader/pipeStream.cpp
-    streamreader/fileStream.cpp
-    streamreader/airplayStream.cpp
-    streamreader/spotifyStream.cpp
+    streamreader/stream_uri.cpp
+    streamreader/stream_manager.cpp
+    streamreader/pcm_stream.cpp
+    streamreader/pipe_stream.cpp
+    streamreader/file_stream.cpp
+    streamreader/airplay_stream.cpp
+    streamreader/librespot_stream.cpp
     streamreader/watchdog.cpp
-    streamreader/processStream.cpp)
+    streamreader/process_stream.cpp)
 
 set(SERVER_LIBRARIES
     ${CMAKE_THREAD_LIBS_INIT}
@@ -30,19 +30,19 @@ set(SERVER_INCLUDE
 
 # Avahi
 if (AVAHI_FOUND)
-    list(APPEND SERVER_SOURCES publishZeroConf/publishAvahi.cpp)
+    list(APPEND SERVER_SOURCES publishZeroConf/publish_avahi.cpp)
     list(APPEND SERVER_LIBRARIES ${AVAHI_LIBRARIES})
     list(APPEND SERVER_INCLUDE ${AVAHI_INCLUDE_DIRS})
 endif (AVAHI_FOUND)
 
 if (BONJOUR_FOUND)
-    list(APPEND SERVER_SOURCES publishZeroConf/publishBonjour.cpp)
+    list(APPEND SERVER_SOURCES publishZeroConf/publish_bonjour.cpp)
 #    list(APPEND SERVER_LIBRARIES ${BONJOUR_LIBRARIES})
 #    list(APPEND SERVER_INCLUDE ${BONJOUR_INCLUDE_DIRS})
 endif (BONJOUR_FOUND)
 
 if (OGG_FOUND AND VORBIS_FOUND AND VORBISENC_FOUND)
-    list(APPEND SERVER_SOURCES encoder/oggEncoder.cpp)
+    list(APPEND SERVER_SOURCES encoder/ogg_encoder.cpp)
     list(APPEND SERVER_LIBRARIES
         ${OGG_LIBRARIES}
         ${VORBIS_LIBRARIES}
@@ -54,7 +54,7 @@ if (OGG_FOUND AND VORBIS_FOUND AND VORBISENC_FOUND)
 endif (OGG_FOUND AND VORBIS_FOUND AND VORBISENC_FOUND)
 
 if (FLAC_FOUND)
-    list(APPEND SERVER_SOURCES encoder/flacEncoder.cpp)
+    list(APPEND SERVER_SOURCES encoder/flac_encoder.cpp)
     list(APPEND SERVER_LIBRARIES ${FLAC_LIBRARIES})
     list(APPEND SERVER_INCLUDE ${FLAC_INCLUDE_DIRS})
 endif (FLAC_FOUND)

server/Makefile

@@ -31,13 +31,13 @@ else
 endif
 
 # Simplify building debuggable executables 'make DEBUG=-g STRIP=echo'
-DEBUG=-O2
+DEBUG=-g
 SANITIZE=
 #-fsanitize=thread
 
 CXXFLAGS += $(ADD_CFLAGS) $(SANITIZE) -std=c++14 -Wall -Wpedantic -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -DVERSION=\"$(VERSION)\" -I. -I.. -I../common
 LDFLAGS   = $(ADD_LDFLAGS) $(SANITIZE) -lvorbis -lvorbisenc -logg -lFLAC 
-OBJ       = snapserver.o config.o control_server.o control_session_tcp.o control_session_http.o stream_server.o stream_session.o streamreader/streamUri.o streamreader/base64.o streamreader/streamManager.o streamreader/pcmStream.o streamreader/pipeStream.o streamreader/fileStream.o streamreader/processStream.o streamreader/airplayStream.o streamreader/spotifyStream.o streamreader/watchdog.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o ../common/sampleFormat.o
+OBJ       = snapserver.o config.o control_server.o control_session_tcp.o control_session_http.o stream_server.o stream_session.o streamreader/stream_uri.o streamreader/base64.o streamreader/stream_manager.o streamreader/pcm_stream.o streamreader/pipe_stream.o streamreader/file_stream.o streamreader/process_stream.o streamreader/airplay_stream.o streamreader/librespot_stream.o streamreader/watchdog.o encoder/encoder_factory.o encoder/flac_encoder.o encoder/pcm_encoder.o encoder/ogg_encoder.o ../common/sample_format.o
 
 ifneq (,$(TARGET))
 CXXFLAGS += -D$(TARGET)
@@ -59,13 +59,13 @@ else ifeq ($(TARGET), OPENWRT)
 STRIP     = echo
 CXXFLAGS += -DNO_CPP11_STRING -DHAS_AVAHI -DHAS_DAEMON -pthread
 LDFLAGS  += -lavahi-client -lavahi-common -latomic
-OBJ      += ../common/daemon.o publishZeroConf/publishAvahi.o 
+OBJ      += ../common/daemon.o publishZeroConf/publish_avahi.o 
 
 else ifeq ($(TARGET), BUILDROOT)
 
 CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -pthread
 LDFLAGS  += -lrt -lavahi-client -lavahi-common -static-libgcc -static-libstdc++
-OBJ      += publishZeroConf/publishAvahi.o 
+OBJ      += publishZeroConf/publish_avahi.o 
 
 else ifeq ($(TARGET), FREEBSD)
 
@@ -73,7 +73,7 @@ CXX       = g++
 STRIP     = echo
 CXXFLAGS += -DFREEBSD -DNO_CPP11_STRING -DHAS_AVAHI -DHAS_DAEMON -pthread
 LDFLAGS  += -lrt -lavahi-client -lavahi-common -static-libgcc -static-libstdc++ -latomic
-OBJ      += ../common/daemon.o publishZeroConf/publishAvahi.o 
+OBJ      += ../common/daemon.o publishZeroConf/publish_avahi.o 
 
 else ifeq ($(TARGET), MACOS)
 
@@ -81,15 +81,15 @@ CXX       = g++
 STRIP     = strip
 CXXFLAGS += -DFREEBSD -DHAS_BONJOUR -DHAS_DAEMON -Wno-deprecated -I/usr/local/include
 LDFLAGS  += -L/usr/local/lib -framework CoreFoundation -framework IOKit
-OBJ      += ../common/daemon.o publishZeroConf/publishBonjour.o
+OBJ      += ../common/daemon.o publishZeroConf/publish_bonjour.o
 
 else
 
 CXX       = g++
-STRIP     = strip
+STRIP     = echo
 CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -pthread
 LDFLAGS  += -lrt -lavahi-client -lavahi-common -static-libgcc -static-libstdc++
-OBJ      += ../common/daemon.o publishZeroConf/publishAvahi.o 
+OBJ      += ../common/daemon.o publishZeroConf/publish_avahi.o 
 
 endif
 

server/config.cpp

@@ -18,9 +18,9 @@
 
 #include "config.h"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
-#include "common/utils/file_utils.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
+#include "common/utils/file_utils.hpp"
 #include <cerrno>
 #include <fcntl.h>
 #include <fstream>

server/config.h

@@ -25,8 +25,8 @@
 #include <vector>
 
 #include "common/json.hpp"
-#include "common/utils.h"
-#include "common/utils/string_utils.h"
+#include "common/utils.hpp"
+#include "common/utils/string_utils.hpp"
 
 
 namespace strutils = utils::string;

server/control_server.cpp

@@ -18,8 +18,8 @@
 
 #include "control_server.hpp"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/utils.h"
+#include "common/snap_exception.hpp"
+#include "common/utils.hpp"
 #include "config.h"
 #include "control_session_http.hpp"
 #include "control_session_tcp.hpp"

server/control_server.hpp

@@ -28,7 +28,7 @@
 #include <vector>
 
 #include "common/queue.h"
-#include "common/sampleFormat.h"
+#include "common/sample_format.hpp"
 #include "control_session.hpp"
 #include "message/codecHeader.h"
 #include "message/message.h"

server/encoder/encoder.hpp

@@ -22,7 +22,7 @@
 #include <memory>
 #include <string>
 
-#include "common/sampleFormat.h"
+#include "common/sample_format.hpp"
 #include "message/codecHeader.h"
 #include "message/pcmChunk.h"
 

server/encoder/encoder_factory.cpp

@@ -16,17 +16,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "encoderFactory.h"
-#include "pcmEncoder.h"
+#include "encoder_factory.hpp"
+#include "pcm_encoder.hpp"
 #if defined(HAS_OGG) && defined(HAS_VORBIS) && defined(HAS_VORBISENC)
-#include "oggEncoder.h"
+#include "ogg_encoder.hpp"
 #endif
 #if defined(HAS_FLAC)
-#include "flacEncoder.h"
+#include "flac_encoder.hpp"
 #endif
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/utils/string_utils.h"
+#include "common/snap_exception.hpp"
+#include "common/utils/string_utils.hpp"
 
 
 using namespace std;

server/encoder/encoder_factory.hpp

@@ -1,7 +1,7 @@
 #ifndef ENCODER_FACTORY_H
 #define ENCODER_FACTORY_H
 
-#include "encoder.h"
+#include "encoder.hpp"
 #include <string>
 
 class EncoderFactory

server/encoder/flac_encoder.cpp

@@ -19,9 +19,9 @@
 #include <iostream>
 
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
-#include "flacEncoder.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
+#include "flac_encoder.hpp"
 
 using namespace std;
 

server/encoder/flac_encoder.hpp

@@ -18,7 +18,7 @@
 
 #ifndef FLAC_ENCODER_H
 #define FLAC_ENCODER_H
-#include "encoder.h"
+#include "encoder.hpp"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

server/encoder/ogg_encoder.cpp

@@ -20,11 +20,11 @@
 #include <iostream>
 
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
-#include "common/utils.h"
-#include "common/utils/string_utils.h"
-#include "oggEncoder.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
+#include "common/utils.hpp"
+#include "common/utils/string_utils.hpp"
+#include "ogg_encoder.hpp"
 
 using namespace std;
 

server/encoder/ogg_encoder.hpp

@@ -18,7 +18,7 @@
 
 #ifndef OGG_ENCODER_H
 #define OGG_ENCODER_H
-#include "encoder.h"
+#include "encoder.hpp"
 #include <ogg/ogg.h>
 #include <vorbis/vorbisenc.h>
 

server/encoder/pcm_encoder.cpp

@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "pcmEncoder.h"
+#include "pcm_encoder.hpp"
 #include "common/endian.hpp"
 #include <memory>
 

server/encoder/pcm_encoder.hpp

@@ -18,7 +18,7 @@
 
 #ifndef PCM_ENCODER_H
 #define PCM_ENCODER_H
-#include "encoder.h"
+#include "encoder.hpp"
 
 
 class PcmEncoder : public Encoder

server/publishZeroConf/publish_avahi.cpp

@@ -17,7 +17,7 @@
   USA.
 ***/
 
-#include "publishAvahi.h"
+#include "publish_avahi.hpp"
 #include "common/aixlog.hpp"
 #include <cstdio>
 #include <cstdlib>

server/publishZeroConf/publish_avahi.hpp

@@ -35,7 +35,7 @@
 
 class PublishAvahi;
 
-#include "publishmDNS.h"
+#include "publish_mdns.hpp"
 
 class PublishAvahi : public PublishmDNS
 {

server/publishZeroConf/publish_bonjour.hpp

@@ -25,7 +25,7 @@
 
 class PublishBonjour;
 
-#include "publishmDNS.h"
+#include "publish_mdns.hpp"
 
 class PublishBonjour : public PublishmDNS
 {

server/publishZeroConf/publish_mdns.hpp

@@ -32,7 +32,7 @@ protected:
 };
 
 #if defined(HAS_AVAHI)
-#include "publishAvahi.h"
+#include "publish_avahi.hpp"
 typedef PublishAvahi PublishZeroConf;
 #elif defined(HAS_BONJOUR)
 #include "publishBonjour.h"

server/snapserver.cpp

@@ -22,19 +22,19 @@
 
 #include "common/popl.hpp"
 #ifdef HAS_DAEMON
-#include "common/daemon.h"
+#include "common/daemon.hpp"
 #endif
-#include "common/sampleFormat.h"
-#include "common/signalHandler.h"
-#include "common/snapException.h"
-#include "common/timeDefs.h"
-#include "common/utils/string_utils.h"
-#include "encoder/encoderFactory.h"
+#include "common/sample_format.hpp"
+#include "common/signal_handler.hpp"
+#include "common/snap_exception.hpp"
+#include "common/time_defs.hpp"
+#include "common/utils/string_utils.hpp"
+#include "encoder/encoder_factory.hpp"
 #include "message/message.h"
 #include "server_settings.hpp"
 #include "stream_server.hpp"
 #if defined(HAS_AVAHI) || defined(HAS_BONJOUR)
-#include "publishZeroConf/publishmDNS.h"
+#include "publishZeroConf/publish_mdns.hpp"
 #endif
 #include "common/aixlog.hpp"
 #include "config.h"

server/stream_server.hpp

@@ -28,7 +28,7 @@
 #include <vector>
 
 #include "common/queue.h"
-#include "common/sampleFormat.h"
+#include "common/sample_format.hpp"
 #include "control_server.hpp"
 #include "jsonrpcpp.hpp"
 #include "message/codecHeader.h"
@@ -36,7 +36,7 @@
 #include "message/serverSettings.h"
 #include "server_settings.hpp"
 #include "stream_session.hpp"
-#include "streamreader/streamManager.h"
+#include "streamreader/stream_manager.hpp"
 
 
 using boost::asio::ip::tcp;

server/stream_session.hpp

@@ -21,7 +21,7 @@
 
 #include "common/queue.h"
 #include "message/message.h"
-#include "streamreader/streamManager.h"
+#include "streamreader/stream_manager.hpp"
 #include <atomic>
 #include <boost/asio.hpp>
 #include <condition_variable>

server/streamreader/airplay_stream.cpp

@@ -16,12 +16,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "airplayStream.h"
+#include "airplay_stream.hpp"
 #include "base64.h"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/utils.h"
-#include "common/utils/string_utils.h"
+#include "common/snap_exception.hpp"
+#include "common/utils.hpp"
+#include "common/utils/string_utils.hpp"
 
 using namespace std;
 

server/streamreader/airplay_stream.hpp

@@ -19,7 +19,7 @@
 #ifndef AIRPLAY_STREAM_H
 #define AIRPLAY_STREAM_H
 
-#include "processStream.h"
+#include "process_stream.hpp"
 
 /*
  * Expat is used in metadata parsing from Shairport-sync.

server/streamreader/file_stream.cpp

@@ -21,9 +21,9 @@
 #include <sys/stat.h>
 
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "encoder/encoderFactory.h"
-#include "fileStream.h"
+#include "common/snap_exception.hpp"
+#include "encoder/encoder_factory.hpp"
+#include "file_stream.hpp"
 
 
 using namespace std;

server/streamreader/file_stream.hpp

@@ -19,7 +19,7 @@
 #ifndef FILE_STREAM_H
 #define FILE_STREAM_H
 
-#include "pcmStream.h"
+#include "pcm_stream.hpp"
 #include <fstream>
 
 

server/streamreader/librespot-meta.patch

@@ -1,31 +0,0 @@
-*** librespot/src/player.rs	2017-11-30 08:16:40.865939287 +0100
---- librespot.meta/src/player.rs	2017-11-30 08:14:39.232954039 +0100
-***************
-*** 13,19 ****
-  use audio_backend::Sink;
-  use audio::{AudioFile, AudioDecrypt};
-  use audio::{VorbisDecoder, VorbisPacket};
-! use metadata::{FileFormat, Track, Metadata};
-  use mixer::AudioFilter;
-  
-  #[derive(Clone)]
---- 13,19 ----
-  use audio_backend::Sink;
-  use audio::{AudioFile, AudioDecrypt};
-  use audio::{VorbisDecoder, VorbisPacket};
-! use metadata::{Artist, FileFormat, Track, Metadata};
-  use mixer::AudioFilter;
-  
-  #[derive(Clone)]
-***************
-*** 384,389 ****
---- 384,392 ----
-  
-          info!("Track \"{}\" loaded", track.name);
-  
-+ 	let artist = Artist::get(&self.session, track.artists[0]).wait().unwrap();
-+         info!("metadata:{{\"ARTIST\":\"{}\",\"TITLE\":\"{}\"}}", artist.name, track.name);
-+ 
-          Some(decoder)
-      }
-  }

server/streamreader/librespot_stream.cpp

@@ -16,11 +16,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "spotifyStream.h"
+#include "librespot_stream.hpp"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/utils.h"
-#include "common/utils/string_utils.h"
+#include "common/snap_exception.hpp"
+#include "common/utils.hpp"
+#include "common/utils/string_utils.hpp"
 #include <regex>
 
 

server/streamreader/librespot_stream.hpp

@@ -19,7 +19,7 @@
 #ifndef SPOTIFY_STREAM_H
 #define SPOTIFY_STREAM_H
 
-#include "processStream.h"
+#include "process_stream.hpp"
 #include "watchdog.h"
 
 /// Starts librespot and reads PCM data from stdout

server/streamreader/pcm_stream.cpp

@@ -21,10 +21,10 @@
 #include <sys/stat.h>
 
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
-#include "encoder/encoderFactory.h"
-#include "pcmStream.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
+#include "encoder/encoder_factory.hpp"
+#include "pcm_stream.hpp"
 
 
 using namespace std;

server/streamreader/pcm_stream.hpp

@@ -20,11 +20,11 @@
 #define PCM_STREAM_H
 
 #include "common/json.hpp"
-#include "common/sampleFormat.h"
-#include "encoder/encoder.h"
+#include "common/sample_format.hpp"
+#include "encoder/encoder.hpp"
 #include "message/codecHeader.h"
 #include "message/streamTags.h"
-#include "streamUri.h"
+#include "stream_uri.hpp"
 #include <atomic>
 #include <condition_variable>
 #include <map>

server/streamreader/pipe_stream.cpp

@@ -23,10 +23,10 @@
 #include <unistd.h>
 
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
-#include "encoder/encoderFactory.h"
-#include "pipeStream.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
+#include "encoder/encoder_factory.hpp"
+#include "pipe_stream.hpp"
 
 
 using namespace std;

server/streamreader/pipe_stream.hpp

@@ -19,7 +19,7 @@
 #ifndef PIPE_STREAM_H
 #define PIPE_STREAM_H
 
-#include "pcmStream.h"
+#include "pcm_stream.hpp"
 
 
 

server/streamreader/process_stream.cpp

@@ -17,11 +17,11 @@
 ***/
 
 
-#include "processStream.h"
+#include "process_stream.hpp"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/utils.h"
-#include "common/utils/string_utils.h"
+#include "common/snap_exception.hpp"
+#include "common/utils.hpp"
+#include "common/utils/string_utils.hpp"
 #include <fcntl.h>
 #include <limits.h>
 #include <sys/stat.h>

server/streamreader/process_stream.hpp

@@ -22,7 +22,7 @@
 #include <memory>
 #include <string>
 
-#include "pcmStream.h"
+#include "pcm_stream.hpp"
 #include "process.hpp"
 
 

server/streamreader/stream_manager.cpp

@@ -16,16 +16,16 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "streamManager.h"
-#include "airplayStream.h"
+#include "stream_manager.hpp"
+#include "airplay_stream.hpp"
 #include "common/aixlog.hpp"
-#include "common/snapException.h"
-#include "common/strCompat.h"
-#include "common/utils.h"
-#include "fileStream.h"
-#include "pipeStream.h"
-#include "processStream.h"
-#include "spotifyStream.h"
+#include "common/snap_exception.hpp"
+#include "common/str_compat.hpp"
+#include "common/utils.hpp"
+#include "file_stream.hpp"
+#include "pipe_stream.hpp"
+#include "process_stream.hpp"
+#include "librespot_stream.hpp"
 
 
 using namespace std;

server/streamreader/stream_manager.hpp

@@ -1,7 +1,7 @@
 #ifndef PCM_READER_FACTORY_H
 #define PCM_READER_FACTORY_H
 
-#include "pcmStream.h"
+#include "pcm_stream.hpp"
 #include <memory>
 #include <string>
 #include <vector>

server/streamreader/stream_uri.cpp

@@ -16,10 +16,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "streamUri.h"
+#include "stream_uri.hpp"
 #include "common/aixlog.hpp"
-#include "common/strCompat.h"
-#include "common/utils/string_utils.h"
+#include "common/str_compat.hpp"
+#include "common/utils/string_utils.hpp"
 
 
 using namespace std;