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

trunk/operations.py

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

trunk/window.py

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