summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/audioregion.h1
-rw-r--r--libs/ardour/ardour/types.h6
2 files changed, 2 insertions, 5 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 013629637d..c03f32cb63 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -180,7 +180,6 @@ class AudioRegion : public Region
private:
friend class RegionFactory;
- friend class Crossfade;
AudioRegion (boost::shared_ptr<AudioSource>);
AudioRegion (const SourceList &);
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 127c840840..6ac9ebfe70 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -557,10 +557,8 @@ namespace ARDOUR {
FadeLinear,
FadeFast,
FadeSlow,
- FadeLogA,
- FadeLogB,
- FadeConstantPowerMinus3dB,
- FadeConstantPowerMinus6dB,
+ FadeConstantPower,
+ FadeSymmetric,
};
} // namespace ARDOUR