diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-01-31 00:04:51 +0300 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-01-31 00:04:51 +0300 |
| commit | d7d185ef4ab0070d955650454c865fdbfeab5aa6 (patch) | |
| tree | a31946662908a0f44d39d7fb5a93de4e44c845fc /source | |
| parent | 9d66bfb52461961fdbcbafb49a6562b4315d056e (diff) | |
Preparation to force an audio device via command line. Will be implemented by theeth.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_sound.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 10 | ||||
| -rw-r--r-- | source/creator/creator.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 8722485b97d..386c8158689 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -41,7 +41,7 @@ void sound_init(); void sound_exit(); -void sound_disable(); +void sound_force_device(int device); struct bSound* sound_new_file(struct Main *main, char* filename); diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 3232e2677b5..948791aa5d8 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -31,11 +31,11 @@ #include <config.h> #endif -static int sound_disabled = 0; +static int force_device = -1; -void sound_disable() +void sound_force_device(int device) { - sound_disabled = 1; + force_device = device; } void sound_init() @@ -49,8 +49,8 @@ void sound_init() specs.format = U.audioformat; specs.rate = U.audiorate; - if (sound_disabled) - device = 0; + if(force_device >= 0) + device = force_device; if(buffersize < 128) buffersize = AUD_DEFAULT_BUFFER_SIZE; diff --git a/source/creator/creator.c b/source/creator/creator.c index 9928ab0be6b..569425884ca 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -487,7 +487,7 @@ int main(int argc, char **argv) else if (BLI_strcasecmp(argv[a], "-noglsl") == 0) GPU_extensions_disable(); else if (BLI_strcasecmp(argv[a], "-noaudio") == 0) - sound_disable(); + sound_force_device(0); break; } } @@ -527,7 +527,7 @@ int main(int argc, char **argv) case 'n': case 'N': if (BLI_strcasecmp(argv[a], "-noaudio") == 0) - sound_disable(); + sound_force_device(0); break; } } |