rpms/audacity/F-9 audacity-1.3.7-audiodevdefaults.patch, NONE, 1.1 audacity.spec, 1.55, 1.56
Michael Schwendt
mschwendt at fedoraproject.org
Tue Mar 17 10:35:42 UTC 2009
- Previous message (by thread): rpms/audacity/devel audacity.spec,1.75,1.76
- Next message (by thread): rpms/libwps/devel import.log, NONE, 1.1 libwps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/pkgs/rpms/audacity/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26185
Modified Files:
audacity.spec
Added Files:
audacity-1.3.7-audiodevdefaults.patch
Log Message:
sync more from Rawhide
audacity-1.3.7-audiodevdefaults.patch:
--- NEW FILE audacity-1.3.7-audiodevdefaults.patch ---
diff -Nur audacity-src-1.3.7-orig/src/prefs/AudioIOPrefs.cpp audacity-src-1.3.7/src/prefs/AudioIOPrefs.cpp
--- audacity-src-1.3.7-orig/src/prefs/AudioIOPrefs.cpp 2009-01-27 21:50:58.000000000 +0100
+++ audacity-src-1.3.7/src/prefs/AudioIOPrefs.cpp 2009-03-02 17:25:17.000000000 +0100
@@ -71,6 +71,25 @@
wxString Name;
wxString Label;
+ mDefaultPlayDeviceName = gPrefs->Read(wxT("/AudioIO/PlaybackDevice"), wxT(""));
+ int playDeviceNum = -1; // use device name from gPrefs
+ if ( mDefaultPlayDeviceName == wxT("") ) {
+#if USE_PORTAUDIO_V19
+ playDeviceNum = Pa_GetDefaultOutputDevice();
+#else
+ playDeviceNum = Pa_GetDefaultOutputDeviceID();
+#endif
+ }
+ mDefaultRecDeviceName = gPrefs->Read(wxT("/AudioIO/RecordingDevice"), wxT(""));
+ int recDeviceNum = -1; // use device name from gPrefs
+ if ( mDefaultRecDeviceName == wxT("") ) {
+#if USE_PORTAUDIO_V19
+ recDeviceNum = Pa_GetDefaultInputDevice();
+#else
+ recDeviceNum = Pa_GetDefaultInputDeviceID();
+#endif
+ }
+
#if USE_PORTAUDIO_V19
int nDevices = Pa_GetDeviceCount();
#else
@@ -85,10 +104,16 @@
if (info->maxOutputChannels > 0) {
mmPlayNames.Add( Name );
mmPlayLabels.Add( Label );
+ if ( playDeviceNum == j ) {
+ mDefaultPlayDeviceName = Name;
+ }
}
if (info->maxInputChannels > 0) {
mmRecordNames.Add( Name );
mmRecordLabels.Add( Label );
+ if ( recDeviceNum == j ) {
+ mDefaultRecDeviceName = Name;
+ }
// if (info->maxInputChannels > numChannels)
// numChannels = info->maxInputChannels;
}
@@ -121,7 +146,7 @@
S.StartMultiColumn(2, wxEXPAND);
S.SetStretchyCol(1);
mPlay = S.TieChoice( _("Device") + wxString(wxT(":")), wxT("PlaybackDevice"),
- wxT(""), mmPlayNames, mmPlayLabels );
+ mDefaultPlayDeviceName, mmPlayNames, mmPlayLabels );
S.AddPrompt( _("Using:") );
wxString ver = _("Portaudio v");
@@ -139,7 +164,7 @@
S.StartMultiColumn(2, wxEXPAND);
S.SetStretchyCol(1);
mRec = S.TieChoice( _("Device") + wxString(wxT(":")), wxT("RecordingDevice"),
- wxT(""), mmRecordNames, mmRecordLabels );
+ mDefaultRecDeviceName, mmRecordNames, mmRecordLabels );
S.TieChoice( _("Channels") + wxString(wxT(":")), wxT("RecordChannels"),
2, mmChannelNames, mmChannelLabels );
S.EndMultiColumn();
diff -Nur audacity-src-1.3.7-orig/src/prefs/AudioIOPrefs.h audacity-src-1.3.7/src/prefs/AudioIOPrefs.h
--- audacity-src-1.3.7-orig/src/prefs/AudioIOPrefs.h 2009-01-27 21:50:58.000000000 +0100
+++ audacity-src-1.3.7/src/prefs/AudioIOPrefs.h 2009-03-02 17:25:16.000000000 +0100
@@ -48,6 +48,9 @@
wxChoice *mPlay;
wxChoice *mRec;
+
+ wxString mDefaultPlayDeviceName;
+ wxString mDefaultRecDeviceName;
};
#endif
Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-9/audacity.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- audacity.spec 17 Mar 2009 10:13:26 -0000 1.55
+++ audacity.spec 17 Mar 2009 10:35:12 -0000 1.56
@@ -5,7 +5,7 @@
Name: audacity
Version: 1.3.7
-Release: 0.4.beta%{?dist}
+Release: 0.4.beta%{?dist}.2
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -21,6 +21,7 @@
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
@@ -36,7 +37,11 @@
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
BuildRequires: soundtouch-devel
+%if 0%{?fedora} < 11
BuildRequires: vamp-plugin-sdk-devel
+%else
+BuildRequires: vamp-plugin-sdk-devel >= 2.0
+%endif
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: wxGTK-devel
@@ -67,7 +72,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
@@ -139,6 +147,9 @@
%changelog
+* Tue Mar 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.7-0.4.beta.2
+- sync with Rawhide (1.3.7-0.6.beta) for updates-testing
+
* 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
- Previous message (by thread): rpms/audacity/devel audacity.spec,1.75,1.76
- Next message (by thread): rpms/libwps/devel import.log, NONE, 1.1 libwps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list