Commit graph

62 commits

Author SHA1 Message Date
Paul Davis
bd1cb0ce46 Revert "Add a couple of pthread helper macros"
This reverts commit 6dd4d411b3.

Conflicts:
	libs/pbd/MSVCpbd/pbd.vcproj
2014-09-08 10:41:51 -04:00
Paul Davis
c7af2444a7 Merge branch 'master' into ardour-merge
Conflicts:
	gtk2_ardour/time_axis_view_item.cc
	libs/backends/wavesaudio/waves_audiobackend.h
	libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
2014-09-02 10:28:52 -04:00
GZharun
bb54afa59f [Summary] Removed redundant output 2014-09-02 14:23:11 +03:00
Greg Zharun
6e204c337c [Summary] Cleaned up temporary code 2014-08-31 16:37:19 +03:00
Greg Zharun
91fcacd150 [Summary] Improved backend workflow, added synchronization for cases when device reset happens on device parameter change 2014-08-31 13:42:18 +03:00
Paul Davis
9c24d10862 Merge branch 'master' into ardour-merge
Conflicts:
	gtk2_ardour/editor.cc
	gtk2_ardour/editor_mouse.cc
	gtk2_ardour/public_editor.h
	gtk2_ardour/time_axis_view_item.cc
	gtk2_ardour/time_axis_view_item.h
2014-08-28 10:58:49 -04:00
GZharun
6009b609f6 [Summary] Simplified device information retrieving. Previous complicity was related to previous workflow which has nothing to do with current workflow. 2014-08-28 10:47:01 +03:00
Robin Gareus
f3b2c02749 fix type typo 2014-08-16 17:00:01 -04:00
Robin Gareus
6eaa121474 outline portable implementation to replace clock_gettime() 2014-08-16 16:49:11 -04:00
John Emmas
cc944dd940 Add some more missing #includes 2014-08-16 16:34:48 -04:00
John Emmas
4c10034682 'atomic_ops' to use glib, rather than Waves's inbuilt atomic operations
Note that the following source files can be removed once we know this works on all platforms:-
backends/wavesaudio/wavesapi/akupara/threading/atomic_ops.hpp
backends/wavesaudio/wavesapi/akupara/threading/atomic_ops_gcc_x96.hpp
backends/wavesaudio/wavesapi/akupara/basics.hpp
backends/wavesaudio/wavesapi/akupara/compiletime_functions.hpp
2014-08-16 16:34:40 -04:00
John Emmas
e15ba3cd69 Add a return value to 'WCMRPortAudioDeviceManager::getDeviceAvailableSampleRates()'
(whilst technically, it doesn't report any encountered errors, it should nevertheless be returning some kind of error status)
2014-08-16 16:34:33 -04:00
John Emmas
6dd4d411b3 Add a couple of pthread helper macros
(to accommodate the fact that in ptw-win32, 'pthread_t' is subtlely different from its non-Windows counterparts)

Conflicts:
	libs/pbd/MSVCpbd/pbd.vcproj
2014-08-16 16:34:17 -04:00
John Emmas
3dd30eef03 Add some type guards to 'wstdint.h' (in case we previously #included some headers which already define those types) 2014-08-16 16:33:27 -04:00
John Emmas
216d8d5a00 Add a couple of missing header files (needed for cin /cout etc) 2014-08-16 16:33:17 -04:00
Paul Davis
e39b66fb7c second part of windows/osx macro change - forgot *.cpp files 2014-08-16 16:29:13 -04:00
Paul Davis
12d5a33626 alter platform-dependent preprocessor macros to use the same names as the rest of the ardour codebase 2014-08-16 16:29:07 -04:00
Greg Zharun
b5c08b6984 [Summary] Improved Port audio Waves API on Windows
[Details] Fixed issue when device sample rate changed by device but not updated in client (tracks engine state controller)
Added PA stream opening retry attempts, because PA needs some time to apply changes and may not successfully open stream at once
2014-08-13 19:39:00 +03:00
GZharun
9c67a37f60 [Summary] Fixed issue with incorrect Mac OS string decoding on Maverics for device channel names 2014-07-30 16:25:29 +03:00
Greg Zharun
e20ca80c44 [Summary] Added channel name prefix according to PRD 2014-07-18 14:07:13 +03:00
GZharun
4e8c702e9a [Summary] Fixed Mavericks specific backend issue 2014-07-16 12:54:56 +03:00
GZharun
8c69a972b2 [Summary] Made Tracks buildable on MAC OS X 10.9 Maverricks.
[Details] Important: On Mavericks Tracks could be successfully built with static library linkage so far.
Use --internal-static-libs flag configuring the build.
[Reviewed by] Partially reviewed by Paul Davis. Some Improvements may be promoted in future.
2014-07-15 15:14:08 +03:00
Greg Zharun
e6f3b19674 [Summary] Corrected log in waves API on Windows 2014-07-09 11:24:41 +03:00
Greg Zharun
cfe2b3c17c [Summary] Fixed windows error with retrieving available sample rates from the device:
error code was not returned when eNoError value should be.
2014-07-08 13:00:32 +03:00
GZharun
0cf788ef12 [Summary] Added possibility to update sample rate list for devices on the fly on MAC 2014-07-08 12:27:20 +03:00
GZharun
daf365ced0 [Summary] Implemented Condition/Lock synchronization for Engine HW enevt handling 2014-07-03 17:12:51 +03:00
grygoriiz
489ead12ba [Summary] Added backend/engine update mechanism when device configuration changes (I/O layout, etc.)
[Reviewed by] The idea of event handling queue has been reviewed by Paul Davis
2014-07-02 13:46:53 +03:00
Greg Zharun
9cdb799f3b Implemented Tracks backend/engine reaction on device configuration changes (like I/O layout changes etc.) on Windows 2014-07-01 14:25:03 +03:00
grygoriiz
bf2dc8fdb8 [Summary] Used older version of CoreAudio API by Paul's suggestion to support MAC OS X version older then 10.8 2014-06-24 18:29:46 +03:00
Greg Zharun
301b9b13bf [Summary] Added PortAudio device channels names retrieving from the driver 2014-06-24 16:43:26 +03:00
grygoriiz
3493d2ccb3 Added Device channel names retrieving on MAC. 2014-06-23 11:59:59 +03:00
Nikolay Polyanovskii
2cf7eafb21 Improve handler of Device_Control_Panel button
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 467536]
2014-06-16 11:31:35 -04:00
Grygorii Zharun
f300eaba93 [Summary] Fixed MAC build
[Details] Added fixes to make the code cross platform compilable
[Reviewed by] N/A

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 446294]
2014-03-26 06:31:34 -05:00
Valeriy Kamyshniy
fc07222e42 [P4/git history rebuild] 2014-05-27 22:51:24 -04:00
Valeriy Kamyshniy
681b7ad1a1 [P4/git history rebuild] 2014-05-27 22:51:22 -04:00
Valeriy Kamyshniy
0f28c8489d [P4/git history rebuild] 2014-05-27 22:51:19 -04:00
Valeriy Kamyshniy
14374a9931 [P4/git history rebuild] 2014-05-27 22:51:16 -04:00
Valeriy Kamyshniy
cf8d1a4f39 [P4/git history rebuild] 2014-05-27 22:51:14 -04:00
Valeriy Kamyshniy
478d31cad9 [P4/git history rebuild] 2014-05-27 22:51:09 -04:00
Valeriy Kamyshniy
aff64b7639 [P4/git history rebuild] 2014-05-27 22:51:05 -04:00
Valeriy Kamyshniy
921018a72d [P4/git history rebuild] 2014-05-27 22:51:02 -04:00
Valeriy Kamyshniy
2d08a2c005 [P4/git history rebuild] 2014-05-27 22:50:59 -04:00
Valeriy Kamyshniy
789c6f90f8 [P4/git history rebuild] 2014-05-27 22:50:47 -04:00
Valeriy Kamyshniy
524bf0c3ca [P4/git history rebuild] 2014-05-27 22:50:39 -04:00
Valeriy Kamyshniy
07dad6265b [P4/git history rebuild] 2014-05-27 22:50:25 -04:00
Valeriy Kamyshniy
5517140c68 [P4/git history rebuild] 2014-05-27 22:50:12 -04:00
Valeriy Kamyshniy
45d159fd77 [P4/git history rebuild] 2014-05-27 22:50:08 -04:00
Valeriy Kamyshniy
12228d251e [P4/git history rebuild] 2014-05-27 22:50:00 -04:00
Valeriy Kamyshniy
73d880fe47 [P4/git history rebuild] 2014-05-27 22:49:57 -04:00
Valeriy Kamyshniy
06629f8717 [P4/git history rebuild] 2014-05-27 22:49:53 -04:00