Skip to content

Commit

Permalink
Merge branch 'master' into myfx
Browse files Browse the repository at this point in the history 
Conflicts:
	pitivi/ui/timeline.py
  • Loading branch information
Karl Palsson committed Sep 11, 2010
2 parents 0aef265 + ca8261d commit b17abd7
Show file tree
Hide file tree
Showing 5 changed files with 259 additions and 182 deletions.
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AC_INIT(PiTiVi, 0.13.4.2,
AC_INIT(PiTiVi, 0.13.4.3,
http://www.pitivi.org/,
pitivi)

Expand Down
31 changes: 19 additions & 12 deletions pitivi/ui/previewer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,9 @@ def _nextThumbnail(self):
the next thumbnail in the queue. This should always be called from the
main application thread."""
if self._queue:
self._startThumbnail(self._queue[0])
if not self._startThumbnail(self._queue[0]):
self._queue.pop(0)
self._nextThumbnail()
return False

def _requestThumbnail(self, segment):
Expand Down Expand Up @@ -387,8 +389,7 @@ def _thumbnailCb(self, unused_thsink, pixbuf, timestamp):

def _startThumbnail(self, timestamp):
RandomAccessPreviewer._startThumbnail(self, timestamp)
self.log("timestamp : %s", gst.TIME_ARGS(timestamp))
self.videopipeline.seek(1.0,
return self.videopipeline.seek(1.0,
gst.FORMAT_TIME, gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE,
gst.SEEK_TYPE_SET, timestamp,
gst.SEEK_TYPE_NONE, -1)
Expand Down Expand Up @@ -428,7 +429,10 @@ def _pipelineInit(self, factory, sbin):
conv : self.audioSink,
self.audioSink : None})
bus = self.audioPipeline.get_bus()
bus.set_sync_handler(self._bus_message)
bus.add_signal_watch()
bus.connect("message::segment-done", self._busMessageSegmentDoneCb)
bus.connect("message::error", self._busMessageErrorCb)

self._audio_cur = None
self.audioPipeline.set_state(gst.STATE_PAUSED)

Expand All @@ -439,27 +443,30 @@ def _segment_for_time(self, time):
# for audio files, we need to know the duration the segment spans
return time - (time % self.tdur), self.tdur

def _bus_message(self, bus, message):
if message.type == gst.MESSAGE_SEGMENT_DONE:
self._finishWaveform()
def _busMessageSegmentDoneCb(self, bus, message):
self.debug("segment done")
self._finishWaveform()

elif message.type == gst.MESSAGE_ERROR:
error, debug = message.parse_error()
# FIXME: do something intelligent here
print "Event bus error:", str(error), str(debug)
def _busMessageErrorCb(self, bus, message):
error, debug = message.parse_error()
print "Event bus error:", str(error), str(debug)

return gst.BUS_PASS

def _startThumbnail(self, (timestamp, duration)):
RandomAccessPreviewer._startThumbnail(self, (timestamp, duration))
self._audio_cur = timestamp, duration
self.audioPipeline.seek(1.0,
res = self.audioPipeline.seek(1.0,
gst.FORMAT_TIME,
gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE | gst.SEEK_FLAG_SEGMENT,
gst.SEEK_TYPE_SET, timestamp,
gst.SEEK_TYPE_SET, timestamp + duration)
if not res:
self.warning("seek failed %s", timestamp)
self.audioPipeline.set_state(gst.STATE_PLAYING)

return res

def _finishWaveform(self):
surfaces = []
surface = cairo.ImageSurface(cairo.FORMAT_A8,
Expand Down
5 changes: 4 additions & 1 deletion pitivi/ui/timeline.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,14 @@ def _dragLeaveCb(self, unused_layout, context, unused_tstamp):
def _dragDropCb(self, widget, context, x, y, timestamp):
if context.targets not in DND_EFFECT_LIST:
self.app.action_log.begin("add clip")

self.timeline.disableUpdates()
self._add_temp_source(x,y)
focus = self._temp_objects[0]
self._move_context = MoveContext(self.timeline,
focus, set(self._temp_objects[1:]))
self._move_temp_source(self.hadj.props.value + x, y)
self._move_context.finish()
self.timeline.enableUpdates()
self.app.action_log.commit()
context.drop_finish(True, timestamp)
self._factories = None
Expand All @@ -459,8 +460,10 @@ def _dragDropCb(self, widget, context, x, y, timestamp):
timeline_objs = self._getTimelineObjectUnderMouse(x, y, factory.getInputStreams()[0])
if timeline_objs:
self.app.action_log.begin("add effect")
self.timeline.disableUpdates()
self.timeline.addEffectFactoryOnObject(factory,
timeline_objects = timeline_objs)
self.timeline.enableUpdates()
self.app.action_log.commit()
self._factories = None
self.app.current.seeker.seek(self._position)
Expand Down
155 changes: 107 additions & 48 deletions po/et.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
msgid ""
msgstr ""
"Project-Id-Version: pitivi master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=pitivi&component=general\n"
"POT-Creation-Date: 2010-07-04 08:32+0000\n"
"PO-Revision-Date: 2010-07-07 22:11+0300\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=pitivi&component=general\n"
"POT-Creation-Date: 2010-09-09 15:01+0000\n"
"PO-Revision-Date: 2010-09-09 23:45+0300\n"
"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
Expand All @@ -36,32 +37,50 @@ msgstr "Üks %s instants juba töötab selles skriptis."
msgid "Could not find the GNonLin plugins!"
msgstr "GNonLin pluginaid ei leitud!"

msgid "Make sure the plugins were installed and are available in the GStreamer plugins path."
msgstr "Veendu, et pluginad on paigaldatud ja saadaval GStreameri pluginate kataloogis."
msgid ""
"Make sure the plugins were installed and are available in the GStreamer "
"plugins path."
msgstr ""
"Veendu, et pluginad on paigaldatud ja saadaval GStreameri pluginate "
"kataloogis."

msgid "Could not find the autodetect plugins!"
msgstr "Automaattuvastuse pluginaid ei leitud!"

msgid "Make sure you have installed gst-plugins-good and is available in the GStreamer plugin path."
msgstr "Veendu, et oled paigaldanud paketi gst-plugins-good ning see on saadaval GStreameri pluginate kataloogis."
msgid ""
"Make sure you have installed gst-plugins-good and is available in the "
"GStreamer plugin path."
msgstr ""
"Veendu, et oled paigaldanud paketi gst-plugins-good ning see on saadaval "
"GStreameri pluginate kataloogis."

msgid "PyGTK doesn't have cairo support!"
msgstr "PyGTK-l puudub cairo tugi!"

msgid "Please use a version of the GTK+ Python bindings built with cairo support."
msgstr "Kasuta sellist GTK+ Pythoni seondust, mis on kompileeritud cairo toega."
msgid ""
"Please use a version of the GTK+ Python bindings built with cairo support."
msgstr ""
"Kasuta sellist GTK+ Pythoni seondust, mis on kompileeritud cairo toega."

msgid "Could not initiate the video output plugins"
msgstr "Video väljundpluginaid ei olnud võimalik lähtestada"

msgid "Make sure you have at least one valid video output sink available (xvimagesink or ximagesink)"
msgstr "Veendu, et saadaval on vähemalt üks sobiv video väljundtoru (xvimagesink või ximagesink)"
msgid ""
"Make sure you have at least one valid video output sink available "
"(xvimagesink or ximagesink)"
msgstr ""
"Veendu, et saadaval on vähemalt üks sobiv video väljundtoru (xvimagesink või "
"ximagesink)"

msgid "Could not initiate the audio output plugins"
msgstr "Audio väljundpluginaid ei olnud võimalik lähtestada"

msgid "Make sure you have at least one valid audio output sink available (alsasink or osssink)"
msgstr "Veendu, et saadaval on vähemalt üks sobiv audio väljundtoru (alsasink või osssink)"
msgid ""
"Make sure you have at least one valid audio output sink available (alsasink "
"or osssink)"
msgstr ""
"Veendu, et saadaval on vähemalt üks sobiv audio väljundtoru (alsasink või "
"osssink)"

msgid "Could not import the cairo Python bindings"
msgstr "Cairo Pythoni seoste importimine pole võimalik"
Expand All @@ -82,44 +101,63 @@ msgid "Make sure you have the goocanvas Python bindings installed"
msgstr "Veendu, et goocanvas'e Pythoni seosed (bindings) on paigaldatud"

#, python-format
msgid "You do not have a recent enough version of the GTK+ Python bindings (currently %s)"
msgstr "Sul pole piisavalt värske GTK+ Pythoni seoste versioon (praegune on %s)"
msgid ""
"You do not have a recent enough version of the GTK+ Python bindings "
"(currently %s)"
msgstr ""
"Sul pole piisavalt värske GTK+ Pythoni seoste versioon (praegune on %s)"

#, python-format
msgid "Install a version of the GTK+ Python bindings greater or equal to %s"
msgstr "Paigalda GTK+ Pythoni seosed, mille versioon on suurem või võrdne kui %s"
msgstr ""
"Paigalda GTK+ Pythoni seosed, mille versioon on vähemalt %s"

#, python-format
msgid "You do not have a recent enough version of the GStreamer Python bindings (currently %s)"
msgstr "Sul pole piisavalt värske GStreameri Pythoni seoste versioon (praegune on %s)"
msgid ""
"You do not have a recent enough version of the GStreamer Python bindings "
"(currently %s)"
msgstr ""
"Sul pole piisavalt värske GStreameri Pythoni seoste versioon (praegune on %s)"

#, python-format
msgid "Install a version of the GStreamer Python bindings greater or equal to %s"
msgstr "Paigalda GStreameri Pythoni seosed, mille versioon on suurem või võrdne kui %s"
msgid ""
"Install a version of the GStreamer Python bindings greater or equal to %s"
msgstr ""
"Paigalda GStreameri Pythoni seosed, mille versioon on vähemalt %s"

#, python-format
msgid "You do not have a recent enough version of GStreamer (currently %s)"
msgstr "Sul pole piisavalt värske GStreameri versioon (praegune on %s)"

#, python-format
msgid "Install a version of the GStreamer greater or equal to %s"
msgstr "Paigalda GStreamer, mille versioon on suurem või võrdne kui %s"
msgstr "Paigalda GStreamer, mille versioon on vähemalt %s"

#, python-format
msgid "You do not have a recent enough version of the cairo Python bindings (currently %s)"
msgstr "Sul pole piisavalt värske cairo Pythoni seoste versioon (praegune on %s)"
msgid ""
"You do not have a recent enough version of the cairo Python bindings "
"(currently %s)"
msgstr ""
"Sul pole piisavalt värske cairo Pythoni seoste versioon (praegune on %s)"

#, python-format
msgid "Install a version of the cairo Python bindings greater or equal to %s"
msgstr "Paigalda cairo Pythoni seosed, mille versioon on suurem või võrdne kui %s"
msgstr ""
"Paigalda cairo Pythoni seosed, mille versioon on vähemalt %s"

#, python-format
msgid "You do not have a recent enough version of the GNonLin GStreamer plugin (currently %s)"
msgstr "Sul pole piisavalt värske GNonLin GStreameri plugina versioon (praegune on %s)"
msgid ""
"You do not have a recent enough version of the GNonLin GStreamer plugin "
"(currently %s)"
msgstr ""
"Sul pole piisavalt värske GNonLin GStreameri plugina versioon (praegune on %"
"s)"

#, python-format
msgid "Install a version of the GNonLin GStreamer plugin greater or equal to %s"
msgstr "Paigalda GNonLin GStreameri plugin, mille versioon on suurem või võrdne kui %s"
msgid ""
"Install a version of the GNonLin GStreamer plugin greater or equal to %s"
msgstr ""
"Paigalda GNonLin GStreameri plugin, mille versioon on vähemalt %s"

msgid "Could not import the Zope interface module"
msgstr "Zope liidese moodulit pole võimalik importida"
Expand Down Expand Up @@ -151,8 +189,11 @@ msgstr "Antud fail ei sisalda ei heli-, video- ega pildivoogu."
msgid "Could not establish the duration of the file."
msgstr "Faili kestust ei suudetud määrata."

msgid "This clip seems to be in a format which cannot be accessed in a random fashion."
msgstr "Klipp tundub olevat vormingus, mida pole võimalik juhuslikust kohast lugeda."
msgid ""
"This clip seems to be in a format which cannot be accessed in a random "
"fashion."
msgstr ""
"Klipp tundub olevat vormingus, mida pole võimalik juhuslikust kohast lugeda."

msgid "Timeout while analyzing file."
msgstr "Faili analüüsimine võttis liiga kaua."
Expand Down Expand Up @@ -184,8 +225,12 @@ msgid "Pipeline didn't want to go to PLAYING."
msgstr "Toru ei tahtnud minna ESITAMISE olekusse."

#, python-format
msgid "There is already a %s instance, please inform the developers by filing a bug at http://bugzilla.gnome.org/enter_bug.cgi?product=pitivi"
msgstr "Üks %s instants juba töötab, teavita sellest arendajaid ning koosta vearaport aadressil http://bugzilla.gnome.org/enter_bug.cgi?product=pitivi"
msgid ""
"There is already a %s instance, please inform the developers by filing a bug "
"at http://bugzilla.gnome.org/enter_bug.cgi?product=pitivi"
msgstr ""
"Üks %s instants juba töötab, teavita sellest arendajaid ning koosta "
"vearaport aadressil http://bugzilla.gnome.org/enter_bug.cgi?product=pitivi"

msgid ""
"\n"
Expand All @@ -198,16 +243,17 @@ msgstr ""

msgid ""
"Starts the video editor, optionally loading PROJECT_FILE. If\n"
" no project is given, %prog creates a new project.\n"
" Alternatively, when -i is specified, arguments are treated as clips to be\n"
" imported into the project. If -a is specified, these clips will also be added to\n"
" the end of the project timeline."
"no project is given, %prog creates a new project.\n"
"Alternatively, when -i is specified, arguments are treated as clips to be\n"
"imported into the project. If -a is specified, these clips will also be "
"added to\n"
"the end of the project timeline."
msgstr ""
"Käivitab videoredaktori, soovil avades PROJEKTIFAILI.\n"
" Kui ühtegi projekti ei ole antud, loob %prog uue projekti.\n"
" Lisaks, kui -i on määratud, koheldakse argumente nagu klippe,\n"
" mis tuleb importida projekti. Kui -a on määratud, lisatakse need\n"
" klipid projekti ajajoone lõppu."
"Kui ühtegi projekti ei ole antud, loob %prog uue projekti.\n"
"Lisaks, kui -i on määratud, koheldakse argumente nagu klippe,\n"
"mis tuleb importida projekti. Kui -a on määratud, lisatakse need\n"
"klipid projekti ajajoone lõppu."

msgid "Import each MEDIA_FILE into the project."
msgstr "Impordi kõik MEEDIAFAILID projekti."
Expand Down Expand Up @@ -336,6 +382,14 @@ msgstr "Omadused puuduvad..."
msgid "Implement Me"
msgstr "Vajab koostamist"

#. i18n: string for custom video width/height/framerate settings
#. i18n: string for custom audio rate/depth/channels settings
msgid "Custom"
msgstr "Kohandatud"

msgid "Save Preset"
msgstr "Salvesta mall"

msgid "Choose..."
msgstr "Vali..."

Expand Down Expand Up @@ -525,11 +579,6 @@ msgstr "SVGA (800x600)"
msgid "XGA (1024x768)"
msgstr "XGA (1024x768)"

#. i18n: string for custom video width/height/framerate settings
#. i18n: string for custom audio rate/depth/channels settings
msgid "Custom"
msgstr "Kohandatud"

msgid "Raw Video"
msgstr "Toorvideo"

Expand Down Expand Up @@ -562,6 +611,9 @@ msgstr "Renderda"
msgid "Split"
msgstr "Tükelda"

msgid "Keyframe"
msgstr "Võtmekaader"

msgid "Unlink"
msgstr "Eemalda link"

Expand Down Expand Up @@ -730,7 +782,8 @@ msgid "Locate missing file..."
msgstr "Puuduva faili asukoha määramine..."

msgid "The following file has moved, please tell PiTiVi where to find it."
msgstr "Järgneva faili asukoht on muutunud, palun näita selle faili uus asukoht."
msgstr ""
"Järgneva faili asukoht on muutunud, palun näita selle faili uus asukoht."

msgid "Duration:"
msgstr "Kestus:"
Expand Down Expand Up @@ -934,8 +987,11 @@ msgstr "Teave"
msgid "Duration"
msgstr "Kestus"

msgid "<span size='x-large'>Import your clips by dragging them here or by using the buttons above.</span>"
msgstr "<span size='x-large'>Impordi klipid lohistades need siia klõpsates ülal asuval nupul.</span>"
msgid ""
"<span>Import your clips by dragging them here or by using the buttons above."
"</span>"
msgstr ""
"<span>Impordi klipid lohistades need siia või kasutades ülemisi nuppe.</span>"

msgid "_Import clips..."
msgstr "_Impordi klippe..."
Expand Down Expand Up @@ -992,6 +1048,9 @@ msgstr "Valiku kustutamine"
msgid "Split clip at playhead position"
msgstr "Klipi tükeldamine esitusejärje kohalt"

msgid "Create a keyframe"
msgstr "Loo uus võtmekaader"

msgid "Zoom In"
msgstr "Suurenda"

Expand Down
Loading

0 comments on commit b17abd7

Please sign in to comment.