rpms/aldrin/devel aldrin-65a8db7be79e.diff, NONE, 1.1 aldrin-firstdev.patch, NONE, 1.1 aldrin.spec, 1.7, 1.8

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/aldrin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18491

Modified Files:
	aldrin.spec 
Added Files:
	aldrin-65a8db7be79e.diff aldrin-firstdev.patch 
Log Message:
* Sat Mar 06 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.13-4
- Change device order in autodetect. Prevents a possible crash.
- Fix segfault in waveedit when deleting end of waveform.


aldrin-65a8db7be79e.diff:
 waveedit.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE aldrin-65a8db7be79e.diff ---
# HG changeset patch -- Bitbucket.org
# Project Aldrin
# URL http://bitbucket.org/paniq/aldrin/overview
# User jmmcd
# Date 1238628185 -3600
# Node ID 65a8db7be79e5a55343fff33e0234702a2c04416
# Parent  66f9f971fdf278d83f620cea4a7de3585d1d1c31
Fix segfault in waveedit when deleting end of waveform. Fixes #16 on bitbucket. Thanks to bucket_brigade for the fix.

--- a/src/aldrin/waveedit.py
+++ b/src/aldrin/waveedit.py
@@ -115,7 +115,7 @@ class WaveEditView(gtk.DrawingArea):
 		player = com.get('aldrin.core.player')
 		if self.selection:
 			begin,end = self.selection
-			self.level.remove_sample_range(begin,end)
+			self.level.remove_sample_range(begin,end-1)
 			self.selection = None
 			player.history_commit("remove sample range")
 			self.sample_changed()

aldrin-firstdev.patch:
 driver.py |   21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE aldrin-firstdev.patch ---
diff -rupN aldrin.old/src/components/driver.py aldrin/src/components/driver.py
--- aldrin.old/src/components/driver.py	2009-01-09 16:25:22.000000000 -0500
+++ aldrin/src/components/driver.py	2010-03-06 04:32:27.000000000 -0500
@@ -155,22 +155,33 @@ class AudioDriver:
 				
 		# second round: if we didnt find them from the config,
 		# pick good alternatives.
+
+		# regardless of what was chosen as input, if output
+		# has an input as well, prefer that one first.
+		# We also prefer the first device since it is usually the
+		# default system device. Unfortunately, the armstrong api
+		# does not provide us a default value.
+		if (output == -1 and input == -1):
+			for i in range(self.driver.get_count()):
+				if (self.driver.is_output(i) and self.driver.is_input(i)):
+					output = i
+					input = i
+					break
 		
 		if output == -1:
 			for i in range(self.driver.get_count()):
 				if self.driver.is_output(i):
 					output = i
-		
-		# regardless of what was chosen as input, if output
-		# has an input as well, prefer that one first.
-		if self.driver.is_input(output):
-			input = output
+					break
 		
 		# take output channel if it supports input		
 		if input == -1:
 			for i in range(self.driver.get_count()):
 				if self.driver.is_input(i):
 					input = i
+					break
+			if self.driver.is_input(output):
+				input = output
 			
 		if output == -1:
 			raise self.AudioInitException


Index: aldrin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aldrin/devel/aldrin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- aldrin.spec	6 Aug 2009 02:58:48 -0000	1.7
+++ aldrin.spec	30 May 2010 15:33:07 -0000	1.8
@@ -2,13 +2,20 @@
 
 Name:		aldrin
 Version:	0.13
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Modular music sequencer/tracker
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://code.google.com/p/aldrin-sequencer/
 Source0:	http://aldrin-sequencer.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:		aldrin-docfix.patch
+# Choose the first detected device instead of last one. Prevents crashes on
+# some systems I tried that supply multiple output devices per sound card.
+# http://bitbucket.org/paniq/aldrin/issue/32/device-order-patch
+Patch1:		aldrin-firstdev.patch
+# Fix segfault in waveedit when deleting end of waveform.
+# http://bitbucket.org/paniq/aldrin/issue/16/segfault-when-deleting-the-end-of-a-wav
+Patch2:		aldrin-65a8db7be79e.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	scons
@@ -26,7 +33,8 @@ samples.
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .docfix
-
+%patch1 -p1 -b .firstdev
+%patch2 -p1 -b .delete.waveform
 
 %build
 # Fix encoding
@@ -80,6 +88,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sat Mar 06 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.13-4
+- Change device order in autodetect. Prevents a possible crash.
+- Fix segfault in waveedit when deleting end of waveform.
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.13-3
 - Update the .desktop file