From 0bb9fbb07ec0f809cdccbb6b05c8630fa606408a Mon Sep 17 00:00:00 2001 From: Martin Piatka Date: Mon, 21 Aug 2023 14:29:00 +0200 Subject: [PATCH] Move pipewire_common to src/ Since it will be used for video stuff too --- configure.ac | 4 ++-- src/audio/capture/pipewire.cpp | 2 +- src/audio/playback/pipewire.cpp | 2 +- src/{audio => }/pipewire_common.cpp | 0 src/{audio => }/pipewire_common.hpp | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename src/{audio => }/pipewire_common.cpp (100%) rename src/{audio => }/pipewire_common.hpp (100%) diff --git a/configure.ac b/configure.ac index 99e2f040a..f60e05895 100644 --- a/configure.ac +++ b/configure.ac @@ -2596,8 +2596,8 @@ PKG_CHECK_MODULES([PIPEWIRE], [libpipewire-0.3 >= 0.3.30], [found_pw_audio_deps= if test $pipewire_audio_req != no -a $found_pw_audio_deps = yes then pipewire_audio=yes - PIPEWIRE_ACAP_OBJS="src/audio/pipewire_common.o src/audio/capture/pipewire.o" - PIPEWIRE_APLAY_OBJS="src/audio/pipewire_common.o src/audio/playback/pipewire.o" + PIPEWIRE_ACAP_OBJS="src/pipewire_common.o src/audio/capture/pipewire.o" + PIPEWIRE_APLAY_OBJS="src/pipewire_common.o src/audio/playback/pipewire.o" add_module acap_pipewire "$PIPEWIRE_ACAP_OBJS" "$PIPEWIRE_LIBS" add_module aplay_pipewire "$PIPEWIRE_APLAY_OBJS" "$PIPEWIRE_LIBS" fi diff --git a/src/audio/capture/pipewire.cpp b/src/audio/capture/pipewire.cpp index 3034428c4..25d0b9cc1 100644 --- a/src/audio/capture/pipewire.cpp +++ b/src/audio/capture/pipewire.cpp @@ -47,7 +47,7 @@ #include "audio/audio_capture.h" #include "audio/types.h" -#include "audio/pipewire_common.hpp" +#include "pipewire_common.hpp" #include "debug.h" #include "lib_common.h" #include "utils/color_out.h" diff --git a/src/audio/playback/pipewire.cpp b/src/audio/playback/pipewire.cpp index 12d3f2294..76dc1c699 100644 --- a/src/audio/playback/pipewire.cpp +++ b/src/audio/playback/pipewire.cpp @@ -44,7 +44,7 @@ #include "audio/audio_playback.h" #include "audio/types.h" -#include "audio/pipewire_common.hpp" +#include "pipewire_common.hpp" #include "debug.h" #include "lib_common.h" #include "utils/color_out.h" diff --git a/src/audio/pipewire_common.cpp b/src/pipewire_common.cpp similarity index 100% rename from src/audio/pipewire_common.cpp rename to src/pipewire_common.cpp diff --git a/src/audio/pipewire_common.hpp b/src/pipewire_common.hpp similarity index 100% rename from src/audio/pipewire_common.hpp rename to src/pipewire_common.hpp