Skip to content

Commit

Permalink
refactor: remove soundux branding
Browse files Browse the repository at this point in the history
  • Loading branch information
Curve committed Oct 17, 2023
1 parent 0c8298a commit 9778f8f
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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")

# --------------------------------------------------------------------------------------------------------
Expand All @@ -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(
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,27 +25,27 @@ _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"
)
```

* Using FetchContent
```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(<target> rohrkabel)
```

## 🧵 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?

Expand All @@ -64,4 +64,4 @@ For more information check out [this example](examples/channels), or feel free t

[Vencord](https://github.com/Vencord/linux-virtmic)

</div>
</div>
4 changes: 2 additions & 2 deletions examples/channels/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ 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()

# --------------------------------------------------------------------------------------------------------
# Link required libraries
# --------------------------------------------------------------------------------------------------------

target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)
target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)
4 changes: 2 additions & 2 deletions examples/mute-microphone/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ 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()

# --------------------------------------------------------------------------------------------------------
# Link required libraries
# --------------------------------------------------------------------------------------------------------

target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)
target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)
4 changes: 2 additions & 2 deletions examples/roundtrip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ 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()

# --------------------------------------------------------------------------------------------------------
# Link required libraries
# --------------------------------------------------------------------------------------------------------

target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)
target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)
4 changes: 2 additions & 2 deletions examples/virtual-mic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ 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()

# --------------------------------------------------------------------------------------------------------
# Link required libraries
# --------------------------------------------------------------------------------------------------------

target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)
target_link_libraries(${PROJECT_NAME} PRIVATE rohrkabel)

0 comments on commit 9778f8f

Please sign in to comment.