libsaria: Initialize controls on import

This avoids an unnecessary function call, it also makes things easier to
read and maintain.

libsaria/__init__.py

@@ -3,32 +3,22 @@
 import version
 import prefs
 import audio
-
 import path
 
+import sources
+import controls
+
 if version.__dev__ == True:
 	import server
 
 from path import lastfm
 #plugin   = None
-controls = None
-
-
-# Initialize helpful variables
-def init():
-	global controls
-
-	import controls
-	import sources
-
-	controls.init()
 
 
 def startup():
 #	global plugin
 #	import plugin
 
-	controls.init2()
 #	plugin.load_all()
 	prefs.enable_save()
 	parse_user_input()
@@ -46,4 +36,3 @@ def parse_user_input():
 	import sys
 	for item in sys.argv[1:]:
 		path.files.universal_open(item)
-init()

libsaria/controls.py

@@ -2,29 +2,16 @@
 
 import prefs
 import audio
+from libsaria import path
+from libsaria import sources
 from libsaria import callbacks
-libsaria = None
-sources  = None
 
-expand = None
-exists = None
+expand = path.expand
+exists = path.exists
 
 pause_after = False
 prefs.init("libsaria.random", False)
 
-def init():
-	global libsaria
-	import libsaria
-
-def init2():
-	global sources
-	global expand
-	global exists
-
-	expand   = libsaria.path.expand
-	exists   = libsaria.path.exists
-	sources  = libsaria.sources
-
 def pick_next():
 	global pause_after
 	file = sources.next()

libsaria/sources/__init__.py

@@ -9,8 +9,6 @@ import library
 import playlist
 import queue
 
-controls = libsaria.controls
-
 cur_source = None
 cur_id = None
 
@@ -75,8 +73,8 @@ def play_id(id):
 	cur_id = id
 	file   = get_attrs("filepath")[0]
 	queue.rm_ids([id])
-	controls.load(file)
-	controls.play()
+	libsaria.controls.load(file)
+	libsaria.controls.play()
 
 def next():
 	global cur_id