diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 9 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins-sections.txt | 70 | ||||
| -rw-r--r-- | sys/osxaudio/gstosxaudiosink.h | 4 | ||||
| -rw-r--r-- | sys/osxvideo/osxvideosink.h | 74 |
5 files changed, 92 insertions, 73 deletions
@@ -1,5 +1,13 @@ 2008-01-15 Stefan Kost <ensonic@users.sf.net> + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-good-plugins-sections.txt: + * sys/osxaudio/gstosxaudiosink.h: + * sys/osxvideo/osxvideosink.h: + Managed to resolve most unused declarations. Filed a bug for one left. + +2008-01-15 Stefan Kost <ensonic@users.sf.net> + * docs/plugins/gst-plugins-good-plugins-sections.txt: Cleanup section file. diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index a1e85498..b2f6f9fe 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -111,6 +111,8 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/icydemux/gsticydemux.h \ $(top_srcdir)/gst/id3demux/gstid3demux.h \ $(top_srcdir)/gst/level/gstlevel.h \ + $(top_srcdir)/gst/multipart/multipartdemux.h \ + $(top_srcdir)/gst/multipart/multipartmux.h \ $(top_srcdir)/gst/qtdemux/qtdemux.h \ $(top_srcdir)/gst/rtsp/gstrtpdec.h \ $(top_srcdir)/gst/rtsp/gstrtspsrc.h \ @@ -131,14 +133,13 @@ EXTRA_HFILES = \ $(top_srcdir)/sys/oss/gstossmixerelement.h \ $(top_srcdir)/sys/oss/gstosssink.h \ $(top_srcdir)/sys/oss/gstosssrc.h \ + $(top_srcdir)/sys/osxaudio/gstosxaudiosrc.h \ + $(top_srcdir)/sys/osxaudio/gstosxaudiosink.h \ + $(top_srcdir)/sys/osxvideo/osxvideosink.h \ $(top_srcdir)/sys/osxvideo/osxvideosink.h \ $(top_srcdir)/sys/v4l2/gstv4l2src.h \ $(top_srcdir)/sys/ximage/gstximagesrc.h -# file that need splitting a header -# $(top_srcdir)/gst/multipart/multipartdemux.c -# $(top_srcdir)/gst/multipart/multipartmux.c - # example code that needs to be converted to xml and placed in xml/ EXAMPLE_CFILES = \ diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 2b4e07ca..18aaa156 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -192,6 +192,7 @@ GST_AVI_SUPERINDEX_COUNT avi_stream_context gst_avi_index_entry gst_avi_superindex_entry +CHUNKID_TO_STREAMNR </SECTION> <SECTION> @@ -272,6 +273,17 @@ gst_cdio_cdda_src_get_type GstDirectDrawSink <SUBSECTION Standard> GstDirectDrawSinkClass +GST_DIRECTDRAW_SINK +GST_DIRECTDRAW_SINK_CLASS +GST_IS_DIRECTDRAW_SINK +GST_IS_DIRECTDRAW_SINK_CLASS +GST_TYPE_DIRECTDRAW_SINK +gst_directdraw_sink_get_type +GstDDrawSurface +GST_DDRAWSURFACE +GST_IS_DDRAWSURFACE +GST_TYPE_DDRAWSURFACE +DIRECTDRAW_VERSION </SECTION> <SECTION> @@ -280,6 +292,14 @@ GstDirectDrawSinkClass GstDirectSoundSink <SUBSECTION Standard> GstDirectSoundSinkClass +GST_DIRECTSOUND_SINK +GST_DIRECTSOUND_SINK_CLASS +GST_IS_DIRECTSOUND_SINK +GST_IS_DIRECTSOUND_SINK_CLASS +GST_TYPE_DIRECTSOUND_SINK +gst_directsound_sink_get_type +GST_DSOUND_LOCK +GST_DSOUND_UNLOCK </SECTION> <SECTION> @@ -302,6 +322,7 @@ gst_dvdec_get_type GstDVDemux <SUBSECTION Standard> GstDVDemuxClass +GstDVDemuxSeekHandler GST_TYPE_DVDEMUX GST_DVDEMUX GST_DVDEMUX_CLASS @@ -336,6 +357,7 @@ GST_FLAC_DEC_CLASS GST_IS_FLAC_DEC GST_IS_FLAC_DEC_CLASS gst_flac_dec_get_type +LEGACY_FLAC </SECTION> <SECTION> @@ -567,6 +589,9 @@ GstOsxAudioSink <SUBSECTION Standard> GstOsxAudioSinkClass GST_TYPE_OSX_AUDIO_SINK +GST_OSX_AUDIO_SINK +GST_OSX_AUDIO_SINK_CLASS +gst_osx_audio_sink_get_type </SECTION> <SECTION> @@ -575,7 +600,10 @@ GST_TYPE_OSX_AUDIO_SINK GstOsxAudioSrc <SUBSECTION Standard> GstOsxAudioSrcClass -GST_TYPE_OSX_AUDIO_SINK +GST_TYPE_OSX_AUDIO_SRC +GST_OSX_AUDIO_SRC +GST_OSX_AUDIO_SRC_CLASS +gst_osx_audio_src_get_type </SECTION> <SECTION> @@ -590,7 +618,6 @@ GST_IS_OSXVIDEOSINK GST_IS_OSXVIDEOSINK_CLASS GST_OSXVIDEOSINK GST_OSXVIDEOSINK_CLASS -GST_TYPE_OSXVIDEOBUFFER GST_TYPE_OSXVIDEOSINK GstOSXWindow gst_osxvideosink_get_type @@ -660,10 +687,8 @@ gst_qtdemux_get_type <SECTION> <FILE>element-rtspsrc</FILE> <TITLE>rtspsrc</TITLE> -RTSPLowerTrans GstRTSPSrc <SUBSECTION Standard> -gst_rtspsrc_send GstRTSPStream GstRTSPSrcClass GST_RTSPSRC @@ -673,9 +698,15 @@ gst_rtspsrc_get_type GST_RTSPSRC_CLASS GST_IS_RTSPSRC_CLASS GST_RTSPSRC_CAST -GST_RTSP_LOOP_GET_COND -GST_RTSP_LOOP_SIGNAL -GST_RTSP_LOOP_WAIT +GST_RTSP_CONN_GET_LOCK +GST_RTSP_CONN_LOCK +GST_RTSP_CONN_UNLOCK +GST_RTSP_STATE_GET_LOCK +GST_RTSP_STATE_LOCK +GST_RTSP_STATE_UNLOCK +GST_RTSP_STREAM_GET_LOCK +GST_RTSP_STREAM_LOCK +GST_RTSP_STREAM_UNLOCK </SECTION> <SECTION> @@ -809,28 +840,10 @@ GST_VIDEO_MIXER_PAD GST_VIDEO_MIXER_PAD_CLASS GST_IS_VIDEO_MIXER_PAD GST_IS_VIDEO_MIXER_PAD_CLASS -GST_TYPE_VIDEO_MIXER_BACKGROUND GST_TYPE_VIDEO_MIXER_PAD GstVideoMixerCollect GstVideoMixerPad GstVideoMixerPadClass -BLEND_ADD -BLEND_DARKEN -BLEND_DIFFERENCE -BLEND_EXCLUSION -BLEND_LIGHTEN -BLEND_MODE -BLEND_MULTIPLY -BLEND_NORMAL -BLEND_SOFTLIGHT -BLEND_SUBTRACT -DEFAULT_AUTOSCAN -DEFAULT_BACKGROUND -DEFAULT_BOUNDARY -DEFAULT_PAD_ALPHA -DEFAULT_PAD_XPOS -DEFAULT_PAD_YPOS -DEFAULT_PAD_ZORDER </SECTION> <SECTION> @@ -865,6 +878,13 @@ GST_WAVEFORM_SINK GST_WAVEFORM_SINK_CLASS GST_TYPE_WAVEFORM_SINK gst_waveform_sink_get_type +WAVE_FORMAT_96M08 +WAVE_FORMAT_96M16 +WAVE_FORMAT_96S08 +WAVE_FORMAT_96S16 +BUFFER_COUNT +BUFFER_SIZE +ERROR_LENGTH </SECTION> <SECTION> diff --git a/sys/osxaudio/gstosxaudiosink.h b/sys/osxaudio/gstosxaudiosink.h index aefdef00..ba71c11d 100644 --- a/sys/osxaudio/gstosxaudiosink.h +++ b/sys/osxaudio/gstosxaudiosink.h @@ -63,10 +63,6 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSX_AUDIO_SINK,GstOsxAudioSink)) #define GST_OSX_AUDIO_SINK_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSX_AUDIO_SINK,GstOsxAudioSinkClass)) -#define GST_IS_PLUGIN_TEMPLATE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSX_AUDIO_SINK)) -#define GST_IS_PLUGIN_TEMPLATE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSX_AUDIO_SINK)) typedef struct _GstOsxAudioSink GstOsxAudioSink; typedef struct _GstOsxAudioSinkClass GstOsxAudioSinkClass; diff --git a/sys/osxvideo/osxvideosink.h b/sys/osxvideo/osxvideosink.h index d7fba966..a51a66b1 100644 --- a/sys/osxvideo/osxvideosink.h +++ b/sys/osxvideo/osxvideosink.h @@ -1,7 +1,5 @@ /* GStreamer - * Copyright (C) 2004-6 Zaheer Abbas Merali <zaheerabbas at merali dot org> - * Copyright (C) 2007 Pioneers of the Inevitable <songbird@songbirdnest.com> - * + * Copyright (C) 2004 Zaheer Abbas Merali <zaheerabbas at merali dot org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,62 +15,65 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. - * - * - * The development of this code was made possible due to the involvement of Pioneers - * of the Inevitable, the creators of the Songbird Music player - * */ -#ifndef __GST_OSX_VIDEO_SINK_H__ -#define __GST_OSX_VIDEO_SINK_H__ +#ifndef __GST_OSXVIDEOSINK_H__ +#define __GST_OSXVIDEOSINK_H__ + +#include <gst/gst.h> #include <gst/video/gstvideosink.h> #include <string.h> #include <math.h> -#include <Cocoa/Cocoa.h> +#define HAVE_OSX +#ifdef HAVE_OSX #include <QuickTime/QuickTime.h> #import "cocoawindow.h" - -GST_DEBUG_CATEGORY_EXTERN (gst_debug_osx_video_sink); -#define GST_CAT_DEFAULT gst_debug_osx_video_sink +#endif G_BEGIN_DECLS -#define GST_TYPE_OSX_VIDEO_SINK \ - (gst_osx_video_sink_get_type()) -#define GST_OSX_VIDEO_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_OSX_VIDEO_SINK, GstOSXVideoSink)) -#define GST_OSX_VIDEO_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_OSX_VIDEO_SINK, GstOSXVideoSinkClass)) -#define GST_IS_OSX_VIDEO_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_OSX_VIDEO_SINK)) -#define GST_IS_OSX_VIDEO_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_OSX_VIDEO_SINK)) +#define GST_TYPE_OSXVIDEOSINK \ + (gst_osxvideosink_get_type()) +#define GST_OSXVIDEOSINK(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_OSXVIDEOSINK, GstOSXVideoSink)) +#define GST_OSXVIDEOSINK_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_OSXVIDEOSINK, GstOSXVideoSinkClass)) +#define GST_IS_OSXVIDEOSINK(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_OSXVIDEOSINK)) +#define GST_IS_OSXVIDEOSINK_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_OSXVIDEOSINK)) typedef struct _GstOSXWindow GstOSXWindow; +typedef struct _GstOSXImage GstOSXImage; typedef struct _GstOSXVideoSink GstOSXVideoSink; typedef struct _GstOSXVideoSinkClass GstOSXVideoSinkClass; -#define GST_TYPE_OSXVIDEOBUFFER (gst_osxvideobuffer_get_type()) - /* OSXWindow stuff */ struct _GstOSXWindow { gint width, height; gboolean internal; - GstOSXVideoSinkWindow* win; +#ifdef HAVE_OSX + GstWindow* win; GstGLView* gstview; - NSAutoreleasePool *pool; +#endif }; struct _GstOSXVideoSink { /* Our element stuff */ GstVideoSink videosink; + GstOSXWindow *osxwindow; + GstOSXImage *osximage; + GstOSXImage *cur_image; + int width; + int height; + guint32 format; + gint fps_n; gint fps_d; @@ -88,20 +89,13 @@ struct _GstOSXVideoSink { struct _GstOSXVideoSinkClass { GstVideoSinkClass parent_class; -}; -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 + /* signal callbacks */ + void (*view_created) (GstElement* element, gpointer view); +}; -@interface GstAppDelegate : NSObject -- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender; -@end +GType gst_osxvideosink_get_type(void); G_END_DECLS -#endif /* __GST_OSX_VIDEO_SINK_H__ */ +#endif /* __GST_OSXVIDEOSINK_H__ */ |