Browse Source

"Fix" auto_ptr issues on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4263 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 14 years ago
parent
commit
c9343ff290
3 changed files with 9 additions and 3 deletions
  1. +0
    -1
      windows/winmme/JackWinMMEDriver.cpp
  2. +4
    -1
      windows/winmme/JackWinMMEInputPort.cpp
  3. +5
    -1
      windows/winmme/JackWinMMEOutputPort.cpp

+ 0
- 1
windows/winmme/JackWinMMEDriver.cpp View File

@@ -186,7 +186,6 @@ JackWinMMEDriver::Open(bool capturing, bool playing, int in_channels,
jack_info("JackWinMMEDriver::Open - input_count %d", input_count); jack_info("JackWinMMEDriver::Open - input_count %d", input_count);
jack_info("JackWinMMEDriver::Open - output_count %d", output_count); jack_info("JackWinMMEDriver::Open - output_count %d", output_count);



if (! (input_count || output_count)) { if (! (input_count || output_count)) {
jack_error("JackWinMMEDriver::Open - no WinMME inputs or outputs " jack_error("JackWinMMEDriver::Open - no WinMME inputs or outputs "
"allocated."); "allocated.");


+ 4
- 1
windows/winmme/JackWinMMEInputPort.cpp View File

@@ -111,7 +111,10 @@ JackWinMMEInputPort::JackWinMMEInputPort(const char *alias_name,
WriteInError("JackWinMMEInputPort [constructor]", "midiInClose", result); WriteInError("JackWinMMEInputPort [constructor]", "midiInClose", result);
} }
delete_sysex_buffer: delete_sysex_buffer:
delete[] sysex_buffer;
delete[] sysex_buffer;
// auto_ptr causing crash so explicitly deleting here...
delete thread_queue;
delete write_queue;
throw std::runtime_error(error_message); throw std::runtime_error(error_message);
} }




+ 5
- 1
windows/winmme/JackWinMMEOutputPort.cpp View File

@@ -99,7 +99,11 @@ JackWinMMEOutputPort::JackWinMMEOutputPort(const char *alias_name,
WriteOutError("JackWinMMEOutputPort [constructor]", "midiOutClose", WriteOutError("JackWinMMEOutputPort [constructor]", "midiOutClose",
result); result);
} }
raise_exception:
raise_exception:
// auto_ptr causing crash so explicitly deleting here...
delete read_queue;
delete thread_queue;
delete thread;
throw std::runtime_error(error_message); throw std::runtime_error(error_message);
} }




Loading…
Cancel
Save