Revision: 23365
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23365
Author:   dingto
Date:     2009-09-20 16:14:40 +0200 (Sun, 20 Sep 2009)

Log Message:
-----------
* UI for recent sound commit. 

Modified Paths:
--------------
    trunk/blender/release/ui/buttons_scene.py
    trunk/blender/release/ui/space_time.py

Modified: trunk/blender/release/ui/buttons_scene.py
===================================================================
--- trunk/blender/release/ui/buttons_scene.py   2009-09-20 14:00:00 UTC (rev 
23364)
+++ trunk/blender/release/ui/buttons_scene.py   2009-09-20 14:14:40 UTC (rev 
23365)
@@ -323,8 +323,10 @@
 
                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"

Modified: trunk/blender/release/ui/space_time.py
===================================================================
--- trunk/blender/release/ui/space_time.py      2009-09-20 14:00:00 UTC (rev 
23364)
+++ trunk/blender/release/ui/space_time.py      2009-09-20 14:14:40 UTC (rev 
23365)
@@ -9,7 +9,6 @@
                
                st = context.space_data
                scene = context.scene
-               rd = context.scene.render_data
                tools = context.tool_settings
                screen = context.screen
 
@@ -55,7 +54,7 @@
                        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 @@
                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 @@
                
                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"


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to