rpms/audacity/devel audacity-1.3.7-audiodevdefaults.patch, NONE, 1.1 audacity-1.3.7-vamp-1.3.patch, NONE, 1.1 audacity.spec, 1.72, 1.73

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13293

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.7-audiodevdefaults.patch 
	audacity-1.3.7-vamp-1.3.patch 
Log Message:
* Sun Mar  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.7-0.5.beta
- show default device names in Audio I/O preferences


audacity-1.3.7-audiodevdefaults.patch:

--- NEW FILE audacity-1.3.7-audiodevdefaults.patch ---
diff -Nur audacity-src-1.3.7-orig/src/AudioIO.cpp audacity-src-1.3.7/src/AudioIO.cpp
--- audacity-src-1.3.7-orig/src/AudioIO.cpp	2009-01-27 21:50:59.000000000 +0100
+++ audacity-src-1.3.7/src/AudioIO.cpp	2009-03-01 08:48:20.000000000 +0100
@@ -1898,6 +1898,11 @@
    // device, so we just use the first one available
    if (recDeviceNum < 0)
       recDeviceNum = 0;
+   const PaDeviceInfo* info = Pa_GetDeviceInfo(recDeviceNum);
+   if (info && (info->maxInputChannels > 0))
+   {
+      gPrefs->Write(wxT("/AudioIO/RecordingDevice"), DeviceName(info));
+   }
    return recDeviceNum;
 }
 
@@ -1937,6 +1942,11 @@
    // device, so we just use the first one available
    if (DeviceNum < 0)
       DeviceNum = 0;
+   const PaDeviceInfo* info = Pa_GetDeviceInfo(DeviceNum);
+   if (info && (info->maxInputChannels > 0))
+   {
+      gPrefs->Write(wxT("/AudioIO/PlaybackDevice"), DeviceName(info));
+   }
    return DeviceNum;
 }
 

audacity-1.3.7-vamp-1.3.patch:

--- NEW FILE audacity-1.3.7-vamp-1.3.patch ---
diff -Nur audacity-src-1.3.7-orig/configure audacity-src-1.3.7/configure
--- audacity-src-1.3.7-orig/configure	2009-01-27 21:50:59.000000000 +0100
+++ audacity-src-1.3.7/configure	2009-02-28 16:06:02.000000000 +0100
@@ -7774,12 +7774,12 @@
     pkg_cv_VAMP_CFLAGS="$VAMP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null`
+  pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 1.1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7790,12 +7790,12 @@
     pkg_cv_VAMP_LIBS="$VAMP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null`
+  pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 1.1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7813,9 +7813,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 2.0" 2>&1`
+	        VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 1.1.0" 2>&1`
         else
-	        VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 2.0" 2>&1`
+	        VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 1.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$VAMP_PKG_ERRORS" >&5
diff -Nur audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.cpp audacity-src-1.3.7/src/effects/vamp/VampEffect.cpp
--- audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.cpp	2009-01-27 21:50:58.000000000 +0100
+++ audacity-src-1.3.7/src/effects/vamp/VampEffect.cpp	2009-02-28 15:45:52.000000000 +0100
@@ -13,9 +13,9 @@
 
 #include "VampEffect.h"
 
-#include <vamp-hostsdk/Plugin.h>
-#include <vamp-hostsdk/PluginChannelAdapter.h>
-#include <vamp-hostsdk/PluginInputDomainAdapter.h>
+#include <vamp-sdk/Plugin.h>
+#include <vamp-sdk/hostext/PluginChannelAdapter.h>
+#include <vamp-sdk/hostext/PluginInputDomainAdapter.h>
 
 #include <wx/wxprec.h>
 #include <wx/button.h>
@@ -311,20 +311,12 @@
       Vamp::RealTime ftime0 = fli->timestamp;
       double ltime0 = ftime0.sec + (double(ftime0.nsec) / 1000000000.0);
 
-      Vamp::RealTime ftime1 = ftime0;
-      if (fli->hasDuration) ftime1 = ftime0 + fli->duration;
-      double ltime1 = ftime1.sec + (double(ftime1.nsec) / 1000000000.0);
-
       wxString label = LAT1CTOWX(fli->label.c_str());
       if (label == wxString()) {
-         if (fli->values.empty()) {
             label = wxString::Format(LAT1CTOWX("%.3f"), ltime0);
-         } else {
-            label = wxString::Format(LAT1CTOWX("%.3f"), *fli->values.begin());
-         }
       }
       
-      ltrack->AddLabel(ltime0, ltime1, label);
+      ltrack->AddLabel(ltime0, ltime0, label);
    }
 }
 
diff -Nur audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.h audacity-src-1.3.7/src/effects/vamp/VampEffect.h
--- audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.h	2009-01-27 21:50:58.000000000 +0100
+++ audacity-src-1.3.7/src/effects/vamp/VampEffect.h	2009-02-28 15:45:52.000000000 +0100
@@ -22,7 +22,7 @@
 
 #include <wx/dialog.h>
 
-#include <vamp-hostsdk/PluginLoader.h>
+#include <vamp-sdk/hostext/PluginLoader.h>
 
 void LoadVampPlugins();
 


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- audacity.spec	28 Feb 2009 17:52:55 -0000	1.72
+++ audacity.spec	1 Mar 2009 08:03:00 -0000	1.73
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.7
-Release: 0.4.beta%{?dist}
+Release: 0.5.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -20,6 +20,8 @@
 Patch3: audacity-1.3.6-flac-import.patch
 Patch4: audacity-1.3.7-portaudio-non-mmap-alsa.patch
 Patch5: audacity-1.3.7-repeat.patch
+Patch6: audacity-1.3.7-vamp-1.3.patch
+Patch7: audacity-1.3.7-audiodevdefaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -66,6 +68,10 @@
 %patch3 -p1 -b .dumb-flac-import
 %patch4 -p1 -b .pa-non-mmap-alsa
 %patch5 -p1 -b .repeat
+%if 0%{?fedora} < 11
+%patch6 -p1 -b .vamp-1.3
+%endif
+%patch7 -p1 -b .audiodevdefaults
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -137,10 +143,14 @@
 
 
 %changelog
+* Sun Mar  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.7-0.5.beta
+- show default device names in Audio I/O preferences
+
 * Sat Feb 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.3.7-0.4.beta
 - remove no longer needed default hostapi hunk of the non-mmap-alsa patch
 
 * Sat Feb 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.7-0.3.beta
+- F-10 only: patch to build with older Vamp API 1.3
 - upgrade to 1.3.7-beta pkg from test branch in Fedora cvs
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-0.13.beta