X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fgdi%2Fgrc.cpp;h=86d53fd3cc1021d3d8fd31c108c295c90f04e499;hb=6bffe6f0ce6b00d792787c91cd609b72748287ae;hp=e5cab87e03a1f3036002f59823c2eeba910e1c77;hpb=8251696239ba2bb74c348a2726fab85a275ebd11;p=vuplus_dvbapp

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index e5cab87..86d53fd 100644
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -119,7 +119,7 @@ void *gRC::thread()
 				break;
 			else if (o.opcode==gOpcode::notify)
 				need_notify = 1;
-			else
+			else if(o.dc)
 			{
 				o.dc->exec(&o);
 				// o.dc is a gDC* filled with grabref... so we must release it here
@@ -139,24 +139,21 @@ void *gRC::thread()
 			
 					/* when the main thread is non-idle for a too long time without any display output,
 					   we want to display a spinner. */
-
-				struct timeval time;
 				struct timespec timeout;
-				gettimeofday(&time, NULL);
-				timeout.tv_sec = time.tv_sec;
-				timeout.tv_nsec = time.tv_usec * 1000;
-				
+				clock_gettime(CLOCK_REALTIME, &timeout);
+
 				if (m_spinner_enabled)
+				{
 					timeout.tv_nsec += 100*1000*1000;
-				else
-					timeout.tv_nsec += 500*1000*1000;
-
 					/* yes, this is required. */
-				if (timeout.tv_nsec > 1000*1000*1000)
-				{
-					timeout.tv_nsec -= 1000*1000*1000;
-					timeout.tv_sec++;
+					if (timeout.tv_nsec > 1000*1000*1000)
+					{
+						timeout.tv_nsec -= 1000*1000*1000;
+						timeout.tv_sec++;
+					}
 				}
+				else
+					timeout.tv_sec += 2;
 
 				int idle = 1;
 
@@ -165,8 +162,6 @@ void *gRC::thread()
 					if (eApp && !eApp->isIdle())
 						idle = 0;
 				}
-				
-				pthread_mutex_unlock(&mutex);
 
 				if (!idle)
 				{
@@ -176,6 +171,7 @@ void *gRC::thread()
 				} else
 					disableSpinner();
 			}
+			pthread_mutex_unlock(&mutex);
 #endif
 		}
 	}
@@ -207,7 +203,8 @@ void gRC::enableSpinner()
 	o.opcode = m_spinner_enabled ? gOpcode::incrementSpinner : gOpcode::enableSpinner;
 	m_spinner_dc->exec(&o);
 	m_spinner_enabled = 1;
-
+	o.opcode = gOpcode::flush;
+	m_spinner_dc->exec(&o);
 }
 
 void gRC::disableSpinner()
@@ -226,6 +223,8 @@ void gRC::disableSpinner()
 	gOpcode o;
 	o.opcode = gOpcode::disableSpinner;
 	m_spinner_dc->exec(&o);
+	o.opcode = gOpcode::flush;
+	m_spinner_dc->exec(&o);
 }
 
 static int gPainter_instances;
@@ -520,16 +519,6 @@ void gPainter::clippop()
 	m_rc->submit(o);
 }
 
-void gPainter::flush()
-{
-	if ( m_dc->islocked() )
-		return;
-	gOpcode o;
-	o.opcode = gOpcode::flush;
-	o.dc = m_dc.grabRef();
-	m_rc->submit(o);
-}
-
 void gPainter::waitVSync()
 {
 	if ( m_dc->islocked() )
@@ -572,14 +561,17 @@ void gPainter::end()
 
 gDC::gDC()
 {
+	m_spinner_pic = 0;
 }
 
 gDC::gDC(gPixmap *pixmap): m_pixmap(pixmap)
 {
+	m_spinner_pic = 0;
 }
 
 gDC::~gDC()
 {
+	delete[] m_spinner_pic;
 }
 
 void gDC::exec(gOpcode *o)
@@ -617,7 +609,7 @@ void gDC::exec(gOpcode *o)
 	{
 		ePtr<eTextPara> para = new eTextPara(o->parm.renderText->area);
 		int flags = o->parm.renderText->flags;
-		assert(m_current_font);
+		ASSERT(m_current_font);
 		para->setFont(m_current_font);
 		para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0);
 		if (o->parm.renderText->text)
@@ -804,7 +796,8 @@ void gDC::incrementSpinner()
 	
 	static int blub;
 	blub++;
-	
+
+#if 0
 	int i;
 	
 	for (i = 0; i < 5; ++i)
@@ -816,14 +809,37 @@ void gDC::incrementSpinner()
 
 		m_pixmap->fill(eRect(x, y, 10, 10), gRGB(col, col, col));
 	}
+#endif
+
+	m_spinner_temp->blit(*m_spinner_saved, ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()));
+
+	if (m_spinner_pic[m_spinner_i])
+		m_spinner_temp->blit(*m_spinner_pic[m_spinner_i], ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()), gPixmap::blitAlphaTest);
+
+	m_pixmap->blit(*m_spinner_temp, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0);
+	m_spinner_i++;
+	m_spinner_i %= m_spinner_num;
 }
 
-void gDC::setSpinner(eRect pos)
+void gDC::setSpinner(eRect pos, ePtr<gPixmap> *pic, int len)
 {
 	ASSERT(m_pixmap);
 	ASSERT(m_pixmap->surface);
 	m_spinner_saved = new gPixmap(pos.size(), m_pixmap->surface->bpp);
+	m_spinner_temp = new gPixmap(pos.size(), m_pixmap->surface->bpp);
 	m_spinner_pos = pos;
+	
+	m_spinner_i = 0;
+	m_spinner_num = len;
+	
+	int i;
+	if (m_spinner_pic)
+		delete[] m_spinner_pic;
+	
+	m_spinner_pic = new ePtr<gPixmap>[len];
+	
+	for (i = 0; i < len; ++i)
+		m_spinner_pic[i] = pic[i];
 }
 
 DEFINE_REF(gDC);