X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fnew.C;h=58e6eca9d3a463d619a68f9294db76fe2e35525f;hb=7920493569041de2d8c991eb4b04b33d41b70d57;hp=949de932ad505907849abf942f41342f8ba2b5b5;hpb=27d1d08d9125dc46f252073aaf1fead7518ee4c8;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/new.C b/cinelerra-5.1/cinelerra/new.C index 949de932..58e6eca9 100644 --- a/cinelerra-5.1/cinelerra/new.C +++ b/cinelerra-5.1/cinelerra/new.C @@ -76,7 +76,6 @@ int New::handle_event() mwindow->gui->unlock_window(); mwindow->edl->save_defaults(mwindow->defaults); create_new_edl(); - create_new_project(); thread->start(); mwindow->gui->lock_window("New::handle_event"); @@ -85,8 +84,7 @@ int New::handle_event() void New::create_new_edl() { - if(!new_edl) - { + if( !new_edl ) { new_edl = new EDL; new_edl->create_objects(); new_edl->load_defaults(mwindow->defaults); @@ -96,30 +94,13 @@ void New::create_new_edl() int New::create_new_project() { - mwindow->cwindow->playback_engine->que->send_command(STOP, - CHANGE_NONE, - 0, - 0); - - for(int i = 0; i < mwindow->vwindows.size(); i++) - { - VWindow *vwindow = mwindow->vwindows.get(i); - if( !vwindow->is_running() ) continue; - vwindow->playback_engine->que->send_command(STOP, CHANGE_NONE, 0, 0); - vwindow->playback_engine->interrupt_playback(0); - } - - mwindow->cwindow->playback_engine->interrupt_playback(0); - + mwindow->stop_playback(0); mwindow->gui->lock_window(); mwindow->reset_caches(); - - memcpy(new_edl->session->achannel_positions, - &mwindow->preferences->channel_positions[ - MAXCHANNELS * (new_edl->session->audio_channels - 1)], - sizeof(int) * MAXCHANNELS); + &mwindow->preferences->channel_positions[new_edl->session->audio_channels - 1], + sizeof(new_edl->session->achannel_positions)); new_edl->session->boundaries(); new_edl->create_default_tracks(); @@ -153,8 +134,6 @@ NewThread::~NewThread() close_window(); } - - BC_Window* NewThread::new_gui() { mwindow->edl->save_defaults(mwindow->defaults); @@ -171,29 +150,22 @@ BC_Window* NewThread::new_gui() return nwindow; } - - void NewThread::handle_close_event(int result) { - if( !new_project->new_edl ) return; new_project->new_edl->save_defaults(mwindow->defaults); mwindow->defaults->save(); - if(result) - { + if( result ) { // Aborted if( !new_project->new_edl->Garbage::remove_user() ) new_project->new_edl = 0; } - else - { + else { new_project->create_new_project(); } } - - int NewThread::load_defaults() { auto_aspect = mwindow->defaults->get("AUTOASPECT", 0); @@ -208,8 +180,7 @@ int NewThread::save_defaults() int NewThread::update_aspect() { - if(auto_aspect) - { + if( auto_aspect ) { char string[BCTEXTLEN]; mwindow->create_aspect_ratio(new_project->new_edl->session->aspect_w, new_project->new_edl->session->aspect_h, @@ -224,8 +195,6 @@ int NewThread::update_aspect() } - - NewWindow::NewWindow(MWindow *mwindow, NewThread *new_thread, int x, int y) : BC_Window(_(PROGRAM_NAME ": New Project"), x, y, WIDTH, HEIGHT, -1, -1, 0, 0, 1) @@ -239,7 +208,7 @@ NewWindow::NewWindow(MWindow *mwindow, NewThread *new_thread, int x, int y) NewWindow::~NewWindow() { lock_window("NewWindow::~NewWindow"); - if(format_presets) delete format_presets; + if( format_presets ) delete format_presets; unlock_window(); } @@ -262,8 +231,6 @@ void NewWindow::create_objects() x = format_presets->x; y = format_presets->y; - - y += 40; y1 = y; add_subwindow(new BC_Title(x, y, _("Audio"), LARGEFONT)); @@ -366,10 +333,7 @@ void NewWindow::create_objects() add_subwindow(aspect_h_text = new NewAspectH(this, "", x1, y)); x1 += aspect_h_text->get_w(); add_subwindow(new AspectPulldown(mwindow, - aspect_w_text, - aspect_h_text, - x1, - y)); + aspect_w_text, aspect_h_text, x1, y)); x1 = aspect_w_text->get_x(); y += aspect_w_text->get_h() + 5; @@ -420,11 +384,6 @@ int NewWindow::update() } - - - - - NewPresets::NewPresets(MWindow *mwindow, NewWindow *gui, int x, int y) : FormatPresets(mwindow, gui, 0, x, y) { @@ -446,7 +405,6 @@ EDL* NewPresets::get_edl() } - NewATracks::NewATracks(NewWindow *nwindow, const char *text, int x, int y) : BC_TextBox(x, y, 90, 1, text) { @@ -479,6 +437,7 @@ int NewATracksTumbler::handle_down_event() return 1; } + NewAChannels::NewAChannels(NewWindow *nwindow, const char *text, int x, int y) : BC_TextBox(x, y, 90, 1, text) { @@ -491,6 +450,7 @@ int NewAChannels::handle_event() return 1; } + NewAChannelsTumbler::NewAChannelsTumbler(NewWindow *nwindow, int x, int y) : BC_Tumbler(x, y) { @@ -524,18 +484,10 @@ int NewSampleRate::handle_event() return 1; } + SampleRatePulldown::SampleRatePulldown(MWindow *mwindow, BC_TextBox *output, int x, int y) - : BC_ListBox(x, - y, - 100, - 200, - LISTBOX_TEXT, - &mwindow->theme->sample_rates, - 0, - 0, - 1, - 0, - 1) + : BC_ListBox(x, y, 100, 200, LISTBOX_TEXT, + &mwindow->theme->sample_rates, 0, 0, 1, 0, 1) { this->mwindow = mwindow; this->output = output; @@ -549,19 +501,6 @@ int SampleRatePulldown::handle_event() } - - - - - - - - - - - - - NewVTracks::NewVTracks(NewWindow *nwindow, const char *text, int x, int y) : BC_TextBox(x, y, 90, 1, text) { @@ -574,6 +513,7 @@ int NewVTracks::handle_event() return 1; } + NewVTracksTumbler::NewVTracksTumbler(NewWindow *nwindow, int x, int y) : BC_Tumbler(x, y) { @@ -594,6 +534,7 @@ int NewVTracksTumbler::handle_down_event() return 1; } + NewVChannels::NewVChannels(NewWindow *nwindow, const char *text, int x, int y) : BC_TextBox(x, y, 90, 1, text) { @@ -606,6 +547,7 @@ int NewVChannels::handle_event() return 1; } + NewVChannelsTumbler::NewVChannelsTumbler(NewWindow *nwindow, int x, int y) : BC_Tumbler(x, y) { @@ -626,6 +568,7 @@ int NewVChannelsTumbler::handle_down_event() return 1; } + NewFrameRate::NewFrameRate(NewWindow *nwindow, const char *text, int x, int y) : BC_TextBox(x, y, 90, 1, text) { @@ -638,21 +581,11 @@ int NewFrameRate::handle_event() return 1; } + FrameRatePulldown::FrameRatePulldown(MWindow *mwindow, - BC_TextBox *output, - int x, - int y) - : BC_ListBox(x, - y, - 100, - 200, - LISTBOX_TEXT, - &mwindow->theme->frame_rates, - 0, - 0, - 1, - 0, - 1) + BC_TextBox *output, int x, int y) + : BC_ListBox(x, y, 150, 250, LISTBOX_TEXT, + &mwindow->theme->frame_rates, 0, 0, 1, 0, 1) { this->mwindow = mwindow; this->output = output; @@ -666,26 +599,15 @@ int FrameRatePulldown::handle_event() } FrameSizePulldown::FrameSizePulldown(Theme *theme, - BC_TextBox *output_w, - BC_TextBox *output_h, - int x, - int y) - : BC_ListBox(x, - y, - 100, - 250, - LISTBOX_TEXT, - &theme->frame_sizes, - 0, - 0, - 1, - 0, - 1) + BC_TextBox *output_w, BC_TextBox *output_h, int x, int y) + : BC_ListBox(x, y, 180, 250, LISTBOX_TEXT, + &theme->frame_sizes, 0, 0, 1, 0, 1) { this->theme = theme; this->output_w = output_w; this->output_h = output_h; } + int FrameSizePulldown::handle_event() { char *text = get_selection(0, 0)->get_text(); @@ -695,8 +617,7 @@ int FrameSizePulldown::handle_event() strcpy(string, text); ptr = strrchr(string, 'x'); - if(ptr) - { + if( ptr ) { ptr++; h = atol(ptr); @@ -710,6 +631,7 @@ int FrameSizePulldown::handle_event() return 1; } + NewOutputW::NewOutputW(NewWindow *nwindow, int x, int y) : BC_TextBox(x, y, 70, 1, nwindow->new_edl->session->output_w) { @@ -722,6 +644,7 @@ int NewOutputW::handle_event() return 1; } + NewOutputH::NewOutputH(NewWindow *nwindow, int x, int y) : BC_TextBox(x, y, 70, 1, nwindow->new_edl->session->output_h) { @@ -734,6 +657,7 @@ int NewOutputH::handle_event() return 1; } + NewAspectW::NewAspectW(NewWindow *nwindow, const char *text, int x, int y) : BC_TextBox(x, y, 70, 1, text) { @@ -746,6 +670,7 @@ int NewAspectW::handle_event() return 1; } + NewAspectH::NewAspectH(NewWindow *nwindow, const char *text, int x, int y) : BC_TextBox(x, y, 70, 1, text) { @@ -758,27 +683,17 @@ int NewAspectH::handle_event() return 1; } + AspectPulldown::AspectPulldown(MWindow *mwindow, - BC_TextBox *output_w, - BC_TextBox *output_h, - int x, - int y) - : BC_ListBox(x, - y, - 100, - 200, - LISTBOX_TEXT, - &mwindow->theme->aspect_ratios, - 0, - 0, - 1, - 0, - 1) + BC_TextBox *output_w, BC_TextBox *output_h, int x, int y) + : BC_ListBox(x, y, 100, 200, LISTBOX_TEXT, + &mwindow->theme->aspect_ratios, 0, 0, 1, 0, 1) { this->mwindow = mwindow; this->output_w = output_w; this->output_h = output_h; } + int AspectPulldown::handle_event() { char *text = get_selection(0, 0)->get_text(); @@ -788,8 +703,7 @@ int AspectPulldown::handle_event() strcpy(string, text); ptr = strrchr(string, ':'); - if(ptr) - { + if( ptr ) { ptr++; h = atof(ptr); @@ -803,6 +717,7 @@ int AspectPulldown::handle_event() return 1; } + ColormodelItem::ColormodelItem(const char *text, int value) : BC_ListBoxItem(text) { @@ -810,21 +725,9 @@ ColormodelItem::ColormodelItem(const char *text, int value) } ColormodelPulldown::ColormodelPulldown(MWindow *mwindow, - BC_TextBox *output_text, - int *output_value, - int x, - int y) - : BC_ListBox(x, - y, - 200, - 150, - LISTBOX_TEXT, - (ArrayList*)&mwindow->colormodels, - 0, - 0, - 1, - 0, - 1) + BC_TextBox *output_text, int *output_value, int x, int y) + : BC_ListBox(x, y, 200, 150, LISTBOX_TEXT, + (ArrayList*)&mwindow->colormodels, 0, 0, 1, 0, 1) { this->mwindow = mwindow; this->output_text = output_text; @@ -841,8 +744,8 @@ int ColormodelPulldown::handle_event() const char* ColormodelPulldown::colormodel_to_text() { - for(int i = 0; i < mwindow->colormodels.total; i++) - if(mwindow->colormodels.values[i]->value == *output_value) + for( int i=0; icolormodels.total; ++i ) + if( mwindow->colormodels.values[i]->value == *output_value ) return mwindow->colormodels.values[i]->get_text(); return _("Unknown"); } @@ -911,12 +814,6 @@ int NewAspectAuto::handle_event() } - - - - - - NewSwapExtents::NewSwapExtents(MWindow *mwindow, NewWindow *gui, int x, int y) : BC_Button(x, y, mwindow->theme->get_image_set("swap_extents")) { @@ -937,6 +834,3 @@ int NewSwapExtents::handle_event() return 1; } - - -