update version, tweak motion window sizes, motion xml

diff --git a/cinelerra-5.1/PKGBUILD b/cinelerra-5.1/PKGBUILD
index f4aa2c6df238ece0680eadfc0d890a423efa8fcb..71d3f24f22925c6055b50b5b4be1e68350edca75 100644 (file)
--- a/cinelerra-5.1/PKGBUILD
+++ b/cinelerra-5.1/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: goodguy <lists.cinelerra-cv.org>
 pkgname=cin
 pkgver=5.1
-pkgrel=20161030
+pkgrel=20161130
 pkgdesc="Cinelerra git://git.cinelerra-cv.org/goodguy/cinelerra.git ($pkgrel)"
 arch=('x86_64')
 url="http://www.cinelerra-cv.org"

diff --git a/cinelerra-5.1/cinelerra.spec b/cinelerra-5.1/cinelerra.spec
index 3f8f36f08440d5363eb525bbf2bf1271efdbfd46..d7646a8875090ba1367d5ee6c1359acac8534739 100644 (file)
--- a/cinelerra-5.1/cinelerra.spec
+++ b/cinelerra-5.1/cinelerra.spec
@@ -1,4 +1,4 @@
-%define ver 20161030
+%define ver 20161130
 Summary: Multimedia Editing and construction
 Name: cinelerra
 Version: 5.1

diff --git a/cinelerra-5.1/debian/changelog b/cinelerra-5.1/debian/changelog
index a2d9e7230cb90675b27e4dd40bab79886b3306bd..5efa32f1d725fc46674ce46459be73be98d739c0 100644 (file)
--- a/cinelerra-5.1/debian/changelog
+++ b/cinelerra-5.1/debian/changelog
@@ -1,4 +1,4 @@
-cin (1:5.1.20161030) unstable; urgency=low
+cin (1:5.1.20161130) unstable; urgency=low
 
   [ guy goode ]
 

diff --git a/cinelerra-5.1/debian/control b/cinelerra-5.1/debian/control
index 69c390aabe0e1d5215db31adf011c5d628f7934b..08d9cf5d29eff4357aec77f88e4df7e11a999785 100644 (file)
--- a/cinelerra-5.1/debian/control
+++ b/cinelerra-5.1/debian/control
@@ -1,7 +1,7 @@
 Source: cin
 Section: video
 Priority: optional
-Standards-Version: 5.1.20161030
+Standards-Version: 5.1.20161130
 Maintainer: mailing list <cinelerra@lists.cinelerra-cv.org>
 Homepage: http://www.cinelerra-cv.org/
 Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs,

diff --git a/cinelerra-5.1/plugins/motion-cv/motion-cv.C b/cinelerra-5.1/plugins/motion-cv/motion-cv.C
index 5e4a1c19cd2196d4438467ee9aa4ee8df7fb8edb..2359e0e253cb7efcca5ea168ec9ca79f28813326 100644 (file)
--- a/cinelerra-5.1/plugins/motion-cv/motion-cv.C
+++ b/cinelerra-5.1/plugins/motion-cv/motion-cv.C
@@ -261,7 +261,7 @@ void MotionCVMain::save_data(KeyFrame *keyframe)
 
 // cause data to be stored directly in text
        output.set_shared_output(keyframe->get_data(), MESSAGESIZE);
-       output.tag.set_title("MOTION");
+       output.tag.set_title("MOTIONCV");
 
        output.tag.set_property("BLOCK_COUNT", config.block_count);
        output.tag.set_property("GLOBAL_POSITIONS", config.global_positions);
@@ -290,7 +290,7 @@ void MotionCVMain::save_data(KeyFrame *keyframe)
        output.tag.set_property("HORIZONTAL_ONLY", config.horizontal_only);
        output.tag.set_property("VERTICAL_ONLY", config.vertical_only);
        output.append_tag();
-       output.tag.set_title("/MOTION");
+       output.tag.set_title("/MOTIONCV");
        output.append_tag();
        output.terminate_string();
 }
@@ -302,7 +302,7 @@ void MotionCVMain::read_data(KeyFrame *keyframe)
        int result = 0;
 
        while( !(result = input.read_tag()) ) {
-               if( input.tag.title_is("MOTION") ) {
+               if( input.tag.title_is("MOTIONCV") ) {
                        config.block_count = input.tag.get_property("BLOCK_COUNT", config.block_count);
                        config.global_positions = input.tag.get_property("GLOBAL_POSITIONS", config.global_positions);
                        config.rotate_positions = input.tag.get_property("ROTATE_POSITIONS", config.rotate_positions);

diff --git a/cinelerra-5.1/plugins/motion-cv/motionwindow-cv.C b/cinelerra-5.1/plugins/motion-cv/motionwindow-cv.C
index 2c4c00492d1afdcf8409683ef10a8a84feb9bde3..3b33646910bc4a96af7f3dd4a52e32292326d1d2 100644 (file)
--- a/cinelerra-5.1/plugins/motion-cv/motionwindow-cv.C
+++ b/cinelerra-5.1/plugins/motion-cv/motionwindow-cv.C
@@ -31,7 +31,7 @@
 #include "pluginserver.h"
 
 MotionCVWindow::MotionCVWindow(MotionCVMain *plugin)
- : PluginClientWindow(plugin, 815, 650, 815, 650, 0)
+ : PluginClientWindow(plugin, 815, 660, 815, 660, 0)
 {
        this->plugin = plugin;
 }
@@ -137,13 +137,13 @@ void MotionCVWindow::create_objects()
        add_subwindow(track_single =
                new TrackSingleFrame(plugin, this, x1, y1));
        add_subwindow(title =
-               new BC_Title(x1 += track_single->get_w() + 20, y1, _("Frame number:")));
+               new BC_Title(x1=x2, y1, _("Frame number:")));
        add_subwindow(track_frame_number =
                new TrackFrameNumber(plugin, this, x1 += title->get_w(), y1));
        add_subwindow(addtrackedframeoffset =
-               new AddTrackedFrameOffset(plugin, this, x1, y1+=track_frame_number->get_h()));
+               new AddTrackedFrameOffset(plugin, this, x1=x2, y1+=track_frame_number->get_h()));
        int pef = client->server->mwindow->edl->session->video_every_frame;
-       add_subwindow(pef_title = new BC_Title(x1, y1+=addtrackedframeoffset->get_h() + 5,
+       add_subwindow(pef_title = new BC_Title(x1=x2, y1+=addtrackedframeoffset->get_h() + 5,
                !pef ?  _("For best results\n"
                                " Set: Play every frame\n"
                                " Preferences-> Playback-> Video Out") :

diff --git a/cinelerra-5.1/plugins/motion-hv/motion-hv.C b/cinelerra-5.1/plugins/motion-hv/motion-hv.C
index 3b0b128ab7e500e31baf8eab232b93f6ea6f4480..ea339d9217ca08bb8a4af74b14fb75db2182d2dd 100644 (file)
--- a/cinelerra-5.1/plugins/motion-hv/motion-hv.C
+++ b/cinelerra-5.1/plugins/motion-hv/motion-hv.C
@@ -332,7 +332,7 @@ void MotionHVMain::save_data(KeyFrame *keyframe)
 
 // cause data to be stored directly in text
        output.set_shared_output(keyframe->get_data(), MESSAGESIZE);
-       output.tag.set_title("MOTION");
+       output.tag.set_title("MOTIONHV");
 
        output.tag.set_property("BLOCK_COUNT", config.block_count);
 //     output.tag.set_property("GLOBAL_POSITIONS", config.global_positions);
@@ -362,7 +362,7 @@ void MotionHVMain::save_data(KeyFrame *keyframe)
        output.tag.set_property("HORIZONTAL_ONLY", config.horizontal_only);
        output.tag.set_property("VERTICAL_ONLY", config.vertical_only);
        output.append_tag();
-       output.tag.set_title("/MOTION");
+       output.tag.set_title("/MOTIONHV");
        output.append_tag();
        output.terminate_string();
 }
@@ -381,7 +381,7 @@ void MotionHVMain::read_data(KeyFrame *keyframe)
 
                if(!result)
                {
-                       if(input.tag.title_is("MOTION"))
+                       if(input.tag.title_is("MOTIONHV"))
                        {
                                config.block_count = input.tag.get_property("BLOCK_COUNT", config.block_count);
 //                             config.global_positions = input.tag.get_property("GLOBAL_POSITIONS", config.global_positions);

diff --git a/cinelerra-5.1/plugins/motion/motionwindow.C b/cinelerra-5.1/plugins/motion/motionwindow.C
index 7d6fa43839ec6adb371259ce497b6223d437139a..78097b8c7e583238d99c9dff9ff46dcd28301093 100644 (file)
--- a/cinelerra-5.1/plugins/motion/motionwindow.C
+++ b/cinelerra-5.1/plugins/motion/motionwindow.C
@@ -32,7 +32,7 @@
 #include "pluginserver.h"
 
 MotionWindow::MotionWindow(MotionMain *plugin)
- : PluginClientWindow(plugin, 600, 650, 600, 650, 0)
+ : PluginClientWindow(plugin, 800, 660, 800, 660, 0)
 {
        this->plugin = plugin;
 }
@@ -43,8 +43,8 @@ MotionWindow::~MotionWindow()
 
 void MotionWindow::create_objects()
 {
-       int x1 = 10, x = 10, y = 10;
-       int x2 = 310;
+       int x = 10, y = 10;
+       int x1 = x, x2 = get_w() / 2;
        BC_Title *title;
 
        add_subwindow(global = new MotionGlobal(plugin, this, x1, y));
@@ -162,13 +162,13 @@ void MotionWindow::create_objects()
        add_subwindow(track_single =
                new TrackSingleFrame(plugin, this, x1, y1));
        add_subwindow(title =
-               new BC_Title(x1 += track_single->get_w() + 20, y1, _("Frame number:")));
+               new BC_Title(x1=x2, y1, _("Frame number:")));
        add_subwindow(track_frame_number =
                new TrackFrameNumber(plugin, this, x1 += title->get_w(), y1));
        add_subwindow(addtrackedframeoffset =
-               new AddTrackedFrameOffset(plugin, this, x1, y1+=track_frame_number->get_h()));
+               new AddTrackedFrameOffset(plugin, this, x1=x2, y1+=track_frame_number->get_h()));
        int pef = client->server->mwindow->edl->session->video_every_frame;
-       add_subwindow(pef_title = new BC_Title(x1, y1+=addtrackedframeoffset->get_h() + 5,
+       add_subwindow(pef_title = new BC_Title(x1=x2, y1+=addtrackedframeoffset->get_h() + 5,
                !pef ?  _("For best results\n"
                                " Set: Play every frame\n"
                                " Preferences-> Playback-> Video Out") :

diff --git a/cinelerra-5.1/plugins/motion2point/motionwindow.C b/cinelerra-5.1/plugins/motion2point/motionwindow.C
index ccfbe5046040bdde5d4f572008e8e3b25b4e2209..f10a7f3959c9c29bc56ee0e247379ae297b715ba 100644 (file)
--- a/cinelerra-5.1/plugins/motion2point/motionwindow.C
+++ b/cinelerra-5.1/plugins/motion2point/motionwindow.C
@@ -37,12 +37,7 @@
 
 
 MotionWindow::MotionWindow(MotionMain2 *plugin)
- : PluginClientWindow(plugin,
-       600,
-       640,
-       600,
-       640,
-       0)
+ : PluginClientWindow(plugin, 680, 660, 680, 660, 0)
 {
        this->plugin = plugin;
 }
@@ -53,7 +48,7 @@ MotionWindow::~MotionWindow()
 
 void MotionWindow::create_objects()
 {
-       int x1[] = { 10, 310 };
+       int x1[] = { 10, get_w()/2 };
        int x = 10, y = 10, y1 = 10;
        BC_Title *title;