Browse Source

Compiles again on Windows.

tags/v1.9.11-RC1
Stephane Letz 10 years ago
parent
commit
b7354b396c
7 changed files with 9 additions and 47 deletions
  1. +1
    -1
      windows/JackMMCSS.cpp
  2. BIN
      windows/Setup/src/32bits/JackRouter.dll
  3. BIN
      windows/Setup/src/64bits/JackRouter.dll
  4. BIN
      windows/Setup/src/gpl_installer.rtf
  5. +0
    -38
      windows/jack_midi_dump.cbp
  6. +3
    -3
      windows/libjacknet.cbp
  7. +5
    -5
      windows/portaudio/JackPortAudioDevices.cpp

+ 1
- 1
windows/JackMMCSS.cpp View File

@@ -57,7 +57,7 @@ int JackMMCSS::MMCSSAcquireRealTime(jack_native_thread_t thread, int priority)
HANDLE task = ffMMCSSFun1("Pro Audio", &dummy);
if (task == NULL) {
jack_error("AvSetMmThreadCharacteristics error : %d", GetLastError());
} else if (ffMMCSSFun2(task, priority - BASE_REALTIME_PRIORITY)) {
} else if (ffMMCSSFun2(task, Jack::AVRT_PRIORITY(priority - BASE_REALTIME_PRIORITY))) {
fHandleTable[thread] = task;
jack_log("AvSetMmThreadPriority success");
return 0;


BIN
windows/Setup/src/32bits/JackRouter.dll View File


BIN
windows/Setup/src/64bits/JackRouter.dll View File


BIN
windows/Setup/src/gpl_installer.rtf View File


+ 0
- 38
windows/jack_midi_dump.cbp View File

@@ -6,24 +6,6 @@
<Option pch_mode="2" />
<Option compiler="mingw_64" />
<Build>
<Target title="Win32 Release 64bits">
<Option output="Release64\bin\jack_midi_dump" prefix_auto="1" extension_auto="1" />
<Option object_output="Release64\" />
<Option type="1" />
<Option compiler="mingw_64" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add directory="..\example-clients" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add library="libjack64" />
<Add directory="Release64\bin" />
</Linker>
</Target>
<Target title="Win32 Debug 64bits">
<Option output="Debug64\bin\jack_midi_dump" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug64\" />
@@ -59,26 +41,6 @@
<Add directory="Release64\bin" />
</Linker>
</Target>
<Target title="Win32 Release 32bits">
<Option output="Release\bin\jack_midi_dump" prefix_auto="1" extension_auto="1" />
<Option object_output="Release\" />
<Option type="1" />
<Option compiler="mingw_64" />
<Compiler>
<Add option="-O2" />
<Add option="-Wall" />
<Add option="-m32" />
<Add directory="..\example-clients" />
<Add directory="..\windows" />
<Add directory="..\common\jack" />
<Add directory="..\common" />
</Compiler>
<Linker>
<Add option="-m32" />
<Add library="libjack" />
<Add directory="Release\bin" />
</Linker>
</Target>
<Target title="Win32 Debug 32bits">
<Option output="Debug\bin\jack_midi_dump" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug\" />


+ 3
- 3
windows/libjacknet.cbp View File

@@ -7,7 +7,7 @@
<Option compiler="gcc" />
<Build>
<Target title="Win32 Release 64bits">
<Option output="Release64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
<Option output="Release64\bin\libjacknet64" prefix_auto="1" extension_auto="1" />
<Option object_output="Release64\libjacknet" />
<Option type="3" />
<Option compiler="gcc" />
@@ -36,7 +36,7 @@
</Linker>
</Target>
<Target title="Win32 Debug 64bits">
<Option output="Debug64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
<Option output="Debug64\bin\libjacknet64" prefix_auto="1" extension_auto="1" />
<Option object_output="Debug64\libjacknet" />
<Option type="3" />
<Option compiler="gcc" />
@@ -65,7 +65,7 @@
</Linker>
</Target>
<Target title="Win32 Profiling 64bits">
<Option output="Release64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
<Option output="Release64\bin\libjacknet64" prefix_auto="1" extension_auto="1" />
<Option object_output="Release64\libjacknet" />
<Option type="3" />
<Option compiler="gcc" />


+ 5
- 5
windows/portaudio/JackPortAudioDevices.cpp View File

@@ -224,10 +224,10 @@ int PortAudioDevices::GetPreferredBufferSize(PaDeviceIndex id)
} else {
jack_info("ASIO buffer granularity = %ld", granularity);
}
return preferredLatency;
} else
#endif
} else
#endif
{
return 512; // Non ASIO driver, returns generic value
}
@@ -260,7 +260,7 @@ void PortAudioDevices::DisplayDevicesNames()
jack_info("Name = %s", GetFullName(id).c_str());
jack_info("Max inputs = %d", fDeviceInfo[id]->maxInputChannels);
jack_info("Max outputs = %d", fDeviceInfo[id]->maxOutputChannels);
#if defined(WIN32) && defined(HAVE_ASIO)
/* ASIO specific latency information */
if (Pa_GetHostApiInfo(fDeviceInfo[id]->hostApi)->type == paASIO) {
@@ -278,7 +278,7 @@ void PortAudioDevices::DisplayDevicesNames()
jack_info("ASIO buffer granularity = %ld", granularity);
}
}
#endif
#endif
jack_info("Default sample rate = %8.2f", fDeviceInfo[id]->defaultSampleRate);

/* poll for standard sample rates */


Loading…
Cancel
Save