X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ec648cb137f7a02e63752b54be2ce3ac959c7c86..1da41232bbb095c380dcc2cfb33b7114f05e8ced:/lib/gui/epositiongauge.cpp

diff --git a/lib/gui/epositiongauge.cpp b/lib/gui/epositiongauge.cpp
index 712bf4a6..e45d4a6c 100644
--- a/lib/gui/epositiongauge.cpp
+++ b/lib/gui/epositiongauge.cpp
@@ -5,15 +5,20 @@ ePositionGauge::ePositionGauge(eWidget *parent)
 	: eWidget(parent)
 {
 	m_point_widget = new ePixmap(this);
+	m_seek_point_widget = new ePixmap(this);
+	m_seek_point_widget->hide();
 	m_point_widget->setAlphatest(1);
+	m_seek_point_widget->setAlphatest(1);
 	m_position = 0;
 	m_length = 0;
 	m_have_foreground_color = 0;
+	m_seek_position = 0;
 }
 
 ePositionGauge::~ePositionGauge()
 {
 	delete m_point_widget;
+	delete m_seek_point_widget;
 }
 
 void ePositionGauge::setLength(const pts_t &len)
@@ -38,15 +43,28 @@ void ePositionGauge::setInColor(const gRGB &color)
 	invalidate();
 }
 
-void ePositionGauge::setPointer(gPixmap *pixmap, const ePoint &center)
+void ePositionGauge::setPointer(int which, ePtr<gPixmap> &pixmap, const ePoint &center)
 {
-	m_point_center = center;
-	m_point_widget->setPixmap(pixmap);
-	m_point_widget->resize(pixmap->size());
+	setPointer(which, pixmap.operator->(), center);
+}
+
+void ePositionGauge::setPointer(int which, gPixmap *pixmap, const ePoint &center)
+{
+	if (which == 0)
+	{
+		m_point_center = center;
+		m_point_widget->setPixmap(pixmap);
+		m_point_widget->resize(pixmap->size());
+	} else
+	{
+		m_seek_point_center = center;
+		m_seek_point_widget->setPixmap(pixmap);
+		m_seek_point_widget->resize(pixmap->size());
+	}
 	updatePosition();
 }
 
-void ePositionGauge::setInOutList(PyObject *list)
+void ePositionGauge::setInOutList(ePyObject list)
 {
 	if (!PyList_Check(list))
 		return;
@@ -57,14 +75,14 @@ void ePositionGauge::setInOutList(PyObject *list)
 	
 	for (i=0; i<size; ++i)
 	{
-		PyObject *tuple = PyList_GetItem(list, i);
+		ePyObject tuple = PyList_GET_ITEM(list, i);
 		if (!PyTuple_Check(tuple))
 			continue;
 
 		if (PyTuple_Size(tuple) != 2)
 			continue;
 
-		PyObject *ppts = PyTuple_GetItem(tuple, 0), *ptype = PyTuple_GetItem(tuple, 1);
+		ePyObject ppts = PyTuple_GET_ITEM(tuple, 0), ptype = PyTuple_GET_ITEM(tuple, 1);
 		if (!(PyLong_Check(ppts) && PyInt_Check(ptype)))
 			continue;
 
@@ -94,6 +112,7 @@ int ePositionGauge::event(int event, void *data, void *data2)
 //		painter.fill(eRect(0, 10, s.width(), s.height()-20));
 		
 		pts_t in = 0, out = 0;
+		int xm, xm_last = -1;
 		
 		std::multiset<cueEntry>::iterator i(m_cue_entries.begin());
 		
@@ -108,11 +127,20 @@ int ePositionGauge::event(int event, void *data, void *data2)
 					continue;
 				} else if (i->what == 1) /* out */
 					out = i++->where;
-				else /* mark */
+				else /* mark or last */
 				{
-					int xm = scale(i->where);
-					painter.setForegroundColor(gRGB(0xFF8080));
-					painter.fill(eRect(xm - 2, 0, 4, s.height()));
+					xm = scale(i->where);
+					if (i->what == 2) {
+						painter.setForegroundColor(gRGB(0xFF8080));
+						if (xm - 2 < xm_last) /* Make sure last is not overdrawn */
+							painter.fill(eRect(xm_last, 0, 2 + xm - xm_last, s.height()));
+						else
+							painter.fill(eRect(xm - 2, 0, 4, s.height()));
+					} else if (i->what == 3) {
+						painter.setForegroundColor(gRGB(0x80FF80));
+						painter.fill(eRect(xm - 1, 0, 3, s.height()));
+						xm_last = xm + 2;
+					}
 					i++;
 					continue;
 				}
@@ -122,7 +150,7 @@ int ePositionGauge::event(int event, void *data, void *data2)
 			{
 				painter.setForegroundColor(gRGB(m_foreground_color));
 				int xi = scale(in), xo = scale(out);
-				painter.fill(eRect(xi, 10, xo-xi, s.height()-14));
+				painter.fill(eRect(xi, (s.height()-4) / 2, xo-xi, 4));
 			}
 			
 			in = m_length;
@@ -161,9 +189,11 @@ int ePositionGauge::event(int event, void *data, void *data2)
 void ePositionGauge::updatePosition()
 {
 	m_pos = scale(m_position);
+	m_seek_pos = scale(m_seek_position);
 	int base = (size().height() - 10) / 2;
 	
 	m_point_widget->move(ePoint(m_pos - m_point_center.x(), base - m_point_center.y()));
+	m_seek_point_widget->move(ePoint(m_seek_pos - m_seek_point_center.x(), base - m_seek_point_center.y()));
 }
 
 int ePositionGauge::scale(const pts_t &val)
@@ -185,3 +215,19 @@ void ePositionGauge::setForegroundColor(const gRGB &col)
 		invalidate();
 	}
 }
+
+void ePositionGauge::enableSeekPointer(int enable)
+{
+	if (enable)
+		m_seek_point_widget->show();
+	else
+		m_seek_point_widget->hide();
+}
+
+void ePositionGauge::setSeekPosition(const pts_t &pos)
+{
+	if (m_seek_position == pos)
+		return;
+	m_seek_position = pos;
+	updatePosition();
+}