anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Quit after and pause after current track work 

git-svn-id: file:///home/anna/Desktop/ocarina-legacy/mithos/ocarina@20 1daee41c-8060-4895-b1f0-2197c00d777a
This commit is contained in:
bjschuma 2009-06-05 16:57:03 +00:00
parent 3a2da68561
commit adb5f410e2
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/operations.py
View File

@ -7,7 +7,7 @@ class Operations:
self.plist = None self.plist = None
self.library = None self.library = None
self.exit = exit self.exit = exit
self.quitAfter = False self.after = 0
# Begin playback # Begin playback
@ -25,15 +25,19 @@ class Operations:
def afterTrack(self,widget,data): def afterTrack(self,widget,data):
if data=="qafter": if (data=="qafter") and not (self.after==1):
self.quitAfter = True self.after = 1
elif (data=="pafter") and not (self.after==2):
self.after = 2
else:
self.after = 0
# Advance to the next song # Advance to the next song
def next(self,widget,data): def next(self,widget,data):
# Close open songs # Close open songs
if self.song != None: if self.song != None:
self.song.close() self.song.close()
if self.quitAfter == True: if self.after == 1:
self.exit(None,None) self.exit(None,None)
# Get next song # Get next song
index = self.plist.next() index = self.plist.next()
@ -43,7 +47,9 @@ class Operations:
self.song = Song(info,self.next) self.song = Song(info,self.next)
if index > -2: if index > -2:
self.song.setInfo = self.setInfo self.song.setInfo = self.setInfo
self.song.play() if self.after != 2:
self.song.play()
self.after = 0
# Mark progress on the progress bar # Mark progress on the progress bar

14
trunk/window.py
View File

@ -155,10 +155,16 @@ class Window(gtk.Window):
# Make playback option # Make playback option
playback = gtk.MenuItem("Playback") playback = gtk.MenuItem("Playback")
pback = gtk.Menu() pback = gtk.Menu()
safter = gtk.MenuItem(label="Quit After Current Track") # Quit after current track
safter.connect("activate",self.ops.afterTrack,"qafter") qafter = gtk.MenuItem(label="Quit After Current Track")
safter.show() qafter.connect("activate",self.ops.afterTrack,"qafter")
pback.append(safter) qafter.show()
pback.append(qafter)
# Pause after current track
pafter = gtk.MenuItem(label="Pause After Current Track")
pafter.connect("activate",self.ops.afterTrack,"pafter")
pafter.show()
pback.append(pafter)
playback.set_submenu(pback) playback.set_submenu(pback)
playback.show() playback.show()
bar.append(playback) bar.append(playback)