Fix up threads to work

This commit is contained in:
Tim Bentley 2016-06-06 20:56:38 +01:00
parent b8b05bb665
commit ad485bd2c9
3 changed files with 80 additions and 19 deletions

View File

@ -0,0 +1,57 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2016 OpenLP Developers #
# --------------------------------------------------------------------------- #
# 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 #
###############################################################################
import logging
from openlp.core.common import OpenLPMixin, Registry, RegistryMixin, RegistryProperties
from openlp.core.lib.api import OpenWSServer, OpenLPPoll, OpenLPHttpServer
log = logging.getLogger(__name__)
class ApiController(RegistryMixin, OpenLPMixin, RegistryProperties):
"""
The implementation of the Media Controller. The Media Controller adds an own class for every Player.
Currently these are QtWebkit, Phonon and Vlc. display_controllers are an array of controllers keyed on the
slidecontroller or plugin which built them.
ControllerType is the class containing the key values.
media_players are an array of media players keyed on player name.
current_media_players is an array of player instances keyed on ControllerType.
"""
def __init__(self, parent=None):
"""
Constructor
"""
super(ApiController, self).__init__(parent)
# Registry().register_function('playbackPlay', self.media_play_msg)
def bootstrap_post_set_up(self):
"""
process the bootstrap post setup request
"""
self.poll = OpenLPPoll()
Registry().register('OpenLPPoll', self.poll)
self.wsserver = OpenWSServer()
self.httpserver = OpenLPHttpServer()

View File

@ -35,20 +35,19 @@ from openlp.core.common import RegistryProperties, OpenLPMixin
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class HttpThread(QtCore.QThread): class HttpThread(QtCore.QObject):
""" """
A special Qt thread class to allow the HTTP server to run at the same time as the UI. A special Qt thread class to allow the HTTP server to run at the same time as the UI.
""" """
def __init__(self, server): def __init__(self):
""" """
Constructor for the thread class. Constructor for the thread class.
:param server: The http server class. :param server: The http server class.
""" """
super(HttpThread, self).__init__(None) super().__init__()
self.http_server = server
def run(self): def start(self):
""" """
Run the thread. Run the thread.
""" """
@ -56,17 +55,20 @@ class HttpThread(QtCore.QThread):
serve(wsgiapp, host='0.0.0.0', port=4317) serve(wsgiapp, host='0.0.0.0', port=4317)
def stop(self): def stop(self):
self.http_server.stop = True pass
class OpenLPHttpServer(RegistryProperties, OpenLPMixin): class OpenLPHttpServer(RegistryProperties, OpenLPMixin):
""" """
Wrapper round a server instance Wrapper round a server instance
""" """
def __init__(self, secure=False): def __init__(self):
""" """
Initialise the http server, and start the server of the correct type http / https Initialise the http server, and start the server of the correct type http / https
""" """
super(OpenLPHttpServer, self).__init__() super(OpenLPHttpServer, self).__init__()
self.http_thread = HttpThread(self) self.thread = QtCore.QThread()
self.http_thread.start() self.worker = HttpThread()
self.worker.moveToThread(self.thread)
self.thread.started.connect(self.worker.start)
self.thread.start()

View File

@ -37,7 +37,7 @@ from openlp.core.common import Settings, RegistryProperties, OpenLPMixin, Regist
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class HttpThread(QtCore.QThread): class WSThread(QtCore.QObject):
""" """
A special Qt thread class to allow the HTTP server to run at the same time as the UI. A special Qt thread class to allow the HTTP server to run at the same time as the UI.
""" """
@ -47,32 +47,34 @@ class HttpThread(QtCore.QThread):
:param server: The http server class. :param server: The http server class.
""" """
super(HttpThread, self).__init__(None) super().__init__()
self.http_server = server self.ws_server = server
def run(self): def start(self):
""" """
Run the thread. Run the thread.
""" """
self.http_server.start_server() self.ws_server.start_server()
def stop(self): def stop(self):
self.http_server.stop = True self.ws_server.stop = True
class OpenWSServer(RegistryProperties, OpenLPMixin): class OpenWSServer(RegistryProperties, OpenLPMixin):
""" """
Wrapper round a server instance Wrapper round a server instance
""" """
def __init__(self, secure=False): def __init__(self):
""" """
Initialise the http server, and start the server of the correct type http / https Initialise the http server, and start the server of the correct type http / https
""" """
super(OpenWSServer, self).__init__() super(OpenWSServer, self).__init__()
self.settings_section = 'remotes' self.settings_section = 'remotes'
self.secure = secure self.thread = QtCore.QThread()
self.http_thread = HttpThread(self) self.worker = WSThread(self)
self.http_thread.start() self.worker.moveToThread(self.thread)
self.thread.started.connect(self.worker.start)
self.thread.start()
def start_server(self): def start_server(self):
""" """