Permalink
Browse files

JACK driver: change preferences without unload

  • Loading branch information...
Igevorse committed Jul 4, 2014
1 parent 5cf7dcb commit ef0d9c451d69af94c072ec185b2f90a3e2c02505
Showing with 233 additions and 139 deletions.
  1. +1 −1 mscore/alsa.cpp
  2. +1 −1 mscore/alsa.h
  3. +1 −2 mscore/driver.h
  4. +199 −110 mscore/jackaudio.cpp
  5. +8 −5 mscore/jackaudio.h
  6. +1 −1 mscore/pa.cpp
  7. +1 −1 mscore/pa.h
  8. +21 −12 mscore/preferences.cpp
  9. +0 −5 mscore/seq.cpp
  10. +0 −1 mscore/seq.h
View
@@ -625,7 +625,7 @@ AlsaAudio::~AlsaAudio()
// return false on error
//---------------------------------------------------------
-bool AlsaAudio::init()
+bool AlsaAudio::init(bool hot)
{
alsa = new AlsaDriver(
preferences.alsaDevice,
View
@@ -122,7 +122,7 @@ class AlsaAudio : public Driver {
public:
AlsaAudio(Seq*);
virtual ~AlsaAudio();
- virtual bool init();
+ virtual bool init(bool hot = false);
virtual QList<QString> inputPorts();
virtual bool start();
virtual bool stop();
View
@@ -40,7 +40,7 @@ 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>(); }
@@ -56,7 +56,6 @@ class Driver {
virtual void handleTimeSigTempoChanged() {}
virtual void checkTransportSeek(int, int) {}
virtual int bufferSize() {return 0;}
- virtual void update() {}
};
Oops, something went wrong.

0 comments on commit ef0d9c4

Please sign in to comment.