Fix FSF address

[platform/upstream/gstreamer.git] / gst / playback / gstplaysinkconvertbin.h

diff --git a/gst/playback/gstplaysinkconvertbin.h b/gst/playback/gstplaysinkconvertbin.h
index 7fac18d..1e452b2 100644 (file)
--- a/gst/playback/gstplaysinkconvertbin.h
+++ b/gst/playback/gstplaysinkconvertbin.h
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #include <gst/gst.h>
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
     GST_LOG_OBJECT (obj,                                                \
                     "locking from thread %p",                           \
                     g_thread_self ());                                  \
-    g_mutex_lock (GST_PLAY_SINK_CONVERT_BIN_CAST(obj)->lock);                \
+    g_mutex_lock (&GST_PLAY_SINK_CONVERT_BIN_CAST(obj)->lock);                \
     GST_LOG_OBJECT (obj,                                                \
                     "locked from thread %p",                            \
                     g_thread_self ());                                  \
@@ -51,7 +51,7 @@ G_BEGIN_DECLS
     GST_LOG_OBJECT (obj,                                                \
                     "unlocking from thread %p",                         \
                     g_thread_self ());                                  \
-    g_mutex_unlock (GST_PLAY_SINK_CONVERT_BIN_CAST(obj)->lock);              \
+    g_mutex_unlock (&GST_PLAY_SINK_CONVERT_BIN_CAST(obj)->lock);              \
 } G_STMT_END
 
 typedef struct _GstPlaySinkConvertBin GstPlaySinkConvertBin;
@@ -62,10 +62,10 @@ struct _GstPlaySinkConvertBin
   GstBin parent;
 
   /* < private > */
-  GMutex *lock;
+  GMutex lock;
 
   GstPad *sinkpad, *sink_proxypad;
-  gboolean sink_proxypad_blocked;
+  guint sink_proxypad_block_id;
   GstSegment segment;
 
   GstPad *srcpad;
@@ -78,7 +78,6 @@ struct _GstPlaySinkConvertBin
 
   /* configuration for derived classes */
   gboolean audio;
-  gboolean (*add_conversion_elements)(GstPlaySinkConvertBin *);
 };
 
 struct _GstPlaySinkConvertBinClass
@@ -93,6 +92,12 @@ gst_play_sink_convert_bin_add_conversion_element_factory (GstPlaySinkConvertBin
 void
 gst_play_sink_convert_bin_add_conversion_element (GstPlaySinkConvertBin *self,
     GstElement *el);
+void
+gst_play_sink_convert_bin_cache_converter_caps (GstPlaySinkConvertBin * self);
+void
+gst_play_sink_convert_bin_remove_elements (GstPlaySinkConvertBin * self);
+void
+gst_play_sink_convert_bin_add_identity (GstPlaySinkConvertBin * self);
 
 G_END_DECLS
 #endif /* __GST_PLAY_SINK_CONVERT_BIN_H__ */