Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / dialog_soundselect.h

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_soundselect.h b/synfig-studio/trunk/src/gtkmm/dialog_soundselect.h
index 9897bff..d23ce93 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dialog_soundselect.h
+++ b/synfig-studio/trunk/src/gtkmm/dialog_soundselect.h
@@ -1,35 +1,37 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dialog_soundselect.h
 **     \brief Sound Select Header
 **
-**     $Id: dialog_soundselect.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 David Roden
 **
-**     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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_DIALOG_SOUNDSELECT_H
-#define __SINFG_DIALOG_SOUNDSELECT_H
+#ifndef __SYNFIG_DIALOG_SOUNDSELECT_H
+#define __SYNFIG_DIALOG_SOUNDSELECT_H
 
 /* === H E A D E R S ======================================================= */
 #include "dockdialog.h"
 #include "widget_filename.h"
 #include "widget_time.h"
 
-#include <sinfgapp/canvasinterface.h>
+#include <synfigapp/canvasinterface.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -42,41 +44,41 @@ namespace studio {
 struct AudioBaseInfo
 {
        std::string             file;
-       sinfg::Time             offset;
+       synfig::Time            offset;
 };
-       
+
 class Dialog_SoundSelect : public Gtk::Dialog
 {
        Widget_Filename         soundfile;
        Widget_Time                     offset;
-       Gtk::Button                     okbutton;
-       
-       etl::handle<sinfgapp::CanvasInterface> canvas_interface;
-       
+       Gtk::Button                     *okbutton;
+
+       etl::handle<synfigapp::CanvasInterface> canvas_interface;
+
        sigc::signal<void,const std::string &>  signal_file_changed_;
-       sigc::signal<void,const sinfg::Time &>  signal_offset_changed_;
-       
+       sigc::signal<void,const synfig::Time &> signal_offset_changed_;
+
        void on_file();
        void on_offset();
        void on_ok();
-       
+
 public:
-       Dialog_SoundSelect(Gtk::Window &parent,etl::handle<sinfgapp::CanvasInterface> ci );
+       Dialog_SoundSelect(Gtk::Window &parent,etl::handle<synfigapp::CanvasInterface> ci );
        ~Dialog_SoundSelect();
 
        //float get_global_fps() const { return globalfps; }
        void set_global_fps(float f);
 
-       sinfg::Time get_offset() const { return offset.get_value(); }
-       void set_offset(const sinfg::Time &t) {offset.set_value(t); }
-       
+       synfig::Time get_offset() const { return offset.get_value(); }
+       void set_offset(const synfig::Time &t) {offset.set_value(t); }
+
        std::string get_file() const { return soundfile.get_value(); }
        void set_file(const std::string &f) {soundfile.set_value(f); }
-       
+
        sigc::signal<void,const std::string &> &signal_file_changed() { return signal_file_changed_; }
-       sigc::signal<void,const sinfg::Time &> &signal_offset_changed() { return signal_offset_changed_; }
+       sigc::signal<void,const synfig::Time &> &signal_offset_changed() { return signal_offset_changed_; }
 };
-       
+
 }; // END of namespace studio
 
 /* === E N D =============================================================== */