wangyix
c2b22c0aa2
Merge remote-tracking branch 'upstream/master'
2014-06-24 09:34:07 -07:00
David Rowe
c40c5d78c8
Fix default audio devices on Windows
...
Windows 8 provides the full friendly device name, not just the first 31 characters.
2014-06-24 08:50:39 -07:00
wangyix
a4f5ce2215
added stats for audiomixer jitter buffers lengths in Application
2014-06-23 17:48:57 -07:00
wangyix
e5d7d471e3
removed debug code
2014-06-23 10:55:30 -07:00
wangyix
a5457eb86b
fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet
...
added more debug stuff, other minor changes and fixes
2014-06-20 14:43:18 -07:00
Kai Ludwig
8c700d43f3
Modified CALLBACK_ACCELERATOR_RATIO for windows because some systems need larger input buffer to work fine.
2014-06-15 21:08:14 +02:00
David Rowe
1503946b7c
Fix build warning in Audio.cpp
...
\interface\src\Audio.cpp(309): warning C4018: '<' : signed/unsigned mismatch
2014-06-11 21:11:49 -07:00
Stephen Birarda
b6b148cd9f
resolve conflicts on merge with upstream master
2014-06-06 11:31:16 -07:00
Stephen Birarda
f6011b65d7
fix input loudness for a stereo source
2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6
complete piping of stereo audio through mixer
2014-06-06 10:55:04 -07:00
Stephen Birarda
681ce247d6
tweak resample to handle 48 to 24 stereo, add stereo/mono byte
2014-06-06 10:27:59 -07:00
Stephen Birarda
7da091d2b4
initial hooks for stereo audio
2014-06-06 10:15:09 -07:00
Andrew Meadows
d3f51fe38e
FinalOrientation -> FinalOrientationInWorldFrame
2014-06-04 10:41:17 -07:00
matsukaze
619db8ee93
Job #19694 - Add option for larger number of frames to the audio scope display
2014-05-27 23:24:28 -04:00
barnold1953
b5ad295756
Fixed improper coding style in previous pull request
2014-05-21 11:24:39 -07:00
barnold1953
661de7c62b
Fixed poor coding standard
2014-05-20 17:46:52 -07:00
barnold1953
2329188939
Stopped windows crash when no audio device is detected
2014-05-20 15:15:45 -07:00
Philip Rosedale
01e5b009ee
scope menus better, pause hotkey, no stay paused, remove menu for shared face culling ops
2014-05-07 20:43:23 -07:00
Atlante45
01637e8037
Fix error introduced with gettimeofday removing + spelling mistake
2014-04-24 17:37:48 -07:00
Clément Brisset
d441e6a453
Merge pull request #2717 from AndrewMeadows/inertia
...
avatar bounding capsule collision against voxels
2014-04-23 16:06:14 -07:00
Atlante45
ae566c55f6
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
2014-04-23 10:38:29 -07:00
Andrew Meadows
bfe1ee377b
remove warning about signed/unsigned comparison
...
Also change n.f to be n.0f as per coding standard
2014-04-23 08:56:53 -07:00
matsukaze
d6e4f217f5
Expanded variable names.
2014-04-22 21:57:41 -04:00
matsukaze
1ff3b83644
Changed const color data and method signatures.
...
Changed constant color data and method signatures from unsigned int to
array of float. Changed glColor4f to glColor4fv.
2014-04-22 19:42:51 -04:00
matsukaze
015cbce322
Changed constant names for improved readability.
2014-04-22 18:57:22 -04:00
matsukaze
ff7a1bd60f
Job #19574 . Add audio oscilloscope.'
2014-04-22 06:53:59 -04:00
Atlante45
ab76e6a00c
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
...
Conflicts:
interface/src/Audio.cpp
2014-04-21 12:19:19 -07:00
ZappoMan
80dd0c3356
fix switching audio device bug
2014-04-20 20:18:56 -07:00
ZappoMan
fa787adce2
added wet/dry mix, and alternate distance attenuation features
2014-04-18 08:55:32 -07:00
Andrew Meadows
e139a6dc95
remove warnings about signed-unsigned comparison
2014-04-17 08:46:41 -07:00
ZappoMan
4c6471caa4
fix typo
2014-04-16 16:43:01 -07:00
ZappoMan
3cb109ec89
clean up
2014-04-16 15:21:04 -07:00
ZappoMan
b00a67cb57
added support for local audio spatialization independent of inbound audio
2014-04-16 13:55:39 -07:00
Atlante45
8cfc8faa01
Removed gettimeofday in Audio
2014-04-16 12:08:17 -07:00
ZappoMan
040df97be2
more cleanup
2014-04-15 20:23:47 -07:00
ZappoMan
82d9c50dc5
moved all local processing to AudioReflector
2014-04-15 20:11:53 -07:00
ZappoMan
a46d3fd254
first cut at local audio spatialization working
2014-04-15 19:57:37 -07:00
ZappoMan
523cc4bdfe
revert some code
2014-04-15 16:30:47 -07:00
ZappoMan
a7cbf7f667
revert some code
2014-04-15 16:26:46 -07:00
ZappoMan
585024d70e
resample the local audio before sending it to any registered listeners
2014-04-15 16:04:33 -07:00
ZappoMan
f9b6585435
some cleanup
2014-04-15 15:20:03 -07:00
ZappoMan
5bc8c83706
loop and variable name cleanup
2014-04-15 15:16:55 -07:00
ZappoMan
e514c95642
variable names cleanup to match coding standard
2014-04-15 14:47:38 -07:00
ZappoMan
24f0f37eb9
cleanup
2014-04-15 14:21:28 -07:00
ZappoMan
579710e4bd
some cleanup
2014-04-15 13:36:20 -07:00
ZappoMan
cd23b95b42
revert back to using QByteArray for processReceivedAudio()
2014-04-15 13:16:52 -07:00
ZappoMan
74828a3215
removed non-functional low pass filter
2014-04-15 12:54:59 -07:00
ZappoMan
9d49a53434
coding standard cleanup
2014-04-15 12:50:05 -07:00
ZappoMan
0d308e7cb9
more cleanup add support for enable/disable rendering of paths
2014-04-14 11:58:49 -07:00
ZappoMan
7a993939bf
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
Stephen Birarda
cf47418d58
remove the audio scope
2014-04-09 17:16:29 -07:00
Stephen Birarda
c208af2246
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 15:10:48 -07:00
Stephen Birarda
7dec499b79
fix accidental changes to Audio.cpp
2014-04-09 14:52:01 -07:00
Stephen Birarda
2d755adfc0
repairs to good code blown away by regex
2014-04-09 10:46:20 -07:00
stojce
7b26317eaf
Merge branch 'master' of https://github.com/worklist/hifi into 19548
2014-04-09 18:55:17 +02:00
stojce
ce85e67a42
Modify icons in Interface "mirror"
2014-04-09 18:54:59 +02:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Thijs Wenker
6754a6ca69
Fixed some style
2014-04-08 23:45:27 +02:00
Thijs Wenker
e9922b6db9
windows default device fix:
...
- fixed tabs>spaces
- doesn't require atlbase anymore, so works on visual studio express
2014-04-07 18:50:13 +02:00
Thijs Wenker
4335ba7b5a
windows default device fix
2014-04-07 17:01:24 +02:00
ZappoMan
dfd6411a4f
add hooks for local audio echo, first cut at diffusion
2014-04-06 10:11:11 -07:00
ZappoMan
98f0fe8619
latest pass, improved distance calulations, added menu item to remove original source
2014-04-03 18:57:08 -07:00
ZappoMan
ed55700c27
Merge branch 'moonshot' of https://github.com/ZappoMan/hifi into moonshot
...
Conflicts:
interface/src/AudioReflector.cpp
2014-04-03 16:22:29 -07:00
matsukaze
9e157ff1c5
More audio fixes.
2014-04-04 16:17:49 -07:00
matsukaze
33d4cb6497
Merge branch 'moonshot' of https://github.com/ZappoMan/hifi into moonshot
2014-04-04 16:16:19 -07:00
matsukaze
33718684e6
More audio fixes.
2014-04-04 16:09:25 -07:00
matsukaze
836fda2c05
Clamp the audio summation.
2014-04-04 09:07:27 -07:00
ZappoMan
5872ec0569
checkpoint
2014-04-03 16:19:33 -07:00
ZappoMan
06adaa009c
add first cut at simple low pass filter
2014-04-03 12:40:35 -07:00
ZappoMan
3808cfa83d
latest work
2014-04-03 08:55:48 -07:00
matsukaze
09bcada263
Fixes to audio spatial processing.
2014-04-03 19:41:59 -07:00
ZappoMan
7717a09f91
use QByteArray for processSpatialAudio() signal
2014-04-02 18:48:28 -07:00
matsukaze
f7d9269314
Modifications to support spatial audio processing.
2014-04-03 17:36:03 -07:00
Philip Rosedale
ca863e77f4
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/interface_en.ts
2014-04-01 21:14:51 -07:00
Philip Rosedale
389091ace6
Merge pull request #2587 from matsukaze/nocrAudioFixes
...
Audio fixes for win OS.
2014-04-01 21:03:26 -07:00
matsukaze
f305b81655
Merge upstream master into audio fixes.
2014-04-02 17:34:41 -07:00
matsukaze
7542917922
Fix tab with space.
2014-04-02 14:22:17 -07:00
matsukaze
94a23b7ffc
Fix brace location and replace tab with space.
2014-04-02 14:15:20 -07:00
matsukaze
952ca928f1
More audio fixes. Fix audio buffer size on Win.
2014-04-02 12:28:22 -07:00
Philip Rosedale
0b792985d3
Tweaks to VU meter, tone injector, and fix to noise gate
2014-04-01 16:43:18 -07:00
matsukaze
c3934d9e86
Fix heap corruption.
2014-04-01 15:49:08 -07:00
Andrzej Kapolka
fb37ef5bca
Fix for annoying intermittent seg fault on Linux exit. Closes #2542 .
2014-04-01 11:25:39 -07:00
Philip Rosedale
7d12fcee9d
220Hz tone injection option for easier audio quality checks
2014-03-31 21:55:29 -07:00
Philip Rosedale
81d1eb7ed2
removed unused procedural movement code
2014-03-31 18:24:58 -07:00
Philip Rosedale
78ee8706d6
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-28 16:48:15 -07:00
Andrew Meadows
c354e980a8
getTweakedOrientation() to getFinalOrientation()
2014-03-27 11:03:42 -07:00
Philip Rosedale
101de1e0e5
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-26 23:24:44 -07:00
Philip Rosedale
7d168b5b1f
Merge pull request #2537 from ZappoMan/bugfixes
...
some windows bug fixes
2014-03-26 23:22:06 -07:00
Philip Rosedale
ff8d154412
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-26 22:38:35 -07:00
Stephen Birarda
7eab276122
suppress debug in ScriptEngine, fix spatialization from FS head changes
2014-03-26 17:19:23 -07:00
Brad Hefta-Gaub
0435b16668
fix formatting
2014-03-26 16:52:24 -07:00
ZappoMan
11c089c221
add support for getting the actual default audio devices in windows by name
2014-03-26 16:48:57 -07:00
Brad Hefta-Gaub
2257afd390
removed unneeded call to disconnect()
2014-03-26 15:20:27 -07:00
Andrzej Kapolka
c18d0ccf8f
Formatting fixes.
2014-03-26 12:34:46 -07:00
Andrzej Kapolka
c31b04af4c
Fix for Windows initial device selection.
2014-03-26 12:23:08 -07:00
Philip Rosedale
caed600817
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-26 12:14:12 -07:00
Andrzej Kapolka
b88708a991
Added mono to stereo conversion to fix Linux audio. Closes #2508 .
2014-03-26 11:01:58 -07:00
Philip Rosedale
d90244c01e
first pass, clipping audio meter
2014-03-25 22:31:44 -07:00
ZappoMan
da763671fa
fix crash when no output audio device selected, add get/set volume support for input devices
2014-03-24 12:52:34 -07:00
ZappoMan
7ef1fe3a74
add support for listing all audio devices and default device in JS
2014-03-24 09:15:03 -07:00
ZappoMan
82d620b1d9
add support for AudioDevice scripting interface, and switching audio input/output device on the fly
2014-03-23 11:26:27 -07:00
Stephen Birarda
61594b9a1e
fixes to silent audio frame sending
2014-03-17 16:27:49 -07:00
Stephen Birarda
9f24bd9c47
have the AudioMixer handle silent audio, send silence from Interface when gate closed
2014-03-17 15:12:02 -07:00
Andrew Meadows
793a760272
merge upstream master into "radians" project
2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb
use radians instead of degrees (almost) everywhere
2014-03-11 17:26:58 -07:00
Stephen Birarda
d1623e6e4d
fixes for warnings produced by Xcode 5.1
2014-03-11 11:45:13 -07:00
Stephen Birarda
b705ec560f
cleanup resources directory references by copying beside the executable
2014-03-06 11:46:49 -08:00
Stephen Birarda
403f91c988
update resource references to use Qt resource system
2014-03-06 10:41:11 -08:00
Philip Rosedale
7ce380a333
relocate mute button, audio scope
2014-02-27 18:02:53 -08:00
Philip Rosedale
f06b30e024
remove audio barograph latency display
2014-02-27 17:45:47 -08:00
Philip Rosedale
ae6d156feb
remove travelling noises
2014-02-27 17:27:41 -08:00
Philip Rosedale
e87ae8ac8f
audio debugging
2014-02-27 15:52:19 -08:00
Stephen Birarda
cb45a3242d
increase size of audio output buffer to match size of ring buffer
2014-02-26 16:29:07 -08:00
Philip Rosedale
8c3b18f797
Finished audio input DC offset correction
2014-02-23 19:56:25 -08:00
Philip Rosedale
4b033b3b98
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-19 15:07:45 -08:00
Philip Rosedale
b368001af4
Adding DC offset calculation to noise cancellation
2014-02-19 15:04:39 -08:00
Andrew Meadows
4010f3ab3f
Remove Avatar::_head, use AvatarData::_headData
2014-02-18 17:41:46 -08:00
Philip Rosedale
50df17dc10
fix windows build buster
2014-02-12 23:37:19 -08:00
Philip Rosedale
595eb38c72
comment out debug
2014-02-12 22:57:13 -08:00
Philip Rosedale
be7d1a5723
Adjustments to noise gate, commit to min sampling method
2014-02-12 22:53:46 -08:00
Philip Rosedale
3a807c1914
comment out debugging spam, improved EditVoxels
2014-02-12 17:57:52 -08:00
Philip Rosedale
0322c8b934
Added minimum sample counting method for noise reduction
2014-02-11 23:44:22 -08:00
Philip Rosedale
03bc5adf64
Add Audio Noise Reduction
2014-02-08 16:35:37 -08:00
Stephen Birarda
3ad8e7260e
fix an accidental DOS and remove getNodeActiveSocketOrPing API
2014-02-07 13:42:52 -08:00
Stephen Birarda
b988308a8d
leverage writeDatagram helper in NodeList, ping if no active socket
2014-02-07 09:49:54 -08:00
Stephen Birarda
a823722d27
add writeDatagram helper to NodeList to insert md5 hash
2014-02-06 14:28:58 -08:00
ZappoMan
8cc4666f2a
fix spacing
2014-02-05 14:00:17 -08:00
ZappoMan
b0ccedd1a6
fix spacing
2014-02-05 13:59:17 -08:00
Brad Hefta-Gaub
a05e07460f
fix windows build errors and warnings
2014-02-05 13:54:17 -08:00
Stephen Birarda
96fd73a766
fixed wrapped read of samples from end of buffer
2014-02-05 11:39:03 -08:00
Stephen Birarda
6b3b03228e
audio repairs so buffers do not climb
2014-02-05 10:22:07 -08:00
Stephen Birarda
c70633e5d1
don't render any audio stats if no _audioOutput, closes #1783
2014-01-31 10:40:10 -08:00
Stephen Birarda
4de270b832
cleanup Node types, closes #1726
2014-01-28 13:38:33 -08:00
Stephen Birarda
2aaa9ce3f6
resolve conflicts on merge with upstream master
2014-01-28 12:30:43 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
Lucas Crisman
43d1678d18
position/sizes tweaks / moving stats and osciloscope when mirror is ON
2014-01-24 07:56:01 -03:00
Lucas Crisman
a2f8a61a69
stats font & color changes, styling audio & bandwidth meters
2014-01-24 05:06:55 -03:00
Lucas Crisman
f818b07dc8
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-23 22:18:33 -03:00
Stephen Birarda
c54eacbf36
make sure starve is displayed even if ring buffer just received data
2014-01-23 11:15:21 -08:00
Lucas Crisman
95837b89c0
Merge branch 'master' of git://github.com/worklist/hifi into 19487
2014-01-23 15:54:14 -03:00
Stephen Birarda
7efc9e2e78
move datagram processing back to separate thread
2014-01-23 10:32:23 -08:00
Lucas Crisman
d86aa227a4
UI stats improvements: first cut
2014-01-22 16:42:09 -03:00
stojce
13f223ff12
Merge branch 'master' of https://github.com/worklist/hifi into 19484
2014-01-17 19:46:44 +01:00
Stephen Birarda
0ddf9520dd
if audio is muted don't loopback local audio, fixes #1561
2014-01-16 14:55:09 -08:00
Andrzej Kapolka
865b495e6c
Merge branch 'master' of https://github.com/worklist/hifi into debone
...
Conflicts:
interface/src/Audio.cpp
interface/src/Menu.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Webcam.cpp
interface/src/devices/Webcam.h
interface/src/renderer/FBXReader.cpp
2014-01-16 13:35:03 -08:00
Andrzej Kapolka
3f08504e3e
Replaced missing functionality.
2014-01-16 12:39:07 -08:00
stojce
150a667cd6
WL job #19484
...
- Move 'Fly to voxel on click' menu item;
- add shortcut for muting audio ...
2014-01-16 20:17:04 +01:00
Andrzej Kapolka
2c7b6b9696
Skeleton removal checkpoint; compiles, but there are a few bits missing.
2014-01-15 15:14:50 -08:00
Brad Hefta-Gaub
170dbe6e85
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Stephen Birarda
599e3bb9e5
resolve conflicts on merge with upstream master
2014-01-14 16:15:58 -08:00
Stephen Birarda
987c639e36
initial newline removal from all QDebug calls
2014-01-14 13:09:22 -08:00
Stephen Birarda
7d1a64ca8c
change NodeList container to QHash with QSharedPointer
2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
55babbf7b6
windows type mismatch warning fixes
2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
08bb783777
more windows build work
2014-01-12 14:49:15 -08:00
Brad Hefta-Gaub
825c1c8876
fix windows warnings
2014-01-11 00:07:35 -08:00
Stephen Birarda
b035f74f94
fix for build busters with changed AbstractAudioInterface
2013-12-19 12:39:57 -08:00
Stephen Birarda
eac3b6be65
add AudioInjector class to pull samples from URL and inject
2013-12-19 12:28:37 -08:00
Stephen Birarda
c6dc93c28e
fix for 8 channel output devices (HDMI capture)
2013-12-17 16:08:38 -08:00
Stephen Birarda
8ece758107
spacing fix in Audio.cpp
2013-12-17 11:13:45 -08:00
Stephen Birarda
cc5c04c82f
remove doubling of right channel for injected audio
2013-12-17 10:31:32 -08:00
Stephen Birarda
a634881477
have linearResampling handle mono to stereo 48KHz conversion
2013-12-17 09:52:42 -08:00
Stephen Birarda
964558d514
add a QAudioOutput object for local loopback
2013-12-17 09:41:28 -08:00
Stephen Birarda
a31f15ee79
don't blow away a channel on local injection loopback
2013-12-16 16:57:30 -08:00
Stephen Birarda
efe05adcae
fix audio graphs for new audio infrastructure
2013-12-16 16:52:04 -08:00
Stephen Birarda
30b22a13ad
remove an unecessary condition in Audio.cpp
2013-12-16 16:30:04 -08:00
Stephen Birarda
bb93c64d8d
some initial audio stat render fixes
2013-12-16 16:21:50 -08:00
Stephen Birarda
90ea978278
fix some clipping in procedural audio
2013-12-16 16:03:46 -08:00
Stephen Birarda
e5d2647e70
fix last input loudness for mouth movement with no depth camera
2013-12-16 16:01:03 -08:00
Stephen Birarda
89beff4253
fix the scope and last input loudness
2013-12-16 15:41:58 -08:00
Stephen Birarda
f7ed8cef8f
fixes for all current headsets work
2013-12-16 15:31:05 -08:00
Stephen Birarda
6b644eb130
repair upsampling and local loopback by correcting for limits
2013-12-16 15:15:25 -08:00
Stephen Birarda
2d4a8ca997
fix scope for audio output
2013-12-16 12:19:19 -08:00
Stephen Birarda
cdc6f33128
fix scope for input
2013-12-16 12:16:08 -08:00
Stephen Birarda
1f9ca00317
drive input from buffer callback and output from network
2013-12-16 11:58:23 -08:00
Stephen Birarda
25b7065298
changes for broken test
2013-12-12 17:19:54 -08:00
Stephen Birarda
f17ee1af7a
cleanup AudioRingBuffer API
2013-12-12 13:37:18 -08:00
Stephen Birarda
d5aadf6598
repair linear resampling for same number of channels
2013-12-12 10:48:42 -08:00
Stephen Birarda
b06af3cd6c
copy all passed samples to AudioRingBuffer
2013-12-12 10:15:43 -08:00
Stephen Birarda
e27aa11216
remove a debug line
2013-12-11 12:03:14 -08:00
Stephen Birarda
af2fa15f55
initial work for change to 48KHz
2013-12-11 12:02:08 -08:00
Stephen Birarda
bcdc066a98
don't set _lastInputLoudness if input is muted
2013-12-06 13:26:40 -08:00
Stephen Birarda
098010e099
don't crash if there is no output
2013-12-06 13:22:07 -08:00
Stephen Birarda
5e73e803e9
fixes for procedural audio input
2013-12-05 14:49:28 -08:00
Stephen Birarda
21076af739
hook audio loudness back to QAudioInput
2013-12-05 14:29:55 -08:00
Stephen Birarda
487209e270
fix bandwidth meter for audio
2013-12-05 13:21:16 -08:00
Stephen Birarda
d1054b3cfc
add received audio to buffer via queued connection
2013-12-05 13:17:16 -08:00
Stephen Birarda
80e1b5a4bc
some logic and spacing fixes in the audio mixer
2013-12-05 13:05:29 -08:00
Stephen Birarda
d2f7dd2371
resolve conflicts on merge with upstream master
2013-12-05 12:13:11 -08:00
Stephen Birarda
71aca69410
fix rendered scope for new Qt Audio
2013-12-05 11:36:45 -08:00
Stephen Birarda
6765ce2f1f
some spacing cleanup in Audio
2013-12-05 10:23:06 -08:00
Stephen Birarda
ab1cd7bd2c
fix red/green display in audio debug rendering
2013-12-04 16:24:14 -08:00
Philip Rosedale
c1f96ab6b4
Merge branch 'master' of https://github.com/worklist/hifi
2013-12-04 15:49:30 -08:00
Philip Rosedale
0c32f94116
Better drums
2013-12-04 15:48:41 -08:00
Stephen Birarda
d722e0bf6a
repairs to Audio class after merge with upstream master
2013-12-04 14:24:07 -08:00
Stephen Birarda
277aa9dd89
handle conflicts on merge with upstream master
2013-12-04 14:21:00 -08:00
Stephen Birarda
7df6210ba0
Merge remote-tracking branch 'upstream/master' into qt-for-portaudio
2013-12-04 14:20:44 -08:00
Stephen Birarda
560844c138
re-enable rendering and fix sampling algorithim
2013-12-04 13:55:27 -08:00
Stephen Birarda
e339155328
replace missing PortAudio with Qt audio
2013-12-04 12:54:33 -08:00
ZappoMan
bc715085a9
Merge pull request #1304 from PhilipRosedale/master
...
Voxel drumming, search function to find leaf voxel containing a point
2013-12-04 11:28:39 -08:00
Philip Rosedale
8fdd78dc26
Added drum sounds and voxel collision detection
2013-12-03 16:25:23 -08:00
Stephen Birarda
3277cb49a6
Merge remote-tracking branch 'upstream/master' into cleanup
2013-12-03 12:21:03 -08:00
Stephen Birarda
141394a664
replace UDPSocket with QUDPSocket
2013-12-02 13:34:29 -08:00
Philip Rosedale
534c5105b0
echo the right one
2013-11-26 11:46:11 -08:00
Philip Rosedale
09ca2a45db
Add local audio monitor option, tweak turning with head
2013-11-26 11:25:06 -08:00
Philip Rosedale
2991c8af61
screen does not flash when voxels are clicked
2013-11-08 14:34:22 -08:00
Andrzej Kapolka
a568e71e37
Merge pull request #1099 from stojce/19433
...
Code Review for Job #19433
2013-10-23 10:03:36 -07:00
stojce
2fcb246923
close button on rear mirror view
2013-10-22 20:42:31 +02:00
Stephen Birarda
00446076b5
remove audio injectors that are starved and not added
2013-10-21 16:04:13 -07:00
Stephen Birarda
80d2df6a49
fix audio ternary indentations
2013-10-17 15:12:34 -07:00
Stephen Birarda
73d3ecccf3
resolve conflicts on merge with upstream master
2013-10-17 14:37:58 -07:00
Stephen Birarda
fa146e302d
remove 16-bit node IDs and replace with UUIDs
2013-10-17 11:49:41 -07:00
PhilipRosedale
9643c1262c
Fix mute button, visualize gaze direction when showing headMouse
2013-10-17 11:03:12 -07:00
Stephen Birarda
7de88898e1
activate appropriate socket after receiving ping reply
2013-10-16 17:51:32 -07:00
stojce
61b213804a
#19426 - Add a mute control to the interface
...
- OpenGL overlay icon
- mute control
- icons
2013-10-05 13:18:35 +02:00
Andrzej Kapolka
54116cbc85
Testing audio shutdown before menu destruction.
2013-09-04 16:04:36 -07:00
Stephen Birarda
146e9176eb
switch to one channel from PortAudio to resolve USB error
2013-08-20 13:06:30 -07:00
Stephen Birarda
46b064b7d6
initial decoupling of menu from Application
2013-08-15 10:46:51 -07:00
Philip Rosedale
45961b2b64
Collision and click sounds improved
2013-08-08 16:00:50 -07:00
Stephen Birarda
25537f78a1
reset the song mix menu item after clip is done
2013-08-05 12:18:59 -07:00
ZappoMan
fd81053e33
fixed compiler warnings
2013-08-02 18:33:41 -07:00
Stephen Birarda
222a46189f
some comments and _songFileBytes reset
2013-08-02 17:50:08 -07:00
Stephen Birarda
d259180778
add option to audio menu to stop the mixed audio
2013-08-02 17:46:23 -07:00
Stephen Birarda
d56b715432
add menu option to mix RAW audio with microphone audio
2013-08-02 17:30:49 -07:00
ZappoMan
9507cd8955
switched to vector
2013-07-23 19:54:29 -07:00
ZappoMan
a162643e1e
more removing of SourceID from classes
2013-07-23 19:21:43 -07:00
ZappoMan
c969570e8c
working on selected audio
2013-07-22 23:05:42 -07:00
ZappoMan
c301b799c5
first cut at selecting audio sources
2013-07-22 13:54:47 -07:00
Philip Rosedale
984332e638
fixes per review
2013-07-17 09:51:04 -07:00
Philip Rosedale
59810cac99
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-16 16:41:02 -07:00
Philip Rosedale
192ae63789
Colliding with ground, voxels makes interesting sounds and flashes your display
2013-07-16 16:40:50 -07:00
Stephen Birarda
1b48d4f0fc
revert removal of extraneous newlines
2013-07-16 12:46:32 -07:00
Stephen Birarda
89d3cfdb6f
remove now extraneous newlines after switch to QDebug
2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756
switch calls to printLog to QDebug
2013-07-16 11:07:22 -07:00
Philip Rosedale
edf031b985
improve collision sounds, difference between ground and voxels
2013-07-15 22:42:55 -07:00
Philip Rosedale
d05108e26d
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-15 19:59:26 -07:00
Philip Rosedale
eee8c3e570
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-15 16:27:51 -07:00
Philip Rosedale
26c0eb2dea
Start to add heartbeat
2013-07-15 16:27:46 -07:00
Stephen Birarda
33ddda2558
correct reference to audio mixer sockaddr_in
2013-07-15 16:02:36 -07:00
Stephen Birarda
a204a8b872
lock the audioMixer to avoid crash when grabbing socket
2013-07-15 16:01:05 -07:00
Stephen Birarda
d389dc6e3a
add method to NodeList to set domain IP to local, move mutex lock to node
2013-07-15 15:17:10 -07:00
Philip Rosedale
f8f6b29559
Audio collision sounds are played locally as well as injected
2013-07-15 14:24:21 -07:00
ZappoMan
f415f4081a
Fixed a bug in LOD boundaries
...
- changed the way we calculate whether or not to render a parent "average" voxel so
that if any of it's most distant child would not be visible, then it's used instead
of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
center of the voxel, but the distance from the camera to the furthest corner relative
to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
tell you which vertex of the box is furthest from the camera
2013-07-15 01:32:14 -07:00
tosh
ac3b95efe7
fixes sliced-away initialization (crashes program during shutdown when running without audio device)
2013-07-13 22:51:57 +02:00
Philip Rosedale
8b9e0426b2
Simple glassy collision sound
2013-07-12 21:34:48 -07:00
Stephen Birarda
76dc01e84e
fix audio silence on receive bail
2013-07-11 17:55:59 -07:00
Stephen Birarda
430f255730
type squish in Audio class
2013-07-11 11:10:03 -07:00
Stephen Birarda
b816761a74
use packet version helpers for PACKET_TYPE_MICROPHONE
2013-07-08 14:24:08 -07:00
Stephen Birarda
5062ae8965
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
2013-07-08 11:37:39 -07:00
Stephen Birarda
36c6912de8
your agents are now nodes
2013-07-03 10:35:09 -07:00
Philip Rosedale
6fbab462f0
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-01 22:30:06 -07:00