X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=slider.c;h=242f1c35c5b84cf1b4f32449dc86230ad64a826f;hp=558f55bde07e4f5740fa128e32838ef73c42e2d8;hb=d330cf697501c14bb696256cb27c9e69b9edf3f4;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623 diff --git a/slider.c b/slider.c index 558f55bd..242f1c35 100644 --- a/slider.c +++ b/slider.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2004-2006 Andre Noll * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file slider.c libzmw-based stream creator for paraslash */ @@ -28,7 +16,7 @@ #define VAL_2_SL_VAL(v) (v) * (SLIDER_RATIO - 1.0) / SLIDER_RATIO #define SL_VAL_2_VAL(v) (v) * SLIDER_RATIO / (SLIDER_RATIO - 1.0) #define VAL_2_SCORE(v) (v) > 0.5? 1 / (1.03 - (v)) / (1.03 - (v)) :\ - - 1 / ((v) + 0.03) / ((v) + 0.03) + - 1 / ((v) + 0.03) / ((v) + 0.03) #define RGB(R,G,B) (((R)<<12) + ((G)<<6) + (B)) @@ -39,28 +27,12 @@ #define NUMPLAYED_FORMULA(v)\ 10 * (v) + (v) / (1 - (v) * (1 - EPSILON)) - static int argc; static char **argv; char *streamname = NULL; static Zmw_Float_0_1 *slider_vals, lastplayed_val, numplayed_val; -#if 0 -static void boxed_text(const char *text, int i) -{ - ZMW(zmw_decorator(Zmw_Decorator_Border_Embossed)) - { - if (i == 2) - { - zmw_horizontal_expand(Zmw_False) ; - zmw_vertical_expand(Zmw_False) ; - } - zmw_label(text) ; - } -} -#endif - -void para_log(int ll, char* fmt,...) /* no logging */ +void para_log(int ll, const char* fmt,...) /* no logging */ { }