Support displaying metadata for images in sequencer preview windows (not

[blender.git] / source / blender / makesdna / DNA_space_types.h

diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 82ab0cce30c5ec8f8267b485feca742269f96d1c..d6785da74862847710902ad72ec139867f908eef 100644 (file)
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -50,28 +50,21 @@
 struct ID;
 struct Text;
 struct Script;
-struct bSound;
-struct ImBuf;
 struct Image;
 struct Scopes;
 struct Histogram;
 struct SpaceIpo;
-struct BlendHandle;
 struct bNodeTree;
-struct uiBlock;
 struct FileList;
 struct bGPdata;
 struct bDopeSheet;
 struct FileSelectParams;
 struct FileLayout;
-struct bScreen;
-struct Scene;
 struct wmOperator;
 struct wmTimer;
 struct MovieClip;
 struct MovieClipScopes;
 struct Mask;
-struct GHash;
 struct BLI_mempool;
 
 
@@ -292,6 +285,7 @@ typedef enum eSpaceOutliner_Mode {
        SO_DATABLOCKS = 11,
        SO_USERDEF = 12,
        /* SO_KEYMAP = 13, */        /* deprecated! */
+       SO_ID_ORPHANS = 14,
 } eSpaceOutliner_Mode;
 
 /* SpaceOops->storeflag */
@@ -462,6 +456,8 @@ typedef enum eScreen_Redraws_Flag {
        // TIME_CONTINUE_PHYSICS  = (1 << 7), /* UNUSED */
        TIME_NODES             = (1 << 8),
        TIME_CLIPS             = (1 << 9),
+
+       TIME_FOLLOW            = (1 << 15),
 } eScreen_Redraws_Flag;
 
 /* time->cache */
@@ -491,7 +487,7 @@ typedef struct SpaceSeq {
        
        float xof DNA_DEPRECATED, yof DNA_DEPRECATED;   /* deprecated: offset for drawing the image preview */
        short mainb;    /* weird name for the sequencer subtype (seq, image, luma... etc) */
-       short render_size;
+       short render_size;  /* eSpaceSeq_Proxy_RenderSize */
        short chanshown;
        short zebra;
        int flag;
@@ -504,6 +500,9 @@ typedef struct SpaceSeq {
        struct bGPdata *gpd;        /* grease-pencil data */
 
        struct SequencerScopes scopes;  /* different scoped displayed in space */
+
+       char multiview_eye;                             /* multiview current eye - for internal use */
+       char pad2[7];
 } SpaceSeq;
 
 
@@ -528,12 +527,14 @@ typedef enum eSpaceSeq_Flag {
        SEQ_DRAWFRAMES              = (1 << 0),
        SEQ_MARKER_TRANS            = (1 << 1),
        SEQ_DRAW_COLOR_SEPARATED    = (1 << 2),
-       SEQ_DRAW_SAFE_MARGINS       = (1 << 3),
+       SEQ_SHOW_SAFE_MARGINS       = (1 << 3),
        SEQ_SHOW_GPENCIL            = (1 << 4),
        SEQ_NO_DRAW_CFRANUM         = (1 << 5),
        SEQ_USE_ALPHA               = (1 << 6), /* use RGBA display mode for preview */
        SEQ_ALL_WAVEFORMS           = (1 << 7), /* draw all waveforms */
        SEQ_NO_WAVEFORMS            = (1 << 8), /* draw no waveforms */
+       SEQ_SHOW_SAFE_CENTER        = (1 << 9),
+       SEQ_SHOW_METADATA           = (1 << 10),
 } eSpaceSeq_Flag;
 
 /* sseq->view */
@@ -554,8 +555,7 @@ typedef enum eSpaceSeq_Proxy_RenderSize {
        SEQ_PROXY_RENDER_SIZE_FULL      = 100
 } eSpaceSeq_Proxy_RenderSize;
 
-typedef struct MaskSpaceInfo
-{
+typedef struct MaskSpaceInfo {
        /* **** mask editing **** */
        struct Mask *mask;
        /* draw options */
@@ -591,6 +591,8 @@ typedef struct FileSelectParams {
        int active_file;
        int sel_first;
        int sel_last;
+       unsigned short thumbnail_size;
+       short pad;
 
        /* short */
        short type; /* XXXXX for now store type here, should be moved to the operator */
@@ -633,9 +635,19 @@ typedef struct SpaceFile {
        struct FileLayout *layout;
        
        short recentnr, bookmarknr;
-       short systemnr, pad2;
+       short systemnr, system_bookmarknr;
 } SpaceFile;
 
+/* FSMenuEntry's without paths indicate seperators */
+typedef struct FSMenuEntry {
+       struct FSMenuEntry *next;
+
+       char *path;
+       char name[256];  /* FILE_MAXFILE */
+       short save;
+       short valid;
+       short pad[2];
+} FSMenuEntry;
 
 /* FileSelectParams.display */
 enum FileDisplayTypeE {
@@ -703,7 +715,7 @@ typedef enum eFileSel_File_Types {
        FILE_TYPE_FTFONT            = (1 << 7),
        FILE_TYPE_SOUND             = (1 << 8),
        FILE_TYPE_TEXT              = (1 << 9),
-       FILE_TYPE_MOVIE_ICON        = (1 << 10), /* movie file that preview can't load */
+       /* 1 << 10 was FILE_TYPE_MOVIE_ICON, got rid of this so free slot for future type... */
        FILE_TYPE_FOLDER            = (1 << 11), /* represents folders for filtering */
        FILE_TYPE_BTX               = (1 << 12),
        FILE_TYPE_COLLADA           = (1 << 13),
@@ -825,6 +837,7 @@ typedef enum eSpaceImage_Flag {
        SI_COLOR_CORRECTION   = (1 << 24),
 
        SI_NO_DRAW_TEXPAINT   = (1 << 25),
+       SI_DRAW_METADATA      = (1 << 26)
 } eSpaceImage_Flag;
 
 /* Text Editor ============================================ */
@@ -933,7 +946,7 @@ typedef struct bNodeTreePath {
        bNodeInstanceKey parent_key;    /* base key for nodes in this tree instance */
        int pad;
        float view_center[2];                   /* v2d center point, so node trees can have different offsets in editors */
-       /* XXX this is not automatically updated when node names are changed! */
+       
        char node_name[64];             /* MAX_NAME */
 } bNodeTreePath;
 
@@ -1201,6 +1214,9 @@ typedef enum eSpace_Type {
        SPACEICONMAX = SPACE_CLIP
 } eSpace_Type;
 
+/* use for function args */
+#define SPACE_TYPE_ANY -1
+
 // TODO: SPACE_SCRIPT
 #if (DNA_DEPRECATED_GCC_POISON == 1)
 #pragma GCC poison SPACE_IMASEL SPACE_SOUND