← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/editors/sound/sound_ops.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/sound/sound_ops.c
160
160
 
161
161
#endif
162
162
 
163
 
static int sound_open_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
163
static int sound_open_invoke(bContext *C, wmOperator *op, const wmEvent *event)
164
164
{
165
165
        if (RNA_struct_property_is_set(op->ptr, "filepath"))
166
166
                return sound_open_exec(C, op);
221
221
        Sequence *seq;
222
222
        Scene *scene = CTX_data_scene(C);
223
223
        struct FCurve *fcu;
224
 
        char driven;
 
224
        bool driven;
225
225
 
226
226
        SEQ_BEGIN(scene->ed, seq)
227
227
        {
391
391
        NULL
392
392
};
393
393
 
394
 
static int sound_mixdown_check(bContext *UNUSED(C), wmOperator *op)
 
394
static bool sound_mixdown_check(bContext *UNUSED(C), wmOperator *op)
395
395
{
396
396
        AUD_Container container = RNA_enum_get(op->ptr, "container");
397
397
 
439
439
 
440
440
#endif // WITH_AUDASPACE
441
441
 
442
 
static int sound_mixdown_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
442
static int sound_mixdown_invoke(bContext *C, wmOperator *op, const wmEvent *event)
443
443
{
444
444
        if (RNA_struct_property_is_set(op->ptr, "filepath"))
445
445
                return sound_mixdown_exec(C, op);
449
449
 
450
450
#ifdef WITH_AUDASPACE
451
451
 
452
 
static int sound_mixdown_draw_check_prop(PointerRNA *UNUSED(ptr), PropertyRNA *prop)
 
452
static bool sound_mixdown_draw_check_prop(PointerRNA *UNUSED(ptr), PropertyRNA *prop)
453
453
{
454
454
        const char *prop_id = RNA_property_identifier(prop);
455
455
        return !(strcmp(prop_id, "filepath") == 0 ||
747
747
        return OPERATOR_FINISHED;
748
748
}
749
749
 
750
 
static int sound_unpack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 
750
static int sound_unpack_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
751
751
{
752
752
        Editing *ed = CTX_data_scene(C)->ed;
753
753
        bSound *sound;