projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inter-view tweaks, add clip preview, fix for dupl proxy vicon refs, fix track drag...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
awindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.h
b/cinelerra-5.1/cinelerra/awindowgui.h
index 99db0753ceaa9e0f7eec56c016a9c73e68b574d3..388ae622fcc730fb72497db5b9849d8e84683e36 100644
(file)
--- a/
cinelerra-5.1/cinelerra/awindowgui.h
+++ b/
cinelerra-5.1/cinelerra/awindowgui.h
@@
-44,6
+44,7
@@
#include "mwindow.inc"
#include "mutex.inc"
#include "pluginserver.inc"
#include "mwindow.inc"
#include "mutex.inc"
#include "pluginserver.inc"
+#include "preferences.inc"
#include "proxypopup.inc"
#include "renderengine.inc"
#include "samples.inc"
#include "proxypopup.inc"
#include "renderengine.inc"
#include "samples.inc"
@@
-57,8
+58,10
@@
// in percent view_h
#define VIEW_POPUP_BAR_H 15
// in percent view_h
#define VIEW_POPUP_BAR_H 15
-#define ASSET_DRAW_IMAGE 0
-#define ASSET_DRAW_MEDIA_MAP 1
+#define ASSET_VIEW_NONE 0
+#define ASSET_VIEW_ICON 1
+#define ASSET_VIEW_MEDIA 2
+#define ASSET_VIEW_MEDIA_MAP 3
class AWindowFolderItem : public BC_ListBoxItem
{
class AWindowFolderItem : public BC_ListBoxItem
{
@@
-169,7
+172,7
@@
class AssetViewPopup : public ViewPopup
{
public:
AssetViewPopup(VIconThread *vt, int draw_mode,
{
public:
AssetViewPopup(VIconThread *vt, int draw_mode,
-
VFrame *frame,
int x, int y, int w, int h);
+
int x, int y, int w, int h);
~AssetViewPopup();
int button_press_event();
~AssetViewPopup();
int button_press_event();
@@
-186,13
+189,15
@@
public:
class AssetVIconThread : public VIconThread
{
public:
class AssetVIconThread : public VIconThread
{
public:
- AssetVIconThread(AWindow
Assets *asset_list
);
+ AssetVIconThread(AWindow
GUI *gui, Preferences *preferences
);
~AssetVIconThread();
~AssetVIconThread();
- void set_view_popup(AssetVIcon *v
icon
, int draw_mode=-1);
- ViewPopup *new_view_window(
VFrame *frame
);
+ void set_view_popup(AssetVIcon *v, int draw_mode=-1);
+ ViewPopup *new_view_window();
+ AWindowGUI *gui;
int draw_mode;
int draw_mode;
+ int vicon_cmodel;
};
};