mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 02:01:12 +00:00
gst/gstpad.c: (gst_pad_set_getcaps_function)
Original commit message from CVS: * gst/gstpad.c: (gst_pad_set_event_function), (gst_pad_set_query_function), (gst_pad_set_query_type_function), (gst_pad_set_getcaps_function) * gst/parse/grammar.y: (gst_parse_found_pad), (gst_parse_perform_delayed_link) Fixed NULL pointer used in GST_CAT_DEBUG using GST_STR_NULL macro So now, we can use --gst-debug-level=5 on Windows * win32/common/libgstcontroller.def: Added export of gst_controller_init * win32/vs6/libgstcontroller.dsp: Fixed Release post build configuration
This commit is contained in:
Sébastien Moutte
parent
70e4214ebf
commit
3eb3b1c742
5 changed files with 42 additions and 12 deletions
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
2006-02-19 Sebastien Moutte <sebastien@moutte.net>
|
||||
|
||||
* gst/gstpad.c: (gst_pad_set_event_function),
|
||||
(gst_pad_set_query_function), (gst_pad_set_query_type_function),
|
||||
(gst_pad_set_getcaps_function)
|
||||
* gst/parse/grammar.y: (gst_parse_found_pad), (gst_parse_perform_delayed_link)
|
||||
Fixed NULL pointer used in GST_CAT_DEBUG using GST_STR_NULL macro
|
||||
So now, we can use --gst-debug-level=5 on Windows
|
||||
* win32/common/libgstcontroller.def:
|
||||
Added export of gst_controller_init
|
||||
* win32/vs6/libgstcontroller.dsp:
|
||||
Fixed Release post build configuration
|
||||
|
||||
2006-02-17 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* tests/check/gst/gstquery.c: (GST_START_TEST):
|
||||
|
|
|
|||
12
gst/gstpad.c
12
gst/gstpad.c
|
|
@ -1113,7 +1113,8 @@ gst_pad_set_event_function (GstPad * pad, GstPadEventFunction event)
|
|||
GST_PAD_EVENTFUNC (pad) = event;
|
||||
|
||||
GST_CAT_DEBUG (GST_CAT_PADS, "eventfunc for %s:%s set to %s",
|
||||
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (event));
|
||||
GST_STR_NULL (GST_DEBUG_PAD_NAME (pad)),
|
||||
GST_STR_NULL (GST_DEBUG_FUNCPTR_NAME (event)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1131,7 +1132,8 @@ gst_pad_set_query_function (GstPad * pad, GstPadQueryFunction query)
|
|||
GST_PAD_QUERYFUNC (pad) = query;
|
||||
|
||||
GST_CAT_DEBUG (GST_CAT_PADS, "queryfunc for %s:%s set to %s",
|
||||
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (query));
|
||||
GST_STR_NULL (GST_DEBUG_PAD_NAME (pad)),
|
||||
GST_STR_NULL (GST_DEBUG_FUNCPTR_NAME (query)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1150,7 +1152,8 @@ gst_pad_set_query_type_function (GstPad * pad,
|
|||
GST_PAD_QUERYTYPEFUNC (pad) = type_func;
|
||||
|
||||
GST_CAT_DEBUG (GST_CAT_PADS, "querytypefunc for %s:%s set to %s",
|
||||
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (type_func));
|
||||
GST_STR_NULL (GST_DEBUG_PAD_NAME (pad)),
|
||||
GST_STR_NULL (GST_DEBUG_FUNCPTR_NAME (type_func)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1306,7 +1309,8 @@ gst_pad_set_getcaps_function (GstPad * pad, GstPadGetCapsFunction getcaps)
|
|||
|
||||
GST_PAD_GETCAPSFUNC (pad) = getcaps;
|
||||
GST_CAT_DEBUG (GST_CAT_PADS, "getcapsfunc for %s:%s set to %s",
|
||||
GST_DEBUG_PAD_NAME (pad), GST_DEBUG_FUNCPTR_NAME (getcaps));
|
||||
GST_STR_NULL (GST_DEBUG_PAD_NAME (pad)),
|
||||
GST_STR_NULL (GST_DEBUG_FUNCPTR_NAME (getcaps)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -404,16 +404,16 @@ gst_parse_found_pad (GstElement *src, GstPad *pad, gpointer data)
|
|||
DelayedLink *link = (DelayedLink *) data;
|
||||
|
||||
GST_CAT_INFO (GST_CAT_PIPELINE, "trying delayed linking %s:%s to %s:%s",
|
||||
GST_ELEMENT_NAME (src), link->src_pad,
|
||||
GST_ELEMENT_NAME (link->sink), link->sink_pad);
|
||||
GST_STR_NULL (GST_ELEMENT_NAME (src)), GST_STR_NULL (link->src_pad),
|
||||
GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad));
|
||||
|
||||
if (gst_element_link_pads_filtered (src, link->src_pad, link->sink,
|
||||
link->sink_pad, link->caps)) {
|
||||
/* do this here, we don't want to get any problems later on when
|
||||
* unlocking states */
|
||||
GST_CAT_DEBUG (GST_CAT_PIPELINE, "delayed linking %s:%s to %s:%s worked",
|
||||
GST_ELEMENT_NAME (src), link->src_pad,
|
||||
GST_ELEMENT_NAME (link->sink), link->sink_pad);
|
||||
GST_STR_NULL (GST_ELEMENT_NAME (src)), GST_STR_NULL (link->src_pad),
|
||||
GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad));
|
||||
g_signal_handler_disconnect (src, link->signal_id);
|
||||
g_free (link->src_pad);
|
||||
g_free (link->sink_pad);
|
||||
|
|
@ -442,8 +442,8 @@ gst_parse_perform_delayed_link (GstElement *src, const gchar *src_pad,
|
|||
/* TODO: maybe we should check if src_pad matches this template's names */
|
||||
|
||||
GST_CAT_DEBUG (GST_CAT_PIPELINE, "trying delayed link %s:%s to %s:%s",
|
||||
GST_ELEMENT_NAME (src), src_pad,
|
||||
GST_ELEMENT_NAME (sink), sink_pad);
|
||||
GST_STR_NULL (GST_ELEMENT_NAME (src)), GST_STR_NULL (src_pad),
|
||||
GST_STR_NULL (GST_ELEMENT_NAME (sink)), GST_STR_NULL (sink_pad));
|
||||
|
||||
data->src_pad = g_strdup (src_pad);
|
||||
data->sink = sink;
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
EXPORTS
|
||||
gst_controller_init
|
||||
gst_object_sync_values
|
||||
|
|
@ -40,6 +40,7 @@ RSC=rc.exe
|
|||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTCONTROLLER_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../libs" /I "../common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTCONTROLLER_EXPORTS" /D "HAVE_CONFIG_H" /YX /FD /c
|
||||
|
|
@ -52,7 +53,12 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib /nologo /dll /machine:I386 /out:"Release/libgstcontroller-0.10.dll"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Release\libgstcontroller-0.10.dll
|
||||
SOURCE="$(InputPath)"
|
||||
PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin
|
||||
# End Special Build Tool
|
||||
|
||||
!ELSEIF "$(CFG)" == "libgstcontroller - Win32 Debug"
|
||||
|
||||
|
|
@ -65,6 +71,7 @@ LINK32=link.exe
|
|||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTCONTROLLER_EXPORTS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../libs" /I "../common" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTCONTROLLER_EXPORTS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
|
||||
|
|
@ -77,7 +84,12 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstcontroller-0.10.dll" /pdbtype:sept
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Debug\libgstcontroller-0.10.dll
|
||||
SOURCE="$(InputPath)"
|
||||
PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin
|
||||
# End Special Build Tool
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue