+2014-02-02 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.64.0 released.
+
+2014-01-29 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.63.8 released.
+
+2014-01-29 Carl Hetherington <cth@carlh.net>
+
+ * Add subtitle X offset option.
+
+ * Fix missing subtitles when subtitled content is at a non-zero position.
+
+2014-01-28 Carl Hetherington <cth@carlh.net>
+
+ * Use Mbit/s instead of the incorrect MBps.
+
+ * Version 1.63.7 released.
+
+2014-01-28 Carl Hetherington <cth@carlh.net>
+
+ * Try to prevent Windows machines going to sleep during encodes.
+
+ * Add option to not install main program / server on Windows.
+
+2014-01-26 Carl Hetherington <cth@carlh.net>
+
+ * Change default JPEG2000 bandwith to 100MBps.
+
+ * Updated fr_FR translation from Theirry Journet.
+
+2014-01-24 Carl Hetherington <cth@carlh.net>
+
+ * Try to fix repeatedly-reported exceptions.
+
+2014-01-23 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.63.6 released.
+
2014-01-23 Carl Hetherington <cth@carlh.net>
* Fix recovery of DCP encoding after a crash with a 3D DCP.
s += str(p) + ', '
print >>f,s[:-2]
-def make_control(version, bits, filename):
+def make_control(version, bits, filename, debug):
f = open(filename, 'w')
print >>f,'Source: dcpomatic'
print >>f,'Section: video'
print >>f,'Architecture: amd64'
packages('Depends', depends[version], f)
+
print >>f,'Description: Generator of Digital Cinema Packages (DCPs)'
print >>f,' DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio'
print >>f,' files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant'
print >>f,' digital projectors.'
+ if debug:
+ print >>f,''
+ print >>f,'Package: dcpomatic-dbg'
+ if bits == 32:
+ print >>f,'Architecture: i386'
+ else:
+ print >>f,'Architecture: amd64'
+ print >>f,'Section: debug'
+ print >>f,'Priority: extra'
+ packages('Depends', depends[version], f)
+ print >>f,'Description: debugging symbols for dcpomatic'
+ print >>f,' This package contains the debugging symbols for dcpomatic.'
+ print >>f,''
+
def dependencies(target):
return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'),
('libdcp', '054cc86'))
else:
cpu = 'amd64'
- make_control(target.version, target.bits, 'debian/control')
+ make_control(target.version, target.bits, 'debian/control', target.debug)
target.command('./waf dist')
f = open('debian/files', 'w')
print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
-dcpomatic (1.63.5-1) UNRELEASED; urgency=low
+dcpomatic (1.64.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Tue, 21 Jan 2014 22:48:10 +0000
+ -- Carl Hetherington <carl@d1stkfactory> Sun, 02 Feb 2014 23:46:54 +0000
dcpomatic (0.87-1) UNRELEASED; urgency=low
override_dh_auto_configure:
LINKFLAGS=$(CDIST_LINKFLAGS) CXXFLAGS="$(CXXFLAGS) $(CDIST_CXXFLAGS)" PKG_CONFIG_PATH=$(CDIST_PKG_CONFIG_PATH) \
- ./waf --nocache configure --prefix=/usr --static
+ ./waf --nocache configure --prefix=/usr --static --enable-debug
override_dh_auto_build:
./waf --nocache build
override_dh_auto_install:
./waf --nocache install --destdir=debian/dcpomatic
+
+.PHONY: override_dh_strip
+override_dh_strip:
+ dh_strip --dbg-package=dcpomatic-dbg
+++ /dev/null
-!include "MUI2.nsh"
-Name "DCP-o-matic"
-
-RequestExecutionLevel admin
-
-outFile "DCP-o-matic @version@ 32-bit Installer.exe"
-!define MUI_ICON "%resources%/dcpomatic.ico"
-!define MUI_UNICON "%resources%/dcpomatic.ico"
-!define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp"
-
-InstallDir "$PROGRAMFILES\DCP-o-matic"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "../../../COPYING"
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_UNPAGE_FINISH
-
-!insertmacro MUI_LANGUAGE "English"
-
-Section "install" "Installation info"
-
-SetOutPath "$INSTDIR\bin"
-
-File "%static_deps%/bin/libintl-8.dll"
-File "%static_deps%/bin/libboost_chrono-mt.dll"
-File "%static_deps%/bin/libboost_filesystem-mt.dll"
-File "%static_deps%/bin/libboost_system-mt.dll"
-File "%static_deps%/bin/libboost_thread_win32-mt.dll"
-File "%static_deps%/bin/libboost_date_time-mt.dll"
-File "%static_deps%/bin/libboost_locale-mt.dll"
-File "%static_deps%/bin/libeay32.dll"
-File "%static_deps%/bin/libgcc_s_sjlj-1.dll"
-File "%static_deps%/bin/libgio-2.0-0.dll"
-File "%static_deps%/bin/libglib-2.0-0.dll"
-File "%static_deps%/bin/libgobject-2.0-0.dll"
-File "%static_deps%/bin/libiconv-2.dll"
-File "%static_deps%/bin/libjpeg-8.dll"
-File "%static_deps%/bin/libMagick++-6.Q16-3.dll"
-File "%static_deps%/bin/libMagickCore-6.Q16-1.dll"
-File "%static_deps%/bin/libMagickWand-6.Q16-1.dll"
-File "%static_deps%/bin/libpng15-15.dll"
-File "%static_deps%/bin/libsigc-2.0-0.dll"
-File "%static_deps%/bin/libsndfile-1.dll"
-File "%static_deps%/bin/libssh.dll"
-File "%static_deps%/bin/libstdc++-6.dll"
-File "%static_deps%/bin/zlib1.dll"
-File "%static_deps%/bin/libjpeg-8.dll"
-File "%static_deps%/bin/wxbase30u_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_richtext_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_html_gcc_custom.dll"
-File "%static_deps%/bin/wxbase30u_xml_gcc_custom.dll"
-File "%static_deps%/bin/libcairo-2.dll"
-File "%static_deps%/bin/libfreetype-6.dll"
-File "%static_deps%/bin/libgthread-2.0-0.dll"
-File "%static_deps%/bin/libpango-1.0-0.dll"
-File "%static_deps%/bin/libgmodule-2.0-0.dll"
-File "%static_deps%/bin/libpangocairo-1.0-0.dll"
-File "%static_deps%/bin/libpangowin32-1.0-0.dll"
-File "%static_deps%/bin/libtiff-5.dll"
-File "%static_deps%/bin/libglibmm-2.4-1.dll"
-File "%static_deps%/bin/libxml++-2.6-2.dll"
-File "%static_deps%/bin/libxml2-2.dll"
-File "%static_deps%/bin/libpixman-1-0.dll"
-File "%static_deps%/bin/libfontconfig-1.dll"
-File "%static_deps%/bin/libexpat-1.dll"
-File "%static_deps%/bin/libbz2.dll"
-File "%static_deps%/bin/libxmlsec1.dll"
-File "%static_deps%/bin/libxmlsec1-openssl.dll"
-File "%static_deps%/bin/libexslt-0.dll"
-File "%static_deps%/bin/libxslt-1.dll"
-File "%static_deps%/bin/libffi-6.dll"
-File "%static_deps%/bin/openssl.exe"
-File "%static_deps%/bin/libcurl-4.dll"
-File "%static_deps%/bin/ssleay32.dll"
-File "%static_deps%/bin/libzip-2.dll"
-
-File "%cdist_deps%/bin/asdcp-libdcp.dll"
-File "%cdist_deps%/bin/kumu-libdcp.dll"
-File "%cdist_deps%/bin/avcodec-55.dll"
-File "%cdist_deps%/bin/avfilter-4.dll"
-File "%cdist_deps%/bin/avformat-55.dll"
-File "%cdist_deps%/bin/avutil-52.dll"
-File "%cdist_deps%/bin/avdevice-55.dll"
-File "%cdist_deps%/bin/dcp.dll"
-File "%cdist_deps%/bin/libopenjpeg-1.dll"
-File "%cdist_deps%/bin/postproc-52.dll"
-File "%cdist_deps%/bin/swresample-0.dll"
-File "%cdist_deps%/bin/swscale-2.dll"
-File "%cdist_deps%/bin/cxml.dll"
-File "%cdist_deps%/bin/ffprobe.exe"
-
-File "%binaries%/src/wx/dcpomatic-wx.dll"
-File "%binaries%/src/lib/dcpomatic.dll"
-File "%binaries%/src/tools/dcpomatic.exe"
-File "%binaries%/src/tools/dcpomatic_batch.exe"
-File "%binaries%/src/tools/dcpomatic_cli.exe"
-File "%binaries%/src/tools/dcpomatic_server_cli.exe"
-File "%binaries%/src/tools/dcpomatic_server.exe"
-
-# I don't know why, but sometimes it seems that
-# delegates.xml must be in with the binaries, and
-# sometimes in the $PROFILE. Meh.
-File "%static_deps%/etc/ImageMagick-6/delegates.xml"
-SetOutPath "$PROFILE\.magick"
-File "%static_deps%/etc/ImageMagick-6/delegates.xml"
-
-SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES"
-File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo"
-SetOutPath "$INSTDIR\locale\it\LC_MESSAGES"
-File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo"
-SetOutPath "$INSTDIR\locale\es\LC_MESSAGES"
-File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo"
-SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES"
-File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo"
-SetOutPath "$INSTDIR\locale\de\LC_MESSAGES"
-File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo"
-
-CreateShortCut "$DESKTOP\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" ""
-CreateShortCut "$DESKTOP\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic_batch.exe" ""
-CreateShortCut "$DESKTOP\DCP-o-matic encode server.lnk" "$INSTDIR\bin\dcpomatic_server.exe" ""
-
-CreateDirectory "$SMPROGRAMS\DCP-o-matic"
-CreateShortCut "$SMPROGRAMS\DCP-o-matic\Uninstall DCP-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic.exe" 0
-CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic_batch.exe" 0
-CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic encode server.lnk" "$INSTDIR\bin\dcpomatic_server.exe" "" "$INSTDIR\bin\dcpomatic_server.exe" 0
-
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
-
-WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-SectionEnd
-
-
-Section "Uninstall"
-
-RMDir /r "$INSTDIR\*.*"
-RMDir "$INSTDIR"
-Delete "$DESKTOP\DCP-o-matic.lnk"
-Delete "$DESKTOP\DCP-o-matic batch converter.lnk"
-Delete "$DESKTOP\DCP-o-matic encode server.lnk"
-Delete "$SMPROGRAMS\DCP-o-matic\*.*"
-RmDir "$SMPROGRAMS\DCP-o-matic"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DCP-o-matic"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic"
-
-SectionEnd
+++ /dev/null
-!include "MUI2.nsh"
-!include "x64.nsh"
-
-Name "DCP-o-matic"
-
-RequestExecutionLevel admin
-
-outFile "DCP-o-matic @version@ 64-bit Installer.exe"
-!define MUI_ICON "%resources%/dcpomatic.ico"
-!define MUI_UNICON "%resources%/dcpomatic.ico"
-!define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp"
-
-InstallDir "$PROGRAMFILES\DCP-o-matic"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "../../../COPYING"
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_UNPAGE_FINISH
-
-!insertmacro MUI_LANGUAGE "English"
-
-Section "install" "Installation info"
-
-${If} ${RunningX64}
- DetailPrint "Installer running on 64-bit host"
- ; disable registry redirection (enable access to 64-bit portion of registry)
- SetRegView 64
- ; change install dir
- StrCpy $INSTDIR "$PROGRAMFILES64\DCP-o-matic"
-${EndIf}
-
-SetOutPath "$INSTDIR\bin"
-
-File "%static_deps%/bin/libintl-8.dll"
-File "%static_deps%/bin/libboost_chrono-mt.dll"
-File "%static_deps%/bin/libboost_filesystem-mt.dll"
-File "%static_deps%/bin/libboost_system-mt.dll"
-File "%static_deps%/bin/libboost_thread_win32-mt.dll"
-File "%static_deps%/bin/libboost_date_time-mt.dll"
-File "%static_deps%/bin/libboost_locale-mt.dll"
-File "%static_deps%/bin/libeay32.dll"
-File "%static_deps%/bin/libgcc_s_sjlj-1.dll"
-File "%static_deps%/bin/libgio-2.0-0.dll"
-File "%static_deps%/bin/libglib-2.0-0.dll"
-File "%static_deps%/bin/libgobject-2.0-0.dll"
-File "%static_deps%/bin/libiconv-2.dll"
-File "%static_deps%/bin/libjpeg-8.dll"
-File "%static_deps%/bin/libMagick++-6.Q16-3.dll"
-File "%static_deps%/bin/libMagickCore-6.Q16-1.dll"
-File "%static_deps%/bin/libMagickWand-6.Q16-1.dll"
-File "%static_deps%/bin/libpng15-15.dll"
-File "%static_deps%/bin/libsigc-2.0-0.dll"
-File "%static_deps%/bin/libsndfile-1.dll"
-File "%static_deps%/bin/libssh.dll"
-File "%static_deps%/bin/libstdc++-6.dll"
-File "%static_deps%/bin/zlib1.dll"
-File "%static_deps%/bin/libjpeg-8.dll"
-File "%static_deps%/bin/wxbase30u_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_richtext_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_html_gcc_custom.dll"
-File "%static_deps%/bin/wxbase30u_xml_gcc_custom.dll"
-File "%static_deps%/bin/libcairo-2.dll"
-File "%static_deps%/bin/libfreetype-6.dll"
-File "%static_deps%/bin/libgthread-2.0-0.dll"
-File "%static_deps%/bin/libpango-1.0-0.dll"
-File "%static_deps%/bin/libgmodule-2.0-0.dll"
-File "%static_deps%/bin/libpangocairo-1.0-0.dll"
-File "%static_deps%/bin/libpangowin32-1.0-0.dll"
-File "%static_deps%/bin/libtiff-5.dll"
-File "%static_deps%/bin/libglibmm-2.4-1.dll"
-File "%static_deps%/bin/libxml++-2.6-2.dll"
-File "%static_deps%/bin/libxml2-2.dll"
-File "%static_deps%/bin/libpixman-1-0.dll"
-File "%static_deps%/bin/libfontconfig-1.dll"
-File "%static_deps%/bin/libexpat-1.dll"
-File "%static_deps%/bin/libbz2.dll"
-File "%static_deps%/bin/libxmlsec1.dll"
-File "%static_deps%/bin/libxmlsec1-openssl.dll"
-File "%static_deps%/bin/libexslt-0.dll"
-File "%static_deps%/bin/libxslt-1.dll"
-File "%static_deps%/bin/libffi-6.dll"
-File "%static_deps%/bin/openssl.exe"
-File "%static_deps%/bin/libcurl-4.dll"
-File "%static_deps%/bin/ssleay32.dll"
-File "%static_deps%/bin/libzip-2.dll"
-
-File "%cdist_deps%/bin/asdcp-libdcp.dll"
-File "%cdist_deps%/bin/kumu-libdcp.dll"
-File "%cdist_deps%/bin/avcodec-55.dll"
-File "%cdist_deps%/bin/avfilter-4.dll"
-File "%cdist_deps%/bin/avformat-55.dll"
-File "%cdist_deps%/bin/avutil-52.dll"
-File "%cdist_deps%/bin/avdevice-55.dll"
-File "%cdist_deps%/bin/dcp.dll"
-File "%cdist_deps%/bin/libopenjpeg-1.dll"
-File "%cdist_deps%/bin/postproc-52.dll"
-File "%cdist_deps%/bin/swresample-0.dll"
-File "%cdist_deps%/bin/swscale-2.dll"
-File "%cdist_deps%/bin/cxml.dll"
-File "%cdist_deps%/bin/ffprobe.exe"
-
-File "%binaries%/src/wx/dcpomatic-wx.dll"
-File "%binaries%/src/lib/dcpomatic.dll"
-File "%binaries%/src/tools/dcpomatic.exe"
-File "%binaries%/src/tools/dcpomatic_batch.exe"
-File "%binaries%/src/tools/dcpomatic_cli.exe"
-File "%binaries%/src/tools/dcpomatic_server_cli.exe"
-File "%binaries%/src/tools/dcpomatic_server.exe"
-
-# I don't know why, but sometimes it seems that
-# delegates.xml must be in with the binaries, and
-# sometimes in the $PROFILE. Meh.
-File "%static_deps%/etc/ImageMagick-6/delegates.xml"
-SetOutPath "$PROFILE\.magick"
-File "%static_deps%/etc/ImageMagick-6/delegates.xml"
-
-SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES"
-File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo"
-SetOutPath "$INSTDIR\locale\it\LC_MESSAGES"
-File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo"
-SetOutPath "$INSTDIR\locale\es\LC_MESSAGES"
-File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo"
-SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES"
-File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo"
-SetOutPath "$INSTDIR\locale\de\LC_MESSAGES"
-File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo"
-File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo"
-File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo"
-
-CreateShortCut "$DESKTOP\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" ""
-CreateShortCut "$DESKTOP\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic_batch.exe" ""
-CreateShortCut "$DESKTOP\DCP-o-matic encode server.lnk" "$INSTDIR\bin\dcpomatic_server.exe" ""
-
-CreateDirectory "$SMPROGRAMS\DCP-o-matic"
-CreateShortCut "$SMPROGRAMS\DCP-o-matic\Uninstall DCP-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic.exe" 0
-CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic batch converter.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic_batch.exe" 0
-CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic encode server.lnk" "$INSTDIR\bin\dcpomatic_server.exe" "" "$INSTDIR\bin\dcpomatic_server.exe" 0
-
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
-
-WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-SectionEnd
-
-
-Section "Uninstall"
-
-RMDir /r "$INSTDIR\*.*"
-RMDir "$INSTDIR"
-Delete "$DESKTOP\DCP-o-matic.lnk"
-Delete "$DESKTOP\DCP-o-matic batch converter.lnk"
-Delete "$DESKTOP\DCP-o-matic encode server.lnk"
-Delete "$SMPROGRAMS\DCP-o-matic\*.*"
-RmDir "$SMPROGRAMS\DCP-o-matic"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DCP-o-matic"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic"
-
-SectionEnd
-def build(bld):
- bld.new_task_gen(features='subst', source='installer.nsi.32.in', target='installer.32.nsi', version=bld.env.VERSION)
- bld.new_task_gen(features='subst', source='installer.nsi.64.in', target='installer.64.nsi', version=bld.env.VERSION)
+from __future__ import print_function
+import os
+
+def write_installer(bits, version):
+ try:
+ os.makedirs('build/platform/windows')
+ except:
+ pass
+
+ f = open('build/platform/windows/installer.%d.nsi' % bits, 'w')
+ print('!include "MUI2.nsh"', file=f)
+ if bits == 64:
+ print('!include "x64.nsh"', file=f)
+
+ print('Name "DCP-o-matic"', file=f)
+ print('RequestExecutionLevel admin', file=f)
+
+ print('outFile "DCP-o-matic %s %d-bit Installer.exe"' % (version, bits), file=f)
+ print("""
+!define MUI_ICON "%resources%/dcpomatic.ico"
+!define MUI_UNICON "%resources%/dcpomatic.ico"
+!define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp"
+!include "Sections.nsh"
+
+InstallDir "$PROGRAMFILES\\DCP-o-matic"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "../../../COPYING"
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_COMPONENTS
+
+Section "Common files (required)" SEC_COMMON
+SectionIn RO
+ """, file=f)
+
+ if bits == 64:
+ print("""
+${If} ${RunningX64}
+ DetailPrint "Installer running on 64-bit host"
+ ; disable registry redirection (enable access to 64-bit portion of registry)
+ SetRegView 64
+ ; change install dir
+ StrCpy $INSTDIR "$PROGRAMFILES64\DCP-o-matic"
+${EndIf}
+ """, file=f)
+
+ print("""
+SetOutPath "$INSTDIR\\bin"
+WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+File "%static_deps%/bin/libintl-8.dll"
+File "%static_deps%/bin/libboost_chrono-mt.dll"
+File "%static_deps%/bin/libboost_filesystem-mt.dll"
+File "%static_deps%/bin/libboost_system-mt.dll"
+File "%static_deps%/bin/libboost_thread_win32-mt.dll"
+File "%static_deps%/bin/libboost_date_time-mt.dll"
+File "%static_deps%/bin/libboost_locale-mt.dll"
+File "%static_deps%/bin/libeay32.dll"
+File "%static_deps%/bin/libgcc_s_sjlj-1.dll"
+File "%static_deps%/bin/libgio-2.0-0.dll"
+File "%static_deps%/bin/libglib-2.0-0.dll"
+File "%static_deps%/bin/libgobject-2.0-0.dll"
+File "%static_deps%/bin/libiconv-2.dll"
+File "%static_deps%/bin/libjpeg-8.dll"
+File "%static_deps%/bin/libMagick++-6.Q16-3.dll"
+File "%static_deps%/bin/libMagickCore-6.Q16-1.dll"
+File "%static_deps%/bin/libMagickWand-6.Q16-1.dll"
+File "%static_deps%/bin/libpng15-15.dll"
+File "%static_deps%/bin/libsigc-2.0-0.dll"
+File "%static_deps%/bin/libsndfile-1.dll"
+File "%static_deps%/bin/libssh.dll"
+File "%static_deps%/bin/libstdc++-6.dll"
+File "%static_deps%/bin/zlib1.dll"
+File "%static_deps%/bin/libjpeg-8.dll"
+File "%static_deps%/bin/wxbase30u_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_richtext_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw30u_html_gcc_custom.dll"
+File "%static_deps%/bin/wxbase30u_xml_gcc_custom.dll"
+File "%static_deps%/bin/libcairo-2.dll"
+File "%static_deps%/bin/libfreetype-6.dll"
+File "%static_deps%/bin/libgthread-2.0-0.dll"
+File "%static_deps%/bin/libpango-1.0-0.dll"
+File "%static_deps%/bin/libgmodule-2.0-0.dll"
+File "%static_deps%/bin/libpangocairo-1.0-0.dll"
+File "%static_deps%/bin/libpangowin32-1.0-0.dll"
+File "%static_deps%/bin/libtiff-5.dll"
+File "%static_deps%/bin/libglibmm-2.4-1.dll"
+File "%static_deps%/bin/libxml++-2.6-2.dll"
+File "%static_deps%/bin/libxml2-2.dll"
+File "%static_deps%/bin/libpixman-1-0.dll"
+File "%static_deps%/bin/libfontconfig-1.dll"
+File "%static_deps%/bin/libexpat-1.dll"
+File "%static_deps%/bin/libbz2.dll"
+File "%static_deps%/bin/libxmlsec1.dll"
+File "%static_deps%/bin/libxmlsec1-openssl.dll"
+File "%static_deps%/bin/libexslt-0.dll"
+File "%static_deps%/bin/libxslt-1.dll"
+File "%static_deps%/bin/libffi-6.dll"
+File "%static_deps%/bin/openssl.exe"
+File "%static_deps%/bin/libcurl-4.dll"
+File "%static_deps%/bin/ssleay32.dll"
+File "%static_deps%/bin/libzip-2.dll"
+
+File "%cdist_deps%/bin/asdcp-libdcp.dll"
+File "%cdist_deps%/bin/kumu-libdcp.dll"
+File "%cdist_deps%/bin/avcodec-55.dll"
+File "%cdist_deps%/bin/avfilter-4.dll"
+File "%cdist_deps%/bin/avformat-55.dll"
+File "%cdist_deps%/bin/avutil-52.dll"
+File "%cdist_deps%/bin/avdevice-55.dll"
+File "%cdist_deps%/bin/dcp.dll"
+File "%cdist_deps%/bin/libopenjpeg-1.dll"
+File "%cdist_deps%/bin/postproc-52.dll"
+File "%cdist_deps%/bin/swresample-0.dll"
+File "%cdist_deps%/bin/swscale-2.dll"
+File "%cdist_deps%/bin/cxml.dll"
+File "%cdist_deps%/bin/ffprobe.exe"
+
+File "%binaries%/src/wx/dcpomatic-wx.dll"
+File "%binaries%/src/lib/dcpomatic.dll"
+
+# I don't know why, but sometimes it seems that
+# delegates.xml must be in with the binaries, and
+# sometimes in the $PROFILE. Meh.
+File "%static_deps%/etc/ImageMagick-6/delegates.xml"
+SetOutPath "$PROFILE\\.magick"
+File "%static_deps%/etc/ImageMagick-6/delegates.xml"
+
+SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo"
+SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo"
+SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo"
+SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo"
+SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo"
+
+WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
+WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe"
+WriteUninstaller "$INSTDIR\\Uninstall.exe"
+
+SectionEnd
+
+Section "DCP-o-matic" SEC_MASTER
+SetOutPath "$INSTDIR\\bin"
+CreateDirectory "$SMPROGRAMS\\DCP-o-matic"
+File "%binaries%/src/tools/dcpomatic.exe"
+File "%binaries%/src/tools/dcpomatic_batch.exe"
+File "%binaries%/src/tools/dcpomatic_cli.exe"
+CreateShortCut "$DESKTOP\\DCP-o-matic.lnk" "$INSTDIR\\bin\\dcpomatic.exe" ""
+CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic.lnk" "$INSTDIR\\bin\\dcpomatic.exe" "" "$INSTDIR\\bin\\dcpomatic.exe" 0
+CreateShortCut "$DESKTOP\\DCP-o-matic batch converter.lnk" "$INSTDIR\\bin\\dcpomatic_batch.exe" ""
+CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic batch converter.lnk" "$INSTDIR\\bin\\dcpomatic.exe" "" "$INSTDIR\\bin\\dcpomatic_batch.exe" 0
+CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\Uninstall DCP-o-matic.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0
+WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
+WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe"
+WriteUninstaller "$INSTDIR\\Uninstall.exe"
+SectionEnd
+
+Section "Encode server" SEC_SERVER
+SetOutPath "$INSTDIR\\bin"
+CreateDirectory "$SMPROGRAMS\\DCP-o-matic"
+File "%binaries%/src/tools/dcpomatic_server_cli.exe"
+File "%binaries%/src/tools/dcpomatic_server.exe"
+CreateShortCut "$DESKTOP\\DCP-o-matic encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" ""
+CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\DCP-o-matic encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" "" "$INSTDIR\\bin\\dcpomatic_server.exe" 0
+CreateShortCut "$SMPROGRAMS\\DCP-o-matic\\Uninstall DCP-o-matic.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0
+SectionEnd
+
+LangString DESC_SEC_MASTER ${LANG_ENGLISH} "DCP-o-matic"
+LangString DESC_SEC_SERVER ${LANG_ENGLISH} "DCP-o-matic encode server"
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MASTER} $(DESC_SEC_MASTER)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_SERVER} $(DESC_SEC_SERVER)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+!insertmacro MUI_LANGUAGE "English"
+
+Section "Uninstall"
+RMDir /r "$INSTDIR\\*.*"
+RMDir "$INSTDIR"
+Delete "$DESKTOP\\DCP-o-matic.lnk"
+Delete "$DESKTOP\\DCP-o-matic batch converter.lnk"
+Delete "$DESKTOP\\DCP-o-matic encode server.lnk"
+Delete "$SMPROGRAMS\\DCP-o-matic\\*.*"
+RmDir "$SMPROGRAMS\\DCP-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic"
+ SectionEnd
+ """, file=f)
+
+def build(bld):
+ write_installer(32, bld.env.VERSION)
+ write_installer(64, bld.env.VERSION)
gdb --args build/src/tools/dcpomatic_batch $*
elif [ "$1" == "--valgrind" ]; then
shift
- valgrind --tool="memcheck" build/src/tools/dcpomatic_batch $*
+ valgrind --tool="memcheck" --suppressions=valgrind.supp --leak-check=full --show-reachable=yes build/src/tools/dcpomatic_batch $*
elif [ "$1" == "--callgrind" ]; then
shift
valgrind --tool="callgrind" build/src/tools/dcpomatic_batch $*
, _default_still_length (10)
, _default_container (Ratio::from_id ("185"))
, _default_dcp_content_type (DCPContentType::from_dci_name ("TST"))
- , _default_j2k_bandwidth (200000000)
+ , _default_j2k_bandwidth (100000000)
, _default_audio_delay (0)
, _kdm_email (
_("Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nThe KDMs are valid from $START_TIME until $END_TIME.\n\nBest regards,\nDCP-o-matic")
return fseek (stream, offset, whence);
#endif
}
+
+void
+kick ()
+{
+#ifdef DCPOMATIC_WINDOWS
+ SetThreadExecutionState (ES_CONTINUOUS);
+#endif
+}
#endif
extern FILE * fopen_boost (boost::filesystem::path, std::string);
extern int dcpomatic_fseek (FILE *, int64_t, int);
+void kick ();
void
Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
{
+ kick ();
+
boost::mutex::scoped_lock lock (_mutex);
/* XXX: discard 3D here if required */
boost::mutex::scoped_lock lm (_mutex);
if (_exception) {
boost::rethrow_exception (_exception);
+ _exception = boost::exception_ptr ();
}
}
: Content (f, node)
, VideoContent (f, node)
, AudioContent (f, node)
- , SubtitleContent (f, node)
+ , SubtitleContent (f, node, version)
{
list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
/* 5 -> 6
* AudioMapping XML changed.
+ * 6 -> 7
+ * Subtitle offset changed to subtitle y offset, and subtitle x offset added.
*/
-int const Film::state_version = 6;
+int const Film::state_version = 7;
/** Construct a Film object in a given directory.
*
_have_valid_pieces = false;
Changed (frequent);
- } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
+ } else if (
+ property == SubtitleContentProperty::SUBTITLE_X_OFFSET ||
+ property == SubtitleContentProperty::SUBTITLE_Y_OFFSET ||
+ property == SubtitleContentProperty::SUBTITLE_SCALE
+ ) {
update_subtitle_from_image ();
update_subtitle_from_text ();
dcpomatic::Rect<double> in_rect = _image_subtitle.subtitle->rect;
libdcp::Size scaled_size;
- in_rect.y += sc->subtitle_offset ();
+ in_rect.x += sc->subtitle_x_offset ();
+ in_rect.y += sc->subtitle_y_offset ();
/* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle_scale */
scaled_size.width = in_rect.width * _video_container_size.width * sc->subtitle_scale ();
true
);
- _out_subtitle.from = _image_subtitle.subtitle->dcp_time;
- _out_subtitle.to = _image_subtitle.subtitle->dcp_time_to;
+ _out_subtitle.from = _image_subtitle.subtitle->dcp_time + piece->content->position ();
+ _out_subtitle.to = _image_subtitle.subtitle->dcp_time_to + piece->content->position ();
}
/** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles.
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2014-01-14 19:45+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Content to be joined must have the same ratio."
msgstr "Zusammengesetzter Inhalt muss das geliche Verhältnis haben"
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
msgstr "Zusammengesetzter Inhalt muss den gleichen Untertitelversatz haben."
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "Zusammengesetzter Inhalt muss den gleichen Untertitelversatz haben."
+
+#: src/lib/subtitle_content.cc:82
msgid "Content to be joined must have the same subtitle scale."
msgstr "Zusammengesetzter Inhalt muss die gleiche Untertitelgröße haben."
msgid "Could not open %1 to send"
msgstr "%1 konnte nicht zum senden geöffnet werden"
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
msgid "Could not read DCP to make KDM for"
msgstr "DCP konnte nicht zur Schlüsselerstellung geöffnet werden"
"Das Laufwer auf dem der Film gespeichert werden soll hat zu wenig Freien "
"Speicher. Bitte Speicher freigeben und nochmals versuchen."
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
msgid ""
"This film was created with an older version of DCP-o-matic, and "
"unfortunately it cannot be loaded into this version. You will need to "
msgid "Yet Another Deinterlacing Filter"
msgstr "Noch ein anderer De-Interlacer"
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
msgid "You must add some content to the DCP before creating it"
msgstr "Sie müssen einen Inhalt hinzufügen bevor Sie ein DCP erstellen können."
msgid "[still]"
msgstr "[Standbild]"
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
msgid "cannot contain slashes"
msgstr "Darf keine Schrägstriche enthalten"
msgid "connecting"
msgstr "verbinde..."
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
msgid "container"
msgstr "Container"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
msgid "content type"
msgstr "Inhalt Typ"
msgid "error during async_write (%1)"
msgstr "error during async_write (%1)"
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
msgid "frames per second"
msgstr "Bilder pro Sekunde"
msgid "multi-part subtitles not yet supported"
msgstr "Multi-Part Untertitel noch nicht unterstützt"
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
msgid "name"
msgstr "Name"
msgstr ""
"Project-Id-Version: LIBDCPOMATIC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2013-11-09 03:09-0500\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
msgid "Content to be joined must have the same ratio."
msgstr ""
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
-msgstr ""
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr "La fuente y el DCP tienen la misma velocidad."
+
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "La fuente y el DCP tienen la misma velocidad."
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:82
msgid "Content to be joined must have the same subtitle scale."
msgstr ""
msgid "Could not open %1 to send"
msgstr "No se pudo abrir %1 para enviar"
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
msgid "Could not read DCP to make KDM for"
msgstr "No se pudo leer el DCP para hacer el KDM"
"En el dispositivo donde se encuentra la película queda poco espacio. Libere "
"espacio en el disco y pruebe de nuevo."
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
msgid ""
"This film was created with an older version of DCP-o-matic, and "
"unfortunately it cannot be loaded into this version. You will need to "
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
msgid "You must add some content to the DCP before creating it"
msgstr "Tienes que añadir contenido al DCP antes de crearlo."
msgid "[still]"
msgstr "imagen fija"
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
msgid "cannot contain slashes"
msgstr "no puede contener barras"
msgid "connecting"
msgstr "conectando"
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
#, fuzzy
msgid "container"
msgstr "contenido"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
msgid "content type"
msgstr "tipo de contenido"
msgid "error during async_write (%1)"
msgstr ""
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
msgid "frames per second"
msgstr "fotogramas por segundo"
msgid "multi-part subtitles not yet supported"
msgstr "todavía no se soportan subtítulos en múltiples partes"
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
msgid "name"
msgstr "nombre"
msgstr ""
"Project-Id-Version: DCP-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
-"PO-Revision-Date: 2013-11-25 19:37+0100\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
+"PO-Revision-Date: 2014-01-25 16:13+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
-"Language: \n"
+"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
#: src/lib/sndfile_content.cc:60
msgid "%1 [audio]"
#: src/lib/writer.cc:74
msgid "Checking existing image data"
-msgstr ""
+msgstr "Recherche de données images existantes"
#: src/lib/writer.cc:448
msgid "Computing audio digest"
-msgstr ""
+msgstr "Fabrication rendu audio"
#: src/lib/image_content.cc:100
msgid "Computing digest"
-msgstr ""
+msgstr "fabrication rendu"
#: src/lib/writer.cc:445
msgid "Computing image digest"
-msgstr ""
+msgstr "Fabrication rendu image"
#: src/lib/util.cc:798
#, fuzzy
msgid "Content to be joined must have the same ratio."
msgstr ""
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
-msgstr ""
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr "Le DCP et la source ont les mêmes cadences."
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "Le DCP et la source ont les mêmes cadences."
+
+#: src/lib/subtitle_content.cc:82
msgid "Content to be joined must have the same subtitle scale."
msgstr ""
msgid "Could not open %1 to send"
msgstr "Ouverture de %1 pour envoi impossible"
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
msgid "Could not read DCP to make KDM for"
msgstr "DCP illisible pour fabrication de KDM"
#: src/lib/writer.cc:115
msgid "Encoding image data"
-msgstr ""
+msgstr "encodage des données image"
#: src/lib/job.cc:314
msgid "Error (%1)"
#: src/lib/content.cc:100
msgid "Only the first piece of content to be joined can have a start trim."
-msgstr ""
+msgstr "Seul le premier contenu à joindre peut avoir un coupure de début."
#: src/lib/content.cc:104
msgid "Only the last piece of content to be joined can have an end trim."
-msgstr ""
+msgstr "Seul le dernier contenu à joindre peut avoir une coupure en fin."
#: src/lib/filter.cc:91
msgid "Overcomplete wavelet denoiser"
"Le disque contenant le film est plein. Libérez de l'espace et essayez à "
"nouveau."
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
msgid ""
"This film was created with an older version of DCP-o-matic, and "
"unfortunately it cannot be loaded into this version. You will need to "
msgid "Yet Another Deinterlacing Filter"
msgstr "Un autre filtre de désentrelacement"
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
msgid "You must add some content to the DCP before creating it"
msgstr "Ajoutez un contenu pour créer le DCP"
msgid "[still]"
msgstr "%1 [fixe]"
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
msgid "cannot contain slashes"
msgstr "slash interdit"
msgid "connecting"
msgstr "connexion"
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
msgid "container"
msgstr "conteneur"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
msgid "content type"
msgstr "type de contenu"
#: src/lib/writer.cc:414
msgid "could not move audio MXF into the DCP (%1)"
-msgstr ""
+msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
#: src/lib/sndfile_decoder.cc:45
msgid "could not open audio file for reading"
msgid "error during async_write (%1)"
msgstr ""
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
msgid "frames per second"
msgstr "images par seconde"
msgid "multi-part subtitles not yet supported"
msgstr "sous-titres en plusieurs parties non supportés"
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
msgid "name"
msgstr "nom"
msgstr ""
"Project-Id-Version: IT VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2013-04-28 10:26+0100\n"
"Last-Translator: Maci <macibro@gmail.com>\n"
"Language-Team: \n"
msgid "Content to be joined must have the same ratio."
msgstr ""
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
-msgstr ""
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr "Il DCP e il sorgente hanno la stessa frequenza."
+
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "Il DCP e il sorgente hanno la stessa frequenza."
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:82
msgid "Content to be joined must have the same subtitle scale."
msgstr ""
msgid "Could not open %1 to send"
msgstr "Non posso aprire %1 da inviare"
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
msgid "Could not read DCP to make KDM for"
msgstr ""
"Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
"altro spazio e riprovare."
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
msgid ""
"This film was created with an older version of DCP-o-matic, and "
"unfortunately it cannot be loaded into this version. You will need to "
msgid "Yet Another Deinterlacing Filter"
msgstr "Altro filtro di deinterlacciamento"
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
msgid "You must add some content to the DCP before creating it"
msgstr ""
msgid "[still]"
msgstr "ancora"
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
msgid "cannot contain slashes"
msgstr "non può contenere barre"
msgid "connecting"
msgstr "mi sto connettendo"
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
#, fuzzy
msgid "container"
msgstr "contenuto"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
msgid "content type"
msgstr "tipo di contenuto"
msgid "error during async_write (%1)"
msgstr ""
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
msgid "frames per second"
msgstr "fotogrammi al secondo"
msgid "multi-part subtitles not yet supported"
msgstr "sottotitoli multi-part non ancora supportati"
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
msgid "name"
msgstr "nome"
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2014-01-19 08:59+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
msgid "Content to be joined must have the same ratio."
msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
-#: src/lib/subtitle_content.cc:65
-msgid "Content to be joined must have the same subtitle offset."
+#: src/lib/subtitle_content.cc:74
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr ""
+"Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
+
+#: src/lib/subtitle_content.cc:78
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y offset."
msgstr ""
"Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
-#: src/lib/subtitle_content.cc:69
+#: src/lib/subtitle_content.cc:82
msgid "Content to be joined must have the same subtitle scale."
msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
msgid "Could not open %1 to send"
msgstr "Kunde inte öppna %1 för att skicka"
-#: src/lib/film.cc:960
+#: src/lib/film.cc:962
msgid "Could not read DCP to make KDM for"
msgstr "Kunde inte läsa DCP för att skapa KDM"
"Enheten som filmen lagras på har för lite ledigt utrymme. Frigör utrymme och "
"försök igen."
-#: src/lib/film.cc:383
+#: src/lib/film.cc:385
msgid ""
"This film was created with an older version of DCP-o-matic, and "
"unfortunately it cannot be loaded into this version. You will need to "
msgid "Yet Another Deinterlacing Filter"
msgstr "Yet Another Deinterlacing Filter"
-#: src/lib/film.cc:287
+#: src/lib/film.cc:289
msgid "You must add some content to the DCP before creating it"
msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
msgid "[still]"
msgstr "[stillbild]"
-#: src/lib/film.cc:240
+#: src/lib/film.cc:242
msgid "cannot contain slashes"
msgstr "får inte innehålla snedstreck"
msgid "connecting"
msgstr "kopplar upp"
-#: src/lib/film.cc:283
+#: src/lib/film.cc:285
msgid "container"
msgstr "behållare"
-#: src/lib/film.cc:291
+#: src/lib/film.cc:293
msgid "content type"
msgstr "innehållstyp"
msgid "error during async_write (%1)"
msgstr "fel vid async_write (%1)"
-#: src/lib/transcode_job.cc:93
+#: src/lib/transcode_job.cc:94
msgid "frames per second"
msgstr "bilder per sekund"
msgid "multi-part subtitles not yet supported"
msgstr "undertexter i flera delar stöds inte ännu"
-#: src/lib/film.cc:240 src/lib/film.cc:295
+#: src/lib/film.cc:242 src/lib/film.cc:297
msgid "name"
msgstr "namn"
}
-SubRipContent::SubRipContent (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int)
+SubRipContent::SubRipContent (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version)
: Content (film, node)
- , SubtitleContent (film, node)
+ , SubtitleContent (film, node, version)
{
}
stringstream s;
s << Content::identifier()
<< "_" << subtitle_scale()
- << "_" << subtitle_offset();
+ << "_" << subtitle_x_offset()
+ << "_" << subtitle_y_offset();
return s.str ();
}
using boost::lexical_cast;
using boost::dynamic_pointer_cast;
-int const SubtitleContentProperty::SUBTITLE_OFFSET = 500;
-int const SubtitleContentProperty::SUBTITLE_SCALE = 501;
+int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500;
+int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
+int const SubtitleContentProperty::SUBTITLE_SCALE = 502;
SubtitleContent::SubtitleContent (shared_ptr<const Film> f, boost::filesystem::path p)
: Content (f, p)
- , _subtitle_offset (0)
+ , _subtitle_x_offset (0)
+ , _subtitle_y_offset (0)
, _subtitle_scale (1)
{
}
-SubtitleContent::SubtitleContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+SubtitleContent::SubtitleContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
: Content (f, node)
- , _subtitle_offset (0)
+ , _subtitle_x_offset (0)
+ , _subtitle_y_offset (0)
, _subtitle_scale (1)
{
LocaleGuard lg;
+
+ if (version >= 7) {
+ _subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
+ _subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
+ } else {
+ _subtitle_y_offset = node->number_child<float> ("SubtitleOffset");
+ }
- _subtitle_offset = node->number_child<float> ("SubtitleOffset");
_subtitle_scale = node->number_child<float> ("SubtitleScale");
}
for (size_t i = 0; i < c.size(); ++i) {
shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (c[i]);
- if (sc->subtitle_offset() != ref->subtitle_offset()) {
- throw JoinError (_("Content to be joined must have the same subtitle offset."));
+ if (sc->subtitle_x_offset() != ref->subtitle_x_offset()) {
+ throw JoinError (_("Content to be joined must have the same subtitle X offset."));
+ }
+
+ if (sc->subtitle_y_offset() != ref->subtitle_y_offset()) {
+ throw JoinError (_("Content to be joined must have the same subtitle Y offset."));
}
if (sc->subtitle_scale() != ref->subtitle_scale()) {
}
}
- _subtitle_offset = ref->subtitle_offset ();
+ _subtitle_x_offset = ref->subtitle_x_offset ();
+ _subtitle_y_offset = ref->subtitle_y_offset ();
_subtitle_scale = ref->subtitle_scale ();
}
{
LocaleGuard lg;
- root->add_child("SubtitleOffset")->add_child_text (lexical_cast<string> (_subtitle_offset));
+ root->add_child("SubtitleXOffset")->add_child_text (lexical_cast<string> (_subtitle_x_offset));
+ root->add_child("SubtitleYOffset")->add_child_text (lexical_cast<string> (_subtitle_y_offset));
root->add_child("SubtitleScale")->add_child_text (lexical_cast<string> (_subtitle_scale));
}
void
-SubtitleContent::set_subtitle_offset (double o)
+SubtitleContent::set_subtitle_x_offset (double o)
+{
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _subtitle_x_offset = o;
+ }
+ signal_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET);
+}
+
+void
+SubtitleContent::set_subtitle_y_offset (double o)
{
{
boost::mutex::scoped_lock lm (_mutex);
- _subtitle_offset = o;
+ _subtitle_y_offset = o;
}
- signal_changed (SubtitleContentProperty::SUBTITLE_OFFSET);
+ signal_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
}
void
class SubtitleContentProperty
{
public:
- static int const SUBTITLE_OFFSET;
+ static int const SUBTITLE_X_OFFSET;
+ static int const SUBTITLE_Y_OFFSET;
static int const SUBTITLE_SCALE;
};
{
public:
SubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
- SubtitleContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+ SubtitleContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int version);
SubtitleContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
- void set_subtitle_offset (double);
+ void set_subtitle_x_offset (double);
+ void set_subtitle_y_offset (double);
void set_subtitle_scale (double);
- double subtitle_offset () const {
+ double subtitle_x_offset () const {
boost::mutex::scoped_lock lm (_mutex);
- return _subtitle_offset;
+ return _subtitle_x_offset;
+ }
+
+ double subtitle_y_offset () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _subtitle_y_offset;
}
double subtitle_scale () const {
private:
friend class ffmpeg_pts_offset_test;
-
+
+ /** x offset for placing subtitles, as a proportion of the container width;
+ * +ve is further right, -ve is further left.
+ */
+ double _subtitle_x_offset;
/** y offset for placing subtitles, as a proportion of the container height;
- +ve is further down the frame, -ve is further up.
- */
- double _subtitle_offset;
+ * +ve is further down the frame, -ve is further up.
+ */
+ double _subtitle_y_offset;
/** scale factor to apply to subtitles */
double _subtitle_scale;
};
set_state (FINISHED_OK);
_film->log()->log (N_("Transcode job completed successfully"));
+ _transcoder.reset ();
} catch (...) {
set_progress (1);
#include <wx/aboutdlg.h>
#include <wx/stdpaths.h>
+#include <wx/cmdline.h>
#include <wx/wx.h>
#include "lib/version.h"
#include "lib/compose.hpp"
#include "wx/wx_ui_signaller.h"
#include "wx/job_manager_view.h"
+using std::exception;
using boost::shared_ptr;
+static std::string film_to_load;
+
enum {
ID_file_add_film = 1,
ID_file_quit,
}
};
+static const wxCmdLineEntryDesc command_line_description[] = {
+ { wxCMD_LINE_PARAM, 0, 0, "film to load", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
+};
+
class App : public wxApp
{
bool OnInit ()
ui_signaller = new wxUISignaller (this);
this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
+ shared_ptr<Film> film;
+ if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
+ try {
+ film.reset (new Film (film_to_load));
+ film->read_metadata ();
+ film->make_dcp ();
+ } catch (exception& e) {
+ error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
+ }
+ }
+
return true;
}
{
ui_signaller->ui_idle ();
}
+
+ void OnInitCmdLine (wxCmdLineParser& parser)
+ {
+ parser.SetDesc (command_line_description);
+ parser.SetSwitchChars (wxT ("-"));
+ }
+
+ bool OnCmdLineParsed (wxCmdLineParser& parser)
+ {
+ if (parser.GetParamCount() > 0) {
+ film_to_load = wx_to_std (parser.GetParam(0));
+ }
+
+ return true;
+ }
};
IMPLEMENT_APP (App)
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2014-01-14 19:49+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
"Project-Id-Version: DCPOMATIC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2013-11-09 02:47-0500\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
msgstr ""
"Project-Id-Version: DCP-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
-"PO-Revision-Date: 2013-11-25 18:58+0100\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
+"PO-Revision-Date: 2014-01-25 16:20+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
-"Language: \n"
+"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
#: src/tools/dcpomatic.cc:366
msgid "%1 already exists as a file, so you cannot use it for a new film."
#: src/tools/dcpomatic.cc:244
msgid "&Tools"
-msgstr ""
+msgstr "&Outils"
#: src/tools/dcpomatic.cc:236
msgid "About"
#: src/tools/dcpomatic.cc:230
msgid "Check for updates"
-msgstr ""
+msgstr "Recherche mises à jour"
#: src/tools/dcpomatic.cc:633
msgid "Could not load film %1 (%2)"
#: src/tools/dcpomatic.cc:229
msgid "Encoding servers..."
-msgstr ""
+msgstr "Serveurs d'encodage"
#: src/tools/dcpomatic.cc:90
msgid "Film changed"
#: src/tools/dcpomatic.cc:228
msgid "Hints..."
-msgstr ""
+msgstr "Avertissements..."
#: src/tools/dcpomatic.cc:223
msgid "Make &KDMs..."
"The DCP for this film will take up about %.1f Gb, and the disk that you are "
"using only has %.1f Gb available. Do you want to continue anyway?"
msgstr ""
+"Le DCP de ce film prendra environ %.1f Go d'espace. Le disque que vous "
+"utilisez n'a que %.1f Go disponible(s). Souhaitez-vous continuer?"
#: src/tools/dcpomatic.cc:728
msgid "The DCP-o-matic download server could not be contacted."
-msgstr ""
+msgstr "Le serveur de téléchargement de DCP-o-matic ne peut être contacté."
#: src/tools/dcpomatic.cc:356
msgid ""
#: src/tools/dcpomatic.cc:723
msgid "There are no new versions of DCP-o-matic available."
-msgstr ""
+msgstr "Aucune mise à jour disponible pour DCP-o-matic."
#: src/tools/dcpomatic.cc:553
msgid "There are unfinished jobs; are you sure you want to quit?"
msgstr ""
"Project-Id-Version: IT VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2013-04-28 10:31+0100\n"
"Last-Translator: Maci <macibro@gmail.com>\n"
"Language-Team: \n"
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2014-01-19 08:59+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_default_j2k_bandwidth = new wxSpinCtrl (_defaults_panel);
s->Add (_default_j2k_bandwidth);
- add_label_to_sizer (s, _defaults_panel, _("MBps"), false);
+ add_label_to_sizer (s, _defaults_panel, _("Mbit/s"), false);
table->Add (s, 1);
}
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_j2k_bandwidth = new wxSpinCtrl (_dcp_panel, wxID_ANY);
s->Add (_j2k_bandwidth, 1);
- add_label_to_sizer (s, _dcp_panel, _("MBps"), false);
+ add_label_to_sizer (s, _dcp_panel, _("Mbit/s"), false);
grid->Add (s, wxGBPosition (r, 1));
}
++r;
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2014-01-14 20:00+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
msgid "%"
msgstr "%"
msgid "Ls"
msgstr "SL"
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
#: src/wx/film_editor.cc:741
msgid "MISSING: "
msgstr "FEHLT:"
msgid "Matrix"
msgstr "Matrix"
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
#: src/wx/config_dialog.cc:67
msgid "Metadata"
msgstr "Metadata"
msgid "Subtitle Language (e.g. FR)"
msgstr "Untertitel Sprache (z.B. EN)"
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Untertitel Offset"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
msgid "Subtitle Scale"
msgstr "Untertitel Größe"
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
msgid "Subtitle Stream"
msgstr "Untertitel Spur"
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Untertitel Offset"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Untertitel Offset"
+
#: src/wx/subtitle_panel.cc:34
msgid "Subtitles"
msgstr "Untertitel"
#: src/wx/timeline.cc:234
msgid "video"
msgstr "Bild"
+
+#~ msgid "MBps"
+#~ msgstr "MBps"
msgstr ""
"Project-Id-Version: libdcpomatic-wx\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2013-11-09 03:00-0500\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
"X-Generator: Poedit 1.5.7\n"
#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
msgid "%"
msgstr "%"
msgid "Ls"
msgstr "s"
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
#: src/wx/film_editor.cc:741
msgid "MISSING: "
msgstr ""
msgid "Matrix"
msgstr ""
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
#: src/wx/config_dialog.cc:67
msgid "Metadata"
msgstr ""
msgid "Subtitle Language (e.g. FR)"
msgstr "Idioma del subtítulo (ej. EN)"
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Desplazamiento del subtítulo"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
msgid "Subtitle Scale"
msgstr "Escala del subtítulo"
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
#, fuzzy
msgid "Subtitle Stream"
msgstr "Escala del subtítulo"
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Desplazamiento del subtítulo"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Desplazamiento del subtítulo"
+
#: src/wx/subtitle_panel.cc:34
msgid "Subtitles"
msgstr "Subtítulos"
msgid "video"
msgstr "Vídeo"
+#~ msgid "MBps"
+#~ msgstr "MBps"
+
#~ msgid "Length"
#~ msgstr "Longitud"
msgstr ""
"Project-Id-Version: DCP-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
-"PO-Revision-Date: 2013-11-25 19:28+0100\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
+"PO-Revision-Date: 2014-01-25 16:56+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
-"Language: \n"
+"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
msgid "%"
msgstr "%"
#: src/wx/config_dialog.cc:131
msgid "(password will be stored on disk in plaintext)"
-msgstr ""
+msgstr "(le mot de passe sera enregistré sur le disque au format texte)"
#: src/wx/config_dialog.cc:108
msgid "(restart DCP-o-matic to see language changes)"
#: src/wx/audio_mapping_view.cc:135
msgid "-3dB"
-msgstr ""
+msgstr "-3dB"
#: src/wx/colour_conversion_editor.cc:83
msgid "1 / "
-msgstr ""
+msgstr "1/"
#: src/wx/audio_panel.cc:236
msgid "1 channel"
#: src/wx/video_panel.cc:200
msgid "2D"
-msgstr ""
+msgstr "2D"
#: src/wx/film_editor.cc:218
msgid "2K"
-msgstr ""
+msgstr "2K"
#: src/wx/film_editor.cc:166
msgid "3D"
-msgstr ""
+msgstr "3D"
#: src/wx/video_panel.cc:201
msgid "3D left/right"
#: src/wx/video_panel.cc:202
msgid "3D top/bottom"
-msgstr ""
+msgstr "3D dessus/dessous"
#: src/wx/film_editor.cc:219
msgid "4K"
-msgstr ""
+msgstr "4K"
#: src/wx/update_dialog.cc:34
msgid "A new version of DCP-o-matic is available."
-msgstr ""
+msgstr "Une nouvelle version de DCP-o-matic est disponible"
#: src/wx/about_dialog.cc:30
msgid "About DCP-o-matic"
msgid ""
"Audio will be passed from content channel %d to DCP channel %d unaltered."
msgstr ""
+"Le son du canal audio %d sera transféré au canal audio du DCP %d sans "
+"modification."
#: src/wx/audio_mapping_view.cc:328
#, c-format
"Audio will be passed from content channel %d to DCP channel %d with gain "
"%.1fdB."
msgstr ""
+"Le son du canal audio %d sera transféré au canal audio du DCP %d avec un "
+"gain de %.1fdB."
#: src/wx/job_wrapper.cc:38
#, c-format
#: src/wx/config_dialog.cc:143
msgid "Check for testing updates as well as stable ones"
-msgstr ""
+msgstr "Recherche de mises à jour en test aussi bien que stables."
#: src/wx/config_dialog.cc:139
msgid "Check for updates on startup"
-msgstr ""
+msgstr "Recherche de mises à jour au démarrage."
#: src/wx/content_menu.cc:182
#, fuzzy
#: src/wx/film_editor.cc:280
msgid "Down"
-msgstr ""
+msgstr "Descendre"
#: src/wx/kdm_dialog.cc:68
msgid "Edit Cinema..."
#: src/wx/cinema_dialog.cc:35
msgid "Email address for KDM delivery"
-msgstr ""
+msgstr "Adresse email pour l'envoi de KDM"
#: src/wx/servers_list_dialog.cc:30
#, fuzzy
#: src/wx/film_editor.cc:157
msgid "Encrypted"
-msgstr ""
+msgstr "Crypté"
#: src/wx/dci_metadata_dialog.cc:59
msgid "Facility (e.g. DLA)"
#: src/wx/content_menu.cc:52
msgid "Find missing..."
-msgstr ""
+msgstr "Recherche de l'élément manquant..."
#: src/wx/film_editor.cc:143
msgid "Frame Rate"
#: src/wx/config_dialog.cc:135
msgid "From address for KDM emails"
-msgstr ""
+msgstr "Email expéditeur pour les envoi de KDM"
#: src/wx/audio_mapping_view.cc:134
msgid "Full"
-msgstr ""
+msgstr "Plein"
#: src/wx/timing_panel.cc:42
msgid "Full length"
-msgstr ""
+msgstr "Durée totale"
#: src/wx/gain_calculator_dialog.cc:27
msgid "Gain Calculator"
#: src/wx/audio_gain_dialog.cc:31
#, c-format
msgid "Gain for content channel %d in DCP channel %d"
-msgstr ""
+msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
#: src/wx/properties_dialog.cc:57
msgid "Gb"
#: src/wx/hints_dialog.cc:26
msgid "Hints"
-msgstr ""
+msgstr "Avertissements"
#: src/wx/servers_list_dialog.cc:40
msgid "Host"
-msgstr ""
+msgstr "Hôtes"
#: src/wx/server_dialog.cc:41
msgid "Host name or IP address"
#: src/wx/film_editor.cc:222
msgid "Interop"
-msgstr ""
+msgstr "MXF-Interop"
#: src/wx/config_dialog.cc:340
msgid "Issuer"
#: src/wx/content_menu.cc:51
msgid "Join"
-msgstr ""
+msgstr "Ajouter"
#: src/wx/config_dialog.cc:71
msgid "KDM email"
msgid "Ls"
msgstr "Ls"
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
#: src/wx/film_editor.cc:741
msgid "MISSING: "
-msgstr ""
+msgstr "MANQUANT:"
#: src/wx/config_dialog.cc:127
#, fuzzy
msgid "Matrix"
msgstr "Matrice"
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
#: src/wx/config_dialog.cc:67
msgid "Metadata"
msgstr "Métadonnées"
#: src/wx/update_dialog.cc:36
msgid "New versions of DCP-o-matic are available."
-msgstr ""
+msgstr "De nouvelles versions de DCP-o-matic sont disponibles."
#: src/wx/audio_mapping_view.cc:323
#, c-format
msgid "No audio will be passed from content channel %d to DCP channel %d."
-msgstr ""
+msgstr "Aucun son ne passera du canal audio %d au canal du DCP %d."
#: src/wx/video_panel.cc:198
msgid "No stretch"
#: src/wx/audio_mapping_view.cc:133
msgid "Off"
-msgstr ""
+msgstr "Eteint"
#: src/wx/config_dialog.cc:119
msgid "Outgoing mail server"
#: src/wx/timing_panel.cc:51
msgid "Play length"
-msgstr ""
+msgstr "Durée de lecture"
#: src/wx/audio_plot.cc:43
msgid "Please wait; audio is being analysed..."
#: src/wx/audio_mapping_view.cc:331
msgid "Right click to change gain."
-msgstr ""
+msgstr "Cliquez droit pour modifier le gain."
#: src/wx/video_panel.cc:101
msgid "Right crop"
#: src/wx/film_editor.cc:221
msgid "SMPTE"
-msgstr ""
+msgstr "SMPTE"
#: src/wx/video_panel.cc:134
msgid "Scale to"
#: src/wx/film_editor.cc:153
msgid "Signed"
-msgstr ""
+msgstr "Signé"
#: src/wx/audio_dialog.cc:71
msgid "Smoothing"
#: src/wx/timeline_dialog.cc:38
msgid "Snap"
-msgstr ""
+msgstr "Echnager"
#: src/wx/update_dialog.cc:43
#, fuzzy
msgid "Subtitle Language (e.g. FR)"
msgstr "Langue de sous-titres (ex. FR)"
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Décalage du sous-titre"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
msgid "Subtitle Scale"
msgstr "Taille du sous-titre"
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
msgid "Subtitle Stream"
msgstr "Flux de sous-titre"
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Décalage du sous-titre"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Décalage du sous-titre"
+
#: src/wx/subtitle_panel.cc:34
msgid "Subtitles"
msgstr "Sous-titres"
"missing. Either try again with the correct content file or remove the "
"missing content."
msgstr ""
+"Les fichiers de contenu que vous avez spécifiés ne sont pas les mêmes que "
+"ceux detectés comme manquants. Vous pouvez réessayer avec les contenus "
+"corrects ou supprimer les contenus manquants."
#: src/wx/hints_dialog.cc:97
msgid "There are no hints: everything looks good!"
-msgstr ""
+msgstr "Il n'y a aucun avertissement: tout semble correct!"
#: src/wx/servers_list_dialog.cc:48
msgid "Threads"
#: src/wx/timing_panel.cc:34
msgid "Timing"
-msgstr ""
+msgstr "Durée"
#: src/wx/video_panel.cc:112
msgid "Top crop"
#: src/wx/film_editor.cc:278
msgid "Up"
-msgstr ""
+msgstr "Monter"
#: src/wx/update_dialog.cc:27
msgid "Update"
-msgstr ""
+msgstr "Mise à jour."
#: src/wx/film_editor.cc:126
msgid "Use DCI name"
#: src/wx/config_dialog.cc:369
msgid "Use all servers"
-msgstr ""
+msgstr "Utiliser tous les serveurs."
#: src/wx/film_editor.cc:147
msgid "Use best"
#: src/wx/kdm_dialog.cc:122
msgid "Write to"
-msgstr ""
+msgstr "Ecrire à"
#: src/wx/about_dialog.cc:91
msgid "Written by"
"You have %d files that look like they are VOB files from DVD. You should "
"join them to ensure smooth joins between the files."
msgstr ""
+"%d fichiers ressemblent à des fichiers VOB de DVD. Vous devriez les ajouter "
+"afin de vous assurer d'une jonction correcte entre vos fichiers."
#: src/wx/hints_dialog.cc:76
#, c-format
"Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
"projectors. Use 24 or 48 frames per second to be on the safe side."
msgstr ""
+"La cadence image de votre DCP (%d ips) peut créer des problèmes avec "
+"quelques projecteurs (anciens). Utilisez plutôt une cadence de 24 ou 48 "
+"images par seconde pour assurer une plus grande compatibilité."
#: src/wx/hints_dialog.cc:66
msgid ""
"Your DCP has an odd number of audio channels. This is very likely to cause "
"problems on playback."
msgstr ""
+"Votre DCP posséde un nombre impair de canaux audio. Cela peut créer des "
+"problèmes de lecture."
#: src/wx/hints_dialog.cc:70
msgid ""
"Your DCP has fewer than 6 audio channels. This may cause problems on some "
"projectors."
msgstr ""
+"Votre DCP a moins de 6 canaux audio. Cela peut créer des problèmes de "
+"lecture sur certains projecteurs."
#: src/wx/timeline.cc:213
msgid "audio"
#: src/wx/timeline.cc:236
msgid "still"
-msgstr ""
+msgstr "fixe"
#: src/wx/repeat_dialog.cc:37
msgid "times"
-msgstr ""
+msgstr "fois"
#: src/wx/timeline.cc:234
msgid "video"
msgstr "vidéo"
+#~ msgid "MBps"
+#~ msgstr "MBps"
+
#~ msgid "Length"
#~ msgstr "Longueur / durée"
msgstr ""
"Project-Id-Version: IT VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2013-04-28 10:27+0100\n"
"Last-Translator: Maci <macibro@gmail.com>\n"
"Language-Team: \n"
"X-Generator: Poedit 1.5.5\n"
#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
msgid "%"
msgstr "%"
msgid "Ls"
msgstr "s"
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
#: src/wx/film_editor.cc:741
msgid "MISSING: "
msgstr ""
msgid "Matrix"
msgstr ""
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
#: src/wx/config_dialog.cc:67
msgid "Metadata"
msgstr ""
msgid "Subtitle Language (e.g. FR)"
msgstr "Lingua dei Sottotitoli (es. FR)"
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Sfalsamento dei Sottotitoli"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
msgid "Subtitle Scale"
msgstr "Scala dei Sottotitoli"
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
#, fuzzy
msgid "Subtitle Stream"
msgstr "Scala dei Sottotitoli"
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Sfalsamento dei Sottotitoli"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Sfalsamento dei Sottotitoli"
+
#: src/wx/subtitle_panel.cc:34
msgid "Subtitles"
msgstr "Sottotitoli"
msgid "video"
msgstr "Video"
+#~ msgid "MBps"
+#~ msgstr "MBps"
+
#~ msgid "Length"
#~ msgstr "Lunghezza"
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
"PO-Revision-Date: 2014-01-19 09:14+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
"X-Generator: Poedit 1.6.3\n"
#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
msgid "%"
msgstr "%"
msgid "Ls"
msgstr "Vs"
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
#: src/wx/film_editor.cc:741
msgid "MISSING: "
msgstr "SAKNAS:"
msgid "Matrix"
msgstr "Matris"
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
#: src/wx/config_dialog.cc:67
msgid "Metadata"
msgstr "Metadata"
msgid "Subtitle Language (e.g. FR)"
msgstr "Undertextspråk (ex. SV)"
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Undertext Förskjutning"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
msgid "Subtitle Scale"
msgstr "Undertext Skalning"
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
msgid "Subtitle Stream"
msgstr "Undertextström"
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Undertext Förskjutning"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Undertext Förskjutning"
+
#: src/wx/subtitle_panel.cc:34
msgid "Subtitles"
msgstr "Undertexter"
msgid "video"
msgstr "video"
+#~ msgid "MBps"
+#~ msgstr "MBps"
+
#~ msgid "Length"
#~ msgstr "Längd"
grid->AddSpacer (0);
{
- add_label_to_sizer (grid, this, _("Subtitle Offset"), true);
+ add_label_to_sizer (grid, this, _("Subtitle X Offset"), true);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _offset = new wxSpinCtrl (this);
- s->Add (_offset);
+ _x_offset = new wxSpinCtrl (this);
+ s->Add (_x_offset);
add_label_to_sizer (s, this, _("%"), false);
grid->Add (s);
}
+ {
+ add_label_to_sizer (grid, this, _("Subtitle Y Offset"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _y_offset = new wxSpinCtrl (this);
+ s->Add (_y_offset);
+ add_label_to_sizer (s, this, _("%"), false);
+ grid->Add (s);
+ }
+
{
add_label_to_sizer (grid, this, _("Subtitle Scale"), true);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_stream = new wxChoice (this, wxID_ANY);
grid->Add (_stream, 1, wxEXPAND);
- _offset->SetRange (-100, 100);
+ _x_offset->SetRange (-100, 100);
+ _y_offset->SetRange (-100, 100);
_scale->SetRange (1, 1000);
_scale->SetValue (100);
_with_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::with_subtitles_toggled, this));
- _offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::offset_changed, this));
+ _x_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this));
+ _y_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this));
_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::scale_changed, this));
_stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&SubtitlePanel::stream_changed, this));
}
}
}
setup_sensitivity ();
- } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) {
- checked_set (_offset, scs ? (scs->subtitle_offset() * 100) : 0);
+ } else if (property == SubtitleContentProperty::SUBTITLE_X_OFFSET) {
+ checked_set (_x_offset, scs ? (scs->subtitle_x_offset() * 100) : 0);
+ } else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) {
+ checked_set (_y_offset, scs ? (scs->subtitle_y_offset() * 100) : 0);
} else if (property == SubtitleContentProperty::SUBTITLE_SCALE) {
checked_set (_scale, scs ? (scs->subtitle_scale() * 100) : 100);
}
}
_with_subtitles->Enable (h);
- _offset->Enable (j);
+ _x_offset->Enable (j);
+ _y_offset->Enable (j);
_scale->Enable (j);
_stream->Enable (j);
}
}
void
-SubtitlePanel::offset_changed ()
+SubtitlePanel::x_offset_changed ()
+{
+ SubtitleContentList c = _editor->selected_subtitle_content ();
+ if (c.size() == 1) {
+ c.front()->set_subtitle_x_offset (_x_offset->GetValue() / 100.0);
+ }
+}
+
+void
+SubtitlePanel::y_offset_changed ()
{
SubtitleContentList c = _editor->selected_subtitle_content ();
if (c.size() == 1) {
- c.front()->set_subtitle_offset (_offset->GetValue() / 100.0);
+ c.front()->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
}
}
SubtitlePanel::content_selection_changed ()
{
film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
- film_content_changed (SubtitleContentProperty::SUBTITLE_OFFSET);
+ film_content_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET);
+ film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
film_content_changed (SubtitleContentProperty::SUBTITLE_SCALE);
}
private:
void with_subtitles_toggled ();
- void offset_changed ();
+ void x_offset_changed ();
+ void y_offset_changed ();
void scale_changed ();
void stream_changed ();
void setup_sensitivity ();
wxCheckBox* _with_subtitles;
- wxSpinCtrl* _offset;
+ wxSpinCtrl* _x_offset;
+ wxSpinCtrl* _y_offset;
wxSpinCtrl* _scale;
wxChoice* _stream;
};
import sys
APPNAME = 'dcpomatic'
-VERSION = '1.63.5devel'
+VERSION = '1.64.0devel'
def options(opt):
opt.load('compiler_cxx')
projects / dcpomatic.git / commitdiff