X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fcondition.h;h=22b38a6b73063df0f6a164117d6d502e96819e92;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hp=1fd455e2e1400d42c452670e1ed2df1b45a13333;hpb=50a589b1decdd353a984d8a710e064ebaf8b4f7b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/condition.h b/cinelerra-5.1/guicast/condition.h
index 1fd455e2..22b38a6b 100644
--- a/cinelerra-5.1/guicast/condition.h
+++ b/cinelerra-5.1/guicast/condition.h
@@ -2,29 +2,30 @@
 /*
  * 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 CONDITION_H
 #define CONDITION_H
 
 #include <pthread.h>
+#include "bctrace.inc"
 
-class Condition
+class Condition : public trace_info
 {
 public:
 	Condition(int init_value = 0, const char *title = 0, int is_binary = 0);
@@ -50,14 +51,41 @@ public:
 	const char *title;
 };
 
-class cLock
+#if 0
+#include <stdio.h>
+
+class TCondition : public Condition
 {
-	Condition &cond;
 public:
-	cLock(Condition &c) : cond(c) { cond.lock(); }
-	cLock(Condition *c) : cond(*c) { cond.lock(); }
-	~cLock() { cond.unlock(); }
+	TCondition(int init_value = 0, const char *title = 0, int is_binary = 0)
+	 : Condition(init_value, title, is_binary) {
+		printf("new TCondition(%s) = %p\n", title, this);
+	}
+	~TCondition() {
+		printf("del TCondition(%s) = %p\n", title, this);
+	}
+	void lock(const char *location = 0) {
+		printf("Locking %p: %s\n", this, title);  Condition::lock(location);
+		printf("Locked %p: %s\n", this, title);
+	}
+	void unlock() {
+		printf("Unlocking %p: %s\n", this, title);  Condition::unlock();
+	}
+	int timed_lock(int microseconds, const char *location = 0) {
+		printf("timed locking %p: %s\n", this, title);
+		int ret = Condition::timed_lock(microseconds, location);
+		printf("timed locked %p:%d %s\n", this, ret,  title);  return ret;
+	}
+	void reset() {
+		printf("Reset %p: %s\n", this, title);
+		Condition::reset();
+	}
+	int get_value() {
+		int ret = Condition::get_value();
+		printf("get_value %p:%d %s\n", this, ret, title);
+		return ret;
+	}
 };
 
-
+#endif
 #endif