X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplaybackengine.C;h=27d177c562ef0b1971579221d126ae52db42a9c7;hb=51fdff4109828a112ac1006a92bdbdd1ba9b18a5;hp=7f31a6c13117f23b9669be4cff7c294855293273;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/playbackengine.C b/cinelerra-5.1/cinelerra/playbackengine.C index 7f31a6c1..27d177c5 100644 --- a/cinelerra-5.1/cinelerra/playbackengine.C +++ b/cinelerra-5.1/cinelerra/playbackengine.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "bchash.h" @@ -66,7 +66,7 @@ PlaybackEngine::~PlaybackEngine() { done = 1; que->send_command(STOP, - CHANGE_NONE, + CHANGE_NONE, 0, 0); interrupt_playback(); @@ -107,8 +107,6 @@ ChannelDB* PlaybackEngine::get_channeldb() { case VIDEO4LINUX2JPEG: return mwindow->channeldb_v4l2jpeg; - case PLAYBACK_BUZ: - return mwindow->channeldb_buz; } return 0; } @@ -117,13 +115,7 @@ int PlaybackEngine::create_render_engine() { // Fix playback configurations delete_render_engine(); - - - render_engine = new RenderEngine(this, - preferences, - output, - get_channeldb(), - 0); + render_engine = new RenderEngine(this, preferences, output, 0); //printf("PlaybackEngine::create_render_engine %d\n", __LINE__); return 0; } @@ -252,7 +244,7 @@ void PlaybackEngine::stop_cursor() void PlaybackEngine::init_tracking() { - tracking_active = !command->single_frame() ? 1 : 0; + tracking_active = !command->single_frame() ? 1 : 0; tracking_position = command->playbackstart; tracking_done->lock("PlaybackEngine::init_tracking"); init_cursor(tracking_active); @@ -308,8 +300,8 @@ double PlaybackEngine::get_tracking_position() if(command->get_direction() == PLAY_FORWARD) { // Interpolate - result = tracking_position + - command->get_speed() * + result = tracking_position + + command->get_speed() * tracking_timer.get_difference() / 1000.0; @@ -323,8 +315,8 @@ double PlaybackEngine::get_tracking_position() else { // Interpolate - result = tracking_position - - command->get_speed() * + result = tracking_position - + command->get_speed() * tracking_timer.get_difference() / 1000.0;