sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2012-05-24 10:16:42 +00:00
parent b5c3ffe9c7
commit 39ff86eb32
1 changed files with 125 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/editors/sound/sound_ops.c
View File

@ -396,15 +396,11 @@ static int sound_mixdown_check(bContext *UNUSED(C), wmOperator *op)
const char *extension = NULL;
EnumPropertyItem *item = container_items;
while(item->identifier != NULL)
{
if(item->value == container)
{
while (item->identifier != NULL) {
if (item->value == container) {
const char **ext = snd_ext_sound;
while(*ext != NULL)
{
if(!strcmp(*ext + 1, item->name))
{
while (*ext != NULL) {
if (!strcmp(*ext + 1, item->name)) {
extension = *ext;
break;
}
@ -456,8 +452,7 @@ static int sound_mixdown_draw_check_prop(PointerRNA *UNUSED(ptr), PropertyRNA *p
const char *prop_id = RNA_property_identifier(prop);
return !(strcmp(prop_id, "filepath") == 0 ||
strcmp(prop_id, "directory") == 0 ||
strcmp(prop_id, "filename") == 0
);
strcmp(prop_id, "filename") == 0);
}
static void sound_mixdown_draw(bContext *C, wmOperator *op)
@ -471,23 +466,27 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op)
{AUD_FORMAT_S32, "S32", 0, "S32", "32 bit signed"},
{AUD_FORMAT_FLOAT32, "F32", 0, "F32", "32 bit floating point"},
{AUD_FORMAT_FLOAT64, "F64", 0, "F64", "64 bit floating point"},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem mp3_format_items[] = {
{AUD_FORMAT_S16, "S16", 0, "S16", "16 bit signed"},
{AUD_FORMAT_S32, "S32", 0, "S32", "32 bit signed"},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem ac3_format_items[] = {
{AUD_FORMAT_S16, "S16", 0, "S16", "16 bit signed"},
{AUD_FORMAT_FLOAT32, "F32", 0, "F32", "32 bit floating point"},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
#ifdef WITH_SNDFILE
static EnumPropertyItem flac_format_items[] = {
{AUD_FORMAT_S16, "S16", 0, "S16", "16 bit signed"},
{AUD_FORMAT_S24, "S24", 0, "S24", "24 bit signed"},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
#endif
static EnumPropertyItem all_codec_items[] = {
@ -498,12 +497,14 @@ static void sound_mixdown_draw(bContext *C, wmOperator *op)
{AUD_CODEC_MP3, "MP3", 0, "MP3", "MPEG-2 Audio Layer III"},
{AUD_CODEC_PCM, "PCM", 0, "PCM", "Pulse Code Modulation (RAW)"},
{AUD_CODEC_VORBIS, "VORBIS", 0, "Vorbis", "Xiph.Org Vorbis Codec"},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem ogg_codec_items[] = {
{AUD_CODEC_FLAC, "FLAC", 0, "FLAC", "Free Lossless Audio Codec"},
{AUD_CODEC_VORBIS, "VORBIS", 0, "Vorbis", "Xiph.Org Vorbis Codec"},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
uiLayout *layout = op->layout;
wmWindowManager *wm = CTX_wm_manager(C);
@ -621,7 +622,8 @@ static void SOUND_OT_mixdown(wmOperatorType *ot)
{AUD_FORMAT_S32, "S32", 0, "S32", "32 bit signed"},
{AUD_FORMAT_FLOAT32, "F32", 0, "F32", "32 bit floating point"},
{AUD_FORMAT_FLOAT64, "F64", 0, "F64", "64 bit floating point"},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem codec_items[] = {
#ifdef WITH_FFMPEG
@ -635,7 +637,8 @@ static void SOUND_OT_mixdown(wmOperatorType *ot)
#endif
{AUD_CODEC_PCM, "PCM", 0, "PCM", "Pulse Code Modulation (RAW)"},
{AUD_CODEC_VORBIS, "VORBIS", 0, "Vorbis", "Xiph.Org Vorbis Codec"},
{0, NULL, 0, NULL, NULL}};
{0, NULL, 0, NULL, NULL}
};
#endif // WITH_AUDASPACE