[SCM] dvdstyler/upstream: Imported Upstream version 2.5.2
fabricesp-guest at users.alioth.debian.org
fabricesp-guest at users.alioth.debian.org
Tue Aug 20 06:23:56 UTC 2013
The following commit has been merged in the upstream branch:
commit f1fd88bcd71d010112b62e6d410d391f9e025798
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date: Tue Aug 20 08:00:16 2013 +0200
Imported Upstream version 2.5.2
diff --git a/ChangeLog b/ChangeLog
index 312623e..5700022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Version 2.5.2 <2013-08-18>
+--------------------------
+
+ * added log file
+ * fixed loading of project with video buttons
+
Version 2.5.1 <2013-08-02>
--------------------------
diff --git a/configure b/configure
index 823cd90..3f4e87b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for DVDStyler 2.5.1.
+# Generated by GNU Autoconf 2.69 for DVDStyler 2.5.2.
#
# Report bugs to <http://www.dvdstyler.org>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='DVDStyler'
PACKAGE_TARNAME='dvdstyler'
-PACKAGE_VERSION='2.5.1'
-PACKAGE_STRING='DVDStyler 2.5.1'
+PACKAGE_VERSION='2.5.2'
+PACKAGE_STRING='DVDStyler 2.5.2'
PACKAGE_BUGREPORT='http://www.dvdstyler.org'
PACKAGE_URL=''
@@ -1301,7 +1301,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures DVDStyler 2.5.1 to adapt to many kinds of systems.
+\`configure' configures DVDStyler 2.5.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1367,7 +1367,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of DVDStyler 2.5.1:";;
+ short | recursive ) echo "Configuration of DVDStyler 2.5.2:";;
esac
cat <<\_ACEOF
@@ -1501,7 +1501,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-DVDStyler configure 2.5.1
+DVDStyler configure 2.5.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1708,7 +1708,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by DVDStyler $as_me 2.5.1, which was
+It was created by DVDStyler $as_me 2.5.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2523,7 +2523,7 @@ fi
# Define the identity of the package.
PACKAGE='dvdstyler'
- VERSION='2.5.1'
+ VERSION='2.5.2'
cat >>confdefs.h <<_ACEOF
@@ -6397,7 +6397,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by DVDStyler $as_me 2.5.1, which was
+This file was extended by DVDStyler $as_me 2.5.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6454,7 +6454,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-DVDStyler config.status 2.5.1
+DVDStyler config.status 2.5.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index 470e042..2d30b05 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl initialization
-AC_INIT([DVDStyler], [2.5.1], [http://www.dvdstyler.org])
+AC_INIT([DVDStyler], [2.5.2], [http://www.dvdstyler.org])
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
diff --git a/src/Menu.cpp b/src/Menu.cpp
index 2426bab..86ba2ed 100644
--- a/src/Menu.cpp
+++ b/src/Menu.cpp
@@ -3,7 +3,7 @@
// Purpose: The class to store a DVD Menu
// Author: Alex Thuering
// Created: 04.11.2003
-// RCS-ID: $Id: Menu.cpp,v 1.113 2013/06/04 20:58:19 ntalex Exp $
+// RCS-ID: $Id: Menu.cpp,v 1.114 2013/08/15 07:06:45 ntalex Exp $
// Copyright: (c) Alex Thuering
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
@@ -338,8 +338,7 @@ bool Menu::RemoveNotChangeable(wxSVGElement* element, MenuObject* obj) {
return element->GetChildren() == NULL; // return if has no children
}
-void CopyCachedImages(wxSVGDocument* doc, wxSVGElement* parent1,
- wxSVGElement* parent2) {
+void CopyCachedImages(wxSVGDocument* doc, wxSVGElement* parent1, wxSVGElement* parent2) {
wxSVGElement* elem1 = (wxSVGElement*) parent1->GetChildren();
wxSVGElement* elem2 = (wxSVGElement*) parent2->GetChildren();
while (elem1 && elem2) {
@@ -930,9 +929,13 @@ bool Menu::PutXML(wxSvgXmlNode* node) {
// fix relative path
wxSVGElement* elem = m_svg->GetRootElement();
while (elem != NULL) {
- if (elem->GetDtd() == wxSVG_IMAGE_ELEMENT) {
- wxSVGImageElement* imgElem = (wxSVGImageElement*)elem;
- wxString href = imgElem->GetHref();
+ if (elem->GetDtd() == wxSVG_IMAGE_ELEMENT || elem->GetDtd() == wxSVG_VIDEO_ELEMENT) {
+ wxSVGURIReference* uriElem = NULL;
+ if (elem->GetDtd() == wxSVG_IMAGE_ELEMENT)
+ uriElem = (wxSVGImageElement*) elem;
+ else // elem->GetDtd() == wxSVG_VIDEO_ELEMENT
+ uriElem = (wxSVGVideoElement*) elem;
+ wxString href = uriElem->GetHref();
if (href.length()) {
wxString frameStr;
if (href.Find(wxT('#')) > 0) {
@@ -941,9 +944,9 @@ bool Menu::PutXML(wxSvgXmlNode* node) {
}
wxFileName fname(href);
if (fname.IsRelative())
- imgElem->SetHref(m_dvd->GetPath() + fname.GetFullPath() + frameStr);
+ uriElem->SetHref(m_dvd->GetPath() + fname.GetFullPath() + frameStr);
else if (!wxFileExists(href) && wxFileExists(m_dvd->GetPath() + fname.GetFullName()))
- imgElem->SetHref(m_dvd->GetPath() + fname.GetFullName() + frameStr);
+ uriElem->SetHref(m_dvd->GetPath() + fname.GetFullName() + frameStr);
}
}
if (elem->GetChildren() != NULL && (elem->GetDtd() == wxSVG_SVG_ELEMENT
diff --git a/src/ProgressDlg.cpp b/src/ProgressDlg.cpp
index a962e92..7a73100 100644
--- a/src/ProgressDlg.cpp
+++ b/src/ProgressDlg.cpp
@@ -3,7 +3,7 @@
// Purpose: Progress of generation/burning dialog
// Author: Alex Thuering
// Created: 14.08.2004
-// RCS-ID: $Id: ProgressDlg.cpp,v 1.150 2013/06/04 19:23:14 ntalex Exp $
+// RCS-ID: $Id: ProgressDlg.cpp,v 1.152 2013/08/18 10:22:24 ntalex Exp $
// Copyright: (c) Alex Thuering
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
@@ -430,6 +430,8 @@ void ProgressDlg::AddDetailText(const wxString& text) {
m_detailsText->ShowPosition(m_detailsText->GetLastPosition());
if (wxLog::GetActiveTarget()->GetVerbose())
fprintf(stderr, "%s", (const char*) text.mb_str());
+ m_logFile.Write(text);
+ m_logFile.Flush();
wxYieldIfNeeded();
}
@@ -470,6 +472,7 @@ void ProgressDlg::End() {
wxBell();
m_cancelBt->SetLabel(_("Close"));
m_cancel = true;
+ m_logFile.Close();
}
bool ProgressDlg::IsCanceled() {
@@ -618,25 +621,30 @@ void ProgressDlg::Run(BurnDlg* burnDlg, DVD* dvd) {
s_config.SetAVConvCmd(wxT("ffmpeg"));
}
#endif
+
+ // clean temp dir
+ wxString tmpDir = burnDlg->GetTempDir();
+ if (tmpDir.Last() != wxFILE_SEP_PATH)
+ tmpDir += wxFILE_SEP_PATH;
+ wxString dvdOutDir = tmpDir + wxString(wxT("dvd-out")) + wxFILE_SEP_PATH;
+ wxString dvdTmpDir = tmpDir + wxString(wxT("dvd-tmp")) + wxFILE_SEP_PATH;
+
+ // create log file
+ m_logFile.Open(tmpDir + wxT("dvdstyler.log"), wxT("w"));
// print version
AddDetailMsg(wxT("DVDStyler v") + APP_VERSION);
AddDetailMsg(wxGetOsDescription());
AddDetailMsg((s_config.GetAVConvCmd() == wxT("ffmpeg") ? wxT("FFmpeg: ") : wxT("Libav: "))
+ wxFfmpegMediaEncoder::GetBackendVersion());
-
+
// prepare
AddSummaryMsg(_("Prepare"));
- wxString tmpDir = burnDlg->GetTempDir();
- if (tmpDir.Last() != wxFILE_SEP_PATH)
- tmpDir += wxFILE_SEP_PATH;
- wxString dvdOutDir = tmpDir + wxString(wxT("dvd-out")) + wxFILE_SEP_PATH;
- wxString dvdTmpDir = tmpDir + wxString(wxT("dvd-tmp")) + wxFILE_SEP_PATH;
-
+ // clean temp dir
if (!CleanTemp(tmpDir, dvdTmpDir, dvdOutDir))
return;
-
+
// check cache and calculate steps
AddDetailMsg(_("Search for transcoded files in cache"));
m_cache->BeginClean();
diff --git a/src/ProgressDlg.h b/src/ProgressDlg.h
index e067cb5..a92f931 100644
--- a/src/ProgressDlg.h
+++ b/src/ProgressDlg.h
@@ -3,7 +3,7 @@
// Purpose: Progress of generation/burning dialog
// Author: Alex Thuering
// Created: 14.08.2004
-// RCS-ID: $Id: ProgressDlg.h,v 1.37 2013/01/10 15:29:57 ntalex Exp $
+// RCS-ID: $Id: ProgressDlg.h,v 1.38 2013/08/18 08:46:00 ntalex Exp $
// Copyright: (c) Alex Thuering
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
@@ -14,6 +14,7 @@
#include "DVD.h"
#include "Cache.h"
#include "BurnDlg.h"
+#include <wx/ffile.h>
// begin wxGlade: dependencies
// end wxGlade
@@ -102,6 +103,7 @@ private:
bool m_end;
Cache* m_cache;
+ wxFFile m_logFile;
void UpdateGauge();
--
dvdstyler packaging
More information about the pkg-multimedia-commits
mailing list