Sound:

[blender.git] / source / blender / makesdna / DNA_scene_types.h

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 73afc3d1a5310081599b40451f014fb22f8cf518..b41cd79b6d416c06b0f1cb6671a74c3a9c26dde9 100644 (file)
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -93,6 +93,8 @@ typedef struct FFMpegCodecData {
        int audio_codec;
        int video_bitrate;
        int audio_bitrate;
+       int audio_mixrate;
+       int audio_volume;
        int gop_size;
        int flags;
 
@@ -106,8 +108,8 @@ typedef struct FFMpegCodecData {
 
 
 typedef struct AudioData {
-       int mixrate;
-       float main;             /* Main mix in dB */
+       int mixrate; // 2.5: now in FFMpegCodecData: audio_mixrate
+       float main; // 2.5: now in FFMpegCodecData: audio_volume
        short flag;
        short pad[3];
 } AudioData;
@@ -170,7 +172,6 @@ typedef struct RenderData {
        struct AviCodecData *avicodecdata;
        struct QuicktimeCodecData *qtcodecdata;
        struct FFMpegCodecData ffcodecdata;
-       struct AudioData audio; /* new in 2.5 */
        
        int cfra, sfra, efra;   /* frames as in 'images' */
        int psfra, pefra;               /* start+end frames of preview range */
@@ -697,7 +698,7 @@ typedef struct Scene {
        /* migrate or replace? depends on some internal things... */
        /* no, is on the right place (ton) */
        struct RenderData r;
-       struct AudioData audio;         /* DEPRECATED 2.5 */
+       struct AudioData audio;
        
        ListBase markers;
        ListBase transform_spaces;