[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22537] branches/blender2.5/blender: 2. 5 Timeline:

[Thomas Dinges]

Revision: 22537
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22537
Author:   dingto
Date:     2009-08-17 00:01:20 +0200 (Mon, 17 Aug 2009)

Log Message:
-----------
2.5 Timeline:
* Finally the header and menus are done via python.
* Added RNA for sync audio. 

Note: This is just a basic working version in python. It needs more work and some layout changes.
Joshua: Feel free to adjust this further :)

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_time.py
    branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c

Modified: branches/blender2.5/blender/release/ui/space_time.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_time.py	2009-08-16 21:05:57 UTC (rev 22536)
+++ branches/blender2.5/blender/release/ui/space_time.py	2009-08-16 22:01:20 UTC (rev 22537)
@@ -9,6 +9,7 @@
 		
 		st = context.space_data
 		scene = context.scene
+		rd = context.scene.render_data
 		tools = context.tool_settings
 		screen = context.screen
 
@@ -47,10 +48,11 @@
 			sub = row.row()
 			sub.scale_x = 2.0
 			sub.itemO("screen.animation_play", text="", icon='ICON_PAUSE')
-		
 		row.item_booleanO("screen.keyframe_jump", "next", True, text="", icon='ICON_NEXT_KEYFRAME')
 		row.item_booleanO("screen.frame_jump", "end", True, text="", icon='ICON_FF')
 		
+		layout.itemS()
+		
 		row = layout.row(align=True)
 		row.itemR(tools, "enable_auto_key", text="", toggle=True, icon='ICON_REC')
 		sub = row.row()
@@ -59,6 +61,10 @@
 		
 		layout.itemS()
 		
+		layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER')
+		
+		layout.itemS()
+		
 		row = layout.row(align=True)
 		row.itemR(scene, "active_keyingset")
 		row.itemO("anim.insert_keyframe", text="", icon="ICON_KEY_HLT")

Modified: branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_time/space_time.c	2009-08-16 21:05:57 UTC (rev 22536)
+++ branches/blender2.5/blender/source/blender/editors/space_time/space_time.c	2009-08-16 22:01:20 UTC (rev 22537)
@@ -270,7 +270,7 @@
 
 /* ************************ header time area region *********************** */
 
-//#define PY_HEADER
+#define PY_HEADER
 /* add handlers, stuff you only do once or on area/region changes */
 static void time_header_area_init(wmWindowManager *wm, ARegion *ar)
 {

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-08-16 21:05:57 UTC (rev 22536)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2009-08-16 22:01:20 UTC (rev 22537)
@@ -1421,6 +1421,11 @@
 	RNA_def_property_ui_text(prop, "Fields Still", "Disable the time difference between fields.");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 	
+	prop= RNA_def_property(srna, "sync_audio", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "audio.flag", AUDIO_SYNC);
+	RNA_def_property_ui_text(prop, "Sync Audio", "Play back and sync with audio from Sequence Editor");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+	
 	prop= RNA_def_property(srna, "render_shadows", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", R_SHADOW);
 	RNA_def_property_ui_text(prop, "Render Shadows", "Calculate shadows while rendering.");