[Audacity-cvs] audacity-src/src/prefs DevicePrefs.cpp,1.11,1.12

[Al Dimond]

Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5283/src/prefs

Modified Files:
        DevicePrefs.cpp 
Log Message:


Index: DevicePrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/DevicePrefs.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- DevicePrefs.cpp     7 Jan 2010 00:43:45 -0000       1.11
+++ DevicePrefs.cpp     20 Jan 2010 01:43:04 -0000      1.12
@@ -334,6 +334,10 @@
    wxLogDebug(wxT("GetDefaultPlayDevice(): HostAPI index %d, name %s"), index, 
wxString(apiinfo->name, wxConvLocal).c_str());
    wxLogDebug(wxT("GetDefaultPlayDevice() default output %d"), 
apiinfo->defaultOutputDevice);
    const PaDeviceInfo* devinfo = 
Pa_GetDeviceInfo(apiinfo->defaultOutputDevice);
+   if (devinfo == NULL) {
+     wxLogDebug(wxT("GetDefaultPlayDevice() no default output device"));
+     return wxString("", wxConvLocal);
+   }
    wxString name(devinfo->name, wxConvLocal);
    wxLogDebug(wxT("GetDefaultPlayDevice() default output device name %s"), 
name.c_str());
    return name;
@@ -349,6 +353,10 @@
    wxLogDebug(wxT("GetDefaultRecordDevice(): HostAPI index %d, name %s"), 
index, wxString(apiinfo->name, wxConvLocal).c_str());
    wxLogDebug(wxT("GetDefaultRecordDevice() default input %d"), 
apiinfo->defaultInputDevice);
    const PaDeviceInfo* devinfo = Pa_GetDeviceInfo(apiinfo->defaultInputDevice);
+   if (devinfo == NULL) {
+     wxLogDebug(wxT("GetDefaultRecordDevice() no default input device"));
+     return wxString("", wxConvLocal);
+   }
    wxString name(devinfo->name, wxConvLocal);
    wxLogDebug(wxT("GetDefaultRecordDevice() default input device name %s"), 
name.c_str());
    return name;


------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs