summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/audiofilesource.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-07-05 19:47:25 +0000
committerDavid Robillard <d@drobilla.net>2006-07-05 19:47:25 +0000
commit22c20ab6f215c0ab24702a479aa6821c25a7d058 (patch)
tree3f606773d2082fd3f28857e1c1ef876d2e007559 /libs/ardour/ardour/audiofilesource.h
parent5dc4abef7951c1a1b85fb6b9dbb194d73b8c4c2b (diff)
Merged with trunk, and a few trivial GUI updates etc.
git-svn-id: svn://localhost/ardour2/branches/midi@664 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audiofilesource.h')
-rw-r--r--libs/ardour/ardour/audiofilesource.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index ecbac569d5..36251c07ff 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -42,7 +42,7 @@ class AudioFileSource : public AudioSource {
Removable = 0x8,
RemovableIfEmpty = 0x10,
RemoveAtDestroy = 0x20,
- BuildPeaks = 0x40
+ NoPeakFile = 0x40
};
virtual ~AudioFileSource ();
@@ -62,7 +62,7 @@ class AudioFileSource : public AudioSource {
cannot.
*/
- static AudioFileSource* create (string path_plus_channel);
+ static AudioFileSource* create (const string& path_plus_channel, Flag flags = Flag (0));
static AudioFileSource* create (const XMLNode&);
static bool get_soundfile_info (string path, SoundFileInfo& _info, string& error);
@@ -97,7 +97,7 @@ class AudioFileSource : public AudioSource {
static void set_search_path (string);
static void set_header_position_offset (jack_nframes_t offset, bool negative);
- static sigc::signal<void,struct tm*, time_t> HeaderPositionOffsetChanged;
+ static sigc::signal<void> HeaderPositionOffsetChanged;
XMLNode& get_state ();
int set_state (const XMLNode&);
@@ -107,7 +107,7 @@ class AudioFileSource : public AudioSource {
to cause issues.
*/
- void handle_header_position_change (struct tm*, time_t tnow);
+ void handle_header_position_change ();
protected: