olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96

[goodguy/history.git] / cinelerra-5.1 / cinelerra / assetedit.h

diff --git a/cinelerra-5.1/cinelerra/assetedit.h b/cinelerra-5.1/cinelerra/assetedit.h
index bc5503c9a327cf9856c3c001d4919405af867066..47a59164ae462f0133566e3911a1be741c74aa6d 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetedit.h
+++ b/cinelerra-5.1/cinelerra/assetedit.h
@@ -23,6 +23,7 @@
 #define ASSETEDIT_H
 
 #include "asset.inc"
+#include "assetedit.inc"
 #include "awindow.inc"
 #include "bcdialog.h"
 #include "bitspopup.inc"
@@ -35,34 +36,23 @@
 #include "resizetrackthread.inc"
 
 
-class AssetEditReelNumber;
-class AssetEditReelName;
-class AssetEditByteOrderHILO;
-class AssetEditByteOrderLOHI;
-class AssetEditPath;
-class AssetEditPathText;
-class AssetEditWindow;
-
-class DetailAssetWindow;
-class DetailAssetThread;
-class DetailAssetButton;
-
 class AssetEdit : public BC_DialogThread
 {
 public:
        AssetEdit(MWindow *mwindow);
        ~AssetEdit();
 
-       void edit_asset(Indexable *indexable);
+       void edit_asset(Indexable *indexable, int x, int y);
        int set_asset(Indexable *indexable);
        void handle_done_event(int result);
        void handle_close_event(int result);
        BC_Window* new_gui();
+       int window_height();
 
        Indexable *indexable;
        MWindow *mwindow;
        AssetEditWindow *window;
-
+       int x, y;
 
 // Changed parameters
        Asset *changed_params;
@@ -84,15 +74,13 @@ public:
        AssetEditPath *path_button;
        AssetEditByteOrderHILO *hilo;
        AssetEditByteOrderLOHI *lohi;
-       BC_TextBox *tc_hours_textbox, *tc_minutes_textbox;
-       BC_TextBox *tc_seconds_textbox, *tc_rest_textbox;
        BitsPopup *bitspopup;
        int allow_edits;
        MWindow *mwindow;
        AssetEdit *asset_edit;
        BC_Title *win_width;
        BC_Title *win_height;
-       DetailAssetThread *detail_thread;
+       DetailAssetDialog *detail_dialog;
        void show_info_detail();
 
 };
@@ -126,21 +114,11 @@ public:
 
 
 
-class AssetEditFormat : public FormatPopup
-{
-public:
-       AssetEditFormat(AssetEditWindow *fwindow, char* default_, int y);
-       ~AssetEditFormat();
-
-       int handle_event();
-       AssetEditWindow *fwindow;
-};
-
-
 class AssetEditChannels : public BC_TumbleTextBox
 {
 public:
-       AssetEditChannels(AssetEditWindow *fwindow, char *text, int x, int y);
+       AssetEditChannels(AssetEditWindow *fwindow,
+               char *text, int x, int y);
 
        int handle_event();
 
@@ -150,7 +128,8 @@ public:
 class AssetEditRate : public BC_TextBox
 {
 public:
-       AssetEditRate(AssetEditWindow *fwindow, char *text, int x, int y);
+       AssetEditRate(AssetEditWindow *fwindow,
+               char *text, int x, int y);
 
        int handle_event();
 
@@ -160,7 +139,8 @@ public:
 class AssetEditFRate : public BC_TextBox
 {
 public:
-       AssetEditFRate(AssetEditWindow *fwindow, char *text, int x, int y);
+       AssetEditFRate(AssetEditWindow *fwindow,
+               char *text, int x, int y);
 
        int handle_event();
 
@@ -170,7 +150,8 @@ public:
 class Interlaceautofix : public BC_CheckBox
 {
 public:
-       Interlaceautofix(MWindow *mwindow,AssetEditWindow *fwindow, int x, int y);
+       Interlaceautofix(MWindow *mwindow, AssetEditWindow *fwindow,
+               int x, int y);
        ~Interlaceautofix();
        int handle_event();
 
@@ -190,7 +171,8 @@ private:
 class AssetEditILaceautofixoption : public BC_TextBox
 {
 public:
-       AssetEditILaceautofixoption(AssetEditWindow *fwindow, char *text, int thedefault, int x, int y, int w);
+       AssetEditILaceautofixoption(AssetEditWindow *fwindow,
+               char *text, int thedefault, int x, int y, int w);
 
        int handle_event();
        int thedefault;
@@ -200,7 +182,8 @@ public:
 class AssetEditILacemode : public BC_TextBox
 {
 public:
-       AssetEditILacemode(AssetEditWindow *fwindow, const char *text, int thedefault, int x, int y, int w);
+       AssetEditILacemode(AssetEditWindow *fwindow,
+               const char *text, int thedefault, int x, int y, int w);
        int handle_event();
        int thedefault;
        AssetEditWindow *fwindow;
@@ -210,12 +193,10 @@ class AssetEditInterlacemodePulldown : public BC_ListBox
 {
 public:
        AssetEditInterlacemodePulldown(MWindow *mwindow,
-                               BC_TextBox *output_text,
-                               int *output_value,
-                               ArrayList<BC_ListBoxItem*> *data,
-                               Interlaceautofix *fixoption_chkbox,
-                               int x,
-                               int y);
+               BC_TextBox *output_text, int *output_value,
+               ArrayList<BC_ListBoxItem*> *data,
+               Interlaceautofix *fixoption_chkbox,
+               int x, int y);
        int handle_event();
        char* interlacemode_to_text();
        MWindow *mwindow;
@@ -229,7 +210,8 @@ private:
 class AssetEditILacefixmethod : public BC_TextBox
 {
 public:
-       AssetEditILacefixmethod(AssetEditWindow *fwindow, const char *text, int thedefault, int x, int y, int w);
+       AssetEditILacefixmethod(AssetEditWindow *fwindow,
+               const char *text, int thedefault, int x, int y, int w);
 
        int handle_event();
        int thedefault;
@@ -239,7 +221,8 @@ public:
 class AssetEditHeader : public BC_TextBox
 {
 public:
-       AssetEditHeader(AssetEditWindow *fwindow, char *text, int x, int y);
+       AssetEditHeader(AssetEditWindow *fwindow,
+               char *text, int x, int y);
 
        int handle_event();
 
@@ -249,7 +232,8 @@ public:
 class AssetEditByteOrderLOHI : public BC_Radial
 {
 public:
-       AssetEditByteOrderLOHI(AssetEditWindow *fwindow, int value, int x, int y);
+       AssetEditByteOrderLOHI(AssetEditWindow *fwindow,
+               int value, int x, int y);
 
        int handle_event();
 
@@ -259,7 +243,8 @@ public:
 class AssetEditByteOrderHILO : public BC_Radial
 {
 public:
-       AssetEditByteOrderHILO(AssetEditWindow *fwindow, int value, int x, int y);
+       AssetEditByteOrderHILO(AssetEditWindow *fwindow,
+               int value, int x, int y);
 
        int handle_event();
 
@@ -269,29 +254,8 @@ public:
 class AssetEditSigned : public BC_CheckBox
 {
 public:
-       AssetEditSigned(AssetEditWindow *fwindow, int value, int x, int y);
-
-       int handle_event();
-
-       AssetEditWindow *fwindow;
-};
-
-class AssetEditReelName : public BC_TextBox
-{
-public:
-       AssetEditReelName(AssetEditWindow *fwindow, int x, int y);
-       ~AssetEditReelName();
-
-       int handle_event();
-
-       AssetEditWindow *fwindow;
-};
-
-class AssetEditReelNumber : public BC_TextBox
-{
-public:
-       AssetEditReelNumber(AssetEditWindow *fwindow, int x, int y);
-       ~AssetEditReelNumber();
+       AssetEditSigned(AssetEditWindow *fwindow,
+               int value, int x, int y);
 
        int handle_event();
 
@@ -305,22 +269,25 @@ class DetailAssetWindow : public BC_Window
        char info[65536];
        BC_ScrollTextBox *text;
 public:
-       DetailAssetWindow(MWindow *mwindow, Asset *asset);
+       DetailAssetWindow(MWindow *mwindow,
+               DetailAssetDialog *detail_dialog, Asset *asset);
        ~DetailAssetWindow();
        void create_objects();
+       DetailAssetDialog *detail_dialog;
 };
 
-class DetailAssetThread : public Thread
+class DetailAssetDialog : public BC_DialogThread
 {
        MWindow *mwindow;
        DetailAssetWindow *dwindow;
 public:
-       DetailAssetThread(MWindow *mwindow);
-       ~DetailAssetThread();
+       DetailAssetDialog(MWindow *mwindow);
+       ~DetailAssetDialog();
+       void start(Asset *asset, int x, int y);
+       BC_Window* new_gui();
 
-       void start(Asset *asset);
-       void stop();
-       void run();
+       Asset *asset;
+       int x, y;
 };