X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frenderengine.C;fp=cinelerra-5.1%2Fcinelerra%2Frenderengine.C;h=970a91b0571f9afff27e1ca68c57f71b819db584;hb=49f85559268fc040fe7ba5611cc0520793cf728b;hp=abca0715be47135761d7ca78d67fc041cadf3e2b;hpb=a284b8c124e0719cf7bde9f3ad4f91a67b7c7f85;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/renderengine.C b/cinelerra-5.1/cinelerra/renderengine.C index abca0715..970a91b0 100644 --- a/cinelerra-5.1/cinelerra/renderengine.C +++ b/cinelerra-5.1/cinelerra/renderengine.C @@ -24,7 +24,6 @@ #include "asset.h" #include "audiodevice.h" #include "bcsignals.h" -#include "channeldb.h" #include "condition.h" #include "edl.h" #include "edlsession.h" @@ -46,13 +45,11 @@ RenderEngine::RenderEngine(PlaybackEngine *playback_engine, Preferences *preferences, Canvas *output, - ChannelDB *channeldb, int is_nested) : Thread(1, 0, 0) { this->playback_engine = playback_engine; this->output = output; - this->channeldb = channeldb; this->is_nested = is_nested; audio = 0; video = 0; @@ -248,26 +245,6 @@ int RenderEngine::brender_available(int position, int direction) return 0; } -Channel* RenderEngine::get_current_channel() -{ - if(channeldb) - { - switch(config->vconfig->driver) - { - case PLAYBACK_BUZ: - if(config->vconfig->buz_out_channel >= 0 && - config->vconfig->buz_out_channel < channeldb->size()) - { - return channeldb->get(config->vconfig->buz_out_channel); - } - break; - case VIDEO4LINUX2JPEG: - case VIDEO4LINUX2MPEG: - break; - } - } - return 0; -} CICache* RenderEngine::get_acache() { @@ -356,8 +333,6 @@ int RenderEngine::open_output() get_output_h(), output, command->single_frame()); - Channel *channel = get_current_channel(); - if(channel) video->set_channel(channel); video->set_quality(80); video->set_cpus(preferences->processors); }