Merge lp:~michael-sheldon/jokosher/windows_port into lp:jokosher

[Michael Sheldon]

=== modified file 'Jokosher/ControlsBox.py'
--- Jokosher/ControlsBox.py	2007-07-10 22:25:55 +0000
+++ Jokosher/ControlsBox.py	2009-02-25 12:39:22 +0000
@@ -54,16 +54,16 @@
 		self.muteImgEnabled = Utils.GetIconThatMayBeMissing("stock_volume-mute", gtk.ICON_SIZE_BUTTON, False)
 		
 		self.recTip = gtk.Tooltips()
-		self.recButton = gtk.ToggleButton("")
+		self.recButton = gtk.ToggleButton()
 		self.recTip.set_tip(self.recButton, self.recTipEnabled, None)
 		self.recButton.connect("toggled", self.OnArm)
 		
-		self.muteButton = gtk.ToggleButton("")
+		self.muteButton = gtk.ToggleButton()
 		self.muteButton.connect("toggled", self.OnMute)
 		self.muteTip = gtk.Tooltips()
 		self.muteTip.set_tip(self.muteButton, self.muteTipDisabled, None)
 		
-		self.soloButton = gtk.ToggleButton("")
+		self.soloButton = gtk.ToggleButton()
 		self.soloTip = gtk.Tooltips()
 		self.soloTip.set_tip(self.soloButton, self.soloTipDisabled, None)
 		self.soloButton.connect("toggled", self.OnSolo)
 
=== modified file 'Jokosher/Event.py'
--- Jokosher/Event.py	2009-02-18 03:05:16 +0000
+++ Jokosher/Event.py	2009-03-19 23:28:10 +0000
@@ -22,6 +22,7 @@
 import Globals
 import gettext
 import urllib
+import PlatformUtils
 
 from elements.singledecodebin import SingleDecodeBin
 _ = gettext.gettext
@@ -51,7 +52,7 @@
 	}
 
 	""" The level sample interval in seconds """
-	LEVEL_INTERVAL = 0.01
+	LEVEL_INTERVAL = 0.1
 	LEVELS_FILE_EXTENSION = ".leveldata"
 	NANO_TO_MILLI_DIVISOR = gst.SECOND / 1000
 	
@@ -161,9 +162,9 @@
 
 			Globals.debug("creating SingleDecodeBin")
 			caps = gst.caps_from_string("audio/x-raw-int;audio/x-raw-float")
-			f = "file://" + self.file
+			f = PlatformUtils.pathname2url(self.file)
+			Globals.debug("file uri is:", f)
 			self.single_decode_bin = SingleDecodeBin(caps=caps, uri=f)
-			Globals.debug("file uri is:", f)
 			self.gnlsrc.add(self.single_decode_bin)
 			Globals.debug("setting event properties:")
 			propsDict = {
@@ -212,7 +213,7 @@
 			self.instrument.project.deleteOnCloseAudioFiles.remove(self.file)
 		
 		self.temp = self.file
-		if os.path.samefile(self.instrument.project.audio_path, os.path.dirname(self.file)):
+		if PlatformUtils.samefile(self.instrument.project.audio_path, os.path.dirname(self.file)):
 			# If the file is in the audio dir, just include the filename, not the absolute path
 			self.file = os.path.basename(self.file)
 		
@@ -772,10 +773,14 @@
 		"""
 		Renders the level information for the GUI.
 		"""
-		pipe = """filesrc name=src location=%s ! decodebin ! audioconvert ! level interval=%d message=true ! fakesink"""
-		
-		pipe = pipe % (self.file.replace(" ", "\ "), self.LEVEL_INTERVAL * gst.SECOND)
+		pipe = """filesrc name=src ! decodebin ! audioconvert ! level message=true name=level_element ! fakesink"""
 		self.loadingPipeline = gst.parse_launch(pipe)
+		
+		filesrc = self.loadingPipeline.get_by_name("src")
+		level = self.loadingPipeline.get_by_name("level_element")
+		
+		filesrc.set_property("location", self.file)
+		level.set_property("interval", int(self.LEVEL_INTERVAL * gst.SECOND))
 
 		self.bus = self.loadingPipeline.get_bus()
 		self.bus.add_signal_watch()
@@ -798,14 +803,25 @@
 		Copies the audio file to the new file location and reads the levels
 		at the same time.
 		"""
-		if not gst.element_make_from_uri(gst.URI_SRC, uri):
+		
+		urisrc = gst.element_make_from_uri(gst.URI_SRC, uri)
+		if not urisrc:
 			#This means that here is no gstreamer src element on the system that can handle this URI type.
 			return False
 		
-		pipe = """%s ! tee name=mytee mytee. ! queue ! filesink location=%s """ +\
-		"""mytee. ! queue ! decodebin ! audioconvert ! level interval=%d message=true ! fakesink""" 
-		pipe = pipe % (urllib.quote(uri,":/"), self.file.replace(" ", "\ "), self.LEVEL_INTERVAL * gst.SECOND)
+		pipe = """tee name=mytee mytee. ! queue ! filesink name=sink """ +\
+		       """mytee. ! queue ! decodebin ! audioconvert ! level name=level_element message=true ! fakesink""" 
 		self.loadingPipeline = gst.parse_launch(pipe)
+		
+		tee = self.loadingPipeline.get_by_name("mytee")
+		filesink = self.loadingPipeline.get_by_name("sink")
+		level = self.loadingPipeline.get_by_name("level_element")
+		
+		self.loadingPipeline.add(urisrc)
+		urisrc.link(tee)
+		
+		filesink.set_property("location", self.file)
+		level.set_property("interval", int(self.LEVEL_INTERVAL * gst.SECOND))
 
 		self.bus = self.loadingPipeline.get_bus()
 		self.bus.add_signal_watch()
 
=== modified file 'Jokosher/EventLaneViewer.py'
--- Jokosher/EventLaneViewer.py	2009-02-15 23:11:00 +0000
+++ Jokosher/EventLaneViewer.py	2009-03-19 23:28:10 +0000
@@ -15,6 +15,7 @@
 from EventViewer import *
 import os.path
 import gettext
+import PlatformUtils
 import urllib # To decode URI's
 import Globals # To get projectfolder
 import ui.EventLaneHSeparator as EventLaneHSeparator
@@ -300,8 +301,9 @@
 			if event:
 				#if we we're called from a mouse click, use the mouse position as the start
 				start = (self.mouseDownPos[0]/self.project.viewScale) + self.project.viewStart
-			
-			self.instrument.AddEventsFromList(start, filenames)
+	
+			uris = [PlatformUtils.pathname2url(filename) for filename in filenames]
+			self.instrument.AddEventsFromList(start, uris)
 
 	#_____________________________________________________________________
 	
 
=== modified file 'Jokosher/Globals.py'
--- Jokosher/Globals.py	2009-02-23 00:47:21 +0000
+++ Jokosher/Globals.py	2009-03-19 23:39:14 +0000
@@ -18,6 +18,7 @@
 import gobject, gtk
 import xdg.BaseDirectory
 import shutil
+import PlatformUtils
 
 import gettext
 _ = gettext.gettext
@@ -37,7 +38,7 @@
 				"windowheight" : 550,
 				"windowwidth" : 900,
 				}
-	
+
 	recording = {
 				"fileformat": "flacenc",
 				"file_extension": "flac",
@@ -45,13 +46,17 @@
 				"audiosrc" : "gconfaudiosrc",
 				"device" : "default"
 				}
+	# Overwrite with platform specific settings
+	recording.update( PlatformUtils.GetRecordingDefaults() )
 	
 	playback = 	{
 				"devicename": "default",
 				"device": "default",
 				"audiosink":"autoaudiosink"
 				}
-	
+	# Overwrite with platform specific settings
+	playback.update( PlatformUtils.GetPlaybackDefaults() )
+
 	extensions = {
 				 "extensions_blacklist": ""
 				 }
@@ -699,6 +704,7 @@
 
 SAMPLE_RATES = [8000, 11025, 22050, 32000, 44100, 48000, 96000, 192000]
 
+
 PLAYBACK_BACKENDS = [
 	(_("Autodetect"), "autoaudiosink"),
 	(_("Use GNOME Settings"), "gconfaudiosink"),
@@ -706,6 +712,8 @@
 	("OSS", "osssink"),
 	("JACK", "jackaudiosink"),
 	("PulseAudio", "pulsesink"),
+	("Direct Sound", "directsoundsink"),
+	("Core Audio", "osxaudiosink")
 ]
 
 CAPTURE_BACKENDS = [
@@ -714,6 +722,8 @@
 	("OSS", "osssrc"),
 	("JACK", "jackaudiosrc"),
 	("PulseAudio", "pulsesrc"),
+	("Direct Sound", "dshowaudiosrc"),
+	("Core Audio", "osxaudiosrc")
 ]
 
 """ Default Instruments """
 
=== modified file 'Jokosher/Instrument.py'
--- Jokosher/Instrument.py	2009-02-18 03:05:16 +0000
+++ Jokosher/Instrument.py	2009-03-19 23:28:10 +0000
@@ -15,6 +15,7 @@
 import pygst
 pygst.require("0.10")
 import gst
+import PlatformUtils
 import os, time, shutil
 import urlparse # To split up URI's
 import gobject
@@ -199,7 +200,7 @@
 		self.volumeElement.link(self.levelElement)
 		self.levelElement.link(self.panElement)	
 		self.panElement.link(self.resample)
-		
+
 		self.playghostpad = gst.GhostPad("src", self.resample.get_pad("src"))
 		self.playbackbin.add_pad(self.playghostpad)
 		
@@ -541,7 +542,7 @@
 		
 		Parameters:
 			start -- the offset time in seconds for the first event.
-			fileList -- paths or URIs to the Event files.
+			fileList -- URIs to the Event files.
 			copyfile --	True = copy the files to Project's audio directory.
 						False = don't copy the files to the Project's audio directory.
 		"""
@@ -555,6 +556,7 @@
 			# Parse the uri, and continue only if it is pointing to a local file
 			(scheme, domain, file, params, query, fragment) = urlparse.urlparse(uri, "file", False)
 			if scheme == "file":
+				file = PlatformUtils.url2pathname(file)
 				event = self.addEventFromFile(start, file, copyFile, _undoAction_=undoAction)
 			else:
 				event = self.addEventFromURL(start, uri, _undoAction_=undoAction)
 
=== modified file 'Jokosher/JokosherApp.py'
--- Jokosher/JokosherApp.py	2009-02-19 01:48:34 +0000
+++ Jokosher/JokosherApp.py	2009-03-19 23:28:10 +0000
@@ -27,6 +27,7 @@
 import InstrumentConnectionsDialog, StatusBar
 import EffectPresets, Extension, ExtensionManager
 import Utils, AudioPreview, MixdownProfileDialog, MixdownActions
+import PlatformUtils
 
 #=========================================================================
 
@@ -1462,7 +1463,8 @@
 					displayed to user detailing the error.
 		"""
 		try:
-			self.SetProject(ProjectManager.LoadProjectFile(path))
+			uri = PlatformUtils.pathname2url(path)
+			self.SetProject(ProjectManager.LoadProjectFile(uri))
 			return True
 		except ProjectManager.OpenProjectError, e:
 			self.ShowOpenProjectErrorDialog(e,parent)
 
=== modified file 'Jokosher/NewProjectDialog.py'
--- Jokosher/NewProjectDialog.py	2008-12-18 19:07:15 +0000
+++ Jokosher/NewProjectDialog.py	2009-03-19 23:28:10 +0000
@@ -12,7 +12,7 @@
 import gtk.glade
 import os
 import ProjectManager
-import pwd
+import PlatformUtils
 import Globals
 import gettext
 _ = gettext.gettext
@@ -75,17 +75,9 @@
 		self.templatecombo.add_attribute(text, "text", 0)
 		
 		self.templatecombo.set_active(0)
-		
+
 		# Default author to name of currently logged in user
-		try:
-			# Try to get the full name if it exists
-			fullname = pwd.getpwuid(os.getuid())[4].split(",")[0]
-			if fullname == "":
-				fullname = pwd.getpwuid(os.getuid())[0]
-			self.author.set_text(fullname)
-		except:
-			# If we can't get the fullname, then just use the login
-			self.author.set_text(pwd.getpwuid(os.getuid())[0])
+		self.author.set_text(PlatformUtils.getFullName())
 		
 		self.okbutton = self.res.get_widget("okButton")
 		self.okbutton.set_flags(gtk.CAN_DEFAULT)
@@ -132,13 +124,15 @@
 		if not author:
 			author = _("Unknown Author")
 			
-		folder = self.folder.get_current_folder()
+		# CreateNewProject expects a URI	
+		folder = PlatformUtils.pathname2url(self.folder.get_current_folder())
+		
 		# Save the selected folder as the default folder
 		Globals.settings.general["projectfolder"] = folder
 		Globals.settings.write()
 		if not folder:
 			folder = "~"
-		
+
 		try:
 			project = ProjectManager.CreateNewProject(folder, name, author)
 		except ProjectManager.CreateProjectError, e:
 
=== added directory 'Jokosher/PlatformUtils'
=== added file 'Jokosher/PlatformUtils/Unix.py'
--- Jokosher/PlatformUtils/Unix.py	1970-01-01 00:00:00 +0000
+++ Jokosher/PlatformUtils/Unix.py	2009-03-19 23:39:14 +0000
@@ -0,0 +1,33 @@
+
+
+import os, os.path, urllib
+import pwd
+
+
+def getFullName():
+	try:
+		# Try to get the full name if it exists
+		fullname = pwd.getpwuid(os.getuid())[4].split(",")[0]
+		if fullname == "":
+			fullname = pwd.getpwuid(os.getuid())[0]
+		return fullname
+	except:
+		# If we can't get the fullname, then just use the login
+		return pwd.getpwuid(os.getuid())[0]
+
+def samefile(path1, path2):
+	return os.path.samefile(path1, path2)
+
+
+def url2pathname(url):
+	return urllib.url2pathname(url)
+
+def pathname2url(path):
+	return "file://%s" % urllib.pathname2url(path)
+
+def GetRecordingDefaults():
+	return dict()
+
+def GetPlaybackDefaults():
+	return dict()
+
 
=== added file 'Jokosher/PlatformUtils/Windows.py'
--- Jokosher/PlatformUtils/Windows.py	1970-01-01 00:00:00 +0000
+++ Jokosher/PlatformUtils/Windows.py	2009-03-19 23:39:14 +0000
@@ -0,0 +1,33 @@
+
+
+import urllib
+
+
+def getFullName():
+	#TODO: Work out how to get the fullname in windows
+	return ""
+
+def samefile(path1, path2):
+	return path1 == path2
+
+def url2pathname(url):
+	return urllib.url2pathname(url)
+
+def pathname2url(path):
+	#Windows pathname2url appends // to the front of the path
+	return "file:%s" % urllib.pathname2url(path)
+
+def GetRecordingDefaults():
+	defaults = {
+			"fileformat": "vorbisenc ! oggmux",
+			"file_extension": "ogg",
+			"audiosrc" : "dshowaudiosrc"
+		}
+	return defaults
+
+
+def GetPlaybackDefaults():
+	defaults = {
+			"audiosink": "directsoundsink"
+		}
+	return defaults	
 
=== added file 'Jokosher/PlatformUtils/__init__.py'
--- Jokosher/PlatformUtils/__init__.py	1970-01-01 00:00:00 +0000
+++ Jokosher/PlatformUtils/__init__.py	2009-03-19 23:44:15 +0000
@@ -0,0 +1,10 @@
+
+import platform
+
+system = platform.system()
+
+if system == "Windows":
+	from Windows import *
+else:
+	from Unix import *
+
 
=== modified file 'Jokosher/Project.py'
--- Jokosher/Project.py	2009-03-17 02:09:31 +0000
+++ Jokosher/Project.py	2009-03-26 15:07:44 +0000
@@ -15,7 +15,7 @@
 pygst.require("0.10")
 import gst
 import gobject
-import os
+import os, os.path
 import gzip
 import re
 
@@ -27,6 +27,7 @@
 import Utils
 import AudioBackend
 import ProjectManager
+import PlatformUtils
 
 #=========================================================================
 
@@ -392,13 +393,20 @@
 				else:
 					capsString = "audioconvert"
 					
-				pipe = "%s ! %s ! level name=recordlevel interval=%d" +\
-							" ! audioconvert ! %s ! filesink location=%s"
-				pipe %= (recordString, capsString, event.LEVEL_INTERVAL * gst.SECOND, encodeString, event.file.replace(" ", "\ "))
+				# TODO: get rid of this entire string; do it manually
+				pipe = "%s ! %s ! level name=recordlevel ! audioconvert ! %s ! filesink name=sink"
+				pipe %= (recordString, capsString, encodeString)
 				
 				Globals.debug("Using pipeline: %s" % pipe)
 				
 				recordingbin = gst.parse_bin_from_description(pipe, False)
+				
+				filesink = recordingbin.get_by_name("sink")
+				level = recordingbin.get_by_name("recordlevel")
+				
+				filesink.set_property("location", event.file)
+				level.set_property("interval", int(event.LEVEL_INTERVAL * gst.SECOND))
+				
 				#update the levels in real time
 				handle = self.bus.connect("message::element", event.recording_bus_level)
 				
@@ -605,15 +613,21 @@
 			if instr.inTrack == index:
 				event = instr.GetRecordingEvent()
 				
+				# TODO: get rid of string concatentation
 				encodeString = Globals.settings.recording["fileformat"]
-				pipe = "queue ! audioconvert ! level name=recordlevel interval=%d !" +\
-							"audioconvert ! %s ! filesink location=%s"
-				pipe %= (event.LEVEL_INTERVAL * gst.SECOND, encodeString, event.file.replace(" ", "\ "))
+				pipe = "queue ! audioconvert ! level name=recordlevel ! audioconvert ! %s ! filesink name=sink"
+				pipe %= encodeString
 				
 				encodeBin = gst.parse_bin_from_description(pipe, True)
 				bin.add(encodeBin)
 				pad.link(encodeBin.get_pad("sink"))
 				
+				filesink = bin.get_by_name("sink")
+				level = bin.get_by_name("recordlevel")
+				
+				filesink.set_property("location", event.file)
+				level.set_property("interval", int(event.LEVEL_INTERVAL * gst.SECOND))
+				
 				handle = self.bus.connect("message::element", event.recording_bus_level)
 				
 				# since we are adding the encodebin to an already playing pipeline, sync up there states
@@ -812,6 +826,8 @@
 			os.remove(path + "~")
 		else:
 			#if the saving doesn't fail, move it to the proper location
+			if os.path.exists(path):
+				os.remove(path)
 			os.rename(path + "~", path)		
 		
 		self.emit("undo")
@@ -1306,10 +1322,12 @@
 		"""
 		if not undoAction:
 			undoAction = self.NewAtomicUndoAction()
-		
+	
+		uris = [PlatformUtils.pathname2url(filename) for filename in fileList]
+
 		name, type, pixbuf, path = [x for x in Globals.getCachedInstruments() if x[1] == "audiofile"][0]
 		instr = self.AddInstrument(name, type, _undoAction_=undoAction)
-		instr.AddEventsFromList(0, fileList, copyFile, undoAction)
+		instr.AddEventsFromList(0, uris, copyFile, undoAction)
 	
 	#_____________________________________________________________________
 	
 
=== modified file 'Jokosher/ProjectManager.py'
--- Jokosher/ProjectManager.py	2009-03-17 02:09:31 +0000
+++ Jokosher/ProjectManager.py	2009-03-26 15:07:44 +0000
@@ -14,6 +14,7 @@
 import Project, Instrument, Event
 import xml.dom.minidom as xml
 import traceback
+import PlatformUtils
 
 def CreateNewProject(projecturi, name, author):
 	"""
@@ -33,6 +34,8 @@
 
 	(scheme, domain,folder, params, query, fragment) = urlparse.urlparse(projecturi, "file", False)
 
+	folder = PlatformUtils.url2pathname(folder)
+
 	if scheme != "file":
 		# raise "The URI scheme used is invalid." message
 		raise CreateProjectError(5)
@@ -114,6 +117,8 @@
 		# raise "The URI scheme used is invalid." message
 		raise OpenProjectError(1, scheme)
 
+	projectfile = PlatformUtils.url2pathname(projectfile)
+
 	Globals.debug("Attempting to open:", projectfile)
 
 	if not os.path.exists(projectfile):
 
=== modified file 'Jokosher/Utils.py'
--- Jokosher/Utils.py	2009-03-12 15:26:43 +0000
+++ Jokosher/Utils.py	2009-03-16 10:02:30 +0000
@@ -16,8 +16,11 @@
 import Globals
 
 import gst
-if gst.pygst_version >= (0, 10, 10):
+try:	
 	import gst.pbutils
+	have_pbutils = True
+except:
+	have_pbutils = False
 
 # the highest range in decibels there can be between any two levels
 DECIBEL_RANGE = 80
@@ -125,7 +128,7 @@
 	if not channelLevels:
 		return 0
 
-	negInf = float("-inf")
+	negInf = -1E+5000
 	peaktotal = 0
 	for peak in channelLevels:
 		#if peak > 0.001:
@@ -380,8 +383,8 @@
 #_____________________________________________________________________
 
 def HandleGstPbutilsMissingMessage(message, callback, x_window_id=0):
-	# pbutils was wrapped in 0.10.10
-	if gst.pygst_version < (0, 10, 10):
+	# Not all platforms have pbutils
+	if not have_pbutils:
 		return False
 
 	#self._installing_plugins = True
 
=== modified file 'bin/jokosher'
--- bin/jokosher	2009-03-17 02:09:31 +0000
+++ bin/jokosher	2009-03-26 14:19:15 +0000
@@ -11,9 +11,17 @@
 #	This script is also responsible for parsing comment line arguments.
 #
 #-------------------------------------------------------------------------------
-import os, sys
+import os, sys, platform
 
-ENV_PATHS = {"JOKOSHER_DATA_PATH" : "/usr/share/jokosher/",
+if platform.system() == "Windows":
+	ENV_PATHS = {"JOKOSHER_DATA_PATH" : ".\\",
+			"JOKOSHER_IMAGE_PATH" : ".\\pixmaps\\",
+			"JOKOSHER_LOCALE_PATH" : ".\\locale\\",
+			"JOKOSHER_HELP_PATH" : ".\\help\\",
+			"GST_PLUGIN_PATH" : ".\\"
+			}
+else:	
+	ENV_PATHS = {"JOKOSHER_DATA_PATH" : "/usr/share/jokosher/",
 			"JOKOSHER_IMAGE_PATH" : "/usr/share/jokosher/pixmaps/",
 			"JOKOSHER_LOCALE_PATH" : "/usr/share/locale/",
 			"JOKOSHER_HELP_PATH" : "/usr/share/gnome/jokosher/"
 
=== removed file 'dist/jokosher-0.9.tar.gz'
 Binary files dist/jokosher-0.9.tar.gz	2007-04-25 03:17:21 +0000 and dist/jokosher-0.9.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'images/jokosher.ico'
 Binary files images/jokosher.ico	1970-01-01 00:00:00 +0000 and images/jokosher.ico	2008-12-18 13:48:58 +0000 differ
=== modified file 'setup.py'
--- setup.py	2009-03-17 02:09:31 +0000
+++ setup.py	2009-03-26 15:07:44 +0000
@@ -50,7 +50,7 @@
 	license='GNU GPL',
 	platforms='linux',
 	scripts=['bin/jokosher'],
-	packages=['Jokosher', 'Jokosher/elements', 'Jokosher/ui'],
+	packages=['Jokosher', 'Jokosher/elements', 'Jokosher/ui', 'Jokosher/PlatformUtils'],
 	data_files=[
 		('share/jokosher/', glob.glob("Jokosher/*.glade")),
 		('share/jokosher/', ["Jokosher/jokosher-logo.png"]),
 
=== added file 'setup_win32.py'
--- setup_win32.py	1970-01-01 00:00:00 +0000
+++ setup_win32.py	2009-03-26 15:07:44 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+from subprocess import *
+import os
+import glob
+import py2exe
+
+dist = setup(name='jokosher',
+	version='0.11.1',
+	author='Jokosher Project',
+	author_email='[e-mail]',
+	maintainer='Michael Sheldon',
+	maintainer_email='[e-mail]',
+	description='Multi-track non-linear audio editing.',
+	long_description='Jokosher is a simple yet powerful multi-track studio. With it you can create and record music, podcasts and more, all from an integrated simple environment.',
+	url='http://www.jokosher.org/',
+	download_url='http://www.jokosher.org/download',
+	license='GNU GPL',
+	packages=['Jokosher', 'Jokosher/elements', 'Jokosher/ui', 'Jokosher/PlatformUtils'],
+	windows = [
+			{
+				'script' : 'bin/jokosher',
+				'icon_resources' : [(1, 'images/jokosher.ico')]
+			}
+		],
+	options = {
+			'py2exe': {
+				'packages' : 'encodings, Jokosher, Jokosher.elements, Jokosher.ui',
+				'includes' : 'cairo, gtk, gtk.glade, gobject, pango, pangocairo, atk, gst, pygst, xdg, Queue, xml.etree.ElementTree, gtk.keysyms, code, keyword, re'
+			}
+	},
+	data_files=[
+		"Jokosher\Jokosher.glade",
+		"Jokosher\jokosher-logo.png",
+		#glob.glob("Instruments\*.instr"),
+		#glob.glob('Instruments\images\*.png'),
+		#glob.glob("extensions\*.py") + glob.glob("extensions\*.egg"),
+		]
+)
+
 
=== added file 'windows_installer.iss'
--- windows_installer.iss	1970-01-01 00:00:00 +0000
+++ windows_installer.iss	2009-03-26 14:19:15 +0000
@@ -0,0 +1,13 @@
+[Setup]
+AppName =Jokosher
+AppVerName=Jokosher version 0.11.1
+DefaultDirName={pf}\Jokosher
+DefaultGroupName=Jokosher
+Compression=bzip/9
+
+[Files]
+Source: dist/*; DestDir: {app}; Flags: recursesubdirs createallsubdirs
+
+[Icons]
+Name: {group}\Jokosher; Filename: {app}\jokosher.exe; WorkingDir: {app}
+Name: {group}\Uninstall Jokosher; Filename: {uninstallexe}