diff --git a/CMakeLists.txt b/CMakeLists.txt index fe06a43..88bc924 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(rohrkabel LANGUAGES CXX VERSION 2.3) +project(rohrkabel LANGUAGES CXX VERSION 2.4) # -------------------------------------------------------------------------------------------------------- # Library options @@ -31,7 +31,7 @@ set(CPM_DOWNLOAD_ALL ${rohrkabel_prefer_remote}) # -------------------------------------------------------------------------------------------------------- add_library(${PROJECT_NAME}) -add_library(soundux::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +add_library(cr::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 20 CXX_EXTENSIONS OFF CXX_STANDARD_REQUIRED ON) @@ -67,7 +67,7 @@ target_sources(${PROJECT_NAME} PRIVATE ${src}) # Include "include" folder # -------------------------------------------------------------------------------------------------------- -target_include_directories(${PROJECT_NAME} PUBLIC "include") +target_include_directories(${PROJECT_NAME} PUBLIC "include") target_include_directories(${PROJECT_NAME} PRIVATE "include/rohrkabel") # -------------------------------------------------------------------------------------------------------- @@ -85,8 +85,8 @@ CPMFindPackage( CPMFindPackage( NAME ereignis - VERSION 2.1 - GIT_REPOSITORY "https://github.com/Soundux/ereignis" + VERSION 2.2 + GIT_REPOSITORY "https://github.com/Curve/ereignis" ) CPMFindPackage( @@ -98,10 +98,10 @@ CPMFindPackage( CPMFindPackage( NAME channel VERSION 2.2 - GIT_REPOSITORY "https://github.com/Soundux/channel" + GIT_REPOSITORY "https://github.com/Curve/channel" ) -target_link_libraries(${PROJECT_NAME} PUBLIC tl::expected soundux::ereignis Boost::callable_traits cr::channel) +target_link_libraries(${PROJECT_NAME} PUBLIC tl::expected cr::ereignis Boost::callable_traits cr::channel) # -------------------------------------------------------------------------------------------------------- # Custom Find-Package configurations diff --git a/LICENSE b/LICENSE index b270cc4..b8a8620 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Soundux +Copyright (c) 2023 Curve Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 47440e5..803796d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ _rohrkabel_ is a wrapper around the pipewire-api that embraces RAII and tries to > [!NOTE] > As of writing only a portion of the pipewire-api has been wrapped. -> In case we're missing something you need feel free to [open an issue](https://github.com/Soundux/rohrkabel/issues/new). +> In case we're missing something you need feel free to [open an issue](https://github.com/Curve/rohrkabel/issues/new). > More portions of the api might be covered in the future depending on personal demand as well as demand from [Soundux](https://github.com/Soundux/Soundux). ## ๐Ÿ“ฆ Installation @@ -25,7 +25,7 @@ _rohrkabel_ is a wrapper around the pipewire-api that embraces RAII and tries to CPMFindPackage( NAME rohrkabel VERSION 2.0 - GIT_REPOSITORY "https://github.com/Soundux/rohrkabel" + GIT_REPOSITORY "https://github.com/Curve/rohrkabel" ) ``` @@ -33,7 +33,7 @@ _rohrkabel_ is a wrapper around the pipewire-api that embraces RAII and tries to ```cmake include(FetchContent) - FetchContent_Declare(rohrkabel GIT_REPOSITORY "https://github.com/Soundux/rohrkabel" GIT_TAG v2.0) + FetchContent_Declare(rohrkabel GIT_REPOSITORY "https://github.com/Curve/rohrkabel" GIT_TAG v2.0) FetchContent_MakeAvailable(rohrkabel) target_link_libraries( rohrkabel) @@ -41,11 +41,11 @@ _rohrkabel_ is a wrapper around the pipewire-api that embraces RAII and tries to ## ๐Ÿงต Thread-Safety -The `pw_main_loop` is not thread-safe, but supplies a [special loop implementation](https://docs.pipewire.org/page_thread_loop.html) meant for threaded-usage. However said special loop is cumbersome to deal with, especially from a RAII perspective, thus _rohrkabel_ uses a different, [channel-based](https://github.com/Soundux/channel) approach inspired by [pipewire-rs](https://pipewire.pages.freedesktop.org/pipewire-rs/pipewire/channel/index.html). +The `pw_main_loop` is not thread-safe, but supplies a [special loop implementation](https://docs.pipewire.org/page_thread_loop.html) meant for threaded-usage. However said special loop is cumbersome to deal with, especially from a RAII perspective, thus _rohrkabel_ uses a different, [channel-based](https://github.com/Curve/channel) approach inspired by [pipewire-rs](https://pipewire.pages.freedesktop.org/pipewire-rs/pipewire/channel/index.html). The channel based approach greatly simplifies working with _rohrkabel_ in multi-threaded environments. -For more information check out [this example](examples/channels), or feel free to [open a discussion](https://github.com/Soundux/rohrkabel/discussions/new/choose). +For more information check out [this example](examples/channels), or feel free to [open a discussion](https://github.com/Curve/rohrkabel/discussions/new/choose). ## ๐ŸŒŽ Who's using rohrkabel? @@ -64,4 +64,4 @@ For more information check out [this example](examples/channels), or feel free t [Vencord](https://github.com/Vencord/linux-virtmic) - \ No newline at end of file + diff --git a/examples/channels/CMakeLists.txt b/examples/channels/CMakeLists.txt index e1d4538..4918f4a 100644 --- a/examples/channels/CMakeLists.txt +++ b/examples/channels/CMakeLists.txt @@ -22,7 +22,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) CPMFindPackage( NAME rohrkabel GIT_TAG master - GIT_REPOSITORY "https://github.com/Soundux/rohrkabel" + GIT_REPOSITORY "https://github.com/Curve/rohrkabel" ) endif() @@ -30,4 +30,4 @@ endif() # Link required libraries # -------------------------------------------------------------------------------------------------------- -target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel) diff --git a/examples/mute-microphone/CMakeLists.txt b/examples/mute-microphone/CMakeLists.txt index 830b01b..465d474 100644 --- a/examples/mute-microphone/CMakeLists.txt +++ b/examples/mute-microphone/CMakeLists.txt @@ -22,7 +22,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) CPMFindPackage( NAME rohrkabel GIT_TAG master - GIT_REPOSITORY "https://github.com/Soundux/rohrkabel" + GIT_REPOSITORY "https://github.com/Curve/rohrkabel" ) endif() @@ -30,4 +30,4 @@ endif() # Link required libraries # -------------------------------------------------------------------------------------------------------- -target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel) diff --git a/examples/roundtrip/CMakeLists.txt b/examples/roundtrip/CMakeLists.txt index bfd2a2a..7a02462 100644 --- a/examples/roundtrip/CMakeLists.txt +++ b/examples/roundtrip/CMakeLists.txt @@ -22,7 +22,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) CPMFindPackage( NAME rohrkabel GIT_TAG master - GIT_REPOSITORY "https://github.com/Soundux/rohrkabel" + GIT_REPOSITORY "https://github.com/Curve/rohrkabel" ) endif() @@ -30,4 +30,4 @@ endif() # Link required libraries # -------------------------------------------------------------------------------------------------------- -target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel) diff --git a/examples/virtual-mic/CMakeLists.txt b/examples/virtual-mic/CMakeLists.txt index 670fb77..1f568de 100644 --- a/examples/virtual-mic/CMakeLists.txt +++ b/examples/virtual-mic/CMakeLists.txt @@ -22,7 +22,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) CPMFindPackage( NAME rohrkabel GIT_TAG master - GIT_REPOSITORY "https://github.com/Soundux/rohrkabel" + GIT_REPOSITORY "https://github.com/Curve/rohrkabel" ) endif() @@ -30,4 +30,4 @@ endif() # Link required libraries # -------------------------------------------------------------------------------------------------------- -target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)