mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-16 16:10:06 +02:00
Include Audacity.h in all files that test config USE_ macros...
... except Experimental.h, but see preceding commit. This is especially important in the header files. Be sure there are no quiet changes of meaning when a header file is included in a different context, not having seen Audacity.h. Rather include Audacity.h even if redundantly. Also, in some header files, move more inside the include-guard #ifdef-#endif pair.
This commit is contained in:
parent
7cd6664f7b
commit
adcb93512c
@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
|
#include "Audacity.h" // for USE_* macros
|
||||||
#include "Experimental.h"
|
#include "Experimental.h"
|
||||||
|
|
||||||
#ifndef __AUDACITY_MIXER_BOARD__
|
#ifndef __AUDACITY_MIXER_BOARD__
|
||||||
|
@ -21,6 +21,8 @@ and TimeTrack.
|
|||||||
|
|
||||||
*//*******************************************************************/
|
*//*******************************************************************/
|
||||||
|
|
||||||
|
#include "Audacity.h" // for USE_* macros
|
||||||
|
|
||||||
#include "Track.h"
|
#include "Track.h"
|
||||||
|
|
||||||
#include "Experimental.h"
|
#include "Experimental.h"
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#ifndef __AUDACITY_TRACKARTIST__
|
#ifndef __AUDACITY_TRACKARTIST__
|
||||||
#define __AUDACITY_TRACKARTIST__
|
#define __AUDACITY_TRACKARTIST__
|
||||||
|
|
||||||
|
#include "Audacity.h" // for USE_* macros
|
||||||
#include "Experimental.h"
|
#include "Experimental.h"
|
||||||
|
|
||||||
#include "MemoryX.h"
|
#include "MemoryX.h"
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#ifndef __AUDACITY_TRACK_PANEL__
|
#ifndef __AUDACITY_TRACK_PANEL__
|
||||||
#define __AUDACITY_TRACK_PANEL__
|
#define __AUDACITY_TRACK_PANEL__
|
||||||
|
|
||||||
|
#include "Audacity.h" // for USE_* macros
|
||||||
#include "Experimental.h"
|
#include "Experimental.h"
|
||||||
|
|
||||||
#include "MemoryX.h"
|
#include "MemoryX.h"
|
||||||
|
@ -15,6 +15,7 @@ the pitch without changing the tempo.
|
|||||||
|
|
||||||
*//*******************************************************************/
|
*//*******************************************************************/
|
||||||
|
|
||||||
|
#include "../Audacity.h" // for USE_* macros
|
||||||
#if USE_SOUNDTOUCH
|
#if USE_SOUNDTOUCH
|
||||||
|
|
||||||
#ifndef __AUDACITY_EFFECT_CHANGEPITCH__
|
#ifndef __AUDACITY_EFFECT_CHANGEPITCH__
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
|
#include "Audacity.h" // for USE_* macros
|
||||||
#if USE_SOUNDTOUCH
|
#if USE_SOUNDTOUCH
|
||||||
|
|
||||||
#ifndef __AUDACITY_EFFECT_CHANGETEMPO__
|
#ifndef __AUDACITY_EFFECT_CHANGETEMPO__
|
||||||
|
@ -11,11 +11,13 @@
|
|||||||
|
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
#if USE_SBSMS
|
|
||||||
|
|
||||||
#ifndef __AUDACITY_EFFECT_SBSMS__
|
#ifndef __AUDACITY_EFFECT_SBSMS__
|
||||||
#define __AUDACITY_EFFECT_SBSMS__
|
#define __AUDACITY_EFFECT_SBSMS__
|
||||||
|
|
||||||
|
#include "../Audacity.h" // for USE_* macros
|
||||||
|
|
||||||
|
#if USE_SBSMS
|
||||||
|
|
||||||
#include "Effect.h"
|
#include "Effect.h"
|
||||||
#include "../../../lib-src/header-substitutes/sbsms.h"
|
#include "../../../lib-src/header-substitutes/sbsms.h"
|
||||||
|
|
||||||
|
@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
#include "../Audacity.h"
|
|
||||||
|
|
||||||
#if USE_SBSMS
|
|
||||||
|
|
||||||
#ifndef __AUDACITY_EFFECT_TIMESCALE__
|
#ifndef __AUDACITY_EFFECT_TIMESCALE__
|
||||||
#define __AUDACITY_EFFECT_TIMESCALE__
|
#define __AUDACITY_EFFECT_TIMESCALE__
|
||||||
|
|
||||||
|
#include "../Audacity.h" // for USE_* macros
|
||||||
|
|
||||||
|
#if USE_SBSMS
|
||||||
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
#include <wx/slider.h>
|
#include <wx/slider.h>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
|
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
|
#include "../../Audacity.h" // for USE_* macros
|
||||||
|
|
||||||
#if USE_VST
|
#if USE_VST
|
||||||
|
|
||||||
#include <wx/wx.h>
|
#include <wx/wx.h>
|
||||||
|
@ -11,9 +11,9 @@ LRN
|
|||||||
#if !defined(__EXPORT_FFMPEG_DIALOGS_H__)
|
#if !defined(__EXPORT_FFMPEG_DIALOGS_H__)
|
||||||
#define __EXPORT_FFMPEG_DIALOGS_H__
|
#define __EXPORT_FFMPEG_DIALOGS_H__
|
||||||
|
|
||||||
#if defined(USE_FFMPEG)
|
#include "../Audacity.h" // keep ffmpeg before wx because they interact // for USE_* macros
|
||||||
|
|
||||||
#include "../Audacity.h" // keep ffmpeg before wx because they interact
|
#if defined(USE_FFMPEG)
|
||||||
|
|
||||||
#include "../FFmpeg.h" // and Audacity.h before FFmpeg for config*.h
|
#include "../FFmpeg.h" // and Audacity.h before FFmpeg for config*.h
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#include "../Audacity.h" // for USE_* macros
|
||||||
#include "../AdornedRulerPanel.h"
|
#include "../AdornedRulerPanel.h"
|
||||||
#include "../AudacityApp.h" // for EVT_CLIPBOARD_CHANGE
|
#include "../AudacityApp.h" // for EVT_CLIPBOARD_CHANGE
|
||||||
#include "../LabelTrack.h"
|
#include "../LabelTrack.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user