ardour/livetrax
13
0
Fork 0
Code

Remove unused CrossfadeComparePtr. Make Crossfade operator== private.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8524 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-01-17 23:23:15 +00:00
parent f1fd7f6fa4
commit bab0f9c969
3 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/ardour/ardour/crossfade.h
View File

@ -30,7 +30,6 @@
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/crossfade_compare.h"
#include "evoral/Curve.hpp" #include "evoral/Curve.hpp"
namespace ARDOUR { namespace ARDOUR {
@ -40,6 +39,12 @@ namespace ARDOUR {
extern PBD::PropertyDescriptor<bool> follow_overlap; extern PBD::PropertyDescriptor<bool> follow_overlap;
} }
enum AnchorPoint {
StartOfIn,
EndOfIn,
EndOfOut
};
class Playlist; class Playlist;
class Crossfade : public ARDOUR::AudioRegion class Crossfade : public ARDOUR::AudioRegion
@ -77,8 +82,6 @@ class Crossfade : public ARDOUR::AudioRegion
static void make_property_quarks (); static void make_property_quarks ();
bool operator== (const ARDOUR::Crossfade&);
XMLNode& get_state (void); XMLNode& get_state (void);
int set_state (const XMLNode&, int version); int set_state (const XMLNode&, int version);
@ -171,6 +174,8 @@ class Crossfade : public ARDOUR::AudioRegion
int compute (boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>, CrossfadeModel); int compute (boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>, CrossfadeModel);
bool update (); bool update ();
bool operator== (const ARDOUR::Crossfade&);
protected: protected:
framecnt_t read_raw_internal (Sample*, framepos_t, framecnt_t, int) const; framecnt_t read_raw_internal (Sample*, framepos_t, framecnt_t, int) const;
}; };

42
libs/ardour/ardour/crossfade_compare.h
View File

@ -1,42 +0,0 @@
/*
Copyright (C) 2003 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ardour_crossfade_compare_h__
#define __ardour_crossfade_compare_h__
/* this exists so that playlist.h doesn't have to include crossfade.h
*/
namespace ARDOUR {
class Crossfade;
struct CrossfadeComparePtr {
bool operator() (const Crossfade *a, const Crossfade *b) const;
};
enum AnchorPoint {
StartOfIn,
EndOfIn,
EndOfOut
};
}
#endif /* __ardour_crossfade_compare_h__ */

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

@ -42,7 +42,6 @@
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "ardour/session_object.h" #include "ardour/session_object.h"
#include "ardour/crossfade_compare.h"
#include "ardour/data_type.h" #include "ardour/data_type.h"
namespace ARDOUR { namespace ARDOUR {