Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2009-09-20 18:14:40 +0400
committerThomas Dinges <blender@dingto.org>2009-09-20 18:14:40 +0400
commitec8c47f0c08bf500bbf5d5fe6a833942c7710d29 (patch)
tree97383297322b2b13be894840002ac10eb6c7ae88 /release/ui
parent1185be4355e6f0d812b7a8909ab3677aeec694ed (diff)
* UI for recent sound commit.
Diffstat (limited to 'release/ui')
-rw-r--r--release/ui/buttons_scene.py2
-rw-r--r--release/ui/space_time.py11
2 files changed, 7 insertions, 6 deletions
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index c25e6352aaf..6f283bb5d5b 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -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"
diff --git a/release/ui/space_time.py b/release/ui/space_time.py
index bb82eea3272..b51b1d8af79 100644
--- a/release/ui/space_time.py
+++ b/release/ui/space_time.py
@@ -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"