maryjane
/
gpodder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Remove config.videoplayer from legacy settings 

Also assume that config.player.{audio,video} are always set.
This commit is contained in:
Teemu Ikonen 2021-01-06 11:23:44 +02:00 committed by Eric Le Lay
parent 47362394a3
commit f86957c7bc
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gpodder/config.py
View File

@ -219,7 +219,6 @@ defaults = {
# The sooner this goes away, the better
gPodderSettings_LegacySupport = {
'videoplayer': 'player.video',
'limit_rate': 'limit.bandwidth.enabled',
'limit_rate_value': 'limit.bandwidth.kbps',
'max_downloads_enabled': 'limit.downloads.enabled',

10
src/gpodder/gtkui/desktop/preferences.py
View File

@ -201,7 +201,7 @@ class gPodderPreferences(BuilderWidget):
self.video_player_model = self.user_apps_reader.get_model('video')
self.combo_video_player_app.set_model(self.video_player_model)
index = self.video_player_model.get_index(self._config.videoplayer)
index = self.video_player_model.get_index(self._config.player.video)
self.combo_video_player_app.set_active(index)
self.preferred_youtube_format_model = YouTubeVideoFormatListModel(self._config)
@ -488,7 +488,7 @@ class gPodderPreferences(BuilderWidget):
def on_combo_video_player_app_changed(self, widget):
index = self.combo_video_player_app.get_active()
self._config.videoplayer = self.video_player_model.get_command(index)
self._config.player.video = self.video_player_model.get_command(index)
def on_combobox_preferred_youtube_format_changed(self, widget):
index = self.combobox_preferred_youtube_format.get_active()
@ -515,11 +515,11 @@ class gPodderPreferences(BuilderWidget):
def on_button_video_player_clicked(self, widget):
result = self.show_text_edit_dialog(_('Configure video player'),
_('Command:'),
self._config.videoplayer)
self._config.player.video)
if result:
self._config.videoplayer = result
index = self.video_player_model.get_index(self._config.videoplayer)
self._config.player.video = result
index = self.video_player_model.get_index(self._config.player.video)
self.combo_video_player_app.set_active(index)
def format_update_interval_value(self, scale, value):

8
src/gpodder/gtkui/main.py
View File

@ -2056,11 +2056,9 @@ class gPodder(BuilderWidget, dbus.service.Object):
def episode_player(self, episode):
file_type = episode.file_type()
if file_type == 'video' and self.config.videoplayer and \
self.config.videoplayer != 'default':
player = self.config.videoplayer
elif file_type == 'audio' and self.config.player.audio and \
self.config.player.audio != 'default':
if file_type == 'video' and self.config.player.video != 'default':
player = self.config.player.video
elif file_type == 'audio' and self.config.player.audio != 'default':
player = self.config.player.audio
else:
player = 'default'