← Back to branch summary

~thelinuxguy/openlp/bible-improvements

« back to all changes in this revision

Viewing changes to openlp/plugins/media/forms/mediaclipselectorform.py

  • Committer: Tim Bentley
  • Author(s): Phill
  • Date: 2017-12-05 17:22:55 UTC
  • mfrom: (2789.1.9 fixes-mkiii)
  • Revision ID: tim.bentley@gmail.com-20171205172255-qr21cr0nuo837r7e
A few various fixes, including some affecting the creation / saving of services.

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~phill-ridout/openlp/fixes-mkIV (revision 2798)
https://ci.openlp.io/job/Branch-01-Pull/2337/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2238/              [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tes...

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/plugins/media/forms/mediaclipselectorform.py
28
28
from PyQt5 import QtCore, QtGui, QtWidgets
29
29
 
30
30
from openlp.core.common import is_win, is_linux, is_macosx
 
31
from openlp.core.common.path import Path
31
32
from openlp.core.common.i18n import translate
32
33
from openlp.core.common.mixins import RegistryProperties
33
34
from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector
109
110
        self.subtitle_tracks_combobox.clear()
110
111
        self.audio_tracks_combobox.clear()
111
112
        self.titles_combo_box.clear()
112
 
        time = QtCore.QTime()
 
113
        time = QtCore.QTime(0, 0, 0)
113
114
        self.start_position_edit.setTime(time)
114
115
        self.end_timeedit.setTime(time)
115
116
        self.position_timeedit.setTime(time)
294
295
        :param clicked: Given from signal, not used.
295
296
        """
296
297
        vlc_ms_pos = self.vlc_media_player.get_time()
297
 
        time = QtCore.QTime()
 
298
        time = QtCore.QTime(0, 0, 0)
298
299
        new_pos_time = time.addMSecs(vlc_ms_pos)
299
300
        self.start_position_edit.setTime(new_pos_time)
300
301
        # If start time is after end time, update end time.
310
311
        :param clicked: Given from signal, not used.
311
312
        """
312
313
        vlc_ms_pos = self.vlc_media_player.get_time()
313
 
        time = QtCore.QTime()
 
314
        time = QtCore.QTime(0, 0, 0)
314
315
        new_pos_time = time.addMSecs(vlc_ms_pos)
315
316
        self.end_timeedit.setTime(new_pos_time)
316
317
        # If start time is after end time, update start time.
447
448
        self.position_slider.setMaximum(self.playback_length)
448
449
        # setup start and end time
449
450
        rounded_vlc_ms_length = int(round(self.playback_length / 100.0) * 100.0)
450
 
        time = QtCore.QTime()
 
451
        time = QtCore.QTime(0, 0, 0)
451
452
        playback_length_time = time.addMSecs(rounded_vlc_ms_length)
452
453
        self.start_position_edit.setMaximumTime(playback_length_time)
453
454
        self.end_timeedit.setMaximumTime(playback_length_time)
505
506
        if self.vlc_media_player:
506
507
            vlc_ms_pos = self.vlc_media_player.get_time()
507
508
            rounded_vlc_ms_pos = int(round(vlc_ms_pos / 100.0) * 100.0)
508
 
            time = QtCore.QTime()
 
509
            time = QtCore.QTime(0, 0, 0)
509
510
            new_pos_time = time.addMSecs(rounded_vlc_ms_pos)
510
511
            self.position_timeedit.setTime(new_pos_time)
511
512
            self.position_slider.setSliderPosition(vlc_ms_pos)
615
616
                break
616
617
        # Append the new name to the optical string and the path
617
618
        optical += new_optical_name + ':' + path
618
 
        self.media_item.add_optical_clip(optical)
 
619
        self.media_item.add_optical_clip(Path(optical))
619
620
 
620
621
    def media_state_wait(self, media_state):
621
622
        """