← Back to branch summary

~michael-sheldon/jokosher/telepathy

« back to all changes in this revision

Viewing changes to Jokosher/PreferencesDialog.py

  • Committer: Mike Sheldon
  • Date: 2009-06-19 17:12:30 UTC
  • mfrom: (1076.1.19 joko-main)
  • Revision ID: mike@mikeasoft.com-20090619171230-h80vj2sykyg9kms6
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
Jokosher/PreferencesDialog.py
228
228
                sampleRateIndex = self.samplingRate.get_active()
229
229
                Globals.settings.recording["samplerate"] = self.sampleRateList[sampleRateIndex][1]
230
230
                if self.playbackDevice.get_active() >= 0:
 
231
                        old_device = Globals.settings.playback["device"]
 
232
                        new_device = self.playbacks[self.playbackDevice.get_active()]
231
233
                        Globals.settings.playback["devicename"] = self.playbackDevice.get_active_text()
232
 
                        Globals.settings.playback["device"] = self.playbacks[self.playbackDevice.get_active()]
 
234
                        Globals.settings.playback["device"] = new_device
 
235
                        
 
236
                        if old_device != new_device and self.project:
 
237
                                self.project.SetProjectSinkDevice()
233
238
                else:
234
239
                        Globals.settings.playback["devicename"] = ""
235
240
                        Globals.settings.playback["device"] = ""
332
337
                        if len(self.playbacks) == 0 and not deviceName:
333
338
                                deviceName = _("Default")
334
339
                        self.playbacks.append(device)
335
 
                        if deviceName:
336
 
                                self.playbackDevice.append_text(deviceName)
 
340
                        if deviceName and device:
 
341
                                s = _("%(device)s (%(id)s)") % {"device":deviceName, "id":device}
 
342
                                self.playbackDevice.append_text(s)
337
343
                        elif device:
338
344
                                self.playbackDevice.append_text(device)
339
345
                        else: