mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

CInfoClock: rework infocklock

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8b61684df
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-12 (Tue, 12 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2013-11-12 12:19:41 +01:00
committed by Michael Liebmann
parent 7a32023d11
commit 885cbcbc40
6 changed files with 92 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/components/cc_frm_clock.cpp
View File

@@ -60,12 +60,11 @@ CComponentsFrmClock::CComponentsFrmClock( const int x_pos, const int y_pos, cons
col_body = color_body;
col_shadow = color_shadow;
cl_format_str = format_str;
paintClock = false;
activeClock = activ;
if (activeClock)
startThread();
cl_format_str = format_str;
}
void CComponentsFrmClock::initVarClock()

115
src/gui/infoclock.cpp
View File

@@ -1,41 +1,45 @@
/*
Based up Neutrino-GUI - Tuxbox-Project
Copyright (C) 2001 by Steffen Hehn 'McClean'
Info Clock Window
based up CComponentsFrmClock
Copyright (C) 2013, Thilo Graf 'dbt'
Copyright (C) 2013, Michael Liebmann 'micha-bbg'
License: GPL
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public
License along with this program; if not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <global.h>
#include <neutrino.h>
#include <pthread.h>
#include <string>
#include <sys/timeb.h>
#include <time.h>
#include <unistd.h>
#include <sys/param.h>
#include <driver/volume.h>
// #include <driver/volume.h>
#include <gui/volumebar.h>
#include <gui/infoclock.h>
#define YOFF 0
CInfoClock::CInfoClock()
{
frameBuffer = CFrameBuffer::getInstance();
x = y = clock_x = 0;
time_height = time_width = thrTimer = 0;
Init();
}
CInfoClock::~CInfoClock()
CInfoClock::CInfoClock():CComponentsFrmClock( 0, 0, 0, 50, "%H:%M:%S", true, CC_SHADOW_OFF, COL_LIGHT_GRAY, COL_MENUCONTENT_PLUS_0,COL_MENUCONTENTDARK_PLUS_0)
{
if(thrTimer)
pthread_cancel(thrTimer);
thrTimer = 0;
}
void CInfoClock::Init()
{
CVolumeHelper::getInstance()->refresh();
CVolumeHelper::getInstance()->getInfoClockDimensions(&clock_x, &y, &time_width, &time_height, &digit_h, &digit_offset);
initVarInfoClock();
}
CInfoClock* CInfoClock::getInstance()
@@ -46,64 +50,35 @@ CInfoClock* CInfoClock::getInstance()
return InfoClock;
}
void CInfoClock::paintTime( bool show_dot)
void CInfoClock::initVarInfoClock()
{
char timestr[20];
int dummy, mute_dx, h_spacer;
time_t tm = time(0);
strftime((char*) &timestr, sizeof(timestr), "%H:%M:%S", localtime(&tm));
timestr[2] = show_dot ? ':':'.';
CVolumeHelper *cvh = CVolumeHelper::getInstance();
cvh->getInfoClockDimensions(&clock_x, &y, &time_width, &time_height, &digit_h, &digit_offset);
cvh->getMuteIconDimensions(&dummy, &dummy, &mute_dx, &dummy);
cvh->getSpacer(&h_spacer, &dummy);
if (CNeutrinoApp::getInstance()->isMuted())
clock_x -= (mute_dx + h_spacer);
int x_diff = (time_width - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(timestr)) / 2;
frameBuffer->paintBoxRel(clock_x, y, time_width, time_height, COL_MENUCONTENT_PLUS_0, RADIUS_SMALL);
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(clock_x + x_diff, y + digit_h + digit_offset + ((time_height - digit_h) / 2), time_width, timestr, COL_MENUCONTENT_TEXT);
cl_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
Init();
}
void* CInfoClock::TimerProc(void *arg)
void CInfoClock::Init()
{
bool show_dot = false;
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,0);
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS,0);
CInfoClock *InfoClock = static_cast<CInfoClock*>(arg);
InfoClock->paintTime(show_dot);
while(1) {
sleep(1);
show_dot = !show_dot;
InfoClock->paintTime(show_dot);
}
return 0;
CVolumeHelper::getInstance()->refresh();
CVolumeHelper::getInstance()->getInfoClockDimensions(&x, &y, &width, &height);
initCCLockItems();
}
void CInfoClock::ClearDisplay()
{
frameBuffer->paintBackgroundBoxRel(clock_x, y, time_width, time_height);
kill();
Init();
}
void CInfoClock::StartClock()
bool CInfoClock::StartClock()
{
Init();
if(!thrTimer) {
pthread_create (&thrTimer, NULL, TimerProc, (void*) this) ;
pthread_detach(thrTimer);
}
return Start();
}
void CInfoClock::StopClock()
bool CInfoClock::StopClock()
{
if(thrTimer) {
pthread_cancel(thrTimer);
thrTimer = 0;
frameBuffer->paintBackgroundBoxRel(clock_x, y, time_width, time_height);
}
bool ret = Stop();
kill();
return ret;
}

72
src/gui/infoclock.h
View File

@@ -1,39 +1,51 @@
#ifndef __infoclock__
#define __infoclock__
/*
Based up Neutrino-GUI - Tuxbox-Project
Copyright (C) 2001 by Steffen Hehn 'McClean'
Info Clock Window
based up CComponentsFrmClock
Copyright (C) 2013, Thilo Graf 'dbt'
Copyright (C) 2013, Michael Liebmann 'micha-bbg'
License: GPL
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public
License along with this program; if not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef __INFOCLOCK__
#define __INFOCLOCK__
#include <driver/framebuffer.h>
#include <driver/fontrenderer.h>
#include <system/settings.h>
#include <gui/color.h>
#include <string>
#include <gui/components/cc.h>
class CInfoClock
class CInfoClock : public CComponentsFrmClock
{
private:
CFrameBuffer * frameBuffer;
protected:
void initVarInfoClock();
private:
void Init();
public:
CInfoClock();
// ~CInfoClock(); // inherited from CComponentsFrmClock
static CInfoClock* getInstance();
pthread_t thrTimer;
void paintTime( bool show_dot);
int time_offset, digit_offset, digit_h;
int x, y, clock_x;
void Init();
static void CleanUpProc(void* arg);
static void* TimerProc(void *arg);
public:
CInfoClock();
~CInfoClock();
static CInfoClock* getInstance();
void StartClock();
void StopClock();
void ClearDisplay();
int time_width, time_height;
bool StartClock();
bool StopClock();
void ClearDisplay();
};
#endif

3
src/gui/volumebar.cpp
View File

@@ -101,7 +101,7 @@ void CVolumeBar::initVolumeBarSize()
cvh->getMuteIconDimensions(&mute_ax, &mute_ay, &mute_dx, &mute_dy);
// info clock
int dummy;
cvh->getInfoClockDimensions(&dummy, &clock_y, &clock_width, &clock_height, &dummy, &dummy);
cvh->getInfoClockDimensions(&dummy, &clock_y, &clock_width, &clock_height);
int mute_corrY = 0;
if (mute_dy < height)
mute_corrY = (height - mute_dy) / 2;
@@ -111,6 +111,7 @@ void CVolumeBar::initVolumeBarSize()
CInfoClock::getInstance()->ClearDisplay();
vb_pbh = height-8;
vb_pby = height/2-vb_pbh/2;
}

2
src/gui/volumebar.h
View File

@@ -123,7 +123,7 @@ class CVolumeHelper
int getVolIconHeight() {return icon_height;}
void getDimensions(int *_x, int *_y, int *_sw, int *_sh, int *_iw, int *_dw) { *_x = x; *_y = y; *_sw = sw; *_sh = sh; *_iw = icon_width; *_dw = digit_width; }
void getMuteIconDimensions(int *_x, int *_y, int *w, int *h) { *_x = mute_ax; *_y = mute_ay+mute_corrY; *w = mute_dx; *h = mute_dy; }
void getInfoClockDimensions(int *_x, int *_y, int *w, int *h, int *d_h, int *d_o) { *_x = clock_ax; *_y = clock_ay; *w = clock_dx; *h = clock_dy, *d_h = digit_h, *d_o = digit_offset; }
void getInfoClockDimensions(int *_x, int *_y, int *w, int *h/*, int *d_h, int *d_o*/) { *_x = clock_ax; *_y = clock_ay; *w = clock_dx; *h = clock_dy/*, *d_h = digit_h, *d_o = digit_offset*/; }
void getVolBarDimensions(int *_y, int *_dy) { *_y = vol_ay; *_dy = vol_height; }
void setMuteIconCorrY(int corr) { mute_corrY = corr; }
void refresh();

2
src/neutrino.cpp
View File

@@ -2028,7 +2028,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
InfoClock = CInfoClock::getInstance();
if(g_settings.mode_clock)
InfoClock->StartClock();
g_settings.mode_clock = InfoClock->StartClock();
//cCA::GetInstance()->Ready(true);