[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46965] trunk/blender/source/blender/ editors/sound/sound_ops.c: fix for building without audaspace
Campbell Barton
ideasman42 at gmail.com
Thu May 24 12:15:38 CEST 2012
Revision: 46965
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46965
Author: campbellbarton
Date: 2012-05-24 10:15:38 +0000 (Thu, 24 May 2012)
Log Message:
-----------
fix for building without audaspace
Modified Paths:
--------------
trunk/blender/source/blender/editors/sound/sound_ops.c
Modified: trunk/blender/source/blender/editors/sound/sound_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sound/sound_ops.c 2012-05-24 09:47:29 UTC (rev 46964)
+++ trunk/blender/source/blender/editors/sound/sound_ops.c 2012-05-24 10:15:38 UTC (rev 46965)
@@ -362,6 +362,7 @@
return OPERATOR_FINISHED;
}
+#ifdef WITH_AUDASPACE
static EnumPropertyItem container_items[] = {
#ifdef WITH_FFMPEG
{AUD_CONTAINER_AC3, "AC3", 0, "ac3", "Dolby Digital ATRAC 3"},
@@ -374,7 +375,8 @@
#endif
{AUD_CONTAINER_OGG, "OGG", 0, "ogg", "Xiph.Org Ogg Container"},
{AUD_CONTAINER_WAV, "WAV", 0, "wav", "Waveform Audio File Format"},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
static const char *snd_ext_sound[] = {
".ac3",
@@ -437,6 +439,8 @@
return FALSE;
}
+#endif // WITH_AUDASPACE
+
static int sound_mixdown_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
if (RNA_struct_property_is_set(op->ptr, "filepath"))
@@ -643,9 +647,9 @@
/* api callbacks */
ot->exec = sound_mixdown_exec;
ot->invoke = sound_mixdown_invoke;
- ot->check = sound_mixdown_check;
#ifdef WITH_AUDASPACE
+ ot->check = sound_mixdown_check;
ot->ui = sound_mixdown_draw;
#endif
/* flags */
More information about the Bf-blender-cvs
mailing list