add BC_SCALE env var for hi def monitors, cleanup theme data

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / livevideo / livevideo.C

diff --git a/cinelerra-5.1/plugins/livevideo/livevideo.C b/cinelerra-5.1/plugins/livevideo/livevideo.C
index 92187364426db10e50570c5cb3297b8aebedd059..1aa84222d2c8963b40a30e619d26bb4eb958c310 100644 (file)
--- a/cinelerra-5.1/plugins/livevideo/livevideo.C
+++ b/cinelerra-5.1/plugins/livevideo/livevideo.C
@@ -26,6 +26,7 @@
 #include "channeldb.h"
 #include "clip.h"
 #include "bchash.h"
+#include "edl.h"
 #include "edlsession.h"
 #include "filexml.h"
 #include "guicast.h"
@@ -196,8 +197,8 @@ LiveVideoWindow::LiveVideoWindow(LiveVideo *plugin)
  : PluginClientWindow(plugin,
        plugin->w,
        plugin->h,
-       100,
-       100,
+       xS(100),
+       yS(100),
        1)
 {
        this->plugin = plugin;
@@ -210,9 +211,11 @@ LiveVideoWindow::~LiveVideoWindow()
 
 void LiveVideoWindow::create_objects()
 {
-       int x = 10, y = 10;
+       int xs10 = xS(10);
+       int ys5 = yS(5), ys10 = yS(10);
+       int x = xs10, y = ys10;
 
-       EDLSession *session = plugin->PluginClient::get_edlsession();
+       EDLSession *session = plugin->get_edl()->session;
        if(session)
                VideoDevice::load_channeldb(plugin->channeldb, session->vconfig_in);
        for(int i = 0; i < plugin->channeldb->size(); i++)
@@ -224,14 +227,14 @@ void LiveVideoWindow::create_objects()
        }
 
        add_subwindow(title = new BC_Title(x, y, _("Channels:")));
-       y += title->get_h() + 5;
+       y += title->get_h() + ys5;
        add_subwindow(list = new LiveChannelList(plugin,
                this,
                x,
                y,
-               get_w() - x - 10,
-               get_h() - y - BC_OKButton::calculate_h() - 10 - 10));
-       y += list->get_h() + 10;
+               get_w() - x - xs10,
+               get_h() - y - BC_OKButton::calculate_h() - ys10 - ys10));
+       y += list->get_h() + ys10;
        add_subwindow(select = new LiveChannelSelect(plugin,
                this,
                x,
@@ -344,8 +347,8 @@ LiveVideo::LiveVideo(PluginServer *server)
        vdevice = 0;
        temp = 0;
        channeldb = new ChannelDB;
-       w = 320;
-       h = 640;
+       w = xS(320);
+       h = yS(640);
        prev_channel = 0;
        dv = 0;
        mjpeg = 0;
@@ -382,7 +385,7 @@ int LiveVideo::process_buffer(VFrame *frame,
 //printf("LiveVideo::process_buffer 10 start_position=%lld buffer_size=%d size=%d\n",
 //start_position, get_buffer_size(), size);
 
-       EDLSession *session = PluginClient::get_edlsession();
+       EDLSession *session = get_edl()->session;
        if(!vdevice)
        {
                if(session)