--- a/vixm/control.py	Fri Nov 03 23:27:49 2006 -0500
+++ b/vixm/control.py	Fri Nov 03 23:34:59 2006 -0500
@@ -6,7 +6,7 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-import os, xmms
+import os
 
 import playlist, util
 
@@ -126,27 +126,27 @@
 def cmd_play(ui, start, stop, args):
 	"""x
 		- Direct XMMS control: play"""
-	xmms.control.play()
+	print "Play not implemented"
 
 def cmd_pause(ui, start, stop, args):
 	"""c
 		- Direct XMMS control: pause"""
-	xmms.control.pause()
+	print "Pause not implemented"
 
 def cmd_stop(ui, start, stop, args):
 	"""v
 		- Direct XMMS control: stop"""
-	xmms.control.stop()
+	print "Stop not implemented"
 
 def cmd_prev(ui, start, stop, args):
 	"""z
 		- Direct XMMS control: previous song"""
-	xmms.control.playlist_prev()
+	print "Previous song not implemented"
 
 def cmd_next(ui, start, stop, args):
 	"""b
 		- Direct XMMS control: next song"""
-	xmms.control.playlist_next()
+	print "Next song not implemented"
 
 def cmd_shell(ui, start, stop, args):
 	"""![command]
@@ -158,10 +158,13 @@
 def cmd_location(ui, start, stop, args):
 	"""=
 		- Display information about currently playing song"""
-	pos = xmms.control.get_playlist_pos()
-	current = ui.lists[playlist.LIST_DEFAULT][pos]
+	current = ui.play.current
 	
+	if not current:
+		return
+
+	current_time = 0
 	print "%d. %s (%s/%s)" % (pos+1, str(current),
-			util.strtime(xmms.control.get_output_time()),
+			util.strtime(current_time),
 			util.strtime(current["time"]))
 

--- a/vixm/player.py	Fri Nov 03 23:27:49 2006 -0500
+++ b/vixm/player.py	Fri Nov 03 23:34:59 2006 -0500
@@ -8,13 +8,15 @@
 		self.shutdown = False
 		self.playing  = False
 
-		self.last     = None
+		self.current  = None
 
 		self.lists = lists
 
 	def play(self, s):
 		print "about to play %s" % (str(s),)
 
+		self.current = s
+
 	def run(self):
 		while not self.shutdown:
 			time.sleep(0.5)

--- a/vixm/playlist.py	Fri Nov 03 23:27:49 2006 -0500
+++ b/vixm/playlist.py	Fri Nov 03 23:34:59 2006 -0500
@@ -6,8 +6,7 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-import random
-import xmms, re
+import random, re
 
 LIST_PRIO	= 0
 LIST_DEFAULT	= 1

--- a/vixm/ui.py	Fri Nov 03 23:27:49 2006 -0500
+++ b/vixm/ui.py	Fri Nov 03 23:34:59 2006 -0500
@@ -8,7 +8,6 @@
 
 import time, sys, re
 from threading import Thread
-import xmms
 
 import playlist, song, util, control, player
 
@@ -131,7 +130,7 @@
 				(control.cmd_help,
 				 False),
 			# the following commands are there do allow some,
-			# more direct control over xmms
+			# more direct control over which songs we play
 			"z":
 				(control.cmd_prev,
 				 False),