From ea3921d8b7fdbca97a8bfb8366b0c0506e2a6884 Mon Sep 17 00:00:00 2001 From: badaix Date: Sat, 12 Oct 2019 14:34:00 +0200 Subject: [PATCH] rename some files to snake_case --- client/CMakeLists.txt | 6 +++--- client/Makefile | 2 +- client/{clientConnection.cpp => client_connection.cpp} | 2 +- client/{clientConnection.h => client_connection.hpp} | 0 client/controller.cpp | 4 ++-- client/{controller.h => controller.hpp} | 6 +++--- client/{doubleBuffer.h => double_buffer.hpp} | 0 client/{metadata.h => metadata.hpp} | 0 client/player/player.h | 2 +- client/{snapClient.cpp => snapclient.cpp} | 6 +++--- client/stream.cpp | 4 ++-- client/{stream.h => stream.hpp} | 2 +- client/{timeProvider.cpp => time_provider.cpp} | 2 +- client/{timeProvider.h => time_provider.hpp} | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) rename client/{clientConnection.cpp => client_connection.cpp} (99%) rename client/{clientConnection.h => client_connection.hpp} (100%) rename client/{controller.h => controller.hpp} (97%) rename client/{doubleBuffer.h => double_buffer.hpp} (100%) rename client/{metadata.h => metadata.hpp} (100%) rename client/{snapClient.cpp => snapclient.cpp} (98%) rename client/{stream.h => stream.hpp} (99%) rename client/{timeProvider.cpp => time_provider.cpp} (98%) rename client/{timeProvider.h => time_provider.hpp} (98%) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 7c214ff4..b98cbd00 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,9 +1,9 @@ set(CLIENT_SOURCES - clientConnection.cpp + client_connection.cpp controller.cpp - snapClient.cpp + snapclient.cpp stream.cpp - timeProvider.cpp + time_provider.cpp decoder/pcmDecoder.cpp player/player.cpp) diff --git a/client/Makefile b/client/Makefile index 1d1a9fbd..ed8f5d94 100644 --- a/client/Makefile +++ b/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 clientConnection.o timeProvider.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/pcmDecoder.o decoder/oggDecoder.o decoder/flacDecoder.o controller.o ../common/sampleFormat.o ifneq (,$(TARGET)) diff --git a/client/clientConnection.cpp b/client/client_connection.cpp similarity index 99% rename from client/clientConnection.cpp rename to client/client_connection.cpp index ec77f7a8..bd5c2230 100644 --- a/client/clientConnection.cpp +++ b/client/client_connection.cpp @@ -16,7 +16,7 @@ along with this program. If not, see . ***/ -#include "clientConnection.h" +#include "client_connection.hpp" #include "common/aixlog.hpp" #include "common/snapException.h" #include "common/strCompat.h" diff --git a/client/clientConnection.h b/client/client_connection.hpp similarity index 100% rename from client/clientConnection.h rename to client/client_connection.hpp diff --git a/client/controller.cpp b/client/controller.cpp index 01eef892..1e2ef48e 100644 --- a/client/controller.cpp +++ b/client/controller.cpp @@ -16,7 +16,7 @@ along with this program. If not, see . ***/ -#include "controller.h" +#include "controller.hpp" #include "decoder/pcmDecoder.h" #include #include @@ -31,7 +31,7 @@ #include "common/snapException.h" #include "message/hello.h" #include "message/time.h" -#include "timeProvider.h" +#include "time_provider.hpp" using namespace std; diff --git a/client/controller.h b/client/controller.hpp similarity index 97% rename from client/controller.h rename to client/controller.hpp index 5fc04dc7..ae26cd6d 100644 --- a/client/controller.h +++ b/client/controller.hpp @@ -33,9 +33,9 @@ #elif HAS_COREAUDIO #include "player/coreAudioPlayer.h" #endif -#include "clientConnection.h" -#include "metadata.h" -#include "stream.h" +#include "client_connection.hpp" +#include "metadata.hpp" +#include "stream.hpp" /// Forwards PCM data to the audio player diff --git a/client/doubleBuffer.h b/client/double_buffer.hpp similarity index 100% rename from client/doubleBuffer.h rename to client/double_buffer.hpp diff --git a/client/metadata.h b/client/metadata.hpp similarity index 100% rename from client/metadata.h rename to client/metadata.hpp diff --git a/client/player/player.h b/client/player/player.h index a04c82b7..a9937c64 100644 --- a/client/player/player.h +++ b/client/player/player.h @@ -22,7 +22,7 @@ #include "common/aixlog.hpp" #include "common/endian.hpp" #include "pcmDevice.h" -#include "stream.h" +#include "stream.hpp" #include #include #include diff --git a/client/snapClient.cpp b/client/snapclient.cpp similarity index 98% rename from client/snapClient.cpp rename to client/snapclient.cpp index bcdf4c1d..112588a7 100644 --- a/client/snapClient.cpp +++ b/client/snapclient.cpp @@ -21,7 +21,7 @@ #include "browseZeroConf/browsemDNS.h" #include "common/popl.hpp" -#include "controller.h" +#include "controller.hpp" #ifdef HAS_ALSA #include "player/alsaPlayer.h" @@ -33,7 +33,7 @@ #include "common/signalHandler.h" #include "common/strCompat.h" #include "common/utils.h" -#include "metadata.h" +#include "metadata.hpp" using namespace std; @@ -117,7 +117,7 @@ int main(int argc, char** argv) if (versionSwitch->is_set()) { cout << "snapclient v" << VERSION << "\n" - << "Copyright (C) 2014-2018 BadAix (snapcast@badaix.de).\n" + << "Copyright (C) 2014-2019 BadAix (snapcast@badaix.de).\n" << "License GPLv3+: GNU GPL version 3 or later .\n" << "This is free software: you are free to change and redistribute it.\n" << "There is NO WARRANTY, to the extent permitted by law.\n\n" diff --git a/client/stream.cpp b/client/stream.cpp index 36db791c..383fa3b4 100644 --- a/client/stream.cpp +++ b/client/stream.cpp @@ -16,9 +16,9 @@ along with this program. If not, see . ***/ -#include "stream.h" +#include "stream.hpp" #include "common/aixlog.hpp" -#include "timeProvider.h" +#include "time_provider.hpp" #include #include #include diff --git a/client/stream.h b/client/stream.hpp similarity index 99% rename from client/stream.h rename to client/stream.hpp index ff210bc9..effa7400 100644 --- a/client/stream.h +++ b/client/stream.hpp @@ -27,7 +27,7 @@ #include "common/queue.h" #include "common/sampleFormat.h" -#include "doubleBuffer.h" +#include "double_buffer.hpp" #include "message/message.h" #include "message/pcmChunk.h" #include diff --git a/client/timeProvider.cpp b/client/time_provider.cpp similarity index 98% rename from client/timeProvider.cpp rename to client/time_provider.cpp index f2910089..5edbed51 100644 --- a/client/timeProvider.cpp +++ b/client/time_provider.cpp @@ -16,7 +16,7 @@ along with this program. If not, see . ***/ -#include "timeProvider.h" +#include "time_provider.hpp" #include "common/aixlog.hpp" diff --git a/client/timeProvider.h b/client/time_provider.hpp similarity index 98% rename from client/timeProvider.h rename to client/time_provider.hpp index b71247cb..ccaef2d5 100644 --- a/client/timeProvider.h +++ b/client/time_provider.hpp @@ -20,7 +20,7 @@ #define TIME_PROVIDER_H #include "common/timeDefs.h" -#include "doubleBuffer.h" +#include "double_buffer.hpp" #include "message/message.h" #include #include