[SCM] devede/master: Imported Upstream version 4.3.2
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun Nov 8 19:26:40 UTC 2015
The following commit has been merged in the master branch:
commit a9d3b6d2f943f3d092b6a08a69d7bc17a5f4eda8
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date: Sun Nov 8 19:25:39 2015 +0000
Imported Upstream version 4.3.2
diff --git a/HISTORY.md b/HISTORY.md
index 9509b35..f7e06b7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,11 @@
## History of versions ##
+* version 4.3.2 (2015-11-07)
+ * Added extra debug info in the log
+
+* version 4.3.1 (2015-11-07)
+ * Added manpage (thanks to Alession Treglia)
+
* version 4.3 (2015-10-26)
* Now doesn't fail when creating a DVD without menu
* Added help in html format
diff --git a/data/devede.1 b/data/devede.1
new file mode 100644
index 0000000..466e79a
--- /dev/null
+++ b/data/devede.1
@@ -0,0 +1,26 @@
+.IX Title "devede 1"
+.TH devede 1 "2009-08-25" "" ""
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+\&\fBdevede\fR \- A simple application to create Video DVDs
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+.B devede
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBDeVeDe\fR allows users to create Video DVDs, suitable for home players, \
+from any number of video files, in any of the formats supported by Mplayer.
+.PP
+It also allows user to create subtitles and even animated menus.
+.PP
+\&\fBDeVeDe\fR has been written in Python and GTK+ and after the \
+installation the application is available from the Applications menu.
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+\fBDeVeDe\fR was written by Sergio Costas <raster at rastersoft.com>
+.PP
+This manual was provided by Alessio Treglia <quadrispro at ubuntu.com> \
+for the Ubuntu project (and may be used by others).
diff --git a/doc/index.html b/doc/index.html
index 7e0997a..d6dc046 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -24,7 +24,7 @@ GPLv3 license.</p>
<p class="golink"><a href="file.html">Properties for files</a></p>
<p class="golink"><a href="menu.html">Creating the DVD menu</a></p>
<p class="golink"><a href="disk.html">Creating the disk image</a></p>
-<p class="golink"><a href="faq.html">Frecuently Asked Questions</a></p>
+<p class="golink"><a href="faq.html">Frequently Asked Questions</a></p>
<p class="golink"><a href="contact.html">Contacting the authors</a></p>
<p class="golink"><a href="gpl.html">License (GPL v3)</a></p>
</body>
diff --git a/setup.py b/setup.py
index 25656da..c313a57 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,8 @@ def get_data_files():
(os.path.join('share', 'devede_ng'), ['data/codepages.lst']),
(os.path.join('share', 'devede_ng'), ['data/languages.lst']),
(os.path.join('share', 'devede_ng', 'backgrounds'), glob('data/pixmaps/backgrounds/*')),
- (os.path.join('share', 'doc', 'devede_ng', 'html'), glob('doc/*'))
+ (os.path.join('share', 'doc', 'devede_ng', 'html'), glob('doc/*')),
+ (os.path.join('share','man','man1'), ['data/devede.1.gz'])
]
for lang_name in [f for f in os.listdir('locale')]:
@@ -52,13 +53,18 @@ def compile_translations():
pass
compile_translations()
+try:
+ if os.path.isfile('data/devede.1'):
+ os.system("gzip -c data/devede.1 > data/devede.1.gz")
+except:
+ pass
#here = os.path.abspath(os.path.dirname(__file__))
setup(
name='devedeng',
- version='4.3',
+ version='4.3.2',
description='A video DVD creator',
long_description = "A program that allows to create video DVDs",
diff --git a/src/devedeng/avprobe.py b/src/devedeng/avprobe.py
index ed1d05f..880fa88 100644
--- a/src/devedeng/avprobe.py
+++ b/src/devedeng/avprobe.py
@@ -70,7 +70,7 @@ class avprobe(devedeng.avbase.avbase):
stdout2 = stdout.decode("utf-8")
except:
stdout2 = stdout.decode("latin1")
- self.config.append_log("AVProbe JSON data: "+str(stdout2))
+ self.config.append_static_log("AVProbe JSON data: "+str(stdout2))
return self.process_json(stdout2, file_name)
@@ -143,7 +143,7 @@ class avprobe(devedeng.avbase.avbase):
stdout2 = stdout.decode("utf-8") + "\n" + stderr.decode("utf-8")
except:
stdout2 = stdout.decode("latin1") + "\n" + stderr.decode("latin1")
- self.config.append_log("Using avprobe human readable format: "+str(stdout2))
+ self.config.append_static_log("Using avprobe human readable format: "+str(stdout2))
for line in stdout2.split("\n"):
line = line.strip()
if line.startswith("Duration: "):
diff --git a/src/devedeng/configuration_data.py b/src/devedeng/configuration_data.py
index 98b65f8..9a0090a 100644
--- a/src/devedeng/configuration_data.py
+++ b/src/devedeng/configuration_data.py
@@ -50,6 +50,7 @@ class configuration(GObject.GObject):
is_local = None
self.log = ""
+ self.static_log = ""
self.disc_type = None
try:
@@ -174,6 +175,8 @@ class configuration(GObject.GObject):
def set_disc_type(self,disc_type):
self.disc_type = disc_type
+ self.clear_static_log()
+ self.clear_log()
self.emit('disc_type',disc_type)
@@ -228,12 +231,20 @@ class configuration(GObject.GObject):
if (cr):
self.log += "\n"
+ def append_static_log(self,data,cr = True):
+
+ self.static_log += data
+ if (cr):
+ self.static_log += "\n"
def clear_log(self):
self.log = ""
+ def clear_static_log(self):
+
+ self.static_log = ""
def get_log(self):
- return self.log
+ return self.static_log + "\n" + self.log
diff --git a/src/devedeng/ffprobe.py b/src/devedeng/ffprobe.py
index 1dd4c17..3fc11af 100644
--- a/src/devedeng/ffprobe.py
+++ b/src/devedeng/ffprobe.py
@@ -69,8 +69,7 @@ class ffprobe(devedeng.executor.executor):
stdout2 = stdout.decode("utf-8")
except:
stdout2 = stdout.decode("latin1")
-
- self.config.append_log("FFProbe JSON data: "+str(stdout2))
+ self.config.append_static_log("FFProbe JSON data: "+str(stdout2))
return self.process_json(file_name,stdout2)
@@ -143,7 +142,7 @@ class ffprobe(devedeng.executor.executor):
stdout2 = stdout.decode("utf-8") + "\n" + stderr.decode("utf-8")
except:
stdout2 = stdout.decode("latin1") + "\n" + stderr.decode("latin1")
- self.config.append_log("Using ffprobe human readable format: "+str(stdout2))
+ self.config.append_static_log("Using ffprobe human readable format: "+str(stdout2))
for line in stdout2.split("\n"):
line = line.strip()
if line.startswith("Duration: "):
diff --git a/src/devedeng/help.py b/src/devedeng/help.py
new file mode 100644
index 0000000..796bd9e
--- /dev/null
+++ b/src/devedeng/help.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+from gi.repository import Gtk,Gdk
+import devedeng.configuration_data
+import os
+
+class help:
+
+ def __init__(self,help_page):
+
+ self.config = devedeng.configuration_data.configuration.get_config()
+
+ file="file://"+os.path.join(self.config.help_path,"html",help_page)
+
+ retval = Gtk.show_uri(None,file,Gdk.CURRENT_TIME)
+ if retval == False:
+ msg=devede_dialogs.show_error(gladefile,_("Can't open the help files."))
diff --git a/src/devedeng/mplayer.py b/src/devedeng/mplayer.py
index 40f71ba..5b31fbb 100644
--- a/src/devedeng/mplayer.py
+++ b/src/devedeng/mplayer.py
@@ -123,20 +123,28 @@ class mplayer(devedeng.executor.executor):
if command=="ID_VIDEO_BITRATE":
self.original_videorate=int(int(parameter)/1000)
+ self.config.append_static_log("ID_VIDEO_BITRATE: "+str(self.original_videorate))
if command=="ID_VIDEO_WIDTH":
self.original_width=int(parameter)
+ self.config.append_static_log("ID_VIDEO_WIDTH: "+str(self.original_width))
if command=="ID_VIDEO_HEIGHT":
self.original_height=int(parameter)
+ self.config.append_static_log("ID_VIDEO_HEIGHT: "+str(self.original_height))
if command=="ID_VIDEO_ASPECT":
self.original_aspect_ratio=float(parameter)
+ self.config.append_static_log("ID_VIDEO_ASPECT: "+str(self.original_aspect_ratio))
if command=="ID_VIDEO_FPS":
self.original_fps=float(parameter)
+ self.config.append_static_log("ID_VIDEO_FPS: "+str(self.original_fps))
if command=="ID_AUDIO_BITRATE":
self.original_audiorate=int(int(parameter)/1000)
+ self.config.append_static_log("ID_AUDIO_BITRATE: "+str(self.original_audiorate))
if command=="ID_AUDIO_RATE":
self.original_audiorate_uncompressed=int(parameter)
+ self.config.append_static_log("ID_AUDIO_RATE: "+str(self.original_audiorate_uncompressed))
if command=="ID_LENGTH":
self.original_length=int(float(parameter))
+ self.config.append_static_log("ID_LENGTH: "+str(self.original_length))
if command=="ID_VIDEO_ID":
self.video_streams+=1
@@ -144,16 +152,18 @@ class mplayer(devedeng.executor.executor):
if (minimum_video == -1) or (minimum_video>video_track):
minimum_video=video_track
self.video_list.append(stream_number)
+ self.config.append_static_log("ID_VIDEO_ID: "+str(stream_number))
if command=="ID_AUDIO_ID":
self.audio_streams+=1
audio_track=int(parameter)
if (minimum_audio == -1) or (minimum_audio>audio_track):
minimum_audio=audio_track
self.audio_list.append(stream_number)
+ self.config.append_static_log("ID_AUDIO_ID: "+str(stream_number))
# increment the stream_number counter in this case to also count
# subtitles and other stream types
- if (command[-3:] == "_ID"):
+ if (command == "ID_VIDEO_ID") or (command == "ID_AUDIO_ID") or (command == "ID_SUBTITLE_ID"):
stream_number += 1
if (check_audio):
@@ -170,4 +180,4 @@ class mplayer(devedeng.executor.executor):
if (self.video_streams == 0):
return False
else:
- return True
\ No newline at end of file
+ return True
--
devede packaging
More information about the pkg-multimedia-commits
mailing list