Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-11 15:58:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

148 commits

Author SHA1 Message Date
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
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Stephen Birarda
5b272bfd6a fix random UUID creation for injected audio 2014-01-05 17:09:57 -08:00
Stephen Birarda
a61e214c9a simplify loopback trigger for injected audio 2014-01-03 10:16:59 -08:00
Stephen Birarda
6f60a22c07 fix copyright years 2014-01-03 09:50:13 -08:00
Stephen Birarda
f24eff33fe open up ASI playSound method to ScriptEngine 2014-01-03 09:38:05 -08:00
Stephen Birarda
443c94a88f repairs to AudioMixer and audio injection flow 2014-01-02 17:15:46 -08:00
Stephen Birarda
594bd58774 add AudioScriptingInterface to expose playSound to JS 2014-01-02 15:35:28 -08:00
Stephen Birarda
8cc4a33ad3 repair AudioInjector threading 2014-01-02 13:35:56 -08:00
Stephen Birarda
3a45fb8533 cleanup new API for sound injection 2014-01-02 12:31:01 -08:00
Stephen Birarda
674c19a570 leverage new AudioInjector API for throw and catch sounds 2014-01-02 12:17:18 -08:00
Stephen Birarda
3123b83d0b audio API changes to allow multiple injections of single sound 2014-01-02 11:53:33 -08:00
Stephen Birarda
0446aeb4d3 loopback injected sound effects to the node by default 2013-12-19 15:44:47 -08:00
Stephen Birarda
80a2bd0844 move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector 2013-12-19 15:44:04 -08:00
Stephen Birarda
8681e66ed3 default to max volume, add a bool flag for loopback 2013-12-19 15:30:33 -08:00
Stephen Birarda
534010347b add a volume setter to the AudioInjector 2013-12-19 15:28:10 -08:00
Stephen Birarda
7ed609633a complete the test injector stub 2013-12-19 15:23:31 -08:00
Stephen Birarda
bdf8c4b9b2 implement threaded send for AudioInjector 2013-12-19 15:17:03 -08:00
Stephen Birarda
2409b5f784 complete inital test of AudioInjector API 2013-12-19 13:46:37 -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
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
Stephen Birarda
b3909da5f0 audio injector requires two UUIDs 2013-10-18 17:37:25 -07:00
Stephen Birarda
4fe2e25bf0 add a stream identifier back to the audio injector 2013-10-18 17:36:59 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
Stephen Birarda
ef655f5e78 clear agent audio injector after send, don't send if empty 2013-10-16 11:50:19 -07:00
Stephen Birarda
0eae0f129c allow audio injection from javascript 2013-10-11 17:37:48 -07:00
Stephen Birarda
0477ad79dd add methods to set/get samples and volume 2013-10-03 13:22:02 -07:00
Stephen Birarda
1f8031770b fix quoted includes in AudioInjector.cpp 2013-08-05 10:28:12 -07:00
Stephen Birarda
8f876b91ae changes for stub pull request of assignee work 2013-08-05 10:06:50 -07:00
Stephen Birarda
9834c10610 movement to use AudioInjector classes in Operative code 2013-07-11 17:47:35 -07:00
Stephen Birarda
d6601ad333 resolve conflicts on merge with upstream master 2013-07-11 14:33:50 -07:00
Stephen Birarda
38a33e0283 couple more type squishes 2013-07-11 11:11:39 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
Stephen Birarda
3cee9b1ab5 remove redundant UDPSocket include 2013-07-08 17:59:27 -07:00
Stephen Birarda
8f7a3f3567 use packet version helpers for PACKET_TYPE_INJECT_AUDIO 2013-07-08 14:07:34 -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
cece4de90e fix the default orientation for an injector 2013-06-27 11:14:22 -07:00
Andrzej Kapolka
db729a04aa Converted double timestamps to long long (64 bit integers), fixed bug with 
updating agent timestamps.
 2013-06-13 11:11:59 -07:00
Stephen Birarda
beb415a851 correct buffer byte constants in AudioRingBuffer 2013-06-05 12:45:07 -07:00
Stephen Birarda
d64b46a6b2 add specialized parsing of audio data to ARB subclasses 2013-06-05 12:11:56 -07:00
Stephen Birarda
4cb00ad54b clean up AudioRingBuffer by subclassing 2013-06-05 11:51:21 -07:00
Stephen Birarda
7d3d8f8b43 rewrite the AudioInjector to send an orientation quaternion instead of bearing 2013-06-04 15:31:11 -07:00
Stephen Birarda
3f7fbb5c1e change injector from cube to sphere 2013-06-04 10:57:53 -07:00
Stephen Birarda
c55b6a20d7 parse the desired cube side length for injected audio source 2013-06-03 15:38:12 -07:00
Stephen Birarda
842ef820ab use a more consistent method to clock the injector thread 2013-05-23 13:56:16 -07:00
Stephen Birarda
00998ba75e some fixes for new audio injector setup 2013-05-17 15:42:37 -07:00
Stephen Birarda
d72b931ebe attach stream identifier to AudioRingBuffer to match incoming data in audio mixer 2013-05-17 14:57:10 -07:00
Stephen Birarda
b7b39c2a6e have addOrUpdateAgent return a pointer to the agent instead of a bool 2013-05-17 14:03:15 -07:00
Stephen Birarda
442d658835 switch from 255 to 0xFF for max volume constant 2013-05-16 14:10:48 -07:00
Stephen Birarda
a37b451993 add constants for volume byte values 2013-05-16 14:09:50 -07:00
Stephen Birarda
f6cc40362c hook the injector up to the change AudioInjector setup 2013-05-16 13:10:48 -07:00
Stephen Birarda
a2f8d8ae25 break audio out of shared into its own library 2013-05-16 13:00:40 -07:00
Renamed from libraries/shared/src/AudioInjector.cpp (Browse further)