👍️[Update] Controller : device manager を root に移動

src-python/config.py

@@ -5,7 +5,8 @@ from json import load as json_load
 from json import dump as json_dump
 import tkinter as tk
 from tkinter import font
-from models.transcription.transcription_utils import device_manager
+
+from device_manager import device_manager
 from models.transcription.transcription_languages import transcription_lang
 from utils import generatePercentageStringsList, isUniqueStrings
 

src-python/device_manager.py

@@ -134,8 +134,6 @@ class DeviceManager:
                 if buffer_default_speaker_device["device"]["name"] != "NoDevice":
                     break
 
-        printLog(self.mic_devices)
-
         self.mic_devices = buffer_mic_devices
         self.default_mic_device = buffer_default_mic_device
         self.speaker_devices = buffer_speaker_devices
@@ -143,23 +141,18 @@ class DeviceManager:
 
     def checkUpdate(self):
         if self.prev_default_mic_device["device"]["name"] != self.default_mic_device["device"]["name"]:
-            printLog("checkUpdate: default_mic_device")
             self.update_flag_default_mic_device = True
             self.prev_default_mic_device = self.default_mic_device
         if self.prev_default_speaker_device["device"]["name"] != self.default_speaker_device["device"]["name"]:
-            printLog("checkUpdate: default_speaker_device")
             self.update_flag_default_speaker_device = True
             self.prev_default_speaker_device = self.default_speaker_device
         if self.prev_mic_host != [host for host in self.mic_devices]:
-            printLog("checkUpdate: mic_host")
             self.update_flag_host_list = True
             self.prev_mic_host = [host for host in self.mic_devices]
         if {key: [device['name'] for device in devices] for key, devices in self.prev_mic_devices.items()} != {key: [device['name'] for device in devices] for key, devices in self.mic_devices.items()}:
-            printLog("checkUpdate: mic_devices")
             self.update_flag_mic_device_list = True
             self.prev_mic_devices = self.mic_devices
         if [device['name'] for device in self.prev_speaker_devices] != [device['name'] for device in self.speaker_devices]:
-            printLog("checkUpdate: speaker_devices")
             self.update_flag_speaker_device_list = True
             self.prev_speaker_devices = self.speaker_devices
 
@@ -196,11 +189,10 @@ class DeviceManager:
                 except Exception as e:
                     printLog("Device Monitoring: ", e)
                 finally:
-                    printLog("Device Monitoring Finally Init")
+                    pass
         except Exception as e:
             printLog("Device Monitoring End Exception: ", e)
 
-
     def startMonitoring(self):
         self.monitoring_flag = True
         self.th_monitoring = Thread(target=self.monitoring)

src-python/model.py

@@ -12,12 +12,15 @@ from queue import Queue
 from threading import Thread
 from requests import get as requests_get
 import webbrowser
-
 from typing import Callable
+
 from flashtext import KeywordProcessor
 from pykakasi import kakasi
+
+from device_manager import device_manager
+from config import config
+
 from models.translation.translation_translator import Translator
-from models.transcription.transcription_utils import device_manager
 from models.osc.osc_tools import sendTyping, sendMessage, receiveOscParameters, getOSCParameterValue
 from models.transcription.transcription_recorder import SelectedMicEnergyAndAudioRecorder, SelectedSpeakerEnergyAndAudioRecorder
 from models.transcription.transcription_recorder import SelectedMicEnergyRecorder, SelectedSpeakerEnergyRecorder
@@ -29,8 +32,6 @@ from models.transcription.transcription_whisper import checkWhisperWeight, downl
 from models.overlay.overlay import Overlay
 from models.overlay.overlay_image import OverlayImage
 
-from config import config
-
 import utils
 
 class threadFnc(Thread):

src-python/webui_controller.py

@@ -3,10 +3,10 @@ from time import sleep
 from subprocess import Popen
 from threading import Thread
 import re
+from device_manager import device_manager
 from config import config
 from model import model
 from utils import isUniqueStrings, printLog
-from models.transcription.transcription_utils import device_manager
 
 class Controller:
     def __init__(self) -> None: