From 991969cab8af1fc961faa9ba8614db9d62e4cb02 Mon Sep 17 00:00:00 2001
From: "RichardAsh1981@gmail.com"
 <RichardAsh1981@gmail.com@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Thu, 12 Sep 2013 16:52:30 +0000
Subject: [PATCH] Apply parts of a warning supression patch by Campbell Barton

---
 images/Arrow.xpm            | 6 +++---
 src/AudioIO.cpp             | 1 +
 src/DeviceManager.cpp       | 2 ++
 src/Sequence.cpp            | 1 +
 src/TimeDialog.cpp          | 2 +-
 src/import/ImportFFmpeg.cpp | 2 +-
 src/prefs/LibraryPrefs.cpp  | 3 +++
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/images/Arrow.xpm b/images/Arrow.xpm
index 993346ccf..07d9733cc 100644
--- a/images/Arrow.xpm
+++ b/images/Arrow.xpm
@@ -43,7 +43,7 @@ static const char * empty_9x16_xpm[] = {
 "........."};
 
 /* XPM */
-static char * arrow15x15_xpm[] = {
+static const char * arrow15x15_xpm[] = {
 "15 15 24 1",
 " 	c None",
 ".	c #FFFFFF",
@@ -86,7 +86,7 @@ static char * arrow15x15_xpm[] = {
 "..............."};
 
 /* XPM */
-static char * unchecked_xpm[] = {
+static const char * unchecked_xpm[] = {
 "15 15 56 1",
 " 	c None",
 ".	c #FFFFFF",
@@ -161,7 +161,7 @@ static char * unchecked_xpm[] = {
 "..............."};
 
 /* XPM */
-static char * checked_xpm[] = {
+static const char * checked_xpm[] = {
 "15 15 70 1",
 " 	c #FFFFFF",
 ".	c #8E8F8F",
diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index f6c60fd30..b05955f71 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -1104,6 +1104,7 @@ void AudioIO::StartMonitoring(double sampleRate)
                                   (unsigned int)captureChannels,
                                   captureFormat);
    // TODO: Check return value of success.
+   (void)success;
 
    // Now start the PortAudio stream!
    mLastPaError = Pa_StartStream( mPortStreamV19 );
diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp
index 51fb5b96f..0b1779fc8 100644
--- a/src/DeviceManager.cpp
+++ b/src/DeviceManager.cpp
@@ -131,7 +131,9 @@ static void FillHostDeviceInfo(DeviceSourceMap *map, const PaDeviceInfo *info, i
 
 static void AddSourcesFromStream(int deviceIndex, const PaDeviceInfo *info, std::vector<DeviceSourceMap> *maps, PaStream *stream)
 {
+#ifdef USE_PORTMIXER
    int i;
+#endif
    DeviceSourceMap map;
 
    map.sourceIndex  = -1;
diff --git a/src/Sequence.cpp b/src/Sequence.cpp
index cd3248872..dad2b67ac 100644
--- a/src/Sequence.cpp
+++ b/src/Sequence.cpp
@@ -82,6 +82,7 @@ Sequence::Sequence(const Sequence &orig, DirManager *projDirManager)
 
    bool bResult = Paste(0, &orig);
    wxASSERT(bResult); // TO DO: Actually handle this.
+   (void)bResult;
 }
 
 Sequence::~Sequence()
diff --git a/src/TimeDialog.cpp b/src/TimeDialog.cpp
index 75b71b272..647940ebd 100644
--- a/src/TimeDialog.cpp
+++ b/src/TimeDialog.cpp
@@ -35,10 +35,10 @@ TimeDialog::TimeDialog(wxWindow *parent,
                        double time,
                        const wxString &prompt)
 :  wxDialog(parent, wxID_ANY, title),
+   mPrompt(prompt),
    mFormat(format),
    mRate(rate),
    mTime(time),
-   mPrompt(prompt),
    mTimeCtrl(NULL)
 {
    ShuttleGui S(this, eIsCreating);
diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp
index 0af8a6968..63734a2b5 100644
--- a/src/import/ImportFFmpeg.cpp
+++ b/src/import/ImportFFmpeg.cpp
@@ -35,6 +35,7 @@ Licensed under the GNU General Public License v2 or later
 #define DESC _("FFmpeg-compatible files")
 
 //TODO: remove non-audio extensions
+#if defined(USE_FFMPEG)
 static const wxChar *exts[] =
 {   
    wxT("4xm"),
@@ -145,7 +146,6 @@ static const wxChar *exts[] =
    wxT("wv")
 };
 
-#if defined(USE_FFMPEG)
 // all the includes live here by default
 #include "Import.h"
 #include "ImportFFmpeg.h"
diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp
index faa269d16..868a34efc 100644
--- a/src/prefs/LibraryPrefs.cpp
+++ b/src/prefs/LibraryPrefs.cpp
@@ -99,6 +99,9 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
 #ifdef DISABLE_DYNAMIC_LOADING_LAME
          locate_button->Enable(FALSE);
          download_button->Enable(FALSE);
+#else
+        (void)locate_button;
+        (void)download_button;
 #endif // DISABLE_DYNAMIC_LOADING_LAME
       }
       S.EndTwoColumn();