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:
authorPeter Schlaile <peter@schlaile.de>2006-03-07 23:01:12 +0300
committerPeter Schlaile <peter@schlaile.de>2006-03-07 23:01:12 +0300
commit327d413eb3c0c4cf07b71903eaa27e784be172c3 (patch)
tree9563098700eaa9f038dd476541ba71adf9d50e16 /source/blender/src/drawseq.c
parent9ce587e2117dcb2340d75c4bfa2b6e3c1135254c (diff)
this patch features several cleanups and bugfixes for the sequencer:
- blur works again (this was a serious bug in gamwarp...) - seperates all sequence effects into a seperate file with a clean interface - thereby fixing some obscure segfaults - seperates the scope views into a seperate file - adds float support to all effects and scope views - removes a bad level call to open_plugin_seq - FFMPEG seeking improved a lot. - FFMPEG compiles with debian sarge version cleanly - Makes hdaudio seek and resample code really work
Diffstat (limited to 'source/blender/src/drawseq.c')
-rw-r--r--source/blender/src/drawseq.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index 1712be12368..a0d3232cf2f 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -70,6 +70,8 @@
#include "BSE_view.h"
#include "BSE_drawipo.h"
#include "BSE_sequence.h"
+#include "BSE_seqeffects.h"
+#include "BSE_seqscopes.h"
#include "BSE_seqaudio.h"
#include "IMB_imbuf_types.h"
@@ -596,8 +598,14 @@ static void draw_image_seq(ScrArea *sa)
free_ibuf = 1;
}
- if (sseq->zoom > 0) zoom = sseq->zoom;
- else zoom = -1.0/sseq->zoom;
+ if (sseq->zoom > 0) {
+ zoom = sseq->zoom;
+ } else if (sseq->zoom == 0) {
+ zoom = 1.0;
+ } else {
+ zoom = -1.0/sseq->zoom;
+ }
+
/* calc location */
x1= (sa->winx-zoom*ibuf->x)/2;
y1= (sa->winy-zoom*ibuf->y)/2;
@@ -809,6 +817,7 @@ static void seq_panel_properties(short cntrl) // SEQ_HANDLER_PROPERTIES
uiDefButS(block, TOG|BIT|7, SEQ_BUT_RELOAD, "Reverse Frames", 10,30,150,19, &last_seq->flag, 0.0, 21.0, 100, 0, "Reverse frame order");
uiDefButF(block, NUM, SEQ_BUT_RELOAD, "Strobe:", 10,10,150,19, &last_seq->strobe, 1.0, 30.0, 100, 0, "Only display every nth frame");
+ uiDefButI(block, NUM, SEQ_BUT_RELOAD, "Preseek:", 10,-10,150,19, &last_seq->anim_preseek, 0.0, 50.0, 100, 0, "On MPEG-seeking preseek this many frames");
}
else if(last_seq->type==SEQ_RAM_SOUND ||