[btdevicemanager] cherry pick OE-A updates

Author: WanWizard

btdevicesmanager/CONTROL/control

@@ -2,5 +2,4 @@ Package: enigma2-plugin-extensions-btdevicesmanager
 Version: 1.0-r0
 Description: this is bt devices manger to pair e.x keyboard or mouse
 Maintainer: a4tech
-Depends: python3-pexpect, bluez5, btinit
-
+Depends: bluez4-testtools, bluez4, bluez-hcidump

btdevicesmanager/po/Makefile.am

@@ -1,3 +1,4 @@
 PLUGIN = BTDevicesManager
-LANGS = ca de el es fr it lt nl pl pt ru sk
-include $(top_srcdir)/Rules-po.mak
+CATEGORY ?= "Extensions"
+
+include $(top_srcdir)/Rules_noxml-po.mak

btdevicesmanager/po/pl.po

@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: BTDevicesManager\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-03-29 20:16+0100\n"
-"PO-Revision-Date: 2025-03-30 13:40+0000\n"
+"PO-Revision-Date: 2025-11-11 15:41+0000\n"
 "Last-Translator: pololoko111\n"
 "Language-Team: \n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.7\n"
 
 msgid "Audio Connect"
 msgstr "Połączenie audio"
@@ -28,10 +28,10 @@ msgid "Audio On"
 msgstr "Dźwięk włączony"
 
 msgid "Bluetooth Devices Manager"
-msgstr "Menadżer urządzeń Bluetooth"
+msgstr "Menedżer Bluetooth"
 
 msgid "Bluetooth Devices Manager Setup"
-msgstr "Konfiguracja Menadżera urządzeń Bluetooth"
+msgstr "Konfiguracja Menedżera Bluetooth"
 
 msgid "Can't not pair with selected device!"
 msgstr "Nie można sparować z wybranym urządzeniem!"
@@ -73,7 +73,7 @@ msgid "Scanning for devices..."
 msgstr "Skanowanie urządzeń..."
 
 msgid "This is bt devices manager"
-msgstr "To jest menadżer urządzeń BT"
+msgstr "Menedżer urządzeń Bluetooth"
 
 msgid "Trying to pair with:"
 msgstr "Próba sparowania z:"

btdevicesmanager/src/BTAudioConnect

@@ -83,7 +83,7 @@ if [ -n "$1" ]; then
     bluetooth_asoundconf "$bluetoothaddr" "$bluetoothname"
 
     log "Starting audio streaming to Bluetooth device"
-    arecord -q -f dat -t raw | aplay -q -f dat -t raw -D bluetooth --process-id-file /var/run/aplay.pid &
+    arecord -q -f dat -t raw | aplay -q -f dat --buffer-size=16384 --period-size=2048 -t raw -D bluetooth --process-id-file /var/run/aplay.pid &
 else
     log "No Bluetooth address provided, exiting"
 fi

btdevicesmanager/src/plugin.py

@@ -45,6 +45,32 @@
 config.btdevicesmanager.audioaddress = ConfigText(default="", fixed_size=False)
 
 
+def applyBTAudioState():
+	if not isfile("/proc/stb/audio/btaudio"):
+		return
+
+	newState = "off"
+	if config.btdevicesmanager.audioaddress.value and config.av.btaudio.value:
+		newState = "on"
+
+	print(f"[BluetoothManager] newState: {newState}")
+	config.btdevicesmanager.audioaddress.save()
+	config.btdevicesmanager.audioconnect.save()
+	if hasattr(config, "av") and hasattr(config.av, "btaudio"):
+		config.av.btaudio.save()
+
+	try:
+		with open("/proc/stb/audio/btaudio", "w") as fn:
+			fn.write(newState)
+	except Exception as e:
+		print(f"[BluetoothManager] Error writing btaudio: {e}")
+
+	commandconnect = resolveFilename(SCOPE_CURRENT_PLUGIN, "Extensions/BTDevicesManager/BTAudioConnect")
+	audioaddress = config.btdevicesmanager.audioaddress.value
+	audioaddress = f" {audioaddress}" if audioaddress and config.btdevicesmanager.audioconnect.value else ""
+	system(f"{commandconnect}{audioaddress}")
+
+
 class BluetoothDevicesManagerSetup(Setup):
 	def __init__(self, session):
 		Setup.__init__(self, session, "BluetoothDevicesManager", plugin="Extensions/BTDevicesManager", PluginLanguageDomain="BTDevicesManager")
@@ -152,7 +178,7 @@ def readDeviceList(self):
 		if self.devicelist:
 			self["ConnStatus"].setText("")
 		else:
-			self["ConnStatus"].setText(_("No connected to any device"))
+			self["ConnStatus"].setText(_("Not connected to any device"))
 		self["devicelist"].setList(self.devicelist)
 		self.selectionChanged()
 
@@ -280,22 +306,19 @@ def keyBlue(self):
 			if current[3] and isAudio:
 				if config.btdevicesmanager.audioaddress.value == current[1]:
 					config.btdevicesmanager.audioaddress.value = ""
+					config.btdevicesmanager.audioconnect.value = False
+					config.av.btaudio.value = False
 				else:
 					config.btdevicesmanager.audioaddress.value = current[1]
-				config.btdevicesmanager.audioaddress.save()
-				commandconnect = resolveFilename(SCOPE_CURRENT_PLUGIN, "Extensions/BTDevicesManager/BTAudioConnect")
-				audioaddress = config.btdevicesmanager.audioaddress.value
-				audioaddress = f" {audioaddress}" if audioaddress and config.btdevicesmanager.audioconnect.value else ""
-				system(f"{commandconnect}{audioaddress}")
+					config.btdevicesmanager.audioconnect.value = True
+					config.av.btaudio.value = True
+				applyBTAudioState()
 				self.selectionChanged()
 
 	def keyMenu(self):
 		if self.hasBTAudio:
 			def setupCallback(*args):
-				commandconnect = resolveFilename(SCOPE_CURRENT_PLUGIN, "Extensions/BTDevicesManager/BTAudioConnect")
-				audioaddress = config.btdevicesmanager.audioaddress.value
-				audioaddress = f" {audioaddress}" if audioaddress and config.btdevicesmanager.audioconnect.value else ""
-				system(f"{commandconnect}{audioaddress}")
+				applyBTAudioState()
 			self.session.openWithCallback(setupCallback, BluetoothDevicesManagerSetup)
 
 	def setListOnView(self):
@@ -346,6 +369,7 @@ def sessionstart(session, reason, **kwargs):
 	global iBluetoothDevicesTask
 	if reason == 0:
 		if isfile("/proc/stb/audio/btaudio"):
+			applyBTAudioState()
 			if iBluetoothDevicesTask is None:
 				iBluetoothDevicesTask = BluetoothDevicesTask(session)
 

test.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+for DIR in *; do
+	if [ -d $DIR/src ]; then
+		if [ -f $DIR/src/Makefile.am ]; then
+			NAME=`grep installdir $DIR/src/Makefile.am`
+			if [ -z "$NAME" ]; then
+				NAME=`grep plugindir $DIR/src/Makefile.am`
+			fi
+			NAME=${NAME%/}
+			echo mv $DIR ${NAME##*/}
+		fi
+	fi
+done