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

Remove config.player from legacy settings 

Use config.player audio everywhere.

Allows setting new config.player.* variables.
This commit is contained in:
Teemu Ikonen 2021-01-05 22:20:54 +02:00 committed by Eric Le Lay
parent 3c17d2bf28
commit 47362394a3
3 changed files with 9 additions and 10 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 = {
'player': 'player.audio',
'videoplayer': 'player.video',
'limit_rate': 'limit.bandwidth.enabled',
'limit_rate_value': 'limit.bandwidth.kbps',

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

@ -196,7 +196,7 @@ class gPodderPreferences(BuilderWidget):
self.audio_player_model = self.user_apps_reader.get_model('audio')
self.combo_audio_player_app.set_model(self.audio_player_model)
index = self.audio_player_model.get_index(self._config.player)
index = self.audio_player_model.get_index(self._config.player.audio)
self.combo_audio_player_app.set_active(index)
self.video_player_model = self.user_apps_reader.get_model('video')
@ -484,7 +484,7 @@ class gPodderPreferences(BuilderWidget):
def on_combo_audio_player_app_changed(self, widget):
index = self.combo_audio_player_app.get_active()
self._config.player = self.audio_player_model.get_command(index)
self._config.player.audio = self.audio_player_model.get_command(index)
def on_combo_video_player_app_changed(self, widget):
index = self.combo_video_player_app.get_active()
@ -505,11 +505,11 @@ class gPodderPreferences(BuilderWidget):
def on_button_audio_player_clicked(self, widget):
result = self.show_text_edit_dialog(_('Configure audio player'),
_('Command:'),
self._config.player)
self._config.player.audio)
if result:
self._config.player = result
index = self.audio_player_model.get_index(self._config.player)
self._config.player.audio = result
index = self.audio_player_model.get_index(self._config.player.audio)
self.combo_audio_player_app.set_active(index)
def on_button_video_player_clicked(self, widget):

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

@ -2059,9 +2059,9 @@ class gPodder(BuilderWidget, dbus.service.Object):
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 and \
self.config.player != 'default':
player = self.config.player
elif file_type == 'audio' and self.config.player.audio and \
self.config.player.audio != 'default':
player = self.config.player.audio
else:
player = 'default'
return player
@ -2076,7 +2076,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
if episode:
player = self.episode_player(episode)
else:
player = self.config.player
player = self.config.player.audio
return player and player != 'default'
def playback_episodes_for_real(self, episodes):