From 712199284dc2f03ec9a5420c0fcd9d9fe9402d2d Mon Sep 17 00:00:00 2001
From: bjschuma <bjschuma@1daee41c-8060-4895-b1f0-2197c00d777a>
Date: Fri, 5 Jun 2009 17:08:12 +0000
Subject: [PATCH] Find song duration before pausing new song

git-svn-id: file:///home/anna/Desktop/ocarina-legacy/mithos/ocarina@21 1daee41c-8060-4895-b1f0-2197c00d777a
---
 trunk/operations.py |  8 ++++++--
 trunk/window.py     | 11 ++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/trunk/operations.py b/trunk/operations.py
index e5086f5d..9957d072 100644
--- a/trunk/operations.py
+++ b/trunk/operations.py
@@ -37,6 +37,7 @@ class Operations:
 		# Close open songs
 		if self.song != None:
 			self.song.close()
+		# Are we exiting?
 		if self.after == 1:
 			self.exit(None,None)
 		# Get next song
@@ -47,8 +48,11 @@ class Operations:
 			self.song = Song(info,self.next)
 		if index > -2:
 			self.song.setInfo = self.setInfo
-			if self.after != 2:
-				self.song.play()
+			# Do we begin playback?
+			#if self.after != 2:
+			self.song.play()
+		if self.after == 2:
+			self.song.pause()
 		self.after = 0
 
 
diff --git a/trunk/window.py b/trunk/window.py
index 7df6ca74..8a7237d4 100644
--- a/trunk/window.py
+++ b/trunk/window.py
@@ -155,16 +155,17 @@ class Window(gtk.Window):
 		# Make playback option
 		playback = gtk.MenuItem("Playback")
 		pback = gtk.Menu()
-		# 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)
+		# Quit after current track
+		qafter = gtk.MenuItem(label="Quit After Current Track")
+		qafter.connect("activate",self.ops.afterTrack,"qafter")
+		qafter.show()
+		pback.append(qafter)
+		
 		playback.set_submenu(pback)
 		playback.show()
 		bar.append(playback)