Commit Graph

70 Commits

Author SHA1 Message Date
Campbell Barton
5e841e4b4a fix for animation playback and build error when compiling without WITH_AUDASPACE 2011-07-13 17:24:33 +00:00
Campbell Barton
ae49f6deb0 fix for a leak in sound_read_sound_buffer(), used when drawing the sequencer waveform. 2011-06-27 05:03:58 +00:00
Campbell Barton
2023db70a8 cmake option to build without an audio library. 2011-06-23 09:27:56 +00:00
Joerg Mueller
e37dc17991 Fix for [#26652] "Audio Muted" in Time Line Editor is not working
-> The feature was completely missing o_O
Also fixed an ffmpeg seeking bug.
2011-04-10 22:40:37 +00:00
Campbell Barton
69bd72c3b6 quiet gcc float -> double promotion warnings. 2011-04-02 02:08:33 +00:00
Nathan Letwory
0ff06e21cd doxygen: blender/blenkernel tagged. 2011-02-27 20:40:57 +00:00
Campbell Barton
9ee1b3930f set main() argv functions to be const char *
also set minimum cmake version to 2.8
2011-02-19 12:05:20 +00:00
Campbell Barton
0955c664aa fix for warnings from Sparse static source code checker, mostly BKE/BLI and python functions.
- use NULL rather then 0 where possible (makes code & function calls more readable IMHO).
- set static variables and functions (exposed some unused vars/funcs).
- use func(void) rather then func() for definitions.
2011-02-13 10:52:18 +00:00
Joerg Mueller
01bb474d4f Audio: Function to get channel count of a sound, for [#25062] Sound Actuator - Positional Audio. 2010-12-22 16:07:57 +00:00
Campbell Barton
5a09368957 use 'const char *' for imbuf and file ops. 2010-11-19 02:14:18 +00:00
Joerg Mueller
2fbfd11f8d Fix for [#24654] Sound Actuator doesn't find the file when Blender is reopened. 2010-11-13 13:44:45 +00:00
Campbell Barton
4d37cf90b9 remove G.sce, use G.main->name instead.
Both stored the filename of the blend file, but G.sce stored the last opened file.
This will make blender act differently in some cases since a relative path to the last opened file will no longer resolve (which is correct IMHO since that file isnt open and the path might not even be valid anymore).

Tested linking with durian files and rendering to relative paths when no files is loaded however we may need to have some operators give an error if they are used on the default startup.blend.
2010-10-18 06:41:16 +00:00
Joerg Mueller
d6d1f3cb68 Reverting Cam's audio code changes from revision 32517. Part of it has been reverted by Nathan already. Cam: next time please check, why a parameter is unused before you remove it! 2010-10-17 09:01:37 +00:00
Campbell Barton
30b79ddcc6 - fixed remaining unused warnings.
- omit render code from this warning (cmake only), until render branch is merged.
- moved -Wunused-parameter warning to apply to all C code in blender (not just ./source/blender), (cmake only).
2010-10-17 06:38:56 +00:00
Nathan Letwory
fe693b4631 Revert overaggressive parameter removal: Main struct is used in audio when Jack support is enabled. 2010-10-16 14:49:56 +00:00
Campbell Barton
8268a4be71 most unused arg warnings corrected.
- removed deprecated bitmap arg from IMB_allocImBuf (plugins will need updating).
- mostly tagged UNUSED() since some of these functions look like they may need to have the arguments used later.
2010-10-16 14:32:17 +00:00
Joerg Mueller
0daa9ec5d9 Fix for [#24051] Scrubbing Timeline in VSE with Jack Audio doesn't scrub just plays the audio track
There were actually two bugs, the one reported and that the Sync Callback never has been called after someone had to add #ifdefs around the call without checking that the build systems are even configured to add the needed definition, am I right Cam? :P
2010-10-02 15:27:55 +00:00
Joerg Mueller
06d2dc86a1 svn merge -r 30954:31059 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-08-05 08:23:26 +00:00
Campbell Barton
708ef64663 include cleanup, no functional changes
- removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases)
- removed DNA_wave_types.h (never used)
- removed Main.wave
2010-08-04 04:01:27 +00:00
Joerg Mueller
86fc34b924 Audaspace:
* Added a stopCallback function that is called when the end of a sound is reached.
* Fixed the scrubbing not working.
* Minor SoundActuator cleanup.
2010-08-02 18:22:34 +00:00
Joerg Mueller
5c9cf81cf9 Audaspace:
* Fixed some compiler warnings
* Implemented device looping
* Note: Scrubbing in the sequencer is broken atm
2010-07-31 10:03:08 +00:00
Joerg Mueller
d17ce0f148 Merging revision 30567 from my GSoC branch, log: Fix for sound not possible to load when file unsaved. 2010-07-21 07:55:53 +00:00
Joerg Mueller
591ac357bb Fix for sound not possible to load when file unsaved. 2010-07-21 07:52:53 +00:00
Joerg Mueller
fd982af447 Merging revision 30434 from my GSoC branch, log: Fixed sound wave display bug for sounds that are not full length. 2010-07-17 13:41:22 +00:00
Joerg Mueller
abeecf4d72 Fixed sound wave display bug for sounds that are not full length. 2010-07-17 13:37:28 +00:00
Campbell Barton
9cbbc9d3af rename some rna properties filename --> filepath
* filename == "foo.ext"
 * filepath == "/path/to/and/including/foo.ext"

this was alredy followed in some places not not everywhere.
2010-06-02 17:58:28 +00:00
Joerg Mueller
5b4e62a977 Fix for #22135, loading ffmpeg now before .B25.blend is loaded. 2010-04-24 16:35:16 +00:00
Campbell Barton
8f1500da00 remove config.h references, was added for automake build system rev around 124-126 but isnt used by any build systems now. 2010-04-18 10:28:37 +00:00
Joerg Mueller
f61b3ac81a Fix for sequencer adding scene strips of the same scene resulting in an endless recursion. 2010-03-21 15:40:36 +00:00
Campbell Barton
546ca400d8 removed unused includes, except for physics and particle related files 2010-03-21 13:42:25 +00:00
Joerg Mueller
1e2be7a8c6 "Fix" aka implementation of [#21548] Audio doesn't work when adding scenes with audio to another scene. 2010-03-20 11:15:16 +00:00
Campbell Barton
1708ac0723 rename some functions to use easier to understand names.
'BLI_makestringcode' --> 'BLI_path_rel'
'BLI_convertstringcwd' --> 'BLI_path_cwd'
'BLI_convertstringframe' --> 'BLI_path_frame'
'BLI_convertstringframe_range' --> 'BLI_path_frame_range'
'BLI_make_cwdpath' --> 'BLI_path_cwd'
2010-03-09 17:36:23 +00:00
Campbell Barton
b356eb6a8b image re-project now uses offscreen render function and has input for render size.
unrelated changes that ended up being more trouble to commit separate...

- removed BLI_split_dirfile(), was nasty, occasionaly modifying the source string, it could create directories and used the $CWD in some cases. was only used in 2 places in filesel.c, if this gives problems can address without bringing back this function.
  renamed BLI_split_dirfile_basic --> BLI_split_dirfile

- view3d_operator_needs_opengl was being called for offscreen render when it wasnt needed.
2010-03-08 20:08:04 +00:00
Andrea Weikert
1a2ceea381 soundfile loading: fix crash with long path to the sound file (was 160 only and unchecked) 2010-02-28 11:02:06 +00:00
Campbell Barton
3307d6d509 building without jack was broken 2010-02-21 19:54:18 +00:00
Joerg Mueller
38ef2df8f7 2.5 Audio:
* Jack Transport support!
* Minor sequencer audio corrections.
2010-02-21 18:01:41 +00:00
Joerg Mueller
f09dc08523 Enabling AV-sync again. You can now choose between No sync, Frame Dropping or AV-sync. 2010-02-19 12:20:29 +00:00
Campbell Barton
b5adeb922f revert 27010, sorry but this makes playback of animation unusable & jerky, we can provide some sample files for testing. 2010-02-18 17:00:24 +00:00
Joerg Mueller
37d781b868 Basic AV Sync for forward playing. 2010-02-18 14:17:53 +00:00
Campbell Barton
2b857baeca [#20958] API: crash on mesh.update() if I unlink and link meshes with the same name twice 2010-02-10 09:30:22 +00:00
Joshua Leung
bc31b2c0f4 Bugfix #21035: PLAYBACK: Consistent crash during playback
Circumvent using RNA path resolution code for finding the volume for sound baking, since this can lead to crashes in some cases.
2010-02-08 23:07:53 +00:00
Brecht Van Lommel
ec7df03c86 Warning fixes, one actual bug found in sequencer sound wave drawing. Also
changed some malloc to MEM_mallocN while trying to track down a memory leak.
2010-02-08 13:55:31 +00:00
Joerg Mueller
9827a3e9ea 2.5 Audio:
- recode of the whole sequencer audio handling
- encode audio flag removed, instead you choose None as audio codec, added None for video codec too
- ffmpeg formats/codecs: enabled: theora, ogg, vorbis; added: matroska, flac (not working, who can fix?), mp3, wav
- sequencer wave drawing
- volume animation (now also working when mixing down to a file!)
- made sequencer strip position and length values unanimatable
2010-02-07 23:41:17 +00:00
Martin Poirier
6c584a449a -setaudio argument to force an audio device.
This also means that only -s and -S are accepted to set start frame and scene (before, it would accept anything that started with s or S, you could have done blender -b file.blend -super 1 -Science "scene 2").

We really need better argument parsing...
2010-01-31 18:32:19 +00:00
Joerg Mueller
d7d185ef4a Preparation to force an audio device via command line. Will be implemented by theeth. 2010-01-30 21:04:51 +00:00
Joerg Mueller
174eccf078 Huge new year audio commit!
* Refactored the whole audaspace library to use float as sample format over all readers.
* Added new Readers like the linear resampler, envelope, lowpass, highpass and butterworth.
* Note: The butterworth filter isn't working correctly, some bug in there... Maybe also true for the envelope.
* Added a sound to f-curve operator that behaves mostly like the soundtracker script of technoestupido.
2010-01-01 05:09:30 +00:00
Martin Poirier
f350cde18c -noaudio option to force the sound system to None.
Useful when openAL is not setup properly (*cough* pulseaudio *cough) and prevents startup.

This doesn't actually affect the userpref option, so you can set it to whatever you want, save userprefs and restart.
2009-12-07 20:39:57 +00:00
Matt Ebb
2c08e182c7 * Added control and animation of sound volume of sequence sound strips (found in properties pane)
To insert keys, use I key while hovering over the button for now, rmb clicking on the property to insert a key doesn't work (general bug for all regions except property editor - will investigate).

Doesn't convert over from old fac0 ipos on opening old files though for the time being.

* Made sequence strip names unique while I was at it, to allow strip properties to be animated properly.
2009-11-19 03:21:37 +00:00
Joerg Mueller
69995bb1b3 Sound:
* Threading buxfix letting MSVC Debug builds crash because of corrupted std::lists
* Adopted two property ranges
* Changed the mixdown volume to set the device volume instead of the volume of every sound.

I also removed the private redefinition of m_logicmgr in SCA_BasicEventManager, which was already defined protected in the parent class SCA_EventManager and thus caused a bug letting GE crash here because of an uninitialized pointer.
2009-09-26 20:03:01 +00:00
Joerg Mueller
189263e1d9 Sound:
* Fixed mixdown volume being int instead of float
* Fixed audio muting for sequencer not working
* Added 3D listener settings with RNA (not working in GE yet)
2009-09-20 17:55:03 +00:00