diff -ruN jokosher-0.10/bin/jokosher jokosher-0.10.1/bin/jokosher --- jokosher-0.10/bin/jokosher 2008-08-25 07:32:05.000000000 +0200 +++ jokosher-0.10.1/bin/jokosher 2008-09-22 06:42:48.000000000 +0200 @@ -43,7 +43,7 @@ openproject = None loadExtensions = True -parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.10") +parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.10.1") #command line options parser.add_option("-d", "--debug", action="store_true", dest="debug", help=_("Print debug output to stdout")) diff -ruN jokosher-0.10/debian/changelog jokosher-0.10.1/debian/changelog --- jokosher-0.10/debian/changelog 2008-09-22 17:26:09.000000000 +0200 +++ jokosher-0.10.1/debian/changelog 2008-09-23 06:43:45.000000000 +0200 @@ -1,3 +1,16 @@ +jokosher (0.10.1-0ubuntu1) intrepid; urgency=low + + * New upstream release. + - Jokosher crashed with UnboundLocalError in DrawWaveform() (LP: #261858) + - Jokosher doesn't play clips imported with the freesound plugin + (LP: #272943) + - Toolbar doesn't obey GNOME desktop-wide settings (LP: #116474) + - Set Recorded Audio Format to FLAC or WAV by default (LP: #144074) + - Put proper extension on recoded audio files. + - Don't give inaccurate download progress when downloading audio from HTTP. + + -- Daniel Holbach Mon, 22 Sep 2008 17:28:34 +0200 + jokosher (0.10-0ubuntu2) intrepid; urgency=low * debian/jokosher.sh: dropped, unnecessary. diff -ruN jokosher-0.10/Jokosher/Event.py jokosher-0.10.1/Jokosher/Event.py --- jokosher-0.10/Jokosher/Event.py 2008-08-25 06:26:59.000000000 +0200 +++ jokosher-0.10.1/Jokosher/Event.py 2008-09-22 06:34:40.000000000 +0200 @@ -682,6 +682,7 @@ Globals.debug("Event %d: duration (%f) is less than last level endtime (%d)." % (self.id, self.duration, final_endtime)) self.duration = final_endtime / 1000.0 + self.SetProperties() Globals.debug("\tduration has been increased to", self.duration) if length and (self.offset > 0 or self.duration != length): @@ -709,7 +710,7 @@ # state has changed try: time = self.loadingPipeline.query_duration(gst.FORMAT_TIME) - if self.duration == 0 and time[0] != 0: + if self.duration == 0 and time[0] > 0: self.duration = float(time[0] / float(gst.SECOND)) #update position with proper duration diff -ruN jokosher-0.10/Jokosher/EventViewer.py jokosher-0.10.1/Jokosher/EventViewer.py --- jokosher-0.10/Jokosher/EventViewer.py 2008-08-10 23:03:10.000000000 +0200 +++ jokosher-0.10.1/Jokosher/EventViewer.py 2008-09-22 06:34:40.000000000 +0200 @@ -369,6 +369,7 @@ starting_time = int(rect.x / self.project.viewScale * 1000) starting_index = levels.find_endtime_index(starting_time) + x = 0 last_x = -2 skip_list = [] iterator = itertools.islice(levels, starting_index, length) @@ -435,7 +436,7 @@ if self.event.isLoading: # Write "Loading..." or "Downloading..." - if self.event.duration == 0: + if self.event.duration <= 0: # for some file types gstreamer doesn't give us a duration # so don't display the percentage if self.event.isDownloading: diff -ruN jokosher-0.10/Jokosher/Globals.py jokosher-0.10.1/Jokosher/Globals.py --- jokosher-0.10/Jokosher/Globals.py 2008-08-12 00:00:11.000000000 +0200 +++ jokosher-0.10.1/Jokosher/Globals.py 2008-09-22 05:27:41.000000000 +0200 @@ -37,7 +37,8 @@ } recording = { - "fileformat": "vorbisenc ! oggmux", + "fileformat": "flacenc", + "file_extension": "flac", "samplerate": "0" # zero means, autodetect sample rate (ie use any available) } diff -ruN jokosher-0.10/Jokosher/Instrument.py jokosher-0.10.1/Jokosher/Instrument.py --- jokosher-0.10/Jokosher/Instrument.py 2008-08-10 23:03:10.000000000 +0200 +++ jokosher-0.10.1/Jokosher/Instrument.py 2008-09-22 05:15:01.000000000 +0200 @@ -493,7 +493,8 @@ event.isRecording = True event.name = _("Recorded audio") - filename = "%s_%d.ogg" % (Globals.FAT32SafeFilename(self.name), event.id) + ext = Globals.settings.recording["file_extension"] + filename = "%s_%d.%s" % (Globals.FAT32SafeFilename(self.name), event.id, ext) event.file = os.path.join(self.project.audio_path, filename) event.levels_file = filename + Event.Event.LEVELS_FILE_EXTENSION diff -ruN jokosher-0.10/Jokosher/Jokosher jokosher-0.10.1/Jokosher/Jokosher --- jokosher-0.10/Jokosher/Jokosher 2008-08-24 21:57:57.000000000 +0200 +++ jokosher-0.10.1/Jokosher/Jokosher 2008-09-22 06:41:23.000000000 +0200 @@ -60,7 +60,7 @@ openproject = None loadExtensions = True -parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.10") +parser = optparse.OptionParser(usage="%prog [options] [project-file]", version="0.10.1") #command line options parser.add_option("-d", "--debug", action="store_true", dest="debug", help=_("Print debug output to stdout")) diff -ruN jokosher-0.10/Jokosher/Jokosher.glade jokosher-0.10.1/Jokosher/Jokosher.glade --- jokosher-0.10/Jokosher/Jokosher.glade 2008-08-24 21:57:06.000000000 +0200 +++ jokosher-0.10.1/Jokosher/Jokosher.glade 2008-09-22 06:41:57.000000000 +0200 @@ -663,7 +663,6 @@ True GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_BOTH True True @@ -860,7 +859,7 @@ Jokosher Audio production made simple. -Version 0.10 +Version 0.10.1 GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff -ruN jokosher-0.10/Jokosher/PreferencesDialog.py jokosher-0.10.1/Jokosher/PreferencesDialog.py --- jokosher-0.10/Jokosher/PreferencesDialog.py 2008-08-10 23:03:10.000000000 +0200 +++ jokosher-0.10.1/Jokosher/PreferencesDialog.py 2008-09-22 05:15:01.000000000 +0200 @@ -202,6 +202,7 @@ exportDict = Globals.EXPORT_FORMATS[self.recordingFileFormat.get_active()] Globals.settings.recording["fileformat"] = exportDict["pipeline"] + Globals.settings.recording["file_extension"] = exportDict["extension"] #only get the number from "44100 Hz", not the whole string sampleRateIndex = self.samplingRate.get_active() Globals.settings.recording["samplerate"] = self.sampleRateList[sampleRateIndex][1] diff -ruN jokosher-0.10/PKG-INFO jokosher-0.10.1/PKG-INFO --- jokosher-0.10/PKG-INFO 2008-08-26 14:34:27.000000000 +0200 +++ jokosher-0.10.1/PKG-INFO 2008-09-22 06:45:30.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: jokosher -Version: 0.10 +Version: 0.10.1 Summary: Multi-track non-linear audio editing. Home-page: http://www.jokosher.org/ Author: David Corrales diff -ruN jokosher-0.10/README jokosher-0.10.1/README --- jokosher-0.10/README 2008-08-24 22:00:16.000000000 +0200 +++ jokosher-0.10.1/README 2008-09-22 06:42:25.000000000 +0200 @@ -1,4 +1,4 @@ -Welcome to Jokosher 0.10! +Welcome to Jokosher 0.10.1! Jokosher is a simple and easy to use audio multi-tracker for the Linux desktop. The aim of the project is to diff -ruN jokosher-0.10/setup.py jokosher-0.10.1/setup.py --- jokosher-0.10/setup.py 2008-08-25 07:27:50.000000000 +0200 +++ jokosher-0.10.1/setup.py 2008-09-22 06:43:31.000000000 +0200 @@ -38,7 +38,7 @@ OMFFILES.append((omfdir, glob.glob("help/jokosher/*.omf"))) dist = setup(name='jokosher', - version='0.10', + version='0.10.1', author='Jokosher Project', author_email='corrales.david@gmail.com', maintainer='David Corrales',