Permalink
Browse files

Mostly style changes

  • Loading branch information...
1 parent 821f0ff commit 49160a35f092db853b68ea8bf7d716816a4caeb8 Richard Hult committed Sep 9, 2007
Showing with 277 additions and 318 deletions.
  1. +1 −1 acinclude.m4
  2. +2 −3 src/Makefile.am
  3. +4 −8 src/gtk-osx-video-embed.c
  4. +232 −251 src/gtk-osx-video-sink.c
  5. +31 −49 src/gtk-osx-video-sink.h
  6. +7 −6 src/test.c
View
@@ -118,6 +118,6 @@ AC_DEFUN([AG_GST_SET_PLUGINDIR],
AC_MSG_NOTICE([Using $PLUGINDIR as the plugin install location])
dnl plugin directory configure-time variable for use in Makefile.am
- plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
+ plugindir="\$(libdir)/gstreamer-0.10"
AC_SUBST(plugindir)
])
View
@@ -4,9 +4,8 @@ plugin_LTLIBRARIES = libgtkosxvideosink.la
libgtkosxvideosink_la_SOURCES = gtk-osx-video-sink.c
libgtkosxvideosink_la_CFLAGS = $(SINK_CFLAGS) -xobjective-c
-libgtkosxvideosink_la_LIBADD = $(SINK_LIBS) -lgstvideo-0.10
-
-#libgtkosxvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -framework Cocoa -framework OpenGL
+libgtkosxvideosink_la_LIBADD = $(SINK_LIBS) -lgstvideo-0.10 libgtkosxvideoembed.la
+libgtkosxvideosink_la_LDFLAGS = -module -avoid-version -framework Cocoa -framework OpenGL
noinst_HEADERS = gtk-osx-video-sink.h
View
@@ -23,7 +23,7 @@ gtk_osx_video_embed_get_type (void)
embed_type = g_type_register_static (G_TYPE_INTERFACE,
"GtkOSXVideoEmbed", &embed_info, 0);
g_type_interface_add_prerequisite (embed_type, G_TYPE_OBJECT);
- //g_type_interface_add_prerequisite (embed_type, GST_VIDEO_SINK);
+ /*g_type_interface_add_prerequisite (embed_type, GST_VIDEO_SINK);*/
}
return embed_type;
@@ -33,14 +33,10 @@ void
gtk_osx_video_embed_set_widget (GtkOSXVideoEmbed *embed,
GtkWidget *widget)
{
- GtkOSXVideoEmbedIface *iface;
-
- g_return_if_fail (embed != NULL);
g_return_if_fail (GTK_IS_OSX_VIDEO_EMBED (embed));
+ g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
- iface = GTK_OSX_VIDEO_EMBED_GET_IFACE (embed);
-
- if (iface->set_widget) {
- iface->set_widget (embed, widget);
+ if (GTK_OSX_VIDEO_EMBED_GET_IFACE (embed)->set_widget) {
+ GTK_OSX_VIDEO_EMBED_GET_IFACE (embed)->set_widget (embed, widget);
}
}
Oops, something went wrong.

0 comments on commit 49160a3

Please sign in to comment.