diff --git a/YACReader/goto_flow.cpp b/YACReader/goto_flow.cpp index 57cb718a..b8734a56 100644 --- a/YACReader/goto_flow.cpp +++ b/YACReader/goto_flow.cpp @@ -108,8 +108,6 @@ void GoToFlow::setNumSlides(unsigned int slides) toolBar->setTop(slides); - SlideInitializer * si = new SlideInitializer(&mutexGoToFlow,flow,slides); - imagesLoaded.clear(); imagesLoaded.fill(false,slides); @@ -124,7 +122,10 @@ void GoToFlow::setNumSlides(unsigned int slides) ready = true; worker->reset(); - si->start(); + flow->clear(); + for(unsigned int i=0;iaddSlide(QImage()); + flow->setCenterIndex(0); } void GoToFlow::reset() @@ -229,30 +230,10 @@ void GoToFlow::setFlowRightToLeft(bool b) flow->setFlowRightToLeft(b); } -//----------------------------------------------------------------------------- -//SlideInitializer -//----------------------------------------------------------------------------- -SlideInitializer::SlideInitializer(QMutex * m,PictureFlow * flow,int slides) - :QThread(),mutex(m),_flow(flow),_slides(slides) -{ - -} -void SlideInitializer::run() -{ - mutex->lock(); - - _flow->clear(); - for(int i=0;i<_slides;i++) - _flow->addSlide(QImage()); - _flow->setCenterIndex(0); - - mutex->unlock(); -} //----------------------------------------------------------------------------- //PageLoader //----------------------------------------------------------------------------- - PageLoader::PageLoader(QMutex * m): QThread(),mutex(m), restart(false), working(false), idx(-1) { diff --git a/YACReader/goto_flow.h b/YACReader/goto_flow.h index 337b1ec0..a09a039f 100644 --- a/YACReader/goto_flow.h +++ b/YACReader/goto_flow.h @@ -21,7 +21,6 @@ class QLabel; class Comic; -class SlideInitializer; class PageLoader; class YACReaderFlow; class PictureFlow; @@ -68,23 +67,10 @@ signals: void goToPage(unsigned int page); }; -//----------------------------------------------------------------------------- -//SlideInitializer -//----------------------------------------------------------------------------- -class SlideInitializer : public QThread -{ -public: - SlideInitializer(QMutex * m,PictureFlow * flow,int slides); -private: - QMutex * mutex; - PictureFlow * _flow; - int _slides; - void run(); -}; + //----------------------------------------------------------------------------- //PageLoader //----------------------------------------------------------------------------- - class PageLoader : public QThread { public: