[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48126] trunk/blender/source/blender/ editors/space_sequencer/sequencer_draw.c: move the frame length to the end for sequence drawing (mango request, since often the name is clipped out entirely so only then length is seen)

Campbell Barton ideasman42 at gmail.com
Wed Jun 20 18:34:22 CEST 2012


Revision: 48126
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48126
Author:   campbellbarton
Date:     2012-06-20 16:34:15 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
move the frame length to the end for sequence drawing (mango request, since often the name is clipped out entirely so only then length is seen)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2012-06-20 15:30:49 UTC (rev 48125)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2012-06-20 16:34:15 UTC (rev 48126)
@@ -530,67 +530,67 @@
 		name = give_seqname(seq);
 
 	if (seq->type == SEQ_TYPE_META || seq->type == SEQ_TYPE_ADJUSTMENT) {
-		BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
+		BLI_snprintf(str, sizeof(str), "%s | %d", name, seq->len);
 	}
 	else if (seq->type == SEQ_TYPE_SCENE) {
 		if (seq->scene) {
 			if (seq->scene_camera) {
-				BLI_snprintf(str, sizeof(str), "%d | %s: %s (%s)",
-				             seq->len, name, seq->scene->id.name + 2, ((ID *)seq->scene_camera)->name + 2);
+				BLI_snprintf(str, sizeof(str), "%s: %s (%s) | %d",
+				             name, seq->scene->id.name + 2, ((ID *)seq->scene_camera)->name + 2, seq->len);
 			}
 			else {
-				BLI_snprintf(str, sizeof(str), "%d | %s: %s",
-				             seq->len, name, seq->scene->id.name + 2);
+				BLI_snprintf(str, sizeof(str), "%s: %s | %d",
+				             name, seq->scene->id.name + 2, seq->len);
 			}
 		}
 		else {
-			BLI_snprintf(str, sizeof(str), "%d | %s",
-			             seq->len, name);
+			BLI_snprintf(str, sizeof(str), "%s | %d",
+			             name, seq->len);
 		}
 	}
 	else if (seq->type == SEQ_TYPE_MOVIECLIP) {
 		if (seq->clip && strcmp(name, seq->clip->id.name + 2) != 0) {
-			BLI_snprintf(str, sizeof(str), "%d | %s: %s",
-			             seq->len, name, seq->clip->id.name + 2);
+			BLI_snprintf(str, sizeof(str), "%s: %s | %d",
+			             name, seq->clip->id.name + 2, seq->len);
 		}
 		else {
-			BLI_snprintf(str, sizeof(str), "%d | %s",
-			             seq->len, name);
+			BLI_snprintf(str, sizeof(str), "%s | %d",
+			             name, seq->len);
 		}
 	}
 	else if (seq->type == SEQ_TYPE_MASK) {
 		if (seq->mask && strcmp(name, seq->mask->id.name + 2) != 0) {
-			BLI_snprintf(str, sizeof(str), "%d | %s: %s",
-			             seq->len, name, seq->mask->id.name + 2);
+			BLI_snprintf(str, sizeof(str), "%s: %s | %d",
+			             name, seq->mask->id.name + 2, seq->len);
 		}
 		else {
-			BLI_snprintf(str, sizeof(str), "%d | %s",
-			             seq->len, name);
+			BLI_snprintf(str, sizeof(str), "%s | %d",
+			             name, seq->len);
 		}
 	}
 	else if (seq->type == SEQ_TYPE_MULTICAM) {
-		BLI_snprintf(str, sizeof(str), "Cam | %s: %d",
+		BLI_snprintf(str, sizeof(str), "Cam %s: %d",
 		             name, seq->multicam_source);
 	}
 	else if (seq->type == SEQ_TYPE_IMAGE) {
-		BLI_snprintf(str, sizeof(str), "%d | %s: %s%s",
-		             seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
+		BLI_snprintf(str, sizeof(str), "%s: %s%s | %d",
+		             name, seq->strip->dir, seq->strip->stripdata->name, seq->len);
 	}
 	else if (seq->type & SEQ_TYPE_EFFECT) {
-		BLI_snprintf(str, sizeof(str), "%d | %s",
-			             seq->len, name);
+		BLI_snprintf(str, sizeof(str), "%s | %d",
+			             name, seq->len);
 	}
 	else if (seq->type == SEQ_TYPE_SOUND_RAM) {
 		if (seq->sound)
-			BLI_snprintf(str, sizeof(str), "%d | %s: %s",
-			             seq->len, name, seq->sound->name);
+			BLI_snprintf(str, sizeof(str), "%s: %s | %d",
+			             name, seq->sound->name, seq->len);
 		else
-			BLI_snprintf(str, sizeof(str), "%d | %s",
-			             seq->len, name);
+			BLI_snprintf(str, sizeof(str), "%s | %d",
+			             name, seq->len);
 	}
 	else if (seq->type == SEQ_TYPE_MOVIE) {
-		BLI_snprintf(str, sizeof(str), "%d | %s: %s%s",
-		             seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
+		BLI_snprintf(str, sizeof(str), "%s: %s%s | %d",
+		             name, seq->strip->dir, seq->strip->stripdata->name, seq->len);
 	}
 	
 	if (seq->flag & SELECT) {




More information about the Bf-blender-cvs mailing list