mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-15 23:59:37 +02:00
Remove unnecessary declarations in include/audacity
This commit is contained in:
parent
67b0f8a869
commit
82802f7781
@ -46,8 +46,6 @@
|
||||
#include "audacity/Types.h"
|
||||
#include <wx/string.h> // member variables
|
||||
|
||||
STRINGS_API const wxString& GetCustomTranslation(const wxString& str1 );
|
||||
|
||||
class ComponentInterfaceSymbol;
|
||||
using VendorSymbol = ComponentInterfaceSymbol;
|
||||
|
||||
|
@ -95,20 +95,4 @@ public:
|
||||
virtual bool RemovePrivateConfig(const RegistryPath & group, const RegistryPath & key) = 0;
|
||||
};
|
||||
|
||||
#if 0
|
||||
/*************************************************************************************//**
|
||||
|
||||
\class ConfigHostInterface
|
||||
|
||||
\brief ConfigHostInterface appears not to be used.
|
||||
|
||||
*******************************************************************************************/
|
||||
class ConfigHostInterface
|
||||
{
|
||||
public:
|
||||
virtual ~ConfigHostInterface() {};
|
||||
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif // __AUDACITY_CONFIGINTERFACE_H__
|
||||
|
@ -247,24 +247,4 @@ public:
|
||||
virtual void ShowOptions() = 0;
|
||||
};
|
||||
|
||||
|
||||
/*************************************************************************************//**
|
||||
|
||||
\class EffectManagerInterface
|
||||
|
||||
\brief UNUSED. EffectManagerInterface provides a single function to find files matching
|
||||
a pattern in a list.
|
||||
|
||||
*******************************************************************************************/
|
||||
class AUDACITY_DLL_API EffectManagerInterface
|
||||
{
|
||||
public:
|
||||
virtual ~EffectManagerInterface() {};
|
||||
|
||||
virtual void FindFilesInPathList(const wxString & pattern,
|
||||
const FilePaths & pathList,
|
||||
FilePaths & files,
|
||||
int searchFlags) = 0;
|
||||
};
|
||||
|
||||
#endif // __AUDACITY_EFFECTINTERFACE_H__
|
||||
|
@ -1,151 +0,0 @@
|
||||
/**********************************************************************
|
||||
|
||||
Audacity: A Digital Audio Editor
|
||||
|
||||
ImporterInterface.h
|
||||
|
||||
Leland Lucius
|
||||
|
||||
Copyright (c) 2014, Audacity Team
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
3. Neither the name of the copyright holder nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
**********************************************************************/
|
||||
|
||||
#ifndef __AUDACITY_IMPORTERINTERFACE_H__
|
||||
#define __AUDACITY_IMPORTERINTERFACE_H__
|
||||
|
||||
#include "Identifier.h"
|
||||
#include "audacity/ConfigInterface.h"
|
||||
#include "audacity/ComponentInterface.h"
|
||||
|
||||
// ============================================================================
|
||||
//
|
||||
// ImporterInterface class
|
||||
//
|
||||
// ============================================================================
|
||||
|
||||
class ImporterHostInterface;
|
||||
class ImporterClientInterface;
|
||||
class ImporterInterface : public ComponentInterface
|
||||
{
|
||||
public:
|
||||
virtual ~ImporterInterface() {};
|
||||
|
||||
// Get unique string ID of this plugin, usually it corresponds
|
||||
// to the underlying library, i.e. "libsndfile", "libflac", "libav"
|
||||
// These MUST NOT change across Audacity versions (but new IDs can
|
||||
// be added).
|
||||
virtual wxString GetPluginStringID() = 0;
|
||||
|
||||
// Get a description of the file type this importer can import.
|
||||
// Examples: "Ogg Vorbis", "MP3", "Uncompressed PCM"
|
||||
virtual TranslatableString GetPluginFormatDescription() = 0;
|
||||
|
||||
// Get a list of extensions this plugin expects to be able to
|
||||
// import. If a filename matches any of these extensions,
|
||||
// this importer will get first dibs on importing it.
|
||||
virtual FileExtensions GetSupportedExtensions() = 0;
|
||||
virtual bool SupportsExtension(const FileExtension & extension) = 0;
|
||||
|
||||
// Create the client that will be used to import a file.
|
||||
virtual ImporterClientInterface *CreateClient() = 0;
|
||||
};
|
||||
|
||||
|
||||
// ============================================================================
|
||||
//
|
||||
// ImporterHostInterface class
|
||||
//
|
||||
// ============================================================================
|
||||
|
||||
class ImporterHostInterface
|
||||
{
|
||||
public:
|
||||
virtual ~ImporterHostInterface() {};
|
||||
|
||||
// Called by the client to add a new stream to the import.
|
||||
virtual bool AddStream(int stream,
|
||||
sampleFormat sampleformat,
|
||||
float sampleRate,
|
||||
int numChannels,
|
||||
ChannelName *channelMap) = 0;
|
||||
|
||||
// Accepts interleaved samples from the client.
|
||||
virtual bool PutSamples(int stream, size_t numSamples, samplePtr inBuffer) = 0;
|
||||
|
||||
// Accepts non-interleaved samples from the client.
|
||||
virtual bool PutSamples(int stream, int channel, size_t numSamples, samplePtr inBuffer) = 0;
|
||||
|
||||
// The client will call this as the import progresses.
|
||||
virtual bool UpdateProgress(float current, float total) = 0;
|
||||
};
|
||||
|
||||
// ============================================================================
|
||||
//
|
||||
// ImporterClientInterface class
|
||||
//
|
||||
// ============================================================================
|
||||
|
||||
class ImporterClientInterface
|
||||
{
|
||||
public:
|
||||
virtual ~ImporterClientInterface() {};
|
||||
|
||||
// Provides a pointer to the associated host for this importer.
|
||||
virtual void SetHost(ImporterHostInterface *host) = 0;
|
||||
|
||||
// Open the given file, returning true if it is a recognized
|
||||
// format, false otherwise. This puts the importer into the open
|
||||
// state.
|
||||
virtual bool Open(const wxString & fileName) = 0;
|
||||
|
||||
// Do any processing necessary to close the file and release resources.
|
||||
// This will be called only if Open() succeeded.
|
||||
virtual void Close() = 0;
|
||||
|
||||
// This is similar to GetImporterDescription, but if possible the
|
||||
// importer will return a more specific description of the
|
||||
// specific file that is open.
|
||||
virtual TranslatableString GetFileDescription() = 0;
|
||||
|
||||
// Return stream descriptions list
|
||||
virtual void GetStreamInfo(wxArrayString & streamInfo) = 0;
|
||||
|
||||
// Set stream "import/don't import" flag
|
||||
virtual void SetStreamUsage(int streamID, bool use) = 0;
|
||||
|
||||
// do the actual import, creating whatever tracks are necessary with
|
||||
// the WaveTrackFactory and calling the progress callback every iteration
|
||||
// through the importing loop
|
||||
virtual bool Import() = 0;
|
||||
};
|
||||
|
||||
#endif // __AUDACITY_IMPORTERINTERFACE_H__
|
@ -45,7 +45,6 @@
|
||||
#include "audacity/ConfigInterface.h"
|
||||
#include "audacity/EffectInterface.h"
|
||||
#include "audacity/ComponentInterface.h"
|
||||
#include "audacity/ImporterInterface.h"
|
||||
|
||||
|
||||
class ModuleInterface;
|
||||
@ -72,7 +71,6 @@ public:
|
||||
|
||||
virtual const PluginID & RegisterPlugin(ModuleInterface *module) = 0;
|
||||
virtual const PluginID & RegisterPlugin(ModuleInterface *provider, EffectDefinitionInterface *effect, int type) = 0;
|
||||
virtual const PluginID & RegisterPlugin(ModuleInterface *provider, ImporterInterface *importer) = 0;
|
||||
|
||||
virtual void FindFilesInPathList(const wxString & pattern,
|
||||
const FilePaths & pathList,
|
||||
|
@ -992,7 +992,6 @@ list( APPEND HEADERS
|
||||
../include/audacity/PluginInterface.h
|
||||
../include/audacity/ComponentInterface.h
|
||||
../include/audacity/EffectAutomationParameters.h
|
||||
../include/audacity/ImporterInterface.h
|
||||
)
|
||||
|
||||
#
|
||||
|
@ -436,18 +436,6 @@ const PluginID & PluginManager::RegisterPlugin(ModuleInterface *provider, Effect
|
||||
return plug.GetID();
|
||||
}
|
||||
|
||||
const PluginID & PluginManager::RegisterPlugin(ModuleInterface *provider, ImporterInterface *importer)
|
||||
{
|
||||
PluginDescriptor & plug = CreatePlugin(GetID(importer), importer, PluginTypeImporter);
|
||||
|
||||
plug.SetProviderID(PluginManager::GetID(provider));
|
||||
|
||||
plug.SetImporterIdentifier(importer->GetPluginStringID());
|
||||
plug.SetImporterExtensions(importer->GetSupportedExtensions());
|
||||
|
||||
return plug.GetID();
|
||||
}
|
||||
|
||||
void PluginManager::FindFilesInPathList(const wxString & pattern,
|
||||
const FilePaths & pathList,
|
||||
FilePaths & files,
|
||||
@ -1579,16 +1567,6 @@ PluginID PluginManager::GetID(EffectDefinitionInterface *effect)
|
||||
effect->GetPath());
|
||||
}
|
||||
|
||||
PluginID PluginManager::GetID(ImporterInterface *importer)
|
||||
{
|
||||
return wxString::Format(wxT("%s_%s_%s_%s_%s"),
|
||||
GetPluginTypeString(PluginTypeImporter),
|
||||
wxEmptyString,
|
||||
importer->GetVendor().Internal(),
|
||||
importer->GetSymbol().Internal(),
|
||||
importer->GetPath());
|
||||
}
|
||||
|
||||
// This string persists in configuration files
|
||||
// So config compatibility will break if it is changed across Audacity versions
|
||||
wxString PluginManager::GetPluginTypeString(PluginType type)
|
||||
|
@ -18,7 +18,6 @@
|
||||
#include <memory>
|
||||
|
||||
#include "audacity/EffectInterface.h"
|
||||
#include "audacity/ImporterInterface.h"
|
||||
#include "audacity/PluginInterface.h"
|
||||
|
||||
class wxArrayString;
|
||||
@ -186,7 +185,6 @@ public:
|
||||
const PluginID & RegisterPlugin(ModuleInterface *module) override;
|
||||
const PluginID & RegisterPlugin(ModuleInterface *provider, ComponentInterface *command);
|
||||
const PluginID & RegisterPlugin(ModuleInterface *provider, EffectDefinitionInterface *effect, int type) override;
|
||||
const PluginID & RegisterPlugin(ModuleInterface *provider, ImporterInterface *importer) override;
|
||||
|
||||
void FindFilesInPathList(const wxString & pattern,
|
||||
const FilePaths & pathList,
|
||||
@ -240,7 +238,6 @@ public:
|
||||
|
||||
static PluginID GetID(ComponentInterface *command);
|
||||
static PluginID GetID(EffectDefinitionInterface *effect);
|
||||
static PluginID GetID(ImporterInterface *importer);
|
||||
|
||||
// This string persists in configuration files
|
||||
// So config compatibility will break if it is changed across Audacity versions
|
||||
|
Loading…
x
Reference in New Issue
Block a user