nested clips, big rework and cleanup, sams new icons, leaks and tweaks

[goodguy/history.git] / cinelerra-5.1 / cinelerra / main.C

diff --git a/cinelerra-5.1/cinelerra/main.C b/cinelerra-5.1/cinelerra/main.C
index e41f0cbe9c9369c28491e70839d9d0264c6c3f0b..92a6a821678d45bee9e3034155b233187b2a906b 100644 (file)
--- a/cinelerra-5.1/cinelerra/main.C
+++ b/cinelerra-5.1/cinelerra/main.C
@@ -18,6 +18,7 @@
  *
  */
 
+#include "aboutprefs.h"
 #include "arraylist.h"
 #include "batchrender.h"
 #include "bcsignals.h"
@@ -117,7 +118,6 @@ int main(int argc, char *argv[])
        config_path[0] = 0;
        batch_path[0] = 0;
        deamon_path[0] = 0;
-       EDL::id_lock = new Mutex("EDL::id_lock");
        Units::init();
 
        File::init_cin_path();
@@ -265,7 +265,6 @@ int main(int argc, char *argv[])
                operation == DO_USAGE ||
                operation == DO_BATCHRENDER) {
 
-               fprintf(stderr, PROGRAM_NAME " " CINELERRA_VERSION);
 #ifndef REPOMAINTXT
 #define REPOMAINTXT ""
 #endif
@@ -275,13 +274,13 @@ int main(int argc, char *argv[])
 #ifndef COPYRIGHTTEXT2
 #define COPYRIGHTTEXT2 ""
 #endif
-#ifndef COMPILEDATE
-#define COMPILEDATE ""
-#endif
-               fprintf(stderr, REPOMAINTXT COPYRIGHTTEXT1 COPYRIGHTTEXT2 COMPILEDATE
-                       PROGRAM_NAME " is free software, covered by the GNU General Public License,\n"
+               fprintf(stderr, "%s %s - %s\n%s",
+                       PROGRAM_NAME,CINELERRA_VERSION, AboutPrefs::build_timestamp,
+                       REPOMAINTXT COPYRIGHTTEXT1 COPYRIGHTTEXT2);
+               fprintf(stderr, "%s is free software, covered by the GNU General Public License,\n"
                        "and you are welcome to change it and/or distribute copies of it under\n"
-                       "certain conditions. There is absolutely no warranty for " PROGRAM_NAME ".\n\n");
+                       "certain conditions. There is absolutely no warranty for %s.\n\n",
+                       PROGRAM_NAME, PROGRAM_NAME);
        }
 
        switch(operation)
@@ -407,7 +406,6 @@ DISABLE_BUFFER
        }
 
        filenames.remove_all_objects();
-       delete EDL::id_lock;  EDL::id_lock = 0;
        Units::finit();
 
        return 0;