bitlair/bitvis
8
0
Fork 0
Code Activity Actions

added: start the text at position 0, and start scrolling after two seconds, but only if the text doesn't fit on the display

Browse source
This commit is contained in:
Bob van Loosen 2012-12-20 16:58:23 +01:00
parent c4c4e8ec59
commit 4c368d2735
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/bitvis.cpp
View file

@ -54,6 +54,7 @@ CBitVis::CBitVis(int argc, char *argv[])
m_nrlines = 48 - m_fontheight - 1; m_nrlines = 48 - m_fontheight - 1;
m_scrolloffset = 0; m_scrolloffset = 0;
m_songupdatetime = GetTimeUs();
m_mpdclient = new CMpdClient("music.bitlair", 6600); m_mpdclient = new CMpdClient("music.bitlair", 6600);
m_mpdclient->StartThread(); m_mpdclient->StartThread();
@ -336,7 +337,10 @@ void CBitVis::SendData(int64_t time)
string currentsong; string currentsong;
if (m_mpdclient->CurrentSong(currentsong)) if (m_mpdclient->CurrentSong(currentsong))
m_scrolloffset = m_nrcolumns; {
m_scrolloffset = 0;
m_songupdatetime = GetTimeUs();
}
SetText(text, currentsong.c_str()); SetText(text, currentsong.c_str());
data.SetData(text, sizeof(text), true); data.SetData(text, sizeof(text), true);
@ -376,14 +380,21 @@ void CBitVis::SetText(uint8_t* buff, const char* str, int offset /*= 0*/)
charpos++; charpos++;
pixlength++; pixlength++;
} }
if (i < length - 1)
{
charpos++; charpos++;
pixlength++; pixlength++;
} }
}
if (pixlength > m_nrcolumns && GetTimeUs() - m_songupdatetime > 2000000)
{
m_scrolloffset--; m_scrolloffset--;
if (m_scrolloffset < -pixlength) if (m_scrolloffset < -pixlength)
m_scrolloffset = m_nrcolumns; m_scrolloffset = m_nrcolumns;
} }
}
void CBitVis::InitChars() void CBitVis::InitChars()
{ {

1
src/bitvis.h
View file

@ -54,6 +54,7 @@ class CBitVis
float m_decay; float m_decay;
int m_fontheight; int m_fontheight;
int m_scrolloffset; int m_scrolloffset;
int64_t m_songupdatetime;
CMpdClient* m_mpdclient; CMpdClient* m_mpdclient;
struct peak struct peak