ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove cruft

This commit is contained in:
Robin Gareus 2014-06-30 21:33:43 +02:00
parent 0ec4784c2b
commit d790881a84
4 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/session_option_editor.cc
View File

@ -132,18 +132,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
/* FADES */
ComboOption<CrossfadeChoice>* cfc = new ComboOption<CrossfadeChoice> (
"xfade-choice",
_("Default crossfade type"),
sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfade_choice),
sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfade_choice)
);
cfc->add (ConstantPowerMinus3dB, _("Constant power (-3dB) crossfade"));
cfc->add (ConstantPowerMinus6dB, _("Linear (-6dB) crossfade"));
add_option (_("Fades"), cfc);
add_option (_("Fades"), new SpinOption<float> (
_("destructive-xfade-seconds"),
_("Destructive crossfade length"),

1
libs/ardour/ardour/session_configuration_vars.h
View File

@ -25,7 +25,6 @@
the value of the variable.
*****************************************************/
CONFIG_VARIABLE (CrossfadeChoice, xfade_choice, "xfade-choice", ConstantPowerMinus3dB)
CONFIG_VARIABLE (uint32_t, destructive_xfade_msecs, "destructive-xfade-msecs", 2)
CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true)
CONFIG_VARIABLE (bool, show_region_fades, "show-region-fades", true)

15
libs/ardour/ardour/types.h
View File

@ -419,17 +419,6 @@ namespace ARDOUR {
MixerOrdered
};
enum CrossfadeModel {
FullCrossfade,
ShortCrossfade
};
enum CrossfadeChoice {
RegionFades,
ConstantPowerMinus3dB,
ConstantPowerMinus6dB,
};
enum ListenPosition {
AfterFaderListen,
PreFaderListen
@ -622,8 +611,6 @@ std::istream& operator>>(std::istream& o, ARDOUR::AFLPosition& sf);
std::istream& operator>>(std::istream& o, ARDOUR::RemoteModel& sf);
std::istream& operator>>(std::istream& o, ARDOUR::ListenPosition& sf);
std::istream& operator>>(std::istream& o, ARDOUR::InsertMergePolicy& sf);
std::istream& operator>>(std::istream& o, ARDOUR::CrossfadeModel& sf);
std::istream& operator>>(std::istream& o, ARDOUR::CrossfadeChoice& sf);
std::istream& operator>>(std::istream& o, ARDOUR::SyncSource& sf);
std::istream& operator>>(std::istream& o, ARDOUR::ShuttleBehaviour& sf);
std::istream& operator>>(std::istream& o, ARDOUR::ShuttleUnits& sf);
@ -646,8 +633,6 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::AFLPosition& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::RemoteModel& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::ListenPosition& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::InsertMergePolicy& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::CrossfadeModel& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::CrossfadeChoice& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::SyncSource& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::ShuttleBehaviour& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::ShuttleUnits& sf);

39
libs/ardour/enums.cc
View File

@ -74,8 +74,6 @@ setup_enum_writer ()
AFLPosition _AFLPosition;
RemoteModel _RemoteModel;
DenormalModel _DenormalModel;
CrossfadeModel _CrossfadeModel;
CrossfadeChoice _CrossfadeChoice;
InsertMergePolicy _InsertMergePolicy;
ListenPosition _ListenPosition;
SampleFormat _SampleFormat;
@ -289,15 +287,6 @@ setup_enum_writer ()
*/
enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered");
REGISTER_ENUM (FullCrossfade);
REGISTER_ENUM (ShortCrossfade);
REGISTER (_CrossfadeModel);
REGISTER_ENUM (RegionFades);
REGISTER_ENUM (ConstantPowerMinus3dB);
REGISTER_ENUM (ConstantPowerMinus6dB);
REGISTER (_CrossfadeChoice);
REGISTER_ENUM (InsertMergeReject);
REGISTER_ENUM (InsertMergeRelax);
REGISTER_ENUM (InsertMergeReplace);
@ -794,34 +783,6 @@ std::ostream& operator<<(std::ostream& o, const InsertMergePolicy& var)
return o << s;
}
std::istream& operator>>(std::istream& o, CrossfadeModel& var)
{
std::string s;
o >> s;
var = (CrossfadeModel) string_2_enum (s, var);
return o;
}
std::ostream& operator<<(std::ostream& o, const CrossfadeModel& var)
{
std::string s = enum_2_string (var);
return o << s;
}
std::istream& operator>>(std::istream& o, CrossfadeChoice& var)
{
std::string s;
o >> s;
var = (CrossfadeChoice) string_2_enum (s, var);
return o;
}
std::ostream& operator<<(std::ostream& o, const CrossfadeChoice& var)
{
std::string s = enum_2_string (var);
return o << s;
}
std::istream& operator>>(std::istream& o, SyncSource& var)
{
std::string s;