Merge remote-tracking branch 'upstream/master' into wx3 is necessary,

scripts/maketarball.sh

@@ -64,21 +64,9 @@ function cleanfulltree {
       exit ${status}
    fi
 
-   printf "Checking SVN status ... "
-   revision="$(svnversion)"
-   regex="[[:digit:]]*"
-   if [[ ${revision} =~ ${regex} ]] ; then
-      echo "Unmodified working copy at revision ${revision}"
-   else
-      echo "Modified working copy! Release tarballs must be built from an unmodified working copy! Exiting"
-      exit
-   fi
-
-   printf "removing SVN directories ... "
-   find . -depth -name '.svn' -execdir rm -rf '{}' ';'
-   # -depth is needed to avoid find trying to examine directories it has just
-   # deleted.
-   # The sort of quotes used is critical!
+   printf "removing GIT directories ... "
+   myrmrvf $1 .git .gitignore
+   myrmrvf $1 .gitignore
    printf "Done\n"
 
    printf "removing vim / emacs temp files ... "
@@ -106,13 +94,13 @@ function cleanfulltree {
    myrmrvf $1 dox 
    printf "Done\n"
 
-   printf "removing unused libraries from SVN tree ..."
+   printf "removing unused libraries from GIT tree ..."
    myrmrvf $1 lib-src/portmidi
    myrmrvf $1 lib-src/libscorealign
    printf "Done\n"
 }
 
-# remove all the things we have in SVN for convenience rather than being
+# remove all the things we have in GIT for convenience rather than being
 # necessary
 function slimtree {
    printf "removing todo lists ... "

scripts/mw2html_audacity/sidebar.html

@@ -4,7 +4,7 @@
       <ul>
          <li><a style="font-style:italic" href="http://forum.audacityteam.org" title="Visit the Forum for technical support">Forum</a></li>
          <li><a style="font-style:italic" href="http://wiki.audacityteam.org" title="Visit the Wiki for tips, tricks and more tutorials">Wiki</a></li>
-         <li><a style="font-style:italic" href="http://audacity.sourceforge.net/download/" title="Download the latest release">Latest Release</a></li>  
+         <li><a style="font-style:italic" href="http://audacityteam.org/download/" title="Download the latest release">Latest Release</a></li>  
       </ul>
    </div>
 </div>

src/AutoRecovery.cpp

@@ -457,7 +457,7 @@ void AutoSaveFile::WriteAttr(const wxString & name, const wxString & value)
    mBuffer.PutC(FT_String);
    WriteName(name);
 
-   short len = value.Length() * sizeof(wxChar);
+   int len = value.Length() * sizeof(wxChar);
 
    mBuffer.Write(&len, sizeof(len));
    mBuffer.Write(value.wx_str(), len);
@@ -525,7 +525,7 @@ void AutoSaveFile::WriteData(const wxString & value)
 {
    mBuffer.PutC(FT_Data);
 
-   short len = value.Length() * sizeof(wxChar);
+   int len = value.Length() * sizeof(wxChar);
 
    mBuffer.Write(&len, sizeof(len));
    mBuffer.Write(value.wx_str(), len);
@@ -535,7 +535,7 @@ void AutoSaveFile::Write(const wxString & value)
 {
    mBuffer.PutC(FT_Raw);
 
-   short len = value.Length() * sizeof(wxChar);
+   int len = value.Length() * sizeof(wxChar);
 
    mBuffer.Write(&len, sizeof(len));
    mBuffer.Write(value.wx_str(), len);
@@ -595,6 +595,7 @@ void AutoSaveFile::CheckSpace(wxMemoryOutputStream & os)
 
 void AutoSaveFile::WriteName(const wxString & name)
 {
+   wxASSERT(name.Length() * sizeof(wxChar) <= SHRT_MAX);
    short len = name.Length() * sizeof(wxChar);
    short id;
 
@@ -770,7 +771,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
 
          case FT_String:
          {
-            short len;
+            int len;
 
             in.Read(&id, sizeof(id));
             in.Read(&len, sizeof(len));
@@ -865,7 +866,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
 
          case FT_Data:
          {
-            short len;
+            int len;
 
             in.Read(&len, sizeof(len));
             wxChar *val = new wxChar[len / sizeof(wxChar)];
@@ -878,7 +879,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
 
          case FT_Raw:
          {
-            short len;
+            int len;
 
             in.Read(&len, sizeof(len));
             wxChar *val = new wxChar[len / sizeof(wxChar)];

src/Languages.cpp

@@ -156,7 +156,9 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
    localLanguageName[wxT("tr")] = wxT("Turkce");
    localLanguageName[wxT("uk")] = wxT("Ukrainska");
    localLanguageName[wxT("vi")] = wxT("Vietnamese");
-   localLanguageName[wxT("zh")] = wxT("Chinese (Simplified)");
+   // If we look up zh in wxLocale we get zh_TW hence we MUST look
+   // for zh_CN.
+   localLanguageName[wxT("zh_CN")] = wxT("Chinese (Simplified)");
    localLanguageName[wxT("zh_TW")] = wxT("Chinese (Traditional)");
 
    wxArrayString audacityPathList = wxGetApp().audacityPathList;
@@ -167,6 +169,8 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
                                       audacityPathList);
 #endif
 
+   // For each language in our list we look for a corresponding entry in
+   // wxLocale.  
    for (LangHash::iterator i = localLanguageName.begin();
         i != localLanguageName.end();
         i++)
@@ -237,10 +241,10 @@ void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames)
 
 
    // Sort
-
    unsigned int j;
-   for(j=0; j<tempNames.GetCount(); j++)
+   for(j=0; j<tempNames.GetCount(); j++){
       reverseHash[tempNames[j]] = tempCodes[j];
+   }
 
    tempNames.Sort();
 

src/effects/Repeat.cpp

@@ -38,7 +38,7 @@
 // Define keys, defaults, minimums, and maximums for the effect parameters
 //
 //     Name    Type  Key             Def  Min   Max      Scale
-Param( Count,  int,  XO("Count"),    10,  2,    INT_MAX, 1  );
+Param( Count,  int,  XO("Count"),    10,  1,    INT_MAX, 1  );
 
 BEGIN_EVENT_TABLE(EffectRepeat, wxEvtHandler)
    EVT_TEXT(wxID_ANY, EffectRepeat::OnRepeatTextChange)

src/effects/VST/VSTEffect.cpp

@@ -1521,7 +1521,8 @@ VSTEffect::VSTEffect(const wxString & path, VSTEffect *master)
    mTimeInfo.flags = kVstTempoValid | kVstNanosValid;
 
    // UI
-
+   
+   mGui = false;
    mNames = NULL;
    mSliders = NULL;
    mDisplays = NULL;
@@ -3598,7 +3599,7 @@ void VSTEffect::BuildPlain()
 
 void VSTEffect::RefreshParameters(int skip)
 {
-   if (mGui)
+   if (!mNames)
    {
       return;
    }

win/audacity.iss

@@ -238,7 +238,7 @@ Name: "bn"; MessagesFile: "{#Get('Bengali.islu')}"
 Name: "bs"; MessagesFile: "{#Get('Bosnian.isl')}"
 Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"
 Name: "ca_ES0valencia"; MessagesFile: "{#Get('Valencian.isl')}"
-Name: "co"; MessagesFile: "compiler:Languages\Corsican.isl"
+;Name: "co"; MessagesFile: "compiler:Languages\Corsican.isl"
 Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl"
 Name: "cy"; MessagesFile: "{#Dummy('Welsh', '0452')}"
 Name: "da"; MessagesFile: "compiler:Languages\Danish.isl"
@@ -267,7 +267,7 @@ Name: "lt"; MessagesFile: "{#Get('Lithuanian.isl')}"
 Name: "mk"; MessagesFile: "{#Get('Macedonian.isl')}"
 Name: "my"; MessagesFile: "{#Dummy('Burmese', '0409')}"
 Name: "nb"; MessagesFile: "compiler:Languages\Norwegian.isl"
-Name: "ne"; MessagesFile: "compiler:Languages\Nepali.islu"
+;Name: "ne"; MessagesFile: "compiler:Languages\Nepali.islu"
 Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"
 Name: "oc"; MessagesFile: "{#Get('Occitan.isl')}"
 Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl"
@@ -317,7 +317,7 @@ bn.ResetPrefs=Reset Preferences
 bs.ResetPrefs=Reset Preferences
 ca.ResetPrefs=Voleu restablir les preferències?
 ca_ES0valencia.ResetPrefs=Reset Preferences
-co.ResetPrefs=Reset Preferences
+;co.ResetPrefs=Reset Preferences
 cs.ResetPrefs=Vynulovat nastavení?
 cy.ResetPrefs=Reset Preferences
 da.ResetPrefs=Gendan indstillinger?
@@ -346,7 +346,7 @@ lt.ResetPrefs=Reset Preferences
 mk.ResetPrefs=Reset Preferences
 my.ResetPrefs=Reset Preferences
 nb.ResetPrefs=Reset Preferences
-ne.ResetPrefs=Reset Preferences
+;ne.ResetPrefs=Reset Preferences
 nl.ResetPrefs=Voorkeuren herstellen?
 oc.ResetPrefs=Reset Preferences
 pl.ResetPrefs=Zresetować ustawienia?