diff options
| author | Florian Jung <flo@windfisch.org> | 2011-08-18 16:45:06 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-08-18 16:45:06 +0000 |
| commit | 0002e57359fb002a70cc9559308619ff611718c9 (patch) | |
| tree | 4d430468df5c1a38895ae9f56a61127240e5ea2b /muse2/muse/driver | |
| parent | 3513555193d44fe99bc30dd3bf04701278a797a1 (diff) | |
| parent | 35c95c10cca9938210818c0b809b1ff4f9c4ad3d (diff) | |
merged with trunk, except:
- not applied the "masteredit saves toolbar state" change, as this
is done by TopWin here in experimental
- fixed some indentation error in scoreedit.cpp
Diffstat (limited to 'muse2/muse/driver')
| -rw-r--r-- | muse2/muse/driver/jack.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/muse2/muse/driver/jack.cpp b/muse2/muse/driver/jack.cpp index 4857ede5..529e8a60 100644 --- a/muse2/muse/driver/jack.cpp +++ b/muse2/muse/driver/jack.cpp @@ -977,7 +977,8 @@ void JackAudioDevice::graphChanged() // p3.3.37 //delete ports; - free(ports); + //free(ports); + jack_free(ports); // p4.0.29 ports = NULL; } @@ -1063,7 +1064,8 @@ void JackAudioDevice::graphChanged() // p3.3.37 //delete ports; - free(ports); + //free(ports); + jack_free(ports); // p4.0.29 ports = NULL; } @@ -1182,7 +1184,8 @@ void JackAudioDevice::graphChanged() // p3.3.55 // Done with ports. Free them. - free(ports); + //free(ports); + jack_free(ports); // p4.0.29 } } } @@ -1279,7 +1282,8 @@ void JackAudioDevice::graphChanged() } // p3.3.55 // Done with ports. Free them. - free(ports); + //free(ports); + jack_free(ports); // p4.0.29 } } } @@ -1662,7 +1666,8 @@ std::list<QString> JackAudioDevice::outputPorts(bool midi, int aliases) // p3.3.37 if(ports) - free(ports); + //free(ports); + jack_free(ports); // p4.0.29 return clientList; } @@ -1734,7 +1739,8 @@ std::list<QString> JackAudioDevice::inputPorts(bool midi, int aliases) // p3.3.37 if(ports) - free(ports); + //free(ports); + jack_free(ports); // p4.0.29 return clientList; } |