...
 
Commits (16)
SHELL=/bin/sh
prefix?=/usr/local
PKG_CONFIG?=pkg-config
OS=$(shell uname || uname -s)
ARCH=$(shell uname -m || arch)
......@@ -123,12 +124,12 @@ PICOBJECTS_PEASD = $(patsubst %.o,%.pic.o,$(OBJECTS_PEASD))
USE_RUNTIME_LINKER = $(shell grep "Linker" generated/gtkd/atk/c/functions.d)
ifeq ($(USE_RUNTIME_LINKER),)
SOFLAGS_GTKD = $(shell pkg-config --libs gtk+-3.0 librsvg-2.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_GTKDGL = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell pkg-config --libs gtkglext-3.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_GTKDSV = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell pkg-config --libs gtksourceview-3.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_GSTREAMERD = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell pkg-config --libs gstreamer-base-1.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_VTED = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell pkg-config --libs vte-2.91 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_PEASD = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell pkg-config --libs-only-l libpeas-1.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_GTKD = $(shell ${PKG_CONFIG} --libs gtk+-3.0 librsvg-2.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_GTKDGL = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell ${PKG_CONFIG} --libs gtkglext-3.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_GTKDSV = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell ${PKG_CONFIG} --libs gtksourceview-3.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_GSTREAMERD = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell ${PKG_CONFIG} --libs gstreamer-base-1.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_VTED = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell ${PKG_CONFIG} --libs vte-2.91 | sed 's/-[lL]/$(LINKERFLAG)&/g')
SOFLAGS_PEASD = $(LINKERFLAG)-L. $(LINKERFLAG)./libgtkd-$(MAJOR).$(SO_POSTFIX) $(shell ${PKG_CONFIG} --libs-only-l libpeas-1.0 | sed 's/-[lL]/$(LINKERFLAG)&/g')
endif
#######################################################################
......
......@@ -52,7 +52,7 @@ public:
extern(C):
version(Windows)
import std.c.windows.windows;
import core.sys.windows.windows;
/* *********************************************************** */
......
......@@ -421,7 +421,7 @@ void main(string[] args)
GStreamer.init(args);
writeln("Checking version of GStreamer...");
GStreamer.versio(major, minor, micro, nano);
GStreamer.version_(major, minor, micro, nano);
writefln("The installed version of GStreamer is %s.%s.%s", major, minor, micro );
GstMediaPlayer gstMediaPlayer = new GstMediaPlayer(args);
......
......@@ -53,6 +53,9 @@ import gtk.ListStore;
import gdk.RGBA;
import gdk.Color;
import pango.PgFontDescription;
import std.stdio;
enum {
COLUMN_NAME,
COLUMN_TEXT,
......@@ -61,6 +64,7 @@ enum {
COLUMN_BOOL_VISIBLE,
COLUMN_TEXT_COLOR,
COLUMN_TEXT_COLOR_RGBA,
COLUMN_TEXT_FONT_DESCRIPTION,
}
void main(string[] args){
......@@ -73,6 +77,7 @@ void main(string[] args){
GType.INT,
Color.getType(),
RGBA.getType(),
PgFontDescription.getType(),
] );
void appendRecord( string name, string value, bool isBoolean, RGBA rgba, Color color ){
......@@ -84,6 +89,7 @@ void main(string[] args){
store.setValue( it, COLUMN_BOOL_VISIBLE, isBoolean );
store.setValue( it, COLUMN_TEXT_COLOR_RGBA, rgba );
store.setValue( it, COLUMN_TEXT_COLOR, color );
store.setValue( it, COLUMN_TEXT_FONT_DESCRIPTION, new PgFontDescription() );
}
// fill store with data
appendRecord( "Loops", "10", false, new RGBA(1.0,0.0,0.0,1.0), new Color(64,64,64) );
......@@ -126,6 +132,17 @@ void main(string[] args){
auto path = new TreePath( p );
auto it = new TreeIter( store, path );
store.setValue(it, COLUMN_BOOL, it.getValueInt( COLUMN_BOOL ) ? 0 : 1 );
auto val = store.getValue(it, COLUMN_TEXT_FONT_DESCRIPTION);
import gobject.Type;
writeln(Type.isA(PgFontDescription.getType(), GType.BOXED));
writeln(PgFontDescription.getType(), " ", val.gType);
auto font = val.get!PgFontDescription();
writeln(font.getFamily());
});
// change the text in the store on end of edit
......
......@@ -164,6 +164,7 @@ public class FlowCombiner
ownedRef = false;
}
alias doref = ref_;
/**
* Increments the reference count on the #GstFlowCombiner.
*
......@@ -171,7 +172,7 @@ public class FlowCombiner
*
* Since: 1.12.1
*/
public FlowCombiner doref()
public FlowCombiner ref_()
{
auto p = gst_flow_combiner_ref(gstFlowCombiner);
......
......@@ -561,7 +561,7 @@ struct GstBitReader
/**
* Current byte position
*/
uint _byte;
uint byte_;
/**
* Bit position in the current byte
*/
......@@ -583,7 +583,7 @@ struct GstByteReader
/**
* Current byte position
*/
uint _byte;
uint byte_;
void*[4] GstReserved;
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.AtscEIT;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -66,7 +66,7 @@ public final class AtscEIT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscEIT);
sliceFree(gstMpegtsAtscEIT);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.AtscEITEvent;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -66,7 +66,7 @@ public final class AtscEITEvent
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscEITEvent);
sliceFree(gstMpegtsAtscEITEvent);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.AtscETT;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -66,7 +66,7 @@ public final class AtscETT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscETT);
sliceFree(gstMpegtsAtscETT);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.AtscMGT;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -66,7 +66,7 @@ public final class AtscMGT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscMGT);
sliceFree(gstMpegtsAtscMGT);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.AtscMGTTable;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -66,7 +66,7 @@ public final class AtscMGTTable
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscMGTTable);
sliceFree(gstMpegtsAtscMGTTable);
}
......
......@@ -24,9 +24,9 @@
module gst.mpegts.AtscMultString;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.Str;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -65,7 +65,7 @@ public final class AtscMultString
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscMultString);
sliceFree(gstMpegtsAtscMultString);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.AtscSTT;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -68,7 +68,7 @@ public final class AtscSTT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscSTT);
sliceFree(gstMpegtsAtscSTT);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.AtscStringSegment;
private import glib.MemorySlice;
private import glib.Str;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -64,7 +64,7 @@ public final class AtscStringSegment
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscStringSegment);
sliceFree(gstMpegtsAtscStringSegment);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.AtscVCT;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -68,7 +68,7 @@ public final class AtscVCT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscVCT);
sliceFree(gstMpegtsAtscVCT);
}
......
......@@ -24,9 +24,9 @@
module gst.mpegts.AtscVCTSource;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.Str;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -67,7 +67,7 @@ public final class AtscVCTSource
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsAtscVCTSource);
sliceFree(gstMpegtsAtscVCTSource);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.BAT;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -66,7 +66,7 @@ public final class BAT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsBAT);
sliceFree(gstMpegtsBAT);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.BATStream;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -64,7 +64,7 @@ public final class BATStream
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsBATStream);
sliceFree(gstMpegtsBATStream);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.ComponentDescriptor;
private import glib.MemorySlice;
private import glib.Str;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -64,7 +64,7 @@ public final class ComponentDescriptor
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsComponentDescriptor);
sliceFree(gstMpegtsComponentDescriptor);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.DataBroadcastDescriptor;
private import glib.MemorySlice;
private import glib.Str;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......
......@@ -24,8 +24,8 @@
module gst.mpegts.EIT;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -66,7 +66,7 @@ public final class EIT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsEIT);
sliceFree(gstMpegtsEIT);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.EITEvent;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -68,7 +68,7 @@ public final class EITEvent
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsEITEvent);
sliceFree(gstMpegtsEITEvent);
}
......
......@@ -24,9 +24,9 @@
module gst.mpegts.ExtendedEventDescriptor;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.Str;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......
......@@ -24,8 +24,8 @@
module gst.mpegts.ISO639LanguageDescriptor;
private import glib.MemorySlice;
private import glib.Str;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......@@ -64,7 +64,7 @@ public final class ISO639LanguageDescriptor
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsISO639LanguageDescriptor);
sliceFree(gstMpegtsISO639LanguageDescriptor);
}
......
......@@ -25,8 +25,8 @@
module gst.mpegts.NIT;
private import glib.ConstructionException;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -68,7 +68,7 @@ public final class NIT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsNIT);
sliceFree(gstMpegtsNIT);
}
......
......@@ -25,8 +25,8 @@
module gst.mpegts.NITStream;
private import glib.ConstructionException;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -66,7 +66,7 @@ public final class NITStream
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsNITStream);
sliceFree(gstMpegtsNITStream);
}
......
......@@ -25,8 +25,8 @@
module gst.mpegts.PMT;
private import glib.ConstructionException;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -71,7 +71,7 @@ public final class PMT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsPMT);
sliceFree(gstMpegtsPMT);
}
......
......@@ -25,8 +25,8 @@
module gst.mpegts.PMTStream;
private import glib.ConstructionException;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -68,7 +68,7 @@ public final class PMTStream
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsPMTStream);
sliceFree(gstMpegtsPMTStream);
}
......
......@@ -25,8 +25,8 @@
module gst.mpegts.PatProgram;
private import glib.ConstructionException;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -68,7 +68,7 @@ public final class PatProgram
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsPatProgram);
sliceFree(gstMpegtsPatProgram);
}
......
......@@ -25,8 +25,8 @@
module gst.mpegts.SDT;
private import glib.ConstructionException;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -68,7 +68,7 @@ public final class SDT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsSDT);
sliceFree(gstMpegtsSDT);
}
......
......@@ -25,8 +25,8 @@
module gst.mpegts.SDTService;
private import glib.ConstructionException;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -66,7 +66,7 @@ public final class SDTService
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsSDTService);
sliceFree(gstMpegtsSDTService);
}
......
......@@ -24,8 +24,8 @@
module gst.mpegts.T2DeliverySystemDescriptor;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
private import gtkd.Loader;
......
......@@ -24,8 +24,8 @@
module gst.mpegts.TOT;
private import glib.MemorySlice;
private import glib.PtrArray;
private import glib.c.functions;
private import gobject.ObjectG;
private import gst.mpegts.c.functions;
public import gst.mpegts.c.types;
......@@ -68,7 +68,7 @@ public final class TOT
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTMPEGTS) && ownedRef )
g_free(gstMpegtsTOT);
sliceFree(gstMpegtsTOT);
}
......
......@@ -144,10 +144,11 @@ public class AtomicQueue
gst_atomic_queue_push(gstAtomicQueue, data);
}
alias doref = ref_;
/**
* Increase the refcount of @queue.
*/
public void doref()
public void ref_()
{
gst_atomic_queue_ref(gstAtomicQueue);
}
......
......@@ -297,15 +297,15 @@ public class Buffer
* @ref until the buffer is freed.
*
* Params:
* doref = a #GstBuffer to ref
* ref_ = a #GstBuffer to ref
*
* Returns: The #GstParentBufferMeta that was added to the buffer
*
* Since: 1.6
*/
public ParentBufferMeta addParentBufferMeta(Buffer doref)
public ParentBufferMeta addParentBufferMeta(Buffer ref_)
{
auto p = gst_buffer_add_parent_buffer_meta(gstBuffer, (doref is null) ? null : doref.getBufferStruct());
auto p = gst_buffer_add_parent_buffer_meta(gstBuffer, (ref_ is null) ? null : ref_.getBufferStruct());
if(p is null)
{
......
......@@ -161,6 +161,7 @@ public class BufferList
return ObjectG.getDObject!(BufferList)(cast(GstBufferList*) p, true);
}
alias foreac = foreach_;
/**
* Call @func with @data for each buffer in @list.
*
......@@ -175,7 +176,7 @@ public class BufferList
* Returns: %TRUE when @func returned %TRUE for each buffer in @list or when
* @list is empty.
*/
public bool foreac(GstBufferListFunc func, void* userData)
public bool foreach_(GstBufferListFunc func, void* userData)
{
return gst_buffer_list_foreach(gstBufferList, func, userData) != 0;
}
......
......@@ -316,6 +316,7 @@ public class Caps
return ObjectG.getDObject!(Caps)(cast(GstCaps*) p, true);
}
alias foreac = foreach_;
/**
* Calls the provided function once for each structure and caps feature in the
* #GstCaps. The function must not modify the fields.
......@@ -330,7 +331,7 @@ public class Caps
*
* Since: 1.6
*/
public bool foreac(GstCapsForeachFunc func, void* userData)
public bool foreach_(GstCapsForeachFunc func, void* userData)
{
return gst_caps_foreach(gstCaps, func, userData) != 0;
}
......@@ -873,13 +874,13 @@ public class Caps
* when there are nested #GstCaps / #GstStructure deeper than one level.
*
* Params:
* str = a string to convert to #GstCaps
* string_ = a string to convert to #GstCaps
*
* Returns: a newly allocated #GstCaps
*/
public static Caps fromString(string str)
public static Caps fromString(string string_)
{
auto p = gst_caps_from_string(Str.toStringz(str));
auto p = gst_caps_from_string(Str.toStringz(string_));
if(p is null)
{
......
......@@ -223,16 +223,16 @@ public class DateTime
* Free-function: gst_date_time_unref
*
* Params:
* str = ISO 8601-formatted datetime string.
* string_ = ISO 8601-formatted datetime string.
*
* Returns: a newly created #GstDateTime,
* or %NULL on error
*
* Throws: ConstructionException GTK+ fails to create the object.
*/
public this(string str)
public this(string string_)
{
auto p = gst_date_time_new_from_iso8601_string(Str.toStringz(str));
auto p = gst_date_time_new_from_iso8601_string(Str.toStringz(string_));
if(p is null)
{
......@@ -513,12 +513,13 @@ public class DateTime
return gst_date_time_has_year(gstDateTime) != 0;
}
alias doref = ref_;
/**
* Atomically increments the reference count of @datetime by one.
*
* Returns: the reference @datetime
*/
public DateTime doref()
public DateTime ref_()
{
auto p = gst_date_time_ref(gstDateTime);
......
......@@ -227,16 +227,16 @@ public struct Debug
* category = category to log
* level = level of the message
* file = the file that emitted the message, usually the __FILE__ identifier
* funct = the function that emitted the message
* function_ = the function that emitted the message
* line = the line from that the message was emitted, usually __LINE__
* object = the object this message relates to,
* or %NULL if none
* message = the actual message
* userData = the FILE* to log to
*/
public static void logDefault(DebugCategory category, GstDebugLevel level, string file, string funct, int line, ObjectG object, GstDebugMessage* message, void* userData)
public static void logDefault(DebugCategory category, GstDebugLevel level, string file, string function_, int line, ObjectG object, GstDebugMessage* message, void* userData)
{
gst_debug_log_default((category is null) ? null : category.getDebugCategoryStruct(), level, Str.toStringz(file), Str.toStringz(funct), line, (object is null) ? null : object.getObjectGStruct(), message, userData);
gst_debug_log_default((category is null) ? null : category.getDebugCategoryStruct(), level, Str.toStringz(file), Str.toStringz(function_), line, (object is null) ? null : object.getObjectGStruct(), message, userData);
}
/**
......@@ -246,16 +246,16 @@ public struct Debug
* category = category to log
* level = level of the message is in
* file = the file that emitted the message, usually the __FILE__ identifier
* funct = the function that emitted the message
* function_ = the function that emitted the message
* line = the line from that the message was emitted, usually __LINE__
* object = the object this message relates to,
* or %NULL if none
* format = a printf style format string
* args = optional arguments for the format
*/
public static void logValist(DebugCategory category, GstDebugLevel level, string file, string funct, int line, ObjectG object, string format, void* args)
public static void logValist(DebugCategory category, GstDebugLevel level, string file, string function_, int line, ObjectG object, string format, void* args)
{
gst_debug_log_valist((category is null) ? null : category.getDebugCategoryStruct(), level, Str.toStringz(file), Str.toStringz(funct), line, (object is null) ? null : object.getObjectGStruct(), Str.toStringz(format), args);
gst_debug_log_valist((category is null) ? null : category.getDebugCategoryStruct(), level, Str.toStringz(file), Str.toStringz(function_), line, (object is null) ? null : object.getObjectGStruct(), Str.toStringz(format), args);
}
/**
......
......@@ -1106,16 +1106,16 @@ public class Element : ObjectGst
* text = an allocated text string to be used
* as a replacement for the default message connected to code,
* or %NULL
* dbg = an allocated debug message to be
* debug_ = an allocated debug message to be
* used as a replacement for the default debugging information,
* or %NULL
* file = the source code file where the error was generated
* funct = the source code function where the error was generated
* function_ = the source code function where the error was generated
* line = the source code line where the error was generated
*/
public void messageFull(GstMessageType type, GQuark domain, int code, string text, string dbg, string file, string funct, int line)
public void messageFull(GstMessageType type, GQuark domain, int code, string text, string debug_, string file, string function_, int line)
{
gst_element_message_full(gstElement, type, domain, code, Str.toStringz(text), Str.toStringz(dbg), Str.toStringz(file), Str.toStringz(funct), line);
gst_element_message_full(gstElement, type, domain, code, Str.toStringz(text), Str.toStringz(debug_), Str.toStringz(file), Str.toStringz(function_), line);
}
/**
......@@ -1131,19 +1131,19 @@ public class Element : ObjectGst
* text = an allocated text string to be used
* as a replacement for the default message connected to code,
* or %NULL
* dbg = an allocated debug message to be
* debug_ = an allocated debug message to be
* used as a replacement for the default debugging information,
* or %NULL
* file = the source code file where the error was generated
* funct = the source code function where the error was generated
* function_ = the source code function where the error was generated
* line = the source code line where the error was generated
* structure = optional details structure
*
* Since: 1.10
*/
public void messageFullWithDetails(GstMessageType type, GQuark domain, int code, string text, string dbg, string file, string funct, int line, Structure structure)
public void messageFullWithDetails(GstMessageType type, GQuark domain, int code, string text, string debug_, string file, string function_, int line, Structure structure)
{
gst_element_message_full_with_details(gstElement, type, domain, code, Str.toStringz(text), Str.toStringz(dbg), Str.toStringz(file), Str.toStringz(funct), line, (structure is null) ? null : structure.getStructureStruct(true));
gst_element_message_full_with_details(gstElement, type, domain, code, Str.toStringz(text), Str.toStringz(debug_), Str.toStringz(file), Str.toStringz(function_), line, (structure is null) ? null : structure.getStructureStruct(true));
}
/**
......
......@@ -219,7 +219,7 @@ public struct GStreamer
* micro = pointer to a guint to store the micro version number
* nano = pointer to a guint to store the nano version number
*/
public static void versio(out uint major, out uint minor, out uint micro, out uint nano)
public static void version_(out uint major, out uint minor, out uint micro, out uint nano)
{
gst_version(&major, &minor, &micro, &nano);
}
......
......@@ -335,6 +335,7 @@ public class Iterator
return gst_iterator_fold(gstIterator, func, (ret is null) ? null : ret.getValueStruct(), userData);
}
alias foreac = foreach_;
/**
* Iterate over all element of @it and call the given function @func for
* each element.
......@@ -348,7 +349,7 @@ public class Iterator
*
* MT safe.
*/
public GstIteratorResult foreac(GstIteratorForeachFunction func, void* userData)
public GstIteratorResult foreach_(GstIteratorForeachFunction func, void* userData)
{
return gst_iterator_foreach(gstIterator, func, userData);
}
......
......@@ -184,13 +184,13 @@ public class Memory
* allocator = the #GstAllocator
* parent = the parent of @mem
* maxsize = the total size of the memory
* alig = the alignment of the memory
* align_ = the alignment of the memory
* offset = The offset in the memory
* size = the size of valid data in the memory
*/
public void init(GstMemoryFlags flags, Allocator allocator, Memory parent, size_t maxsize, size_t alig, size_t offset, size_t size)
public void init(GstMemoryFlags flags, Allocator allocator, Memory parent, size_t maxsize, size_t align_, size_t offset, size_t size)
{
gst_memory_init(gstMemory, flags, (allocator is null) ? null : allocator.getAllocatorStruct(), (parent is null) ? null : parent.getMemoryStruct(), maxsize, alig, offset, size);
gst_memory_init(gstMemory, flags, (allocator is null) ? null : allocator.getAllocatorStruct(), (parent is null) ? null : parent.getMemoryStruct(), maxsize, align_, offset, size);
}
/**
......
......@@ -1545,18 +1545,18 @@ public class Message
*
* Params:
* gerror = location for the GError
* dbg = location for the debug message,
* debug_ = location for the debug message,
* or %NULL
*/
public void parseError(out ErrorG gerror, out string dbg)
public void parseError(out ErrorG gerror, out string debug_)
{
GError* outgerror = null;
char* outdbg = null;
char* outdebug_ = null;
gst_message_parse_error(gstMessage, &outgerror, &outdbg);
gst_message_parse_error(gstMessage, &outgerror, &outdebug_);
gerror = new ErrorG(outgerror);
dbg = Str.toString(outdbg);
debug_ = Str.toString(outdebug_);
}
/**
......@@ -1623,18 +1623,18 @@ public class Message
*
* Params:
* gerror = location for the GError
* dbg = location for the debug message,
* debug_ = location for the debug message,
* or %NULL
*/
public void parseInfo(out ErrorG gerror, out string dbg)
public void parseInfo(out ErrorG gerror, out string debug_)
{
GError* outgerror = null;
char* outdbg = null;
char* outdebug_ = null;
gst_message_parse_info(gstMessage, &outgerror, &outdbg);
gst_message_parse_info(gstMessage, &outgerror, &outdebug_);
gerror = new ErrorG(outgerror);
dbg = Str.toString(outdbg);
debug_ = Str.toString(outdebug_);
}
/**
......@@ -2111,18 +2111,18 @@ public class Message
*
* Params:
* gerror = location for the GError
* dbg = location for the debug message,
* debug_ = location for the debug message,
* or %NULL
*/
public void parseWarning(out ErrorG gerror, out string dbg)
public void parseWarning(out ErrorG gerror, out string debug_)
{
GError* outgerror = null;
char* outdbg = null;
char* outdebug_ = null;
gst_message_parse_warning(gstMessage, &outgerror, &outdbg);
gst_message_parse_warning(gstMessage, &outgerror, &outdebug_);
gerror = new ErrorG(outgerror);
dbg = Str.toString(outdbg);
debug_ = Str.toString(outdebug_);
}
/**
......
......@@ -24,8 +24,8 @@
module gstreamer.Meta;
private import glib.MemorySlice;
private import glib.Str;
private import glib.c.functions;
private import gstreamer.c.functions;
public import gstreamer.c.types;
public import gstreamerc.gstreamertypes;
......
......@@ -199,6 +199,7 @@ public class MiniObject
return ObjectG.getDObject!(MiniObject)(cast(GstMiniObject*) p, true);
}
alias doref = ref_;
/**
* Increase the reference count of the mini-object.
*
......@@ -211,7 +212,7 @@ public class MiniObject
*
* Returns: the mini-object.
*/
public MiniObject doref()
public MiniObject ref_()
{
auto p = gst_mini_object_ref(gstMiniObject);
......
......@@ -239,11 +239,11 @@ public class ObjectGst : ObjectG
*
* Params:
* error = the GError.
* dbg = an additional debug information string, or %NULL
* debug_ = an additional debug information string, or %NULL
*/
public void defaultError(ErrorG error, string dbg)
public void defaultError(ErrorG error, string debug_)
{
gst_object_default_error(gstObject, (error is null) ? null : error.getErrorGStruct(), Str.toStringz(dbg));
gst_object_default_error(gstObject, (error is null) ? null : error.getErrorGStruct(), Str.toStringz(debug_));
}
/**
......@@ -487,6 +487,7 @@ public class ObjectGst : ObjectG
return gst_object_has_as_parent(gstObject, (parent is null) ? null : parent.getObjectGstStruct()) != 0;
}
alias doref = ref_;
/**
* Increments the reference count on @object. This function
* does not take the lock on @object because it relies on
......@@ -498,7 +499,7 @@ public class ObjectGst : ObjectG
*
* Returns: A pointer to @object
*/
public override ObjectGst doref()
public override ObjectGst ref_()
{
auto p = gst_object_ref(gstObject);
......
......@@ -24,7 +24,7 @@
module gstreamer.ParentBufferMeta;
private import glib.c.functions;
private import glib.MemorySlice;
private import gobject.ObjectG;
private import gstreamer.Buffer;
private import gstreamer.c.functions;
......@@ -77,7 +77,7 @@ public final class ParentBufferMeta
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTREAMER) && ownedRef )
g_free(gstParentBufferMeta);
sliceFree(gstParentBufferMeta);
}
......
......@@ -172,18 +172,18 @@ public class Plugin : ObjectGst
* case a similar plugin with the same name ever gets added to GStreamer)
* description = description of the plugin
* initFunc = pointer to the init function of this plugin.
* versio = version string of the plugin
* version_ = version string of the plugin
* license = effective license of plugin. Must be one of the approved licenses
* (see #GstPluginDesc above) or the plugin will not be registered.
* source = source module plugin belongs to
* p = shipped package plugin belongs to
* package_ = shipped package plugin belongs to
* origin = URL to provider of plugin
*
* Returns: %TRUE if the plugin was registered correctly, otherwise %FALSE.
*/
public static bool registerStatic(int majorVersion, int minorVersion, string name, string description, GstPluginInitFunc initFunc, string versio, string license, string source, string p, string origin)
public static bool registerStatic(int majorVersion, int minorVersion, string name, string description, GstPluginInitFunc initFunc, string version_, string license, string source, string package_, string origin)
{
return gst_plugin_register_static(majorVersion, minorVersion, Str.toStringz(name), Str.toStringz(description), initFunc, Str.toStringz(versio), Str.toStringz(license), Str.toStringz(source), Str.toStringz(p), Str.toStringz(origin)) != 0;
return gst_plugin_register_static(majorVersion, minorVersion, Str.toStringz(name), Str.toStringz(description), initFunc, Str.toStringz(version_), Str.toStringz(license), Str.toStringz(source), Str.toStringz(package_), Str.toStringz(origin)) != 0;
}
/**
......@@ -207,19 +207,19 @@ public class Plugin : ObjectGst
* description = description of the plugin
* initFullFunc = pointer to the init function with user data
* of this plugin.
* versio = version string of the plugin
* version_ = version string of the plugin
* license = effective license of plugin. Must be one of the approved licenses
* (see #GstPluginDesc above) or the plugin will not be registered.
* source = source module plugin belongs to
* p = shipped package plugin belongs to
* package_ = shipped package plugin belongs to
* origin = URL to provider of plugin
* userData = gpointer to user data
*
* Returns: %TRUE if the plugin was registered correctly, otherwise %FALSE.
*/
public static bool registerStaticFull(int majorVersion, int minorVersion, string name, string description, GstPluginInitFullFunc initFullFunc, string versio, string license, string source, string p, string origin, void* userData)
public static bool registerStaticFull(int majorVersion, int minorVersion, string name, string description, GstPluginInitFullFunc initFullFunc, string version_, string license, string source, string package_, string origin, void* userData)
{
return gst_plugin_register_static_full(majorVersion, minorVersion, Str.toStringz(name), Str.toStringz(description), initFullFunc, Str.toStringz(versio), Str.toStringz(license), Str.toStringz(source), Str.toStringz(p), Str.toStringz(origin), userData) != 0;
return gst_plugin_register_static_full(majorVersion, minorVersion, Str.toStringz(name), Str.toStringz(description), initFullFunc, Str.toStringz(version_), Str.toStringz(license), Str.toStringz(source), Str.toStringz(package_), Str.toStringz(origin), userData) != 0;
}
/**
......
......@@ -1021,11 +1021,11 @@ public class Query
* flags = #GstSchedulingFlags
* minsize = the suggested minimum size of pull requests
* maxsize = the suggested maximum size of pull requests:
* alig = the suggested alignment of pull requests
* align_ = the suggested alignment of pull requests
*/
public void parseScheduling(out GstSchedulingFlags flags, out int minsize, out int maxsize, out int alig)
public void parseScheduling(out GstSchedulingFlags flags, out int minsize, out int maxsize, out int align_)
{
gst_query_parse_scheduling(gstQuery, &flags, &minsize, &maxsize, &alig);
gst_query_parse_scheduling(gstQuery, &flags, &minsize, &maxsize, &align_);
}
/**
......@@ -1340,11 +1340,11 @@ public class Query
* flags = #GstSchedulingFlags
* minsize = the suggested minimum size of pull requests
* maxsize = the suggested maximum size of pull requests
* alig = the suggested alignment of pull requests
* align_ = the suggested alignment of pull requests
*/
public void setScheduling(GstSchedulingFlags flags, int minsize, int maxsize, int alig)
public void setScheduling(GstSchedulingFlags flags, int minsize, int maxsize, int align_)
{
gst_query_set_scheduling(gstQuery, flags, minsize, maxsize, alig);
gst_query_set_scheduling(gstQuery, flags, minsize, maxsize, align_);
}
/**
......
......@@ -24,7 +24,7 @@
module gstreamer.ReferenceTimestampMeta;
private import glib.c.functions;
private import glib.MemorySlice;
private import gobject.ObjectG;
private import gstreamer.Caps;
private import gstreamer.c.functions;
......
......@@ -24,8 +24,8 @@
module gstreamer.StaticPadTemplate;
private import glib.MemorySlice;
private import glib.Str;
private import glib.c.functions;
private import gobject.ObjectG;
private import gstreamer.Caps;
private import gstreamer.PadTemplate;
......@@ -71,7 +71,7 @@ public final class StaticPadTemplate
~this ()
{
if ( Linker.isLoaded(LIBRARY_GSTREAMER) && ownedRef )
g_free(gstStaticPadTemplate);
sliceFree(gstStaticPadTemplate);
}
......
......@@ -359,6 +359,7 @@ public class Structure
return gst_structure_fixate_field_string(gstStructure, Str.toStringz(fieldName), Str.toStringz(target)) != 0;
}
alias foreac = foreach_;
/**
* Calls the provided function once for each field in the #GstStructure. The
* function must not modify the fields. Also see gst_structure_map_in_place()
......@@ -371,7 +372,7 @@ public class Structure
* Returns: %TRUE if the supplied function returns %TRUE For each of the fields,
* %FALSE otherwise.
*/
public bool foreac(GstStructureForeachFunc func, void* userData)
public bool foreach_(GstStructureForeachFunc func, void* userData)
{
return gst_structure_foreach(gstStructure, func, userData) != 0;
}
......@@ -1181,18 +1182,18 @@ public class Structure
* Free-function: gst_structure_free
*
* Params:
* str = a string representation of a #GstStructure.
* string_ = a string representation of a #GstStructure.
* end = pointer to store the end of the string in.
*
* Returns: a new #GstStructure or %NULL
* when the string could not be parsed. Free with
* gst_structure_free() after use.
*/