* UI for recent sound commit.
authorThomas Dinges <blender@dingto.org>
Sun, 20 Sep 2009 14:14:40 +0000 (14:14 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 20 Sep 2009 14:14:40 +0000 (14:14 +0000)
release/ui/buttons_scene.py
release/ui/space_time.py

index c25e6352aaf1bc38b32052df3907dfac0f51a910..6f283bb5d5bc3dd63ee5430df0cd3728b7fcdb51 100644 (file)
@@ -323,8 +323,10 @@ class SCENE_PT_encoding(RenderButtonsPanel):
 
                col = split.column()
                col.itemR(rd, "ffmpeg_audio_bitrate")
+               col.itemR(rd, "ffmpeg_audio_mixrate")
                col = split.column()
                col.itemR(rd, "ffmpeg_multiplex_audio")
+               col.itemR(rd, "ffmpeg_audio_volume")
 
 class SCENE_PT_antialiasing(RenderButtonsPanel):
        __label__ = "Anti-Aliasing"
index bb82eea32726a117e937286e2bd6eaf53c223654..b51b1d8af79e5a25e588d666b5ee93175ddf2ad7 100644 (file)
@@ -9,7 +9,6 @@ class TIME_HT_header(bpy.types.Header):
                
                st = context.space_data
                scene = context.scene
-               rd = context.scene.render_data
                tools = context.tool_settings
                screen = context.screen
 
@@ -55,7 +54,7 @@ class TIME_HT_header(bpy.types.Header):
                        subsub = row.row()
                        subsub.itemR(tools, "record_with_nla", toggle=True)
                        
-               layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
+               layout.itemR(scene, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
                
                layout.itemS()
                
@@ -112,7 +111,7 @@ class TIME_MT_playback(bpy.types.Menu):
                layout = self.layout
                
                st = context.space_data
-               rd = context.scene.render_data
+               scene = context.scene
                
                layout.itemR(st, "play_top_left")
                layout.itemR(st, "play_all_3d")
@@ -127,10 +126,10 @@ class TIME_MT_playback(bpy.types.Menu):
                
                layout.itemS()
                
-               layout.itemR(rd, "sync_audio", icon='ICON_SPEAKER')
+               layout.itemR(scene, "sync_audio", icon='ICON_SPEAKER')
+               layout.itemR(scene, "mute_audio")
+               layout.itemR(scene, "scrub_audio")
 
-               
-               
 class TIME_MT_autokey(bpy.types.Menu):
        __space_type__ = 'TIMELINE'
        __label__ = "Auto-Keyframing Mode"