Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5035

Modified Files:
      Tag: Audacity_UmixIt
        AboutDialog.cpp AudioIO.cpp 
Log Message:
Side-porting a few Intel Mac fixes from 10.2.6

Index: AboutDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AboutDialog.cpp,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.8.2.1
diff -u -d -r1.18.2.8 -r1.18.2.8.2.1
--- AboutDialog.cpp     4 Jun 2006 10:12:53 -0000       1.18.2.8
+++ AboutDialog.cpp     27 Nov 2006 16:44:08 -0000      1.18.2.8.2.1
@@ -50,6 +50,10 @@
 
    wxString informationStr;
 
+   #ifdef __i686
+   informationStr += _("Intel Mac version");
+   #endif
+
    #ifdef MP3SUPPORT
    informationStr += _("MP3 importing enabled");
    #else

Index: AudioIO.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.cpp,v
retrieving revision 1.100.2.27
retrieving revision 1.100.2.27.2.1
diff -u -d -r1.100.2.27 -r1.100.2.27.2.1
--- AudioIO.cpp 23 Mar 2006 13:58:23 -0000      1.100.2.27
+++ AudioIO.cpp 27 Nov 2006 16:44:08 -0000      1.100.2.27.2.1
@@ -651,7 +651,7 @@
    gPrefs->Read("/AudioIO/RecordChannels", &captureChannels, 1L);
    gPrefs->Read("/AudioIO/SWPlaythrough", &mSoftwarePlaythrough, false);
    #if __WXMAC__
-   gPrefs->Read("/AudioIO/NoModifyDevice", &mNoModifyDevice, false);
+   gPrefs->Read("/AudioIO/NoModifyDevice", &mNoModifyDevice, true);
    #endif
    int playbackChannels = 0;
 
@@ -709,7 +709,7 @@
 
    gPrefs->Read("/AudioIO/SWPlaythrough", &mSoftwarePlaythrough, false);
    #ifdef __WXMAC__
-   gPrefs->Read("/AudioIO/NoModifyDevice", &mNoModifyDevice, false);
+   gPrefs->Read("/AudioIO/NoModifyDevice", &mNoModifyDevice, true);
    #endif
 
    mInputMeter = NULL;


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to