Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-01-18 05:23:07 +01:00
Code Issues Packages Projects Releases Activity

some corrections for playback mode

Browse Source
This commit is contained in:
DYefremov
2021-03-16 00:26:28 +03:00
parent b60a9a69b6
commit 55a21fbc18
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/tools/media.py
View File

@@ -287,6 +287,10 @@ class VlcPlayer(Player):
widget.add(area)
if sys.platform == "linux":
self._player.set_xwindow(area.get_window().get_xid())
elif sys.platform == "darwin":
self.set_nso(area)
else:
log("Video widget initialization error: platform '{}' is not supported. ".format(sys.platform))
def set_nso(self, widget):
""" Used on MacOS to set NSObject.
@@ -307,7 +311,7 @@ class VlcPlayer(Player):
pointer = ctypes.pythonapi.PyCapsule_GetPointer(widget.get_window().__gpointer__, None)
self._player.set_nsobject(get_nsview(pointer))
def on_drawing_area_draw(self, widget, cr):
def on_drawing_area_draw(self, widget, cr):
""" Used for black background drawing in the player drawing area. """
allocation = widget.get_allocation()
cr.set_source_rgb(0, 0, 0)

12
app/ui/main_app_window.py
View File

@@ -2649,14 +2649,16 @@ class Application(Gtk.Application):
self._playback_window.resize(width, height)
self._playback_window.connect("delete-event", self.on_player_close)
self._player_prev_button.set_visible(False)
self._player_next_button.set_visible(False)
box = Gtk.HBox(visible=True, orientation="vertical")
self._player_event_box.reparent(box)
self._player_box.remove(self._player_tool_bar)
box.pack_end(self._player_tool_bar, False, False, 0)
self._playback_window.add(box)
if not self._settings.is_darwin or self._settings.stream_lib == "gst":
self._player_prev_button.set_visible(False)
self._player_next_button.set_visible(False)
self._player_box.remove(self._player_tool_bar)
box.pack_end(self._player_tool_bar, False, False, 0)
self._playback_window.add(box)
self._playback_window.set_application(self)
self._playback_window.show()

2
app/ui/settings_dialog.glade
View File

@@ -1997,6 +1997,7 @@ Author: Dmitriy Yefremov
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">vlc_lib_button</property>
<signal name="toggled" handler="on_play_mode_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2012,6 +2013,7 @@ Author: Dmitriy Yefremov
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">gst_lib_button</property>
<signal name="toggled" handler="on_play_mode_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>

8
app/ui/settings_dialog.py
View File

@@ -613,6 +613,11 @@ class SettingsDialog:
if self._main_stack.get_visible_child_name() != "streaming":
return
if self._settings.is_darwin:
is_gst = self._gst_lib_button.get_active()
self._play_in_built_radio_button.set_sensitive(is_gst)
self._play_in_window_radio_button.set_active(not is_gst and self._play_in_built_radio_button.get_active())
if button.get_active():
self.show_info_message("Save and restart the program to apply the settings.", Gtk.MessageType.WARNING)
@@ -622,6 +627,9 @@ class SettingsDialog:
self._play_in_window_radio_button.set_active(mode is PlayStreamsMode.WINDOW)
self._get_m3u_radio_button.set_active(mode is PlayStreamsMode.M3U)
if self._settings.is_darwin and self._settings.stream_lib != "gst":
self._play_in_built_radio_button.set_sensitive(False)
def get_play_stream_mode(self):
if self._play_in_built_radio_button.get_active():
return PlayStreamsMode.BUILT_IN