Luciole

Merge lp:~fred-bertolus/luciole/fix-pitivi-export into lp:luciole

  1. fix-pitivi-export
  2. Merge into 0.9
Proposed by Fred Bertolus
Status: Merged
Approved by: NicoInattendu
Approved revision: 137
Merged at revision: 137
Proposed branch: lp:~fred-bertolus/luciole/fix-pitivi-export
Merge into: lp:luciole
Diff against target: 79 lines (+14/-10)
2 files modified
luciole/gui/actions.py (+11/-8)
luciole/project/export/export_pitivi.py (+3/-2)
To merge this branch: bzr merge lp:~fred-bertolus/luciole/fix-pitivi-export
Reviewer Review Type Date Requested Status
NicoInattendu Approve
Review via email: mp+60982@code.launchpad.net

Description of the change

Bonjour,

En cherchant un logiciel pour faire du timelapse, je suis tombé sur luciole que semblait convenir. Malheuresement, l'export pitivi ne générait pas les bonnes durées pour les images (par exemple chaque images duraient 0.5 seconde au lieu de 0.08 seconde pour un framerate de 12,5 images par secondes.

J'ai donc téléchargé la version de dev, qui avait le même comportement, mais la boite de dialogue ne s'affichait plus.

J'ai donc fait 2 corrections :

- Réparation de l'affichage de la boite de dialogue "export tools"
- Correction de la durée des images dans l'export Pitivi

Merci pour le logiciel

To post a comment you must log in.
Revision history for this message
NicoInattendu (nico-inattendu) wrote :

To be linked with Bug #782641. For the export tool problem
To be linked with Bug #782643 : for export to Pitivi problem

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'luciole/gui/actions.py'
2--- luciole/gui/actions.py 2011-03-25 09:19:59 +0000
3+++ luciole/gui/actions.py 2011-05-14 07:42:32 +0000
4@@ -39,6 +39,7 @@
5 import luciole.gui.constants as GUI_CONST
6 import luciole.constants as LCONST
7 from luciole.gui.windows.export_video_window import ExportVideoWindow
8+from luciole.gui.windows.export_tool_window import ExportToolWindow
9 from luciole.info import REVNO, VERSION
10 _tv_change_signal = 'treeview-change'
11 _tv_selected_signal = 'treeview-selected'
12@@ -472,8 +473,8 @@
13 """ report bug action """
14 self.debug('Report bug action')
15 try:
16- webbrowser.open("https://bugs.launchpad.net/luciole/+filebug")
17- except:
18+ webbrowser.open("https://bugs.launchpad.net/luciole/+filebug")
19+ except:
20 _msg = _("Unable to open the Launchpad web page.")
21 self.warning(_msg)
22 self.gui.windows.error_message(_msg)
23@@ -482,8 +483,8 @@
24 """ ask a question action """
25 self.debug('Ask a question action')
26 try:
27- webbrowser.open("https://answers.launchpad.net/luciole/+addquestion")
28- except:
29+ webbrowser.open("https://answers.launchpad.net/luciole/+addquestion")
30+ except:
31 _msg = _("Unable to open the Launchpad web page.")
32 self.warning(_msg)
33 self.gui.windows.error_message(_msg)
34@@ -492,8 +493,8 @@
35 """ Help trranslate action """
36 self.debug('Help translate action')
37 try:
38- webbrowser.open("https://translations.launchpad.net/luciole")
39- except:
40+ webbrowser.open("https://translations.launchpad.net/luciole")
41+ except:
42 _msg = _("Unable to open the Launchpad web page.")
43 self.warning(_msg)
44 self.gui.windows.error_message(_msg)
45@@ -537,8 +538,10 @@
46 _export.run(self.app.project_ctrl.project.props)
47
48 def _export_tool_cb(self, action) :
49- # TODO implement
50- pass
51+ """ Export tools callback"""
52+ _export_tools = ExportToolWindow(project=self.app.project_ctrl.project.props)
53+ _export_tools.run()
54+
55
56 def _project_properties_cb(self, action) :
57 """ Display of project properties"""
58
59=== modified file 'luciole/project/export/export_pitivi.py'
60--- luciole/project/export/export_pitivi.py 2010-04-22 07:05:32 +0000
61+++ luciole/project/export/export_pitivi.py 2011-05-14 07:42:32 +0000
62@@ -56,7 +56,8 @@
63 __STREAM_NAME = "src0"
64 __STREAM_TYPE = "pitivi.stream.VideoStream"
65
66- __BASE_DURATION_NS = 1000000000
67+ __BASE_DURATION_SECOND = 1000000000
68+ __BASE_FRAME_RATE = 25
69
70 __TIMELINE_TYPE = "pitivi.timeline.track.SourceTrackObject"
71 __TIMELINE_IN_POINT = "(gint64)0"
72@@ -166,7 +167,7 @@
73 """ compute duration in pitivi format.
74 Input is the fpi : number of frame per image
75 """
76- duration = (1.0/fpi)*self.__BASE_DURATION_NS
77+ duration = fpi*self.__BASE_DURATION_SECOND / self.__BASE_FRAME_RATE
78 # use of str and int : int for a rounded value and str for string in element tree
79 return str(int(duration))
80

Subscribers

People subscribed via source and target branches

to status/vote changes: