small fixes

kirkshoop · Sep 7, 2017 · 7a7e0df · 7a7e0df
1 parent a9ec935
commit 7a7e0df
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ cmake_install.cmake
 install_manifest.txt
 CTestTestfile.cmake
 unix/*
+build/*
+.vscode/*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,7 +74,7 @@ set(SAMPLE_RESOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/imgui.ini
     ${CMAKE_CURRENT_SOURCE_DIR}/NotoMono-Regular.ttf
     ${CMAKE_CURRENT_SOURCE_DIR}/NotoSansSymbols-Regular.ttf
-    ${CMAKE_CURRENT_SOURCE_DIR}/dash.wav
+    ${CMAKE_CURRENT_SOURCE_DIR}/dot.wav
 )
 
 add_executable(${SAMPLE_PROJECT} ${SAMPLE_SOURCES} ${SAMPLE_RESOURCES})
@@ -110,36 +110,36 @@ set_source_files_properties(${SAMPLE_RESOURCES} PROPERTIES
     HEADER_FILE_ONLY ON
     MACOSX_PACKAGE_LOCATION Resources)
 
-set(Boost_USE_STATIC_LIBS OFF)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost COMPONENTS thread) 
+# set(Boost_USE_STATIC_LIBS OFF)
+# set(Boost_USE_MULTITHREADED ON)
+# set(Boost_USE_STATIC_RUNTIME OFF)
+# find_package(Boost COMPONENTS thread) 
 
-MESSAGE( STATUS "Boost_VERSION: " ${Boost_VERSION} )
+# MESSAGE( STATUS "Boost_VERSION: " ${Boost_VERSION} )
 
-set(FUTURE_PROJECT
-    future)
+# set(FUTURE_PROJECT
+#     future)
 
-add_executable(${FUTURE_PROJECT} future.cpp ${SAMPLE_RESOURCES})
+# add_executable(${FUTURE_PROJECT} future.cpp ${SAMPLE_RESOURCES})
 
-target_compile_options(${FUTURE_PROJECT} PUBLIC ${SHARED_COMPILE_OPTIONS})
-target_compile_features(${FUTURE_PROJECT} PUBLIC ${SHARED_COMPILE_FEATURES})
-target_compile_definitions(${FUTURE_PROJECT} PUBLIC 
-    BOOST_THREAD_VERSION=4 
-    BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION=1)
+# target_compile_options(${FUTURE_PROJECT} PUBLIC ${SHARED_COMPILE_OPTIONS})
+# target_compile_features(${FUTURE_PROJECT} PUBLIC ${SHARED_COMPILE_FEATURES})
+# target_compile_definitions(${FUTURE_PROJECT} PUBLIC 
+#     BOOST_THREAD_VERSION=4 
+#     BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION=1)
 
-target_include_directories(${FUTURE_PROJECT} SYSTEM PUBLIC 
-    ${Boost_INCLUDE_DIRS}
-    ${range-v3_INCLUDE_DIR} 
-    ${LIBOAUTH_INCLUDE_DIRS} 
-    ${CURL_INCLUDE_DIRS}
-    ${jsoncpp_INCLUDE_DIR})
+# target_include_directories(${FUTURE_PROJECT} SYSTEM PUBLIC 
+#     ${Boost_INCLUDE_DIRS}
+#     ${range-v3_INCLUDE_DIR} 
+#     ${LIBOAUTH_INCLUDE_DIRS} 
+#     ${CURL_INCLUDE_DIRS}
+#     ${jsoncpp_INCLUDE_DIR})
 
-target_link_libraries(${FUTURE_PROJECT} 
-    ${Boost_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT} 
-    ${LIBOAUTH_LIBRARY} 
-    ${CURL_LIBRARIES})
+# target_link_libraries(${FUTURE_PROJECT} 
+#     ${Boost_LIBRARIES}
+#     ${CMAKE_THREAD_LIBS_INIT} 
+#     ${LIBOAUTH_LIBRARY} 
+#     ${CURL_LIBRARIES})
 
 # configure unit tests via CTest
 enable_testing()

diff --git a/main.cpp b/main.cpp
@@ -290,13 +290,6 @@ int main(int argc, const char *argv[])
         return -1;
     }
 
-    Mix_Chunk *dash = Mix_LoadWAV((exeparent + "/Resources/dash.wav").c_str());
-    if (dash == NULL)
-    {
-        printf("Mix_LoadWAV dash - Error: %s\n", SDL_GetError());
-        return -1;
-    }
-
     Mix_Chunk *dot = Mix_LoadWAV((exeparent + "/Resources/dot.wav").c_str());
     if (dot == NULL)
     {
@@ -377,7 +370,6 @@ int main(int argc, const char *argv[])
         SDL_GL_DeleteContext(glcontext);
         SDL_DestroyWindow(window);
         Mix_FreeChunk(dot);
-        Mix_FreeChunk(dash);
 	    Mix_CloseAudio();
         SDL_Quit();
     });

diff --git a/rxcurl.h b/rxcurl.h
@@ -64,6 +64,7 @@ struct http_state
             auto localheaders = headers;
             auto localrxcurl = rxcurl;
             auto localRequest = request;
+            chunkbus.get_subscription().unsubscribe();
             subscriber<string>* localChunkout = chunkout.release();
             rxcurl->worker
                 .take(1)