Revision: 48482
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48482
Author: campbellbarton
Date: 2012-07-02 08:12:34 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
Modified:
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
2012-07-02 08:10:05 UTC (rev 48481)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
2012-07-02 08:12:34 UTC (rev 48482)
@@ -43,7 +43,7 @@
#include <sys/wait.h>
#else
#include <io.h>
-#endif
+#endif
#include "MEM_guardedalloc.h"
#include "PIL_time.h"
@@ -88,18 +88,18 @@
static Window *g_window = NULL;
static int qualN = 0;
-#define LSHIFT (1<<0)
-#define RSHIFT (1<<1)
-#define SHIFT (LSHIFT | RSHIFT)
-#define LALT (1<<2)
-#define RALT (1<<3)
-#define ALT (LALT | RALT)
-#define LCTRL (1<<4)
-#define RCTRL (1<<5)
-#define LMOUSE (1<<16)
-#define MMOUSE (1<<17)
-#define RMOUSE (1<<18)
-#define MOUSE (LMOUSE | MMOUSE | RMOUSE)
+#define LSHIFT (1 << 0)
+#define RSHIFT (1 << 1)
+#define SHIFT (LSHIFT | RSHIFT)
+#define LALT (1 << 2)
+#define RALT (1 << 3)
+#define ALT (LALT | RALT)
+#define LCTRL (1 << 4)
+#define RCTRL (1 << 5)
+#define LMOUSE (1 << 16)
+#define MMOUSE (1 << 17)
+#define RMOUSE (1 << 18)
+#define MOUSE (LMOUSE | MMOUSE | RMOUSE)
unsigned short screen_qread(short *val, char *ascii);
@@ -109,43 +109,43 @@
char ascii;
int event = screen_qread(val, &ascii);
- switch(event){
- case LEFTMOUSE:
- if (*val) qualN |= LMOUSE;
- else qualN &= ~LMOUSE;
- break;
- case MIDDLEMOUSE:
- if (*val) qualN |= MMOUSE;
- else qualN &= ~MMOUSE;
- break;
- case RIGHTMOUSE:
- if (*val) qualN |= RMOUSE;
- else qualN &= ~RMOUSE;
- break;
- case LEFTSHIFTKEY:
- if (*val) qualN |= LSHIFT;
- else qualN &= ~LSHIFT;
- break;
- case RIGHTSHIFTKEY:
- if (*val) qualN |= RSHIFT;
- else qualN &= ~RSHIFT;
- break;
- case LEFTCTRLKEY:
- if (*val) qualN |= LCTRL;
- else qualN &= ~LCTRL;
- break;
- case RIGHTCTRLKEY:
- if (*val) qualN |= RCTRL;
- else qualN &= ~RCTRL;
- break;
- case LEFTALTKEY:
- if (*val) qualN |= LALT;
- else qualN &= ~LALT;
- break;
- case RIGHTALTKEY:
- if (*val) qualN |= RALT;
- else qualN &= ~RALT;
- break;
+ switch (event) {
+ case LEFTMOUSE:
+ if (*val) qualN |= LMOUSE;
+ else qualN &= ~LMOUSE;
+ break;
+ case MIDDLEMOUSE:
+ if (*val) qualN |= MMOUSE;
+ else qualN &= ~MMOUSE;
+ break;
+ case RIGHTMOUSE:
+ if (*val) qualN |= RMOUSE;
+ else qualN &= ~RMOUSE;
+ break;
+ case LEFTSHIFTKEY:
+ if (*val) qualN |= LSHIFT;
+ else qualN &= ~LSHIFT;
+ break;
+ case RIGHTSHIFTKEY:
+ if (*val) qualN |= RSHIFT;
+ else qualN &= ~RSHIFT;
+ break;
+ case LEFTCTRLKEY:
+ if (*val) qualN |= LCTRL;
+ else qualN &= ~LCTRL;
+ break;
+ case RIGHTCTRLKEY:
+ if (*val) qualN |= RCTRL;
+ else qualN &= ~RCTRL;
+ break;
+ case LEFTALTKEY:
+ if (*val) qualN |= LALT;
+ else qualN &= ~LALT;
+ break;
+ case RIGHTALTKEY:
+ if (*val) qualN |= RALT;
+ else qualN &= ~RALT;
+ break;
}
return(event);
@@ -156,7 +156,7 @@
-typedef struct pict{
+typedef struct pict {
struct pict *next, *prev;
char *mem;
int size;
@@ -167,11 +167,11 @@
int IB_flags;
}Pict;
-static struct ListBase _picsbase = {0,0};
+static struct ListBase _picsbase = {0, 0};
static struct ListBase *picsbase = &_picsbase;
static int fromdisk = FALSE;
-static int fstep = 1;
-static float zoomx = 1.0 , zoomy = 1.0;
+static int fstep = 1;
+static float zoomx = 1.0, zoomy = 1.0;
static double ptottime = 0.0, swaptime = 0.04;
static int pupdate_time(void)
@@ -188,46 +188,46 @@
static void toscreen(Pict *picture, struct ImBuf *ibuf)
{
-
- if (ibuf == 0){
+
+ if (ibuf == 0) {
printf("no ibuf !\n");
return;
}
- if (ibuf->rect==NULL && ibuf->rect_float) {
+ if (ibuf->rect == NULL && ibuf->rect_float) {
IMB_rect_from_float(ibuf);
imb_freerectfloatImBuf(ibuf);
}
- if (ibuf->rect==NULL)
+ if (ibuf->rect == NULL)
return;
glRasterPos2f(0.0f, 0.0f);
glDrawPixels(ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
-
+
pupdate_time();
- if(picture && (qualN & (SHIFT|LMOUSE))) {
+ if (picture && (qualN & (SHIFT | LMOUSE))) {
char str[512];
cpack(-1);
glRasterPos2f(0.02f, 0.03f);
sprintf(str, "%s | %.2f frames/s\n", picture->name, fstep /
swaptime);
BMF_DrawString(G.fonts, str);
}
-
+
window_swap_buffers(g_window);
}
-static void build_pict_list(char * first, int totframes, int fstep)
+static void build_pict_list(char *first, int totframes, int fstep)
{
- int size,pic,file;
+ int size, pic, file;
char *mem, name[512];
short val;
- struct pict * picture = 0;
+ struct pict *picture = 0;
struct ImBuf *ibuf = 0;
int count = 0;
char str[512];
- struct anim * anim;
-
+ struct anim *anim;
+
if (IMB_isanim(first)) {
anim = IMB_open_anim(first, IB_rect);
if (anim) {
@@ -236,9 +236,9 @@
toscreen(NULL, ibuf);
IMB_freeImBuf(ibuf);
}
-
- for (pic = 0; pic < IMB_anim_get_duration(anim); pic
++) {
- picture =
(Pict*)MEM_callocN(sizeof(Pict),"Pict");
+
+ for (pic = 0; pic < IMB_anim_get_duration(anim); pic++)
{
+ picture = (Pict *)MEM_callocN(sizeof(Pict),
"Pict");
picture->anim = anim;
picture->frame = pic;
picture->IB_flags = IB_rect;
@@ -246,16 +246,16 @@
picture->name = strdup(str);
BLI_addtail(picsbase, picture);
}
- }
+ }
else printf("couldn't open anim %s\n", first);
- }
+ }
else {
-
- strcpy(name,first);
-
+
+ strcpy(name, first);
+
pupdate_time();
ptottime = 1.0;
-
+
/*
O_DIRECT
If set, all reads and writes on the resulting file descriptor will
@@ -265,13 +265,13 @@
information about how to determine the alignment constraints.
O_DIRECT is a Silicon Graphics extension and is only supported on
local EFS and XFS file systems.
-*/
-
- while(IMB_ispic(name) && totframes){
- file = open(name, O_BINARY|O_RDONLY, 0);
+ */
+
+ while (IMB_ispic(name) && totframes) {
+ file = open(name, O_BINARY | O_RDONLY, 0);
if (file < 0) return;
- picture = (struct pict*)MEM_callocN(sizeof(struct
pict), "picture");
- if (picture == 0){
+ picture = (struct pict *)MEM_callocN(sizeof(struct
pict), "picture");
+ if (picture == 0) {
printf("Not enough memory for pict struct \n");
close(file);
return;
@@ -286,34 +286,35 @@
picture->size = size;
picture->IB_flags = IB_rect;
-
+
if (fromdisk == FALSE) {
- mem=(char *)MEM_mallocN(size, "build pic list");
- if (mem==0){
+ mem = (char *)MEM_mallocN(size, "build pic
list");
+ if (mem == 0) {
printf("Couldn't get memory\n");
close(file);
MEM_freeN(picture);
return;
}
-
- if (read(file,mem,size) != size){
- printf("Error while reading %s\n",name);
+
+ if (read(file, mem, size) != size) {
+ printf("Error while reading %s\n",
name);
close(file);
MEM_freeN(picture);
MEM_freeN(mem);
return;
}
- } else mem = 0;
-
+ }
+ else mem = 0;
+
picture->mem = mem;
picture->name = strdup(name);
close(file);
- BLI_addtail(picsbase,picture);
+ BLI_addtail(picsbase, picture);
count++;
-
+
pupdate_time();
-
- if (ptottime > 1.0) {
+
+ if (ptottime > 1.0) {
if (picture->mem) ibuf =
IMB_ibImageFromMemory((int *) picture->mem, picture->size, picture->IB_flags);
else ibuf = IMB_loadiffname(picture->name,
picture->IB_flags);
if (ibuf) {
@@ -323,14 +324,14 @@
pupdate_time();
ptottime = 0.0;
}
-
+
BLI_newname(name, +fstep);
-
- while(qtest()){
- switch(qreadN(&val)){
- case ESCKEY:
- if (val) return;
- break;
+
+ while (qtest()) {
+ switch (qreadN(&val)) {
+ case ESCKEY:
+ if (val) return;
+ break;
}
}
totframes--;
@@ -350,57 +351,59 @@
short pingpong = FALSE, direction = 1, next = 1, turbo = FALSE, /*
doubleb = TRUE, */ noskip = FALSE;
int sizex, sizey, ofsx, ofsy, i;
/* This was done to disambiguate the name for use under c++. */
- struct anim * anim = 0;
- int start_x= 0, start_y= 0;
- int sfra= -1;
- int efra= -1;
+ struct anim *anim = 0;
+ int start_x = 0, start_y = 0;
+ int sfra = -1;
+ int efra = -1;
int totblock;
-
+
while (argc > 1) {
- if (argv[1][0] == '-'){
- switch(argv[1][1]) {
+ if (argv[1][0] == '-') {
+ switch (argv[1][1]) {
case 'm':
fromdisk = TRUE;
break;
case 'p':
- if (argc>3) {
- start_x= atoi(argv[2]);
- start_y= atoi(argv[3]);
- argc-= 2;
- argv+= 2;
- } else {
+ if (argc > 3) {
+ start_x = atoi(argv[2]);
+ start_y = atoi(argv[3]);
+ argc -= 2;
+ argv += 2;
+ }
+ else {
printf("too few arguments for
-p (need 2): skipping\n");
}
break;
case 'f':
- if (argc>3) {
+ if (argc > 3) {
double fps = atof(argv[2]);
- double fps_base= atof(argv[3]);
+ double fps_base = atof(argv[3]);
if (fps == 0) {
fps = 1;
printf("invalid fps,"
"forcing 1\n");
}
swaptime = fps_base / fps;
- argc-= 2;
- argv+= 2;
- } else {
+ argc -= 2;
+ argv += 2;
+ }
+ else {
printf("too few arguments for
-f (need 2): skipping\n");
}
break;
case 's':
- sfra= MIN2(MAXFRAME, MAX2(1,
atoi(argv[2]) ));
+ sfra = MIN2(MAXFRAME, MAX2(1,
atoi(argv[2]) ));
argc--;
argv++;
break;
case 'e':
- efra= MIN2(MAXFRAME, MAX2(1,
atoi(argv[2]) ));
+ efra = MIN2(MAXFRAME, MAX2(1,
atoi(argv[2]) ));
argc--;
argv++;
break;
case 'j':
- fstep= MIN2(MAXFRAME, MAX2(1,
atoi(argv[2])));
- swaptime*= fstep;
+ fstep = MIN2(MAXFRAME, MAX2(1,
atoi(argv[2])));
+ swaptime *= fstep;
argc--;
argv++;
break;
@@ -410,17 +413,18 @@
}
argc--;
argv++;
- } else break;
+ }
+ else break;
}
-
+
#ifdef WITH_QUICKTIME
-#if defined (_WIN32) || defined (__APPLE__)
+#if defined(_WIN32) || defined(__APPLE__)
/* Initialize QuickTime */
#ifndef noErr
#define noErr 0
#endif
-#ifdef _WIN32
+#ifdef _WIN32
if (InitializeQTML(0) != noErr)
G.have_quicktime = FALSE;
else
@@ -430,15 +434,15 @@
G.have_quicktime = FALSE;
else
#endif /* _WIN32 || __APPLE__ */
- G.have_quicktime = TRUE;
+ G.have_quicktime = TRUE;
#endif /* WITH_QUICKTIME */
- if (argc > 1) strcpy(name,argv[1]);
+ if (argc > 1) strcpy(name, argv[1]);
else {
BLI_getwdN(name);
- if (name[strlen(name)-1] != '/') strcat(name,"/");
+ if (name[strlen(name) - 1] != '/') strcat(name, "/");
}
-
+
if (IMB_isanim(name)) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
