X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmwindow.C;h=8fffe15fd88eab00d98ce7cfdcb28c59cf4e64d0;hb=94e8dc2b306135e7735b2618a54f0f7de7ac7a0c;hp=40a8b4711775bd3e511890f2b8fd4467a743ba88;hpb=aec726a82269214e444c42aafabdf84974e8c3b7;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/mwindow.C b/cinelerra-5.0/cinelerra/mwindow.C index 40a8b471..8fffe15f 100644 --- a/cinelerra-5.0/cinelerra/mwindow.C +++ b/cinelerra-5.0/cinelerra/mwindow.C @@ -109,6 +109,7 @@ #include "vwindowgui.h" #include "vwindow.h" #include "wavecache.h" +#include "wwindow.h" #include "zoombar.h" #include @@ -200,6 +201,7 @@ MWindow::MWindow() awindow = 0; gwindow = 0; twindow = 0; + wwindow = 0; lwindow = 0; sighandler = 0; reload_status = 0; @@ -235,7 +237,6 @@ MWindow::~MWindow() hide_keyframe_guis(); clean_indexes(); save_defaults(); - // Give up and go to a movie // cant run valgrind if this is used // if( !reload_status ) exit(0); @@ -250,12 +251,14 @@ MWindow::~MWindow() if( lwindow && lwindow->gui ) lwindow->gui->close(0); if( gwindow && gwindow->gui ) gwindow->gui->close(0); if( twindow && twindow->is_running() ) twindow->close_window(); + if( wwindow && wwindow->is_running() ) wwindow->close_window(); vwindows.remove_all_objects(); gui->close(0); if( awindow ) awindow->join(); if( cwindow ) cwindow->join(); if( lwindow ) lwindow->join(); if( twindow ) twindow->join(); + if( wwindow ) wwindow->join(); if( gwindow ) gwindow->join(); join(); #else @@ -268,6 +271,7 @@ MWindow::~MWindow() close_gui(lwindow); close_gui(gwindow); close_gui(twindow); + close_gui(wwindow); vwindows.remove_all_objects(); gui->close(0); join(); @@ -284,6 +288,7 @@ MWindow::~MWindow() delete awindow; awindow = 0; delete lwindow; lwindow = 0; delete twindow; twindow = 0; + delete wwindow; wwindow = 0; delete gwindow; gwindow = 0; // must be last or nouveau chokes delete cwindow; cwindow = 0; @@ -330,8 +335,7 @@ void MWindow::quit(int unlock) interrupt_indexes(); clean_indexes(); save_defaults(); -// This is the last thread to exit - playback_3d->quit(); + gui->set_done(0); if(unlock) gui->lock_window("MWindow::quit"); } @@ -463,8 +467,8 @@ int MWindow::init_plugins(MWindow *mwindow, Preferences *preferences) if( !load_plugin_index(mwindow, index_path) ) return 1; FILE *fp = fopen(index_path,"w"); if( !fp ) { - fprintf(stderr," MWindow::init_plugins: " - "can't create plugin index: %s\n", index_path); + fprintf(stderr,_("MWindow::init_plugins: " + "can't create plugin index: %s\n"), index_path); return 1; } fprintf(fp, "%d\n", PLUGIN_FILE_VERSION); @@ -658,10 +662,19 @@ void MWindow::init_gwindow() void MWindow::init_tipwindow() { - twindow = new TipWindow(this); + if( !twindow ) + twindow = new TipWindow(this); twindow->start(); } +void MWindow::show_warning(int *do_warning, const char *text) +{ + if( do_warning && !*do_warning ) return; + if( !wwindow ) + wwindow = new WWindow(this); + wwindow->show_warning(do_warning, text); +} + void MWindow::init_theme() { Timer timer; @@ -947,7 +960,7 @@ int MWindow::put_commercial() for(Track *track=tracks->first; track && !errmsg; track=track->next) { if( track->data_type != TRACK_VIDEO ) continue; if( !track->record ) continue; - if( count > 0 ) { errmsg = "multiple video tracks"; break; } + if( count > 0 ) { errmsg = _("multiple video tracks"); break; } ++count; int64_t units_start = track->to_units(start,0); int64_t units_end = track->to_units(end,0); @@ -959,9 +972,9 @@ int MWindow::put_commercial() edit2 = edits->last; units_end = edits->length(); } - if(edit1 != edit2) { errmsg = "crosses edits"; break; } + if(edit1 != edit2) { errmsg = _("crosses edits"); break; } Indexable *indexable = edit1->get_source(); - if( !indexable->is_asset ) { errmsg = "not asset"; break; } + if( !indexable->is_asset ) { errmsg = _("not asset"); break; } } //run it for(Track *track=tracks->first; track && !errmsg; track=track->next) { @@ -980,17 +993,17 @@ int MWindow::put_commercial() Indexable *indexable = edit1->get_source(); Asset *asset = (Asset *)indexable; File *file = video_cache->check_out(asset, edl); - if( !file ) { errmsg = "no file"; break; } + if( !file ) { errmsg = _("no file"); break; } int64_t edit_length = units_end - units_start; int64_t edit_start = units_start - edit1->startproject + edit1->startsource; result = commercials->put_clip(file, edit1->channel, track->from_units(edit_start), track->from_units(edit_length)); video_cache->check_in(asset); - if( result ) { errmsg = "db failed"; break; } + if( result ) { errmsg = _("db failed"); break; } } if( errmsg ) { char string[BCTEXTLEN]; - sprintf(string, "put_commercial: %s", errmsg); + sprintf(string, _("put_commercial: %s"), errmsg); MainError::show_error(string); undo_commercial(); result = 1; @@ -1060,7 +1073,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); new_edl->copy_session(edl); new_file->set_program(edl->session->program_no); - sprintf(string, "Loading %s", new_asset->path); + sprintf(string, _("Loading %s"), new_asset->path); gui->show_message(string); if(debug) printf("MWindow::load_filenames %d\n", __LINE__); @@ -1078,7 +1091,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); (new_asset->height % 2))) { char string[BCTEXTLEN]; - sprintf(string, "%s's resolution is %dx%d.\nImages with odd dimensions may not decode properly.", + sprintf(string, _("%s's resolution is %dx%d.\nImages with odd dimensions may not decode properly."), new_asset->path, new_asset->width, new_asset->height); @@ -1089,8 +1102,8 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); edl->session->program_no != new_asset->program) { char string[BCTEXTLEN]; - sprintf(string, "%s's index was built for program number %d\n" - "Playback preference is %d.\n Using program %d.", + sprintf(string, _("%s's index was built for program number %d\n" + "Playback preference is %d.\n Using program %d."), new_asset->path, new_asset->program, edl->session->program_no, new_asset->program); MainError::show_error(string); @@ -1424,6 +1437,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__); select_asset(0, 0); edl->local_session->preview_start = 0; edl->local_session->preview_end = edl->tracks->total_playable_length(); + edl->local_session->loop_playback = 0; edl->local_session->set_selectionstart(0); edl->local_session->set_selectionend(0); fit_selection(); @@ -1506,9 +1520,9 @@ void MWindow::test_plugins(EDL *new_edl, char *path) if (!plugin_found) { sprintf(string, - "The effect '%s' in file '%s' is not part of your installation of Cinelerra.\n" - "The project won't be rendered as it was meant and Cinelerra might crash.\n", - plugin->title, + _("The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n" + "The project won't be rendered as it was meant and Cinelerra might crash.\n"), + "effect", plugin->title, path); MainError::show_error(string); } @@ -1539,9 +1553,9 @@ void MWindow::test_plugins(EDL *new_edl, char *path) if (!transition_found) { sprintf(string, - "The transition '%s' in file '%s' is not part of your installation of Cinelerra.\n" - "The project won't be rendered as it was meant and Cinelerra might crash.\n", - edit->transition->title, + _("The %s '%s' in file '%s' is not part of your installation of Cinelerra.\n" + "The project won't be rendered as it was meant and Cinelerra might crash.\n"), + "transition", edit->transition->title, path); MainError::show_error(string); } @@ -1573,11 +1587,11 @@ void MWindow::init_shm() fd = 0; if(result < 0x7fffffff) { char string[BCTEXTLEN]; - sprintf(string, "MWindow::init_shm: /proc/sys/kernel/shmmax is 0x" _LX ".\n" + sprintf(string, _("MWindow::init_shm: /proc/sys/kernel/shmmax is 0x" _LX ".\n" "you probably need to be root, or:\n" "as root, run: echo 0x7fffffff > /proc/sys/kernel/shmmax\n" "before trying to start cinelerra.\n" - "It should be at least 0x7fffffff for Cinelerra.\n", result); + "It should be at least 0x7fffffff for Cinelerra.\n"), result); MainError::show_error(string); } } @@ -1807,7 +1821,7 @@ ENABLE_BUFFER //PRINT_TRACE gwindow->start(); //PRINT_TRACE - Thread::start(); +// Thread::start(); //PRINT_TRACE playback_3d->start(); //PRINT_TRACE @@ -2663,8 +2677,16 @@ static inline int gcd(int m, int n) int MWindow::create_aspect_ratio(float &w, float &h, int width, int height) { + w = 1; h = 1; if(!width || !height) return 1; double ar = (double)width / height; +// square-ish pixels + if( EQUIV(ar, 1.0000) ) return 0; + if( EQUIV(ar, 1.3333) ) { w = 4; h = 3; return 0; } + if( EQUIV(ar, 1.7777) ) { w = 16; h = 9; return 0; } + if( EQUIV(ar, 2.1111) ) { w = 19; h = 9; return 0; } + if( EQUIV(ar, 2.2222) ) { w = 20; h = 9; return 0; } + if( EQUIV(ar, 2.3333) ) { w = 21; h = 9; return 0; } int ww = width, hh = height; // numerator, denominator must be under mx int mx = 255, n = gcd(ww, hh); @@ -2780,6 +2802,13 @@ void MWindow::remove_assets_from_project(int push_undo) } } + for(int i = 0; i < session->drag_assets->size(); i++) + { + Indexable *indexable = session->drag_assets->values[i]; + remove_indexfile(indexable); + } + +//printf("MWindow::rebuild_indices 1 %s\n", indexable->path); if(push_undo) undo->update_undo_before(); edl->remove_from_project(session->drag_assets); edl->remove_from_project(session->drag_clips);