Update upstream source from tag 'upstream/3.0.2'

Update to upstream version '3.0.2'
with Debian dir 26e1b8d7612e50e81b8325506c1ce54f71cba270

1 files changed, 0 insertions, 98 deletions

diff --git a/Meter.c b/Meter.c
index 699a788..00c49ce 100644
--- a/Meter.c
+++ b/Meter.c
@@ -11,7 +11,6 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "CRT.h"
 #include "StringUtils.h"
-#include "ListItem.h"
 #include "Settings.h"
 
 #include <math.h>
@@ -19,108 +18,11 @@ in the source distribution for its full text.
 #include <stdlib.h>
 #include <stdarg.h>
 #include <assert.h>
-#include <sys/time.h>
-
-#define METER_BUFFER_LEN 256
 
 #define GRAPH_DELAY (DEFAULT_DELAY/2)
 
 #define GRAPH_HEIGHT 4 /* Unit: rows (lines) */
 
-/*{
-#include "ListItem.h"
-
-#include <sys/time.h>
-
-typedef struct Meter_ Meter;
-
-typedef void(*Meter_Init)(Meter*);
-typedef void(*Meter_Done)(Meter*);
-typedef void(*Meter_UpdateMode)(Meter*, int);
-typedef void(*Meter_UpdateValues)(Meter*, char*, int);
-typedef void(*Meter_Draw)(Meter*, int, int, int);
-
-typedef struct MeterClass_ {
-   ObjectClass super;
-   const Meter_Init init;
-   const Meter_Done done;
-   const Meter_UpdateMode updateMode;
-   const Meter_Draw draw;
-   const Meter_UpdateValues updateValues;
-   const int defaultMode;
-   const double total;
-   const int* attributes;
-   const char* name;
-   const char* uiName;
-   const char* caption;
-   const char* description;
-   const char maxItems;
-   char curItems;
-} MeterClass;
-
-#define As_Meter(this_)                ((MeterClass*)((this_)->super.klass))
-#define Meter_initFn(this_)            As_Meter(this_)->init
-#define Meter_init(this_)              As_Meter(this_)->init((Meter*)(this_))
-#define Meter_done(this_)              As_Meter(this_)->done((Meter*)(this_))
-#define Meter_updateModeFn(this_)      As_Meter(this_)->updateMode
-#define Meter_updateMode(this_, m_)    As_Meter(this_)->updateMode((Meter*)(this_), m_)
-#define Meter_drawFn(this_)            As_Meter(this_)->draw
-#define Meter_doneFn(this_)            As_Meter(this_)->done
-#define Meter_updateValues(this_, buf_, sz_) \
-                                       As_Meter(this_)->updateValues((Meter*)(this_), buf_, sz_)
-#define Meter_defaultMode(this_)       As_Meter(this_)->defaultMode
-#define Meter_getItems(this_)          As_Meter(this_)->curItems
-#define Meter_setItems(this_, n_)      As_Meter(this_)->curItems = (n_)
-#define Meter_attributes(this_)        As_Meter(this_)->attributes
-#define Meter_name(this_)              As_Meter(this_)->name
-#define Meter_uiName(this_)            As_Meter(this_)->uiName
-
-struct Meter_ {
-   Object super;
-   Meter_Draw draw;
-
-   char* caption;
-   int mode;
-   int param;
-   void* drawData;
-   int h;
-   struct ProcessList_* pl;
-   double* values;
-   double total;
-};
-
-typedef struct MeterMode_ {
-   Meter_Draw draw;
-   const char* uiName;
-   int h;
-} MeterMode;
-
-typedef enum {
-   CUSTOM_METERMODE = 0,
-   BAR_METERMODE,
-   TEXT_METERMODE,
-   GRAPH_METERMODE,
-   LED_METERMODE,
-   LAST_METERMODE
-} MeterModeId;
-
-typedef struct GraphData_ {
-   struct timeval time;
-   double values[METER_BUFFER_LEN];
-} GraphData;
-
-}*/
-
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-#ifndef CLAMP
-#define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
-#endif
-
 MeterClass Meter_class = {
    .super = {
       .extends = Class(Object)