Browse Source

Apply parts of a warning supression patch by Campbell Barton

mac-2.1.1-vi
RichardAsh1981@gmail.com 9 years ago
parent
commit
991969cab8
  1. 6
      images/Arrow.xpm
  2. 1
      src/AudioIO.cpp
  3. 2
      src/DeviceManager.cpp
  4. 1
      src/Sequence.cpp
  5. 2
      src/TimeDialog.cpp
  6. 2
      src/import/ImportFFmpeg.cpp
  7. 3
      src/prefs/LibraryPrefs.cpp

6
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",

1
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 );

2
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;

1
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()

2
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);

2
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"

3
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();

Loading…
Cancel
Save