openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Review: Needs Fixing

Great work. - Review of the 1st 5000 lines two in line comments.

Diff comments:

> 
> === modified file 'openlp/core/lib/mediamanageritem.py'
> --- openlp/core/lib/mediamanageritem.py	2015-03-06 22:18:51 +0000
> +++ openlp/core/lib/mediamanageritem.py	2015-11-07 01:16:31 +0000
> @@ -96,16 +96,13 @@
>          self.single_service_item = True
>          self.quick_preview_allowed = False
>          self.has_search = False
> -        self.page_layout = QtGui.QVBoxLayout(self)
> +        self.page_layout = QtWidgets.QVBoxLayout(self)
>          self.page_layout.setSpacing(0)
> -        self.page_layout.setMargin(0)
> +        self.page_layout.setContentsMargins(0, 0, 0, 0)
>          self.required_icons()
>          self.setupUi()
>          self.retranslateUi()
>          self.auto_select_id = -1
> -        # Need to use event as called across threads and UI is updated
> -        QtCore.QObject.connect(self, QtCore.SIGNAL('%s_go_live' % self.plugin.name), self.go_live_remote)
> -        QtCore.QObject.connect(self, QtCore.SIGNAL('%s_add_to_service' % self.plugin.name), self.add_to_service_remote)
>  

Why has this been removed?

>      def setup_item(self):
>          """
> 
> === added file 'openlp/core/ui/media/systemplayer.py'
> --- openlp/core/ui/media/systemplayer.py	1970-01-01 00:00:00 +0000
> +++ openlp/core/ui/media/systemplayer.py	2015-11-07 01:16:31 +0000
> @@ -0,0 +1,258 @@
> +# -*- coding: utf-8 -*-
> +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
> +
> +###############################################################################
> +# OpenLP - Open Source Lyrics Projection                                      #
> +# --------------------------------------------------------------------------- #
> +# Copyright (c) 2008-2014 Raoul Snyman                                        #
> +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan      #
> +# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
> +# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer.   #
> +# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
> +# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
> +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
> +# Frode Woldsund, Martin Zibricky, Patrick Zimmermann                         #
> +# --------------------------------------------------------------------------- #
> +# This program is free software; you can redistribute it and/or modify it     #
> +# under the terms of the GNU General Public License as published by the Free  #
> +# Software Foundation; version 2 of the License.                              #
> +#                                                                             #
> +# This program is distributed in the hope that it will be useful, but WITHOUT #
> +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
> +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
> +# more details.                                                               #
> +#                                                                             #
> +# You should have received a copy of the GNU General Public License along     #
> +# with this program; if not, write to the Free Software Foundation, Inc., 59  #
> +# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
> +###############################################################################
> +"""
> +The :mod:`~openlp.core.ui.media.systemplayer` contains the system (aka QtMultimedia) player component.
> +"""
> +import logging
> +import mimetypes
> +
> +from PyQt5 import QtCore, QtMultimedia, QtMultimediaWidgets
> +
> +from openlp.core.lib import translate
> +from openlp.core.ui.media import MediaState
> +from openlp.core.ui.media.mediaplayer import MediaPlayer
> +
> +
> +log = logging.getLogger(__name__)
> +
> +ADDITIONAL_EXT = {
> +    'audio/ac3': ['.ac3'],
> +    'audio/flac': ['.flac'],
> +    'audio/x-m4a': ['.m4a'],
> +    'audio/midi': ['.mid', '.midi'],
> +    'audio/x-mp3': ['.mp3'],
> +    'audio/mpeg': ['.mp3', '.mp2', '.mpga', '.mpega', '.m4a'],
> +    'audio/qcelp': ['.qcp'],
> +    'audio/x-wma': ['.wma'],
> +    'audio/x-ms-wma': ['.wma'],
> +    'video/x-flv': ['.flv'],
> +    'video/x-matroska': ['.mpv', '.mkv'],
> +    'video/x-wmv': ['.wmv'],
> +    'video/x-mpg': ['.mpg'],
> +    'video/mpeg': ['.mp4', '.mts', '.mov'],
> +    'video/x-ms-wmv': ['.wmv']
> +}
> +
> +
> +class SystemPlayer(MediaPlayer):
> +    """
> +    A specialised version of the MediaPlayer class, which provides a QtMultimedia display.
> +    """
> +
> +    def __init__(self, parent):
> +        """
> +        Constructor
> +        """
> +        super(SystemPlayer, self).__init__(parent, 'system')
> +        self.original_name = 'System'
> +        self.display_name = '&System'
> +        self.parent = parent
> +        self.additional_extensions = ADDITIONAL_EXT
> +        self.media_player = QtMultimedia.QMediaPlayer(None, QtMultimedia.QMediaPlayer.VideoSurface)
> +        mimetypes.init()
> +        media_service = self.media_player.service()
> +        log.info(media_service.__class__.__name__)
> +        container_control = media_service.requestControl('org.qt-project.qt.mediacontainercontrol/5.0')
> +        if container_control is not None:
> +            supported_codecs = container_control.supportedContainers()
> +            self.media_player.service().releaseControl(container_control)
> +            for mime_type in supported_codecs:
> +                # mime_type = str(mime_type)
> +                # if mime_type.startswith('audio/'):
> +                log.info(mime_type)
> +                # self._add_to_list(self.audio_extensions_list, mime_type)
> +                # video_device_info = QtMultimedia.QVideoDeviceInfo(QtMultimedia.QAudioDeviceInfo.defaultOutputDevice())
> +                # log.info('Supported audio codecs: %s', device_info.supportedCodecs())
> +                # for mime_type in device_info.supportedCodecs():
> +                #     elif mime_type.startswith('video/'):
> +                #         self._add_to_list(self.video_extensions_list, mime_type)

Why is this commented out?

> +        self._add_to_list(self.audio_extensions_list, 'audio/pcm')
> +
> +    def _add_to_list(self, mime_type_list, mimetype):
> +        """
> +        Add mimetypes to the provided list
> +        """
> +        # Add all extensions which mimetypes provides us for supported types.
> +        extensions = mimetypes.guess_all_extensions(str(mimetype))
> +        for extension in extensions:
> +            ext = '*%s' % extension
> +            if ext not in mime_type_list:
> +                mime_type_list.append(ext)
> +        log.info('MediaPlugin: %s extensions: %s' % (mimetype, ' '.join(extensions)))
> +        # Add extensions for this mimetype from self.additional_extensions.
> +        # This hack clears mimetypes' and operating system's shortcomings
> +        # by providing possibly missing extensions.
> +        if mimetype in list(self.additional_extensions.keys()):
> +            for extension in self.additional_extensions[mimetype]:
> +                ext = '*%s' % extension
> +                if ext not in mime_type_list:
> +                    mime_type_list.append(ext)
> +            log.info('MediaPlugin: %s additional extensions: %s' %
> +                     (mimetype, ' '.join(self.additional_extensions[mimetype])))
> +
> +    def setup(self, display):
> +        """
> +        Set up the player widgets
> +        :param display:
> +        """
> +        display.video_widget = QtMultimediaWidgets.QVideoWidget(display)
> +        display.video_widget.resize(display.size())
> +        display.media_player = QtMultimedia.QMediaPlayer(display)
> +        display.media_player.setVideoOutput(display.video_widget)
> +        display.video_widget.raise_()
> +        display.video_widget.hide()
> +        self.has_own_widget = True
> +
> +    def check_available(self):
> +        """
> +        Check if the player is available
> +        """
> +        return True
> +
> +    def load(self, display):
> +        """
> +        Load a video into the display
> +        :param display:
> +        """
> +        log.debug('load vid in Phonon Controller')
> +        controller = display.controller
> +        volume = controller.media_info.volume
> +        path = controller.media_info.file_info.absoluteFilePath()
> +        display.media_player.setMedia(QtMultimedia.QMediaContent(QtCore.QUrl.fromLocalFile(path)))
> +        self.volume(display, volume)
> +        return True
> +
> +    def resize(self, display):
> +        """
> +        Resize the display
> +        :param display:
> +        """
> +        display.video_widget.resize(display.size())
> +
> +    def play(self, display):
> +        """
> +        Play the current media item
> +        :param display:
> +        """
> +        log.info('Play the current item')
> +        controller = display.controller
> +        start_time = 0
> +        if display.media_player.state() != QtMultimedia.QMediaPlayer.PausedState and \
> +                controller.media_info.start_time > 0:
> +            start_time = controller.media_info.start_time
> +        display.media_player.play()
> +        if start_time > 0:
> +            self.seek(display, controller.media_info.start_time * 1000)
> +        self.volume(display, controller.media_info.volume)
> +        controller.media_info.length = int(display.media_player.duration() / 1000)
> +        controller.seek_slider.setMaximum(controller.media_info.length * 1000)
> +        self.state = MediaState.Playing
> +        display.video_widget.raise_()
> +        return True
> +
> +    def pause(self, display):
> +        """
> +        Pause the current media item
> +        """
> +        display.media_player.pause()
> +        if display.media_player.state() == QtMultimedia.QMediaPlayer.PausedState:
> +            self.state = MediaState.Paused
> +
> +    def stop(self, display):
> +        """
> +        Stop the current media item
> +        """
> +        display.media_player.stop()
> +        self.set_visible(display, False)
> +        self.state = MediaState.Stopped
> +
> +    def volume(self, display, vol):
> +        """
> +        Set the volume
> +        """
> +        # 1.0 is the highest value
> +        if display.has_audio:
> +            vol = float(vol) / float(100)
> +            display.media_player.setVolume(vol)
> +
> +    def seek(self, display, seek_value):
> +        """
> +        Go to a particular point in the current media item
> +        """
> +        display.media_player.setPosition(seek_value)
> +
> +    def reset(self, display):
> +        """
> +        Reset the media player
> +        """
> +        display.media_player.stop()
> +        display.media_player.setMedia(QtMultimedia.QMediaContent())
> +        self.set_visible(display, False)
> +        display.video_widget.setVisible(False)
> +        self.state = MediaState.Off
> +
> +    def set_visible(self, display, status):
> +        """
> +        Set the visibility of the widget
> +        """
> +        if self.has_own_widget:
> +            display.video_widget.setVisible(status)
> +
> +    def update_ui(self, display):
> +        """
> +        Update the UI
> +        """
> +        if display.media_player.state() == QtMultimedia.QMediaPlayer.PausedState and self.state != MediaState.Paused:
> +            self.stop(display)
> +        controller = display.controller
> +        if controller.media_info.end_time > 0:
> +            if display.media_player.position() > controller.media_info.end_time * 1000:
> +                self.stop(display)
> +                self.set_visible(display, False)
> +        if not controller.seek_slider.isSliderDown():
> +            controller.seek_slider.blockSignals(True)
> +            controller.seek_slider.setSliderPosition(display.media_player.position())
> +            controller.seek_slider.blockSignals(False)
> +
> +    def get_media_display_css(self):
> +        """
> +        Add css style sheets to htmlbuilder
> +        """
> +        return ''
> +
> +    def get_info(self):
> +        """
> +        Return some info about this player
> +        """
> +        return (translate('Media.player', 'This media player uses your operating system '
> +                                          'to provide media capabilities.') +
> +                '<br/> <strong>' + translate('Media.player', 'Audio') +
> +                '</strong><br/>' + str(self.audio_extensions_list) +
> +                '<br/><strong>' + translate('Media.player', 'Video') +
> +                '</strong><br/>' + str(self.video_extensions_list) + '<br/>')


-- 
https://code.launchpad.net/~springermac/openlp/pyqt5_final/+merge/276924
Your team OpenLP Core is subscribed to branch lp:openlp.