projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add file size toggle icons, ff_lut3d icon, fullscrn clk2play fix, timebar endpt curso...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
awindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.h
b/cinelerra-5.1/cinelerra/awindowgui.h
index 3068ac99f00eb79164541d55807074fca08740d5..703c976422e535c81acb3727989ca6b88d49381e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/awindowgui.h
+++ b/
cinelerra-5.1/cinelerra/awindowgui.h
@@
-27,6
+27,7
@@
#include "assetpopup.inc"
#include "asset.inc"
#include "assets.inc"
#include "assetpopup.inc"
#include "asset.inc"
#include "assets.inc"
+#include "audiodevice.inc"
#include "awindow.inc"
#include "awindowgui.inc"
#include "clippopup.inc"
#include "awindow.inc"
#include "awindowgui.inc"
#include "clippopup.inc"
@@
-55,6
+56,9
@@
public:
void create_objects();
void reset();
void create_objects();
void reset();
+ static void draw_hue_bar(VFrame *frame, double t);
+ static void draw_wave(VFrame *frame, double *dp, int len,
+ int base_color, int line_color);
MWindow *mwindow;
AWindowGUI *gui;
MWindow *mwindow;
AWindowGUI *gui;
@@
-79,6
+83,25
@@
public:
VIcon *vicon;
};
VIcon *vicon;
};
+typedef int16_t vicon_audio_t;
+
+class AssetVIconAudio : public Thread
+{
+public:
+ AssetVIconAudio(AWindowGUI *gui);
+ ~AssetVIconAudio();
+
+ void run();
+ void start(AssetVIcon *vicon);
+ void stop(int wait);
+
+ AWindowGUI *gui;
+ AudioDevice *audio;
+ AssetVIcon *vicon;
+ int interrupted;
+ int audio_pos;
+};
+
class AssetVIcon : public VIcon {
public:
AssetPicon *picon;
class AssetVIcon : public VIcon {
public:
AssetPicon *picon;
@@
-89,6
+112,9
@@
public:
int64_t set_seq_no(int64_t no);
int get_vx();
int get_vy();
int64_t set_seq_no(int64_t no);
int get_vx();
int get_vy();
+ void load_audio();
+ void start_audio();
+ void stop_audio();
AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length);
~AssetVIcon();
AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length);
~AssetVIcon();
@@
-239,6
+265,7
@@
public:
// Temporary for reading picons from files
VFrame *temp_picon;
VIconThread *vicon_thread;
// Temporary for reading picons from files
VFrame *temp_picon;
VIconThread *vicon_thread;
+ AssetVIconAudio *vicon_audio;
int64_t plugin_visibility;
AWindowRemovePlugin *remove_plugin;
int64_t plugin_visibility;
AWindowRemovePlugin *remove_plugin;