diff --git a/README.md b/README.md index 5639d50..a09811a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Click on the images below to hear what it sounds like: - + ## Details @@ -60,8 +60,8 @@ The [examples](https://github.com/ggerganov/ggwave/blob/master/examples/) folder | ------- | ----------- | | [simple-rx](https://github.com/ggerganov/ggwave/blob/master/examples/simple-rx) | A very basic receive-only program | | [ggwave-cli](https://github.com/ggerganov/ggwave/blob/master/examples/ggwave-cli) | A command line tool for sending/receiving data through sound | -| [ggwave-gui](https://github.com/ggerganov/ggwave/blob/master/examples/ggwave-gui) | A GUI tool for sending/receiving data through sound | | [ggwave-wasm](https://github.com/ggerganov/ggwave/blob/master/examples/ggwave-wasm) | a WebAssembly module for web applications | +| [waver](https://github.com/ggerganov/ggwave/blob/master/examples/waver) | A GUI tool for sending/receiving data through sound | Other projects using **ggwave** or one of its prototypes: @@ -75,10 +75,10 @@ Other projects using **ggwave** or one of its prototypes: [Ubuntu] $ sudo apt install libsdl2-dev - + [Mac OS with brew] $ brew install sdl2 - + [MSYS2] $ pacman -S git cmake make mingw-w64-x86_64-dlfcn mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index f4d20d5..eb80a19 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -71,8 +71,8 @@ if (GGWAVE_SUPPORT_SDL2) else() # non-emscripten sdl2 examples - add_subdirectory(ggwave-cli) - add_subdirectory(ggwave-gui) add_subdirectory(simple-rx) + add_subdirectory(ggwave-cli) + add_subdirectory(waver) endif() endif() diff --git a/examples/ggwave-gui/CMakeLists.txt b/examples/ggwave-gui/CMakeLists.txt deleted file mode 100644 index b891fe2..0000000 --- a/examples/ggwave-gui/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -add_executable(ggwave-gui main.cpp common.cpp interface.cpp interface-unix.cpp) - -target_include_directories(ggwave-gui PRIVATE - .. - ${SDL2_INCLUDE_DIRS} - ) - -target_link_libraries(ggwave-gui PRIVATE - ggwave - ggwave-common - ggwave-common-sdl2 - ggsock - imgui-sdl2 - ${CMAKE_THREAD_LIBS_INIT} - ) diff --git a/examples/waver/CMakeLists.txt b/examples/waver/CMakeLists.txt new file mode 100644 index 0000000..30f1dd7 --- /dev/null +++ b/examples/waver/CMakeLists.txt @@ -0,0 +1,15 @@ +add_executable(waver main.cpp common.cpp interface.cpp interface-unix.cpp) + +target_include_directories(waver PRIVATE + .. + ${SDL2_INCLUDE_DIRS} + ) + +target_link_libraries(waver PRIVATE + ggwave + ggwave-common + ggwave-common-sdl2 + ggsock + imgui-sdl2 + ${CMAKE_THREAD_LIBS_INIT} + ) diff --git a/examples/ggwave-gui/README.md b/examples/waver/README.md similarity index 84% rename from examples/ggwave-gui/README.md rename to examples/waver/README.md index 5aad61c..185d582 100644 --- a/examples/ggwave-gui/README.md +++ b/examples/waver/README.md @@ -1,8 +1,8 @@ -# ggwave-gui +# waver -Simple GUI program using `ggwave`. The UI is the same as in the `Waver` mobile applications. +Simple GUI program using `ggwave`. The UI is the same as in the `Waver: Data Over Sound` mobile applications. - + Download on the App Store Get it on Google Play diff --git a/examples/ggwave-gui/common.cpp b/examples/waver/common.cpp similarity index 100% rename from examples/ggwave-gui/common.cpp rename to examples/waver/common.cpp diff --git a/examples/ggwave-gui/common.h b/examples/waver/common.h similarity index 100% rename from examples/ggwave-gui/common.h rename to examples/waver/common.h diff --git a/examples/ggwave-gui/interface-unix.cpp b/examples/waver/interface-unix.cpp similarity index 100% rename from examples/ggwave-gui/interface-unix.cpp rename to examples/waver/interface-unix.cpp diff --git a/examples/ggwave-gui/interface.cpp b/examples/waver/interface.cpp similarity index 100% rename from examples/ggwave-gui/interface.cpp rename to examples/waver/interface.cpp diff --git a/examples/ggwave-gui/interface.h b/examples/waver/interface.h similarity index 100% rename from examples/ggwave-gui/interface.h rename to examples/waver/interface.h diff --git a/examples/ggwave-gui/main.cpp b/examples/waver/main.cpp similarity index 99% rename from examples/ggwave-gui/main.cpp rename to examples/waver/main.cpp index 2741d9b..3890c72 100644 --- a/examples/ggwave-gui/main.cpp +++ b/examples/waver/main.cpp @@ -165,7 +165,7 @@ int main(int argc, char** argv) { //int windowX = scale*570; //int windowY = scale*917; - const char * windowTitle = "ggwave-gui"; + const char * windowTitle = "Waver"; SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); SDL_Window * window = SDL_CreateWindow(windowTitle, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, windowX, windowY, window_flags); diff --git a/media/ggwave-gui0-fast.gif b/media/waver-0-fast.gif similarity index 100% rename from media/ggwave-gui0-fast.gif rename to media/waver-0-fast.gif