diff --git a/contrib/geoJSON_export.lua b/contrib/geoJSON_export.lua index 4834bb0..4815e07 100644 --- a/contrib/geoJSON_export.lua +++ b/contrib/geoJSON_export.lua @@ -35,7 +35,6 @@ USAGE local dt = require "darktable" local du = require "lib/dtutils" local df = require "lib/dtutils.file" -require "official/yield" local gettext = dt.gettext du.check_min_api_version("3.0.0", "geoJSON_export") diff --git a/contrib/geoToolbox.lua b/contrib/geoToolbox.lua index 1bce5f3..86dd533 100644 --- a/contrib/geoToolbox.lua +++ b/contrib/geoToolbox.lua @@ -28,7 +28,6 @@ require "geoToolbox" local dt = require "darktable" local du = require "lib/dtutils" local df = require "lib/dtutils.file" -require "official/yield" local gettext = dt.gettext du.check_min_api_version("3.0.0", "geoToolbox") diff --git a/contrib/hugin.lua b/contrib/hugin.lua index 83ec3be..1de8f04 100644 --- a/contrib/hugin.lua +++ b/contrib/hugin.lua @@ -40,7 +40,6 @@ local du = require "lib/dtutils" local df = require "lib/dtutils.file" local log = require "lib/dtutils.log" local dtsys = require "lib/dtutils.system" -require "official/yield" local gettext = dt.gettext local namespace = 'module_hugin' @@ -227,4 +226,4 @@ dt.register_storage(namespace, _("hugin panorama"), show_status, create_panorama -- --- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua \ No newline at end of file +-- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua diff --git a/contrib/pdf_slideshow.lua b/contrib/pdf_slideshow.lua index f01b014..10e84db 100644 --- a/contrib/pdf_slideshow.lua +++ b/contrib/pdf_slideshow.lua @@ -41,7 +41,6 @@ format (all fields can be the empty string): local dt = require "darktable" local du = require "lib/dtutils" local df = require "lib/dtutils.file" -require "official/yield" local gettext = dt.gettext diff --git a/contrib/slideshowMusic.lua b/contrib/slideshowMusic.lua index 90d6bc3..921c6ff 100644 --- a/contrib/slideshowMusic.lua +++ b/contrib/slideshowMusic.lua @@ -27,7 +27,6 @@ USAGE local dt = require "darktable" local du = require "lib/dtutils" local df = require "lib/dtutils.file" -require "official/yield" local gettext = dt.gettext du.check_min_api_version("2.0.2", "slideshowMusic") diff --git a/lib/dtutils/system.lua b/lib/dtutils/system.lua index f202d6d..f41f821 100644 --- a/lib/dtutils/system.lua +++ b/lib/dtutils/system.lua @@ -1,7 +1,6 @@ local dtutils_system = {} local dt = require "darktable" -require "official/yield" -- necessary for dt.control.execute() dtutils_system.libdoc = { Name = [[dtutils.system]], diff --git a/official/generate_image_txt.lua b/official/generate_image_txt.lua index a214a2a..0d34330 100644 --- a/official/generate_image_txt.lua +++ b/official/generate_image_txt.lua @@ -37,7 +37,6 @@ USAGE local dt = require "darktable" local du = require "lib/dtutils" require "darktable.debug" -require "official/yield" du.check_min_api_version("2.1.0", "generate_image_txt") diff --git a/official/selection_to_pdf.lua b/official/selection_to_pdf.lua index f6fbfe8..9d548da 100644 --- a/official/selection_to_pdf.lua +++ b/official/selection_to_pdf.lua @@ -35,7 +35,6 @@ Plugin allows you to choose how many thumbnails you need per row ]] local dt = require "darktable" local du = require "lib/dtutils" -require "official/yield" du.check_min_api_version("2.0.0", "selection_to_pdf") diff --git a/official/yield.lua b/official/yield.lua deleted file mode 100644 index 3e5cb9b..0000000 --- a/official/yield.lua +++ /dev/null @@ -1,42 +0,0 @@ ---[[ - This file is part of darktable, - Copyright 2016 by Tobias Jakobs. - - This program 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. - - This program 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 this program. If not, see . -]] ---[[ -darktable yield compatibility script - -USAGE -* require this script from your main Lua file in the first line - -]] -local dt = require "darktable" -local yield_orig = coroutine.yield - -if (dt.configuration.api_version_major < 4) then - dt.control = {} - dt.control.execute = function(command) - yield_orig("RUN_COMMAND", command) - end - dt.control.read = function(command) - yield_orig("FILE_READABLE", command) - end - dt.control.sleep = function(command) - yield_orig("WAIT_MS", command) - end -end - --- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua --- kate: hl Lua; diff --git a/tools/script_manager.lua b/tools/script_manager.lua index ecb4999..684d488 100644 --- a/tools/script_manager.lua +++ b/tools/script_manager.lua @@ -226,7 +226,7 @@ local function scan_scripts() if not string.match(script_file, "yield") then -- special case, because everything needs this add_script_data(script_file) else - prequire(script_file) -- load yield.lua + -- prequire(script_file) -- load yield.lua end end end