Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / cinelerra / mainclock.h

diff --git a/cinelerra-5.0/cinelerra/mainclock.h b/cinelerra-5.0/cinelerra/mainclock.h
deleted file mode 100644 (file)
index 3653246..0000000
--- a/cinelerra-5.0/cinelerra/mainclock.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/*
- * CINELERRA
- * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
- * 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-1307  USA
- * 
- */
-
-#ifndef MAINCLOCK_H
-#define MAINCLOCK_H
-
-#include "guicast.h"
-#include "mwindow.inc"
-#include "mwindowgui.inc"
-
-class MainClock : public BC_Title
-{
-public:
-       MainClock(MWindow *mwindow, int x, int y, int w);
-       ~MainClock();
-       
-       void update(double position);
-       
-       MWindow *mwindow;
-};
-
-
-#endif