allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

require new JACK API; fix inheritance bug in AudioRegion::verify_*()

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/midi@1789 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2007-05-07 03:26:43 +00:00
parent ebe4fc9d88
commit 5183f9b772
6 changed files with 4 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@@ -413,7 +413,7 @@ deps = \
'samplerate' : '0.1.0',
'raptor' : '1.4.2',
'lrdf' : '0.4.0',
'jack' : '0.102.29',
'jack' : '0.105.0',
'libgnomecanvas-2.0' : '2.0'
}

6
libs/ardour/audioregion.cc
View File

@@ -243,7 +243,7 @@ AudioRegion::verify_start_and_length (nframes_t new_start, nframes_t new_length)
if (afs && afs->destructive()) {
return true;
} else {
return verify_start_and_length(new_start, new_length);
return Region::verify_start_and_length(new_start, new_length);
}
}
@@ -255,7 +255,7 @@ AudioRegion::verify_start (nframes_t pos)
if (afs && afs->destructive()) {
return true;
} else {
return verify_start(pos);
return Region::verify_start(pos);
}
}
@@ -267,7 +267,7 @@ AudioRegion::verify_start_mutable (nframes_t& new_start)
if (afs && afs->destructive()) {
return true;
} else {
return verify_start_mutable(new_start);
return Region::verify_start_mutable(new_start);
}
}

1
libs/ardour/midi_port.cc
View File

@@ -21,7 +21,6 @@
#include <ardour/midi_port.h>
#include <ardour/data_type.h>
#include <midi++/jackcompat.h>
using namespace ARDOUR;
using namespace std;

5
libs/ardour/playlist.cc
View File

@@ -1460,12 +1460,7 @@ Playlist::state (bool full_state)
if (full_state) {
RegionLock rlock (this, false);
cerr << _name << " getting region state for " << regions.size() << endl;
for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
cerr << "\t" << " now at " << (*i) << endl;
cerr << "\t\t" << (*i)->name() << endl;
node->add_child_nocopy ((*i)->get_state());
}
}

1
libs/midi++2/jack_midiport.cc
View File

@@ -24,7 +24,6 @@
#include <midi++/types.h>
#include <midi++/jack.h>
#include <midi++/port_request.h>
#include <midi++/jackcompat.h>
using namespace std;
using namespace MIDI;

74
libs/midi++2/midi++/jackcompat.h
View File

@@ -1,74 +0,0 @@
/* JACK MIDI API compatibility hacks.
* Copyright (C) 2007 Nedko Arnaudov <nedko@arnaudov.name>
*
* 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; version 2 of the License
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef JACK_COMPAT_H
#define JACK_COMPAT_H
//#define JACK_MIDI_NEEDS_NFRAMES
#if defined(JACK_MIDI_NEEDS_NFRAMES)
static jack_nframes_t
jack_midi_get_event_count_compat(
void * port_buffer)
{
#if defined(HAVE_OLD_JACK_MIDI)
return jack_midi_port_get_info(port_buffer, 0)->event_count;
#else
return jack_midi_get_event_count(port_buffer, 0);
#endif
}
#define jack_midi_get_event_count jack_midi_get_event_count_compat
static int
jack_midi_event_get_compat(
jack_midi_event_t * event,
void * port_buffer,
jack_nframes_t event_index)
{
return jack_midi_event_get(event, port_buffer, event_index, 0);
}
static int
jack_midi_event_write_compat(void *port_buffer,
jack_nframes_t time,
const jack_midi_data_t *data,
size_t data_size)
{
return jack_midi_event_write (port_buffer, time, data, data_size, 0);
}
static void
jack_midi_clear_buffer_compat(void* buf)
{
jack_midi_clear_buffer (buf, 0);
}
#define jack_midi_event_get jack_midi_event_get_compat
#define jack_midi_event_write jack_midi_event_write_compat
#define jack_midi_clear_buffer jack_midi_clear_buffer_compat
#else
#if defined(HAVE_OLD_JACK_MIDI)
#error "Old (0.102.20) JACK MIDI API needs nframes (autotools probably gone mad)"
#endif
#endif /* #if defined(JACK_MIDI_NEEDS_NFRAMES) */
#endif /* JACK_COMPAT_H */