X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Findexfile.C;h=b62379b2c71108630c1d5f23fb33464da23c7462;hb=af2d680fc71d16363f7f7fb7e602cb0c30015ee5;hp=5958efa5f85a08aaee6c6b50957d4521d1d95c41;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/indexfile.C b/cinelerra-5.1/cinelerra/indexfile.C index 5958efa5..b62379b2 100644 --- a/cinelerra-5.1/cinelerra/indexfile.C +++ b/cinelerra-5.1/cinelerra/indexfile.C @@ -336,7 +336,7 @@ int IndexFile::open_source() command.realtime = 0; cache = new CICache(mwindow->preferences); render_engine = new RenderEngine(0, - mwindow->preferences, 0, 0, 0); + mwindow->preferences, 0, 0); render_engine->set_acache(cache); render_engine->arm_command(&command); FileSystem fs; @@ -445,7 +445,7 @@ SET_TRACE // Some file formats have their own sample index. // Test for index in stream table of contents - if(source && !source->get_index(index_filename)) + if(source && !source->get_index(this, progress)) { IndexState *index_state = get_state(); index_state->index_status = INDEX_READY; @@ -738,9 +738,7 @@ SET_TRACE int prev_y2 = center_pixel; int first_frame = 1; int zoom_y = mwindow->edl->local_session->zoom_y, zoom_y2 = zoom_y / 2; - int max_y = canvas->get_h(); - int zmax_y = center_pixel + zoom_y2 - 1; - if( zmax_y < max_y ) max_y = zmax_y; + int max_y = center_pixel + zoom_y2 - 1; SET_TRACE for(int bufferposition = 0;