gnomemm r1438 - in gstreamermm/trunk: . gstreamer/src

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Wed Apr  2 03:22:42 2008
New Revision: 1438
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1438&view=rev

Log:
2008-04-01  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/src/event.hg:
	* gstreamer/src/message.ccg:
	* gstreamer/src/message.hg:
	* gstreamer/src/query.ccg:
	* gstreamer/src/query.hg: Modified get_structure() methods to get
	GstStructure* for each call (It seems more reliable if structure is
	changed for any reason); Removed unused members structure_

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/event.ccg
   gstreamermm/trunk/gstreamer/src/event.hg
   gstreamermm/trunk/gstreamer/src/message.ccg
   gstreamermm/trunk/gstreamer/src/message.hg
   gstreamermm/trunk/gstreamer/src/query.ccg
   gstreamermm/trunk/gstreamer/src/query.hg

Modified: gstreamermm/trunk/gstreamer/src/event.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.ccg	Wed Apr  2 03:22:42 2008
@@ -36,15 +36,12 @@
 
 const Structure* Event::get_structure()
 {
-  static bool got_structure = false;
+  static Structure structure;
 
-  if(!got_structure) {
-    Structure temp(const_cast<GstStructure*>(gst_event_get_structure(gobj())), false);
-    structure_.swap(temp);
-    got_structure = true;
-  }
-
-  return &structure_;
+  GstStructure* gst_structure = const_cast<GstStructure*>(gst_event_get_structure(gobj()));
+  Structure temp(gst_structure, false /*don't copy*/, false /*don't destroy*/);
+  structure.swap(temp);
+  return &structure;
 }
 
 bool Event::is_downstream() const

Modified: gstreamermm/trunk/gstreamer/src/event.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.hg	Wed Apr  2 03:22:42 2008
@@ -89,9 +89,6 @@
   _MEMBER_GET(event_type, type, EventType, GstEventType)
   _MEMBER_GET(timestamp, timestamp, ClockTime, guint64)
   _MEMBER_GET_GOBJECT(source, src, Gst::Object, GstObject*)
-
-protected:
-  Structure structure_;
 };
 
 class EventBufferSize : public Event

Modified: gstreamermm/trunk/gstreamer/src/message.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.ccg	Wed Apr  2 03:22:42 2008
@@ -37,15 +37,12 @@
 const Structure*
 Message::get_structure()
 {
-  static bool got_structure = false;
+  static Structure structure;
 
-  if(!got_structure) {
-    Structure temp(const_cast<GstStructure*>(gst_message_get_structure(gobj())), false);
-    structure_.swap(temp);
-    got_structure = true;
-  }
-
-  return &structure_;
+  GstStructure* gst_structure = const_cast<GstStructure*>(gst_message_get_structure(gobj()));
+  Structure temp(gst_structure, false /*don't copy*/, false /*don't destroy*/);
+  structure.swap(temp);
+  return &structure;
 }
 
 MessageApplication::MessageApplication(GstMessage* castitem)

Modified: gstreamermm/trunk/gstreamer/src/message.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/message.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/message.hg	Wed Apr  2 03:22:42 2008
@@ -59,9 +59,6 @@
   _MEMBER_GET(message_type, type, MessageType, GstMessageType)
   _MEMBER_GET(timestamp, timestamp, ClockTime, guint64)
   _MEMBER_GET_GOBJECT(source, src, Gst::Object, GstObject*)
-
-protected: 
-  Structure structure_;
 };
 
 class MessageApplication : public Message

Modified: gstreamermm/trunk/gstreamer/src/query.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.ccg	Wed Apr  2 03:22:42 2008
@@ -36,15 +36,12 @@
 
 const Structure* Query::get_structure()
 {
-  static bool got_structure = false;
+  static Structure structure;
 
-  if(!got_structure) {
-    Structure temp(const_cast<GstStructure*>(gst_query_get_structure(gobj())), false);
-    structure_.swap(temp);
-    got_structure = true;
-  }
-
-  return &structure_;
+  GstStructure* gst_structure = const_cast<GstStructure*>(gst_query_get_structure(gobj()));
+  Structure temp(gst_structure, false /*don't copy*/, false /*don't destroy*/);
+  structure.swap(temp);
+  return &structure;
 }
 
 bool get_details(QueryType type, QueryTypeDefinition &def)

Modified: gstreamermm/trunk/gstreamer/src/query.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/query.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/query.hg	Wed Apr  2 03:22:42 2008
@@ -70,9 +70,6 @@
   //TODO: static bool query_types_contains(const std::vector<const QueryType>& types, QueryType type)
 
   bool get_details(QueryType type, QueryTypeDefinition& def);
-
-protected:
-  Structure structure_;
 };
 
 class QueryConvert : public Query