Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jack transport: new features added #1035

Merged
merged 6 commits into from
Jul 24, 2014
Merged

Jack transport: new features added #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c4d8ea
JACK Transport reposition
Igevorse Jun 18, 2014
fa509a8
JACK Timebase slave: sync to JACK tempo
Igevorse Jul 2, 2014
5cf7dcb
Changed Preferences->I/O ui, added 'Use JACK Transport' and 'Timebase…
Igevorse Jul 3, 2014
ef0d9c4
JACK driver: change preferences without unload
Igevorse Jul 4, 2014
701d86d
JACK restoring audio connections
Igevorse Jul 5, 2014
8c946f7
Bug fixes
Igevorse Jul 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 1 addition & 35 deletions mscore/alsa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ AlsaAudio::~AlsaAudio()
// return false on error
//---------------------------------------------------------

bool AlsaAudio::init()
bool AlsaAudio::init(bool hot)
{
alsa = new AlsaDriver(
preferences.alsaDevice,
Expand Down Expand Up @@ -729,40 +729,6 @@ bool AlsaAudio::stop()
return true;
}

//---------------------------------------------------------
// registerPort
//---------------------------------------------------------

void AlsaAudio::registerPort(const QString&, bool, bool)
{
}

//---------------------------------------------------------
// unregisterPort
//---------------------------------------------------------

void AlsaAudio::unregisterPort(int)
{
}

//---------------------------------------------------------
// inputPorts
//---------------------------------------------------------

QList<QString> AlsaAudio::inputPorts()
{
QList<QString> l;
return l;
}

//---------------------------------------------------------
// disconnect
//---------------------------------------------------------

void AlsaAudio::disconnect(void* /*src*/, void* /*dst*/)
{
}

//---------------------------------------------------------
// startTransport
//---------------------------------------------------------
Expand Down
8 changes: 1 addition & 7 deletions mscore/alsa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,9 @@ class AlsaAudio : public Driver {
public:
AlsaAudio(Seq*);
virtual ~AlsaAudio();
virtual bool init();
virtual QList<QString> inputPorts();
virtual bool init(bool hot = false);
virtual bool start();
virtual bool stop();
void connect(void*, void*) {}
void disconnect(void* src, void* dst);
float* getLBuffer(long n);
float* getRBuffer(long n);
virtual bool isRealtime() const { return false; }
Expand All @@ -139,9 +136,6 @@ class AlsaAudio : public Driver {
void write(int n, void* l);

virtual void midiRead();

virtual void registerPort(const QString& name, bool input, bool midi);
virtual void unregisterPort(int);
};

}
Expand Down
8 changes: 4 additions & 4 deletions mscore/driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ class Driver {
public:
Driver(Seq* s) { seq = s; }
virtual ~Driver() {}
virtual bool init() = 0;
virtual bool init(bool hot = false) = 0;
virtual bool start() = 0;
virtual bool stop() = 0;
virtual QList<QString> inputPorts() { return QList<QString>(); }
virtual void stopTransport() = 0;
virtual void startTransport() = 0;
virtual Transport getState() = 0;
virtual void seekTransport(int) {}
virtual int sampleRate() const = 0;
virtual void registerPort(const QString& /*name*/, bool /*input*/, bool /*midi*/) {}
virtual void unregisterPort(int) {}
virtual void putEvent(const NPlayEvent&, unsigned /*framePos*/) {}
virtual void midiRead() {}
virtual void handleTimeSigTempoChanged() {}
virtual void checkTransportSeek(int, int, bool) {}
virtual int bufferSize() {return 0;}
};


Expand Down
Loading