Changeset 1257
- Timestamp:
- 06/09/08 12:20:15 (3 months ago)
- Files:
-
- patchage/src/JackDriver.cpp (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
patchage/src/JackDriver.cpp
r1191 r1257 149 149 if (ref.type == PatchageEvent::PortRef::JACK_ID) 150 150 jack_port = jack_port_by_id(_client, ref.id.jack_id); 151 151 152 152 string module_name, port_name; 153 153 port_names(ref, module_name, port_name); 154 155 ModuleType type = InputOutput; 156 if (_app->state_manager()->get_module_split(module_name, 157 (jack_port_flags(jack_port) & JackPortIsTerminal))) { 158 if (jack_port_flags(jack_port) & JackPortIsInput) { 159 type = Input; 160 } else { 161 type = Output; 162 } 163 } 164 154 165 boost::shared_ptr<PatchageModule> parent 155 = _app->canvas()->find_module(module_name, InputOutput);166 = _app->canvas()->find_module(module_name, type); 156 167 157 168 if (!parent) { 158 169 parent = boost::shared_ptr<PatchageModule>( 159 new PatchageModule(patchage, module_name, InputOutput));170 new PatchageModule(patchage, module_name, type)); 160 171 parent->load_location(); 161 172 patchage->canvas()->add_item(parent); … … 234 245 ports = jack_get_ports(_client, NULL, NULL, 0); // get all existing ports 235 246 247 if (!ports) { 248 _shutdown_mutex.unlock(); 249 return; 250 } 251 236 252 string client1_name; 237 253 string port1_name; … … 240 256 241 257 // Add all ports 242 if (ports)243 258 for (int i=0; ports[i]; ++i) { 244 259 port = jack_port_by_name(_client, ports[i]); … … 286 301 287 302 // Add all connections 288 if (ports) {289 290 303 for (int i=0; ports[i]; ++i) { 291 304 … … 332 345 } 333 346 334 }335 336 347 _shutdown_mutex.unlock(); 337 348 … … 570 581 } 571 582 } 583 572 584 573 585 float … … 593 605 } 594 606 607 595 608 void 596 609 JackDriver::reset_max_dsp_load() 597 610 { 598 jack_reset_max_delayed_usecs(_client); 599 } 611 jack_reset_max_delayed_usecs(_client); 612 } 613
