From 61da0e8ad956708c5c89b1a8fc082a7f3d7613f7 Mon Sep 17 00:00:00 2001
From: Philip Ridout <phill.ridout@googlemail.com>
Date: Thu, 7 Nov 2013 20:35:02 +0000
Subject: [PATCH] Some refactoring

---
 .bzrignore                                                | 1 +
 openlp/plugins/presentations/lib/pptviewcontroller.py     | 7 ++++---
 .../plugins/presentations/lib/pptviewlib/pptviewlib.cpp   | 4 ++--
 .../plugins/presentations/lib/presentationcontroller.py   | 8 +++++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index d87c55a61..f149d97a7 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -28,3 +28,4 @@ tests.kdev4
 *.nja
 *.orig
 __pycache__
+*.dll
diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py
index 9f39419e4..9c9f81028 100644
--- a/openlp/plugins/presentations/lib/pptviewcontroller.py
+++ b/openlp/plugins/presentations/lib/pptviewcontroller.py
@@ -121,15 +121,16 @@ class PptviewDocument(PresentationDocument):
         the background PptView task started earlier.
         """
         log.debug('LoadPresentation')
+        temp_folder = self.get_temp_folder()
         size = ScreenList().current['size']
         rect = RECT(size.x(), size.y(), size.right(), size.bottom())
         file_path = os.path.normpath(self.filepath)
-        preview_path = os.path.join(self.get_temp_folder(), 'slide')
+        preview_path = os.path.join(temp_folder, 'slide')
         # Ensure that the paths are null terminated
         file_path = file_path.encode('utf-16-le') + b'\0'
         preview_path = preview_path.encode('utf-16-le') + b'\0'
-        if not os.path.isdir(self.get_temp_folder()):
-            os.makedirs(self.get_temp_folder())
+        if not os.path.isdir(temp_folder):
+            os.makedirs(temp_folder)
         self.ppt_id = self.controller.process.OpenPPT(file_path, None, rect, preview_path)
         if self.ppt_id >= 0:
             self.create_thumbnails()
diff --git a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp
index ac51f1155..8b0df45ec 100644
--- a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp
+++ b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp
@@ -223,12 +223,12 @@ DllExport int OpenPPT(wchar_t *filename, HWND hParentWnd, RECT rect,
         {
             if (steps <= pptView[id].steps)
             {
-                Sleep(100);
+                Sleep(25);
                 DEBUG(L"OpenPPT: Step %d/%d\n", steps, pptView[id].steps);
                 steps++;
                 NextStep(id);
             }
-            Sleep(10);
+            Sleep(75);
         }
         DEBUG(L"OpenPPT: Slides %d, Steps %d, first slide steps %d\n",
             pptView[id].slideCount, pptView[id].steps,
diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py
index 17911606c..03efa989f 100644
--- a/openlp/plugins/presentations/lib/presentationcontroller.py
+++ b/openlp/plugins/presentations/lib/presentationcontroller.py
@@ -96,8 +96,14 @@ class PresentationDocument(object):
         """
         Constructor for the PresentationController class
         """
-        self.slidenumber = 0
         self.controller = controller
+        self._setup(name)
+
+    def _setup(self, name):
+        """
+        Run some initial setup. This method is separate from __init__ in order to mock it out in tests.
+        """
+        self.slidenumber = 0
         self.filepath = name
         check_directory_exists(self.get_thumbnail_folder())