multi-line clip note fix

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

diff --git a/cinelerra-5.1/cinelerra/new.C b/cinelerra-5.1/cinelerra/new.C
index 605be8684e3022ba5da3b42ca2120f49ec8e82a3..9877894bd05bd29ce749385520b1717399f5c24f 100644 (file)
--- a/cinelerra-5.1/cinelerra/new.C
+++ b/cinelerra-5.1/cinelerra/new.C
@@ -41,6 +41,8 @@
 #include "preferences.h"
 #include "theme.h"
 #include "transportque.h"
+#include "track.h"
+#include "tracks.h"
 #include "videowindow.h"
 #include "vplayback.h"
 #include "vwindow.h"
@@ -97,7 +99,21 @@ int New::create_new_project(int load_mode)
                sizeof(new_edl->session->achannel_positions));
        new_edl->session->boundaries();
        new_edl->create_default_tracks();
-
+       if( load_mode == LOADMODE_NEW_TRACKS ) {
+               Tracks *tracks =  mwindow->edl->tracks;
+               int vindex = tracks->total_video_tracks();
+               int aindex = tracks->total_audio_tracks();
+               for( Track *track=new_edl->tracks->first; track; track=track->next ) {
+                       switch( track->data_type ) {
+                       case TRACK_AUDIO:
+                               sprintf(track->title, _("Audio %d"), ++aindex);
+                               break;
+                       case TRACK_VIDEO:
+                               sprintf(track->title, _("Video %d"), ++vindex);
+                               break;
+                       }
+               }
+       }
        mwindow->undo->update_undo_before();
        mwindow->set_filename("");
        ArrayList<EDL *>new_edls;
@@ -110,7 +126,7 @@ int New::create_new_project(int load_mode)
        mwindow->update_project(load_mode);
        mwindow->session->changes_made = 0;
        mwindow->undo->update_undo_after(load_mode == LOADMODE_REPLACE ?
-               _("New Project") : _("Append Project"), LOAD_ALL);
+               _("New Project") : _("Append to Project"), LOAD_ALL);
        mwindow->gui->unlock_window();
        return 0;
 }
@@ -259,7 +275,9 @@ void NewWindow::create_objects()
        lock_window("NewWindow::create_objects");
        mwindow->theme->draw_new_bg(this);
 
-       add_subwindow(new BC_Title(x, y, _("Parameters for the new project:")));
+       add_subwindow( new BC_Title(x, y, new_thread->load_mode == LOADMODE_REPLACE ?
+                       _("Parameters for the new project:") :
+                       _("Parameters for additional tracks:") ) );
        y += 20;
 
        format_presets = new NewPresets(mwindow,
@@ -347,7 +365,7 @@ void NewWindow::create_objects()
 //     y += canvas_h_text->get_h() + 5;
 
        x1 = x;
-       add_subwindow(new BC_Title(x1, y, _("Canvas size:")));
+       add_subwindow(new BC_Title(x1, y, _("Track size:")));
        x1 += 115;
        add_subwindow(output_w_text = new NewOutputW(this, x1, y));
        x1 += output_w_text->get_w() + 2;