flowblade/repos/community-any/mlt7.patch

   1 diff --git a/flowblade-trunk/Flowblade/app.py b/flowblade-trunk/Flowblade/app.py
   2 index fc9b8149..1c23080c 100644
   3 --- a/flowblade-trunk/Flowblade/app.py
   4 +++ b/flowblade-trunk/Flowblade/app.py
   5 @@ -40,7 +40,7 @@ from gi.repository import Gtk
   6  from gi.repository import Gdk
   7
   8  import locale
   9 -import mlt
  10 +import mlt7 as mlt
  11  import hashlib
  12  import os
  13  import sys
  14 diff --git a/flowblade-trunk/Flowblade/audiomonitoring.py b/flowblade-trunk/Flowblade/audiomonitoring.py
  15 index d55cf01a..a0de59f7 100644
  16 --- a/flowblade-trunk/Flowblade/audiomonitoring.py
  17 +++ b/flowblade-trunk/Flowblade/audiomonitoring.py
  18 @@ -29,7 +29,7 @@ except ImportError:
  19  import gi
  20
  21  import cairo
  22 -import mlt
  23 +import mlt7 as mlt
  24  import time
  25
  26  from gi.repository import Gtk, GObject
  27 diff --git a/flowblade-trunk/Flowblade/audiosync.py b/flowblade-trunk/Flowblade/audiosync.py
  28 index 8de23c03..17b26073 100644
  29 --- a/flowblade-trunk/Flowblade/audiosync.py
  30 +++ b/flowblade-trunk/Flowblade/audiosync.py
  31 @@ -23,7 +23,7 @@ Handles syncing clips based on their audio data.
  32  """
  33  import datetime
  34  import hashlib
  35 -import mlt
  36 +import mlt7 as mlt
  37  import os
  38  import subprocess
  39  import sys
  40 diff --git a/flowblade-trunk/Flowblade/audiowaveform.py b/flowblade-trunk/Flowblade/audiowaveform.py
  41 index 3d1d5e0e..3de5a8ef 100644
  42 --- a/flowblade-trunk/Flowblade/audiowaveform.py
  43 +++ b/flowblade-trunk/Flowblade/audiowaveform.py
  44 @@ -22,7 +22,7 @@
  45  Modules handles creating and caching audio waveform images for clips.
  46  """
  47
  48 -import mlt
  49 +import mlt7 as mlt
  50  import os
  51  import pickle
  52  import threading
  53 diff --git a/flowblade-trunk/Flowblade/audiowaveformrenderer.py b/flowblade-trunk/Flowblade/audiowaveformrenderer.py
  54 index 67bc5779..e4a67b4a 100644
  55 --- a/flowblade-trunk/Flowblade/audiowaveformrenderer.py
  56 +++ b/flowblade-trunk/Flowblade/audiowaveformrenderer.py
  57 @@ -23,7 +23,7 @@ Modules handles creating and caching audio waveform images for clips.
  58  """
  59
  60  import locale
  61 -import mlt
  62 +import mlt7 as mlt
  63  import os
  64  import pickle
  65  import subprocess
  66 diff --git a/flowblade-trunk/Flowblade/clipmenuaction.py b/flowblade-trunk/Flowblade/clipmenuaction.py
  67 index 1b8f357a..6dae9ca5 100644
  68 --- a/flowblade-trunk/Flowblade/clipmenuaction.py
  69 +++ b/flowblade-trunk/Flowblade/clipmenuaction.py
  70 @@ -27,7 +27,7 @@ from PIL import Image
  71  from gi.repository import GLib
  72  from gi.repository import Gtk
  73
  74 -import mlt
  75 +import mlt7 as mlt
  76  from operator import itemgetter
  77  import os
  78  import shutil
  79 diff --git a/flowblade-trunk/Flowblade/containeractions.py b/flowblade-trunk/Flowblade/containeractions.py
  80 index b12d9db9..148a588b 100644
  81 --- a/flowblade-trunk/Flowblade/containeractions.py
  82 +++ b/flowblade-trunk/Flowblade/containeractions.py
  83 @@ -24,7 +24,7 @@ from gi.repository import GLib
  84  import cairo
  85  import copy
  86  import hashlib
  87 -import mlt
  88 +import mlt7 as mlt
  89  import os
  90  from os import listdir
  91  from os.path import isfile, join
  92 diff --git a/flowblade-trunk/Flowblade/exporting.py b/flowblade-trunk/Flowblade/exporting.py
  93 index 0f5dcf63..224dee9c 100644
  94 --- a/flowblade-trunk/Flowblade/exporting.py
  95 +++ b/flowblade-trunk/Flowblade/exporting.py
  96 @@ -22,7 +22,7 @@ from gi.repository import Gtk
  97  import os
  98  from xml.dom import minidom
  99  from math import floor
 100 -import mlt
 101 +import mlt7 as mlt
 102  import time
 103  import hashlib
 104  import re
 105 diff --git a/flowblade-trunk/Flowblade/medialinker.py b/flowblade-trunk/Flowblade/medialinker.py
 106 index a8e963e8..895a5142 100644
 107 --- a/flowblade-trunk/Flowblade/medialinker.py
 108 +++ b/flowblade-trunk/Flowblade/medialinker.py
 109 @@ -19,7 +19,7 @@
 110  """
 111
 112  import glob
 113 -import mlt
 114 +import mlt7 as mlt
 115  import locale
 116  import os
 117  import subprocess
 118 diff --git a/flowblade-trunk/Flowblade/mltenv.py b/flowblade-trunk/Flowblade/mltenv.py
 119 index d97406c1..3da17092 100644
 120 --- a/flowblade-trunk/Flowblade/mltenv.py
 121 +++ b/flowblade-trunk/Flowblade/mltenv.py
 122 @@ -22,7 +22,7 @@
 123  Module checks environment for available codecs and formats.
 124  """
 125  from gi.repository import GObject
 126 -import mlt
 127 +import mlt7 as mlt
 128
 129  import dialogutils
 130  import editorstate
 131 diff --git a/flowblade-trunk/Flowblade/mltfilters.py b/flowblade-trunk/Flowblade/mltfilters.py
 132 index 644fd9bc..8ec082c6 100644
 133 --- a/flowblade-trunk/Flowblade/mltfilters.py
 134 +++ b/flowblade-trunk/Flowblade/mltfilters.py
 135 @@ -27,7 +27,7 @@ import copy
 136
 137  from gi.repository import GdkPixbuf
 138
 139 -import mlt
 140 +import mlt7 as mlt
 141  import xml.dom.minidom
 142
 143  import appconsts
 144 diff --git a/flowblade-trunk/Flowblade/mltplayer.py b/flowblade-trunk/Flowblade/mltplayer.py
 145 index fddd4c97..84d79070 100644
 146 --- a/flowblade-trunk/Flowblade/mltplayer.py
 147 +++ b/flowblade-trunk/Flowblade/mltplayer.py
 148 @@ -24,7 +24,7 @@ a Xwindow of a GTK+ widget and os audiosystem using a SDL consumer.
 149  """
 150  from gi.repository import Gdk
 151
 152 -import mlt
 153 +import mlt7 as mlt
 154  import os
 155  import time
 156
 157 diff --git a/flowblade-trunk/Flowblade/mltprofiles.py b/flowblade-trunk/Flowblade/mltprofiles.py
 158 index 4a891a52..293ed226 100644
 159 --- a/flowblade-trunk/Flowblade/mltprofiles.py
 160 +++ b/flowblade-trunk/Flowblade/mltprofiles.py
 161 @@ -22,7 +22,7 @@
 162  MLT framework profiles.
 163  """
 164  import os
 165 -import mlt
 166 +import mlt7 as mlt
 167  import xml.dom.minidom
 168
 169  import appconsts
 170 diff --git a/flowblade-trunk/Flowblade/mlttransitions.py b/flowblade-trunk/Flowblade/mlttransitions.py
 171 index 0b77938a..6af1a581 100644
 172 --- a/flowblade-trunk/Flowblade/mlttransitions.py
 173 +++ b/flowblade-trunk/Flowblade/mlttransitions.py
 174 @@ -23,7 +23,7 @@ Module contains objects that wrap mlt.Transition objects used to mix video betwe
 175  two tracks.
 176  """
 177  import copy
 178 -import mlt
 179 +import mlt7 as mlt
 180  import os
 181  import xml.dom.minidom
 182
 183 diff --git a/flowblade-trunk/Flowblade/monitorwidget.py b/flowblade-trunk/Flowblade/monitorwidget.py
 184 index 48a01ae8..88b0b56a 100644
 185 --- a/flowblade-trunk/Flowblade/monitorwidget.py
 186 +++ b/flowblade-trunk/Flowblade/monitorwidget.py
 187 @@ -21,7 +21,7 @@ from gi.repository import Gdk
 188  from gi.repository import Gtk, GLib
 189
 190  import cairo
 191 -import mlt
 192 +import mlt7 as mlt
 193  import numpy as np
 194  import os
 195  import threading
 196 diff --git a/flowblade-trunk/Flowblade/patternproducer.py b/flowblade-trunk/Flowblade/patternproducer.py
 197 index afa1271a..35751273 100644
 198 --- a/flowblade-trunk/Flowblade/patternproducer.py
 199 +++ b/flowblade-trunk/Flowblade/patternproducer.py
 200 @@ -27,7 +27,7 @@ import hashlib
 201
 202  from gi.repository import Gtk, Gdk
 203
 204 -import mlt
 205 +import mlt7 as mlt
 206
 207  import appconsts
 208  import dialogutils
 209 diff --git a/flowblade-trunk/Flowblade/projectaction.py b/flowblade-trunk/Flowblade/projectaction.py
 210 index a684f514..c44a6590 100644
 211 --- a/flowblade-trunk/Flowblade/projectaction.py
 212 +++ b/flowblade-trunk/Flowblade/projectaction.py
 213 @@ -28,7 +28,7 @@ import datetime
 214  import fnmatch
 215  import glob
 216  import hashlib
 217 -import mlt
 218 +import mlt7 as mlt
 219  import os
 220  from os import listdir
 221  from os.path import isfile, join, expanduser
 222 diff --git a/flowblade-trunk/Flowblade/projectdata.py b/flowblade-trunk/Flowblade/projectdata.py
 223 index f063275a..a401ade3 100644
 224 --- a/flowblade-trunk/Flowblade/projectdata.py
 225 +++ b/flowblade-trunk/Flowblade/projectdata.py
 226 @@ -23,7 +23,7 @@ Module contains objects used to capture project data.
 227  """
 228  import cairo
 229  import datetime
 230 -import mlt
 231 +import mlt7 as mlt
 232  import hashlib
 233  import os
 234
 235 diff --git a/flowblade-trunk/Flowblade/projectmediaimport.py b/flowblade-trunk/Flowblade/projectmediaimport.py
 236 index 52c294df..9c03aae0 100644
 237 --- a/flowblade-trunk/Flowblade/projectmediaimport.py
 238 +++ b/flowblade-trunk/Flowblade/projectmediaimport.py
 239 @@ -18,7 +18,7 @@
 240      along with Flowblade Movie Editor.  If not, see <http://www.gnu.org/licenses/>.
 241  """
 242
 243 -import mlt
 244 +import mlt7 as mlt
 245  import locale
 246  import os
 247  import subprocess
 248 diff --git a/flowblade-trunk/Flowblade/proxyediting.py b/flowblade-trunk/Flowblade/proxyediting.py
 249 index b0eae3a3..a9a5fb24 100644
 250 --- a/flowblade-trunk/Flowblade/proxyediting.py
 251 +++ b/flowblade-trunk/Flowblade/proxyediting.py
 252 @@ -20,7 +20,7 @@
 253
 254  import glob
 255  import hashlib
 256 -import mlt
 257 +import mlt7 as mlt
 258  import os
 259  import shutil
 260  import threading
 261 diff --git a/flowblade-trunk/Flowblade/render.py b/flowblade-trunk/Flowblade/render.py
 262 index ae22d939..34f5527f 100644
 263 --- a/flowblade-trunk/Flowblade/render.py
 264 +++ b/flowblade-trunk/Flowblade/render.py
 265 @@ -28,7 +28,7 @@ Rendering is done in app.player object of class mltplayer.Player
 266
 267  from gi.repository import Gtk
 268
 269 -import mlt
 270 +import mlt7 as mlt
 271  import hashlib
 272  import os
 273  import subprocess
 274 diff --git a/flowblade-trunk/Flowblade/renderconsumer.py b/flowblade-trunk/Flowblade/renderconsumer.py
 275 index 71dad22e..6c454556 100644
 276 --- a/flowblade-trunk/Flowblade/renderconsumer.py
 277 +++ b/flowblade-trunk/Flowblade/renderconsumer.py
 278 @@ -25,7 +25,7 @@ Module contains objects and methods needed to create render consumers.
 279
 280  from gi.repository import Gdk
 281
 282 -import mlt
 283 +import mlt7 as mlt
 284  import time
 285  import threading
 286  import xml.dom.minidom
 287 diff --git a/flowblade-trunk/Flowblade/sequence.py b/flowblade-trunk/Flowblade/sequence.py
 288 index 76b4ccaa..ad909866 100644
 289 --- a/flowblade-trunk/Flowblade/sequence.py
 290 +++ b/flowblade-trunk/Flowblade/sequence.py
 291 @@ -23,7 +23,7 @@ Module contains class Sequence that is the multitrack media object being edited
 292  by the application. A project has 1-n of these.
 293  """
 294  import time
 295 -import mlt
 296 +import mlt7 as mlt
 297  import os
 298
 299  import appconsts
 300 diff --git a/flowblade-trunk/Flowblade/tlinerenderserver.py b/flowblade-trunk/Flowblade/tlinerenderserver.py
 301 index 8228da5f..9a9a6a05 100644
 302 --- a/flowblade-trunk/Flowblade/tlinerenderserver.py
 303 +++ b/flowblade-trunk/Flowblade/tlinerenderserver.py
 304 @@ -32,7 +32,7 @@ import dbus
 305  import dbus.service
 306  from dbus.mainloop.glib import DBusGMainLoop
 307  import locale
 308 -import mlt
 309 +import mlt7 as mlt
 310  import os
 311  import subprocess
 312  import sys
 313 diff --git a/flowblade-trunk/Flowblade/tools/batchrendering.py b/flowblade-trunk/Flowblade/tools/batchrendering.py
 314 index b136cb59..9c534150 100644
 315 --- a/flowblade-trunk/Flowblade/tools/batchrendering.py
 316 +++ b/flowblade-trunk/Flowblade/tools/batchrendering.py
 317 @@ -29,7 +29,7 @@ from gi.repository import Gtk, Gdk, GdkPixbuf
 318  import dbus
 319  import dbus.service
 320  from dbus.mainloop.glib import DBusGMainLoop
 321 -import mlt
 322 +import mlt7 as mlt
 323  import hashlib
 324  import locale
 325  import os
 326 diff --git a/flowblade-trunk/Flowblade/tools/blenderheadless.py b/flowblade-trunk/Flowblade/tools/blenderheadless.py
 327 index a0df37b9..ad2645c6 100644
 328 --- a/flowblade-trunk/Flowblade/tools/blenderheadless.py
 329 +++ b/flowblade-trunk/Flowblade/tools/blenderheadless.py
 330 @@ -30,7 +30,7 @@ gi.require_version('Gtk', '3.0')
 331  from gi.repository import GLib
 332
 333  import locale
 334 -import mlt
 335 +import mlt7 as mlt
 336  import os
 337  from os import listdir
 338  from os.path import isfile, join
 339 diff --git a/flowblade-trunk/Flowblade/tools/gmic.py b/flowblade-trunk/Flowblade/tools/gmic.py
 340 index 1053b5e8..d6539f41 100644
 341 --- a/flowblade-trunk/Flowblade/tools/gmic.py
 342 +++ b/flowblade-trunk/Flowblade/tools/gmic.py
 343 @@ -29,7 +29,7 @@ from gi.repository import Pango
 344
 345  import cairo
 346  import locale
 347 -import mlt
 348 +import mlt7 as mlt
 349  import os
 350  import re
 351  import shutil
 352 diff --git a/flowblade-trunk/Flowblade/tools/gmicheadless.py b/flowblade-trunk/Flowblade/tools/gmicheadless.py
 353 index 433c7722..424fd977 100644
 354 --- a/flowblade-trunk/Flowblade/tools/gmicheadless.py
 355 +++ b/flowblade-trunk/Flowblade/tools/gmicheadless.py
 356 @@ -30,7 +30,7 @@ gi.require_version('Gtk', '3.0')
 357  from gi.repository import GLib
 358
 359  import locale
 360 -import mlt
 361 +import mlt7 as mlt
 362  import os
 363  import pickle
 364  import subprocess
 365 diff --git a/flowblade-trunk/Flowblade/tools/gmicplayer.py b/flowblade-trunk/Flowblade/tools/gmicplayer.py
 366 index 4fd0aac5..61037abb 100644
 367 --- a/flowblade-trunk/Flowblade/tools/gmicplayer.py
 368 +++ b/flowblade-trunk/Flowblade/tools/gmicplayer.py
 369 @@ -23,7 +23,7 @@ Clip player used to select frames for preview and range selection.
 370  """
 371
 372
 373 -import mlt
 374 +import mlt7 as mlt
 375  import os
 376  from os import listdir
 377  from os.path import isfile, join
 378 diff --git a/flowblade-trunk/Flowblade/tools/mltheadlessutils.py b/flowblade-trunk/Flowblade/tools/mltheadlessutils.py
 379 index ed0b64d9..4b8437df 100644
 380 --- a/flowblade-trunk/Flowblade/tools/mltheadlessutils.py
 381 +++ b/flowblade-trunk/Flowblade/tools/mltheadlessutils.py
 382 @@ -24,7 +24,7 @@ in initialized Flowblade/MLT enviroment.
 383  """
 384
 385  import locale
 386 -import mlt
 387 +import mlt7 as mlt
 388  import os
 389
 390  import ccrutils
 391 diff --git a/flowblade-trunk/Flowblade/tools/mltxmlheadless.py b/flowblade-trunk/Flowblade/tools/mltxmlheadless.py
 392 index cc24e216..194be4f3 100644
 393 --- a/flowblade-trunk/Flowblade/tools/mltxmlheadless.py
 394 +++ b/flowblade-trunk/Flowblade/tools/mltxmlheadless.py
 395 @@ -30,7 +30,7 @@ gi.require_version('Gtk', '3.0')
 396  from gi.repository import GLib
 397
 398  import locale
 399 -import mlt
 400 +import mlt7 as mlt
 401  import os
 402  import pickle
 403  import subprocess
 404 diff --git a/flowblade-trunk/Flowblade/tools/motionheadless.py b/flowblade-trunk/Flowblade/tools/motionheadless.py
 405 index f0dc350b..516ea16a 100644
 406 --- a/flowblade-trunk/Flowblade/tools/motionheadless.py
 407 +++ b/flowblade-trunk/Flowblade/tools/motionheadless.py
 408 @@ -18,7 +18,7 @@
 409      along with Flowblade Movie Editor. If not, see <http://www.gnu.org/licenses/>.
 410  """
 411
 412 -import mlt
 413 +import mlt7 as mlt
 414  import os
 415  import threading
 416  import time
 417 diff --git a/flowblade-trunk/Flowblade/tools/proxyheadless.py b/flowblade-trunk/Flowblade/tools/proxyheadless.py
 418 index 1a34f437..c3f090f8 100644
 419 --- a/flowblade-trunk/Flowblade/tools/proxyheadless.py
 420 +++ b/flowblade-trunk/Flowblade/tools/proxyheadless.py
 421 @@ -19,7 +19,7 @@
 422  """
 423
 424  import glob
 425 -import mlt
 426 +import mlt7 as mlt
 427  import os
 428  from PIL import Image
 429  import threading
 430 diff --git a/flowblade-trunk/flowblade b/flowblade-trunk/flowblade
 431 index 01f6d092..7c8bc14d 100755
 432 --- a/flowblade-trunk/flowblade
 433 +++ b/flowblade-trunk/flowblade
 434 @@ -57,7 +57,7 @@ sys.path.insert(0, modules_path)
 435
 436  # Check that we have MLT, missing is fatal.
 437  try:
 438 -    import mlt
 439 +    import mlt7 as mlt
 440      try:
 441          mlt_version = mlt.LIBMLT_VERSION
 442          print ("MLT found, version:", mlt_version)