Stephen Birarda
|
ab5c8e072f
|
handle blocked AudioInjectorManager for restart
|
2015-11-17 16:31:18 -08:00 |
|
Stephen Birarda
|
d764ff2e87
|
remove static variables in AudioInjector.cpp
|
2015-11-17 15:12:04 -08:00 |
|
Stephen Birarda
|
7da6ec46c4
|
more handling of various AudioInjector states
|
2015-11-17 14:20:59 -08:00 |
|
Stephen Birarda
|
80115d38e9
|
tweak the AudioInjectorManager for injector threading
|
2015-11-16 18:53:09 -08:00 |
|
Stephen Birarda
|
aa77c4894c
|
add an AudioInjectorManager for more efficient threading
|
2015-11-16 16:04:10 -08:00 |
|
Atlante45
|
ffafd3194e
|
Recording audio fixes
|
2015-11-05 16:46:59 -08:00 |
|
Brad Hefta-Gaub
|
5e82b9c433
|
more warning fixes
|
2015-09-24 08:26:56 -07:00 |
|
Ken Cooke
|
4b9c2ed6b6
|
In AudioInjector, replace SOXR with AudioSRC.
Used for pitch shifting in playSound(). Setup time (once per sound) is drastically improved.
|
2015-09-22 23:08:05 -07:00 |
|
Howard Stearns
|
d003ec9c58
|
Delete collision sounds (and their threads) after use.
This has been broken ever since I added avatar collision sounds around https://github.com/highfidelity/hifi/pull/5159 or so.
|
2015-08-31 15:49:17 -07:00 |
|
Stephen Birarda
|
e93b360908
|
expose options property to AI script interface
|
2015-08-20 12:12:43 -07:00 |
|
Stephen Birarda
|
0177513285
|
resolve conflicts on merge with upstream/master
|
2015-07-20 12:29:38 -07:00 |
|
Howard Stearns
|
2d277a2abd
|
Fix https://app.asana.com/0/30233891560551/41734486809354/f
|
2015-07-17 11:28:25 -07:00 |
|
Stephen Birarda
|
a6641908fb
|
check if audio mixer is alive before packet send
|
2015-07-16 15:49:15 -07:00 |
|
Stephen Birarda
|
c5047ec76d
|
fix sequence number packing for audio injector
|
2015-07-16 15:47:25 -07:00 |
|
Stephen Birarda
|
05dde9d8f5
|
resolve conflicts on merge with upstream/master
|
2015-07-15 16:18:47 -07:00 |
|
Stephen Birarda
|
e127c5c06d
|
rename Packet methods for clarity
|
2015-07-15 10:40:40 -07:00 |
|
Atlante45
|
c80df94b06
|
Update includes for moved files
|
2015-07-13 15:28:55 -07:00 |
|
Atlante45
|
957e6394a9
|
sendPacket function take Node& not a pointer
|
2015-07-13 11:57:20 -07:00 |
|
Atlante45
|
6c591131ba
|
Made Animations safe for resource reload
|
2015-07-10 12:01:51 -07:00 |
|
Stephen Birarda
|
a363f42bb2
|
pass const NLPacket& for all sendUnreliablePacket calls
|
2015-07-09 11:42:18 -07:00 |
|
Stephen Birarda
|
f3eb6982e6
|
fix writing to packet in AudioInjector
|
2015-07-08 16:39:24 -07:00 |
|
Atlante45
|
7329ad6334
|
Templated read/write in Packet
|
2015-07-08 13:45:12 -07:00 |
|
Atlante45
|
6bf05fbf1f
|
Pointer fixes
|
2015-07-08 10:50:51 -07:00 |
|
Atlante45
|
7713219718
|
Compile fixes
|
2015-07-08 10:40:35 -07:00 |
|
Stephen Birarda
|
eac3a2a640
|
packet repairs for AudioInjector
|
2015-07-07 15:50:32 -07:00 |
|
Stephen Birarda
|
e1c098233a
|
use sendUnreliablePacket for repeated send in AI
|
2015-07-06 18:03:41 -07:00 |
|
Howard Stearns
|
3b8a46b87d
|
Allow scripted audio injectors to have options set.
|
2015-06-23 21:01:34 -07:00 |
|
Howard Stearns
|
dc10e15e96
|
Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client.
|
2015-06-19 14:20:00 -07:00 |
|
Howard Stearns
|
b4dfaba55e
|
Incorporate ctrlaltdavid's changes.
|
2015-06-17 11:59:15 -07:00 |
|
Howard Stearns
|
6d99d50f72
|
Don't clip local audio sounds (https://app.asana.com/0/32622044445063/37633564937422)
and quiet some warnings (of https://app.asana.com/0/32622044445063/37620738098871).
|
2015-06-16 10:51:42 -07:00 |
|
Howard Stearns
|
8e41c58fad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into restartable-non-local-sound
|
2015-06-08 15:45:30 -07:00 |
|
Howard Stearns
|
564b0b48ef
|
Alternate version that uses signal rather than polling.
|
2015-06-08 14:29:43 -07:00 |
|
Stephen Birarda
|
666830c04d
|
add a sound once first AM packet received
|
2015-06-08 11:30:12 -07:00 |
|
Howard Stearns
|
6668de56cd
|
Fix AudioInjector::restart() for the non-local case.
|
2015-06-08 10:34:56 -07:00 |
|
Stephen Birarda
|
6b3cf1ba4a
|
remove dependency of PacketHeaders on NodeList
|
2015-05-05 12:19:42 -07:00 |
|
Atlante45
|
1dcc2f7988
|
Fix local injector modifying system volume
|
2015-05-04 15:53:58 +02:00 |
|
Seth Alves
|
7af32bd67a
|
put audio and script-engine logging into their own QLoggingCategory
|
2015-04-06 15:57:18 -07:00 |
|
Stephen Birarda
|
13fc0b1fcd
|
fix AudioInjector debug line to be more clear
|
2015-02-13 09:36:16 -08:00 |
|
Stephen Birarda
|
060b0bbfd6
|
tell injector it is not finished once restarted
|
2015-02-12 11:13:03 -08:00 |
|
Stephen Birarda
|
ea52cea5dd
|
more cleanup for AudioInjector mem management
|
2015-02-12 10:56:40 -08:00 |
|
Stephen Birarda
|
43e777163e
|
use a QPointer to trigger delayed delete
|
2015-02-11 19:15:33 -08:00 |
|
Stephen Birarda
|
79674fb94f
|
use a wrapper on audio injector for script ownership
|
2015-02-11 17:20:00 -08:00 |
|
Stephen Birarda
|
449719bc7c
|
add option to restart a local audio injector
|
2015-02-11 16:58:30 -08:00 |
|
Stephen Birarda
|
4894a5b414
|
better handling of cleanup for local injector
|
2015-02-11 16:11:55 -08:00 |
|
Stephen Birarda
|
0498c5c708
|
provide old ASI APIs in AudioInjector
|
2015-02-11 15:57:32 -08:00 |
|
Stephen Birarda
|
7b485829c4
|
cleanup AudioInjector memory management
|
2015-02-11 15:52:00 -08:00 |
|
Stephen Birarda
|
c9c53453c3
|
repairs to local audio injector cleanup
|
2015-02-04 14:47:18 -08:00 |
|
Atlante45
|
2a82ff9768
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
|
2015-01-13 11:03:14 -08:00 |
|
Atlante45
|
0bd9ed469e
|
Changed NodeList::getInstance() calls to use the DM
|
2014-12-17 15:28:25 -08:00 |
|
Stephen Birarda
|
1db12453d4
|
move audio stats into member of Audio
|
2014-12-16 14:47:24 -08:00 |
|
Stephen Birarda
|
c734bc89a3
|
move the audio scope into its own class
|
2014-12-16 11:54:59 -08:00 |
|
Stephen Birarda
|
987b75d8f7
|
switch to next musak when finished
|
2014-11-19 14:52:57 -08:00 |
|
Stephen Birarda
|
45450c4fe3
|
handle offset passed in AudioInjectorOptions for mixer injections
|
2014-11-19 13:42:24 -08:00 |
|
Stephen Birarda
|
81c5f9ba5a
|
inject lobby music at a random starting point
|
2014-11-19 13:36:27 -08:00 |
|
Stephen Birarda
|
03bfaa4869
|
handle RAW stereo audio files by using stereo.raw extension
|
2014-11-19 12:20:12 -08:00 |
|
Stephen Birarda
|
fd6b9c3550
|
changes to sound class to allow caching of sounds
|
2014-11-13 10:16:42 -08:00 |
|
Stephen Birarda
|
ed9a2bf676
|
fix for AudioInjector QScriptValue conversion typos
|
2014-11-11 20:48:34 -08:00 |
|
Stephen Birarda
|
9aa950e657
|
fix audio injector cleanup for local only injectors
|
2014-11-11 17:34:03 -08:00 |
|
Stephen Birarda
|
cb5d5dd3a8
|
handle looping via AudioInjectorLocalBuffer
|
2014-11-11 16:57:25 -08:00 |
|
Stephen Birarda
|
a5a02b5f8a
|
add AudioInjectorLocalBuffer for more control
|
2014-11-11 16:34:00 -08:00 |
|
Stephen Birarda
|
0e30c65e60
|
handle cleanup of local injection, volume
|
2014-11-11 15:12:11 -08:00 |
|
Stephen Birarda
|
83529c1fed
|
fix QIODevice fail in AudioInjector by passing explicit size
|
2014-11-11 14:45:33 -08:00 |
|
Stephen Birarda
|
cd3877b584
|
handle local audio output via AudioInjector directly for control
|
2014-11-11 14:14:43 -08:00 |
|
Stephen Birarda
|
ef2c181c98
|
repairs to audio classes for Sound* to QScriptValue
|
2014-11-11 10:55:07 -08:00 |
|
Stephen Birarda
|
a8681cd5b6
|
changes to allow AudioInjectorOptions to operate as a hash from js
|
2014-11-11 10:24:21 -08:00 |
|
Stephen Birarda
|
f1a238a6c2
|
piping for local UI sounds
|
2014-11-07 10:08:09 -08:00 |
|
AndrewMeadows
|
843aaf4e95
|
Merge pull request #3747 from PhilipRosedale/master
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
|
2014-11-06 10:36:46 -08:00 |
|
AndrewMeadows
|
3f3e6ea581
|
Merge pull request #3745 from Atlante45/ignore_penumbra
Ignore penumbra
|
2014-11-06 09:59:31 -08:00 |
|
Philip Rosedale
|
54957a2fa1
|
merge fix
|
2014-11-05 21:08:24 -08:00 |
|
Philip Rosedale
|
688bd0f34f
|
first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body'
|
2014-11-05 16:58:58 -08:00 |
|
Stephen Birarda
|
663167d684
|
wait on AudioInjectors when shutting down interface
|
2014-11-05 10:37:22 -08:00 |
|
Atlante45
|
4b73a5ac35
|
Modify injected audio stream to send the ignore penumbra option
|
2014-11-05 16:22:06 +01:00 |
|
Atlante45
|
dbc81fcdca
|
Update audio injector volume every frame
|
2014-09-30 11:19:45 -07:00 |
|
Atlante45
|
5a8b9082b2
|
Check _currentSendPosition instead of overriding
|
2014-09-26 19:47:26 -07:00 |
|
Atlante45
|
6df430660d
|
Uninitialized member
|
2014-09-26 15:23:17 -07:00 |
|
Atlante45
|
a4a5d71caa
|
Merge branch 'fix_attachment_bug_with_recording' of github.com:Atlante45/hifi into radio_js
Conflicts:
libraries/audio/src/AudioInjector.cpp
|
2014-09-26 10:45:34 -07:00 |
|
Atlante45
|
72f5b9b77b
|
code cleanup
|
2014-09-25 19:19:03 -07:00 |
|
Atlante45
|
7dc07a1c51
|
Compute correct number of bytes to send when stereo
|
2014-09-25 17:54:11 -07:00 |
|
Atlante45
|
75dc26c9ff
|
Slider can moved when recording paused or stoped
|
2014-09-24 16:19:47 -07:00 |
|
Atlante45
|
1d014358ee
|
Added possibility to change AudioInjector position
|
2014-09-19 17:06:03 -07:00 |
|
Atlante45
|
619aebcd67
|
move isStereo packing to the correct position
|
2014-09-05 16:18:02 -07:00 |
|
Atlante45
|
507419162c
|
Added stereo option to the AudioInjector
|
2014-09-05 14:34:55 -07:00 |
|
Atlante45
|
90d8626615
|
Fix for audio on ACs
|
2014-08-26 14:35:35 -07:00 |
|
Atlante45
|
45ccb01297
|
Update options position and orientation correctly in the AudioInjector
|
2014-08-18 21:05:03 -07:00 |
|
wangyix
|
1b0ce510f6
|
fixed a typo, tidied up more minor details
|
2014-06-30 15:33:31 -07:00 |
|
wangyix
|
c3f571745c
|
removed more debug stuff
|
2014-06-27 17:42:22 -07:00 |
|
wangyix
|
ff438a2434
|
added seq stats for Agent,
fixed AudioInjector to do << (quint16)0 instead of
skipRawData(sizeof(quint16) to correctly allocate space for seq number;
added debug prints;
|
2014-06-27 11:23:50 -07:00 |
|
wangyix
|
cb48825561
|
added seq number to all Audio types, untested
|
2014-06-26 16:52:23 -07:00 |
|
David Rowe
|
bd4d167684
|
Make JavaScript audio samples able to be looped
Add a "loop" property to AudioInjectorOptions and provide an example JavaScript file.
|
2014-05-29 14:13:02 -07:00 |
|
Stephen Birarda
|
a8a53e35dd
|
make sure shouldStop for injector defaults to false
|
2014-05-08 11:12:16 -07:00 |
|
Stephen Birarda
|
99ee6ae8af
|
return an injector from playSound and allow user to stop it
|
2014-05-07 16:26:32 -07:00 |
|
Atlante45
|
d34e6ff864
|
Removed gettimeofday in AudioInjector
|
2014-04-16 12:01:41 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Stephen Birarda
|
60eb588e96
|
remove some unecessary null pointer checks
|
2014-03-03 11:36:01 -08:00 |
|
ZappoMan
|
59eefa314c
|
add support for Audio.startDrumSound() to allow drum sound procedural audio in JS
|
2014-03-03 03:17:16 -08:00 |
|
Stephen Birarda
|
ee9f8937e3
|
fix a silly typo
|
2014-02-19 18:03:34 -08:00 |
|
Stephen Birarda
|
7ceacd2751
|
remove blank if and fix ping reply construction
|
2014-02-07 10:24:01 -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 |
|
Andrzej Kapolka
|
1e9e298a75
|
Missing includes.
|
2014-01-29 13:47:13 -08:00 |
|