[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13844] trunk/blender/source/blender/src: == Sequencer ==

[Peter Schlaile]

Revision: 13844
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13844
Author:   schlaile
Date:     2008-02-24 14:26:27 +0100 (Sun, 24 Feb 2008)

Log Message:
-----------
== Sequencer ==

* Fix button drawing in header finally, sigh.
* Fixes: 
  [#8262] Hide Meta Strip does not hide contained Audio

Modified Paths:
--------------
    trunk/blender/source/blender/src/header_seq.c
    trunk/blender/source/blender/src/seqaudio.c

Modified: trunk/blender/source/blender/src/header_seq.c
===================================================================
--- trunk/blender/source/blender/src/header_seq.c	2008-02-24 12:57:11 UTC (rev 13843)
+++ trunk/blender/source/blender/src/header_seq.c	2008-02-24 13:26:27 UTC (rev 13844)
@@ -720,9 +720,9 @@
 			minchan = -BLI_countlist(&((Editing*)G.scene->ed)->metastack);
 
 		uiDefButS(block, NUM, B_REDR, "Chan:",
-		xco, 0, 3.5 * XIC,YIC,
-		&sseq->chanshown, minchan, MAXSEQ, 0, 0,
-		"The channel number shown in the image preview. 0 is the result of all strips combined.");
+			  xco, 0, 3.5 * XIC,YIC,
+			  &sseq->chanshown, minchan, MAXSEQ, 0, 0,
+			  "The channel number shown in the image preview. 0 is the result of all strips combined.");
 		
 		xco+= 8 + XIC*3.5;
 
@@ -760,13 +760,18 @@
 		}
 	} else {
 		/* ZOOM and BORDER */
-		xco+= 8;
-		uiBlockBeginAlign(block);
-		uiDefIconButI(block, TOG, B_VIEW2DZOOM, ICON_VIEWZOOM,	xco+=XIC,0,XIC,YIC, &viewmovetemp, 0, 0, 0, 0, "Zooms view in and out (Ctrl MiddleMouse)");
-		uiDefIconBut(block, BUT, B_IPOBORDER, ICON_BORDERMOVE,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Zooms view to fit area");
-		uiBlockEndAlign(block);
-
-		xco+= 16;
+		uiDefIconButI(block, TOG, B_VIEW2DZOOM, 
+			      ICON_VIEWZOOM,	
+			      xco,0,XIC,YIC, &viewmovetemp, 
+			      0, 0, 0, 0, 
+			      "Zooms view in and out (Ctrl MiddleMouse)");
+		xco += XIC;
+		uiDefIconBut(block, BUT, B_IPOBORDER, 
+			     ICON_BORDERMOVE,	
+			     xco,0,XIC,YIC, 0, 
+			     0, 0, 0, 0, 
+			     "Zooms view to fit area");
+		xco += 8 + XIC;
 	}
 
 	uiDefBut(block, BUT, B_SEQCLEAR, "Refresh", xco,0,3*XIC,YIC, 0, 0, 0, 0, 0, "Clears all buffered images in memory");

Modified: trunk/blender/source/blender/src/seqaudio.c
===================================================================
--- trunk/blender/source/blender/src/seqaudio.c	2008-02-24 12:57:11 UTC (rev 13843)
+++ trunk/blender/source/blender/src/seqaudio.c	2008-02-24 13:26:27 UTC (rev 13844)
@@ -362,7 +362,8 @@
 			   Uint8 *sstream, int len)
 {
 	while(seq) {
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_META &&
+		    (!(seq->flag & SEQ_MUTE))) {
 			audio_fill_seq(seq->seqbase.first,
 				       mixdown, sstream, len);
 		}