← Back to branch summary

~ubuntu-branches/ubuntu/utopic/radiotray/utopic

« back to all changes in this revision

Viewing changes to src/RadioTray.py

  • Committer: Bazaar Package Importer
  • Author(s): Elías Alejandro Año Mendoza
  • Date: 2011-03-18 09:16:48 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110318091648-doskr4rlcdgmuo0v
Tags: 0.6.3-1
http://bugs.debian.org/612725
http://bugs.debian.org/616155
* New upstream release
* Added missing dependency (Closes: #612725)
  + Thanks to Stefan Pavlov <spavlov@uni-svishtov.bg>
* Fixed typo in description (Closes: #616155)
  + Thanks to Roth Robert <robert.roth.off@gmail.com>
* Switched debian/copyright to DEP-5

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/RadioTray.py
58
58
        self.audio = AudioPlayerGStreamer(self.mediator, self.cfg_provider, self.log)
59
59
 
60
60
        # load gui
61
 
        self.systray = SysTray(self.mediator, self.provider, self.log)
 
61
        self.systray = SysTray(self.mediator, self.provider, self.log, self.cfg_provider)
62
62
 
63
63
        # config mediator
64
64
        self.mediator.setAudioPlayer(self.audio)
69
69
        dbus_mpris = mpris.RadioTrayMpris(self.provider, self.mediator)
70
70
 
71
71
        if(url != None):
72
 
            self.mediator.playUrl(url)
 
72
            if (url == "--resume"):
 
73
                self.mediator.playLast()                
 
74
            else:
 
75
                self.mediator.playUrl(url)
73
76
 
74
77
        # start app
75
78
        self.systray.run()