[Jack-Devel] [PATCH 4/6] Added Stéphane review fixes : Renamed JackIIODriver.C -> JackIIODriver.cpp Renamed JackIIODriver.H -> JackIIODriver.h Added delete iio_driver when failure is encountered when executing driver_initialize.
---
codeBlocks/jack2.cbp | 5 +-
codeBlocks/jack2.layout | 303 ++++++++++++++++-------
linux/iio/{JackIIODriver.C => JackIIODriver.cpp} | 11 +-
linux/iio/{JackIIODriver.H => JackIIODriver.h} | 0
linux/wscript | 4 +-
5 files changed, 228 insertions(+), 95 deletions(-)
rename linux/iio/{JackIIODriver.C => JackIIODriver.cpp} (97%)
rename linux/iio/{JackIIODriver.H => JackIIODriver.h} (100%)
diff --git a/codeBlocks/jack2.cbp b/codeBlocks/jack2.cbp
index 8d49beb..93a26bb 100644
--- a/codeBlocks/jack2.cbp
+++ b/codeBlocks/jack2.cbp
@@ -477,10 +477,9 @@
<Unit filename="../linux/freebob/JackFreebobDriver.cpp" />
<Unit filename="../linux/freebob/JackFreebobDriver.h" />
<Unit filename="../linux/freebob/freebob_driver.h" />
- <Unit filename="../linux/iio/JackIIODriver.C">
- <Option compilerVar="CC" />
- </Unit>
<Unit filename="../linux/iio/JackIIODriver.H" />
+ <Unit filename="../linux/iio/JackIIODriver.cpp" />
+ <Unit filename="../linux/iio/JackIIODriver.h" />
<Unit filename="../linux/wscript" />
<Unit filename="../macosx/JackAtomic_os.h" />
<Unit filename="../macosx/JackCompilerDeps_os.h" />
diff --git a/codeBlocks/jack2.layout b/codeBlocks/jack2.layout
index ce7dad1..cacfa18 100644
--- a/codeBlocks/jack2.layout
+++ b/codeBlocks/jack2.layout
@@ -1,44 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Debug" />
- <File name="../common/JackAudioDriver.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackDriver.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="3119" topLine="7" />
+ <Cursor1 position="7200" topLine="18" />
</Cursor>
</File>
- <File name="../linux/firewire/JackFFADODriver.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackNetAPI.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="31011" topLine="804" />
+ <Cursor1 position="29070" topLine="800" />
</Cursor>
</File>
- <File name="../common/JackThreadedDriver.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/iio/JackIIODriver.H" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="2427" topLine="63" />
+ <Cursor1 position="2060" topLine="31" />
</Cursor>
</File>
- <File name="../common/JackAudioAdapterInterface.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackMidiDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="5240" topLine="36" />
+ <Cursor1 position="5505" topLine="158" />
</Cursor>
</File>
- <File name="../common/JackArgParser.cpp" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor>
- <Cursor1 position="6777" topLine="174" />
- </Cursor>
- </File>
- <File name="../common/Jackdmp.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/jack/systemdeps.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="4598" topLine="118" />
+ <Cursor1 position="4452" topLine="74" />
</Cursor>
</File>
- <File name="../linux/driver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackControlAPI.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1320" topLine="25" />
+ <Cursor1 position="19941" topLine="707" />
</Cursor>
</File>
- <File name="../common/netjack.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackError.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="2364" topLine="63" />
+ <Cursor1 position="2588" topLine="78" />
</Cursor>
</File>
<File name="../common/shm.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -46,24 +41,24 @@
<Cursor1 position="17836" topLine="711" />
</Cursor>
</File>
- <File name="../dbus/wscript" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackAudioAdapter.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="814" topLine="44" />
+ <Cursor1 position="5048" topLine="151" />
</Cursor>
</File>
- <File name="../common/JackDummyDriver.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackDriverLoader.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="950" topLine="15" />
+ <Cursor1 position="16699" topLine="500" />
</Cursor>
</File>
- <File name="../common/JackLoopbackDriver.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../posix/JackCompilerDeps_os.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="2289" topLine="93" />
+ <Cursor1 position="810" topLine="0" />
</Cursor>
</File>
- <File name="../common/JackArgParser.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/alsa/JackAlsaAdapter.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="836" topLine="0" />
+ <Cursor1 position="13753" topLine="444" />
</Cursor>
</File>
<File name="../waf" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -71,19 +66,44 @@
<Cursor1 position="43" topLine="1" />
</Cursor>
</File>
- <File name="../linux/alsa/JackAlsaAdapter.cpp" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackAudioDriver.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="3500" topLine="23" />
+ <Cursor1 position="1666" topLine="40" />
</Cursor>
</File>
- <File name="../linux/freebob/JackFreebobDriver.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../macosx/coremidi/JackCoreMidiDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="2786" topLine="41" />
+ <Cursor1 position="26911" topLine="828" />
</Cursor>
</File>
- <File name="../linux/alsa/JackAlsaDriver.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackLibSampleRateResampler.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="3102" topLine="82" />
+ </Cursor>
+ </File>
+ <File name="../common/JackAC3Encoder.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="1149" topLine="36" />
+ </Cursor>
+ </File>
+ <File name="../common/JackFreewheelDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="881" topLine="0" />
+ </Cursor>
+ </File>
+ <File name="../common/JackTimedDriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="1408" topLine="27" />
+ </Cursor>
+ </File>
+ <File name="../linux/driver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="2258" topLine="52" />
+ </Cursor>
+ </File>
+ <File name="../common/JackThreadedDriver.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1319" topLine="36" />
+ <Cursor1 position="2009" topLine="63" />
</Cursor>
</File>
<File name="../linux/wscript" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -91,94 +111,124 @@
<Cursor1 position="4882" topLine="94" />
</Cursor>
</File>
- <File name="../linux/JackLinuxTime.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackArgParser.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="93" />
+ <Cursor1 position="836" topLine="0" />
</Cursor>
</File>
- <File name="../solaris/oss/JackBoomerDriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/driver_interface.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="122" />
+ <Cursor1 position="4239" topLine="0" />
</Cursor>
</File>
- <File name="../common/JackInternalClient.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/freebob/JackFreebobDriver.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="877" topLine="13" />
+ <Cursor1 position="2811" topLine="58" />
</Cursor>
</File>
- <File name="../common/JackDriver.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackAudioAdapter.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="0" topLine="34" />
+ </Cursor>
+ </File>
+ <File name="../linux/alsa/JackAlsaAdapter.cpp" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="4947" topLine="142" />
+ </Cursor>
+ </File>
+ <File name="../linux/iio/JackIIODriver.C" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="3010" topLine="65" />
+ </Cursor>
+ </File>
+ <File name="../common/JackLoopbackDriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="108" />
+ <Cursor1 position="791" topLine="0" />
+ </Cursor>
+ </File>
+ <File name="../linux/alsa/JackAlsaDriver.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="1304" topLine="39" />
+ </Cursor>
+ </File>
+ <File name="../common/Jackdmp.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="4598" topLine="118" />
</Cursor>
</File>
<File name="../linux/freebob/JackFreebobDriver.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="929" />
+ <Cursor1 position="37493" topLine="1062" />
</Cursor>
</File>
- <File name="../macosx/coreaudio/JackCoreAudioAdapter.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/firewire/JackFFADODriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="111" />
+ <Cursor1 position="876" topLine="53" />
</Cursor>
</File>
- <File name="../common/JackDriverLoader.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackDummyDriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="18913" topLine="586" />
+ <Cursor1 position="1242" topLine="23" />
</Cursor>
</File>
- <File name="../common/JackAPI.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackTimedDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="15232" topLine="275" />
+ <Cursor1 position="2116" topLine="52" />
</Cursor>
</File>
- <File name="../common/driver_interface.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackAudioAdapterInterface.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="4239" topLine="0" />
+ <Cursor1 position="1667" topLine="40" />
</Cursor>
</File>
- <File name="../macosx/coreaudio/JackCoreAudioDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackAudioPort.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="243" />
+ <Cursor1 position="3281" topLine="78" />
</Cursor>
</File>
- <File name="../common/JackTools.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackLoopbackDriver.cpp" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="3683" topLine="118" />
+ <Cursor1 position="2289" topLine="93" />
</Cursor>
</File>
- <File name="../common/JackAudioAdapterFactory.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/alsa/JackAlsaDriver.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="2313" topLine="68" />
+ <Cursor1 position="3935" topLine="89" />
</Cursor>
</File>
- <File name="../linux/freebob/freebob_driver.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackArgParser.cpp" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="208" />
+ <Cursor1 position="6777" topLine="174" />
</Cursor>
</File>
- <File name="../macosx/coreaudio/JackCoreAudioDriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackDriver.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="179" />
+ <Cursor1 position="6288" topLine="169" />
</Cursor>
</File>
- <File name="../linux/alsa/JackAlsaDriver.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackAC3Encoder.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="24" />
+ <Cursor1 position="2587" topLine="57" />
</Cursor>
</File>
- <File name="../dbus/reserve.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/firewire/ffado_driver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="2044" topLine="36" />
+ <Cursor1 position="5335" topLine="170" />
</Cursor>
</File>
- <File name="../common/JackControlAPI.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackThreadedDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="10607" topLine="359" />
+ <Cursor1 position="2310" topLine="65" />
</Cursor>
</File>
- <File name="../linux/iio/JackIIODriver.C" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../macosx/coreaudio/JackCoreAudioDriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1827" topLine="120" />
+ <Cursor1 position="0" topLine="131" />
+ </Cursor>
+ </File>
+ <File name="../tests/cpu.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="2625" topLine="60" />
</Cursor>
</File>
<File name="../common/JackNetDriver.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -186,59 +236,134 @@
<Cursor1 position="27095" topLine="694" />
</Cursor>
</File>
+ <File name="../common/JackDummyDriver.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="4054" topLine="85" />
+ </Cursor>
+ </File>
+ <File name="../wscript" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="1795" topLine="60" />
+ </Cursor>
+ </File>
<File name="../solaris/oss/JackBoomerDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="5835" topLine="166" />
+ <Cursor1 position="28383" topLine="766" />
</Cursor>
</File>
- <File name="../linux/firewire/JackFFADODriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../dbus/wscript" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="814" topLine="44" />
+ </Cursor>
+ </File>
+ <File name="../linux/alsarawmidi/JackALSARawMidiDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="2" />
+ <Cursor1 position="886" topLine="9" />
</Cursor>
</File>
- <File name="../linux/firewire/ffado_driver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/firewire/JackFFADODriver.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="5335" topLine="170" />
+ <Cursor1 position="36979" topLine="850" />
</Cursor>
</File>
- <File name="../common/JackDriver.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackNetAdapter.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="2693" topLine="64" />
+ <Cursor1 position="13012" topLine="344" />
</Cursor>
</File>
- <File name="../linux/iio/JackIIODriver.H" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../macosx/coreaudio/JackCoreAudioAdapter.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="1872" topLine="11" />
+ <Cursor1 position="0" topLine="111" />
</Cursor>
</File>
- <File name="../common/jack/systemdeps.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../solaris/oss/JackOSSAdapter.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="4452" topLine="74" />
+ <Cursor1 position="19006" topLine="540" />
</Cursor>
</File>
- <File name="../common/JackAudioAdapter.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/freebob/freebob_driver.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="0" topLine="34" />
+ <Cursor1 position="0" topLine="208" />
</Cursor>
</File>
- <File name="../posix/JackCompilerDeps_os.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../linux/alsa/alsa_driver.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="810" topLine="0" />
+ <Cursor1 position="39273" topLine="1550" />
</Cursor>
</File>
- <File name="../wscript" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../dbus/reserve.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="10408" topLine="225" />
+ <Cursor1 position="2044" topLine="36" />
</Cursor>
</File>
- <File name="../common/JackError.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../dbus/controller.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="2588" topLine="78" />
+ <Cursor1 position="13679" topLine="496" />
</Cursor>
</File>
- <File name="../common/JackAudioDriver.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="../common/JackAudioAdapterFactory.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
- <Cursor1 position="4660" topLine="27" />
+ <Cursor1 position="2313" topLine="68" />
+ </Cursor>
+ </File>
+ <File name="../common/JackAudioDriver.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="2552" topLine="64" />
+ </Cursor>
+ </File>
+ <File name="../solaris/oss/JackOSSDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="23371" topLine="632" />
+ </Cursor>
+ </File>
+ <File name="../common/JackAPI.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="851" topLine="5" />
+ </Cursor>
+ </File>
+ <File name="../common/JackEngineControl.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="3800" topLine="80" />
+ </Cursor>
+ </File>
+ <File name="../common/netjack.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="2364" topLine="63" />
+ </Cursor>
+ </File>
+ <File name="../solaris/oss/JackBoomerDriver.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="0" topLine="122" />
+ </Cursor>
+ </File>
+ <File name="../windows/portaudio/JackPortAudioDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="2636" topLine="52" />
+ </Cursor>
+ </File>
+ <File name="../linux/JackLinuxTime.c" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="0" topLine="93" />
+ </Cursor>
+ </File>
+ <File name="../common/JackEngine.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="5459" topLine="150" />
+ </Cursor>
+ </File>
+ <File name="../macosx/coreaudio/JackCoreAudioDriver.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="10708" topLine="300" />
+ </Cursor>
+ </File>
+ <File name="../common/JackInternalClient.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="877" topLine="13" />
+ </Cursor>
+ </File>
+ <File name="../common/JackTools.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor>
+ <Cursor1 position="3683" topLine="118" />
</Cursor>
</File>
</CodeBlocks_layout_file>
diff --git a/linux/iio/JackIIODriver.C b/linux/iio/JackIIODriver.cpp
similarity index 97%
rename from linux/iio/JackIIODriver.C
rename to linux/iio/JackIIODriver.cpp
index 4f93480..127af7b 100644
--- a/linux/iio/JackIIODriver.C
+++ b/linux/iio/JackIIODriver.cpp
@@ -17,7 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "JackIIODriver.H"
+#include "JackIIODriver.h"
#include "driver_interface.h"
#include "JackEngineControl.h"
#include "JackGraphManager.h"
@@ -175,11 +175,13 @@ SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLocke
// interrogate the available iio devices searching for the chip name
if (iio_driver->iio.findDevicesByChipName(chipName)!=NO_ERROR) { // find all devices with a particular chip which are present.
jack_error("\nThe iio driver found no devices by the name %s\n", chipName.c_str());
+ delete iio_driver;
return NULL;
}
if (iio_driver->iio.getDeviceCnt()<1) { // If there are no devices found by that chip name, then indicate.
jack_error("\nThe iio driver found no devices by the name %s\n", chipName.c_str());
+ delete iio_driver;
return NULL;
}
@@ -194,6 +196,7 @@ SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLocke
int ret=iio_driver->iio.getReadArray(periodSize, iio_driver->data); // resize the array to be able to read enough memory
if (ret!=NO_ERROR) {
jack_error("iio::getReadArray couldn't create the data buffer, indicating the problem.");
+ delete iio_driver;
return NULL;
}
if (iio_driver->data.cols()>colCnt) // resize the data columns to match the specified number of columns (channels / channels per device)
@@ -201,6 +204,7 @@ SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLocke
ret=iio_driver->iio.open(periodCount, periodSize); // try to open all IIO devices
if (ret!=NO_ERROR)
+ delete iio_driver;
return NULL;
Jack::JackDriverClientInterface* threaded_driver = new Jack::JackThreadedDriver(iio_driver);
@@ -216,6 +220,11 @@ SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLocke
} else
jack_error("\nHave you run out of memory ? I tried to create Jack's standard threaded driver in memory but failed! The good news is that you had enough memory to create the IIO driver.\n");
+ if (!threaded_driver) { // handle the case that the threaded_driver was not created succ.
+ delete iio_driver;
+ iio_driver=NULL;
+ }
+
return threaded_driver;
}
diff --git a/linux/iio/JackIIODriver.H b/linux/iio/JackIIODriver.h
similarity index 100%
rename from linux/iio/JackIIODriver.H
rename to linux/iio/JackIIODriver.h
diff --git a/linux/wscript b/linux/wscript
index caf286a..3e7f097 100644
--- a/linux/wscript
+++ b/linux/wscript
@@ -19,7 +19,7 @@ def configure(conf):
conf.env['BUILD_DRIVER_IIO'] += conf.is_defined('HAVE_EIGEN3')
conf.check_cfg(package='sox', atleast_version='14.4.0', args='--cflags --libs', mandatory=False)
conf.env['BUILD_DRIVER_IIO'] += conf.is_defined('HAVE_SOX')
-
+
def create_jack_driver_obj(bld, target, sources, uselib = None):
driver = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])
@@ -82,7 +82,7 @@ def build(bld):
'firewire/JackFFADOMidiSendQueue.cpp'
]
- iio_driver_src = ['iio/JackIIODriver.C']
+ iio_driver_src = ['iio/JackIIODriver.cpp']
if bld.env['BUILD_DRIVER_ALSA'] == True:
create_jack_driver_obj(bld, 'alsa', alsa_driver_src, ["ALSA"])
--
1.8.3.2
1392326711.14288_0.ltw:2,a <1392326687-3964-5-git-send-email-flatmax at flatmax dot org>