Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / localsession.C

diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C
index 50837a135044536a7949a27a6fa6693880cdba46..c8428abd07e5c3f215b6ffdfd2b045afd0744a51 100644 (file)
--- a/cinelerra-5.1/cinelerra/localsession.C
+++ b/cinelerra-5.1/cinelerra/localsession.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,7 @@
 #include "clip.h"
 #include "bchash.h"
 #include "edl.h"
+#include "edlsession.h"
 #include "filesystem.h"
 #include "filexml.h"
 #include "floatauto.h"
@@ -72,32 +74,23 @@ LocalSession::LocalSession(EDL *edl)
        preview_start = 0;  preview_end = -1;
        zoom_sample = DEFAULT_ZOOM_TIME;
        zoom_y = 0;
-       zoom_track = 0;
+       zoom_atrack = 64;
+       zoom_vtrack = 64;
        x_pane = y_pane = -1;
+       gang_tracks = GANG_NONE;
 
        for(int i = 0; i < TOTAL_PANES; i++) {
                view_start[i] = 0;
                track_start[i] = 0;
        }
 
+       reset_view_limits();
        automation_mins[AUTOGROUPTYPE_AUDIO_FADE] = -80;
        automation_maxs[AUTOGROUPTYPE_AUDIO_FADE] = 6;
-
        automation_mins[AUTOGROUPTYPE_VIDEO_FADE] = 0;
        automation_maxs[AUTOGROUPTYPE_VIDEO_FADE] = 100;
-
-       automation_mins[AUTOGROUPTYPE_ZOOM] = 0.005;
-       automation_maxs[AUTOGROUPTYPE_ZOOM] = 5.000;
-
-       automation_mins[AUTOGROUPTYPE_SPEED] = 0.005;
+       automation_mins[AUTOGROUPTYPE_SPEED] = SPEED_MIN;
        automation_maxs[AUTOGROUPTYPE_SPEED] = 5.000;
-
-       automation_mins[AUTOGROUPTYPE_X] = -100;
-       automation_maxs[AUTOGROUPTYPE_X] = 100;
-
-       automation_mins[AUTOGROUPTYPE_Y] = -100;
-       automation_maxs[AUTOGROUPTYPE_Y] = 100;
-
        automation_mins[AUTOGROUPTYPE_INT255] = 0;
        automation_maxs[AUTOGROUPTYPE_INT255] = 255;
 
@@ -110,6 +103,7 @@ LocalSession::LocalSession(EDL *edl)
        red_max = green_max = blue_max = 0;
        use_max = 0;
        solo_track_id = -1;
+       gang_tracks = GANG_NONE;
 }
 
 LocalSession::~LocalSession()
@@ -139,7 +133,8 @@ void LocalSession::copy_from(LocalSession *that)
 
        zoom_sample = that->zoom_sample;
        zoom_y = that->zoom_y;
-       zoom_track = that->zoom_track;
+       zoom_atrack = that->zoom_atrack;
+       zoom_vtrack = that->zoom_vtrack;
        preview_start = that->preview_start;
        preview_end = that->preview_end;
        red = that->red;
@@ -150,6 +145,7 @@ void LocalSession::copy_from(LocalSession *that)
        blue_max = that->blue_max;
        use_max = that->use_max;
        solo_track_id = that->solo_track_id;
+       gang_tracks = that->gang_tracks;
 
        for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) {
                automation_mins[i] = that->automation_mins[i];
@@ -186,8 +182,8 @@ void LocalSession::save_xml(FileXML *file, double start)
        file->tag.set_property("ZOOM_SAMPLE", zoom_sample);
 //printf("EDLSession::save_session 1\n");
        file->tag.set_property("ZOOMY", zoom_y);
-//printf("EDLSession::save_session 1 %d\n", zoom_track);
-       file->tag.set_property("ZOOM_TRACK", zoom_track);
+       file->tag.set_property("ZOOM_ATRACK", zoom_atrack);
+       file->tag.set_property("ZOOM_VTRACK", zoom_vtrack);
 
        double preview_start = this->preview_start - start;
        if( preview_start < 0 ) preview_start = 0;
@@ -204,6 +200,8 @@ void LocalSession::save_xml(FileXML *file, double start)
        file->tag.set_property("GREEN_MAX", green_max);
        file->tag.set_property("BLUE_MAX", blue_max);
        file->tag.set_property("USE_MAX", use_max);
+       file->tag.set_property("GANG_TRACKS", gang_tracks);
+
 
        for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) {
                if (!Automation::autogrouptypes_fixedrange[i]) {
@@ -242,6 +240,7 @@ void LocalSession::synchronize_params(LocalSession *that)
        blue_max = that->blue_max;
        if( solo_track_id < 0 || that->solo_track_id < 0 )
                solo_track_id = that->solo_track_id;
+       gang_tracks = that->gang_tracks;
 }
 
 
@@ -288,7 +287,10 @@ void LocalSession::load_xml(FileXML *file, unsigned long load_flags)
 
                zoom_sample = file->tag.get_property("ZOOM_SAMPLE", zoom_sample);
                zoom_y = file->tag.get_property("ZOOMY", zoom_y);
-               zoom_track = file->tag.get_property("ZOOM_TRACK", zoom_track);
+               int64_t zoom_track = file->tag.get_property("ZOOM_TRACK", 0);
+               if( zoom_track > 0 ) zoom_atrack = zoom_vtrack = zoom_track;
+               zoom_atrack = file->tag.get_property("ZOOM_ATRACK", zoom_atrack);
+               zoom_vtrack = file->tag.get_property("ZOOM_VTRACK", zoom_vtrack);
                preview_start = file->tag.get_property("PREVIEW_START", preview_start);
                preview_end = file->tag.get_property("PREVIEW_END", preview_end);
                red = file->tag.get_property("RED", red);
@@ -298,11 +300,13 @@ void LocalSession::load_xml(FileXML *file, unsigned long load_flags)
                green_max = file->tag.get_property("GREEN_MAX", green_max);
                blue_max = file->tag.get_property("BLUE_MAX", blue_max);
                use_max = file->tag.get_property("USE_MAX", use_max);
-
+               gang_tracks = file->tag.get_property("GANG_TRACKS", gang_tracks);
                for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) {
                        if (!Automation::autogrouptypes_fixedrange[i]) {
                                automation_mins[i] = file->tag.get_property(xml_autogrouptypes_titlesmin[i],automation_mins[i]);
+                               AUTOMATIONCLAMPS(automation_mins[i], i);
                                automation_maxs[i] = file->tag.get_property(xml_autogrouptypes_titlesmax[i],automation_maxs[i]);
+                               AUTOMATIONCLAMPS(automation_maxs[i], i);
                        }
                }
                floatauto_type = file->tag.get_property("FLOATAUTO_TYPE", floatauto_type);
@@ -351,8 +355,11 @@ int LocalSession::load_defaults(BC_Hash *defaults)
 //     track_start = defaults->get("TRACK_START", 0);
 //     view_start = defaults->get("VIEW_START", 0);
        zoom_sample = defaults->get("ZOOM_SAMPLE", DEFAULT_ZOOM_TIME);
-       zoom_y = defaults->get("ZOOMY", 64);
-       zoom_track = defaults->get("ZOOM_TRACK", 64);
+       zoom_y = defaults->get("ZOOMY", DEFAULT_ZOOM_TRACK);
+       int64_t zoom_track = defaults->get("ZOOM_TRACK", 0);
+       if( zoom_track == 0 ) zoom_track = DEFAULT_ZOOM_TRACK;
+       zoom_atrack = defaults->get("ZOOM_ATRACK", zoom_track);
+       zoom_vtrack = defaults->get("ZOOM_VTRACK", zoom_track);
        red = defaults->get("RED", 0.0);
        green = defaults->get("GREEN", 0.0);
        blue = defaults->get("BLUE", 0.0);
@@ -360,11 +367,14 @@ int LocalSession::load_defaults(BC_Hash *defaults)
        green_max = defaults->get("GREEN_MAX", 0.0);
        blue_max = defaults->get("BLUE_MAX", 0.0);
        use_max = defaults->get("USE_MAX", 0);
+       gang_tracks = defaults->get("GANG_TRACKS", GANG_NONE);
 
        for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) {
                if (!Automation::autogrouptypes_fixedrange[i]) {
                        automation_mins[i] = defaults->get(xml_autogrouptypes_titlesmin[i], automation_mins[i]);
+                       AUTOMATIONCLAMPS(automation_mins[i], i);
                        automation_maxs[i] = defaults->get(xml_autogrouptypes_titlesmax[i], automation_maxs[i]);
+                       AUTOMATIONCLAMPS(automation_maxs[i], i);
                }
        }
 
@@ -386,7 +396,8 @@ int LocalSession::save_defaults(BC_Hash *defaults)
 //     defaults->update("VIEW_START", view_start);
        defaults->update("ZOOM_SAMPLE", zoom_sample);
        defaults->update("ZOOMY", zoom_y);
-       defaults->update("ZOOM_TRACK", zoom_track);
+       defaults->update("ZOOM_ATRACK", zoom_atrack);
+       defaults->update("ZOOM_VTRACK", zoom_vtrack);
        defaults->update("RED", red);
        defaults->update("GREEN", green);
        defaults->update("BLUE", blue);
@@ -394,6 +405,7 @@ int LocalSession::save_defaults(BC_Hash *defaults)
        defaults->update("GREEN_MAX", green_max);
        defaults->update("BLUE_MAX", blue_max);
        defaults->update("USE_MAX", use_max);
+       defaults->update("GANG_TRACKS", gang_tracks);
 
        for (int i = 0; i < AUTOGROUPTYPE_COUNT; i++) {
                if (!Automation::autogrouptypes_fixedrange[i]) {
@@ -505,3 +517,16 @@ int LocalSession::outpoint_valid()
        return out_point >= 0;
 }
 
+void LocalSession::reset_view_limits()
+{
+       automation_mins[AUTOGROUPTYPE_ZOOM] = 0.005;
+       automation_maxs[AUTOGROUPTYPE_ZOOM] = 5.000;
+       int out_w = edl->session->output_w;
+       automation_mins[AUTOGROUPTYPE_X] = -out_w;
+       automation_maxs[AUTOGROUPTYPE_X] = out_w;
+       int out_h = edl->session->output_h;
+       automation_mins[AUTOGROUPTYPE_Y] = -out_h;
+       automation_maxs[AUTOGROUPTYPE_Y] = out_h;
+
+}
+