[Bf-blender-cvs] [8fa15d1] master: Correction to previous commit: it was unable to change format for some containers
Sergey Sharybin
noreply at git.blender.org
Fri Feb 28 09:08:20 CET 2014
Commit: 8fa15d105078251dc55909a85dfd9823c3907bce
Author: Sergey Sharybin
Date: Fri Feb 28 14:07:23 2014 +0600
https://developer.blender.org/rB8fa15d105078251dc55909a85dfd9823c3907bce
Correction to previous commit: it was unable to change format for some containers
===================================================================
M source/blender/editors/sound/sound_ops.c
===================================================================
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index 1979379..88891c9 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -532,8 +532,9 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op)
#ifdef WITH_SNDFILE
RNA_def_property_clear_flag(prop_format, PROP_HIDDEN);
RNA_def_property_enum_items(prop_format, flac_format_items);
-#endif
+#else
RNA_enum_set(op->ptr, "format", AUD_FORMAT_S16);
+#endif
break;
case AUD_CONTAINER_MATROSKA:
RNA_def_property_clear_flag(prop_codec, PROP_HIDDEN);
@@ -556,7 +557,6 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op)
case AUD_CODEC_MP3:
RNA_def_property_enum_items(prop_format, mp3_format_items);
RNA_def_property_clear_flag(prop_format, PROP_HIDDEN);
- RNA_enum_set(op->ptr, "format", AUD_FORMAT_S16);
break;
case AUD_CODEC_PCM:
RNA_def_property_flag(prop_bitrate, PROP_HIDDEN);
@@ -581,13 +581,11 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op)
RNA_def_property_enum_items(prop_format, mp3_format_items);
RNA_def_property_enum_items(prop_codec, all_codec_items);
RNA_enum_set(op->ptr, "codec", AUD_CODEC_MP3);
- RNA_enum_set(op->ptr, "format", AUD_FORMAT_S16);
break;
case AUD_CONTAINER_OGG:
RNA_def_property_clear_flag(prop_codec, PROP_HIDDEN);
RNA_def_property_enum_items(prop_codec, ogg_codec_items);
RNA_enum_set(op->ptr, "format", AUD_FORMAT_S16);
- RNA_enum_set(op->ptr, "codec", AUD_CODEC_VORBIS);
break;
case AUD_CONTAINER_WAV:
RNA_def_property_flag(prop_bitrate, PROP_HIDDEN);
More information about the Bf-blender-cvs
mailing list