projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix code style
[ardour.git]
/
libs
/
ardour
/
ardour
/
export_format_base.h
diff --git
a/libs/ardour/ardour/export_format_base.h
b/libs/ardour/ardour/export_format_base.h
index dceb943e621c5705eacb733cf07b6ad41365617c..ee2739eee1f576ab8c33115e9eb970596691a619 100644
(file)
--- a/
libs/ardour/ardour/export_format_base.h
+++ b/
libs/ardour/ardour/export_format_base.h
@@
-22,21
+22,23
@@
#define __ardour_export_format_base_h__
#include <set>
#define __ardour_export_format_base_h__
#include <set>
-#include <algorithm>
+#include <string>
+
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <glibmm/ustring.h>
#include <sndfile.h>
#include <samplerate.h>
#include <sndfile.h>
#include <samplerate.h>
-#include "ardour/gdither_types.h"
-#include "ardour/ardour.h"
+
+#include "pbd/signals.h"
+#include "ardour/libardour_visibility.h"
+#include "ardour/types.h"
+
+#include "audiographer/general/sample_format_converter.h"
namespace ARDOUR
{
namespace ARDOUR
{
-class HasSampleFormat;
-
-class ExportFormatBase {
+class LIBARDOUR_API ExportFormatBase {
public:
enum Type {
public:
enum Type {
@@
-48,6
+50,7
@@
class ExportFormatBase {
F_None = 0,
F_WAV = SF_FORMAT_WAV,
F_W64 = SF_FORMAT_W64,
F_None = 0,
F_WAV = SF_FORMAT_WAV,
F_W64 = SF_FORMAT_W64,
+ F_CAF = SF_FORMAT_CAF,
F_AIFF = SF_FORMAT_AIFF,
F_AU = SF_FORMAT_AU,
F_IRCAM = SF_FORMAT_IRCAM,
F_AIFF = SF_FORMAT_AIFF,
F_AU = SF_FORMAT_AU,
F_IRCAM = SF_FORMAT_IRCAM,
@@
-76,10
+79,10
@@
class ExportFormatBase {
};
enum DitherType {
};
enum DitherType {
- D_None =
GDither
None,
- D_Rect =
GDither
Rect,
- D_Tri =
GDither
Tri,
- D_Shaped =
GDither
Shaped
+ D_None =
AudioGrapher::D_
None,
+ D_Rect =
AudioGrapher::D_
Rect,
+ D_Tri =
AudioGrapher::D_
Tri,
+ D_Shaped =
AudioGrapher::D_
Shaped
};
enum Quality {
};
enum Quality {
@@
-92,11
+95,14
@@
class ExportFormatBase {
enum SampleRate {
SR_None = 0,
enum SampleRate {
SR_None = 0,
- SR_22_05 = 220500,
+ SR_Session = 1,
+ SR_8 = 8000,
+ SR_22_05 = 22050,
SR_44_1 = 44100,
SR_48 = 48000,
SR_88_2 = 88200,
SR_96 = 96000,
SR_44_1 = 44100,
SR_48 = 48000,
SR_88_2 = 88200,
SR_96 = 96000,
+ SR_176_4 = 176400,
SR_192 = 192000
};
SR_192 = 192000
};
@@
-109,7
+115,7
@@
class ExportFormatBase {
};
/// Class for managing selection and compatibility states
};
/// Class for managing selection and compatibility states
- class SelectableCompatible {
+ class
LIBARDOUR_API
SelectableCompatible {
public:
SelectableCompatible ()
: _selected (false), _compatible (true) { }
public:
SelectableCompatible ()
: _selected (false), _compatible (true) { }
@@
-120,19
+126,19
@@
class ExportFormatBase {
bool selected () const { return _selected; }
bool compatible () const { return _compatible; }
bool selected () const { return _selected; }
bool compatible () const { return _compatible; }
-
Glib::u
string name () const { return _name; }
+
std::
string name () const { return _name; }
void set_selected (bool value);
void set_compatible (bool value);
protected:
void set_selected (bool value);
void set_compatible (bool value);
protected:
- void set_name (
Glib::u
string name) { _name = name; }
+ void set_name (
std::
string name) { _name = name; }
private:
bool _selected;
bool _compatible;
private:
bool _selected;
bool _compatible;
-
Glib::u
string _name;
+
std::
string _name;
};
public:
};
public:
@@
-143,7
+149,6
@@
class ExportFormatBase {
virtual ~ExportFormatBase ();
boost::shared_ptr<ExportFormatBase> get_intersection (ExportFormatBase const & other) const;
virtual ~ExportFormatBase ();
boost::shared_ptr<ExportFormatBase> get_intersection (ExportFormatBase const & other) const;
- boost::shared_ptr<ExportFormatBase> get_difference (ExportFormatBase const & other) const;
boost::shared_ptr<ExportFormatBase> get_union (ExportFormatBase const & other) const;
bool endiannesses_empty () const { return endiannesses.empty (); }
boost::shared_ptr<ExportFormatBase> get_union (ExportFormatBase const & other) const;
bool endiannesses_empty () const { return endiannesses.empty (); }
@@
-158,8
+163,10
@@
class ExportFormatBase {
bool has_format (FormatId format) const { return format_ids.find (format) != format_ids.end(); }
bool has_quality (Quality quality) const { return qualities.find (quality) != qualities.end(); }
bool has_format (FormatId format) const { return format_ids.find (format) != format_ids.end(); }
bool has_quality (Quality quality) const { return qualities.find (quality) != qualities.end(); }
- void set_extension (Glib::ustring const & extension) { _extension = extension; }
- Glib::ustring const & extension () const { return _extension; }
+ void set_extension (std::string const & extension) { _extension = extension; }
+ std::string const & extension () const { return _extension; }
+
+ static SampleRate nearest_sample_rate (samplecnt_t sample_rate);
protected:
protected:
@@
-180,11
+187,10
@@
class ExportFormatBase {
private:
private:
-
Glib::u
string _extension;
+
std::
string _extension;
enum SetOperation {
SetUnion,
enum SetOperation {
SetUnion,
- SetDifference,
SetIntersection
};
SetIntersection
};