From e6e57b6c034f1e122b0fdeeb09cd0dbb830514f5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 22 Mar 2013 21:29:52 +0100
Subject: [PATCH 1/9] updated comments and docs to 120 characters per line

---
 openlp/core/lib/db.py | 92 ++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 58 deletions(-)

diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index 26923d25d..41b05d388 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -134,8 +134,7 @@ def delete_database(plugin_name, db_file_name=None):
         The name of the plugin to remove the database for
 
     ``db_file_name``
-        The database file name. Defaults to None resulting in the
-        plugin_name being used.
+        The database file name. Defaults to None resulting in the plugin_name being used.
     """
     db_file_path = None
     if db_file_name:
@@ -164,11 +163,10 @@ class Manager(object):
     """
     Provide generic object persistence management
     """
-    def __init__(self, plugin_name, init_schema, db_file_name=None,
-                 upgrade_mod=None):
+    def __init__(self, plugin_name, init_schema, db_file_name=None, upgrade_mod=None):
         """
-        Runs the initialisation process that includes creating the connection
-        to the database and the tables if they don't exist.
+        Runs the initialisation process that includes creating the connection to the database and the tables if they do
+        not exist.
 
         ``plugin_name``
             The name to setup paths and settings section names
@@ -180,8 +178,7 @@ class Manager(object):
             The upgrade_schema function for this database
 
         ``db_file_name``
-            The file name to use for this database. Defaults to None resulting
-            in the plugin_name being used.
+            The file name to use for this database. Defaults to None resulting in the plugin_name being used.
         """
         settings = Settings()
         settings.beginGroup(plugin_name)
@@ -241,11 +238,9 @@ class Manager(object):
                 self.is_dirty = True
                 return True
             except OperationalError:
-                # This exception clause is for users running MySQL which likes
-                # to terminate connections on its own without telling anyone.
-                # See bug #927473
-                # However, other dbms can raise it, usually in a non-recoverable
-                # way. So we only retry 3 times.
+                # This exception clause is for users running MySQL which likes to terminate connections on its own
+                # without telling anyone. See bug #927473. However, other dbms can raise it, usually in a
+                # non-recoverable way. So we only retry 3 times.
                 log.exception(u'Probably a MySQL issue - "MySQL has gone away"')
                 self.session.rollback()
                 if try_count >= 2:
@@ -276,11 +271,9 @@ class Manager(object):
                 self.is_dirty = True
                 return True
             except OperationalError:
-                # This exception clause is for users running MySQL which likes
-                # to terminate connections on its own without telling anyone.
-                # See bug #927473
-                # However, other dbms can raise it, usually in a non-recoverable
-                # way. So we only retry 3 times.
+                # This exception clause is for users running MySQL which likes to terminate connections on its own
+                # without telling anyone. See bug #927473. However, other dbms can raise it, usually in a
+                # non-recoverable way. So we only retry 3 times.
                 log.exception(u'Probably a MySQL issue, "MySQL has gone away"')
                 self.session.rollback()
                 if try_count >= 2:
@@ -310,11 +303,9 @@ class Manager(object):
                 try:
                     return self.session.query(object_class).get(key)
                 except OperationalError:
-                    # This exception clause is for users running MySQL which likes
-                    # to terminate connections on its own without telling anyone.
-                    # See bug #927473
-                    # However, other dbms can raise it, usually in a non-recoverable
-                    # way. So we only retry 3 times.
+                    # This exception clause is for users running MySQL which likes to terminate connections on its own
+                    # without telling anyone. See bug #927473. However, other dbms can raise it, usually in a
+                    # non-recoverable way. So we only retry 3 times.
                     log.exception(u'Probably a MySQL issue, "MySQL has gone away"')
                     if try_count >= 2:
                         raise
@@ -333,11 +324,9 @@ class Manager(object):
             try:
                 return self.session.query(object_class).filter(filter_clause).first()
             except OperationalError:
-                # This exception clause is for users running MySQL which likes
-                # to terminate connections on its own without telling anyone.
-                # See bug #927473
-                # However, other dbms can raise it, usually in a non-recoverable
-                # way. So we only retry 3 times.
+                # This exception clause is for users running MySQL which likes to terminate connections on its own
+                # without telling anyone. See bug #927473. However, other dbms can raise it, usually in a
+                # non-recoverable way. So we only retry 3 times.
                 log.exception(u'Probably a MySQL issue, "MySQL has gone away"')
                 if try_count >= 2:
                     raise
@@ -350,8 +339,7 @@ class Manager(object):
             The type of objects to return
 
         ``filter_clause``
-            The filter governing selection of objects to return. Defaults to
-            None.
+            The filter governing selection of objects to return. Defaults to None.
 
         ``order_by_ref``
             Any parameters to order the returned objects by. Defaults to None.
@@ -367,11 +355,9 @@ class Manager(object):
             try:
                 return query.all()
             except OperationalError:
-                # This exception clause is for users running MySQL which likes
-                # to terminate connections on its own without telling anyone.
-                # See bug #927473
-                # However, other dbms can raise it, usually in a non-recoverable
-                # way. So we only retry 3 times.
+                # This exception clause is for users running MySQL which likes to terminate connections on its own
+                # without telling anyone. See bug #927473. However, other dbms can raise it, usually in a
+                # non-recoverable way. So we only retry 3 times.
                 log.exception(u'Probably a MySQL issue, "MySQL has gone away"')
                 if try_count >= 2:
                     raise
@@ -384,8 +370,7 @@ class Manager(object):
             The type of objects to return.
 
         ``filter_clause``
-            The filter governing selection of objects to return. Defaults to
-            None.
+            The filter governing selection of objects to return. Defaults to None.
         """
         query = self.session.query(object_class)
         if filter_clause is not None:
@@ -394,11 +379,9 @@ class Manager(object):
             try:
                 return query.count()
             except OperationalError:
-                # This exception clause is for users running MySQL which likes
-                # to terminate connections on its own without telling anyone.
-                # See bug #927473
-                # However, other dbms can raise it, usually in a non-recoverable
-                # way. So we only retry 3 times.
+                # This exception clause is for users running MySQL which likes to terminate connections on its own
+                # without telling anyone. See bug #927473. However, other dbms can raise it, usually in a
+                # non-recoverable way. So we only retry 3 times.
                 log.exception(u'Probably a MySQL issue, "MySQL has gone away"')
                 if try_count >= 2:
                     raise
@@ -422,11 +405,9 @@ class Manager(object):
                     self.is_dirty = True
                     return True
                 except OperationalError:
-                    # This exception clause is for users running MySQL which likes
-                    # to terminate connections on its own without telling anyone.
-                    # See bug #927473
-                    # However, other dbms can raise it, usually in a non-recoverable
-                    # way. So we only retry 3 times.
+                    # This exception clause is for users running MySQL which likes to terminate connections on its own
+                    # without telling anyone. See bug #927473. However, other dbms can raise it, usually in a
+                    # non-recoverable way. So we only retry 3 times.
                     log.exception(u'Probably a MySQL issue, "MySQL has gone away"')
                     self.session.rollback()
                     if try_count >= 2:
@@ -443,17 +424,14 @@ class Manager(object):
 
     def delete_all_objects(self, object_class, filter_clause=None):
         """
-        Delete all object records.
-        This method should only be used for simple tables and not ones with
-        relationships.  The relationships are not deleted from the database and
-        this will lead to database corruptions.
+        Delete all object records. This method should only be used for simple tables and **not** ones with
+        relationships.  The relationships are not deleted from the database and this will lead to database corruptions.
 
         ``object_class``
             The type of object to delete
 
         ``filter_clause``
-            The filter governing selection of objects to return. Defaults to
-            None.
+            The filter governing selection of objects to return. Defaults to None.
         """
         for try_count in range(3):
             try:
@@ -465,11 +443,9 @@ class Manager(object):
                 self.is_dirty = True
                 return True
             except OperationalError:
-                # This exception clause is for users running MySQL which likes
-                # to terminate connections on its own without telling anyone.
-                # See bug #927473
-                # However, other dbms can raise it, usually in a non-recoverable
-                # way. So we only retry 3 times.
+                # This exception clause is for users running MySQL which likes to terminate connections on its own
+                # without telling anyone. See bug #927473. However, other dbms can raise it, usually in a
+                # non-recoverable way. So we only retry 3 times.
                 log.exception(u'Probably a MySQL issue, "MySQL has gone away"')
                 self.session.rollback()
                 if try_count >= 2:

From d77efd63d209bc205c9955c62525a3840eef8181 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 22 Mar 2013 21:35:59 +0100
Subject: [PATCH 3/9] fixed double space

---
 openlp/core/lib/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index 41b05d388..c6bce2a00 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -425,7 +425,7 @@ class Manager(object):
     def delete_all_objects(self, object_class, filter_clause=None):
         """
         Delete all object records. This method should only be used for simple tables and **not** ones with
-        relationships.  The relationships are not deleted from the database and this will lead to database corruptions.
+        relationships. The relationships are not deleted from the database and this will lead to database corruptions.
 
         ``object_class``
             The type of object to delete

From a73570d4fc2c763fad863b9bc41540404f7b8881 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 23 Mar 2013 06:46:41 +0000
Subject: [PATCH 4/9] Minor fixes for missed

---
 openlp/core/lib/mediamanageritem.py           | 2 +-
 openlp/core/ui/slidecontroller.py             | 2 +-
 openlp/plugins/alerts/lib/alertsmanager.py    | 8 ++++----
 openlp/plugins/bibles/lib/mediaitem.py        | 2 +-
 openlp/plugins/custom/lib/mediaitem.py        | 2 +-
 openlp/plugins/images/lib/mediaitem.py        | 2 +-
 openlp/plugins/media/lib/mediaitem.py         | 2 +-
 openlp/plugins/presentations/lib/mediaitem.py | 2 +-
 openlp/plugins/remotes/lib/httpserver.py      | 4 ++--
 openlp/plugins/songs/lib/mediaitem.py         | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index e261bfe59..f6c95aa9e 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -94,7 +94,7 @@ class MediaManagerItem(QtGui.QWidget):
         self.remote_triggered = None
         self.single_service_item = True
         self.quick_preview_allowed = False
-        self.hasSearch = False
+        self.has_search = False
         self.page_layout = QtGui.QVBoxLayout(self)
         self.page_layout.setSpacing(0)
         self.page_layout.setMargin(0)
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 4e7341081..bfc7b1782 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -99,7 +99,7 @@ class SlideController(DisplayController):
             u'delay_spin_box'
         ]
         self.audio_list = [
-            u'audio_pause_item',
+            u'audioPauseItem',
             u'audio_time_label'
         ]
         self.wide_menu = [
diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py
index f760288f1..042999a11 100644
--- a/openlp/plugins/alerts/lib/alertsmanager.py
+++ b/openlp/plugins/alerts/lib/alertsmanager.py
@@ -87,11 +87,11 @@ class AlertsManager(QtCore.QObject):
         if not self.alert_list:
             return
         text = self.alert_list.pop(0)
-        alertTab = self.parent().settingsTab
-        self.live_controller.display.alert(text, alertTab.location)
+        alert_tab = self.parent().settings_tab
+        self.live_controller.display.alert(text, alert_tab.location)
         # Check to see if we have a timer running.
         if self.timer_id == 0:
-            self.timer_id = self.startTimer(int(alertTab.timeout) * 1000)
+            self.timer_id = self.startTimer(int(alert_tab.timeout) * 1000)
 
     def timerEvent(self, event):
         """
@@ -103,7 +103,7 @@ class AlertsManager(QtCore.QObject):
         """
         log.debug(u'timer event')
         if event.timerId() == self.timer_id:
-            alertTab = self.parent().settingsTab
+            alertTab = self.parent().settings_tab
             self.live_controller.display.alert(u'', alertTab.location)
         self.killTimer(self.timer_id)
         self.timer_id = 0
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 2bb3fb383..1e49f95fe 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -67,7 +67,7 @@ class BibleMediaItem(MediaManagerItem):
         # Place to store the search results for both bibles.
         self.settings = self.plugin.settings_tab
         self.quick_preview_allowed = True
-        self.hasSearch = True
+        self.has_search = True
         self.search_results = {}
         self.second_search_results = {}
         self.check_search_result()
diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 8e95b038b..9e3261eeb 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -60,7 +60,7 @@ class CustomMediaItem(MediaManagerItem):
         self.edit_custom_form = EditCustomForm(self, self.main_window, self.plugin.manager)
         self.single_service_item = False
         self.quick_preview_allowed = True
-        self.hasSearch = True
+        self.has_search = True
         # Holds information about whether the edit is remotely triggered and
         # which Custom is required.
         self.remoteCustom = -1
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 1b2fe512e..e7ee591df 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -53,7 +53,7 @@ class ImageMediaItem(MediaManagerItem):
         self.icon_path = u'images/image'
         MediaManagerItem.__init__(self, parent, plugin)
         self.quick_preview_allowed = True
-        self.hasSearch = True
+        self.has_search = True
         self.manager = plugin.manager
         self.choose_group_form = ChooseGroupForm(self)
         self.add_group_form = AddGroupForm(self)
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 64f637b00..57bc6947b 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -59,7 +59,7 @@ class MediaMediaItem(MediaManagerItem):
         self.automatic = u''
         MediaManagerItem.__init__(self, parent, plugin)
         self.single_service_item = False
-        self.hasSearch = True
+        self.has_search = True
         self.media_object = None
         self.display_controller = DisplayController(parent)
         self.display_controller.controller_layout = QtGui.QVBoxLayout()
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index fb7aacca8..f92562541 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -58,7 +58,7 @@ class PresentationMediaItem(MediaManagerItem):
         self.Automatic = u''
         MediaManagerItem.__init__(self, parent, plugin)
         self.message_listener = MessageListener(self)
-        self.hasSearch = True
+        self.has_search = True
         self.single_service_item = False
         Registry().register_function(u'mediaitem_presentation_rebuild', self.populate_display_types)
         Registry().register_function(u'mediaitem_suffixes', self.build_file_mask_string)
diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py
index d57b970c6..0386b3266 100644
--- a/openlp/plugins/remotes/lib/httpserver.py
+++ b/openlp/plugins/remotes/lib/httpserver.py
@@ -492,7 +492,7 @@ class HttpConnection(object):
         if action == u'search':
             searches = []
             for plugin in self.plugin_manager.plugins:
-                if plugin.status == PluginStatus.Active and plugin.media_item and plugin.mediaItem.hasSearch:
+                if plugin.status == PluginStatus.Active and plugin.media_item and plugin.mediaItem.has_search:
                     searches.append([plugin.name, unicode(plugin.textStrings[StringContent.Name][u'plural'])])
             return HttpResponse(json.dumps({u'results': {u'items': searches}}), {u'Content-Type': u'application/json'})
 
@@ -509,7 +509,7 @@ class HttpConnection(object):
             return HttpResponse(code=u'400 Bad Request')
         text = urllib.unquote(text)
         plugin = self.plugin_manager.get_plugin_by_name(plugin_name)
-        if plugin.status == PluginStatus.Active and plugin.media_item and plugin.mediaItem.hasSearch:
+        if plugin.status == PluginStatus.Active and plugin.media_item and plugin.mediaItem.has_search:
             results = plugin.media_item.search(text, False)
         else:
             results = []
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 9d520ee36..0c4898fd9 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -81,7 +81,7 @@ class SongMediaItem(MediaManagerItem):
         self.remoteSong = -1
         self.editItem = None
         self.quick_preview_allowed = True
-        self.hasSearch = True
+        self.has_search = True
 
     def _updateBackgroundAudio(self, song, item):
         song.media_files = []

From 90d0d3c133f4c15b13b834d79dec21e71d879514 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 23 Mar 2013 07:28:24 +0000
Subject: [PATCH 5/9] More updates

---
 openlp/core/ui/media/mediaplayer.py  |  2 +-
 openlp/core/ui/media/phononplayer.py | 14 +++++++-------
 openlp/core/ui/media/vlcplayer.py    | 14 +++++++-------
 openlp/core/ui/media/webkitplayer.py | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/openlp/core/ui/media/mediaplayer.py b/openlp/core/ui/media/mediaplayer.py
index 1b296beb7..c1f060f60 100644
--- a/openlp/core/ui/media/mediaplayer.py
+++ b/openlp/core/ui/media/mediaplayer.py
@@ -103,7 +103,7 @@ class MediaPlayer(object):
         """
         pass
 
-    def seek(self, display, seekVal):
+    def seek(self, display, seek_value):
         """
         Change playing position of current Media File
         """
diff --git a/openlp/core/ui/media/phononplayer.py b/openlp/core/ui/media/phononplayer.py
index ffb3455b0..6e4da140c 100644
--- a/openlp/core/ui/media/phononplayer.py
+++ b/openlp/core/ui/media/phononplayer.py
@@ -195,7 +195,7 @@ class PhononPlayer(MediaPlayer):
             self.seek(display, controller.media_info.start_time * 1000)
         self.volume(display, controller.media_info.volume)
         controller.media_info.length = int(display.media_object.totalTime() / 1000)
-        controller.seekSlider.setMaximum(controller.media_info.length * 1000)
+        controller.seek_slider.setMaximum(controller.media_info.length * 1000)
         self.state = MediaState.Playing
         display.phonon_widget.raise_()
         return True
@@ -225,11 +225,11 @@ class PhononPlayer(MediaPlayer):
             vol = float(vol) / float(100)
             display.audio.setVolume(vol)
 
-    def seek(self, display, seekVal):
+    def seek(self, display, seek_value):
         """
         Go to a particular point in the current media item
         """
-        display.media_object.seek(seekVal)
+        display.media_object.seek(seek_value)
 
     def reset(self, display):
         """
@@ -259,10 +259,10 @@ class PhononPlayer(MediaPlayer):
             if display.media_object.currentTime() > controller.media_info.end_time * 1000:
                 self.stop(display)
                 self.set_visible(display, False)
-        if not controller.seekSlider.isSliderDown():
-            controller.seekSlider.blockSignals(True)
-            controller.seekSlider.setSliderPosition(display.media_object.currentTime())
-            controller.seekSlider.blockSignals(False)
+        if not controller._slider.isSliderDown():
+            controller.seek_slider.blockSignals(True)
+            controller.seek_slider.setSliderPosition(display.media_object.currentTime())
+            controller.seek_slider.blockSignals(False)
 
     def get_media_display_css(self):
         """
diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py
index 1195ef1b5..a2764bc5a 100644
--- a/openlp/core/ui/media/vlcplayer.py
+++ b/openlp/core/ui/media/vlcplayer.py
@@ -212,7 +212,7 @@ class VlcPlayer(MediaPlayer):
         if start_time > 0:
             self.seek(display, controller.media_info.start_time * 1000)
         controller.media_info.length = int(display.vlcMediaPlayer.get_media().get_duration() / 1000)
-        controller.seekSlider.setMaximum(controller.media_info.length * 1000)
+        controller.seek_slider.setMaximum(controller.media_info.length * 1000)
         self.state = MediaState.Playing
         display.vlcWidget.raise_()
         return True
@@ -241,12 +241,12 @@ class VlcPlayer(MediaPlayer):
         if display.has_audio:
             display.vlcMediaPlayer.audio_set_volume(vol)
 
-    def seek(self, display, seekVal):
+    def seek(self, display, seek_value):
         """
         Go to a particular position
         """
         if display.vlcMediaPlayer.is_seekable():
-            display.vlcMediaPlayer.set_time(seekVal)
+            display.vlcMediaPlayer.set_time(seek_value)
 
     def reset(self, display):
         """
@@ -275,10 +275,10 @@ class VlcPlayer(MediaPlayer):
             if display.vlcMediaPlayer.get_time() > controller.media_info.end_time * 1000:
                 self.stop(display)
                 self.set_visible(display, False)
-        if not controller.seekSlider.isSliderDown():
-            controller.seekSlider.blockSignals(True)
-            controller.seekSlider.setSliderPosition(display.vlcMediaPlayer.get_time())
-            controller.seekSlider.blockSignals(False)
+        if not controller.seek_slider.isSliderDown():
+            controller.seek_slider.blockSignals(True)
+            controller.seek_slider.setSliderPosition(display.vlcMediaPlayer.get_time())
+            controller.seek_slider.blockSignals(False)
 
     def get_info(self):
         """
diff --git a/openlp/core/ui/media/webkitplayer.py b/openlp/core/ui/media/webkitplayer.py
index 8f2bce0f0..f2dbfe5dc 100644
--- a/openlp/core/ui/media/webkitplayer.py
+++ b/openlp/core/ui/media/webkitplayer.py
@@ -462,11 +462,11 @@ class WebkitPlayer(MediaPlayer):
                 length = int(length * 1000)
         if currentTime > 0:
             controller.media_info.length = length
-            controller.seekSlider.setMaximum(length)
-            if not controller.seekSlider.isSliderDown():
-                controller.seekSlider.blockSignals(True)
-                controller.seekSlider.setSliderPosition(currentTime)
-                controller.seekSlider.blockSignals(False)
+            controller.seek_slider.setMaximum(length)
+            if not controller.seek_slider.isSliderDown():
+                controller.seek_slider.blockSignals(True)
+                controller.seek_slider.setSliderPosition(currentTime)
+                controller.seek_slider.blockSignals(False)
 
     def get_info(self):
         """

From 12058ebf8c8860d64fe8d940d9f92a38435b88fc Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 23 Mar 2013 07:45:08 +0000
Subject: [PATCH 6/9] fix typo

---
 openlp/core/ui/media/phononplayer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/media/phononplayer.py b/openlp/core/ui/media/phononplayer.py
index 6e4da140c..2a6eb77ba 100644
--- a/openlp/core/ui/media/phononplayer.py
+++ b/openlp/core/ui/media/phononplayer.py
@@ -259,7 +259,7 @@ class PhononPlayer(MediaPlayer):
             if display.media_object.currentTime() > controller.media_info.end_time * 1000:
                 self.stop(display)
                 self.set_visible(display, False)
-        if not controller._slider.isSliderDown():
+        if not controller.seek_slider.isSliderDown():
             controller.seek_slider.blockSignals(True)
             controller.seek_slider.setSliderPosition(display.media_object.currentTime())
             controller.seek_slider.blockSignals(False)

From 509917480c42fcf0de4018422b908a28e9ed1ad3 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Tue, 26 Mar 2013 07:17:29 +0000
Subject: [PATCH 7/9] Fix missing string converstion

---
 openlp/plugins/remotes/lib/httpserver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py
index 0386b3266..d285baa50 100644
--- a/openlp/plugins/remotes/lib/httpserver.py
+++ b/openlp/plugins/remotes/lib/httpserver.py
@@ -492,7 +492,7 @@ class HttpConnection(object):
         if action == u'search':
             searches = []
             for plugin in self.plugin_manager.plugins:
-                if plugin.status == PluginStatus.Active and plugin.media_item and plugin.mediaItem.has_search:
+                if plugin.status == PluginStatus.Active and plugin.media_item and plugin.media_item.has_search:
                     searches.append([plugin.name, unicode(plugin.textStrings[StringContent.Name][u'plural'])])
             return HttpResponse(json.dumps({u'results': {u'items': searches}}), {u'Content-Type': u'application/json'})
 
@@ -509,7 +509,7 @@ class HttpConnection(object):
             return HttpResponse(code=u'400 Bad Request')
         text = urllib.unquote(text)
         plugin = self.plugin_manager.get_plugin_by_name(plugin_name)
-        if plugin.status == PluginStatus.Active and plugin.media_item and plugin.mediaItem.has_search:
+        if plugin.status == PluginStatus.Active and plugin.media_item and plugin.media_item.has_search:
             results = plugin.media_item.search(text, False)
         else:
             results = []

From b9a5ee28a9fa0a8bbd8fa6daed866722d76720b9 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Tue, 26 Mar 2013 07:34:42 +0000
Subject: [PATCH 8/9] Fix missing string converstion

---
 openlp/core/ui/slidecontroller.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index bfc7b1782..f0c5aa170 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -98,6 +98,7 @@ class SlideController(DisplayController):
             u'loop_separator',
             u'delay_spin_box'
         ]
+        # audioPauseItem is also in Settings so any changes need to be paired
         self.audio_list = [
             u'audioPauseItem',
             u'audio_time_label'

From e6e9dec39660b53744776d40cd9f2ebe939ddbe3 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 26 Mar 2013 12:15:31 +0100
Subject: [PATCH 9/9] updated vlc.py

---
 openlp/core/ui/media/vendor/vlc.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openlp/core/ui/media/vendor/vlc.py b/openlp/core/ui/media/vendor/vlc.py
index e7138b50a..dbb2971f7 100644
--- a/openlp/core/ui/media/vendor/vlc.py
+++ b/openlp/core/ui/media/vendor/vlc.py
@@ -48,7 +48,7 @@ import sys
 from inspect import getargspec
 
 __version__ = "N/A"
-build_date  = "Wed Feb 13 18:40:24 2013"
+build_date  = "Thu Mar 21 22:33:03 2013"
 
 if sys.version_info[0] > 2:
     str = str
@@ -70,7 +70,7 @@ if sys.version_info[0] > 2:
         if isinstance(b, bytes):
             return b.decode(sys.getfilesystemencoding())
         else:
-            return b
+            return str(b)
 else:
     str = str
     unicode = unicode
@@ -90,6 +90,8 @@ else:
         """
         if isinstance(b, str):
             return unicode(b, sys.getfilesystemencoding())
+        else:
+            return b
 
 # Internal guard to prevent internal classes to be directly
 # instanciated.