From b9ca852b510d0d0486db098fbaf23641f8a54015 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 5 Feb 2009 10:19:37 -0800 Subject: osxvideosink: remove non-embedded mode and fix memory management. Remove non-embedded mode. Embed mode becomes default and only mode. embed property is retained for binary compatibility. Added autorelease pools around all objc functions that might be called from a non-main thread. --- sys/osxvideo/osxvideosink.h | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'sys/osxvideo/osxvideosink.h') diff --git a/sys/osxvideo/osxvideosink.h b/sys/osxvideo/osxvideosink.h index ccaeb6ca..a29f2186 100644 --- a/sys/osxvideo/osxvideosink.h +++ b/sys/osxvideo/osxvideosink.h @@ -63,27 +63,13 @@ typedef struct _GstOSXVideoSinkClass GstOSXVideoSinkClass; struct _GstOSXWindow { gint width, height; gboolean internal; - GstOSXVideoSinkWindow* win; GstGLView* gstview; - NSAutoreleasePool *pool; }; struct _GstOSXVideoSink { /* Our element stuff */ GstVideoSink videosink; GstOSXWindow *osxwindow; - - GstTask *event_task; - GStaticRecMutex event_task_lock; - - /* Unused */ - gint pixel_width, pixel_height; - - GstClockTime time; - - gboolean embed; - gboolean fullscreen; - gboolean sw_scaling_failed; }; struct _GstOSXVideoSinkClass { @@ -92,16 +78,6 @@ struct _GstOSXVideoSinkClass { GType gst_osx_video_sink_get_type(void); -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 -@interface NSApplication(AppleMenu) -- (void)setAppleMenu:(NSMenu *)menu; -@end -#endif - -@interface GstAppDelegate : NSObject -- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender; -@end - G_END_DECLS #endif /* __GST_OSX_VIDEO_SINK_H__ */ -- cgit