git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/tmbinc/enigma2-git
[enigma2.git]
/
lib
/
gui
/
epositiongauge.h
diff --git
a/lib/gui/epositiongauge.h
b/lib/gui/epositiongauge.h
index 74e972c37e04ce52177416342b75ed7a415f74b6..f90b2809782850bd50a36035e1df0ffebb90db63 100644
(file)
--- a/
lib/gui/epositiongauge.h
+++ b/
lib/gui/epositiongauge.h
@@
-17,10
+17,15
@@
public:
void setPosition(const pts_t &pos);
void setInColor(const gRGB &color); /* foreground? */
void setPosition(const pts_t &pos);
void setInColor(const gRGB &color); /* foreground? */
- void setPointer(gPixmap *pixmap, const ePoint ¢er);
+ void setPointer(int which, gPixmap *pixmap, const ePoint ¢er);
+ void setPointer(int which, ePtr<gPixmap> &pixmap, const ePoint ¢er);
- void setInOutList(
PyObject *
list);
+ void setInOutList(
SWIG_PYOBJECT(ePyObject)
list);
void setForegroundColor(const gRGB &col);
void setForegroundColor(const gRGB &col);
+
+ void enableSeekPointer(int enable);
+ void setSeekPosition(const pts_t &pos);
+
#ifndef SWIG
protected:
int event(int event, void *data=0, void *data2=0);
#ifndef SWIG
protected:
int event(int event, void *data=0, void *data2=0);
@@
-30,12
+35,12
@@
private:
{
evtChangedPosition = evtUserWidget
};
{
evtChangedPosition = evtUserWidget
};
- ePixmap *m_point_widget;
- ePoint m_point_center;
+ ePixmap *m_point_widget, *m_seek_point_widget;
+ ePoint m_point_center, m_seek_point_center;
+
+ pts_t m_position, m_length, m_seek_position;
+ int m_pos, m_seek_pos;
- pts_t m_position, m_length;
- int m_pos;
-
/* TODO: this is duplicated code from lib/service/servicedvb.h */
struct cueEntry
{
/* TODO: this is duplicated code from lib/service/servicedvb.h */
struct cueEntry
{