From c7d301e1d7edc17020a855a4ea9bbaa015f15b28 Mon Sep 17 00:00:00 2001 From: badaix Date: Thu, 9 Jan 2025 15:50:22 +0100 Subject: [PATCH] Reformat cmake and python --- control/snapcast_mpris.py | 40 +++++++++++++++++++-------------------- server/CMakeLists.txt | 3 +-- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/control/snapcast_mpris.py b/control/snapcast_mpris.py index 9f42bc86..932cc1c2 100755 --- a/control/snapcast_mpris.py +++ b/control/snapcast_mpris.py @@ -828,32 +828,32 @@ class MPRISInterface(dbus.service.Object): __root_interface: __root_props, } - @ dbus.service.method(__introspect_interface) + @dbus.service.method(__introspect_interface) def Introspect(self): return MPRIS2_INTROSPECTION - @ dbus.service.signal(__prop_interface, signature="sa{sv}as") + @dbus.service.signal(__prop_interface, signature="sa{sv}as") def PropertiesChanged(self, interface, changed_properties, invalidated_properties): pass - @ dbus.service.method(__prop_interface, - in_signature="ss", out_signature="v") + @dbus.service.method(__prop_interface, + in_signature="ss", out_signature="v") def Get(self, interface, prop): getter, setter = self.__prop_mapping[interface][prop] if callable(getter): return getter() return getter - @ dbus.service.method(__prop_interface, - in_signature="ssv", out_signature="") + @dbus.service.method(__prop_interface, + in_signature="ssv", out_signature="") def Set(self, interface, prop, value): getter, setter = self.__prop_mapping[interface][prop] if setter is not None: setter(value) - @ dbus.service.method(__prop_interface, - in_signature="s", out_signature="a{sv}") + @dbus.service.method(__prop_interface, + in_signature="s", out_signature="a{sv}") def GetAll(self, interface): read_props = {} props = self.__prop_mapping[interface] @@ -874,49 +874,49 @@ class MPRISInterface(dbus.service.Object): return value # Root methods - @ dbus.service.method(__root_interface, in_signature='', out_signature='') + @dbus.service.method(__root_interface, in_signature='', out_signature='') def Raise(self): logger.debug('Raise') webbrowser.open(url=f'http://{params["host"]}:{params["port"]}', new=1) return - @ dbus.service.method(__root_interface, in_signature='', out_signature='') + @dbus.service.method(__root_interface, in_signature='', out_signature='') def Quit(self): logger.debug('Quit') return # Player methods - @ dbus.service.method(__player_interface, in_signature='', out_signature='') + @dbus.service.method(__player_interface, in_signature='', out_signature='') def Next(self): snapcast_wrapper.control("next") return - @ dbus.service.method(__player_interface, in_signature='', out_signature='') + @dbus.service.method(__player_interface, in_signature='', out_signature='') def Previous(self): snapcast_wrapper.control("previous") return - @ dbus.service.method(__player_interface, in_signature='', out_signature='') + @dbus.service.method(__player_interface, in_signature='', out_signature='') def Pause(self): snapcast_wrapper.control("pause") return - @ dbus.service.method(__player_interface, in_signature='', out_signature='') + @dbus.service.method(__player_interface, in_signature='', out_signature='') def PlayPause(self): snapcast_wrapper.control("playPause") return - @ dbus.service.method(__player_interface, in_signature='', out_signature='') + @dbus.service.method(__player_interface, in_signature='', out_signature='') def Stop(self): snapcast_wrapper.control("stop") return - @ dbus.service.method(__player_interface, in_signature='', out_signature='') + @dbus.service.method(__player_interface, in_signature='', out_signature='') def Play(self): snapcast_wrapper.control("play") return - @ dbus.service.method(__player_interface, in_signature='x', out_signature='') + @dbus.service.method(__player_interface, in_signature='x', out_signature='') def Seek(self, offset): logger.debug(f'Seek {offset}') snapcast_wrapper.control("seek", {"offset": float(offset) / 1000000}) @@ -933,7 +933,7 @@ class MPRISInterface(dbus.service.Object): # self.Seeked(position * 1000000) return - @ dbus.service.method(__player_interface, in_signature='ox', out_signature='') + @dbus.service.method(__player_interface, in_signature='ox', out_signature='') def SetPosition(self, trackid, position): logger.debug(f'setPosition trackId: {trackid}, position: {position}') snapcast_wrapper.control( @@ -951,14 +951,14 @@ class MPRISInterface(dbus.service.Object): # self.Seeked(position * 1000000) return - @ dbus.service.method(__player_interface, in_signature='', out_signature='') + @dbus.service.method(__player_interface, in_signature='', out_signature='') def OpenUri(self): logger.debug('OpenUri') # TODO return # Player signals - @ dbus.service.signal(__player_interface, signature='x') + @dbus.service.signal(__player_interface, signature='x') def Seeked(self, position): logger.debug(f'Seeked to {position}') snapcast_wrapper.properties['position'] = float(position) / 1000000 diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 534886fb..302e4a07 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -37,7 +37,6 @@ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server) include_directories(SYSTEM ${Boost_INCLUDE_DIR}) - if(ANDROID) find_package(vorbis REQUIRED CONFIG) list(APPEND SERVER_LIBRARIES boost::boost) @@ -70,7 +69,7 @@ else() list(APPEND SERVER_LIBRARIES ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES} ${OGG_LIBRARIES}) include_directories(${OGG_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS} - ${VORBISENC_INCLUDE_DIRS}) + ${VORBISENC_INCLUDE_DIRS}) link_directories(${VORBIS_LIBRARY_DIRS}) link_directories(${VORBISENC_LIBRARY_DIRS}) link_directories(${OGG_LIBRARY_DIRS})