diff --git a/contrib/hugin.lua b/contrib/hugin.lua
index b7ffbfb..819e5b2 100644
--- a/contrib/hugin.lua
+++ b/contrib/hugin.lua
@@ -1,119 +1,119 @@
---[[
- Hugin storage for darktable
-
- copyright (c) 2014 Wolfgang Goetz
- copyright (c) 2015 Christian Kanzian
- copyright (c) 2015 Tobias Jakobs
-
- darktable 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.
-
- darktable 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 darktable. If not, see .
-]]
-
---[[
-HUGIN
-Add a new storage option to send images to hugin.
-Images are exported to darktable tmp dir first.
-
-ADDITIONAL SOFTWARE NEEDED FOR THIS SCRIPT
-* hugin
-
-USAGE
-* require this file from your main luarc config file.
-
-This plugin will add a new storage option and calls hugin after export.
-]]
-
-local dt = require "darktable"
-
--- should work with darktable API version 2.0.0
-dt.configuration.check_version(...,{2,0,0})
-
-local function checkIfBinExists(bin)
- local handle = io.popen("which "..bin)
- local result = handle:read()
- local ret
- handle:close()
- if (result) then
- dt.print_error("true checkIfBinExists: "..bin)
- ret = true
- else
- dt.print_error(bin.." not found")
- ret = false
- end
-
-
- return ret
-end
-
-local function show_status(storage, image, format, filename,
- number, total, high_quality, extra_data)
- dt.print("Export to Hugin "..tostring(number).."/"..tostring(total))
-end
-
-local function create_panorama(storage, image_table, extra_data) --finalize
- if not checkIfBinExists("hugin") then
- darktable.print_error("hugin not found")
- return
- end
-
--- Since Hugin 2015.0.0 hugin provides a command line tool to start the assistant
--- http://wiki.panotools.org/Hugin_executor
--- We need pto_gen to create pto file for hugin_executor
--- http://hugin.sourceforge.net/docs/manual/Pto_gen.html
-
- local hugin_executor = false
- if (checkIfBinExists("hugin_executor") and checkIfBinExists("pto_gen")) then
- hugin_executor = true
- end
-
- -- list of exported images
- local img_list
-
- -- reset and create image list
- img_list = ""
-
- for _,v in pairs(image_table) do
- img_list = img_list ..v.. " "
- end
-
- dt.print("Will try to stitch now")
-
- local huginStartCommand
- if (hugin_executor) then
- huginStartCommand = "pto_gen "..img_list.." -o "..dt.configuration.tmp_dir.."/project.pto"
- dt.print("Creating pto file")
- coroutine.yield("RUN_COMMAND", huginStartCommand)
-
- dt.print("Running Assistent")
- huginStartCommand = "hugin_executor --assistant "..dt.configuration.tmp_dir.."/project.pto"
- coroutine.yield("RUN_COMMAND", huginStartCommand)
-
- huginStartCommand = "hugin "..dt.configuration.tmp_dir.."/project.pto"
- else
- huginStartCommand = "hugin "..img_list
- end
-
- dt.print_error(huginStartCommand)
-
- if coroutine.yield("RUN_COMMAND", huginStartCommand)
- then
- dt.print("Command hugin failed ...")
- end
-
-end
-
--- Register
-dt.register_storage("module_hugin", "Hugin Panorama", show_status, create_panorama)
-
---
--- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua
+--[[
+ Hugin storage for darktable
+
+ copyright (c) 2014 Wolfgang Goetz
+ copyright (c) 2015 Christian Kanzian
+ copyright (c) 2015 Tobias Jakobs
+
+ darktable 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.
+
+ darktable 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 darktable. If not, see .
+]]
+
+--[[
+HUGIN
+Add a new storage option to send images to hugin.
+Images are exported to darktable tmp dir first.
+
+ADDITIONAL SOFTWARE NEEDED FOR THIS SCRIPT
+* hugin
+
+USAGE
+* require this file from your main luarc config file.
+
+This plugin will add a new storage option and calls hugin after export.
+]]
+
+local dt = require "darktable"
+
+-- should work with darktable API version 2.0.0
+dt.configuration.check_version(...,{2,0,0})
+
+local function checkIfBinExists(bin)
+ local handle = io.popen("which "..bin)
+ local result = handle:read()
+ local ret
+ handle:close()
+ if (result) then
+ dt.print_error("true checkIfBinExists: "..bin)
+ ret = true
+ else
+ dt.print_error(bin.." not found")
+ ret = false
+ end
+
+
+ return ret
+end
+
+local function show_status(storage, image, format, filename,
+ number, total, high_quality, extra_data)
+ dt.print("Export to Hugin "..tostring(number).."/"..tostring(total))
+end
+
+local function create_panorama(storage, image_table, extra_data) --finalize
+ if not checkIfBinExists("hugin") then
+ darktable.print_error("hugin not found")
+ return
+ end
+
+-- Since Hugin 2015.0.0 hugin provides a command line tool to start the assistant
+-- http://wiki.panotools.org/Hugin_executor
+-- We need pto_gen to create pto file for hugin_executor
+-- http://hugin.sourceforge.net/docs/manual/Pto_gen.html
+
+ local hugin_executor = false
+ if (checkIfBinExists("hugin_executor") and checkIfBinExists("pto_gen")) then
+ hugin_executor = true
+ end
+
+ -- list of exported images
+ local img_list
+
+ -- reset and create image list
+ img_list = ""
+
+ for _,v in pairs(image_table) do
+ img_list = img_list ..v.. " "
+ end
+
+ dt.print("Will try to stitch now")
+
+ local huginStartCommand
+ if (hugin_executor) then
+ huginStartCommand = "pto_gen "..img_list.." -o "..dt.configuration.tmp_dir.."/project.pto"
+ dt.print("Creating pto file")
+ coroutine.yield("RUN_COMMAND", huginStartCommand)
+
+ dt.print("Running Assistent")
+ huginStartCommand = "hugin_executor --assistant "..dt.configuration.tmp_dir.."/project.pto"
+ coroutine.yield("RUN_COMMAND", huginStartCommand)
+
+ huginStartCommand = "hugin "..dt.configuration.tmp_dir.."/project.pto"
+ else
+ huginStartCommand = "hugin "..img_list
+ end
+
+ dt.print_error(huginStartCommand)
+
+ if coroutine.yield("RUN_COMMAND", huginStartCommand)
+ then
+ dt.print("Command hugin failed ...")
+ end
+
+end
+
+-- Register
+dt.register_storage("module_hugin", "Hugin Panorama", show_status, create_panorama)
+
+--
+-- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua
diff --git a/contrib/video_mencoder.lua b/contrib/video_mencoder.lua
index 18ddc25..8198780 100644
--- a/contrib/video_mencoder.lua
+++ b/contrib/video_mencoder.lua
@@ -1,120 +1,120 @@
---[[
- This file is part of darktable,
- Copyright 2014 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 video export script
-
-ADDITIONAL SOFTWARE NEEDED FOR THIS SCRIPT
-* mencoder (MEncoder is from the MPlayer Team)
-* xdg-open
-* xdg-user-dir
-
-WARNING
-This script is only tested with Linux
-
-USAGE
-* require this script from your main lua file
-]]
-
-local dt = require "darktable"
-dt.configuration.check_version(...,{2,0,1})
-
-local function show_status(storage, image, format, filename, number, total, high_quality, extra_data)
- dt.print("Export Image "..tostring(number).."/"..tostring(total))
-end
-
-local function checkIfBinExists(bin)
- local handle = io.popen("which "..bin)
- local result = handle:read()
- local ret
- handle:close()
- if (result) then
- --dt.print_error("true checkIfBinExists: "..bin)
- ret = true
- else
- dt.print_error(bin.." not found")
- ret = false
- end
-
- return ret
-end
-
-local function create_video_mencoder(storage, image_table, extra_data)
- if not checkIfBinExists("mencoder") then
- return
- end
- if not checkIfBinExists("xdg-open") then
- return
- end
- if not checkIfBinExists("xdg-user-dir") then
- return
- end
-
- exportDirectory = dt.preferences.read("video_mencoder","ExportDirectory","string")
- exportFilename = "output.avi"
- framsePerSecond = dt.preferences.read("video_mencoder","FramesPerSecond","integer")
-
- dt.print_error("Will try to create video now")
- -- Set the codec
- local codec = ""
- local codecPreferences = ""
-
- codecPreferences = dt.preferences.read("video_mencoder","Codec","string")
- if (codecPreferences == "H.264 encoding") then
- codec = 'x264'
- end
- if (codecPreferences == "XviD encoding") then
- codec = 'xvid'
- end
- if not codecPreferences then
- codec = 'x264'
- end
-
- -- Create the command
- local command = "mencoder -idx -nosound -noskip -ovc "..codec.." -lavcopts vcodec=mjpeg -o "..exportDirectory.."/"..exportFilename.." -mf fps="..framsePerSecond .." mf://"
-
- for _,v in pairs(image_table) do
- command = command..v..","
- end
-
- dt.print_error("this is the command: "..command)
- -- USE coroutine.yield. It does not block the UI
- coroutine.yield("RUN_COMMAND", command)
-
- dt.print("Video created in "..exportDirectory)
-
- if ( dt.preferences.read("video_mencoder","OpenVideo","bool") == true ) then
- -- USE coroutine.yield. It does not block the UI
- local playVideoCommand = "xdg-open "..exportDirectory.."/"..exportFilename
- coroutine.yield("RUN_COMMAND", playVideoCommand)
- end
-end
-
--- Preferences
-dt.preferences.register("video_mencoder", "FramesPerSecond", "float", "Video exort (MEncoder): Frames per second", "Frames per Second in the Video export", 15, 1, 99, 0.1 )
-dt.preferences.register("video_mencoder", "OpenVideo", "bool", "Video exort (MEncoder): Open video after export", "Opens the Video after the export with the standard video player", false )
-
-local handle = io.popen("xdg-user-dir VIDEOS")
-local result = handle:read()
-handle:close()
-dt.preferences.register("video_mencoder", "ExportDirectory", "directory", "Video exort (MEncoder): Video export directory","A directory that will be used to export a Video",result)
-
--- Get the MEncoder codec list with: mencoder -ovc help
-dt.preferences.register("video_mencoder", "Codec", "enum", "Video exort (MEncoder): Codec","Video codec","H.264 encoding","H.264 encoding","XviD encoding")
-
--- Register
-dt.register_storage("video_mencoder", "Video Export (MEncoder)", show_status, create_video)
+--[[
+ This file is part of darktable,
+ Copyright 2014 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 video export script
+
+ADDITIONAL SOFTWARE NEEDED FOR THIS SCRIPT
+* mencoder (MEncoder is from the MPlayer Team)
+* xdg-open
+* xdg-user-dir
+
+WARNING
+This script is only tested with Linux
+
+USAGE
+* require this script from your main lua file
+]]
+
+local dt = require "darktable"
+dt.configuration.check_version(...,{2,0,1})
+
+local function show_status(storage, image, format, filename, number, total, high_quality, extra_data)
+ dt.print("Export Image "..tostring(number).."/"..tostring(total))
+end
+
+local function checkIfBinExists(bin)
+ local handle = io.popen("which "..bin)
+ local result = handle:read()
+ local ret
+ handle:close()
+ if (result) then
+ --dt.print_error("true checkIfBinExists: "..bin)
+ ret = true
+ else
+ dt.print_error(bin.." not found")
+ ret = false
+ end
+
+ return ret
+end
+
+local function create_video_mencoder(storage, image_table, extra_data)
+ if not checkIfBinExists("mencoder") then
+ return
+ end
+ if not checkIfBinExists("xdg-open") then
+ return
+ end
+ if not checkIfBinExists("xdg-user-dir") then
+ return
+ end
+
+ exportDirectory = dt.preferences.read("video_mencoder","ExportDirectory","string")
+ exportFilename = "output.avi"
+ framsePerSecond = dt.preferences.read("video_mencoder","FramesPerSecond","integer")
+
+ dt.print_error("Will try to create video now")
+ -- Set the codec
+ local codec = ""
+ local codecPreferences = ""
+
+ codecPreferences = dt.preferences.read("video_mencoder","Codec","string")
+ if (codecPreferences == "H.264 encoding") then
+ codec = 'x264'
+ end
+ if (codecPreferences == "XviD encoding") then
+ codec = 'xvid'
+ end
+ if not codecPreferences then
+ codec = 'x264'
+ end
+
+ -- Create the command
+ local command = "mencoder -idx -nosound -noskip -ovc "..codec.." -lavcopts vcodec=mjpeg -o "..exportDirectory.."/"..exportFilename.." -mf fps="..framsePerSecond .." mf://"
+
+ for _,v in pairs(image_table) do
+ command = command..v..","
+ end
+
+ dt.print_error("this is the command: "..command)
+ -- USE coroutine.yield. It does not block the UI
+ coroutine.yield("RUN_COMMAND", command)
+
+ dt.print("Video created in "..exportDirectory)
+
+ if ( dt.preferences.read("video_mencoder","OpenVideo","bool") == true ) then
+ -- USE coroutine.yield. It does not block the UI
+ local playVideoCommand = "xdg-open "..exportDirectory.."/"..exportFilename
+ coroutine.yield("RUN_COMMAND", playVideoCommand)
+ end
+end
+
+-- Preferences
+dt.preferences.register("video_mencoder", "FramesPerSecond", "float", "Video exort (MEncoder): Frames per second", "Frames per Second in the Video export", 15, 1, 99, 0.1 )
+dt.preferences.register("video_mencoder", "OpenVideo", "bool", "Video exort (MEncoder): Open video after export", "Opens the Video after the export with the standard video player", false )
+
+local handle = io.popen("xdg-user-dir VIDEOS")
+local result = handle:read()
+handle:close()
+dt.preferences.register("video_mencoder", "ExportDirectory", "directory", "Video exort (MEncoder): Video export directory","A directory that will be used to export a Video",result)
+
+-- Get the MEncoder codec list with: mencoder -ovc help
+dt.preferences.register("video_mencoder", "Codec", "enum", "Video exort (MEncoder): Codec","Video codec","H.264 encoding","H.264 encoding","XviD encoding")
+
+-- Register
+dt.register_storage("video_mencoder", "Video Export (MEncoder)", show_status, create_video)