Added inbound PTT audio queue and playback block when recording
This commit is contained in:
Mark Qvist
parent
abd5187571
commit
9e770fc3f1
|
|
@ -1743,6 +1743,7 @@ class SidebandApp(MDApp):
|
|||
RNS.trace_exception(e)
|
||||
|
||||
def message_ptt_down_action(self, sender=None):
|
||||
self.sideband.ui_started_recording()
|
||||
self.audio_msg_mode = LXMF.AM_CODEC2_2400
|
||||
self.message_attach_action(attach_type="audio", nodialog=True)
|
||||
if self.rec_dialog == None:
|
||||
|
|
@ -1761,6 +1762,7 @@ class SidebandApp(MDApp):
|
|||
|
||||
|
||||
def message_ptt_up_action(self, sender=None):
|
||||
self.sideband.ui_stopped_recording()
|
||||
self.rec_dialog.recording = False
|
||||
el_button = self.messages_view.ids.message_ptt_button
|
||||
el_icon = self.messages_view.ids.message_ptt_button.children[0].children[1]
|
||||
|
|
@ -1843,6 +1845,7 @@ class SidebandApp(MDApp):
|
|||
|
||||
def a_rec_action(sender):
|
||||
if not self.rec_dialog.recording:
|
||||
self.sideband.ui_started_recording()
|
||||
RNS.log("Starting recording...") # TODO: Remove
|
||||
self.rec_dialog.recording = True
|
||||
el = self.rec_dialog.rec_item.children[0].children[0]
|
||||
|
|
@ -1856,6 +1859,7 @@ class SidebandApp(MDApp):
|
|||
Clock.schedule_once(cb, 0.10)
|
||||
|
||||
else:
|
||||
self.sideband.ui_stopped_recording()
|
||||
RNS.log("Stopping recording...") # TODO: Remove
|
||||
self.rec_dialog.recording = False
|
||||
self.rec_dialog.rec_item.text = "[size="+str(ss)+"]Start Recording[/size]"
|
||||
|
|
|
|||
|
|
@ -114,7 +114,10 @@ class SidebandCore():
|
|||
self.is_daemon = is_daemon
|
||||
self.msg_audio = None
|
||||
self.last_msg_audio = None
|
||||
self.ptt_playback_lock = threading.Lock()
|
||||
self.ui_recording = False
|
||||
self.db = None
|
||||
self.db_lock = threading.Lock()
|
||||
|
||||
if not self.is_service and not self.is_client:
|
||||
self.is_standalone = True
|
||||
|
|
@ -1468,6 +1471,28 @@ class SidebandCore():
|
|||
RNS.log("Error while setting log level over RPC: "+str(e), RNS.LOG_DEBUG)
|
||||
return False
|
||||
|
||||
def service_rpc_set_ui_recording(self, recording):
|
||||
if not RNS.vendor.platformutils.is_android():
|
||||
pass
|
||||
else:
|
||||
if self.is_service:
|
||||
# TODO: Remove
|
||||
RNS.log("Indicating recording in service: "+str(recording))
|
||||
self.ui_recording = recording
|
||||
return True
|
||||
else:
|
||||
try:
|
||||
# TODO: Remove
|
||||
RNS.log("Passing recording indication to service: "+str(recording))
|
||||
if self.rpc_connection == None:
|
||||
self.rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key)
|
||||
self.rpc_connection.send({"set_ui_recording": recording})
|
||||
response = self.rpc_connection.recv()
|
||||
return response
|
||||
except Exception as e:
|
||||
RNS.log("Error while setting UI recording status over RPC: "+str(e), RNS.LOG_DEBUG)
|
||||
return False
|
||||
|
||||
def getstate(self, prop, allow_cache=False):
|
||||
with self.state_lock:
|
||||
if not self.service_stopped:
|
||||
|
|
@ -1576,6 +1601,9 @@ class SidebandCore():
|
|||
elif "set_debug" in call:
|
||||
self.service_rpc_set_debug(call["set_debug"])
|
||||
connection.send(True)
|
||||
elif "set_ui_recording" in call:
|
||||
self.service_rpc_set_ui_recording(call["set_ui_recording"])
|
||||
connection.send(True)
|
||||
elif "get_plugins_info" in call:
|
||||
connection.send(self._get_plugins_info())
|
||||
else:
|
||||
|
|
@ -3865,8 +3893,40 @@ class SidebandCore():
|
|||
if self.gui_display() == "conversations_screen" and self.gui_foreground():
|
||||
should_notify = False
|
||||
|
||||
### PTT #######################################################################
|
||||
if not originator and LXMF.FIELD_AUDIO in message.fields and ptt_enabled:
|
||||
self.ptt_event(message)
|
||||
|
||||
if self.is_client:
|
||||
should_notify = False
|
||||
|
||||
if telemetry_only:
|
||||
should_notify = False
|
||||
|
||||
if should_notify:
|
||||
nlen = 128
|
||||
text = message.content.decode("utf-8")
|
||||
notification_content = text[:nlen]
|
||||
if len(text) > nlen:
|
||||
notification_content += " [...]"
|
||||
|
||||
if len(text) < 2 and LXMF.FIELD_AUDIO in message.fields:
|
||||
notification_content = "Audio message"
|
||||
if len(text) < 2 and LXMF.FIELD_IMAGE in message.fields:
|
||||
notification_content = "Image"
|
||||
if len(text) < 2 and LXMF.FIELD_FILE_ATTACHMENTS in message.fields:
|
||||
notification_content = "File attachment"
|
||||
|
||||
try:
|
||||
self.notify(title=self.peer_display_name(context_dest), content=notification_content, group="LXM", context_id=RNS.hexrep(context_dest, delimit=False))
|
||||
except Exception as e:
|
||||
RNS.log("Could not post notification for received message: "+str(e), RNS.LOG_ERROR)
|
||||
|
||||
def ptt_playback(self, message):
|
||||
while hasattr(self, "msg_sound") and self.msg_sound != None and self.msg_sound.playing():
|
||||
RNS.log("Waiting for playback to stop")
|
||||
time.sleep(0.1)
|
||||
time.sleep(0.5)
|
||||
|
||||
if self.msg_audio == None:
|
||||
if RNS.vendor.platformutils.is_android():
|
||||
from plyer import audio
|
||||
|
|
@ -3916,10 +3976,6 @@ class SidebandCore():
|
|||
self.msg_sound._file_path = temp_path
|
||||
self.msg_sound.reload()
|
||||
|
||||
if self.msg_sound != None and self.msg_sound.playing():
|
||||
RNS.log("Stopping playback", RNS.LOG_DEBUG)
|
||||
self.msg_sound.stop()
|
||||
else:
|
||||
if self.msg_sound != None:
|
||||
RNS.log("Starting playback", RNS.LOG_DEBUG)
|
||||
self.msg_sound.play()
|
||||
|
|
@ -3930,30 +3986,38 @@ class SidebandCore():
|
|||
except Exception as e:
|
||||
RNS.log("Error while playing message audio:"+str(e))
|
||||
RNS.trace_exception(e)
|
||||
###############################################################################
|
||||
|
||||
def ptt_event(self, message):
|
||||
def ptt_job():
|
||||
try:
|
||||
# TODO: Remove logs
|
||||
RNS.log("Taking lock")
|
||||
self.ptt_playback_lock.acquire()
|
||||
while self.ui_recording:
|
||||
RNS.log("Waiting for UI recording to finish")
|
||||
time.sleep(0.5)
|
||||
|
||||
if self.is_client:
|
||||
should_notify = False
|
||||
RNS.log("Starting playback")
|
||||
self.ptt_playback(message)
|
||||
except Exception as e:
|
||||
RNS.log("Error while starting playback for PTT-enabled conversation: "+str(e), RNS.LOG_ERROR)
|
||||
finally:
|
||||
RNS.log("Releasing lock")
|
||||
self.ptt_playback_lock.release()
|
||||
|
||||
if telemetry_only:
|
||||
should_notify = False
|
||||
threading.Thread(target=ptt_job, daemon=True).start()
|
||||
|
||||
if should_notify:
|
||||
nlen = 128
|
||||
text = message.content.decode("utf-8")
|
||||
notification_content = text[:nlen]
|
||||
if len(text) > nlen:
|
||||
notification_content += " [...]"
|
||||
def ui_started_recording(self):
|
||||
# TODO: Remove
|
||||
RNS.log("Indicating recording started")
|
||||
self.ui_recording = True
|
||||
self.service_rpc_set_ui_recording(True)
|
||||
|
||||
if len(text) < 2 and LXMF.FIELD_AUDIO in message.fields:
|
||||
notification_content = "Audio message"
|
||||
if len(text) < 2 and LXMF.FIELD_IMAGE in message.fields:
|
||||
notification_content = "Image"
|
||||
if len(text) < 2 and LXMF.FIELD_FILE_ATTACHMENTS in message.fields:
|
||||
notification_content = "File attachment"
|
||||
|
||||
self.notify(title=self.peer_display_name(context_dest), content=notification_content, group="LXM", context_id=RNS.hexrep(context_dest, delimit=False))
|
||||
def ui_stopped_recording(self):
|
||||
# TODO: Remove
|
||||
RNS.log("Indicating recording stopped")
|
||||
self.ui_recording = False
|
||||
self.service_rpc_set_ui_recording(False)
|
||||
|
||||
def start(self):
|
||||
self._db_clean_messages()
|
||||
|
|
|
|||
Loading…
Reference in New Issue