@@ -1,4 +1,11 @@

 -------------------------------------------------------------------

+Wed Oct  4 23:03:03 UTC 2017 - avvissu@yandex.by

+

+- Update to 1.14:

+  * see /usr/share/doc/packages/flowblade/RELEASE_NOTES

+- Use python-gobject-Gdk instead of python-gobject

+

+-------------------------------------------------------------------

 Tue Mar 21 18:43:57 UTC 2017 - avvissu@yandex.by

 - Update to 1.12.2:

​

@@ -17,7 +17,7 @@

 %define prjname Flowblade

 Name:           flowblade

-Version:        1.12.2

+Version:        1.14

 Release:        0

 Summary:        Multitrack non-linear video editor

 License:        GPL-3.0

@@ -36,7 +36,6 @@

 BuildRequires:  dbus-1-python

 BuildRequires:  python-cairo

 BuildRequires:  python-gnomevfs

-BuildRequires:  python-gobject

 BuildRequires:  python-imaging

 BuildRequires:  python-mlt

 BuildRequires:  python-numpy

@@ -48,6 +47,7 @@

 Requires:       libmlt6-modules

 Requires:       python-cairo

 Requires:       python-gnomevfs

+Requires:       python-gobject-Gdk

 Requires:       python-gobject

 Requires:       python-imaging

 Requires:       python-mlt

​

@@ -1,5879 +0,0 @@

-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER

-# This file is distributed under the same license as the PACKAGE package.

-#

-# Николай Смольянинов <smolianinow.colya2016@yandex.ru>, 2017.

-msgid ""

-msgstr ""

-"Project-Id-Version: Flowblade\n"

-"Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2017-03-06 18:44+0200\n"

-"PO-Revision-Date: 2017-03-06 18:18+0300\n"

-"Last-Translator: Николай Смольянинов <smolianinow.colya2016@yandex.ru>\n"

-"Language-Team: Russian\n"

-"Language: ru_RU\n"

-"MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"

-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

-"X-Generator: Poedit 1.8.7.1\n"

-

-#: app.py:758

-msgid "Too small screen for this application."

-msgstr "Недостаточное разрешение экрана."

-

-#: app.py:761

-msgid "Minimum screen dimensions for this application are 1152 x 768.\n"

-msgstr "Разрешение экрана должно быть не ниже 1152 х 768.\n"

-

-#: app.py:762

-msgid "Your screen dimensions are "

-msgstr "Ваше разрешение экрана"

-

-#: app.py:795 projectaction.py:366 projectaction.py:696

-msgid "Project has not been saved previously"

-msgstr "Проект не был сохранён"

-

-#: app.py:796 projectaction.py:367 projectaction.py:697

-msgid "Save project with File -> Save As before closing."

-msgstr "Сохраните проект перед закрытием (Файл ⇨ Сохранить как...)."

-

-#: projectaction.py:111

-msgid "Media asset was missing!"

-msgstr "Недостающий медиа актив!"

-

-#: projectaction.py:112

-msgid "Path of missing asset:"

-msgstr "Путь недостающего актива"

-

-#: projectaction.py:113

-msgid ""

-"Relative search for replacement file in sub folders of project file failed."

-msgstr ""

-"Относительный поиск замены файла во вложеных папках файла проекта не удался."

-

-#: projectaction.py:114

-msgid "To load the project you will need to either:"

-msgstr "Для загрузки проекта требуется, либо:"

-

-#: projectaction.py:115

-msgid ""

-"Open project in 'Media Relinker' tool to relink media assets to new files, or"

-msgstr ""

-"Открытый проект в инструменте \"Медиа компоновщик\"  переупакует медиа-"

-"активы к новым файлам, или"

-

-#: projectaction.py:116

-msgid "Place a file with the same exact name and path on the hard drive"

-msgstr "Создать резервный файл с тем же именем и  содержанием"

-

-#: projectaction.py:117

-msgid "Open project in Media Relinker tool"

-msgstr "Открытый проект в Медиа компоновщике"

-

-#: projectaction.py:136

-msgid "Profile with Description: '"

-msgstr "Профиль с описанием: '"

-

-#: projectaction.py:136

-msgid "' was not found on load!"

-msgstr "' не найден при загрузке!"

-

-#: projectaction.py:137

-msgid ""

-"It is possible to load the project by creating a User Profile with exactly "

-"the same Description\n"

-"as the missing profile. "

-msgstr ""

-"Можно загрузить проект путём создания профиля с тем же содержанием, что было "

-"в отсутствующем\n"

-"профиле. "

-

-#: projectaction.py:138

-msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."

-msgstr ""

-"Профили пользователей могут быть созданы с помощью меню  \"Правка ⇨ Менеджер "

-"профилей\"."

-

-#: projectaction.py:145

-msgid "Opening"

-msgstr "Открывается"

-

-#: projectaction.py:276

-msgid "Media files already present in project were opened!"

-msgstr "Клипы уже присутствуют в проекте и были открыты!"

-

-#: projectaction.py:282

-msgid ""

-"Files already present:\n"

-"\n"

-msgstr ""

-"Файлы уже присутствуют:\n"

-"\n"

-

-#: projectaction.py:481

-msgid "Selected folder contains files"

-msgstr "Выбранная папка содержит файлы"

-

-#: projectaction.py:482

-msgid ""

-"When saving a back-up snapshot of the project, the selected folder\n"

-"has to be empty."

-msgstr ""

-"При сохранении резервной копии проекта, выбираемая папка\n"

-"должна быть пустой."

-

-#: projectaction.py:553

-msgid "Copying project media assets"

-msgstr "Копирование медиа-активов проекта"

-

-#: projectaction.py:554

-msgid "Saving project file"

-msgstr "Сохранение файла проекта"

-

-#: projectaction.py:709

-msgid "Project not found on disk"

-msgstr "Проект не найден"

-

-#: projectaction.py:710

-msgid "Project can't be loaded."

-msgstr "Невозможно загрузить проект"

-

-#: projectaction.py:718

-msgid "Project has not been saved since it was opened."

-msgstr "Открыт не сохранённый проект."

-

-#: projectaction.py:723

-msgid "Project was saved less than a minute ago."

-msgstr "Проект был сохранён менее минуты назад."

-

-#: projectaction.py:726

-msgid "Project was saved one minute ago."

-msgstr "Проект был сохранён минуту назад."

-

-#: projectaction.py:728

-msgid "Project was saved "

-msgstr "Проект был сохранён "

-

-#: projectaction.py:728

-msgid " minutes ago."

-msgstr " минут назад."

-

-#: projectaction.py:782

-msgid "Render launch failed!"

-msgstr "Не удалось запустить сборку!"

-

-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299

-msgid "Error message: "

-msgstr "Сообщение об ошибке:"

-

-#: projectaction.py:796

-msgid "Adding item to render queue failed!"

-msgstr "Не удалось добавить элемент в очередь!"

-

-#: projectaction.py:815

-msgid "Open.."

-msgstr "Открыть.."

-

-#: projectaction.py:845

-msgid "No file was selected"

-msgstr "Ничего не выбрано"

-

-#: projectaction.py:845

-msgid "Select a numbered file to add an Image Sequence to Project."

-msgstr ""

-"Выберите нумерованный файл для добавления последовательности изображений в "

-"проект."

-

-#: projectaction.py:853

-msgid "Not a sequence file!"

-msgstr "Нет последовательности файлов!"

-

-#: projectaction.py:853

-msgid ""

-"Selected file does not have a number part in it,\n"

-"so it can't be an image sequence file."

-msgstr ""

-"Выбранный файл содержит номера, \\ поэтому он не может быть файлом "

-"последовательности изображений."

-

​

@@ -1,77 +0,0 @@

- <!DOCTYPE html>

-<html>

-<head>

-  <title>Clip Syncing</title>

-  <link rel="stylesheet" href="style.css">

-<script src="toc.js" type="text/javascript"></script>

-</head>

-

-<body>

-

-<div id="content">

-<img src="header_text_5.png" >

-

-<script src="tocgen.js"></script>

-

-<div id="toccontent">

-

-<div class="subject-header">Clip Syncing and Audio Split Editing</div>

-

-<p>

-In Flowblade Movie Editor you can <b>set a clip's positions to follow another clip's positions</b> on request.

-</p>

-

-

-<div id="toc"></div>

-

-<h3>Main points</h3>

-<ul>

-<li>Sync relations are set up by selecting a <b>Sync Parent Clip</b> for a <b>Sync Child Clip</b>.</li>

-<li><b>Only clips on track V1 can be Sync Parent Clips</b>. This is done to encourage edit style in which the main body of the Sequence is on track V1 and composites and audio split edits are done relative to the clip sequence on track V1.</li>

-<li><b>Sync feature helps preserve earlier work</b> an multitrack composites and audio split edits when clips are no longer in correct positions relative to each other, because of edits elsewhere on the Sequence.</li>

-<li><b>Resyncs are only done on request</b> to avoid jumping of clips on the timeline while editing. Explicit resyncs are also better from the point of view of avoiding side effects when doing edits.

-</li>

-</ul>

-<h3>Setting Sync Parent</h3>

-<ol>

-<li> Click <b>Right Mouse</b> on clip and select Select Sync Parent Clip... on any clip NOT on track V1.</li>

-<li> Cursor turns into a Target Cross. Click on clip on track V1 to select it as Sync Parent Clip.</li>

-<li> Sync Relation is established between the two clips. Cursor turns back into a default pointer.</li>

-<li> Sync State Stripe appers on the Sync Child Clip. Sync State Indicator Stripes on Clips:</li>

-<ul>

-<li> Green means that clip is in sync with parent.</li>

-<li> Red means that clip is NOT in sync with parent.</li>

-<li> Gray means that Sync Parent Clip is no longer on track V1.</li>

-</ul>

-</ol>

-

-<h3>Resyncing Sync Child Clips</h3>

-<ul>

-<li> Select <b>Edit -> Resync All to resync</b> from application menu all Sync Child Clips.</li>

-<li> Select <b>Edit - >Resync Selected to resync</b> from application menu selected Sync Child Clips.</li>

-<li> Click <b>Right Mouse</b> on Sync Child Clip and select <b>Resync</b> from popoup menu to resync single clip.</li>

-<li> Press <b>Resync Selected</b> Bbtton to resync selected Sync Child Clips.</li>

-</ul>

-

-<h3> Clearing Sync Parent Relations </h3>

-<ul>

-<li> Click <b>Right Mouse</b> on Sync Child Clip and select Clear Sync Relation.</li>

-</ul>

-

-<h3>Syncing Composited Clips</h3>

-<ul>

-<li> If appropriate set all clips that are part of a multitrack composite synched to the same clip.</li>

-</ul>

-

-<h3>Audio Split Syncing</h3>

-<ul>

-<li> Click <b>Right Mouse</b> on clip in track V1 and select Split Audio Synched.</li>

-<li> Edit audio split using Two Roll Trim mode to maintain sync with parent clip.</li>

-<li> Resync Audio as needed.</li>

-</ul>

-

-</div>

-</div>

-</body>

-

-</html> 

​

@@ -1,46 +0,0 @@

- <!DOCTYPE html>

-<html>

-<head>

-  <title>Page Title</title>

-  <link rel="stylesheet" href="style.css">

-<script src="toc.js" type="text/javascript"></script>

-</head>

-

-<body>

-

-<div id="content">

-<img src="header_text_5.png" >

-

-<script src="tocgen.js"></script>

-

-<div id="toccontent">

-

-<div class="subject-header">Slow / Fast Motion </div>

-

-<div id="toc"></div>

-

-<p>

-In Flowblade motion effects are achived by <b>rendering slow / fast motion versions of video clips</b> and placing those on the timeline.

-</p>

-<h3> Creating Motion Clips </h3>

-<ol>

-<li> Right click on a Media File and select <b>Render Slow / Fast Motion File</b> from menu</li>

-<li>Edit parameters for the new motion Clip

-<ul>

-<li> Set speed</li>

-<li> Give name and location for motion Clip </li>

-<li> Select rendering parameters for motion Clip. It is probably a good idea to use a <b>lossless format</b> here to avoid any generational quality losses.</li>

-<li> Select render range, either:</li>

-<ul>

-<li> Full Source Clip</li>

-<li> From Source Clip Mark In to Mark Out</li>

-</ul>

-</ul>

-<li> Click <b>Render</b> button to create a new motion Clip</li>

-</ol>

-

-</div>

-</div>

-</body>

-

-</html> 

​

@@ -1,9 +1,7 @@

 ![Flowblade](flowblade-trunk/Flowblade/res/img/header_text.png "Flowblade")

-**NEW RELEASE 1.12 is out. Relesase notes [here](./flowblade-trunk/docs/RELEASE_NOTES.md).**

-

-**Installing instructions are available [here](./flowblade-trunk/docs/INSTALLING.md).**

+**Coming soon: Target date for release 1.14 further post-poned to August 6th 2017.**

 **Contents:**

   1. [Introduction](https://github.com/jliljebl/flowblade#introduction)

@@ -58,9 +56,9 @@

 # Releases

-**Latest release:** Flowblade Movie Editor 1.12 was released on March 2016.

+**Latest release:** Flowblade Movie Editor 1.12 was released on March 2017.

-**Next release:** Flowblade Movie Editor 1.12 will be out on August 2017.

+**Next release:** Flowblade Movie Editor 1.14 will be out on August 2017.

 # Installing Flowblade

@@ -95,7 +93,7 @@

 [The project webpage is here](http://jliljebl.github.io/flowblade/). 

-For questions and discussion on Flowblade we have a [Google+ group] (https://plus.google.com/u/0/communities/103860400113389238474) available. There will be some updates on what is happening with the project too.

+For questions and discussion on Flowblade we have a [Google+ group](https://plus.google.com/u/0/communities/103860400113389238474) available. There will be some updates on what is happening with the project too.

 Use the **Issues** tab to give bug reports or to make feature requests.

​

@@ -83,6 +83,7 @@

 import respaths

 import resync

 import sequence

+import shortcuts

 import snapping

 import titler

 import tlinewidgets

@@ -94,6 +95,7 @@

 import updater

 import utils

+

 import jackaudio

 AUTOSAVE_DIR = appconsts.AUTOSAVE_DIR

@@ -175,7 +177,7 @@

         os.mkdir(user_dir + appconsts.TRIM_VIEW_DIR)

     if not os.path.exists(user_dir + appconsts.NATRON_DIR):

         os.mkdir(user_dir + appconsts.NATRON_DIR)

-        

+       

     # Set paths.

     respaths.set_paths(root_path)

@@ -195,6 +197,10 @@

     translations.load_filters_translations()

     mlttransitions.init_module()

+    # Apr-2017 - SvdB - Keyboard shortcuts

+    shortcuts.load_shortcut_files()

+    shortcuts.load_shortcuts()

+    

     # RHEL7/CentOS compatibility fix

     if gtk_version == "3.8.8":

         GObject.threads_init()

@@ -270,6 +276,7 @@

     gmic.test_availablity()

     toolnatron.init()

     toolsintegration.init()

+    #toolsintegration.test()

     # Create player object

     create_player()

@@ -327,7 +334,7 @@

             print "Launch assoc file:", assoc_file_path

             global assoc_timeout_id

             assoc_timeout_id = GObject.timeout_add(10, open_assoc_file)

-            

+       

     # Launch gtk+ main loop

     Gtk.main()

@@ -537,6 +544,8 @@

     proxyediting.set_menu_to_proxy_state()

+    undo.clear_undos()

+

     # Enable edit action GUI updates

     edit.do_gui_update = True

@@ -557,7 +566,6 @@

     audiowaveform.frames_cache = {}

     editorstate.project = new_project

-

     editorstate.media_view_filter = appconsts.SHOW_ALL_FILES

     # Inits widgets with project data

@@ -599,7 +607,7 @@

     gui.editor_window.handle_insert_move_mode_button_press()

     editorstate.trim_mode_ripple = False

-    #editorstate.project.c_seq.print_all()

+    updater.set_timeline_height()

 def change_current_sequence(index):

     stop_autosave()

@@ -624,6 +632,8 @@

     selection.select_path(str(selected_index))

     start_autosave()

+    updater.set_timeline_height()

+

 def display_current_sequence():

     # Get shorter alias.

     player = editorstate.player

@@ -750,6 +760,15 @@

         editorwindow.MONITOR_AREA_WIDTH = 400

         positionbar.BAR_WIDTH = 100

+    if editorpersistance.prefs.double_track_hights == True:

+        appconsts.TRACK_HEIGHT_NORMAL = 100 # track height in canvas and column

+        appconsts.TRACK_HEIGHT_SMALL = 50 # track height in canvas and column

+        appconsts.TRACK_HEIGHT_SMALLEST = 50 # maybe remove as it is no longer meaningful

+        appconsts.TLINE_HEIGHT = 520

+        sequence.TRACK_HEIGHT_NORMAL = appconsts.TRACK_HEIGHT_NORMAL # track height in canvas and column

+        sequence.TRACK_HEIGHT_SMALL = appconsts.TRACK_HEIGHT_SMALL # track height in canvas and column

+        tlinewidgets.set_tracks_double_height_consts()

+        

 def _too_small_screen_exit():

     global exit_timeout_id

     exit_timeout_id = GObject.timeout_add(200, _show_too_small_info)

​

@@ -65,10 +65,11 @@

 PROP_FLOAT = 1

 PROP_EXPRESSION = 2

-# Display heights for tracks.

+# Display heights for tracks and timeline.

 TRACK_HEIGHT_NORMAL = 50 # track height in canvas and column

 TRACK_HEIGHT_SMALL = 25 # track height in canvas and column

 TRACK_HEIGHT_SMALLEST = 25 # maybe remove as it is no longer meaningful

+TLINE_HEIGHT = 260

 # Notebook widths

 NOTEBOOK_WIDTH = 600 # defines app min width with MONITOR_AREA_WIDTH

@@ -147,8 +148,8 @@

 THUMBNAILS_DIR = "thumbnails"

 RENDERED_CLIPS_DIR = "rendered_clips"

 GMIC_DIR = "gmic"

-NODE_COMPOSITORS_DIR = "node_compositors"

-PHANTOM_DISK_CACHE_DIR = "phantom_disk_cache"

+PHANTOM_DIR = "phantom2d"

+PHANTOM_DISK_CACHE_DIR = "disk_cache"

 MATCH_FRAME_DIR = "match_frame"

 MATCH_FRAME = MATCH_FRAME_DIR + "/match_frame.png"

 MATCH_FRAME_NEW = MATCH_FRAME_DIR + "/match_frame_new.png"

@@ -192,3 +193,17 @@

 SINGLE_WINDOW = 1

 TWO_WINDOWS = 2

+# Apr-2017 - SvdB

+SHORTCUTS_DEFAULT = 'Flowblade Default'

+SHORTCUTS_DEFAULT_XML = 'flowblade'

+SHORTCUTS_ROOT_TAG = 'flowblade'

+SHORTCUTS_TAG = 'shortcuts'

+

+# Project properties keys

+P_PROP_DISSOLVE_GROUP_FADE_IN = "P_PROP_DISSOLVE_GROUP_FADE_IN"

+P_PROP_DISSOLVE_GROUP_FADE_OUT = "P_PROP_DISSOLVE_GROUP_FADE_OUT"

+P_PROP_ANIM_GROUP_FADE_IN = "P_PROP_ANIM_GROUP_FADE_IN"

+P_PROP_ANIM_GROUP_FADE_OUT = "P_PROP_ANIM_GROUP_FADE_OUT"

+P_PROP_TLINE_SHRINK_VERTICAL = "tline_shrink_vertical"

+P_PROP_LAST_RENDER_SELECTIONS = "P_PROP_LAST_RENDER_SELECTIONS"

+P_PROP_TRANSITION_ENCODING = "P_PROP_TRANSITION_ENCODING"

​

@@ -0,0 +1,351 @@

+"""

+    Flowblade Movie Editor is a nonlinear video editor.

+    Copyright 2012 Janne Liljeblad.

+

+    This file is part of Flowblade Movie Editor <http://code.google.com/p/flowblade>.

+

+    Flowblade Movie Editor 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 3 of the License, or

+    (at your option) any later version.

+

+    Flowblade Movie Editor 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 Flowblade Movie Editor. If not, see <http://www.gnu.org/licenses/>.

+"""

+

+"""

+Application module.

+

+Handles application initialization, shutdown, opening projects, autosave and changing

+sequences.

+"""

+import datetime

+import md5

+import mlt

+import os

+import subprocess

+import sys

+import time

+import threading

+

+import gi

+gi.require_version('Gtk', '3.0')

+gi.require_version('PangoCairo', '1.0')

+from gi.repository import GLib

+from gi.repository import Gtk, Gdk, GdkPixbuf

+

+import appconsts

+import clapperless

+import dialogs

+import dialogutils

+import edit

+import editorpersistance

+import editorstate

+from editorstate import PROJECT

+from editorstate import current_sequence

+import gui

+import movemodes

+import projectaction

+import renderconsumer

+import respaths

+import tlinewidgets

+import updater

+import utils

+

+_tline_sync_data = None # Compound clip and tline clip sync functions can't pass the same data througn clapperless so 

+                         # we use this global to save data as needed for tline sync function.

+                         # The data flow is a bit haed to follow here, this needs tobe refactored.

+

+class ClapperlesLaunchThread(threading.Thread):

+    def __init__(self, video_file, audio_file, completed_callback):

+        threading.Thread.__init__(self)

+        self.video_file = video_file

+        self.audio_file = audio_file

+        self.completed_callback = completed_callback

+        

+    def run(self):

+        _write_offsets(self.video_file, self.audio_file, self.completed_callback)

+

+# ------------------------------------------------------- module funcs

+def _write_offsets(video_file_path, audio_file_path, completed_callback):

+    print "Starting clapperless analysis..."

+    fps = str(int(utils.fps() + 0.5))

+    idstr = _get_offset_file_idstr(video_file_path, audio_file_path)

+

+    FLOG = open(utils.get_hidden_user_dir_path() + "log_clapperless", 'w')

+    

+    # clapperless.py computes offsets and writes them to file clapperless.OFFSETS_DATA_FILE

+    p = subprocess.Popen([sys.executable, respaths.LAUNCH_DIR + "flowbladeclapperless", video_file_path, audio_file_path, "--rate", fps, "--idstr", idstr], stdin=FLOG, stdout=FLOG, stderr=FLOG)

+    p.wait()

+    

+    # Offsets are now available

+    GLib.idle_add(completed_callback, (video_file_path, audio_file_path, idstr))

+

+def _get_offset_file_idstr(file_1, file_2):

+    # Create unique file path in hidden render folder

+    folder = editorpersistance.prefs.render_folder

+    return md5.new(file_1 + file_2).hexdigest()

+    

+def _read_offsets(idstr):

+    offsets_file = utils.get_hidden_user_dir_path() + clapperless.OFFSETS_DATA_FILE + "_"+ idstr

+    with open(offsets_file) as f:

+        file_lines = f.readlines()

+    file_lines = [x.rstrip("\n") for x in file_lines]

+    

+    _files_offsets = {}

+    for line in file_lines:

+        tokens = line.split(" ")

+        _files_offsets[tokens[0]] = tokens[1]

+    

+    os.remove(offsets_file)

+

+    return _files_offsets

+

+

+# ------------------------------------------------------- tline audio sync

+def init_select_tline_sync_clip(popup_data):

+

+    clip, track, item_id, x = popup_data

+    frame = tlinewidgets.get_frame(x)

+    clip_index = current_sequence().get_clip_index(track, frame)

+

+    if not (track.clips[clip_index] == clip):

+        # This should never happen 

+        print "big fu at init_select_tline_sync_clip(...)"

+        return

+

+    gdk_window = gui.tline_display.get_parent_window();

+    gdk_window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.TCROSS))

+    editorstate.edit_mode = editorstate.SELECT_TLINE_SYNC_CLIP

+

+    global _tline_sync_data

+    _tline_sync_data = TLineSyncData()

+    _tline_sync_data.origin_clip = clip

+    _tline_sync_data.origin_track = track

+    _tline_sync_data.origin_clip_index = clip_index

+    

+    

+def select_sync_clip_mouse_pressed(event, frame):

+    sync_clip = _get_sync_tline_clip(event, frame)

+

+    if sync_clip == None:

+        return # selection wasn't good

+    

+    if utils.is_mlt_xml_file(sync_clip.path) == True:

+        # This isn't translated because 1.14 translation window is close, translation coming for 1.16

+        dialogutils.warning_message("Cannot Timeline Audio Sync with Compound Clips!", 

+                                    "Audio syncing for Compound Clips is not supported.",

+                                    gui.editor_window.window,

+                                    True)

+        return

+

+    sync_track =  tlinewidgets.get_track(event.y)

+    sync_clip_index = sync_track.clips.index(sync_clip)

+

+    _tline_sync_data.sync_clip = sync_clip

+    _tline_sync_data.sync_track = sync_track

+    _tline_sync_data.sync_clip_index = sync_clip_index

+

+    # TImeline media offset for clips

+    sync_clip_start_in_tline = sync_track.clip_start(sync_clip_index)

+    _tline_sync_data.origin_clip_start_in_tline = _tline_sync_data.origin_track.clip_start(_tline_sync_data.origin_clip_index)

+    

+    _tline_sync_data.clip_tline_media_offset = (sync_clip_start_in_tline - sync_clip.clip_in) - (_tline_sync_data.origin_clip_start_in_tline - _tline_sync_data.origin_clip.clip_in)

+    

+    gdk_window = gui.tline_display.get_parent_window();

+    gdk_window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR))

+    

+    # This or GUI freezes, we really can't do Popen.wait() in a Gtk thread

+    clapperless_thread = ClapperlesLaunchThread(_tline_sync_data.origin_clip.path, sync_clip.path, _tline_sync_offsets_computed_callback)

+    clapperless_thread.start()

+

+    # Edit consumes selection

+    movemodes.clear_selected_clips()

+

+    updater.repaint_tline()

+

+def _get_sync_tline_clip(event, frame):

+    sync_track = tlinewidgets.get_track(event.y)

+

+    if sync_track == None:

+        return None

+        

+    if sync_track == _tline_sync_data.origin_track:

+        dialogutils.warning_message(_("Audio Sync parent clips must be on differnt tracks "), 

+                                _("Selected audio sync clip is on the sametrack as the sync action origin clip."),

+                                gui.editor_window.window,

+                                True)

+        return None

+

+    sync_clip_index = current_sequence().get_clip_index(sync_track, frame)

+    if sync_clip_index == -1:

+        return None

+

+    return sync_track.clips[sync_clip_index]

+    

+def _tline_sync_offsets_computed_callback(clapperless_data):

+    print "Clapperless done for tline sync"

+    

+    file_path_1, file_path_2, idstr = clapperless_data

+    files_offsets = _read_offsets(idstr)

+    

+    _tline_sync_data.media_offset_frames = int(float(files_offsets[file_path_2]) + 0.5)

+    

+    dialogs.tline_audio_sync_dialog(_tline_audio_sync_dialog_callback, _tline_sync_data)

​

@@ -141,7 +141,7 @@

                 action = edit.clip_end_drag_replace_blank_action(data)

                 action.do_edit()

     else:# Dragging clip start

-        delta =  frame - orig_in  - 1 # -1 because..uhh..inclusive exclusive something something

+        delta = frame - orig_in  - 1 # -1 because..uhh..inclusive exclusive something something

         # prev clip is not blank or first clip

         if ((clip_index == 0) or

             (track.clips[clip_index - 1].is_blanck_clip == False)):

​

@@ -33,6 +33,7 @@

 import time

 import audiowaveform

+import audiosync

 import appconsts

 import clipeffectseditor

 import compositeeditor

@@ -216,12 +217,43 @@

                 "out_frame":compositor_out,

                 "a_track":target_track_index,

                 "b_track":track.id,

-                "compositor_type":compositor_type}

+                "compositor_type":compositor_type,

+                "clip":clip}

     action = edit.add_compositor_action(edit_data)

     action.do_edit()

     updater.repaint_tline()

+def _add_autofade(data):

+    clip, track, item_id, item_data = data

+    x, compositor_type = item_data

+

+    frame = tlinewidgets.get_frame(x)

+    clip_index = track.get_clip_index_at(frame)

+

+    target_track_index = track.id - 1

+

+    clip_length = clip.clip_out - clip.clip_in

+    if compositor_type == "##auto_fade_in":

+        compositor_in = current_sequence().tracks[track.id].clip_start(clip_index)

+        compositor_out = compositor_in + int(utils.fps()) - 1

+    else:

+        clip_start = current_sequence().tracks[track.id].clip_start(clip_index)

+        compositor_out = clip_start + clip_length

+        compositor_in = compositor_out - int(utils.fps()) + 1

+

+    edit_data = {"origin_clip_id":clip.id,

+                "in_frame":compositor_in,

+                "out_frame":compositor_out,

+                "a_track":target_track_index,

+                "b_track":track.id,

+                "compositor_type":compositor_type,

+                "clip":clip}

+    action = edit.add_compositor_action(edit_data)

+    action.do_edit()

+    

+    updater.repaint_tline()

+    

 def _mute_clip(data):

     clip, track, item_id, item_data = data

     set_clip_muted = item_data

@@ -235,6 +267,62 @@

         action = edit.unmute_clip(data)

         action.do_edit()

+def _delete_clip(data):

+    tlineaction.splice_out_button_pressed()

+    

+def _lift(data):

+    tlineaction.lift_button_pressed()

+    

+def _set_length(data):

+    clip, track, item_id, item_data = data

+    dialogs.clip_length_change_dialog(_change_clip_length_dialog_callback, clip, track)

+

+def _change_clip_length_dialog_callback(dialog, response_id, clip, track, length_changer):

+    if response_id != Gtk.ResponseType.ACCEPT:

+        dialog.destroy()

+        return

+

+    length = length_changer.get_length()

+    index = track.clips.index(clip)

+    

+    dialog.destroy()

+    

+    data = {"track":track,

+            "clip":clip,

+            "index":index,

+            "length":length}

+            

+    action = edit.set_clip_length_action(data)

+    action.do_edit()

+                

+def _stretch_next(data):

+    clip, track, item_id, item_data = data

+    try:

+        next_index = track.clips.index(clip) + 1

+        if next_index >= len( track.clips):

+            return # clip is last clip

+        if track.clips[next_index].is_blanck_clip == True:

+            # Next clip is blank so we can do this.

+            clip = track.clips[next_index]

+            data = (clip, track, item_id, item_data)

+            _cover_blank_from_prev(data, True)

+    except:

+        pass # any error means that this can't be done

+        

+def _stretch_prev(data):

+    clip, track, item_id, item_data = data

+    try:

+        prev_index = track.clips.index(clip) - 1

+        if prev_index < 0:

+            return # clip is first clip

+        if track.clips[prev_index].is_blanck_clip == True:

+            # Next clip is blank so we can do this.

+            clip = track.clips[prev_index]

+            data = (clip, track, item_id, item_data)

+            _cover_blank_from_next(data, True)

+    except:

+        pass # any error means that this can't be done

+        

 def _delete_blank(data):

     clip, track, item_id, x = data

     movemodes.select_blank_range(track, clip)

@@ -245,13 +333,17 @@

     action = edit.remove_multiple_action(data)

     action.do_edit()

-def _cover_blank_from_prev(data):

+def _cover_blank_from_prev(data, called_from_prev_clip=False):

     clip, track, item_id, item_data = data

-    clip_index = movemodes.selected_range_in - 1

-    if clip_index < 0: # we're not getting legal clip index

-        return 

-    cover_clip = track.clips[clip_index]

-

+    if not called_from_prev_clip:

+        clip_index = movemodes.selected_range_in - 1

+        if clip_index < 0: # we're not getting legal clip index

+            return 

+        cover_clip = track.clips[clip_index]

+    else:

+        clip_index = track.clips.index(clip) - 1

+        cover_clip = track.clips[clip_index]

+        

     # Check that clip covers blank area

     total_length = 0

     for i in range(movemodes.selected_range_in,  movemodes.selected_range_out + 1):

@@ -269,14 +361,19 @@

     action = edit.trim_end_over_blanks(data)

     action.do_edit()

-def _cover_blank_from_next(data):

+def _cover_blank_from_next(data, called_from_next_clip=False):

     clip, track, item_id, item_data = data

-    clip_index = movemodes.selected_range_out + 1

-    blank_index = movemodes.selected_range_in

-    if clip_index < 0: # we're not getting legal clip index

-        return

-    cover_clip = track.clips[clip_index]

-    

+    if not called_from_next_clip:

+        clip_index = movemodes.selected_range_out + 1

+        blank_index = movemodes.selected_range_in

+        if clip_index < 0: # we're not getting legal clip index

+            return

+        cover_clip = track.clips[clip_index]

+    else:

+        clip_index = track.clips.index(clip) + 1

+        blank_index = clip_index - 1

+        cover_clip = track.clips[clip_index]

+        

     # Check that clip covers blank area

     total_length = 0

     for i in range(movemodes.selected_range_in,  movemodes.selected_range_out + 1):

@@ -465,4 +562,11 @@

                   "match_frame_start_monitor":_match_frame_start_monitor,

                   "match_frame_end_monitor":_match_frame_end_monitor,

                   "select_all_after": _select_all_after,

-                  "select_all_before":_select_all_before}

+                  "select_all_before":_select_all_before,

+                  "delete":_delete_clip,

+                  "lift":_lift, 

+                  "length":_set_length,

+                  "stretch_next":_stretch_next, 

+                  "stretch_prev":_stretch_prev,

+                  "add_autofade":_add_autofade,

+                  "set_audio_sync_clip":audiosync.init_select_tline_sync_clip}

​

@@ -19,13 +19,14 @@

 """

 """

-Module handles clips compositing gui.

+Module handles Compositors edit panel.

 """

 import copy

 from gi.repository import Gtk

+import compositorfades

 import gui

 import guicomponents

 import guiutils

@@ -33,6 +34,7 @@

 from editorstate import current_sequence

 import editorpersistance

 import keyframeeditor

+import mlttransitions

 import propertyeditorbuilder

 import propertyedit

 import propertyparse

@@ -56,6 +58,17 @@

     """

     # Left side

     widgets.compositor_info = guicomponents.CompositorInfoPanel()

+    widgets.fade_in_b = Gtk.Button(_("Add Fade In"))

+    widgets.fade_in_b.connect("clicked", lambda w,e: _add_fade_in_pressed(), None)

+    widgets.fade_out_b = Gtk.Button(_("Add Fade Out"))

+    widgets.fade_out_b.connect("clicked", lambda w,e: _add_fade_out_pressed(), None)

+

+    widgets.fade_in_spin = Gtk.SpinButton.new_with_range(0, 150, 1)

+    widgets.fade_in_spin.set_value(10)

+    

+    widgets.fade_out_spin = Gtk.SpinButton.new_with_range(0, 150, 1)

+    widgets.fade_out_spin.set_value(10)

+    

     widgets.delete_b = Gtk.Button(_("Delete"))

     widgets.delete_b.connect("clicked", lambda w,e: _delete_compositor_pressed(), None)

     widgets.reset_b = Gtk.Button(_("Reset"))

@@ -74,6 +87,13 @@

     compositor_vbox = Gtk.VBox(False, 2)

     compositor_vbox.pack_start(widgets.compositor_info, False, False, 0)

+    compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)

+    compositor_vbox.pack_start(widgets.fade_in_b, False, False, 0)

+    compositor_vbox.pack_start(widgets.fade_in_spin, False, False, 0)

+    compositor_vbox.pack_start(guiutils.get_pad_label(5, 12), False, False, 0)

+    compositor_vbox.pack_start(widgets.fade_out_b, False, False, 0)

+    compositor_vbox.pack_start(widgets.fade_out_spin, False, False, 0)

+    compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)

     compositor_vbox.pack_start(Gtk.Label(), True, True, 0)

     compositor_vbox.pack_start(widgets.reset_b, False, False, 0)

     compositor_vbox.pack_start(widgets.delete_b, False, False, 0)

@@ -113,10 +133,32 @@

     widgets.delete_b.set_sensitive(value)

     widgets.reset_b.set_sensitive(value)

+    if compositor == None or (compositor.transition.info.auto_fade_compositor == False \

+        and mlttransitions.is_blender(compositor.transition.info.name) == False):

+        widgets.fade_in_b.set_sensitive(value)

+        widgets.fade_out_b.set_sensitive(value)

+        widgets.fade_in_spin.set_sensitive(value)

+        widgets.fade_out_spin.set_sensitive(value)

+    else: # Autofade compositors or blenders don't use these buttons

+        widgets.fade_in_b.set_sensitive(False)

+        widgets.fade_out_b.set_sensitive(False)

+        widgets.fade_in_spin.set_sensitive(False)

+        widgets.fade_out_spin.set_sensitive(False)

+

 def maybe_clear_editor(killed_compositor):

     if killed_compositor.destroy_id == compositor.destroy_id:

         clear_compositor()

+def _add_fade_in_pressed():

+    compositorfades.add_fade_in(compositor, int(widgets.fade_in_spin.get_value()))

+    # We need GUI reload to show results

+    set_compositor(compositor)

+

+def _add_fade_out_pressed():

+    compositorfades.add_fade_out(compositor, int(widgets.fade_out_spin.get_value()))

+    # We need GUI reload to show results

+    set_compositor(compositor)

+

 def _delete_compositor_pressed():

     data = {"compositor":compositor}

     action = edit.delete_compositor_action(data)

@@ -141,7 +183,7 @@

     vbox = Gtk.VBox()

-    # case: Empty edit frame

+    # Case: Empty edit frame

     global compositor

     if compositor == None:

         widgets.empty_label = Gtk.Label(label=_("No Compositor"))

@@ -152,7 +194,8 @@

         widgets.value_edit_box = vbox

         widgets.value_edit_frame.add(vbox)

         return 

-    

+

+    # Case: Filled frame

     compositor_name_label = Gtk.Label(label= "<b>" + compositor.name + "</b>")

     compositor_name_label.set_use_markup(True)

     vbox.pack_start(compositor_name_label, False, False, 0)

@@ -190,6 +233,7 @@

         if ((editor_type == propertyeditorbuilder.KEYFRAME_EDITOR)

             or (editor_type == propertyeditorbuilder.KEYFRAME_EDITOR_RELEASE)

             or (editor_type == propertyeditorbuilder.KEYFRAME_EDITOR_CLIP)

+            or (editor_type == propertyeditorbuilder.FADE_LENGTH)

             or (editor_type == propertyeditorbuilder.GEOMETRY_EDITOR)):

                 keyframe_editor_widgets.append(editor_row)

​

@@ -0,0 +1,285 @@

+"""

+    Flowblade Movie Editor is a nonlinear video editor.

+    Copyright 2012 Janne Liljeblad.

+

+    This file is part of Flowblade Movie Editor <http://code.google.com/p/flowblade>.

+

+    Flowblade Movie Editor 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 3 of the License, or

+    (at your option) any later version.

+

+    Flowblade Movie Editor 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 Flowblade Movie Editor.  If not, see <http://www.gnu.org/licenses/>.

+"""

+import appconsts

+import dialogutils

+import gui

+import editorstate

+from editorstate import current_sequence

+import propertyedit

+import propertyparse

+

+"""

+This module handles adding fade-ins and fade-outs to compositors.

+

+Creating and managing keyframes is mostly handled by editor GUI components which cannot easily 

+be used for adding fade-ins and fade outs, so this dedicated module is needed.

+"""

+

+# Dissolve default fades group ("Dissolve", "Blend") keyframe property class names

+_dissolve_property_klasses = ["OpacityInGeomKeyframeProperty", "KeyFrameHCSTransitionProperty"]

+

+# -------------------------------------------------------------- module interface

+def add_default_fades(compositor, clip):

+    # Default fades are not aplied to auto fade compositors

+    if compositor.transition.info.auto_fade_compositor == True:

+        return

+        

+    keyframe_property, property_klass, keyframes = _get_kfproperty_klass_and_keyframes(compositor, clip)

+

+    if keyframe_property == None:

+        return

+        

+    fade_in_length, fade_out_length = _get_default_fades_lengths(property_klass)

+    print fade_in_length, 

+    if fade_in_length > 0:

+        if fade_in_length <= clip.clip_length():

+            keyframes = _add_default_fade_in(keyframe_property, property_klass, keyframes, fade_in_length)

+        else:

+            _show_defaults_length_error_dialog()

+            return

+            

+    if fade_out_length > 0:

+        if fade_out_length + fade_in_length + 1 <= clip.clip_length():

+            keyframes = _add_default_fade_out(keyframe_property, property_klass, keyframes, fade_out_length, clip)

+        else:

+            _show_defaults_length_error_dialog()

+            return

+

+    keyframe_property.write_out_keyframes(keyframes)

+

+def add_fade_in(compositor, fade_in_length):

+    clip = _get_compositor_clip(compositor)

+    keyframe_property, property_klass, keyframes = _get_kfproperty_klass_and_keyframes(compositor, clip)

+    

+    if fade_in_length > 0:

+        if fade_in_length <= clip.clip_length():

+            _do_user_add_fade_in(keyframe_property, property_klass, keyframes, fade_in_length)

+        else:

+            _show_length_error_dialog()

+

+def add_fade_out(compositor, fade_out_length):

+    clip = _get_compositor_clip(compositor)

+    keyframe_property, property_klass, keyframes = _get_kfproperty_klass_and_keyframes(compositor, clip)

+    

+    if fade_out_length > 0:

+        if fade_out_length + 1 <= clip.clip_length():

+            _do_user_add_fade_out(keyframe_property, property_klass, keyframes, fade_out_length, clip)

+        else:

+            _show_length_error_dialog()

+

+def set_auto_fade_in_keyframes(compositor):

+    clip = _get_compositor_clip(compositor)

+    keyframe_property, property_klass, keyframes = _get_kfproperty_klass_and_keyframes(compositor, clip)

+    

+    # Remove all key frames, there exists 2 or 1, 0 when created 1 always after that

+    while len(keyframes) > 0: 

+        keyframes.pop()

+    

+    # Set in fade in keyframes

+    keyframes.append((0, 0))

+    keyframes.append((compositor.get_length() - 1, 100))

+

+    keyframe_property.write_out_keyframes(keyframes)

+

+def set_auto_fade_out_keyframes(compositor):

+    clip = _get_compositor_clip(compositor)

+    keyframe_property, property_klass, keyframes = _get_kfproperty_klass_and_keyframes(compositor, clip)

+

+    # Pop first keyframe to get frame

+    #frame, geom, opacity = keyframes.pop(0)

+    

+    # Remove all key frames, there exists 2 or 1, 0 when created 1 always after that

+    while len(keyframes) > 0: 

+        keyframes.pop()

+    

+    # Set in fade in keyframes

+    keyframes.append((0, 100))

+    keyframes.append((compositor.get_length() - 1, 0))

+

+    keyframe_property.write_out_keyframes(keyframes)

+    

+# ---------------------------------------------------------------------- module finctions

+def _get_kfproperty_klass_and_keyframes(compositor, clip):

+    # Create editable properties from compositor properties.

+    t_editable_properties = propertyedit.get_transition_editable_properties(compositor)

+

+    # Find keyframe property, its class and create keyframes list

+    if compositor.transition.info.mlt_service_id == "frei0r.cairoaffineblend": # Affine Blend

+        # Because of frei0r's forced value 0.0-1.0 range "Affine Blend" is handled in a more complex way compared to other compositors

+        keyframe_property = propertyparse.create_editable_property_for_affine_blend(clip, t_editable_properties)

+        keyframes = propertyparse.rotating_geom_keyframes_value_string_to_geom_kf_array(keyframe_property.value, keyframe_property.get_in_value)

+        property_klass = keyframe_property.__class__.__name__

+        return (keyframe_property, property_klass, keyframes)

+        

+    else: # Dissolve, Blend, Picture-in-Picture, Region

+        keyframe_property = None

+        property_klass = None

+        for ep in t_editable_properties:

+            property_klass = ep.__class__.__name__

+            if property_klass == "OpacityInGeomKeyframeProperty": # Dissolve

+                keyframe_property = ep

+                keyframes = propertyparse.geom_keyframes_value_string_to_opacity_kf_array(keyframe_property.value, keyframe_property.get_in_value)

+                break

+            if property_klass == "KeyFrameHCSTransitionProperty": # Blend

+                keyframe_property = ep

+                keyframes = propertyparse.single_value_keyframes_string_to_kf_array(keyframe_property.value, keyframe_property.get_in_value)

+                break

+            if property_klass == "KeyFrameGeometryOpacityProperty": # Picture-in-Picture, Region

+                keyframe_property = ep

+                keyframes = propertyparse.geom_keyframes_value_string_to_geom_kf_array(keyframe_property.value, keyframe_property.get_in_value)

+                break

+

+        if keyframe_property == None:

+            print "didn't find keyframe_property in _get_kfproperty_klass_and_keyframes"

+            return (None, None, None)

+

+        return (keyframe_property, property_klass, keyframes)

+

+def _get_compositor_clip(compositor):

+    for i in range(current_sequence().first_video_index, len(current_sequence().tracks) - 1): # -1, there is a topmost hidden track 

+        track = current_sequence().tracks[i] # b_track is source track where origin clip is

+        for j in range(0, len(track.clips)):

+            clip = track.clips[j]

+            if clip.id == compositor.origin_clip_id:

+                return clip

+    

+    return None

+

+def _get_default_fades_lengths(property_klass):

+    if property_klass in _dissolve_property_klasses:

+        fade_in_length = editorstate.PROJECT().get_project_property(appconsts.P_PROP_DISSOLVE_GROUP_FADE_IN)

+        fade_out_length = editorstate.PROJECT().get_project_property(appconsts.P_PROP_DISSOLVE_GROUP_FADE_OUT) 

+    else:

+        fade_in_length = editorstate.PROJECT().get_project_property(appconsts.P_PROP_ANIM_GROUP_FADE_IN)

+        fade_out_length = editorstate.PROJECT().get_project_property(appconsts.P_PROP_ANIM_GROUP_FADE_OUT)

+    

+    return (fade_in_length, fade_out_length)

+

+def _add_default_fade_in(keyframe_property, property_klass, keyframes, fade_in_length):

+    if property_klass in _dissolve_property_klasses:

+        frame, opacity  = keyframes.pop(0)

+        keyframes.append((frame, 0))

+        keyframes.append((frame + fade_in_length, 100))

+        return keyframes

+    else:

+        # (0, [0, 0, 1280, 720], 100.0) or (0, [640.0, 360.0, 1.0, 1.0, 0.0], 100.0) e.g.

+        frame, geom, opacity = keyframes.pop(0)

+        keyframes.append((frame, geom, 0))

+        keyframes.append((frame + fade_in_length, geom, 100))

+        return keyframes

+

+def _add_default_fade_out(keyframe_property, property_klass, keyframes, fade_out_length, clip, kf_before_fade_out_index=0):

+    if property_klass in _dissolve_property_klasses:

+        keyframes.append((clip.clip_length() - fade_out_length - 1, 100))

+        keyframes.append((clip.clip_length() - 1, 0))

+        return keyframes