X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_sound.cpp;h=631db4b31d9ea6210e354f50e0cc04263732396c;hb=29b64838a7e7b91aa32c8a3f4a69e64b31d5558d;hp=c19780dca013e72c97a2f6db8974b448162b1df8;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_sound.cpp b/synfig-studio/trunk/src/gtkmm/widget_sound.cpp index c19780d..631db4b 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_sound.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_sound.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file widget_sound.cpp ** \brief Widget Sound Implementation File ** ** $Id: widget_sound.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package 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. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package 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. ** \endlegal */ /* ========================================================================= */ @@ -30,7 +31,7 @@ #include -#include +#include #include #include "widget_sound.h" @@ -42,7 +43,7 @@ using namespace std; using namespace etl; -//using namespace sinfg; +//using namespace synfig; using studio::AudioProfile; @@ -66,7 +67,7 @@ studio::Widget_Sound::~Widget_Sound() void studio::Widget_Sound::set_position(double t) { - //sinfg::info("Setting position to %.2lf s", t); + //synfig::info("Setting position to %.2lf s", t); if(adj_timescale && t != adj_timescale->get_value()) { float upper = adj_timescale->get_upper(); @@ -166,7 +167,7 @@ bool studio::Widget_Sound::on_expose_event(GdkEventExpose *heh) //redraw all the samples from begin to end, but only if we have samples to draw (or there is no space to draw) - //sinfg::warning("Ok rendered everything, now must render actual sound wave"); + //synfig::warning("Ok rendered everything, now must render actual sound wave"); if(!audioprof || !adj_timescale || !w) { get_window()->end_paint(); @@ -210,7 +211,7 @@ bool studio::Widget_Sound::on_expose_event(GdkEventExpose *heh) delta = (end - begin)/(float)w; //samples per pixel - /*sinfg::warning("Rendering a framesize of %f secs from [%d,%d) samples to %d samples, took %f sec", + /*synfig::warning("Rendering a framesize of %f secs from [%d,%d) samples to %d samples, took %f sec", framesize, begin, end, w, check());*/ cur = begin; @@ -237,7 +238,7 @@ bool studio::Widget_Sound::on_expose_event(GdkEventExpose *heh) } } - //sinfg::warning("Drawing audio line"); + //synfig::warning("Drawing audio line"); c.set_rgb_p(1,0,0); gc->set_rgb_fg_color(c); get_window()->draw_line(gc,posi,0,posi,get_height());