diff --git a/.gitignore b/.gitignore
index 6413e521..a12662d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,13 +14,13 @@ Output/Songs
 /*.ctl
 /Output/Registration.xml
 /Vocaluxe.suo
-/Vocaluxe/Vocaluxe.csproj.user
+*.csproj.user
+*.vcxproj.user
 /Output/Config.xml
 *.ipch
 *.log
 /Output/Playlists/*.xml
-/Output/x64/gstreamer/GstreamerHelper.dll
-/Output/x86/gstreamer/GstreamerHelper.dll
+GstreamerHelper.dll
 *.tlog
 *.suo
 *.obj
@@ -39,11 +39,7 @@ Output/Songs
 *.Cache
 /GstreamerHelper/bin/*
 /VocaluxeLib/bin
-/ClientServerLib/ClientServerLib/ClientServerLib.csproj.user
-/ClientServerLib/ClientServerLib/bin/Debug/ClientServerLib.dll
-/ClientServerLib/ClientTest/bin/Debug/ClientServerLib.dll
-/ClientServerLib/ClientTest/bin/Release/ClientServerLib.dll
-/ClientServerLib/ClientServerLib/bin/ClientServerLib.dll
+ClientServerLib.dll
 ClientTest.exe
 *.vshost.*
 *.userprefs
@@ -63,3 +59,4 @@ Output/Vocaluxe_x64.exe
 /Output/VocaluxeServerConfig.exe.config
 /PhoneGap/
 /Output/Profiles
+PitchTracker.dll
diff --git a/ClientServerLib/ClientServerLib/CDiscover.cs b/ClientServerLib/ClientServerLib/CDiscover.cs
index 17beab61..d78bc19b 100644
--- a/ClientServerLib/ClientServerLib/CDiscover.cs
+++ b/ClientServerLib/ClientServerLib/CDiscover.cs
@@ -18,7 +18,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
diff --git a/ClientServerLib/ClientServerLib/CServer.cs b/ClientServerLib/ClientServerLib/CServer.cs
index 51a6d2b7..3403a092 100644
--- a/ClientServerLib/ClientServerLib/CServer.cs
+++ b/ClientServerLib/ClientServerLib/CServer.cs
@@ -16,9 +16,9 @@
 #endregion
 
 using System;
+using System.Diagnostics;
 using System.ServiceModel;
 using System.ServiceModel.Web;
-using System.Diagnostics;
 using System.Net;
 
 namespace ServerLib
@@ -191,10 +191,15 @@ namespace ServerLib
                     CreateNoWindow = true,
                     WindowStyle = ProcessWindowStyle.Hidden,
                 };
-            Process p = Process.Start(info);
-            p.WaitForExit();
-            p.Close();
-
+            try
+            {
+                using (Process p = Process.Start(info))
+                {
+                    p.WaitForExit();
+                    p.Close();
+                }
+            }
+            catch (Exception) {}
 #else
 
     //Required?
diff --git a/ClientServerLib/ClientServerLib/Properties/AssemblyInfo.cs b/ClientServerLib/ClientServerLib/Properties/AssemblyInfo.cs
index fe3863d2..2acbaa9a 100644
--- a/ClientServerLib/ClientServerLib/Properties/AssemblyInfo.cs
+++ b/ClientServerLib/ClientServerLib/Properties/AssemblyInfo.cs
@@ -16,7 +16,6 @@
 #endregion
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
diff --git a/GstreamerHelper/GstreamerAudio.cpp b/GstreamerHelper/GstreamerAudio.cpp
deleted file mode 100644
index 1e5f6baf..00000000
--- a/GstreamerHelper/GstreamerAudio.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-#include "stdafx.h"
-#include "GstreamerAudio.h"
-
-#define DllExport extern "C" __declspec(dllexport)
-
-map<int, GstreamerAudioStream*> Streams;
-queue<int> IDs;
-EXTERN_C IMAGE_DOS_HEADER __ImageBase;
-DllExport void SetLogCallback (LogCallback Callback)
-{
-	Log = Callback;
-}
-
-DllExport bool Init()
-{
-	for(int i = 0; i < 1000; i++)
-	{
-		IDs.push(i);
-	}
-#if _WIN64
-	SetDllDirectory(L".\\x64\\gstreamer");
-#else
-	SetDllDirectory(L".\\x86\\gstreamer");
-#endif
-
-	gst_init(NULL, NULL);
-	GstRegistry* registry = gst_registry_get();
-
-#if _WIN64
-	gst_registry_scan_path(registry, ".\\x64\\gstreamer");
-#else
-	gst_registry_scan_path(registry, ".\\x86\\gstreamer");
-#endif
-
-	return true;
-}
-
-
-DllExport void SetGlobalVolume(float Volume)
-{
-	map<int, GstreamerAudioStream*>::iterator p;
-
-	for(p = Streams.begin(); p != Streams.end(); p++) {
-		p->second->SetStreamVolume(Volume);
-	}
-}
-
-
-DllExport int GetStreamCount(void)
-{
-	return Streams.size();
-}
-
-
-DllExport void CloseAll(void)
-{
-  map<int, GstreamerAudioStream*>::iterator p;
-  
-  for(p = Streams.begin(); p != Streams.end(); p++) {
-	  p->second->Close();
-  }
-}
-
-DllExport int Load(const wchar_t* Media)
-{
-	GstreamerAudioStream *s = new GstreamerAudioStream(IDs.front());
-	Streams.insert(pair<int, GstreamerAudioStream*> (IDs.front(), s));
-	IDs.pop();
-	return s->Load(Media);
-}
-
-DllExport int LoadPrescan(const wchar_t* Media, bool Prescan)
-{
-	GstreamerAudioStream *s = new GstreamerAudioStream(IDs.front());
-	Streams.insert(pair<int, GstreamerAudioStream*> (IDs.front(), s));
-	IDs.pop();
-	return s->Load(Media, Prescan);
-}
-
-DllExport void Close(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		delete it->second;
-		IDs.push(it->first);
-		Streams.erase(it);
-	}
-}
-
-DllExport void Play(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		it->second->Play();
-	}
-}
-
-DllExport void PlayLoop(int Stream, bool Loop)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		it->second->Play(Loop);
-	}
-}
-
-DllExport void Pause(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		it->second->Pause();
-	}
-}
-
-DllExport void Stop(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		it->second->Stop();
-	}
-}
-
-DllExport void Fade(int Stream, float TargetVolume, float Seconds)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		it->second->Fade(TargetVolume, Seconds);
-	}
-}
-
-DllExport void FadeAndPause(int Stream, float TargetVolume, float Seconds)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		it->second->FadeAndPause(TargetVolume, Seconds);
-	}
-}
-
-DllExport void FadeAndStop(int Stream, float TargetVolume, float Seconds)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		it->second->FadeAndStop(TargetVolume, Seconds);
-	}
-}
-
-DllExport void SetStreamVolume(int Stream, float Volume)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		return it->second->SetStreamVolume(Volume);
-	}
-}
-
-DllExport void SetStreamVolumeMax(int Stream, float Volume)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		return it->second->SetStreamVolumeMax(Volume);
-	}
-}
-
-DllExport float GetLength(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		return it->second->GetLength();
-	}
-	else return -1.0;
-}
-
-DllExport float GetPosition(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		return it->second->GetPosition();
-	}
-	else return -1;
-}
-
-DllExport bool IsPlaying(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		return it->second->IsPlaying();
-	}
-	else return false;
-}
-
-DllExport bool IsPaused(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		return it->second->IsPaused();
-	}
-	else return false;
-}
-
-DllExport bool IsFinished(int Stream)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		return it->second->IsFinished();
-	}
-	else return false;
-}
-
-DllExport void SetPosition(int Stream, float Position)
-{
-	map<int,GstreamerAudioStream*>::iterator it = Streams.find(Stream);
-	if(it != Streams.end())
-	{
-		return it->second->SetPosition(Position);
-	}
-}
-
-DllExport void Update(void)
-{
-  map<int, GstreamerAudioStream*>::iterator p = Streams.begin();
-
-  while(p != Streams.end())
-  {
-	  if(p->second->Closed)
-	  {
-		delete p->second;
-		IDs.push(p->first);
-		Streams.erase(p++);
-	  }
-	  else {
-		p->second->Update();
-		++p;
-	  }
-  }
-}
-
-void LogError(const char* msg)
-{
-	Log(msg);
-}
\ No newline at end of file
diff --git a/GstreamerHelper/GstreamerAudio.h b/GstreamerHelper/GstreamerAudio.h
deleted file mode 100644
index a9ea49b0..00000000
--- a/GstreamerHelper/GstreamerAudio.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-#include <string>
-#include <map>
-#include <queue>
-#include "gst/gst.h"
-#include "GstreamerAudioStream.h"
-#include "gst\gst.h"
-
-#define DllExport extern "C" __declspec(dllexport)
-
-using namespace std;
-
-	typedef void (__stdcall * LogCallback)(const char* text);
-	static LogCallback Log;
-
-	DllExport void SetLogCallback(LogCallback Callback);
-
-	DllExport bool Init();
-	DllExport void SetGlobalVolume(float Volume);
-	DllExport int GetStreamCount(void);
-	DllExport void CloseAll(void);
-
-	//Stream handling
-	DllExport int Load(const wchar_t* Media);
-	DllExport int LoadPrescan(const wchar_t* Media, bool Prescan);
-	DllExport void Close(int Stream);
-
-	DllExport void Play(int Stream);
-	DllExport void PlayLoop(int Stream, bool Loop);
-	DllExport void Pause(int Stream);
-	DllExport void Stop(int Stream);
-	DllExport void Fade(int Stream, float TargetVolume, float Seconds);
-	DllExport void FadeAndPause(int Stream, float TargetVolume, float Seconds);
-	DllExport void FadeAndStop(int Stream, float TargetVolume, float Seconds);
-	DllExport void SetStreamVolume(int Stream, float Volume);
-	DllExport void SetStreamVolumeMax(int Stream, float Volume);
-
-	DllExport float GetLength(int Stream);
-	DllExport float GetPosition(int Stream);
-
-	DllExport bool IsPlaying(int Stream);
-	DllExport bool IsPaused(int Stream);
-	DllExport bool IsFinished(int Stream);
-
-	DllExport void SetPosition(int Stream, float Position);
-
-	DllExport void Update();
-
-	void LogError(const char* msg);
diff --git a/GstreamerHelper/GstreamerAudioStream.cpp b/GstreamerHelper/GstreamerAudioStream.cpp
deleted file mode 100644
index ed8d2c4a..00000000
--- a/GstreamerHelper/GstreamerAudioStream.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-#include "stdafx.h"
-#include "GstreamerAudioStream.h"
-
-
-typedef enum {
-  GST_PLAY_FLAG_VIDEO         = (1 << 0),
-  GST_PLAY_FLAG_AUDIO         = (1 << 1),
-  GST_PLAY_FLAG_TEXT          = (1 << 2),
-  GST_PLAY_FLAG_VIS           = (1 << 3),
-  GST_PLAY_FLAG_SOFT_VOLUME   = (1 << 4),
-  GST_PLAY_FLAG_NATIVE_AUDIO  = (1 << 5),
-  GST_PLAY_FLAG_NATIVE_VIDEO  = (1 << 6),
-  GST_PLAY_FLAG_DOWNLOAD      = (1 << 7),
-  GST_PLAY_FLAG_BUFFERING     = (1 << 8),
-  GST_PLAY_FLAG_DEINTERLACE   = (1 << 9),
-  GST_PLAY_FLAG_SOFT_COLORBALANCE = (1 << 10)
-} GstPlayFlags;
-
-GstreamerAudioStream::GstreamerAudioStream(int id)
-{
-	ID = id;
-	MaxVolume = 1.0;
-	Volume = 1.0;
-	Duration = -1;
-	Loop = false;
-	Running = true;
-
-	Finished = false;
-
-	//Fading
-	FadeTimer = g_timer_new();
-	FadeTime = 0.0;
-    TargetVolume = 1.0;
-    StartVolume = 1.0;
-    CloseStreamAfterFade = false;
-    PauseStreamAfterFade = false;
-    Fading = false;
-
-	Closed = false;
-}
-
-
-GstreamerAudioStream::~GstreamerAudioStream(void)
-{
-	Close();
-}
-
-// Loads a stream but does not wait for it to get initialized, 
-// so querying duration or position directly after initialization might
-// return strange values! To work around this use the prescan load function!
-int GstreamerAudioStream::Load(const wchar_t* Media)
-{
-	Element = gst_element_factory_make("playbin", "playbin");
-
-	Convert = gst_element_factory_make("audioconvert", "audioconvert");
-	Audiosink = gst_element_factory_make("directsoundsink", "directsoundsink");
-	SinkBin = gst_bin_new("SinkBin");
-	gst_bin_add_many (GST_BIN (SinkBin), Convert, Audiosink, NULL);
-	gst_element_link_many (Convert, Audiosink, NULL);
-	Pad = gst_element_get_static_pad (Convert, "sink");
-	GhostPad = gst_ghost_pad_new ("sink", Pad);
-	gst_pad_set_active (GhostPad, TRUE);
-	gst_element_add_pad (SinkBin, GhostPad);
-
-	Bus = gst_element_get_bus(Element);
-	if(!Element)
-	{
-		LogError ("Could not create element!");
-		return -1;
-	} 
-	Running = true;
-	gst_element_set_state(Element, GST_STATE_NULL);
-	g_object_set(Element, "uri", Media, NULL);
-	g_object_set(Element, "audio-sink", SinkBin, NULL);
-	g_object_set(Element, "flags", GST_PLAY_FLAG_AUDIO, NULL); 
-
-	gst_element_set_state(Element, GST_STATE_PAUSED);
-
-	return ID;
-}
-
-//Loads a stream and waits for its initialization
-int GstreamerAudioStream::Load(const wchar_t* Media, bool Prescan)
-{
-	Load(Media);
-	if(Prescan){
-		gst_bus_timed_pop_filtered(Bus, -1, GST_MESSAGE_ASYNC_DONE);
-		//Workaround: Waiting for the stream to be loaded (Length>0)
-		for(int i=0;i<40;i++){
-			if(GetLength()>0.f)
-				break;
-			Sleep(5);
-		}
-	}
-	return ID;
-}
-
-void GstreamerAudioStream::Close(void)
-{
-	if(Element)
-	{
-		gst_element_set_state(Element, GST_STATE_NULL);
-		gst_object_unref(GST_OBJECT (Element));
-	}
-
-	/* without that there are no crashes any more. but i don't know if there is a memory leak if we do that.
-	if(Bus)
-		gst_object_unref(Bus);
-	if(Message)
-		gst_message_unref(Message);
-	if(Convert)
-		gst_object_unref(Convert);
-	if(Audiosink)
-		gst_object_unref(Audiosink);
-	if(Pad)
-		gst_object_unref(Pad);
-	if(GhostPad)
-		gst_object_unref(GhostPad);
-	if(SinkBin)
-		gst_object_unref(SinkBin);
-	*/
-
-	if(FadeTimer)
-		g_timer_destroy (FadeTimer);
-
-	Running = false;
-	Closed = true;
-}
-
-void GstreamerAudioStream::Play(void)
-{
-	if(Element)
-	{
-		PauseStreamAfterFade = false;
-		Running = true;
-		if(gst_element_set_state(Element, GST_STATE_PLAYING) == GST_STATE_CHANGE_ASYNC)
-			gst_bus_timed_pop_filtered(Bus, -1, GST_MESSAGE_ASYNC_DONE);
-		SetStreamVolume(Volume * 100.0);
-	}
-
-}
-
-void GstreamerAudioStream::Play(bool Loop)
-{
-	this->Loop = Loop;
-	Play();
-}
-
-void GstreamerAudioStream::Pause()
-{
-	Running = true;
-	if(Element)
-		gst_element_set_state(Element, GST_STATE_PAUSED);
-	SetStreamVolume(Volume * 100.0);
-}
-
-void GstreamerAudioStream::Stop()
-{
-	if(Element)
-	{
-		gst_element_set_state(Element, GST_STATE_NULL);
-		gst_element_seek_simple(Element, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, 0);
-	}
-}
-
-void GstreamerAudioStream::SetStreamVolume(float Volume)
-{
-	this->Volume = Volume / 100.0;
-	if(Element)
-	{
-		g_object_set(this->Element, "volume", (gdouble)(Volume / 100.0) * MaxVolume, NULL);
-	}
-}
-
-void GstreamerAudioStream::SetStreamVolumeMax(float MaxVolume)
-{
-	this->MaxVolume = (gdouble) (MaxVolume / 100.0);
-	if(Element)
-	{
-		g_object_set(this->Element, "volume", Volume * this->MaxVolume, NULL);
-	}
-}
-
-float GstreamerAudioStream::GetLength()
-{
-	if(Duration <= 0.f)
-		RefreshDuration();
-	return Duration;
-}
-
-void GstreamerAudioStream::RefreshDuration()
-{
-	if(Element)
-	{
-		gint64 time = -1000;
-		if(gst_element_query_duration(Element, GST_FORMAT_TIME, &time))
-			Duration = (gfloat)((gdouble)time/GST_SECOND);
-	}
-}
-
-float GstreamerAudioStream::GetPosition()
-{
-	if(Element)
-	{
-		gint64 time = 0;
-		if (gst_element_query_position(Element, GST_FORMAT_TIME, &time))
-			return (float)((gdouble)time/GST_SECOND);
-		else
-			return -1;
-	}
-	else return -1;
-}
-
-void GstreamerAudioStream::SetPosition(float Position)
-{
-	if(Element)
-	{
-		//Not sure if we need GST_SEEK_FLAG_ACCURATE
-		if(!gst_element_seek_simple(Element, GST_FORMAT_TIME, (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE), Position * GST_SECOND))
-			LogError("Seek failed");
-	}
-}
-
-void GstreamerAudioStream::Fade(float TargetVolume, float Seconds)
-{
-	Fading = true;
-	g_timer_stop(FadeTimer);
-    StartVolume = Volume;
-    this->TargetVolume = TargetVolume / 100.0;
-    FadeTime = (gdouble)Seconds;
-    g_timer_start(FadeTimer);
-}
-
-void GstreamerAudioStream::FadeAndPause(float TargetVolume, float Seconds)
-{
-    PauseStreamAfterFade = true;
-
-    Fade(TargetVolume, Seconds);
-}
-
-void GstreamerAudioStream::FadeAndStop(float TargetVolume, float Seconds)
-{
-    CloseStreamAfterFade = true;
-
-    Fade(TargetVolume, Seconds);
-}
-
-bool GstreamerAudioStream::IsPlaying()
-{
-	GstStateChangeReturn ret;
-	GstState current, pending;
-
-	//This might block!!!
-	ret = gst_element_get_state (Element, &current, &pending, GST_CLOCK_TIME_NONE);
-	return current == GST_STATE_PLAYING && !Finished;
-}
-
-bool GstreamerAudioStream::IsPaused()
-{
-	GstStateChangeReturn ret;
-	GstState current, pending;
-
-	//This might block!!!
-	ret = gst_element_get_state (Element, &current, &pending, GST_CLOCK_TIME_NONE);
-	return current == GST_STATE_PAUSED && !Finished;
-}
-
-bool GstreamerAudioStream::IsFinished()
-{
-	return Finished;
-}
-
-void GstreamerAudioStream::UpdateVolume()
-{
-	if (Fading)
-	{
-		if (g_timer_elapsed(FadeTimer, NULL) < FadeTime) {
-			gdouble vol = (StartVolume + (TargetVolume - StartVolume) * (g_timer_elapsed(FadeTimer, NULL) / FadeTime));
-			SetStreamVolume(100.0 * vol);
-		}
-		else
-		{
-			SetStreamVolume (TargetVolume * 100.0);
-			g_timer_stop(FadeTimer);
-			Fading = false;
-
-			if (CloseStreamAfterFade)
-			{
-				Closed = true;
-			}
-
-			if (PauseStreamAfterFade)
-				Pause();
-		}
-	}
-}
-
-void GstreamerAudioStream::Update()
-{
-	if(Running) {
-		UpdateVolume();
-		Message = gst_bus_pop (Bus);
-   
-		/* Parse message */
-		if (Message != NULL) {
-		  GError *err;
-		  gchar *debug_info;
-		  string m;
-       
-		  switch (GST_MESSAGE_TYPE (Message)) {
-			case GST_MESSAGE_ERROR:
-				gst_message_parse_error (Message, &err, &debug_info);
-				m = err->message;
-				LogError(m.c_str());
-				g_clear_error (&err);
-				g_free (debug_info);
-				break;
-			case GST_MESSAGE_DURATION_CHANGED:
-				RefreshDuration();
-				break;
-			case GST_MESSAGE_STATE_CHANGED:
-				break;
-			case GST_MESSAGE_EOS:
-				if(Loop)
-					SetPosition(0);
-				else
-					Finished = true;
-				break;
-			default:
-				/* We should not reach here */
-				//LogError ("Unexpected message received.\n");
-				break;
-		  }
-		  gst_message_unref (Message);
-		}
-	}
-}
-
diff --git a/GstreamerHelper/GstreamerAudioStream.h b/GstreamerHelper/GstreamerAudioStream.h
deleted file mode 100644
index 7f46488d..00000000
--- a/GstreamerHelper/GstreamerAudioStream.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma once
-#pragma warning(disable: 4244) // possible loss of data
-#pragma warning(disable: 4267) // possible loss of data
-#pragma warning(disable: 4800)
-
-#include <string>
-#include "gst/gst.h"
-#include "GstreamerAudio.h"
-
-using namespace std;
-
-class GstreamerAudioStream
-{
-public:
-	int ID;
-	bool Closed;
-
-	GstreamerAudioStream(int ID);
-	~GstreamerAudioStream(void);
-
-	int Load(const wchar_t* Media);
-	int Load(const wchar_t* Media, bool Prescan);
-	void Close();
-
-	void Play();
-	void Play(bool Loop);
-	void Pause();
-	void Stop();
-
-	void Fade(float TargetVolume, float Seconds);
-	void FadeAndPause(float TargetVolume, float Seconds);
-	void FadeAndStop(float TargetVolume, float Seconds);
-	void SetStreamVolume(float Volume);
-	void SetStreamVolumeMax(float Volume);
-
-	float GetLength();
-	float GetPosition();
-	void SetPosition(float Position);
-
-	bool IsPlaying();
-	bool IsPaused();
-	bool IsFinished();
-
-	void Update();
-private:
-	GstElement *Element, *Audiosink, *Convert, *SinkBin;
-	GstPad *Pad, *GhostPad;
-	GstBus *Bus;
-	GstMessage *Message;
-
-	gboolean Running;
-	gboolean Loop;
-
-	gboolean Finished;
-
-	gdouble MaxVolume;
-	gdouble Volume;
-
-	gfloat Duration;
-
-	GTimer *FadeTimer;
-
-    gdouble FadeTime;
-    gdouble TargetVolume;
-    gdouble StartVolume;
-    gboolean CloseStreamAfterFade;
-    gboolean PauseStreamAfterFade;
-    gboolean Fading;
-
-	void RefreshDuration();
-	void UpdateVolume();
-};
-
diff --git a/GstreamerHelper/GstreamerHelper.vcxproj b/GstreamerHelper/GstreamerHelper.vcxproj
deleted file mode 100644
index 21d99413..00000000
--- a/GstreamerHelper/GstreamerHelper.vcxproj
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugWin|Win32">
-      <Configuration>DebugWin</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugWin|x64">
-      <Configuration>DebugWin</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="InstallerWin|Win32">
-      <Configuration>InstallerWin</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="InstallerWin|x64">
-      <Configuration>InstallerWin</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWin|Win32">
-      <Configuration>ReleaseWin</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWin|x64">
-      <Configuration>ReleaseWin</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{ED007796-367F-4142-AA55-5450C7645C2C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>GstreamerHelper</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'">
-    <LinkIncremental>
-    </LinkIncremental>
-    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
-    <IncludePath>$(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(MSBuildProjectDirectory)\x86\lib;$(LibraryPath)</LibraryPath>
-    <GenerateManifest>true</GenerateManifest>
-    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
-    <IncludePath>$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>..\CheckingRules.ruleset</CodeAnalysisRuleSet>
-    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
-    <IncludePath>$(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(MSBuildProjectDirectory)\x86\lib;$(LibraryPath)</LibraryPath>
-    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
-    <IncludePath>$(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(MSBuildProjectDirectory)\x86\lib;$(LibraryPath)</LibraryPath>
-    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
-    <IncludePath>$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)</LibraryPath>
-    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
-    <IncludePath>$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)</LibraryPath>
-    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\Output\x86</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\Output\x86</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GSTREAMERHELPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Profile>true</Profile>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copying binary</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GSTREAMERHELPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <Profile>true</Profile>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GSTREAMERHELPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copying binary</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GSTREAMERHELPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\gstreamer\" /I /Y</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copying binary</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GSTREAMERHELPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GSTREAMERHELPER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="GstreamerAudio.h" />
-    <ClInclude Include="GstreamerAudioStream.h" />
-    <ClInclude Include="GstreamerVideo.h" />
-    <ClInclude Include="GstreamerVideoStream.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="targetver.h" />
-    <ClInclude Include="VocaluxeClock.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'">false</CompileAsManaged>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">false</CompileAsManaged>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">false</CompileAsManaged>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">false</CompileAsManaged>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="GstreamerAudio.cpp" />
-    <ClCompile Include="GstreamerAudioStream.cpp" />
-    <ClCompile Include="GstreamerVideo.cpp" />
-    <ClCompile Include="GstreamerVideoStream.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="VocaluxeClock.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/GstreamerHelper/GstreamerHelper.vcxproj.filters b/GstreamerHelper/GstreamerHelper.vcxproj.filters
deleted file mode 100644
index fc78f1e9..00000000
--- a/GstreamerHelper/GstreamerHelper.vcxproj.filters
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Quelldateien">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headerdateien">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Ressourcendateien">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="targetver.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="GstreamerAudioStream.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="GstreamerAudio.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="GstreamerVideo.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="GstreamerVideoStream.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="VocaluxeClock.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="GstreamerAudioStream.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="GstreamerAudio.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="GstreamerVideo.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="GstreamerVideoStream.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="VocaluxeClock.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/GstreamerHelper/GstreamerHelper.vcxproj.user b/GstreamerHelper/GstreamerHelper.vcxproj.user
deleted file mode 100644
index a375ae35..00000000
--- a/GstreamerHelper/GstreamerHelper.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git a/GstreamerHelper/GstreamerVideo.cpp b/GstreamerHelper/GstreamerVideo.cpp
deleted file mode 100644
index ab025608..00000000
--- a/GstreamerHelper/GstreamerVideo.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "stdafx.h"
-#include "GstreamerVideo.h"
-#include "GstreamerVideoStream.h"
-
-map<int, GstreamerVideoStream*> VideoStreams;
-queue<int> VideoIDs;
-
-DllExport void SetVideoLogCallback (LogCallback Callback)
-{
-	Log = Callback;
-}
-
-DllExport bool InitVideo()
-{
-	for(int i = 0; i < 1000; i++)
-	{
-		VideoIDs.push(i);
-	}
-#if _WIN64
-	SetDllDirectory(L".\\x64\\gstreamer");
-#else
-		SetDllDirectory(L".\\x86\\gstreamer");
-#endif
-
-	gst_init(NULL, NULL);
-
-	GstRegistry* registry = gst_registry_get();
-
-#if _WIN64
-	gst_registry_scan_path(registry, ".\\x64\\gstreamer");
-#else
-	gst_registry_scan_path(registry, ".\\x86\\gstreamer");
-#endif
-	return true;
-}
-
-DllExport void CloseAllVideos(void)
-{
-  map<int, GstreamerVideoStream*>::iterator p;
-  
-  for(p = VideoStreams.begin(); p != VideoStreams.end(); p++) {
-	  p->second->CloseVideo();
-  }
-}
-
-DllExport int LoadVideo(const wchar_t* Media)
-{
-	GstreamerVideoStream *s = new GstreamerVideoStream(VideoIDs.front());
-	VideoStreams.insert(pair<int, GstreamerVideoStream*> (VideoIDs.front(), s));
-	VideoIDs.pop();
-	return s->LoadVideo(Media);
-}
-
-DllExport bool CloseVideo(int Stream)
-{
-	map<int,GstreamerVideoStream*>::iterator it = VideoStreams.find(Stream);
-	if(it != VideoStreams.end())
-	{
-		delete it->second;
-		VideoStreams.erase(it);
-	}
-	else return false;
-	return true;
-}
-
-DllExport int GetVideoNumStreams()
-{
-	return (int) VideoStreams.size();
-}
-
-DllExport float GetVideoLength(int Stream)
-{
-	map<int,GstreamerVideoStream*>::iterator it = VideoStreams.find(Stream);
-	if(it != VideoStreams.end())
-	{
-		return it->second->GetVideoLength();
-	}
-	else return -1.0;
-}
-
-DllExport struct ApplicationFrame GetFrame(int Stream, float Time)
-{
-	map<int,GstreamerVideoStream*>::iterator it = VideoStreams.find(Stream);
-	if(it != VideoStreams.end())
-	{
-		return it->second->GetFrame(Time);
-	}
-	struct ApplicationFrame returnFrame;
-	returnFrame.size=0;
-	returnFrame.width=0;
-	returnFrame.height=0;
-	returnFrame.data=NULL;
-	returnFrame.videotime=0;
-	return returnFrame;
-}
-
-DllExport bool Skip(int Stream, float Start, float Gap)
-{
-	map<int,GstreamerVideoStream*>::iterator it = VideoStreams.find(Stream);
-	if(it != VideoStreams.end())
-	{
-		return it->second->Skip(Start, Gap);
-	}
-	else return false;
-}
-
-DllExport void SetVideoLoop(int Stream, bool Loop)
-{
-	map<int,GstreamerVideoStream*>::iterator it = VideoStreams.find(Stream);
-	if(it != VideoStreams.end())
-	{
-		it->second->SetVideoLoop(Loop);
-	}
-}
-
-DllExport void PauseVideo(int Stream)
-{
-	map<int,GstreamerVideoStream*>::iterator it = VideoStreams.find(Stream);
-	if(it != VideoStreams.end())
-	{
-		it->second->PauseVideo();
-	}
-}
-
-DllExport void ResumeVideo(int Stream)
-{
-	map<int,GstreamerVideoStream*>::iterator it = VideoStreams.find(Stream);
-	if(it != VideoStreams.end())
-	{
-		it->second->ResumeVideo();
-	}
-}
-
-DllExport bool Finished(int Stream)
-{
-	map<int,GstreamerVideoStream*>::iterator it = VideoStreams.find(Stream);
-	if(it != VideoStreams.end())
-	{
-		return it->second->IsFinished();
-	}
-	else return true;
-}
-
-DllExport void UpdateVideo(void)
-{
-  map<int, GstreamerVideoStream*>::iterator p = VideoStreams.begin();
-
-  while(p != VideoStreams.end())
-  {
-	  if(p->second->Closed)
-	  {
-		delete p->second;
-		VideoStreams.erase(p++);
-	  }
-	  else {
-		p->second->UpdateVideo();
-		++p;
-	  }
-  }
-}
-
-void LogVideoError(const char* msg)
-{
-	Log(msg);
-}
\ No newline at end of file
diff --git a/GstreamerHelper/GstreamerVideo.h b/GstreamerHelper/GstreamerVideo.h
deleted file mode 100644
index b00bc1f4..00000000
--- a/GstreamerHelper/GstreamerVideo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-#include <string>
-#include <map>
-#include <queue>
-#include "gst/gst.h"
-#define DllExport extern "C" __declspec(dllexport)
-
-using namespace std;
-
-	typedef void (__stdcall * LogCallback)(const char* text);
-	static LogCallback Log;
-
-	struct ApplicationFrame {
-		guint8* data;
-		int size;
-		int width;
-		int height;
-		float videotime;
-	};
-
-	DllExport void SetVideoLogCallback(LogCallback Callback);
-
-    DllExport bool InitVideo();
-    DllExport void CloseAllVideos();
-
-    DllExport int LoadVideo(const wchar_t* Media);
-    DllExport bool CloseVideo(int StreamID);
-    DllExport int GetVideoNumStreams();
-
-    DllExport float GetVideoLength(int StreamID);
-	DllExport struct ApplicationFrame GetFrame(int StreamID, float Time);
-    DllExport bool Skip(int StreamID, float Start, float Gap);
-    DllExport void SetVideoLoop(int StreamID, bool Loop);
-    DllExport void PauseVideo(int StreamID);
-	DllExport void ResumeVideo(int StreamID);
-
-    DllExport bool Finished(int StreamID);
-
-	DllExport void UpdateVideo();
-
-	void LogVideoError(const char* msg);
-
diff --git a/GstreamerHelper/GstreamerVideoStream.cpp b/GstreamerHelper/GstreamerVideoStream.cpp
deleted file mode 100644
index 93c98df0..00000000
--- a/GstreamerHelper/GstreamerVideoStream.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-#include "stdafx.h"
-#include "GstreamerVideoStream.h"
-
-typedef enum {
-  GST_PLAY_FLAG_VIDEO         = (1 << 0),
-  GST_PLAY_FLAG_AUDIO         = (1 << 1),
-  GST_PLAY_FLAG_TEXT          = (1 << 2),
-  GST_PLAY_FLAG_VIS           = (1 << 3),
-  GST_PLAY_FLAG_SOFT_VOLUME   = (1 << 4),
-  GST_PLAY_FLAG_NATIVE_AUDIO  = (1 << 5),
-  GST_PLAY_FLAG_NATIVE_VIDEO  = (1 << 6),
-  GST_PLAY_FLAG_DOWNLOAD      = (1 << 7),
-  GST_PLAY_FLAG_BUFFERING     = (1 << 8),
-  GST_PLAY_FLAG_DEINTERLACE   = (1 << 9),
-  GST_PLAY_FLAG_SOFT_COLORBALANCE = (1 << 10)
-} GstPlayFlags;
-
-GstreamerVideoStream::GstreamerVideoStream(int ID)
-{
-	this->ID = ID;
-
-	Loop = false;
-
-	Running = true;
-
-	Paused = false;
-	Finished = false;
-	Closed = false;
-	Copying = true;
-
-	BufferFull = false;
-	for(int i = 0; i < 5; i++)
-	{
-		FrameBuffer[i].Sample = NULL;
-		FrameBuffer[i].Buffer = NULL;
-		FrameBuffer[i].Displayed = true;
-	}
-
-	Duration = -1.0;
-}
-
-
-GstreamerVideoStream::~GstreamerVideoStream(void)
-{
-	CloseVideo();
-}
-
-int GstreamerVideoStream::LoadVideo(const wchar_t* Filename)
-{
-	Element = gst_element_factory_make("playbin", "playbin");
-	Appsink = (GstAppSink*) gst_element_factory_make("appsink", "appsink");
-
-	Bus = gst_element_get_bus(Element);
-	if(!Element || !Appsink)
-	{
-		LogVideoError ("Could not create element!");
-		return -1;
-	} 
-
-	g_object_set(Element, "uri", Filename, NULL);
-	g_object_set(Element, "video-sink", Appsink, NULL);
-	g_object_set(Element, "flags", GST_PLAY_FLAG_VIDEO, NULL); 
-	g_object_set (Appsink, "emit-signals", FALSE, "sync", FALSE, NULL);
-
-	GstCaps *caps;
-	caps = gst_caps_new_simple ("video/x-raw",
-		"format", G_TYPE_STRING, "BGRA", //We should use RGB for better performance here! Implement later
-		NULL);
-
-	gst_app_sink_set_caps(Appsink, caps);
-
-	gst_app_sink_set_drop(Appsink, false);
-	gst_app_sink_set_max_buffers(Appsink, 5);
-
-	gst_element_set_state(Element, GST_STATE_PLAYING);
-	//gst_element_set_state(GST_ELEMENT (Appsink), GST_STATE_PLAYING);
-	gst_bus_timed_pop_filtered(Bus, -1, GST_MESSAGE_ASYNC_DONE);
-	CopyThread = thread (&GstreamerVideoStream::Copy, this);
-
-	RefreshDuration();
-
-	return ID;
-}
-
-void GstreamerVideoStream::Copy()
-{
-	while(Copying)
-	{
-		int num = -1;
-		for (int i = 0; i < 5; i++)
-		{
-			if(FrameBuffer[i].Displayed)
-			{
-
-				num = i;
-				GstSample *sample;
-				sample = gst_app_sink_pull_sample(Appsink);
-				Mutex.lock();
-				if(FrameBuffer[i].Buffer)
-				{
-					if(FrameBuffer[i].Memory.data)
-						gst_buffer_unmap(FrameBuffer[i].Buffer, &FrameBuffer[i].Memory);
-					gst_buffer_unref(FrameBuffer[i].Buffer);
-				}
-				//if(FrameBuffer[i].Sample)
-					//gst_sample_unref(FrameBuffer[i].Sample);
-
-
-				FrameBuffer[i].Displayed = false;
-				FrameBuffer[i].Sample = sample;
-				Mutex.unlock();
-
-				//gst_element_send_event (Element, gst_event_new_step (GST_FORMAT_BUFFERS, 1, 1.0, TRUE, FALSE));
-				break;
-			}
-		}
-		if(num == -1)
-			BufferFull = true;
-	}
-}
-
-bool GstreamerVideoStream::CloseVideo()
-{
-	Copying = false;
-	CopyThread.join();
-
-	for(int i= 0; i< 5; i++)
-	{
-		if(FrameBuffer[i].Buffer)
-		{
-			if(FrameBuffer[i].Memory.data)
-				gst_buffer_unmap(FrameBuffer[i].Buffer, &FrameBuffer[i].Memory);
-			gst_buffer_unref(FrameBuffer[i].Buffer);
-		}
-		//if(FrameBuffer[i].Sample)
-			//gst_sample_unref(FrameBuffer[i].Sample);
-	}
-
-	if(Element)
-		gst_element_set_state(Element, GST_STATE_NULL);
-
-	if(Appsink)
-		gst_object_unref(Appsink);
-	if(Bus)
-		gst_object_unref(Bus);
-	//if(Buffer && &Mapinfo)
-		//gst_buffer_unmap(Buffer, &Mapinfo);
-
-
-	if(Element)
-		gst_object_unref(Element);
-	return true;
-}
-
-float GstreamerVideoStream::GetVideoLength()
-{
-	if(Duration <= 0)
-		RefreshDuration();
-	return Duration;
-}
-
-struct ApplicationFrame GstreamerVideoStream::GetFrame(float Time)
-{
-	float VideoTime = 0.0;
-	int Width = 0;
-	int Height = 0;
-	int Size = -1;
-
-	Mutex.lock();
-	for(int i = 0; i < 5; i++)
-	{
-		if(!FrameBuffer[i].Displayed)
-		{
-			if(FrameBuffer[i].Sample) {
-				GstBuffer *Buffer = gst_sample_get_buffer(FrameBuffer[i].Sample);
-				GstMapInfo Mapinfo;
-
-				GstCaps *BufferCaps = gst_sample_get_caps (FrameBuffer[i].Sample);
-				GstStructure *BufferStructure = gst_caps_get_structure (BufferCaps, 0);
-
-				gst_buffer_map(Buffer, &Mapinfo, GST_MAP_READ);
-
-				Size = (int) Mapinfo.size;
-				gst_structure_get_int (BufferStructure, "width", &Width);
-				gst_structure_get_int (BufferStructure, "height", &Height);
-				VideoTime = (float) (Buffer->pts / GST_SECOND);
-
-				ReturnFrame.data = Mapinfo.data;
-				ReturnFrame.height = Height;
-				ReturnFrame.width = Width;
-				ReturnFrame.size = Size;
-				ReturnFrame.videotime = VideoTime;
-
-				FrameBuffer[i].Memory = Mapinfo;
-				FrameBuffer[i].Buffer = Buffer;
-
-				if(BufferCaps)
-					gst_caps_unref(BufferCaps);
-
-				if(BufferStructure)
-					gst_object_unref(BufferStructure);
-			}
-			FrameBuffer[i].Displayed = true;
-			break;
-		}
-	}
-	Mutex.unlock();
-	return ReturnFrame;
-}
-
-bool GstreamerVideoStream::Skip(float Start, float Gap)
-{
-	if(!gst_element_seek_simple(Element, GST_FORMAT_TIME, (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE), (gint64)((Start + Gap) * GST_SECOND)))
-	{
-		LogVideoError("Seek failed");
-		return true;
-	}
-	return false;
-}
-
-void GstreamerVideoStream::SetVideoLoop(bool Loop)
-{
-	if(Loop)
-		g_object_set(Element, "sync", TRUE, NULL);
-	else
-		g_object_set(Element, "sync", FALSE, NULL);
-	this->Loop = Loop;
-}
-
-void GstreamerVideoStream::PauseVideo()
-{
-	if(Element)
-		gst_element_set_state(Element, GST_STATE_PAUSED);
-}
-
-void GstreamerVideoStream::ResumeVideo()
-{
-	if(Element)
-		gst_element_set_state(Element, GST_STATE_PLAYING);
-}
-
-bool GstreamerVideoStream::IsFinished()
-{
-	return Finished;
-}
-
-void GstreamerVideoStream::RefreshDuration()
-{
-	if(Element)
-	{
-		gint64 time;
-		if(!gst_element_query_duration(Element, GST_FORMAT_TIME, &time)) {
-			LogVideoError("Could not query duration");
-		}
-		Duration = (gfloat)((gdouble)(time/GST_SECOND));
-	}
-}
-
-void GstreamerVideoStream::UpdateVideo()
-{
-	if(Running) {
-		Message = gst_bus_pop (Bus);
-   
-		/* Parse message */
-		if (Message != NULL) {
-		  GError *err;
-		  gchar *debug_info;
-		  string m;
-       
-		  switch (GST_MESSAGE_TYPE (Message)) {
-			case GST_MESSAGE_ERROR:
-				gst_message_parse_error (Message, &err, &debug_info);
-				m = err->message;
-				LogVideoError(m.c_str());
-				g_clear_error (&err);
-				g_free (debug_info);
-				break;
-			case GST_MESSAGE_DURATION_CHANGED:
-				RefreshDuration();
-				break;
-			case GST_MESSAGE_STATE_CHANGED:
-				break;
-			case GST_MESSAGE_EOS:
-				if(Loop)
-					Skip(0, 0);
-				else
-					Finished = true;
-				break;
-			default:
-				/* We should not reach here */
-				//LogError ("Unexpected message received.\n");
-				break;
-		  }
-		  gst_message_unref (Message);
-		}
-	}
-}
\ No newline at end of file
diff --git a/GstreamerHelper/GstreamerVideoStream.h b/GstreamerHelper/GstreamerVideoStream.h
deleted file mode 100644
index 7d69e019..00000000
--- a/GstreamerHelper/GstreamerVideoStream.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-#include <mutex>
-#include <thread>
-#include "gst/gst.h"
-#include "GstreamerVideo.h"
-#include "gst\app\gstappsink.h"
-#include "VocaluxeClock.h"
-
-	using namespace std;
-
-class GstreamerVideoStream
-{
-
-public:
-	int ID;
-	bool Closed;
-
-	GstreamerVideoStream(int ID);
-	~GstreamerVideoStream(void);
-
-	int LoadVideo(const wchar_t* VideoFileName);
-    bool CloseVideo();
-
-    float GetVideoLength();
-	struct ApplicationFrame GetFrame(float Time);
-    bool Skip(float Start, float Gap);
-    void SetVideoLoop(bool Loop);
-    void PauseVideo();
-	void ResumeVideo();
-
-	void UpdateVideo();
-
-    bool IsFinished();
-
-private:
-	struct BufferFrame {
-		GstSample *Sample;
-		GstBuffer *Buffer;
-		GstMapInfo Memory;
-		gboolean Displayed;
-	};
-
-	thread CopyThread;
-
-	GstAppSink *Appsink;
-	GstElement *Element;
-	GstBus *Bus;
-	GstMessage *Message;
-
-	BufferFrame FrameBuffer[5];
-	gboolean BufferFull;
-	mutex Mutex;
-
-	gboolean Loop;
-
-	gboolean Running;
-	volatile gboolean Copying;
-
-	gboolean Paused;
-	bool Finished;
-
-	gfloat Duration;
-
-	ApplicationFrame ReturnFrame;
-
-	void RefreshDuration();
-
-	void Copy();
-};
-
-
diff --git a/GstreamerHelper/dllmain.cpp b/GstreamerHelper/dllmain.cpp
deleted file mode 100644
index aa837bd4..00000000
--- a/GstreamerHelper/dllmain.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// dllmain.cpp : Definiert den Einstiegspunkt für die DLL-Anwendung.
-#include "stdafx.h"
-
-BOOL APIENTRY DllMain( HMODULE hModule,
-                       DWORD  ul_reason_for_call,
-                       LPVOID lpReserved
-					 )
-{
-	switch (ul_reason_for_call)
-	{
-	case DLL_PROCESS_ATTACH:
-	case DLL_THREAD_ATTACH:
-	case DLL_THREAD_DETACH:
-	case DLL_PROCESS_DETACH:
-		break;
-	}
-	return TRUE;
-}
-
diff --git a/GstreamerHelper/stdafx.cpp b/GstreamerHelper/stdafx.cpp
deleted file mode 100644
index 84f3b8da..00000000
--- a/GstreamerHelper/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : Quelldatei, die nur die Standard-Includes einbindet.
-// GstreamerHelper.pch ist der vorkompilierte Header.
-// stdafx.obj enthält die vorkompilierten Typinformationen.
-
-#include "stdafx.h"
-
-// TODO: Auf zusätzliche Header verweisen, die in STDAFX.H
-// und nicht in dieser Datei erforderlich sind.
diff --git a/GstreamerHelper/stdafx.h b/GstreamerHelper/stdafx.h
deleted file mode 100644
index fbc6220a..00000000
--- a/GstreamerHelper/stdafx.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// stdafx.h : Includedatei für Standardsystem-Includedateien
-// oder häufig verwendete projektspezifische Includedateien,
-// die nur in unregelmäßigen Abständen geändert werden.
-//
-
-#pragma once
-
-#include "targetver.h"
-
-#define WIN32_LEAN_AND_MEAN             // Selten verwendete Teile der Windows-Header nicht einbinden.
-// Windows-Headerdateien:
-#include <windows.h>
-
-
-
-// TODO: Hier auf zusätzliche Header, die das Programm erfordert, verweisen.
diff --git a/GstreamerHelper/targetver.h b/GstreamerHelper/targetver.h
deleted file mode 100644
index a7654135..00000000
--- a/GstreamerHelper/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Durch Einbeziehen von"SDKDDKVer.h" wird die höchste verfügbare Windows-Plattform definiert.
-
-// Wenn Sie die Anwendung für eine frühere Windows-Plattform erstellen möchten, schließen Sie "WinSDKVer.h" ein, und
-// legen Sie das _WIN32_WINNT-Makro auf die zu unterstützende Plattform fest, bevor Sie "SDKDDKVer.h" einschließen.
-
-#include <SDKDDKVer.h>
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gaction.h b/GstreamerHelper/x64/include/glib-2.0/gio/gaction.h
deleted file mode 100644
index 0a4e8c39..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gaction.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_H__
-#define __G_ACTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ACTION                                       (g_action_get_type ())
-#define G_ACTION(inst)                                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_ACTION, GAction))
-#define G_IS_ACTION(inst)                                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_ACTION))
-#define G_ACTION_GET_IFACE(inst)                            (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             G_TYPE_ACTION, GActionInterface))
-
-typedef struct _GActionInterface                            GActionInterface;
-
-struct _GActionInterface
-{
-  GTypeInterface g_iface;
-
-  /* virtual functions */
-  const gchar *        (* get_name)             (GAction  *action);
-  const GVariantType * (* get_parameter_type)   (GAction  *action);
-  const GVariantType * (* get_state_type)       (GAction  *action);
-  GVariant *           (* get_state_hint)       (GAction  *action);
-
-  gboolean             (* get_enabled)          (GAction  *action);
-  GVariant *           (* get_state)            (GAction  *action);
-
-  void                 (* change_state)         (GAction  *action,
-                                                 GVariant *value);
-  void                 (* activate)             (GAction  *action,
-                                                 GVariant *parameter);
-};
-
-GLIB_AVAILABLE_IN_2_30
-GType                   g_action_get_type                               (void) G_GNUC_CONST;
-
-const gchar *           g_action_get_name                               (GAction            *action);
-const GVariantType *    g_action_get_parameter_type                     (GAction            *action);
-const GVariantType *    g_action_get_state_type                         (GAction            *action);
-GVariant *              g_action_get_state_hint                         (GAction            *action);
-
-gboolean                g_action_get_enabled                            (GAction            *action);
-GVariant *              g_action_get_state                              (GAction            *action);
-
-void                    g_action_change_state                           (GAction            *action,
-                                                                         GVariant           *value);
-void                    g_action_activate                               (GAction            *action,
-                                                                         GVariant           *parameter);
-G_END_DECLS
-
-#endif /* __G_ACTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gactiongroup.h b/GstreamerHelper/x64/include/glib-2.0/gio/gactiongroup.h
deleted file mode 100644
index b300aefd..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gactiongroup.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_GROUP_H__
-#define __G_ACTION_GROUP_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_ACTION_GROUP                                 (g_action_group_get_type ())
-#define G_ACTION_GROUP(inst)                                (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_ACTION_GROUP, GActionGroup))
-#define G_IS_ACTION_GROUP(inst)                             (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_ACTION_GROUP))
-#define G_ACTION_GROUP_GET_IFACE(inst)                      (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             G_TYPE_ACTION_GROUP, GActionGroupInterface))
-
-typedef struct _GActionGroupInterface                       GActionGroupInterface;
-
-struct _GActionGroupInterface
-{
-  GTypeInterface g_iface;
-
-  /* virtual functions */
-  gboolean              (* has_action)                 (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  gchar **              (* list_actions)               (GActionGroup  *action_group);
-
-  gboolean              (* get_action_enabled)         (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  const GVariantType *  (* get_action_parameter_type)  (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  const GVariantType *  (* get_action_state_type)      (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  GVariant *            (* get_action_state_hint)      (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  GVariant *            (* get_action_state)           (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  void                  (* change_action_state)        (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        GVariant      *value);
-
-  void                  (* activate_action)            (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        GVariant      *parameter);
-
-  /* signals */
-  void                  (* action_added)               (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-  void                  (* action_removed)             (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-  void                  (* action_enabled_changed)     (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        gboolean       enabled);
-  void                  (* action_state_changed)       (GActionGroup   *action_group,
-                                                        const gchar    *action_name,
-                                                        GVariant       *state);
-
-  /* more virtual functions */
-  gboolean              (* query_action)               (GActionGroup        *action_group,
-                                                        const gchar         *action_name,
-                                                        gboolean            *enabled,
-                                                        const GVariantType **parameter_type,
-                                                        const GVariantType **state_type,
-                                                        GVariant           **state_hint,
-                                                        GVariant           **state);
-};
-
-GType                   g_action_group_get_type                         (void) G_GNUC_CONST;
-
-gboolean                g_action_group_has_action                       (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-gchar **                g_action_group_list_actions                     (GActionGroup *action_group);
-
-const GVariantType *    g_action_group_get_action_parameter_type        (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-const GVariantType *    g_action_group_get_action_state_type            (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-GVariant *              g_action_group_get_action_state_hint            (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-
-gboolean                g_action_group_get_action_enabled               (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-
-GVariant *              g_action_group_get_action_state                 (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-void                    g_action_group_change_action_state              (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *value);
-
-void                    g_action_group_activate_action                  (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *parameter);
-
-/* signals */
-void                    g_action_group_action_added                     (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-void                    g_action_group_action_removed                   (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-void                    g_action_group_action_enabled_changed           (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         gboolean      enabled);
-
-void                    g_action_group_action_state_changed             (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *state);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_action_group_query_action                     (GActionGroup        *action_group,
-                                                                         const gchar         *action_name,
-                                                                         gboolean            *enabled,
-                                                                         const GVariantType **parameter_type,
-                                                                         const GVariantType **state_type,
-                                                                         GVariant           **state_hint,
-                                                                         GVariant           **state);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_GROUP_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gactiongroupexporter.h b/GstreamerHelper/x64/include/glib-2.0/gio/gactiongroupexporter.h
deleted file mode 100644
index eaa18e66..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gactiongroupexporter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_GROUP_EXPORTER_H__
-#define __G_ACTION_GROUP_EXPORTER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_32
-guint                   g_dbus_connection_export_action_group           (GDBusConnection  *connection,
-                                                                         const gchar      *object_path,
-                                                                         GActionGroup     *action_group,
-                                                                         GError          **error);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_dbus_connection_unexport_action_group         (GDBusConnection  *connection,
-                                                                         guint             export_id);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_GROUP_EXPORTER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gactionmap.h b/GstreamerHelper/x64/include/glib-2.0/gio/gactionmap.h
deleted file mode 100644
index 8e5993e2..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gactionmap.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_MAP_H__
-#define __G_ACTION_MAP_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_ACTION_MAP                                   (g_action_map_get_type ())
-#define G_ACTION_MAP(inst)                                  (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                             G_TYPE_ACTION_MAP, GActionMap))
-#define G_IS_ACTION_MAP(inst)                               (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                             G_TYPE_ACTION_MAP))
-#define G_ACTION_MAP_GET_IFACE(inst)                        (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                   \
-                                                             G_TYPE_ACTION_MAP, GActionMapInterface))
-
-typedef struct _GActionMapInterface                         GActionMapInterface;
-typedef struct _GActionEntry                                GActionEntry;
-
-struct _GActionMapInterface
-{
-  GTypeInterface g_iface;
-
-  GAction * (* lookup_action) (GActionMap  *action_map,
-                               const gchar *action_name);
-  void      (* add_action)    (GActionMap  *action_map,
-                               GAction     *action);
-  void      (* remove_action) (GActionMap  *action_map,
-                               const gchar *action_name);
-};
-
-struct _GActionEntry
-{
-  const gchar *name;
-
-  void (* activate) (GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       user_data);
-
-  const gchar *parameter_type;
-
-  const gchar *state;
-
-  void (* change_state) (GSimpleAction *action,
-                         GVariant      *value,
-                         gpointer       user_data);
-
-  /*< private >*/
-  gsize padding[3];
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_action_map_get_type                           (void) G_GNUC_CONST;
-
-GAction *               g_action_map_lookup_action                      (GActionMap         *action_map,
-                                                                         const gchar        *action_name);
-void                    g_action_map_add_action                         (GActionMap         *action_map,
-                                                                         GAction            *action);
-void                    g_action_map_remove_action                      (GActionMap         *action_map,
-                                                                         const gchar        *action_name);
-void                    g_action_map_add_action_entries                 (GActionMap         *action_map,
-                                                                         const GActionEntry *entries,
-                                                                         gint                n_entries,
-                                                                         gpointer            user_data);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_MAP_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gappinfo.h b/GstreamerHelper/x64/include/glib-2.0/gio/gappinfo.h
deleted file mode 100644
index 578f62f1..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gappinfo.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APP_INFO_H__
-#define __G_APP_INFO_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APP_INFO            (g_app_info_get_type ())
-#define G_APP_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_APP_INFO, GAppInfo))
-#define G_IS_APP_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_APP_INFO))
-#define G_APP_INFO_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_APP_INFO, GAppInfoIface))
-
-#define G_TYPE_APP_LAUNCH_CONTEXT         (g_app_launch_context_get_type ())
-#define G_APP_LAUNCH_CONTEXT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContext))
-#define G_APP_LAUNCH_CONTEXT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-#define G_IS_APP_LAUNCH_CONTEXT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_APP_LAUNCH_CONTEXT))
-#define G_IS_APP_LAUNCH_CONTEXT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LAUNCH_CONTEXT))
-#define G_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-
-typedef struct _GAppLaunchContextClass   GAppLaunchContextClass;
-typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
-
-/**
- * GAppInfo:
- *
- * Information about an installed application and methods to launch
- * it (with file arguments).
- */
-
-/**
- * GAppInfoIface:
- * @g_iface: The parent interface.
- * @dup: Copies a #GAppInfo.
- * @equal: Checks two #GAppInfo<!-- -->s for equality.
- * @get_id: Gets a string identifier for a #GAppInfo.
- * @get_name: Gets the name of the application for a #GAppInfo.
- * @get_description: Gets a short description for the application described by the #GAppInfo.
- * @get_executable: Gets the executable name for the #GAppInfo.
- * @get_icon: Gets the #GIcon for the #GAppInfo.
- * @launch: Launches an application specified by the #GAppInfo.
- * @supports_uris: Indicates whether the application specified supports launching URIs.
- * @supports_files: Indicates whether the application specified accepts filename arguments.
- * @launch_uris: Launches an application with a list of URIs.
- * @should_show: Returns whether an application should be shown (e.g. when getting a list of installed applications).
- * <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">
- * <citetitle>FreeDesktop.Org Startup Notification Specification</citetitle></ulink>.
- * @set_as_default_for_type: Sets an application as default for a given content type.
- * @set_as_default_for_extension: Sets an application as default for a given file extension.
- * @add_supports_type: Adds to the #GAppInfo information about supported file types.
- * @can_remove_supports_type: Checks for support for removing supported file types from a #GAppInfo.
- * @remove_supports_type: Removes a supported application type from a #GAppInfo.
- * @can_delete: Checks if a #GAppInfo can be deleted. Since 2.20
- * @do_delete: Deletes a #GAppInfo. Since 2.20
- * @get_commandline: Gets the commandline for the #GAppInfo. Since 2.20
- * @get_display_name: Gets the display name for the #GAppInfo. Since 2.24
- * @set_as_last_used_for_type: Sets the application as the last used. See g_app_info_set_as_last_used_for_type().
- *
- * Application Information interface, for operating system portability.
- */
-typedef struct _GAppInfoIface    GAppInfoIface;
-
-struct _GAppInfoIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GAppInfo *   (* dup)                          (GAppInfo           *appinfo);
-  gboolean     (* equal)                        (GAppInfo           *appinfo1,
-                                                 GAppInfo           *appinfo2);
-  const char * (* get_id)                       (GAppInfo           *appinfo);
-  const char * (* get_name)                     (GAppInfo           *appinfo);
-  const char * (* get_description)              (GAppInfo           *appinfo);
-  const char * (* get_executable)               (GAppInfo           *appinfo);
-  GIcon *      (* get_icon)                     (GAppInfo           *appinfo);
-  gboolean     (* launch)                       (GAppInfo           *appinfo,
-                                                 GList              *files,
-                                                 GAppLaunchContext  *launch_context,
-                                                 GError            **error);
-  gboolean     (* supports_uris)                (GAppInfo           *appinfo);
-  gboolean     (* supports_files)               (GAppInfo           *appinfo);
-  gboolean     (* launch_uris)                  (GAppInfo           *appinfo,
-                                                 GList              *uris,
-                                                 GAppLaunchContext  *launch_context,
-                                                 GError            **error);
-  gboolean     (* should_show)                  (GAppInfo           *appinfo);
-
-  /* For changing associations */
-  gboolean     (* set_as_default_for_type)      (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* set_as_default_for_extension) (GAppInfo           *appinfo,
-                                                 const char         *extension,
-                                                 GError            **error);
-  gboolean     (* add_supports_type)            (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* can_remove_supports_type)     (GAppInfo           *appinfo);
-  gboolean     (* remove_supports_type)         (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* can_delete)                   (GAppInfo           *appinfo);
-  gboolean     (* do_delete)                    (GAppInfo           *appinfo);
-  const char * (* get_commandline)              (GAppInfo           *appinfo);
-  const char * (* get_display_name)             (GAppInfo           *appinfo);
-  gboolean     (* set_as_last_used_for_type)    (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  const char ** (* get_supported_types)         (GAppInfo           *appinfo);
-};
-
-GType       g_app_info_get_type                     (void) G_GNUC_CONST;
-GAppInfo *  g_app_info_create_from_commandline      (const char           *commandline,
-                                                     const char           *application_name,
-                                                     GAppInfoCreateFlags   flags,
-                                                     GError              **error);
-GAppInfo *  g_app_info_dup                          (GAppInfo             *appinfo);
-gboolean    g_app_info_equal                        (GAppInfo             *appinfo1,
-                                                     GAppInfo             *appinfo2);
-const char *g_app_info_get_id                       (GAppInfo             *appinfo);
-const char *g_app_info_get_name                     (GAppInfo             *appinfo);
-const char *g_app_info_get_display_name             (GAppInfo             *appinfo);
-const char *g_app_info_get_description              (GAppInfo             *appinfo);
-const char *g_app_info_get_executable               (GAppInfo             *appinfo);
-const char *g_app_info_get_commandline              (GAppInfo             *appinfo);
-GIcon *     g_app_info_get_icon                     (GAppInfo             *appinfo);
-gboolean    g_app_info_launch                       (GAppInfo             *appinfo,
-                                                     GList                *files,
-                                                     GAppLaunchContext    *launch_context,
-                                                     GError              **error);
-gboolean    g_app_info_supports_uris                (GAppInfo             *appinfo);
-gboolean    g_app_info_supports_files               (GAppInfo             *appinfo);
-gboolean    g_app_info_launch_uris                  (GAppInfo             *appinfo,
-                                                     GList                *uris,
-                                                     GAppLaunchContext    *launch_context,
-                                                     GError              **error);
-gboolean    g_app_info_should_show                  (GAppInfo             *appinfo);
-
-gboolean    g_app_info_set_as_default_for_type      (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-gboolean    g_app_info_set_as_default_for_extension (GAppInfo             *appinfo,
-                                                     const char           *extension,
-                                                     GError              **error);
-gboolean    g_app_info_add_supports_type            (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-gboolean    g_app_info_can_remove_supports_type     (GAppInfo             *appinfo);
-gboolean    g_app_info_remove_supports_type         (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_2_34
-const char **g_app_info_get_supported_types         (GAppInfo             *appinfo);
-
-gboolean    g_app_info_can_delete                   (GAppInfo   *appinfo);
-gboolean    g_app_info_delete                       (GAppInfo   *appinfo);
-
-gboolean    g_app_info_set_as_last_used_for_type    (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-
-GList *   g_app_info_get_all                     (void);
-GList *   g_app_info_get_all_for_type            (const char  *content_type);
-GList *   g_app_info_get_recommended_for_type    (const gchar *content_type);
-GList *   g_app_info_get_fallback_for_type       (const gchar *content_type);
-
-void      g_app_info_reset_type_associations     (const char  *content_type);
-GAppInfo *g_app_info_get_default_for_type        (const char  *content_type,
-                                                  gboolean     must_support_uris);
-GAppInfo *g_app_info_get_default_for_uri_scheme  (const char  *uri_scheme);
-
-gboolean  g_app_info_launch_default_for_uri      (const char              *uri,
-                                                  GAppLaunchContext       *launch_context,
-                                                  GError                 **error);
-
-/**
- * GAppLaunchContext:
- *
- * Integrating the launch with the launching application. This is used to
- * handle for instance startup notification and launching the new application
- * on the same screen as the launching window.
- */
-struct _GAppLaunchContext
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GAppLaunchContextPrivate *priv;
-};
-
-struct _GAppLaunchContextClass
-{
-  GObjectClass parent_class;
-
-  char * (* get_display)           (GAppLaunchContext *context,
-                                    GAppInfo          *info,
-                                    GList             *files);
-  char * (* get_startup_notify_id) (GAppLaunchContext *context,
-                                    GAppInfo          *info,
-                                    GList             *files);
-  void   (* launch_failed)         (GAppLaunchContext *context,
-                                    const char        *startup_notify_id);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType              g_app_launch_context_get_type              (void) G_GNUC_CONST;
-GAppLaunchContext *g_app_launch_context_new                   (void);
-
-GLIB_AVAILABLE_IN_2_32
-void               g_app_launch_context_setenv                (GAppLaunchContext *context,
-                                                               const char        *variable,
-                                                               const char        *value);
-GLIB_AVAILABLE_IN_2_32
-void               g_app_launch_context_unsetenv              (GAppLaunchContext *context,
-                                                               const char        *variable);
-GLIB_AVAILABLE_IN_2_32
-char **            g_app_launch_context_get_environment       (GAppLaunchContext *context);
-
-char *             g_app_launch_context_get_display           (GAppLaunchContext *context,
-                                                               GAppInfo          *info,
-                                                               GList             *files);
-char *             g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
-                                                               GAppInfo          *info,
-                                                               GList             *files);
-void               g_app_launch_context_launch_failed         (GAppLaunchContext *context,
-                                                               const char *       startup_notify_id);
-
-G_END_DECLS
-
-#endif /* __G_APP_INFO_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gapplication.h b/GstreamerHelper/x64/include/glib-2.0/gio/gapplication.h
deleted file mode 100644
index 087682eb..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gapplication.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APPLICATION_H__
-#define __G_APPLICATION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APPLICATION                                  (g_application_get_type ())
-#define G_APPLICATION(inst)                                 (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_APPLICATION, GApplication))
-#define G_APPLICATION_CLASS(class)                          (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_APPLICATION, GApplicationClass))
-#define G_IS_APPLICATION(inst)                              (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_APPLICATION))
-#define G_IS_APPLICATION_CLASS(class)                       (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_APPLICATION))
-#define G_APPLICATION_GET_CLASS(inst)                       (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_APPLICATION, GApplicationClass))
-
-typedef struct _GApplicationPrivate                         GApplicationPrivate;
-typedef struct _GApplicationClass                           GApplicationClass;
-
-/**
- * GApplication:
- *
- * Since: 2.28
- */
-struct _GApplication
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GApplicationPrivate *priv;
-};
-
-struct _GApplicationClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void                      (* startup)             (GApplication              *application);
-
-  void                      (* activate)            (GApplication              *application);
-
-  void                      (* open)                (GApplication              *application,
-                                                     GFile                    **files,
-                                                     gint                       n_files,
-                                                     const gchar               *hint);
-
-  int                       (* command_line)        (GApplication              *application,
-                                                     GApplicationCommandLine   *command_line);
-
-  /* vfuncs */
-  gboolean                  (* local_command_line)  (GApplication              *application,
-                                                     gchar                   ***arguments,
-                                                     int                       *exit_status);
-
-  void                      (* before_emit)         (GApplication              *application,
-                                                     GVariant                  *platform_data);
-  void                      (* after_emit)          (GApplication              *application,
-                                                     GVariant                  *platform_data);
-  void                      (* add_platform_data)   (GApplication              *application,
-                                                     GVariantBuilder           *builder);
-  void                      (* quit_mainloop)       (GApplication              *application);
-  void                      (* run_mainloop)        (GApplication              *application);
-  void                      (* shutdown)            (GApplication              *application);
-
-  gboolean                  (* dbus_register)       (GApplication              *application,
-                                                     GDBusConnection           *connection,
-                                                     const gchar               *object_path,
-                                                     GError                   **error);
-  void                      (* dbus_unregister)     (GApplication              *application,
-                                                     GDBusConnection           *connection,
-                                                     const gchar               *object_path);
-
-  /*< private >*/
-  gpointer padding[9];
-};
-
-GType                   g_application_get_type                          (void) G_GNUC_CONST;
-
-gboolean                g_application_id_is_valid                       (const gchar              *application_id);
-
-GApplication *          g_application_new                               (const gchar              *application_id,
-                                                                         GApplicationFlags         flags);
-
-const gchar *           g_application_get_application_id                (GApplication             *application);
-void                    g_application_set_application_id                (GApplication             *application,
-                                                                         const gchar              *application_id);
-
-GLIB_AVAILABLE_IN_2_34
-GDBusConnection *       g_application_get_dbus_connection               (GApplication             *application);
-GLIB_AVAILABLE_IN_2_34
-const gchar *           g_application_get_dbus_object_path              (GApplication             *application);
-
-guint                   g_application_get_inactivity_timeout            (GApplication             *application);
-void                    g_application_set_inactivity_timeout            (GApplication             *application,
-                                                                         guint                     inactivity_timeout);
-
-GApplicationFlags       g_application_get_flags                         (GApplication             *application);
-void                    g_application_set_flags                         (GApplication             *application,
-                                                                         GApplicationFlags         flags);
-
-GLIB_DEPRECATED
-void                    g_application_set_action_group                  (GApplication             *application,
-                                                                         GActionGroup             *action_group);
-
-gboolean                g_application_get_is_registered                 (GApplication             *application);
-gboolean                g_application_get_is_remote                     (GApplication             *application);
-
-gboolean                g_application_register                          (GApplication             *application,
-                                                                         GCancellable             *cancellable,
-                                                                         GError                  **error);
-
-void                    g_application_hold                              (GApplication             *application);
-void                    g_application_release                           (GApplication             *application);
-
-void                    g_application_activate                          (GApplication             *application);
-
-void                    g_application_open                              (GApplication             *application,
-                                                                         GFile                   **files,
-                                                                         gint                      n_files,
-                                                                         const gchar              *hint);
-
-int                     g_application_run                               (GApplication             *application,
-                                                                         int                       argc,
-                                                                         char                    **argv);
-
-void                    g_application_quit                              (GApplication             *application);
-
-GLIB_AVAILABLE_IN_2_32
-GApplication *          g_application_get_default                       (void);
-GLIB_AVAILABLE_IN_2_32
-void                    g_application_set_default                       (GApplication             *application);
-
-G_END_DECLS
-
-#endif /* __G_APPLICATION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gapplicationcommandline.h b/GstreamerHelper/x64/include/glib-2.0/gio/gapplicationcommandline.h
deleted file mode 100644
index 25def211..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gapplicationcommandline.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APPLICATION_COMMAND_LINE_H__
-#define __G_APPLICATION_COMMAND_LINE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APPLICATION_COMMAND_LINE                     (g_application_command_line_get_type ())
-#define G_APPLICATION_COMMAND_LINE(inst)                    (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLine))
-#define G_APPLICATION_COMMAND_LINE_CLASS(class)             (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLineClass))
-#define G_IS_APPLICATION_COMMAND_LINE(inst)                 (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE))
-#define G_IS_APPLICATION_COMMAND_LINE_CLASS(class)          (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE))
-#define G_APPLICATION_COMMAND_LINE_GET_CLASS(inst)          (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLineClass))
-
-typedef struct _GApplicationCommandLinePrivate               GApplicationCommandLinePrivate;
-typedef struct _GApplicationCommandLineClass                 GApplicationCommandLineClass;
-
-struct _GApplicationCommandLine
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GApplicationCommandLinePrivate *priv;
-};
-
-struct _GApplicationCommandLineClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  void (* print_literal)    (GApplicationCommandLine *cmdline,
-                             const gchar             *message);
-  void (* printerr_literal) (GApplicationCommandLine *cmdline,
-                             const gchar             *message);
-
-  gpointer padding[12];
-};
-
-GType                   g_application_command_line_get_type             (void) G_GNUC_CONST;
-
-gchar **                g_application_command_line_get_arguments        (GApplicationCommandLine   *cmdline,
-                                                                         int                       *argc);
-
-const gchar * const *   g_application_command_line_get_environ          (GApplicationCommandLine   *cmdline);
-
-const gchar *           g_application_command_line_getenv               (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *name);
-
-const gchar *           g_application_command_line_get_cwd              (GApplicationCommandLine   *cmdline);
-
-gboolean                g_application_command_line_get_is_remote        (GApplicationCommandLine   *cmdline);
-
-void                    g_application_command_line_print                (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *format,
-                                                                         ...) G_GNUC_PRINTF(2, 3);
-void                    g_application_command_line_printerr             (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *format,
-                                                                         ...) G_GNUC_PRINTF(2, 3);
-
-int                     g_application_command_line_get_exit_status      (GApplicationCommandLine   *cmdline);
-void                    g_application_command_line_set_exit_status      (GApplicationCommandLine   *cmdline,
-                                                                         int                        exit_status);
-
-GVariant *              g_application_command_line_get_platform_data    (GApplicationCommandLine   *cmdline);
-
-G_END_DECLS
-
-#endif /* __G_APPLICATION_COMMAND_LINE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gasyncinitable.h b/GstreamerHelper/x64/include/glib-2.0/gio/gasyncinitable.h
deleted file mode 100644
index 84428215..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gasyncinitable.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNC_INITABLE_H__
-#define __G_ASYNC_INITABLE_H__
-
-#include <gio/giotypes.h>
-#include <gio/ginitable.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ASYNC_INITABLE            (g_async_initable_get_type ())
-#define G_ASYNC_INITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ASYNC_INITABLE, GAsyncInitable))
-#define G_IS_ASYNC_INITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ASYNC_INITABLE))
-#define G_ASYNC_INITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ASYNC_INITABLE, GAsyncInitableIface))
-#define G_TYPE_IS_ASYNC_INITABLE(type)   (g_type_is_a ((type), G_TYPE_ASYNC_INITABLE))
-
-/**
- * GAsyncInitable:
- *
- * Interface for asynchronously initializable objects.
- *
- * Since: 2.22
- **/
-typedef struct _GAsyncInitableIface GAsyncInitableIface;
-
-/**
- * GAsyncInitableIface:
- * @g_iface: The parent interface.
- * @init_async: Starts initialization of the object.
- * @init_finish: Finishes initialization of the object.
- *
- * Provides an interface for asynchronous initializing object such that
- * initialization may fail.
- *
- * Since: 2.22
- **/
-struct _GAsyncInitableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  void     (* init_async)  (GAsyncInitable      *initable,
-			    int                  io_priority,
-			    GCancellable        *cancellable,
-			    GAsyncReadyCallback  callback,
-			    gpointer             user_data);
-  gboolean (* init_finish) (GAsyncInitable      *initable,
-			    GAsyncResult        *res,
-			    GError             **error);
-};
-
-GType    g_async_initable_get_type    (void) G_GNUC_CONST;
-
-
-void     g_async_initable_init_async       (GAsyncInitable       *initable,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-gboolean g_async_initable_init_finish      (GAsyncInitable       *initable,
-					    GAsyncResult         *res,
-					    GError              **error);
-
-void     g_async_initable_new_async        (GType                 object_type,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data,
-					    const gchar          *first_property_name,
-					    ...);
-void     g_async_initable_newv_async       (GType                 object_type,
-					    guint                 n_parameters,
-					    GParameter           *parameters,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-void     g_async_initable_new_valist_async (GType                 object_type,
-					    const gchar          *first_property_name,
-					    va_list               var_args,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-GObject *g_async_initable_new_finish       (GAsyncInitable       *initable,
-					    GAsyncResult         *res,
-					    GError              **error);
-
-
-
-G_END_DECLS
-
-
-#endif /* __G_ASYNC_INITABLE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gasyncresult.h b/GstreamerHelper/x64/include/glib-2.0/gio/gasyncresult.h
deleted file mode 100644
index e898401a..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gasyncresult.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNC_RESULT_H__
-#define __G_ASYNC_RESULT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ASYNC_RESULT            (g_async_result_get_type ())
-#define G_ASYNC_RESULT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ASYNC_RESULT, GAsyncResult))
-#define G_IS_ASYNC_RESULT(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ASYNC_RESULT))
-#define G_ASYNC_RESULT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ASYNC_RESULT, GAsyncResultIface))
-
-/**
- * GAsyncResult:
- *
- * Holds results information for an asynchronous operation,
- * usually passed directly to a asynchronous _finish() operation.
- **/
-typedef struct _GAsyncResultIface    GAsyncResultIface;
-
-
-/**
- * GAsyncResultIface:
- * @g_iface: The parent interface.
- * @get_user_data: Gets the user data passed to the callback.
- * @get_source_object: Gets the source object that issued the asynchronous operation.
- * @is_tagged: Checks if a result is tagged with a particular source.
- *
- * Interface definition for #GAsyncResult.
- **/
-struct _GAsyncResultIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  gpointer  (* get_user_data)     (GAsyncResult *res);
-  GObject * (* get_source_object) (GAsyncResult *res);
-
-  gboolean  (* is_tagged)         (GAsyncResult *res,
-				   gpointer      tag);
-};
-
-GType    g_async_result_get_type          (void) G_GNUC_CONST;
-
-gpointer g_async_result_get_user_data     (GAsyncResult *res);
-GObject *g_async_result_get_source_object (GAsyncResult *res);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean g_async_result_legacy_propagate_error (GAsyncResult  *res,
-						GError       **error);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_async_result_is_tagged              (GAsyncResult  *res,
-						gpointer       source_tag);
-
-G_END_DECLS
-
-#endif /* __G_ASYNC_RESULT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gbufferedinputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gbufferedinputstream.h
deleted file mode 100644
index 029426c2..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gbufferedinputstream.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_BUFFERED_INPUT_STREAM_H__
-#define __G_BUFFERED_INPUT_STREAM_H__
-
-#include <gio/gfilterinputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BUFFERED_INPUT_STREAM         (g_buffered_input_stream_get_type ())
-#define G_BUFFERED_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStream))
-#define G_BUFFERED_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStreamClass))
-#define G_IS_BUFFERED_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_BUFFERED_INPUT_STREAM))
-#define G_IS_BUFFERED_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_BUFFERED_INPUT_STREAM))
-#define G_BUFFERED_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStreamClass))
-
-/**
- * GBufferedInputStream:
- *
- * Implements #GFilterInputStream with a sized input buffer.
- **/
-typedef struct _GBufferedInputStreamClass    GBufferedInputStreamClass;
-typedef struct _GBufferedInputStreamPrivate  GBufferedInputStreamPrivate;
-
-struct _GBufferedInputStream
-{
-  GFilterInputStream parent_instance;
-
-  /*< private >*/
-  GBufferedInputStreamPrivate *priv;
-};
-
-struct _GBufferedInputStreamClass
-{
-  GFilterInputStreamClass parent_class;
-
-  gssize   (* fill)        (GBufferedInputStream *stream,
-			    gssize                count,
-			    GCancellable         *cancellable,
-			    GError              **error);
-
-  /* Async ops: (optional in derived classes) */
-  void     (* fill_async)  (GBufferedInputStream *stream,
-			    gssize                count,
-			    int                   io_priority,
-			    GCancellable         *cancellable,
-			    GAsyncReadyCallback   callback,
-			    gpointer              user_data);
-  gssize   (* fill_finish) (GBufferedInputStream *stream,
-			    GAsyncResult         *result,
-			    GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GType         g_buffered_input_stream_get_type        (void) G_GNUC_CONST;
-GInputStream* g_buffered_input_stream_new             (GInputStream          *base_stream);
-GInputStream* g_buffered_input_stream_new_sized       (GInputStream          *base_stream,
-						       gsize                  size);
-
-gsize         g_buffered_input_stream_get_buffer_size (GBufferedInputStream  *stream);
-void          g_buffered_input_stream_set_buffer_size (GBufferedInputStream  *stream,
-						       gsize                  size);
-gsize         g_buffered_input_stream_get_available   (GBufferedInputStream  *stream);
-gsize         g_buffered_input_stream_peek            (GBufferedInputStream  *stream,
-						       void                  *buffer,
-						       gsize                  offset,
-						       gsize                  count);
-const void*   g_buffered_input_stream_peek_buffer     (GBufferedInputStream  *stream,
-						       gsize                 *count);
-
-gssize        g_buffered_input_stream_fill            (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       GCancellable          *cancellable,
-						       GError               **error);
-void          g_buffered_input_stream_fill_async      (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       int                    io_priority,
-						       GCancellable          *cancellable,
-						       GAsyncReadyCallback    callback,
-						       gpointer               user_data);
-gssize        g_buffered_input_stream_fill_finish     (GBufferedInputStream  *stream,
-						       GAsyncResult          *result,
-						       GError               **error);
-
-int           g_buffered_input_stream_read_byte       (GBufferedInputStream  *stream,
-						       GCancellable          *cancellable,
-						       GError               **error);
-
-G_END_DECLS
-
-#endif /* __G_BUFFERED_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gbufferedoutputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gbufferedoutputstream.h
deleted file mode 100644
index 0d84790b..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gbufferedoutputstream.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
-#define __G_BUFFERED_OUTPUT_STREAM_H__
-
-#include <gio/gfilteroutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BUFFERED_OUTPUT_STREAM         (g_buffered_output_stream_get_type ())
-#define G_BUFFERED_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStream))
-#define G_BUFFERED_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStreamClass))
-#define G_IS_BUFFERED_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_BUFFERED_OUTPUT_STREAM))
-#define G_IS_BUFFERED_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_BUFFERED_OUTPUT_STREAM))
-#define G_BUFFERED_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStreamClass))
-
-/**
- * GBufferedOutputStream:
- *
- * An implementation of #GFilterOutputStream with a sized buffer.
- **/
-typedef struct _GBufferedOutputStreamClass    GBufferedOutputStreamClass;
-typedef struct _GBufferedOutputStreamPrivate  GBufferedOutputStreamPrivate;
-
-struct _GBufferedOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< protected >*/
-  GBufferedOutputStreamPrivate *priv;
-};
-
-struct _GBufferedOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-};
-
-
-GType          g_buffered_output_stream_get_type        (void) G_GNUC_CONST;
-GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
-GOutputStream* g_buffered_output_stream_new_sized       (GOutputStream         *base_stream,
-							 gsize                  size);
-gsize          g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream);
-void           g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream,
-							 gsize                  size);
-gboolean       g_buffered_output_stream_get_auto_grow   (GBufferedOutputStream *stream);
-void           g_buffered_output_stream_set_auto_grow   (GBufferedOutputStream *stream,
-							 gboolean               auto_grow);
-
-G_END_DECLS
-
-#endif /* __G_BUFFERED_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gcancellable.h b/GstreamerHelper/x64/include/glib-2.0/gio/gcancellable.h
deleted file mode 100644
index d8fa6336..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gcancellable.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CANCELLABLE_H__
-#define __G_CANCELLABLE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CANCELLABLE         (g_cancellable_get_type ())
-#define G_CANCELLABLE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CANCELLABLE, GCancellable))
-#define G_CANCELLABLE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CANCELLABLE, GCancellableClass))
-#define G_IS_CANCELLABLE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CANCELLABLE))
-#define G_IS_CANCELLABLE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CANCELLABLE))
-#define G_CANCELLABLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CANCELLABLE, GCancellableClass))
-
-/**
- * GCancellable:
- *
- * Allows actions to be cancelled.
- */
-typedef struct _GCancellableClass   GCancellableClass;
-typedef struct _GCancellablePrivate GCancellablePrivate;
-
-struct _GCancellable
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GCancellablePrivate *priv;
-};
-
-struct _GCancellableClass
-{
-  GObjectClass parent_class;
-
-  void (* cancelled) (GCancellable *cancellable);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType         g_cancellable_get_type               (void) G_GNUC_CONST;
-
-GCancellable *g_cancellable_new                    (void);
-
-/* These are only safe to call inside a cancellable op */
-gboolean      g_cancellable_is_cancelled           (GCancellable  *cancellable);
-gboolean      g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
-						    GError       **error);
-
-int           g_cancellable_get_fd                 (GCancellable  *cancellable);
-gboolean      g_cancellable_make_pollfd            (GCancellable  *cancellable,
-						    GPollFD       *pollfd);
-void          g_cancellable_release_fd             (GCancellable  *cancellable);
-
-GSource *     g_cancellable_source_new             (GCancellable  *cancellable);
-
-GCancellable *g_cancellable_get_current            (void);
-void          g_cancellable_push_current           (GCancellable  *cancellable);
-void          g_cancellable_pop_current            (GCancellable  *cancellable);
-void          g_cancellable_reset                  (GCancellable  *cancellable);
-gulong        g_cancellable_connect                (GCancellable  *cancellable,
-						    GCallback      callback,
-						    gpointer       data,
-						    GDestroyNotify data_destroy_func);
-void          g_cancellable_disconnect             (GCancellable  *cancellable,
-						    gulong         handler_id);
-
-
-/* This is safe to call from another thread */
-void          g_cancellable_cancel       (GCancellable  *cancellable);
-
-G_END_DECLS
-
-#endif /* __G_CANCELLABLE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gcharsetconverter.h b/GstreamerHelper/x64/include/glib-2.0/gio/gcharsetconverter.h
deleted file mode 100644
index 5198d463..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gcharsetconverter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CHARSET_CONVERTER_H__
-#define __G_CHARSET_CONVERTER_H__
-
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CHARSET_CONVERTER         (g_charset_converter_get_type ())
-#define G_CHARSET_CONVERTER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CHARSET_CONVERTER, GCharsetConverter))
-#define G_CHARSET_CONVERTER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CHARSET_CONVERTER, GCharsetConverterClass))
-#define G_IS_CHARSET_CONVERTER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CHARSET_CONVERTER))
-#define G_IS_CHARSET_CONVERTER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CHARSET_CONVERTER))
-#define G_CHARSET_CONVERTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CHARSET_CONVERTER, GCharsetConverterClass))
-
-typedef struct _GCharsetConverterClass   GCharsetConverterClass;
-
-struct _GCharsetConverterClass
-{
-  GObjectClass parent_class;
-};
-
-GType              g_charset_converter_get_type      (void) G_GNUC_CONST;
-
-GCharsetConverter *g_charset_converter_new            (const gchar  *to_charset,
-						       const gchar  *from_charset,
-						       GError **error);
-void               g_charset_converter_set_use_fallback (GCharsetConverter *converter,
-							 gboolean use_fallback);
-gboolean           g_charset_converter_get_use_fallback (GCharsetConverter *converter);
-guint              g_charset_converter_get_num_fallbacks (GCharsetConverter *converter);
-
-G_END_DECLS
-
-#endif /* __G_CHARSET_CONVERTER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gcontenttype.h b/GstreamerHelper/x64/include/glib-2.0/gio/gcontenttype.h
deleted file mode 100644
index fb4b8619..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gcontenttype.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONTENT_TYPE_H__
-#define __G_CONTENT_TYPE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-gboolean g_content_type_equals            (const gchar  *type1,
-                                           const gchar  *type2);
-gboolean g_content_type_is_a              (const gchar  *type,
-                                           const gchar  *supertype);
-gboolean g_content_type_is_unknown        (const gchar  *type);
-gchar *  g_content_type_get_description   (const gchar  *type);
-gchar *  g_content_type_get_mime_type     (const gchar  *type);
-GIcon *  g_content_type_get_icon          (const gchar  *type);
-GIcon *  g_content_type_get_symbolic_icon (const gchar  *type);
-GLIB_AVAILABLE_IN_2_34
-gchar *  g_content_type_get_generic_icon_name (const gchar  *type);
-
-gboolean g_content_type_can_be_executable (const gchar  *type);
-
-gchar *  g_content_type_from_mime_type    (const gchar  *mime_type);
-
-gchar *  g_content_type_guess             (const gchar  *filename,
-                                           const guchar *data,
-                                           gsize         data_size,
-                                           gboolean     *result_uncertain);
-
-gchar ** g_content_type_guess_for_tree    (GFile        *root);
-
-GList *  g_content_types_get_registered   (void);
-
-G_END_DECLS
-
-#endif /* __G_CONTENT_TYPE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gconverter.h b/GstreamerHelper/x64/include/glib-2.0/gio/gconverter.h
deleted file mode 100644
index 6770aaf9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gconverter.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERTER_H__
-#define __G_CONVERTER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER            (g_converter_get_type ())
-#define G_CONVERTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_CONVERTER, GConverter))
-#define G_IS_CONVERTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_CONVERTER))
-#define G_CONVERTER_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_CONVERTER, GConverterIface))
-
-/**
- * GConverter:
- *
- * Seek object for streaming operations.
- *
- * Since: 2.24
- **/
-typedef struct _GConverterIface   GConverterIface;
-
-/**
- * GConverterIface:
- * @g_iface: The parent interface.
- * @convert: Converts data.
- * @reset: Reverts the internal state of the converter to its initial state.
- *
- * Provides an interface for converting data from one type
- * to another type. The conversion can be stateful
- * and may fail at any place.
- *
- * Since: 2.24
- **/
-struct _GConverterIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GConverterResult (* convert) (GConverter *converter,
-				const void *inbuf,
-				gsize       inbuf_size,
-				void       *outbuf,
-				gsize       outbuf_size,
-				GConverterFlags flags,
-				gsize      *bytes_read,
-				gsize      *bytes_written,
-				GError    **error);
-  void  (* reset)   (GConverter *converter);
-};
-
-GType            g_converter_get_type     (void) G_GNUC_CONST;
-
-GConverterResult g_converter_convert (GConverter       *converter,
-				      const void       *inbuf,
-				      gsize             inbuf_size,
-				      void             *outbuf,
-				      gsize             outbuf_size,
-				      GConverterFlags   flags,
-				      gsize            *bytes_read,
-				      gsize            *bytes_written,
-				      GError          **error);
-void             g_converter_reset   (GConverter       *converter);
-
-
-G_END_DECLS
-
-
-#endif /* __G_CONVERTER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gconverterinputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gconverterinputstream.h
deleted file mode 100644
index 8e4f1d4f..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gconverterinputstream.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERTER_INPUT_STREAM_H__
-#define __G_CONVERTER_INPUT_STREAM_H__
-
-#include <gio/gfilterinputstream.h>
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER_INPUT_STREAM         (g_converter_input_stream_get_type ())
-#define G_CONVERTER_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStream))
-#define G_CONVERTER_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStreamClass))
-#define G_IS_CONVERTER_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CONVERTER_INPUT_STREAM))
-#define G_IS_CONVERTER_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CONVERTER_INPUT_STREAM))
-#define G_CONVERTER_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStreamClass))
-
-/**
- * GConverterInputStream:
- *
- * An implementation of #GFilterInputStream that allows data
- * conversion.
- **/
-typedef struct _GConverterInputStreamClass    GConverterInputStreamClass;
-typedef struct _GConverterInputStreamPrivate  GConverterInputStreamPrivate;
-
-struct _GConverterInputStream
-{
-  GFilterInputStream parent_instance;
-
-  /*< private >*/
-  GConverterInputStreamPrivate *priv;
-};
-
-struct _GConverterInputStreamClass
-{
-  GFilterInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType                  g_converter_input_stream_get_type      (void) G_GNUC_CONST;
-GInputStream          *g_converter_input_stream_new           (GInputStream          *base_stream,
-                                                               GConverter            *converter);
-GConverter            *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream);
-
-G_END_DECLS
-
-#endif /* __G_CONVERTER_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gconverteroutputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gconverteroutputstream.h
deleted file mode 100644
index ceac2008..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gconverteroutputstream.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERTER_OUTPUT_STREAM_H__
-#define __G_CONVERTER_OUTPUT_STREAM_H__
-
-#include <gio/gfilteroutputstream.h>
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER_OUTPUT_STREAM         (g_converter_output_stream_get_type ())
-#define G_CONVERTER_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStream))
-#define G_CONVERTER_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStreamClass))
-#define G_IS_CONVERTER_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CONVERTER_OUTPUT_STREAM))
-#define G_IS_CONVERTER_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CONVERTER_OUTPUT_STREAM))
-#define G_CONVERTER_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStreamClass))
-
-/**
- * GConverterOutputStream:
- *
- * An implementation of #GFilterOutputStream that allows data
- * conversion.
- **/
-typedef struct _GConverterOutputStreamClass    GConverterOutputStreamClass;
-typedef struct _GConverterOutputStreamPrivate  GConverterOutputStreamPrivate;
-
-struct _GConverterOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< private >*/
-  GConverterOutputStreamPrivate *priv;
-};
-
-struct _GConverterOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType                   g_converter_output_stream_get_type      (void) G_GNUC_CONST;
-GOutputStream          *g_converter_output_stream_new           (GOutputStream         *base_stream,
-                                                                 GConverter            *converter);
-GConverter             *g_converter_output_stream_get_converter (GConverterOutputStream *converter_stream);
-
-G_END_DECLS
-
-#endif /* __G_CONVERTER_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gcredentials.h b/GstreamerHelper/x64/include/glib-2.0/gio/gcredentials.h
deleted file mode 100644
index 8e09f779..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gcredentials.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CREDENTIALS_H__
-#define __G_CREDENTIALS_H__
-
-#include <gio/giotypes.h>
-
-#ifdef G_OS_UNIX
-/* To get the uid_t type */
-#include <unistd.h>
-#include <sys/types.h>
-#endif
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CREDENTIALS         (g_credentials_get_type ())
-#define G_CREDENTIALS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CREDENTIALS, GCredentials))
-#define G_CREDENTIALS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CREDENTIALS, GCredentialsClass))
-#define G_CREDENTIALS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CREDENTIALS, GCredentialsClass))
-#define G_IS_CREDENTIALS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CREDENTIALS))
-#define G_IS_CREDENTIALS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CREDENTIALS))
-
-typedef struct _GCredentialsClass   GCredentialsClass;
-
-GType            g_credentials_get_type           (void) G_GNUC_CONST;
-
-GCredentials    *g_credentials_new                (void);
-
-gchar           *g_credentials_to_string          (GCredentials    *credentials);
-
-gpointer         g_credentials_get_native         (GCredentials    *credentials,
-                                                   GCredentialsType native_type);
-
-void             g_credentials_set_native         (GCredentials    *credentials,
-                                                   GCredentialsType native_type,
-                                                   gpointer         native);
-
-gboolean         g_credentials_is_same_user       (GCredentials    *credentials,
-                                                   GCredentials    *other_credentials,
-                                                   GError         **error);
-
-#ifdef G_OS_UNIX
-uid_t            g_credentials_get_unix_user      (GCredentials    *credentials,
-                                                   GError         **error);
-gboolean         g_credentials_set_unix_user      (GCredentials    *credentials,
-                                                   uid_t           uid,
-                                                   GError         **error);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_DBUS_PROXY_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdatainputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdatainputstream.h
deleted file mode 100644
index 0f205c65..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdatainputstream.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DATA_INPUT_STREAM_H__
-#define __G_DATA_INPUT_STREAM_H__
-
-#include <gio/gbufferedinputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DATA_INPUT_STREAM         (g_data_input_stream_get_type ())
-#define G_DATA_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DATA_INPUT_STREAM, GDataInputStream))
-#define G_DATA_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DATA_INPUT_STREAM, GDataInputStreamClass))
-#define G_IS_DATA_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DATA_INPUT_STREAM))
-#define G_IS_DATA_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DATA_INPUT_STREAM))
-#define G_DATA_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DATA_INPUT_STREAM, GDataInputStreamClass))
-
-/**
- * GDataInputStream:
- *
- * An implementation of #GBufferedInputStream that allows for high-level
- * data manipulation of arbitrary data (including binary operations).
- **/
-typedef struct _GDataInputStreamClass    GDataInputStreamClass;
-typedef struct _GDataInputStreamPrivate  GDataInputStreamPrivate;
-
-struct _GDataInputStream
-{
-  GBufferedInputStream parent_instance;
-
-  /*< private >*/
-  GDataInputStreamPrivate *priv;
-};
-
-struct _GDataInputStreamClass
-{
-  GBufferedInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType                  g_data_input_stream_get_type             (void) G_GNUC_CONST;
-GDataInputStream *     g_data_input_stream_new                  (GInputStream            *base_stream);
-
-void                   g_data_input_stream_set_byte_order       (GDataInputStream        *stream,
-                                                                 GDataStreamByteOrder     order);
-GDataStreamByteOrder   g_data_input_stream_get_byte_order       (GDataInputStream        *stream);
-void                   g_data_input_stream_set_newline_type     (GDataInputStream        *stream,
-                                                                 GDataStreamNewlineType   type);
-GDataStreamNewlineType g_data_input_stream_get_newline_type     (GDataInputStream        *stream);
-guchar                 g_data_input_stream_read_byte            (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-gint16                 g_data_input_stream_read_int16           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-guint16                g_data_input_stream_read_uint16          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-gint32                 g_data_input_stream_read_int32           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-guint32                g_data_input_stream_read_uint32          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-gint64                 g_data_input_stream_read_int64           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-guint64                g_data_input_stream_read_uint64          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-char *                 g_data_input_stream_read_line            (GDataInputStream        *stream,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_2_30
-char *                 g_data_input_stream_read_line_utf8       (GDataInputStream        *stream,
-								 gsize                   *length,
-								 GCancellable            *cancellable,
-								 GError                 **error);
-void                   g_data_input_stream_read_line_async      (GDataInputStream        *stream,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-char *                 g_data_input_stream_read_line_finish     (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_2_30
-char *                 g_data_input_stream_read_line_finish_utf8(GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-char *                 g_data_input_stream_read_until           (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-void                   g_data_input_stream_read_until_async     (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-char *                 g_data_input_stream_read_until_finish    (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-
-char *                 g_data_input_stream_read_upto            (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gssize                   stop_chars_len,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-void                   g_data_input_stream_read_upto_async      (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gssize                   stop_chars_len,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-char *                 g_data_input_stream_read_upto_finish     (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_DATA_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdataoutputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdataoutputstream.h
deleted file mode 100644
index 0fb3cbfe..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdataoutputstream.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DATA_OUTPUT_STREAM_H__
-#define __G_DATA_OUTPUT_STREAM_H__
-
-#include <gio/gfilteroutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DATA_OUTPUT_STREAM         (g_data_output_stream_get_type ())
-#define G_DATA_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStream))
-#define G_DATA_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStreamClass))
-#define G_IS_DATA_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DATA_OUTPUT_STREAM))
-#define G_IS_DATA_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DATA_OUTPUT_STREAM))
-#define G_DATA_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStreamClass))
-
-/**
- * GDataOutputStream:
- *
- * An implementation of #GBufferedOutputStream that allows for high-level
- * data manipulation of arbitrary data (including binary operations).
- **/
-typedef struct _GDataOutputStream         GDataOutputStream;
-typedef struct _GDataOutputStreamClass    GDataOutputStreamClass;
-typedef struct _GDataOutputStreamPrivate  GDataOutputStreamPrivate;
-
-struct _GDataOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< private >*/
-  GDataOutputStreamPrivate *priv;
-};
-
-struct _GDataOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GType                g_data_output_stream_get_type       (void) G_GNUC_CONST;
-GDataOutputStream *  g_data_output_stream_new            (GOutputStream         *base_stream);
-
-void                 g_data_output_stream_set_byte_order (GDataOutputStream     *stream,
-							  GDataStreamByteOrder   order);
-GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream     *stream);
-
-gboolean             g_data_output_stream_put_byte       (GDataOutputStream     *stream,
-							  guchar                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int16      (GDataOutputStream     *stream,
-							  gint16                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint16     (GDataOutputStream     *stream,
-							  guint16                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int32      (GDataOutputStream     *stream,
-							  gint32                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint32     (GDataOutputStream     *stream,
-							  guint32                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int64      (GDataOutputStream     *stream,
-							  gint64                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint64     (GDataOutputStream     *stream,
-							  guint64                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_string     (GDataOutputStream     *stream,
-							  const char            *str,
-							  GCancellable          *cancellable,
-							  GError               **error);
-
-G_END_DECLS
-
-#endif /* __G_DATA_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusactiongroup.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusactiongroup.h
deleted file mode 100644
index 12a2f60c..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusactiongroup.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_ACTION_GROUP_H__
-#define __G_DBUS_ACTION_GROUP_H__
-
-#include "giotypes.h"
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_ACTION_GROUP                            (g_dbus_action_group_get_type ())
-#define G_DBUS_ACTION_GROUP(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroup))
-#define G_DBUS_ACTION_GROUP_CLASS(class)                    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-#define G_IS_DBUS_ACTION_GROUP(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_IS_DBUS_ACTION_GROUP_CLASS(class)                 (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_DBUS_ACTION_GROUP_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-
-GType                   g_dbus_action_group_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GDBusActionGroup *      g_dbus_action_group_get                       (GDBusConnection        *connection,
-                                                                       const gchar            *bus_name,
-                                                                       const gchar            *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ACTION_GROUP_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusaddress.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusaddress.h
deleted file mode 100644
index 955c39e9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusaddress.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_ADDRESS_H__
-#define __G_DBUS_ADDRESS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-gboolean g_dbus_is_address (const gchar *string);
-gboolean g_dbus_is_supported_address (const gchar  *string,
-                                      GError      **error);
-
-void                 g_dbus_address_get_stream        (const gchar          *address,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-
-GIOStream           *g_dbus_address_get_stream_finish (GAsyncResult         *res,
-                                                       gchar               **out_guid,
-                                                       GError              **error);
-
-GIOStream           *g_dbus_address_get_stream_sync   (const gchar          *address,
-                                                       gchar               **out_guid,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-
-gchar               *g_dbus_address_get_for_bus_sync  (GBusType              bus_type,
-                                                       GCancellable  *cancellable,
-                                                       GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ADDRESS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusauthobserver.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusauthobserver.h
deleted file mode 100644
index ffb1ddf1..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusauthobserver.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_AUTH_OBSERVER_H__
-#define __G_DBUS_AUTH_OBSERVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_AUTH_OBSERVER         (g_dbus_auth_observer_get_type ())
-#define G_DBUS_AUTH_OBSERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_AUTH_OBSERVER, GDBusAuthObserver))
-#define G_IS_DBUS_AUTH_OBSERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_AUTH_OBSERVER))
-
-GType              g_dbus_auth_observer_get_type                     (void) G_GNUC_CONST;
-GDBusAuthObserver *g_dbus_auth_observer_new                          (void);
-gboolean           g_dbus_auth_observer_authorize_authenticated_peer (GDBusAuthObserver  *observer,
-                                                                      GIOStream          *stream,
-                                                                      GCredentials       *credentials);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean           g_dbus_auth_observer_allow_mechanism (GDBusAuthObserver  *observer,
-                                                         const gchar        *mechanism);
-
-G_END_DECLS
-
-#endif /* _G_DBUS_AUTH_OBSERVER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusconnection.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusconnection.h
deleted file mode 100644
index 6c1ec5c3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusconnection.h
+++ /dev/null
@@ -1,599 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_CONNECTION_H__
-#define __G_DBUS_CONNECTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_CONNECTION         (g_dbus_connection_get_type ())
-#define G_DBUS_CONNECTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_CONNECTION, GDBusConnection))
-#define G_IS_DBUS_CONNECTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_CONNECTION))
-
-GType            g_dbus_connection_get_type                   (void) G_GNUC_CONST;
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void              g_bus_get                    (GBusType             bus_type,
-                                                GCancellable        *cancellable,
-                                                GAsyncReadyCallback  callback,
-                                                gpointer             user_data);
-GDBusConnection  *g_bus_get_finish             (GAsyncResult        *res,
-                                                GError             **error);
-GDBusConnection  *g_bus_get_sync               (GBusType            bus_type,
-                                                GCancellable       *cancellable,
-                                                GError            **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void             g_dbus_connection_new                        (GIOStream              *stream,
-                                                               const gchar            *guid,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GAsyncReadyCallback     callback,
-                                                               gpointer                user_data);
-GDBusConnection *g_dbus_connection_new_finish                 (GAsyncResult           *res,
-                                                               GError                **error);
-GDBusConnection *g_dbus_connection_new_sync                   (GIOStream              *stream,
-                                                               const gchar            *guid,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GError                **error);
-
-void             g_dbus_connection_new_for_address            (const gchar            *address,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GAsyncReadyCallback     callback,
-                                                               gpointer                user_data);
-GDBusConnection *g_dbus_connection_new_for_address_finish     (GAsyncResult           *res,
-                                                               GError                **error);
-GDBusConnection *g_dbus_connection_new_for_address_sync       (const gchar            *address,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GError                **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void             g_dbus_connection_start_message_processing   (GDBusConnection    *connection);
-gboolean         g_dbus_connection_is_closed                  (GDBusConnection    *connection);
-GIOStream       *g_dbus_connection_get_stream                 (GDBusConnection    *connection);
-const gchar     *g_dbus_connection_get_guid                   (GDBusConnection    *connection);
-const gchar     *g_dbus_connection_get_unique_name            (GDBusConnection    *connection);
-GCredentials    *g_dbus_connection_get_peer_credentials       (GDBusConnection    *connection);
-
-GLIB_AVAILABLE_IN_2_34
-guint32          g_dbus_connection_get_last_serial            (GDBusConnection    *connection);
-
-gboolean         g_dbus_connection_get_exit_on_close          (GDBusConnection    *connection);
-void             g_dbus_connection_set_exit_on_close          (GDBusConnection    *connection,
-                                                               gboolean            exit_on_close);
-GDBusCapabilityFlags  g_dbus_connection_get_capabilities      (GDBusConnection    *connection);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void             g_dbus_connection_close                          (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-gboolean         g_dbus_connection_close_finish                   (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-gboolean         g_dbus_connection_close_sync                     (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void             g_dbus_connection_flush                          (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-gboolean         g_dbus_connection_flush_finish                   (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-gboolean         g_dbus_connection_flush_sync                     (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-gboolean         g_dbus_connection_send_message                   (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   volatile guint32    *out_serial,
-                                                                   GError             **error);
-void             g_dbus_connection_send_message_with_reply        (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   gint                 timeout_msec,
-                                                                   volatile guint32    *out_serial,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-GDBusMessage    *g_dbus_connection_send_message_with_reply_finish (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-GDBusMessage    *g_dbus_connection_send_message_with_reply_sync   (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   gint                 timeout_msec,
-                                                                   volatile guint32    *out_serial,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-gboolean  g_dbus_connection_emit_signal                       (GDBusConnection    *connection,
-                                                               const gchar        *destination_bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *signal_name,
-                                                               GVariant           *parameters,
-                                                               GError            **error);
-void      g_dbus_connection_call                              (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GCancellable       *cancellable,
-                                                               GAsyncReadyCallback callback,
-                                                               gpointer            user_data);
-GVariant *g_dbus_connection_call_finish                       (GDBusConnection    *connection,
-                                                               GAsyncResult       *res,
-                                                               GError            **error);
-GVariant *g_dbus_connection_call_sync                         (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GCancellable       *cancellable,
-                                                               GError            **error);
-GLIB_AVAILABLE_IN_2_30
-void      g_dbus_connection_call_with_unix_fd_list            (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GUnixFDList        *fd_list,
-                                                               GCancellable       *cancellable,
-                                                               GAsyncReadyCallback callback,
-                                                               gpointer            user_data);
-GLIB_AVAILABLE_IN_2_30
-GVariant *g_dbus_connection_call_with_unix_fd_list_finish     (GDBusConnection    *connection,
-                                                               GUnixFDList       **out_fd_list,
-                                                               GAsyncResult       *res,
-                                                               GError            **error);
-GLIB_AVAILABLE_IN_2_30
-GVariant *g_dbus_connection_call_with_unix_fd_list_sync       (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GUnixFDList        *fd_list,
-                                                               GUnixFDList       **out_fd_list,
-                                                               GCancellable       *cancellable,
-                                                               GError            **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-
-/**
- * GDBusInterfaceMethodCallFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name the method was invoked on.
- * @method_name: The name of the method that was invoked.
- * @parameters: A #GVariant tuple with parameters.
- * @invocation: A #GDBusMethodInvocation object that can be used to return a value or error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @method_call function in #GDBusInterfaceVTable.
- *
- * Since: 2.26
- */
-typedef void (*GDBusInterfaceMethodCallFunc) (GDBusConnection       *connection,
-                                              const gchar           *sender,
-                                              const gchar           *object_path,
-                                              const gchar           *interface_name,
-                                              const gchar           *method_name,
-                                              GVariant              *parameters,
-                                              GDBusMethodInvocation *invocation,
-                                              gpointer               user_data);
-
-/**
- * GDBusInterfaceGetPropertyFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name for the property.
- * @property_name: The name of the property to get the value of.
- * @error: Return location for error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @get_property function in #GDBusInterfaceVTable.
- *
- * Returns: A #GVariant with the value for @property_name or %NULL if
- *     @error is set. If the returned #GVariant is floating, it is
- *     consumed - otherwise its reference count is decreased by one.
- *
- * Since: 2.26
- */
-typedef GVariant *(*GDBusInterfaceGetPropertyFunc) (GDBusConnection       *connection,
-                                                    const gchar           *sender,
-                                                    const gchar           *object_path,
-                                                    const gchar           *interface_name,
-                                                    const gchar           *property_name,
-                                                    GError               **error,
-                                                    gpointer               user_data);
-
-/**
- * GDBusInterfaceSetPropertyFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name for the property.
- * @property_name: The name of the property to get the value of.
- * @value: The value to set the property to.
- * @error: Return location for error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @set_property function in #GDBusInterfaceVTable.
- *
- * Returns: %TRUE if the property was set to @value, %FALSE if @error is set.
- *
- * Since: 2.26
- */
-typedef gboolean  (*GDBusInterfaceSetPropertyFunc) (GDBusConnection       *connection,
-                                                    const gchar           *sender,
-                                                    const gchar           *object_path,
-                                                    const gchar           *interface_name,
-                                                    const gchar           *property_name,
-                                                    GVariant              *value,
-                                                    GError               **error,
-                                                    gpointer               user_data);
-
-/**
- * GDBusInterfaceVTable:
- * @method_call: Function for handling incoming method calls.
- * @get_property: Function for getting a property.
- * @set_property: Function for setting a property.
- *
- * Virtual table for handling properties and method calls for a D-Bus
- * interface.
- *
- * If you want to handle getting/setting D-Bus properties asynchronously, simply
- * register an object with the <literal>org.freedesktop.DBus.Properties</literal>
- * D-Bus interface using g_dbus_connection_register_object().
- *
- * Since: 2.26
- */
-struct _GDBusInterfaceVTable
-{
-  GDBusInterfaceMethodCallFunc  method_call;
-  GDBusInterfaceGetPropertyFunc get_property;
-  GDBusInterfaceSetPropertyFunc set_property;
-
-  /*< private >*/
-  /* Padding for future expansion - also remember to update
-   * gdbusconnection.c:_g_dbus_interface_vtable_copy() when
-   * changing this.
-   */
-  gpointer padding[8];
-};
-
-guint            g_dbus_connection_register_object            (GDBusConnection            *connection,
-                                                               const gchar                *object_path,
-                                                               GDBusInterfaceInfo         *interface_info,
-                                                               const GDBusInterfaceVTable *vtable,
-                                                               gpointer                    user_data,
-                                                               GDestroyNotify              user_data_free_func,
-                                                               GError                    **error);
-gboolean         g_dbus_connection_unregister_object          (GDBusConnection            *connection,
-                                                               guint                       registration_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusSubtreeEnumerateFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @enumerate function in #GDBusSubtreeVTable.
- *
- * This function is called when generating introspection data and also
- * when preparing to dispatch incoming messages in the event that the
- * %G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES flag is not
- * specified (ie: to verify that the object path is valid).
- *
- * Hierarchies are not supported; the items that you return should not
- * contain the '/' character.
- *
- * The return value will be freed with g_strfreev().
- *
- * Returns: A newly allocated array of strings for node names that are children of @object_path.
- *
- * Since: 2.26
- */
-typedef gchar** (*GDBusSubtreeEnumerateFunc) (GDBusConnection       *connection,
-                                              const gchar           *sender,
-                                              const gchar           *object_path,
-                                              gpointer               user_data);
-
-/**
- * GDBusSubtreeIntrospectFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @node: A node that is a child of @object_path (relative to @object_path) or %NULL for the root of the subtree.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @introspect function in #GDBusSubtreeVTable.
- *
- * Subtrees are flat.  @node, if non-%NULL, is always exactly one
- * segment of the object path (ie: it never contains a slash).
- *
- * This function should return %NULL to indicate that there is no object
- * at this node.
- *
- * If this function returns non-%NULL, the return value is expected to
- * be a %NULL-terminated array of pointers to #GDBusInterfaceInfo
- * structures describing the interfaces implemented by @node.  This
- * array will have g_dbus_interface_info_unref() called on each item
- * before being freed with g_free().
- *
- * The difference between returning %NULL and an array containing zero
- * items is that the standard DBus interfaces will returned to the
- * remote introspector in the empty array case, but not in the %NULL
- * case.
- *
- * Returns: A %NULL-terminated array of pointers to #GDBusInterfaceInfo, or %NULL.
- *
- * Since: 2.26
- */
-typedef GDBusInterfaceInfo ** (*GDBusSubtreeIntrospectFunc) (GDBusConnection       *connection,
-                                                             const gchar           *sender,
-                                                             const gchar           *object_path,
-                                                             const gchar           *node,
-                                                             gpointer               user_data);
-
-/**
- * GDBusSubtreeDispatchFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @interface_name: The D-Bus interface name that the method call or property access is for.
- * @node: A node that is a child of @object_path (relative to @object_path) or %NULL for the root of the subtree.
- * @out_user_data: Return location for user data to pass to functions in the returned #GDBusInterfaceVTable (never %NULL).
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @dispatch function in #GDBusSubtreeVTable.
- *
- * Subtrees are flat.  @node, if non-%NULL, is always exactly one
- * segment of the object path (ie: it never contains a slash).
- *
- * Returns: A #GDBusInterfaceVTable or %NULL if you don't want to handle the methods.
- *
- * Since: 2.26
- */
-typedef const GDBusInterfaceVTable * (*GDBusSubtreeDispatchFunc) (GDBusConnection             *connection,
-                                                                  const gchar                 *sender,
-                                                                  const gchar                 *object_path,
-                                                                  const gchar                 *interface_name,
-                                                                  const gchar                 *node,
-                                                                  gpointer                    *out_user_data,
-                                                                  gpointer                     user_data);
-
-/**
- * GDBusSubtreeVTable:
- * @enumerate: Function for enumerating child nodes.
- * @introspect: Function for introspecting a child node.
- * @dispatch: Function for dispatching a remote call on a child node.
- *
- * Virtual table for handling subtrees registered with g_dbus_connection_register_subtree().
- *
- * Since: 2.26
- */
-struct _GDBusSubtreeVTable
-{
-  GDBusSubtreeEnumerateFunc  enumerate;
-  GDBusSubtreeIntrospectFunc introspect;
-  GDBusSubtreeDispatchFunc   dispatch;
-
-  /*< private >*/
-  /* Padding for future expansion - also remember to update
-   * gdbusconnection.c:_g_dbus_subtree_vtable_copy() when
-   * changing this.
-   */
-  gpointer padding[8];
-};
-
-guint            g_dbus_connection_register_subtree           (GDBusConnection            *connection,
-                                                               const gchar                *object_path,
-                                                               const GDBusSubtreeVTable   *vtable,
-                                                               GDBusSubtreeFlags           flags,
-                                                               gpointer                    user_data,
-                                                               GDestroyNotify              user_data_free_func,
-                                                               GError                    **error);
-gboolean         g_dbus_connection_unregister_subtree         (GDBusConnection            *connection,
-                                                               guint                       registration_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusSignalCallback:
- * @connection: A #GDBusConnection.
- * @sender_name: The unique bus name of the sender of the signal.
- * @object_path: The object path that the signal was emitted on.
- * @interface_name: The name of the interface.
- * @signal_name: The name of the signal.
- * @parameters: A #GVariant tuple with parameters for the signal.
- * @user_data: User data passed when subscribing to the signal.
- *
- * Signature for callback function used in g_dbus_connection_signal_subscribe().
- *
- * Since: 2.26
- */
-typedef void (*GDBusSignalCallback) (GDBusConnection  *connection,
-                                     const gchar      *sender_name,
-                                     const gchar      *object_path,
-                                     const gchar      *interface_name,
-                                     const gchar      *signal_name,
-                                     GVariant         *parameters,
-                                     gpointer          user_data);
-
-guint            g_dbus_connection_signal_subscribe           (GDBusConnection     *connection,
-                                                               const gchar         *sender,
-                                                               const gchar         *interface_name,
-                                                               const gchar         *member,
-                                                               const gchar         *object_path,
-                                                               const gchar         *arg0,
-                                                               GDBusSignalFlags     flags,
-                                                               GDBusSignalCallback  callback,
-                                                               gpointer             user_data,
-                                                               GDestroyNotify       user_data_free_func);
-void             g_dbus_connection_signal_unsubscribe         (GDBusConnection     *connection,
-                                                               guint                subscription_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusMessageFilterFunction:
- * @connection: (transfer none): A #GDBusConnection.
- * @message: (transfer full): A locked #GDBusMessage that the filter function takes ownership of.
- * @incoming: %TRUE if it is a message received from the other peer, %FALSE if it is
- * a message to be sent to the other peer.
- * @user_data: User data passed when adding the filter.
- *
- * Signature for function used in g_dbus_connection_add_filter().
- *
- * A filter function is passed a #GDBusMessage and expected to return
- * a #GDBusMessage too. Passive filter functions that don't modify the
- * message can simply return the @message object:
- * |[
- * static GDBusMessage *
- * passive_filter (GDBusConnection *connection
- *                 GDBusMessage    *message,
- *                 gboolean         incoming,
- *                 gpointer         user_data)
- * {
- *   /<!-- -->* inspect @message *<!-- -->/
- *   return message;
- * }
- * ]|
- * Filter functions that wants to drop a message can simply return %NULL:
- * |[
- * static GDBusMessage *
- * drop_filter (GDBusConnection *connection
- *              GDBusMessage    *message,
- *              gboolean         incoming,
- *              gpointer         user_data)
- * {
- *   if (should_drop_message)
- *     {
- *       g_object_unref (message);
- *       message = NULL;
- *     }
- *   return message;
- * }
- * ]|
- * Finally, a filter function may modify a message by copying it:
- * |[
- * static GDBusMessage *
- * modifying_filter (GDBusConnection *connection
- *                   GDBusMessage    *message,
- *                   gboolean         incoming,
- *                   gpointer         user_data)
- * {
- *   GDBusMessage *copy;
- *   GError *error;
- *
- *   error = NULL;
- *   copy = g_dbus_message_copy (message, &error);
- *   /<!-- -->* handle @error being is set *<!-- -->/
- *   g_object_unref (message);
- *
- *   /<!-- -->* modify @copy *<!-- -->/
- *
- *   return copy;
- * }
- * ]|
- * If the returned #GDBusMessage is different from @message and cannot
- * be sent on @connection (it could use features, such as file
- * descriptors, not compatible with @connection), then a warning is
- * logged to <emphasis>standard error</emphasis>. Applications can
- * check this ahead of time using g_dbus_message_to_blob() passing a
- * #GDBusCapabilityFlags value obtained from @connection.
- *
- * Returns: (transfer full) (allow-none): A #GDBusMessage that will be freed with
- * g_object_unref() or %NULL to drop the message. Passive filter
- * functions can simply return the passed @message object.
- *
- * Since: 2.26
- */
-typedef GDBusMessage *(*GDBusMessageFilterFunction) (GDBusConnection *connection,
-                                                     GDBusMessage    *message,
-                                                     gboolean         incoming,
-                                                     gpointer         user_data);
-
-guint g_dbus_connection_add_filter (GDBusConnection            *connection,
-                                    GDBusMessageFilterFunction  filter_function,
-                                    gpointer                    user_data,
-                                    GDestroyNotify              user_data_free_func);
-
-void  g_dbus_connection_remove_filter (GDBusConnection    *connection,
-                                       guint               filter_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-
-G_END_DECLS
-
-#endif /* __G_DBUS_CONNECTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbuserror.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbuserror.h
deleted file mode 100644
index 85e2f881..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbuserror.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_ERROR_H__
-#define __G_DBUS_ERROR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_DBUS_ERROR:
- *
- * Error domain for errors generated by a remote message bus. Errors
- * in this domain will be from the #GDBusError enumeration.  See
- * #GError for more information on error domains.
- *
- * Note that errors in this error domain is intended only for
- * returning errors from a remote message bus process. Errors
- * generated locally in-process by e.g. #GDBusConnection is from the
- * %G_IO_ERROR domain.
- *
- * Since: 2.26
- */
-#define G_DBUS_ERROR g_dbus_error_quark()
-
-GQuark g_dbus_error_quark (void);
-
-/* Used by applications to check, get and strip the D-Bus error name */
-gboolean g_dbus_error_is_remote_error       (const GError    *error);
-gchar   *g_dbus_error_get_remote_error      (const GError    *error);
-gboolean g_dbus_error_strip_remote_error    (GError          *error);
-
-/**
- * GDBusErrorEntry:
- * @error_code: An error code.
- * @dbus_error_name: The D-Bus error name to associate with @error_code.
- *
- * Struct used in g_dbus_error_register_error_domain().
- *
- * Since: 2.26
- */
-struct _GDBusErrorEntry
-{
-  gint         error_code;
-  const gchar *dbus_error_name;
-};
-
-gboolean g_dbus_error_register_error        (GQuark                 error_domain,
-                                             gint                   error_code,
-                                             const gchar           *dbus_error_name);
-gboolean g_dbus_error_unregister_error      (GQuark                 error_domain,
-                                             gint                   error_code,
-                                             const gchar           *dbus_error_name);
-void     g_dbus_error_register_error_domain (const gchar           *error_domain_quark_name,
-                                             volatile gsize        *quark_volatile,
-                                             const GDBusErrorEntry *entries,
-                                             guint                  num_entries);
-
-/* Only used by object mappings to map back and forth to GError */
-GError  *g_dbus_error_new_for_dbus_error    (const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message);
-void     g_dbus_error_set_dbus_error        (GError         **error,
-                                             const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message,
-                                             const gchar     *format,
-                                             ...);
-void     g_dbus_error_set_dbus_error_valist (GError         **error,
-                                             const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message,
-                                             const gchar     *format,
-                                             va_list          var_args);
-gchar   *g_dbus_error_encode_gerror         (const GError    *error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ERROR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusinterface.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusinterface.h
deleted file mode 100644
index 9536e627..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusinterface.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_INTERFACE_H__
-#define __G_DBUS_INTERFACE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_INTERFACE         (g_dbus_interface_get_type())
-#define G_DBUS_INTERFACE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_INTERFACE, GDBusInterface))
-#define G_IS_DBUS_INTERFACE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_INTERFACE))
-#define G_DBUS_INTERFACE_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_INTERFACE, GDBusInterfaceIface))
-
-/**
- * GDBusInterface:
- *
- * Base type for D-Bus interfaces.
- *
- * Since: 2.30
- */
-
-typedef struct _GDBusInterfaceIface GDBusInterfaceIface;
-
-/**
- * GDBusInterfaceIface:
- * @parent_iface: The parent interface.
- * @get_info: Returns a #GDBusInterfaceInfo. See g_dbus_interface_get_info().
- * @get_object: Gets the enclosing #GDBusObject. See g_dbus_interface_get_object().
- * @set_object: Sets the enclosing #GDBusObject. See g_dbus_interface_set_object().
- * @dup_object: Gets a reference to the enclosing #GDBusObject. See g_dbus_interface_dup_object(). Added in 2.32.
- *
- * Base type for D-Bus interfaces.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  GDBusInterfaceInfo   *(*get_info)   (GDBusInterface      *interface_);
-  GDBusObject          *(*get_object) (GDBusInterface      *interface_);
-  void                  (*set_object) (GDBusInterface      *interface_,
-                                       GDBusObject         *object);
-  GDBusObject          *(*dup_object) (GDBusInterface      *interface_);
-};
-
-GType                 g_dbus_interface_get_type         (void) G_GNUC_CONST;
-GDBusInterfaceInfo   *g_dbus_interface_get_info         (GDBusInterface      *interface_);
-GDBusObject          *g_dbus_interface_get_object       (GDBusInterface      *interface_);
-void                  g_dbus_interface_set_object       (GDBusInterface      *interface_,
-                                                         GDBusObject         *object);
-GLIB_AVAILABLE_IN_2_32
-GDBusObject          *g_dbus_interface_dup_object       (GDBusInterface      *interface_);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTERFACE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusinterfaceskeleton.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusinterfaceskeleton.h
deleted file mode 100644
index 5f1c1663..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusinterfaceskeleton.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_INTERFACE_SKELETON_H__
-#define __G_DBUS_INTERFACE_SKELETON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_INTERFACE_SKELETON         (g_dbus_interface_skeleton_get_type ())
-#define G_DBUS_INTERFACE_SKELETON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeleton))
-#define G_DBUS_INTERFACE_SKELETON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeletonClass))
-#define G_DBUS_INTERFACE_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeletonClass))
-#define G_IS_DBUS_INTERFACE_SKELETON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_INTERFACE_SKELETON))
-#define G_IS_DBUS_INTERFACE_SKELETON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_INTERFACE_SKELETON))
-
-typedef struct _GDBusInterfaceSkeletonClass   GDBusInterfaceSkeletonClass;
-typedef struct _GDBusInterfaceSkeletonPrivate GDBusInterfaceSkeletonPrivate;
-
-/**
- * GDBusInterfaceSkeleton:
- *
- * The #GDBusInterfaceSkeleton structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceSkeleton
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusInterfaceSkeletonPrivate *priv;
-};
-
-/**
- * GDBusInterfaceSkeletonClass:
- * @parent_class: The parent class.
- * @get_info: Returns a #GDBusInterfaceInfo. See g_dbus_interface_skeleton_get_info() for details.
- * @get_vtable: Returns a #GDBusInterfaceVTable. See g_dbus_interface_skeleton_get_vtable() for details.
- * @get_properties: Returns a #GVariant with all properties. See g_dbus_interface_skeleton_get_properties().
- * @flush: Emits outstanding changes, if any. See g_dbus_interface_skeleton_flush().
- * @g_authorize_method: Signal class handler for the #GDBusInterfaceSkeleton::g-authorize-method signal.
- *
- * Class structure for #GDBusInterfaceSkeleton.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceSkeletonClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Functions */
-  GDBusInterfaceInfo   *(*get_info)       (GDBusInterfaceSkeleton  *interface_);
-  GDBusInterfaceVTable *(*get_vtable)     (GDBusInterfaceSkeleton  *interface_);
-  GVariant             *(*get_properties) (GDBusInterfaceSkeleton  *interface_);
-  void                  (*flush)          (GDBusInterfaceSkeleton  *interface_);
-
-  /*< private >*/
-  gpointer vfunc_padding[8];
-  /*< public >*/
-
-  /* Signals */
-  gboolean (*g_authorize_method) (GDBusInterfaceSkeleton  *interface_,
-                                  GDBusMethodInvocation   *invocation);
-
-  /*< private >*/
-  gpointer signal_padding[8];
-};
-
-GType                        g_dbus_interface_skeleton_get_type        (void) G_GNUC_CONST;
-GDBusInterfaceSkeletonFlags  g_dbus_interface_skeleton_get_flags       (GDBusInterfaceSkeleton      *interface_);
-void                         g_dbus_interface_skeleton_set_flags       (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusInterfaceSkeletonFlags  flags);
-GDBusInterfaceInfo          *g_dbus_interface_skeleton_get_info        (GDBusInterfaceSkeleton      *interface_);
-GDBusInterfaceVTable        *g_dbus_interface_skeleton_get_vtable      (GDBusInterfaceSkeleton      *interface_);
-GVariant                    *g_dbus_interface_skeleton_get_properties  (GDBusInterfaceSkeleton      *interface_);
-void                         g_dbus_interface_skeleton_flush           (GDBusInterfaceSkeleton      *interface_);
-
-gboolean                     g_dbus_interface_skeleton_export          (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection,
-                                                                        const gchar                 *object_path,
-                                                                        GError                     **error);
-void                         g_dbus_interface_skeleton_unexport        (GDBusInterfaceSkeleton      *interface_);
-void                g_dbus_interface_skeleton_unexport_from_connection (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection);
-
-GDBusConnection             *g_dbus_interface_skeleton_get_connection  (GDBusInterfaceSkeleton      *interface_);
-GList                       *g_dbus_interface_skeleton_get_connections (GDBusInterfaceSkeleton      *interface_);
-gboolean                     g_dbus_interface_skeleton_has_connection  (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection);
-const gchar                 *g_dbus_interface_skeleton_get_object_path (GDBusInterfaceSkeleton      *interface_);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTERFACE_SKELETON_H */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusintrospection.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusintrospection.h
deleted file mode 100644
index 884c733c..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusintrospection.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_INTROSPECTION_H__
-#define __G_DBUS_INTROSPECTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GDBusAnnotationInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @key: The name of the annotation, e.g. "org.freedesktop.DBus.Deprecated".
- * @value: The value of the annotation.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about an annotation.
- *
- * Since: 2.26
- */
-struct _GDBusAnnotationInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *key;
-  gchar                *value;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusArgInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: Name of the argument, e.g. @unix_user_id.
- * @signature: D-Bus signature of the argument (a single complete type).
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about an argument for a method or a signal.
- *
- * Since: 2.26
- */
-struct _GDBusArgInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  gchar                *signature;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusMethodInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus method, e.g. @RequestName.
- * @in_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no in arguments.
- * @out_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no out arguments.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a method on an D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusMethodInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusArgInfo        **in_args;
-  GDBusArgInfo        **out_args;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusSignalInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus signal, e.g. "NameOwnerChanged".
- * @args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no arguments.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a signal on a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusSignalInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusArgInfo        **args;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusPropertyInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus property, e.g. "SupportedFilesystems".
- * @signature: The D-Bus signature of the property (a single complete type).
- * @flags: Access control flags for the property.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a D-Bus property on a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusPropertyInfo
-{
-  /*< public >*/
-  volatile gint             ref_count;
-  gchar                    *name;
-  gchar                    *signature;
-  GDBusPropertyInfoFlags    flags;
-  GDBusAnnotationInfo     **annotations;
-};
-
-/**
- * GDBusInterfaceInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus interface, e.g. "org.freedesktop.DBus.Properties".
- * @methods: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusMethodInfo structures or %NULL if there are no methods.
- * @signals: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusSignalInfo structures or %NULL if there are no signals.
- * @properties: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusPropertyInfo structures or %NULL if there are no properties.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusInterfaceInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusMethodInfo     **methods;
-  GDBusSignalInfo     **signals;
-  GDBusPropertyInfo   **properties;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusNodeInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @path: The path of the node or %NULL if omitted. Note that this may be a relative path. See the D-Bus specification for more details.
- * @interfaces: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusInterfaceInfo structures or %NULL if there are no interfaces.
- * @nodes: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusNodeInfo structures or %NULL if there are no nodes.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about nodes in a remote object hierarchy.
- *
- * Since: 2.26
- */
-struct _GDBusNodeInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *path;
-  GDBusInterfaceInfo  **interfaces;
-  GDBusNodeInfo       **nodes;
-  GDBusAnnotationInfo **annotations;
-};
-
-const gchar        *g_dbus_annotation_info_lookup          (GDBusAnnotationInfo **annotations,
-                                                            const gchar          *name);
-GDBusMethodInfo    *g_dbus_interface_info_lookup_method    (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-GDBusSignalInfo    *g_dbus_interface_info_lookup_signal    (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-GDBusPropertyInfo  *g_dbus_interface_info_lookup_property  (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-void                g_dbus_interface_info_cache_build      (GDBusInterfaceInfo   *info);
-void                g_dbus_interface_info_cache_release    (GDBusInterfaceInfo   *info);
-
-void                g_dbus_interface_info_generate_xml     (GDBusInterfaceInfo   *info,
-                                                            guint                 indent,
-                                                            GString              *string_builder);
-
-GDBusNodeInfo      *g_dbus_node_info_new_for_xml           (const gchar          *xml_data,
-                                                            GError              **error);
-GDBusInterfaceInfo *g_dbus_node_info_lookup_interface      (GDBusNodeInfo        *info,
-                                                            const gchar          *name);
-void                g_dbus_node_info_generate_xml          (GDBusNodeInfo        *info,
-                                                            guint                 indent,
-                                                            GString              *string_builder);
-
-GDBusNodeInfo       *g_dbus_node_info_ref                  (GDBusNodeInfo        *info);
-GDBusInterfaceInfo  *g_dbus_interface_info_ref             (GDBusInterfaceInfo   *info);
-GDBusMethodInfo     *g_dbus_method_info_ref                (GDBusMethodInfo      *info);
-GDBusSignalInfo     *g_dbus_signal_info_ref                (GDBusSignalInfo      *info);
-GDBusPropertyInfo   *g_dbus_property_info_ref              (GDBusPropertyInfo    *info);
-GDBusArgInfo        *g_dbus_arg_info_ref                   (GDBusArgInfo         *info);
-GDBusAnnotationInfo *g_dbus_annotation_info_ref            (GDBusAnnotationInfo  *info);
-
-void                 g_dbus_node_info_unref                (GDBusNodeInfo        *info);
-void                 g_dbus_interface_info_unref           (GDBusInterfaceInfo   *info);
-void                 g_dbus_method_info_unref              (GDBusMethodInfo      *info);
-void                 g_dbus_signal_info_unref              (GDBusSignalInfo      *info);
-void                 g_dbus_property_info_unref            (GDBusPropertyInfo    *info);
-void                 g_dbus_arg_info_unref                 (GDBusArgInfo         *info);
-void                 g_dbus_annotation_info_unref          (GDBusAnnotationInfo  *info);
-
-/**
- * G_TYPE_DBUS_NODE_INFO:
- *
- * The #GType for a boxed type holding a #GDBusNodeInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_NODE_INFO       (g_dbus_node_info_get_type ())
-
-/**
- * G_TYPE_DBUS_INTERFACE_INFO:
- *
- * The #GType for a boxed type holding a #GDBusInterfaceInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_INTERFACE_INFO  (g_dbus_interface_info_get_type ())
-
-/**
- * G_TYPE_DBUS_METHOD_INFO:
- *
- * The #GType for a boxed type holding a #GDBusMethodInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_METHOD_INFO     (g_dbus_method_info_get_type ())
-
-/**
- * G_TYPE_DBUS_SIGNAL_INFO:
- *
- * The #GType for a boxed type holding a #GDBusSignalInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_SIGNAL_INFO     (g_dbus_signal_info_get_type ())
-
-/**
- * G_TYPE_DBUS_PROPERTY_INFO:
- *
- * The #GType for a boxed type holding a #GDBusPropertyInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_PROPERTY_INFO   (g_dbus_property_info_get_type ())
-
-/**
- * G_TYPE_DBUS_ARG_INFO:
- *
- * The #GType for a boxed type holding a #GDBusArgInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_ARG_INFO        (g_dbus_arg_info_get_type ())
-
-/**
- * G_TYPE_DBUS_ANNOTATION_INFO:
- *
- * The #GType for a boxed type holding a #GDBusAnnotationInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_ANNOTATION_INFO (g_dbus_annotation_info_get_type ())
-
-GType g_dbus_node_info_get_type       (void) G_GNUC_CONST;
-GType g_dbus_interface_info_get_type  (void) G_GNUC_CONST;
-GType g_dbus_method_info_get_type     (void) G_GNUC_CONST;
-GType g_dbus_signal_info_get_type     (void) G_GNUC_CONST;
-GType g_dbus_property_info_get_type   (void) G_GNUC_CONST;
-GType g_dbus_arg_info_get_type        (void) G_GNUC_CONST;
-GType g_dbus_annotation_info_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTROSPECTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmenumodel.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmenumodel.h
deleted file mode 100644
index 4cbdf2d6..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmenumodel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_DBUS_MENU_MODEL_H__
-#define __G_DBUS_MENU_MODEL_H__
-
-#include <gio/gdbusconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_MENU_MODEL          (g_dbus_menu_model_get_type ())
-#define G_DBUS_MENU_MODEL(inst)         (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                         G_TYPE_DBUS_MENU_MODEL, GDBusMenuModel))
-#define G_IS_DBUS_MENU_MODEL(inst)      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                         G_TYPE_DBUS_MENU_MODEL))
-
-typedef struct _GDBusMenuModel GDBusMenuModel;
-
-GType                   g_dbus_menu_model_get_type     (void) G_GNUC_CONST;
-
-GDBusMenuModel *        g_dbus_menu_model_get          (GDBusConnection *connection,
-                                                        const gchar     *bus_name,
-                                                        const gchar     *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_MENU_MODEL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmessage.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmessage.h
deleted file mode 100644
index 5c4febd2..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmessage.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_MESSAGE_H__
-#define __G_DBUS_MESSAGE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_MESSAGE         (g_dbus_message_get_type ())
-#define G_DBUS_MESSAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_MESSAGE, GDBusMessage))
-#define G_IS_DBUS_MESSAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_MESSAGE))
-
-GType                     g_dbus_message_get_type           (void) G_GNUC_CONST;
-GDBusMessage             *g_dbus_message_new                (void);
-GDBusMessage             *g_dbus_message_new_signal         (const gchar              *path,
-                                                             const gchar              *interface_,
-                                                             const gchar              *signal);
-GDBusMessage             *g_dbus_message_new_method_call    (const gchar              *name,
-                                                             const gchar              *path,
-                                                             const gchar              *interface_,
-                                                             const gchar              *method);
-GDBusMessage             *g_dbus_message_new_method_reply   (GDBusMessage             *method_call_message);
-GDBusMessage             *g_dbus_message_new_method_error   (GDBusMessage             *method_call_message,
-                                                             const gchar              *error_name,
-                                                             const gchar              *error_message_format,
-                                                             ...);
-GDBusMessage             *g_dbus_message_new_method_error_valist (GDBusMessage             *method_call_message,
-                                                                  const gchar              *error_name,
-                                                                  const gchar              *error_message_format,
-                                                                  va_list                   var_args);
-GDBusMessage             *g_dbus_message_new_method_error_literal (GDBusMessage             *method_call_message,
-                                                                   const gchar              *error_name,
-                                                                   const gchar              *error_message);
-gchar                    *g_dbus_message_print              (GDBusMessage             *message,
-                                                             guint                     indent);
-gboolean                  g_dbus_message_get_locked         (GDBusMessage             *message);
-void                      g_dbus_message_lock               (GDBusMessage             *message);
-GDBusMessage             *g_dbus_message_copy               (GDBusMessage             *message,
-                                                             GError                  **error);
-GDBusMessageByteOrder     g_dbus_message_get_byte_order     (GDBusMessage             *message);
-void                      g_dbus_message_set_byte_order     (GDBusMessage             *message,
-                                                             GDBusMessageByteOrder     byte_order);
-
-GDBusMessageType          g_dbus_message_get_message_type   (GDBusMessage             *message);
-void                      g_dbus_message_set_message_type   (GDBusMessage             *message,
-                                                             GDBusMessageType          type);
-GDBusMessageFlags         g_dbus_message_get_flags          (GDBusMessage             *message);
-void                      g_dbus_message_set_flags          (GDBusMessage             *message,
-                                                             GDBusMessageFlags         flags);
-guint32                   g_dbus_message_get_serial         (GDBusMessage             *message);
-void                      g_dbus_message_set_serial         (GDBusMessage             *message,
-                                                             guint32                   serial);
-GVariant                 *g_dbus_message_get_header         (GDBusMessage             *message,
-                                                             GDBusMessageHeaderField   header_field);
-void                      g_dbus_message_set_header         (GDBusMessage             *message,
-                                                             GDBusMessageHeaderField   header_field,
-                                                             GVariant                 *value);
-guchar                   *g_dbus_message_get_header_fields  (GDBusMessage             *message);
-GVariant                 *g_dbus_message_get_body           (GDBusMessage             *message);
-void                      g_dbus_message_set_body           (GDBusMessage             *message,
-                                                             GVariant                 *body);
-GUnixFDList              *g_dbus_message_get_unix_fd_list   (GDBusMessage             *message);
-void                      g_dbus_message_set_unix_fd_list   (GDBusMessage             *message,
-                                                             GUnixFDList              *fd_list);
-
-guint32                   g_dbus_message_get_reply_serial   (GDBusMessage             *message);
-void                      g_dbus_message_set_reply_serial   (GDBusMessage             *message,
-                                                             guint32                   value);
-
-const gchar              *g_dbus_message_get_interface      (GDBusMessage             *message);
-void                      g_dbus_message_set_interface      (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_member         (GDBusMessage             *message);
-void                      g_dbus_message_set_member         (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_path           (GDBusMessage             *message);
-void                      g_dbus_message_set_path           (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_sender         (GDBusMessage             *message);
-void                      g_dbus_message_set_sender         (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_destination    (GDBusMessage             *message);
-void                      g_dbus_message_set_destination    (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_error_name     (GDBusMessage             *message);
-void                      g_dbus_message_set_error_name     (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_signature      (GDBusMessage             *message);
-void                      g_dbus_message_set_signature      (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-guint32                   g_dbus_message_get_num_unix_fds   (GDBusMessage             *message);
-void                      g_dbus_message_set_num_unix_fds   (GDBusMessage             *message,
-                                                             guint32                   value);
-
-const gchar              *g_dbus_message_get_arg0           (GDBusMessage             *message);
-
-
-GDBusMessage             *g_dbus_message_new_from_blob      (guchar                   *blob,
-                                                             gsize                     blob_len,
-                                                             GDBusCapabilityFlags      capabilities,
-                                                             GError                  **error);
-
-gssize                    g_dbus_message_bytes_needed       (guchar                   *blob,
-                                                             gsize                     blob_len,
-                                                             GError                  **error);
-
-guchar                   *g_dbus_message_to_blob            (GDBusMessage             *message,
-                                                             gsize                    *out_size,
-                                                             GDBusCapabilityFlags      capabilities,
-                                                             GError                  **error);
-
-gboolean                  g_dbus_message_to_gerror          (GDBusMessage             *message,
-                                                             GError                  **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_MESSAGE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmethodinvocation.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmethodinvocation.h
deleted file mode 100644
index b1a87ac9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusmethodinvocation.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_METHOD_INVOCATION_H__
-#define __G_DBUS_METHOD_INVOCATION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_METHOD_INVOCATION         (g_dbus_method_invocation_get_type ())
-#define G_DBUS_METHOD_INVOCATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_METHOD_INVOCATION, GDBusMethodInvocation))
-#define G_IS_DBUS_METHOD_INVOCATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_METHOD_INVOCATION))
-
-GType                  g_dbus_method_invocation_get_type             (void) G_GNUC_CONST;
-const gchar           *g_dbus_method_invocation_get_sender           (GDBusMethodInvocation *invocation);
-const gchar           *g_dbus_method_invocation_get_object_path      (GDBusMethodInvocation *invocation);
-const gchar           *g_dbus_method_invocation_get_interface_name   (GDBusMethodInvocation *invocation);
-const gchar           *g_dbus_method_invocation_get_method_name      (GDBusMethodInvocation *invocation);
-const GDBusMethodInfo *g_dbus_method_invocation_get_method_info      (GDBusMethodInvocation *invocation);
-GDBusConnection       *g_dbus_method_invocation_get_connection       (GDBusMethodInvocation *invocation);
-GDBusMessage          *g_dbus_method_invocation_get_message          (GDBusMethodInvocation *invocation);
-GVariant              *g_dbus_method_invocation_get_parameters       (GDBusMethodInvocation *invocation);
-gpointer               g_dbus_method_invocation_get_user_data        (GDBusMethodInvocation *invocation);
-
-void                   g_dbus_method_invocation_return_value         (GDBusMethodInvocation *invocation,
-                                                                      GVariant              *parameters);
-void                   g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation *invocation,
-                                                                                GVariant              *parameters,
-                                                                                GUnixFDList           *fd_list);
-void                   g_dbus_method_invocation_return_error         (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *format,
-                                                                      ...);
-void                   g_dbus_method_invocation_return_error_valist  (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *format,
-                                                                      va_list                var_args);
-void                   g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *message);
-void                   g_dbus_method_invocation_return_gerror        (GDBusMethodInvocation *invocation,
-                                                                      const GError          *error);
-void                   g_dbus_method_invocation_take_error           (GDBusMethodInvocation *invocation,
-                                                                      GError                *error);
-void                   g_dbus_method_invocation_return_dbus_error    (GDBusMethodInvocation *invocation,
-                                                                      const gchar           *error_name,
-                                                                      const gchar           *error_message);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_METHOD_INVOCATION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusnameowning.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusnameowning.h
deleted file mode 100644
index fc4b92c9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusnameowning.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_NAME_OWNING_H__
-#define __G_DBUS_NAME_OWNING_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GBusAcquiredCallback:
- * @connection: The #GDBusConnection to a message bus.
- * @name: The name that is requested to be owned.
- * @user_data: User data passed to g_bus_own_name().
- *
- * Invoked when a connection to a message bus has been obtained.
- *
- * Since: 2.26
- */
-typedef void (*GBusAcquiredCallback) (GDBusConnection *connection,
-                                      const gchar     *name,
-                                      gpointer         user_data);
-
-/**
- * GBusNameAcquiredCallback:
- * @connection: The #GDBusConnection on which to acquired the name.
- * @name: The name being owned.
- * @user_data: User data passed to g_bus_own_name() or g_bus_own_name_on_connection().
- *
- * Invoked when the name is acquired.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameAcquiredCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          gpointer         user_data);
-
-/**
- * GBusNameLostCallback:
- * @connection: The #GDBusConnection on which to acquire the name or %NULL if
- * the connection was disconnected.
- * @name: The name being owned.
- * @user_data: User data passed to g_bus_own_name() or g_bus_own_name_on_connection().
- *
- * Invoked when the name is lost or @connection has been closed.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameLostCallback) (GDBusConnection *connection,
-                                      const gchar     *name,
-                                      gpointer         user_data);
-
-guint g_bus_own_name                 (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GBusAcquiredCallback      bus_acquired_handler,
-                                      GBusNameAcquiredCallback  name_acquired_handler,
-                                      GBusNameLostCallback      name_lost_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-
-guint g_bus_own_name_on_connection   (GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GBusNameAcquiredCallback  name_acquired_handler,
-                                      GBusNameLostCallback      name_lost_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-
-guint g_bus_own_name_with_closures   (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GClosure                 *bus_acquired_closure,
-                                      GClosure                 *name_acquired_closure,
-                                      GClosure                 *name_lost_closure);
-
-guint g_bus_own_name_on_connection_with_closures (
-                                      GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GClosure                 *name_acquired_closure,
-                                      GClosure                 *name_lost_closure);
-
-void  g_bus_unown_name               (guint                     owner_id);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_NAME_OWNING_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusnamewatching.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusnamewatching.h
deleted file mode 100644
index 3e3f75a2..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusnamewatching.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_NAME_WATCHING_H__
-#define __G_DBUS_NAME_WATCHING_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GBusNameAppearedCallback:
- * @connection: The #GDBusConnection the name is being watched on.
- * @name: The name being watched.
- * @name_owner: Unique name of the owner of the name being watched.
- * @user_data: User data passed to g_bus_watch_name().
- *
- * Invoked when the name being watched is known to have to have a owner.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameAppearedCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          const gchar     *name_owner,
-                                          gpointer         user_data);
-
-/**
- * GBusNameVanishedCallback:
- * @connection: The #GDBusConnection the name is being watched on.
- * @name: The name being watched.
- * @user_data: User data passed to g_bus_watch_name().
- *
- * Invoked when the name being watched is known not to have to have a owner.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameVanishedCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          gpointer         user_data);
-
-
-guint g_bus_watch_name               (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GBusNameAppearedCallback  name_appeared_handler,
-                                      GBusNameVanishedCallback  name_vanished_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GBusNameAppearedCallback  name_appeared_handler,
-                                      GBusNameVanishedCallback  name_vanished_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-guint g_bus_watch_name_with_closures (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GClosure                 *name_appeared_closure,
-                                      GClosure                 *name_vanished_closure);
-guint g_bus_watch_name_on_connection_with_closures (
-                                      GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GClosure                 *name_appeared_closure,
-                                      GClosure                 *name_vanished_closure);
-void  g_bus_unwatch_name             (guint                     watcher_id);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_NAME_WATCHING_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobject.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobject.h
deleted file mode 100644
index 30983b11..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobject.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_H__
-#define __G_DBUS_OBJECT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT         (g_dbus_object_get_type())
-#define G_DBUS_OBJECT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT, GDBusObject))
-#define G_IS_DBUS_OBJECT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT))
-#define G_DBUS_OBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_OBJECT, GDBusObjectIface))
-
-typedef struct _GDBusObjectIface GDBusObjectIface;
-
-/**
- * GDBusObjectIface:
- * @parent_iface: The parent interface.
- * @get_object_path: Returns the object path. See g_dbus_object_get_object_path().
- * @get_interfaces: Returns all interfaces. See g_dbus_object_get_interfaces().
- * @get_interface: Returns an interface by name. See g_dbus_object_get_interface().
- * @interface_added: Signal handler for the #GDBusObject::interface-added signal.
- * @interface_removed: Signal handler for the #GDBusObject::interface-removed signal.
- *
- * Base object type for D-Bus objects.
- *
- * Since: 2.30
- */
-struct _GDBusObjectIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  const gchar     *(*get_object_path) (GDBusObject  *object);
-  GList           *(*get_interfaces)  (GDBusObject  *object);
-  GDBusInterface  *(*get_interface)   (GDBusObject  *object,
-                                       const gchar  *interface_name);
-
-  /* Signals */
-  void (*interface_added)   (GDBusObject     *object,
-                             GDBusInterface  *interface_);
-  void (*interface_removed) (GDBusObject     *object,
-                             GDBusInterface  *interface_);
-
-};
-
-GType            g_dbus_object_get_type        (void) G_GNUC_CONST;
-const gchar     *g_dbus_object_get_object_path (GDBusObject  *object);
-GList           *g_dbus_object_get_interfaces  (GDBusObject  *object);
-GDBusInterface  *g_dbus_object_get_interface   (GDBusObject  *object,
-                                                const gchar  *interface_name);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanager.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanager.h
deleted file mode 100644
index 05cec1a4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanager.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_H__
-#define __G_DBUS_OBJECT_MANAGER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER         (g_dbus_object_manager_get_type())
-#define G_DBUS_OBJECT_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER, GDBusObjectManager))
-#define G_IS_DBUS_OBJECT_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER))
-#define G_DBUS_OBJECT_MANAGER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_OBJECT_MANAGER, GDBusObjectManagerIface))
-
-typedef struct _GDBusObjectManagerIface GDBusObjectManagerIface;
-
-/**
- * GDBusObjectManagerIface:
- * @parent_iface: The parent interface.
- * @get_object_path: Virtual function for g_dbus_object_manager_get_object_path().
- * @get_objects: Virtual function for g_dbus_object_manager_get_objects().
- * @get_object: Virtual function for g_dbus_object_manager_get_object().
- * @get_interface: Virtual function for g_dbus_object_manager_get_interface().
- * @object_added: Signal handler for the #GDBusObjectManager::object-added signal.
- * @object_removed: Signal handler for the #GDBusObjectManager::object-removed signal.
- * @interface_added: Signal handler for the #GDBusObjectManager::interface-added signal.
- * @interface_removed: Signal handler for the #GDBusObjectManager::interface-removed signal.
- *
- * Base type for D-Bus object managers.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  const gchar     *(*get_object_path) (GDBusObjectManager    *manager);
-  GList           *(*get_objects)     (GDBusObjectManager    *manager);
-  GDBusObject     *(*get_object)      (GDBusObjectManager    *manager,
-                                       const gchar           *object_path);
-  GDBusInterface  *(*get_interface)   (GDBusObjectManager    *manager,
-                                       const gchar           *object_path,
-                                       const gchar           *interface_name);
-
-  /* Signals */
-  void    (*object_added)                 (GDBusObjectManager   *manager,
-                                           GDBusObject          *object);
-  void    (*object_removed)               (GDBusObjectManager   *manager,
-                                           GDBusObject          *object);
-
-  void    (*interface_added)              (GDBusObjectManager   *manager,
-                                           GDBusObject          *object,
-                                           GDBusInterface       *interface_);
-  void    (*interface_removed)            (GDBusObjectManager   *manager,
-                                           GDBusObject          *object,
-                                           GDBusInterface       *interface_);
-};
-
-GType            g_dbus_object_manager_get_type        (void) G_GNUC_CONST;
-const gchar     *g_dbus_object_manager_get_object_path (GDBusObjectManager    *manager);
-GList           *g_dbus_object_manager_get_objects     (GDBusObjectManager    *manager);
-GDBusObject     *g_dbus_object_manager_get_object      (GDBusObjectManager    *manager,
-                                                        const gchar           *object_path);
-GDBusInterface  *g_dbus_object_manager_get_interface   (GDBusObjectManager    *manager,
-                                                        const gchar           *object_path,
-                                                        const gchar           *interface_name);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanagerclient.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanagerclient.h
deleted file mode 100644
index ad41fee6..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanagerclient.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_CLIENT_H__
-#define __G_DBUS_OBJECT_MANAGER_CLIENT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER_CLIENT         (g_dbus_object_manager_client_get_type ())
-#define G_DBUS_OBJECT_MANAGER_CLIENT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClient))
-#define G_DBUS_OBJECT_MANAGER_CLIENT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClientClass))
-#define G_DBUS_OBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClientClass))
-#define G_IS_DBUS_OBJECT_MANAGER_CLIENT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT))
-#define G_IS_DBUS_OBJECT_MANAGER_CLIENT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT))
-
-typedef struct _GDBusObjectManagerClientClass   GDBusObjectManagerClientClass;
-typedef struct _GDBusObjectManagerClientPrivate GDBusObjectManagerClientPrivate;
-
-/**
- * GDBusObjectManagerClient:
-  *
- * The #GDBusObjectManagerClient structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerClient
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectManagerClientPrivate *priv;
-};
-
-/**
- * GDBusObjectManagerClientClass:
- * @parent_class: The parent class.
- * @interface_proxy_signal: Signal class handler for the #GDBusObjectManagerClient::interface-proxy-signal signal.
- * @interface_proxy_properties_changed: Signal class handler for the #GDBusObjectManagerClient::interface-proxy-properties-changed signal.
- *
- * Class structure for #GDBusObjectManagerClient.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerClientClass
-{
-  GObjectClass parent_class;
-
-  /* signals */
-  void    (*interface_proxy_signal)             (GDBusObjectManagerClient *manager,
-                                                 GDBusObjectProxy         *object_proxy,
-                                                 GDBusProxy               *interface_proxy,
-                                                 const gchar              *sender_name,
-                                                 const gchar              *signal_name,
-                                                 GVariant                 *parameters);
-
-  void    (*interface_proxy_properties_changed) (GDBusObjectManagerClient   *manager,
-                                                 GDBusObjectProxy           *object_proxy,
-                                                 GDBusProxy                 *interface_proxy,
-                                                 GVariant                   *changed_properties,
-                                                 const gchar* const         *invalidated_properties);
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GType                         g_dbus_object_manager_client_get_type           (void) G_GNUC_CONST;
-void                          g_dbus_object_manager_client_new                (GDBusConnection               *connection,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GAsyncReadyCallback            callback,
-                                                                               gpointer                       user_data);
-GDBusObjectManager           *g_dbus_object_manager_client_new_finish         (GAsyncResult                  *res,
-                                                                               GError                       **error);
-GDBusObjectManager           *g_dbus_object_manager_client_new_sync           (GDBusConnection               *connection,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GError                       **error);
-void                          g_dbus_object_manager_client_new_for_bus        (GBusType                       bus_type,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GAsyncReadyCallback            callback,
-                                                                               gpointer                       user_data);
-GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_finish (GAsyncResult                  *res,
-                                                                               GError                       **error);
-GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_sync   (GBusType                       bus_type,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GError                       **error);
-GDBusConnection              *g_dbus_object_manager_client_get_connection     (GDBusObjectManagerClient      *manager);
-GDBusObjectManagerClientFlags g_dbus_object_manager_client_get_flags          (GDBusObjectManagerClient      *manager);
-const gchar                  *g_dbus_object_manager_client_get_name           (GDBusObjectManagerClient      *manager);
-gchar                        *g_dbus_object_manager_client_get_name_owner     (GDBusObjectManagerClient      *manager);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_CLIENT_H */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanagerserver.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanagerserver.h
deleted file mode 100644
index 90668dd8..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectmanagerserver.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_SERVER_H__
-#define __G_DBUS_OBJECT_MANAGER_SERVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER_SERVER         (g_dbus_object_manager_server_get_type ())
-#define G_DBUS_OBJECT_MANAGER_SERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServer))
-#define G_DBUS_OBJECT_MANAGER_SERVER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServerClass))
-#define G_DBUS_OBJECT_MANAGER_SERVER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServerClass))
-#define G_IS_DBUS_OBJECT_MANAGER_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER))
-#define G_IS_DBUS_OBJECT_MANAGER_SERVER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_MANAGER_SERVER))
-
-typedef struct _GDBusObjectManagerServerClass   GDBusObjectManagerServerClass;
-typedef struct _GDBusObjectManagerServerPrivate GDBusObjectManagerServerPrivate;
-
-/**
- * GDBusObjectManagerServer:
- *
- * The #GDBusObjectManagerServer structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerServer
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectManagerServerPrivate *priv;
-};
-
-/**
- * GDBusObjectManagerServerClass:
- * @parent_class: The parent class.
- *
- * Class structure for #GDBusObjectManagerServer.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerServerClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GType                     g_dbus_object_manager_server_get_type            (void) G_GNUC_CONST;
-GDBusObjectManagerServer *g_dbus_object_manager_server_new                 (const gchar               *object_path);
-GDBusConnection          *g_dbus_object_manager_server_get_connection      (GDBusObjectManagerServer  *manager);
-void                      g_dbus_object_manager_server_set_connection      (GDBusObjectManagerServer  *manager,
-                                                                            GDBusConnection           *connection);
-void                      g_dbus_object_manager_server_export              (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-void                      g_dbus_object_manager_server_export_uniquely     (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-gboolean                  g_dbus_object_manager_server_is_exported         (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-gboolean                  g_dbus_object_manager_server_unexport            (GDBusObjectManagerServer  *manager,
-                                                                            const gchar               *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_SERVER_H */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectproxy.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectproxy.h
deleted file mode 100644
index 58aef853..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectproxy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_PROXY_H__
-#define __G_DBUS_OBJECT_PROXY_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_PROXY         (g_dbus_object_proxy_get_type ())
-#define G_DBUS_OBJECT_PROXY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxy))
-#define G_DBUS_OBJECT_PROXY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxyClass))
-#define G_DBUS_OBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxyClass))
-#define G_IS_DBUS_OBJECT_PROXY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_PROXY))
-#define G_IS_DBUS_OBJECT_PROXY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_PROXY))
-
-typedef struct _GDBusObjectProxyClass   GDBusObjectProxyClass;
-typedef struct _GDBusObjectProxyPrivate GDBusObjectProxyPrivate;
-
-/**
- * GDBusObjectProxy:
- *
- * The #GDBusObjectProxy structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectProxy
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectProxyPrivate *priv;
-};
-
-/**
- * GDBusObjectProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #GDBusObjectProxy.
- *
- * Since: 2.30
- */
-struct _GDBusObjectProxyClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GType             g_dbus_object_proxy_get_type       (void) G_GNUC_CONST;
-GDBusObjectProxy *g_dbus_object_proxy_new            (GDBusConnection   *connection,
-                                                      const gchar       *object_path);
-GDBusConnection  *g_dbus_object_proxy_get_connection (GDBusObjectProxy  *proxy);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_PROXY_H */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectskeleton.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectskeleton.h
deleted file mode 100644
index 918a3353..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusobjectskeleton.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_SKELETON_H__
-#define __G_DBUS_OBJECT_SKELETON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_SKELETON         (g_dbus_object_skeleton_get_type ())
-#define G_DBUS_OBJECT_SKELETON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeleton))
-#define G_DBUS_OBJECT_SKELETON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeletonClass))
-#define G_DBUS_OBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeletonClass))
-#define G_IS_DBUS_OBJECT_SKELETON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_SKELETON))
-#define G_IS_DBUS_OBJECT_SKELETON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_SKELETON))
-
-typedef struct _GDBusObjectSkeletonClass   GDBusObjectSkeletonClass;
-typedef struct _GDBusObjectSkeletonPrivate GDBusObjectSkeletonPrivate;
-
-/**
- * GDBusObjectSkeleton:
- *
- * The #GDBusObjectSkeleton structure contains private data and should only be
- * accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectSkeleton
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectSkeletonPrivate *priv;
-};
-
-/**
- * GDBusObjectSkeletonClass:
- * @parent_class: The parent class.
- * @authorize_method: Signal class handler for the #GDBusObjectSkeleton::authorize-method signal.
- *
- * Class structure for #GDBusObjectSkeleton.
- *
- * Since: 2.30
- */
-struct _GDBusObjectSkeletonClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  gboolean (*authorize_method) (GDBusObjectSkeleton       *object,
-                                GDBusInterfaceSkeleton    *interface_,
-                                GDBusMethodInvocation *invocation);
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GType                g_dbus_object_skeleton_get_type                  (void) G_GNUC_CONST;
-GDBusObjectSkeleton *g_dbus_object_skeleton_new                       (const gchar            *object_path);
-void                 g_dbus_object_skeleton_flush                     (GDBusObjectSkeleton    *object);
-void                 g_dbus_object_skeleton_add_interface             (GDBusObjectSkeleton    *object,
-                                                                       GDBusInterfaceSkeleton *interface_);
-void                 g_dbus_object_skeleton_remove_interface          (GDBusObjectSkeleton    *object,
-                                                                       GDBusInterfaceSkeleton *interface_);
-void                 g_dbus_object_skeleton_remove_interface_by_name  (GDBusObjectSkeleton    *object,
-                                                                       const gchar            *interface_name);
-void                 g_dbus_object_skeleton_set_object_path           (GDBusObjectSkeleton    *object,
-                                                                       const gchar            *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_SKELETON_H */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusproxy.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusproxy.h
deleted file mode 100644
index 1e920d30..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusproxy.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_PROXY_H__
-#define __G_DBUS_PROXY_H__
-
-#include <gio/giotypes.h>
-#include <gio/gdbusintrospection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_PROXY         (g_dbus_proxy_get_type ())
-#define G_DBUS_PROXY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_PROXY, GDBusProxy))
-#define G_DBUS_PROXY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_PROXY, GDBusProxyClass))
-#define G_DBUS_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_PROXY, GDBusProxyClass))
-#define G_IS_DBUS_PROXY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_PROXY))
-#define G_IS_DBUS_PROXY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_PROXY))
-
-typedef struct _GDBusProxyClass   GDBusProxyClass;
-typedef struct _GDBusProxyPrivate GDBusProxyPrivate;
-
-/**
- * GDBusProxy:
- *
- * The #GDBusProxy structure contains only private data and
- * should only be accessed using the provided API.
- *
- * Since: 2.26
- */
-struct _GDBusProxy
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusProxyPrivate *priv;
-};
-
-/**
- * GDBusProxyClass:
- * @g_properties_changed: Signal class handler for the #GDBusProxy::g-properties-changed signal.
- * @g_signal: Signal class handler for the #GDBusProxy::g-signal signal.
- *
- * Class structure for #GDBusProxy.
- *
- * Since: 2.26
- */
-struct _GDBusProxyClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* Signals */
-  void (*g_properties_changed) (GDBusProxy          *proxy,
-                                GVariant            *changed_properties,
-                                const gchar* const  *invalidated_properties);
-  void (*g_signal)             (GDBusProxy          *proxy,
-                                const gchar         *sender_name,
-                                const gchar         *signal_name,
-                                GVariant            *parameters);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[32];
-};
-
-GType            g_dbus_proxy_get_type                  (void) G_GNUC_CONST;
-void             g_dbus_proxy_new                       (GDBusConnection     *connection,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GDBusProxy      *g_dbus_proxy_new_finish                (GAsyncResult        *res,
-                                                         GError             **error);
-GDBusProxy      *g_dbus_proxy_new_sync                  (GDBusConnection     *connection,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-void             g_dbus_proxy_new_for_bus               (GBusType             bus_type,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GDBusProxy      *g_dbus_proxy_new_for_bus_finish        (GAsyncResult        *res,
-                                                         GError             **error);
-GDBusProxy      *g_dbus_proxy_new_for_bus_sync          (GBusType             bus_type,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-GDBusConnection *g_dbus_proxy_get_connection            (GDBusProxy          *proxy);
-GDBusProxyFlags  g_dbus_proxy_get_flags                 (GDBusProxy          *proxy);
-const gchar     *g_dbus_proxy_get_name                  (GDBusProxy          *proxy);
-gchar           *g_dbus_proxy_get_name_owner            (GDBusProxy          *proxy);
-const gchar     *g_dbus_proxy_get_object_path           (GDBusProxy          *proxy);
-const gchar     *g_dbus_proxy_get_interface_name        (GDBusProxy          *proxy);
-gint             g_dbus_proxy_get_default_timeout       (GDBusProxy          *proxy);
-void             g_dbus_proxy_set_default_timeout       (GDBusProxy          *proxy,
-                                                         gint                 timeout_msec);
-GDBusInterfaceInfo *g_dbus_proxy_get_interface_info     (GDBusProxy          *proxy);
-void             g_dbus_proxy_set_interface_info        (GDBusProxy           *proxy,
-                                                         GDBusInterfaceInfo   *info);
-GVariant        *g_dbus_proxy_get_cached_property       (GDBusProxy          *proxy,
-                                                         const gchar         *property_name);
-void             g_dbus_proxy_set_cached_property       (GDBusProxy          *proxy,
-                                                         const gchar         *property_name,
-                                                         GVariant            *value);
-gchar          **g_dbus_proxy_get_cached_property_names (GDBusProxy          *proxy);
-void             g_dbus_proxy_call                      (GDBusProxy          *proxy,
-                                                         const gchar         *method_name,
-                                                         GVariant            *parameters,
-                                                         GDBusCallFlags       flags,
-                                                         gint                 timeout_msec,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GVariant        *g_dbus_proxy_call_finish               (GDBusProxy          *proxy,
-                                                         GAsyncResult        *res,
-                                                         GError             **error);
-GVariant        *g_dbus_proxy_call_sync                 (GDBusProxy          *proxy,
-                                                         const gchar         *method_name,
-                                                         GVariant            *parameters,
-                                                         GDBusCallFlags       flags,
-                                                         gint                 timeout_msec,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-
-void             g_dbus_proxy_call_with_unix_fd_list        (GDBusProxy          *proxy,
-                                                             const gchar         *method_name,
-                                                             GVariant            *parameters,
-                                                             GDBusCallFlags       flags,
-                                                             gint                 timeout_msec,
-                                                             GUnixFDList         *fd_list,
-                                                             GCancellable        *cancellable,
-                                                             GAsyncReadyCallback  callback,
-                                                             gpointer             user_data);
-GVariant        *g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy          *proxy,
-                                                             GUnixFDList        **out_fd_list,
-                                                             GAsyncResult        *res,
-                                                             GError             **error);
-GVariant        *g_dbus_proxy_call_with_unix_fd_list_sync   (GDBusProxy          *proxy,
-                                                             const gchar         *method_name,
-                                                             GVariant            *parameters,
-                                                             GDBusCallFlags       flags,
-                                                             gint                 timeout_msec,
-                                                             GUnixFDList         *fd_list,
-                                                             GUnixFDList        **out_fd_list,
-                                                             GCancellable        *cancellable,
-                                                             GError             **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_PROXY_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusserver.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusserver.h
deleted file mode 100644
index 3d10c1b4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusserver.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_SERVER_H__
-#define __G_DBUS_SERVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_SERVER         (g_dbus_server_get_type ())
-#define G_DBUS_SERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_SERVER, GDBusServer))
-#define G_IS_DBUS_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_SERVER))
-
-GType             g_dbus_server_get_type           (void) G_GNUC_CONST;
-GDBusServer      *g_dbus_server_new_sync           (const gchar       *address,
-                                                    GDBusServerFlags   flags,
-                                                    const gchar       *guid,
-                                                    GDBusAuthObserver *observer,
-                                                    GCancellable      *cancellable,
-                                                    GError           **error);
-const gchar      *g_dbus_server_get_client_address (GDBusServer       *server);
-const gchar      *g_dbus_server_get_guid           (GDBusServer       *server);
-GDBusServerFlags  g_dbus_server_get_flags          (GDBusServer       *server);
-void              g_dbus_server_start              (GDBusServer       *server);
-void              g_dbus_server_stop               (GDBusServer       *server);
-gboolean          g_dbus_server_is_active          (GDBusServer       *server);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_SERVER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusutils.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdbusutils.h
deleted file mode 100644
index a05a2300..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdbusutils.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_UTILS_H__
-#define __G_DBUS_UTILS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-gboolean g_dbus_is_guid (const gchar *string);
-gchar *g_dbus_generate_guid (void);
-
-gboolean g_dbus_is_name (const gchar *string);
-gboolean g_dbus_is_unique_name (const gchar *string);
-gboolean g_dbus_is_member_name (const gchar *string);
-gboolean g_dbus_is_interface_name (const gchar *string);
-
-void g_dbus_gvariant_to_gvalue (GVariant  *value,
-                                GValue    *out_gvalue);
-GVariant *g_dbus_gvalue_to_gvariant (const GValue         *gvalue,
-                                     const GVariantType   *type);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_UTILS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gdrive.h b/GstreamerHelper/x64/include/glib-2.0/gio/gdrive.h
deleted file mode 100644
index d42b0b70..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gdrive.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DRIVE_H__
-#define __G_DRIVE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DRIVE           (g_drive_get_type ())
-#define G_DRIVE(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DRIVE, GDrive))
-#define G_IS_DRIVE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DRIVE))
-#define G_DRIVE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DRIVE, GDriveIface))
-
-/**
- * GDriveIface:
- * @g_iface: The parent interface.
- * @changed: Signal emitted when the drive is changed.
- * @disconnected: The removed signal that is emitted when the #GDrive have been disconnected. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @eject_button: Signal emitted when the physical eject button (if any) of a drive have been pressed.
- * @get_name: Returns the name for the given #GDrive.
- * @get_icon: Returns a #GIcon for the given #GDrive.
- * @has_volumes: Returns %TRUE if the #GDrive has mountable volumes.
- * @get_volumes: Returns a list #GList of #GVolume for the #GDrive.
- * @is_media_removable: Returns %TRUE if the #GDrive supports removal and insertion of media.
- * @has_media: Returns %TRUE if the #GDrive has media inserted.
- * @is_media_check_automatic: Returns %TRUE if the #GDrive is capabable of automatically detecting media changes.
- * @can_poll_for_media: Returns %TRUE if the #GDrive is capable of manually polling for media change.
- * @can_eject: Returns %TRUE if the #GDrive can eject media.
- * @eject: Ejects a #GDrive.
- * @eject_finish: Finishes an eject operation.
- * @poll_for_media: Poll for media insertion/removal on a #GDrive.
- * @poll_for_media_finish: Finishes a media poll operation.
- * @get_identifier: Returns the identifier of the given kind, or %NULL if
- *    the #GDrive doesn't have one.
- * @enumerate_identifiers: Returns an array strings listing the kinds
- *    of identifiers which the #GDrive has.
- * @get_start_stop_type: Gets a #GDriveStartStopType with details about starting/stopping the drive. Since 2.22.
- * @can_stop: Returns %TRUE if a #GDrive can be stopped. Since 2.22.
- * @stop: Stops a #GDrive. Since 2.22.
- * @stop_finish: Finishes a stop operation. Since 2.22.
- * @can_start: Returns %TRUE if a #GDrive can be started. Since 2.22.
- * @can_start_degraded: Returns %TRUE if a #GDrive can be started degraded. Since 2.22.
- * @start: Starts a #GDrive. Since 2.22.
- * @start_finish: Finishes a start operation. Since 2.22.
- * @stop_button: Signal emitted when the physical stop button (if any) of a drive have been pressed. Since 2.22.
- * @eject_with_operation: Starts ejecting a #GDrive using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_sort_key: Gets a key used for sorting #GDrive instances or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Returns a symbolic #GIcon for the given #GDrive. Since 2.34.
- *
- * Interface for creating #GDrive implementations.
- */
-typedef struct _GDriveIface    GDriveIface;
-
-struct _GDriveIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void     (* changed)                  (GDrive              *drive);
-  void     (* disconnected)             (GDrive              *drive);
-  void     (* eject_button)             (GDrive              *drive);
-
-  /* Virtual Table */
-  char *   (* get_name)                 (GDrive              *drive);
-  GIcon *  (* get_icon)                 (GDrive              *drive);
-  gboolean (* has_volumes)              (GDrive              *drive);
-  GList *  (* get_volumes)              (GDrive              *drive);
-  gboolean (* is_media_removable)       (GDrive              *drive);
-  gboolean (* has_media)                (GDrive              *drive);
-  gboolean (* is_media_check_automatic) (GDrive              *drive);
-  gboolean (* can_eject)                (GDrive              *drive);
-  gboolean (* can_poll_for_media)       (GDrive              *drive);
-  void     (* eject)                    (GDrive              *drive,
-                                         GMountUnmountFlags   flags,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* eject_finish)             (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  void     (* poll_for_media)           (GDrive              *drive,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* poll_for_media_finish)    (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  char *   (* get_identifier)           (GDrive              *drive,
-                                         const char          *kind);
-  char **  (* enumerate_identifiers)    (GDrive              *drive);
-
-  GDriveStartStopType (* get_start_stop_type) (GDrive        *drive);
-
-  gboolean (* can_start)                (GDrive              *drive);
-  gboolean (* can_start_degraded)       (GDrive              *drive);
-  void     (* start)                    (GDrive              *drive,
-                                         GDriveStartFlags     flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* start_finish)             (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  gboolean (* can_stop)                 (GDrive              *drive);
-  void     (* stop)                     (GDrive              *drive,
-                                         GMountUnmountFlags   flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* stop_finish)              (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  /* signal, not VFunc */
-  void     (* stop_button)              (GDrive              *drive);
-
-  void        (* eject_with_operation)      (GDrive              *drive,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GDrive            *drive,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  const gchar * (* get_sort_key)        (GDrive              *drive);
-  GIcon *       (* get_symbolic_icon)   (GDrive              *drive);
-
-};
-
-GType    g_drive_get_type                 (void) G_GNUC_CONST;
-
-char *   g_drive_get_name                 (GDrive               *drive);
-GIcon *  g_drive_get_icon                 (GDrive               *drive);
-GIcon *  g_drive_get_symbolic_icon        (GDrive               *drive);
-gboolean g_drive_has_volumes              (GDrive               *drive);
-GList *  g_drive_get_volumes              (GDrive               *drive);
-gboolean g_drive_is_media_removable       (GDrive               *drive);
-gboolean g_drive_has_media                (GDrive               *drive);
-gboolean g_drive_is_media_check_automatic (GDrive               *drive);
-gboolean g_drive_can_poll_for_media       (GDrive               *drive);
-gboolean g_drive_can_eject                (GDrive               *drive);
-GLIB_DEPRECATED_FOR(g_drive_eject_with_operation)
-void     g_drive_eject                    (GDrive               *drive,
-                                           GMountUnmountFlags    flags,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-
-GLIB_DEPRECATED_FOR(g_drive_eject_with_operation_finish)
-gboolean g_drive_eject_finish             (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-void     g_drive_poll_for_media           (GDrive               *drive,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-gboolean g_drive_poll_for_media_finish    (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-char *   g_drive_get_identifier           (GDrive              *drive,
-                                           const char          *kind);
-char **  g_drive_enumerate_identifiers    (GDrive              *drive);
-
-GDriveStartStopType g_drive_get_start_stop_type (GDrive        *drive);
-
-gboolean g_drive_can_start                (GDrive              *drive);
-gboolean g_drive_can_start_degraded       (GDrive              *drive);
-void     g_drive_start                    (GDrive              *drive,
-                                           GDriveStartFlags     flags,
-                                           GMountOperation     *mount_operation,
-                                           GCancellable        *cancellable,
-                                           GAsyncReadyCallback  callback,
-                                           gpointer             user_data);
-gboolean g_drive_start_finish             (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-
-gboolean g_drive_can_stop                 (GDrive               *drive);
-void     g_drive_stop                     (GDrive               *drive,
-                                           GMountUnmountFlags    flags,
-                                           GMountOperation      *mount_operation,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-gboolean g_drive_stop_finish              (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-
-void        g_drive_eject_with_operation      (GDrive              *drive,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_drive_eject_with_operation_finish (GDrive            *drive,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_2_32
-const gchar *g_drive_get_sort_key         (GDrive               *drive);
-
-G_END_DECLS
-
-#endif /* __G_DRIVE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gemblem.h b/GstreamerHelper/x64/include/glib-2.0/gio/gemblem.h
deleted file mode 100644
index 06816e12..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gemblem.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Clemens N. Buss <cebuzz@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_EMBLEM_H__
-#define __G_EMBLEM_H__
-
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_EMBLEM         (g_emblem_get_type ())
-#define G_EMBLEM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_EMBLEM, GEmblem))
-#define G_EMBLEM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_EMBLEM, GEmblemClass))
-#define G_IS_EMBLEM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_EMBLEM))
-#define G_IS_EMBLEM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_EMBLEM))
-#define G_EMBLEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_EMBLEM, GEmblemClass))
-
-/**
- * GEmblem:
- *
- * An object for Emblems
- */
-typedef struct _GEmblem        GEmblem;
-typedef struct _GEmblemClass   GEmblemClass;
-
-GType          g_emblem_get_type        (void) G_GNUC_CONST;
-
-GEmblem       *g_emblem_new             (GIcon         *icon);
-GEmblem       *g_emblem_new_with_origin (GIcon         *icon,
-                                         GEmblemOrigin  origin);
-GIcon         *g_emblem_get_icon        (GEmblem       *emblem);
-GEmblemOrigin  g_emblem_get_origin      (GEmblem       *emblem);
-
-G_END_DECLS
-
-#endif /* __G_EMBLEM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gemblemedicon.h b/GstreamerHelper/x64/include/glib-2.0/gio/gemblemedicon.h
deleted file mode 100644
index ded69281..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gemblemedicon.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Gio - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Matthias Clasen <mclasen@redhat.com>
- *         Clemens N. Buss <cebuzz@gmail.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_EMBLEMED_ICON_H__
-#define __G_EMBLEMED_ICON_H__
-
-#include <gio/gicon.h>
-#include <gio/gemblem.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_EMBLEMED_ICON         (g_emblemed_icon_get_type ())
-#define G_EMBLEMED_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_EMBLEMED_ICON, GEmblemedIcon))
-#define G_EMBLEMED_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_EMBLEMED_ICON, GEmblemedIconClass))
-#define G_IS_EMBLEMED_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_EMBLEMED_ICON))
-#define G_IS_EMBLEMED_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_EMBLEMED_ICON))
-#define G_EMBLEMED_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_EMBLEMED_ICON, GEmblemedIconClass))
-
-/**
- * GEmblemedIcon:
- *
- * An implementation of #GIcon for icons with emblems.
- **/
-typedef struct _GEmblemedIcon        GEmblemedIcon;
-typedef struct _GEmblemedIconClass   GEmblemedIconClass;
-typedef struct _GEmblemedIconPrivate GEmblemedIconPrivate;
-
-struct _GEmblemedIcon
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GEmblemedIconPrivate *priv;
-};
-
-struct _GEmblemedIconClass
-{
-  GObjectClass parent_class;
-};
-
-GType  g_emblemed_icon_get_type    (void) G_GNUC_CONST;
-
-GIcon *g_emblemed_icon_new         (GIcon         *icon,
-                                    GEmblem       *emblem);
-GIcon *g_emblemed_icon_get_icon    (GEmblemedIcon *emblemed);
-GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed);
-void   g_emblemed_icon_add_emblem  (GEmblemedIcon *emblemed,
-                                    GEmblem       *emblem);
-void   g_emblemed_icon_clear_emblems  (GEmblemedIcon *emblemed);
-
-G_END_DECLS
-
-#endif /* __G_EMBLEMED_ICON_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfile.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfile.h
deleted file mode 100644
index 1a724db6..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfile.h
+++ /dev/null
@@ -1,1042 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_H__
-#define __G_FILE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE            (g_file_get_type ())
-#define G_FILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_FILE, GFile))
-#define G_IS_FILE(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE))
-#define G_FILE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_FILE, GFileIface))
-
-#if 0
-/**
- * GFile:
- *
- * A handle to an object implementing the #GFileIface interface.
- * Generally stores a location within the file system. Handles do not
- * necessarily represent files or directories that currently exist.
- **/
-typedef struct _GFile         		GFile; /* Dummy typedef */
-#endif
-typedef struct _GFileIface    		GFileIface;
-
-
-/**
- * GFileIface:
- * @g_iface: The parent interface.
- * @dup: Duplicates a #GFile.
- * @hash: Creates a hash of a #GFile.
- * @equal: Checks equality of two given #GFile<!-- -->s.
- * @is_native: Checks to see if a file is native to the system.
- * @has_uri_scheme: Checks to see if a #GFile has a given URI scheme.
- * @get_uri_scheme: Gets the URI scheme for a #GFile.
- * @get_basename: Gets the basename for a given #GFile.
- * @get_path: Gets the current path within a #GFile.
- * @get_uri: Gets a URI for the path within a #GFile.
- * @get_parse_name: Gets the parsed name for the #GFile.
- * @get_parent: Gets the parent directory for the #GFile.
- * @prefix_matches: Checks whether a #GFile contains a specified file.
- * @get_relative_path: Gets the path for a #GFile relative to a given path.
- * @resolve_relative_path: Resolves a relative path for a #GFile to an absolute path.
- * @get_child_for_display_name: Gets the child #GFile for a given display name.
- * @enumerate_children: Gets a #GFileEnumerator with the children of a #GFile.
- * @enumerate_children_async: Asynchronously gets a #GFileEnumerator with the children of a #GFile.
- * @enumerate_children_finish: Finishes asynchronously enumerating the children.
- * @query_info: Gets the #GFileInfo for a #GFile.
- * @query_info_async: Asynchronously gets the #GFileInfo for a #GFile.
- * @query_info_finish: Finishes an asynchronous query info operation.
- * @query_filesystem_info: Gets a #GFileInfo for the file system #GFile is on.
- * @query_filesystem_info_async: Asynchronously gets a #GFileInfo for the file system #GFile is on.
- * @query_filesystem_info_finish: Finishes asynchronously getting the file system info.
- * @find_enclosing_mount: Gets a #GMount for the #GFile.
- * @find_enclosing_mount_async: Asynchronously gets the #GMount for a #GFile.
- * @find_enclosing_mount_finish: Finishes asynchronously getting the volume.
- * @set_display_name: Sets the display name for a #GFile.
- * @set_display_name_async: Asynchronously sets a #GFile's display name.
- * @set_display_name_finish: Finishes asynchronously setting a #GFile's display name.
- * @query_settable_attributes: Returns a list of #GFileAttribute<!-- -->s that can be set.
- * @_query_settable_attributes_async: Asynchronously gets a list of #GFileAttribute<!-- -->s that can be set.
- * @_query_settable_attributes_finish: Finishes asynchronously querying settable attributes.
- * @query_writable_namespaces: Returns a list of #GFileAttribute namespaces that are writable.
- * @_query_writable_namespaces_async: Asynchronously gets a list of #GFileAttribute namespaces that are writable.
- * @_query_writable_namespaces_finish: Finishes asynchronously querying the writable namespaces.
- * @set_attribute: Sets a #GFileAttribute.
- * @set_attributes_from_info: Sets a #GFileAttribute with information from a #GFileInfo.
- * @set_attributes_async: Asynchronously sets a file's attributes.
- * @set_attributes_finish: Finishes setting a file's attributes asynchronously.
- * @read_fn: Reads a file asynchronously.
- * @read_async: Asynchronously reads a file.
- * @read_finish: Finishes asynchronously reading a file.
- * @append_to: Writes to the end of a file.
- * @append_to_async: Asynchronously writes to the end of a file.
- * @append_to_finish: Finishes an asynchronous file append operation.
- * @create: Creates a new file.
- * @create_async: Asynchronously creates a file.
- * @create_finish: Finishes asynchronously creating a file.
- * @replace: Replaces the contents of a file.
- * @replace_async: Asynchronously replaces the contents of a file.
- * @replace_finish: Finishes asynchronously replacing a file.
- * @delete_file: Deletes a file.
- * @delete_file_async: Asynchronously deletes a file.
- * @delete_file_finish: Finishes an asynchronous delete.
- * @trash: Sends a #GFile to the Trash location.
- * @_trash_async: Asynchronously sends a #GFile to the Trash location.
- * @_trash_finish: Finishes an asynchronous file trashing operation.
- * @make_directory: Makes a directory.
- * @_make_directory_async: Asynchronously makes a directory.
- * @_make_directory_finish: Finishes making a directory asynchronously.
- * @make_symbolic_link: Makes a symbolic link.
- * @_make_symbolic_link_async: Asynchronously makes a symbolic link
- * @_make_symbolic_link_finish: Finishes making a symbolic link asynchronously.
- * @copy: Copies a file.
- * @copy_async: Asynchronously copies a file.
- * @copy_finish: Finishes an asynchronous copy operation.
- * @move: Moves a file.
- * @_move_async: Asynchronously moves a file.
- * @_move_finish: Finishes an asynchronous move operation.
- * @mount_mountable: Mounts a mountable object.
- * @mount_mountable_finish: Finishes a mounting operation.
- * @unmount_mountable: Unmounts a mountable object.
- * @unmount_mountable_finish: Finishes an unmount operation.
- * @eject_mountable: Ejects a mountable.
- * @eject_mountable_finish: Finishes an eject operation.
- * @mount_enclosing_volume: Mounts a specified location.
- * @mount_enclosing_volume_finish: Finishes mounting a specified location.
- * @monitor_dir: Creates a #GFileMonitor for the location.
- * @monitor_file: Creates a #GFileMonitor for the location.
- * @open_readwrite: Open file read/write. Since 2.22.
- * @open_readwrite_async: Asynchronously opens file read/write. Since 2.22.
- * @open_readwrite_finish: Finishes an asynchronous open read/write. Since 2.22.
- * @create_readwrite: Creates file read/write. Since 2.22.
- * @create_readwrite_async: Asynchronously creates file read/write. Since 2.22.
- * @create_readwrite_finish: Finishes an asynchronous creates read/write. Since 2.22.
- * @replace_readwrite: Replaces file read/write. Since 2.22.
- * @replace_readwrite_async: Asynchronously replaces file read/write. Since 2.22.
- * @replace_readwrite_finish: Finishes an asynchronous replace read/write. Since 2.22.
- * @start_mountable: Starts a mountable object. Since 2.22.
- * @start_mountable_finish: Finishes an start operation. Since 2.22.
- * @stop_mountable: Stops a mountable. Since 2.22.
- * @stop_mountable_finish: Finishes an stop operation. Since 2.22.
- * @supports_thread_contexts: a boolean that indicates whether the #GFile implementation supports thread-default contexts. Since 2.22.
- * @unmount_mountable_with_operation: Unmounts a mountable object using a #GMountOperation. Since 2.22.
- * @unmount_mountable_with_operation_finish: Finishes an unmount operation using a #GMountOperation. Since 2.22.
- * @eject_mountable_with_operation: Ejects a mountable object using a #GMountOperation. Since 2.22.
- * @eject_mountable_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @poll_mountable: Polls a mountable object for media changes. Since 2.22.
- * @poll_mountable_finish: Finishes an poll operation for media changes. Since 2.22.
- *
- * An interface for writing VFS file handles.
- **/
-struct _GFileIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GFile *             (* dup)                         (GFile         *file);
-  guint               (* hash)                        (GFile         *file);
-  gboolean            (* equal)                       (GFile         *file1,
-                                                       GFile         *file2);
-  gboolean            (* is_native)                   (GFile         *file);
-  gboolean            (* has_uri_scheme)              (GFile         *file,
-                                                       const char    *uri_scheme);
-  char *              (* get_uri_scheme)              (GFile         *file);
-  char *              (* get_basename)                (GFile         *file);
-  char *              (* get_path)                    (GFile         *file);
-  char *              (* get_uri)                     (GFile         *file);
-  char *              (* get_parse_name)              (GFile         *file);
-  GFile *             (* get_parent)                  (GFile         *file);
-  gboolean            (* prefix_matches)              (GFile         *prefix,
-                                                       GFile         *file);
-  char *              (* get_relative_path)           (GFile         *parent,
-                                                       GFile         *descendant);
-  GFile *             (* resolve_relative_path)       (GFile        *file,
-                                                       const char   *relative_path);
-  GFile *             (* get_child_for_display_name)  (GFile        *file,
-                                                       const char   *display_name,
-                                                       GError      **error);
-
-  GFileEnumerator *   (* enumerate_children)          (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* enumerate_children_async)    (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileEnumerator *   (* enumerate_children_finish)   (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileInfo *         (* query_info)                  (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* query_info_async)            (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInfo *         (* query_info_finish)           (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileInfo *         (* query_filesystem_info)       (GFile                *file,
-                                                       const char           *attributes,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* query_filesystem_info_async) (GFile                *file,
-                                                       const char           *attributes,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInfo *         (* query_filesystem_info_finish)(GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GMount *            (* find_enclosing_mount)        (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* find_enclosing_mount_async)  (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GMount *            (* find_enclosing_mount_finish) (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFile *             (* set_display_name)            (GFile                *file,
-                                                       const char           *display_name,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* set_display_name_async)      (GFile                *file,
-                                                       const char           *display_name,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFile *             (* set_display_name_finish)     (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileAttributeInfoList * (* query_settable_attributes)    (GFile          *file,
-                                                             GCancellable   *cancellable,
-                                                             GError        **error);
-  void                (* _query_settable_attributes_async)  (void);
-  void                (* _query_settable_attributes_finish) (void);
-
-  GFileAttributeInfoList * (* query_writable_namespaces)    (GFile          *file,
-                                                             GCancellable   *cancellable,
-                                                             GError        **error);
-  void                (* _query_writable_namespaces_async)  (void);
-  void                (* _query_writable_namespaces_finish) (void);
-
-  gboolean            (* set_attribute)               (GFile                *file,
-                                                       const char           *attribute,
-                                                       GFileAttributeType    type,
-                                                       gpointer              value_p,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  gboolean            (* set_attributes_from_info)    (GFile                *file,
-                                                       GFileInfo            *info,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* set_attributes_async)        (GFile                *file,
-                                                       GFileInfo            *info,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* set_attributes_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GFileInfo           **info,
-                                                       GError              **error);
-
-  GFileInputStream *  (* read_fn)                     (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* read_async)                  (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInputStream *  (* read_finish)                 (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* append_to)                   (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* append_to_async)             (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* append_to_finish)            (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* create)                      (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* create_async)                (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* create_finish)               (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* replace)                     (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* replace_async)               (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* replace_finish)              (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  gboolean            (* delete_file)                 (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* delete_file_async)           (GFile                *file,
-						       int                   io_priority,
-						       GCancellable         *cancellable,
-						       GAsyncReadyCallback   callback,
-						       gpointer              user_data);
-  gboolean            (* delete_file_finish)          (GFile                *file,
-						       GAsyncResult         *result,
-						       GError              **error);
-
-  gboolean            (* trash)                       (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* _trash_async)                (void);
-  void                (* _trash_finish)               (void);
-
-  gboolean            (* make_directory)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* _make_directory_async)       (void);
-  void                (* _make_directory_finish)      (void);
-
-  gboolean            (* make_symbolic_link)          (GFile                *file,
-                                                       const char           *symlink_value,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* _make_symbolic_link_async)   (void);
-  void                (* _make_symbolic_link_finish)  (void);
-
-  gboolean            (* copy)                        (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GError              **error);
-  void                (* copy_async)                  (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* copy_finish)                 (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  gboolean            (* move)                        (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GError              **error);
-  void                (* _move_async)                 (void);
-  void                (* _move_finish)                (void);
-
-  void                (* mount_mountable)             (GFile                *file,
-                                                       GMountMountFlags      flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFile *             (* mount_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* unmount_mountable)           (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* unmount_mountable_finish)    (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* eject_mountable)             (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* eject_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* mount_enclosing_volume)      (GFile                *location,
-                                                       GMountMountFlags      flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean         (* mount_enclosing_volume_finish)  (GFile                *location,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  GFileMonitor *      (* monitor_dir)                 (GFile                *file,
-                                                       GFileMonitorFlags     flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  GFileMonitor *      (* monitor_file)                (GFile                *file,
-                                                       GFileMonitorFlags     flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-
-  GFileIOStream *     (* open_readwrite)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* open_readwrite_async)        (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* open_readwrite_finish)       (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-  GFileIOStream *     (* create_readwrite)            (GFile                *file,
-						       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* create_readwrite_async)      (GFile                *file,
-						       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* create_readwrite_finish)      (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-  GFileIOStream *     (* replace_readwrite)           (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* replace_readwrite_async)     (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* replace_readwrite_finish)    (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  void                (* start_mountable)             (GFile                *file,
-                                                       GDriveStartFlags      flags,
-                                                       GMountOperation      *start_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* start_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* stop_mountable)              (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* stop_mountable_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  gboolean            supports_thread_contexts;
-
-  void                (* unmount_mountable_with_operation) (GFile           *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* unmount_mountable_with_operation_finish) (GFile    *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* eject_mountable_with_operation) (GFile             *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* eject_mountable_with_operation_finish) (GFile      *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* poll_mountable)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* poll_mountable_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-};
-
-GType                   g_file_get_type                   (void) G_GNUC_CONST;
-
-GFile *                 g_file_new_for_path               (const char                 *path);
-GFile *                 g_file_new_for_uri                (const char                 *uri);
-GFile *                 g_file_new_for_commandline_arg    (const char                 *arg);
-GLIB_AVAILABLE_IN_2_32
-GFile *                 g_file_new_tmp                    (const char                 *tmpl,
-                                                           GFileIOStream             **iostream,
-                                                           GError                    **error);
-GFile *                 g_file_parse_name                 (const char                 *parse_name);
-GFile *                 g_file_dup                        (GFile                      *file);
-guint                   g_file_hash                       (gconstpointer               file);
-gboolean                g_file_equal                      (GFile                      *file1,
-							   GFile                      *file2);
-char *                  g_file_get_basename               (GFile                      *file);
-char *                  g_file_get_path                   (GFile                      *file);
-char *                  g_file_get_uri                    (GFile                      *file);
-char *                  g_file_get_parse_name             (GFile                      *file);
-GFile *                 g_file_get_parent                 (GFile                      *file);
-gboolean                g_file_has_parent                 (GFile                      *file,
-                                                           GFile                      *parent);
-GFile *                 g_file_get_child                  (GFile                      *file,
-							   const char                 *name);
-GFile *                 g_file_get_child_for_display_name (GFile                      *file,
-							   const char                 *display_name,
-							   GError                    **error);
-gboolean                g_file_has_prefix                 (GFile                      *file,
-							   GFile                      *prefix);
-char *                  g_file_get_relative_path          (GFile                      *parent,
-							   GFile                      *descendant);
-GFile *                 g_file_resolve_relative_path      (GFile                      *file,
-							   const char                 *relative_path);
-gboolean                g_file_is_native                  (GFile                      *file);
-gboolean                g_file_has_uri_scheme             (GFile                      *file,
-							   const char                 *uri_scheme);
-char *                  g_file_get_uri_scheme             (GFile                      *file);
-GFileInputStream *      g_file_read                       (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_read_async                 (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInputStream *      g_file_read_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileOutputStream *     g_file_append_to                  (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileOutputStream *     g_file_create                     (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileOutputStream *     g_file_replace                    (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_append_to_async            (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_append_to_finish           (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-void                    g_file_create_async               (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_create_finish              (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-void                    g_file_replace_async              (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_replace_finish             (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileIOStream *         g_file_open_readwrite             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_open_readwrite_async       (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileIOStream *         g_file_open_readwrite_finish      (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileIOStream *         g_file_create_readwrite           (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_create_readwrite_async     (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileIOStream *         g_file_create_readwrite_finish    (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileIOStream *         g_file_replace_readwrite          (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_replace_readwrite_async    (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileIOStream *         g_file_replace_readwrite_finish   (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_query_exists               (GFile                      *file,
-							   GCancellable               *cancellable);
-GFileType               g_file_query_file_type            (GFile                      *file,
-                                                           GFileQueryInfoFlags         flags,
-                                                           GCancellable               *cancellable);
-GFileInfo *             g_file_query_info                 (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_query_info_async           (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInfo *             g_file_query_info_finish          (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileInfo *             g_file_query_filesystem_info      (GFile                      *file,
-							   const char                 *attributes,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_query_filesystem_info_async (GFile                      *file,
-							   const char                 *attributes,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInfo *             g_file_query_filesystem_info_finish (GFile                      *file,
-                                                           GAsyncResult               *res,
-							   GError                    **error);
-GMount *                g_file_find_enclosing_mount       (GFile                      *file,
-                                                           GCancellable               *cancellable,
-                                                           GError                    **error);
-void                    g_file_find_enclosing_mount_async (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GMount *                g_file_find_enclosing_mount_finish (GFile                     *file,
-							    GAsyncResult              *res,
-							    GError                   **error);
-GFileEnumerator *       g_file_enumerate_children         (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_enumerate_children_async   (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileEnumerator *       g_file_enumerate_children_finish  (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFile *                 g_file_set_display_name           (GFile                      *file,
-							   const char                 *display_name,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_set_display_name_async     (GFile                      *file,
-							   const char                 *display_name,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFile *                 g_file_set_display_name_finish    (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_delete                     (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-GLIB_AVAILABLE_IN_2_34
-void                    g_file_delete_async               (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean                g_file_delete_finish              (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-gboolean                g_file_trash                      (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_copy                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-void                    g_file_copy_async                 (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_copy_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_move                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-gboolean                g_file_make_directory             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_make_directory_with_parents (GFile                     *file,
-		                                           GCancellable               *cancellable,
-		                                           GError                    **error);
-gboolean                g_file_make_symbolic_link         (GFile                      *file,
-							   const char                 *symlink_value,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileAttributeInfoList *g_file_query_settable_attributes  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileAttributeInfoList *g_file_query_writable_namespaces  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute              (GFile                      *file,
-							   const char                 *attribute,
-							   GFileAttributeType          type,
-							   gpointer                    value_p,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attributes_from_info   (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_set_attributes_async       (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_set_attributes_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GFileInfo                 **info,
-							   GError                    **error);
-gboolean                g_file_set_attribute_string       (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_byte_string  (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_uint32       (GFile                      *file,
-							   const char                 *attribute,
-							   guint32                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_int32        (GFile                      *file,
-							   const char                 *attribute,
-							   gint32                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_uint64       (GFile                      *file,
-							   const char                 *attribute,
-							   guint64                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_int64        (GFile                      *file,
-							   const char                 *attribute,
-							   gint64                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_mount_enclosing_volume     (GFile                      *location,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_mount_enclosing_volume_finish (GFile                      *location,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_mount_mountable            (GFile                      *file,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFile *                 g_file_mount_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation)
-void                    g_file_unmount_mountable          (GFile                      *file,
-                                                           GMountUnmountFlags          flags,
-                                                           GCancellable               *cancellable,
-                                                           GAsyncReadyCallback         callback,
-                                                           gpointer                    user_data);
-
-GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish)
-gboolean                g_file_unmount_mountable_finish   (GFile                      *file,
-                                                           GAsyncResult               *result,
-                                                           GError                    **error);
-void                    g_file_unmount_mountable_with_operation (GFile                *file,
-							   GMountUnmountFlags          flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_unmount_mountable_with_operation_finish (GFile         *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation)
-void                    g_file_eject_mountable            (GFile                      *file,
-                                                           GMountUnmountFlags          flags,
-                                                           GCancellable               *cancellable,
-                                                           GAsyncReadyCallback         callback,
-                                                           gpointer                    user_data);
-
-GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish)
-gboolean                g_file_eject_mountable_finish     (GFile                      *file,
-                                                           GAsyncResult               *result,
-                                                           GError                    **error);
-void                    g_file_eject_mountable_with_operation (GFile                  *file,
-							   GMountUnmountFlags          flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_eject_mountable_with_operation_finish (GFile           *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-gboolean                g_file_copy_attributes            (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-
-GFileMonitor*           g_file_monitor_directory          (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-GFileMonitor*           g_file_monitor_file               (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-GFileMonitor*           g_file_monitor                    (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-
-void                    g_file_start_mountable            (GFile                      *file,
-							   GDriveStartFlags            flags,
-							   GMountOperation            *start_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_start_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_stop_mountable             (GFile                      *file,
-							   GMountUnmountFlags          flags,
-                                                           GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_stop_mountable_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-void                    g_file_poll_mountable             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_poll_mountable_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-/* Utilities */
-
-GAppInfo *g_file_query_default_handler       (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GError                **error);
-gboolean g_file_load_contents                (GFile                  *file,
-					      GCancellable           *cancellable,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-void     g_file_load_contents_async          (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_load_contents_finish         (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-void     g_file_load_partial_contents_async  (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GFileReadMoreCallback   read_more_callback,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_load_partial_contents_finish (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-gboolean g_file_replace_contents             (GFile                  *file,
-					      const char             *contents,
-					      gsize                   length,
-					      const char             *etag,
-					      gboolean                make_backup,
-					      GFileCreateFlags        flags,
-					      char                  **new_etag,
-					      GCancellable           *cancellable,
-					      GError                **error);
-void     g_file_replace_contents_async       (GFile                  *file,
-					      const char             *contents,
-					      gsize                   length,
-					      const char             *etag,
-					      gboolean                make_backup,
-					      GFileCreateFlags        flags,
-					      GCancellable           *cancellable,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_replace_contents_finish      (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **new_etag,
-					      GError                **error);
-
-gboolean g_file_supports_thread_contexts     (GFile                  *file);
-
-G_END_DECLS
-
-#endif /* __G_FILE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfileattribute.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfileattribute.h
deleted file mode 100644
index 445cdd77..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfileattribute.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ATTRIBUTE_H__
-#define __G_FILE_ATTRIBUTE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GFileAttributeInfo:
- * @name: the name of the attribute.
- * @type: the #GFileAttributeType type of the attribute.
- * @flags: a set of #GFileAttributeInfoFlags.
- *
- * Information about a specific attribute.
- **/
-struct _GFileAttributeInfo
-{
-  char                    *name;
-  GFileAttributeType       type;
-  GFileAttributeInfoFlags  flags;
-};
-
-/**
- * GFileAttributeInfoList:
- * @infos: an array of #GFileAttributeInfo<!-- -->s.
- * @n_infos: the number of values in the array.
- *
- * Acts as a lightweight registry for possible valid file attributes.
- * The registry stores Key-Value pair formats as #GFileAttributeInfo<!-- -->s.
- **/
-struct _GFileAttributeInfoList
-{
-  GFileAttributeInfo *infos;
-  int                 n_infos;
-};
-
-#define G_TYPE_FILE_ATTRIBUTE_INFO_LIST (g_file_attribute_info_list_get_type ())
-GType g_file_attribute_info_list_get_type (void);
-
-GFileAttributeInfoList *  g_file_attribute_info_list_new    (void);
-GFileAttributeInfoList *  g_file_attribute_info_list_ref    (GFileAttributeInfoList *list);
-void                      g_file_attribute_info_list_unref  (GFileAttributeInfoList *list);
-GFileAttributeInfoList *  g_file_attribute_info_list_dup    (GFileAttributeInfoList *list);
-const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list,
-							     const char             *name);
-void                      g_file_attribute_info_list_add    (GFileAttributeInfoList *list,
-							     const char             *name,
-							     GFileAttributeType      type,
-							     GFileAttributeInfoFlags flags);
-
-G_END_DECLS
-
-#endif /* __G_FILE_INFO_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfileenumerator.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfileenumerator.h
deleted file mode 100644
index 9cd2f3ec..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfileenumerator.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ENUMERATOR_H__
-#define __G_FILE_ENUMERATOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_ENUMERATOR         (g_file_enumerator_get_type ())
-#define G_FILE_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_ENUMERATOR, GFileEnumerator))
-#define G_FILE_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_ENUMERATOR, GFileEnumeratorClass))
-#define G_IS_FILE_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_ENUMERATOR))
-#define G_IS_FILE_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_ENUMERATOR))
-#define G_FILE_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_ENUMERATOR, GFileEnumeratorClass))
-
-/**
- * GFileEnumerator:
- *
- * A per matched file iterator.
- **/
-typedef struct _GFileEnumeratorClass    GFileEnumeratorClass;
-typedef struct _GFileEnumeratorPrivate  GFileEnumeratorPrivate;
-
-struct _GFileEnumerator
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GFileEnumeratorPrivate *priv;
-};
-
-struct _GFileEnumeratorClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  GFileInfo * (* next_file)         (GFileEnumerator      *enumerator,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* close_fn)          (GFileEnumerator      *enumerator,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-
-  void        (* next_files_async)  (GFileEnumerator      *enumerator,
-                                     int                   num_files,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GList *     (* next_files_finish) (GFileEnumerator      *enumerator,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  void        (* close_async)       (GFileEnumerator      *enumerator,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  gboolean    (* close_finish)      (GFileEnumerator      *enumerator,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-};
-
-GType      g_file_enumerator_get_type          (void) G_GNUC_CONST;
-
-GFileInfo *g_file_enumerator_next_file         (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-gboolean   g_file_enumerator_close             (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-void       g_file_enumerator_next_files_async  (GFileEnumerator      *enumerator,
-						int                   num_files,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-GList *    g_file_enumerator_next_files_finish (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-void       g_file_enumerator_close_async       (GFileEnumerator      *enumerator,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-gboolean   g_file_enumerator_close_finish      (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-gboolean   g_file_enumerator_is_closed         (GFileEnumerator      *enumerator);
-gboolean   g_file_enumerator_has_pending       (GFileEnumerator      *enumerator);
-void       g_file_enumerator_set_pending       (GFileEnumerator      *enumerator,
-						gboolean              pending);
-GFile *    g_file_enumerator_get_container     (GFileEnumerator *enumerator);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ENUMERATOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfileicon.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfileicon.h
deleted file mode 100644
index 08ae7919..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfileicon.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ICON_H__
-#define __G_FILE_ICON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_ICON         (g_file_icon_get_type ())
-#define G_FILE_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_ICON, GFileIcon))
-#define G_FILE_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_ICON, GFileIconClass))
-#define G_IS_FILE_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_ICON))
-#define G_IS_FILE_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_ICON))
-#define G_FILE_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_ICON, GFileIconClass))
-
-/**
- * GFileIcon:
- *
- * Gets an icon for a #GFile. Implements #GLoadableIcon.
- **/
-typedef struct _GFileIconClass   GFileIconClass;
-
-GType   g_file_icon_get_type (void) G_GNUC_CONST;
-
-GIcon * g_file_icon_new      (GFile     *file);
-
-GFile * g_file_icon_get_file (GFileIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ICON_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfileinfo.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfileinfo.h
deleted file mode 100644
index 9399e534..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfileinfo.h
+++ /dev/null
@@ -1,983 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_INFO_H__
-#define __G_FILE_INFO_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_INFO         (g_file_info_get_type ())
-#define G_FILE_INFO(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_INFO, GFileInfo))
-#define G_FILE_INFO_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_INFO, GFileInfoClass))
-#define G_IS_FILE_INFO(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_INFO))
-#define G_IS_FILE_INFO_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_INFO))
-#define G_FILE_INFO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_INFO, GFileInfoClass))
-
-/**
- * GFileInfo:
- *
- * Stores information about a file system object referenced by a #GFile.
- **/
-typedef struct _GFileInfoClass   GFileInfoClass;
-
-
-/* Common Attributes:  */
-/**
- * G_FILE_ATTRIBUTE_STANDARD_TYPE:
- *
- * A key in the "standard" namespace for storing file types.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- * The value for this key should contain a #GFileType.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_TYPE "standard::type"                     /* uint32 (GFileType) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN:
- *
- * A key in the "standard" namespace for checking if a file is hidden.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "standard::is-hidden"           /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP:
- *
- * A key in the "standard" namespace for checking if a file is a backup file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP "standard::is-backup"           /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK:
- *
- * A key in the "standard" namespace for checking if the file is a symlink.
- * Typically the actual type is something else, if we followed the symlink
- * to get the type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK "standard::is-symlink"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL:
- *
- * A key in the "standard" namespace for checking if a file is virtual.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL "standard::is-virtual"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_NAME:
- *
- * A key in the "standard" namespace for getting the name of the file.
- * The name is the on-disk filename which may not be in any known encoding,
- * and can thus not be generally displayed as is.
- * Use #G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME if you need to display the
- * name in a user interface.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_NAME "standard::name"                     /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME:
- *
- * A key in the "standard" namespace for getting the display name of the file.
- * A display name is guaranteed to be in UTF8 and can thus be displayed in
- * the UI.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME "standard::display-name"     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME:
- *
- * A key in the "standard" namespace for edit name of the file.
- * An edit name is similar to the display name, but it is meant to be
- * used when you want to rename the file in the UI. The display name
- * might contain information you don't want in the new filename (such as
- * "(invalid unicode)" if the filename was in an invalid encoding).
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME "standard::edit-name"           /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_COPY_NAME:
- *
- * A key in the "standard" namespace for getting the copy name of the file.
- * The copy name is an optional version of the name. If available it's always
- * in UTF8, and corresponds directly to the original filename (only transcoded to
- * UTF8). This is useful if you want to copy the file to another filesystem that
- * might have a different encoding. If the filename is not a valid string in the
- * encoding selected for the filesystem it is in then the copy name will not be set.
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_COPY_NAME "standard::copy-name"           /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION:
- *
- * A key in the "standard" namespace for getting the description of the file.
- * The description is a utf8 string that describes the file, generally containing
- * the filename, but can also contain furter information. Example descriptions
- * could be "filename (on hostname)" for a remote file or "filename (in trash)"
- * for a file in the trash. This is useful for instance as the window title
- * when displaying a directory or for a bookmarks menu.
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION "standard::description"        /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_ICON:
- *
- * A key in the "standard" namespace for getting the icon for the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.
- * The value for this key should contain a #GIcon.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_ICON "standard::icon"                     /* object (GIcon) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON:
- *
- * A key in the "standard" namespace for getting the symbolic icon for the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.
- * The value for this key should contain a #GIcon.
- *
- * Since: 2.34
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON "standard::symbolic-icon"   /* object (GIcon) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE:
- *
- * A key in the "standard" namespace for getting the content type of the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * The value for this key should contain a valid content type.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "standard::content-type"     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE:
- *
- * A key in the "standard" namespace for getting the fast content type.
- * The fast content type isn't as reliable as the regular one, as it
- * only uses the filename to guess it, but it is faster to calculate than the
- * regular content type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE "standard::fast-content-type" /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SIZE:
- *
- * A key in the "standard" namespace for getting the file's size (in bytes).
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SIZE "standard::size"                     /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE:
- *
- * A key in the "standard" namespace for getting the amount of disk space
- * that is consumed by the file (in bytes).  This will generally be larger
- * than the file size (due to block size overhead) but can occasionally be
- * smaller (for example, for sparse files).
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- *
- * Since: 2.20
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE "standard::allocated-size" /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET:
- *
- * A key in the "standard" namespace for getting the symlink target, if the file
- * is a symlink. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET "standard::symlink-target" /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_TARGET_URI:
- *
- * A key in the "standard" namespace for getting the target URI for the file, in
- * the case of %G_FILE_TYPE_SHORTCUT or %G_FILE_TYPE_MOUNTABLE files.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_TARGET_URI "standard::target-uri"         /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER:
- *
- * A key in the "standard" namespace for setting the sort order of a file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_INT32.
- * An example use would be in file managers, which would use this key
- * to set the order files are displayed. Files with smaller sort order
- * should be sorted first, and files without sort order as if sort order
- * was zero.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER "standard::sort-order"         /* int32  */
-
-/* Entity tags, used to avoid missing updates on save */
-
-/**
- * G_FILE_ATTRIBUTE_ETAG_VALUE:
- *
- * A key in the "etag" namespace for getting the value of the file's
- * entity tag. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_ETAG_VALUE "etag::value"                 /* string */
-
-/* File identifier, for e.g. avoiding loops when doing recursive
- * directory scanning
- */
-
-/**
- * G_FILE_ATTRIBUTE_ID_FILE:
- *
- * A key in the "id" namespace for getting a file identifier.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * An example use would be during listing files, to avoid recursive
- * directory scanning.
- **/
-#define G_FILE_ATTRIBUTE_ID_FILE "id::file"                     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_ID_FILESYSTEM:
- *
- * A key in the "id" namespace for getting the file system identifier.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * An example use would be during drag and drop to see if the source
- * and target are on the same filesystem (default to move) or not (default
- * to copy).
- **/
-#define G_FILE_ATTRIBUTE_ID_FILESYSTEM "id::filesystem"         /* string */
-
-/* Calculated Access Rights for current user */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_READ:
- *
- * A key in the "access" namespace for getting read privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to read the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_READ "access::can-read"       /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE:
- *
- * A key in the "access" namespace for getting write privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to write to the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE "access::can-write"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE:
- *
- * A key in the "access" namespace for getting execution privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to execute the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE "access::can-execute" /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE:
- *
- * A key in the "access" namespace for checking deletion privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to delete the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE "access::can-delete"   /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH:
- *
- * A key in the "access" namespace for checking trashing privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to move the file to
- * the trash.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH "access::can-trash"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME:
- *
- * A key in the "access" namespace for checking renaming privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to rename the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME "access::can-rename"   /* boolean */
-
-/* TODO: Should we have special version for directories? can_enumerate, etc */
-
-/* Mountable attributes */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) is mountable.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT "mountable::can-mount"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE)  is unmountable.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT "mountable::can-unmount" /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be ejected.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT "mountable::can-eject"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE:
- *
- * A key in the "mountable" namespace for getting the unix device.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE "mountable::unix-device" /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE:
- *
- * A key in the "mountable" namespace for getting the unix device file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- * Since: 2.22
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE "mountable::unix-device-file" /* string */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI:
- *
- * A key in the "mountable" namespace for getting the HAL UDI for the mountable
- * file. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI "mountable::hal-udi"         /* string */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be started.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START "mountable::can-start"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START_DEGRADED:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be started
- * degraded.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START_DEGRADED "mountable::can-start-degraded"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_STOP:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be stopped.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_STOP "mountable::can-stop"      /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE:
- *
- * A key in the "mountable" namespace for getting the #GDriveStartStopType.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE "mountable::start-stop-type" /* uint32 (GDriveStartStopType) */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be polled.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL "mountable::can-poll"      /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE)
- * is automatically polled for media.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC "mountable::is-media-check-automatic"      /* boolean */
-
-/* Time attributes */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_MODIFIED:
- *
- * A key in the "time" namespace for getting the time the file was last
- * modified. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
- * file was modified.
- **/
-#define G_FILE_ATTRIBUTE_TIME_MODIFIED "time::modified"           /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC:
- *
- * A key in the "time" namespace for getting the miliseconds of the time
- * the file was last modified. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_MODIFIED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC "time::modified-usec" /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_ACCESS:
- *
- * A key in the "time" namespace for getting the time the file was last
- * accessed. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
- * file was last accessed.
- **/
-#define G_FILE_ATTRIBUTE_TIME_ACCESS "time::access"               /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_ACCESS_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was last accessed. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_ACCESS. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_ACCESS_USEC "time::access-usec"     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CHANGED:
- *
- * A key in the "time" namespace for getting the time the file was last
- * changed. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
- * and contains the UNIX time since the file was last changed.
- *
- * This corresponds to the traditional UNIX ctime.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CHANGED "time::changed"             /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CHANGED_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was last changed. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_CHANGED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CHANGED_USEC "time::changed-usec"   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CREATED:
- *
- * A key in the "time" namespace for getting the time the file was created.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
- * and contains the UNIX time since the file was created.
- *
- * This corresponds to the NTFS ctime.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CREATED "time::created"             /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CREATED_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was created. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_CREATED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CREATED_USEC "time::created-usec"   /* uint32 */
-
-/* Unix specific attributes */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_DEVICE:
- *
- * A key in the "unix" namespace for getting the device id of the device the
- * file is located on (see stat() documentation). This attribute is only
- * available for UNIX file systems. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_DEVICE "unix::device"               /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_INODE:
- *
- * A key in the "unix" namespace for getting the inode of the file.
- * This attribute is only available for UNIX file systems. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_INODE "unix::inode"                 /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_MODE:
- *
- * A key in the "unix" namespace for getting the mode of the file
- * (e.g. whether the file is a regular file, symlink, etc). See lstat()
- * documentation. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_MODE "unix::mode"                   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_NLINK:
- *
- * A key in the "unix" namespace for getting the number of hard links
- * for a file. See lstat() documentation. This attribute is only available
- * for UNIX file systems. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_NLINK "unix::nlink"                 /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_UID:
- *
- * A key in the "unix" namespace for getting the user ID for the file.
- * This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_UID "unix::uid"                     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_GID:
- *
- * A key in the "unix" namespace for getting the group ID for the file.
- * This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_GID "unix::gid"                     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_RDEV:
- *
- * A key in the "unix" namespace for getting the device ID for the file
- * (if it is a special file). See lstat() documentation. This attribute
- * is only available for UNIX file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_RDEV "unix::rdev"                   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE:
- *
- * A key in the "unix" namespace for getting the block size for the file
- * system. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE "unix::block-size"       /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_BLOCKS:
- *
- * A key in the "unix" namespace for getting the number of blocks allocated
- * for the file. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_BLOCKS "unix::blocks"               /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT:
- *
- * A key in the "unix" namespace for checking if the file represents a
- * UNIX mount point. This attribute is %TRUE if the file is a UNIX mount
- * point. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT "unix::is-mountpoint" /* boolean */
-
-/* DOS specific attributes */
-
-/**
- * G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE:
- *
- * A key in the "dos" namespace for checking if the file's archive flag
- * is set. This attribute is %TRUE if the archive flag is set. This attribute
- * is only available for DOS file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE "dos::is-archive"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_DOS_IS_SYSTEM:
- *
- * A key in the "dos" namespace for checking if the file's backup flag
- * is set. This attribute is %TRUE if the backup flag is set. This attribute
- * is only available for DOS file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_DOS_IS_SYSTEM "dos::is-system"           /* boolean */
-
-/* Owner attributes */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_USER:
- *
- * A key in the "owner" namespace for getting the user name of the
- * file's owner. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_USER "owner::user"                 /* string */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_USER_REAL:
- *
- * A key in the "owner" namespace for getting the real name of the
- * user that owns the file. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_USER_REAL "owner::user-real"       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_GROUP:
- *
- * A key in the "owner" namespace for getting the file owner's group.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_GROUP "owner::group"               /* string */
-
-/* Thumbnails */
-
-/**
- * G_FILE_ATTRIBUTE_THUMBNAIL_PATH:
- *
- * A key in the "thumbnail" namespace for getting the path to the thumbnail
- * image. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH "thumbnail::path"         /* bytestring */
-/**
- * G_FILE_ATTRIBUTE_THUMBNAILING_FAILED:
- *
- * A key in the "thumbnail" namespace for checking if thumbnailing failed.
- * This attribute is %TRUE if thumbnailing failed. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED "thumbnail::failed"         /* boolean */
-
-/* Preview */
-
-/**
- * G_FILE_ATTRIBUTE_PREVIEW_ICON:
- *
- * A key in the "preview" namespace for getting a #GIcon that can be
- * used to get preview of the file. For example, it may be a low
- * resolution thumbnail without metadata. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.  The value
- * for this key should contain a #GIcon.
- *
- * Since: 2.20
- **/
-#define G_FILE_ATTRIBUTE_PREVIEW_ICON "preview::icon"         /* object (GIcon) */
-
-/* File system info (for g_file_get_filesystem_info) */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_SIZE:
- *
- * A key in the "filesystem" namespace for getting the total size (in bytes) of the file system,
- * used in g_file_query_filesystem_info(). Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_SIZE "filesystem::size"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_FREE:
- *
- * A key in the "filesystem" namespace for getting the number of bytes of free space left on the
- * file system. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_FREE "filesystem::free"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_USED:
- *
- * A key in the "filesystem" namespace for getting the number of bytes of used on the
- * file system. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64.
- *
- * Since: 2.32
- */
-#define G_FILE_ATTRIBUTE_FILESYSTEM_USED "filesystem::used"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_TYPE:
- *
- * A key in the "filesystem" namespace for getting the file system's type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_TYPE "filesystem::type"                       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_READONLY:
- *
- * A key in the "filesystem" namespace for checking if the file system
- * is read only. Is set to %TRUE if the file system is read only.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_READONLY "filesystem::readonly"               /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW:
- *
- * A key in the "filesystem" namespace for hinting a file manager
- * application whether it should preview (e.g. thumbnail) files on the
- * file system. The value for this key contain a
- * #GFilesystemPreviewType.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW "filesystem::use-preview"        /* uint32 (GFilesystemPreviewType) */
-
-/**
- * G_FILE_ATTRIBUTE_GVFS_BACKEND:
- *
- * A key in the "gvfs" namespace that gets the name of the current
- * GVFS backend in use. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_GVFS_BACKEND "gvfs::backend"             /* string */
-
-/**
- * G_FILE_ATTRIBUTE_SELINUX_CONTEXT:
- *
- * A key in the "selinux" namespace for getting the file's SELinux
- * context. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING. Note that this attribute is only
- * available if GLib has been built with SELinux support.
- **/
-#define G_FILE_ATTRIBUTE_SELINUX_CONTEXT "selinux::context"       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT:
- *
- * A key in the "trash" namespace.  When requested against
- * "trash:///" returns the number of (toplevel) items in the trash folder.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT "trash::item-count"     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_ORIG_PATH:
- *
- * A key in the "trash" namespace.  When requested against
- * items in "trash:///", will return the original path to the file before it
- * was trashed. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- *
- * Since: 2.24.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_ORIG_PATH "trash::orig-path"     /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_DELETION_DATE:
- *
- * A key in the "trash" namespace.  When requested against
- * items in "trash:///", will return the date and time when the file
- * was trashed. The format of the returned string is YYYY-MM-DDThh:mm:ss.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- * Since: 2.24.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_DELETION_DATE "trash::deletion-date"  /* string */
-
-GType              g_file_info_get_type                  (void) G_GNUC_CONST;
-
-GFileInfo *        g_file_info_new                       (void);
-GFileInfo *        g_file_info_dup                       (GFileInfo  *other);
-void               g_file_info_copy_into                 (GFileInfo  *src_info,
-							  GFileInfo  *dest_info);
-gboolean           g_file_info_has_attribute             (GFileInfo  *info,
-							  const char *attribute);
-gboolean           g_file_info_has_namespace             (GFileInfo  *info,
-							  const char *name_space);
-char **            g_file_info_list_attributes           (GFileInfo  *info,
-							  const char *name_space);
-gboolean           g_file_info_get_attribute_data        (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType *type,
-							  gpointer   *value_pp,
-							  GFileAttributeStatus *status);
-GFileAttributeType g_file_info_get_attribute_type        (GFileInfo  *info,
-							  const char *attribute);
-void               g_file_info_remove_attribute          (GFileInfo  *info,
-							  const char *attribute);
-GFileAttributeStatus g_file_info_get_attribute_status    (GFileInfo  *info,
-							  const char *attribute);
-gboolean           g_file_info_set_attribute_status      (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeStatus status);
-char *             g_file_info_get_attribute_as_string   (GFileInfo  *info,
-							  const char *attribute);
-const char *       g_file_info_get_attribute_string      (GFileInfo  *info,
-							  const char *attribute);
-const char *       g_file_info_get_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute);
-gboolean           g_file_info_get_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute);
-guint32            g_file_info_get_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute);
-gint32             g_file_info_get_attribute_int32       (GFileInfo  *info,
-							  const char *attribute);
-guint64            g_file_info_get_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute);
-gint64             g_file_info_get_attribute_int64       (GFileInfo  *info,
-							  const char *attribute);
-GObject *          g_file_info_get_attribute_object      (GFileInfo  *info,
-							  const char *attribute);
-char **            g_file_info_get_attribute_stringv     (GFileInfo  *info,
-							  const char *attribute);
-
-void               g_file_info_set_attribute             (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType type,
-							  gpointer    value_p);
-void               g_file_info_set_attribute_string      (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-void               g_file_info_set_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-void               g_file_info_set_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute,
-							  gboolean    attr_value);
-void               g_file_info_set_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute,
-							  guint32     attr_value);
-void               g_file_info_set_attribute_int32       (GFileInfo  *info,
-							  const char *attribute,
-							  gint32      attr_value);
-void               g_file_info_set_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute,
-							  guint64     attr_value);
-void               g_file_info_set_attribute_int64       (GFileInfo  *info,
-							  const char *attribute,
-							  gint64      attr_value);
-void               g_file_info_set_attribute_object      (GFileInfo  *info,
-							  const char *attribute,
-							  GObject    *attr_value);
-void               g_file_info_set_attribute_stringv     (GFileInfo  *info,
-							  const char *attribute,
-							  char      **attr_value);
-
-void               g_file_info_clear_status              (GFileInfo  *info);
-
-/* Helper getters: */
-GFileType         g_file_info_get_file_type          (GFileInfo         *info);
-gboolean          g_file_info_get_is_hidden          (GFileInfo         *info);
-gboolean          g_file_info_get_is_backup          (GFileInfo         *info);
-gboolean          g_file_info_get_is_symlink         (GFileInfo         *info);
-const char *      g_file_info_get_name               (GFileInfo         *info);
-const char *      g_file_info_get_display_name       (GFileInfo         *info);
-const char *      g_file_info_get_edit_name          (GFileInfo         *info);
-GIcon *           g_file_info_get_icon               (GFileInfo         *info);
-GIcon *           g_file_info_get_symbolic_icon      (GFileInfo         *info);
-const char *      g_file_info_get_content_type       (GFileInfo         *info);
-goffset           g_file_info_get_size               (GFileInfo         *info);
-void              g_file_info_get_modification_time  (GFileInfo         *info,
-						      GTimeVal          *result);
-const char *      g_file_info_get_symlink_target     (GFileInfo         *info);
-const char *      g_file_info_get_etag               (GFileInfo         *info);
-gint32            g_file_info_get_sort_order         (GFileInfo         *info);
-
-void              g_file_info_set_attribute_mask     (GFileInfo         *info,
-						      GFileAttributeMatcher *mask);
-void              g_file_info_unset_attribute_mask   (GFileInfo         *info);
-
-/* Helper setters: */
-void              g_file_info_set_file_type          (GFileInfo         *info,
-						      GFileType          type);
-void              g_file_info_set_is_hidden          (GFileInfo         *info,
-						      gboolean           is_hidden);
-void              g_file_info_set_is_symlink         (GFileInfo         *info,
-						      gboolean           is_symlink);
-void              g_file_info_set_name               (GFileInfo         *info,
-						      const char        *name);
-void              g_file_info_set_display_name       (GFileInfo         *info,
-						      const char        *display_name);
-void              g_file_info_set_edit_name          (GFileInfo         *info,
-						      const char        *edit_name);
-void              g_file_info_set_icon               (GFileInfo         *info,
-						      GIcon             *icon);
-void              g_file_info_set_symbolic_icon      (GFileInfo         *info,
-						      GIcon             *icon);
-void              g_file_info_set_content_type       (GFileInfo         *info,
-						      const char        *content_type);
-void              g_file_info_set_size               (GFileInfo         *info,
-						      goffset            size);
-void              g_file_info_set_modification_time  (GFileInfo         *info,
-						      GTimeVal          *mtime);
-void              g_file_info_set_symlink_target     (GFileInfo         *info,
-						      const char        *symlink_target);
-void              g_file_info_set_sort_order         (GFileInfo         *info,
-						      gint32             sort_order);
-
-#define G_TYPE_FILE_ATTRIBUTE_MATCHER (g_file_attribute_matcher_get_type ())
-GType g_file_attribute_matcher_get_type (void) G_GNUC_CONST;
-
-GFileAttributeMatcher *g_file_attribute_matcher_new            (const char            *attributes);
-GFileAttributeMatcher *g_file_attribute_matcher_ref            (GFileAttributeMatcher *matcher);
-void                   g_file_attribute_matcher_unref          (GFileAttributeMatcher *matcher);
-GFileAttributeMatcher *g_file_attribute_matcher_subtract       (GFileAttributeMatcher *matcher,
-                                                                GFileAttributeMatcher *subtract);
-gboolean               g_file_attribute_matcher_matches        (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-gboolean               g_file_attribute_matcher_matches_only   (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-gboolean               g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
-								     const char            *ns);
-const char *           g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
-GLIB_AVAILABLE_IN_2_32
-char *                 g_file_attribute_matcher_to_string      (GFileAttributeMatcher *matcher);
-
-G_END_DECLS
-
-#endif /* __G_FILE_INFO_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfileinputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfileinputstream.h
deleted file mode 100644
index 08c056e1..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfileinputstream.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_INPUT_STREAM_H__
-#define __G_FILE_INPUT_STREAM_H__
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_INPUT_STREAM         (g_file_input_stream_get_type ())
-#define G_FILE_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_INPUT_STREAM, GFileInputStream))
-#define G_FILE_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_INPUT_STREAM, GFileInputStreamClass))
-#define G_IS_FILE_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_INPUT_STREAM))
-#define G_IS_FILE_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_INPUT_STREAM))
-#define G_FILE_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_INPUT_STREAM, GFileInputStreamClass))
-
-/**
- * GFileInputStream:
- *
- * A subclass of GInputStream for opened files. This adds
- * a few file-specific operations and seeking.
- *
- * #GFileInputStream implements #GSeekable.
- **/
-typedef struct _GFileInputStreamClass    GFileInputStreamClass;
-typedef struct _GFileInputStreamPrivate  GFileInputStreamPrivate;
-
-struct _GFileInputStream
-{
-  GInputStream parent_instance;
-
-  /*< private >*/
-  GFileInputStreamPrivate *priv;
-};
-
-struct _GFileInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  goffset     (* tell)              (GFileInputStream     *stream);
-  gboolean    (* can_seek)          (GFileInputStream     *stream);
-  gboolean    (* seek)	            (GFileInputStream     *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileInputStream     *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileInputStream     *stream,
-                                     const char           *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileInputStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType      g_file_input_stream_get_type          (void) G_GNUC_CONST;
-
-GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
-						  const char           *attributes,
-						  GCancellable         *cancellable,
-						  GError              **error);
-void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
-						  const char           *attributes,
-						  int                   io_priority,
-						  GCancellable         *cancellable,
-						  GAsyncReadyCallback   callback,
-						  gpointer              user_data);
-GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream     *stream,
-						  GAsyncResult         *result,
-						  GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfileiostream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfileiostream.h
deleted file mode 100644
index 31497e38..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfileiostream.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* GIO - GLib Input, Io and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_IO_STREAM_H__
-#define __G_FILE_IO_STREAM_H__
-
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_IO_STREAM         (g_file_io_stream_get_type ())
-#define G_FILE_IO_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_IO_STREAM, GFileIOStream))
-#define G_FILE_IO_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_IO_STREAM, GFileIOStreamClass))
-#define G_IS_FILE_IO_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_IO_STREAM))
-#define G_IS_FILE_IO_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_IO_STREAM))
-#define G_FILE_IO_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_IO_STREAM, GFileIOStreamClass))
-
-/**
- * GFileIOStream:
- *
- * A subclass of GIOStream for opened files. This adds
- * a few file-specific operations and seeking and truncating.
- *
- * #GFileIOStream implements GSeekable.
- **/
-typedef struct _GFileIOStreamClass    GFileIOStreamClass;
-typedef struct _GFileIOStreamPrivate  GFileIOStreamPrivate;
-
-struct _GFileIOStream
-{
-  GIOStream parent_instance;
-
-  /*< private >*/
-  GFileIOStreamPrivate *priv;
-};
-
-struct _GFileIOStreamClass
-{
-  GIOStreamClass parent_class;
-
-  goffset     (* tell)              (GFileIOStream    *stream);
-  gboolean    (* can_seek)          (GFileIOStream    *stream);
-  gboolean    (* seek)	            (GFileIOStream    *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* can_truncate)      (GFileIOStream    *stream);
-  gboolean    (* truncate_fn)       (GFileIOStream    *stream,
-                                     goffset               size,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileIOStream    *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileIOStream     *stream,
-                                     const char            *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileIOStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  char      * (* get_etag)          (GFileIOStream    *stream);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType      g_file_io_stream_get_type          (void) G_GNUC_CONST;
-
-GFileInfo *g_file_io_stream_query_info        (GFileIOStream    *stream,
-					       const char           *attributes,
-					       GCancellable         *cancellable,
-					       GError              **error);
-void       g_file_io_stream_query_info_async  (GFileIOStream    *stream,
-					       const char           *attributes,
-					       int                   io_priority,
-					       GCancellable         *cancellable,
-					       GAsyncReadyCallback   callback,
-					       gpointer              user_data);
-GFileInfo *g_file_io_stream_query_info_finish (GFileIOStream    *stream,
-					       GAsyncResult         *result,
-					       GError              **error);
-char *     g_file_io_stream_get_etag          (GFileIOStream    *stream);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_IO_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfilemonitor.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfilemonitor.h
deleted file mode 100644
index 8e27d22e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfilemonitor.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_MONITOR_H__
-#define __G_FILE_MONITOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_MONITOR         (g_file_monitor_get_type ())
-#define G_FILE_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_MONITOR, GFileMonitor))
-#define G_FILE_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_MONITOR, GFileMonitorClass))
-#define G_IS_FILE_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_MONITOR))
-#define G_IS_FILE_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_MONITOR))
-#define G_FILE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_MONITOR, GFileMonitorClass))
-
-typedef struct _GFileMonitorClass       GFileMonitorClass;
-typedef struct _GFileMonitorPrivate	GFileMonitorPrivate;
-
-/**
- * GFileMonitor:
- *
- * Watches for changes to a file.
- **/
-struct _GFileMonitor
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GFileMonitorPrivate *priv;
-};
-
-struct _GFileMonitorClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  void     (* changed) (GFileMonitor      *monitor,
-                        GFile             *file,
-                        GFile             *other_file,
-                        GFileMonitorEvent  event_type);
-
-  /* Virtual Table */
-  gboolean (* cancel)  (GFileMonitor      *monitor);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType    g_file_monitor_get_type       (void) G_GNUC_CONST;
-
-gboolean g_file_monitor_cancel         (GFileMonitor      *monitor);
-gboolean g_file_monitor_is_cancelled   (GFileMonitor      *monitor);
-void     g_file_monitor_set_rate_limit (GFileMonitor      *monitor,
-                                        gint               limit_msecs);
-
-
-/* For implementations */
-void     g_file_monitor_emit_event     (GFileMonitor      *monitor,
-                                        GFile             *child,
-                                        GFile             *other_file,
-                                        GFileMonitorEvent  event_type);
-
-G_END_DECLS
-
-#endif /* __G_FILE_MONITOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfilenamecompleter.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfilenamecompleter.h
deleted file mode 100644
index 1899c27d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfilenamecompleter.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILENAME_COMPLETER_H__
-#define __G_FILENAME_COMPLETER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILENAME_COMPLETER         (g_filename_completer_get_type ())
-#define G_FILENAME_COMPLETER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILENAME_COMPLETER, GFilenameCompleter))
-#define G_FILENAME_COMPLETER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILENAME_COMPLETER, GFilenameCompleterClass))
-#define G_FILENAME_COMPLETER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILENAME_COMPLETER, GFilenameCompleterClass))
-#define G_IS_FILENAME_COMPLETER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILENAME_COMPLETER))
-#define G_IS_FILENAME_COMPLETER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILENAME_COMPLETER))
-
-/**
- * GFilenameCompleter:
- *
- * Completes filenames based on files that exist within the file system.
- **/
-typedef struct _GFilenameCompleterClass GFilenameCompleterClass;
-
-struct _GFilenameCompleterClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void (* got_completion_data) (GFilenameCompleter *filename_completer);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-GType               g_filename_completer_get_type              (void) G_GNUC_CONST;
-
-GFilenameCompleter *g_filename_completer_new                   (void);
-
-char *              g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
-                                                                const char *initial_text);
-char **             g_filename_completer_get_completions       (GFilenameCompleter *completer,
-                                                                const char *initial_text);
-void                g_filename_completer_set_dirs_only         (GFilenameCompleter *completer,
-                                                                gboolean dirs_only);
-
-G_END_DECLS
-
-#endif /* __G_FILENAME_COMPLETER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfileoutputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfileoutputstream.h
deleted file mode 100644
index 3b5f85d3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfileoutputstream.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_OUTPUT_STREAM_H__
-#define __G_FILE_OUTPUT_STREAM_H__
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_OUTPUT_STREAM         (g_file_output_stream_get_type ())
-#define G_FILE_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStream))
-#define G_FILE_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStreamClass))
-#define G_IS_FILE_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_OUTPUT_STREAM))
-#define G_IS_FILE_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_OUTPUT_STREAM))
-#define G_FILE_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStreamClass))
-
-/**
- * GFileOutputStream:
- *
- * A subclass of GOutputStream for opened files. This adds
- * a few file-specific operations and seeking and truncating.
- *
- * #GFileOutputStream implements GSeekable.
- **/
-typedef struct _GFileOutputStreamClass    GFileOutputStreamClass;
-typedef struct _GFileOutputStreamPrivate  GFileOutputStreamPrivate;
-
-struct _GFileOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< private >*/
-  GFileOutputStreamPrivate *priv;
-};
-
-struct _GFileOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  goffset     (* tell)              (GFileOutputStream    *stream);
-  gboolean    (* can_seek)          (GFileOutputStream    *stream);
-  gboolean    (* seek)	            (GFileOutputStream    *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* can_truncate)      (GFileOutputStream    *stream);
-  gboolean    (* truncate_fn)       (GFileOutputStream    *stream,
-                                     goffset               size,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileOutputStream    *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileOutputStream     *stream,
-                                     const char            *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileOutputStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  char      * (* get_etag)          (GFileOutputStream    *stream);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType      g_file_output_stream_get_type          (void) G_GNUC_CONST;
-
-
-GFileInfo *g_file_output_stream_query_info        (GFileOutputStream    *stream,
-                                                   const char           *attributes,
-                                                   GCancellable         *cancellable,
-                                                   GError              **error);
-void       g_file_output_stream_query_info_async  (GFileOutputStream    *stream,
-						   const char           *attributes,
-						   int                   io_priority,
-						   GCancellable         *cancellable,
-						   GAsyncReadyCallback   callback,
-						   gpointer              user_data);
-GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream    *stream,
-						   GAsyncResult         *result,
-						   GError              **error);
-char *     g_file_output_stream_get_etag          (GFileOutputStream    *stream);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfilterinputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfilterinputstream.h
deleted file mode 100644
index 1514104a..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfilterinputstream.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILTER_INPUT_STREAM_H__
-#define __G_FILTER_INPUT_STREAM_H__
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILTER_INPUT_STREAM         (g_filter_input_stream_get_type ())
-#define G_FILTER_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStream))
-#define G_FILTER_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStreamClass))
-#define G_IS_FILTER_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILTER_INPUT_STREAM))
-#define G_IS_FILTER_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILTER_INPUT_STREAM))
-#define G_FILTER_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStreamClass))
-
-/**
- * GFilterInputStream:
- *
- * A base class for all input streams that work on an underlying stream.
- **/
-typedef struct _GFilterInputStreamClass    GFilterInputStreamClass;
-
-struct _GFilterInputStream
-{
-  GInputStream parent_instance;
-
-  /*<protected >*/
-  GInputStream *base_stream;
-};
-
-struct _GFilterInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-
-GType          g_filter_input_stream_get_type              (void) G_GNUC_CONST;
-GInputStream * g_filter_input_stream_get_base_stream       (GFilterInputStream *stream);
-gboolean       g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream);
-void           g_filter_input_stream_set_close_base_stream (GFilterInputStream *stream,
-                                                            gboolean            close_base);
-
-G_END_DECLS
-
-#endif /* __G_FILTER_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gfilteroutputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gfilteroutputstream.h
deleted file mode 100644
index 10350e5a..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gfilteroutputstream.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILTER_OUTPUT_STREAM_H__
-#define __G_FILTER_OUTPUT_STREAM_H__
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILTER_OUTPUT_STREAM         (g_filter_output_stream_get_type ())
-#define G_FILTER_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStream))
-#define G_FILTER_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamClass))
-#define G_IS_FILTER_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILTER_OUTPUT_STREAM))
-#define G_IS_FILTER_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILTER_OUTPUT_STREAM))
-#define G_FILTER_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamClass))
-
-/**
- * GFilterOutputStream:
- *
- * A base class for all output streams that work on an underlying stream.
- **/
-typedef struct _GFilterOutputStreamClass    GFilterOutputStreamClass;
-
-struct _GFilterOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< protected >*/
-  GOutputStream *base_stream;
-};
-
-struct _GFilterOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-
-GType           g_filter_output_stream_get_type              (void) G_GNUC_CONST;
-GOutputStream * g_filter_output_stream_get_base_stream       (GFilterOutputStream *stream);
-gboolean        g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream);
-void            g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
-                                                              gboolean             close_base);
-
-G_END_DECLS
-
-#endif /* __G_FILTER_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gicon.h b/GstreamerHelper/x64/include/glib-2.0/gio/gicon.h
deleted file mode 100644
index 8f339f69..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gicon.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ICON_H__
-#define __G_ICON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ICON            (g_icon_get_type ())
-#define G_ICON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ICON, GIcon))
-#define G_IS_ICON(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ICON))
-#define G_ICON_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ICON, GIconIface))
-
-/**
- * GIcon:
- *
- * An abstract type that specifies an icon.
- **/
-typedef struct _GIconIface GIconIface;
-
-/**
- * GIconIface:
- * @g_iface: The parent interface.
- * @hash: A hash for a given #GIcon.
- * @equal: Checks if two #GIcon<!-- -->s are equal.
- * @to_tokens: Serializes a #GIcon into tokens. The tokens must not
- * contain any whitespace. Don't implement if the #GIcon can't be
- * serialized (Since 2.20).
- * @from_tokens: Constructs a #GIcon from tokens. Set the #GError if
- * the tokens are malformed. Don't implement if the #GIcon can't be
- * serialized (Since 2.20).
- *
- * GIconIface is used to implement GIcon types for various
- * different systems. See #GThemedIcon and #GLoadableIcon for
- * examples of how to implement this interface.
- */
-struct _GIconIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  guint       (* hash)        (GIcon   *icon);
-  gboolean    (* equal)       (GIcon   *icon1,
-                               GIcon   *icon2);
-  gboolean    (* to_tokens)   (GIcon   *icon,
-			       GPtrArray *tokens,
-                               gint    *out_version);
-  GIcon *     (* from_tokens) (gchar  **tokens,
-                               gint     num_tokens,
-                               gint     version,
-                               GError **error);
-};
-
-GType    g_icon_get_type  (void) G_GNUC_CONST;
-
-guint    g_icon_hash            (gconstpointer  icon);
-gboolean g_icon_equal           (GIcon         *icon1,
-                                 GIcon         *icon2);
-gchar   *g_icon_to_string       (GIcon         *icon);
-GIcon   *g_icon_new_for_string  (const gchar   *str,
-                                 GError       **error);
-
-G_END_DECLS
-
-#endif /* __G_ICON_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/ginetaddress.h b/GstreamerHelper/x64/include/glib-2.0/gio/ginetaddress.h
deleted file mode 100644
index d523cd65..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/ginetaddress.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INET_ADDRESS_H__
-#define __G_INET_ADDRESS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_ADDRESS         (g_inet_address_get_type ())
-#define G_INET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_ADDRESS, GInetAddress))
-#define G_INET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_ADDRESS, GInetAddressClass))
-#define G_IS_INET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_ADDRESS))
-#define G_IS_INET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_ADDRESS))
-#define G_INET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_ADDRESS, GInetAddressClass))
-
-typedef struct _GInetAddressClass   GInetAddressClass;
-typedef struct _GInetAddressPrivate GInetAddressPrivate;
-
-struct _GInetAddress
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInetAddressPrivate *priv;
-};
-
-struct _GInetAddressClass
-{
-  GObjectClass parent_class;
-
-  gchar *        (*to_string) (GInetAddress *address);
-  const guint8 * (*to_bytes)  (GInetAddress *address);
-};
-
-GType                 g_inet_address_get_type             (void) G_GNUC_CONST;
-
-GInetAddress *        g_inet_address_new_from_string      (const gchar          *string);
-
-GInetAddress *        g_inet_address_new_from_bytes       (const guint8         *bytes,
-							   GSocketFamily         family);
-
-GInetAddress *        g_inet_address_new_loopback         (GSocketFamily         family);
-
-GInetAddress *        g_inet_address_new_any              (GSocketFamily         family);
-
-gboolean              g_inet_address_equal                (GInetAddress         *address,
-                                                           GInetAddress         *other_address);
-
-gchar *               g_inet_address_to_string            (GInetAddress         *address);
-
-const guint8 *        g_inet_address_to_bytes             (GInetAddress         *address);
-
-gsize                 g_inet_address_get_native_size      (GInetAddress         *address);
-
-GSocketFamily         g_inet_address_get_family           (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_any           (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_loopback      (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_link_local    (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_site_local    (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_multicast     (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_global     (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_link_local (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_node_local (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_org_local  (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_site_local (GInetAddress         *address);
-
-G_END_DECLS
-
-#endif /* __G_INET_ADDRESS_H__ */
-
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/ginetaddressmask.h b/GstreamerHelper/x64/include/glib-2.0/gio/ginetaddressmask.h
deleted file mode 100644
index 53b0aac6..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/ginetaddressmask.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INET_ADDRESS_MASK_H__
-#define __G_INET_ADDRESS_MASK_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_ADDRESS_MASK         (g_inet_address_mask_get_type ())
-#define G_INET_ADDRESS_MASK(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_ADDRESS_MASK, GInetAddressMask))
-#define G_INET_ADDRESS_MASK_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_ADDRESS_MASK, GInetAddressMaskClass))
-#define G_IS_INET_ADDRESS_MASK(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_ADDRESS_MASK))
-#define G_IS_INET_ADDRESS_MASK_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_ADDRESS_MASK))
-#define G_INET_ADDRESS_MASK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_ADDRESS_MASK, GInetAddressMaskClass))
-
-typedef struct _GInetAddressMaskClass   GInetAddressMaskClass;
-typedef struct _GInetAddressMaskPrivate GInetAddressMaskPrivate;
-
-struct _GInetAddressMask
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInetAddressMaskPrivate *priv;
-};
-
-struct _GInetAddressMaskClass
-{
-  GObjectClass parent_class;
-
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType g_inet_address_mask_get_type (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GInetAddressMask *g_inet_address_mask_new             (GInetAddress      *addr,
-						       guint              length,
-						       GError           **error);
-
-GLIB_AVAILABLE_IN_2_32
-GInetAddressMask *g_inet_address_mask_new_from_string (const gchar       *mask_string,
-						       GError           **error);
-gchar            *g_inet_address_mask_to_string       (GInetAddressMask  *mask);
-
-GSocketFamily     g_inet_address_mask_get_family      (GInetAddressMask  *mask);
-GInetAddress     *g_inet_address_mask_get_address     (GInetAddressMask  *mask);
-guint             g_inet_address_mask_get_length      (GInetAddressMask  *mask);
-
-gboolean          g_inet_address_mask_matches         (GInetAddressMask  *mask,
-						       GInetAddress      *address);
-gboolean          g_inet_address_mask_equal           (GInetAddressMask  *mask,
-						       GInetAddressMask  *mask2);
-
-G_END_DECLS
-
-#endif /* __G_INET_ADDRESS_MASK_H__ */
-
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/ginetsocketaddress.h b/GstreamerHelper/x64/include/glib-2.0/gio/ginetsocketaddress.h
deleted file mode 100644
index ab20235d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/ginetsocketaddress.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INET_SOCKET_ADDRESS_H__
-#define __G_INET_SOCKET_ADDRESS_H__
-
-#include <gio/gsocketaddress.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_SOCKET_ADDRESS         (g_inet_socket_address_get_type ())
-#define G_INET_SOCKET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddress))
-#define G_INET_SOCKET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddressClass))
-#define G_IS_INET_SOCKET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_SOCKET_ADDRESS))
-#define G_IS_INET_SOCKET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_SOCKET_ADDRESS))
-#define G_INET_SOCKET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddressClass))
-
-typedef struct _GInetSocketAddressClass   GInetSocketAddressClass;
-typedef struct _GInetSocketAddressPrivate GInetSocketAddressPrivate;
-
-struct _GInetSocketAddress
-{
-  GSocketAddress parent_instance;
-
-  /*< private >*/
-  GInetSocketAddressPrivate *priv;
-};
-
-struct _GInetSocketAddressClass
-{
-  GSocketAddressClass parent_class;
-};
-
-GType           g_inet_socket_address_get_type     (void) G_GNUC_CONST;
-
-GSocketAddress *g_inet_socket_address_new          (GInetAddress       *address,
-						    guint16             port);
-
-GInetAddress *  g_inet_socket_address_get_address  (GInetSocketAddress *address);
-guint16         g_inet_socket_address_get_port     (GInetSocketAddress *address);
-
-GLIB_AVAILABLE_IN_2_32
-guint32         g_inet_socket_address_get_flowinfo (GInetSocketAddress *address);
-GLIB_AVAILABLE_IN_2_32
-guint32         g_inet_socket_address_get_scope_id (GInetSocketAddress *address);
-
-G_END_DECLS
-
-#endif /* __G_INET_SOCKET_ADDRESS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/ginitable.h b/GstreamerHelper/x64/include/glib-2.0/gio/ginitable.h
deleted file mode 100644
index 1a2d13d9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/ginitable.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INITABLE_H__
-#define __G_INITABLE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INITABLE            (g_initable_get_type ())
-#define G_INITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_INITABLE, GInitable))
-#define G_IS_INITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_INITABLE))
-#define G_INITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_INITABLE, GInitableIface))
-#define G_TYPE_IS_INITABLE(type)   (g_type_is_a ((type), G_TYPE_INITABLE))
-
-/**
- * GInitable:
- *
- * Interface for initializable objects.
- *
- * Since: 2.22
- **/
-typedef struct _GInitableIface GInitableIface;
-
-/**
- * GInitableIface:
- * @g_iface: The parent interface.
- * @init: Initializes the object.
- *
- * Provides an interface for initializing object such that initialization
- * may fail.
- *
- * Since: 2.22
- **/
-struct _GInitableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  gboolean    (* init) (GInitable    *initable,
-			GCancellable *cancellable,
-			GError      **error);
-};
-
-
-GType    g_initable_get_type   (void) G_GNUC_CONST;
-
-gboolean g_initable_init       (GInitable     *initable,
-				GCancellable  *cancellable,
-				GError       **error);
-
-gpointer g_initable_new        (GType          object_type,
-				GCancellable  *cancellable,
-				GError       **error,
-				const gchar   *first_property_name,
-				...);
-gpointer g_initable_newv       (GType          object_type,
-				guint          n_parameters,
-				GParameter    *parameters,
-				GCancellable  *cancellable,
-				GError       **error);
-GObject* g_initable_new_valist (GType          object_type,
-				const gchar   *first_property_name,
-				va_list        var_args,
-				GCancellable  *cancellable,
-				GError       **error);
-
-G_END_DECLS
-
-
-#endif /* __G_INITABLE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/ginputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/ginputstream.h
deleted file mode 100644
index e9b36f7e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/ginputstream.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INPUT_STREAM_H__
-#define __G_INPUT_STREAM_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INPUT_STREAM         (g_input_stream_get_type ())
-#define G_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INPUT_STREAM, GInputStream))
-#define G_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INPUT_STREAM, GInputStreamClass))
-#define G_IS_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INPUT_STREAM))
-#define G_IS_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INPUT_STREAM))
-#define G_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INPUT_STREAM, GInputStreamClass))
-
-/**
- * GInputStream:
- *
- * Base class for streaming input operations.
- **/
-typedef struct _GInputStreamClass    GInputStreamClass;
-typedef struct _GInputStreamPrivate  GInputStreamPrivate;
-
-struct _GInputStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInputStreamPrivate *priv;
-};
-
-struct _GInputStreamClass
-{
-  GObjectClass parent_class;
-
-  /* Sync ops: */
-
-  gssize   (* read_fn)      (GInputStream        *stream,
-                             void                *buffer,
-                             gsize                count,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  gssize   (* skip)         (GInputStream        *stream,
-                             gsize                count,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  gboolean (* close_fn)	    (GInputStream        *stream,
-                             GCancellable        *cancellable,
-                             GError             **error);
-
-  /* Async ops: (optional in derived classes) */
-  void     (* read_async)   (GInputStream        *stream,
-                             void                *buffer,
-                             gsize                count,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gssize   (* read_finish)  (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  void     (* skip_async)   (GInputStream        *stream,
-                             gsize                count,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gssize   (* skip_finish)  (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  void     (* close_async)  (GInputStream        *stream,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gboolean (* close_finish) (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType    g_input_stream_get_type      (void) G_GNUC_CONST;
-
-gssize   g_input_stream_read          (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gboolean g_input_stream_read_all      (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       gsize                 *bytes_read,
-				       GCancellable          *cancellable,
-				       GError               **error);
-GLIB_AVAILABLE_IN_2_34
-GBytes  *g_input_stream_read_bytes    (GInputStream          *stream,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gssize   g_input_stream_skip          (GInputStream          *stream,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gboolean g_input_stream_close         (GInputStream          *stream,
-				       GCancellable          *cancellable,
-				       GError               **error);
-void     g_input_stream_read_async    (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gssize   g_input_stream_read_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-GLIB_AVAILABLE_IN_2_34
-void     g_input_stream_read_bytes_async  (GInputStream          *stream,
-					   gsize                  count,
-					   int                    io_priority,
-					   GCancellable          *cancellable,
-					   GAsyncReadyCallback    callback,
-					   gpointer               user_data);
-GLIB_AVAILABLE_IN_2_34
-GBytes  *g_input_stream_read_bytes_finish (GInputStream          *stream,
-					   GAsyncResult          *result,
-					   GError               **error);
-void     g_input_stream_skip_async    (GInputStream          *stream,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gssize   g_input_stream_skip_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-void     g_input_stream_close_async   (GInputStream          *stream,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gboolean g_input_stream_close_finish  (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-
-/* For implementations: */
-
-gboolean g_input_stream_is_closed     (GInputStream          *stream);
-gboolean g_input_stream_has_pending   (GInputStream          *stream);
-gboolean g_input_stream_set_pending   (GInputStream          *stream,
-				       GError               **error);
-void     g_input_stream_clear_pending (GInputStream          *stream);
-
-G_END_DECLS
-
-#endif /* __G_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gio.h b/GstreamerHelper/x64/include/glib-2.0/gio/gio.h
deleted file mode 100644
index 3fb914d2..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gio.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_IO_H__
-#define __G_IO_H__
-
-#define __GIO_GIO_H_INSIDE__
-
-#include <gio/giotypes.h>
-
-#include <gio/gaction.h>
-#include <gio/gactiongroup.h>
-#include <gio/gactiongroupexporter.h>
-#include <gio/gactionmap.h>
-#include <gio/gappinfo.h>
-#include <gio/gapplication.h>
-#include <gio/gapplicationcommandline.h>
-#include <gio/gasyncinitable.h>
-#include <gio/gasyncresult.h>
-#include <gio/gbufferedinputstream.h>
-#include <gio/gbufferedoutputstream.h>
-#include <gio/gcancellable.h>
-#include <gio/gcharsetconverter.h>
-#include <gio/gcontenttype.h>
-#include <gio/gconverter.h>
-#include <gio/gconverterinputstream.h>
-#include <gio/gconverteroutputstream.h>
-#include <gio/gcredentials.h>
-#include <gio/gdatainputstream.h>
-#include <gio/gdataoutputstream.h>
-#include <gio/gdbusaddress.h>
-#include <gio/gdbusauthobserver.h>
-#include <gio/gdbusconnection.h>
-#include <gio/gdbuserror.h>
-#include <gio/gdbusintrospection.h>
-#include <gio/gdbusmessage.h>
-#include <gio/gdbusmethodinvocation.h>
-#include <gio/gdbusnameowning.h>
-#include <gio/gdbusnamewatching.h>
-#include <gio/gdbusproxy.h>
-#include <gio/gdbusserver.h>
-#include <gio/gdbusutils.h>
-#include <gio/gdrive.h>
-#include <gio/gemblemedicon.h>
-#include <gio/gfileattribute.h>
-#include <gio/gfileenumerator.h>
-#include <gio/gfile.h>
-#include <gio/gfileicon.h>
-#include <gio/gfileinfo.h>
-#include <gio/gfileinputstream.h>
-#include <gio/gfileiostream.h>
-#include <gio/gfilemonitor.h>
-#include <gio/gfilenamecompleter.h>
-#include <gio/gfileoutputstream.h>
-#include <gio/gfilterinputstream.h>
-#include <gio/gfilteroutputstream.h>
-#include <gio/gicon.h>
-#include <gio/ginetaddress.h>
-#include <gio/ginetaddressmask.h>
-#include <gio/ginetsocketaddress.h>
-#include <gio/ginitable.h>
-#include <gio/ginputstream.h>
-#include <gio/gioenums.h>
-#include <gio/gioenumtypes.h>
-#include <gio/gioerror.h>
-#include <gio/giomodule.h>
-#include <gio/gioscheduler.h>
-#include <gio/giostream.h>
-#include <gio/gloadableicon.h>
-#include <gio/gmemoryinputstream.h>
-#include <gio/gmemoryoutputstream.h>
-#include <gio/gmount.h>
-#include <gio/gmountoperation.h>
-#include <gio/gnativevolumemonitor.h>
-#include <gio/gnetworkaddress.h>
-#include <gio/gnetworkmonitor.h>
-#include <gio/gnetworkservice.h>
-#include <gio/goutputstream.h>
-#include <gio/gpermission.h>
-#include <gio/gpollableinputstream.h>
-#include <gio/gpollableoutputstream.h>
-#include <gio/gpollableutils.h>
-#include <gio/gproxy.h>
-#include <gio/gproxyaddress.h>
-#include <gio/gproxyaddressenumerator.h>
-#include <gio/gproxyresolver.h>
-#include <gio/gresolver.h>
-#include <gio/gresource.h>
-#include <gio/gseekable.h>
-#include <gio/gsettingsschema.h>
-#include <gio/gsettings.h>
-#include <gio/gsimpleaction.h>
-#include <gio/gsimpleactiongroup.h>
-#include <gio/gsimpleasyncresult.h>
-#include <gio/gsimplepermission.h>
-#include <gio/gsocketaddressenumerator.h>
-#include <gio/gsocketaddress.h>
-#include <gio/gsocketclient.h>
-#include <gio/gsocketconnectable.h>
-#include <gio/gsocketconnection.h>
-#include <gio/gsocketcontrolmessage.h>
-#include <gio/gsocket.h>
-#include <gio/gsocketlistener.h>
-#include <gio/gsocketservice.h>
-#include <gio/gsrvtarget.h>
-#include <gio/gtcpconnection.h>
-#include <gio/gtcpwrapperconnection.h>
-#include <gio/gtestdbus.h>
-#include <gio/gthemedicon.h>
-#include <gio/gthreadedsocketservice.h>
-#include <gio/gtlsbackend.h>
-#include <gio/gtlscertificate.h>
-#include <gio/gtlsclientconnection.h>
-#include <gio/gtlsconnection.h>
-#include <gio/gtlsdatabase.h>
-#include <gio/gtlsfiledatabase.h>
-#include <gio/gtlsinteraction.h>
-#include <gio/gtlsserverconnection.h>
-#include <gio/gtlspassword.h>
-#include <gio/gvfs.h>
-#include <gio/gvolume.h>
-#include <gio/gvolumemonitor.h>
-#include <gio/gzlibcompressor.h>
-#include <gio/gzlibdecompressor.h>
-#include <gio/gdbusinterface.h>
-#include <gio/gdbusinterfaceskeleton.h>
-#include <gio/gdbusobject.h>
-#include <gio/gdbusobjectskeleton.h>
-#include <gio/gdbusobjectproxy.h>
-#include <gio/gdbusobjectmanager.h>
-#include <gio/gdbusobjectmanagerclient.h>
-#include <gio/gdbusobjectmanagerserver.h>
-#include <gio/gdbusactiongroup.h>
-#include <gio/gremoteactiongroup.h>
-#include <gio/gmenumodel.h>
-#include <gio/gmenu.h>
-#include <gio/gmenuexporter.h>
-#include <gio/gdbusmenumodel.h>
-
-#undef __GIO_GIO_H_INSIDE__
-
-#endif /* __G_IO_H__ */
-
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gioenums.h b/GstreamerHelper/x64/include/glib-2.0/gio/gioenums.h
deleted file mode 100644
index b3706237..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gioenums.h
+++ /dev/null
@@ -1,1658 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __GIO_ENUMS_H__
-#define __GIO_ENUMS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/**
- * GAppInfoCreateFlags:
- * @G_APP_INFO_CREATE_NONE: No flags.
- * @G_APP_INFO_CREATE_NEEDS_TERMINAL: Application opens in a terminal window.
- * @G_APP_INFO_CREATE_SUPPORTS_URIS: Application supports URI arguments.
- * @G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION: Application supports startup notification. Since 2.26
- *
- * Flags used when creating a #GAppInfo.
- */
-typedef enum {
-  G_APP_INFO_CREATE_NONE                           = 0,         /*< nick=none >*/
-  G_APP_INFO_CREATE_NEEDS_TERMINAL                 = (1 << 0),  /*< nick=needs-terminal >*/
-  G_APP_INFO_CREATE_SUPPORTS_URIS                  = (1 << 1),  /*< nick=supports-uris >*/
-  G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION  = (1 << 2)   /*< nick=supports-startup-notification >*/
-} GAppInfoCreateFlags;
-
-/**
- * GConverterFlags:
- * @G_CONVERTER_NO_FLAGS: No flags.
- * @G_CONVERTER_INPUT_AT_END: At end of input data
- * @G_CONVERTER_FLUSH: Flush data
- *
- * Flags used when calling a g_converter_convert().
- *
- * Since: 2.24
- */
-typedef enum {
-  G_CONVERTER_NO_FLAGS     = 0,         /*< nick=none >*/
-  G_CONVERTER_INPUT_AT_END = (1 << 0),  /*< nick=input-at-end >*/
-  G_CONVERTER_FLUSH        = (1 << 1)   /*< nick=flush >*/
-} GConverterFlags;
-
-/**
- * GConverterResult:
- * @G_CONVERTER_ERROR: There was an error during conversion.
- * @G_CONVERTER_CONVERTED: Some data was consumed or produced
- * @G_CONVERTER_FINISHED: The conversion is finished
- * @G_CONVERTER_FLUSHED: Flushing is finished
- *
- * Results returned from g_converter_convert().
- *
- * Since: 2.24
- */
-typedef enum {
-  G_CONVERTER_ERROR     = 0,  /*< nick=error >*/
-  G_CONVERTER_CONVERTED = 1,  /*< nick=converted >*/
-  G_CONVERTER_FINISHED  = 2,  /*< nick=finished >*/
-  G_CONVERTER_FLUSHED   = 3   /*< nick=flushed >*/
-} GConverterResult;
-
-
-/**
- * GDataStreamByteOrder:
- * @G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN: Selects Big Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN: Selects Little Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN: Selects endianness based on host machine's architecture.
- *
- * #GDataStreamByteOrder is used to ensure proper endianness of streaming data sources
- * across various machine architectures.
- *
- **/
-typedef enum {
-  G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN,
-  G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN,
-  G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN
-} GDataStreamByteOrder;
-
-
-/**
- * GDataStreamNewlineType:
- * @G_DATA_STREAM_NEWLINE_TYPE_LF: Selects "LF" line endings, common on most modern UNIX platforms.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR: Selects "CR" line endings.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR_LF: Selects "CR, LF" line ending, common on Microsoft Windows.
- * @G_DATA_STREAM_NEWLINE_TYPE_ANY: Automatically try to handle any line ending type.
- *
- * #GDataStreamNewlineType is used when checking for or setting the line endings for a given file.
- **/
-typedef enum {
-  G_DATA_STREAM_NEWLINE_TYPE_LF,
-  G_DATA_STREAM_NEWLINE_TYPE_CR,
-  G_DATA_STREAM_NEWLINE_TYPE_CR_LF,
-  G_DATA_STREAM_NEWLINE_TYPE_ANY
-} GDataStreamNewlineType;
-
-
-/**
- * GFileAttributeType:
- * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitalized type.
- * @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated UTF8 string.
- * @G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: a zero terminated string of non-zero bytes.
- * @G_FILE_ATTRIBUTE_TYPE_BOOLEAN: a boolean value.
- * @G_FILE_ATTRIBUTE_TYPE_UINT32: an unsigned 4-byte/32-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_INT32: a signed 4-byte/32-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_UINT64: an unsigned 8-byte/64-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_INT64: a signed 8-byte/64-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_OBJECT: a #GObject.
- * @G_FILE_ATTRIBUTE_TYPE_STRINGV: a %NULL terminated char **. Since 2.22
- *
- * The data types for file attributes.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_TYPE_INVALID = 0,
-  G_FILE_ATTRIBUTE_TYPE_STRING,
-  G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, /* zero terminated string of non-zero bytes */
-  G_FILE_ATTRIBUTE_TYPE_BOOLEAN,
-  G_FILE_ATTRIBUTE_TYPE_UINT32,
-  G_FILE_ATTRIBUTE_TYPE_INT32,
-  G_FILE_ATTRIBUTE_TYPE_UINT64,
-  G_FILE_ATTRIBUTE_TYPE_INT64,
-  G_FILE_ATTRIBUTE_TYPE_OBJECT,
-  G_FILE_ATTRIBUTE_TYPE_STRINGV
-} GFileAttributeType;
-
-
-/**
- * GFileAttributeInfoFlags:
- * @G_FILE_ATTRIBUTE_INFO_NONE: no flags set.
- * @G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE: copy the attribute values when the file is copied.
- * @G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED: copy the attribute values when the file is moved.
- *
- * Flags specifying the behaviour of an attribute.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_INFO_NONE            = 0,
-  G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE  = (1 << 0),
-  G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED = (1 << 1)
-} GFileAttributeInfoFlags;
-
-
-/**
- * GFileAttributeStatus:
- * @G_FILE_ATTRIBUTE_STATUS_UNSET: Attribute value is unset (empty).
- * @G_FILE_ATTRIBUTE_STATUS_SET: Attribute value is set.
- * @G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING: Indicates an error in setting the value.
- *
- * Used by g_file_set_attributes_from_info() when setting file attributes.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_STATUS_UNSET = 0,
-  G_FILE_ATTRIBUTE_STATUS_SET,
-  G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING
-} GFileAttributeStatus;
-
-
-/**
- * GFileQueryInfoFlags:
- * @G_FILE_QUERY_INFO_NONE: No flags set.
- * @G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- *
- * Flags used when querying a #GFileInfo.
- */
-typedef enum {
-  G_FILE_QUERY_INFO_NONE              = 0,
-  G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS = (1 << 0)   /*< nick=nofollow-symlinks >*/
-} GFileQueryInfoFlags;
-
-
-/**
- * GFileCreateFlags:
- * @G_FILE_CREATE_NONE: No flags set.
- * @G_FILE_CREATE_PRIVATE: Create a file that can only be
- *    accessed by the current user.
- * @G_FILE_CREATE_REPLACE_DESTINATION: Replace the destination
- *    as if it didn't exist before. Don't try to keep any old
- *    permissions, replace instead of following links. This
- *    is generally useful if you're doing a "copy over"
- *    rather than a "save new version of" replace operation.
- *    You can think of it as "unlink destination" before
- *    writing to it, although the implementation may not
- *    be exactly like that. Since 2.20
- *
- * Flags used when an operation may create a file.
- */
-typedef enum {
-  G_FILE_CREATE_NONE    = 0,
-  G_FILE_CREATE_PRIVATE = (1 << 0),
-  G_FILE_CREATE_REPLACE_DESTINATION = (1 << 1)
-} GFileCreateFlags;
-
-
-/**
- * GMountMountFlags:
- * @G_MOUNT_MOUNT_NONE: No flags set.
- *
- * Flags used when mounting a mount.
- */
-typedef enum /*< flags >*/ {
-  G_MOUNT_MOUNT_NONE = 0
-} GMountMountFlags;
-
-
-/**
- * GMountUnmountFlags:
- * @G_MOUNT_UNMOUNT_NONE: No flags set.
- * @G_MOUNT_UNMOUNT_FORCE: Unmount even if there are outstanding
- *  file operations on the mount.
- *
- * Flags used when an unmounting a mount.
- */
-typedef enum {
-  G_MOUNT_UNMOUNT_NONE  = 0,
-  G_MOUNT_UNMOUNT_FORCE = (1 << 0)
-} GMountUnmountFlags;
-
-/**
- * GDriveStartFlags:
- * @G_DRIVE_START_NONE: No flags set.
- *
- * Flags used when starting a drive.
- *
- * Since: 2.22
- */
-typedef enum /*< flags >*/ {
-  G_DRIVE_START_NONE = 0
-} GDriveStartFlags;
-
-/**
- * GDriveStartStopType:
- * @G_DRIVE_START_STOP_TYPE_UNKNOWN: Unknown or drive doesn't support
- *    start/stop.
- * @G_DRIVE_START_STOP_TYPE_SHUTDOWN: The stop method will physically
- *    shut down the drive and e.g. power down the port the drive is
- *    attached to.
- * @G_DRIVE_START_STOP_TYPE_NETWORK: The start/stop methods are used
- *    for connecting/disconnect to the drive over the network.
- * @G_DRIVE_START_STOP_TYPE_MULTIDISK: The start/stop methods will
- *    assemble/disassemble a virtual drive from several physical
- *    drives.
- * @G_DRIVE_START_STOP_TYPE_PASSWORD: The start/stop methods will
- *    unlock/lock the disk (for example using the ATA <quote>SECURITY
- *    UNLOCK DEVICE</quote> command)
- *
- * Enumeration describing how a drive can be started/stopped.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_DRIVE_START_STOP_TYPE_UNKNOWN,
-  G_DRIVE_START_STOP_TYPE_SHUTDOWN,
-  G_DRIVE_START_STOP_TYPE_NETWORK,
-  G_DRIVE_START_STOP_TYPE_MULTIDISK,
-  G_DRIVE_START_STOP_TYPE_PASSWORD
-} GDriveStartStopType;
-
-/**
- * GFileCopyFlags:
- * @G_FILE_COPY_NONE: No flags set.
- * @G_FILE_COPY_OVERWRITE: Overwrite any existing files
- * @G_FILE_COPY_BACKUP: Make a backup of any existing files.
- * @G_FILE_COPY_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- * @G_FILE_COPY_ALL_METADATA: Copy all file metadata instead of just default set used for copy (see #GFileInfo).
- * @G_FILE_COPY_NO_FALLBACK_FOR_MOVE: Don't use copy and delete fallback if native move not supported.
- * @G_FILE_COPY_TARGET_DEFAULT_PERMS: Leaves target file with default perms, instead of setting the source file perms.
- *
- * Flags used when copying or moving files.
- */
-typedef enum {
-  G_FILE_COPY_NONE                 = 0,          /*< nick=none >*/
-  G_FILE_COPY_OVERWRITE            = (1 << 0),
-  G_FILE_COPY_BACKUP               = (1 << 1),
-  G_FILE_COPY_NOFOLLOW_SYMLINKS    = (1 << 2),
-  G_FILE_COPY_ALL_METADATA         = (1 << 3),
-  G_FILE_COPY_NO_FALLBACK_FOR_MOVE = (1 << 4),
-  G_FILE_COPY_TARGET_DEFAULT_PERMS = (1 << 5)
-} GFileCopyFlags;
-
-
-/**
- * GFileMonitorFlags:
- * @G_FILE_MONITOR_NONE: No flags set.
- * @G_FILE_MONITOR_WATCH_MOUNTS: Watch for mount events.
- * @G_FILE_MONITOR_SEND_MOVED: Pair DELETED and CREATED events caused
- *   by file renames (moves) and send a single G_FILE_MONITOR_EVENT_MOVED
- *   event instead (NB: not supported on all backends; the default
- *   behaviour -without specifying this flag- is to send single DELETED
- *   and CREATED events).
- *
- * Flags used to set what a #GFileMonitor will watch for.
- */
-typedef enum {
-  G_FILE_MONITOR_NONE         = 0,
-  G_FILE_MONITOR_WATCH_MOUNTS = (1 << 0),
-  G_FILE_MONITOR_SEND_MOVED   = (1 << 1)
-} GFileMonitorFlags;
-
-
-/**
- * GFileType:
- * @G_FILE_TYPE_UNKNOWN: File's type is unknown.
- * @G_FILE_TYPE_REGULAR: File handle represents a regular file.
- * @G_FILE_TYPE_DIRECTORY: File handle represents a directory.
- * @G_FILE_TYPE_SYMBOLIC_LINK: File handle represents a symbolic link
- *    (Unix systems).
- * @G_FILE_TYPE_SPECIAL: File is a "special" file, such as a socket, fifo,
- *    block device, or character device.
- * @G_FILE_TYPE_SHORTCUT: File is a shortcut (Windows systems).
- * @G_FILE_TYPE_MOUNTABLE: File is a mountable location.
- *
- * Indicates the file's on-disk type.
- **/
-typedef enum {
-  G_FILE_TYPE_UNKNOWN = 0,
-  G_FILE_TYPE_REGULAR,
-  G_FILE_TYPE_DIRECTORY,
-  G_FILE_TYPE_SYMBOLIC_LINK,
-  G_FILE_TYPE_SPECIAL, /* socket, fifo, blockdev, chardev */
-  G_FILE_TYPE_SHORTCUT,
-  G_FILE_TYPE_MOUNTABLE
-} GFileType;
-
-
-/**
- * GFilesystemPreviewType:
- * @G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS: Only preview files if user has explicitly requested it.
- * @G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL: Preview files if user has requested preview of "local" files.
- * @G_FILESYSTEM_PREVIEW_TYPE_NEVER: Never preview files.
- *
- * Indicates a hint from the file system whether files should be
- * previewed in a file manager. Returned as the value of the key
- * #G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW.
- **/
-typedef enum {
-  G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS = 0,
-  G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL,
-  G_FILESYSTEM_PREVIEW_TYPE_NEVER
-} GFilesystemPreviewType;
-
-
-/**
- * GFileMonitorEvent:
- * @G_FILE_MONITOR_EVENT_CHANGED: a file changed.
- * @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: a hint that this was probably the last change in a set of changes.
- * @G_FILE_MONITOR_EVENT_DELETED: a file was deleted.
- * @G_FILE_MONITOR_EVENT_CREATED: a file was created.
- * @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: a file attribute was changed.
- * @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: the file location will soon be unmounted.
- * @G_FILE_MONITOR_EVENT_UNMOUNTED: the file location was unmounted.
- * @G_FILE_MONITOR_EVENT_MOVED: the file was moved.
- *
- * Specifies what type of event a monitor event is.
- **/
-typedef enum {
-  G_FILE_MONITOR_EVENT_CHANGED,
-  G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
-  G_FILE_MONITOR_EVENT_DELETED,
-  G_FILE_MONITOR_EVENT_CREATED,
-  G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED,
-  G_FILE_MONITOR_EVENT_PRE_UNMOUNT,
-  G_FILE_MONITOR_EVENT_UNMOUNTED,
-  G_FILE_MONITOR_EVENT_MOVED
-} GFileMonitorEvent;
-
-
-/* This enumeration conflicts with GIOError in giochannel.h. However,
- * that is only used as a return value in some deprecated functions.
- * So, we reuse the same prefix for the enumeration values, but call
- * the actual enumeration (which is rarely used) GIOErrorEnum.
- */
-/**
- * GIOErrorEnum:
- * @G_IO_ERROR_FAILED: Generic error condition for when any operation fails.
- * @G_IO_ERROR_NOT_FOUND: File not found.
- * @G_IO_ERROR_EXISTS: File already exists.
- * @G_IO_ERROR_IS_DIRECTORY: File is a directory.
- * @G_IO_ERROR_NOT_DIRECTORY: File is not a directory.
- * @G_IO_ERROR_NOT_EMPTY: File is a directory that isn't empty.
- * @G_IO_ERROR_NOT_REGULAR_FILE: File is not a regular file.
- * @G_IO_ERROR_NOT_SYMBOLIC_LINK: File is not a symbolic link.
- * @G_IO_ERROR_NOT_MOUNTABLE_FILE: File cannot be mounted.
- * @G_IO_ERROR_FILENAME_TOO_LONG: Filename is too many characters.
- * @G_IO_ERROR_INVALID_FILENAME: Filename is invalid or contains invalid characters.
- * @G_IO_ERROR_TOO_MANY_LINKS: File contains too many symbolic links.
- * @G_IO_ERROR_NO_SPACE: No space left on drive.
- * @G_IO_ERROR_INVALID_ARGUMENT: Invalid argument.
- * @G_IO_ERROR_PERMISSION_DENIED: Permission denied.
- * @G_IO_ERROR_NOT_SUPPORTED: Operation not supported for the current backend.
- * @G_IO_ERROR_NOT_MOUNTED: File isn't mounted.
- * @G_IO_ERROR_ALREADY_MOUNTED: File is already mounted.
- * @G_IO_ERROR_CLOSED: File was closed.
- * @G_IO_ERROR_CANCELLED: Operation was cancelled. See #GCancellable.
- * @G_IO_ERROR_PENDING: Operations are still pending.
- * @G_IO_ERROR_READ_ONLY: File is read only.
- * @G_IO_ERROR_CANT_CREATE_BACKUP: Backup couldn't be created.
- * @G_IO_ERROR_WRONG_ETAG: File's Entity Tag was incorrect.
- * @G_IO_ERROR_TIMED_OUT: Operation timed out.
- * @G_IO_ERROR_WOULD_RECURSE: Operation would be recursive.
- * @G_IO_ERROR_BUSY: File is busy.
- * @G_IO_ERROR_WOULD_BLOCK: Operation would block.
- * @G_IO_ERROR_HOST_NOT_FOUND: Host couldn't be found (remote operations).
- * @G_IO_ERROR_WOULD_MERGE: Operation would merge files.
- * @G_IO_ERROR_FAILED_HANDLED: Operation failed and a helper program has
- *     already interacted with the user. Do not display any error dialog.
- * @G_IO_ERROR_TOO_MANY_OPEN_FILES: The current process has too many files
- *     open and can't open any more. Duplicate descriptors do count toward
- *     this limit. Since 2.20
- * @G_IO_ERROR_NOT_INITIALIZED: The object has not been initialized. Since 2.22
- * @G_IO_ERROR_ADDRESS_IN_USE: The requested address is already in use. Since 2.22
- * @G_IO_ERROR_PARTIAL_INPUT: Need more input to finish operation. Since 2.24
- * @G_IO_ERROR_INVALID_DATA: There input data was invalid. Since 2.24
- * @G_IO_ERROR_DBUS_ERROR: A remote object generated an error that
- *     doesn't correspond to a locally registered #GError error
- *     domain. Use g_dbus_error_get_remote_error() to extract the D-Bus
- *     error name and g_dbus_error_strip_remote_error() to fix up the
- *     message so it matches what was received on the wire. Since 2.26.
- * @G_IO_ERROR_HOST_UNREACHABLE: Host unreachable. Since 2.26
- * @G_IO_ERROR_NETWORK_UNREACHABLE: Network unreachable. Since 2.26
- * @G_IO_ERROR_CONNECTION_REFUSED: Connection refused. Since 2.26
- * @G_IO_ERROR_PROXY_FAILED: Connection to proxy server failed. Since 2.26
- * @G_IO_ERROR_PROXY_AUTH_FAILED: Proxy authentication failed. Since 2.26
- * @G_IO_ERROR_PROXY_NEED_AUTH: Proxy server needs authentication. Since 2.26
- * @G_IO_ERROR_PROXY_NOT_ALLOWED: Proxy connection is not allowed by ruleset.
- *     Since 2.26
- *
- * Error codes returned by GIO functions.
- *
- **/
-typedef enum {
-  G_IO_ERROR_FAILED,
-  G_IO_ERROR_NOT_FOUND,
-  G_IO_ERROR_EXISTS,
-  G_IO_ERROR_IS_DIRECTORY,
-  G_IO_ERROR_NOT_DIRECTORY,
-  G_IO_ERROR_NOT_EMPTY,
-  G_IO_ERROR_NOT_REGULAR_FILE,
-  G_IO_ERROR_NOT_SYMBOLIC_LINK,
-  G_IO_ERROR_NOT_MOUNTABLE_FILE,
-  G_IO_ERROR_FILENAME_TOO_LONG,
-  G_IO_ERROR_INVALID_FILENAME,
-  G_IO_ERROR_TOO_MANY_LINKS,
-  G_IO_ERROR_NO_SPACE,
-  G_IO_ERROR_INVALID_ARGUMENT,
-  G_IO_ERROR_PERMISSION_DENIED,
-  G_IO_ERROR_NOT_SUPPORTED,
-  G_IO_ERROR_NOT_MOUNTED,
-  G_IO_ERROR_ALREADY_MOUNTED,
-  G_IO_ERROR_CLOSED,
-  G_IO_ERROR_CANCELLED,
-  G_IO_ERROR_PENDING,
-  G_IO_ERROR_READ_ONLY,
-  G_IO_ERROR_CANT_CREATE_BACKUP,
-  G_IO_ERROR_WRONG_ETAG,
-  G_IO_ERROR_TIMED_OUT,
-  G_IO_ERROR_WOULD_RECURSE,
-  G_IO_ERROR_BUSY,
-  G_IO_ERROR_WOULD_BLOCK,
-  G_IO_ERROR_HOST_NOT_FOUND,
-  G_IO_ERROR_WOULD_MERGE,
-  G_IO_ERROR_FAILED_HANDLED,
-  G_IO_ERROR_TOO_MANY_OPEN_FILES,
-  G_IO_ERROR_NOT_INITIALIZED,
-  G_IO_ERROR_ADDRESS_IN_USE,
-  G_IO_ERROR_PARTIAL_INPUT,
-  G_IO_ERROR_INVALID_DATA,
-  G_IO_ERROR_DBUS_ERROR,
-  G_IO_ERROR_HOST_UNREACHABLE,
-  G_IO_ERROR_NETWORK_UNREACHABLE,
-  G_IO_ERROR_CONNECTION_REFUSED,
-  G_IO_ERROR_PROXY_FAILED,
-  G_IO_ERROR_PROXY_AUTH_FAILED,
-  G_IO_ERROR_PROXY_NEED_AUTH,
-  G_IO_ERROR_PROXY_NOT_ALLOWED
-} GIOErrorEnum;
-
-
-/**
- * GAskPasswordFlags:
- * @G_ASK_PASSWORD_NEED_PASSWORD: operation requires a password.
- * @G_ASK_PASSWORD_NEED_USERNAME: operation requires a username.
- * @G_ASK_PASSWORD_NEED_DOMAIN: operation requires a domain.
- * @G_ASK_PASSWORD_SAVING_SUPPORTED: operation supports saving settings.
- * @G_ASK_PASSWORD_ANONYMOUS_SUPPORTED: operation supports anonymous users.
- *
- * #GAskPasswordFlags are used to request specific information from the
- * user, or to notify the user of their choices in an authentication
- * situation.
- **/
-typedef enum {
-  G_ASK_PASSWORD_NEED_PASSWORD       = (1 << 0),
-  G_ASK_PASSWORD_NEED_USERNAME       = (1 << 1),
-  G_ASK_PASSWORD_NEED_DOMAIN         = (1 << 2),
-  G_ASK_PASSWORD_SAVING_SUPPORTED    = (1 << 3),
-  G_ASK_PASSWORD_ANONYMOUS_SUPPORTED = (1 << 4)
-} GAskPasswordFlags;
-
-
-/**
- * GPasswordSave:
- * @G_PASSWORD_SAVE_NEVER: never save a password.
- * @G_PASSWORD_SAVE_FOR_SESSION: save a password for the session.
- * @G_PASSWORD_SAVE_PERMANENTLY: save a password permanently.
- *
- * #GPasswordSave is used to indicate the lifespan of a saved password.
- *
- * #Gvfs stores passwords in the Gnome keyring when this flag allows it
- * to, and later retrieves it again from there.
- **/
-typedef enum {
-  G_PASSWORD_SAVE_NEVER,
-  G_PASSWORD_SAVE_FOR_SESSION,
-  G_PASSWORD_SAVE_PERMANENTLY
-} GPasswordSave;
-
-
-/**
- * GMountOperationResult:
- * @G_MOUNT_OPERATION_HANDLED: The request was fulfilled and the
- *     user specified data is now available
- * @G_MOUNT_OPERATION_ABORTED: The user requested the mount operation
- *     to be aborted
- * @G_MOUNT_OPERATION_UNHANDLED: The request was unhandled (i.e. not
- *     implemented)
- *
- * #GMountOperationResult is returned as a result when a request for
- * information is send by the mounting operation.
- **/
-typedef enum {
-  G_MOUNT_OPERATION_HANDLED,
-  G_MOUNT_OPERATION_ABORTED,
-  G_MOUNT_OPERATION_UNHANDLED
-} GMountOperationResult;
-
-
-/**
- * GOutputStreamSpliceFlags:
- * @G_OUTPUT_STREAM_SPLICE_NONE: Do not close either stream.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE: Close the source stream after
- *     the splice.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET: Close the target stream after
- *     the splice.
- *
- * GOutputStreamSpliceFlags determine how streams should be spliced.
- **/
-typedef enum {
-  G_OUTPUT_STREAM_SPLICE_NONE         = 0,
-  G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE = (1 << 0),
-  G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET = (1 << 1)
-} GOutputStreamSpliceFlags;
-
-
-/**
- * GIOStreamSpliceFlags:
- * @G_IO_STREAM_SPLICE_NONE: Do not close either stream.
- * @G_IO_STREAM_SPLICE_CLOSE_STREAM1: Close the first stream after
- *     the splice.
- * @G_IO_STREAM_SPLICE_CLOSE_STREAM2: Close the second stream after
- *     the splice.
- * @G_IO_STREAM_SPLICE_WAIT_FOR_BOTH: Wait for both splice operations to finish
- *     before calling the callback.
- *
- * GIOStreamSpliceFlags determine how streams should be spliced.
- *
- * Since: 2.28
- **/
-typedef enum {
-  G_IO_STREAM_SPLICE_NONE          = 0,
-  G_IO_STREAM_SPLICE_CLOSE_STREAM1 = (1 << 0),
-  G_IO_STREAM_SPLICE_CLOSE_STREAM2 = (1 << 1),
-  G_IO_STREAM_SPLICE_WAIT_FOR_BOTH = (1 << 2)
-} GIOStreamSpliceFlags;
-
-/**
- * GEmblemOrigin:
- * @G_EMBLEM_ORIGIN_UNKNOWN: Emblem of unknown origin
- * @G_EMBLEM_ORIGIN_DEVICE: Emblem adds device-specific information
- * @G_EMBLEM_ORIGIN_LIVEMETADATA: Emblem depicts live metadata, such as "readonly"
- * @G_EMBLEM_ORIGIN_TAG: Emblem comes from a user-defined tag, e.g. set by nautilus (in the future)
- *
- * GEmblemOrigin is used to add information about the origin of the emblem
- * to #GEmblem.
- *
- * Since: 2.18
- */
-typedef enum  {
-  G_EMBLEM_ORIGIN_UNKNOWN,
-  G_EMBLEM_ORIGIN_DEVICE,
-  G_EMBLEM_ORIGIN_LIVEMETADATA,
-  G_EMBLEM_ORIGIN_TAG
-} GEmblemOrigin;
-
-/**
- * GResolverError:
- * @G_RESOLVER_ERROR_NOT_FOUND: the requested name/address/service was not
- *     found
- * @G_RESOLVER_ERROR_TEMPORARY_FAILURE: the requested information could not
- *     be looked up due to a network error or similar problem
- * @G_RESOLVER_ERROR_INTERNAL: unknown error
- *
- * An error code used with %G_RESOLVER_ERROR in a #GError returned
- * from a #GResolver routine.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_RESOLVER_ERROR_NOT_FOUND,
-  G_RESOLVER_ERROR_TEMPORARY_FAILURE,
-  G_RESOLVER_ERROR_INTERNAL
-} GResolverError;
-
-/**
- * GResolverRecordType:
- * @G_RESOLVER_RECORD_SRV: lookup DNS SRV records for a domain
- * @G_RESOLVER_RECORD_MX: lookup DNS MX records for a domain
- * @G_RESOLVER_RECORD_TXT: lookup DNS TXT records for a name
- * @G_RESOLVER_RECORD_SOA: lookup DNS SOA records for a zone
- * @G_RESOLVER_RECORD_NS: lookup DNS NS records for a domain
- *
- * The type of record that g_resolver_lookup_records() or
- * g_resolver_lookup_records_async() should retrieve. The records are returned
- * as lists of #GVariant tuples. Each record type has different values in
- * the variant tuples returned.
- *
- * %G_RESOLVER_RECORD_SRV records are returned as variants with the signature
- * '(qqqs)', containing a guint16 with the priority, a guint16 with the
- * weight, a guint16 with the port, and a string of the hostname.
- *
- * %G_RESOLVER_RECORD_MX records are returned as variants with the signature
- * '(qs)', representing a guint16 with the preference, and a string containing
- * the mail exchanger hostname.
- *
- * %G_RESOLVER_RECORD_TXT records are returned as variants with the signature
- * '(as)', representing an array of the strings in the text record.
- *
- * %G_RESOLVER_RECORD_SOA records are returned as variants with the signature
- * '(ssuuuuu)', representing a string containing the primary name server, a
- * string containing the administrator, the serial as a guint32, the refresh
- * interval as guint32, the retry interval as a guint32, the expire timeout
- * as a guint32, and the ttl as a guint32.
- *
- * %G_RESOLVER_RECORD_NS records are returned as variants with the signature
- * '(s)', representing a string of the hostname of the name server.
- *
- * Since: 2.34
- */
-typedef enum {
-  G_RESOLVER_RECORD_SRV = 1,
-  G_RESOLVER_RECORD_MX,
-  G_RESOLVER_RECORD_TXT,
-  G_RESOLVER_RECORD_SOA,
-  G_RESOLVER_RECORD_NS
-} GResolverRecordType;
-
-/**
- * GResourceError:
- * @G_RESOURCE_ERROR_NOT_FOUND: no file was found at the requested path
- * @G_RESOURCE_ERROR_INTERNAL: unknown error
- *
- * An error code used with %G_RESOURCE_ERROR in a #GError returned
- * from a #GResource routine.
- *
- * Since: 2.32
- */
-typedef enum {
-  G_RESOURCE_ERROR_NOT_FOUND,
-  G_RESOURCE_ERROR_INTERNAL
-} GResourceError;
-
-/**
- * GResourceFlags:
- * @G_RESOURCE_FLAGS_NONE: No flags set.
- * @G_RESOURCE_FLAGS_COMPRESSED: The file is compressed.
- *
- * GResourceFlags give information about a particular file inside a resource
- * bundle.
- * 
- * Since: 2.32
- **/
-typedef enum {
-  G_RESOURCE_FLAGS_NONE       = 0,
-  G_RESOURCE_FLAGS_COMPRESSED = (1<<0)
-} GResourceFlags;
-
-/**
- * GResourceLookupFlags:
- * @G_RESOURCE_LOOKUP_FLAGS_NONE: No flags set.
- *
- * GResourceLookupFlags determine how resource path lookups are handled.
- * 
- * Since: 2.32
- **/
-typedef enum /*< flags >*/ {
-  G_RESOURCE_LOOKUP_FLAGS_NONE       = 0
-} GResourceLookupFlags;
-
-/**
- * GSocketFamily:
- * @G_SOCKET_FAMILY_INVALID: no address family
- * @G_SOCKET_FAMILY_IPV4: the IPv4 family
- * @G_SOCKET_FAMILY_IPV6: the IPv6 family
- * @G_SOCKET_FAMILY_UNIX: the UNIX domain family
- *
- * The protocol family of a #GSocketAddress. (These values are
- * identical to the system defines %AF_INET, %AF_INET6 and %AF_UNIX,
- * if available.)
- *
- * Since: 2.22
- */
-typedef enum {
-  G_SOCKET_FAMILY_INVALID,
-  G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
-  G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
-  G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
-} GSocketFamily;
-
-/**
- * GSocketType:
- * @G_SOCKET_TYPE_INVALID: Type unknown or wrong
- * @G_SOCKET_TYPE_STREAM: Reliable connection-based byte streams (e.g. TCP).
- * @G_SOCKET_TYPE_DATAGRAM: Connectionless, unreliable datagram passing.
- *     (e.g. UDP)
- * @G_SOCKET_TYPE_SEQPACKET: Reliable connection-based passing of datagrams
- *     of fixed maximum length (e.g. SCTP).
- *
- * Flags used when creating a #GSocket. Some protocols may not implement
- * all the socket types.
- *
- * Since: 2.22
- */
-typedef enum
-{
-  G_SOCKET_TYPE_INVALID,
-  G_SOCKET_TYPE_STREAM,
-  G_SOCKET_TYPE_DATAGRAM,
-  G_SOCKET_TYPE_SEQPACKET
-} GSocketType;
-
-/**
- * GSocketMsgFlags:
- * @G_SOCKET_MSG_NONE: No flags.
- * @G_SOCKET_MSG_OOB: Request to send/receive out of band data.
- * @G_SOCKET_MSG_PEEK: Read data from the socket without removing it from
- *     the queue.
- * @G_SOCKET_MSG_DONTROUTE: Don't use a gateway to send out the packet,
- *     only send to hosts on directly connected networks.
- *
- * Flags used in g_socket_receive_message() and g_socket_send_message().
- * The flags listed in the enum are some commonly available flags, but the
- * values used for them are the same as on the platform, and any other flags
- * are passed in/out as is. So to use a platform specific flag, just include
- * the right system header and pass in the flag.
- *
- * Since: 2.22
- */
-typedef enum /*< flags >*/
-{
-  G_SOCKET_MSG_NONE,
-  G_SOCKET_MSG_OOB = GLIB_SYSDEF_MSG_OOB,
-  G_SOCKET_MSG_PEEK = GLIB_SYSDEF_MSG_PEEK,
-  G_SOCKET_MSG_DONTROUTE = GLIB_SYSDEF_MSG_DONTROUTE
-} GSocketMsgFlags;
-
-/**
- * GSocketProtocol:
- * @G_SOCKET_PROTOCOL_UNKNOWN: The protocol type is unknown
- * @G_SOCKET_PROTOCOL_DEFAULT: The default protocol for the family/type
- * @G_SOCKET_PROTOCOL_TCP: TCP over IP
- * @G_SOCKET_PROTOCOL_UDP: UDP over IP
- * @G_SOCKET_PROTOCOL_SCTP: SCTP over IP
- *
- * A protocol identifier is specified when creating a #GSocket, which is a
- * family/type specific identifier, where 0 means the default protocol for
- * the particular family/type.
- *
- * This enum contains a set of commonly available and used protocols. You
- * can also pass any other identifiers handled by the platform in order to
- * use protocols not listed here.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_SOCKET_PROTOCOL_UNKNOWN = -1,
-  G_SOCKET_PROTOCOL_DEFAULT = 0,
-  G_SOCKET_PROTOCOL_TCP     = 6,
-  G_SOCKET_PROTOCOL_UDP     = 17,
-  G_SOCKET_PROTOCOL_SCTP    = 132
-} GSocketProtocol;
-
-/**
- * GZlibCompressorFormat:
- * @G_ZLIB_COMPRESSOR_FORMAT_ZLIB: deflate compression with zlib header
- * @G_ZLIB_COMPRESSOR_FORMAT_GZIP: gzip file format
- * @G_ZLIB_COMPRESSOR_FORMAT_RAW: deflate compression with no header
- *
- * Used to select the type of data format to use for #GZlibDecompressor
- * and #GZlibCompressor.
- *
- * Since: 2.24
- */
-typedef enum {
-  G_ZLIB_COMPRESSOR_FORMAT_ZLIB,
-  G_ZLIB_COMPRESSOR_FORMAT_GZIP,
-  G_ZLIB_COMPRESSOR_FORMAT_RAW
-} GZlibCompressorFormat;
-
-/**
- * GUnixSocketAddressType:
- * @G_UNIX_SOCKET_ADDRESS_INVALID: invalid
- * @G_UNIX_SOCKET_ADDRESS_ANONYMOUS: anonymous
- * @G_UNIX_SOCKET_ADDRESS_PATH: a filesystem path
- * @G_UNIX_SOCKET_ADDRESS_ABSTRACT: an abstract name
- * @G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED: an abstract name, 0-padded
- *   to the full length of a unix socket name
- *
- * The type of name used by a #GUnixSocketAddress.
- * %G_UNIX_SOCKET_ADDRESS_PATH indicates a traditional unix domain
- * socket bound to a filesystem path. %G_UNIX_SOCKET_ADDRESS_ANONYMOUS
- * indicates a socket not bound to any name (eg, a client-side socket,
- * or a socket created with socketpair()).
- *
- * For abstract sockets, there are two incompatible ways of naming
- * them; the man pages suggest using the entire <literal>struct
- * sockaddr_un</literal> as the name, padding the unused parts of the
- * %sun_path field with zeroes; this corresponds to
- * %G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED. However, many programs
- * instead just use a portion of %sun_path, and pass an appropriate
- * smaller length to bind() or connect(). This is
- * %G_UNIX_SOCKET_ADDRESS_ABSTRACT.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_UNIX_SOCKET_ADDRESS_INVALID,
-  G_UNIX_SOCKET_ADDRESS_ANONYMOUS,
-  G_UNIX_SOCKET_ADDRESS_PATH,
-  G_UNIX_SOCKET_ADDRESS_ABSTRACT,
-  G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED
-} GUnixSocketAddressType;
-
-/**
- * GBusType:
- * @G_BUS_TYPE_STARTER: An alias for the message bus that activated the process, if any.
- * @G_BUS_TYPE_NONE: Not a message bus.
- * @G_BUS_TYPE_SYSTEM: The system-wide message bus.
- * @G_BUS_TYPE_SESSION: The login session message bus.
- *
- * An enumeration for well-known message buses.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_TYPE_STARTER = -1,
-  G_BUS_TYPE_NONE = 0,
-  G_BUS_TYPE_SYSTEM  = 1,
-  G_BUS_TYPE_SESSION = 2
-} GBusType;
-
-/**
- * GBusNameOwnerFlags:
- * @G_BUS_NAME_OWNER_FLAGS_NONE: No flags set.
- * @G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT: Allow another message bus connection to claim the name.
- * @G_BUS_NAME_OWNER_FLAGS_REPLACE: If another message bus connection owns the name and have
- * specified #G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT, then take the name from the other connection.
- *
- * Flags used in g_bus_own_name().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_NAME_OWNER_FLAGS_NONE = 0,                    /*< nick=none >*/
-  G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0),  /*< nick=allow-replacement >*/
-  G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1)            /*< nick=replace >*/
-} GBusNameOwnerFlags;
-
-/**
- * GBusNameWatcherFlags:
- * @G_BUS_NAME_WATCHER_FLAGS_NONE: No flags set.
- * @G_BUS_NAME_WATCHER_FLAGS_AUTO_START: If no-one owns the name when
- * beginning to watch the name, ask the bus to launch an owner for the
- * name.
- *
- * Flags used in g_bus_watch_name().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_NAME_WATCHER_FLAGS_NONE = 0,
-  G_BUS_NAME_WATCHER_FLAGS_AUTO_START = (1<<0)
-} GBusNameWatcherFlags;
-
-/**
- * GDBusProxyFlags:
- * @G_DBUS_PROXY_FLAGS_NONE: No flags set.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES: Don't load properties.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS: Don't connect to signals on the remote object.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START: If not set and the proxy if for a well-known name,
- * then request the bus to launch an owner for the name if no-one owns the name. This flag can
- * only be used in proxies for well-known names.
- * @G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES: If set, the property value for any <emphasis>invalidated property</emphasis> will be (asynchronously) retrieved upon receiving the <ulink url="http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-properties">PropertiesChanged</ulink> D-Bus signal and the property will not cause emission of the #GDBusProxy::g-properties-changed signal. When the value is received the #GDBusProxy::g-properties-changed signal is emitted for the property along with the retrieved value. Since 2.32.
- *
- * Flags used when constructing an instance of a #GDBusProxy derived class.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_PROXY_FLAGS_NONE = 0,
-  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0),
-  G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1),
-  G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = (1<<2),
-  G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES = (1<<3)
-} GDBusProxyFlags;
-
-/**
- * GDBusError:
- * @G_DBUS_ERROR_FAILED:
- * A generic error; "something went wrong" - see the error message for
- * more.
- * @G_DBUS_ERROR_NO_MEMORY:
- * There was not enough memory to complete an operation.
- * @G_DBUS_ERROR_SERVICE_UNKNOWN:
- * The bus doesn't know how to launch a service to supply the bus name
- * you wanted.
- * @G_DBUS_ERROR_NAME_HAS_NO_OWNER:
- * The bus name you referenced doesn't exist (i.e. no application owns
- * it).
- * @G_DBUS_ERROR_NO_REPLY:
- * No reply to a message expecting one, usually means a timeout occurred.
- * @G_DBUS_ERROR_IO_ERROR:
- * Something went wrong reading or writing to a socket, for example.
- * @G_DBUS_ERROR_BAD_ADDRESS:
- * A D-Bus bus address was malformed.
- * @G_DBUS_ERROR_NOT_SUPPORTED:
- * Requested operation isn't supported (like ENOSYS on UNIX).
- * @G_DBUS_ERROR_LIMITS_EXCEEDED:
- * Some limited resource is exhausted.
- * @G_DBUS_ERROR_ACCESS_DENIED:
- * Security restrictions don't allow doing what you're trying to do.
- * @G_DBUS_ERROR_AUTH_FAILED:
- * Authentication didn't work.
- * @G_DBUS_ERROR_NO_SERVER:
- * Unable to connect to server (probably caused by ECONNREFUSED on a
- * socket).
- * @G_DBUS_ERROR_TIMEOUT:
- * Certain timeout errors, possibly ETIMEDOUT on a socket.  Note that
- * %G_DBUS_ERROR_NO_REPLY is used for message reply timeouts. Warning:
- * this is confusingly-named given that %G_DBUS_ERROR_TIMED_OUT also
- * exists. We can't fix it for compatibility reasons so just be
- * careful.
- * @G_DBUS_ERROR_NO_NETWORK:
- * No network access (probably ENETUNREACH on a socket).
- * @G_DBUS_ERROR_ADDRESS_IN_USE:
- * Can't bind a socket since its address is in use (i.e. EADDRINUSE).
- * @G_DBUS_ERROR_DISCONNECTED:
- * The connection is disconnected and you're trying to use it.
- * @G_DBUS_ERROR_INVALID_ARGS:
- * Invalid arguments passed to a method call.
- * @G_DBUS_ERROR_FILE_NOT_FOUND:
- * Missing file.
- * @G_DBUS_ERROR_FILE_EXISTS:
- * Existing file and the operation you're using does not silently overwrite.
- * @G_DBUS_ERROR_UNKNOWN_METHOD:
- * Method name you invoked isn't known by the object you invoked it on.
- * @G_DBUS_ERROR_TIMED_OUT:
- * Certain timeout errors, e.g. while starting a service. Warning: this is
- * confusingly-named given that %G_DBUS_ERROR_TIMEOUT also exists. We
- * can't fix it for compatibility reasons so just be careful.
- * @G_DBUS_ERROR_MATCH_RULE_NOT_FOUND:
- * Tried to remove or modify a match rule that didn't exist.
- * @G_DBUS_ERROR_MATCH_RULE_INVALID:
- * The match rule isn't syntactically valid.
- * @G_DBUS_ERROR_SPAWN_EXEC_FAILED:
- * While starting a new process, the exec() call failed.
- * @G_DBUS_ERROR_SPAWN_FORK_FAILED:
- * While starting a new process, the fork() call failed.
- * @G_DBUS_ERROR_SPAWN_CHILD_EXITED:
- * While starting a new process, the child exited with a status code.
- * @G_DBUS_ERROR_SPAWN_CHILD_SIGNALED:
- * While starting a new process, the child exited on a signal.
- * @G_DBUS_ERROR_SPAWN_FAILED:
- * While starting a new process, something went wrong.
- * @G_DBUS_ERROR_SPAWN_SETUP_FAILED:
- * We failed to setup the environment correctly.
- * @G_DBUS_ERROR_SPAWN_CONFIG_INVALID:
- * We failed to setup the config parser correctly.
- * @G_DBUS_ERROR_SPAWN_SERVICE_INVALID:
- * Bus name was not valid.
- * @G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND:
- * Service file not found in system-services directory.
- * @G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID:
- * Permissions are incorrect on the setuid helper.
- * @G_DBUS_ERROR_SPAWN_FILE_INVALID:
- * Service file invalid (Name, User or Exec missing).
- * @G_DBUS_ERROR_SPAWN_NO_MEMORY:
- * Tried to get a UNIX process ID and it wasn't available.
- * @G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN:
- * Tried to get a UNIX process ID and it wasn't available.
- * @G_DBUS_ERROR_INVALID_SIGNATURE:
- * A type signature is not valid.
- * @G_DBUS_ERROR_INVALID_FILE_CONTENT:
- * A file contains invalid syntax or is otherwise broken.
- * @G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
- * Asked for SELinux security context and it wasn't available.
- * @G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN:
- * Asked for ADT audit data and it wasn't available.
- * @G_DBUS_ERROR_OBJECT_PATH_IN_USE:
- * There's already an object with the requested object path.
- *
- * Error codes for the %G_DBUS_ERROR error domain.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  /* Well-known errors in the org.freedesktop.DBus.Error namespace */
-  G_DBUS_ERROR_FAILED,                           /* org.freedesktop.DBus.Error.Failed */
-  G_DBUS_ERROR_NO_MEMORY,                        /* org.freedesktop.DBus.Error.NoMemory */
-  G_DBUS_ERROR_SERVICE_UNKNOWN,                  /* org.freedesktop.DBus.Error.ServiceUnknown */
-  G_DBUS_ERROR_NAME_HAS_NO_OWNER,                /* org.freedesktop.DBus.Error.NameHasNoOwner */
-  G_DBUS_ERROR_NO_REPLY,                         /* org.freedesktop.DBus.Error.NoReply */
-  G_DBUS_ERROR_IO_ERROR,                         /* org.freedesktop.DBus.Error.IOError */
-  G_DBUS_ERROR_BAD_ADDRESS,                      /* org.freedesktop.DBus.Error.BadAddress */
-  G_DBUS_ERROR_NOT_SUPPORTED,                    /* org.freedesktop.DBus.Error.NotSupported */
-  G_DBUS_ERROR_LIMITS_EXCEEDED,                  /* org.freedesktop.DBus.Error.LimitsExceeded */
-  G_DBUS_ERROR_ACCESS_DENIED,                    /* org.freedesktop.DBus.Error.AccessDenied */
-  G_DBUS_ERROR_AUTH_FAILED,                      /* org.freedesktop.DBus.Error.AuthFailed */
-  G_DBUS_ERROR_NO_SERVER,                        /* org.freedesktop.DBus.Error.NoServer */
-  G_DBUS_ERROR_TIMEOUT,                          /* org.freedesktop.DBus.Error.Timeout */
-  G_DBUS_ERROR_NO_NETWORK,                       /* org.freedesktop.DBus.Error.NoNetwork */
-  G_DBUS_ERROR_ADDRESS_IN_USE,                   /* org.freedesktop.DBus.Error.AddressInUse */
-  G_DBUS_ERROR_DISCONNECTED,                     /* org.freedesktop.DBus.Error.Disconnected */
-  G_DBUS_ERROR_INVALID_ARGS,                     /* org.freedesktop.DBus.Error.InvalidArgs */
-  G_DBUS_ERROR_FILE_NOT_FOUND,                   /* org.freedesktop.DBus.Error.FileNotFound */
-  G_DBUS_ERROR_FILE_EXISTS,                      /* org.freedesktop.DBus.Error.FileExists */
-  G_DBUS_ERROR_UNKNOWN_METHOD,                   /* org.freedesktop.DBus.Error.UnknownMethod */
-  G_DBUS_ERROR_TIMED_OUT,                        /* org.freedesktop.DBus.Error.TimedOut */
-  G_DBUS_ERROR_MATCH_RULE_NOT_FOUND,             /* org.freedesktop.DBus.Error.MatchRuleNotFound */
-  G_DBUS_ERROR_MATCH_RULE_INVALID,               /* org.freedesktop.DBus.Error.MatchRuleInvalid */
-  G_DBUS_ERROR_SPAWN_EXEC_FAILED,                /* org.freedesktop.DBus.Error.Spawn.ExecFailed */
-  G_DBUS_ERROR_SPAWN_FORK_FAILED,                /* org.freedesktop.DBus.Error.Spawn.ForkFailed */
-  G_DBUS_ERROR_SPAWN_CHILD_EXITED,               /* org.freedesktop.DBus.Error.Spawn.ChildExited */
-  G_DBUS_ERROR_SPAWN_CHILD_SIGNALED,             /* org.freedesktop.DBus.Error.Spawn.ChildSignaled */
-  G_DBUS_ERROR_SPAWN_FAILED,                     /* org.freedesktop.DBus.Error.Spawn.Failed */
-  G_DBUS_ERROR_SPAWN_SETUP_FAILED,               /* org.freedesktop.DBus.Error.Spawn.FailedToSetup */
-  G_DBUS_ERROR_SPAWN_CONFIG_INVALID,             /* org.freedesktop.DBus.Error.Spawn.ConfigInvalid */
-  G_DBUS_ERROR_SPAWN_SERVICE_INVALID,            /* org.freedesktop.DBus.Error.Spawn.ServiceNotValid */
-  G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND,          /* org.freedesktop.DBus.Error.Spawn.ServiceNotFound */
-  G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID,        /* org.freedesktop.DBus.Error.Spawn.PermissionsInvalid */
-  G_DBUS_ERROR_SPAWN_FILE_INVALID,               /* org.freedesktop.DBus.Error.Spawn.FileInvalid */
-  G_DBUS_ERROR_SPAWN_NO_MEMORY,                  /* org.freedesktop.DBus.Error.Spawn.NoMemory */
-  G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN,          /* org.freedesktop.DBus.Error.UnixProcessIdUnknown */
-  G_DBUS_ERROR_INVALID_SIGNATURE,                /* org.freedesktop.DBus.Error.InvalidSignature */
-  G_DBUS_ERROR_INVALID_FILE_CONTENT,             /* org.freedesktop.DBus.Error.InvalidFileContent */
-  G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */
-  G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN,           /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */
-  G_DBUS_ERROR_OBJECT_PATH_IN_USE                /* org.freedesktop.DBus.Error.ObjectPathInUse */
-} GDBusError;
-/* Remember to update g_dbus_error_quark() in gdbuserror.c if you extend this enumeration */
-
-/**
- * GDBusConnectionFlags:
- * @G_DBUS_CONNECTION_FLAGS_NONE: No flags set.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT: Perform authentication against server.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER: Perform authentication against client.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS: When
- * authenticating as a server, allow the anonymous authentication
- * method.
- * @G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION: Pass this flag if connecting to a peer that is a
- * message bus. This means that the Hello() method will be invoked as part of the connection setup.
- * @G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING: If set, processing of D-Bus messages is
- * delayed until g_dbus_connection_start_message_processing() is called.
- *
- * Flags used when creating a new #GDBusConnection.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CONNECTION_FLAGS_NONE = 0,
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT = (1<<0),
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER = (1<<1),
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<2),
-  G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION = (1<<3),
-  G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING = (1<<4)
-} GDBusConnectionFlags;
-
-/**
- * GDBusCapabilityFlags:
- * @G_DBUS_CAPABILITY_FLAGS_NONE: No flags set.
- * @G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING: The connection
- * supports exchanging UNIX file descriptors with the remote peer.
- *
- * Capabilities negotiated with the remote peer.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CAPABILITY_FLAGS_NONE = 0,
-  G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0)
-} GDBusCapabilityFlags;
-
-/**
- * GDBusCallFlags:
- * @G_DBUS_CALL_FLAGS_NONE: No flags set.
- * @G_DBUS_CALL_FLAGS_NO_AUTO_START: The bus must not launch
- * an owner for the destination name in response to this method
- * invocation.
- *
- * Flags used in g_dbus_connection_call() and similar APIs.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CALL_FLAGS_NONE = 0,
-  G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0)
-} GDBusCallFlags;
-/* (1<<31) is reserved for internal use by GDBusConnection, do not use it. */
-
-/**
- * GDBusMessageType:
- * @G_DBUS_MESSAGE_TYPE_INVALID: Message is of invalid type.
- * @G_DBUS_MESSAGE_TYPE_METHOD_CALL: Method call.
- * @G_DBUS_MESSAGE_TYPE_METHOD_RETURN: Method reply.
- * @G_DBUS_MESSAGE_TYPE_ERROR: Error reply.
- * @G_DBUS_MESSAGE_TYPE_SIGNAL: Signal emission.
- *
- * Message types used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_TYPE_INVALID,
-  G_DBUS_MESSAGE_TYPE_METHOD_CALL,
-  G_DBUS_MESSAGE_TYPE_METHOD_RETURN,
-  G_DBUS_MESSAGE_TYPE_ERROR,
-  G_DBUS_MESSAGE_TYPE_SIGNAL
-} GDBusMessageType;
-
-/**
- * GDBusMessageFlags:
- * @G_DBUS_MESSAGE_FLAGS_NONE: No flags set.
- * @G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED: A reply is not expected.
- * @G_DBUS_MESSAGE_FLAGS_NO_AUTO_START: The bus must not launch an
- * owner for the destination name in response to this message.
- *
- * Message flags used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_FLAGS_NONE = 0,
-  G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED = (1<<0),
-  G_DBUS_MESSAGE_FLAGS_NO_AUTO_START = (1<<1)
-} GDBusMessageFlags;
-
-/**
- * GDBusMessageHeaderField:
- * @G_DBUS_MESSAGE_HEADER_FIELD_INVALID: Not a valid header field.
- * @G_DBUS_MESSAGE_HEADER_FIELD_PATH: The object path.
- * @G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE: The interface name.
- * @G_DBUS_MESSAGE_HEADER_FIELD_MEMBER: The method or signal name.
- * @G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME: The name of the error that occurred.
- * @G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL: The serial number the message is a reply to.
- * @G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION: The name the message is intended for.
- * @G_DBUS_MESSAGE_HEADER_FIELD_SENDER: Unique name of the sender of the message (filled in by the bus).
- * @G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE: The signature of the message body.
- * @G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS: The number of UNIX file descriptors that accompany the message.
- *
- * Header fields used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_HEADER_FIELD_INVALID,
-  G_DBUS_MESSAGE_HEADER_FIELD_PATH,
-  G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE,
-  G_DBUS_MESSAGE_HEADER_FIELD_MEMBER,
-  G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME,
-  G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL,
-  G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION,
-  G_DBUS_MESSAGE_HEADER_FIELD_SENDER,
-  G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE,
-  G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS
-} GDBusMessageHeaderField;
-
-/**
- * GDBusPropertyInfoFlags:
- * @G_DBUS_PROPERTY_INFO_FLAGS_NONE: No flags set.
- * @G_DBUS_PROPERTY_INFO_FLAGS_READABLE: Property is readable.
- * @G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE: Property is writable.
- *
- * Flags describing the access control of a D-Bus property.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_PROPERTY_INFO_FLAGS_NONE = 0,
-  G_DBUS_PROPERTY_INFO_FLAGS_READABLE = (1<<0),
-  G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1)
-} GDBusPropertyInfoFlags;
-
-/**
- * GDBusSubtreeFlags:
- * @G_DBUS_SUBTREE_FLAGS_NONE: No flags set.
- * @G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES: Method calls to objects not in the enumerated range
- *                                                       will still be dispatched. This is useful if you want
- *                                                       to dynamically spawn objects in the subtree.
- *
- * Flags passed to g_dbus_connection_register_subtree().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SUBTREE_FLAGS_NONE = 0,
-  G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0)
-} GDBusSubtreeFlags;
-
-/**
- * GDBusServerFlags:
- * @G_DBUS_SERVER_FLAGS_NONE: No flags set.
- * @G_DBUS_SERVER_FLAGS_RUN_IN_THREAD: All #GDBusServer::new-connection
- * signals will run in separated dedicated threads (see signal for
- * details).
- * @G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS: Allow the anonymous
- * authentication method.
- *
- * Flags used when creating a #GDBusServer.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SERVER_FLAGS_NONE = 0,
-  G_DBUS_SERVER_FLAGS_RUN_IN_THREAD = (1<<0),
-  G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<1)
-} GDBusServerFlags;
-
-/**
- * GDBusSignalFlags:
- * @G_DBUS_SIGNAL_FLAGS_NONE: No flags set.
- * @G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE: Don't actually send the AddMatch
- * D-Bus call for this signal subscription.  This gives you more control
- * over which match rules you add (but you must add them manually).
- *
- * Flags used when subscribing to signals via g_dbus_connection_signal_subscribe().
- *
- * Since: 2.26
- */
-typedef enum /*< flags >*/
-{
-  G_DBUS_SIGNAL_FLAGS_NONE = 0,
-  G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE = (1<<0)
-} GDBusSignalFlags;
-
-/**
- * GDBusSendMessageFlags:
- * @G_DBUS_SEND_MESSAGE_FLAGS_NONE: No flags set.
- * @G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL: Do not automatically
- * assign a serial number from the #GDBusConnection object when
- * sending a message.
- *
- * Flags used when sending #GDBusMessage<!-- -->s on a #GDBusConnection.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SEND_MESSAGE_FLAGS_NONE = 0,
-  G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL = (1<<0)
-} GDBusSendMessageFlags;
-/* (1<<31) is reserved for internal use by GDBusConnection, do not use it. */
-
-/**
- * GCredentialsType:
- * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type.
- * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>.
- * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
- * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
- *
- * Enumeration describing different kinds of native credential types.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_CREDENTIALS_TYPE_INVALID,
-  G_CREDENTIALS_TYPE_LINUX_UCRED,
-  G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-  G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED
-} GCredentialsType;
-
-/**
- * GDBusMessageByteOrder:
- * @G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN: The byte order is big endian.
- * @G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN: The byte order is little endian.
- *
- * Enumeration used to describe the byte order of a D-Bus message.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN    = 'B',
-  G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN = 'l'
-} GDBusMessageByteOrder;
-
-/**
- * GApplicationFlags:
- * @G_APPLICATION_FLAGS_NONE: Default
- * @G_APPLICATION_IS_SERVICE: Run as a service. In this mode, registration
- *      fails if the service is already running, and the application will
- *      stay around for a while when the use count falls to zero.
- * @G_APPLICATION_IS_LAUNCHER: Don't try to become the primary instance.
- * @G_APPLICATION_HANDLES_OPEN: This application handles opening files (in
- *     the primary instance). Note that this flag only affects the default
- *     implementation of local_command_line(), and has no effect if
- *     %G_APPLICATION_HANDLES_COMMAND_LINE is given.
- *     See g_application_run() for details.
- * @G_APPLICATION_HANDLES_COMMAND_LINE: This application handles command line
- *     arguments (in the primary instance). Note that this flag only affect
- *     the default implementation of local_command_line().
- *     See g_application_run() for details.
- * @G_APPLICATION_SEND_ENVIRONMENT: Send the environment of the
- *     launching process to the primary instance. Set this flag if your
- *     application is expected to behave differently depending on certain
- *     environment variables. For instance, an editor might be expected
- *     to use the <envar>GIT_COMMITTER_NAME</envar> environment variable
- *     when editing a git commit message. The environment is available
- *     to the #GApplication::command-line signal handler, via
- *     g_application_command_line_getenv().
- * @G_APPLICATION_NON_UNIQUE: Make no attempts to do any of the typical
- *     single-instance application negotiation, even if the application
- *     ID is given.  The application neither attempts to become the
- *     owner of the application ID nor does it check if an existing
- *     owner already exists.  Everything occurs in the local process.
- *     Since: 2.30.
- *
- * Flags used to define the behaviour of a #GApplication.
- *
- * Since: 2.28
- **/
-typedef enum
-{
-  G_APPLICATION_FLAGS_NONE,
-  G_APPLICATION_IS_SERVICE  =          (1 << 0),
-  G_APPLICATION_IS_LAUNCHER =          (1 << 1),
-
-  G_APPLICATION_HANDLES_OPEN =         (1 << 2),
-  G_APPLICATION_HANDLES_COMMAND_LINE = (1 << 3),
-  G_APPLICATION_SEND_ENVIRONMENT    =  (1 << 4),
-
-  G_APPLICATION_NON_UNIQUE =           (1 << 5)
-} GApplicationFlags;
-
-/**
- * GTlsError:
- * @G_TLS_ERROR_UNAVAILABLE: No TLS provider is available
- * @G_TLS_ERROR_MISC: Miscellaneous TLS error
- * @G_TLS_ERROR_BAD_CERTIFICATE: A certificate could not be parsed
- * @G_TLS_ERROR_NOT_TLS: The TLS handshake failed because the
- *   peer does not seem to be a TLS server.
- * @G_TLS_ERROR_HANDSHAKE: The TLS handshake failed because the
- *   peer's certificate was not acceptable.
- * @G_TLS_ERROR_CERTIFICATE_REQUIRED: The TLS handshake failed because
- *   the server requested a client-side certificate, but none was
- *   provided. See g_tls_connection_set_certificate().
- * @G_TLS_ERROR_EOF: The TLS connection was closed without proper
- *   notice, which may indicate an attack. See
- *   g_tls_connection_set_require_close_notify().
- *
- * An error code used with %G_TLS_ERROR in a #GError returned from a
- * TLS-related routine.
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_ERROR_UNAVAILABLE,
-  G_TLS_ERROR_MISC,
-  G_TLS_ERROR_BAD_CERTIFICATE,
-  G_TLS_ERROR_NOT_TLS,
-  G_TLS_ERROR_HANDSHAKE,
-  G_TLS_ERROR_CERTIFICATE_REQUIRED,
-  G_TLS_ERROR_EOF
-} GTlsError;
-
-/**
- * GTlsCertificateFlags:
- * @G_TLS_CERTIFICATE_UNKNOWN_CA: The signing certificate authority is
- *   not known.
- * @G_TLS_CERTIFICATE_BAD_IDENTITY: The certificate does not match the
- *   expected identity of the site that it was retrieved from.
- * @G_TLS_CERTIFICATE_NOT_ACTIVATED: The certificate's activation time
- *   is still in the future
- * @G_TLS_CERTIFICATE_EXPIRED: The certificate has expired
- * @G_TLS_CERTIFICATE_REVOKED: The certificate has been revoked
- *   according to the #GTlsConnection's certificate revocation list.
- * @G_TLS_CERTIFICATE_INSECURE: The certificate's algorithm is
- *   considered insecure.
- * @G_TLS_CERTIFICATE_GENERIC_ERROR: Some other error occurred validating
- *   the certificate
- * @G_TLS_CERTIFICATE_VALIDATE_ALL: the combination of all of the above
- *   flags
- *
- * A set of flags describing TLS certification validation. This can be
- * used to set which validation steps to perform (eg, with
- * g_tls_client_connection_set_validation_flags()), or to describe why
- * a particular certificate was rejected (eg, in
- * #GTlsConnection::accept-certificate).
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_CERTIFICATE_UNKNOWN_CA    = (1 << 0),
-  G_TLS_CERTIFICATE_BAD_IDENTITY  = (1 << 1),
-  G_TLS_CERTIFICATE_NOT_ACTIVATED = (1 << 2),
-  G_TLS_CERTIFICATE_EXPIRED       = (1 << 3),
-  G_TLS_CERTIFICATE_REVOKED       = (1 << 4),
-  G_TLS_CERTIFICATE_INSECURE      = (1 << 5),
-  G_TLS_CERTIFICATE_GENERIC_ERROR = (1 << 6),
-
-  G_TLS_CERTIFICATE_VALIDATE_ALL  = 0x007f
-} GTlsCertificateFlags;
-
-/**
- * GTlsAuthenticationMode:
- * @G_TLS_AUTHENTICATION_NONE: client authentication not required
- * @G_TLS_AUTHENTICATION_REQUESTED: client authentication is requested
- * @G_TLS_AUTHENTICATION_REQUIRED: client authentication is required
- *
- * The client authentication mode for a #GTlsServerConnection.
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_AUTHENTICATION_NONE,
-  G_TLS_AUTHENTICATION_REQUESTED,
-  G_TLS_AUTHENTICATION_REQUIRED
-} GTlsAuthenticationMode;
-
-/**
- * GTlsRehandshakeMode:
- * @G_TLS_REHANDSHAKE_NEVER: Never allow rehandshaking
- * @G_TLS_REHANDSHAKE_SAFELY: Allow safe rehandshaking only
- * @G_TLS_REHANDSHAKE_UNSAFELY: Allow unsafe rehandshaking
- *
- * When to allow rehandshaking. See
- * g_tls_connection_set_rehandshake_mode().
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_REHANDSHAKE_NEVER,
-  G_TLS_REHANDSHAKE_SAFELY,
-  G_TLS_REHANDSHAKE_UNSAFELY
-} GTlsRehandshakeMode;
-
-/**
- * GTlsPasswordFlags:
- * @G_TLS_PASSWORD_NONE: No flags
- * @G_TLS_PASSWORD_RETRY: The password was wrong, and the user should retry.
- * @G_TLS_PASSWORD_MANY_TRIES: Hint to the user that the password has been
- *    wrong many times, and the user may not have many chances left.
- * @G_TLS_PASSWORD_FINAL_TRY: Hint to the user that this is the last try to get
- *    this password right.
- *
- * Various flags for the password.
- *
- * Since: 2.30
- */
-
-typedef enum _GTlsPasswordFlags
-{
-  G_TLS_PASSWORD_NONE = 0,
-  G_TLS_PASSWORD_RETRY = 1 << 1,
-  G_TLS_PASSWORD_MANY_TRIES = 1 << 2,
-  G_TLS_PASSWORD_FINAL_TRY = 1 << 3
-} GTlsPasswordFlags;
-
-/**
- * GTlsInteractionResult:
- * @G_TLS_INTERACTION_UNHANDLED: The interaction was unhandled (i.e. not
- *     implemented).
- * @G_TLS_INTERACTION_HANDLED: The interaction completed, and resulting data
- *     is available.
- * @G_TLS_INTERACTION_FAILED: The interaction has failed, or was cancelled.
- *     and the operation should be aborted.
- *
- * #GTlsInteractionResult is returned by various functions in #GTlsInteraction
- * when finishing an interaction request.
- *
- * Since: 2.30
- */
-typedef enum {
-  G_TLS_INTERACTION_UNHANDLED,
-  G_TLS_INTERACTION_HANDLED,
-  G_TLS_INTERACTION_FAILED
-} GTlsInteractionResult;
-
-/**
- * GDBusInterfaceSkeletonFlags:
- * @G_DBUS_INTERFACE_SKELETON_FLAGS_NONE: No flags set.
- * @G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD: Each method invocation is handled in
- *   a thread dedicated to the invocation. This means that the method implementation can use blocking IO
- *   without blocking any other part of the process. It also means that the method implementation must
- *   use locking to access data structures used by other threads.
- *
- * Flags describing the behavior of a #GDBusInterfaceSkeleton instance.
- *
- * Since: 2.30
- */
-typedef enum
-{
-  G_DBUS_INTERFACE_SKELETON_FLAGS_NONE = 0,
-  G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD = (1<<0)
-} GDBusInterfaceSkeletonFlags;
-
-/**
- * GDBusObjectManagerClientFlags:
- * @G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE: No flags set.
- * @G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START: If not set and the
- *   manager is for a well-known name, then request the bus to launch
- *   an owner for the name if no-one owns the name. This flag can only
- *   be used in managers for well-known names.
- *
- * Flags used when constructing a #GDBusObjectManagerClient.
- *
- * Since: 2.30
- */
-typedef enum
-{
-  G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE = 0,
-  G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START = (1<<0)
-} GDBusObjectManagerClientFlags;
-
-/**
- * GTlsDatabaseVerifyFlags:
- * @G_TLS_DATABASE_VERIFY_NONE: No verification flags
- *
- * Flags for g_tls_database_verify_chain().
- *
- * Since: 2.30
- */
-typedef enum /*< flags >*/ {
-  G_TLS_DATABASE_VERIFY_NONE = 0
-} GTlsDatabaseVerifyFlags;
-
-/**
- * GTlsDatabaseLookupFlags:
- * @G_TLS_DATABASE_LOOKUP_NONE: No lookup flags
- * @G_TLS_DATABASE_LOOKUP_KEYPAIR: Restrict lookup to certificates that have
- *     a private key.
- *
- * Flags for g_tls_database_lookup_certificate_handle(),
- * g_tls_database_lookup_certificate_issuer(),
- * and g_tls_database_lookup_certificates_issued_by().
- *
- * Since: 2.30
- */
-typedef enum {
-  G_TLS_DATABASE_LOOKUP_NONE = 0,
-  G_TLS_DATABASE_LOOKUP_KEYPAIR = 1
-} GTlsDatabaseLookupFlags;
-
-/**
- * GIOModuleScopeFlags:
- * @G_IO_MODULE_SCOPE_NONE: No module scan flags
- * @G_IO_MODULE_SCOPE_BLOCK_DUPLICATES: When using this scope to load or
- *     scan modules, automatically block a modules which has the same base
- *     basename as previously loaded module.
- *
- * Flags for use with g_io_module_scope_new().
- *
- * Since: 2.30
- */
-typedef enum {
-  G_IO_MODULE_SCOPE_NONE,
-  G_IO_MODULE_SCOPE_BLOCK_DUPLICATES
-} GIOModuleScopeFlags;
-
-/**
- * GSocketClientEvent:
- * @G_SOCKET_CLIENT_RESOLVING: The client is doing a DNS lookup.
- * @G_SOCKET_CLIENT_RESOLVED: The client has completed a DNS lookup.
- * @G_SOCKET_CLIENT_CONNECTING: The client is connecting to a remote
- *   host (either a proxy or the destination server).
- * @G_SOCKET_CLIENT_CONNECTED: The client has connected to a remote
- *   host.
- * @G_SOCKET_CLIENT_PROXY_NEGOTIATING: The client is negotiating
- *   with a proxy to connect to the destination server.
- * @G_SOCKET_CLIENT_PROXY_NEGOTIATED: The client has negotiated
- *   with the proxy server.
- * @G_SOCKET_CLIENT_TLS_HANDSHAKING: The client is performing a
- *   TLS handshake.
- * @G_SOCKET_CLIENT_TLS_HANDSHAKED: The client has performed a
- *   TLS handshake.
- * @G_SOCKET_CLIENT_COMPLETE: The client is done with a particular
- *   #GSocketConnectable.
- *
- * Describes an event occurring on a #GSocketClient. See the
- * #GSocketClient::event signal for more details.
- *
- * Additional values may be added to this type in the future.
- *
- * Since: 2.32
- */
-typedef enum {
-  G_SOCKET_CLIENT_RESOLVING,
-  G_SOCKET_CLIENT_RESOLVED,
-  G_SOCKET_CLIENT_CONNECTING,
-  G_SOCKET_CLIENT_CONNECTED,
-  G_SOCKET_CLIENT_PROXY_NEGOTIATING,
-  G_SOCKET_CLIENT_PROXY_NEGOTIATED,
-  G_SOCKET_CLIENT_TLS_HANDSHAKING,
-  G_SOCKET_CLIENT_TLS_HANDSHAKED,
-  G_SOCKET_CLIENT_COMPLETE
-} GSocketClientEvent;
-
-/**
- * GTestDBusFlags:
- * @G_TEST_DBUS_NONE: No flags.
- *
- * Flags to define future #GTestDBus behaviour.
- *
- * Since: 2.34
- */
-typedef enum /*< flags >*/ {
-  G_TEST_DBUS_NONE = 0
-} GTestDBusFlags;
-
-G_END_DECLS
-
-#endif /* __GIO_ENUMS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gioenumtypes.h b/GstreamerHelper/x64/include/glib-2.0/gio/gioenumtypes.h
deleted file mode 100644
index 70b2630e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gioenumtypes.h
+++ /dev/null
@@ -1,159 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GIO_ENUM_TYPES_H__
-#define __GIO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "gioenums.h" */
-GType g_app_info_create_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_APP_INFO_CREATE_FLAGS (g_app_info_create_flags_get_type ())
-GType g_converter_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CONVERTER_FLAGS (g_converter_flags_get_type ())
-GType g_converter_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CONVERTER_RESULT (g_converter_result_get_type ())
-GType g_data_stream_byte_order_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DATA_STREAM_BYTE_ORDER (g_data_stream_byte_order_get_type ())
-GType g_data_stream_newline_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DATA_STREAM_NEWLINE_TYPE (g_data_stream_newline_type_get_type ())
-GType g_file_attribute_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_TYPE (g_file_attribute_type_get_type ())
-GType g_file_attribute_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS (g_file_attribute_info_flags_get_type ())
-GType g_file_attribute_status_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_STATUS (g_file_attribute_status_get_type ())
-GType g_file_query_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_QUERY_INFO_FLAGS (g_file_query_info_flags_get_type ())
-GType g_file_create_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_CREATE_FLAGS (g_file_create_flags_get_type ())
-GType g_mount_mount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_MOUNT_FLAGS (g_mount_mount_flags_get_type ())
-GType g_mount_unmount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_UNMOUNT_FLAGS (g_mount_unmount_flags_get_type ())
-GType g_drive_start_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DRIVE_START_FLAGS (g_drive_start_flags_get_type ())
-GType g_drive_start_stop_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DRIVE_START_STOP_TYPE (g_drive_start_stop_type_get_type ())
-GType g_file_copy_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_COPY_FLAGS (g_file_copy_flags_get_type ())
-GType g_file_monitor_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_FLAGS (g_file_monitor_flags_get_type ())
-GType g_file_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_TYPE (g_file_type_get_type ())
-GType g_filesystem_preview_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILESYSTEM_PREVIEW_TYPE (g_filesystem_preview_type_get_type ())
-GType g_file_monitor_event_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_EVENT (g_file_monitor_event_get_type ())
-GType g_io_error_enum_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_ERROR_ENUM (g_io_error_enum_get_type ())
-GType g_ask_password_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_ASK_PASSWORD_FLAGS (g_ask_password_flags_get_type ())
-GType g_password_save_get_type (void) G_GNUC_CONST;
-#define G_TYPE_PASSWORD_SAVE (g_password_save_get_type ())
-GType g_mount_operation_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_OPERATION_RESULT (g_mount_operation_result_get_type ())
-GType g_output_stream_splice_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_OUTPUT_STREAM_SPLICE_FLAGS (g_output_stream_splice_flags_get_type ())
-GType g_io_stream_splice_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_STREAM_SPLICE_FLAGS (g_io_stream_splice_flags_get_type ())
-GType g_emblem_origin_get_type (void) G_GNUC_CONST;
-#define G_TYPE_EMBLEM_ORIGIN (g_emblem_origin_get_type ())
-GType g_resolver_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOLVER_ERROR (g_resolver_error_get_type ())
-GType g_resolver_record_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOLVER_RECORD_TYPE (g_resolver_record_type_get_type ())
-GType g_resource_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_ERROR (g_resource_error_get_type ())
-GType g_resource_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_FLAGS (g_resource_flags_get_type ())
-GType g_resource_lookup_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_LOOKUP_FLAGS (g_resource_lookup_flags_get_type ())
-GType g_socket_family_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_FAMILY (g_socket_family_get_type ())
-GType g_socket_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_TYPE (g_socket_type_get_type ())
-GType g_socket_msg_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_MSG_FLAGS (g_socket_msg_flags_get_type ())
-GType g_socket_protocol_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_PROTOCOL (g_socket_protocol_get_type ())
-GType g_zlib_compressor_format_get_type (void) G_GNUC_CONST;
-#define G_TYPE_ZLIB_COMPRESSOR_FORMAT (g_zlib_compressor_format_get_type ())
-GType g_unix_socket_address_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_UNIX_SOCKET_ADDRESS_TYPE (g_unix_socket_address_type_get_type ())
-GType g_bus_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_TYPE (g_bus_type_get_type ())
-GType g_bus_name_owner_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_NAME_OWNER_FLAGS (g_bus_name_owner_flags_get_type ())
-GType g_bus_name_watcher_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_NAME_WATCHER_FLAGS (g_bus_name_watcher_flags_get_type ())
-GType g_dbus_proxy_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_PROXY_FLAGS (g_dbus_proxy_flags_get_type ())
-GType g_dbus_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_ERROR (g_dbus_error_get_type ())
-GType g_dbus_connection_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CONNECTION_FLAGS (g_dbus_connection_flags_get_type ())
-GType g_dbus_capability_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CAPABILITY_FLAGS (g_dbus_capability_flags_get_type ())
-GType g_dbus_call_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CALL_FLAGS (g_dbus_call_flags_get_type ())
-GType g_dbus_message_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_TYPE (g_dbus_message_type_get_type ())
-GType g_dbus_message_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_FLAGS (g_dbus_message_flags_get_type ())
-GType g_dbus_message_header_field_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_HEADER_FIELD (g_dbus_message_header_field_get_type ())
-GType g_dbus_property_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_PROPERTY_INFO_FLAGS (g_dbus_property_info_flags_get_type ())
-GType g_dbus_subtree_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SUBTREE_FLAGS (g_dbus_subtree_flags_get_type ())
-GType g_dbus_server_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SERVER_FLAGS (g_dbus_server_flags_get_type ())
-GType g_dbus_signal_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SIGNAL_FLAGS (g_dbus_signal_flags_get_type ())
-GType g_dbus_send_message_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SEND_MESSAGE_FLAGS (g_dbus_send_message_flags_get_type ())
-GType g_credentials_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CREDENTIALS_TYPE (g_credentials_type_get_type ())
-GType g_dbus_message_byte_order_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_BYTE_ORDER (g_dbus_message_byte_order_get_type ())
-GType g_application_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_APPLICATION_FLAGS (g_application_flags_get_type ())
-GType g_tls_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_ERROR (g_tls_error_get_type ())
-GType g_tls_certificate_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_CERTIFICATE_FLAGS (g_tls_certificate_flags_get_type ())
-GType g_tls_authentication_mode_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_AUTHENTICATION_MODE (g_tls_authentication_mode_get_type ())
-GType g_tls_rehandshake_mode_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_REHANDSHAKE_MODE (g_tls_rehandshake_mode_get_type ())
-GType g_tls_password_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_PASSWORD_FLAGS (g_tls_password_flags_get_type ())
-GType g_tls_interaction_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_INTERACTION_RESULT (g_tls_interaction_result_get_type ())
-GType g_dbus_interface_skeleton_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_INTERFACE_SKELETON_FLAGS (g_dbus_interface_skeleton_flags_get_type ())
-GType g_dbus_object_manager_client_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_OBJECT_MANAGER_CLIENT_FLAGS (g_dbus_object_manager_client_flags_get_type ())
-GType g_tls_database_verify_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_DATABASE_VERIFY_FLAGS (g_tls_database_verify_flags_get_type ())
-GType g_tls_database_lookup_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_DATABASE_LOOKUP_FLAGS (g_tls_database_lookup_flags_get_type ())
-GType g_io_module_scope_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_MODULE_SCOPE_FLAGS (g_io_module_scope_flags_get_type ())
-GType g_socket_client_event_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_CLIENT_EVENT (g_socket_client_event_get_type ())
-GType g_test_dbus_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TEST_DBUS_FLAGS (g_test_dbus_flags_get_type ())
-
-/* enumerations from "gsettings.h" */
-GType g_settings_bind_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SETTINGS_BIND_FLAGS (g_settings_bind_flags_get_type ())
-G_END_DECLS
-
-#endif /* __GIO_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gioerror.h b/GstreamerHelper/x64/include/glib-2.0/gio/gioerror.h
deleted file mode 100644
index 12c2b062..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gioerror.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_ERROR_H__
-#define __G_IO_ERROR_H__
-
-#include <glib.h>
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_IO_ERROR:
- *
- * Error domain for GIO. Errors in this domain will be from the #GIOErrorEnum enumeration.
- * See #GError for more information on error domains.
- **/
-#define G_IO_ERROR g_io_error_quark()
-
-GQuark       g_io_error_quark      (void);
-GIOErrorEnum g_io_error_from_errno (gint err_no);
-
-#ifdef G_OS_WIN32
-GIOErrorEnum g_io_error_from_win32_error (gint error_code);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IO_ERROR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/giomodule.h b/GstreamerHelper/x64/include/glib-2.0/gio/giomodule.h
deleted file mode 100644
index e98dd9d2..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/giomodule.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_MODULE_H__
-#define __G_IO_MODULE_H__
-
-#include <gio/giotypes.h>
-#include <gmodule.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GIOModuleScope GIOModuleScope;
-
-GIOModuleScope *   g_io_module_scope_new     (GIOModuleScopeFlags  flags);
-void               g_io_module_scope_free    (GIOModuleScope      *scope);
-void               g_io_module_scope_block   (GIOModuleScope      *scope,
-                                              const gchar         *basename);
-
-#define G_IO_TYPE_MODULE         (g_io_module_get_type ())
-#define G_IO_MODULE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_IO_TYPE_MODULE, GIOModule))
-#define G_IO_MODULE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_IO_TYPE_MODULE, GIOModuleClass))
-#define G_IO_IS_MODULE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_IO_TYPE_MODULE))
-#define G_IO_IS_MODULE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_IO_TYPE_MODULE))
-#define G_IO_MODULE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_IO_TYPE_MODULE, GIOModuleClass))
-
-/**
- * GIOModule:
- *
- * Opaque module base class for extending GIO.
- **/
-typedef struct _GIOModuleClass GIOModuleClass;
-
-GType              g_io_module_get_type                       (void) G_GNUC_CONST;
-GIOModule         *g_io_module_new                            (const gchar       *filename);
-
-void               g_io_modules_scan_all_in_directory         (const char        *dirname);
-GList             *g_io_modules_load_all_in_directory         (const gchar       *dirname);
-
-void               g_io_modules_scan_all_in_directory_with_scope   (const gchar       *dirname,
-                                                                    GIOModuleScope    *scope);
-GList             *g_io_modules_load_all_in_directory_with_scope   (const gchar       *dirname,
-                                                                    GIOModuleScope    *scope);
-
-gboolean              g_io_module_load_static_module              (const char *name);
-
-GIOExtensionPoint *g_io_extension_point_register              (const char        *name);
-GIOExtensionPoint *g_io_extension_point_lookup                (const char        *name);
-void               g_io_extension_point_set_required_type     (GIOExtensionPoint *extension_point,
-							       GType              type);
-GType              g_io_extension_point_get_required_type     (GIOExtensionPoint *extension_point);
-GList             *g_io_extension_point_get_extensions        (GIOExtensionPoint *extension_point);
-GIOExtension *     g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point,
-							       const char        *name);
-GIOExtension *     g_io_extension_point_implement             (const char        *extension_point_name,
-							       GType              type,
-							       const char        *extension_name,
-							       gint               priority);
-
-GType              g_io_extension_get_type                    (GIOExtension      *extension);
-const char *       g_io_extension_get_name                    (GIOExtension      *extension);
-gint               g_io_extension_get_priority                (GIOExtension      *extension);
-GTypeClass*        g_io_extension_ref_class                   (GIOExtension      *extension);
-
-
-/* API for the modules to implement */
-
-/**
- * g_io_module_load:
- * @module: a #GIOModule.
- *
- * Required API for GIO modules to implement.
- * This function is ran after the module has been loaded into GIO,
- * to initialize the module.
- **/
-void   g_io_module_load   (GIOModule *module);
-
-/**
- * g_io_module_unload:
- * @module: a #GIOModule.
- *
- * Required API for GIO modules to implement.
- * This function is ran when the module is being unloaded from GIO,
- * to finalize the module.
- **/
-void   g_io_module_unload (GIOModule *module);
-
-/**
- * g_io_module_query:
- *
- * Optional API for GIO modules to implement.
- *
- * Should return a list of all the extension points that may be
- * implemented in this module.
- *
- * This method will not be called in normal use, however it may be
- * called when probing existing modules and recording which extension
- * points that this model is used for. This means we won't have to
- * load and initialze this module unless its needed.
- *
- * If this function is not implemented by the module the module will
- * always be loaded, initialized and then unloaded on application startup
- * so that it can register its extension points during init.
- *
- * Note that a module need not actually implement all the extension points
- * that g_io_module_query returns, since the exact list of extension may
- * depend on runtime issues. However all extension points actually implemented
- * must be returned by g_io_module_query() (if defined).
- *
- * When installing a module that implements g_io_module_query you must
- * run gio-querymodules in order to build the cache files required for
- * lazy loading.
- *
- * Returns: (transfer full): A %NULL-terminated array of strings, listing the supported
- *     extension points of the module. The array must be suitable for
- *     freeing with g_strfreev().
- *
- * Since: 2.24
- **/
-char **g_io_module_query (void);
-
-#define G_IO_MODULE_DECLARE(name) \
-extern gboolean G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void);
-
-#define G_IO_MODULE_LOAD(name) \
-G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
-
-#ifdef G_IO_MODULE_BUILD_STATIC
-#define G_IO_MODULE_DEFINE(name) \
-G_BEGIN_DECLS \
-void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void); \
-void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void) \
-{g_io_module_load_static_module (#name);} \
-void G_PASTE(g_io_module_, G_PASTE(name, _load)) (GIOModule *module); \
-void G_PASTE(g_io_module_, G_PASTE(name, _unload)) (GIOModule *module); \
-gchar ** G_PASTE(g_io_module_, G_PASTE(name, _query)) (void); \
-void G_PASTE(g_io_module_, G_PASTE(name, _load)) (GIOModule *module) \
-{_g_io_module_load(module);} \
-void G_PASTE(g_io_module_, G_PASTE(name, _unload)) (GIOModule *module) \
-{_g_io_module_unload(module);} \
-gchar ** G_PASTE(g_io_module_, G_PASTE(name, _query)) (void) \
-{return _g_io_module_query();} \
-G_END_DECLS
-#else
-#define G_IO_MODULE_DEFINE(name) \
-G_BEGIN_DECLS \
-g_io_module_load(GIOModule *module) { _g_io_module_load(module);} \
-g_io_module_unload(GIOModule *module) { _g_io_module_unload(module);} \
-gchar ** g_io_module_query(void) {return _g_io_module_query();} \
-G_END_DECLS
-#endif
-
-G_END_DECLS
-#endif /* __G_IO_MODULE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gioscheduler.h b/GstreamerHelper/x64/include/glib-2.0/gio/gioscheduler.h
deleted file mode 100644
index 7d6b5273..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gioscheduler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_SCHEDULER_H__
-#define __G_IO_SCHEDULER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-void     g_io_scheduler_push_job                   (GIOSchedulerJobFunc  job_func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify,
-						    gint                 io_priority,
-						    GCancellable        *cancellable);
-void     g_io_scheduler_cancel_all_jobs            (void);
-gboolean g_io_scheduler_job_send_to_mainloop       (GIOSchedulerJob     *job,
-						    GSourceFunc          func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify);
-void     g_io_scheduler_job_send_to_mainloop_async (GIOSchedulerJob     *job,
-						    GSourceFunc          func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify);
-
-G_END_DECLS
-
-#endif /* __G_IO_SCHEDULER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/giostream.h b/GstreamerHelper/x64/include/glib-2.0/gio/giostream.h
deleted file mode 100644
index 90283ddb..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/giostream.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * See the included COPYING file for more information.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_STREAM_H__
-#define __G_IO_STREAM_H__
-
-#include <gio/ginputstream.h>
-#include <gio/goutputstream.h>
-#include <gio/gcancellable.h>
-#include <gio/gioerror.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_IO_STREAM         (g_io_stream_get_type ())
-#define G_IO_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_IO_STREAM, GIOStream))
-#define G_IO_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_IO_STREAM, GIOStreamClass))
-#define G_IS_IO_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_IO_STREAM))
-#define G_IS_IO_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_IO_STREAM))
-#define G_IO_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_IO_STREAM, GIOStreamClass))
-
-typedef struct _GIOStreamPrivate                            GIOStreamPrivate;
-typedef struct _GIOStreamClass                              GIOStreamClass;
-
-/**
- * GIOStream:
- *
- * Base class for read-write streams.
- **/
-struct _GIOStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GIOStreamPrivate *priv;
-};
-
-struct _GIOStreamClass
-{
-  GObjectClass parent_class;
-
-  GInputStream *  (*get_input_stream)  (GIOStream *stream);
-  GOutputStream * (*get_output_stream) (GIOStream *stream);
-
-  gboolean (* close_fn)	    (GIOStream           *stream,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  void     (* close_async)  (GIOStream           *stream,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gboolean (* close_finish) (GIOStream           *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-  void (*_g_reserved10) (void);
-};
-
-GType          g_io_stream_get_type          (void)  G_GNUC_CONST;
-
-GInputStream * g_io_stream_get_input_stream  (GIOStream            *stream);
-GOutputStream *g_io_stream_get_output_stream (GIOStream            *stream);
-
-void           g_io_stream_splice_async      (GIOStream            *stream1,
-					      GIOStream            *stream2,
-					      GIOStreamSpliceFlags  flags,
-					      int                   io_priority,
-					      GCancellable         *cancellable,
-					      GAsyncReadyCallback   callback,
-					      gpointer              user_data);
-
-gboolean       g_io_stream_splice_finish     (GAsyncResult         *result,
-                                              GError              **error);
-
-gboolean       g_io_stream_close             (GIOStream            *stream,
-					      GCancellable         *cancellable,
-					      GError              **error);
-
-void           g_io_stream_close_async       (GIOStream            *stream,
-					      int                   io_priority,
-					      GCancellable         *cancellable,
-					      GAsyncReadyCallback   callback,
-					      gpointer              user_data);
-gboolean       g_io_stream_close_finish      (GIOStream            *stream,
-					      GAsyncResult         *result,
-					      GError              **error);
-
-gboolean       g_io_stream_is_closed         (GIOStream            *stream);
-gboolean       g_io_stream_has_pending       (GIOStream            *stream);
-gboolean       g_io_stream_set_pending       (GIOStream            *stream,
-					      GError              **error);
-void           g_io_stream_clear_pending     (GIOStream            *stream);
-
-G_END_DECLS
-
-#endif /* __G_IO_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/giotypes.h b/GstreamerHelper/x64/include/glib-2.0/gio/giotypes.h
deleted file mode 100644
index 876d856c..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/giotypes.h
+++ /dev/null
@@ -1,472 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __GIO_TYPES_H__
-#define __GIO_TYPES_H__
-
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAppLaunchContext             GAppLaunchContext;
-typedef struct _GAppInfo                      GAppInfo; /* Dummy typedef */
-typedef struct _GAsyncResult                  GAsyncResult; /* Dummy typedef */
-typedef struct _GAsyncInitable                GAsyncInitable;
-typedef struct _GBufferedInputStream          GBufferedInputStream;
-typedef struct _GBufferedOutputStream         GBufferedOutputStream;
-typedef struct _GCancellable                  GCancellable;
-typedef struct _GCharsetConverter             GCharsetConverter;
-typedef struct _GConverter                    GConverter;
-typedef struct _GConverterInputStream         GConverterInputStream;
-typedef struct _GConverterOutputStream        GConverterOutputStream;
-typedef struct _GDataInputStream              GDataInputStream;
-typedef struct _GSimplePermission             GSimplePermission;
-typedef struct _GZlibCompressor               GZlibCompressor;
-typedef struct _GZlibDecompressor             GZlibDecompressor;
-
-typedef struct _GSimpleActionGroup            GSimpleActionGroup;
-typedef struct _GRemoteActionGroup            GRemoteActionGroup;
-typedef struct _GDBusActionGroup              GDBusActionGroup;
-typedef struct _GActionMap                    GActionMap;
-typedef struct _GActionGroup                  GActionGroup;
-typedef struct _GSimpleAction                 GSimpleAction;
-typedef struct _GAction                       GAction;
-typedef struct _GApplication                  GApplication;
-typedef struct _GApplicationCommandLine       GApplicationCommandLine;
-typedef struct _GSettingsBackend              GSettingsBackend;
-typedef struct _GSettings                     GSettings;
-typedef struct _GPermission                   GPermission;
-
-typedef struct _GMenuModel                    GMenuModel;
-
-/**
- * GDrive:
- *
- * Opaque drive object.
- **/
-typedef struct _GDrive                        GDrive; /* Dummy typedef */
-typedef struct _GFileEnumerator               GFileEnumerator;
-typedef struct _GFileMonitor                  GFileMonitor;
-typedef struct _GFilterInputStream            GFilterInputStream;
-typedef struct _GFilterOutputStream           GFilterOutputStream;
-
-/**
- * GFile:
- *
- * A handle to an object implementing the #GFileIface interface.
- * Generally stores a location within the file system. Handles do not
- * necessarily represent files or directories that currently exist.
- **/
-typedef struct _GFile                         GFile; /* Dummy typedef */
-typedef struct _GFileInfo                     GFileInfo;
-
-/**
- * GFileAttributeMatcher:
- *
- * Determines if a string matches a file attribute.
- **/
-typedef struct _GFileAttributeMatcher         GFileAttributeMatcher;
-typedef struct _GFileAttributeInfo            GFileAttributeInfo;
-typedef struct _GFileAttributeInfoList        GFileAttributeInfoList;
-typedef struct _GFileDescriptorBased          GFileDescriptorBased;
-typedef struct _GFileInputStream              GFileInputStream;
-typedef struct _GFileOutputStream             GFileOutputStream;
-typedef struct _GFileIOStream                 GFileIOStream;
-typedef struct _GFileIcon                     GFileIcon;
-typedef struct _GFilenameCompleter            GFilenameCompleter;
-
-
-typedef struct _GIcon                         GIcon; /* Dummy typedef */
-typedef struct _GInetAddress                  GInetAddress;
-typedef struct _GInetAddressMask              GInetAddressMask;
-typedef struct _GInetSocketAddress            GInetSocketAddress;
-typedef struct _GInputStream                  GInputStream;
-typedef struct _GInitable                     GInitable;
-typedef struct _GIOModule                     GIOModule;
-typedef struct _GIOExtensionPoint             GIOExtensionPoint;
-typedef struct _GIOExtension                  GIOExtension;
-
-/**
- * GIOSchedulerJob:
- *
- * Opaque class for defining and scheduling IO jobs.
- **/
-typedef struct _GIOSchedulerJob               GIOSchedulerJob;
-typedef struct _GIOStreamAdapter              GIOStreamAdapter;
-typedef struct _GLoadableIcon                 GLoadableIcon; /* Dummy typedef */
-typedef struct _GMemoryInputStream            GMemoryInputStream;
-typedef struct _GMemoryOutputStream           GMemoryOutputStream;
-
-/**
- * GMount:
- *
- * A handle to an object implementing the #GMountIface interface.
- **/
-typedef struct _GMount                        GMount; /* Dummy typedef */
-typedef struct _GMountOperation               GMountOperation;
-typedef struct _GNetworkAddress               GNetworkAddress;
-typedef struct _GNetworkMonitor               GNetworkMonitor;
-typedef struct _GNetworkService               GNetworkService;
-typedef struct _GOutputStream                 GOutputStream;
-typedef struct _GIOStream                     GIOStream;
-typedef struct _GPollableInputStream          GPollableInputStream; /* Dummy typedef */
-typedef struct _GPollableOutputStream         GPollableOutputStream; /* Dummy typedef */
-typedef struct _GResolver                     GResolver;
-/**
- * GResource:
- *
- * A resource bundle.
- *
- * Since: 2.32
- */
-typedef struct _GResource                     GResource;
-typedef struct _GSeekable                     GSeekable;
-typedef struct _GSimpleAsyncResult            GSimpleAsyncResult;
-
-/**
- * GSocket:
- *
- * A lowlevel network socket object.
- *
- * Since: 2.22
- **/
-typedef struct _GSocket                       GSocket;
-
-/**
- * GSocketControlMessage:
- *
- * Base class for socket-type specific control messages that can be sent and
- * received over #GSocket.
- **/
-typedef struct _GSocketControlMessage         GSocketControlMessage;
-/**
- * GSocketClient:
- *
- * A helper class for network clients to make connections.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketClient                               GSocketClient;
-/**
- * GSocketConnection:
- *
- * A socket connection GIOStream object for connection-oriented sockets.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketConnection                           GSocketConnection;
-/**
- * GSocketListener:
- *
- * A helper class for network servers to listen for and accept connections.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketListener                             GSocketListener;
-/**
- * GSocketService:
- *
- * A helper class for handling accepting incomming connections in the
- * glib mainloop.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketService                              GSocketService;
-typedef struct _GSocketAddress                GSocketAddress;
-typedef struct _GSocketAddressEnumerator      GSocketAddressEnumerator;
-typedef struct _GSocketConnectable            GSocketConnectable;
-typedef struct _GSrvTarget                    GSrvTarget;
-/**
- * GTcpConnection:
- *
- * A #GSocketConnection for TCP/IP connections.
- *
- * Since: 2.22
- **/
-typedef struct _GTcpConnection                              GTcpConnection;
-typedef struct _GTcpWrapperConnection                       GTcpWrapperConnection;
-/**
- * GThreadedSocketService:
- *
- * A helper class for handling accepting incoming connections in the
- * glib mainloop and handling them in a thread.
- *
- * Since: 2.22
- **/
-typedef struct _GThreadedSocketService                      GThreadedSocketService;
-typedef struct _GThemedIcon                   GThemedIcon;
-typedef struct _GTlsCertificate               GTlsCertificate;
-typedef struct _GTlsClientConnection          GTlsClientConnection; /* Dummy typedef */
-typedef struct _GTlsConnection                GTlsConnection;
-typedef struct _GTlsDatabase                  GTlsDatabase;
-typedef struct _GTlsFileDatabase              GTlsFileDatabase;
-typedef struct _GTlsInteraction               GTlsInteraction;
-typedef struct _GTlsPassword                  GTlsPassword;
-typedef struct _GTlsServerConnection          GTlsServerConnection; /* Dummy typedef */
-typedef struct _GVfs                          GVfs; /* Dummy typedef */
-
-/**
- * GProxyResolver:
- *
- * A helper class to enumerate proxies base on URI.
- *
- * Since: 2.26
- **/
-typedef struct _GProxyResolver                GProxyResolver;
-typedef struct _GProxy			      GProxy;
-typedef struct _GProxyAddress		      GProxyAddress;
-typedef struct _GProxyAddressEnumerator	      GProxyAddressEnumerator;
-
-/**
- * GVolume:
- *
- * Opaque mountable volume object.
- **/
-typedef struct _GVolume                       GVolume; /* Dummy typedef */
-typedef struct _GVolumeMonitor                GVolumeMonitor;
-
-/**
- * GAsyncReadyCallback:
- * @source_object: the object the asynchronous operation was started with.
- * @res: a #GAsyncResult.
- * @user_data: user data passed to the callback.
- *
- * Type definition for a function that will be called back when an asynchronous
- * operation within GIO has been completed.
- **/
-typedef void (*GAsyncReadyCallback) (GObject *source_object,
-				     GAsyncResult *res,
-				     gpointer user_data);
-
-/**
- * GFileProgressCallback:
- * @current_num_bytes: the current number of bytes in the operation.
- * @total_num_bytes: the total number of bytes in the operation.
- * @user_data: user data passed to the callback.
- *
- * When doing file operations that may take a while, such as moving
- * a file or copying a file, a progress callback is used to pass how
- * far along that operation is to the application.
- **/
-typedef void (*GFileProgressCallback) (goffset current_num_bytes,
-                                       goffset total_num_bytes,
-                                       gpointer user_data);
-
-/**
- * GFileReadMoreCallback:
- * @file_contents: the data as currently read.
- * @file_size: the size of the data currently read.
- * @callback_data: data passed to the callback.
- *
- * When loading the partial contents of a file with g_file_load_partial_contents_async(),
- * it may become necessary to determine if any more data from the file should be loaded.
- * A #GFileReadMoreCallback function facilitates this by returning %TRUE if more data
- * should be read, or %FALSE otherwise.
- *
- * Returns: %TRUE if more data should be read back. %FALSE otherwise.
- **/
-typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
-                                            goffset file_size,
-                                            gpointer callback_data);
-
-
-/**
- * GIOSchedulerJobFunc:
- * @job: a #GIOSchedulerJob.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @user_data: the data to pass to callback function
- *
- * I/O Job function.
- *
- * Long-running jobs should periodically check the @cancellable
- * to see if they have been cancelled.
- *
- * Returns: %TRUE if this function should be called again to
- *    complete the job, %FALSE if the job is complete (or cancelled)
- **/
-typedef gboolean (*GIOSchedulerJobFunc) (GIOSchedulerJob *job,
-					 GCancellable    *cancellable,
-					 gpointer         user_data);
-
-/**
- * GSimpleAsyncThreadFunc:
- * @res: a #GSimpleAsyncResult.
- * @object: a #GObject.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- *
- * Simple thread function that runs an asynchronous operation and
- * checks for cancellation.
- **/
-typedef void (*GSimpleAsyncThreadFunc) (GSimpleAsyncResult *res,
-                                        GObject *object,
-                                        GCancellable *cancellable);
-
-/**
- * GSocketSourceFunc:
- * @socket: the #GSocket
- * @condition: the current condition at the source fired.
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_socket_create_source().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.22
- */
-typedef gboolean (*GSocketSourceFunc) (GSocket *socket,
-				       GIOCondition condition,
-				       gpointer user_data);
-
-/**
- * GInputVector:
- * @buffer: Pointer to a buffer where data will be written.
- * @size: the available size in @buffer.
- *
- * Structure used for scatter/gather data input.
- * You generally pass in an array of #GInputVector<!-- -->s
- * and the operation will store the read data starting in the
- * first buffer, switching to the next as needed.
- *
- * Since: 2.22
- */
-typedef struct _GInputVector GInputVector;
-
-struct _GInputVector {
-  gpointer buffer;
-  gsize size;
-};
-
-/**
- * GOutputVector:
- * @buffer: Pointer to a buffer of data to read.
- * @size: the size of @buffer.
- *
- * Structure used for scatter/gather data output.
- * You generally pass in an array of #GOutputVector<!-- -->s
- * and the operation will use all the buffers as if they were
- * one buffer.
- *
- * Since: 2.22
- */
-typedef struct _GOutputVector GOutputVector;
-
-struct _GOutputVector {
-  gconstpointer buffer;
-  gsize size;
-};
-
-typedef struct _GCredentials                  GCredentials;
-typedef struct _GUnixCredentialsMessage       GUnixCredentialsMessage;
-typedef struct _GUnixFDList                   GUnixFDList;
-typedef struct _GDBusMessage                  GDBusMessage;
-typedef struct _GDBusConnection               GDBusConnection;
-typedef struct _GDBusProxy                    GDBusProxy;
-typedef struct _GDBusMethodInvocation         GDBusMethodInvocation;
-typedef struct _GDBusServer                   GDBusServer;
-typedef struct _GDBusAuthObserver             GDBusAuthObserver;
-typedef struct _GDBusErrorEntry               GDBusErrorEntry;
-typedef struct _GDBusInterfaceVTable          GDBusInterfaceVTable;
-typedef struct _GDBusSubtreeVTable            GDBusSubtreeVTable;
-typedef struct _GDBusAnnotationInfo           GDBusAnnotationInfo;
-typedef struct _GDBusArgInfo                  GDBusArgInfo;
-typedef struct _GDBusMethodInfo               GDBusMethodInfo;
-typedef struct _GDBusSignalInfo               GDBusSignalInfo;
-typedef struct _GDBusPropertyInfo             GDBusPropertyInfo;
-typedef struct _GDBusInterfaceInfo            GDBusInterfaceInfo;
-typedef struct _GDBusNodeInfo                 GDBusNodeInfo;
-
-/**
- * GCancellableSourceFunc:
- * @cancellable: the #GCancellable
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_cancellable_source_new().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.28
- */
-typedef gboolean (*GCancellableSourceFunc) (GCancellable *cancellable,
-					    gpointer      user_data);
-
-/**
- * GPollableSourceFunc:
- * @pollable_stream: the #GPollableInputStream or #GPollableOutputStream
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_pollable_input_stream_create_source() and
- * g_pollable_output_stream_create_source().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.28
- */
-typedef gboolean (*GPollableSourceFunc) (GObject  *pollable_stream,
-					 gpointer  user_data);
-
-typedef struct _GDBusInterface              GDBusInterface; /* Dummy typedef */
-typedef struct _GDBusInterfaceSkeleton      GDBusInterfaceSkeleton;
-typedef struct _GDBusObject                 GDBusObject;  /* Dummy typedef */
-typedef struct _GDBusObjectSkeleton         GDBusObjectSkeleton;
-typedef struct _GDBusObjectProxy            GDBusObjectProxy;
-typedef struct _GDBusObjectManager          GDBusObjectManager;  /* Dummy typedef */
-typedef struct _GDBusObjectManagerClient    GDBusObjectManagerClient;
-typedef struct _GDBusObjectManagerServer    GDBusObjectManagerServer;
-
-/**
- * GDBusProxyTypeFunc:
- * @manager: A #GDBusObjectManagerClient.
- * @object_path: The object path of the remote object.
- * @interface_name: (allow-none): The interface name of the remote object or %NULL if a #GDBusObjectProxy #GType is requested.
- * @user_data: User data.
- *
- * Function signature for a function used to determine the #GType to
- * use for an interface proxy (if @interface_name is not %NULL) or
- * object proxy (if @interface_name is %NULL).
- *
- * This function is called in the
- * <link linkend="g-main-context-push-thread-default">thread-default main loop</link>
- * that @manager was constructed in.
- *
- * Returns: A #GType to use for the remote object. The returned type
- *   must be a #GDBusProxy<!-- -->- or #GDBusObjectProxy<!-- -->-derived
- *   type.
- *
- * Since: 2.30
- */
-typedef GType (*GDBusProxyTypeFunc) (GDBusObjectManagerClient   *manager,
-                                     const gchar                *object_path,
-                                     const gchar                *interface_name,
-                                     gpointer                    user_data);
-
-typedef struct _GTestDBus GTestDBus;
-
-G_END_DECLS
-
-#endif /* __GIO_TYPES_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gloadableicon.h b/GstreamerHelper/x64/include/glib-2.0/gio/gloadableicon.h
deleted file mode 100644
index 754090fe..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gloadableicon.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_LOADABLE_ICON_H__
-#define __G_LOADABLE_ICON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_LOADABLE_ICON            (g_loadable_icon_get_type ())
-#define G_LOADABLE_ICON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_LOADABLE_ICON, GLoadableIcon))
-#define G_IS_LOADABLE_ICON(obj)	        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_LOADABLE_ICON))
-#define G_LOADABLE_ICON_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_LOADABLE_ICON, GLoadableIconIface))
-
-/**
- * GLoadableIcon:
- *
- * Generic type for all kinds of icons that can be loaded
- * as a stream.
- **/
-typedef struct _GLoadableIconIface    		GLoadableIconIface;
-
-/**
- * GLoadableIconIface:
- * @g_iface: The parent interface.
- * @load: Loads an icon.
- * @load_async: Loads an icon asynchronously.
- * @load_finish: Finishes an asynchronous icon load.
- *
- * Interface for icons that can be loaded as a stream.
- **/
-struct _GLoadableIconIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GInputStream * (* load)        (GLoadableIcon       *icon,
-                                  int                  size,
-                                  char               **type,
-                                  GCancellable        *cancellable,
-                                  GError             **error);
-  void           (* load_async)  (GLoadableIcon       *icon,
-                                  int                  size,
-                                  GCancellable        *cancellable,
-                                  GAsyncReadyCallback  callback,
-                                  gpointer             user_data);
-  GInputStream * (* load_finish) (GLoadableIcon       *icon,
-                                  GAsyncResult        *res,
-                                  char               **type,
-                                  GError             **error);
-};
-
-GType         g_loadable_icon_get_type    (void) G_GNUC_CONST;
-
-GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
-					   int                   size,
-					   char                **type,
-					   GCancellable         *cancellable,
-					   GError              **error);
-void          g_loadable_icon_load_async  (GLoadableIcon        *icon,
-					   int                   size,
-					   GCancellable         *cancellable,
-					   GAsyncReadyCallback   callback,
-					   gpointer              user_data);
-GInputStream *g_loadable_icon_load_finish (GLoadableIcon        *icon,
-					   GAsyncResult         *res,
-					   char                **type,
-					   GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_LOADABLE_ICON_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gmemoryinputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gmemoryinputstream.h
deleted file mode 100644
index 1625ae94..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gmemoryinputstream.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MEMORY_INPUT_STREAM_H__
-#define __G_MEMORY_INPUT_STREAM_H__
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MEMORY_INPUT_STREAM         (g_memory_input_stream_get_type ())
-#define G_MEMORY_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStream))
-#define G_MEMORY_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStreamClass))
-#define G_IS_MEMORY_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MEMORY_INPUT_STREAM))
-#define G_IS_MEMORY_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MEMORY_INPUT_STREAM))
-#define G_MEMORY_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStreamClass))
-
-/**
- * GMemoryInputStream:
- *
- * Implements #GInputStream for arbitrary memory chunks.
- **/
-typedef struct _GMemoryInputStreamClass    GMemoryInputStreamClass;
-typedef struct _GMemoryInputStreamPrivate  GMemoryInputStreamPrivate;
-
-struct _GMemoryInputStream
-{
-  GInputStream parent_instance;
-
-  /*< private >*/
-  GMemoryInputStreamPrivate *priv;
-};
-
-struct _GMemoryInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GType          g_memory_input_stream_get_type      (void) G_GNUC_CONST;
-GInputStream * g_memory_input_stream_new           (void);
-GInputStream * g_memory_input_stream_new_from_data (const void         *data,
-                                                    gssize              len,
-                                                    GDestroyNotify      destroy);
-GLIB_AVAILABLE_IN_2_34
-GInputStream * g_memory_input_stream_new_from_bytes (GBytes            *bytes);
-
-void           g_memory_input_stream_add_data      (GMemoryInputStream *stream,
-                                                    const void         *data,
-                                                    gssize              len,
-                                                    GDestroyNotify      destroy);
-GLIB_AVAILABLE_IN_2_34
-void           g_memory_input_stream_add_bytes     (GMemoryInputStream     *stream,
-						    GBytes                 *bytes);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gmemoryoutputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gmemoryoutputstream.h
deleted file mode 100644
index faf0364c..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gmemoryoutputstream.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MEMORY_OUTPUT_STREAM_H__
-#define __G_MEMORY_OUTPUT_STREAM_H__
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MEMORY_OUTPUT_STREAM         (g_memory_output_stream_get_type ())
-#define G_MEMORY_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStream))
-#define G_MEMORY_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStreamClass))
-#define G_IS_MEMORY_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MEMORY_OUTPUT_STREAM))
-#define G_IS_MEMORY_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MEMORY_OUTPUT_STREAM))
-#define G_MEMORY_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStreamClass))
-
-/**
- * GMemoryOutputStream:
- *
- * Implements #GOutputStream for arbitrary memory chunks.
- **/
-typedef struct _GMemoryOutputStreamClass    GMemoryOutputStreamClass;
-typedef struct _GMemoryOutputStreamPrivate  GMemoryOutputStreamPrivate;
-
-struct _GMemoryOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< private >*/
-  GMemoryOutputStreamPrivate *priv;
-};
-
-struct _GMemoryOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-/**
- * GReallocFunc:
- * @data: memory block to reallocate
- * @size: size to reallocate @data to
- *
- * Changes the size of the memory block pointed to by @data to
- * @size bytes.
- *
- * The function should have the same semantics as realloc().
- *
- * Returns: a pointer to the reallocated memory
- */
-typedef gpointer (* GReallocFunc) (gpointer data,
-                                   gsize    size);
-
-GType          g_memory_output_stream_get_type      (void) G_GNUC_CONST;
-
-GOutputStream *g_memory_output_stream_new           (gpointer             data,
-                                                     gsize                size,
-                                                     GReallocFunc         realloc_function,
-                                                     GDestroyNotify       destroy_function);
-gpointer       g_memory_output_stream_get_data      (GMemoryOutputStream *ostream);
-gsize          g_memory_output_stream_get_size      (GMemoryOutputStream *ostream);
-gsize          g_memory_output_stream_get_data_size (GMemoryOutputStream *ostream);
-gpointer       g_memory_output_stream_steal_data    (GMemoryOutputStream *ostream);
-
-GLIB_AVAILABLE_IN_2_34
-GBytes *       g_memory_output_stream_steal_as_bytes (GMemoryOutputStream *ostream);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gmenu.h b/GstreamerHelper/x64/include/glib-2.0/gio/gmenu.h
deleted file mode 100644
index 35001c87..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gmenu.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_H__
-#define __G_MENU_H__
-
-#include <gio/gmenumodel.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MENU          (g_menu_get_type ())
-#define G_MENU(inst)         (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                              G_TYPE_MENU, GMenu))
-#define G_IS_MENU(inst)      (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                              G_TYPE_MENU))
-
-#define G_TYPE_MENU_ITEM     (g_menu_item_get_type ())
-#define G_MENU_ITEM(inst)    (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                              G_TYPE_MENU_ITEM, GMenuItem))
-#define G_IS_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                              G_TYPE_MENU_ITEM))
-
-typedef struct _GMenuItem GMenuItem;
-typedef struct _GMenu     GMenu;
-
-GLIB_AVAILABLE_IN_2_32
-GType       g_menu_get_type                         (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GMenu *     g_menu_new                              (void);
-
-void        g_menu_freeze                           (GMenu       *menu);
-
-void        g_menu_insert_item                      (GMenu       *menu,
-                                                     gint         position,
-                                                     GMenuItem   *item);
-void        g_menu_prepend_item                     (GMenu       *menu,
-                                                     GMenuItem   *item);
-void        g_menu_append_item                      (GMenu       *menu,
-                                                     GMenuItem   *item);
-void        g_menu_remove                           (GMenu       *menu,
-                                                     gint         position);
-
-void        g_menu_insert                           (GMenu       *menu,
-                                                     gint         position,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-void        g_menu_prepend                          (GMenu       *menu,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-void        g_menu_append                           (GMenu       *menu,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-
-void        g_menu_insert_section                   (GMenu       *menu,
-                                                     gint         position,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-void        g_menu_prepend_section                  (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-void        g_menu_append_section                   (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-
-void        g_menu_insert_submenu                   (GMenu       *menu,
-                                                     gint        position,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-void        g_menu_prepend_submenu                  (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-void        g_menu_append_submenu                   (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-
-
-GType       g_menu_item_get_type                    (void) G_GNUC_CONST;
-GMenuItem * g_menu_item_new                         (const gchar *label,
-                                                     const gchar *detailed_action);
-
-GLIB_AVAILABLE_IN_2_34
-GMenuItem * g_menu_item_new_from_model              (GMenuModel  *model,
-                                                     gint         item_index);
-
-GMenuItem * g_menu_item_new_submenu                 (const gchar *label,
-                                                     GMenuModel  *submenu);
-
-GMenuItem * g_menu_item_new_section                 (const gchar *label,
-                                                     GMenuModel  *section);
-
-GLIB_AVAILABLE_IN_2_34
-GVariant *  g_menu_item_get_attribute_value         (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const GVariantType *expected_type);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_menu_item_get_attribute               (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const gchar *format_string,
-                                                     ...);
-GLIB_AVAILABLE_IN_2_34
-GMenuModel *g_menu_item_get_link                    (GMenuItem   *menu_item,
-                                                     const gchar *link);
-
-void        g_menu_item_set_attribute_value         (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     GVariant    *value);
-void        g_menu_item_set_attribute               (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const gchar *format_string,
-                                                     ...);
-void        g_menu_item_set_link                    (GMenuItem   *menu_item,
-                                                     const gchar *link,
-                                                     GMenuModel  *model);
-void        g_menu_item_set_label                   (GMenuItem   *menu_item,
-                                                     const gchar *label);
-void        g_menu_item_set_submenu                 (GMenuItem   *menu_item,
-                                                     GMenuModel  *submenu);
-void        g_menu_item_set_section                 (GMenuItem   *menu_item,
-                                                     GMenuModel  *section);
-void        g_menu_item_set_action_and_target_value (GMenuItem   *menu_item,
-                                                     const gchar *action,
-                                                     GVariant    *target_value);
-void        g_menu_item_set_action_and_target       (GMenuItem   *menu_item,
-                                                     const gchar *action,
-                                                     const gchar *format_string,
-                                                     ...);
-void        g_menu_item_set_detailed_action         (GMenuItem   *menu_item,
-                                                     const gchar *detailed_action);
-
-G_END_DECLS
-
-#endif /* __G_MENU_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gmenuexporter.h b/GstreamerHelper/x64/include/glib-2.0/gio/gmenuexporter.h
deleted file mode 100644
index 1673b227..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gmenuexporter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- *  This library is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2 of the
- *  licence, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- *  USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_EXPORTER_H__
-#define __G_MENU_EXPORTER_H__
-
-#include <gio/gdbusconnection.h>
-#include <gio/gmenumodel.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_32
-guint                   g_dbus_connection_export_menu_model             (GDBusConnection  *connection,
-                                                                         const gchar      *object_path,
-                                                                         GMenuModel       *menu,
-                                                                         GError          **error);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_dbus_connection_unexport_menu_model           (GDBusConnection  *connection,
-                                                                         guint             export_id);
-
-G_END_DECLS
-
-#endif /* __G_MENU_EXPORTER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gmenumodel.h b/GstreamerHelper/x64/include/glib-2.0/gio/gmenumodel.h
deleted file mode 100644
index 689c2ced..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gmenumodel.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_MODEL_H__
-#define __G_MENU_MODEL_H__
-
-#include <glib-object.h>
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_MENU_ATTRIBUTE_ACTION "action"
-#define G_MENU_ATTRIBUTE_TARGET "target"
-#define G_MENU_ATTRIBUTE_LABEL "label"
-
-#define G_MENU_LINK_SUBMENU "submenu"
-#define G_MENU_LINK_SECTION "section"
-
-#define G_TYPE_MENU_MODEL                                   (g_menu_model_get_type ())
-#define G_MENU_MODEL(inst)                                  (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_MODEL, GMenuModel))
-#define G_MENU_MODEL_CLASS(class)                           (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_MODEL, GMenuModelClass))
-#define G_IS_MENU_MODEL(inst)                               (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_MODEL))
-#define G_IS_MENU_MODEL_CLASS(class)                        (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_MODEL))
-#define G_MENU_MODEL_GET_CLASS(inst)                        (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_MODEL, GMenuModelClass))
-
-typedef struct _GMenuModelPrivate                           GMenuModelPrivate;
-typedef struct _GMenuModelClass                             GMenuModelClass;
-
-typedef struct _GMenuAttributeIterPrivate                   GMenuAttributeIterPrivate;
-typedef struct _GMenuAttributeIterClass                     GMenuAttributeIterClass;
-typedef struct _GMenuAttributeIter                          GMenuAttributeIter;
-
-typedef struct _GMenuLinkIterPrivate                        GMenuLinkIterPrivate;
-typedef struct _GMenuLinkIterClass                          GMenuLinkIterClass;
-typedef struct _GMenuLinkIter                               GMenuLinkIter;
-
-struct _GMenuModel
-{
-  GObject            parent_instance;
-  GMenuModelPrivate *priv;
-};
-
-struct _GMenuModelClass
-{
-  GObjectClass parent_class;
-
-  gboolean              (*is_mutable)                       (GMenuModel          *model);
-  gint                  (*get_n_items)                      (GMenuModel          *model);
-  void                  (*get_item_attributes)              (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             GHashTable         **attributes);
-  GMenuAttributeIter *  (*iterate_item_attributes)          (GMenuModel          *model,
-                                                             gint                 item_index);
-  GVariant *            (*get_item_attribute_value)         (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             const gchar         *attribute,
-                                                             const GVariantType  *expected_type);
-  void                  (*get_item_links)                   (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             GHashTable         **links);
-  GMenuLinkIter *       (*iterate_item_links)               (GMenuModel          *model,
-                                                             gint                 item_index);
-  GMenuModel *          (*get_item_link)                    (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             const gchar         *link);
-};
-
-GType                   g_menu_model_get_type                           (void) G_GNUC_CONST;
-
-gboolean                g_menu_model_is_mutable                         (GMenuModel         *model);
-gint                    g_menu_model_get_n_items                        (GMenuModel         *model);
-
-GMenuAttributeIter *    g_menu_model_iterate_item_attributes            (GMenuModel         *model,
-                                                                         gint                item_index);
-GVariant *              g_menu_model_get_item_attribute_value           (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *attribute,
-                                                                         const GVariantType *expected_type);
-gboolean                g_menu_model_get_item_attribute                 (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *attribute,
-                                                                         const gchar        *format_string,
-                                                                         ...);
-GMenuLinkIter *         g_menu_model_iterate_item_links                 (GMenuModel         *model,
-                                                                         gint                item_index);
-GMenuModel *            g_menu_model_get_item_link                      (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *link);
-
-void                    g_menu_model_items_changed                      (GMenuModel         *model,
-                                                                         gint                position,
-                                                                         gint                removed,
-                                                                         gint                added);
-
-
-#define G_TYPE_MENU_ATTRIBUTE_ITER                          (g_menu_attribute_iter_get_type ())
-#define G_MENU_ATTRIBUTE_ITER(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIter))
-#define G_MENU_ATTRIBUTE_ITER_CLASS(class)                  (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIterClass))
-#define G_IS_MENU_ATTRIBUTE_ITER(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER))
-#define G_IS_MENU_ATTRIBUTE_ITER_CLASS(class)               (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER))
-#define G_MENU_ATTRIBUTE_ITER_GET_CLASS(inst)               (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIterClass))
-
-struct _GMenuAttributeIter
-{
-  GObject parent_instance;
-  GMenuAttributeIterPrivate *priv;
-};
-
-struct _GMenuAttributeIterClass
-{
-  GObjectClass parent_class;
-
-  gboolean      (*get_next) (GMenuAttributeIter  *iter,
-                             const gchar        **out_type,
-                             GVariant           **value);
-};
-
-GType                   g_menu_attribute_iter_get_type                  (void) G_GNUC_CONST;
-
-gboolean                g_menu_attribute_iter_get_next                  (GMenuAttributeIter  *iter,
-                                                                         const gchar        **out_name,
-                                                                         GVariant           **value);
-gboolean                g_menu_attribute_iter_next                      (GMenuAttributeIter  *iter);
-const gchar *           g_menu_attribute_iter_get_name                  (GMenuAttributeIter  *iter);
-GVariant *              g_menu_attribute_iter_get_value                 (GMenuAttributeIter  *iter);
-
-
-#define G_TYPE_MENU_LINK_ITER                               (g_menu_link_iter_get_type ())
-#define G_MENU_LINK_ITER(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIter))
-#define G_MENU_LINK_ITER_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIterClass))
-#define G_IS_MENU_LINK_ITER(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_LINK_ITER))
-#define G_IS_MENU_LINK_ITER_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_LINK_ITER))
-#define G_MENU_LINK_ITER_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIterClass))
-
-struct _GMenuLinkIter
-{
-  GObject parent_instance;
-  GMenuLinkIterPrivate *priv;
-};
-
-struct _GMenuLinkIterClass
-{
-  GObjectClass parent_class;
-
-  gboolean      (*get_next) (GMenuLinkIter  *iter,
-                             const gchar   **out_name,
-                             GMenuModel    **value);
-};
-
-GType                   g_menu_link_iter_get_type                       (void) G_GNUC_CONST;
-
-gboolean                g_menu_link_iter_get_next                       (GMenuLinkIter  *iter,
-                                                                         const gchar   **out_link,
-                                                                         GMenuModel    **value);
-gboolean                g_menu_link_iter_next                           (GMenuLinkIter  *iter);
-const gchar *           g_menu_link_iter_get_name                       (GMenuLinkIter  *iter);
-GMenuModel *            g_menu_link_iter_get_value                      (GMenuLinkIter  *iter);
-
-G_END_DECLS
-
-#endif /* __G_MENU_MODEL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gmount.h b/GstreamerHelper/x64/include/glib-2.0/gio/gmount.h
deleted file mode 100644
index 33728920..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gmount.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MOUNT_H__
-#define __G_MOUNT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MOUNT            (g_mount_get_type ())
-#define G_MOUNT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_MOUNT, GMount))
-#define G_IS_MOUNT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_MOUNT))
-#define G_MOUNT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_MOUNT, GMountIface))
-
-typedef struct _GMountIface    GMountIface;
-
-/**
- * GMountIface:
- * @g_iface: The parent interface.
- * @changed: Changed signal that is emitted when the mount's state has changed.
- * @unmounted: The unmounted signal that is emitted when the #GMount have been unmounted. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @pre_unmount: The ::pre-unmount signal that is emitted when the #GMount will soon be emitted. If the recipient is somehow holding the mount open by keeping an open file on it it should close the file.
- * @get_root: Gets a #GFile to the root directory of the #GMount.
- * @get_name: Gets a string containing the name of the #GMount.
- * @get_icon: Gets a #GIcon for the #GMount.
- * @get_uuid: Gets the UUID for the #GMount. The reference is typically based on the file system UUID for the mount in question and should be considered an opaque string. Returns %NULL if there is no UUID available.
- * @get_volume: Gets a #GVolume the mount is located on. Returns %NULL if the #GMount is not associated with a #GVolume.
- * @get_drive: Gets a #GDrive the volume of the mount is located on. Returns %NULL if the #GMount is not associated with a #GDrive or a #GVolume. This is convenience method for getting the #GVolume and using that to get the #GDrive.
- * @can_unmount: Checks if a #GMount can be unmounted.
- * @can_eject: Checks if a #GMount can be ejected.
- * @unmount: Starts unmounting a #GMount.
- * @unmount_finish: Finishes an unmounting operation.
- * @eject: Starts ejecting a #GMount.
- * @eject_finish: Finishes an eject operation.
- * @remount: Starts remounting a #GMount.
- * @remount_finish: Finishes a remounting operation.
- * @guess_content_type: Starts guessing the type of the content of a #GMount.
- *     See g_mount_guess_content_type() for more information on content
- *     type guessing. This operation was added in 2.18.
- * @guess_content_type_finish: Finishes a content type guessing operation. Added in 2.18.
- * @guess_content_type_sync: Synchronous variant of @guess_content_type. Added in 2.18
- * @unmount_with_operation: Starts unmounting a #GMount using a #GMountOperation. Since 2.22.
- * @unmount_with_operation_finish: Finishes an unmounting operation using a #GMountOperation. Since 2.22.
- * @eject_with_operation: Starts ejecting a #GMount using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_default_location: Gets a #GFile indication a start location that can be use as the entry point for this mount. Since 2.24.
- * @get_sort_key: Gets a key used for sorting #GMount instance or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Gets a symbolic #GIcon for the #GMount. Since 2.34.
- *
- * Interface for implementing operations for mounts.
- **/
-struct _GMountIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  void        (* changed)                   (GMount              *mount);
-  void        (* unmounted)                 (GMount              *mount);
-
-  /* Virtual Table */
-
-  GFile     * (* get_root)                  (GMount              *mount);
-  char      * (* get_name)                  (GMount              *mount);
-  GIcon     * (* get_icon)                  (GMount              *mount);
-  char      * (* get_uuid)                  (GMount              *mount);
-  GVolume   * (* get_volume)                (GMount              *mount);
-  GDrive    * (* get_drive)                 (GMount              *mount);
-  gboolean    (* can_unmount)               (GMount              *mount);
-  gboolean    (* can_eject)                 (GMount              *mount);
-
-  void        (* unmount)                   (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* unmount_finish)            (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* eject)                     (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_finish)              (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* remount)                   (GMount              *mount,
-                                             GMountMountFlags     flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* remount_finish)            (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* guess_content_type)        (GMount              *mount,
-                                             gboolean             force_rescan,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gchar    ** (* guess_content_type_finish) (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-  gchar    ** (* guess_content_type_sync)   (GMount              *mount,
-                                             gboolean             force_rescan,
-                                             GCancellable        *cancellable,
-                                             GError             **error);
-
-  /* Signal, not VFunc */
-  void        (* pre_unmount)               (GMount              *mount);
-
-  void        (* unmount_with_operation)    (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* unmount_with_operation_finish) (GMount          *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* eject_with_operation)      (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GMount            *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-  GFile     * (* get_default_location)      (GMount              *mount);
-
-  const gchar * (* get_sort_key)            (GMount              *mount);
-  GIcon       * (* get_symbolic_icon)       (GMount              *mount);
-};
-
-GType       g_mount_get_type                  (void) G_GNUC_CONST;
-
-GFile     * g_mount_get_root                  (GMount              *mount);
-GFile     * g_mount_get_default_location      (GMount              *mount);
-char      * g_mount_get_name                  (GMount              *mount);
-GIcon     * g_mount_get_icon                  (GMount              *mount);
-GIcon     * g_mount_get_symbolic_icon         (GMount              *mount);
-char      * g_mount_get_uuid                  (GMount              *mount);
-GVolume   * g_mount_get_volume                (GMount              *mount);
-GDrive    * g_mount_get_drive                 (GMount              *mount);
-gboolean    g_mount_can_unmount               (GMount              *mount);
-gboolean    g_mount_can_eject                 (GMount              *mount);
-
-GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation)
-void        g_mount_unmount                   (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-
-GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation_finish)
-gboolean    g_mount_unmount_finish            (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_DEPRECATED_FOR(g_mount_eject_with_operation)
-void        g_mount_eject                     (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-
-GLIB_DEPRECATED_FOR(g_mount_eject_with_operation_finish)
-gboolean    g_mount_eject_finish              (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-void        g_mount_remount                   (GMount              *mount,
-                                               GMountMountFlags     flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_mount_remount_finish            (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-void        g_mount_guess_content_type        (GMount              *mount,
-                                               gboolean             force_rescan,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gchar    ** g_mount_guess_content_type_finish (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-gchar    ** g_mount_guess_content_type_sync   (GMount              *mount,
-                                               gboolean             force_rescan,
-                                               GCancellable        *cancellable,
-                                               GError             **error);
-
-gboolean    g_mount_is_shadowed               (GMount              *mount);
-void        g_mount_shadow                    (GMount              *mount);
-void        g_mount_unshadow                  (GMount              *mount);
-
-void        g_mount_unmount_with_operation    (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_mount_unmount_with_operation_finish (GMount          *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-void        g_mount_eject_with_operation      (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_mount_eject_with_operation_finish (GMount            *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-const gchar *g_mount_get_sort_key             (GMount              *mount);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gmountoperation.h b/GstreamerHelper/x64/include/glib-2.0/gio/gmountoperation.h
deleted file mode 100644
index 0c112658..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gmountoperation.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MOUNT_OPERATION_H__
-#define __G_MOUNT_OPERATION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MOUNT_OPERATION         (g_mount_operation_get_type ())
-#define G_MOUNT_OPERATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MOUNT_OPERATION, GMountOperation))
-#define G_MOUNT_OPERATION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MOUNT_OPERATION, GMountOperationClass))
-#define G_IS_MOUNT_OPERATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MOUNT_OPERATION))
-#define G_IS_MOUNT_OPERATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MOUNT_OPERATION))
-#define G_MOUNT_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MOUNT_OPERATION, GMountOperationClass))
-
-/**
- * GMountOperation:
- *
- * Class for providing authentication methods for mounting operations,
- * such as mounting a file locally, or authenticating with a server.
- **/
-typedef struct _GMountOperationClass   GMountOperationClass;
-typedef struct _GMountOperationPrivate GMountOperationPrivate;
-
-struct _GMountOperation
-{
-  GObject parent_instance;
-
-  GMountOperationPrivate *priv;
-};
-
-struct _GMountOperationClass
-{
-  GObjectClass parent_class;
-
-  /* signals: */
-
-  void (* ask_password) (GMountOperation       *op,
-			 const char            *message,
-			 const char            *default_user,
-			 const char            *default_domain,
-			 GAskPasswordFlags      flags);
-
-  void (* ask_question) (GMountOperation       *op,
-			 const char            *message,
-			 const char            *choices[]);
-
-  void (* reply)        (GMountOperation       *op,
-			 GMountOperationResult  result);
-
-  void (* aborted)      (GMountOperation       *op);
-
-  void (* show_processes) (GMountOperation      *op,
-                           const gchar          *message,
-                           GArray               *processes,
-                           const gchar          *choices[]);
-
-  void (* show_unmount_progress) (GMountOperation *op,
-                                  const gchar     *message,
-                                  gint64           time_left,
-                                  gint64           bytes_left);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-};
-
-GType             g_mount_operation_get_type      (void) G_GNUC_CONST;
-GMountOperation * g_mount_operation_new           (void);
-
-const char *  g_mount_operation_get_username      (GMountOperation *op);
-void          g_mount_operation_set_username      (GMountOperation *op,
-						   const char      *username);
-const char *  g_mount_operation_get_password      (GMountOperation *op);
-void          g_mount_operation_set_password      (GMountOperation *op,
-						   const char      *password);
-gboolean      g_mount_operation_get_anonymous     (GMountOperation *op);
-void          g_mount_operation_set_anonymous     (GMountOperation *op,
-						   gboolean         anonymous);
-const char *  g_mount_operation_get_domain        (GMountOperation *op);
-void          g_mount_operation_set_domain        (GMountOperation *op,
-						   const char      *domain);
-GPasswordSave g_mount_operation_get_password_save (GMountOperation *op);
-void          g_mount_operation_set_password_save (GMountOperation *op,
-						   GPasswordSave    save);
-int           g_mount_operation_get_choice        (GMountOperation *op);
-void          g_mount_operation_set_choice        (GMountOperation *op,
-						   int              choice);
-void          g_mount_operation_reply             (GMountOperation *op,
-						   GMountOperationResult result);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_OPERATION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gnativevolumemonitor.h b/GstreamerHelper/x64/include/glib-2.0/gio/gnativevolumemonitor.h
deleted file mode 100644
index e072576f..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gnativevolumemonitor.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_NATIVE_VOLUME_MONITOR_H__
-#define __G_NATIVE_VOLUME_MONITOR_H__
-
-#include <gio/gvolumemonitor.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NATIVE_VOLUME_MONITOR        (g_native_volume_monitor_get_type ())
-#define G_NATIVE_VOLUME_MONITOR(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NATIVE_VOLUME_MONITOR, GNativeVolumeMonitor))
-#define G_NATIVE_VOLUME_MONITOR_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NATIVE_VOLUME_MONITOR, GNativeVolumeMonitorClass))
-#define G_IS_NATIVE_VOLUME_MONITOR(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NATIVE_VOLUME_MONITOR))
-#define G_IS_NATIVE_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NATIVE_VOLUME_MONITOR))
-
-#define G_NATIVE_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-native-volume-monitor"
-
-typedef struct _GNativeVolumeMonitor      GNativeVolumeMonitor;
-typedef struct _GNativeVolumeMonitorClass GNativeVolumeMonitorClass;
-
-struct _GNativeVolumeMonitor
-{
-  GVolumeMonitor parent_instance;
-};
-
-struct _GNativeVolumeMonitorClass
-{
-  GVolumeMonitorClass parent_class;
-
-  GMount * (* get_mount_for_mount_path) (const char   *mount_path,
-                                         GCancellable *cancellable);
-};
-
-GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_NATIVE_VOLUME_MONITOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkaddress.h b/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkaddress.h
deleted file mode 100644
index af163211..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkaddress.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_NETWORK_ADDRESS_H__
-#define __G_NETWORK_ADDRESS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NETWORK_ADDRESS         (g_network_address_get_type ())
-#define G_NETWORK_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_ADDRESS, GNetworkAddress))
-#define G_NETWORK_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NETWORK_ADDRESS, GNetworkAddressClass))
-#define G_IS_NETWORK_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_ADDRESS))
-#define G_IS_NETWORK_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NETWORK_ADDRESS))
-#define G_NETWORK_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_NETWORK_ADDRESS, GNetworkAddressClass))
-
-typedef struct _GNetworkAddressClass   GNetworkAddressClass;
-typedef struct _GNetworkAddressPrivate GNetworkAddressPrivate;
-
-struct _GNetworkAddress
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GNetworkAddressPrivate *priv;
-};
-
-struct _GNetworkAddressClass
-{
-  GObjectClass parent_class;
-
-};
-
-GType               g_network_address_get_type     (void) G_GNUC_CONST;
-
-GSocketConnectable *g_network_address_new          (const gchar      *hostname,
-						    guint16           port);
-GSocketConnectable *g_network_address_parse        (const gchar      *host_and_port,
-						    guint16           default_port,
-						    GError          **error);
-GSocketConnectable *g_network_address_parse_uri    (const gchar      *uri,
-    						    guint16           default_port,
-						    GError          **error);
-const gchar        *g_network_address_get_hostname (GNetworkAddress  *addr);
-guint16             g_network_address_get_port     (GNetworkAddress  *addr);
-const gchar        *g_network_address_get_scheme   (GNetworkAddress  *addr);
-
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_ADDRESS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkmonitor.h b/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkmonitor.h
deleted file mode 100644
index 995ff545..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkmonitor.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_NETWORK_MONITOR_H__
-#define __G_NETWORK_MONITOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_NETWORK_MONITOR_EXTENSION_POINT_NAME:
- *
- * Extension point for network status monitoring functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- *
- * Since: 2.30
- */
-#define G_NETWORK_MONITOR_EXTENSION_POINT_NAME "gio-network-monitor"
-
-#define G_TYPE_NETWORK_MONITOR         (g_network_monitor_get_type ())
-#define G_NETWORK_MONITOR(o)               (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_MONITOR, GNetworkMonitor))
-#define G_IS_NETWORK_MONITOR(o)            (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_MONITOR))
-#define G_NETWORK_MONITOR_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_NETWORK_MONITOR, GNetworkMonitorInterface))
-
-typedef struct _GNetworkMonitorInterface GNetworkMonitorInterface;
-
-struct _GNetworkMonitorInterface {
-  GTypeInterface g_iface;
-
-  void     (*network_changed)  (GNetworkMonitor      *monitor,
-				gboolean              available);
-
-  gboolean (*can_reach)        (GNetworkMonitor      *monitor,
-				GSocketConnectable   *connectable,
-				GCancellable         *cancellable,
-				GError              **error);
-  void     (*can_reach_async)  (GNetworkMonitor      *monitor,
-				GSocketConnectable   *connectable,
-				GCancellable         *cancellable,
-				GAsyncReadyCallback   callback,
-				gpointer              user_data);
-  gboolean (*can_reach_finish) (GNetworkMonitor      *monitor,
-				GAsyncResult         *result,
-				GError              **error);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType            g_network_monitor_get_type              (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GNetworkMonitor *g_network_monitor_get_default           (void);
-
-gboolean         g_network_monitor_get_network_available (GNetworkMonitor     *monitor);
-
-gboolean         g_network_monitor_can_reach             (GNetworkMonitor     *monitor,
-							  GSocketConnectable  *connectable,
-							  GCancellable        *cancellable,
-							  GError             **error);
-void             g_network_monitor_can_reach_async       (GNetworkMonitor     *monitor,
-							  GSocketConnectable  *connectable,
-							  GCancellable        *cancellable,
-							  GAsyncReadyCallback  callback,
-							  gpointer             user_data);
-gboolean         g_network_monitor_can_reach_finish      (GNetworkMonitor     *monitor,
-							  GAsyncResult        *result,
-							  GError             **error);
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_MONITOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkservice.h b/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkservice.h
deleted file mode 100644
index 1f6dbea8..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gnetworkservice.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_NETWORK_SERVICE_H__
-#define __G_NETWORK_SERVICE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NETWORK_SERVICE         (g_network_service_get_type ())
-#define G_NETWORK_SERVICE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_SERVICE, GNetworkService))
-#define G_NETWORK_SERVICE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NETWORK_SERVICE, GNetworkServiceClass))
-#define G_IS_NETWORK_SERVICE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_SERVICE))
-#define G_IS_NETWORK_SERVICE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NETWORK_SERVICE))
-#define G_NETWORK_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_NETWORK_SERVICE, GNetworkServiceClass))
-
-typedef struct _GNetworkServiceClass   GNetworkServiceClass;
-typedef struct _GNetworkServicePrivate GNetworkServicePrivate;
-
-struct _GNetworkService
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GNetworkServicePrivate *priv;
-};
-
-struct _GNetworkServiceClass
-{
-  GObjectClass parent_class;
-
-};
-
-GType                g_network_service_get_type      (void) G_GNUC_CONST;
-
-GSocketConnectable  *g_network_service_new           (const gchar     *service,
-						      const gchar     *protocol,
-						      const gchar     *domain);
-
-const gchar         *g_network_service_get_service   (GNetworkService *srv);
-const gchar         *g_network_service_get_protocol  (GNetworkService *srv);
-const gchar         *g_network_service_get_domain    (GNetworkService *srv);
-const gchar         *g_network_service_get_scheme    (GNetworkService *srv);
-void                 g_network_service_set_scheme    (GNetworkService *srv, const gchar *scheme);
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_SERVICE_H__ */
-
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/goutputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/goutputstream.h
deleted file mode 100644
index 5e9850c8..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/goutputstream.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_OUTPUT_STREAM_H__
-#define __G_OUTPUT_STREAM_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_OUTPUT_STREAM         (g_output_stream_get_type ())
-#define G_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_OUTPUT_STREAM, GOutputStream))
-#define G_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_OUTPUT_STREAM, GOutputStreamClass))
-#define G_IS_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_OUTPUT_STREAM))
-#define G_IS_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_OUTPUT_STREAM))
-#define G_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_OUTPUT_STREAM, GOutputStreamClass))
-
-/**
- * GOutputStream:
- *
- * Base class for writing output.
- *
- * All classes derived from GOutputStream should implement synchronous
- * writing, splicing, flushing and closing streams, but may implement
- * asynchronous versions.
- **/
-typedef struct _GOutputStreamClass    GOutputStreamClass;
-typedef struct _GOutputStreamPrivate  GOutputStreamPrivate;
-
-struct _GOutputStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GOutputStreamPrivate *priv;
-};
-
-
-struct _GOutputStreamClass
-{
-  GObjectClass parent_class;
-
-  /* Sync ops: */
-
-  gssize      (* write_fn)      (GOutputStream            *stream,
-                                 const void               *buffer,
-                                 gsize                     count,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gssize      (* splice)        (GOutputStream            *stream,
-                                 GInputStream             *source,
-                                 GOutputStreamSpliceFlags  flags,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gboolean    (* flush)	        (GOutputStream            *stream,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gboolean    (* close_fn)      (GOutputStream            *stream,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-
-  /* Async ops: (optional in derived classes) */
-
-  void        (* write_async)   (GOutputStream            *stream,
-                                 const void               *buffer,
-                                 gsize                     count,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gssize      (* write_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* splice_async)  (GOutputStream            *stream,
-                                 GInputStream             *source,
-                                 GOutputStreamSpliceFlags  flags,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gssize      (* splice_finish) (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* flush_async)   (GOutputStream            *stream,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gboolean    (* flush_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* close_async)   (GOutputStream            *stream,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gboolean    (* close_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-};
-
-GType    g_output_stream_get_type      (void) G_GNUC_CONST;
-
-gssize   g_output_stream_write         (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_write_all     (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					gsize                     *bytes_written,
-					GCancellable              *cancellable,
-					GError                   **error);
-GLIB_AVAILABLE_IN_2_34
-gssize   g_output_stream_write_bytes   (GOutputStream             *stream,
-					GBytes                    *bytes,
-					GCancellable              *cancellable,
-					GError                   **error);
-gssize   g_output_stream_splice        (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_flush         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_close         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-void     g_output_stream_write_async   (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gssize   g_output_stream_write_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-GLIB_AVAILABLE_IN_2_34
-void     g_output_stream_write_bytes_async  (GOutputStream             *stream,
-					     GBytes                    *bytes,
-					     int                        io_priority,
-					     GCancellable              *cancellable,
-					     GAsyncReadyCallback        callback,
-					     gpointer                   user_data);
-GLIB_AVAILABLE_IN_2_34
-gssize   g_output_stream_write_bytes_finish (GOutputStream             *stream,
-					     GAsyncResult              *result,
-					     GError                   **error);
-void     g_output_stream_splice_async  (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gssize   g_output_stream_splice_finish (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_flush_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gboolean g_output_stream_flush_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_close_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gboolean g_output_stream_close_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-
-gboolean g_output_stream_is_closed     (GOutputStream             *stream);
-gboolean g_output_stream_is_closing    (GOutputStream             *stream);
-gboolean g_output_stream_has_pending   (GOutputStream             *stream);
-gboolean g_output_stream_set_pending   (GOutputStream             *stream,
-					GError                   **error);
-void     g_output_stream_clear_pending (GOutputStream             *stream);
-
-
-G_END_DECLS
-
-#endif /* __G_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gpermission.h b/GstreamerHelper/x64/include/glib-2.0/gio/gpermission.h
deleted file mode 100644
index 3f742578..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gpermission.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PERMISSION_H__
-#define __G_PERMISSION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PERMISSION             (g_permission_get_type ())
-#define G_PERMISSION(inst)            (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                       G_TYPE_PERMISSION, GPermission))
-#define G_PERMISSION_CLASS(class)     (G_TYPE_CHECK_CLASS_CAST ((class),     \
-                                       G_TYPE_PERMISSION, GPermissionClass))
-#define G_IS_PERMISSION(inst)         (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                       G_TYPE_PERMISSION))
-#define G_IS_PERMISSION_CLASS(class)  (G_TYPE_CHECK_CLASS_TYPE ((class),     \
-                                       G_TYPE_PERMISSION))
-#define G_PERMISSION_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst),    \
-                                       G_TYPE_PERMISSION, GPermissionClass))
-
-typedef struct _GPermissionPrivate    GPermissionPrivate;
-typedef struct _GPermissionClass      GPermissionClass;
-
-struct _GPermission
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GPermissionPrivate *priv;
-};
-
-struct _GPermissionClass {
-  GObjectClass parent_class;
-
-  gboolean (*acquire)        (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GError              **error);
-  void     (*acquire_async)  (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GAsyncReadyCallback   callback,
-                              gpointer              user_data);
-  gboolean (*acquire_finish) (GPermission          *permission,
-                              GAsyncResult         *result,
-                              GError              **error);
-
-  gboolean (*release)        (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GError              **error);
-  void     (*release_async)  (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GAsyncReadyCallback   callback,
-                              gpointer              user_data);
-  gboolean (*release_finish) (GPermission          *permission,
-                              GAsyncResult         *result,
-                              GError              **error);
-
-  gpointer reserved[16];
-};
-
-GType           g_permission_get_type           (void);
-gboolean        g_permission_acquire            (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-void            g_permission_acquire_async      (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-gboolean        g_permission_acquire_finish     (GPermission          *permission,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-gboolean        g_permission_release            (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-void            g_permission_release_async      (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-gboolean        g_permission_release_finish     (GPermission          *permission,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-gboolean        g_permission_get_allowed        (GPermission   *permission);
-gboolean        g_permission_get_can_acquire    (GPermission   *permission);
-gboolean        g_permission_get_can_release    (GPermission   *permission);
-
-void            g_permission_impl_update        (GPermission  *permission,
-                                                 gboolean      allowed,
-                                                 gboolean      can_acquire,
-                                                 gboolean      can_release);
-
-G_END_DECLS
-
-#endif /* __G_PERMISSION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gpollableinputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gpollableinputstream.h
deleted file mode 100644
index 49af7ee2..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gpollableinputstream.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_POLLABLE_INPUT_STREAM_H__
-#define __G_POLLABLE_INPUT_STREAM_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_POLLABLE_INPUT_STREAM               (g_pollable_input_stream_get_type ())
-#define G_POLLABLE_INPUT_STREAM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_POLLABLE_INPUT_STREAM, GPollableInputStream))
-#define G_IS_POLLABLE_INPUT_STREAM(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_POLLABLE_INPUT_STREAM))
-#define G_POLLABLE_INPUT_STREAM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_POLLABLE_INPUT_STREAM, GPollableInputStreamInterface))
-
-/**
- * GPollableInputStream:
- *
- * An interface for a #GInputStream that can be polled for readability.
- *
- * Since: 2.28
- */
-typedef struct _GPollableInputStreamInterface GPollableInputStreamInterface;
-
-/**
- * GPollableInputStreamInterface:
- * @g_iface: The parent interface.
- * @can_poll: Checks if the #GPollableInputStream instance is actually pollable
- * @is_readable: Checks if the stream is readable
- * @create_source: Creates a #GSource to poll the stream
- * @read_nonblocking: Does a non-blocking read or returns
- *   %G_IO_ERROR_WOULD_BLOCK
- *
- * The interface for pollable input streams.
- *
- * The default implementation of @can_poll always returns %TRUE.
- *
- * The default implementation of @read_nonblocking calls
- * g_pollable_input_stream_is_readable(), and then calls
- * g_input_stream_read() if it returns %TRUE. This means you only need
- * to override it if it is possible that your @is_readable
- * implementation may return %TRUE when the stream is not actually
- * readable.
- *
- * Since: 2.28
- */
-struct _GPollableInputStreamInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean     (*can_poll)         (GPollableInputStream  *stream);
-
-  gboolean     (*is_readable)      (GPollableInputStream  *stream);
-  GSource *    (*create_source)    (GPollableInputStream  *stream,
-				    GCancellable          *cancellable);
-  gssize       (*read_nonblocking) (GPollableInputStream  *stream,
-				    void                  *buffer,
-				    gsize                  count,
-				    GError               **error);
-};
-
-GType    g_pollable_input_stream_get_type         (void) G_GNUC_CONST;
-
-gboolean g_pollable_input_stream_can_poll         (GPollableInputStream  *stream);
-
-gboolean g_pollable_input_stream_is_readable      (GPollableInputStream  *stream);
-GSource *g_pollable_input_stream_create_source    (GPollableInputStream  *stream,
-						   GCancellable          *cancellable);
-
-gssize   g_pollable_input_stream_read_nonblocking (GPollableInputStream  *stream,
-						   void                  *buffer,
-						   gsize                  count,
-						   GCancellable          *cancellable,
-						   GError               **error);
-
-G_END_DECLS
-
-
-#endif /* __G_POLLABLE_INPUT_STREAM_H__ */
-
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gpollableoutputstream.h b/GstreamerHelper/x64/include/glib-2.0/gio/gpollableoutputstream.h
deleted file mode 100644
index c5945ce3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gpollableoutputstream.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_POLLABLE_OUTPUT_STREAM_H__
-#define __G_POLLABLE_OUTPUT_STREAM_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_POLLABLE_OUTPUT_STREAM               (g_pollable_output_stream_get_type ())
-#define G_POLLABLE_OUTPUT_STREAM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM, GPollableOutputStream))
-#define G_IS_POLLABLE_OUTPUT_STREAM(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM))
-#define G_POLLABLE_OUTPUT_STREAM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM, GPollableOutputStreamInterface))
-
-/**
- * GPollableOutputStream:
- *
- * An interface for a #GOutputStream that can be polled for readability.
- *
- * Since: 2.28
- */
-typedef struct _GPollableOutputStreamInterface GPollableOutputStreamInterface;
-
-/**
- * GPollableOutputStreamInterface:
- * @g_iface: The parent interface.
- * @can_poll: Checks if the #GPollableOutputStream instance is actually pollable
- * @is_writable: Checks if the stream is writable
- * @create_source: Creates a #GSource to poll the stream
- * @write_nonblocking: Does a non-blocking write or returns
- *   %G_IO_ERROR_WOULD_BLOCK
- *
- * The interface for pollable output streams.
- *
- * The default implementation of @can_poll always returns %TRUE.
- *
- * The default implementation of @write_nonblocking calls
- * g_pollable_output_stream_is_writable(), and then calls
- * g_output_stream_write() if it returns %TRUE. This means you only
- * need to override it if it is possible that your @is_writable
- * implementation may return %TRUE when the stream is not actually
- * writable.
- *
- * Since: 2.28
- */
-struct _GPollableOutputStreamInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean     (*can_poll)          (GPollableOutputStream  *stream);
-
-  gboolean     (*is_writable)       (GPollableOutputStream  *stream);
-  GSource *    (*create_source)     (GPollableOutputStream  *stream,
-				     GCancellable           *cancellable);
-  gssize       (*write_nonblocking) (GPollableOutputStream  *stream,
-				     const void             *buffer,
-				     gsize                   count,
-				     GError                **error);
-};
-
-GType    g_pollable_output_stream_get_type          (void) G_GNUC_CONST;
-
-gboolean g_pollable_output_stream_can_poll          (GPollableOutputStream  *stream);
-
-gboolean g_pollable_output_stream_is_writable       (GPollableOutputStream  *stream);
-GSource *g_pollable_output_stream_create_source     (GPollableOutputStream  *stream,
-						     GCancellable           *cancellable);
-
-gssize   g_pollable_output_stream_write_nonblocking (GPollableOutputStream  *stream,
-						     const void             *buffer,
-						     gsize                   count,
-						     GCancellable           *cancellable,
-						     GError                **error);
-
-G_END_DECLS
-
-
-#endif /* __G_POLLABLE_OUTPUT_STREAM_H__ */
-
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gpollableutils.h b/GstreamerHelper/x64/include/glib-2.0/gio/gpollableutils.h
deleted file mode 100644
index 782f3ca4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gpollableutils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_POLLABLE_UTILS_H__
-#define __G_POLLABLE_UTILS_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-GSource *g_pollable_source_new       (GObject        *pollable_stream);
-
-GLIB_AVAILABLE_IN_2_34
-GSource *g_pollable_source_new_full  (gpointer        pollable_stream,
-				      GSource        *child_source,
-				      GCancellable   *cancellable);
-
-GLIB_AVAILABLE_IN_2_34
-gssize   g_pollable_stream_read      (GInputStream   *stream,
-				      void           *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      GCancellable   *cancellable,
-				      GError        **error);
-
-GLIB_AVAILABLE_IN_2_34
-gssize   g_pollable_stream_write     (GOutputStream  *stream,
-				      const void     *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      GCancellable   *cancellable,
-				      GError        **error);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_pollable_stream_write_all (GOutputStream  *stream,
-				      const void     *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      gsize          *bytes_written,
-				      GCancellable   *cancellable,
-				      GError        **error);
-
-G_END_DECLS
-
-#endif /* _G_POLLABLE_UTILS_H_ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gproxy.h b/GstreamerHelper/x64/include/glib-2.0/gio/gproxy.h
deleted file mode 100644
index d7d11a7f..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gproxy.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PROXY_H__
-#define __G_PROXY_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY		(g_proxy_get_type ())
-#define G_PROXY(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY, GProxy))
-#define G_IS_PROXY(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY))
-#define G_PROXY_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_PROXY, GProxyInterface))
-
-/**
- * G_PROXY_EXTENSION_POINT_NAME:
- *
- * Extension point for proxy functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- *
- * Since: 2.26
- */
-#define G_PROXY_EXTENSION_POINT_NAME "gio-proxy"
-
-/**
- * GProxy:
- *
- * Interface that handles proxy connection and payload.
- *
- * Since: 2.26
- */
-typedef struct _GProxyInterface GProxyInterface;
-
-/**
- * GProxyInterface:
- * @g_iface: The parent interface.
- * @connect: Connect to proxy server and wrap (if required) the #connection
- *           to handle payload.
- * @connect_async: Same as connect() but asynchronous.
- * @connect_finish: Returns the result of connect_async()
- * @supports_hostname: Returns whether the proxy supports hostname lookups.
- *
- * Provides an interface for handling proxy connection and payload.
- *
- * Since: 2.26
- */
-struct _GProxyInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GIOStream * (* connect)           (GProxy               *proxy,
-				     GIOStream            *connection,
-				     GProxyAddress        *proxy_address,
-				     GCancellable         *cancellable,
-				     GError              **error);
-
-  void        (* connect_async)     (GProxy               *proxy,
-				     GIOStream            *connection,
-				     GProxyAddress	  *proxy_address,
-				     GCancellable         *cancellable,
-				     GAsyncReadyCallback   callback,
-				     gpointer              user_data);
-
-  GIOStream * (* connect_finish)    (GProxy               *proxy,
-				     GAsyncResult         *result,
-				     GError              **error);
-
-  gboolean    (* supports_hostname) (GProxy             *proxy);
-};
-
-GType      g_proxy_get_type                 (void) G_GNUC_CONST;
-
-GProxy    *g_proxy_get_default_for_protocol (const gchar *protocol);
-
-GIOStream *g_proxy_connect           (GProxy               *proxy,
-				      GIOStream            *connection,
-				      GProxyAddress        *proxy_address,
-				      GCancellable         *cancellable,
-				      GError              **error);
-
-void       g_proxy_connect_async     (GProxy               *proxy,
-				      GIOStream            *connection,
-				      GProxyAddress        *proxy_address,
-				      GCancellable         *cancellable,
-				      GAsyncReadyCallback   callback,
-				      gpointer              user_data);
-
-GIOStream *g_proxy_connect_finish    (GProxy               *proxy,
-				      GAsyncResult         *result,
-				      GError              **error);
-
-gboolean   g_proxy_supports_hostname (GProxy               *proxy);
-
-G_END_DECLS
-
-#endif /* __G_PROXY_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gproxyaddress.h b/GstreamerHelper/x64/include/glib-2.0/gio/gproxyaddress.h
deleted file mode 100644
index 8d51f11d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gproxyaddress.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PROXY_ADDRESS_H__
-#define __G_PROXY_ADDRESS_H__
-
-#include <gio/ginetsocketaddress.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_ADDRESS         (g_proxy_address_get_type ())
-#define G_PROXY_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_ADDRESS, GProxyAddress))
-#define G_PROXY_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_PROXY_ADDRESS, GProxyAddressClass))
-#define G_IS_PROXY_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_ADDRESS))
-#define G_IS_PROXY_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_PROXY_ADDRESS))
-#define G_PROXY_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_PROXY_ADDRESS, GProxyAddressClass))
-
-typedef struct _GProxyAddressClass   GProxyAddressClass;
-typedef struct _GProxyAddressPrivate GProxyAddressPrivate;
-
-struct _GProxyAddress
-{
-  GInetSocketAddress parent_instance;
-
-  /*< private >*/
-  GProxyAddressPrivate *priv;
-};
-
-struct _GProxyAddressClass
-{
-  GInetSocketAddressClass parent_class;
-};
-
-
-GType           g_proxy_address_get_type    (void) G_GNUC_CONST;
-
-GSocketAddress *g_proxy_address_new         (GInetAddress *inetaddr,
-					     guint16       port,
-					     const gchar  *protocol,
-					     const gchar  *dest_hostname,
-		                             guint16       dest_port,
-					     const gchar  *username,
-					     const gchar  *password);
-
-const gchar    *g_proxy_address_get_protocol                (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_2_34
-const gchar    *g_proxy_address_get_destination_protocol    (GProxyAddress *proxy);
-const gchar    *g_proxy_address_get_destination_hostname    (GProxyAddress *proxy);
-guint16         g_proxy_address_get_destination_port        (GProxyAddress *proxy);
-const gchar    *g_proxy_address_get_username                (GProxyAddress *proxy);
-const gchar    *g_proxy_address_get_password                (GProxyAddress *proxy);
-
-GLIB_AVAILABLE_IN_2_34
-const gchar    *g_proxy_address_get_uri                     (GProxyAddress *proxy);
-
-G_END_DECLS
-
-#endif /* __G_PROXY_ADDRESS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gproxyaddressenumerator.h b/GstreamerHelper/x64/include/glib-2.0/gio/gproxyaddressenumerator.h
deleted file mode 100644
index b38045f6..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gproxyaddressenumerator.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PROXY_ADDRESS_ENUMERATOR_H__
-#define __G_PROXY_ADDRESS_ENUMERATOR_H__
-
-#include <gio/gsocketaddressenumerator.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_ADDRESS_ENUMERATOR         (g_proxy_address_enumerator_get_type ())
-#define G_PROXY_ADDRESS_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumerator))
-#define G_PROXY_ADDRESS_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumeratorClass))
-#define G_IS_PROXY_ADDRESS_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR))
-#define G_IS_PROXY_ADDRESS_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_PROXY_ADDRESS_ENUMERATOR))
-#define G_PROXY_ADDRESS_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumeratorClass))
-
-/**
- * GProxyAddressEnumerator:
- *
- * A subclass of #GSocketAddressEnumerator that takes another address
- * enumerator and wraps its results in #GProxyAddress<!-- -->es as
- * directed by the default #GProxyResolver.
- */
-
-typedef struct _GProxyAddressEnumeratorClass GProxyAddressEnumeratorClass;
-typedef struct _GProxyAddressEnumeratorPrivate GProxyAddressEnumeratorPrivate;
-
-struct _GProxyAddressEnumerator
-{
-  GSocketAddressEnumerator parent_instance;
-  GProxyAddressEnumeratorPrivate *priv;
-};
-
-struct _GProxyAddressEnumeratorClass
-{
-  GSocketAddressEnumeratorClass parent_class;
-
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-};
-
-GType           g_proxy_address_enumerator_get_type    (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PROXY_ADDRESS_ENUMERATOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gproxyresolver.h b/GstreamerHelper/x64/include/glib-2.0/gio/gproxyresolver.h
deleted file mode 100644
index 7d8d27de..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gproxyresolver.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PROXY_RESOLVER_H__
-#define __G_PROXY_RESOLVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_RESOLVER         (g_proxy_resolver_get_type ())
-#define G_PROXY_RESOLVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_RESOLVER, GProxyResolver))
-#define G_IS_PROXY_RESOLVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_RESOLVER))
-#define G_PROXY_RESOLVER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_PROXY_RESOLVER, GProxyResolverInterface))
-
-/**
- * G_PROXY_RESOLVER_EXTENSION_POINT_NAME:
- *
- * Extension point for proxy resolving functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_PROXY_RESOLVER_EXTENSION_POINT_NAME "gio-proxy-resolver"
-
-typedef struct _GProxyResolverInterface GProxyResolverInterface;
-
-struct _GProxyResolverInterface {
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean (* is_supported)  (GProxyResolver       *resolver);
-
-  gchar	** (* lookup)        (GProxyResolver       *resolver,
-			      const gchar          *uri,
-			      GCancellable         *cancellable,
-			      GError              **error);
-
-  void     (* lookup_async)  (GProxyResolver       *resolver,
-			      const gchar          *uri,
-			      GCancellable         *cancellable,
-			      GAsyncReadyCallback   callback,
-			      gpointer              user_data);
-
-  gchar	** (* lookup_finish) (GProxyResolver       *resolver,
-			      GAsyncResult         *result,
-			      GError              **error);
-};
-
-GType		g_proxy_resolver_get_type       (void) G_GNUC_CONST;
-GProxyResolver *g_proxy_resolver_get_default    (void);
-
-gboolean        g_proxy_resolver_is_supported   (GProxyResolver       *resolver);
-gchar	      **g_proxy_resolver_lookup		(GProxyResolver       *resolver,
-						 const gchar          *uri,
-						 GCancellable         *cancellable,
-						 GError              **error);
-void		g_proxy_resolver_lookup_async   (GProxyResolver       *resolver,
-						 const gchar          *uri,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-gchar	      **g_proxy_resolver_lookup_finish  (GProxyResolver       *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-
-G_END_DECLS
-
-#endif /* __G_PROXY_RESOLVER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gremoteactiongroup.h b/GstreamerHelper/x64/include/glib-2.0/gio/gremoteactiongroup.h
deleted file mode 100644
index d2849e63..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gremoteactiongroup.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_REMOTE_ACTION_GROUP_H__
-#define __G_REMOTE_ACTION_GROUP_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_REMOTE_ACTION_GROUP                          (g_remote_action_group_get_type ())
-#define G_REMOTE_ACTION_GROUP(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                             G_TYPE_REMOTE_ACTION_GROUP, GRemoteActionGroup))
-#define G_IS_REMOTE_ACTION_GROUP(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                             G_TYPE_REMOTE_ACTION_GROUP))
-#define G_REMOTE_ACTION_GROUP_GET_IFACE(inst)               (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                   \
-                                                             G_TYPE_REMOTE_ACTION_GROUP,                              \
-                                                             GRemoteActionGroupInterface))
-
-typedef struct _GRemoteActionGroupInterface                 GRemoteActionGroupInterface;
-
-struct _GRemoteActionGroupInterface
-{
-  GTypeInterface g_iface;
-
-  void (* activate_action_full)     (GRemoteActionGroup *remote,
-                                     const gchar        *action_name,
-                                     GVariant           *parameter,
-                                     GVariant           *platform_data);
-
-  void (* change_action_state_full) (GRemoteActionGroup *remote,
-                                     const gchar        *action_name,
-                                     GVariant           *value,
-                                     GVariant           *platform_data);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_remote_action_group_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_remote_action_group_activate_action_full      (GRemoteActionGroup *remote,
-                                                                         const gchar        *action_name,
-                                                                         GVariant           *parameter,
-                                                                         GVariant           *platform_data);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_remote_action_group_change_action_state_full  (GRemoteActionGroup *remote,
-                                                                         const gchar        *action_name,
-                                                                         GVariant           *value,
-                                                                         GVariant           *platform_data);
-
-G_END_DECLS
-
-#endif /* __G_REMOTE_ACTION_GROUP_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gresolver.h b/GstreamerHelper/x64/include/glib-2.0/gio/gresolver.h
deleted file mode 100644
index ecd8e51d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gresolver.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_RESOLVER_H__
-#define __G_RESOLVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_RESOLVER         (g_resolver_get_type ())
-#define G_RESOLVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_RESOLVER, GResolver))
-#define G_RESOLVER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_RESOLVER, GResolverClass))
-#define G_IS_RESOLVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_RESOLVER))
-#define G_IS_RESOLVER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_RESOLVER))
-#define G_RESOLVER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_RESOLVER, GResolverClass))
-
-typedef struct _GResolverPrivate GResolverPrivate;
-typedef struct _GResolverClass   GResolverClass;
-
-struct _GResolver {
-  GObject parent_instance;
-
-  GResolverPrivate *priv;
-};
-
-struct _GResolverClass {
-  GObjectClass parent_class;
-
-  /* Signals */
-  void    ( *reload)                   (GResolver            *resolver);
-
-  /* Virtual methods */
-  GList * ( *lookup_by_name)           (GResolver            *resolver,
-					const gchar          *hostname,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_by_name_async)     (GResolver            *resolver,
-					const gchar          *hostname,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  GList * ( *lookup_by_name_finish)    (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  gchar * ( *lookup_by_address)        (GResolver            *resolver,
-					GInetAddress         *address,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_by_address_async)  (GResolver            *resolver,
-					GInetAddress         *address,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  gchar * ( *lookup_by_address_finish) (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  GList * ( *lookup_service)           (GResolver            *resolver,
-					const gchar          *rrname,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_service_async)     (GResolver            *resolver,
-					const gchar          *rrname,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  GList * ( *lookup_service_finish)    (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  GList * ( *lookup_records)           (GResolver            *resolver,
-                                        const gchar          *rrname,
-                                        GResolverRecordType   record_type,
-                                        GCancellable         *cancellable,
-                                        GError              **error);
-
-  void    ( *lookup_records_async)     (GResolver            *resolver,
-                                        const gchar          *rrname,
-                                        GResolverRecordType   record_type,
-                                        GCancellable         *cancellable,
-                                        GAsyncReadyCallback   callback,
-                                        gpointer              user_data);
-
-  GList * ( *lookup_records_finish)    (GResolver            *resolver,
-                                        GAsyncResult         *result,
-                                        GError              **error);
-
-  /* Padding for future expansion */
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-
-};
-
-GType      g_resolver_get_type                  (void) G_GNUC_CONST;
-GResolver *g_resolver_get_default               (void);
-void       g_resolver_set_default               (GResolver            *resolver);
-
-GList     *g_resolver_lookup_by_name            (GResolver            *resolver,
-						 const gchar          *hostname,
-						 GCancellable         *cancellable,
-						 GError              **error);
-void       g_resolver_lookup_by_name_async      (GResolver            *resolver,
-						 const gchar          *hostname,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-GList     *g_resolver_lookup_by_name_finish     (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-void       g_resolver_free_addresses            (GList                *addresses);
-
-gchar     *g_resolver_lookup_by_address         (GResolver            *resolver,
-						 GInetAddress         *address,
-						 GCancellable         *cancellable,
-						 GError              **error);
-void       g_resolver_lookup_by_address_async   (GResolver            *resolver,
-						 GInetAddress         *address,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-gchar     *g_resolver_lookup_by_address_finish  (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-GList     *g_resolver_lookup_service            (GResolver            *resolver,
-						 const gchar          *service,
-						 const gchar          *protocol,
-						 const gchar          *domain,
-						 GCancellable         *cancellable,
-						 GError              **error);
-void       g_resolver_lookup_service_async      (GResolver            *resolver,
-						 const gchar          *service,
-						 const gchar          *protocol,
-						 const gchar          *domain,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-GList     *g_resolver_lookup_service_finish     (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-GLIB_AVAILABLE_IN_2_34
-GList     *g_resolver_lookup_records            (GResolver            *resolver,
-                                                 const gchar          *rrname,
-                                                 GResolverRecordType   record_type,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-GLIB_AVAILABLE_IN_2_34
-void       g_resolver_lookup_records_async      (GResolver            *resolver,
-                                                 const gchar          *rrname,
-                                                 GResolverRecordType   record_type,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-GLIB_AVAILABLE_IN_2_34
-GList     *g_resolver_lookup_records_finish     (GResolver            *resolver,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-void       g_resolver_free_targets              (GList                *targets);
-
-/**
- * G_RESOLVER_ERROR:
- *
- * Error domain for #GResolver. Errors in this domain will be from the
- * #GResolverError enumeration. See #GError for more information on
- * error domains.
- */
-#define G_RESOLVER_ERROR (g_resolver_error_quark ())
-GQuark g_resolver_error_quark (void);
-
-G_END_DECLS
-
-#endif /* __G_RESOLVER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gresource.h b/GstreamerHelper/x64/include/glib-2.0/gio/gresource.h
deleted file mode 100644
index 15bfc8a4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gresource.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_RESOURCE_H__
-#define __G_RESOURCE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TYPE_RESOURCE:
- *
- * The #GType for #GResource.
- */
-#define G_TYPE_RESOURCE (g_resource_get_type ())
-
-
-/**
- * G_RESOURCE_ERROR:
- *
- * Error domain for #GResource. Errors in this domain will be from the
- * #GResourceError enumeration. See #GError for more information on
- * error domains.
- */
-#define G_RESOURCE_ERROR (g_resource_error_quark ())
-GQuark g_resource_error_quark (void);
-
-typedef struct _GStaticResource GStaticResource;
-
-struct _GStaticResource {
-  const guint8 *data;
-  gsize data_len;
-  GResource *resource;
-  GStaticResource *next;
-  gpointer padding;
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType         g_resource_get_type            (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GResource *   g_resource_new_from_data       (GBytes                *data,
-					      GError               **error);
-GResource *   g_resource_ref                 (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_resource_unref               (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-GResource *   g_resource_load                (const gchar           *filename,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GInputStream *g_resource_open_stream         (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GBytes *      g_resource_lookup_data         (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-char **       g_resource_enumerate_children  (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean      g_resource_get_info            (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      gsize                 *size,
-					      guint32               *flags,
-					      GError               **error);
-
-GLIB_AVAILABLE_IN_2_32
-void          g_resources_register           (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_resources_unregister         (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-GInputStream *g_resources_open_stream        (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GBytes *      g_resources_lookup_data        (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-char **       g_resources_enumerate_children (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean      g_resources_get_info           (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      gsize                 *size,
-					      guint32               *flags,
-					      GError               **error);
-
-
-GLIB_AVAILABLE_IN_2_32
-void          g_static_resource_init          (GStaticResource *static_resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_static_resource_fini          (GStaticResource *static_resource);
-GLIB_AVAILABLE_IN_2_32
-GResource    *g_static_resource_get_resource  (GStaticResource *static_resource);
-
-G_END_DECLS
-
-#endif /* __G_RESOURCE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gseekable.h b/GstreamerHelper/x64/include/glib-2.0/gio/gseekable.h
deleted file mode 100644
index ba51eea5..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gseekable.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SEEKABLE_H__
-#define __G_SEEKABLE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SEEKABLE            (g_seekable_get_type ())
-#define G_SEEKABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_SEEKABLE, GSeekable))
-#define G_IS_SEEKABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_SEEKABLE))
-#define G_SEEKABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_SEEKABLE, GSeekableIface))
-
-/**
- * GSeekable:
- *
- * Seek object for streaming operations.
- **/
-typedef struct _GSeekableIface   GSeekableIface;
-
-/**
- * GSeekableIface:
- * @g_iface: The parent interface.
- * @tell: Tells the current location within a stream.
- * @can_seek: Checks if seeking is supported by the stream.
- * @seek: Seeks to a location within a stream.
- * @can_truncate: Checks if truncation is supported by the stream.
- * @truncate_fn: Truncates a stream.
- *
- * Provides an interface for implementing seekable functionality on I/O Streams.
- **/
-struct _GSeekableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  goffset     (* tell)	         (GSeekable    *seekable);
-
-  gboolean    (* can_seek)       (GSeekable    *seekable);
-  gboolean    (* seek)	         (GSeekable    *seekable,
-				  goffset       offset,
-				  GSeekType     type,
-				  GCancellable *cancellable,
-				  GError      **error);
-
-  gboolean    (* can_truncate)   (GSeekable    *seekable);
-  gboolean    (* truncate_fn)    (GSeekable    *seekable,
-				  goffset       offset,
-				  GCancellable *cancellable,
-				  GError       **error);
-
-  /* TODO: Async seek/truncate */
-};
-
-GType    g_seekable_get_type     (void) G_GNUC_CONST;
-
-goffset  g_seekable_tell         (GSeekable     *seekable);
-gboolean g_seekable_can_seek     (GSeekable     *seekable);
-gboolean g_seekable_seek         (GSeekable     *seekable,
-				  goffset        offset,
-				  GSeekType      type,
-				  GCancellable  *cancellable,
-				  GError       **error);
-gboolean g_seekable_can_truncate (GSeekable     *seekable);
-gboolean g_seekable_truncate     (GSeekable     *seekable,
-				  goffset        offset,
-				  GCancellable  *cancellable,
-				  GError       **error);
-
-G_END_DECLS
-
-
-#endif /* __G_SEEKABLE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsettings.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsettings.h
deleted file mode 100644
index 01f3e9e1..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsettings.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SETTINGS_H__
-#define __G_SETTINGS_H__
-
-#include <gio/gsettingsschema.h>
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SETTINGS                                     (g_settings_get_type ())
-#define G_SETTINGS(inst)                                    (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SETTINGS, GSettings))
-#define G_SETTINGS_CLASS(class)                             (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SETTINGS, GSettingsClass))
-#define G_IS_SETTINGS(inst)                                 (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_SETTINGS))
-#define G_IS_SETTINGS_CLASS(class)                          (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_SETTINGS))
-#define G_SETTINGS_GET_CLASS(inst)                          (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SETTINGS, GSettingsClass))
-
-typedef struct _GSettingsPrivate                            GSettingsPrivate;
-typedef struct _GSettingsClass                              GSettingsClass;
-
-struct _GSettingsClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  void        (*writable_changed)      (GSettings    *settings,
-                                        const gchar  *key);
-  void        (*changed)               (GSettings    *settings,
-                                        const gchar  *key);
-  gboolean    (*writable_change_event) (GSettings    *settings,
-                                        GQuark        key);
-  gboolean    (*change_event)          (GSettings    *settings,
-                                        const GQuark *keys,
-                                        gint          n_keys);
-
-  gpointer padding[20];
-};
-
-struct _GSettings
-{
-  GObject parent_instance;
-  GSettingsPrivate *priv;
-};
-
-
-GType                   g_settings_get_type                             (void);
-
-const gchar * const *   g_settings_list_schemas                         (void);
-const gchar * const *   g_settings_list_relocatable_schemas             (void);
-GSettings *             g_settings_new                                  (const gchar        *schema_id);
-GSettings *             g_settings_new_with_path                        (const gchar        *schema_id,
-                                                                         const gchar        *path);
-GSettings *             g_settings_new_with_backend                     (const gchar        *schema_id,
-                                                                         GSettingsBackend   *backend);
-GSettings *             g_settings_new_with_backend_and_path            (const gchar        *schema_id,
-                                                                         GSettingsBackend   *backend,
-                                                                         const gchar        *path);
-GLIB_AVAILABLE_IN_2_32
-GSettings *             g_settings_new_full                             (GSettingsSchema    *schema,
-                                                                         GSettingsBackend   *backend,
-                                                                         const gchar        *path);
-gchar **                g_settings_list_children                        (GSettings          *settings);
-gchar **                g_settings_list_keys                            (GSettings          *settings);
-GVariant *              g_settings_get_range                            (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_range_check                          (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         GVariant           *value);
-
-gboolean                g_settings_set_value                            (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         GVariant           *value);
-GVariant *              g_settings_get_value                            (GSettings          *settings,
-                                                                         const gchar        *key);
-
-gboolean                g_settings_set                                  (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *format,
-                                                                         ...);
-void                    g_settings_get                                  (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *format,
-                                                                         ...);
-void                    g_settings_reset                                (GSettings          *settings,
-                                                                         const gchar        *key);
-
-gint                    g_settings_get_int                              (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_int                              (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gint                value);
-guint                   g_settings_get_uint                             (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_uint                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         guint               value);
-gchar *                 g_settings_get_string                           (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_string                           (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *value);
-gboolean                g_settings_get_boolean                          (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_boolean                          (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gboolean            value);
-gdouble                 g_settings_get_double                           (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_double                           (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gdouble             value);
-gchar **                g_settings_get_strv                             (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_strv                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar *const *value);
-gint                    g_settings_get_enum                             (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_enum                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gint                value);
-guint                   g_settings_get_flags                            (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_flags                            (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         guint               value);
-GSettings *             g_settings_get_child                            (GSettings          *settings,
-                                                                         const gchar        *name);
-
-gboolean                g_settings_is_writable                          (GSettings          *settings,
-                                                                         const gchar        *name);
-
-void                    g_settings_delay                                (GSettings          *settings);
-void                    g_settings_apply                                (GSettings          *settings);
-void                    g_settings_revert                               (GSettings          *settings);
-gboolean                g_settings_get_has_unapplied                    (GSettings          *settings);
-void                    g_settings_sync                                 (void);
-
-/**
- * GSettingsBindSetMapping:
- * @value: a #GValue containing the property value to map
- * @expected_type: the #GVariantType to create
- * @user_data: user data that was specified when the binding was created
- *
- * The type for the function that is used to convert an object property
- * value to a #GVariant for storing it in #GSettings.
- *
- * Returns: a new #GVariant holding the data from @value,
- *     or %NULL in case of an error
- */
-typedef GVariant *    (*GSettingsBindSetMapping)                        (const GValue       *value,
-                                                                         const GVariantType *expected_type,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsBindGetMapping:
- * @value: return location for the property value
- * @variant: the #GVariant
- * @user_data: user data that was specified when the binding was created
- *
- * The type for the function that is used to convert from #GSettings to
- * an object property. The @value is already initialized to hold values
- * of the appropriate type.
- *
- * Returns: %TRUE if the conversion succeeded, %FALSE in case of an error
- */
-typedef gboolean      (*GSettingsBindGetMapping)                        (GValue             *value,
-                                                                         GVariant           *variant,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsGetMapping:
- * @value: the #GVariant to map, or %NULL
- * @result: (out): the result of the mapping
- * @user_data: (closure): the user data that was passed to
- * g_settings_get_mapped()
- *
- * The type of the function that is used to convert from a value stored
- * in a #GSettings to a value that is useful to the application.
- *
- * If the value is successfully mapped, the result should be stored at
- * @result and %TRUE returned.  If mapping fails (for example, if @value
- * is not in the right format) then %FALSE should be returned.
- *
- * If @value is %NULL then it means that the mapping function is being
- * given a "last chance" to successfully return a valid value.  %TRUE
- * must be returned in this case.
- *
- * Returns: %TRUE if the conversion succeeded, %FALSE in case of an error
- **/
-typedef gboolean      (*GSettingsGetMapping)                            (GVariant           *value,
-                                                                         gpointer           *result,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsBindFlags:
- * @G_SETTINGS_BIND_DEFAULT: Equivalent to <literal>G_SETTINGS_BIND_GET|G_SETTINGS_BIND_SET</literal>
- * @G_SETTINGS_BIND_GET: Update the #GObject property when the setting changes.
- *     It is an error to use this flag if the property is not writable.
- * @G_SETTINGS_BIND_SET: Update the setting when the #GObject property changes.
- *     It is an error to use this flag if the property is not readable.
- * @G_SETTINGS_BIND_NO_SENSITIVITY: Do not try to bind a "sensitivity" property to the writability of the setting
- * @G_SETTINGS_BIND_GET_NO_CHANGES: When set in addition to #G_SETTINGS_BIND_GET, set the #GObject property
- *     value initially from the setting, but do not listen for changes of the setting
- * @G_SETTINGS_BIND_INVERT_BOOLEAN: When passed to g_settings_bind(), uses a pair of mapping functions that invert
- *     the boolean value when mapping between the setting and the property.  The setting and property must both
- *     be booleans.  You cannot pass this flag to g_settings_bind_with_mapping().
- *
- * Flags used when creating a binding. These flags determine in which
- * direction the binding works. The default is to synchronize in both
- * directions.
- */
-typedef enum
-{
-  G_SETTINGS_BIND_DEFAULT,
-  G_SETTINGS_BIND_GET            = (1<<0),
-  G_SETTINGS_BIND_SET            = (1<<1),
-  G_SETTINGS_BIND_NO_SENSITIVITY = (1<<2),
-  G_SETTINGS_BIND_GET_NO_CHANGES = (1<<3),
-  G_SETTINGS_BIND_INVERT_BOOLEAN = (1<<4)
-} GSettingsBindFlags;
-
-void                    g_settings_bind                                 (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         GSettingsBindFlags       flags);
-void                    g_settings_bind_with_mapping                    (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         GSettingsBindFlags       flags,
-                                                                         GSettingsBindGetMapping  get_mapping,
-                                                                         GSettingsBindSetMapping  set_mapping,
-                                                                         gpointer                 user_data,
-                                                                         GDestroyNotify           destroy);
-void                    g_settings_bind_writable                        (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         gboolean                 inverted);
-void                    g_settings_unbind                               (gpointer                 object,
-                                                                         const gchar             *property);
-
-GLIB_AVAILABLE_IN_2_32
-GAction *               g_settings_create_action                        (GSettings               *settings,
-                                                                         const gchar             *key);
-
-gpointer                g_settings_get_mapped                           (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         GSettingsGetMapping      mapping,
-                                                                         gpointer                 user_data);
-
-G_END_DECLS
-
-#endif  /* __G_SETTINGS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsettingsbackend.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsettingsbackend.h
deleted file mode 100644
index e6741873..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsettingsbackend.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- * Copyright © 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Matthias Clasen <mclasen@redhat.com>
- */
-
-#ifndef __G_SETTINGS_BACKEND_H__
-#define __G_SETTINGS_BACKEND_H__
-
-#if !defined (G_SETTINGS_ENABLE_BACKEND) && !defined (GIO_COMPILATION)
-#error "You must define G_SETTINGS_ENABLE_BACKEND before including <gio/gsettingsbackend.h>."
-#endif
-
-#define __GIO_GIO_H_INSIDE__
-#include <gio/giotypes.h>
-#undef __GIO_GIO_H_INSIDE__
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SETTINGS_BACKEND                             (g_settings_backend_get_type ())
-#define G_SETTINGS_BACKEND(inst)                            (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackend))
-#define G_SETTINGS_BACKEND_CLASS(class)                     (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackendClass))
-#define G_IS_SETTINGS_BACKEND(inst)                         (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SETTINGS_BACKEND))
-#define G_IS_SETTINGS_BACKEND_CLASS(class)                  (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SETTINGS_BACKEND))
-#define G_SETTINGS_BACKEND_GET_CLASS(inst)                  (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackendClass))
-
-/**
- * G_SETTINGS_BACKEND_EXTENSION_POINT_NAME:
- *
- * Extension point for #GSettingsBackend functionality.
- **/
-#define G_SETTINGS_BACKEND_EXTENSION_POINT_NAME "gsettings-backend"
-
-/**
- * GSettingsBackend:
- *
- * An implementation of a settings storage repository.
- **/
-typedef struct _GSettingsBackendPrivate                     GSettingsBackendPrivate;
-typedef struct _GSettingsBackendClass                       GSettingsBackendClass;
-
-struct _GSettingsBackendClass
-{
-  GObjectClass parent_class;
-
-  GVariant *    (*read)             (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     const GVariantType  *expected_type,
-                                     gboolean             default_value);
-
-  gboolean      (*get_writable)     (GSettingsBackend    *backend,
-                                     const gchar         *key);
-
-  gboolean      (*write)            (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     GVariant            *value,
-                                     gpointer             origin_tag);
-  gboolean      (*write_tree)       (GSettingsBackend    *backend,
-                                     GTree               *tree,
-                                     gpointer             origin_tag);
-  void          (*reset)            (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     gpointer             origin_tag);
-
-  void          (*subscribe)        (GSettingsBackend    *backend,
-                                     const gchar         *name);
-  void          (*unsubscribe)      (GSettingsBackend    *backend,
-                                     const gchar         *name);
-  void          (*sync)             (GSettingsBackend    *backend);
-
-  GPermission * (*get_permission)   (GSettingsBackend    *backend,
-                                     const gchar         *path);
-
-  gpointer padding[24];
-};
-
-struct _GSettingsBackend
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GSettingsBackendPrivate *priv;
-};
-
-GType                   g_settings_backend_get_type                     (void);
-
-void                    g_settings_backend_changed                      (GSettingsBackend    *backend,
-                                                                         const gchar         *key,
-                                                                         gpointer             origin_tag);
-void                    g_settings_backend_path_changed                 (GSettingsBackend    *backend,
-                                                                         const gchar         *path,
-                                                                         gpointer             origin_tag);
-void                    g_settings_backend_flatten_tree                 (GTree               *tree,
-                                                                         gchar              **path,
-                                                                         const gchar       ***keys,
-                                                                         GVariant          ***values);
-void                    g_settings_backend_keys_changed                 (GSettingsBackend    *backend,
-                                                                         const gchar         *path,
-                                                                         gchar const * const *items,
-                                                                         gpointer             origin_tag);
-
-void                    g_settings_backend_path_writable_changed        (GSettingsBackend    *backend,
-                                                                         const gchar         *path);
-void                    g_settings_backend_writable_changed             (GSettingsBackend    *backend,
-                                                                         const gchar         *key);
-void                    g_settings_backend_changed_tree                 (GSettingsBackend    *backend,
-                                                                         GTree               *tree,
-                                                                         gpointer             origin_tag);
-
-GSettingsBackend *      g_settings_backend_get_default                  (void);
-
-GSettingsBackend *      g_keyfile_settings_backend_new                  (const gchar         *filename,
-                                                                         const gchar         *root_path,
-                                                                         const gchar         *root_group);
-
-GSettingsBackend *      g_null_settings_backend_new                     (void);
-
-GSettingsBackend *      g_memory_settings_backend_new                   (void);
-
-G_END_DECLS
-
-#endif /* __G_SETTINGS_BACKEND_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsettingsschema.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsettingsschema.h
deleted file mode 100644
index 277907da..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsettingsschema.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SETTINGS_SCHEMA_H__
-#define __G_SETTINGS_SCHEMA_H__
-
-#include <glib-object.h>
-
-typedef struct _GSettingsSchemaSource                       GSettingsSchemaSource;
-typedef struct _GSettingsSchema                             GSettingsSchema;
-
-#define                 G_TYPE_SETTINGS_SCHEMA_SOURCE                   (g_settings_schema_source_get_type ())
-GLIB_AVAILABLE_IN_2_32
-GType                   g_settings_schema_source_get_type               (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchemaSource * g_settings_schema_source_get_default            (void);
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchemaSource * g_settings_schema_source_ref                    (GSettingsSchemaSource  *source);
-GLIB_AVAILABLE_IN_2_32
-void                    g_settings_schema_source_unref                  (GSettingsSchemaSource  *source);
-
-GSettingsSchemaSource * g_settings_schema_source_new_from_directory     (const gchar            *directory,
-                                                                         GSettingsSchemaSource  *parent,
-                                                                         gboolean                trusted,
-                                                                         GError                **error);
-
-GSettingsSchema *       g_settings_schema_source_lookup                 (GSettingsSchemaSource  *source,
-                                                                         const gchar            *schema_id,
-                                                                         gboolean                recursive);
-
-#define                 G_TYPE_SETTINGS_SCHEMA                          (g_settings_schema_get_type ())
-GLIB_AVAILABLE_IN_2_32
-GType                   g_settings_schema_get_type                      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchema *       g_settings_schema_ref                           (GSettingsSchema        *schema);
-GLIB_AVAILABLE_IN_2_32
-void                    g_settings_schema_unref                         (GSettingsSchema        *schema);
-
-const gchar *           g_settings_schema_get_id                        (GSettingsSchema        *schema);
-const gchar *           g_settings_schema_get_path                      (GSettingsSchema        *schema);
-
-#endif /* __G_SETTINGS_SCHEMA_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleaction.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleaction.h
deleted file mode 100644
index 7570fb4e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleaction.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_ACTION_H__
-#define __G_SIMPLE_ACTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ACTION                                (g_simple_action_get_type ())
-#define G_SIMPLE_ACTION(inst)                               (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION, GSimpleAction))
-#define G_IS_SIMPLE_ACTION(inst)                            (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION))
-
-GType                   g_simple_action_get_type                        (void) G_GNUC_CONST;
-
-GSimpleAction *         g_simple_action_new                             (const gchar        *name,
-                                                                         const GVariantType *parameter_type);
-
-GSimpleAction *         g_simple_action_new_stateful                    (const gchar        *name,
-                                                                         const GVariantType *parameter_type,
-                                                                         GVariant           *state);
-
-void                    g_simple_action_set_enabled                     (GSimpleAction      *simple,
-                                                                         gboolean            enabled);
-
-void                    g_simple_action_set_state                       (GSimpleAction      *simple,
-                                                                         GVariant           *value);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_ACTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleactiongroup.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleactiongroup.h
deleted file mode 100644
index 7de37bc0..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleactiongroup.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_ACTION_GROUP_H__
-#define __G_SIMPLE_ACTION_GROUP_H__
-
-#include "gactiongroup.h"
-#include "gactionmap.h"
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ACTION_GROUP                          (g_simple_action_group_get_type ())
-#define G_SIMPLE_ACTION_GROUP(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroup))
-#define G_SIMPLE_ACTION_GROUP_CLASS(class)                  (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroupClass))
-#define G_IS_SIMPLE_ACTION_GROUP(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP))
-#define G_IS_SIMPLE_ACTION_GROUP_CLASS(class)               (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP))
-#define G_SIMPLE_ACTION_GROUP_GET_CLASS(inst)               (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroupClass))
-
-typedef struct _GSimpleActionGroupPrivate                   GSimpleActionGroupPrivate;
-typedef struct _GSimpleActionGroupClass                     GSimpleActionGroupClass;
-
-/**
- * GSimpleActionGroup:
- *
- * The #GSimpleActionGroup structure contains private data and should only be accessed using the provided API.
- *
- * Since: 2.28
- */
-struct _GSimpleActionGroup
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GSimpleActionGroupPrivate *priv;
-};
-
-struct _GSimpleActionGroupClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[12];
-};
-
-GType                   g_simple_action_group_get_type                  (void) G_GNUC_CONST;
-
-GSimpleActionGroup *    g_simple_action_group_new                       (void);
-
-GAction *               g_simple_action_group_lookup                    (GSimpleActionGroup *simple,
-                                                                         const gchar        *action_name);
-
-void                    g_simple_action_group_insert                    (GSimpleActionGroup *simple,
-                                                                         GAction            *action);
-
-void                    g_simple_action_group_remove                    (GSimpleActionGroup *simple,
-                                                                         const gchar        *action_name);
-
-void                    g_simple_action_group_add_entries               (GSimpleActionGroup *simple,
-                                                                         const GActionEntry *entries,
-                                                                         gint                n_entries,
-                                                                         gpointer            user_data);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_ACTION_GROUP_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleasyncresult.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleasyncresult.h
deleted file mode 100644
index 74976301..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsimpleasyncresult.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_ASYNC_RESULT_H__
-#define __G_SIMPLE_ASYNC_RESULT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ASYNC_RESULT         (g_simple_async_result_get_type ())
-#define G_SIMPLE_ASYNC_RESULT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResult))
-#define G_SIMPLE_ASYNC_RESULT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResultClass))
-#define G_IS_SIMPLE_ASYNC_RESULT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SIMPLE_ASYNC_RESULT))
-#define G_IS_SIMPLE_ASYNC_RESULT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SIMPLE_ASYNC_RESULT))
-#define G_SIMPLE_ASYNC_RESULT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResultClass))
-
-/**
- * GSimpleAsyncResult:
- *
- * A simple implementation of #GAsyncResult.
- **/
-typedef struct _GSimpleAsyncResultClass   GSimpleAsyncResultClass;
-
-
-GType               g_simple_async_result_get_type         (void) G_GNUC_CONST;
-
-GSimpleAsyncResult *g_simple_async_result_new              (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    gpointer                 source_tag);
-GSimpleAsyncResult *g_simple_async_result_new_error        (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    ...) G_GNUC_PRINTF (6, 7);
-GSimpleAsyncResult *g_simple_async_result_new_from_error   (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    const GError            *error);
-GSimpleAsyncResult *g_simple_async_result_new_take_error   (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    GError                  *error);
-
-void                g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult      *simple,
-                                                               gpointer                 op_res,
-                                                               GDestroyNotify           destroy_op_res);
-gpointer            g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult      *simple);
-
-void                g_simple_async_result_set_op_res_gssize   (GSimpleAsyncResult      *simple,
-                                                               gssize                   op_res);
-gssize              g_simple_async_result_get_op_res_gssize   (GSimpleAsyncResult      *simple);
-
-void                g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult      *simple,
-                                                               gboolean                 op_res);
-gboolean            g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult      *simple);
-
-
-
-GLIB_AVAILABLE_IN_2_32
-void                g_simple_async_result_set_check_cancellable (GSimpleAsyncResult *simple,
-                                                                 GCancellable       *check_cancellable);
-gpointer            g_simple_async_result_get_source_tag   (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult      *simple,
-								   gboolean          handle_cancellation);
-void                g_simple_async_result_complete         (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_complete_in_idle (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_run_in_thread    (GSimpleAsyncResult      *simple,
-							    GSimpleAsyncThreadFunc   func,
-							    int                      io_priority,
-							    GCancellable            *cancellable);
-void                g_simple_async_result_set_from_error   (GSimpleAsyncResult      *simple,
-							    const GError            *error);
-void                g_simple_async_result_take_error       (GSimpleAsyncResult      *simple,
-							    GError            *error);
-gboolean            g_simple_async_result_propagate_error  (GSimpleAsyncResult      *simple,
-							    GError                 **dest);
-void                g_simple_async_result_set_error        (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    ...) G_GNUC_PRINTF (4, 5);
-void                g_simple_async_result_set_error_va     (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    va_list                  args);
-gboolean            g_simple_async_result_is_valid         (GAsyncResult            *result,
-                                                            GObject                 *source,
-                                                            gpointer                 source_tag);
-
-void g_simple_async_report_error_in_idle  (GObject            *object,
-					   GAsyncReadyCallback callback,
-					   gpointer            user_data,
-					   GQuark              domain,
-					   gint                code,
-					   const char         *format,
-					   ...);
-void g_simple_async_report_gerror_in_idle (GObject            *object,
-					   GAsyncReadyCallback callback,
-					   gpointer            user_data,
-					   const GError       *error);
-void g_simple_async_report_take_gerror_in_idle (GObject            *object,
-                                                GAsyncReadyCallback callback,
-                                                gpointer            user_data,
-                                                GError             *error);
-
-G_END_DECLS
-
-
-
-#endif /* __G_SIMPLE_ASYNC_RESULT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsimplepermission.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsimplepermission.h
deleted file mode 100644
index 367fe895..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsimplepermission.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_PERMISSION_H__
-#define __G_SIMPLE_PERMISSION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_PERMISSION      (g_simple_permission_get_type ())
-#define G_SIMPLE_PERMISSION(inst)     (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                       G_TYPE_SIMPLE_PERMISSION,             \
-                                       GSimplePermission))
-#define G_IS_SIMPLE_PERMISSION(inst)  (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                       G_TYPE_SIMPLE_PERMISSION))
-
-GType                   g_simple_permission_get_type            (void);
-GPermission *           g_simple_permission_new                 (gboolean allowed);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_PERMISSION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocket.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocket.h
deleted file mode 100644
index 29ba44f3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocket.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_H__
-#define __G_SOCKET_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET                                       (g_socket_get_type ())
-#define G_SOCKET(inst)                                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET, GSocket))
-#define G_SOCKET_CLASS(class)                               (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET, GSocketClass))
-#define G_IS_SOCKET(inst)                                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET))
-#define G_IS_SOCKET_CLASS(class)                            (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET))
-#define G_SOCKET_GET_CLASS(inst)                            (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET, GSocketClass))
-
-typedef struct _GSocketPrivate                              GSocketPrivate;
-typedef struct _GSocketClass                                GSocketClass;
-
-struct _GSocketClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-  void (*_g_reserved10) (void);
-};
-
-struct _GSocket
-{
-  GObject parent_instance;
-  GSocketPrivate *priv;
-};
-
-GType                  g_socket_get_type                (void) G_GNUC_CONST;
-GSocket *              g_socket_new                     (GSocketFamily            family,
-							 GSocketType              type,
-							 GSocketProtocol          protocol,
-							 GError                 **error);
-GSocket *              g_socket_new_from_fd             (gint                     fd,
-							 GError                 **error);
-int                    g_socket_get_fd                  (GSocket                 *socket);
-GSocketFamily          g_socket_get_family              (GSocket                 *socket);
-GSocketType            g_socket_get_socket_type         (GSocket                 *socket);
-GSocketProtocol        g_socket_get_protocol            (GSocket                 *socket);
-GSocketAddress *       g_socket_get_local_address       (GSocket                 *socket,
-							 GError                 **error);
-GSocketAddress *       g_socket_get_remote_address      (GSocket                 *socket,
-							 GError                 **error);
-void                   g_socket_set_blocking            (GSocket                 *socket,
-							 gboolean                 blocking);
-gboolean               g_socket_get_blocking            (GSocket                 *socket);
-void                   g_socket_set_keepalive           (GSocket                 *socket,
-							 gboolean                 keepalive);
-gboolean               g_socket_get_keepalive           (GSocket                 *socket);
-gint                   g_socket_get_listen_backlog      (GSocket                 *socket);
-void                   g_socket_set_listen_backlog      (GSocket                 *socket,
-							 gint                     backlog);
-guint                  g_socket_get_timeout             (GSocket                 *socket);
-void                   g_socket_set_timeout             (GSocket                 *socket,
-							 guint                    timeout);
-
-GLIB_AVAILABLE_IN_2_32
-guint                  g_socket_get_ttl                 (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_ttl                 (GSocket                 *socket,
-                                                         guint                    ttl);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_get_broadcast           (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_broadcast           (GSocket                 *socket,
-                                                         gboolean		  broadcast);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_get_multicast_loopback  (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_multicast_loopback  (GSocket                 *socket,
-                                                         gboolean		  loopback);
-GLIB_AVAILABLE_IN_2_32
-guint                  g_socket_get_multicast_ttl       (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_multicast_ttl       (GSocket                 *socket,
-                                                         guint                    ttl);
-gboolean               g_socket_is_connected            (GSocket                 *socket);
-gboolean               g_socket_bind                    (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 gboolean                 allow_reuse,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_join_multicast_group    (GSocket                 *socket,
-                                                         GInetAddress            *group,
-                                                         gboolean                 source_specific,
-                                                         const gchar             *iface,
-                                                         GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_leave_multicast_group   (GSocket                 *socket,
-                                                         GInetAddress            *group,
-                                                         gboolean                 source_specific,
-                                                         const gchar             *iface,
-                                                         GError                 **error);
-gboolean               g_socket_connect                 (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gboolean               g_socket_check_connect_result    (GSocket                 *socket,
-							 GError                 **error);
-
-gssize                 g_socket_get_available_bytes     (GSocket                 *socket);
-
-GIOCondition           g_socket_condition_check         (GSocket                 *socket,
-							 GIOCondition             condition);
-gboolean               g_socket_condition_wait          (GSocket                 *socket,
-							 GIOCondition             condition,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_condition_timed_wait    (GSocket                 *socket,
-							 GIOCondition             condition,
-							 gint64                   timeout,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GSocket *              g_socket_accept                  (GSocket                 *socket,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gboolean               g_socket_listen                  (GSocket                 *socket,
-							 GError                 **error);
-gssize                 g_socket_receive                 (GSocket                 *socket,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_receive_from            (GSocket                 *socket,
-							 GSocketAddress         **address,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_send                    (GSocket                 *socket,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_send_to                 (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_receive_message         (GSocket                 *socket,
-							 GSocketAddress         **address,
-							 GInputVector            *vectors,
-							 gint                     num_vectors,
-							 GSocketControlMessage ***messages,
-							 gint                    *num_messages,
-							 gint                    *flags,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_send_message            (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 GOutputVector           *vectors,
-							 gint                     num_vectors,
-							 GSocketControlMessage  **messages,
-							 gint                     num_messages,
-							 gint                     flags,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gboolean               g_socket_close                   (GSocket                 *socket,
-							 GError                 **error);
-gboolean               g_socket_shutdown                (GSocket                 *socket,
-							 gboolean                 shutdown_read,
-							 gboolean                 shutdown_write,
-							 GError                 **error);
-gboolean               g_socket_is_closed               (GSocket                 *socket);
-GSource *              g_socket_create_source           (GSocket                 *socket,
-							 GIOCondition             condition,
-							 GCancellable            *cancellable);
-gboolean               g_socket_speaks_ipv4             (GSocket                 *socket);
-GCredentials          *g_socket_get_credentials         (GSocket                 *socket,
-                                                         GError                 **error);
-
-gssize                 g_socket_receive_with_blocking   (GSocket                 *socket,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 gboolean                 blocking,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_send_with_blocking      (GSocket                 *socket,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 gboolean                 blocking,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketaddress.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocketaddress.h
deleted file mode 100644
index 356e2b05..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketaddress.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_ADDRESS_H__
-#define __G_SOCKET_ADDRESS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_ADDRESS         (g_socket_address_get_type ())
-#define G_SOCKET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SOCKET_ADDRESS, GSocketAddress))
-#define G_SOCKET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SOCKET_ADDRESS, GSocketAddressClass))
-#define G_IS_SOCKET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SOCKET_ADDRESS))
-#define G_IS_SOCKET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SOCKET_ADDRESS))
-#define G_SOCKET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SOCKET_ADDRESS, GSocketAddressClass))
-
-typedef struct _GSocketAddressClass   GSocketAddressClass;
-
-struct _GSocketAddress
-{
-  GObject parent_instance;
-};
-
-struct _GSocketAddressClass
-{
-  GObjectClass parent_class;
-
-  GSocketFamily  (*get_family)      (GSocketAddress *address);
-
-  gssize         (*get_native_size) (GSocketAddress *address);
-
-  gboolean       (*to_native)       (GSocketAddress *address,
-                                     gpointer        dest,
-                                     gsize           destlen,
-				     GError        **error);
-};
-
-GType                 g_socket_address_get_type        (void) G_GNUC_CONST;
-
-GSocketFamily         g_socket_address_get_family      (GSocketAddress *address);
-
-GSocketAddress *      g_socket_address_new_from_native (gpointer        native,
-                                                        gsize           len);
-
-gboolean              g_socket_address_to_native       (GSocketAddress *address,
-                                                        gpointer        dest,
-                                                        gsize           destlen,
-							GError        **error);
-
-gssize                g_socket_address_get_native_size (GSocketAddress *address);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_ADDRESS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketaddressenumerator.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocketaddressenumerator.h
deleted file mode 100644
index c69be2f3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketaddressenumerator.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_ADDRESS_ENUMERATOR_H__
-#define __G_SOCKET_ADDRESS_ENUMERATOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_ADDRESS_ENUMERATOR         (g_socket_address_enumerator_get_type ())
-#define G_SOCKET_ADDRESS_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumerator))
-#define G_SOCKET_ADDRESS_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumeratorClass))
-#define G_IS_SOCKET_ADDRESS_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR))
-#define G_IS_SOCKET_ADDRESS_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SOCKET_ADDRESS_ENUMERATOR))
-#define G_SOCKET_ADDRESS_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumeratorClass))
-
-/**
- * GSocketAddressEnumerator:
- *
- * Enumerator type for objects that contain or generate
- * #GSocketAddress<!-- -->es.
- */
-typedef struct _GSocketAddressEnumeratorClass GSocketAddressEnumeratorClass;
-
-struct _GSocketAddressEnumerator
-{
-  GObject parent_instance;
-
-};
-
-struct _GSocketAddressEnumeratorClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  GSocketAddress * (* next)        (GSocketAddressEnumerator  *enumerator,
-				    GCancellable              *cancellable,
-				    GError                   **error);
-
-  void             (* next_async)  (GSocketAddressEnumerator  *enumerator,
-				    GCancellable              *cancellable,
-				    GAsyncReadyCallback        callback,
-				    gpointer                   user_data);
-  GSocketAddress * (* next_finish) (GSocketAddressEnumerator  *enumerator,
-				    GAsyncResult              *result,
-				    GError                   **error);
-};
-
-GType           g_socket_address_enumerator_get_type        (void) G_GNUC_CONST;
-
-GSocketAddress *g_socket_address_enumerator_next        (GSocketAddressEnumerator  *enumerator,
-							 GCancellable              *cancellable,
-							 GError                   **error);
-
-void            g_socket_address_enumerator_next_async  (GSocketAddressEnumerator  *enumerator,
-							 GCancellable              *cancellable,
-							 GAsyncReadyCallback        callback,
-							 gpointer                   user_data);
-GSocketAddress *g_socket_address_enumerator_next_finish (GSocketAddressEnumerator  *enumerator,
-							 GAsyncResult              *result,
-							 GError                   **error);
-
-G_END_DECLS
-
-
-#endif /* __G_SOCKET_ADDRESS_ENUMERATOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketclient.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocketclient.h
deleted file mode 100644
index 216310b4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketclient.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_CLIENT_H__
-#define __G_SOCKET_CLIENT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CLIENT                                (g_socket_client_get_type ())
-#define G_SOCKET_CLIENT(inst)                               (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClient))
-#define G_SOCKET_CLIENT_CLASS(class)                        (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClientClass))
-#define G_IS_SOCKET_CLIENT(inst)                            (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CLIENT))
-#define G_IS_SOCKET_CLIENT_CLASS(class)                     (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CLIENT))
-#define G_SOCKET_CLIENT_GET_CLASS(inst)                     (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClientClass))
-
-typedef struct _GSocketClientPrivate                        GSocketClientPrivate;
-typedef struct _GSocketClientClass                          GSocketClientClass;
-
-struct _GSocketClientClass
-{
-  GObjectClass parent_class;
-
-  void (* event) (GSocketClient       *client,
-		  GSocketClientEvent  event,
-		  GSocketConnectable  *connectable,
-		  GIOStream           *connection);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-};
-
-struct _GSocketClient
-{
-  GObject parent_instance;
-  GSocketClientPrivate *priv;
-};
-
-GType                   g_socket_client_get_type                        (void) G_GNUC_CONST;
-
-GSocketClient          *g_socket_client_new                             (void);
-
-GSocketFamily           g_socket_client_get_family                      (GSocketClient        *client);
-void                    g_socket_client_set_family                      (GSocketClient        *client,
-									 GSocketFamily         family);
-GSocketType             g_socket_client_get_socket_type                 (GSocketClient        *client);
-void                    g_socket_client_set_socket_type                 (GSocketClient        *client,
-									 GSocketType           type);
-GSocketProtocol         g_socket_client_get_protocol                    (GSocketClient        *client);
-void                    g_socket_client_set_protocol                    (GSocketClient        *client,
-									 GSocketProtocol       protocol);
-GSocketAddress         *g_socket_client_get_local_address               (GSocketClient        *client);
-void                    g_socket_client_set_local_address               (GSocketClient        *client,
-									 GSocketAddress       *address);
-guint                   g_socket_client_get_timeout                     (GSocketClient        *client);
-void                    g_socket_client_set_timeout                     (GSocketClient        *client,
-									 guint                 timeout);
-gboolean                g_socket_client_get_enable_proxy                (GSocketClient        *client);
-void                    g_socket_client_set_enable_proxy                (GSocketClient        *client,
-    									 gboolean	      enable);
-
-gboolean                g_socket_client_get_tls                         (GSocketClient        *client);
-void                    g_socket_client_set_tls                         (GSocketClient        *client,
-									 gboolean              tls);
-GTlsCertificateFlags    g_socket_client_get_tls_validation_flags        (GSocketClient        *client);
-void                    g_socket_client_set_tls_validation_flags        (GSocketClient        *client,
-									 GTlsCertificateFlags  flags);
-
-GSocketConnection *     g_socket_client_connect                         (GSocketClient        *client,
-                                                                         GSocketConnectable   *connectable,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GSocketConnection *     g_socket_client_connect_to_host                 (GSocketClient        *client,
-									 const gchar          *host_and_port,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GSocketConnection *     g_socket_client_connect_to_service              (GSocketClient        *client,
-									 const gchar          *domain,
-									 const gchar          *service,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GSocketConnection *     g_socket_client_connect_to_uri                  (GSocketClient        *client,
-									 const gchar          *uri,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-void                    g_socket_client_connect_async                   (GSocketClient        *client,
-                                                                         GSocketConnectable   *connectable,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocketConnection *     g_socket_client_connect_finish                  (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-void                    g_socket_client_connect_to_host_async           (GSocketClient        *client,
-									 const gchar          *host_and_port,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocketConnection *     g_socket_client_connect_to_host_finish          (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-
-void                    g_socket_client_connect_to_service_async        (GSocketClient        *client,
-									 const gchar          *domain,
-									 const gchar          *service,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocketConnection *     g_socket_client_connect_to_service_finish       (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-void                    g_socket_client_connect_to_uri_async            (GSocketClient        *client,
-									 const gchar          *uri,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocketConnection *     g_socket_client_connect_to_uri_finish           (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-void			g_socket_client_add_application_proxy		(GSocketClient        *client,
-									 const gchar          *protocol);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CLIENT_H___ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketconnectable.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocketconnectable.h
deleted file mode 100644
index 0f84a4ae..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketconnectable.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_CONNECTABLE_H__
-#define __G_SOCKET_CONNECTABLE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONNECTABLE            (g_socket_connectable_get_type ())
-#define G_SOCKET_CONNECTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_SOCKET_CONNECTABLE, GSocketConnectable))
-#define G_IS_SOCKET_CONNECTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_SOCKET_CONNECTABLE))
-#define G_SOCKET_CONNECTABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_SOCKET_CONNECTABLE, GSocketConnectableIface))
-
-/**
- * GSocketConnectable:
- *
- * Interface for objects that contain or generate #GSocketAddress<!-- -->es.
- */
-typedef struct _GSocketConnectableIface GSocketConnectableIface;
-
-/**
- * GSocketConnectableIface:
- * @g_iface: The parent interface.
- * @enumerate: Creates a #GSocketAddressEnumerator
- * @proxy_enumerate: Creates a #GProxyAddressEnumerator
- *
- * Provides an interface for returning a #GSocketAddressEnumerator
- * and #GProxyAddressEnumerator
- */
-struct _GSocketConnectableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GSocketAddressEnumerator * (* enumerate)       (GSocketConnectable *connectable);
-
-  GSocketAddressEnumerator * (* proxy_enumerate) (GSocketConnectable *connectable);
-
-};
-
-GType                     g_socket_connectable_get_type  (void) G_GNUC_CONST;
-
-GSocketAddressEnumerator *g_socket_connectable_enumerate (GSocketConnectable *connectable);
-
-GSocketAddressEnumerator *g_socket_connectable_proxy_enumerate (GSocketConnectable *connectable);
-
-G_END_DECLS
-
-
-#endif /* __G_SOCKET_CONNECTABLE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketconnection.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocketconnection.h
deleted file mode 100644
index 0daa5f35..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketconnection.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_CONNECTION_H__
-#define __G_SOCKET_CONNECTION_H__
-
-#include <glib-object.h>
-#include <gio/gsocket.h>
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONNECTION                            (g_socket_connection_get_type ())
-#define G_SOCKET_CONNECTION(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnection))
-#define G_SOCKET_CONNECTION_CLASS(class)                    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnectionClass))
-#define G_IS_SOCKET_CONNECTION(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CONNECTION))
-#define G_IS_SOCKET_CONNECTION_CLASS(class)                 (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CONNECTION))
-#define G_SOCKET_CONNECTION_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnectionClass))
-
-typedef struct _GSocketConnectionPrivate                    GSocketConnectionPrivate;
-typedef struct _GSocketConnectionClass                      GSocketConnectionClass;
-
-struct _GSocketConnectionClass
-{
-  GIOStreamClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketConnection
-{
-  GIOStream parent_instance;
-  GSocketConnectionPrivate *priv;
-};
-
-GType              g_socket_connection_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_is_connected              (GSocketConnection  *connection);
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_connect                   (GSocketConnection  *connection,
-								  GSocketAddress     *address,
-								  GCancellable       *cancellable,
-								  GError            **error);
-GLIB_AVAILABLE_IN_2_32
-void               g_socket_connection_connect_async             (GSocketConnection  *connection,
-								  GSocketAddress     *address,
-								  GCancellable       *cancellable,
-								  GAsyncReadyCallback callback,
-								  gpointer            user_data);
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_connect_finish            (GSocketConnection  *connection,
-								  GAsyncResult       *result,
-								  GError            **error);
-
-GSocket           *g_socket_connection_get_socket                (GSocketConnection  *connection);
-GSocketAddress    *g_socket_connection_get_local_address         (GSocketConnection  *connection,
-								  GError            **error);
-GSocketAddress    *g_socket_connection_get_remote_address        (GSocketConnection  *connection,
-								  GError            **error);
-
-void               g_socket_connection_factory_register_type     (GType               g_type,
-								  GSocketFamily       family,
-								  GSocketType         type,
-								  gint                protocol);
-GType              g_socket_connection_factory_lookup_type       (GSocketFamily       family,
-								  GSocketType         type,
-								  gint                protocol_id);
-GSocketConnection *g_socket_connection_factory_create_connection (GSocket            *socket);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CONNECTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketcontrolmessage.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocketcontrolmessage.h
deleted file mode 100644
index 6af300c1..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketcontrolmessage.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_CONTROL_MESSAGE_H__
-#define __G_SOCKET_CONTROL_MESSAGE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONTROL_MESSAGE                       (g_socket_control_message_get_type ())
-#define G_SOCKET_CONTROL_MESSAGE(inst)                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessage))
-#define G_SOCKET_CONTROL_MESSAGE_CLASS(class)               (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessageClass))
-#define G_IS_SOCKET_CONTROL_MESSAGE(inst)                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE))
-#define G_IS_SOCKET_CONTROL_MESSAGE_CLASS(class)            (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE))
-#define G_SOCKET_CONTROL_MESSAGE_GET_CLASS(inst)            (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessageClass))
-
-typedef struct _GSocketControlMessagePrivate                GSocketControlMessagePrivate;
-typedef struct _GSocketControlMessageClass                  GSocketControlMessageClass;
-
-/**
- * GSocketControlMessageClass:
- * @get_size: gets the size of the message.
- * @get_level: gets the protocol of the message.
- * @get_type: gets the protocol specific type of the message.
- * @serialize: Writes out the message data.
- * @deserialize: Tries to deserialize a message.
- **/
-
-struct _GSocketControlMessageClass
-{
-  GObjectClass parent_class;
-
-  gsize                  (* get_size)  (GSocketControlMessage  *message);
-  int                    (* get_level) (GSocketControlMessage  *message);
-  int                    (* get_type)  (GSocketControlMessage  *message);
-  void                   (* serialize) (GSocketControlMessage  *message,
-					gpointer                data);
-  GSocketControlMessage *(* deserialize) (int                   level,
-					  int                   type,
-					  gsize                 size,
-					  gpointer              data);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-struct _GSocketControlMessage
-{
-  GObject parent_instance;
-  GSocketControlMessagePrivate *priv;
-};
-
-GType                  g_socket_control_message_get_type     (void) G_GNUC_CONST;
-gsize                  g_socket_control_message_get_size     (GSocketControlMessage *message);
-int                    g_socket_control_message_get_level    (GSocketControlMessage *message);
-int                    g_socket_control_message_get_msg_type (GSocketControlMessage *message);
-void                   g_socket_control_message_serialize    (GSocketControlMessage *message,
-							      gpointer               data);
-GSocketControlMessage *g_socket_control_message_deserialize  (int                    level,
-							      int                    type,
-							      gsize                  size,
-							      gpointer               data);
-
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CONTROL_MESSAGE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketlistener.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocketlistener.h
deleted file mode 100644
index da09a784..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketlistener.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_LISTENER_H__
-#define __G_SOCKET_LISTENER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_LISTENER                              (g_socket_listener_get_type ())
-#define G_SOCKET_LISTENER(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListener))
-#define G_SOCKET_LISTENER_CLASS(class)                      (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListenerClass))
-#define G_IS_SOCKET_LISTENER(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_LISTENER))
-#define G_IS_SOCKET_LISTENER_CLASS(class)                   (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_LISTENER))
-#define G_SOCKET_LISTENER_GET_CLASS(inst)                   (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListenerClass))
-
-typedef struct _GSocketListenerPrivate                      GSocketListenerPrivate;
-typedef struct _GSocketListenerClass                        GSocketListenerClass;
-
-/**
- * GSocketListenerClass:
- * @changed: virtual method called when the set of socket listened to changes
- **/
-struct _GSocketListenerClass
-{
-  GObjectClass parent_class;
-
-  void (* changed) (GSocketListener *listener);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketListener
-{
-  GObject parent_instance;
-  GSocketListenerPrivate *priv;
-};
-
-GType                   g_socket_listener_get_type                      (void) G_GNUC_CONST;
-
-GSocketListener *       g_socket_listener_new                           (void);
-
-void                    g_socket_listener_set_backlog                   (GSocketListener     *listener,
-									 int                  listen_backlog);
-
-gboolean                g_socket_listener_add_socket                    (GSocketListener     *listener,
-                                                                         GSocket             *socket,
-									 GObject             *source_object,
-									 GError             **error);
-gboolean                g_socket_listener_add_address                   (GSocketListener     *listener,
-                                                                         GSocketAddress      *address,
-									 GSocketType          type,
-									 GSocketProtocol      protocol,
-									 GObject             *source_object,
-                                                                         GSocketAddress     **effective_address,
-									 GError             **error);
-gboolean                g_socket_listener_add_inet_port                 (GSocketListener     *listener,
-                                                                         guint16              port,
-									 GObject             *source_object,
-									 GError             **error);
-guint16                 g_socket_listener_add_any_inet_port             (GSocketListener     *listener,
-									 GObject             *source_object,
-									 GError             **error);
-
-GSocket *               g_socket_listener_accept_socket                 (GSocketListener      *listener,
-									 GObject             **source_object,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-void                    g_socket_listener_accept_socket_async           (GSocketListener      *listener,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocket *               g_socket_listener_accept_socket_finish          (GSocketListener      *listener,
-                                                                         GAsyncResult         *result,
-									 GObject             **source_object,
-                                                                         GError              **error);
-
-
-GSocketConnection *     g_socket_listener_accept                        (GSocketListener      *listener,
-									 GObject             **source_object,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-
-void                    g_socket_listener_accept_async                  (GSocketListener      *listener,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-
-GSocketConnection *     g_socket_listener_accept_finish                 (GSocketListener      *listener,
-                                                                         GAsyncResult         *result,
-									 GObject             **source_object,
-                                                                         GError              **error);
-
-void                    g_socket_listener_close                         (GSocketListener      *listener);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_LISTENER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketservice.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsocketservice.h
deleted file mode 100644
index 27cc0a26..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsocketservice.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_SERVICE_H__
-#define __G_SOCKET_SERVICE_H__
-
-#include <gio/gsocketlistener.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_SERVICE                               (g_socket_service_get_type ())
-#define G_SOCKET_SERVICE(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketService))
-#define G_SOCKET_SERVICE_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketServiceClass))
-#define G_IS_SOCKET_SERVICE(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_SERVICE))
-#define G_IS_SOCKET_SERVICE_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_SERVICE))
-#define G_SOCKET_SERVICE_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketServiceClass))
-
-typedef struct _GSocketServicePrivate                       GSocketServicePrivate;
-typedef struct _GSocketServiceClass                         GSocketServiceClass;
-
-/**
- * GSocketServiceClass:
- * @incomming: signal emitted when new connections are accepted
- */
-struct _GSocketServiceClass
-{
-  GSocketListenerClass parent_class;
-
-  gboolean (* incoming) (GSocketService    *service,
-                         GSocketConnection *connection,
-			 GObject           *source_object);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketService
-{
-  GSocketListener parent_instance;
-  GSocketServicePrivate *priv;
-};
-
-GType           g_socket_service_get_type  (void);
-
-GSocketService *g_socket_service_new       (void);
-void            g_socket_service_start     (GSocketService *service);
-void            g_socket_service_stop      (GSocketService *service);
-gboolean        g_socket_service_is_active (GSocketService *service);
-
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_SERVICE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gsrvtarget.h b/GstreamerHelper/x64/include/glib-2.0/gio/gsrvtarget.h
deleted file mode 100644
index 67ce2a9e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gsrvtarget.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SRV_TARGET_H__
-#define __G_SRV_TARGET_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GType g_srv_target_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SRV_TARGET (g_srv_target_get_type ())
-
-GSrvTarget  *g_srv_target_new          (const gchar *hostname,
-				        guint16      port,
-				        guint16      priority,
-				        guint16      weight);
-GSrvTarget  *g_srv_target_copy         (GSrvTarget  *target);
-void         g_srv_target_free         (GSrvTarget  *target);
-
-const gchar *g_srv_target_get_hostname (GSrvTarget  *target);
-guint16      g_srv_target_get_port     (GSrvTarget  *target);
-guint16      g_srv_target_get_priority (GSrvTarget  *target);
-guint16      g_srv_target_get_weight   (GSrvTarget  *target);
-
-GList       *g_srv_target_list_sort    (GList       *targets);
-
-G_END_DECLS
-
-#endif /* __G_SRV_TARGET_H__ */
-
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtcpconnection.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtcpconnection.h
deleted file mode 100644
index 3928825a..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtcpconnection.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TCP_CONNECTION_H__
-#define __G_TCP_CONNECTION_H__
-
-#include <gio/gsocketconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TCP_CONNECTION                               (g_tcp_connection_get_type ())
-#define G_TCP_CONNECTION(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnection))
-#define G_TCP_CONNECTION_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnectionClass))
-#define G_IS_TCP_CONNECTION(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_TCP_CONNECTION))
-#define G_IS_TCP_CONNECTION_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_TCP_CONNECTION))
-#define G_TCP_CONNECTION_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnectionClass))
-
-typedef struct _GTcpConnectionPrivate                       GTcpConnectionPrivate;
-typedef struct _GTcpConnectionClass                         GTcpConnectionClass;
-
-struct _GTcpConnectionClass
-{
-  GSocketConnectionClass parent_class;
-};
-
-struct _GTcpConnection
-{
-  GSocketConnection parent_instance;
-  GTcpConnectionPrivate *priv;
-};
-
-GType    g_tcp_connection_get_type                (void) G_GNUC_CONST;
-
-void     g_tcp_connection_set_graceful_disconnect (GTcpConnection *connection,
-						   gboolean        graceful_disconnect);
-gboolean g_tcp_connection_get_graceful_disconnect (GTcpConnection *connection);
-
-G_END_DECLS
-
-#endif /* __G_TCP_CONNECTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtcpwrapperconnection.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtcpwrapperconnection.h
deleted file mode 100644
index 01d3a03a..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtcpwrapperconnection.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- * Copyright © 2010 Collabora Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- *
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TCP_WRAPPER_CONNECTION_H__
-#define __G_TCP_WRAPPER_CONNECTION_H__
-
-#include <gio/gtcpconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TCP_WRAPPER_CONNECTION            (g_tcp_wrapper_connection_get_type ())
-#define G_TCP_WRAPPER_CONNECTION(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnection))
-#define G_TCP_WRAPPER_CONNECTION_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnectionClass))
-#define G_IS_TCP_WRAPPER_CONNECTION(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION))
-#define G_IS_TCP_WRAPPER_CONNECTION_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION))
-#define G_TCP_WRAPPER_CONNECTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnectionClass))
-
-typedef struct _GTcpWrapperConnectionPrivate GTcpWrapperConnectionPrivate;
-typedef struct _GTcpWrapperConnectionClass   GTcpWrapperConnectionClass;
-
-struct _GTcpWrapperConnectionClass
-{
-  GTcpConnectionClass parent_class;
-};
-
-struct _GTcpWrapperConnection
-{
-  GTcpConnection parent_instance;
-  GTcpWrapperConnectionPrivate *priv;
-};
-
-GType              g_tcp_wrapper_connection_get_type (void) G_GNUC_CONST;
-
-GSocketConnection *g_tcp_wrapper_connection_new                (GIOStream             *base_io_stream,
-								GSocket               *socket);
-GIOStream         *g_tcp_wrapper_connection_get_base_io_stream (GTcpWrapperConnection *conn);
-
-G_END_DECLS
-
-#endif /* __G_TCP_WRAPPER_CONNECTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtestdbus.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtestdbus.h
deleted file mode 100644
index 0fd281b4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtestdbus.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GIO testing utilities
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: David Zeuthen <davidz@redhat.com>
- *          Xavier Claessens <xavier.claessens@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TEST_DBUS_H__
-#define __G_TEST_DBUS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TEST_DBUS \
-    (g_test_dbus_get_type ())
-#define G_TEST_DBUS(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_TEST_DBUS, \
-        GTestDBus))
-#define G_IS_TEST_DBUS(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_TEST_DBUS))
-
-GLIB_AVAILABLE_IN_2_34
-GType          g_test_dbus_get_type        (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_34
-GTestDBus *    g_test_dbus_new             (GTestDBusFlags flags);
-
-GLIB_AVAILABLE_IN_2_34
-GTestDBusFlags g_test_dbus_get_flags       (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-const gchar *  g_test_dbus_get_bus_address (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_add_service_dir (GTestDBus     *self,
-                                            const gchar   *path);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_up              (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_stop            (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_down            (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_unset           (void);
-
-G_END_DECLS
-
-#endif /* __G_TEST_DBUS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gthemedicon.h b/GstreamerHelper/x64/include/glib-2.0/gio/gthemedicon.h
deleted file mode 100644
index b0085e68..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gthemedicon.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_THEMED_ICON_H__
-#define __G_THEMED_ICON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_THEMED_ICON         (g_themed_icon_get_type ())
-#define G_THEMED_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_THEMED_ICON, GThemedIcon))
-#define G_THEMED_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_THEMED_ICON, GThemedIconClass))
-#define G_IS_THEMED_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_THEMED_ICON))
-#define G_IS_THEMED_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_THEMED_ICON))
-#define G_THEMED_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_THEMED_ICON, GThemedIconClass))
-
-/**
- * GThemedIcon:
- *
- * An implementation of #GIcon for themed icons.
- **/
-typedef struct _GThemedIconClass   GThemedIconClass;
-
-GType  g_themed_icon_get_type                   (void) G_GNUC_CONST;
-
-GIcon *g_themed_icon_new                        (const char  *iconname);
-GIcon *g_themed_icon_new_with_default_fallbacks (const char  *iconname);
-GIcon *g_themed_icon_new_from_names             (char       **iconnames,
-                                                 int          len);
-void   g_themed_icon_prepend_name               (GThemedIcon *icon,
-                                                 const char  *iconname);
-void   g_themed_icon_append_name                (GThemedIcon *icon,
-                                                 const char  *iconname);
-
-const gchar* const * g_themed_icon_get_names     (GThemedIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_THEMED_ICON_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gthreadedsocketservice.h b/GstreamerHelper/x64/include/glib-2.0/gio/gthreadedsocketservice.h
deleted file mode 100644
index f9470907..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gthreadedsocketservice.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_THREADED_SOCKET_SERVICE_H__
-#define __G_THREADED_SOCKET_SERVICE_H__
-
-#include <gio/gsocketservice.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_THREADED_SOCKET_SERVICE                      (g_threaded_socket_service_get_type ())
-#define G_THREADED_SOCKET_SERVICE(inst)                     (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketService))
-#define G_THREADED_SOCKET_SERVICE_CLASS(class)              (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketServiceClass))
-#define G_IS_THREADED_SOCKET_SERVICE(inst)                  (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE))
-#define G_IS_THREADED_SOCKET_SERVICE_CLASS(class)           (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE))
-#define G_THREADED_SOCKET_SERVICE_GET_CLASS(inst)           (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketServiceClass))
-
-typedef struct _GThreadedSocketServicePrivate               GThreadedSocketServicePrivate;
-typedef struct _GThreadedSocketServiceClass                 GThreadedSocketServiceClass;
-
-struct _GThreadedSocketServiceClass
-{
-  GSocketServiceClass parent_class;
-
-  gboolean (* run) (GThreadedSocketService *service,
-                    GSocketConnection      *connection,
-                    GObject                *source_object);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-struct _GThreadedSocketService
-{
-  GSocketService parent_instance;
-  GThreadedSocketServicePrivate *priv;
-};
-
-GType                   g_threaded_socket_service_get_type              (void);
-GSocketService *        g_threaded_socket_service_new                   (int max_threads);
-
-G_END_DECLS
-
-#endif /* __G_THREADED_SOCKET_SERVICE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsbackend.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlsbackend.h
deleted file mode 100644
index 389b5d77..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsbackend.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_BACKEND_H__
-#define __G_TLS_BACKEND_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TLS_BACKEND_EXTENSION_POINT_NAME:
- *
- * Extension point for TLS functionality via #GTlsBackend.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_TLS_BACKEND_EXTENSION_POINT_NAME "gio-tls-backend"
-
-#define G_TYPE_TLS_BACKEND               (g_tls_backend_get_type ())
-#define G_TLS_BACKEND(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_TLS_BACKEND, GTlsBackend))
-#define G_IS_TLS_BACKEND(obj)	         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_TLS_BACKEND))
-#define G_TLS_BACKEND_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_TLS_BACKEND, GTlsBackendInterface))
-
-typedef struct _GTlsBackend          GTlsBackend;
-typedef struct _GTlsBackendInterface GTlsBackendInterface;
-
-/**
- * GTlsBackendInterface:
- * @g_iface: The parent interface.
- * @supports_tls: returns whether the backend supports TLS.
- * @get_default_database: returns a default #GTlsDatabase instance.
- * @get_certificate_type: returns the #GTlsCertificate implementation type
- * @get_client_connection_type: returns the #GTlsClientConnection implementation type
- * @get_server_connection_type: returns the #GTlsServerConnection implementation type
- * @get_file_database_type: returns the #GTlsFileDatabase implementation type.
- *
- * Provides an interface for describing TLS-related types.
- *
- * Since: 2.28
- */
-struct _GTlsBackendInterface
-{
-  GTypeInterface g_iface;
-
-  /* methods */
-  gboolean       ( *supports_tls)               (GTlsBackend *backend);
-  GType          ( *get_certificate_type)       (void);
-  GType          ( *get_client_connection_type) (void);
-  GType          ( *get_server_connection_type) (void);
-  GType          ( *get_file_database_type)     (void);
-  GTlsDatabase * ( *get_default_database)       (GTlsBackend *backend);
-};
-
-GType          g_tls_backend_get_type                   (void) G_GNUC_CONST;
-
-GTlsBackend *  g_tls_backend_get_default                (void);
-
-GTlsDatabase * g_tls_backend_get_default_database       (GTlsBackend *backend);
-
-gboolean       g_tls_backend_supports_tls               (GTlsBackend *backend);
-
-GType          g_tls_backend_get_certificate_type       (GTlsBackend *backend);
-GType          g_tls_backend_get_client_connection_type (GTlsBackend *backend);
-GType          g_tls_backend_get_server_connection_type (GTlsBackend *backend);
-GType          g_tls_backend_get_file_database_type     (GTlsBackend *backend);
-
-G_END_DECLS
-
-#endif /* __G_TLS_BACKEND_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlscertificate.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlscertificate.h
deleted file mode 100644
index 991eb1d4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlscertificate.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_CERTIFICATE_H__
-#define __G_TLS_CERTIFICATE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CERTIFICATE            (g_tls_certificate_get_type ())
-#define G_TLS_CERTIFICATE(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CERTIFICATE, GTlsCertificate))
-#define G_TLS_CERTIFICATE_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_CERTIFICATE, GTlsCertificateClass))
-#define G_IS_TLS_CERTIFICATE(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CERTIFICATE))
-#define G_IS_TLS_CERTIFICATE_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_CERTIFICATE))
-#define G_TLS_CERTIFICATE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_CERTIFICATE, GTlsCertificateClass))
-
-typedef struct _GTlsCertificateClass   GTlsCertificateClass;
-typedef struct _GTlsCertificatePrivate GTlsCertificatePrivate;
-
-struct _GTlsCertificate {
-  GObject parent_instance;
-
-  GTlsCertificatePrivate *priv;
-};
-
-struct _GTlsCertificateClass
-{
-  GObjectClass parent_class;
-
-  GTlsCertificateFlags  (* verify) (GTlsCertificate     *cert,
-				    GSocketConnectable  *identity,
-				    GTlsCertificate     *trusted_ca);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GType                 g_tls_certificate_get_type           (void) G_GNUC_CONST;
-
-GTlsCertificate      *g_tls_certificate_new_from_pem       (const gchar         *data,
-							    gssize               length,
-							    GError             **error);
-
-GTlsCertificate      *g_tls_certificate_new_from_file      (const gchar         *file,
-							    GError             **error);
-GTlsCertificate      *g_tls_certificate_new_from_files     (const gchar         *cert_file,
-							    const gchar         *key_file,
-							    GError             **error);
-GList                *g_tls_certificate_list_new_from_file (const gchar         *file,
-							    GError             **error);
-
-GTlsCertificate      *g_tls_certificate_get_issuer         (GTlsCertificate     *cert);
-
-GTlsCertificateFlags  g_tls_certificate_verify             (GTlsCertificate     *cert,
-							    GSocketConnectable  *identity,
-							    GTlsCertificate     *trusted_ca);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean              g_tls_certificate_is_same            (GTlsCertificate     *cert_one,
-                                                            GTlsCertificate     *cert_two);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CERTIFICATE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsclientconnection.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlsclientconnection.h
deleted file mode 100644
index eaf62f0b..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsclientconnection.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_CLIENT_CONNECTION_H__
-#define __G_TLS_CLIENT_CONNECTION_H__
-
-#include <gio/gtlsconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CLIENT_CONNECTION                (g_tls_client_connection_get_type ())
-#define G_TLS_CLIENT_CONNECTION(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CLIENT_CONNECTION, GTlsClientConnection))
-#define G_IS_TLS_CLIENT_CONNECTION(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CLIENT_CONNECTION))
-#define G_TLS_CLIENT_CONNECTION_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_CLIENT_CONNECTION, GTlsClientConnectionInterface))
-
-typedef struct _GTlsClientConnectionInterface GTlsClientConnectionInterface;
-
-struct _GTlsClientConnectionInterface
-{
-  GTypeInterface g_iface;
-
-};
-
-GType                 g_tls_client_connection_get_type             (void) G_GNUC_CONST;
-
-GIOStream *           g_tls_client_connection_new                  (GIOStream               *base_io_stream,
-								    GSocketConnectable      *server_identity,
-								    GError                 **error);
-
-GTlsCertificateFlags  g_tls_client_connection_get_validation_flags (GTlsClientConnection    *conn);
-void                  g_tls_client_connection_set_validation_flags (GTlsClientConnection    *conn,
-								    GTlsCertificateFlags     flags);
-GSocketConnectable   *g_tls_client_connection_get_server_identity  (GTlsClientConnection    *conn);
-void                  g_tls_client_connection_set_server_identity  (GTlsClientConnection    *conn,
-								    GSocketConnectable      *identity);
-gboolean              g_tls_client_connection_get_use_ssl3         (GTlsClientConnection    *conn);
-void                  g_tls_client_connection_set_use_ssl3         (GTlsClientConnection    *conn,
-								    gboolean                 use_ssl3);
-GList *               g_tls_client_connection_get_accepted_cas     (GTlsClientConnection    *conn);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CLIENT_CONNECTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsconnection.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlsconnection.h
deleted file mode 100644
index 37132cc8..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsconnection.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_CONNECTION_H__
-#define __G_TLS_CONNECTION_H__
-
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CONNECTION            (g_tls_connection_get_type ())
-#define G_TLS_CONNECTION(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CONNECTION, GTlsConnection))
-#define G_TLS_CONNECTION_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_CONNECTION, GTlsConnectionClass))
-#define G_IS_TLS_CONNECTION(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CONNECTION))
-#define G_IS_TLS_CONNECTION_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_CONNECTION))
-#define G_TLS_CONNECTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_CONNECTION, GTlsConnectionClass))
-
-typedef struct _GTlsConnectionClass   GTlsConnectionClass;
-typedef struct _GTlsConnectionPrivate GTlsConnectionPrivate;
-
-struct _GTlsConnection {
-  GIOStream parent_instance;
-
-  GTlsConnectionPrivate *priv;
-};
-
-struct _GTlsConnectionClass
-{
-  GIOStreamClass parent_class;
-
-  /* signals */
-  gboolean          ( *accept_certificate) (GTlsConnection       *connection,
-					    GTlsCertificate      *peer_cert,
-					    GTlsCertificateFlags  errors);
-
-  /* methods */
-  gboolean ( *handshake )        (GTlsConnection       *conn,
-				  GCancellable         *cancellable,
-				  GError              **error);
-
-  void     ( *handshake_async )  (GTlsConnection       *conn,
-				  int                   io_priority,
-				  GCancellable         *cancellable,
-				  GAsyncReadyCallback   callback,
-				  gpointer              user_data);
-  gboolean ( *handshake_finish ) (GTlsConnection       *conn,
-				  GAsyncResult         *result,
-				  GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GType                 g_tls_connection_get_type                    (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED
-void                  g_tls_connection_set_use_system_certdb       (GTlsConnection       *conn,
-                                                                    gboolean              use_system_certdb);
-GLIB_DEPRECATED
-gboolean              g_tls_connection_get_use_system_certdb       (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_database                (GTlsConnection       *conn,
-								    GTlsDatabase         *database);
-GTlsDatabase *        g_tls_connection_get_database                (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_certificate             (GTlsConnection       *conn,
-                                                                    GTlsCertificate      *certificate);
-GTlsCertificate      *g_tls_connection_get_certificate             (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_interaction             (GTlsConnection       *conn,
-                                                                    GTlsInteraction      *interaction);
-GTlsInteraction *     g_tls_connection_get_interaction             (GTlsConnection       *conn);
-
-GTlsCertificate      *g_tls_connection_get_peer_certificate        (GTlsConnection       *conn);
-GTlsCertificateFlags  g_tls_connection_get_peer_certificate_errors (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_require_close_notify    (GTlsConnection       *conn,
-								    gboolean              require_close_notify);
-gboolean              g_tls_connection_get_require_close_notify    (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_rehandshake_mode        (GTlsConnection       *conn,
-								    GTlsRehandshakeMode   mode);
-GTlsRehandshakeMode   g_tls_connection_get_rehandshake_mode        (GTlsConnection       *conn);
-
-gboolean              g_tls_connection_handshake                   (GTlsConnection       *conn,
-								    GCancellable         *cancellable,
-								    GError              **error);
-
-void                  g_tls_connection_handshake_async             (GTlsConnection       *conn,
-								    int                   io_priority,
-								    GCancellable         *cancellable,
-								    GAsyncReadyCallback   callback,
-								    gpointer              user_data);
-gboolean              g_tls_connection_handshake_finish            (GTlsConnection       *conn,
-								    GAsyncResult         *result,
-								    GError              **error);
-
-/**
- * G_TLS_ERROR:
- *
- * Error domain for TLS. Errors in this domain will be from the
- * #GTlsError enumeration. See #GError for more information on error
- * domains.
- */
-#define G_TLS_ERROR (g_tls_error_quark ())
-GQuark g_tls_error_quark (void);
-
-
-/*< protected >*/
-gboolean              g_tls_connection_emit_accept_certificate     (GTlsConnection       *conn,
-								    GTlsCertificate      *peer_cert,
-								    GTlsCertificateFlags  errors);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CONNECTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsdatabase.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlsdatabase.h
deleted file mode 100644
index 9f93cc91..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsdatabase.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_DATABASE_H__
-#define __G_TLS_DATABASE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TLS_DATABASE_PURPOSE_AUTHENTICATE_SERVER "1.3.6.1.5.5.7.3.1"
-#define G_TLS_DATABASE_PURPOSE_AUTHENTICATE_CLIENT "1.3.6.1.5.5.7.3.2"
-
-#define G_TYPE_TLS_DATABASE            (g_tls_database_get_type ())
-#define G_TLS_DATABASE(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_DATABASE, GTlsDatabase))
-#define G_TLS_DATABASE_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_DATABASE, GTlsDatabaseClass))
-#define G_IS_TLS_DATABASE(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_DATABASE))
-#define G_IS_TLS_DATABASE_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_DATABASE))
-#define G_TLS_DATABASE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_DATABASE, GTlsDatabaseClass))
-
-typedef struct _GTlsDatabaseClass   GTlsDatabaseClass;
-typedef struct _GTlsDatabasePrivate GTlsDatabasePrivate;
-
-struct _GTlsDatabase
-{
-  GObject parent_instance;
-
-  GTlsDatabasePrivate *priv;
-};
-
-struct _GTlsDatabaseClass
-{
-  GObjectClass parent_class;
-
-  /* virtual methods */
-
-  GTlsCertificateFlags  (*verify_chain)                         (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *chain,
-                                                                 const gchar             *purpose,
-                                                                 GSocketConnectable      *identity,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseVerifyFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*verify_chain_async)                   (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *chain,
-                                                                 const gchar             *purpose,
-                                                                 GSocketConnectable      *identity,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseVerifyFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificateFlags  (*verify_chain_finish)                  (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  gchar*                (*create_certificate_handle)            (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate);
-
-  GTlsCertificate*      (*lookup_certificate_for_handle)        (GTlsDatabase            *self,
-                                                                 const gchar             *handle,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificate_for_handle_async)  (GTlsDatabase            *self,
-                                                                 const gchar             *handle,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificate*      (*lookup_certificate_for_handle_finish) (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  GTlsCertificate*      (*lookup_certificate_issuer)            (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificate_issuer_async)      (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificate*      (*lookup_certificate_issuer_finish)     (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  GList*                (*lookup_certificates_issued_by)        (GTlsDatabase            *self,
-                                                                 GByteArray              *issuer_raw_dn,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificates_issued_by_async)  (GTlsDatabase            *self,
-                                                                 GByteArray              *issuer_raw_dn,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GList*                (*lookup_certificates_issued_by_finish) (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[16];
-};
-
-GType                g_tls_database_get_type                              (void) G_GNUC_CONST;
-
-GTlsCertificateFlags g_tls_database_verify_chain                          (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *chain,
-                                                                           const gchar             *purpose,
-                                                                           GSocketConnectable      *identity,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseVerifyFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-void                 g_tls_database_verify_chain_async                    (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *chain,
-                                                                           const gchar             *purpose,
-                                                                           GSocketConnectable      *identity,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseVerifyFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GTlsCertificateFlags g_tls_database_verify_chain_finish                   (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-gchar*               g_tls_database_create_certificate_handle             (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate);
-
-GTlsCertificate*     g_tls_database_lookup_certificate_for_handle         (GTlsDatabase            *self,
-                                                                           const gchar             *handle,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-void                 g_tls_database_lookup_certificate_for_handle_async   (GTlsDatabase            *self,
-                                                                           const gchar             *handle,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GTlsCertificate*     g_tls_database_lookup_certificate_for_handle_finish  (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-GTlsCertificate*     g_tls_database_lookup_certificate_issuer             (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-void                 g_tls_database_lookup_certificate_issuer_async       (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GTlsCertificate*     g_tls_database_lookup_certificate_issuer_finish      (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-GList*               g_tls_database_lookup_certificates_issued_by         (GTlsDatabase            *self,
-                                                                           GByteArray              *issuer_raw_dn,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-void                 g_tls_database_lookup_certificates_issued_by_async    (GTlsDatabase            *self,
-                                                                            GByteArray              *issuer_raw_dn,
-                                                                            GTlsInteraction         *interaction,
-                                                                            GTlsDatabaseLookupFlags  flags,
-                                                                            GCancellable            *cancellable,
-                                                                            GAsyncReadyCallback      callback,
-                                                                            gpointer                 user_data);
-
-GList*               g_tls_database_lookup_certificates_issued_by_finish   (GTlsDatabase            *self,
-                                                                            GAsyncResult            *result,
-                                                                            GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_DATABASE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsfiledatabase.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlsfiledatabase.h
deleted file mode 100644
index bc6a17ff..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsfiledatabase.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2010 Collabora, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * See the included COPYING file for more information.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_FILE_DATABASE_H__
-#define __G_TLS_FILE_DATABASE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_FILE_DATABASE                (g_tls_file_database_get_type ())
-#define G_TLS_FILE_DATABASE(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_FILE_DATABASE, GTlsFileDatabase))
-#define G_IS_TLS_FILE_DATABASE(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_FILE_DATABASE))
-#define G_TLS_FILE_DATABASE_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_FILE_DATABASE, GTlsFileDatabaseInterface))
-
-typedef struct _GTlsFileDatabaseInterface GTlsFileDatabaseInterface;
-
-/**
- * GTlsFileDatabaseInterface:
- * @g_iface: The parent interface.
- *
- * Provides an interface for #GTlsFileDatabase implementations.
- *
- */
-struct _GTlsFileDatabaseInterface
-{
-  GTypeInterface g_iface;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GType                        g_tls_file_database_get_type              (void) G_GNUC_CONST;
-
-GTlsDatabase*                g_tls_file_database_new                   (const gchar  *anchors,
-                                                                        GError      **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_FILE_DATABASE_H___ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsinteraction.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlsinteraction.h
deleted file mode 100644
index fc76fe2d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsinteraction.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2011 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_INTERACTION_H__
-#define __G_TLS_INTERACTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_INTERACTION         (g_tls_interaction_get_type ())
-#define G_TLS_INTERACTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_TLS_INTERACTION, GTlsInteraction))
-#define G_TLS_INTERACTION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_TLS_INTERACTION, GTlsInteractionClass))
-#define G_IS_TLS_INTERACTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_TLS_INTERACTION))
-#define G_IS_TLS_INTERACTION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_TLS_INTERACTION))
-#define G_TLS_INTERACTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_TLS_INTERACTION, GTlsInteractionClass))
-
-typedef struct _GTlsInteractionClass   GTlsInteractionClass;
-typedef struct _GTlsInteractionPrivate GTlsInteractionPrivate;
-
-struct _GTlsInteraction
-{
-  /*< private >*/
-  GObject parent_instance;
-  GTlsInteractionPrivate *priv;
-};
-
-struct _GTlsInteractionClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  GTlsInteractionResult  (* ask_password)        (GTlsInteraction    *interaction,
-                                                  GTlsPassword       *password,
-                                                  GCancellable       *cancellable,
-                                                  GError            **error);
-
-  void                   (* ask_password_async)  (GTlsInteraction    *interaction,
-                                                  GTlsPassword       *password,
-                                                  GCancellable       *cancellable,
-                                                  GAsyncReadyCallback callback,
-                                                  gpointer            user_data);
-
-  GTlsInteractionResult  (* ask_password_finish) (GTlsInteraction    *interaction,
-                                                  GAsyncResult       *result,
-                                                  GError            **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[24];
-};
-
-GType                  g_tls_interaction_get_type            (void) G_GNUC_CONST;
-
-GTlsInteractionResult  g_tls_interaction_invoke_ask_password (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GError            **error);
-
-
-GTlsInteractionResult  g_tls_interaction_ask_password        (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GError            **error);
-
-void                   g_tls_interaction_ask_password_async  (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GAsyncReadyCallback callback,
-                                                              gpointer            user_data);
-
-GTlsInteractionResult  g_tls_interaction_ask_password_finish (GTlsInteraction    *interaction,
-                                                              GAsyncResult       *result,
-                                                              GError            **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_INTERACTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlspassword.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlspassword.h
deleted file mode 100644
index ef581b61..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlspassword.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2011 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_PASSWORD_H__
-#define __G_TLS_PASSWORD_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_PASSWORD         (g_tls_password_get_type ())
-#define G_TLS_PASSWORD(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_TLS_PASSWORD, GTlsPassword))
-#define G_TLS_PASSWORD_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_TLS_PASSWORD, GTlsPasswordClass))
-#define G_IS_TLS_PASSWORD(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_TLS_PASSWORD))
-#define G_IS_TLS_PASSWORD_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_TLS_PASSWORD))
-#define G_TLS_PASSWORD_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_TLS_PASSWORD, GTlsPasswordClass))
-
-typedef struct _GTlsPasswordClass   GTlsPasswordClass;
-typedef struct _GTlsPasswordPrivate GTlsPasswordPrivate;
-
-struct _GTlsPassword
-{
-  GObject parent_instance;
-
-  GTlsPasswordPrivate *priv;
-};
-
-struct _GTlsPasswordClass
-{
-  GObjectClass parent_class;
-
-  /* methods */
-
-  const guchar *    ( *get_value)            (GTlsPassword  *password,
-                                              gsize         *length);
-
-  void              ( *set_value)            (GTlsPassword  *password,
-                                              guchar        *value,
-                                              gssize         length,
-                                              GDestroyNotify destroy);
-
-  const gchar*      ( *get_default_warning)  (GTlsPassword  *password);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[4];
-};
-
-GType             g_tls_password_get_type            (void) G_GNUC_CONST;
-
-GTlsPassword *    g_tls_password_new                 (GTlsPasswordFlags  flags,
-                                                      const gchar       *description);
-
-const guchar *    g_tls_password_get_value           (GTlsPassword      *password,
-                                                      gsize             *length);
-void              g_tls_password_set_value           (GTlsPassword      *password,
-                                                      const guchar      *value,
-                                                      gssize             length);
-void              g_tls_password_set_value_full      (GTlsPassword      *password,
-                                                      guchar            *value,
-                                                      gssize             length,
-                                                      GDestroyNotify     destroy);
-
-GTlsPasswordFlags g_tls_password_get_flags           (GTlsPassword      *password);
-void              g_tls_password_set_flags           (GTlsPassword      *password,
-                                                      GTlsPasswordFlags  flags);
-
-const gchar*      g_tls_password_get_description     (GTlsPassword      *password);
-void              g_tls_password_set_description     (GTlsPassword      *password,
-                                                      const gchar       *description);
-
-const gchar *     g_tls_password_get_warning         (GTlsPassword      *password);
-void              g_tls_password_set_warning         (GTlsPassword      *password,
-                                                      const gchar       *warning);
-
-G_END_DECLS
-
-#endif /* __G_TLS_PASSWORD_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsserverconnection.h b/GstreamerHelper/x64/include/glib-2.0/gio/gtlsserverconnection.h
deleted file mode 100644
index c909d550..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gtlsserverconnection.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_SERVER_CONNECTION_H__
-#define __G_TLS_SERVER_CONNECTION_H__
-
-#include <gio/gtlsconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_SERVER_CONNECTION                (g_tls_server_connection_get_type ())
-#define G_TLS_SERVER_CONNECTION(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_SERVER_CONNECTION, GTlsServerConnection))
-#define G_IS_TLS_SERVER_CONNECTION(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_SERVER_CONNECTION))
-#define G_TLS_SERVER_CONNECTION_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_SERVER_CONNECTION, GTlsServerConnectionInterface))
-
-/**
- * GTlsServerConnection:
- *
- * TLS server-side connection. This is the server-side implementation
- * of a #GTlsConnection.
- *
- * Since: 2.28
- */
-typedef struct _GTlsServerConnectionInterface GTlsServerConnectionInterface;
-
-struct _GTlsServerConnectionInterface
-{
-  GTypeInterface g_iface;
-
-};
-
-GType                 g_tls_server_connection_get_type                 (void) G_GNUC_CONST;
-
-GIOStream *           g_tls_server_connection_new                      (GIOStream        *base_io_stream,
-									GTlsCertificate  *certificate,
-									GError          **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_SERVER_CONNECTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gvfs.h b/GstreamerHelper/x64/include/glib-2.0/gio/gvfs.h
deleted file mode 100644
index bacbe8b6..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gvfs.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VFS_H__
-#define __G_VFS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_VFS         (g_vfs_get_type ())
-#define G_VFS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS, GVfs))
-#define G_VFS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS, GVfsClass))
-#define G_VFS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS, GVfsClass))
-#define G_IS_VFS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS))
-#define G_IS_VFS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS))
-
-/**
- * G_VFS_EXTENSION_POINT_NAME:
- *
- * Extension point for #GVfs functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_VFS_EXTENSION_POINT_NAME "gio-vfs"
-
-/**
- * GVfs:
- *
- * Virtual File System object.
- **/
-typedef struct _GVfsClass    GVfsClass;
-
-struct _GVfs
-{
-  GObject parent_instance;
-};
-
-struct _GVfsClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  gboolean              (* is_active)                 (GVfs       *vfs);
-  GFile               * (* get_file_for_path)         (GVfs       *vfs,
-                                                       const char *path);
-  GFile               * (* get_file_for_uri)          (GVfs       *vfs,
-                                                       const char *uri);
-  const gchar * const * (* get_supported_uri_schemes) (GVfs       *vfs);
-  GFile               * (* parse_name)                (GVfs       *vfs,
-                                                       const char *parse_name);
-
-  /*< private >*/
-  void                  (* local_file_add_info)       (GVfs       *vfs,
-						       const char *filename,
-						       guint64     device,
-						       GFileAttributeMatcher *attribute_matcher,
-						       GFileInfo  *info,
-						       GCancellable *cancellable,
-						       gpointer   *extra_data,
-						       GDestroyNotify *free_extra_data);
-  void                  (* add_writable_namespaces)   (GVfs       *vfs,
-						       GFileAttributeInfoList *list);
-  gboolean              (* local_file_set_attributes) (GVfs       *vfs,
-						       const char *filename,
-						       GFileInfo  *info,
-                                                       GFileQueryInfoFlags flags,
-                                                       GCancellable *cancellable,
-						       GError    **error);
-  void                  (* local_file_removed)        (GVfs       *vfs,
-						       const char *filename);
-  void                  (* local_file_moved)          (GVfs       *vfs,
-						       const char *source,
-						       const char *dest);
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-};
-
-GType                 g_vfs_get_type                  (void) G_GNUC_CONST;
-
-gboolean              g_vfs_is_active                 (GVfs       *vfs);
-GFile *               g_vfs_get_file_for_path         (GVfs       *vfs,
-                                                       const char *path);
-GFile *               g_vfs_get_file_for_uri          (GVfs       *vfs,
-                                                       const char *uri);
-const gchar* const * g_vfs_get_supported_uri_schemes  (GVfs       *vfs);
-
-GFile *               g_vfs_parse_name                (GVfs       *vfs,
-                                                       const char *parse_name);
-
-GVfs *                g_vfs_get_default               (void);
-GVfs *                g_vfs_get_local                 (void);
-
-G_END_DECLS
-
-#endif /* __G_VFS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gvolume.h b/GstreamerHelper/x64/include/glib-2.0/gio/gvolume.h
deleted file mode 100644
index b0d862e7..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gvolume.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VOLUME_H__
-#define __G_VOLUME_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_HAL_UDI:
- *
- * The string used to obtain a Hal UDI with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_HAL_UDI "hal-udi"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE:
- *
- * The string used to obtain a Unix device path with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE "unix-device"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_LABEL:
- *
- * The string used to obtain a filesystem label with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_LABEL "label"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_UUID:
- *
- * The string used to obtain a UUID with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_UUID "uuid"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_NFS_MOUNT:
- *
- * The string used to obtain a NFS mount with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_NFS_MOUNT "nfs-mount"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_CLASS:
- *
- * The string used to obtain the volume <emphasis>class</emphasis>
- * with g_volume_get_identifier().
- *
- * Known volume classes include <literal>device</literal> and
- * <literal>network</literal>. Other classes may be added in the
- * future.
- *
- * This is intended to be used by applications to classify #GVolume
- * instances into different sections - for example a file manager or
- * file chooser can use this information to show
- * <literal>network</literal> volumes under a "Network" heading and
- * <literal>device</literal> volumes under a "Devices" heading.
- */
-#define G_VOLUME_IDENTIFIER_KIND_CLASS "class"
-
-
-#define G_TYPE_VOLUME            (g_volume_get_type ())
-#define G_VOLUME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_VOLUME, GVolume))
-#define G_IS_VOLUME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_VOLUME))
-#define G_VOLUME_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_VOLUME, GVolumeIface))
-
-/**
- * GVolumeIface:
- * @g_iface: The parent interface.
- * @changed: Changed signal that is emitted when the volume's state has changed.
- * @removed: The removed signal that is emitted when the #GVolume have been removed. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @get_name: Gets a string containing the name of the #GVolume.
- * @get_icon: Gets a #GIcon for the #GVolume.
- * @get_uuid: Gets the UUID for the #GVolume. The reference is typically based on the file system UUID for the mount in question and should be considered an opaque string. Returns %NULL if there is no UUID available.
- * @get_drive: Gets a #GDrive the volume is located on. Returns %NULL if the #GVolume is not associated with a #GDrive.
- * @get_mount: Gets a #GMount representing the mounted volume. Returns %NULL if the #GVolume is not mounted.
- * @can_mount: Returns %TRUE if the #GVolume can be mounted.
- * @can_eject: Checks if a #GVolume can be ejected.
- * @mount_fn: Mounts a given #GVolume. 
- *     #GVolume implementations must emit the #GMountOperation::aborted 
- *     signal before completing a mount operation that is aborted while 
- *     awaiting input from the user through a #GMountOperation instance.
- * @mount_finish: Finishes a mount operation.
- * @eject: Ejects a given #GVolume.
- * @eject_finish: Finishes an eject operation.
- * @get_identifier: Returns the <link linkend="volume-identifier">identifier</link> of the given kind, or %NULL if
- *    the #GVolume doesn't have one.
- * @enumerate_identifiers: Returns an array strings listing the kinds
- *    of <link linkend="volume-identifier">identifiers</link> which the #GVolume has.
- * @should_automount: Returns %TRUE if the #GVolume should be automatically mounted.
- * @get_activation_root: Returns the activation root for the #GVolume if it is known in advance or %NULL if
- *   it is not known.
- * @eject_with_operation: Starts ejecting a #GVolume using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_sort_key: Gets a key used for sorting #GVolume instance or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Gets a symbolic #GIcon for the #GVolume. Since 2.34.
- *
- * Interface for implementing operations for mountable volumes.
- **/
-typedef struct _GVolumeIface    GVolumeIface;
-
-struct _GVolumeIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  void        (* changed)               (GVolume             *volume);
-  void        (* removed)               (GVolume             *volume);
-
-  /* Virtual Table */
-
-  char      * (* get_name)              (GVolume             *volume);
-  GIcon     * (* get_icon)              (GVolume             *volume);
-  char      * (* get_uuid)              (GVolume             *volume);
-  GDrive    * (* get_drive)             (GVolume             *volume);
-  GMount    * (* get_mount)             (GVolume             *volume);
-  gboolean    (* can_mount)             (GVolume             *volume);
-  gboolean    (* can_eject)             (GVolume             *volume);
-  void        (* mount_fn)              (GVolume             *volume,
-                                         GMountMountFlags     flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean    (* mount_finish)          (GVolume             *volume,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  void        (* eject)                 (GVolume             *volume,
-                                         GMountUnmountFlags   flags,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean    (* eject_finish)          (GVolume             *volume,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  char      * (* get_identifier)        (GVolume             *volume,
-                                         const char          *kind);
-  char     ** (* enumerate_identifiers) (GVolume             *volume);
-
-  gboolean    (* should_automount)      (GVolume             *volume);
-
-  GFile     * (* get_activation_root)   (GVolume             *volume);
-
-  void        (* eject_with_operation)      (GVolume             *volume,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GVolume           *volume,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  const gchar * (* get_sort_key)        (GVolume             *volume);
-  GIcon       * (* get_symbolic_icon)   (GVolume             *volume);
-};
-
-GType    g_volume_get_type              (void) G_GNUC_CONST;
-
-char *   g_volume_get_name              (GVolume              *volume);
-GIcon *  g_volume_get_icon              (GVolume              *volume);
-GIcon *  g_volume_get_symbolic_icon     (GVolume              *volume);
-char *   g_volume_get_uuid              (GVolume              *volume);
-GDrive * g_volume_get_drive             (GVolume              *volume);
-GMount * g_volume_get_mount             (GVolume              *volume);
-gboolean g_volume_can_mount             (GVolume              *volume);
-gboolean g_volume_can_eject             (GVolume              *volume);
-gboolean g_volume_should_automount      (GVolume              *volume);
-void     g_volume_mount                 (GVolume              *volume,
-					 GMountMountFlags      flags,
-					 GMountOperation      *mount_operation,
-					 GCancellable         *cancellable,
-					 GAsyncReadyCallback   callback,
-					 gpointer              user_data);
-gboolean g_volume_mount_finish          (GVolume              *volume,
-					 GAsyncResult         *result,
-					 GError              **error);
-GLIB_DEPRECATED_FOR(g_volume_eject_with_operation)
-void     g_volume_eject                 (GVolume              *volume,
-                                         GMountUnmountFlags    flags,
-                                         GCancellable         *cancellable,
-                                         GAsyncReadyCallback   callback,
-                                         gpointer              user_data);
-
-GLIB_DEPRECATED_FOR(g_volume_eject_with_operation_finish)
-gboolean g_volume_eject_finish          (GVolume              *volume,
-                                         GAsyncResult         *result,
-                                         GError              **error);
-char *   g_volume_get_identifier        (GVolume              *volume,
-					 const char           *kind);
-char **  g_volume_enumerate_identifiers (GVolume              *volume);
-
-GFile *  g_volume_get_activation_root   (GVolume              *volume);
-
-void        g_volume_eject_with_operation     (GVolume             *volume,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_volume_eject_with_operation_finish (GVolume          *volume,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_2_32
-const gchar *g_volume_get_sort_key            (GVolume              *volume);
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gvolumemonitor.h b/GstreamerHelper/x64/include/glib-2.0/gio/gvolumemonitor.h
deleted file mode 100644
index 2bff07ed..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gvolumemonitor.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VOLUME_MONITOR_H__
-#define __G_VOLUME_MONITOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_VOLUME_MONITOR         (g_volume_monitor_get_type ())
-#define G_VOLUME_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VOLUME_MONITOR, GVolumeMonitor))
-#define G_VOLUME_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VOLUME_MONITOR, GVolumeMonitorClass))
-#define G_VOLUME_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VOLUME_MONITOR, GVolumeMonitorClass))
-#define G_IS_VOLUME_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VOLUME_MONITOR))
-#define G_IS_VOLUME_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VOLUME_MONITOR))
-
-/**
- * G_VOLUME_MONITOR_EXTENSION_POINT_NAME:
- *
- * Extension point for volume monitor functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-volume-monitor"
-
-/**
- * GVolumeMonitor:
- *
- * A Volume Monitor that watches for volume events.
- **/
-typedef struct _GVolumeMonitorClass GVolumeMonitorClass;
-
-struct _GVolumeMonitor
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  gpointer priv;
-};
-
-struct _GVolumeMonitorClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void      (* volume_added)         (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-  void      (* volume_removed)       (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-  void      (* volume_changed)       (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-
-  void      (* mount_added)          (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_removed)        (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_pre_unmount)    (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_changed)        (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-
-  void      (* drive_connected)      (GVolumeMonitor *volume_monitor,
-                                      GDrive	     *drive);
-  void      (* drive_disconnected)   (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-  void      (* drive_changed)        (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-
-  /* Vtable */
-
-  gboolean  (* is_supported)         (void);
-
-  GList   * (* get_connected_drives) (GVolumeMonitor *volume_monitor);
-  GList   * (* get_volumes)          (GVolumeMonitor *volume_monitor);
-  GList   * (* get_mounts)           (GVolumeMonitor *volume_monitor);
-
-  GVolume * (* get_volume_for_uuid)  (GVolumeMonitor *volume_monitor,
-                                      const char     *uuid);
-
-  GMount  * (* get_mount_for_uuid)   (GVolumeMonitor *volume_monitor,
-                                      const char     *uuid);
-
-
-  /* These arguments are unfortunately backwards by mistake (bug #520169). Deprecated in 2.20. */
-  GVolume * (* adopt_orphan_mount)   (GMount         *mount,
-                                      GVolumeMonitor *volume_monitor);
-
-  /* signal added in 2.17 */
-  void      (* drive_eject_button)   (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-
-  /* signal added in 2.21 */
-  void      (* drive_stop_button)   (GVolumeMonitor *volume_monitor,
-                                     GDrive         *drive);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-GType           g_volume_monitor_get_type             (void) G_GNUC_CONST;
-
-GVolumeMonitor *g_volume_monitor_get                  (void);
-GList *         g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor);
-GList *         g_volume_monitor_get_volumes          (GVolumeMonitor *volume_monitor);
-GList *         g_volume_monitor_get_mounts           (GVolumeMonitor *volume_monitor);
-GVolume *       g_volume_monitor_get_volume_for_uuid  (GVolumeMonitor *volume_monitor,
-                                                       const char     *uuid);
-GMount *        g_volume_monitor_get_mount_for_uuid   (GVolumeMonitor *volume_monitor,
-                                                       const char     *uuid);
-
-GLIB_DEPRECATED
-GVolume *       g_volume_monitor_adopt_orphan_mount   (GMount         *mount);
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_MONITOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gzlibcompressor.h b/GstreamerHelper/x64/include/glib-2.0/gio/gzlibcompressor.h
deleted file mode 100644
index 58247815..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gzlibcompressor.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ZLIB_COMPRESSOR_H__
-#define __G_ZLIB_COMPRESSOR_H__
-
-#include <gio/gconverter.h>
-#include <gio/gfileinfo.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ZLIB_COMPRESSOR         (g_zlib_compressor_get_type ())
-#define G_ZLIB_COMPRESSOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressor))
-#define G_ZLIB_COMPRESSOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressorClass))
-#define G_IS_ZLIB_COMPRESSOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_ZLIB_COMPRESSOR))
-#define G_IS_ZLIB_COMPRESSOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_ZLIB_COMPRESSOR))
-#define G_ZLIB_COMPRESSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressorClass))
-
-typedef struct _GZlibCompressorClass   GZlibCompressorClass;
-
-struct _GZlibCompressorClass
-{
-  GObjectClass parent_class;
-};
-
-GType            g_zlib_compressor_get_type (void) G_GNUC_CONST;
-
-GZlibCompressor *g_zlib_compressor_new (GZlibCompressorFormat format,
-					int level);
-
-GFileInfo       *g_zlib_compressor_get_file_info (GZlibCompressor *compressor);
-void             g_zlib_compressor_set_file_info (GZlibCompressor *compressor,
-                                                  GFileInfo       *file_info);
-
-G_END_DECLS
-
-#endif /* __G_ZLIB_COMPRESSOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gio/gzlibdecompressor.h b/GstreamerHelper/x64/include/glib-2.0/gio/gzlibdecompressor.h
deleted file mode 100644
index f7bb57dd..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gio/gzlibdecompressor.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ZLIB_DECOMPRESSOR_H__
-#define __G_ZLIB_DECOMPRESSOR_H__
-
-#include <gio/gconverter.h>
-#include <gio/gfileinfo.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ZLIB_DECOMPRESSOR         (g_zlib_decompressor_get_type ())
-#define G_ZLIB_DECOMPRESSOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressor))
-#define G_ZLIB_DECOMPRESSOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressorClass))
-#define G_IS_ZLIB_DECOMPRESSOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_ZLIB_DECOMPRESSOR))
-#define G_IS_ZLIB_DECOMPRESSOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_ZLIB_DECOMPRESSOR))
-#define G_ZLIB_DECOMPRESSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressorClass))
-
-typedef struct _GZlibDecompressorClass   GZlibDecompressorClass;
-
-struct _GZlibDecompressorClass
-{
-  GObjectClass parent_class;
-};
-
-GType              g_zlib_decompressor_get_type (void) G_GNUC_CONST;
-
-GZlibDecompressor *g_zlib_decompressor_new (GZlibCompressorFormat format);
-
-GFileInfo         *g_zlib_decompressor_get_file_info (GZlibDecompressor *decompressor);
-
-G_END_DECLS
-
-#endif /* __G_ZLIB_DECOMPRESSOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib-object.h b/GstreamerHelper/x64/include/glib-2.0/glib-object.h
deleted file mode 100644
index 336ba931..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib-object.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GLIB_GOBJECT_H__
-#define __GLIB_GOBJECT_H__
-
-#define __GLIB_GOBJECT_H_INSIDE__
-
-/* topmost include file for GObject header files */
-#include <gobject/gbinding.h>
-#include <gobject/gboxed.h>
-#include <gobject/genums.h>
-#include <gobject/gobject.h>
-#include <gobject/gparam.h>
-#include <gobject/gparamspecs.h>
-#include <gobject/gsignal.h>
-#include <gobject/gsourceclosure.h>
-#include <gobject/gtype.h>
-#include <gobject/gtypemodule.h>
-#include <gobject/gtypeplugin.h>
-#include <gobject/gvalue.h>
-#include <gobject/gvaluearray.h>
-#include <gobject/gvaluetypes.h>
-
-#undef __GLIB_GOBJECT_H_INSIDE__
-
-#endif /* __GLIB_GOBJECT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib-unix.h b/GstreamerHelper/x64/include/glib-2.0/glib-unix.h
deleted file mode 100644
index c04f66f3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib-unix.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* glib-unix.h - Unix specific integration
- * Copyright (C) 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_UNIX_H__
-#define __G_UNIX_H__
-
-/* We need to include the UNIX headers needed to use the APIs below,
- * but we also take this opportunity to include a wide selection of
- * other UNIX headers.  If one of the headers below is broken on some
- * system, work around it here (or better, fix the system or tell
- * people to use a better one).
- */
-#include <unistd.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include <glib.h>
-
-#ifndef G_OS_UNIX
-#error "This header may only be used on UNIX"
-#endif
-
-G_BEGIN_DECLS
-
-/**
- * G_UNIX_ERROR:
- *
- * Error domain for API in the "g_unix_" namespace.  Note that there is
- * no exported enumeration mapping %errno.  Instead, all functions
- * ensure that %errno is relevant.  The code for all #G_UNIX_ERROR is
- * always <literal>0</literal>, and the error message is always
- * generated via g_strerror().
- *
- * It is expected that most code will not look at %errno from these
- * APIs. Important cases where one would want to differentiate between
- * errors are already covered by existing cross-platform GLib API,
- * such as e.g. #GFile wrapping <literal>ENOENT</literal>.  However, it is
- * provided for completeness, at least.
- */
-#define G_UNIX_ERROR (g_unix_error_quark())
-
-GLIB_AVAILABLE_IN_2_30
-GQuark g_unix_error_quark (void);
-
-GLIB_AVAILABLE_IN_2_30
-gboolean g_unix_open_pipe (gint    *fds,
-                           gint     flags,
-                           GError **error);
-
-GLIB_AVAILABLE_IN_2_30
-gboolean g_unix_set_fd_nonblocking (gint       fd,
-                                    gboolean   nonblock,
-                                    GError   **error);
-
-GLIB_AVAILABLE_IN_2_30
-GSource *g_unix_signal_source_new  (gint signum);
-
-GLIB_AVAILABLE_IN_2_30
-guint    g_unix_signal_add_full    (gint           priority,
-                                    gint           signum,
-                                    GSourceFunc    handler,
-                                    gpointer       user_data,
-                                    GDestroyNotify notify);
-
-GLIB_AVAILABLE_IN_2_30
-guint    g_unix_signal_add         (gint        signum,
-                                    GSourceFunc handler,
-                                    gpointer    user_data);
-
-G_END_DECLS
-
-#endif  /* __G_UNIX_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib.h b/GstreamerHelper/x64/include/glib-2.0/glib.h
deleted file mode 100644
index 77abf232..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_LIB_H__
-#define __G_LIB_H__
-
-#define __GLIB_H_INSIDE__
-
-#include <glib/galloca.h>
-#include <glib/garray.h>
-#include <glib/gasyncqueue.h>
-#include <glib/gatomic.h>
-#include <glib/gbacktrace.h>
-#include <glib/gbase64.h>
-#include <glib/gbitlock.h>
-#include <glib/gbookmarkfile.h>
-#include <glib/gbytes.h>
-#include <glib/gcharset.h>
-#include <glib/gchecksum.h>
-#include <glib/gconvert.h>
-#include <glib/gdataset.h>
-#include <glib/gdate.h>
-#include <glib/gdatetime.h>
-#include <glib/gdir.h>
-#include <glib/genviron.h>
-#include <glib/gerror.h>
-#include <glib/gfileutils.h>
-#include <glib/ggettext.h>
-#include <glib/ghash.h>
-#include <glib/ghmac.h>
-#include <glib/ghook.h>
-#include <glib/ghostutils.h>
-#include <glib/giochannel.h>
-#include <glib/gkeyfile.h>
-#include <glib/glist.h>
-#include <glib/gmacros.h>
-#include <glib/gmain.h>
-#include <glib/gmappedfile.h>
-#include <glib/gmarkup.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gnode.h>
-#include <glib/goption.h>
-#include <glib/gpattern.h>
-#include <glib/gpoll.h>
-#include <glib/gprimes.h>
-#include <glib/gqsort.h>
-#include <glib/gquark.h>
-#include <glib/gqueue.h>
-#include <glib/grand.h>
-#include <glib/gregex.h>
-#include <glib/gscanner.h>
-#include <glib/gsequence.h>
-#include <glib/gshell.h>
-#include <glib/gslice.h>
-#include <glib/gslist.h>
-#include <glib/gspawn.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
-#include <glib/gstringchunk.h>
-#include <glib/gtestutils.h>
-#include <glib/gthread.h>
-#include <glib/gthreadpool.h>
-#include <glib/gtimer.h>
-#include <glib/gtimezone.h>
-#include <glib/gtrashstack.h>
-#include <glib/gtree.h>
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gurifuncs.h>
-#include <glib/gutils.h>
-#include <glib/gvarianttype.h>
-#include <glib/gvariant.h>
-#include <glib/gversion.h>
-#include <glib/gversionmacros.h>
-#ifdef G_PLATFORM_WIN32
-#include <glib/gwin32.h>
-#endif
-
-#include <glib/deprecated/gallocator.h>
-#include <glib/deprecated/gcache.h>
-#include <glib/deprecated/gcompletion.h>
-#include <glib/deprecated/gmain.h>
-#include <glib/deprecated/grel.h>
-#include <glib/deprecated/gthread.h>
-
-#undef __GLIB_H_INSIDE__
-
-#endif /* __G_LIB_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gallocator.h b/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gallocator.h
deleted file mode 100644
index e4990e90..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gallocator.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ALLOCATOR_H__
-#define __G_ALLOCATOR_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAllocator GAllocator;
-typedef struct _GMemChunk  GMemChunk;
-
-#define G_ALLOC_ONLY                    1
-#define G_ALLOC_AND_FREE                2
-#define G_ALLOCATOR_LIST                1
-#define G_ALLOCATOR_SLIST               2
-#define G_ALLOCATOR_NODE                3
-
-#define g_chunk_new(type, chunk)        ((type *) g_mem_chunk_alloc (chunk))
-#define g_chunk_new0(type, chunk)       ((type *) g_mem_chunk_alloc0 (chunk))
-#define g_chunk_free(mem, mem_chunk)    (g_mem_chunk_free (mem_chunk, mem))
-#define g_mem_chunk_create(type, x, y)  (g_mem_chunk_new (NULL, sizeof (type), 0, 0))
-
-
-GLIB_DEPRECATED
-GMemChunk *     g_mem_chunk_new         (const gchar  *name,
-                                         gint          atom_size,
-                                         gsize         area_size,
-                                         gint          type);
-GLIB_DEPRECATED
-void            g_mem_chunk_destroy     (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-gpointer        g_mem_chunk_alloc       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-gpointer        g_mem_chunk_alloc0      (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_free        (GMemChunk    *mem_chunk,
-                                         gpointer      mem);
-GLIB_DEPRECATED
-void            g_mem_chunk_clean       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_reset       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_print       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_info        (void);
-GLIB_DEPRECATED
-void            g_blow_chunks           (void);
-
-
-GLIB_DEPRECATED
-GAllocator *    g_allocator_new         (const gchar  *name,
-                                         guint         n_preallocs);
-GLIB_DEPRECATED
-void            g_allocator_free        (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_list_push_allocator   (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_list_pop_allocator    (void);
-GLIB_DEPRECATED
-void            g_slist_push_allocator  (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_slist_pop_allocator   (void);
-GLIB_DEPRECATED
-void            g_node_push_allocator   (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_node_pop_allocator    (void);
-
-G_END_DECLS
-
-#endif /* __G_ALLOCATOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gcache.h b/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gcache.h
deleted file mode 100644
index 2e5119b2..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gcache.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CACHE_H__
-#define __G_CACHE_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GCache          GCache;
-
-typedef gpointer        (*GCacheNewFunc)        (gpointer       key);
-typedef gpointer        (*GCacheDupFunc)        (gpointer       value);
-typedef void            (*GCacheDestroyFunc)    (gpointer       value);
-
-/* Caches
- */
-GLIB_DEPRECATED
-GCache*  g_cache_new           (GCacheNewFunc      value_new_func,
-                                GCacheDestroyFunc  value_destroy_func,
-                                GCacheDupFunc      key_dup_func,
-                                GCacheDestroyFunc  key_destroy_func,
-                                GHashFunc          hash_key_func,
-                                GHashFunc          hash_value_func,
-                                GEqualFunc         key_equal_func);
-GLIB_DEPRECATED
-void     g_cache_destroy       (GCache            *cache);
-GLIB_DEPRECATED
-gpointer g_cache_insert        (GCache            *cache,
-                                gpointer           key);
-GLIB_DEPRECATED
-void     g_cache_remove        (GCache            *cache,
-                                gconstpointer      value);
-GLIB_DEPRECATED
-void     g_cache_key_foreach   (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-GLIB_DEPRECATED
-void     g_cache_value_foreach (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-
-G_END_DECLS
-
-#endif /* __G_CACHE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gcompletion.h b/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gcompletion.h
deleted file mode 100644
index 88a0479d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gcompletion.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_COMPLETION_H__
-#define __G_COMPLETION_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GCompletion     GCompletion;
-
-typedef gchar*          (*GCompletionFunc)      (gpointer);
-
-/* GCompletion
- */
-
-typedef gint (*GCompletionStrncmpFunc) (const gchar *s1,
-                                        const gchar *s2,
-                                        gsize        n);
-
-struct _GCompletion
-{
-  GList* items;
-  GCompletionFunc func;
- 
-  gchar* prefix;
-  GList* cache;
-  GCompletionStrncmpFunc strncmp_func;
-};
-
-GLIB_DEPRECATED_IN_2_26
-GCompletion* g_completion_new           (GCompletionFunc func);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_add_items     (GCompletion*    cmp,
-                                         GList*          items);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_remove_items  (GCompletion*    cmp,
-                                         GList*          items);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_clear_items   (GCompletion*    cmp);
-GLIB_DEPRECATED_IN_2_26
-GList*       g_completion_complete      (GCompletion*    cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GLIB_DEPRECATED_IN_2_26
-GList*       g_completion_complete_utf8 (GCompletion  *cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_set_compare   (GCompletion *cmp,
-                                         GCompletionStrncmpFunc strncmp_func);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_free          (GCompletion*    cmp);
-
-G_END_DECLS
-
-#endif /* __G_COMPLETION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gmain.h b/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gmain.h
deleted file mode 100644
index d1ddf197..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gmain.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DEPRECATED_MAIN_H__
-#define __G_DEPRECATED_MAIN_H__
-
-#include <glib/gmain.h>
-
-G_BEGIN_DECLS
-
-/* ============== Compat main loop stuff ================== */
-
-/**
- * g_main_new:
- * @is_running: set to %TRUE to indicate that the loop is running. This
- *     is not very important since calling g_main_run() will set this
- *     to %TRUE anyway.
- *
- * Creates a new #GMainLoop for th default main context.
- *
- * Returns: a new #GMainLoop
- *
- * Deprecated: 2.2: Use g_main_loop_new() instead
- */
-#define         g_main_new(is_running)  g_main_loop_new (NULL, is_running)
-
-/**
- * g_main_run:
- * @loop: a #GMainLoop
- *
- * Runs a main loop until it stops running.
- *
- * Deprecated: 2.2: Use g_main_loop_run() instead
- */
-#define         g_main_run(loop)        g_main_loop_run(loop)
-
-/**
- * g_main_quit:
- * @loop: a #GMainLoop
- *
- * Stops the #GMainLoop.
- * If g_main_run() was called to run the #GMainLoop, it will now return.
- *
- * Deprecated: 2.2: Use g_main_loop_quit() instead
- */
-#define g_main_quit(loop)       g_main_loop_quit(loop)
-
-/**
- * g_main_destroy:
- * @loop: a #GMainLoop
- *
- * Frees the memory allocated for the #GMainLoop.
- *
- * Deprecated: 2.2: Use g_main_loop_unref() instead
- */
-#define g_main_destroy(loop)    g_main_loop_unref(loop)
-
-/**
- * g_main_is_running:
- * @loop: a #GMainLoop
- *
- * Checks if the main loop is running.
- *
- * Returns: %TRUE if the main loop is running
- *
- * Deprecated: 2.2: Use g_main_loop_is_running() instead
- */
-#define g_main_is_running(loop) g_main_loop_is_running(loop)
-
-/**
- * g_main_iteration:
- * @may_block: set to %TRUE if it should block (i.e. wait) until an event
- *     source becomes ready. It will return after an event source has been
- *     processed. If set to %FALSE it will return immediately if no event
- *     source is ready to be processed.
- *
- * Runs a single iteration for the default #GMainContext.
- *
- * Returns: %TRUE if more events are pending.
- *
- * Deprecated: 2.2: Use g_main_context_iteration() instead.
- */
-#define g_main_iteration(may_block) g_main_context_iteration (NULL, may_block)
-
-/**
- * g_main_pending:
- *
- * Checks if any events are pending for the default #GMainContext
- * (i.e. ready to be processed).
- *
- * Returns: %TRUE if any events are pending.
- *
- * Deprected: 2.2: Use g_main_context_pending() instead.
- */
-#define g_main_pending()            g_main_context_pending (NULL)
-
-/**
- * g_main_set_poll_func:
- * @func: the function to call to poll all file descriptors
- *
- * Sets the function to use for the handle polling of file descriptors
- * for the default main context.
- *
- * Deprecated: 2.2: Use g_main_context_set_poll_func() again
- */
-#define g_main_set_poll_func(func)  g_main_context_set_poll_func (NULL, func)
-
-
-G_END_DECLS
-
-#endif /* __G_DEPRECATED_MAIN_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/grel.h b/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/grel.h
deleted file mode 100644
index c9e09962..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/grel.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_REL_H__
-#define __G_REL_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GRelation       GRelation;
-typedef struct _GTuples         GTuples;
-
-struct _GTuples
-{
-  guint len;
-};
-
-/* GRelation
- *
- * Indexed Relations.  Imagine a really simple table in a
- * database.  Relations are not ordered.  This data type is meant for
- * maintaining a N-way mapping.
- *
- * g_relation_new() creates a relation with FIELDS fields
- *
- * g_relation_destroy() frees all resources
- * g_tuples_destroy() frees the result of g_relation_select()
- *
- * g_relation_index() indexes relation FIELD with the provided
- *   equality and hash functions.  this must be done before any
- *   calls to insert are made.
- *
- * g_relation_insert() inserts a new tuple.  you are expected to
- *   provide the right number of fields.
- *
- * g_relation_delete() deletes all relations with KEY in FIELD
- * g_relation_select() returns ...
- * g_relation_count() counts ...
- */
-
-GLIB_DEPRECATED_IN_2_26
-GRelation* g_relation_new     (gint         fields);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_destroy (GRelation   *relation);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_index   (GRelation   *relation,
-                               gint         field,
-                               GHashFunc    hash_func,
-                               GEqualFunc   key_equal_func);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_insert  (GRelation   *relation,
-                               ...);
-GLIB_DEPRECATED_IN_2_26
-gint       g_relation_delete  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-GTuples*   g_relation_select  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-gint       g_relation_count   (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-gboolean   g_relation_exists  (GRelation   *relation,
-                               ...);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_print   (GRelation   *relation);
-GLIB_DEPRECATED_IN_2_26
-void       g_tuples_destroy   (GTuples     *tuples);
-GLIB_DEPRECATED_IN_2_26
-gpointer   g_tuples_index     (GTuples     *tuples,
-                               gint         index_,
-                               gint         field);
-
-G_END_DECLS
-
-#endif /* __G_REL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gthread.h b/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gthread.h
deleted file mode 100644
index 1866540e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/deprecated/gthread.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DEPRECATED_THREAD_H__
-#define __G_DEPRECATED_THREAD_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  G_THREAD_PRIORITY_LOW,
-  G_THREAD_PRIORITY_NORMAL,
-  G_THREAD_PRIORITY_HIGH,
-  G_THREAD_PRIORITY_URGENT
-} GThreadPriority;
-
-struct  _GThread
-{
-  /*< private >*/
-  GThreadFunc func;
-  gpointer data;
-  gboolean joinable;
-  GThreadPriority priority;
-};
-
-typedef struct _GThreadFunctions GThreadFunctions;
-struct _GThreadFunctions
-{
-  GMutex*  (*mutex_new)           (void);
-  void     (*mutex_lock)          (GMutex               *mutex);
-  gboolean (*mutex_trylock)       (GMutex               *mutex);
-  void     (*mutex_unlock)        (GMutex               *mutex);
-  void     (*mutex_free)          (GMutex               *mutex);
-  GCond*   (*cond_new)            (void);
-  void     (*cond_signal)         (GCond                *cond);
-  void     (*cond_broadcast)      (GCond                *cond);
-  void     (*cond_wait)           (GCond                *cond,
-                                   GMutex               *mutex);
-  gboolean (*cond_timed_wait)     (GCond                *cond,
-                                   GMutex               *mutex,
-                                   GTimeVal             *end_time);
-  void      (*cond_free)          (GCond                *cond);
-  GPrivate* (*private_new)        (GDestroyNotify        destructor);
-  gpointer  (*private_get)        (GPrivate             *private_key);
-  void      (*private_set)        (GPrivate             *private_key,
-                                   gpointer              data);
-  void      (*thread_create)      (GThreadFunc           func,
-                                   gpointer              data,
-                                   gulong                stack_size,
-                                   gboolean              joinable,
-                                   gboolean              bound,
-                                   GThreadPriority       priority,
-                                   gpointer              thread,
-                                   GError              **error);
-  void      (*thread_yield)       (void);
-  void      (*thread_join)        (gpointer              thread);
-  void      (*thread_exit)        (void);
-  void      (*thread_set_priority)(gpointer              thread,
-                                   GThreadPriority       priority);
-  void      (*thread_self)        (gpointer              thread);
-  gboolean  (*thread_equal)       (gpointer              thread1,
-                                   gpointer              thread2);
-};
-
-GLIB_VAR GThreadFunctions       g_thread_functions_for_glib_use;
-GLIB_VAR gboolean               g_thread_use_default_impl;
-
-GLIB_VAR guint64   (*g_thread_gettime) (void);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_thread_new)
-GThread *g_thread_create       (GThreadFunc       func,
-                                gpointer          data,
-                                gboolean          joinable,
-                                GError          **error);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_thread_new)
-GThread *g_thread_create_full  (GThreadFunc       func,
-                                gpointer          data,
-                                gulong            stack_size,
-                                gboolean          joinable,
-                                gboolean          bound,
-                                GThreadPriority   priority,
-                                GError          **error);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_set_priority (GThread          *thread,
-                                GThreadPriority   priority);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_foreach      (GFunc             thread_func,
-                                gpointer          user_data);
-
-#ifndef G_OS_WIN32
-#include <pthread.h>
-#endif
-
-#define g_static_mutex_get_mutex g_static_mutex_get_mutex_impl
-#define G_STATIC_MUTEX_INIT { NULL }
-typedef struct
-{
-  GMutex *mutex;
-#ifndef G_OS_WIN32
-  /* only for ABI compatibility reasons */
-  pthread_mutex_t unused;
-#endif
-} GStaticMutex;
-
-#define g_static_mutex_lock(mutex) \
-    g_mutex_lock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_trylock(mutex) \
-    g_mutex_trylock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_unlock(mutex) \
-    g_mutex_unlock (g_static_mutex_get_mutex (mutex))
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_mutex_init)
-void    g_static_mutex_init           (GStaticMutex *mutex);
-GLIB_DEPRECATED_IN_2_32_FOR(g_mutex_free)
-void    g_static_mutex_free           (GStaticMutex *mutex);
-GMutex *g_static_mutex_get_mutex_impl (GStaticMutex *mutex);
-
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  guint depth;
-
-  /* ABI compat only */
-  union {
-#ifdef G_OS_WIN32
-    void *owner;
-#else
-    pthread_t owner;
-#endif
-    gdouble dummy;
-  } unused;
-};
-
-#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_init)
-void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_lock)
-void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_try_lock)
-gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_unlock)
-void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
-                                         guint            depth);
-
-GLIB_DEPRECATED_IN_2_32
-guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_free)
-void     g_static_rec_mutex_free        (GStaticRecMutex *mutex);
-
-typedef struct _GStaticRWLock GStaticRWLock;
-struct _GStaticRWLock
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  GCond *read_cond;
-  GCond *write_cond;
-  guint read_counter;
-  gboolean have_writer;
-  guint want_to_read;
-  guint want_to_write;
-};
-
-#define G_STATIC_RW_LOCK_INIT { G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, 0, 0 }
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_init)
-void      g_static_rw_lock_init           (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_lock)
-void      g_static_rw_lock_reader_lock    (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_trylock)
-gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_unlock)
-void      g_static_rw_lock_reader_unlock  (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_lock)
-void      g_static_rw_lock_writer_lock    (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_trylock)
-gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_unlock)
-void      g_static_rw_lock_writer_unlock  (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_free)
-void      g_static_rw_lock_free           (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32
-GPrivate *      g_private_new             (GDestroyNotify notify);
-
-typedef struct _GStaticPrivate  GStaticPrivate;
-struct _GStaticPrivate
-{
-  /*< private >*/
-  guint index;
-};
-
-#define G_STATIC_PRIVATE_INIT { 0 }
-GLIB_DEPRECATED_IN_2_32
-void     g_static_private_init           (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_private_get)
-gpointer g_static_private_get            (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_private_set)
-void     g_static_private_set            (GStaticPrivate *private_key,
-                                          gpointer        data,
-                                          GDestroyNotify  notify);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_static_private_free           (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32
-gboolean g_once_init_enter_impl          (volatile gsize *location);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_init                   (gpointer vtable);
-GLIB_DEPRECATED_IN_2_32
-void    g_thread_init_with_errorcheck_mutexes (gpointer vtable);
-
-GLIB_DEPRECATED_IN_2_32
-gboolean g_thread_get_initialized        (void);
-
-GLIB_VAR gboolean g_threads_got_initialized;
-
-#define g_thread_supported()     (1)
-
-GLIB_DEPRECATED_IN_2_32
-GMutex *        g_mutex_new             (void);
-GLIB_DEPRECATED_IN_2_32
-void            g_mutex_free            (GMutex *mutex);
-GLIB_DEPRECATED_IN_2_32
-GCond *         g_cond_new              (void);
-GLIB_DEPRECATED_IN_2_32
-void            g_cond_free             (GCond  *cond);
-GLIB_DEPRECATED_IN_2_32
-gboolean        g_cond_timed_wait       (GCond          *cond,
-                                         GMutex         *mutex,
-                                         GTimeVal       *timeval);
-
-G_END_DECLS
-
-#endif /* __G_DEPRECATED_THREAD_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/galloca.h b/GstreamerHelper/x64/include/glib-2.0/glib/galloca.h
deleted file mode 100644
index a18a75cd..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/galloca.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ALLOCA_H__
-#define __G_ALLOCA_H__
-
-#include <glib/gtypes.h>
-
-#if defined(__BIONIC__) && defined (GLIB_HAVE_ALLOCA_H)
-# include <alloca.h>
-#elif defined(__GNUC__)
-/* GCC does the right thing */
-# undef alloca
-# define alloca(size)   __builtin_alloca (size)
-#elif defined (GLIB_HAVE_ALLOCA_H)
-/* a native and working alloca.h is there */ 
-# include <alloca.h>
-#else /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-# if defined(_MSC_VER) || defined(__DMC__)
-#  include <malloc.h>
-#  define alloca _alloca
-# else /* !_MSC_VER && !__DMC__ */
-#  ifdef _AIX
-#   pragma alloca
-#  else /* !_AIX */
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-G_BEGIN_DECLS
-char *alloca ();
-G_END_DECLS
-#   endif /* !alloca */
-#  endif /* !_AIX */
-# endif /* !_MSC_VER && !__DMC__ */
-#endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-
-/**
- * g_alloca:
- * @size: number of bytes to allocate.
- * 
- * Allocates @size bytes on the stack; these bytes will be freed when the current
- * stack frame is cleaned up. This macro essentially just wraps the alloca()
- * function present on most UNIX variants.
- * Thus it provides the same advantages and pitfalls as alloca():
- * <variablelist>
- *   <varlistentry><term></term><listitem><para>
- *     + alloca() is very fast, as on most systems it's implemented by just adjusting
- *     the stack pointer register.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     + It doesn't cause any memory fragmentation, within its scope, separate alloca()
- *     blocks just build up and are released together at function end.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Allocation sizes have to fit into the current stack frame. For instance in a
- *       threaded environment on Linux, the per-thread stack size is limited to 2 Megabytes,
- *       so be sparse with alloca() uses.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Allocation failure due to insufficient stack space is not indicated with a %NULL
- *       return like e.g. with malloc(). Instead, most systems probably handle it the same
- *       way as out of stack space situations from infinite function recursion, i.e.
- *       with a segmentation fault.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Special care has to be taken when mixing alloca() with GNU C variable sized arrays.
- *       Stack space allocated with alloca() in the same scope as a variable sized array
- *       will be freed together with the variable sized array upon exit of that scope, and
- *       not upon exit of the enclosing function scope.
- *   </para></listitem></varlistentry>
- * </variablelist>
- * 
- * Returns: space for @size bytes, allocated on the stack
- */
-#define g_alloca(size)		 alloca (size)
-/**
- * g_newa:
- * @struct_type: Type of memory chunks to be allocated
- * @n_structs: Number of chunks to be allocated
- * 
- * Wraps g_alloca() in a more typesafe manner.
- * 
- * Returns: Pointer to stack space for @n_structs chunks of type @struct_type
- */
-#define g_newa(struct_type, n_structs)	((struct_type*) g_alloca (sizeof (struct_type) * (gsize) (n_structs)))
-
-#endif /* __G_ALLOCA_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/garray.h b/GstreamerHelper/x64/include/glib-2.0/glib/garray.h
deleted file mode 100644
index eb37b92e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/garray.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ARRAY_H__
-#define __G_ARRAY_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GBytes          GBytes;
-typedef struct _GArray		GArray;
-typedef struct _GByteArray	GByteArray;
-typedef struct _GPtrArray	GPtrArray;
-
-struct _GArray
-{
-  gchar *data;
-  guint len;
-};
-
-struct _GByteArray
-{
-  guint8 *data;
-  guint	  len;
-};
-
-struct _GPtrArray
-{
-  gpointer *pdata;
-  guint	    len;
-};
-
-/* Resizable arrays. remove fills any cleared spot and shortens the
- * array, while preserving the order. remove_fast will distort the
- * order by moving the last element to the position of the removed.
- */
-
-#define g_array_append_val(a,v)	  g_array_append_vals (a, &(v), 1)
-#define g_array_prepend_val(a,v)  g_array_prepend_vals (a, &(v), 1)
-#define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1)
-#define g_array_index(a,t,i)      (((t*) (void *) (a)->data) [(i)])
-
-GArray* g_array_new               (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size);
-GArray* g_array_sized_new         (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size,
-				   guint             reserved_size);
-gchar*  g_array_free              (GArray           *array,
-				   gboolean          free_segment);
-GArray *g_array_ref               (GArray           *array);
-void    g_array_unref             (GArray           *array);
-guint   g_array_get_element_size  (GArray           *array);
-GArray* g_array_append_vals       (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_prepend_vals      (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_insert_vals       (GArray           *array,
-				   guint             index_,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_set_size          (GArray           *array,
-				   guint             length);
-GArray* g_array_remove_index      (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_index_fast (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_range      (GArray           *array,
-				   guint             index_,
-				   guint             length);
-void    g_array_sort              (GArray           *array,
-				   GCompareFunc      compare_func);
-void    g_array_sort_with_data    (GArray           *array,
-				   GCompareDataFunc  compare_func,
-				   gpointer          user_data);
-void    g_array_set_clear_func    (GArray           *array,
-                                   GDestroyNotify    clear_func);
-
-/* Resizable pointer array.  This interface is much less complicated
- * than the above.  Add appends a pointer.  Remove fills any cleared 
- * spot and shortens the array. remove_fast will again distort order.  
- */
-#define    g_ptr_array_index(array,index_) ((array)->pdata)[index_]
-GPtrArray* g_ptr_array_new                (void);
-GPtrArray* g_ptr_array_new_with_free_func (GDestroyNotify    element_free_func);
-GPtrArray* g_ptr_array_sized_new          (guint             reserved_size);
-GPtrArray* g_ptr_array_new_full           (guint             reserved_size,
-					   GDestroyNotify    element_free_func);
-gpointer*  g_ptr_array_free               (GPtrArray        *array,
-					   gboolean          free_seg);
-GPtrArray* g_ptr_array_ref                (GPtrArray        *array);
-void       g_ptr_array_unref              (GPtrArray        *array);
-void       g_ptr_array_set_free_func      (GPtrArray        *array,
-                                           GDestroyNotify    element_free_func);
-void       g_ptr_array_set_size           (GPtrArray        *array,
-					   gint              length);
-gpointer   g_ptr_array_remove_index       (GPtrArray        *array,
-					   guint             index_);
-gpointer   g_ptr_array_remove_index_fast  (GPtrArray        *array,
-					   guint             index_);
-gboolean   g_ptr_array_remove             (GPtrArray        *array,
-					   gpointer          data);
-gboolean   g_ptr_array_remove_fast        (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_remove_range       (GPtrArray        *array,
-					   guint             index_,
-					   guint             length);
-void       g_ptr_array_add                (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_sort               (GPtrArray        *array,
-					   GCompareFunc      compare_func);
-void       g_ptr_array_sort_with_data     (GPtrArray        *array,
-					   GCompareDataFunc  compare_func,
-					   gpointer          user_data);
-void       g_ptr_array_foreach            (GPtrArray        *array,
-					   GFunc             func,
-					   gpointer          user_data);
-
-
-/* Byte arrays, an array of guint8.  Implemented as a GArray,
- * but type-safe.
- */
-
-GByteArray* g_byte_array_new               (void);
-GByteArray* g_byte_array_new_take          (guint8           *data,
-                                            gsize             len);
-GByteArray* g_byte_array_sized_new         (guint             reserved_size);
-guint8*     g_byte_array_free              (GByteArray       *array,
-					    gboolean          free_segment);
-GBytes*     g_byte_array_free_to_bytes     (GByteArray       *array);
-GByteArray *g_byte_array_ref               (GByteArray       *array);
-void        g_byte_array_unref             (GByteArray       *array);
-GByteArray* g_byte_array_append            (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_prepend           (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_set_size          (GByteArray       *array,
-					    guint             length);
-GByteArray* g_byte_array_remove_index      (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_index_fast (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_range      (GByteArray       *array,
-					    guint             index_,
-					    guint             length);
-void        g_byte_array_sort              (GByteArray       *array,
-					    GCompareFunc      compare_func);
-void        g_byte_array_sort_with_data    (GByteArray       *array,
-					    GCompareDataFunc  compare_func,
-					    gpointer          user_data);
-
-G_END_DECLS
-
-#endif /* __G_ARRAY_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gasyncqueue.h b/GstreamerHelper/x64/include/glib-2.0/glib/gasyncqueue.h
deleted file mode 100644
index f0d6d959..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gasyncqueue.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNCQUEUE_H__
-#define __G_ASYNCQUEUE_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAsyncQueue GAsyncQueue;
-
-GAsyncQueue *g_async_queue_new                  (void);
-GAsyncQueue *g_async_queue_new_full             (GDestroyNotify item_free_func);
-void         g_async_queue_lock                 (GAsyncQueue      *queue);
-void         g_async_queue_unlock               (GAsyncQueue      *queue);
-GAsyncQueue *g_async_queue_ref                  (GAsyncQueue      *queue);
-void         g_async_queue_unref                (GAsyncQueue      *queue);
-
-GLIB_DEPRECATED_FOR(g_async_queue_ref)
-void         g_async_queue_ref_unlocked         (GAsyncQueue      *queue);
-
-GLIB_DEPRECATED_FOR(g_async_queue_unref)
-void         g_async_queue_unref_and_unlock     (GAsyncQueue      *queue);
-
-void         g_async_queue_push                 (GAsyncQueue      *queue,
-                                                 gpointer          data);
-void         g_async_queue_push_unlocked        (GAsyncQueue      *queue,
-                                                 gpointer          data);
-void         g_async_queue_push_sorted          (GAsyncQueue      *queue,
-                                                 gpointer          data,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-void         g_async_queue_push_sorted_unlocked (GAsyncQueue      *queue,
-                                                 gpointer          data,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-gpointer     g_async_queue_pop                  (GAsyncQueue      *queue);
-gpointer     g_async_queue_pop_unlocked         (GAsyncQueue      *queue);
-gpointer     g_async_queue_try_pop              (GAsyncQueue      *queue);
-gpointer     g_async_queue_try_pop_unlocked     (GAsyncQueue      *queue);
-gpointer     g_async_queue_timeout_pop          (GAsyncQueue      *queue,
-                                                 guint64           timeout);
-gpointer     g_async_queue_timeout_pop_unlocked (GAsyncQueue      *queue,
-                                                 guint64           timeout);
-gint         g_async_queue_length               (GAsyncQueue      *queue);
-gint         g_async_queue_length_unlocked      (GAsyncQueue      *queue);
-void         g_async_queue_sort                 (GAsyncQueue      *queue,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-void         g_async_queue_sort_unlocked        (GAsyncQueue      *queue,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-
-GLIB_DEPRECATED_FOR(g_async_queue_timeout_pop)
-gpointer     g_async_queue_timed_pop            (GAsyncQueue      *queue,
-                                                 GTimeVal         *end_time);
-GLIB_DEPRECATED_FOR(g_async_queue_timeout_pop_unlocked)
-gpointer     g_async_queue_timed_pop_unlocked   (GAsyncQueue      *queue,
-                                                 GTimeVal         *end_time);
-
-G_END_DECLS
-
-#endif /* __G_ASYNCQUEUE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gatomic.h b/GstreamerHelper/x64/include/glib-2.0/glib/gatomic.h
deleted file mode 100644
index 8b52e0b3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gatomic.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright © 2011 Ryan Lortie
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ATOMIC_H__
-#define __G_ATOMIC_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gint                    g_atomic_int_get                      (volatile gint  *atomic);
-void                    g_atomic_int_set                      (volatile gint  *atomic,
-                                                               gint            newval);
-void                    g_atomic_int_inc                      (volatile gint  *atomic);
-gboolean                g_atomic_int_dec_and_test             (volatile gint  *atomic);
-gboolean                g_atomic_int_compare_and_exchange     (volatile gint  *atomic,
-                                                               gint            oldval,
-                                                               gint            newval);
-gint                    g_atomic_int_add                      (volatile gint  *atomic,
-                                                               gint            val);
-GLIB_AVAILABLE_IN_2_30
-guint                   g_atomic_int_and                      (volatile guint *atomic,
-                                                               guint           val);
-GLIB_AVAILABLE_IN_2_30
-guint                   g_atomic_int_or                       (volatile guint *atomic,
-                                                               guint           val);
-guint                   g_atomic_int_xor                      (volatile guint *atomic,
-                                                               guint           val);
-
-gpointer                g_atomic_pointer_get                  (volatile void  *atomic);
-void                    g_atomic_pointer_set                  (volatile void  *atomic,
-                                                               gpointer        newval);
-gboolean                g_atomic_pointer_compare_and_exchange (volatile void  *atomic,
-                                                               gpointer        oldval,
-                                                               gpointer        newval);
-gssize                  g_atomic_pointer_add                  (volatile void  *atomic,
-                                                               gssize          val);
-GLIB_AVAILABLE_IN_2_30
-gsize                   g_atomic_pointer_and                  (volatile void  *atomic,
-                                                               gsize           val);
-GLIB_AVAILABLE_IN_2_30
-gsize                   g_atomic_pointer_or                   (volatile void  *atomic,
-                                                               gsize           val);
-gsize                   g_atomic_pointer_xor                  (volatile void  *atomic,
-                                                               gsize           val);
-
-GLIB_DEPRECATED_IN_2_30_FOR(g_atomic_add)
-gint                    g_atomic_int_exchange_and_add         (volatile gint  *atomic,
-                                                               gint            val);
-
-G_END_DECLS
-
-#if defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
-
-#define g_atomic_int_get(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    __sync_synchronize ();                                                   \
-    (gint) *(atomic);                                                        \
-  }))
-#define g_atomic_int_set(atomic, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (newval) : 0);                                   \
-    *(atomic) = (newval);                                                    \
-    __sync_synchronize ();                                                   \
-  }))
-#define g_atomic_int_inc(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    (void) __sync_fetch_and_add ((atomic), 1);                               \
-  }))
-#define g_atomic_int_dec_and_test(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    __sync_fetch_and_sub ((atomic), 1) == 1;                                 \
-  }))
-#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 0);                        \
-    (gboolean) __sync_bool_compare_and_swap ((atomic), (oldval), (newval));  \
-  }))
-#define g_atomic_int_add(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (gint) __sync_fetch_and_add ((atomic), (val));                           \
-  }))
-#define g_atomic_int_and(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_and ((atomic), (val));                          \
-  }))
-#define g_atomic_int_or(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_or ((atomic), (val));                           \
-  }))
-#define g_atomic_int_xor(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_xor ((atomic), (val));                          \
-  }))
-
-#define g_atomic_pointer_get(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    __sync_synchronize ();                                                   \
-    (gpointer) *(atomic);                                                    \
-  }))
-#define g_atomic_pointer_set(atomic, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    *(atomic) = (__typeof__ (*(atomic))) (gsize) (newval);                   \
-    __sync_synchronize ();                                                   \
-  }))
-#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (gboolean) __sync_bool_compare_and_swap ((atomic), (oldval), (newval));  \
-  }))
-#define g_atomic_pointer_add(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gssize) __sync_fetch_and_add ((atomic), (val));                         \
-  }))
-#define g_atomic_pointer_and(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_and ((atomic), (val));                          \
-  }))
-#define g_atomic_pointer_or(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_or ((atomic), (val));                           \
-  }))
-#define g_atomic_pointer_xor(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_xor ((atomic), (val));                          \
-  }))
-
-#else /* defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */
-
-#define g_atomic_int_get(atomic) \
-  (g_atomic_int_get ((gint *) (atomic)))
-#define g_atomic_int_set(atomic, newval) \
-  (g_atomic_int_set ((gint *) (atomic), (gint) (newval)))
-#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \
-  (g_atomic_int_compare_and_exchange ((gint *) (atomic), (oldval), (newval)))
-#define g_atomic_int_add(atomic, val) \
-  (g_atomic_int_add ((gint *) (atomic), (val)))
-#define g_atomic_int_and(atomic, val) \
-  (g_atomic_int_and ((guint *) (atomic), (val)))
-#define g_atomic_int_or(atomic, val) \
-  (g_atomic_int_or ((guint *) (atomic), (val)))
-#define g_atomic_int_xor(atomic, val) \
-  (g_atomic_int_xor ((guint *) (atomic), (val)))
-#define g_atomic_int_inc(atomic) \
-  (g_atomic_int_inc ((gint *) (atomic)))
-#define g_atomic_int_dec_and_test(atomic) \
-  (g_atomic_int_dec_and_test ((gint *) (atomic)))
-
-#define g_atomic_pointer_get(atomic) \
-  (g_atomic_pointer_get (atomic))
-#define g_atomic_pointer_set(atomic, newval) \
-  (g_atomic_pointer_set ((atomic), (gpointer) (newval)))
-#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
-  (g_atomic_pointer_compare_and_exchange ((atomic), (gpointer) (oldval), (gpointer) (newval)))
-#define g_atomic_pointer_add(atomic, val) \
-  (g_atomic_pointer_add ((atomic), (gssize) (val)))
-#define g_atomic_pointer_and(atomic, val) \
-  (g_atomic_pointer_and ((atomic), (gsize) (val)))
-#define g_atomic_pointer_or(atomic, val) \
-  (g_atomic_pointer_or ((atomic), (gsize) (val)))
-#define g_atomic_pointer_xor(atomic, val) \
-  (g_atomic_pointer_xor ((atomic), (gsize) (val)))
-
-#endif /* defined(__GNUC__) && defined(G_ATOMIC_OP_USE_GCC_BUILTINS) */
-
-#endif /* __G_ATOMIC_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gbacktrace.h b/GstreamerHelper/x64/include/glib-2.0/glib/gbacktrace.h
deleted file mode 100644
index f0a6eab9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gbacktrace.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BACKTRACE_H__
-#define __G_BACKTRACE_H__
-
-#include <glib/gtypes.h>
-#include <signal.h>
-
-G_BEGIN_DECLS
-
-void g_on_error_query (const gchar *prg_name);
-void g_on_error_stack_trace (const gchar *prg_name);
-
-/**
- * G_BREAKPOINT:
- *
- * Inserts a breakpoint instruction into the code.
- *
- * On x86 and alpha systems this is implemented as a soft interrupt
- * and on other architectures it raises a <literal>SIGTRAP</literal> signal.
- */
-#if (defined (__i386__) || defined (__x86_64__)) && defined (__GNUC__) && __GNUC__ >= 2
-#  define G_BREAKPOINT()        G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END
-#elif (defined (_MSC_VER) || defined (__DMC__)) && defined (_M_IX86)
-#  define G_BREAKPOINT()        G_STMT_START{ __asm int 3h }G_STMT_END
-#elif defined (_MSC_VER)
-#  define G_BREAKPOINT()        G_STMT_START{ __debugbreak(); }G_STMT_END
-#elif defined (__alpha__) && !defined(__osf__) && defined (__GNUC__) && __GNUC__ >= 2
-#  define G_BREAKPOINT()        G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END
-#else   /* !__i386__ && !__alpha__ */
-#  define G_BREAKPOINT()        G_STMT_START{ raise (SIGTRAP); }G_STMT_END
-#endif  /* __i386__ */
-
-G_END_DECLS
-
-#endif /* __G_BACKTRACE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gbase64.h b/GstreamerHelper/x64/include/glib-2.0/glib/gbase64.h
deleted file mode 100644
index 88ce6d8a..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gbase64.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* gbase64.h - Base64 coding functions
- *
- *  Copyright (C) 2005  Alexander Larsson <alexl@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BASE64_H__
-#define __G_BASE64_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gsize   g_base64_encode_step    (const guchar *in,
-                                 gsize         len,
-                                 gboolean      break_lines,
-                                 gchar        *out,
-                                 gint         *state,
-                                 gint         *save);
-gsize   g_base64_encode_close   (gboolean      break_lines,
-                                 gchar        *out,
-                                 gint         *state,
-                                 gint         *save);
-gchar*  g_base64_encode         (const guchar *data,
-                                 gsize         len) G_GNUC_MALLOC;
-gsize   g_base64_decode_step    (const gchar  *in,
-                                 gsize         len,
-                                 guchar       *out,
-                                 gint         *state,
-                                 guint        *save);
-guchar *g_base64_decode         (const gchar  *text,
-                                 gsize        *out_len) G_GNUC_MALLOC;
-guchar *g_base64_decode_inplace (gchar        *text,
-                                 gsize        *out_len);
-
-
-G_END_DECLS
-
-#endif /* __G_BASE64_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gbitlock.h b/GstreamerHelper/x64/include/glib-2.0/glib/gbitlock.h
deleted file mode 100644
index 641ee696..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gbitlock.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright © 2008 Ryan Lortie
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_BITLOCK_H__
-#define __G_BITLOCK_H__
-
-#include <glib/gtypes.h>
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-G_BEGIN_DECLS
-
-void      g_bit_lock                      (volatile gint *address,
-                                           gint           lock_bit);
-gboolean  g_bit_trylock                   (volatile gint *address,
-                                           gint           lock_bit);
-void      g_bit_unlock                    (volatile gint *address,
-                                           gint           lock_bit);
-
-void      g_pointer_bit_lock              (volatile void *address,
-                                           gint           lock_bit);
-gboolean  g_pointer_bit_trylock           (volatile void *address,
-                                           gint           lock_bit);
-void      g_pointer_bit_unlock            (volatile void *address,
-                                           gint           lock_bit);
-
-#ifdef __GNUC__
-
-#define g_pointer_bit_lock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_lock ((address), (lock_bit));                              \
-  }))
-
-#define g_pointer_bit_trylock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_trylock ((address), (lock_bit));                           \
-  }))
-
-#define g_pointer_bit_unlock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_unlock ((address), (lock_bit));                            \
-  }))
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_BITLOCK_H_ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gbookmarkfile.h b/GstreamerHelper/x64/include/glib-2.0/glib/gbookmarkfile.h
deleted file mode 100644
index 6b2ee6f4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gbookmarkfile.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* gbookmarkfile.h: parsing and building desktop bookmarks
- *
- * Copyright (C) 2005-2006 Emmanuele Bassi
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BOOKMARK_FILE_H__
-#define __G_BOOKMARK_FILE_H__
-
-#include <glib/gerror.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_BOOKMARK_FILE_ERROR:
- *
- * Error domain for bookmark file parsing.
- * Errors in this domain will be from the #GBookmarkFileError
- * enumeration. See #GError for information on error domains.
- */
-#define G_BOOKMARK_FILE_ERROR	(g_bookmark_file_error_quark ())
-
-
-/**
- * GBookmarkFileError:
- * @G_BOOKMARK_FILE_ERROR_INVALID_URI: URI was ill-formed
- * @G_BOOKMARK_FILE_ERROR_INVALID_VALUE: a requested field was not found
- * @G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED: a requested application did
- *     not register a bookmark
- * @G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND: a requested URI was not found
- * @G_BOOKMARK_FILE_ERROR_READ: document was ill formed
- * @G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING: the text being parsed was
- *     in an unknown encoding
- * @G_BOOKMARK_FILE_ERROR_WRITE: an error occurred while writing
- * @G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND: requested file was not found
- *
- * Error codes returned by bookmark file parsing.
- */
-typedef enum
-{
-  G_BOOKMARK_FILE_ERROR_INVALID_URI,
-  G_BOOKMARK_FILE_ERROR_INVALID_VALUE,
-  G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED,
-  G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-  G_BOOKMARK_FILE_ERROR_READ,
-  G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING,
-  G_BOOKMARK_FILE_ERROR_WRITE,
-  G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND
-} GBookmarkFileError;
-
-GQuark g_bookmark_file_error_quark (void);
-
-/**
- * GBookmarkFile:
- *
- * The <structname>GBookmarkFile</structname> struct contains only
- * private data and should not be directly accessed.
- */
-typedef struct _GBookmarkFile GBookmarkFile;
-
-GBookmarkFile *g_bookmark_file_new                 (void);
-void           g_bookmark_file_free                (GBookmarkFile  *bookmark);
-
-gboolean       g_bookmark_file_load_from_file      (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data      (GBookmarkFile  *bookmark,
-						    const gchar    *data,
-						    gsize           length,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data_dirs (GBookmarkFile  *bookmark,
-						    const gchar    *file,
-						    gchar         **full_path,
-						    GError        **error);
-gchar *        g_bookmark_file_to_data             (GBookmarkFile  *bookmark,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_to_file             (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-
-void           g_bookmark_file_set_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *title);
-gchar *        g_bookmark_file_get_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *description);
-gchar *        g_bookmark_file_get_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *mime_type);
-gchar *        g_bookmark_file_get_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar   **groups,
-						    gsize           length);
-void           g_bookmark_file_add_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group);
-gboolean       g_bookmark_file_has_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gchar **       g_bookmark_file_get_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_add_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec);
-gboolean       g_bookmark_file_has_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gchar **       g_bookmark_file_get_applications    (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_set_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec,
-						    gint            count,
-						    time_t          stamp,
-						    GError        **error);
-gboolean       g_bookmark_file_get_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    gchar         **exec,
-						    guint          *count,
-						    time_t         *stamp,
-						    GError        **error);
-void           g_bookmark_file_set_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gboolean        is_private);
-gboolean       g_bookmark_file_get_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *href,
-						    const gchar    *mime_type);
-gboolean       g_bookmark_file_get_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gchar         **href,
-						    gchar         **mime_type,
-						    GError        **error);
-void           g_bookmark_file_set_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          added);
-time_t         g_bookmark_file_get_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          modified);
-time_t         g_bookmark_file_get_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          visited);
-time_t         g_bookmark_file_get_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri, 
-						    GError        **error);
-gboolean       g_bookmark_file_has_item            (GBookmarkFile  *bookmark,
-						    const gchar    *uri);
-gint           g_bookmark_file_get_size            (GBookmarkFile  *bookmark);
-gchar **       g_bookmark_file_get_uris            (GBookmarkFile  *bookmark,
-						    gsize          *length) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_remove_group        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_application  (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_item         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-gboolean       g_bookmark_file_move_item           (GBookmarkFile  *bookmark,
-						    const gchar    *old_uri,
-						    const gchar    *new_uri,
-						    GError        **error);
-
-G_END_DECLS
-
-#endif /* __G_BOOKMARK_FILE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gbytes.h b/GstreamerHelper/x64/include/glib-2.0/glib/gbytes.h
deleted file mode 100644
index de3c8f80..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gbytes.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- * Copyright © 2011 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- *         Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BYTES_H__
-#define __G_BYTES_H__
-
-#include <glib/gtypes.h>
-#include <glib/garray.h>
-
-G_BEGIN_DECLS
-
-GBytes *        g_bytes_new                     (gconstpointer   data,
-                                                 gsize           size);
-
-GBytes *        g_bytes_new_take                (gpointer        data,
-                                                 gsize           size);
-
-GBytes *        g_bytes_new_static              (gconstpointer   data,
-                                                 gsize           size);
-
-GBytes *        g_bytes_new_with_free_func      (gconstpointer   data,
-                                                 gsize           size,
-                                                 GDestroyNotify  free_func,
-                                                 gpointer        user_data);
-
-GBytes *        g_bytes_new_from_bytes          (GBytes         *bytes,
-                                                 gsize           offset,
-                                                 gsize           length);
-
-gconstpointer   g_bytes_get_data                (GBytes         *bytes,
-                                                 gsize          *size);
-
-gsize           g_bytes_get_size                (GBytes         *bytes);
-
-GBytes *        g_bytes_ref                     (GBytes         *bytes);
-
-void            g_bytes_unref                   (GBytes         *bytes);
-
-gpointer        g_bytes_unref_to_data           (GBytes         *bytes,
-                                                 gsize          *size);
-
-GByteArray *    g_bytes_unref_to_array          (GBytes         *bytes);
-
-guint           g_bytes_hash                    (gconstpointer   bytes);
-
-gboolean        g_bytes_equal                   (gconstpointer   bytes1,
-                                                 gconstpointer   bytes2);
-
-gint            g_bytes_compare                 (gconstpointer   bytes1,
-                                                 gconstpointer   bytes2);
-
-G_END_DECLS
-
-#endif /* __G_BYTES_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gcharset.h b/GstreamerHelper/x64/include/glib-2.0/glib/gcharset.h
deleted file mode 100644
index 9b56524c..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gcharset.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* gcharset.h - Charset functions
- *
- *  Copyright (C) 2011 Red Hat, Inc.
- *
- * The GLib Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The GLib Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CHARSET_H__
-#define __G_CHARSET_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gboolean              g_get_charset         (const char **charset);
-gchar *               g_get_codeset         (void);
-
-const gchar * const * g_get_language_names  (void);
-gchar **              g_get_locale_variants (const gchar *locale);
-
-G_END_DECLS
-
-#endif  /* __G_CHARSET_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gchecksum.h b/GstreamerHelper/x64/include/glib-2.0/glib/gchecksum.h
deleted file mode 100644
index b0621f24..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gchecksum.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* gchecksum.h - data hashing functions
- *
- * Copyright (C) 2007  Emmanuele Bassi  <ebassi@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CHECKSUM_H__
-#define __G_CHECKSUM_H__
-
-#include <glib/gtypes.h>
-#include <glib/gbytes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GChecksumType:
- * @G_CHECKSUM_MD5: Use the MD5 hashing algorithm
- * @G_CHECKSUM_SHA1: Use the SHA-1 hashing algorithm
- * @G_CHECKSUM_SHA256: Use the SHA-256 hashing algorithm
- *
- * The hashing algorithm to be used by #GChecksum when performing the
- * digest of some data.
- *
- * Note that the #GChecksumType enumeration may be extended at a later
- * date to include new hashing algorithm types.
- *
- * Since: 2.16
- */
-typedef enum {
-  G_CHECKSUM_MD5,
-  G_CHECKSUM_SHA1,
-  G_CHECKSUM_SHA256
-} GChecksumType;
-
-/**
- * GChecksum:
- *
- * An opaque structure representing a checksumming operation.
- * To create a new GChecksum, use g_checksum_new(). To free
- * a GChecksum, use g_checksum_free().
- *
- * Since: 2.16
- */
-typedef struct _GChecksum       GChecksum;
-
-gssize                g_checksum_type_get_length    (GChecksumType    checksum_type);
-
-GChecksum *           g_checksum_new                (GChecksumType    checksum_type);
-void                  g_checksum_reset              (GChecksum       *checksum);
-GChecksum *           g_checksum_copy               (const GChecksum *checksum);
-void                  g_checksum_free               (GChecksum       *checksum);
-void                  g_checksum_update             (GChecksum       *checksum,
-                                                     const guchar    *data,
-                                                     gssize           length);
-const gchar *         g_checksum_get_string         (GChecksum       *checksum);
-void                  g_checksum_get_digest         (GChecksum       *checksum,
-                                                     guint8          *buffer,
-                                                     gsize           *digest_len);
-
-gchar                *g_compute_checksum_for_data   (GChecksumType    checksum_type,
-                                                     const guchar    *data,
-                                                     gsize            length);
-gchar                *g_compute_checksum_for_string (GChecksumType    checksum_type,
-                                                     const gchar     *str,
-                                                     gssize           length);
-
-GLIB_AVAILABLE_IN_2_34
-gchar                *g_compute_checksum_for_bytes  (GChecksumType    checksum_type,
-                                                     GBytes          *data);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gconvert.h b/GstreamerHelper/x64/include/glib-2.0/glib/gconvert.h
deleted file mode 100644
index 7fd16c84..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gconvert.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERT_H__
-#define __G_CONVERT_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-/**
- * GConvertError:
- * @G_CONVERT_ERROR_NO_CONVERSION: Conversion between the requested character
- *     sets is not supported.
- * @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion input.
- * @G_CONVERT_ERROR_FAILED: Conversion failed for some reason.
- * @G_CONVERT_ERROR_PARTIAL_INPUT: Partial character sequence at end of input.
- * @G_CONVERT_ERROR_BAD_URI: URI is invalid.
- * @G_CONVERT_ERROR_NOT_ABSOLUTE_PATH: Pathname is not an absolute path.
- *
- * Error codes returned by character set conversion routines.
- */
-typedef enum
-{
-  G_CONVERT_ERROR_NO_CONVERSION,
-  G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-  G_CONVERT_ERROR_FAILED,
-  G_CONVERT_ERROR_PARTIAL_INPUT,
-  G_CONVERT_ERROR_BAD_URI,
-  G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
-} GConvertError;
-
-/**
- * G_CONVERT_ERROR:
- *
- * Error domain for character set conversions. Errors in this domain will
- * be from the #GConvertError enumeration. See #GError for information on
- * error domains.
- */
-#define G_CONVERT_ERROR g_convert_error_quark()
-GQuark g_convert_error_quark (void);
-
-/**
- * GIconv:
- *
- * The <structname>GIConv</structname> struct wraps an
- * iconv() conversion descriptor. It contains private data
- * and should only be accessed using the following functions.
- */
-typedef struct _GIConv *GIConv;
-
-GIConv g_iconv_open   (const gchar  *to_codeset,
-		       const gchar  *from_codeset);
-gsize  g_iconv        (GIConv        converter,
-		       gchar       **inbuf,
-		       gsize        *inbytes_left,
-		       gchar       **outbuf,
-		       gsize        *outbytes_left);
-gint   g_iconv_close  (GIConv        converter);
-
-
-gchar* g_convert               (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-gchar* g_convert_with_iconv    (const gchar  *str,
-				gssize        len,
-				GIConv        converter,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-gchar* g_convert_with_fallback (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				const gchar  *fallback,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-
-
-/* Convert between libc's idea of strings and UTF-8.
- */
-gchar* g_locale_to_utf8   (const gchar  *opsysstring,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-gchar* g_locale_from_utf8 (const gchar  *utf8string,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-
-/* Convert between the operating system (or C runtime)
- * representation of file names and UTF-8.
- */
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_filename_to_utf8 g_filename_to_utf8_utf8
-#define g_filename_from_utf8 g_filename_from_utf8_utf8
-#define g_filename_from_uri g_filename_from_uri_utf8
-#define g_filename_to_uri g_filename_to_uri_utf8 
-#endif
-#endif
-
-gchar* g_filename_to_utf8   (const gchar  *opsysstring,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-gchar* g_filename_from_utf8 (const gchar  *utf8string,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-
-gchar *g_filename_from_uri (const gchar *uri,
-			    gchar      **hostname,
-			    GError     **error) G_GNUC_MALLOC;
-  
-gchar *g_filename_to_uri   (const gchar *filename,
-			    const gchar *hostname,
-			    GError     **error) G_GNUC_MALLOC;
-gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
-gboolean g_get_filename_charsets (const gchar ***charsets);
-
-gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;
-
-gchar **g_uri_list_extract_uris (const gchar *uri_list) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_CONVERT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gdataset.h b/GstreamerHelper/x64/include/glib-2.0/glib/gdataset.h
deleted file mode 100644
index a93f6ae9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gdataset.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATASET_H__
-#define __G_DATASET_H__
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GData           GData;
-
-typedef void            (*GDataForeachFunc)     (GQuark         key_id,
-                                                 gpointer       data,
-                                                 gpointer       user_data);
-
-/* Keyed Data List
- */
-void     g_datalist_init                (GData            **datalist);
-void     g_datalist_clear               (GData            **datalist);
-gpointer g_datalist_id_get_data         (GData            **datalist,
-					 GQuark             key_id);
-void     g_datalist_id_set_data_full    (GData            **datalist,
-					 GQuark             key_id,
-					 gpointer           data,
-					 GDestroyNotify     destroy_func);
-
-typedef gpointer (*GDuplicateFunc) (gpointer data, gpointer user_data);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer g_datalist_id_dup_data         (GData            **datalist,
-                                         GQuark             key_id,
-                                         GDuplicateFunc     dup_func,
-					 gpointer           user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_datalist_id_replace_data     (GData            **datalist,
-                                         GQuark             key_id,
-                                         gpointer           oldval,
-                                         gpointer           newval,
-                                         GDestroyNotify     destroy,
-					 GDestroyNotify    *old_destroy);
-
-gpointer g_datalist_id_remove_no_notify (GData            **datalist,
-					 GQuark             key_id);
-void     g_datalist_foreach             (GData            **datalist,
-					 GDataForeachFunc   func,
-					 gpointer           user_data);
-
-/**
- * G_DATALIST_FLAGS_MASK:
- *
- * A bitmask that restricts the possible flags passed to
- * g_datalist_set_flags(). Passing a flags value where
- * flags & ~G_DATALIST_FLAGS_MASK != 0 is an error.
- */
-#define G_DATALIST_FLAGS_MASK 0x3
-
-void     g_datalist_set_flags           (GData            **datalist,
-					 guint              flags);
-void     g_datalist_unset_flags         (GData            **datalist,
-					 guint              flags);
-guint    g_datalist_get_flags           (GData            **datalist);
-
-#define   g_datalist_id_set_data(dl, q, d)      \
-     g_datalist_id_set_data_full ((dl), (q), (d), NULL)
-#define   g_datalist_id_remove_data(dl, q)      \
-     g_datalist_id_set_data ((dl), (q), NULL)
-#define   g_datalist_set_data_full(dl, k, d, f) \
-     g_datalist_id_set_data_full ((dl), g_quark_from_string (k), (d), (f))
-#define   g_datalist_remove_no_notify(dl, k)    \
-     g_datalist_id_remove_no_notify ((dl), g_quark_try_string (k))
-#define   g_datalist_set_data(dl, k, d)         \
-     g_datalist_set_data_full ((dl), (k), (d), NULL)
-#define   g_datalist_remove_data(dl, k)         \
-     g_datalist_id_set_data ((dl), g_quark_try_string (k), NULL)
-
-/* Location Associated Keyed Data
- */
-void      g_dataset_destroy             (gconstpointer    dataset_location);
-gpointer  g_dataset_id_get_data         (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-gpointer  g_datalist_get_data            (GData	 **datalist,
-					  const gchar *key);
-void      g_dataset_id_set_data_full    (gconstpointer    dataset_location,
-                                         GQuark           key_id,
-                                         gpointer         data,
-                                         GDestroyNotify   destroy_func);
-gpointer  g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-void      g_dataset_foreach             (gconstpointer    dataset_location,
-                                         GDataForeachFunc func,
-                                         gpointer         user_data);
-#define   g_dataset_id_set_data(l, k, d)        \
-     g_dataset_id_set_data_full ((l), (k), (d), NULL)
-#define   g_dataset_id_remove_data(l, k)        \
-     g_dataset_id_set_data ((l), (k), NULL)
-#define   g_dataset_get_data(l, k)              \
-     (g_dataset_id_get_data ((l), g_quark_try_string (k)))
-#define   g_dataset_set_data_full(l, k, d, f)   \
-     g_dataset_id_set_data_full ((l), g_quark_from_string (k), (d), (f))
-#define   g_dataset_remove_no_notify(l, k)      \
-     g_dataset_id_remove_no_notify ((l), g_quark_try_string (k))
-#define   g_dataset_set_data(l, k, d)           \
-     g_dataset_set_data_full ((l), (k), (d), NULL)
-#define   g_dataset_remove_data(l, k)           \
-     g_dataset_id_set_data ((l), g_quark_try_string (k), NULL)
-
-G_END_DECLS
-
-#endif /* __G_DATASET_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gdate.h b/GstreamerHelper/x64/include/glib-2.0/glib/gdate.h
deleted file mode 100644
index 5ef1850b..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gdate.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATE_H__
-#define __G_DATE_H__
-
-#include <time.h>
-
-#include <glib/gtypes.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/* GDate
- *
- * Date calculations (not time for now, to be resolved). These are a
- * mutant combination of Steffen Beyer's DateCalc routines
- * (http://www.perl.com/CPAN/authors/id/STBEY/) and Jon Trowbridge's
- * date routines (written for in-house software).  Written by Havoc
- * Pennington <hp@pobox.com>
- */
-
-typedef gint32  GTime;
-typedef guint16 GDateYear;
-typedef guint8  GDateDay;   /* day of the month */
-typedef struct _GDate GDate;
-
-/* enum used to specify order of appearance in parsed date strings */
-typedef enum
-{
-  G_DATE_DAY   = 0,
-  G_DATE_MONTH = 1,
-  G_DATE_YEAR  = 2
-} GDateDMY;
-
-/* actual week and month values */
-typedef enum
-{
-  G_DATE_BAD_WEEKDAY  = 0,
-  G_DATE_MONDAY       = 1,
-  G_DATE_TUESDAY      = 2,
-  G_DATE_WEDNESDAY    = 3,
-  G_DATE_THURSDAY     = 4,
-  G_DATE_FRIDAY       = 5,
-  G_DATE_SATURDAY     = 6,
-  G_DATE_SUNDAY       = 7
-} GDateWeekday;
-typedef enum
-{
-  G_DATE_BAD_MONTH = 0,
-  G_DATE_JANUARY   = 1,
-  G_DATE_FEBRUARY  = 2,
-  G_DATE_MARCH     = 3,
-  G_DATE_APRIL     = 4,
-  G_DATE_MAY       = 5,
-  G_DATE_JUNE      = 6,
-  G_DATE_JULY      = 7,
-  G_DATE_AUGUST    = 8,
-  G_DATE_SEPTEMBER = 9,
-  G_DATE_OCTOBER   = 10,
-  G_DATE_NOVEMBER  = 11,
-  G_DATE_DECEMBER  = 12
-} GDateMonth;
-
-#define G_DATE_BAD_JULIAN 0U
-#define G_DATE_BAD_DAY    0U
-#define G_DATE_BAD_YEAR   0U
-
-/* Note: directly manipulating structs is generally a bad idea, but
- * in this case it's an *incredibly* bad idea, because all or part
- * of this struct can be invalid at any given time. Use the functions,
- * or you will get hosed, I promise.
- */
-struct _GDate
-{
-  guint julian_days : 32; /* julian days representation - we use a
-                           *  bitfield hoping that 64 bit platforms
-                           *  will pack this whole struct in one big
-                           *  int
-                           */
-
-  guint julian : 1;    /* julian is valid */
-  guint dmy    : 1;    /* dmy is valid */
-
-  /* DMY representation */
-  guint day    : 6;
-  guint month  : 4;
-  guint year   : 16;
-};
-
-/* g_date_new() returns an invalid date, you then have to _set() stuff
- * to get a usable object. You can also allocate a GDate statically,
- * then call g_date_clear() to initialize.
- */
-GDate*       g_date_new                   (void);
-GDate*       g_date_new_dmy               (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year);
-GDate*       g_date_new_julian            (guint32      julian_day);
-void         g_date_free                  (GDate       *date);
-
-/* check g_date_valid() after doing an operation that might fail, like
- * _parse.  Almost all g_date operations are undefined on invalid
- * dates (the exceptions are the mutators, since you need those to
- * return to validity).
- */
-gboolean     g_date_valid                 (const GDate *date);
-gboolean     g_date_valid_day             (GDateDay     day) G_GNUC_CONST;
-gboolean     g_date_valid_month           (GDateMonth month) G_GNUC_CONST;
-gboolean     g_date_valid_year            (GDateYear  year) G_GNUC_CONST;
-gboolean     g_date_valid_weekday         (GDateWeekday weekday) G_GNUC_CONST;
-gboolean     g_date_valid_julian          (guint32 julian_date) G_GNUC_CONST;
-gboolean     g_date_valid_dmy             (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-
-GDateWeekday g_date_get_weekday           (const GDate *date);
-GDateMonth   g_date_get_month             (const GDate *date);
-GDateYear    g_date_get_year              (const GDate *date);
-GDateDay     g_date_get_day               (const GDate *date);
-guint32      g_date_get_julian            (const GDate *date);
-guint        g_date_get_day_of_year       (const GDate *date);
-/* First monday/sunday is the start of week 1; if we haven't reached
- * that day, return 0. These are not ISO weeks of the year; that
- * routine needs to be added.
- * these functions return the number of weeks, starting on the
- * corrsponding day
- */
-guint        g_date_get_monday_week_of_year (const GDate *date);
-guint        g_date_get_sunday_week_of_year (const GDate *date);
-guint        g_date_get_iso8601_week_of_year (const GDate *date);
-
-/* If you create a static date struct you need to clear it to get it
- * in a sane state before use. You can clear a whole array at
- * once with the ndates argument.
- */
-void         g_date_clear                 (GDate       *date,
-                                           guint        n_dates);
-
-/* The parse routine is meant for dates typed in by a user, so it
- * permits many formats but tries to catch common typos. If your data
- * needs to be strictly validated, it is not an appropriate function.
- */
-void         g_date_set_parse             (GDate       *date,
-                                           const gchar *str);
-void         g_date_set_time_t            (GDate       *date,
-					   time_t       timet);
-void         g_date_set_time_val          (GDate       *date,
-					   GTimeVal    *timeval);
-#ifndef G_DISABLE_DEPRECATED
-GLIB_DEPRECATED_FOR(g_date_set_time_t)
-void         g_date_set_time              (GDate       *date,
-                                           GTime        time_);
-#endif
-void         g_date_set_month             (GDate       *date,
-                                           GDateMonth   month);
-void         g_date_set_day               (GDate       *date,
-                                           GDateDay     day);
-void         g_date_set_year              (GDate       *date,
-                                           GDateYear    year);
-void         g_date_set_dmy               (GDate       *date,
-                                           GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    y);
-void         g_date_set_julian            (GDate       *date,
-                                           guint32      julian_date);
-gboolean     g_date_is_first_of_month     (const GDate *date);
-gboolean     g_date_is_last_of_month      (const GDate *date);
-
-/* To go forward by some number of weeks just go forward weeks*7 days */
-void         g_date_add_days              (GDate       *date,
-                                           guint        n_days);
-void         g_date_subtract_days         (GDate       *date,
-                                           guint        n_days);
-
-/* If you add/sub months while day > 28, the day might change */
-void         g_date_add_months            (GDate       *date,
-                                           guint        n_months);
-void         g_date_subtract_months       (GDate       *date,
-                                           guint        n_months);
-
-/* If it's feb 29, changing years can move you to the 28th */
-void         g_date_add_years             (GDate       *date,
-                                           guint        n_years);
-void         g_date_subtract_years        (GDate       *date,
-                                           guint        n_years);
-gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_days_in_month     (GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_sunday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-
-/* Returns the number of days between the two dates.  If date2 comes
-   before date1, a negative value is return. */
-gint         g_date_days_between          (const GDate *date1,
-					   const GDate *date2);
-
-/* qsort-friendly (with a cast...) */
-gint         g_date_compare               (const GDate *lhs,
-                                           const GDate *rhs);
-void         g_date_to_struct_tm          (const GDate *date,
-                                           struct tm   *tm);
-
-void         g_date_clamp                 (GDate *date,
-					   const GDate *min_date,
-					   const GDate *max_date);
-
-/* Swap date1 and date2's values if date1 > date2. */
-void         g_date_order                 (GDate *date1, GDate *date2);
-
-/* Just like strftime() except you can only use date-related formats.
- *   Using a time format is undefined.
- */
-gsize        g_date_strftime              (gchar       *s,
-                                           gsize        slen,
-                                           const gchar *format,
-                                           const GDate *date);
-
-#ifndef G_DISABLE_DEPRECATED
-
-#define g_date_weekday 			g_date_get_weekday
-#define g_date_month 			g_date_get_month
-#define g_date_year 			g_date_get_year
-#define g_date_day 			g_date_get_day
-#define g_date_julian 			g_date_get_julian
-#define g_date_day_of_year 		g_date_get_day_of_year
-#define g_date_monday_week_of_year 	g_date_get_monday_week_of_year
-#define g_date_sunday_week_of_year 	g_date_get_sunday_week_of_year
-#define g_date_days_in_month 		g_date_get_days_in_month
-#define g_date_monday_weeks_in_year 	g_date_get_monday_weeks_in_year
-#define g_date_sunday_weeks_in_year	g_date_get_sunday_weeks_in_year
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_DATE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gdatetime.h b/GstreamerHelper/x64/include/glib-2.0/glib/gdatetime.h
deleted file mode 100644
index 6643e3ff..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gdatetime.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2009-2010 Christian Hergert <chris@dronelabs.com>
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * licence, or (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA.
- *
- * Authors: Christian Hergert <chris@dronelabs.com>
- *          Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *          Emmanuele Bassi <ebassi@linux.intel.com>
- *          Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATE_TIME_H__
-#define __G_DATE_TIME_H__
-
-#include <glib/gtimezone.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TIME_SPAN_DAY:
- *
- * Evaluates to a time span of one day.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_DAY                 (G_GINT64_CONSTANT (86400000000))
-
-/**
- * G_TIME_SPAN_HOUR:
- *
- * Evaluates to a time span of one hour.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_HOUR                (G_GINT64_CONSTANT (3600000000))
-
-/**
- * G_TIME_SPAN_MINUTE:
- *
- * Evaluates to a time span of one minute.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_MINUTE              (G_GINT64_CONSTANT (60000000))
-
-/**
- * G_TIME_SPAN_SECOND:
- *
- * Evaluates to a time span of one second.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT (1000000))
-
-/**
- * G_TIME_SPAN_MILLISECOND:
- *
- * Evaluates to a time span of one millisecond.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_MILLISECOND         (G_GINT64_CONSTANT (1000))
-
-/**
- * GTimeSpan:
- *
- * A value representing an interval of time, in microseconds.
- *
- * Since: 2.26
- */
-typedef gint64 GTimeSpan;
-
-/**
- * GDateTime:
- *
- * <structname>GDateTime</structname> is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
-typedef struct _GDateTime GDateTime;
-
-void                    g_date_time_unref                               (GDateTime      *datetime);
-GDateTime *             g_date_time_ref                                 (GDateTime      *datetime);
-
-GDateTime *             g_date_time_new_now                             (GTimeZone      *tz);
-GDateTime *             g_date_time_new_now_local                       (void);
-GDateTime *             g_date_time_new_now_utc                         (void);
-
-GDateTime *             g_date_time_new_from_unix_local                 (gint64          t);
-GDateTime *             g_date_time_new_from_unix_utc                   (gint64          t);
-
-GDateTime *             g_date_time_new_from_timeval_local              (const GTimeVal *tv);
-GDateTime *             g_date_time_new_from_timeval_utc                (const GTimeVal *tv);
-
-GDateTime *             g_date_time_new                                 (GTimeZone      *tz,
-                                                                         gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-GDateTime *             g_date_time_new_local                           (gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-GDateTime *             g_date_time_new_utc                             (gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add                                 (GDateTime      *datetime,
-                                                                         GTimeSpan       timespan);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_years                           (GDateTime      *datetime,
-                                                                         gint            years);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_months                          (GDateTime      *datetime,
-                                                                         gint            months);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_weeks                           (GDateTime      *datetime,
-                                                                         gint            weeks);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_days                            (GDateTime      *datetime,
-                                                                         gint            days);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_hours                           (GDateTime      *datetime,
-                                                                         gint            hours);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_minutes                         (GDateTime      *datetime,
-                                                                         gint            minutes);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_seconds                         (GDateTime      *datetime,
-                                                                         gdouble         seconds);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_full                            (GDateTime      *datetime,
-                                                                         gint            years,
-                                                                         gint            months,
-                                                                         gint            days,
-                                                                         gint            hours,
-                                                                         gint            minutes,
-                                                                         gdouble         seconds);
-
-gint                    g_date_time_compare                             (gconstpointer   dt1,
-                                                                         gconstpointer   dt2);
-GTimeSpan               g_date_time_difference                          (GDateTime      *end,
-                                                                         GDateTime      *begin);
-guint                   g_date_time_hash                                (gconstpointer   datetime);
-gboolean                g_date_time_equal                               (gconstpointer   dt1,
-                                                                         gconstpointer   dt2);
-
-void                    g_date_time_get_ymd                             (GDateTime      *datetime,
-                                                                         gint           *year,
-                                                                         gint           *month,
-                                                                         gint           *day);
-
-gint                    g_date_time_get_year                            (GDateTime      *datetime);
-gint                    g_date_time_get_month                           (GDateTime      *datetime);
-gint                    g_date_time_get_day_of_month                    (GDateTime      *datetime);
-
-gint                    g_date_time_get_week_numbering_year             (GDateTime      *datetime);
-gint                    g_date_time_get_week_of_year                    (GDateTime      *datetime);
-gint                    g_date_time_get_day_of_week                     (GDateTime      *datetime);
-
-gint                    g_date_time_get_day_of_year                     (GDateTime      *datetime);
-
-gint                    g_date_time_get_hour                            (GDateTime      *datetime);
-gint                    g_date_time_get_minute                          (GDateTime      *datetime);
-gint                    g_date_time_get_second                          (GDateTime      *datetime);
-gint                    g_date_time_get_microsecond                     (GDateTime      *datetime);
-gdouble                 g_date_time_get_seconds                         (GDateTime      *datetime);
-
-gint64                  g_date_time_to_unix                             (GDateTime      *datetime);
-gboolean                g_date_time_to_timeval                          (GDateTime      *datetime,
-                                                                         GTimeVal       *tv);
-
-GTimeSpan               g_date_time_get_utc_offset                      (GDateTime      *datetime);
-const gchar *           g_date_time_get_timezone_abbreviation           (GDateTime      *datetime);
-gboolean                g_date_time_is_daylight_savings                 (GDateTime      *datetime);
-
-GDateTime *             g_date_time_to_timezone                         (GDateTime      *datetime,
-                                                                         GTimeZone      *tz);
-GDateTime *             g_date_time_to_local                            (GDateTime      *datetime);
-GDateTime *             g_date_time_to_utc                              (GDateTime      *datetime);
-
-gchar *                 g_date_time_format                              (GDateTime      *datetime,
-                                                                         const gchar    *format) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_DATE_TIME_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gdir.h b/GstreamerHelper/x64/include/glib-2.0/glib/gdir.h
deleted file mode 100644
index 79b3038d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gdir.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * gdir.c: Simplified wrapper around the DIRENT functions.
- *
- * Copyright 2001 Hans Breuer
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DIR_H__
-#define __G_DIR_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GDir GDir;
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-/* For DLL ABI stability, keep old names for old (non-UTF-8) functionality. */
-#define g_dir_open g_dir_open_utf8
-#define g_dir_read_name g_dir_read_name_utf8
-#endif
-#endif
-
-GDir    *                g_dir_open           (const gchar  *path,
-					       guint         flags,
-					       GError      **error);
-const gchar *            g_dir_read_name      (GDir         *dir);
-void                     g_dir_rewind         (GDir         *dir);
-void                     g_dir_close          (GDir         *dir);
-
-G_END_DECLS
-
-#endif /* __G_DIR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/genviron.h b/GstreamerHelper/x64/include/glib-2.0/glib/genviron.h
deleted file mode 100644
index c75c5482..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/genviron.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ENVIRON_H__
-#define __G_ENVIRON_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_getenv g_getenv_utf8
-#define g_setenv g_setenv_utf8
-#define g_unsetenv g_unsetenv_utf8
-#endif
-#endif
-
-const gchar * g_getenv           (const gchar  *variable);
-gboolean      g_setenv           (const gchar  *variable,
-                                  const gchar  *value,
-                                  gboolean      overwrite);
-void          g_unsetenv         (const gchar  *variable);
-gchar **      g_listenv          (void);
-
-gchar **      g_get_environ      (void);
-const gchar * g_environ_getenv   (gchar       **envp,
-                                  const gchar  *variable);
-gchar **      g_environ_setenv   (gchar       **envp,
-                                  const gchar  *variable,
-                                  const gchar  *value,
-                                  gboolean      overwrite) G_GNUC_WARN_UNUSED_RESULT;
-gchar **      g_environ_unsetenv (gchar       **envp,
-                                  const gchar  *variable) G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS
-
-#endif /* __G_ENVIRON_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gerror.h b/GstreamerHelper/x64/include/glib-2.0/glib/gerror.h
deleted file mode 100644
index 6eb65fee..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gerror.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* gerror.h - Error reporting system
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ERROR_H__
-#define __G_ERROR_H__
-
-#include <stdarg.h>
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/**
- * GError:
- * @domain: error domain, e.g. #G_FILE_ERROR
- * @code: error code, e.g. %G_FILE_ERROR_NOENT
- * @message: human-readable informative error message
- *
- * The <structname>GError</structname> structure contains
- * information about an error that has occurred.
- */
-typedef struct _GError GError;
-
-struct _GError
-{
-  GQuark       domain;
-  gint         code;
-  gchar       *message;
-};
-
-GError*  g_error_new           (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (3, 4);
-
-GError*  g_error_new_literal   (GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-GError*  g_error_new_valist    (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                va_list        args);
-
-void     g_error_free          (GError        *error);
-GError*  g_error_copy          (const GError  *error);
-
-gboolean g_error_matches       (const GError  *error,
-                                GQuark         domain,
-                                gint           code);
-
-/* if (err) *err = g_error_new(domain, code, format, ...), also has
- * some sanity checks.
- */
-void     g_set_error           (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (4, 5);
-
-void     g_set_error_literal   (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-
-/* if (dest) *dest = src; also has some sanity checks.
- */
-void     g_propagate_error     (GError       **dest,
-				GError        *src);
-
-/* if (err && *err) { g_error_free(*err); *err = NULL; } */
-void     g_clear_error         (GError       **err);
-
-/* if (err) prefix the formatted string to the ->message */
-void     g_prefix_error               (GError       **err,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (2, 3);
-
-/* g_propagate_error then g_error_prefix on dest */
-void     g_propagate_prefixed_error   (GError       **dest,
-                                       GError        *src,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (3, 4);
-
-G_END_DECLS
-
-#endif /* __G_ERROR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gfileutils.h b/GstreamerHelper/x64/include/glib-2.0/glib/gfileutils.h
deleted file mode 100644
index 7c2eb1dd..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gfileutils.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* gfileutils.h - File utility functions
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_FILEUTILS_H__
-#define __G_FILEUTILS_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_FILE_ERROR g_file_error_quark ()
-
-typedef enum
-{
-  G_FILE_ERROR_EXIST,
-  G_FILE_ERROR_ISDIR,
-  G_FILE_ERROR_ACCES,
-  G_FILE_ERROR_NAMETOOLONG,
-  G_FILE_ERROR_NOENT,
-  G_FILE_ERROR_NOTDIR,
-  G_FILE_ERROR_NXIO,
-  G_FILE_ERROR_NODEV,
-  G_FILE_ERROR_ROFS,
-  G_FILE_ERROR_TXTBSY,
-  G_FILE_ERROR_FAULT,
-  G_FILE_ERROR_LOOP,
-  G_FILE_ERROR_NOSPC,
-  G_FILE_ERROR_NOMEM,
-  G_FILE_ERROR_MFILE,
-  G_FILE_ERROR_NFILE,
-  G_FILE_ERROR_BADF,
-  G_FILE_ERROR_INVAL,
-  G_FILE_ERROR_PIPE,
-  G_FILE_ERROR_AGAIN,
-  G_FILE_ERROR_INTR,
-  G_FILE_ERROR_IO,
-  G_FILE_ERROR_PERM,
-  G_FILE_ERROR_NOSYS,
-  G_FILE_ERROR_FAILED
-} GFileError;
-
-/* For backward-compat reasons, these are synced to an old
- * anonymous enum in libgnome. But don't use that enum
- * in new code.
- */
-typedef enum
-{
-  G_FILE_TEST_IS_REGULAR    = 1 << 0,
-  G_FILE_TEST_IS_SYMLINK    = 1 << 1,
-  G_FILE_TEST_IS_DIR        = 1 << 2,
-  G_FILE_TEST_IS_EXECUTABLE = 1 << 3,
-  G_FILE_TEST_EXISTS        = 1 << 4
-} GFileTest;
-
-GQuark     g_file_error_quark      (void);
-/* So other code can generate a GFileError */
-GFileError g_file_error_from_errno (gint err_no);
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_file_test g_file_test_utf8
-#define g_file_get_contents g_file_get_contents_utf8
-#define g_mkstemp g_mkstemp_utf8
-#define g_file_open_tmp g_file_open_tmp_utf8
-#endif
-#endif
-
-gboolean g_file_test         (const gchar  *filename,
-                              GFileTest     test);
-gboolean g_file_get_contents (const gchar  *filename,
-                              gchar       **contents,
-                              gsize        *length,
-                              GError      **error);
-gboolean g_file_set_contents (const gchar *filename,
-                              const gchar *contents,
-                              gssize         length,
-                              GError       **error);
-gchar   *g_file_read_link    (const gchar  *filename,
-                              GError      **error);
-
-/* Wrapper / workalike for mkdtemp() */
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_mkdtemp            (gchar        *tmpl);
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_mkdtemp_full       (gchar        *tmpl,
-                               gint          mode);
-
-/* Wrapper / workalike for mkstemp() */
-gint     g_mkstemp            (gchar        *tmpl);
-gint     g_mkstemp_full       (gchar        *tmpl,
-                               gint          flags,
-                               gint          mode);
-
-/* Wrappers for g_mkstemp and g_mkdtemp() */
-gint     g_file_open_tmp      (const gchar  *tmpl,
-                               gchar       **name_used,
-                               GError      **error);
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_dir_make_tmp       (const gchar  *tmpl,
-                               GError      **error);
-
-gchar   *g_build_path         (const gchar *separator,
-                               const gchar *first_element,
-                               ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar   *g_build_pathv        (const gchar  *separator,
-                               gchar       **args) G_GNUC_MALLOC;
-
-gchar   *g_build_filename     (const gchar *first_element,
-                               ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar   *g_build_filenamev    (gchar      **args) G_GNUC_MALLOC;
-
-gint     g_mkdir_with_parents (const gchar *pathname,
-                               gint         mode);
-
-#ifdef G_OS_WIN32
-
-/* On Win32, the canonical directory separator is the backslash, and
- * the search path separator is the semicolon. Note that also the
- * (forward) slash works as directory separator.
- */
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-#else  /* !G_OS_WIN32 */
-
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-
-#endif /* !G_OS_WIN32 */
-
-gboolean     g_path_is_absolute (const gchar *file_name);
-const gchar *g_path_skip_root   (const gchar *file_name);
-
-GLIB_DEPRECATED_FOR(g_path_get_basename)
-const gchar *g_basename         (const gchar *file_name);
-#ifndef G_DISABLE_DEPRECATED
-#define g_dirname g_path_get_dirname
-#endif
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_get_current_dir g_get_current_dir_utf8
-#endif
-#endif
-
-gchar *g_get_current_dir   (void);
-gchar *g_path_get_basename (const gchar *file_name) G_GNUC_MALLOC;
-gchar *g_path_get_dirname  (const gchar *file_name) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_FILEUTILS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/ggettext.h b/GstreamerHelper/x64/include/glib-2.0/glib/ggettext.h
deleted file mode 100644
index 54bbaa8e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/ggettext.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_GETTEXT_H__
-#define __G_GETTEXT_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-const gchar *g_strip_context (const gchar *msgid,
-                              const gchar *msgval) G_GNUC_FORMAT(1);
-
-const gchar *g_dgettext      (const gchar *domain,
-                              const gchar *msgid) G_GNUC_FORMAT(2);
-const gchar *g_dcgettext     (const gchar *domain,
-                              const gchar *msgid,
-                              gint         category) G_GNUC_FORMAT(2);
-const gchar *g_dngettext     (const gchar *domain,
-                              const gchar *msgid,
-                              const gchar *msgid_plural,
-                              gulong       n) G_GNUC_FORMAT(3);
-const gchar *g_dpgettext     (const gchar *domain,
-                              const gchar *msgctxtid,
-                              gsize        msgidoffset) G_GNUC_FORMAT(2);
-const gchar *g_dpgettext2    (const gchar *domain,
-                              const gchar *context,
-                              const gchar *msgid) G_GNUC_FORMAT(3);
-
-G_END_DECLS
-
-#endif /* __G_GETTEXT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/ghash.h b/GstreamerHelper/x64/include/glib-2.0/glib/ghash.h
deleted file mode 100644
index 3eb89127..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/ghash.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HASH_H__
-#define __G_HASH_H__
-
-#include <glib/gtypes.h>
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GHashTable  GHashTable;
-
-typedef gboolean  (*GHRFunc)  (gpointer  key,
-                               gpointer  value,
-                               gpointer  user_data);
-
-typedef struct _GHashTableIter GHashTableIter;
-
-struct _GHashTableIter
-{
-  /*< private >*/
-  gpointer      dummy1;
-  gpointer      dummy2;
-  gpointer      dummy3;
-  int           dummy4;
-  gboolean      dummy5;
-  gpointer      dummy6;
-};
-
-GHashTable* g_hash_table_new               (GHashFunc       hash_func,
-                                            GEqualFunc      key_equal_func);
-GHashTable* g_hash_table_new_full          (GHashFunc       hash_func,
-                                            GEqualFunc      key_equal_func,
-                                            GDestroyNotify  key_destroy_func,
-                                            GDestroyNotify  value_destroy_func);
-void        g_hash_table_destroy           (GHashTable     *hash_table);
-void        g_hash_table_insert            (GHashTable     *hash_table,
-                                            gpointer        key,
-                                            gpointer        value);
-void        g_hash_table_replace           (GHashTable     *hash_table,
-                                            gpointer        key,
-                                            gpointer        value);
-void        g_hash_table_add               (GHashTable     *hash_table,
-                                            gpointer        key);
-gboolean    g_hash_table_remove            (GHashTable     *hash_table,
-                                            gconstpointer   key);
-void        g_hash_table_remove_all        (GHashTable     *hash_table);
-gboolean    g_hash_table_steal             (GHashTable     *hash_table,
-                                            gconstpointer   key);
-void        g_hash_table_steal_all         (GHashTable     *hash_table);
-gpointer    g_hash_table_lookup            (GHashTable     *hash_table,
-                                            gconstpointer   key);
-gboolean    g_hash_table_contains          (GHashTable     *hash_table,
-                                            gconstpointer   key);
-gboolean    g_hash_table_lookup_extended   (GHashTable     *hash_table,
-                                            gconstpointer   lookup_key,
-                                            gpointer       *orig_key,
-                                            gpointer       *value);
-void        g_hash_table_foreach           (GHashTable     *hash_table,
-                                            GHFunc          func,
-                                            gpointer        user_data);
-gpointer    g_hash_table_find              (GHashTable     *hash_table,
-                                            GHRFunc         predicate,
-                                            gpointer        user_data);
-guint       g_hash_table_foreach_remove    (GHashTable     *hash_table,
-                                            GHRFunc         func,
-                                            gpointer        user_data);
-guint       g_hash_table_foreach_steal     (GHashTable     *hash_table,
-                                            GHRFunc         func,
-                                            gpointer        user_data);
-guint       g_hash_table_size              (GHashTable     *hash_table);
-GList *     g_hash_table_get_keys          (GHashTable     *hash_table);
-GList *     g_hash_table_get_values        (GHashTable     *hash_table);
-
-void        g_hash_table_iter_init         (GHashTableIter *iter,
-                                            GHashTable     *hash_table);
-gboolean    g_hash_table_iter_next         (GHashTableIter *iter,
-                                            gpointer       *key,
-                                            gpointer       *value);
-GHashTable* g_hash_table_iter_get_hash_table (GHashTableIter *iter);
-void        g_hash_table_iter_remove       (GHashTableIter *iter);
-GLIB_AVAILABLE_IN_2_30
-void        g_hash_table_iter_replace      (GHashTableIter *iter,
-                                            gpointer        value);
-void        g_hash_table_iter_steal        (GHashTableIter *iter);
-
-GHashTable* g_hash_table_ref               (GHashTable     *hash_table);
-void        g_hash_table_unref             (GHashTable     *hash_table);
-
-#ifndef G_DISABLE_DEPRECATED
-#define g_hash_table_freeze(hash_table) ((void)0)
-#define g_hash_table_thaw(hash_table) ((void)0)
-#endif
-
-/* Hash Functions
- */
-gboolean g_str_equal    (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_str_hash     (gconstpointer  v);
-
-gboolean g_int_equal    (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_int_hash     (gconstpointer  v);
-
-gboolean g_int64_equal  (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_int64_hash   (gconstpointer  v);
-
-gboolean g_double_equal (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_double_hash  (gconstpointer  v);
-
-guint    g_direct_hash  (gconstpointer  v) G_GNUC_CONST;
-gboolean g_direct_equal (gconstpointer  v1,
-                         gconstpointer  v2) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_HASH_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/ghmac.h b/GstreamerHelper/x64/include/glib-2.0/glib/ghmac.h
deleted file mode 100644
index d03d71f3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/ghmac.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ghmac.h - secure data hashing
- *
- * Copyright (C) 2011  Stef Walter  <stefw@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HMAC_H__
-#define __G_HMAC_H__
-
-#include <glib/gtypes.h>
-#include "gchecksum.h"
-
-G_BEGIN_DECLS
-
-/**
- * GHmac:
- *
- * An opaque structure representing a HMAC operation.
- * To create a new GHmac, use g_hmac_new(). To free
- * a GHmac, use g_hmac_unref().
- *
- * Since: 2.30
- */
-typedef struct _GHmac       GHmac;
-
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_new                    (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len);
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_copy                   (const GHmac   *hmac);
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_ref                    (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_unref                  (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_update                 (GHmac         *hmac,
-                                                     const guchar  *data,
-                                                     gssize         length);
-GLIB_AVAILABLE_IN_2_30
-const gchar *         g_hmac_get_string             (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_get_digest             (GHmac         *hmac,
-                                                     guint8        *buffer,
-                                                     gsize         *digest_len);
-
-GLIB_AVAILABLE_IN_2_30
-gchar                *g_compute_hmac_for_data       (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len,
-                                                     const guchar  *data,
-                                                     gsize          length);
-GLIB_AVAILABLE_IN_2_30
-gchar                *g_compute_hmac_for_string     (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len,
-                                                     const gchar   *str,
-                                                     gssize         length);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/ghook.h b/GstreamerHelper/x64/include/glib-2.0/glib/ghook.h
deleted file mode 100644
index e7292ead..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/ghook.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HOOK_H__
-#define __G_HOOK_H__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GHook		GHook;
-typedef struct _GHookList	GHookList;
-
-typedef gint		(*GHookCompareFunc)	(GHook		*new_hook,
-						 GHook		*sibling);
-typedef gboolean	(*GHookFindFunc)	(GHook		*hook,
-						 gpointer	 data);
-typedef void		(*GHookMarshaller)	(GHook		*hook,
-						 gpointer	 marshal_data);
-typedef gboolean	(*GHookCheckMarshaller)	(GHook		*hook,
-						 gpointer	 marshal_data);
-typedef void		(*GHookFunc)		(gpointer	 data);
-typedef gboolean	(*GHookCheckFunc)	(gpointer	 data);
-typedef void		(*GHookFinalizeFunc)	(GHookList      *hook_list,
-						 GHook          *hook);
-typedef enum
-{
-  G_HOOK_FLAG_ACTIVE	    = 1 << 0,
-  G_HOOK_FLAG_IN_CALL	    = 1 << 1,
-  G_HOOK_FLAG_MASK	    = 0x0f
-} GHookFlagMask;
-#define G_HOOK_FLAG_USER_SHIFT	(4)
-
-
-/* --- structures --- */
-struct _GHookList
-{
-  gulong	    seq_id;
-  guint		    hook_size : 16;
-  guint		    is_setup : 1;
-  GHook		   *hooks;
-  gpointer	    dummy3;
-  GHookFinalizeFunc finalize_hook;
-  gpointer	    dummy[2];
-};
-struct _GHook
-{
-  gpointer	 data;
-  GHook		*next;
-  GHook		*prev;
-  guint		 ref_count;
-  gulong	 hook_id;
-  guint		 flags;
-  gpointer	 func;
-  GDestroyNotify destroy;
-};
-
-
-/* --- macros --- */
-#define	G_HOOK(hook)			((GHook*) (hook))
-#define	G_HOOK_FLAGS(hook)		(G_HOOK (hook)->flags)
-#define	G_HOOK_ACTIVE(hook)		((G_HOOK_FLAGS (hook) & \
-					  G_HOOK_FLAG_ACTIVE) != 0)
-#define	G_HOOK_IN_CALL(hook)		((G_HOOK_FLAGS (hook) & \
-					  G_HOOK_FLAG_IN_CALL) != 0)
-#define G_HOOK_IS_VALID(hook)		(G_HOOK (hook)->hook_id != 0 && \
-					 (G_HOOK_FLAGS (hook) & \
-                                          G_HOOK_FLAG_ACTIVE))
-#define G_HOOK_IS_UNLINKED(hook)	(G_HOOK (hook)->next == NULL && \
-					 G_HOOK (hook)->prev == NULL && \
-					 G_HOOK (hook)->hook_id == 0 && \
-					 G_HOOK (hook)->ref_count == 0)
-
-
-/* --- prototypes --- */
-/* callback maintenance functions */
-void	 g_hook_list_init		(GHookList		*hook_list,
-					 guint			 hook_size);
-void	 g_hook_list_clear		(GHookList		*hook_list);
-GHook*	 g_hook_alloc			(GHookList		*hook_list);
-void	 g_hook_free			(GHookList		*hook_list,
-					 GHook			*hook);
-GHook *	 g_hook_ref			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_unref			(GHookList		*hook_list,
-					 GHook			*hook);
-gboolean g_hook_destroy			(GHookList		*hook_list,
-					 gulong			 hook_id);
-void	 g_hook_destroy_link		(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_prepend			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_insert_before		(GHookList		*hook_list,
-					 GHook			*sibling,
-					 GHook			*hook);
-void	 g_hook_insert_sorted		(GHookList		*hook_list,
-					 GHook			*hook,
-					 GHookCompareFunc	 func);
-GHook*	 g_hook_get			(GHookList		*hook_list,
-					 gulong			 hook_id);
-GHook*	 g_hook_find			(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 GHookFindFunc		 func,
-					 gpointer		 data);
-GHook*	 g_hook_find_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 data);
-GHook*	 g_hook_find_func		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func);
-GHook*	 g_hook_find_func_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func,
-					 gpointer		 data);
-/* return the first valid hook, and increment its reference count */
-GHook*	 g_hook_first_valid		(GHookList		*hook_list,
-					 gboolean		 may_be_in_call);
-/* return the next valid hook with incremented reference count, and
- * decrement the reference count of the original hook
- */
-GHook*	 g_hook_next_valid		(GHookList		*hook_list,
-					 GHook			*hook,
-					 gboolean		 may_be_in_call);
-/* GHookCompareFunc implementation to insert hooks sorted by their id */
-gint	 g_hook_compare_ids		(GHook			*new_hook,
-					 GHook			*sibling);
-/* convenience macros */
-#define	 g_hook_append( hook_list, hook )  \
-     g_hook_insert_before ((hook_list), NULL, (hook))
-/* invoke all valid hooks with the (*GHookFunc) signature.
- */
-void	 g_hook_list_invoke		(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke all valid hooks with the (*GHookCheckFunc) signature,
- * and destroy the hook if FALSE is returned.
- */
-void	 g_hook_list_invoke_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke a marshaller on all valid hooks.
- */
-void	 g_hook_list_marshal		(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-void	 g_hook_list_marshal_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookCheckMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-
-G_END_DECLS
-
-#endif /* __G_HOOK_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/ghostutils.h b/GstreamerHelper/x64/include/glib-2.0/glib/ghostutils.h
deleted file mode 100644
index 0349da36..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/ghostutils.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HOST_UTILS_H__
-#define __G_HOST_UTILS_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gboolean  g_hostname_is_non_ascii     (const gchar *hostname);
-gboolean  g_hostname_is_ascii_encoded (const gchar *hostname);
-gboolean  g_hostname_is_ip_address    (const gchar *hostname);
-
-gchar    *g_hostname_to_ascii         (const gchar *hostname);
-gchar    *g_hostname_to_unicode       (const gchar *hostname);
-
-G_END_DECLS
-
-#endif /* __G_HOST_UTILS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gi18n-lib.h b/GstreamerHelper/x64/include/glib-2.0/glib/gi18n-lib.h
deleted file mode 100644
index ca002a72..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gi18n-lib.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_I18N_LIB_H__
-#define __G_I18N_LIB_H__
-
-#include <glib.h>
-
-#include <libintl.h>
-#include <string.h>
-
-#ifndef GETTEXT_PACKAGE
-#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.  Did you forget to include config.h?
-#endif
-
-#define  _(String) ((char *) g_dgettext (GETTEXT_PACKAGE, String))
-#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, 0)
-#define N_(String) (String)
-#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1)
-#define NC_(Context, String) (String)
-
-#endif  /* __G_I18N_LIB_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gi18n.h b/GstreamerHelper/x64/include/glib-2.0/glib/gi18n.h
deleted file mode 100644
index c710046e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gi18n.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_I18N_H__
-#define __G_I18N_H__
-
-#include <glib.h>
-
-#include <libintl.h>
-#include <string.h>
-
-#define  _(String) gettext (String)
-#define Q_(String) g_dpgettext (NULL, String, 0)
-#define N_(String) (String)
-#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
-#define NC_(Context, String) (String)
-
-#endif  /* __G_I18N_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/giochannel.h b/GstreamerHelper/x64/include/glib-2.0/glib/giochannel.h
deleted file mode 100644
index 8d3f2d7e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/giochannel.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_IOCHANNEL_H__
-#define __G_IOCHANNEL_H__
-
-#include <glib/gconvert.h>
-#include <glib/gmain.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-/* GIOChannel
- */
-
-typedef struct _GIOChannel	GIOChannel;
-typedef struct _GIOFuncs        GIOFuncs;
-
-typedef enum
-{
-  G_IO_ERROR_NONE,
-  G_IO_ERROR_AGAIN,
-  G_IO_ERROR_INVAL,
-  G_IO_ERROR_UNKNOWN
-} GIOError;
-
-#define G_IO_CHANNEL_ERROR g_io_channel_error_quark()
-
-typedef enum
-{
-  /* Derived from errno */
-  G_IO_CHANNEL_ERROR_FBIG,
-  G_IO_CHANNEL_ERROR_INVAL,
-  G_IO_CHANNEL_ERROR_IO,
-  G_IO_CHANNEL_ERROR_ISDIR,
-  G_IO_CHANNEL_ERROR_NOSPC,
-  G_IO_CHANNEL_ERROR_NXIO,
-  G_IO_CHANNEL_ERROR_OVERFLOW,
-  G_IO_CHANNEL_ERROR_PIPE,
-  /* Other */
-  G_IO_CHANNEL_ERROR_FAILED
-} GIOChannelError;
-
-typedef enum
-{
-  G_IO_STATUS_ERROR,
-  G_IO_STATUS_NORMAL,
-  G_IO_STATUS_EOF,
-  G_IO_STATUS_AGAIN
-} GIOStatus;
-
-typedef enum
-{
-  G_SEEK_CUR,
-  G_SEEK_SET,
-  G_SEEK_END
-} GSeekType;
-
-typedef enum /*< flags >*/
-{
-  G_IO_IN	GLIB_SYSDEF_POLLIN,
-  G_IO_OUT	GLIB_SYSDEF_POLLOUT,
-  G_IO_PRI	GLIB_SYSDEF_POLLPRI,
-  G_IO_ERR	GLIB_SYSDEF_POLLERR,
-  G_IO_HUP	GLIB_SYSDEF_POLLHUP,
-  G_IO_NVAL	GLIB_SYSDEF_POLLNVAL
-} GIOCondition;
-
-typedef enum
-{
-  G_IO_FLAG_APPEND = 1 << 0,
-  G_IO_FLAG_NONBLOCK = 1 << 1,
-  G_IO_FLAG_IS_READABLE = 1 << 2,	/* Read only flag */
-  G_IO_FLAG_IS_WRITABLE = 1 << 3,	/* Read only flag */
-  G_IO_FLAG_IS_SEEKABLE = 1 << 4,	/* Read only flag */
-  G_IO_FLAG_MASK = (1 << 5) - 1,
-  G_IO_FLAG_GET_MASK = G_IO_FLAG_MASK,
-  G_IO_FLAG_SET_MASK = G_IO_FLAG_APPEND | G_IO_FLAG_NONBLOCK
-} GIOFlags;
-
-/* Misspelling in enum in 2.29.10 and earlier */
-#define G_IO_FLAG_IS_WRITEABLE (G_IO_FLAG_IS_WRITABLE)
-
-struct _GIOChannel
-{
-  /*< private >*/
-  gint ref_count;
-  GIOFuncs *funcs;
-
-  gchar *encoding;
-  GIConv read_cd;
-  GIConv write_cd;
-  gchar *line_term;		/* String which indicates the end of a line of text */
-  guint line_term_len;		/* So we can have null in the line term */
-
-  gsize buf_size;
-  GString *read_buf;		/* Raw data from the channel */
-  GString *encoded_read_buf;    /* Channel data converted to UTF-8 */
-  GString *write_buf;		/* Data ready to be written to the file */
-  gchar partial_write_buf[6];	/* UTF-8 partial characters, null terminated */
-
-  /* Group the flags together, immediately after partial_write_buf, to save memory */
-
-  guint use_buffer     : 1;	/* The encoding uses the buffers */
-  guint do_encode      : 1;	/* The encoding uses the GIConv coverters */
-  guint close_on_unref : 1;	/* Close the channel on final unref */
-  guint is_readable    : 1;	/* Cached GIOFlag */
-  guint is_writeable   : 1;	/* ditto */
-  guint is_seekable    : 1;	/* ditto */
-
-  gpointer reserved1;	
-  gpointer reserved2;	
-};
-
-typedef gboolean (*GIOFunc) (GIOChannel   *source,
-			     GIOCondition  condition,
-			     gpointer      data);
-struct _GIOFuncs
-{
-  GIOStatus (*io_read)           (GIOChannel   *channel, 
-			          gchar        *buf, 
-				  gsize         count,
-				  gsize        *bytes_read,
-				  GError      **err);
-  GIOStatus (*io_write)          (GIOChannel   *channel, 
-				  const gchar  *buf, 
-				  gsize         count,
-				  gsize        *bytes_written,
-				  GError      **err);
-  GIOStatus (*io_seek)           (GIOChannel   *channel, 
-				  gint64        offset, 
-				  GSeekType     type,
-				  GError      **err);
-  GIOStatus  (*io_close)         (GIOChannel   *channel,
-				  GError      **err);
-  GSource*   (*io_create_watch)  (GIOChannel   *channel,
-				  GIOCondition  condition);
-  void       (*io_free)          (GIOChannel   *channel);
-  GIOStatus  (*io_set_flags)     (GIOChannel   *channel,
-                                  GIOFlags      flags,
-				  GError      **err);
-  GIOFlags   (*io_get_flags)     (GIOChannel   *channel);
-};
-
-void        g_io_channel_init   (GIOChannel    *channel);
-GIOChannel *g_io_channel_ref    (GIOChannel    *channel);
-void        g_io_channel_unref  (GIOChannel    *channel);
-
-GLIB_DEPRECATED_FOR(g_io_channel_read_for)
-GIOError    g_io_channel_read   (GIOChannel    *channel,
-                                 gchar         *buf,
-                                 gsize          count,
-                                 gsize         *bytes_read);
-
-GLIB_DEPRECATED_FOR(g_io_channel_write_chars)
-GIOError  g_io_channel_write    (GIOChannel    *channel,
-                                 const gchar   *buf,
-                                 gsize          count,
-                                 gsize         *bytes_written);
-
-GLIB_DEPRECATED_FOR(g_io_channel_seek_position)
-GIOError  g_io_channel_seek     (GIOChannel    *channel,
-                                 gint64         offset,
-                                 GSeekType      type);
-
-GLIB_DEPRECATED_FOR(g_io_channel_shutdown)
-void      g_io_channel_close    (GIOChannel    *channel);
-
-GIOStatus g_io_channel_shutdown (GIOChannel      *channel,
-				 gboolean         flush,
-				 GError         **err);
-guint     g_io_add_watch_full   (GIOChannel      *channel,
-				 gint             priority,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data,
-				 GDestroyNotify   notify);
-GSource * g_io_create_watch     (GIOChannel      *channel,
-				 GIOCondition     condition);
-guint     g_io_add_watch        (GIOChannel      *channel,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data);
-
-/* character encoding conversion involved functions.
- */
-
-void                  g_io_channel_set_buffer_size      (GIOChannel   *channel,
-							 gsize         size);
-gsize                 g_io_channel_get_buffer_size      (GIOChannel   *channel);
-GIOCondition          g_io_channel_get_buffer_condition (GIOChannel   *channel);
-GIOStatus             g_io_channel_set_flags            (GIOChannel   *channel,
-							 GIOFlags      flags,
-							 GError      **error);
-GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
-void                  g_io_channel_set_line_term        (GIOChannel   *channel,
-							 const gchar  *line_term,
-							 gint          length);
-const gchar *         g_io_channel_get_line_term        (GIOChannel   *channel,
-							 gint         *length);
-void		      g_io_channel_set_buffered		(GIOChannel   *channel,
-							 gboolean      buffered);
-gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
-GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
-							 const gchar  *encoding,
-							 GError      **error);
-const gchar *         g_io_channel_get_encoding         (GIOChannel   *channel);
-void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
-							 gboolean      do_close);
-gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
-
-
-GIOStatus   g_io_channel_flush            (GIOChannel   *channel,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line        (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
-					   GString      *buffer,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   GError      **error);
-GIOStatus   g_io_channel_read_chars       (GIOChannel   *channel,
-					   gchar        *buf,
-					   gsize         count,
-					   gsize        *bytes_read,
-					   GError      **error);
-GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
-					   gunichar     *thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_write_chars      (GIOChannel   *channel,
-					   const gchar  *buf,
-					   gssize        count,
-					   gsize        *bytes_written,
-					   GError      **error);
-GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
-					   gunichar      thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
-					   gint64        offset,
-					   GSeekType     type,
-					   GError      **error);
-#ifdef G_OS_WIN32
-#define g_io_channel_new_file g_io_channel_new_file_utf8
-#endif
-
-GIOChannel* g_io_channel_new_file         (const gchar  *filename,
-					   const gchar  *mode,
-					   GError      **error);
-
-/* Error handling */
-
-GQuark          g_io_channel_error_quark      (void);
-GIOChannelError g_io_channel_error_from_errno (gint en);
-
-/* On Unix, IO channels created with this function for any file
- * descriptor or socket.
- *
- * On Win32, this can be used either for files opened with the MSVCRT
- * (the Microsoft run-time C library) _open() or _pipe, including file
- * descriptors 0, 1 and 2 (corresponding to stdin, stdout and stderr),
- * or for Winsock SOCKETs. If the parameter is a legal file
- * descriptor, it is assumed to be such, otherwise it should be a
- * SOCKET. This relies on SOCKETs and file descriptors not
- * overlapping. If you want to be certain, call either
- * g_io_channel_win32_new_fd() or g_io_channel_win32_new_socket()
- * instead as appropriate.
- *
- * The term file descriptor as used in the context of Win32 refers to
- * the emulated Unix-like file descriptors MSVCRT provides. The native
- * corresponding concept is file HANDLE. There isn't as of yet a way to
- * get GIOChannels for Win32 file HANDLEs.
- */
-GIOChannel* g_io_channel_unix_new    (int         fd);
-gint        g_io_channel_unix_get_fd (GIOChannel *channel);
-
-
-/* Hook for GClosure / GSource integration. Don't touch */
-GLIB_VAR GSourceFuncs g_io_watch_funcs;
-
-#ifdef G_OS_WIN32
-
-/* You can use this "pseudo file descriptor" in a GPollFD to add
- * polling for Windows messages. GTK applications should not do that.
- */
-
-#define G_WIN32_MSG_HANDLE 19981206
-
-/* Use this to get a GPollFD from a GIOChannel, so that you can call
- * g_io_channel_win32_poll(). After calling this you should only use
- * g_io_channel_read() to read from the GIOChannel, i.e. never read()
- * from the underlying file descriptor. For SOCKETs, it is possible to call
- * recv().
- */
-void        g_io_channel_win32_make_pollfd (GIOChannel   *channel,
-					    GIOCondition  condition,
-					    GPollFD      *fd);
-
-/* This can be used to wait a until at least one of the channels is readable.
- * On Unix you would do a select() on the file descriptors of the channels.
- */
-gint        g_io_channel_win32_poll   (GPollFD    *fds,
-				       gint        n_fds,
-				       gint        timeout_);
-
-/* Create an IO channel for Windows messages for window handle hwnd. */
-#if GLIB_SIZEOF_VOID_P == 8
-/* We use gsize here so that it is still an integer type and not a
- * pointer, like the guint in the traditional prototype. We can't use
- * intptr_t as that is not portable enough.
- */
-GIOChannel *g_io_channel_win32_new_messages (gsize hwnd);
-#else
-GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
-#endif
-
-/* Create an IO channel for C runtime (emulated Unix-like) file
- * descriptors. After calling g_io_add_watch() on a IO channel
- * returned by this function, you shouldn't call read() on the file
- * descriptor. This is because adding polling for a file descriptor is
- * implemented on Win32 by starting a thread that sits blocked in a
- * read() from the file descriptor most of the time. All reads from
- * the file descriptor should be done by this internal GLib
- * thread. Your code should call only g_io_channel_read_chars().
- */
-GIOChannel* g_io_channel_win32_new_fd (gint         fd);
-
-/* Get the C runtime file descriptor of a channel. */
-gint        g_io_channel_win32_get_fd (GIOChannel *channel);
-
-/* Create an IO channel for a winsock socket. The parameter should be
- * a SOCKET. Contrary to IO channels for file descriptors (on *Win32),
- * you can use normal recv() or recvfrom() on sockets even if GLib
- * is polling them.
- */
-GIOChannel *g_io_channel_win32_new_socket (gint socket);
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IOCHANNEL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gkeyfile.h b/GstreamerHelper/x64/include/glib-2.0/glib/gkeyfile.h
deleted file mode 100644
index 998bb7a7..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gkeyfile.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/* gkeyfile.h - desktop entry file parser
- *
- *  Copyright 2004 Red Hat, Inc.
- *
- *  Ray Strode <halfline@hawaii.rr.com>
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_KEY_FILE_H__
-#define __G_KEY_FILE_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  G_KEY_FILE_ERROR_UNKNOWN_ENCODING,
-  G_KEY_FILE_ERROR_PARSE,
-  G_KEY_FILE_ERROR_NOT_FOUND,
-  G_KEY_FILE_ERROR_KEY_NOT_FOUND,
-  G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-  G_KEY_FILE_ERROR_INVALID_VALUE
-} GKeyFileError;
-
-#define G_KEY_FILE_ERROR g_key_file_error_quark()
-
-GQuark g_key_file_error_quark (void);
-
-typedef struct _GKeyFile GKeyFile;
-
-typedef enum
-{
-  G_KEY_FILE_NONE              = 0,
-  G_KEY_FILE_KEEP_COMMENTS     = 1 << 0,
-  G_KEY_FILE_KEEP_TRANSLATIONS = 1 << 1
-} GKeyFileFlags;
-
-GKeyFile *g_key_file_new                    (void);
-GKeyFile *g_key_file_ref                    (GKeyFile             *key_file);
-void      g_key_file_unref                  (GKeyFile             *key_file);
-void      g_key_file_free                   (GKeyFile             *key_file);
-void      g_key_file_set_list_separator     (GKeyFile             *key_file,
-					     gchar                 separator);
-gboolean  g_key_file_load_from_file         (GKeyFile             *key_file,
-					     const gchar          *file,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean  g_key_file_load_from_data         (GKeyFile             *key_file,
-					     const gchar          *data,
-					     gsize                 length,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_dirs          (GKeyFile             *key_file,
-					     const gchar	  *file,
-					     const gchar	 **search_dirs,
-					     gchar		 **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_data_dirs     (GKeyFile             *key_file,
-					     const gchar          *file,
-					     gchar               **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gchar    *g_key_file_to_data                (GKeyFile             *key_file,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gchar    *g_key_file_get_start_group        (GKeyFile             *key_file) G_GNUC_MALLOC;
-gchar   **g_key_file_get_groups             (GKeyFile             *key_file,
-					     gsize                *length) G_GNUC_MALLOC;
-gchar   **g_key_file_get_keys               (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gboolean  g_key_file_has_group              (GKeyFile             *key_file,
-					     const gchar          *group_name);
-gboolean  g_key_file_has_key                (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-gchar    *g_key_file_get_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *value);
-gchar    *g_key_file_get_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *string);
-gchar    *g_key_file_get_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar          *string);
-gboolean  g_key_file_get_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              value);
-gint      g_key_file_get_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  value);
-gint64    g_key_file_get_int64              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_int64              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint64                value);
-guint64   g_key_file_get_uint64             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_uint64             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     guint64               value);
-gdouble   g_key_file_get_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error);
-void      g_key_file_set_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               value);
-gchar   **g_key_file_get_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar * const   list[],
-					     gsize                 length);
-gchar   **g_key_file_get_locale_string_list (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_locale_string_list (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar * const   list[],
-					     gsize                 length);
-gboolean *g_key_file_get_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              list[],
-					     gsize                 length);
-gint     *g_key_file_get_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               list[],
-                                             gsize                 length);
-gdouble  *g_key_file_get_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gsize                *length,
-                                             GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  list[],
-					     gsize                 length);
-gboolean  g_key_file_set_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             const gchar          *comment,
-                                             GError              **error);
-gchar    *g_key_file_get_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error) G_GNUC_MALLOC;
-
-gboolean  g_key_file_remove_comment         (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-					     GError              **error);
-gboolean  g_key_file_remove_key             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-gboolean  g_key_file_remove_group           (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     GError              **error);
-
-/* Defines for handling freedesktop.org Desktop files */
-#define G_KEY_FILE_DESKTOP_GROUP                "Desktop Entry"
-
-#define G_KEY_FILE_DESKTOP_KEY_TYPE             "Type"
-#define G_KEY_FILE_DESKTOP_KEY_VERSION          "Version"
-#define G_KEY_FILE_DESKTOP_KEY_NAME             "Name"
-#define G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME     "GenericName"
-#define G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY       "NoDisplay"
-#define G_KEY_FILE_DESKTOP_KEY_COMMENT          "Comment"
-#define G_KEY_FILE_DESKTOP_KEY_ICON             "Icon"
-#define G_KEY_FILE_DESKTOP_KEY_HIDDEN           "Hidden"
-#define G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN     "OnlyShowIn"
-#define G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN      "NotShowIn"
-#define G_KEY_FILE_DESKTOP_KEY_TRY_EXEC         "TryExec"
-#define G_KEY_FILE_DESKTOP_KEY_EXEC             "Exec"
-#define G_KEY_FILE_DESKTOP_KEY_PATH             "Path"
-#define G_KEY_FILE_DESKTOP_KEY_TERMINAL         "Terminal"
-#define G_KEY_FILE_DESKTOP_KEY_MIME_TYPE        "MimeType"
-#define G_KEY_FILE_DESKTOP_KEY_CATEGORIES       "Categories"
-#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY   "StartupNotify"
-#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
-#define G_KEY_FILE_DESKTOP_KEY_URL              "URL"
-
-#define G_KEY_FILE_DESKTOP_TYPE_APPLICATION     "Application"
-#define G_KEY_FILE_DESKTOP_TYPE_LINK            "Link"
-#define G_KEY_FILE_DESKTOP_TYPE_DIRECTORY       "Directory"
-
-G_END_DECLS
-
-#endif /* __G_KEY_FILE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/glist.h b/GstreamerHelper/x64/include/glib-2.0/glib/glist.h
deleted file mode 100644
index 44cfcc01..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/glist.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_LIST_H__
-#define __G_LIST_H__
-
-#include <glib/gmem.h>
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GList GList;
-
-struct _GList
-{
-  gpointer data;
-  GList *next;
-  GList *prev;
-};
-
-/* Doubly linked lists
- */
-GList*   g_list_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_list_free                    (GList            *list);
-void     g_list_free_1                  (GList            *list);
-#define  g_list_free1                   g_list_free_1
-void     g_list_free_full               (GList            *list,
-					 GDestroyNotify    free_func);
-GList*   g_list_append                  (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_prepend                 (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert                  (GList            *list,
-					 gpointer          data,
-					 gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted           (GList            *list,
-					 gpointer          data,
-					 GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted_with_data (GList            *list,
-					 gpointer          data,
-					 GCompareDataFunc  func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_before           (GList            *list,
-					 GList            *sibling,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_concat                  (GList            *list1,
-					 GList            *list2) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove                  (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_all              (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_link             (GList            *list,
-					 GList            *llink) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_delete_link             (GList            *list,
-					 GList            *link_) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_reverse                 (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_copy                    (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-
-GLIB_AVAILABLE_IN_2_34
-GList*   g_list_copy_deep               (GList            *list,
-					 GCopyFunc         func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-
-GList*   g_list_nth                     (GList            *list,
-					 guint             n);
-GList*   g_list_nth_prev                (GList            *list,
-					 guint             n);
-GList*   g_list_find                    (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_find_custom             (GList            *list,
-					 gconstpointer     data,
-					 GCompareFunc      func);
-gint     g_list_position                (GList            *list,
-					 GList            *llink);
-gint     g_list_index                   (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_last                    (GList            *list);
-GList*   g_list_first                   (GList            *list);
-guint    g_list_length                  (GList            *list);
-void     g_list_foreach                 (GList            *list,
-					 GFunc             func,
-					 gpointer          user_data);
-GList*   g_list_sort                    (GList            *list,
-					 GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_sort_with_data          (GList            *list,
-					 GCompareDataFunc  compare_func,
-					 gpointer          user_data)  G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_list_nth_data                (GList            *list,
-					 guint             n);
-
-
-#define g_list_previous(list)	        ((list) ? (((GList *)(list))->prev) : NULL)
-#define g_list_next(list)	        ((list) ? (((GList *)(list))->next) : NULL)
-
-G_END_DECLS
-
-#endif /* __G_LIST_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gmacros.h b/GstreamerHelper/x64/include/glib-2.0/glib/gmacros.h
deleted file mode 100644
index 4ad57da3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gmacros.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/* This file must not include any other glib header file and must thus
- * not refer to variables from glibconfig.h
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MACROS_H__
-#define __G_MACROS_H__
-
-/* We include stddef.h to get the system's definition of NULL
- */
-#include <stddef.h>
-
-/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
- * where this is valid. This allows for warningless compilation of
- * "long long" types even in the presence of '-ansi -pedantic'. 
- */
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define G_GNUC_EXTENSION __extension__
-#else
-#  define G_GNUC_EXTENSION
-#endif
-
-/* Provide macros to feature the GCC function attribute.
- */
-#if    __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#define G_GNUC_PURE                            \
-  __attribute__((__pure__))
-#define G_GNUC_MALLOC    			\
-  __attribute__((__malloc__))
-#else
-#define G_GNUC_PURE
-#define G_GNUC_MALLOC
-#endif
-
-#if     __GNUC__ >= 4
-#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-#else
-#define G_GNUC_NULL_TERMINATED
-#endif
-
-#if     (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-#define G_GNUC_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
-#define G_GNUC_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y)))
-#else
-#define G_GNUC_ALLOC_SIZE(x)
-#define G_GNUC_ALLOC_SIZE2(x,y)
-#endif
-
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_PRINTF( format_idx, arg_idx )    \
-  __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#define G_GNUC_SCANF( format_idx, arg_idx )     \
-  __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
-#define G_GNUC_FORMAT( arg_idx )                \
-  __attribute__((__format_arg__ (arg_idx)))
-#define G_GNUC_NORETURN                         \
-  __attribute__((__noreturn__))
-#define G_GNUC_CONST                            \
-  __attribute__((__const__))
-#define G_GNUC_UNUSED                           \
-  __attribute__((__unused__))
-#define G_GNUC_NO_INSTRUMENT			\
-  __attribute__((__no_instrument_function__))
-#else   /* !__GNUC__ */
-#define G_GNUC_PRINTF( format_idx, arg_idx )
-#define G_GNUC_SCANF( format_idx, arg_idx )
-#define G_GNUC_FORMAT( arg_idx )
-#define G_GNUC_NORETURN
-#define G_GNUC_CONST
-#define G_GNUC_UNUSED
-#define G_GNUC_NO_INSTRUMENT
-#endif  /* !__GNUC__ */
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define G_GNUC_DEPRECATED                            \
-  __attribute__((__deprecated__))
-#else
-#define G_GNUC_DEPRECATED
-#endif /* __GNUC__ */
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_GNUC_DEPRECATED_FOR(f)                        \
-  __attribute__((deprecated("Use " #f " instead")))
-#else
-#define G_GNUC_DEPRECATED_FOR(f)        G_GNUC_DEPRECATED
-#endif /* __GNUC__ */
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS		\
-  _Pragma ("GCC diagnostic push")			\
-  _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#define G_GNUC_END_IGNORE_DEPRECATIONS			\
-  _Pragma ("GCC diagnostic pop")
-#else
-#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-#define G_GNUC_END_IGNORE_DEPRECATIONS
-#endif
-
-#if     __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#  define G_GNUC_MAY_ALIAS __attribute__((may_alias))
-#else
-#  define G_GNUC_MAY_ALIAS
-#endif
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#define G_GNUC_WARN_UNUSED_RESULT 		\
-  __attribute__((warn_unused_result))
-#else
-#define G_GNUC_WARN_UNUSED_RESULT
-#endif /* __GNUC__ */
-
-#ifndef G_DISABLE_DEPRECATED
-/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
- * macros, so we can refer to them as strings unconditionally.
- * usage not-recommended since gcc-3.0
- */
-#if defined (__GNUC__) && (__GNUC__ < 3)
-#define G_GNUC_FUNCTION         __FUNCTION__
-#define G_GNUC_PRETTY_FUNCTION  __PRETTY_FUNCTION__
-#else   /* !__GNUC__ */
-#define G_GNUC_FUNCTION         ""
-#define G_GNUC_PRETTY_FUNCTION  ""
-#endif  /* !__GNUC__ */
-#endif  /* !G_DISABLE_DEPRECATED */
-
-#define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
-#define	G_STRINGIFY_ARG(contents)	#contents
-
-#ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */
-#define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2
-#define G_PASTE(identifier1,identifier2)      G_PASTE_ARGS (identifier1, identifier2)
-#ifdef __COUNTER__
-#define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __COUNTER__)[(expr) ? 1 : -1]
-#else
-#define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __LINE__)[(expr) ? 1 : -1]
-#endif
-#define G_STATIC_ASSERT_EXPR(expr) ((void) sizeof (char[(expr) ? 1 : -1]))
-#endif
-
-/* Provide a string identifying the current code position */
-#if defined(__GNUC__) && (__GNUC__ < 3) && !defined(__cplusplus)
-#  define G_STRLOC	__FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()"
-#else
-#  define G_STRLOC	__FILE__ ":" G_STRINGIFY (__LINE__)
-#endif
-
-/* Provide a string identifying the current function, non-concatenatable */
-#if defined (__GNUC__)
-#  define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
-#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 19901L
-#  define G_STRFUNC     ((const char*) (__func__))
-#elif defined(_MSC_VER) && (_MSC_VER > 1300)
-#  define G_STRFUNC     ((const char*) (__FUNCTION__))
-#else
-#  define G_STRFUNC     ((const char*) ("???"))
-#endif
-
-/* Guard C code in headers, while including them from C++ */
-#ifdef  __cplusplus
-# define G_BEGIN_DECLS  extern "C" {
-# define G_END_DECLS    }
-#else
-# define G_BEGIN_DECLS
-# define G_END_DECLS
-#endif
-
-/* Provide definitions for some commonly used macros.
- *  Some of them are only provided if they haven't already
- *  been defined. It is assumed that if they are already
- *  defined then the current definition is correct.
- */
-#ifndef NULL
-#  ifdef __cplusplus
-#    define NULL        (0L)
-#  else /* !__cplusplus */
-#    define NULL        ((void*) 0)
-#  endif /* !__cplusplus */
-#endif
-
-#ifndef	FALSE
-#define	FALSE	(0)
-#endif
-
-#ifndef	TRUE
-#define	TRUE	(!FALSE)
-#endif
-
-#undef	MAX
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
-#undef	MIN
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-
-#undef	ABS
-#define ABS(a)	   (((a) < 0) ? -(a) : (a))
-
-#undef	CLAMP
-#define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-
-/* Count the number of elements in an array. The array must be defined
- * as such; using this with a dynamically allocated array will give
- * incorrect results.
- */
-#define G_N_ELEMENTS(arr)		(sizeof (arr) / sizeof ((arr)[0]))
-
-/* Macros by analogy to GINT_TO_POINTER, GPOINTER_TO_INT
- */
-#define GPOINTER_TO_SIZE(p)	((gsize) (p))
-#define GSIZE_TO_POINTER(s)	((gpointer) (gsize) (s))
-
-/* Provide convenience macros for handling structure
- * fields through their offsets.
- */
-
-#if defined(__GNUC__)  && __GNUC__ >= 4
-#  define G_STRUCT_OFFSET(struct_type, member) \
-      ((glong) offsetof (struct_type, member))
-#else
-#  define G_STRUCT_OFFSET(struct_type, member)	\
-      ((glong) ((guint8*) &((struct_type*) 0)->member))
-#endif
-
-#define G_STRUCT_MEMBER_P(struct_p, struct_offset)   \
-    ((gpointer) ((guint8*) (struct_p) + (glong) (struct_offset)))
-#define G_STRUCT_MEMBER(member_type, struct_p, struct_offset)   \
-    (*(member_type*) G_STRUCT_MEMBER_P ((struct_p), (struct_offset)))
-
-/* Provide simple macro statement wrappers:
- *   G_STMT_START { statements; } G_STMT_END;
- * This can be used as a single statement, like:
- *   if (x) G_STMT_START { ... } G_STMT_END; else ...
- * This intentionally does not use compiler extensions like GCC's '({...})' to
- * avoid portability issue or side effects when compiled with different compilers.
- */
-#if !(defined (G_STMT_START) && defined (G_STMT_END))
-#  define G_STMT_START  do
-#  define G_STMT_END    while (0)
-#endif
-
-/* Deprecated -- do not use. */
-#ifndef G_DISABLE_DEPRECATED
-#ifdef G_DISABLE_CONST_RETURNS
-#define G_CONST_RETURN
-#else
-#define G_CONST_RETURN const
-#endif
-#endif
-
-/*
- * The G_LIKELY and G_UNLIKELY macros let the programmer give hints to 
- * the compiler about the expected result of an expression. Some compilers
- * can use this information for optimizations.
- *
- * The _G_BOOLEAN_EXPR macro is intended to trigger a gcc warning when
- * putting assignments in g_return_if_fail ().  
- */
-#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define _G_BOOLEAN_EXPR(expr)                   \
- G_GNUC_EXTENSION ({                            \
-   int _g_boolean_var_;                         \
-   if (expr)                                    \
-      _g_boolean_var_ = 1;                      \
-   else                                         \
-      _g_boolean_var_ = 0;                      \
-   _g_boolean_var_;                             \
-})
-#define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1))
-#define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 0))
-#else
-#define G_LIKELY(expr) (expr)
-#define G_UNLIKELY(expr) (expr)
-#endif
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define G_DEPRECATED __attribute__((__deprecated__))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
-#define G_DEPRECATED __declspec(deprecated)
-#else
-#define G_DEPRECATED
-#endif
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead")))
-#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
-#define G_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead"))
-#else
-#define G_DEPRECATED_FOR(f) G_DEPRECATED
-#endif
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_UNAVAILABLE(maj,min) __attribute__((deprecated("Not available before " #maj "." #min)))
-#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
-#define G_UNAVAILABLE(maj,min) __declspec(deprecated("is not available before " #maj "." #min))
-#else
-#define G_UNAVAILABLE(maj,min)
-#endif
-
-/* These macros are used to mark deprecated functions in GLib headers,
- * and thus have to be exposed in installed headers. But please
- * do *not* use them in other projects. Instead, use G_DEPRECATED
- * or define your own wrappers around it.
- */
-
-#ifdef GLIB_DISABLE_DEPRECATION_WARNINGS
-#define GLIB_DEPRECATED
-#define GLIB_DEPRECATED_FOR(f)
-#define GLIB_UNAVAILABLE(maj,min)
-#else
-#define GLIB_DEPRECATED G_DEPRECATED
-#define GLIB_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
-#define GLIB_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min)
-#endif
-
-#endif /* __G_MACROS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gmain.h b/GstreamerHelper/x64/include/glib-2.0/glib/gmain.h
deleted file mode 100644
index 4d4d5043..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gmain.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/* gmain.h - the GLib Main loop
- * Copyright (C) 1998-2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MAIN_H__
-#define __G_MAIN_H__
-
-#include <glib/gpoll.h>
-#include <glib/gslist.h>
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMainContext:
- *
- * The <structname>GMainContext</structname> struct is an opaque data
- * type representing a set of sources to be handled in a main loop.
- */
-typedef struct _GMainContext            GMainContext;
-
-/**
- * GMainLoop:
- *
- * The <structname>GMainLoop</structname> struct is an opaque data type
- * representing the main event loop of a GLib or GTK+ application.
- */
-typedef struct _GMainLoop               GMainLoop;
-
-/**
- * GSource:
- *
- * The <structname>GSource</structname> struct is an opaque data type
- * representing an event source.
- */
-typedef struct _GSource                 GSource;
-typedef struct _GSourcePrivate          GSourcePrivate;
-
-/**
- * GSourceCallbackFuncs:
- * @ref: Called when a reference is added to the callback object
- * @unref: Called when a reference to the callback object is dropped
- * @get: Called to extract the callback function and data from the
- *     callback object.
-
- * The <structname>GSourceCallbackFuncs</structname> struct contains
- * functions for managing callback objects.
- */
-typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
-
-/**
- * GSourceFuncs:
- * @prepare: Called before all the file descriptors are polled. If the
- *     source can determine that it is ready here (without waiting for the
- *     results of the poll() call) it should return %TRUE. It can also return
- *     a @timeout_ value which should be the maximum timeout (in milliseconds)
- *     which should be passed to the poll() call. The actual timeout used will
- *     be -1 if all sources returned -1, or it will be the minimum of all the
- *     @timeout_ values returned which were >= 0.
- * @check: Called after all the file descriptors are polled. The source
- *     should return %TRUE if it is ready to be dispatched. Note that some
- *     time may have passed since the previous prepare function was called,
- *     so the source should be checked again here.
- * @dispatch: Called to dispatch the event source, after it has returned
- *     %TRUE in either its @prepare or its @check function. The @dispatch
- *     function is passed in a callback function and data. The callback
- *     function may be %NULL if the source was never connected to a callback
- *     using g_source_set_callback(). The @dispatch function should call the
- *     callback function with @user_data and whatever additional parameters
- *     are needed for this type of event source.
- * @finalize: Called when the source is finalized.
- *
- * The <structname>GSourceFuncs</structname> struct contains a table of
- * functions used to handle event sources in a generic manner.
- *
- * For idle sources, the prepare and check functions always return %TRUE
- * to indicate that the source is always ready to be processed. The prepare
- * function also returns a timeout value of 0 to ensure that the poll() call
- * doesn't block (since that would be time wasted which could have been spent
- * running the idle function).
- *
- * For timeout sources, the prepare and check functions both return %TRUE
- * if the timeout interval has expired. The prepare function also returns
- * a timeout value to ensure that the poll() call doesn't block too long
- * and miss the next timeout.
- *
- * For file descriptor sources, the prepare function typically returns %FALSE,
- * since it must wait until poll() has been called before it knows whether
- * any events need to be processed. It sets the returned timeout to -1 to
- * indicate that it doesn't mind how long the poll() call blocks. In the
- * check function, it tests the results of the poll() call to see if the
- * required condition has been met, and returns %TRUE if so.
- */
-typedef struct _GSourceFuncs            GSourceFuncs;
-
-/**
- * GPid:
- *
- * A type which is used to hold a process identification.
- *
- * On UNIX, processes are identified by a process id (an integer),
- * while Windows uses process handles (which are pointers).
- *
- * GPid is used in GLib only for descendant processes spawned with
- * the g_spawn functions.
- */
-
-/**
- * GSourceFunc:
- * @user_data: data passed to the function, set when the source was
- *     created with one of the above functions
- *
- * Specifies the type of function passed to g_timeout_add(),
- * g_timeout_add_full(), g_idle_add(), and g_idle_add_full().
- *
- * Returns: %FALSE if the source should be removed
- */
-typedef gboolean (*GSourceFunc)       (gpointer user_data);
-
-/**
- * GChildWatchFunc:
- * @pid: the process id of the child process
- * @status: Status information about the child process, encoded
- *     in a platform-specific manner
- * @user_data: user data passed to g_child_watch_add()
- *
- * Prototype of a #GChildWatchSource callback, called when a child
- * process has exited.  To interpret @status, see the documentation
- * for g_spawn_check_exit_status().
- */
-typedef void     (*GChildWatchFunc)   (GPid     pid,
-                                       gint     status,
-                                       gpointer user_data);
-struct _GSource
-{
-  /*< private >*/
-  gpointer callback_data;
-  GSourceCallbackFuncs *callback_funcs;
-
-  GSourceFuncs *source_funcs;
-  guint ref_count;
-
-  GMainContext *context;
-
-  gint priority;
-  guint flags;
-  guint source_id;
-
-  GSList *poll_fds;
-  
-  GSource *prev;
-  GSource *next;
-
-  char    *name;
-
-  GSourcePrivate *priv;
-};
-
-struct _GSourceCallbackFuncs
-{
-  void (*ref)   (gpointer     cb_data);
-  void (*unref) (gpointer     cb_data);
-  void (*get)   (gpointer     cb_data,
-                 GSource     *source, 
-                 GSourceFunc *func,
-                 gpointer    *data);
-};
-
-/**
- * GSourceDummyMarshal:
- *
- * This is just a placeholder for #GClosureMarshal,
- * which cannot be used here for dependency reasons.
- */
-typedef void (*GSourceDummyMarshal) (void);
-
-struct _GSourceFuncs
-{
-  gboolean (*prepare)  (GSource    *source,
-                        gint       *timeout_);
-  gboolean (*check)    (GSource    *source);
-  gboolean (*dispatch) (GSource    *source,
-                        GSourceFunc callback,
-                        gpointer    user_data);
-  void     (*finalize) (GSource    *source); /* Can be NULL */
-
-  /*< private >*/
-  /* For use by g_source_set_closure */
-  GSourceFunc     closure_callback;        
-  GSourceDummyMarshal closure_marshal; /* Really is of type GClosureMarshal */
-};
-
-/* Standard priorities */
-
-/**
- * G_PRIORITY_HIGH:
- *
- * Use this for high priority event sources.
- *
- * It is not used within GLib or GTK+.
- */
-#define G_PRIORITY_HIGH            -100
-
-/**
- * G_PRIORITY_DEFAULT:
- *
- * Use this for default priority event sources.
- *
- * In GLib this priority is used when adding timeout functions
- * with g_timeout_add(). In GDK this priority is used for events
- * from the X server.
- */
-#define G_PRIORITY_DEFAULT          0
-
-/**
- * G_PRIORITY_HIGH_IDLE:
- *
- * Use this for high priority idle functions.
- *
- * GTK+ uses #G_PRIORITY_HIGH_IDLE + 10 for resizing operations,
- * and #G_PRIORITY_HIGH_IDLE + 20 for redrawing operations. (This is
- * done to ensure that any pending resizes are processed before any
- * pending redraws, so that widgets are not redrawn twice unnecessarily.)
- */
-#define G_PRIORITY_HIGH_IDLE        100
-
-/**
- * G_PRIORITY_DEFAULT_IDLE:
- *
- * Use this for default priority idle functions.
- *
- * In GLib this priority is used when adding idle functions with
- * g_idle_add().
- */
-#define G_PRIORITY_DEFAULT_IDLE     200
-
-/**
- * G_PRIORITY_LOW:
- *
- * Use this for very low priority background tasks.
- *
- * It is not used within GLib or GTK+.
- */
-#define G_PRIORITY_LOW              300
-
-/**
- * G_SOURCE_REMOVE:
- *
- * Use this macro as the return value of a #GSourceFunc to remove
- * the #GSource from the main loop.
- *
- * Since: 2.32
- */
-#define G_SOURCE_REMOVE         FALSE
-
-/**
- * G_SOURCE_CONTINUE:
- *
- * Use this macro as the return value of a #GSourceFunc to leave
- * the #GSource in the main loop.
- *
- * Since: 2.32
- */
-#define G_SOURCE_CONTINUE       TRUE
-
-/* GMainContext: */
-
-GMainContext *g_main_context_new       (void);
-GMainContext *g_main_context_ref       (GMainContext *context);
-void          g_main_context_unref     (GMainContext *context);
-GMainContext *g_main_context_default   (void);
-
-gboolean      g_main_context_iteration (GMainContext *context,
-                                        gboolean      may_block);
-gboolean      g_main_context_pending   (GMainContext *context);
-
-/* For implementation of legacy interfaces
- */
-GSource      *g_main_context_find_source_by_id              (GMainContext *context,
-                                                             guint         source_id);
-GSource      *g_main_context_find_source_by_user_data       (GMainContext *context,
-                                                             gpointer      user_data);
-GSource      *g_main_context_find_source_by_funcs_user_data (GMainContext *context,
-                                                             GSourceFuncs *funcs,
-                                                             gpointer      user_data);
-
-/* Low level functions for implementing custom main loops.
- */
-void     g_main_context_wakeup  (GMainContext *context);
-gboolean g_main_context_acquire (GMainContext *context);
-void     g_main_context_release (GMainContext *context);
-gboolean g_main_context_is_owner (GMainContext *context);
-gboolean g_main_context_wait    (GMainContext *context,
-                                 GCond        *cond,
-                                 GMutex       *mutex);
-
-gboolean g_main_context_prepare  (GMainContext *context,
-                                  gint         *priority);
-gint     g_main_context_query    (GMainContext *context,
-                                  gint          max_priority,
-                                  gint         *timeout_,
-                                  GPollFD      *fds,
-                                  gint          n_fds);
-gint     g_main_context_check    (GMainContext *context,
-                                  gint          max_priority,
-                                  GPollFD      *fds,
-                                  gint          n_fds);
-void     g_main_context_dispatch (GMainContext *context);
-
-void     g_main_context_set_poll_func (GMainContext *context,
-                                       GPollFunc     func);
-GPollFunc g_main_context_get_poll_func (GMainContext *context);
-
-/* Low level functions for use by source implementations
- */
-void     g_main_context_add_poll    (GMainContext *context,
-                                     GPollFD      *fd,
-                                     gint          priority);
-void     g_main_context_remove_poll (GMainContext *context,
-                                     GPollFD      *fd);
-
-gint     g_main_depth               (void);
-GSource *g_main_current_source      (void);
-
-/* GMainContexts for other threads
- */
-void          g_main_context_push_thread_default (GMainContext *context);
-void          g_main_context_pop_thread_default  (GMainContext *context);
-GMainContext *g_main_context_get_thread_default  (void);
-GMainContext *g_main_context_ref_thread_default  (void);
-
-/* GMainLoop: */
-
-GMainLoop *g_main_loop_new        (GMainContext *context,
-                                   gboolean      is_running);
-void       g_main_loop_run        (GMainLoop    *loop);
-void       g_main_loop_quit       (GMainLoop    *loop);
-GMainLoop *g_main_loop_ref        (GMainLoop    *loop);
-void       g_main_loop_unref      (GMainLoop    *loop);
-gboolean   g_main_loop_is_running (GMainLoop    *loop);
-GMainContext *g_main_loop_get_context (GMainLoop    *loop);
-
-/* GSource: */
-
-GSource *g_source_new             (GSourceFuncs   *source_funcs,
-                                   guint           struct_size);
-GSource *g_source_ref             (GSource        *source);
-void     g_source_unref           (GSource        *source);
-
-guint    g_source_attach          (GSource        *source,
-                                   GMainContext   *context);
-void     g_source_destroy         (GSource        *source);
-
-void     g_source_set_priority    (GSource        *source,
-                                   gint            priority);
-gint     g_source_get_priority    (GSource        *source);
-void     g_source_set_can_recurse (GSource        *source,
-                                   gboolean        can_recurse);
-gboolean g_source_get_can_recurse (GSource        *source);
-guint    g_source_get_id          (GSource        *source);
-
-GMainContext *g_source_get_context (GSource       *source);
-
-void     g_source_set_callback    (GSource        *source,
-                                   GSourceFunc     func,
-                                   gpointer        data,
-                                   GDestroyNotify  notify);
-
-void     g_source_set_funcs       (GSource        *source,
-                                   GSourceFuncs   *funcs);
-gboolean g_source_is_destroyed    (GSource        *source);
-
-void                 g_source_set_name       (GSource        *source,
-                                              const char     *name);
-const char *         g_source_get_name       (GSource        *source);
-void                 g_source_set_name_by_id (guint           tag,
-                                              const char     *name);
-
-
-/* Used to implement g_source_connect_closure and internally*/
-void g_source_set_callback_indirect (GSource              *source,
-                                     gpointer              callback_data,
-                                     GSourceCallbackFuncs *callback_funcs);
-
-void     g_source_add_poll            (GSource        *source,
-				       GPollFD        *fd);
-void     g_source_remove_poll         (GSource        *source,
-				       GPollFD        *fd);
-
-void     g_source_add_child_source    (GSource        *source,
-				       GSource        *child_source);
-void     g_source_remove_child_source (GSource        *source,
-				       GSource        *child_source);
-
-GLIB_DEPRECATED_IN_2_28_FOR(g_source_get_time)
-void     g_source_get_current_time (GSource        *source,
-                                    GTimeVal       *timeval);
-
-gint64   g_source_get_time         (GSource        *source);
-
- /* void g_source_connect_closure (GSource        *source,
-                                  GClosure       *closure);
- */
-
-/* Specific source types
- */
-GSource *g_idle_source_new        (void);
-GSource *g_child_watch_source_new (GPid pid);
-GSource *g_timeout_source_new     (guint interval);
-GSource *g_timeout_source_new_seconds (guint interval);
-
-/* Miscellaneous functions
- */
-void   g_get_current_time                 (GTimeVal       *result);
-gint64 g_get_monotonic_time               (void);
-gint64 g_get_real_time                    (void);
-
-
-/* Source manipulation by ID */
-gboolean g_source_remove                     (guint          tag);
-gboolean g_source_remove_by_user_data        (gpointer       user_data);
-gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
-                                              gpointer       user_data);
-
-/* Idles, child watchers and timeouts */
-guint    g_timeout_add_full         (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_timeout_add              (guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-guint    g_timeout_add_seconds_full (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_timeout_add_seconds      (guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-guint    g_child_watch_add_full     (gint            priority,
-                                     GPid            pid,
-                                     GChildWatchFunc function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_child_watch_add          (GPid            pid,
-                                     GChildWatchFunc function,
-                                     gpointer        data);
-guint    g_idle_add                 (GSourceFunc     function,
-                                     gpointer        data);
-guint    g_idle_add_full            (gint            priority,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-gboolean g_idle_remove_by_data      (gpointer        data);
-
-void     g_main_context_invoke_full (GMainContext   *context,
-                                     gint            priority,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-void     g_main_context_invoke      (GMainContext   *context,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-
-/* Hook for GClosure / GSource integration. Don't touch */
-GLIB_VAR GSourceFuncs g_timeout_funcs;
-GLIB_VAR GSourceFuncs g_child_watch_funcs;
-GLIB_VAR GSourceFuncs g_idle_funcs;
-
-G_END_DECLS
-
-#endif /* __G_MAIN_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gmappedfile.h b/GstreamerHelper/x64/include/glib-2.0/glib/gmappedfile.h
deleted file mode 100644
index cf122e41..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gmappedfile.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * gmappedfile.h: Simplified wrapper around the mmap function
- *
- * Copyright 2005 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MAPPED_FILE_H__
-#define __G_MAPPED_FILE_H__
-
-#include <glib/gbytes.h>
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMappedFile GMappedFile;
-
-GMappedFile *g_mapped_file_new          (const gchar  *filename,
-				         gboolean      writable,
-				         GError      **error) G_GNUC_MALLOC;
-GMappedFile *g_mapped_file_new_from_fd  (gint          fd,
-					 gboolean      writable,
-					 GError      **error) G_GNUC_MALLOC;
-gsize        g_mapped_file_get_length   (GMappedFile  *file);
-gchar       *g_mapped_file_get_contents (GMappedFile  *file);
-GLIB_AVAILABLE_IN_2_34
-GBytes *     g_mapped_file_get_bytes    (GMappedFile  *file);
-GMappedFile *g_mapped_file_ref          (GMappedFile  *file);
-void         g_mapped_file_unref        (GMappedFile  *file);
-
-GLIB_DEPRECATED_FOR(g_mapped_file_unref)
-void         g_mapped_file_free         (GMappedFile  *file);
-
-G_END_DECLS
-
-#endif /* __G_MAPPED_FILE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gmarkup.h b/GstreamerHelper/x64/include/glib-2.0/glib/gmarkup.h
deleted file mode 100644
index a8865da9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gmarkup.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* gmarkup.h - Simple XML-like string parser/writer
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MARKUP_H__
-#define __G_MARKUP_H__
-
-#include <stdarg.h>
-
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMarkupError:
- * @G_MARKUP_ERROR_BAD_UTF8: text being parsed was not valid UTF-8
- * @G_MARKUP_ERROR_EMPTY: document contained nothing, or only whitespace
- * @G_MARKUP_ERROR_PARSE: document was ill-formed
- * @G_MARKUP_ERROR_UNKNOWN_ELEMENT: error should be set by #GMarkupParser
- *     functions; element wasn't known
- * @G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE: error should be set by #GMarkupParser
- *     functions; attribute wasn't known
- * @G_MARKUP_ERROR_INVALID_CONTENT: error should be set by #GMarkupParser
- *     functions; content was invalid
- * @G_MARKUP_ERROR_MISSING_ATTRIBUTE: error should be set by #GMarkupParser
- *     functions; a required attribute was missing
- *
- * Error codes returned by markup parsing.
- */
-typedef enum
-{
-  G_MARKUP_ERROR_BAD_UTF8,
-  G_MARKUP_ERROR_EMPTY,
-  G_MARKUP_ERROR_PARSE,
-  /* The following are primarily intended for specific GMarkupParser
-   * implementations to set.
-   */
-  G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-  G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
-  G_MARKUP_ERROR_INVALID_CONTENT,
-  G_MARKUP_ERROR_MISSING_ATTRIBUTE
-} GMarkupError;
-
-/**
- * G_MARKUP_ERROR:
- *
- * Error domain for markup parsing.
- * Errors in this domain will be from the #GMarkupError enumeration.
- * See #GError for information on error domains.
- */
-#define G_MARKUP_ERROR g_markup_error_quark ()
-
-GQuark g_markup_error_quark (void);
-
-/**
- * GMarkupParseFlags:
- * @G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG: flag you should not use
- * @G_MARKUP_TREAT_CDATA_AS_TEXT: When this flag is set, CDATA marked
- *     sections are not passed literally to the @passthrough function of
- *     the parser. Instead, the content of the section (without the
- *     <literal>&lt;![CDATA[</literal> and <literal>]]&gt;</literal>) is
- *     passed to the @text function. This flag was added in GLib 2.12
- * @G_MARKUP_PREFIX_ERROR_POSITION: Normally errors caught by GMarkup
- *     itself have line/column information prefixed to them to let the
- *     caller know the location of the error. When this flag is set the
- *     location information is also prefixed to errors generated by the
- *     #GMarkupParser implementation functions
- *
- * Flags that affect the behaviour of the parser.
- */
-typedef enum
-{
-  G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0,
-  G_MARKUP_TREAT_CDATA_AS_TEXT              = 1 << 1,
-  G_MARKUP_PREFIX_ERROR_POSITION            = 1 << 2
-} GMarkupParseFlags;
-
-/**
- * GMarkupParseContext:
- *
- * A parse context is used to parse a stream of bytes that
- * you expect to contain marked-up text.
- *
- * See g_markup_parse_context_new(), #GMarkupParser, and so
- * on for more details.
- */
-typedef struct _GMarkupParseContext GMarkupParseContext;
-typedef struct _GMarkupParser GMarkupParser;
-
-/**
- * GMarkupParser:
- * @start_element: Callback to invoke when the opening tag of an element
- *     is seen.
- * @end_element: Callback to invoke when the closing tag of an element
- *     is seen. Note that this is also called for empty tags like
- *     <literal>&lt;empty/&gt;</literal>.
- * @text: Callback to invoke when some text is seen (text is always
- *     inside an element). Note that the text of an element may be spread
- *     over multiple calls of this function. If the
- *     %G_MARKUP_TREAT_CDATA_AS_TEXT flag is set, this function is also
- *     called for the content of CDATA marked sections.
- * @passthrough: Callback to invoke for comments, processing instructions
- *     and doctype declarations; if you're re-writing the parsed document,
- *     write the passthrough text back out in the same position. If the
- *     %G_MARKUP_TREAT_CDATA_AS_TEXT flag is not set, this function is also
- *     called for CDATA marked sections.
- * @error: Callback to invoke when an error occurs.
- *
- * Any of the fields in #GMarkupParser can be %NULL, in which case they
- * will be ignored. Except for the @error function, any of these callbacks
- * can set an error; in particular the %G_MARKUP_ERROR_UNKNOWN_ELEMENT,
- * %G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, and %G_MARKUP_ERROR_INVALID_CONTENT
- * errors are intended to be set from these callbacks. If you set an error
- * from a callback, g_markup_parse_context_parse() will report that error
- * back to its caller.
- */
-struct _GMarkupParser
-{
-  /* Called for open tags <foo bar="baz"> */
-  void (*start_element)  (GMarkupParseContext *context,
-                          const gchar         *element_name,
-                          const gchar        **attribute_names,
-                          const gchar        **attribute_values,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for close tags </foo> */
-  void (*end_element)    (GMarkupParseContext *context,
-                          const gchar         *element_name,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for character data */
-  /* text is not nul-terminated */
-  void (*text)           (GMarkupParseContext *context,
-                          const gchar         *text,
-                          gsize                text_len,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for strings that should be re-saved verbatim in this same
-   * position, but are not otherwise interpretable.  At the moment
-   * this includes comments and processing instructions.
-   */
-  /* text is not nul-terminated. */
-  void (*passthrough)    (GMarkupParseContext *context,
-                          const gchar         *passthrough_text,
-                          gsize                text_len,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called on error, including one set by other
-   * methods in the vtable. The GError should not be freed.
-   */
-  void (*error)          (GMarkupParseContext *context,
-                          GError              *error,
-                          gpointer             user_data);
-};
-
-GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
-                                                   GMarkupParseFlags    flags,
-                                                   gpointer             user_data,
-                                                   GDestroyNotify       user_data_dnotify);
-void                 g_markup_parse_context_free  (GMarkupParseContext *context);
-gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
-                                                   const gchar         *text,
-                                                   gssize               text_len,
-                                                   GError             **error);
-void                 g_markup_parse_context_push  (GMarkupParseContext *context,
-                                                   const GMarkupParser *parser,
-                                                   gpointer             user_data);
-gpointer             g_markup_parse_context_pop   (GMarkupParseContext *context);
-
-gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
-                                                       GError             **error);
-const gchar *        g_markup_parse_context_get_element (GMarkupParseContext *context);
-const GSList *       g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
-
-/* For user-constructed error messages, has no precise semantics */
-void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
-                                                          gint                *line_number,
-                                                          gint                *char_number);
-gpointer             g_markup_parse_context_get_user_data (GMarkupParseContext *context);
-
-/* useful when saving */
-gchar* g_markup_escape_text (const gchar *text,
-                             gssize       length);
-
-gchar *g_markup_printf_escaped (const char *format,
-				...) G_GNUC_PRINTF (1, 2);
-gchar *g_markup_vprintf_escaped (const char *format,
-				 va_list     args);
-
-typedef enum
-{
-  G_MARKUP_COLLECT_INVALID,
-  G_MARKUP_COLLECT_STRING,
-  G_MARKUP_COLLECT_STRDUP,
-  G_MARKUP_COLLECT_BOOLEAN,
-  G_MARKUP_COLLECT_TRISTATE,
-
-  G_MARKUP_COLLECT_OPTIONAL = (1 << 16)
-} GMarkupCollectType;
-
-
-/* useful from start_element */
-gboolean   g_markup_collect_attributes (const gchar         *element_name,
-                                        const gchar        **attribute_names,
-                                        const gchar        **attribute_values,
-                                        GError             **error,
-                                        GMarkupCollectType   first_type,
-                                        const gchar         *first_attr,
-                                        ...);
-
-G_END_DECLS
-
-#endif /* __G_MARKUP_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gmem.h b/GstreamerHelper/x64/include/glib-2.0/glib/gmem.h
deleted file mode 100644
index c50f46e7..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gmem.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MEM_H__
-#define __G_MEM_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMemVTable:
- * @malloc: function to use for allocating memory.
- * @realloc: function to use for reallocating memory.
- * @free: function to use to free memory.
- * @calloc: function to use for allocating zero-filled memory.
- * @try_malloc: function to use for allocating memory without a default error handler.
- * @try_realloc: function to use for reallocating memory without a default error handler.
- * 
- * A set of functions used to perform memory allocation. The same #GMemVTable must
- * be used for all allocations in the same program; a call to g_mem_set_vtable(),
- * if it exists, should be prior to any use of GLib.
- */
-typedef struct _GMemVTable GMemVTable;
-
-
-#if GLIB_SIZEOF_VOID_P > GLIB_SIZEOF_LONG
-/**
- * G_MEM_ALIGN:
- *
- * Indicates the number of bytes to which memory will be aligned on the
- * current platform.
- */
-#  define G_MEM_ALIGN	GLIB_SIZEOF_VOID_P
-#else	/* GLIB_SIZEOF_VOID_P <= GLIB_SIZEOF_LONG */
-#  define G_MEM_ALIGN	GLIB_SIZEOF_LONG
-#endif	/* GLIB_SIZEOF_VOID_P <= GLIB_SIZEOF_LONG */
-
-
-/* Memory allocation functions
- */
-
-void	 g_free	          (gpointer	 mem);
-
-GLIB_AVAILABLE_IN_2_34
-void     g_clear_pointer  (gpointer      *pp,
-                           GDestroyNotify destroy);
-
-gpointer g_malloc         (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_malloc0        (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_realloc        (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_try_malloc     (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_try_malloc0    (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_try_realloc    (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-gpointer g_malloc_n       (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_malloc0_n      (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_realloc_n      (gpointer	 mem,
-			   gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_try_malloc_n   (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_try_malloc0_n  (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_try_realloc_n  (gpointer	 mem,
-			   gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-#define g_clear_pointer(pp, destroy) \
-  G_STMT_START {                                                               \
-    G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer));                       \
-    /* Only one access, please */                                              \
-    gpointer *_pp = (gpointer *) (pp);                                         \
-    gpointer _p;                                                               \
-    /* This assignment is needed to avoid a gcc warning */                     \
-    GDestroyNotify _destroy = (GDestroyNotify) (destroy);                      \
-                                                                               \
-    (void) (0 ? (gpointer) *(pp) : 0);                                         \
-    do                                                                         \
-      _p = g_atomic_pointer_get (_pp);                                         \
-    while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
-                                                                               \
-    if (_p)                                                                    \
-      _destroy (_p);                                                           \
-  } G_STMT_END
-
-/* Optimise: avoid the call to the (slower) _n function if we can
- * determine at compile-time that no overflow happens.
- */
-#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
-#  define _G_NEW(struct_type, n_structs, func) \
-	(struct_type *) (G_GNUC_EXTENSION ({			\
-	  gsize __n = (gsize) (n_structs);			\
-	  gsize __s = sizeof (struct_type);			\
-	  gpointer __p;						\
-	  if (__s == 1)						\
-	    __p = g_##func (__n);				\
-	  else if (__builtin_constant_p (__n) &&		\
-	           (__s == 0 || __n <= G_MAXSIZE / __s))	\
-	    __p = g_##func (__n * __s);				\
-	  else							\
-	    __p = g_##func##_n (__n, __s);			\
-	  __p;							\
-	}))
-#  define _G_RENEW(struct_type, mem, n_structs, func) \
-	(struct_type *) (G_GNUC_EXTENSION ({			\
-	  gsize __n = (gsize) (n_structs);			\
-	  gsize __s = sizeof (struct_type);			\
-	  gpointer __p = (gpointer) (mem);			\
-	  if (__s == 1)						\
-	    __p = g_##func (__p, __n);				\
-	  else if (__builtin_constant_p (__n) &&		\
-	           (__s == 0 || __n <= G_MAXSIZE / __s))	\
-	    __p = g_##func (__p, __n * __s);			\
-	  else							\
-	    __p = g_##func##_n (__p, __n, __s);			\
-	  __p;							\
-	}))
-
-#else
-
-/* Unoptimised version: always call the _n() function. */
-
-#define _G_NEW(struct_type, n_structs, func) \
-        ((struct_type *) g_##func##_n ((n_structs), sizeof (struct_type)))
-#define _G_RENEW(struct_type, mem, n_structs, func) \
-        ((struct_type *) g_##func##_n (mem, (n_structs), sizeof (struct_type)))
-
-#endif
-
-/**
- * g_new:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Allocates @n_structs elements of type @struct_type.
- * The returned pointer is cast to a pointer to the given type.
- * If @n_structs is 0 it returns %NULL.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Since the returned pointer is already casted to the right type,
- * it is normally unnecessary to cast it explicitly, and doing
- * so might hide memory allocation errors.
- * 
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_new(struct_type, n_structs)			_G_NEW (struct_type, n_structs, malloc)
-/**
- * g_new0:
- * @struct_type: the type of the elements to allocate.
- * @n_structs: the number of elements to allocate.
- * 
- * Allocates @n_structs elements of type @struct_type, initialized to 0's.
- * The returned pointer is cast to a pointer to the given type.
- * If @n_structs is 0 it returns %NULL.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Since the returned pointer is already casted to the right type,
- * it is normally unnecessary to cast it explicitly, and doing
- * so might hide memory allocation errors.
- * 
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type.
- */
-#define g_new0(struct_type, n_structs)			_G_NEW (struct_type, n_structs, malloc0)
-/**
- * g_renew:
- * @struct_type: the type of the elements to allocate
- * @mem: the currently allocated memory
- * @n_structs: the number of elements to allocate
- * 
- * Reallocates the memory pointed to by @mem, so that it now has space for
- * @n_structs elements of type @struct_type. It returns the new address of
- * the memory, which may have been moved.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Returns: a pointer to the new allocated memory, cast to a pointer to @struct_type
- */
-#define g_renew(struct_type, mem, n_structs)		_G_RENEW (struct_type, mem, n_structs, realloc)
-/**
- * g_try_new:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to allocate @n_structs elements of type @struct_type, and returns
- * %NULL on failure. Contrast with g_new(), which aborts the program on failure.
- * The returned pointer is cast to a pointer to the given type.
- * The function returns %NULL when @n_structs is 0 of if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_new(struct_type, n_structs)		_G_NEW (struct_type, n_structs, try_malloc)
-/**
- * g_try_new0:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to allocate @n_structs elements of type @struct_type, initialized
- * to 0's, and returns %NULL on failure. Contrast with g_new0(), which aborts
- * the program on failure.
- * The returned pointer is cast to a pointer to the given type.
- * The function returns %NULL when @n_structs is 0 of if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_new0(struct_type, n_structs)		_G_NEW (struct_type, n_structs, try_malloc0)
-/**
- * g_try_renew:
- * @struct_type: the type of the elements to allocate
- * @mem: the currently allocated memory
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to reallocate the memory pointed to by @mem, so that it now has
- * space for @n_structs elements of type @struct_type, and returns %NULL on
- * failure. Contrast with g_renew(), which aborts the program on failure.
- * It returns the new address of the memory, which may have been moved.
- * The function returns %NULL if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the new allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_renew(struct_type, mem, n_structs)	_G_RENEW (struct_type, mem, n_structs, try_realloc)
-
-
-/* Memory allocation virtualization for debugging purposes
- * g_mem_set_vtable() has to be the very first GLib function called
- * if being used
- */
-struct _GMemVTable {
-  gpointer (*malloc)      (gsize    n_bytes);
-  gpointer (*realloc)     (gpointer mem,
-			   gsize    n_bytes);
-  void     (*free)        (gpointer mem);
-  /* optional; set to NULL if not used ! */
-  gpointer (*calloc)      (gsize    n_blocks,
-			   gsize    n_block_bytes);
-  gpointer (*try_malloc)  (gsize    n_bytes);
-  gpointer (*try_realloc) (gpointer mem,
-			   gsize    n_bytes);
-};
-void	 g_mem_set_vtable (GMemVTable	*vtable);
-gboolean g_mem_is_system_malloc (void);
-
-GLIB_VAR gboolean g_mem_gc_friendly;
-
-/* Memory profiler and checker, has to be enabled via g_mem_set_vtable()
- */
-GLIB_VAR GMemVTable	*glib_mem_profiler_table;
-void	g_mem_profile	(void);
-
-G_END_DECLS
-
-#endif /* __G_MEM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gmessages.h b/GstreamerHelper/x64/include/glib-2.0/glib/gmessages.h
deleted file mode 100644
index 9cbcc838..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gmessages.h
+++ /dev/null
@@ -1,404 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MESSAGES_H__
-#define __G_MESSAGES_H__
-
-#include <stdarg.h>
-#include <glib/gtypes.h>
-#include <glib/gmacros.h>
-
-/* Suppress warnings when GCC is in -pedantic mode and not -std=c99
- */
-#if (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
-#pragma GCC system_header
-#endif
-
-G_BEGIN_DECLS
-
-/* calculate a string size, guaranteed to fit format + args.
- */
-gsize	g_printf_string_upper_bound (const gchar* format,
-				     va_list	  args);
-
-/* Log level shift offset for user defined
- * log levels (0-7 are used by GLib).
- */
-#define G_LOG_LEVEL_USER_SHIFT  (8)
-
-/* Glib log levels and flags.
- */
-typedef enum
-{
-  /* log flags */
-  G_LOG_FLAG_RECURSION          = 1 << 0,
-  G_LOG_FLAG_FATAL              = 1 << 1,
-
-  /* GLib log levels */
-  G_LOG_LEVEL_ERROR             = 1 << 2,       /* always fatal */
-  G_LOG_LEVEL_CRITICAL          = 1 << 3,
-  G_LOG_LEVEL_WARNING           = 1 << 4,
-  G_LOG_LEVEL_MESSAGE           = 1 << 5,
-  G_LOG_LEVEL_INFO              = 1 << 6,
-  G_LOG_LEVEL_DEBUG             = 1 << 7,
-
-  G_LOG_LEVEL_MASK              = ~(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL)
-} GLogLevelFlags;
-
-/* GLib log levels that are considered fatal by default */
-#define G_LOG_FATAL_MASK        (G_LOG_FLAG_RECURSION | G_LOG_LEVEL_ERROR)
-
-typedef void            (*GLogFunc)             (const gchar   *log_domain,
-                                                 GLogLevelFlags log_level,
-                                                 const gchar   *message,
-                                                 gpointer       user_data);
-
-/* Logging mechanism
- */
-guint           g_log_set_handler       (const gchar    *log_domain,
-                                         GLogLevelFlags  log_levels,
-                                         GLogFunc        log_func,
-                                         gpointer        user_data);
-void            g_log_remove_handler    (const gchar    *log_domain,
-                                         guint           handler_id);
-void            g_log_default_handler   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *message,
-                                         gpointer        unused_data);
-GLogFunc        g_log_set_default_handler (GLogFunc      log_func,
-					   gpointer      user_data);
-void            g_log                   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         ...) G_GNUC_PRINTF (3, 4);
-void            g_logv                  (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         va_list         args);
-GLogLevelFlags  g_log_set_fatal_mask    (const gchar    *log_domain,
-                                         GLogLevelFlags  fatal_mask);
-GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
-
-/* internal */
-G_GNUC_INTERNAL void	_g_log_fallback_handler	(const gchar   *log_domain,
-						 GLogLevelFlags log_level,
-						 const gchar   *message,
-						 gpointer       unused_data);
-
-/* Internal functions, used to implement the following macros */
-void g_return_if_fail_warning (const char *log_domain,
-			       const char *pretty_function,
-			       const char *expression);
-void g_warn_message           (const char     *domain,
-                               const char     *file,
-                               int             line,
-                               const char     *func,
-                               const char     *warnexpr);
-GLIB_DEPRECATED
-void g_assert_warning         (const char *log_domain,
-			       const char *file,
-			       const int   line,
-		               const char *pretty_function,
-		               const char *expression) G_GNUC_NORETURN;
-
-
-#ifndef G_LOG_DOMAIN
-#define G_LOG_DOMAIN    ((gchar*) 0)
-#endif  /* G_LOG_DOMAIN */
-#ifdef G_HAVE_ISO_VARARGS
-/* for(;;) ; so that GCC knows that control doesn't go past g_error().
- * Put space before ending semicolon to avoid C++ build warnings.
- */
-#define g_error(...)  G_STMT_START {                 \
-                        g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_ERROR,    \
-                               __VA_ARGS__);         \
-                        for (;;) ;                   \
-                      } G_STMT_END
-                        
-#define g_message(...)  g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_MESSAGE,  \
-                               __VA_ARGS__)
-#define g_critical(...) g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_CRITICAL, \
-                               __VA_ARGS__)
-#define g_warning(...)  g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_WARNING,  \
-                               __VA_ARGS__)
-#define g_debug(...)    g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_DEBUG,    \
-                               __VA_ARGS__)
-#elif defined(G_HAVE_GNUC_VARARGS)
-#define g_error(format...)    G_STMT_START {                 \
-                                g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_ERROR,    \
-                                       format);              \
-                                for (;;) ;                   \
-                              } G_STMT_END
-                              
-#define g_message(format...)    g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_MESSAGE,  \
-                                       format)
-#define g_critical(format...)   g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_CRITICAL, \
-                                       format)
-#define g_warning(format...)    g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_WARNING,  \
-                                       format)
-#define g_debug(format...)      g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_DEBUG,    \
-                                       format)
-#else   /* no varargs macros */
-static void
-g_error (const gchar *format,
-         ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
-  va_end (args);
-
-  for(;;) ;
-}
-static void
-g_message (const gchar *format,
-           ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, format, args);
-  va_end (args);
-}
-static void
-g_critical (const gchar *format,
-            ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, format, args);
-  va_end (args);
-}
-static void
-g_warning (const gchar *format,
-           ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, format, args);
-  va_end (args);
-}
-static void
-g_debug (const gchar *format,
-         ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
-  va_end (args);
-}
-#endif  /* !__GNUC__ */
-
-/**
- * GPrintFunc:
- * @string: the message to output
- *
- * Specifies the type of the print handler functions.
- * These are called with the complete formatted string to output.
- */
-typedef void    (*GPrintFunc)           (const gchar    *string);
-void            g_print                 (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_print_handler     (GPrintFunc      func);
-void            g_printerr              (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
-
-/**
- * g_warn_if_reached:
- *
- * Logs a critical warning.
- *
- * Since: 2.16
- */
-#define g_warn_if_reached() \
-  do { \
-    g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); \
-  } while (0)
-
-/**
- * g_warn_if_fail:
- * @expr: the expression to check
- *
- * Logs a warning if the expression is not true.
- *
- * Since: 2.16
- */
-#define g_warn_if_fail(expr) \
-  do { \
-    if G_LIKELY (expr) ; \
-    else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, #expr); \
-  } while (0)
-
-#ifdef G_DISABLE_CHECKS
-
-/**
- * g_return_if_fail:
- * @expr: the expression to check
- *
- * Verifies that the expression evaluates to %TRUE.  If the expression
- * evaluates to %FALSE, a critical message is logged and the current
- * function returns.  This can only be used in functions which do not
- * return a value.
- *
- * If G_DISABLE_CHECKS is defined then the check is not performed.  You
- * should therefore not depend on any side effects of @expr.
- */
-#define g_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
-
-/**
- * g_return_val_if_fail:
- * @expr: the expression to check
- * @val: the value to return from the current function
- *       if the expression is not true
- *
- * Verifies that the expression evaluates to %TRUE.  If the expression
- * evaluates to %FALSE, a critical message is logged and @val is
- * returned from the current function.
- *
- * If G_DISABLE_CHECKS is defined then the check is not performed.  You
- * should therefore not depend on any side effects of @expr.
- */
-#define g_return_val_if_fail(expr,val) G_STMT_START{ (void)0; }G_STMT_END
-
-/**
- * g_return_if_reached:
- *
- * Logs a critical message and returns from the current function.
- * This can only be used in functions which do not return a value.
- */
-#define g_return_if_reached() G_STMT_START{ return; }G_STMT_END
-
-/**
- * g_return_val_if_reached:
- * @val: the value to return from the current function
- *
- * Logs a critical message and returns @val.
- */
-#define g_return_val_if_reached(val) G_STMT_START{ return (val); }G_STMT_END
-
-#else /* !G_DISABLE_CHECKS */
-
-#ifdef __GNUC__
-
-#define g_return_if_fail(expr)		G_STMT_START{			\
-     if G_LIKELY(expr) { } else       					\
-       {								\
-	 g_return_if_fail_warning (G_LOG_DOMAIN,			\
-		                   __PRETTY_FUNCTION__,		        \
-		                   #expr);				\
-	 return;							\
-       };				}G_STMT_END
-
-#define g_return_val_if_fail(expr,val)	G_STMT_START{			\
-     if G_LIKELY(expr) { } else						\
-       {								\
-	 g_return_if_fail_warning (G_LOG_DOMAIN,			\
-		                   __PRETTY_FUNCTION__,		        \
-		                   #expr);				\
-	 return (val);							\
-       };				}G_STMT_END
-
-#define g_return_if_reached()		G_STMT_START{			\
-     g_log (G_LOG_DOMAIN,						\
-	    G_LOG_LEVEL_CRITICAL,					\
-	    "file %s: line %d (%s): should not be reached",		\
-	    __FILE__,							\
-	    __LINE__,							\
-	    __PRETTY_FUNCTION__);					\
-     return;				}G_STMT_END
-
-#define g_return_val_if_reached(val)	G_STMT_START{			\
-     g_log (G_LOG_DOMAIN,						\
-	    G_LOG_LEVEL_CRITICAL,					\
-	    "file %s: line %d (%s): should not be reached",		\
-	    __FILE__,							\
-	    __LINE__,							\
-	    __PRETTY_FUNCTION__);					\
-     return (val);			}G_STMT_END
-
-#else /* !__GNUC__ */
-
-#define g_return_if_fail(expr)		G_STMT_START{		\
-     if (expr) { } else						\
-       {							\
-	 g_log (G_LOG_DOMAIN,					\
-		G_LOG_LEVEL_CRITICAL,				\
-		"file %s: line %d: assertion `%s' failed",	\
-		__FILE__,					\
-		__LINE__,					\
-		#expr);						\
-	 return;						\
-       };				}G_STMT_END
-
-#define g_return_val_if_fail(expr, val)	G_STMT_START{		\
-     if (expr) { } else						\
-       {							\
-	 g_log (G_LOG_DOMAIN,					\
-		G_LOG_LEVEL_CRITICAL,				\
-		"file %s: line %d: assertion `%s' failed",	\
-		__FILE__,					\
-		__LINE__,					\
-		#expr);						\
-	 return (val);						\
-       };				}G_STMT_END
-
-#define g_return_if_reached()		G_STMT_START{		\
-     g_log (G_LOG_DOMAIN,					\
-	    G_LOG_LEVEL_CRITICAL,				\
-	    "file %s: line %d: should not be reached",		\
-	    __FILE__,						\
-	    __LINE__);						\
-     return;				}G_STMT_END
-
-#define g_return_val_if_reached(val)	G_STMT_START{		\
-     g_log (G_LOG_DOMAIN,					\
-	    G_LOG_LEVEL_CRITICAL,				\
-	    "file %s: line %d: should not be reached",		\
-	    __FILE__,						\
-	    __LINE__);						\
-     return (val);			}G_STMT_END
-
-#endif /* !__GNUC__ */
-
-#endif /* !G_DISABLE_CHECKS */
-
-G_END_DECLS
-
-#endif /* __G_MESSAGES_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gnode.h b/GstreamerHelper/x64/include/glib-2.0/glib/gnode.h
deleted file mode 100644
index 7ffdcbfc..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gnode.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_NODE_H__
-#define __G_NODE_H__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GNode		GNode;
-
-/* Tree traverse flags */
-typedef enum
-{
-  G_TRAVERSE_LEAVES     = 1 << 0,
-  G_TRAVERSE_NON_LEAVES = 1 << 1,
-  G_TRAVERSE_ALL        = G_TRAVERSE_LEAVES | G_TRAVERSE_NON_LEAVES,
-  G_TRAVERSE_MASK       = 0x03,
-  G_TRAVERSE_LEAFS      = G_TRAVERSE_LEAVES,
-  G_TRAVERSE_NON_LEAFS  = G_TRAVERSE_NON_LEAVES
-} GTraverseFlags;
-
-/* Tree traverse orders */
-typedef enum
-{
-  G_IN_ORDER,
-  G_PRE_ORDER,
-  G_POST_ORDER,
-  G_LEVEL_ORDER
-} GTraverseType;
-
-typedef gboolean	(*GNodeTraverseFunc)	(GNode	       *node,
-						 gpointer	data);
-typedef void		(*GNodeForeachFunc)	(GNode	       *node,
-						 gpointer	data);
-
-/**
- * GCopyFunc:
- * @src: A pointer to the data which should be copied
- * @data: Additional data
- *
- * A function of this signature is used to copy the node data 
- * when doing a deep-copy of a tree.
- *
- * Returns: A pointer to the copy
- *
- * Since: 2.4
- */
-typedef gpointer	(*GCopyFunc)            (gconstpointer  src,
-                                                 gpointer       data);
-
-/* N-way tree implementation
- */
-struct _GNode
-{
-  gpointer data;
-  GNode	  *next;
-  GNode	  *prev;
-  GNode	  *parent;
-  GNode	  *children;
-};
-
-/**
- * G_NODE_IS_ROOT:
- * @node: a #GNode
- *
- * Returns %TRUE if a #GNode is the root of a tree.
- *
- * Returns: %TRUE if the #GNode is the root of a tree 
- *     (i.e. it has no parent or siblings)
- */
-#define	 G_NODE_IS_ROOT(node)	(((GNode*) (node))->parent == NULL && \
-				 ((GNode*) (node))->prev == NULL && \
-				 ((GNode*) (node))->next == NULL)
-
-/**
- * G_NODE_IS_LEAF:
- * @node: a #GNode
- *
- * Returns %TRUE if a #GNode is a leaf node.
- *
- * Returns: %TRUE if the #GNode is a leaf node 
- *     (i.e. it has no children)
- */
-#define	 G_NODE_IS_LEAF(node)	(((GNode*) (node))->children == NULL)
-
-GNode*	 g_node_new		(gpointer	   data);
-void	 g_node_destroy		(GNode		  *root);
-void	 g_node_unlink		(GNode		  *node);
-GNode*   g_node_copy_deep       (GNode            *node,
-				 GCopyFunc         copy_func,
-				 gpointer          data);
-GNode*   g_node_copy            (GNode            *node);
-GNode*	 g_node_insert		(GNode		  *parent,
-				 gint		   position,
-				 GNode		  *node);
-GNode*	 g_node_insert_before	(GNode		  *parent,
-				 GNode		  *sibling,
-				 GNode		  *node);
-GNode*   g_node_insert_after    (GNode            *parent,
-				 GNode            *sibling,
-				 GNode            *node); 
-GNode*	 g_node_prepend		(GNode		  *parent,
-				 GNode		  *node);
-guint	 g_node_n_nodes		(GNode		  *root,
-				 GTraverseFlags	   flags);
-GNode*	 g_node_get_root	(GNode		  *node);
-gboolean g_node_is_ancestor	(GNode		  *node,
-				 GNode		  *descendant);
-guint	 g_node_depth		(GNode		  *node);
-GNode*	 g_node_find		(GNode		  *root,
-				 GTraverseType	   order,
-				 GTraverseFlags	   flags,
-				 gpointer	   data);
-
-/* convenience macros */
-/**
- * g_node_append:
- * @parent: the #GNode to place the new #GNode under
- * @node: the #GNode to insert
- *
- * Inserts a #GNode as the last child of the given parent.
- *
- * Returns: the inserted #GNode
- */
-#define g_node_append(parent, node)				\
-     g_node_insert_before ((parent), NULL, (node))
-
-/**
- * g_node_insert_data:
- * @parent: the #GNode to place the new #GNode under
- * @position: the position to place the new #GNode at. If position is -1, 
- *     the new #GNode is inserted as the last child of @parent
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode at the given position.
- *
- * Returns: the new #GNode
- */
-#define	g_node_insert_data(parent, position, data)		\
-     g_node_insert ((parent), (position), g_node_new (data))
-
-/**
- * g_node_insert_data_after:
- * @parent: the #GNode to place the new #GNode under
- * @sibling: the sibling #GNode to place the new #GNode after
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode after the given sibling.
- *
- * Returns: the new #GNode
- */
-
-#define	g_node_insert_data_after(parent, sibling, data)	\
-     g_node_insert_after ((parent), (sibling), g_node_new (data))
-/**
- * g_node_insert_data_before:
- * @parent: the #GNode to place the new #GNode under
- * @sibling: the sibling #GNode to place the new #GNode before
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode before the given sibling.
- *
- * Returns: the new #GNode
- */
-#define	g_node_insert_data_before(parent, sibling, data)	\
-     g_node_insert_before ((parent), (sibling), g_node_new (data))
-
-/**
- * g_node_prepend_data:
- * @parent: the #GNode to place the new #GNode under
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode as the first child of the given parent.
- *
- * Returns: the new #GNode
- */
-#define	g_node_prepend_data(parent, data)			\
-     g_node_prepend ((parent), g_node_new (data))
-
-/**
- * g_node_append_data:
- * @parent: the #GNode to place the new #GNode under
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode as the last child of the given parent.
- *
- * Returns: the new #GNode
- */
-#define	g_node_append_data(parent, data)			\
-     g_node_insert_before ((parent), NULL, g_node_new (data))
-
-/* traversal function, assumes that `node' is root
- * (only traverses `node' and its subtree).
- * this function is just a high level interface to
- * low level traversal functions, optimized for speed.
- */
-void	 g_node_traverse	(GNode		  *root,
-				 GTraverseType	   order,
-				 GTraverseFlags	   flags,
-				 gint		   max_depth,
-				 GNodeTraverseFunc func,
-				 gpointer	   data);
-
-/* return the maximum tree height starting with `node', this is an expensive
- * operation, since we need to visit all nodes. this could be shortened by
- * adding `guint height' to struct _GNode, but then again, this is not very
- * often needed, and would make g_node_insert() more time consuming.
- */
-guint	 g_node_max_height	 (GNode *root);
-
-void	 g_node_children_foreach (GNode		  *node,
-				  GTraverseFlags   flags,
-				  GNodeForeachFunc func,
-				  gpointer	   data);
-void	 g_node_reverse_children (GNode		  *node);
-guint	 g_node_n_children	 (GNode		  *node);
-GNode*	 g_node_nth_child	 (GNode		  *node,
-				  guint		   n);
-GNode*	 g_node_last_child	 (GNode		  *node);
-GNode*	 g_node_find_child	 (GNode		  *node,
-				  GTraverseFlags   flags,
-				  gpointer	   data);
-gint	 g_node_child_position	 (GNode		  *node,
-				  GNode		  *child);
-gint	 g_node_child_index	 (GNode		  *node,
-				  gpointer	   data);
-
-GNode*	 g_node_first_sibling	 (GNode		  *node);
-GNode*	 g_node_last_sibling	 (GNode		  *node);
-
-/**
- * g_node_prev_sibling:
- * @node: a #GNode
- *
- * Gets the previous sibling of a #GNode.
- *
- * Returns: the previous sibling of @node, or %NULL if @node is the first
- *     node or %NULL
- */
-#define	 g_node_prev_sibling(node)	((node) ? \
-					 ((GNode*) (node))->prev : NULL)
-
-/**
- * g_node_next_sibling:
- * @node: a #GNode
- *
- * Gets the next sibling of a #GNode.
- *
- * Returns: the next sibling of @node, or %NULL if @node is the last node
- *     or %NULL
- */
-#define	 g_node_next_sibling(node)	((node) ? \
-					 ((GNode*) (node))->next : NULL)
-
-/**
- * g_node_first_child:
- * @node: a #GNode
- *
- * Gets the first child of a #GNode.
- *
- * Returns: the first child of @node, or %NULL if @node is %NULL 
- *     or has no children
- */
-#define	 g_node_first_child(node)	((node) ? \
-					 ((GNode*) (node))->children : NULL)
-
-G_END_DECLS
-
-#endif /* __G_NODE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/goption.h b/GstreamerHelper/x64/include/glib-2.0/glib/goption.h
deleted file mode 100644
index 7d1f2a1d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/goption.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/* goption.h - Option parser
- *
- *  Copyright (C) 2004  Anders Carlsson <andersca@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_OPTION_H__
-#define __G_OPTION_H__
-
-#include <glib/gerror.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/**
- * GOptionContext:
- * 
- * A <structname>GOptionContext</structname> struct defines which options
- * are accepted by the commandline option parser. The struct has only private 
- * fields and should not be directly accessed.
- */
-typedef struct _GOptionContext GOptionContext;
-
-/**
- * GOptionGroup:
- *
- * A <structname>GOptionGroup</structname> struct defines the options in a single
- * group. The struct has only private fields and should not be directly accessed.
- *
- * All options in a group share the same translation function. Libraries which
- * need to parse commandline options are expected to provide a function for
- * getting a <structname>GOptionGroup</structname> holding their options, which
- * the application can then add to its #GOptionContext.
- */
-typedef struct _GOptionGroup   GOptionGroup;
-typedef struct _GOptionEntry   GOptionEntry;
-
-/**
- * GOptionFlags:
- * @G_OPTION_FLAG_HIDDEN: The option doesn't appear in <option>--help</option>
- *  output.
- * @G_OPTION_FLAG_IN_MAIN: The option appears in the main section of the
- *  <option>--help</option> output, even if it is defined in a group.
- * @G_OPTION_FLAG_REVERSE: For options of the %G_OPTION_ARG_NONE kind, this flag
- *  indicates that the sense of the option is reversed.
- * @G_OPTION_FLAG_NO_ARG: For options of the %G_OPTION_ARG_CALLBACK kind,
- *  this flag indicates that the callback does not take any argument
- *  (like a %G_OPTION_ARG_NONE option). Since 2.8
- * @G_OPTION_FLAG_FILENAME: For options of the %G_OPTION_ARG_CALLBACK
- *  kind, this flag indicates that the argument should be passed to the
- *  callback in the GLib filename encoding rather than UTF-8. Since 2.8
- * @G_OPTION_FLAG_OPTIONAL_ARG: For options of the %G_OPTION_ARG_CALLBACK 
- *  kind, this flag indicates that the argument supply is optional. If no argument
- *  is given then data of %GOptionParseFunc will be set to NULL. Since 2.8
- * @G_OPTION_FLAG_NOALIAS: This flag turns off the automatic conflict resolution
- *  which prefixes long option names with <literal>groupname-</literal> if 
- *  there is a conflict. This option should only be used in situations where
- *  aliasing is necessary to model some legacy commandline interface. It is
- *  not safe to use this option, unless all option groups are under your 
- *  direct control. Since 2.8.
- * 
- * Flags which modify individual options.
- */
-typedef enum
-{
-  G_OPTION_FLAG_HIDDEN		= 1 << 0,
-  G_OPTION_FLAG_IN_MAIN		= 1 << 1,
-  G_OPTION_FLAG_REVERSE		= 1 << 2,
-  G_OPTION_FLAG_NO_ARG		= 1 << 3,
-  G_OPTION_FLAG_FILENAME	= 1 << 4,
-  G_OPTION_FLAG_OPTIONAL_ARG    = 1 << 5,
-  G_OPTION_FLAG_NOALIAS	        = 1 << 6
-} GOptionFlags;
-
-/**
- * GOptionArg:
- * @G_OPTION_ARG_NONE: No extra argument. This is useful for simple flags.
- * @G_OPTION_ARG_STRING: The option takes a string argument.
- * @G_OPTION_ARG_INT: The option takes an integer argument.
- * @G_OPTION_ARG_CALLBACK: The option provides a callback to parse the
- *  extra argument.
- * @G_OPTION_ARG_FILENAME: The option takes a filename as argument.
- * @G_OPTION_ARG_STRING_ARRAY: The option takes a string argument, multiple
- *  uses of the option are collected into an array of strings.
- * @G_OPTION_ARG_FILENAME_ARRAY: The option takes a filename as argument, 
- *  multiple uses of the option are collected into an array of strings.
- * @G_OPTION_ARG_DOUBLE: The option takes a double argument. The argument
- *  can be formatted either for the user's locale or for the "C" locale. Since 2.12
- * @G_OPTION_ARG_INT64: The option takes a 64-bit integer. Like %G_OPTION_ARG_INT
- *  but for larger numbers. The number can be in decimal base, or in hexadecimal
- *  (when prefixed with <literal>0x</literal>, for example, <literal>0xffffffff</literal>).
- *  Since 2.12
- * 
- * The #GOptionArg enum values determine which type of extra argument the
- * options expect to find. If an option expects an extra argument, it
- * can be specified in several ways; with a short option:
- * <option>-x arg</option>, with a long option: <option>--name arg</option>
- * or combined in a single argument: <option>--name=arg</option>.
- */
-typedef enum
-{
-  G_OPTION_ARG_NONE,
-  G_OPTION_ARG_STRING,
-  G_OPTION_ARG_INT,
-  G_OPTION_ARG_CALLBACK,
-  G_OPTION_ARG_FILENAME,
-  G_OPTION_ARG_STRING_ARRAY,
-  G_OPTION_ARG_FILENAME_ARRAY,
-  G_OPTION_ARG_DOUBLE,
-  G_OPTION_ARG_INT64
-} GOptionArg;
-
-/**
- * GOptionArgFunc:
- * @option_name: The name of the option being parsed. This will be either a 
- *  single dash followed by a single letter (for a short name) or two dashes
- *  followed by a long option name.
- * @value: The value to be parsed.
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: A return location for errors. The error code %G_OPTION_ERROR_FAILED
- *  is intended to be used for errors in #GOptionArgFunc callbacks.
- * 
- * The type of function to be passed as callback for %G_OPTION_ARG_CALLBACK
- * options.
- * 
- * Returns: %TRUE if the option was successfully parsed, %FALSE if an error 
- *  occurred, in which case @error should be set with g_set_error()
- */
-typedef gboolean (*GOptionArgFunc) (const gchar    *option_name,
-				    const gchar    *value,
-				    gpointer        data,
-				    GError        **error);
-
-/**
- * GOptionParseFunc:
- * @context: The active #GOptionContext
- * @group: The group to which the function belongs
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: A return location for error details
- * 
- * The type of function that can be called before and after parsing. 
- * 
- * Returns: %TRUE if the function completed successfully, %FALSE if an error 
- *  occurred, in which case @error should be set with g_set_error()
- */
-typedef gboolean (*GOptionParseFunc) (GOptionContext *context,
-				      GOptionGroup   *group,
-				      gpointer	      data,
-				      GError        **error);
-
-/**
- * GOptionErrorFunc:
- * @context: The active #GOptionContext
- * @group: The group to which the function belongs
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: The #GError containing details about the parse error
- * 
- * The type of function to be used as callback when a parse error occurs.
- */
-typedef void (*GOptionErrorFunc) (GOptionContext *context,
-				  GOptionGroup   *group,
-				  gpointer        data,
-				  GError        **error);
-
-/**
- * G_OPTION_ERROR:
- * 
- * Error domain for option parsing. Errors in this domain will
- * be from the #GOptionError enumeration. See #GError for information on 
- * error domains.
- */
-#define G_OPTION_ERROR (g_option_error_quark ())
-
-/**
- * GOptionError:
- * @G_OPTION_ERROR_UNKNOWN_OPTION: An option was not known to the parser.
- *  This error will only be reported, if the parser hasn't been instructed
- *  to ignore unknown options, see g_option_context_set_ignore_unknown_options().
- * @G_OPTION_ERROR_BAD_VALUE: A value couldn't be parsed.
- * @G_OPTION_ERROR_FAILED: A #GOptionArgFunc callback failed.
- * 
- * Error codes returned by option parsing.
- */
-typedef enum
-{
-  G_OPTION_ERROR_UNKNOWN_OPTION,
-  G_OPTION_ERROR_BAD_VALUE,
-  G_OPTION_ERROR_FAILED
-} GOptionError;
-
-GQuark g_option_error_quark (void);
-
-/**
- * GOptionEntry:
- * @long_name: The long name of an option can be used to specify it
- *  in a commandline as --<replaceable>long_name</replaceable>. Every
- *  option must have a long name. To resolve conflicts if multiple
- *  option groups contain the same long name, it is also possible to
- *  specify the option as 
- *  --<replaceable>groupname</replaceable>-<replaceable>long_name</replaceable>.
- * @short_name: If an option has a short name, it can be specified
- *  -<replaceable>short_name</replaceable> in a commandline. @short_name must be 
- *  a printable ASCII character different from '-', or zero if the option has no
- *  short name.
- * @flags: Flags from #GOptionFlags.
- * @arg: The type of the option, as a #GOptionArg.
- * @arg_data: If the @arg type is %G_OPTION_ARG_CALLBACK, then @arg_data must 
- *  point to a #GOptionArgFunc callback function, which will be called to handle 
- *  the extra argument. Otherwise, @arg_data is a pointer to a location to store 
- *  the value, the required type of the location depends on the @arg type:
- *  <variablelist>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_NONE</term>
- *  <listitem><para>%gboolean</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_STRING</term>
- *  <listitem><para>%gchar*</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_INT</term>
- *  <listitem><para>%gint</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_FILENAME</term>
- *  <listitem><para>%gchar*</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_STRING_ARRAY</term>
- *  <listitem><para>%gchar**</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_FILENAME_ARRAY</term>
- *  <listitem><para>%gchar**</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_DOUBLE</term>
- *  <listitem><para>%gdouble</para></listitem>
- *  </varlistentry>
- *  </variablelist>
- *  If @arg type is %G_OPTION_ARG_STRING or %G_OPTION_ARG_FILENAME the location
- *  will contain a newly allocated string if the option was given. That string
- *  needs to be freed by the callee using g_free(). Likewise if @arg type is
- *  %G_OPTION_ARG_STRING_ARRAY or %G_OPTION_ARG_FILENAME_ARRAY, the data should
- *  be freed using g_strfreev().
- * @description: the description for the option in <option>--help</option>
- *  output. The @description is translated using the @translate_func of the
- *  group, see g_option_group_set_translation_domain().
- * @arg_description: The placeholder to use for the extra argument parsed
- *  by the option in <option>--help</option>
- *  output. The @arg_description is translated using the @translate_func of the
- *  group, see g_option_group_set_translation_domain().
- * 
- * A <structname>GOptionEntry</structname> defines a single option.
- * To have an effect, they must be added to a #GOptionGroup with
- * g_option_context_add_main_entries() or g_option_group_add_entries().
- */
-struct _GOptionEntry
-{
-  const gchar *long_name;
-  gchar        short_name;
-  gint         flags;
-
-  GOptionArg   arg;
-  gpointer     arg_data;
-  
-  const gchar *description;
-  const gchar *arg_description;
-};
-
-/**
- * G_OPTION_REMAINING:
- * 
- * If a long option in the main group has this name, it is not treated as a 
- * regular option. Instead it collects all non-option arguments which would
- * otherwise be left in <literal>argv</literal>. The option must be of type
- * %G_OPTION_ARG_CALLBACK, %G_OPTION_ARG_STRING_ARRAY
- * or %G_OPTION_ARG_FILENAME_ARRAY.
- * 
- * 
- * Using #G_OPTION_REMAINING instead of simply scanning <literal>argv</literal>
- * for leftover arguments has the advantage that GOption takes care of 
- * necessary encoding conversions for strings or filenames.
- * 
- * Since: 2.6
- */
-#define G_OPTION_REMAINING ""
-
-GOptionContext *g_option_context_new              (const gchar         *parameter_string);
-void            g_option_context_set_summary      (GOptionContext      *context,
-                                                   const gchar         *summary);
-const gchar *   g_option_context_get_summary      (GOptionContext     *context);
-void            g_option_context_set_description  (GOptionContext      *context,
-                                                   const gchar         *description);
-const gchar *   g_option_context_get_description  (GOptionContext     *context);
-void            g_option_context_free             (GOptionContext      *context);
-void		g_option_context_set_help_enabled (GOptionContext      *context,
-						   gboolean		help_enabled);
-gboolean	g_option_context_get_help_enabled (GOptionContext      *context);
-void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
-							     gboolean	     ignore_unknown);
-gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
-
-void            g_option_context_add_main_entries (GOptionContext      *context,
-						   const GOptionEntry  *entries,
-						   const gchar         *translation_domain);
-gboolean        g_option_context_parse            (GOptionContext      *context,
-						   gint                *argc,
-						   gchar             ***argv,
-						   GError             **error);
-void            g_option_context_set_translate_func (GOptionContext     *context,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void            g_option_context_set_translation_domain (GOptionContext  *context,
-							 const gchar     *domain);
-
-void            g_option_context_add_group      (GOptionContext *context,
-						 GOptionGroup   *group);
-void          g_option_context_set_main_group (GOptionContext *context,
-					       GOptionGroup   *group);
-GOptionGroup *g_option_context_get_main_group (GOptionContext *context);
-gchar        *g_option_context_get_help       (GOptionContext *context,
-                                               gboolean        main_help,
-                                               GOptionGroup   *group);
-
-GOptionGroup *g_option_group_new                    (const gchar        *name,
-						     const gchar        *description,
-						     const gchar        *help_description,
-						     gpointer            user_data,
-						     GDestroyNotify      destroy);
-void	      g_option_group_set_parse_hooks	    (GOptionGroup       *group,
-						     GOptionParseFunc    pre_parse_func,
-						     GOptionParseFunc	 post_parse_func);
-void	      g_option_group_set_error_hook	    (GOptionGroup       *group,
-						     GOptionErrorFunc	 error_func);
-void          g_option_group_free                   (GOptionGroup       *group);
-void          g_option_group_add_entries            (GOptionGroup       *group,
-						     const GOptionEntry *entries);
-void          g_option_group_set_translate_func     (GOptionGroup       *group,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void          g_option_group_set_translation_domain (GOptionGroup       *group,
-						     const gchar        *domain);
-
-G_END_DECLS
-
-#endif /* __G_OPTION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gpattern.h b/GstreamerHelper/x64/include/glib-2.0/glib/gpattern.h
deleted file mode 100644
index e692d902..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gpattern.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 1999  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_PATTERN_H__
-#define __G_PATTERN_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-
-typedef struct _GPatternSpec    GPatternSpec;
-
-GPatternSpec* g_pattern_spec_new       (const gchar  *pattern);
-void          g_pattern_spec_free      (GPatternSpec *pspec);
-gboolean      g_pattern_spec_equal     (GPatternSpec *pspec1,
-					GPatternSpec *pspec2);
-gboolean      g_pattern_match          (GPatternSpec *pspec,
-					guint         string_length,
-					const gchar  *string,
-					const gchar  *string_reversed);
-gboolean      g_pattern_match_string   (GPatternSpec *pspec,
-					const gchar  *string);
-gboolean      g_pattern_match_simple   (const gchar  *pattern,
-					const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_PATTERN_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gpoll.h b/GstreamerHelper/x64/include/glib-2.0/glib/gpoll.h
deleted file mode 100644
index f28b758e..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gpoll.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* gpoll.h - poll(2) support
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (__G_MAIN_H__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_POLL_H__
-#define __G_POLL_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Any definitions using GPollFD or GPollFunc are primarily
- * for Unix and not guaranteed to be the compatible on all
- * operating systems on which GLib runs. Right now, the
- * GLib does use these functions on Win32 as well, but interprets
- * them in a fairly different way than on Unix. If you use
- * these definitions, you are should be prepared to recode
- * for different operating systems.
- *
- * Note that on systems with a working poll(2), that function is used
- * in place of g_poll(). Thus g_poll() must have the same signature as
- * poll(), meaning GPollFD must have the same layout as struct pollfd.
- *
- *
- * On Win32, the fd in a GPollFD should be Win32 HANDLE (*not* a file
- * descriptor as provided by the C runtime) that can be used by
- * MsgWaitForMultipleObjects. This does *not* include file handles
- * from CreateFile, SOCKETs, nor pipe handles. (But you can use
- * WSAEventSelect to signal events when a SOCKET is readable).
- *
- * On Win32, fd can also be the special value G_WIN32_MSG_HANDLE to
- * indicate polling for messages.
- *
- * But note that G_WIN32_MSG_HANDLE GPollFDs should not be used by GDK
- * (GTK) programs, as GDK itself wants to read messages and convert them
- * to GDK events.
- *
- * So, unless you really know what you are doing, it's best not to try
- * to use the main loop polling stuff for your own needs on
- * Windows.
- */
-typedef struct _GPollFD GPollFD;
-
-/**
- * GPollFunc:
- * @ufds: an array of #GPollFD elements
- * @nfsd: the number of elements in @ufds
- * @timeout_: the maximum time to wait for an event of the file descriptors.
- *     A negative value indicates an infinite timeout.
- *
- * Specifies the type of function passed to g_main_context_set_poll_func().
- * The semantics of the function should match those of the poll() system call.
- *
- * Returns: the number of #GPollFD elements which have events or errors
- *     reported, or -1 if an error occurred.
- */
-typedef gint    (*GPollFunc)    (GPollFD *ufds,
-                                 guint    nfsd,
-                                 gint     timeout_);
-
-/**
- * GPollFD:
- * @fd: the file descriptor to poll (or a <type>HANDLE</type> on Win32)
- * @events: a bitwise combination from #GIOCondition, specifying which
- *     events should be polled for. Typically for reading from a file
- *     descriptor you would use %G_IO_IN | %G_IO_HUP | %G_IO_ERR, and
- *     for writing you would use %G_IO_OUT | %G_IO_ERR.
- * @revents: a bitwise combination of flags from #GIOCondition, returned
- *     from the poll() function to indicate which events occurred.
- *
- * Represents a file descriptor, which events to poll for, and which events
- * occurred.
- */
-struct _GPollFD
-{
-#if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8
-  gint64	fd;
-#else
-  gint		fd;
-#endif
-  gushort 	events;
-  gushort 	revents;
-};
-
-#ifdef G_OS_WIN32
-#if GLIB_SIZEOF_VOID_P == 8
-#define G_POLLFD_FORMAT "%#I64x"
-#else
-#define G_POLLFD_FORMAT "%#x"
-#endif
-#else
-#define G_POLLFD_FORMAT "%d"
-#endif
-
-gint g_poll (GPollFD *fds,
-	     guint    nfds,
-	     gint     timeout);
-
-G_END_DECLS
-
-#endif /* __G_POLL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gprimes.h b/GstreamerHelper/x64/include/glib-2.0/glib/gprimes.h
deleted file mode 100644
index 19f57021..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gprimes.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_PRIMES_H__
-#define __G_PRIMES_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Prime numbers.
- */
-
-/* This function returns prime numbers spaced by approximately 1.5-2.0
- * and is for use in resizing data structures which prefer
- * prime-valued sizes.	The closest spaced prime function returns the
- * next largest prime, or the highest it knows about which is about
- * MAXINT/4.
- */
-guint	   g_spaced_primes_closest (guint num) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PRIMES_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gprintf.h b/GstreamerHelper/x64/include/glib-2.0/glib/gprintf.h
deleted file mode 100644
index d96870fb..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gprintf.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_PRINTF_H__
-#define __G_PRINTF_H__
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-gint                  g_printf    (gchar const *format,
-                                   ...) G_GNUC_PRINTF (1, 2);
-gint                  g_fprintf   (FILE        *file,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-gint                  g_sprintf   (gchar       *string,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-
-gint                  g_vprintf   (gchar const *format,
-                                   va_list      args);
-gint                  g_vfprintf  (FILE        *file,
-				   gchar const *format,
-				   va_list      args);
-gint                  g_vsprintf  (gchar       *string,
-				   gchar const *format,
-				   va_list      args);
-gint                  g_vasprintf (gchar      **string,
-				   gchar const *format,
-				   va_list      args);
-
-G_END_DECLS
-
-#endif /* __G_PRINTF_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gqsort.h b/GstreamerHelper/x64/include/glib-2.0/glib/gqsort.h
deleted file mode 100644
index 05b4b66f..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gqsort.h
+++ /dev/null
@@ -1,46 +0,0 @@
- /* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QSORT_H__
-#define __G_QSORT_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-void g_qsort_with_data (gconstpointer    pbase,
-			gint             total_elems,
-			gsize            size,
-			GCompareDataFunc compare_func,
-			gpointer         user_data);
-
-G_END_DECLS
-
-#endif /* __G_QSORT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gquark.h b/GstreamerHelper/x64/include/glib-2.0/glib/gquark.h
deleted file mode 100644
index 39d22ab1..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gquark.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QUARK_H__
-#define __G_QUARK_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 GQuark;
-
-/* Quarks (string<->id association)
- */
-GQuark                g_quark_try_string         (const gchar *string);
-GQuark                g_quark_from_static_string (const gchar *string);
-GQuark                g_quark_from_string        (const gchar *string);
-const gchar *         g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
-
-#define G_DEFINE_QUARK(QN, q_n)                                         \
-GQuark                                                                  \
-q_n##_quark (void)                                                      \
-{                                                                       \
-  static GQuark q;                                                      \
-                                                                        \
-  if G_UNLIKELY (q == 0)                                                \
-    q = g_quark_from_static_string (#QN);                               \
-                                                                        \
-  return q;                                                             \
-}
-
-const gchar *         g_intern_string            (const gchar *string);
-const gchar *         g_intern_static_string     (const gchar *string);
-
-G_END_DECLS
-
-#endif /* __G_QUARK_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gqueue.h b/GstreamerHelper/x64/include/glib-2.0/glib/gqueue.h
deleted file mode 100644
index 1d13eef8..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gqueue.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QUEUE_H__
-#define __G_QUEUE_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GQueue GQueue;
-
-/**
- * GQueue:
- * @head: a pointer to the first element of the queue
- * @tail: a pointer to the last element of the queue
- * @length: the number of elements in the queue
- *
- * Contains the public fields of a
- * <link linkend="glib-Double-ended-Queues">Queue</link>.
- */
-struct _GQueue
-{
-  GList *head;
-  GList *tail;
-  guint  length;
-};
-
-/**
- * G_QUEUE_INIT:
- *
- * A statically-allocated #GQueue must be initialized with this
- * macro before it can be used. This macro can be used to initialize
- * a variable, but it cannot be assigned to a variable. In that case
- * you have to use g_queue_init().
- *
- * |[
- * GQueue my_queue = G_QUEUE_INIT;
- * ]|
- *
- * Since: 2.14
- */
-#define G_QUEUE_INIT { NULL, NULL, 0 }
-
-/* Queues
- */
-GQueue*  g_queue_new            (void);
-void     g_queue_free           (GQueue           *queue);
-void     g_queue_free_full      (GQueue           *queue,
-				GDestroyNotify    free_func);
-void     g_queue_init           (GQueue           *queue);
-void     g_queue_clear          (GQueue           *queue);
-gboolean g_queue_is_empty       (GQueue           *queue);
-guint    g_queue_get_length     (GQueue           *queue);
-void     g_queue_reverse        (GQueue           *queue);
-GQueue * g_queue_copy           (GQueue           *queue);
-void     g_queue_foreach        (GQueue           *queue,
-                                 GFunc             func,
-                                 gpointer          user_data);
-GList *  g_queue_find           (GQueue           *queue,
-                                 gconstpointer     data);
-GList *  g_queue_find_custom    (GQueue           *queue,
-                                 gconstpointer     data,
-                                 GCompareFunc      func);
-void     g_queue_sort           (GQueue           *queue,
-                                 GCompareDataFunc  compare_func,
-                                 gpointer          user_data);
-
-void     g_queue_push_head      (GQueue           *queue,
-                                 gpointer          data);
-void     g_queue_push_tail      (GQueue           *queue,
-                                 gpointer          data);
-void     g_queue_push_nth       (GQueue           *queue,
-                                 gpointer          data,
-                                 gint              n);
-gpointer g_queue_pop_head       (GQueue           *queue);
-gpointer g_queue_pop_tail       (GQueue           *queue);
-gpointer g_queue_pop_nth        (GQueue           *queue,
-                                 guint             n);
-gpointer g_queue_peek_head      (GQueue           *queue);
-gpointer g_queue_peek_tail      (GQueue           *queue);
-gpointer g_queue_peek_nth       (GQueue           *queue,
-                                 guint             n);
-gint     g_queue_index          (GQueue           *queue,
-                                 gconstpointer     data);
-gboolean g_queue_remove         (GQueue           *queue,
-                                 gconstpointer     data);
-guint    g_queue_remove_all     (GQueue           *queue,
-                                 gconstpointer     data);
-void     g_queue_insert_before  (GQueue           *queue,
-                                 GList            *sibling,
-                                 gpointer          data);
-void     g_queue_insert_after   (GQueue           *queue,
-                                 GList            *sibling,
-                                 gpointer          data);
-void     g_queue_insert_sorted  (GQueue           *queue,
-                                 gpointer          data,
-                                 GCompareDataFunc  func,
-                                 gpointer          user_data);
-
-void     g_queue_push_head_link (GQueue           *queue,
-                                 GList            *link_);
-void     g_queue_push_tail_link (GQueue           *queue,
-                                 GList            *link_);
-void     g_queue_push_nth_link  (GQueue           *queue,
-                                 gint              n,
-                                 GList            *link_);
-GList*   g_queue_pop_head_link  (GQueue           *queue);
-GList*   g_queue_pop_tail_link  (GQueue           *queue);
-GList*   g_queue_pop_nth_link   (GQueue           *queue,
-                                 guint             n);
-GList*   g_queue_peek_head_link (GQueue           *queue);
-GList*   g_queue_peek_tail_link (GQueue           *queue);
-GList*   g_queue_peek_nth_link  (GQueue           *queue,
-                                 guint             n);
-gint     g_queue_link_index     (GQueue           *queue,
-                                 GList            *link_);
-void     g_queue_unlink         (GQueue           *queue,
-                                 GList            *link_);
-void     g_queue_delete_link    (GQueue           *queue,
-                                 GList            *link_);
-
-G_END_DECLS
-
-#endif /* __G_QUEUE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/grand.h b/GstreamerHelper/x64/include/glib-2.0/glib/grand.h
deleted file mode 100644
index 182616b3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/grand.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_RAND_H__
-#define __G_RAND_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GRand           GRand;
-
-/* GRand - a good and fast random number generator: Mersenne Twister
- * see http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html for more info.
- * The range functions return a value in the intervall [begin, end).
- * int          -> [0..2^32-1]
- * int_range    -> [begin..end-1]
- * double       -> [0..1)
- * double_range -> [begin..end)
- */
-
-GRand*  g_rand_new_with_seed  (guint32  seed);
-GRand*  g_rand_new_with_seed_array (const guint32 *seed,
-				    guint seed_length);
-GRand*  g_rand_new            (void);
-void    g_rand_free           (GRand   *rand_);
-GRand*  g_rand_copy           (GRand   *rand_);
-void    g_rand_set_seed       (GRand   *rand_,
-			       guint32  seed);
-void	g_rand_set_seed_array (GRand   *rand_,
-			       const guint32 *seed,
-			       guint    seed_length);
-
-#define g_rand_boolean(rand_) ((g_rand_int (rand_) & (1 << 15)) != 0)
-
-guint32 g_rand_int            (GRand   *rand_);
-gint32  g_rand_int_range      (GRand   *rand_,
-			       gint32   begin,
-			       gint32   end);
-gdouble g_rand_double         (GRand   *rand_);
-gdouble g_rand_double_range   (GRand   *rand_,
-			       gdouble  begin,
-			       gdouble  end);
-void    g_random_set_seed     (guint32  seed);
-
-#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
-
-guint32 g_random_int          (void);
-gint32  g_random_int_range    (gint32   begin,
-			       gint32   end);
-gdouble g_random_double       (void);
-gdouble g_random_double_range (gdouble  begin,
-			       gdouble  end);
-
-
-G_END_DECLS
-
-#endif /* __G_RAND_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gregex.h b/GstreamerHelper/x64/include/glib-2.0/glib/gregex.h
deleted file mode 100644
index 53a2aeef..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gregex.h
+++ /dev/null
@@ -1,561 +0,0 @@
-/* GRegex -- regular expression API wrapper around PCRE.
- *
- * Copyright (C) 1999, 2000 Scott Wimer
- * Copyright (C) 2004, Matthias Clasen <mclasen@redhat.com>
- * Copyright (C) 2005 - 2007, Marco Barisione <marco@barisione.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_REGEX_H__
-#define __G_REGEX_H__
-
-#include <glib/gerror.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-/**
- * GRegexError:
- * @G_REGEX_ERROR_COMPILE: Compilation of the regular expression failed.
- * @G_REGEX_ERROR_OPTIMIZE: Optimization of the regular expression failed.
- * @G_REGEX_ERROR_REPLACE: Replacement failed due to an ill-formed replacement
- *     string.
- * @G_REGEX_ERROR_MATCH: The match process failed.
- * @G_REGEX_ERROR_INTERNAL: Internal error of the regular expression engine.
- *     Since 2.16
- * @G_REGEX_ERROR_STRAY_BACKSLASH: "\\" at end of pattern. Since 2.16
- * @G_REGEX_ERROR_MISSING_CONTROL_CHAR: "\\c" at end of pattern. Since 2.16
- * @G_REGEX_ERROR_UNRECOGNIZED_ESCAPE: Unrecognized character follows "\\".
- *     Since 2.16
- * @G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER: Numbers out of order in "{}"
- *     quantifier. Since 2.16
- * @G_REGEX_ERROR_QUANTIFIER_TOO_BIG: Number too big in "{}" quantifier.
- *     Since 2.16
- * @G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS: Missing terminating "]" for
- *     character class. Since 2.16
- * @G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS: Invalid escape sequence
- *     in character class. Since 2.16
- * @G_REGEX_ERROR_RANGE_OUT_OF_ORDER: Range out of order in character class.
- *     Since 2.16
- * @G_REGEX_ERROR_NOTHING_TO_REPEAT: Nothing to repeat. Since 2.16
- * @G_REGEX_ERROR_UNRECOGNIZED_CHARACTER: Unrecognized character after "(?",
- *     "(?&lt;" or "(?P". Since 2.16
- * @G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS: POSIX named classes are
- *     supported only within a class. Since 2.16
- * @G_REGEX_ERROR_UNMATCHED_PARENTHESIS: Missing terminating ")" or ")"
- *     without opening "(". Since 2.16
- * @G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE: Reference to non-existent
- *     subpattern. Since 2.16
- * @G_REGEX_ERROR_UNTERMINATED_COMMENT: Missing terminating ")" after comment.
- *     Since 2.16
- * @G_REGEX_ERROR_EXPRESSION_TOO_LARGE: Regular expression too large.
- *     Since 2.16
- * @G_REGEX_ERROR_MEMORY_ERROR: Failed to get memory. Since 2.16
- * @G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND: Lookbehind assertion is not
- *     fixed length. Since 2.16
- * @G_REGEX_ERROR_MALFORMED_CONDITION: Malformed number or name after "(?(".
- *     Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES: Conditional group contains
- *     more than two branches. Since 2.16
- * @G_REGEX_ERROR_ASSERTION_EXPECTED: Assertion expected after "(?(".
- *     Since 2.16
- * @G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME: Unknown POSIX class name.
- *     Since 2.16
- * @G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED: POSIX collating
- *     elements are not supported. Since 2.16
- * @G_REGEX_ERROR_HEX_CODE_TOO_LARGE: Character value in "\\x{...}" sequence
- *     is too large. Since 2.16
- * @G_REGEX_ERROR_INVALID_CONDITION: Invalid condition "(?(0)". Since 2.16
- * @G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND: \\C not allowed in
- *     lookbehind assertion. Since 2.16
- * @G_REGEX_ERROR_INFINITE_LOOP: Recursive call could loop indefinitely.
- *     Since 2.16
- * @G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR: Missing terminator
- *     in subpattern name. Since 2.16
- * @G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME: Two named subpatterns have
- *     the same name. Since 2.16
- * @G_REGEX_ERROR_MALFORMED_PROPERTY: Malformed "\\P" or "\\p" sequence.
- *     Since 2.16
- * @G_REGEX_ERROR_UNKNOWN_PROPERTY: Unknown property name after "\\P" or
- *     "\\p". Since 2.16
- * @G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG: Subpattern name is too long
- *     (maximum 32 characters). Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_SUBPATTERNS: Too many named subpatterns (maximum
- *     10,000). Since 2.16
- * @G_REGEX_ERROR_INVALID_OCTAL_VALUE: Octal value is greater than "\\377".
- *     Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE: "DEFINE" group contains more
- *     than one branch. Since 2.16
- * @G_REGEX_ERROR_DEFINE_REPETION: Repeating a "DEFINE" group is not allowed.
- *     This error is never raised. Since: 2.16 Deprecated: 2.34
- * @G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS: Inconsistent newline options.
- *     Since 2.16
- * @G_REGEX_ERROR_MISSING_BACK_REFERENCE: "\\g" is not followed by a braced,
- *      angle-bracketed, or quoted name or number, or by a plain number. Since: 2.16
- * @G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE: relative reference must not be zero. Since: 2.34
- * @G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN: the backtracing
- *     control verb used does not allow an argument. Since: 2.34
- * @G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB: unknown backtracing 
- *     control verb. Since: 2.34
- * @G_REGEX_ERROR_NUMBER_TOO_BIG: number is too big in escape sequence. Since: 2.34
- * @G_REGEX_ERROR_MISSING_SUBPATTERN_NAME: Missing subpattern name. Since: 2.34
- * @G_REGEX_ERROR_MISSING_DIGIT: Missing digit. Since 2.34
- * @G_REGEX_ERROR_INVALID_DATA_CHARACTER: In JavaScript compatibility mode,
- *     "[" is an invalid data character. Since: 2.34
- * @G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME: different names for subpatterns of the 
- *     same number are not allowed. Since: 2.34
- * @G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED: the backtracing control
- *     verb requires an argument. Since: 2.34
- * @G_REGEX_ERROR_INVALID_CONTROL_CHAR: "\\c" must be followed by an ASCII 
- *     character. Since: 2.34
- * @G_REGEX_ERROR_MISSING_NAME: "\\k" is not followed by a braced, angle-bracketed, or 
- *     quoted name. Since: 2.34
- * @G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS: "\\N" is not supported in a class. Since: 2.34
- * @G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES: too many forward references. Since: 2.34
- * @G_REGEX_ERROR_NAME_TOO_LONG: the name is too long in "(*MARK)", "(*PRUNE)", 
- *     "(*SKIP)", or "(*THEN)". Since: 2.34
- * @G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE: the character value in the \\u sequence is
- *     too large. Since: 2.34
- *
- * Error codes returned by regular expressions functions.
- *
- * Since: 2.14
- */
-typedef enum
-{
-  G_REGEX_ERROR_COMPILE,
-  G_REGEX_ERROR_OPTIMIZE,
-  G_REGEX_ERROR_REPLACE,
-  G_REGEX_ERROR_MATCH,
-  G_REGEX_ERROR_INTERNAL,
-
-  /* These are the error codes from PCRE + 100 */
-  G_REGEX_ERROR_STRAY_BACKSLASH = 101,
-  G_REGEX_ERROR_MISSING_CONTROL_CHAR = 102,
-  G_REGEX_ERROR_UNRECOGNIZED_ESCAPE = 103,
-  G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER = 104,
-  G_REGEX_ERROR_QUANTIFIER_TOO_BIG = 105,
-  G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS = 106,
-  G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS = 107,
-  G_REGEX_ERROR_RANGE_OUT_OF_ORDER = 108,
-  G_REGEX_ERROR_NOTHING_TO_REPEAT = 109,
-  G_REGEX_ERROR_UNRECOGNIZED_CHARACTER = 112,
-  G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS = 113,
-  G_REGEX_ERROR_UNMATCHED_PARENTHESIS = 114,
-  G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE = 115,
-  G_REGEX_ERROR_UNTERMINATED_COMMENT = 118,
-  G_REGEX_ERROR_EXPRESSION_TOO_LARGE = 120,
-  G_REGEX_ERROR_MEMORY_ERROR = 121,
-  G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND = 125,
-  G_REGEX_ERROR_MALFORMED_CONDITION = 126,
-  G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES = 127,
-  G_REGEX_ERROR_ASSERTION_EXPECTED = 128,
-  G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME = 130,
-  G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED = 131,
-  G_REGEX_ERROR_HEX_CODE_TOO_LARGE = 134,
-  G_REGEX_ERROR_INVALID_CONDITION = 135,
-  G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND = 136,
-  G_REGEX_ERROR_INFINITE_LOOP = 140,
-  G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR = 142,
-  G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME = 143,
-  G_REGEX_ERROR_MALFORMED_PROPERTY = 146,
-  G_REGEX_ERROR_UNKNOWN_PROPERTY = 147,
-  G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG = 148,
-  G_REGEX_ERROR_TOO_MANY_SUBPATTERNS = 149,
-  G_REGEX_ERROR_INVALID_OCTAL_VALUE = 151,
-  G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE = 154,
-  G_REGEX_ERROR_DEFINE_REPETION = 155,
-  G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS = 156,
-  G_REGEX_ERROR_MISSING_BACK_REFERENCE = 157,
-  G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE = 158,
-  G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN = 159,
-  G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB  = 160,
-  G_REGEX_ERROR_NUMBER_TOO_BIG = 161,
-  G_REGEX_ERROR_MISSING_SUBPATTERN_NAME = 162,
-  G_REGEX_ERROR_MISSING_DIGIT = 163,
-  G_REGEX_ERROR_INVALID_DATA_CHARACTER = 164,
-  G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME = 165,
-  G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED = 166,
-  G_REGEX_ERROR_INVALID_CONTROL_CHAR = 168,
-  G_REGEX_ERROR_MISSING_NAME = 169,
-  G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS = 171,
-  G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES = 172,
-  G_REGEX_ERROR_NAME_TOO_LONG = 175,
-  G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE = 176
-} GRegexError;
-
-/**
- * G_REGEX_ERROR:
- *
- * Error domain for regular expressions. Errors in this domain will be
- * from the #GRegexError enumeration. See #GError for information on
- * error domains.
- *
- * Since: 2.14
- */
-#define G_REGEX_ERROR g_regex_error_quark ()
-
-GQuark g_regex_error_quark (void);
-
-/**
- * GRegexCompileFlags:
- * @G_REGEX_CASELESS: Letters in the pattern match both upper- and
- *     lowercase letters. This option can be changed within a pattern
- *     by a "(?i)" option setting.
- * @G_REGEX_MULTILINE: By default, GRegex treats the strings as consisting
- *     of a single line of characters (even if it actually contains
- *     newlines). The "start of line" metacharacter ("^") matches only
- *     at the start of the string, while the "end of line" metacharacter
- *     ("$") matches only at the end of the string, or before a terminating
- *     newline (unless #G_REGEX_DOLLAR_ENDONLY is set). When
- *     #G_REGEX_MULTILINE is set, the "start of line" and "end of line"
- *     constructs match immediately following or immediately before any
- *     newline in the string, respectively, as well as at the very start
- *     and end. This can be changed within a pattern by a "(?m)" option
- *     setting.
- * @G_REGEX_DOTALL: A dot metacharater (".") in the pattern matches all
- *     characters, including newlines. Without it, newlines are excluded.
- *     This option can be changed within a pattern by a ("?s") option setting.
- * @G_REGEX_EXTENDED: Whitespace data characters in the pattern are
- *     totally ignored except when escaped or inside a character class.
- *     Whitespace does not include the VT character (code 11). In addition,
- *     characters between an unescaped "#" outside a character class and
- *     the next newline character, inclusive, are also ignored. This can
- *     be changed within a pattern by a "(?x)" option setting.
- * @G_REGEX_ANCHORED: The pattern is forced to be "anchored", that is,
- *     it is constrained to match only at the first matching point in the
- *     string that is being searched. This effect can also be achieved by
- *     appropriate constructs in the pattern itself such as the "^"
- *     metacharater.
- * @G_REGEX_DOLLAR_ENDONLY: A dollar metacharacter ("$") in the pattern
- *     matches only at the end of the string. Without this option, a
- *     dollar also matches immediately before the final character if
- *     it is a newline (but not before any other newlines). This option
- *     is ignored if #G_REGEX_MULTILINE is set.
- * @G_REGEX_UNGREEDY: Inverts the "greediness" of the quantifiers so that
- *     they are not greedy by default, but become greedy if followed by "?".
- *     It can also be set by a "(?U)" option setting within the pattern.
- * @G_REGEX_RAW: Usually strings must be valid UTF-8 strings, using this
- *     flag they are considered as a raw sequence of bytes.
- * @G_REGEX_NO_AUTO_CAPTURE: Disables the use of numbered capturing
- *     parentheses in the pattern. Any opening parenthesis that is not
- *     followed by "?" behaves as if it were followed by "?:" but named
- *     parentheses can still be used for capturing (and they acquire numbers
- *     in the usual way).
- * @G_REGEX_OPTIMIZE: Optimize the regular expression. If the pattern will
- *     be used many times, then it may be worth the effort to optimize it
- *     to improve the speed of matches.
- * @G_REGEX_FIRSTLINE: Limits an unanchored pattern to match before (or at) the
- *     first newline. Since: 2.34
- * @G_REGEX_DUPNAMES: Names used to identify capturing subpatterns need not
- *     be unique. This can be helpful for certain types of pattern when it
- *     is known that only one instance of the named subpattern can ever be
- *     matched.
- * @G_REGEX_NEWLINE_CR: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     is '\r'.
- * @G_REGEX_NEWLINE_LF: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     is '\n'.
- * @G_REGEX_NEWLINE_CRLF: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     sequence is '\r\n'.
- * @G_REGEX_NEWLINE_ANYCRLF: Usually any newline character or character sequence
- *     is recognized. If this option is set, the only recognized newline character
- *     sequences are '\r', '\n', and '\r\n'. Since: 2.34
- * @G_REGEX_BSR_ANYCRLF: Usually any newline character or character sequence
- *     is recognised. If this option is set, then "\R" only recognizes the newline
- *    characters '\r', '\n' and '\r\n'. Since: 2.34
- * @G_REGEX_JAVASCRIPT_COMPAT: Changes behaviour so that it is compatible with
- *     JavaScript rather than PCRE. Since: 2.34
- *
- * Flags specifying compile-time options.
- *
- * Since: 2.14
- */
-/* Remember to update G_REGEX_COMPILE_MASK in gregex.c after
- * adding a new flag. */
-typedef enum
-{
-  G_REGEX_CASELESS          = 1 << 0,
-  G_REGEX_MULTILINE         = 1 << 1,
-  G_REGEX_DOTALL            = 1 << 2,
-  G_REGEX_EXTENDED          = 1 << 3,
-  G_REGEX_ANCHORED          = 1 << 4,
-  G_REGEX_DOLLAR_ENDONLY    = 1 << 5,
-  G_REGEX_UNGREEDY          = 1 << 9,
-  G_REGEX_RAW               = 1 << 11,
-  G_REGEX_NO_AUTO_CAPTURE   = 1 << 12,
-  G_REGEX_OPTIMIZE          = 1 << 13,
-  G_REGEX_FIRSTLINE         = 1 << 18,
-  G_REGEX_DUPNAMES          = 1 << 19,
-  G_REGEX_NEWLINE_CR        = 1 << 20,
-  G_REGEX_NEWLINE_LF        = 1 << 21,
-  G_REGEX_NEWLINE_CRLF      = G_REGEX_NEWLINE_CR | G_REGEX_NEWLINE_LF,
-  G_REGEX_NEWLINE_ANYCRLF   = G_REGEX_NEWLINE_CR | 1 << 22,
-  G_REGEX_BSR_ANYCRLF       = 1 << 23,
-  G_REGEX_JAVASCRIPT_COMPAT = 1 << 25
-} GRegexCompileFlags;
-
-/**
- * GRegexMatchFlags:
- * @G_REGEX_MATCH_ANCHORED: The pattern is forced to be "anchored", that is,
- *     it is constrained to match only at the first matching point in the
- *     string that is being searched. This effect can also be achieved by
- *     appropriate constructs in the pattern itself such as the "^"
- *     metacharater.
- * @G_REGEX_MATCH_NOTBOL: Specifies that first character of the string is
- *     not the beginning of a line, so the circumflex metacharacter should
- *     not match before it. Setting this without #G_REGEX_MULTILINE (at
- *     compile time) causes circumflex never to match. This option affects
- *     only the behaviour of the circumflex metacharacter, it does not
- *     affect "\A".
- * @G_REGEX_MATCH_NOTEOL: Specifies that the end of the subject string is
- *     not the end of a line, so the dollar metacharacter should not match
- *     it nor (except in multiline mode) a newline immediately before it.
- *     Setting this without #G_REGEX_MULTILINE (at compile time) causes
- *     dollar never to match. This option affects only the behaviour of
- *     the dollar metacharacter, it does not affect "\Z" or "\z".
- * @G_REGEX_MATCH_NOTEMPTY: An empty string is not considered to be a valid
- *     match if this option is set. If there are alternatives in the pattern,
- *     they are tried. If all the alternatives match the empty string, the
- *     entire match fails. For example, if the pattern "a?b?" is applied to
- *     a string not beginning with "a" or "b", it matches the empty string
- *     at the start of the string. With this flag set, this match is not
- *     valid, so GRegex searches further into the string for occurrences
- *     of "a" or "b".
- * @G_REGEX_MATCH_PARTIAL: Turns on the partial matching feature, for more
- *     documentation on partial matching see g_match_info_is_partial_match().
- * @G_REGEX_MATCH_NEWLINE_CR: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\r' character as line terminator.
- * @G_REGEX_MATCH_NEWLINE_LF: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\n' character as line terminator.
- * @G_REGEX_MATCH_NEWLINE_CRLF: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\r\n' characters sequence as line terminator.
- * @G_REGEX_MATCH_NEWLINE_ANY: Overrides the newline definition set when
- *     creating a new #GRegex, any Unicode newline sequence
- *     is recognised as a newline. These are '\r', '\n' and '\rn', and the
- *     single characters U+000B LINE TABULATION, U+000C FORM FEED (FF),
- *     U+0085 NEXT LINE (NEL), U+2028 LINE SEPARATOR and
- *     U+2029 PARAGRAPH SEPARATOR.
- * @G_REGEX_MATCH_NEWLINE_ANYCRLF: Overrides the newline definition set when
- *     creating a new #GRegex; any '\r', '\n', or '\r\n' character sequence
- *     is recognized as a newline. Since: 2.34
- * @G_REGEX_MATCH_BSR_ANYCRLF: Overrides the newline definition for "\R" set when
- *     creating a new #GRegex; only '\r', '\n', or '\r\n' character sequences
- *     are recognized as a newline by "\R". Since: 2.34
- * @G_REGEX_MATCH_BSR_ANY: Overrides the newline definition for "\R" set when
- *     creating a new #GRegex; any Unicode newline character or character sequence
- *     are recognized as a newline by "\R". These are '\r', '\n' and '\rn', and the
- *     single characters U+000B LINE TABULATION, U+000C FORM FEED (FF),
- *     U+0085 NEXT LINE (NEL), U+2028 LINE SEPARATOR and
- *     U+2029 PARAGRAPH SEPARATOR. Since: 2.34
- * @G_REGEX_MATCH_PARTIAL_SOFT: An alias for #G_REGEX_MATCH_PARTIAL. Since: 2.34
- * @G_REGEX_MATCH_PARTIAL_HARD: Turns on the partial matching feature. In contrast to
- *     to #G_REGEX_MATCH_PARTIAL_SOFT, this stops matching as soon as a partial match
- *     is found, without continuing to search for a possible complete match. See
- *     see g_match_info_is_partial_match() for more information. Since: 2.34
- * @G_REGEX_MATCH_NOTEMPTY_ATSTART: Like #G_REGEX_MATCH_NOTEMPTY, but only applied to
- *     the start of the matched string. For anchored
- *     patterns this can only happen for pattern containing "\K". Since: 2.34
- *
- * Flags specifying match-time options.
- *
- * Since: 2.14
- */
-/* Remember to update G_REGEX_MATCH_MASK in gregex.c after
- * adding a new flag. */
-typedef enum
-{
-  G_REGEX_MATCH_ANCHORED         = 1 << 4,
-  G_REGEX_MATCH_NOTBOL           = 1 << 7,
-  G_REGEX_MATCH_NOTEOL           = 1 << 8,
-  G_REGEX_MATCH_NOTEMPTY         = 1 << 10,
-  G_REGEX_MATCH_PARTIAL          = 1 << 15,
-  G_REGEX_MATCH_NEWLINE_CR       = 1 << 20,
-  G_REGEX_MATCH_NEWLINE_LF       = 1 << 21,
-  G_REGEX_MATCH_NEWLINE_CRLF     = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_LF,
-  G_REGEX_MATCH_NEWLINE_ANY      = 1 << 22,
-  G_REGEX_MATCH_NEWLINE_ANYCRLF  = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_ANY,
-  G_REGEX_MATCH_BSR_ANYCRLF      = 1 << 23,
-  G_REGEX_MATCH_BSR_ANY          = 1 << 24,
-  G_REGEX_MATCH_PARTIAL_SOFT     = G_REGEX_MATCH_PARTIAL,
-  G_REGEX_MATCH_PARTIAL_HARD     = 1 << 27,
-  G_REGEX_MATCH_NOTEMPTY_ATSTART = 1 << 28
-} GRegexMatchFlags;
-
-/**
- * GRegex:
- *
- * A GRegex is the "compiled" form of a regular expression pattern. This
- * structure is opaque and its fields cannot be accessed directly.
- *
- * Since: 2.14
- */
-typedef struct _GRegex		GRegex;
-
-
-typedef struct _GMatchInfo	GMatchInfo;
-
-/**
- * GRegexEvalCallback:
- * @match_info: the #GMatchInfo generated by the match.
- *     Use g_match_info_get_regex() and g_match_info_get_string() if you
- *     need the #GRegex or the matched string.
- * @result: a #GString containing the new string
- * @user_data: user data passed to g_regex_replace_eval()
- *
- * Specifies the type of the function passed to g_regex_replace_eval().
- * It is called for each occurrence of the pattern in the string passed
- * to g_regex_replace_eval(), and it should append the replacement to
- * @result.
- *
- * Returns: %FALSE to continue the replacement process, %TRUE to stop it
- *
- * Since: 2.14
- */
-typedef gboolean (*GRegexEvalCallback)		(const GMatchInfo *match_info,
-						 GString          *result,
-						 gpointer          user_data);
-
-
-GRegex		 *g_regex_new			(const gchar         *pattern,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-GRegex           *g_regex_ref			(GRegex              *regex);
-void		  g_regex_unref			(GRegex              *regex);
-const gchar	 *g_regex_get_pattern		(const GRegex        *regex);
-gint		  g_regex_get_max_backref	(const GRegex        *regex);
-gint		  g_regex_get_capture_count	(const GRegex        *regex);
-gboolean          g_regex_get_has_cr_or_lf      (const GRegex        *regex);
-gint		  g_regex_get_string_number	(const GRegex        *regex, 
-						 const gchar         *name);
-gchar		 *g_regex_escape_string		(const gchar         *string,
-						 gint                 length);
-gchar		 *g_regex_escape_nul		(const gchar         *string,
-						 gint                 length);
-
-GRegexCompileFlags g_regex_get_compile_flags    (const GRegex        *regex);
-GRegexMatchFlags   g_regex_get_match_flags      (const GRegex        *regex);
-
-/* Matching. */
-gboolean	  g_regex_match_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gboolean	  g_regex_match			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-gboolean	  g_regex_match_full		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info,
-						 GError             **error);
-gboolean	  g_regex_match_all		(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-gboolean	  g_regex_match_all_full	(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info,
-						 GError             **error);
-
-/* String splitting. */
-gchar		**g_regex_split_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gchar		**g_regex_split			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options);
-gchar		**g_regex_split_full		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 gint                 max_tokens,
-						 GError             **error);
-
-/* String replacement. */
-gchar		 *g_regex_replace		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-gchar		 *g_regex_replace_literal	(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-gchar		 *g_regex_replace_eval		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GRegexEvalCallback   eval,
-						 gpointer             user_data,
-						 GError             **error);
-gboolean	  g_regex_check_replacement	(const gchar         *replacement,
-						 gboolean            *has_references,
-						 GError             **error);
-
-/* Match info */
-GRegex		 *g_match_info_get_regex	(const GMatchInfo    *match_info);
-const gchar      *g_match_info_get_string       (const GMatchInfo    *match_info);
-
-GMatchInfo       *g_match_info_ref              (GMatchInfo          *match_info);
-void              g_match_info_unref            (GMatchInfo          *match_info);
-void		  g_match_info_free		(GMatchInfo          *match_info);
-gboolean	  g_match_info_next		(GMatchInfo          *match_info,
-						 GError             **error);
-gboolean	  g_match_info_matches		(const GMatchInfo    *match_info);
-gint		  g_match_info_get_match_count	(const GMatchInfo    *match_info);
-gboolean	  g_match_info_is_partial_match	(const GMatchInfo    *match_info);
-gchar		 *g_match_info_expand_references(const GMatchInfo    *match_info,
-						 const gchar         *string_to_expand,
-						 GError             **error);
-gchar		 *g_match_info_fetch		(const GMatchInfo    *match_info,
-						 gint                 match_num);
-gboolean	  g_match_info_fetch_pos	(const GMatchInfo    *match_info,
-						 gint                 match_num,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		 *g_match_info_fetch_named	(const GMatchInfo    *match_info,
-						 const gchar         *name);
-gboolean	  g_match_info_fetch_named_pos	(const GMatchInfo    *match_info,
-						 const gchar         *name,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		**g_match_info_fetch_all	(const GMatchInfo    *match_info);
-
-G_END_DECLS
-
-#endif  /*  __G_REGEX_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gscanner.h b/GstreamerHelper/x64/include/glib-2.0/glib/gscanner.h
deleted file mode 100644
index dd932f42..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gscanner.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SCANNER_H__
-#define __G_SCANNER_H__
-
-#include <glib/gdataset.h>
-#include <glib/ghash.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GScanner	GScanner;
-typedef struct _GScannerConfig	GScannerConfig;
-typedef union  _GTokenValue     GTokenValue;
-
-typedef void		(*GScannerMsgFunc)	(GScanner      *scanner,
-						 gchar	       *message,
-						 gboolean	error);
-
-/* GScanner: Flexible lexical scanner for general purpose.
- */
-
-/* Character sets */
-#define G_CSET_A_2_Z	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-#define G_CSET_a_2_z	"abcdefghijklmnopqrstuvwxyz"
-#define G_CSET_DIGITS	"0123456789"
-#define G_CSET_LATINC	"\300\301\302\303\304\305\306"\
-			"\307\310\311\312\313\314\315\316\317\320"\
-			"\321\322\323\324\325\326"\
-			"\330\331\332\333\334\335\336"
-#define G_CSET_LATINS	"\337\340\341\342\343\344\345\346"\
-			"\347\350\351\352\353\354\355\356\357\360"\
-			"\361\362\363\364\365\366"\
-			"\370\371\372\373\374\375\376\377"
-
-/* Error types */
-typedef enum
-{
-  G_ERR_UNKNOWN,
-  G_ERR_UNEXP_EOF,
-  G_ERR_UNEXP_EOF_IN_STRING,
-  G_ERR_UNEXP_EOF_IN_COMMENT,
-  G_ERR_NON_DIGIT_IN_CONST,
-  G_ERR_DIGIT_RADIX,
-  G_ERR_FLOAT_RADIX,
-  G_ERR_FLOAT_MALFORMED
-} GErrorType;
-
-/* Token types */
-typedef enum
-{
-  G_TOKEN_EOF			=   0,
-  
-  G_TOKEN_LEFT_PAREN		= '(',
-  G_TOKEN_RIGHT_PAREN		= ')',
-  G_TOKEN_LEFT_CURLY		= '{',
-  G_TOKEN_RIGHT_CURLY		= '}',
-  G_TOKEN_LEFT_BRACE		= '[',
-  G_TOKEN_RIGHT_BRACE		= ']',
-  G_TOKEN_EQUAL_SIGN		= '=',
-  G_TOKEN_COMMA			= ',',
-  
-  G_TOKEN_NONE			= 256,
-  
-  G_TOKEN_ERROR,
-  
-  G_TOKEN_CHAR,
-  G_TOKEN_BINARY,
-  G_TOKEN_OCTAL,
-  G_TOKEN_INT,
-  G_TOKEN_HEX,
-  G_TOKEN_FLOAT,
-  G_TOKEN_STRING,
-  
-  G_TOKEN_SYMBOL,
-  G_TOKEN_IDENTIFIER,
-  G_TOKEN_IDENTIFIER_NULL,
-  
-  G_TOKEN_COMMENT_SINGLE,
-  G_TOKEN_COMMENT_MULTI,
-
-  /*< private >*/
-  G_TOKEN_LAST
-} GTokenType;
-
-union	_GTokenValue
-{
-  gpointer	v_symbol;
-  gchar		*v_identifier;
-  gulong	v_binary;
-  gulong	v_octal;
-  gulong	v_int;
-  guint64       v_int64;
-  gdouble	v_float;
-  gulong	v_hex;
-  gchar		*v_string;
-  gchar		*v_comment;
-  guchar	v_char;
-  guint		v_error;
-};
-
-struct	_GScannerConfig
-{
-  /* Character sets
-   */
-  gchar		*cset_skip_characters;		/* default: " \t\n" */
-  gchar		*cset_identifier_first;
-  gchar		*cset_identifier_nth;
-  gchar		*cpair_comment_single;		/* default: "#\n" */
-  
-  /* Should symbol lookup work case sensitive?
-   */
-  guint		case_sensitive : 1;
-  
-  /* Boolean values to be adjusted "on the fly"
-   * to configure scanning behaviour.
-   */
-  guint		skip_comment_multi : 1;		/* C like comment */
-  guint		skip_comment_single : 1;	/* single line comment */
-  guint		scan_comment_multi : 1;		/* scan multi line comments? */
-  guint		scan_identifier : 1;
-  guint		scan_identifier_1char : 1;
-  guint		scan_identifier_NULL : 1;
-  guint		scan_symbols : 1;
-  guint		scan_binary : 1;
-  guint		scan_octal : 1;
-  guint		scan_float : 1;
-  guint		scan_hex : 1;			/* `0x0ff0' */
-  guint		scan_hex_dollar : 1;		/* `$0ff0' */
-  guint		scan_string_sq : 1;		/* string: 'anything' */
-  guint		scan_string_dq : 1;		/* string: "\\-escapes!\n" */
-  guint		numbers_2_int : 1;		/* bin, octal, hex => int */
-  guint		int_2_float : 1;		/* int => G_TOKEN_FLOAT? */
-  guint		identifier_2_string : 1;
-  guint		char_2_token : 1;		/* return G_TOKEN_CHAR? */
-  guint		symbol_2_token : 1;
-  guint		scope_0_fallback : 1;		/* try scope 0 on lookups? */
-  guint		store_int64 : 1; 		/* use value.v_int64 rather than v_int */
-
-  /*< private >*/
-  guint		padding_dummy;
-};
-
-struct	_GScanner
-{
-  /* unused fields */
-  gpointer		user_data;
-  guint			max_parse_errors;
-  
-  /* g_scanner_error() increments this field */
-  guint			parse_errors;
-  
-  /* name of input stream, featured by the default message handler */
-  const gchar		*input_name;
-  
-  /* quarked data */
-  GData			*qdata;
-  
-  /* link into the scanner configuration */
-  GScannerConfig	*config;
-  
-  /* fields filled in after g_scanner_get_next_token() */
-  GTokenType		token;
-  GTokenValue		value;
-  guint			line;
-  guint			position;
-  
-  /* fields filled in after g_scanner_peek_next_token() */
-  GTokenType		next_token;
-  GTokenValue		next_value;
-  guint			next_line;
-  guint			next_position;
-
-  /*< private >*/
-  /* to be considered private */
-  GHashTable		*symbol_table;
-  gint			input_fd;
-  const gchar		*text;
-  const gchar		*text_end;
-  gchar			*buffer;
-  guint			scope_id;
-
-  /*< public >*/
-  /* handler function for _warn and _error */
-  GScannerMsgFunc	msg_handler;
-};
-
-GScanner*	g_scanner_new			(const GScannerConfig *config_templ);
-void		g_scanner_destroy		(GScanner	*scanner);
-void		g_scanner_input_file		(GScanner	*scanner,
-						 gint		input_fd);
-void		g_scanner_sync_file_offset	(GScanner	*scanner);
-void		g_scanner_input_text		(GScanner	*scanner,
-						 const	gchar	*text,
-						 guint		text_len);
-GTokenType	g_scanner_get_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_peek_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_cur_token		(GScanner	*scanner);
-GTokenValue	g_scanner_cur_value		(GScanner	*scanner);
-guint		g_scanner_cur_line		(GScanner	*scanner);
-guint		g_scanner_cur_position		(GScanner	*scanner);
-gboolean	g_scanner_eof			(GScanner	*scanner);
-guint		g_scanner_set_scope		(GScanner	*scanner,
-						 guint		 scope_id);
-void		g_scanner_scope_add_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol,
-						 gpointer	value);
-void		g_scanner_scope_remove_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-gpointer	g_scanner_scope_lookup_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-void		g_scanner_scope_foreach_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 GHFunc		 func,
-						 gpointer	 user_data);
-gpointer	g_scanner_lookup_symbol		(GScanner	*scanner,
-						 const gchar	*symbol);
-void		g_scanner_unexp_token		(GScanner	*scanner,
-						 GTokenType	expected_token,
-						 const gchar	*identifier_spec,
-						 const gchar	*symbol_spec,
-						 const gchar	*symbol_name,
-						 const gchar	*message,
-						 gint		 is_error);
-void		g_scanner_error			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-void		g_scanner_warn			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* keep downward source compatibility */
-#define		g_scanner_add_symbol( scanner, symbol, value )	G_STMT_START { \
-  g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \
-} G_STMT_END
-#define		g_scanner_remove_symbol( scanner, symbol )	G_STMT_START { \
-  g_scanner_scope_remove_symbol ((scanner), 0, (symbol)); \
-} G_STMT_END
-#define		g_scanner_foreach_symbol( scanner, func, data )	G_STMT_START { \
-  g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
-} G_STMT_END
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They do no good. */
-#define g_scanner_freeze_symbol_table(scanner) ((void)0)
-#define g_scanner_thaw_symbol_table(scanner) ((void)0)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_SCANNER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gsequence.h b/GstreamerHelper/x64/include/glib-2.0/glib/gsequence.h
deleted file mode 100644
index 3e5a03de..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gsequence.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
- * Soeren Sandmann (sandmann@daimi.au.dk)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SEQUENCE_H__
-#define __G_SEQUENCE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSequence      GSequence;
-typedef struct _GSequenceNode  GSequenceIter;
-
-typedef gint (* GSequenceIterCompareFunc) (GSequenceIter *a,
-                                           GSequenceIter *b,
-                                           gpointer       data);
-
-
-/* GSequence */
-GSequence *    g_sequence_new                (GDestroyNotify            data_destroy);
-void           g_sequence_free               (GSequence                *seq);
-gint           g_sequence_get_length         (GSequence                *seq);
-void           g_sequence_foreach            (GSequence                *seq,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_foreach_range      (GSequenceIter            *begin,
-                                              GSequenceIter            *end,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_sort               (GSequence                *seq,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_iter          (GSequence                *seq,
-                                              GSequenceIterCompareFunc  cmp_func,
-                                              gpointer                  cmp_data);
-
-
-/* Getting iters */
-GSequenceIter *g_sequence_get_begin_iter     (GSequence                *seq);
-GSequenceIter *g_sequence_get_end_iter       (GSequence                *seq);
-GSequenceIter *g_sequence_get_iter_at_pos    (GSequence                *seq,
-                                              gint                      pos);
-GSequenceIter *g_sequence_append             (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_prepend            (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_insert_before      (GSequenceIter            *iter,
-                                              gpointer                  data);
-void           g_sequence_move               (GSequenceIter            *src,
-                                              GSequenceIter            *dest);
-void           g_sequence_swap               (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_insert_sorted      (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_insert_sorted_iter (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed       (GSequenceIter            *iter,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed_iter  (GSequenceIter            *iter,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_remove             (GSequenceIter            *iter);
-void           g_sequence_remove_range       (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-void           g_sequence_move_range         (GSequenceIter            *dest,
-                                              GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-GSequenceIter *g_sequence_search             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_search_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_lookup             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_lookup_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-
-
-/* Dereferencing */
-gpointer       g_sequence_get                (GSequenceIter            *iter);
-void           g_sequence_set                (GSequenceIter            *iter,
-                                              gpointer                  data);
-
-/* Operations on GSequenceIter * */
-gboolean       g_sequence_iter_is_begin      (GSequenceIter            *iter);
-gboolean       g_sequence_iter_is_end        (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_next          (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_prev          (GSequenceIter            *iter);
-gint           g_sequence_iter_get_position  (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_move          (GSequenceIter            *iter,
-                                              gint                      delta);
-GSequence *    g_sequence_iter_get_sequence  (GSequenceIter            *iter);
-
-
-/* Search */
-gint           g_sequence_iter_compare       (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-
-G_END_DECLS
-
-#endif /* __G_SEQUENCE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gshell.h b/GstreamerHelper/x64/include/glib-2.0/glib/gshell.h
deleted file mode 100644
index ddb4ec56..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gshell.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* gshell.h - Shell-related utilities
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not, write
- * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SHELL_H__
-#define __G_SHELL_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_SHELL_ERROR g_shell_error_quark ()
-
-typedef enum
-{
-  /* mismatched or otherwise mangled quoting */
-  G_SHELL_ERROR_BAD_QUOTING,
-  /* string to be parsed was empty */
-  G_SHELL_ERROR_EMPTY_STRING,
-  G_SHELL_ERROR_FAILED
-} GShellError;
-
-GQuark g_shell_error_quark (void);
-
-gchar*   g_shell_quote      (const gchar   *unquoted_string);
-gchar*   g_shell_unquote    (const gchar   *quoted_string,
-                             GError       **error);
-gboolean g_shell_parse_argv (const gchar   *command_line,
-                             gint          *argcp,
-                             gchar       ***argvp,
-                             GError       **error);
-
-G_END_DECLS
-
-#endif /* __G_SHELL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gslice.h b/GstreamerHelper/x64/include/glib-2.0/glib/gslice.h
deleted file mode 100644
index 3efd645d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gslice.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GLIB sliced memory - fast threaded memory chunk allocator
- * Copyright (C) 2005 Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SLICE_H__
-#define __G_SLICE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* slices - fast allocation/release of small memory blocks
- */
-gpointer g_slice_alloc          	(gsize	       block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_slice_alloc0         	(gsize         block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_slice_copy                   (gsize         block_size,
-                                         gconstpointer mem_block) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-void     g_slice_free1          	(gsize         block_size,
-					 gpointer      mem_block);
-void     g_slice_free_chain_with_offset (gsize         block_size,
-					 gpointer      mem_chain,
-					 gsize         next_offset);
-#define  g_slice_new(type)      ((type*) g_slice_alloc (sizeof (type)))
-#define  g_slice_new0(type)     ((type*) g_slice_alloc0 (sizeof (type)))
-/* MemoryBlockType *
- *       g_slice_dup                    (MemoryBlockType,
- *	                                 MemoryBlockType *mem_block);
- *       g_slice_free                   (MemoryBlockType,
- *	                                 MemoryBlockType *mem_block);
- *       g_slice_free_chain             (MemoryBlockType,
- *                                       MemoryBlockType *first_chain_block,
- *                                       memory_block_next_field);
- * pseudo prototypes for the macro
- * definitions following below.
- */
-
-/* we go through extra hoops to ensure type safety */
-#define g_slice_dup(type, mem)                                  \
-  (1 ? (type*) g_slice_copy (sizeof (type), (mem))              \
-     : ((void) ((type*) 0 == (mem)), (type*) 0))
-#define g_slice_free(type, mem)				do {	\
-  if (1) g_slice_free1 (sizeof (type), (mem));			\
-  else   (void) ((type*) 0 == (mem)); 				\
-} while (0)
-#define g_slice_free_chain(type, mem_chain, next)	do {	\
-  if (1) g_slice_free_chain_with_offset (sizeof (type),		\
-                 (mem_chain), G_STRUCT_OFFSET (type, next)); 	\
-  else   (void) ((type*) 0 == (mem_chain));			\
-} while (0)
-
-
-/* --- internal debugging API --- */
-typedef enum {
-  G_SLICE_CONFIG_ALWAYS_MALLOC = 1,
-  G_SLICE_CONFIG_BYPASS_MAGAZINES,
-  G_SLICE_CONFIG_WORKING_SET_MSECS,
-  G_SLICE_CONFIG_COLOR_INCREMENT,
-  G_SLICE_CONFIG_CHUNK_SIZES,
-  G_SLICE_CONFIG_CONTENTION_COUNTER
-} GSliceConfig;
-
-GLIB_DEPRECATED_IN_2_34
-void     g_slice_set_config	   (GSliceConfig ckey, gint64 value);
-GLIB_DEPRECATED_IN_2_34
-gint64   g_slice_get_config	   (GSliceConfig ckey);
-GLIB_DEPRECATED_IN_2_34
-gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
-
-G_END_DECLS
-
-#endif /* __G_SLICE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gslist.h b/GstreamerHelper/x64/include/glib-2.0/glib/gslist.h
deleted file mode 100644
index c61fd2ff..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gslist.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SLIST_H__
-#define __G_SLIST_H__
-
-#include <glib/gmem.h>
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSList GSList;
-
-struct _GSList
-{
-  gpointer data;
-  GSList *next;
-};
-
-/* Singly linked lists
- */
-GSList*  g_slist_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_slist_free                    (GSList           *list);
-void     g_slist_free_1                  (GSList           *list);
-#define	 g_slist_free1		         g_slist_free_1
-void     g_slist_free_full               (GSList           *list,
-					  GDestroyNotify    free_func);
-GSList*  g_slist_append                  (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_prepend                 (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert                  (GSList           *list,
-					  gpointer          data,
-					  gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted           (GSList           *list,
-					  gpointer          data,
-					  GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted_with_data (GSList           *list,
-					  gpointer          data,
-					  GCompareDataFunc  func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_before           (GSList           *slist,
-					  GSList           *sibling,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_concat                  (GSList           *list1,
-					  GSList           *list2) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove                  (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_all              (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_delete_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_reverse                 (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_copy                    (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-
-GLIB_AVAILABLE_IN_2_34
-GSList*  g_slist_copy_deep               (GSList            *list,
-					  GCopyFunc         func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_nth                     (GSList           *list,
-					  guint             n);
-GSList*  g_slist_find                    (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_find_custom             (GSList           *list,
-					  gconstpointer     data,
-					  GCompareFunc      func);
-gint     g_slist_position                (GSList           *list,
-					  GSList           *llink);
-gint     g_slist_index                   (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_last                    (GSList           *list);
-guint    g_slist_length                  (GSList           *list);
-void     g_slist_foreach                 (GSList           *list,
-					  GFunc             func,
-					  gpointer          user_data);
-GSList*  g_slist_sort                    (GSList           *list,
-					  GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_sort_with_data          (GSList           *list,
-					  GCompareDataFunc  compare_func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_slist_nth_data                (GSList           *list,
-					  guint             n);
-
-#define  g_slist_next(slist)	         ((slist) ? (((GSList *)(slist))->next) : NULL)
-
-G_END_DECLS
-
-#endif /* __G_SLIST_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gspawn.h b/GstreamerHelper/x64/include/glib-2.0/glib/gspawn.h
deleted file mode 100644
index 1120d81d..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gspawn.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* gspawn.h - Process launching
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not, write
- * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SPAWN_H__
-#define __G_SPAWN_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-
-/* I'm not sure I remember our proposed naming convention here. */
-/**
- * G_SPAWN_ERROR:
- *
- * Error domain for spawning processes. Errors in this domain will
- * be from the #GSpawnError enumeration. See #GError for information on
- * error domains.
- */
-#define G_SPAWN_ERROR g_spawn_error_quark ()
-
-/**
- * GSpawnError:
- * @G_SPAWN_ERROR_FORK: Fork failed due to lack of memory.
- * @G_SPAWN_ERROR_READ: Read or select on pipes failed.
- * @G_SPAWN_ERROR_CHDIR: Changing to working directory failed.
- * @G_SPAWN_ERROR_ACCES: execv() returned <literal>EACCES</literal>
- * @G_SPAWN_ERROR_PERM: execv() returned <literal>EPERM</literal>
- * @G_SPAWN_ERROR_TOO_BIG: execv() returned <literal>E2BIG</literal>
- * @G_SPAWN_ERROR_2BIG: deprecated alias for %G_SPAWN_ERROR_TOO_BIG
- * @G_SPAWN_ERROR_NOEXEC: execv() returned <literal>ENOEXEC</literal>
- * @G_SPAWN_ERROR_NAMETOOLONG: execv() returned <literal>ENAMETOOLONG</literal>
- * @G_SPAWN_ERROR_NOENT: execv() returned <literal>ENOENT</literal>
- * @G_SPAWN_ERROR_NOMEM: execv() returned <literal>ENOMEM</literal>
- * @G_SPAWN_ERROR_NOTDIR: execv() returned <literal>ENOTDIR</literal>
- * @G_SPAWN_ERROR_LOOP: execv() returned <literal>ELOOP</literal>
- * @G_SPAWN_ERROR_TXTBUSY: execv() returned <literal>ETXTBUSY</literal>
- * @G_SPAWN_ERROR_IO: execv() returned <literal>EIO</literal>
- * @G_SPAWN_ERROR_NFILE: execv() returned <literal>ENFILE</literal>
- * @G_SPAWN_ERROR_MFILE: execv() returned <literal>EMFILE</literal>
- * @G_SPAWN_ERROR_INVAL: execv() returned <literal>EINVAL</literal>
- * @G_SPAWN_ERROR_ISDIR: execv() returned <literal>EISDIR</literal>
- * @G_SPAWN_ERROR_LIBBAD: execv() returned <literal>ELIBBAD</literal>
- * @G_SPAWN_ERROR_FAILED: Some other fatal failure,
- *   <literal>error-&gt;message</literal> should explain.
- *
- * Error codes returned by spawning processes.
- */
-typedef enum
-{
-  G_SPAWN_ERROR_FORK,   /* fork failed due to lack of memory */
-  G_SPAWN_ERROR_READ,   /* read or select on pipes failed */
-  G_SPAWN_ERROR_CHDIR,  /* changing to working dir failed */
-  G_SPAWN_ERROR_ACCES,  /* execv() returned EACCES */
-  G_SPAWN_ERROR_PERM,   /* execv() returned EPERM */
-  G_SPAWN_ERROR_TOO_BIG,/* execv() returned E2BIG */
-#ifndef G_DISABLE_DEPRECATED
-  G_SPAWN_ERROR_2BIG = G_SPAWN_ERROR_TOO_BIG,
-#endif
-  G_SPAWN_ERROR_NOEXEC, /* execv() returned ENOEXEC */
-  G_SPAWN_ERROR_NAMETOOLONG, /* ""  "" ENAMETOOLONG */
-  G_SPAWN_ERROR_NOENT,       /* ""  "" ENOENT */
-  G_SPAWN_ERROR_NOMEM,       /* ""  "" ENOMEM */
-  G_SPAWN_ERROR_NOTDIR,      /* ""  "" ENOTDIR */
-  G_SPAWN_ERROR_LOOP,        /* ""  "" ELOOP   */
-  G_SPAWN_ERROR_TXTBUSY,     /* ""  "" ETXTBUSY */
-  G_SPAWN_ERROR_IO,          /* ""  "" EIO */
-  G_SPAWN_ERROR_NFILE,       /* ""  "" ENFILE */
-  G_SPAWN_ERROR_MFILE,       /* ""  "" EMFLE */
-  G_SPAWN_ERROR_INVAL,       /* ""  "" EINVAL */
-  G_SPAWN_ERROR_ISDIR,       /* ""  "" EISDIR */
-  G_SPAWN_ERROR_LIBBAD,      /* ""  "" ELIBBAD */
-  G_SPAWN_ERROR_FAILED       /* other fatal failure, error->message
-                              * should explain
-                              */
-} GSpawnError;
-
-/**
- * G_SPAWN_EXIT_ERROR:
- *
- * Error domain used by g_spawn_check_exit_status().  The code
- * will be the program exit code.
- */
-#define G_SPAWN_EXIT_ERROR g_spawn_exit_error_quark ()
-
-/**
- * GSpawnChildSetupFunc:
- * @user_data: user data to pass to the function.
- *
- * Specifies the type of the setup function passed to g_spawn_async(),
- * g_spawn_sync() and g_spawn_async_with_pipes(), which can, in very
- * limited ways, be used to affect the child's execution.
- *
- * On POSIX platforms, the function is called in the child after GLib
- * has performed all the setup it plans to perform, but before calling
- * exec(). Actions taken in this function will only affect the child,
- * not the parent.
- *
- * On Windows, the function is called in the parent. Its usefulness on
- * Windows is thus questionable. In many cases executing the child setup
- * function in the parent can have ill effects, and you should be very
- * careful when porting software to Windows that uses child setup
- * functions.
- *
- * However, even on POSIX, you are extremely limited in what you can
- * safely do from a #GSpawnChildSetupFunc, because any mutexes that
- * were held by other threads in the parent process at the time of the
- * fork() will still be locked in the child process, and they will
- * never be unlocked (since the threads that held them don't exist in
- * the child). POSIX allows only async-signal-safe functions (see
- * <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>)
- * to be called in the child between fork() and exec(), which
- * drastically limits the usefulness of child setup functions.
- *
- * In particular, it is not safe to call any function which may
- * call malloc(), which includes POSIX functions such as setenv().
- * If you need to set up the child environment differently from
- * the parent, you should use g_get_environ(), g_environ_setenv(),
- * and g_environ_unsetenv(), and then pass the complete environment
- * list to the <literal>g_spawn...</literal> function.
- */
-typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
-
-/**
- * GSpawnFlags:
- * @G_SPAWN_LEAVE_DESCRIPTORS_OPEN: the parent's open file descriptors will be
- *   inherited by the child; otherwise all descriptors except stdin/stdout/stderr
- *   will be closed before calling exec() in the child.
- * @G_SPAWN_DO_NOT_REAP_CHILD: the child will not be automatically reaped; you
- *   must use g_child_watch_add() yourself (or call waitpid()
- *   or handle <literal>SIGCHLD</literal> yourself), or the child will become a zombie.
- * @G_SPAWN_SEARCH_PATH: <literal>argv[0]</literal> need not be an absolute path,
- *   it will be looked for in the user's <envar>PATH</envar>.
- * @G_SPAWN_STDOUT_TO_DEV_NULL: the child's standard output will be discarded,
- *   instead of going to the same location as the parent's standard output.
- * @G_SPAWN_STDERR_TO_DEV_NULL: the child's standard error will be discarded.
- * @G_SPAWN_CHILD_INHERITS_STDIN: the child will inherit the parent's standard
- *   input (by default, the child's standard input is attached to
- *   <filename>/dev/null</filename>).
- * @G_SPAWN_FILE_AND_ARGV_ZERO: the first element of <literal>argv</literal> is
- *   the file to execute, while the remaining elements are the actual argument
- *   vector to pass to the file. Normally g_spawn_async_with_pipes() uses
- *   <literal>argv[0]</literal> as the file to execute, and passes all of
- *   <literal>argv</literal> to the child.
- * @G_SPAWN_SEARCH_PATH_FROM_ENVP: if <literal>argv[0]</literal> is not an abolute path,
- *   it will be looked for in the <envar>PATH</envar> from the passed child 
- *   environment. Since: 2.34
- *
- * Flags passed to g_spawn_sync(), g_spawn_async() and g_spawn_async_with_pipes().
- */
-typedef enum
-{
-  G_SPAWN_LEAVE_DESCRIPTORS_OPEN = 1 << 0,
-  G_SPAWN_DO_NOT_REAP_CHILD      = 1 << 1,
-  /* look for argv[0] in the path i.e. use execvp() */
-  G_SPAWN_SEARCH_PATH            = 1 << 2,
-  /* Dump output to /dev/null */
-  G_SPAWN_STDOUT_TO_DEV_NULL     = 1 << 3,
-  G_SPAWN_STDERR_TO_DEV_NULL     = 1 << 4,
-  G_SPAWN_CHILD_INHERITS_STDIN   = 1 << 5,
-  G_SPAWN_FILE_AND_ARGV_ZERO     = 1 << 6,
-  G_SPAWN_SEARCH_PATH_FROM_ENVP  = 1 << 7
-} GSpawnFlags;
-
-GQuark g_spawn_error_quark (void);
-GQuark g_spawn_exit_error_quark (void);
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_spawn_async g_spawn_async_utf8
-#define g_spawn_async_with_pipes g_spawn_async_with_pipes_utf8
-#define g_spawn_sync g_spawn_sync_utf8
-#define g_spawn_command_line_sync g_spawn_command_line_sync_utf8
-#define g_spawn_command_line_async g_spawn_command_line_async_utf8
-#endif
-#endif
-
-gboolean g_spawn_async (const gchar           *working_directory,
-                        gchar                **argv,
-                        gchar                **envp,
-                        GSpawnFlags            flags,
-                        GSpawnChildSetupFunc   child_setup,
-                        gpointer               user_data,
-                        GPid                  *child_pid,
-                        GError               **error);
-
-
-/* Opens pipes for non-NULL standard_output, standard_input, standard_error,
- * and returns the parent's end of the pipes.
- */
-gboolean g_spawn_async_with_pipes (const gchar          *working_directory,
-                                   gchar               **argv,
-                                   gchar               **envp,
-                                   GSpawnFlags           flags,
-                                   GSpawnChildSetupFunc  child_setup,
-                                   gpointer              user_data,
-                                   GPid                 *child_pid,
-                                   gint                 *standard_input,
-                                   gint                 *standard_output,
-                                   gint                 *standard_error,
-                                   GError              **error);
-
-
-/* If standard_output or standard_error are non-NULL, the full
- * standard output or error of the command will be placed there.
- */
-
-gboolean g_spawn_sync         (const gchar          *working_directory,
-                               gchar               **argv,
-                               gchar               **envp,
-                               GSpawnFlags           flags,
-                               GSpawnChildSetupFunc  child_setup,
-                               gpointer              user_data,
-                               gchar               **standard_output,
-                               gchar               **standard_error,
-                               gint                 *exit_status,
-                               GError              **error);
-
-gboolean g_spawn_command_line_sync  (const gchar          *command_line,
-                                     gchar               **standard_output,
-                                     gchar               **standard_error,
-                                     gint                 *exit_status,
-                                     GError              **error);
-gboolean g_spawn_command_line_async (const gchar          *command_line,
-                                     GError              **error);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean g_spawn_check_exit_status (gint      exit_status,
-				    GError  **error);
-
-void g_spawn_close_pid (GPid pid);
-
-G_END_DECLS
-
-#endif /* __G_SPAWN_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gstdio.h b/GstreamerHelper/x64/include/glib-2.0/glib/gstdio.h
deleted file mode 100644
index 08aea7d3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gstdio.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* gstdio.h - GFilename wrappers for C library functions
- *
- * Copyright 2004 Tor Lillqvist
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_STDIO_H__
-#define __G_STDIO_H__
-
-#include <glib/gprintf.h>
-
-#include <sys/stat.h>
-
-G_BEGIN_DECLS
-
-#if defined (_MSC_VER) && !defined(_WIN64)
-
-/* Make it clear that we mean the struct with 32-bit st_size and
- * 32-bit st_*time fields as that is how the 32-bit GLib DLL normally
- * has been compiled. If you get a compiler warning when calling
- * g_stat(), do take it seriously and make sure that the type of
- * struct stat the code in GLib fills in matches the struct the type
- * of struct stat you pass to g_stat(). To avoid hassle, to get file
- * attributes just use the GIO API instead which doesn't use struct
- * stat.
- *
- * Sure, it would be nicer to use a struct with 64-bit st_size and
- * 64-bit st_*time fields, but changing that now would break ABI. And
- * in MinGW, a plain "struct stat" is the one with 32-bit st_size and
- * st_*time fields.
- */
-
-typedef struct _stat32 GStatBuf;
-
-#else
-
-typedef struct stat GStatBuf;
-
-#endif
-
-#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX)
-
-/* Just pass on to the system functions, so there's no potential for data
- * format mismatches, especially with large file interfaces. 
- * A few functions can't be handled in this way, since they are not defined
- * in a portable system header that we could include here.
- */
-
-#ifndef __GTK_DOC_IGNORE__
-#define g_chmod   chmod
-#define g_open    open
-#define g_creat   creat
-#define g_rename  rename
-#define g_mkdir   mkdir
-#define g_stat    stat
-#define g_lstat   lstat
-#define g_remove  remove
-#define g_fopen   fopen
-#define g_freopen freopen
-#define g_utime   utime
-#endif
-
-int g_access (const gchar *filename,
-	      int          mode);
-
-int g_chdir  (const gchar *path);
-
-int g_unlink (const gchar *filename);
-
-int g_rmdir  (const gchar *filename);
-
-#else /* ! G_OS_UNIX */
-
-/* Wrappers for C library functions that take pathname arguments. On
- * Unix, the pathname is a file name as it literally is in the file
- * system. On well-maintained systems with consistent users who know
- * what they are doing and no exchange of files with others this would
- * be a well-defined encoding, preferably UTF-8. On Windows, the
- * pathname is always in UTF-8, even if that is not the on-disk
- * encoding, and not the encoding accepted by the C library or Win32
- * API.
- */
-
-int g_access    (const gchar *filename,
-		 int          mode);
-
-int g_chmod     (const gchar *filename,
-		 int          mode);
-
-int g_open      (const gchar *filename,
-                 int          flags,
-                 int          mode);
-
-int g_creat     (const gchar *filename,
-                 int          mode);
-
-int g_rename    (const gchar *oldfilename,
-                 const gchar *newfilename);
-
-int g_mkdir     (const gchar *filename,
-                 int          mode);
-
-int g_chdir     (const gchar *path);
-
-int g_stat      (const gchar *filename,
-                 GStatBuf    *buf);
-
-int g_lstat     (const gchar *filename,
-                 GStatBuf    *buf);
-
-int g_unlink    (const gchar *filename);
-
-int g_remove    (const gchar *filename);
-
-int g_rmdir     (const gchar *filename);
-
-FILE *g_fopen   (const gchar *filename,
-                 const gchar *mode);
-
-FILE *g_freopen (const gchar *filename,
-                 const gchar *mode,
-                 FILE        *stream);
-
-struct utimbuf;			/* Don't need the real definition of struct utimbuf when just
-				 * including this header.
-				 */
-
-int g_utime     (const gchar    *filename,
-		 struct utimbuf *utb);
-
-#endif /* G_OS_UNIX */
-
-G_END_DECLS
-
-#endif /* __G_STDIO_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gstrfuncs.h b/GstreamerHelper/x64/include/glib-2.0/glib/gstrfuncs.h
deleted file mode 100644
index 68c89fdb..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gstrfuncs.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_STRFUNCS_H__
-#define __G_STRFUNCS_H__
-
-#include <stdarg.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Functions like the ones in <ctype.h> that are not affected by locale. */
-typedef enum {
-  G_ASCII_ALNUM  = 1 << 0,
-  G_ASCII_ALPHA  = 1 << 1,
-  G_ASCII_CNTRL  = 1 << 2,
-  G_ASCII_DIGIT  = 1 << 3,
-  G_ASCII_GRAPH  = 1 << 4,
-  G_ASCII_LOWER  = 1 << 5,
-  G_ASCII_PRINT  = 1 << 6,
-  G_ASCII_PUNCT  = 1 << 7,
-  G_ASCII_SPACE  = 1 << 8,
-  G_ASCII_UPPER  = 1 << 9,
-  G_ASCII_XDIGIT = 1 << 10
-} GAsciiType;
-
-GLIB_VAR const guint16 * const g_ascii_table;
-
-#define g_ascii_isalnum(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_ALNUM) != 0)
-
-#define g_ascii_isalpha(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_ALPHA) != 0)
-
-#define g_ascii_iscntrl(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_CNTRL) != 0)
-
-#define g_ascii_isdigit(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_DIGIT) != 0)
-
-#define g_ascii_isgraph(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_GRAPH) != 0)
-
-#define g_ascii_islower(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_LOWER) != 0)
-
-#define g_ascii_isprint(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_PRINT) != 0)
-
-#define g_ascii_ispunct(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_PUNCT) != 0)
-
-#define g_ascii_isspace(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_SPACE) != 0)
-
-#define g_ascii_isupper(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_UPPER) != 0)
-
-#define g_ascii_isxdigit(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_XDIGIT) != 0)
-
-gchar                 g_ascii_tolower  (gchar        c) G_GNUC_CONST;
-gchar                 g_ascii_toupper  (gchar        c) G_GNUC_CONST;
-
-gint                  g_ascii_digit_value  (gchar    c) G_GNUC_CONST;
-gint                  g_ascii_xdigit_value (gchar    c) G_GNUC_CONST;
-
-/* String utility functions that modify a string argument or
- * return a constant string that must not be freed.
- */
-#define	 G_STR_DELIMITERS	"_-|> <."
-gchar*	              g_strdelimit     (gchar	     *string,
-					const gchar  *delimiters,
-					gchar	      new_delimiter);
-gchar*	              g_strcanon       (gchar        *string,
-					const gchar  *valid_chars,
-					gchar         substitutor);
-const gchar *         g_strerror       (gint	      errnum) G_GNUC_CONST;
-const gchar *         g_strsignal      (gint	      signum) G_GNUC_CONST;
-gchar *	              g_strreverse     (gchar	     *string);
-gsize	              g_strlcpy	       (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gsize	              g_strlcat        (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gchar *               g_strstr_len     (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-gchar *               g_strrstr        (const gchar  *haystack,
-					const gchar  *needle);
-gchar *               g_strrstr_len    (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-
-gboolean              g_str_has_suffix (const gchar  *str,
-					const gchar  *suffix);
-gboolean              g_str_has_prefix (const gchar  *str,
-					const gchar  *prefix);
-
-/* String to/from double conversion functions */
-
-gdouble	              g_strtod         (const gchar  *nptr,
-					gchar	    **endptr);
-gdouble	              g_ascii_strtod   (const gchar  *nptr,
-					gchar	    **endptr);
-guint64		      g_ascii_strtoull (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-gint64		      g_ascii_strtoll  (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-/* 29 bytes should enough for all possible values that
- * g_ascii_dtostr can produce.
- * Then add 10 for good measure */
-#define G_ASCII_DTOSTR_BUF_SIZE (29 + 10)
-gchar *               g_ascii_dtostr   (gchar        *buffer,
-					gint          buf_len,
-					gdouble       d);
-gchar *               g_ascii_formatd  (gchar        *buffer,
-					gint          buf_len,
-					const gchar  *format,
-					gdouble       d);
-
-/* removes leading spaces */
-gchar*                g_strchug        (gchar        *string);
-/* removes trailing spaces */
-gchar*                g_strchomp       (gchar        *string);
-/* removes leading & trailing spaces */
-#define g_strstrip( string )	g_strchomp (g_strchug (string))
-
-gint                  g_ascii_strcasecmp  (const gchar *s1,
-					   const gchar *s2);
-gint                  g_ascii_strncasecmp (const gchar *s1,
-					   const gchar *s2,
-					   gsize        n);
-gchar*                g_ascii_strdown     (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-gchar*                g_ascii_strup       (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-
-
-GLIB_DEPRECATED
-gint                  g_strcasecmp     (const gchar *s1,
-                                        const gchar *s2);
-GLIB_DEPRECATED
-gint                  g_strncasecmp    (const gchar *s1,
-                                        const gchar *s2,
-                                        guint        n);
-GLIB_DEPRECATED
-gchar*                g_strdown        (gchar       *string);
-GLIB_DEPRECATED
-gchar*                g_strup          (gchar       *string);
-
-
-/* String utility functions that return a newly allocated string which
- * ought to be freed with g_free from the caller at some point.
- */
-gchar*	              g_strdup	       (const gchar *str) G_GNUC_MALLOC;
-gchar*	              g_strdup_printf  (const gchar *format,
-					...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC;
-gchar*	              g_strdup_vprintf (const gchar *format,
-					va_list      args) G_GNUC_MALLOC;
-gchar*	              g_strndup	       (const gchar *str,
-					gsize        n) G_GNUC_MALLOC;  
-gchar*	              g_strnfill       (gsize        length,  
-					gchar        fill_char) G_GNUC_MALLOC;
-gchar*	              g_strconcat      (const gchar *string1,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar*                g_strjoin	       (const gchar  *separator,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-
-/* Make a copy of a string interpreting C string -style escape
- * sequences. Inverse of g_strescape. The recognized sequences are \b
- * \f \n \r \t \\ \" and the octal format.
- */
-gchar*                g_strcompress    (const gchar *source) G_GNUC_MALLOC;
-
-/* Copy a string escaping nonprintable characters like in C strings.
- * Inverse of g_strcompress. The exceptions parameter, if non-NULL, points
- * to a string containing characters that are not to be escaped.
- *
- * Deprecated API: gchar* g_strescape (const gchar *source);
- * Luckily this function wasn't used much, using NULL as second parameter
- * provides mostly identical semantics.
- */
-gchar*                g_strescape      (const gchar *source,
-					const gchar *exceptions) G_GNUC_MALLOC;
-
-gpointer              g_memdup	       (gconstpointer mem,
-					guint	       byte_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(2);
-
-/* NULL terminated string arrays.
- * g_strsplit(), g_strsplit_set() split up string into max_tokens tokens
- * at delim and return a newly allocated string array.
- * g_strjoinv() concatenates all of str_array's strings, sliding in an
- * optional separator, the returned string is newly allocated.
- * g_strfreev() frees the array itself and all of its strings.
- * g_strdupv() copies a NULL-terminated array of strings
- * g_strv_length() returns the length of a NULL-terminated array of strings
- */
-gchar**	              g_strsplit       (const gchar  *string,
-					const gchar  *delimiter,
-					gint          max_tokens) G_GNUC_MALLOC;
-gchar **	      g_strsplit_set   (const gchar *string,
-					const gchar *delimiters,
-					gint         max_tokens) G_GNUC_MALLOC;
-gchar*                g_strjoinv       (const gchar  *separator,
-					gchar       **str_array) G_GNUC_MALLOC;
-void                  g_strfreev       (gchar       **str_array);
-gchar**               g_strdupv        (gchar       **str_array) G_GNUC_MALLOC;
-guint                 g_strv_length    (gchar       **str_array);
-
-gchar*                g_stpcpy         (gchar        *dest,
-                                        const char   *src);
-
-G_END_DECLS
-
-#endif /* __G_STRFUNCS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gstring.h b/GstreamerHelper/x64/include/glib-2.0/glib/gstring.h
deleted file mode 100644
index 75434908..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gstring.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_STRING_H__
-#define __G_STRING_H__
-
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gbytes.h>
-#include <glib/gutils.h>  /* for G_CAN_INLINE */
-
-G_BEGIN_DECLS
-
-typedef struct _GString         GString;
-
-struct _GString
-{
-  gchar  *str;
-  gsize len;
-  gsize allocated_len;
-};
-
-GString*     g_string_new               (const gchar     *init);
-GString*     g_string_new_len           (const gchar     *init,
-                                         gssize           len);
-GString*     g_string_sized_new         (gsize            dfl_size);
-gchar*       g_string_free              (GString         *string,
-                                         gboolean         free_segment);
-GLIB_AVAILABLE_IN_2_34
-GBytes*      g_string_free_to_bytes     (GString         *string);
-gboolean     g_string_equal             (const GString   *v,
-                                         const GString   *v2);
-guint        g_string_hash              (const GString   *str);
-GString*     g_string_assign            (GString         *string,
-                                         const gchar     *rval);
-GString*     g_string_truncate          (GString         *string,
-                                         gsize            len);
-GString*     g_string_set_size          (GString         *string,
-                                         gsize            len);
-GString*     g_string_insert_len        (GString         *string,
-                                         gssize           pos,
-                                         const gchar     *val,
-                                         gssize           len);
-GString*     g_string_append            (GString         *string,
-                                         const gchar     *val);
-GString*     g_string_append_len        (GString         *string,
-                                         const gchar     *val,
-                                         gssize           len);
-GString*     g_string_append_c          (GString         *string,
-                                         gchar            c);
-GString*     g_string_append_unichar    (GString         *string,
-                                         gunichar         wc);
-GString*     g_string_prepend           (GString         *string,
-                                         const gchar     *val);
-GString*     g_string_prepend_c         (GString         *string,
-                                         gchar            c);
-GString*     g_string_prepend_unichar   (GString         *string,
-                                         gunichar         wc);
-GString*     g_string_prepend_len       (GString         *string,
-                                         const gchar     *val,
-                                         gssize           len);
-GString*     g_string_insert            (GString         *string,
-                                         gssize           pos,
-                                         const gchar     *val);
-GString*     g_string_insert_c          (GString         *string,
-                                         gssize           pos,
-                                         gchar            c);
-GString*     g_string_insert_unichar    (GString         *string,
-                                         gssize           pos,
-                                         gunichar         wc);
-GString*     g_string_overwrite         (GString         *string,
-                                         gsize            pos,
-                                         const gchar     *val);
-GString*     g_string_overwrite_len     (GString         *string,
-                                         gsize            pos,
-                                         const gchar     *val,
-                                         gssize           len);
-GString*     g_string_erase             (GString         *string,
-                                         gssize           pos,
-                                         gssize           len);
-GString*     g_string_ascii_down        (GString         *string);
-GString*     g_string_ascii_up          (GString         *string);
-void         g_string_vprintf           (GString         *string,
-                                         const gchar     *format,
-                                         va_list          args);
-void         g_string_printf            (GString         *string,
-                                         const gchar     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-void         g_string_append_vprintf    (GString         *string,
-                                         const gchar     *format,
-                                         va_list          args);
-void         g_string_append_printf     (GString         *string,
-                                         const gchar     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-GString*     g_string_append_uri_escaped (GString         *string,
-                                          const gchar     *unescaped,
-                                          const gchar     *reserved_chars_allowed,
-                                          gboolean         allow_utf8);
-
-/* -- optimize g_strig_append_c --- */
-#ifdef G_CAN_INLINE
-static inline GString*
-g_string_append_c_inline (GString *gstring,
-                          gchar    c)
-{
-  if (gstring->len + 1 < gstring->allocated_len)
-    {
-      gstring->str[gstring->len++] = c;
-      gstring->str[gstring->len] = 0;
-    }
-  else
-    g_string_insert_c (gstring, -1, c);
-  return gstring;
-}
-#define g_string_append_c(gstr,c)       g_string_append_c_inline (gstr, c)
-#endif /* G_CAN_INLINE */
-
-
-GLIB_DEPRECATED
-GString *g_string_down (GString *string);
-GLIB_DEPRECATED
-GString *g_string_up   (GString *string);
-
-#ifndef G_DISABLE_DEPRECATED
-#define  g_string_sprintf  g_string_printf
-#define  g_string_sprintfa g_string_append_printf
-#endif
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gstringchunk.h b/GstreamerHelper/x64/include/glib-2.0/glib/gstringchunk.h
deleted file mode 100644
index 5ab2e8ad..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gstringchunk.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_STRINGCHUNK_H__
-#define __G_STRINGCHUNK_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GStringChunk GStringChunk;
-
-GStringChunk* g_string_chunk_new          (gsize size);
-void          g_string_chunk_free         (GStringChunk *chunk);
-void          g_string_chunk_clear        (GStringChunk *chunk);
-gchar*        g_string_chunk_insert       (GStringChunk *chunk,
-                                           const gchar  *string);
-gchar*        g_string_chunk_insert_len   (GStringChunk *chunk,
-                                           const gchar  *string,
-                                           gssize        len);
-gchar*        g_string_chunk_insert_const (GStringChunk *chunk,
-                                           const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gtestutils.h b/GstreamerHelper/x64/include/glib-2.0/glib/gtestutils.h
deleted file mode 100644
index 967fa63b..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gtestutils.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/* GLib testing utilities
- * Copyright (C) 2007 Imendio AB
- * Authors: Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TEST_UTILS_H__
-#define __G_TEST_UTILS_H__
-
-#include <glib/gmessages.h>
-#include <glib/gstring.h>
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-typedef struct GTestCase  GTestCase;
-typedef struct GTestSuite GTestSuite;
-typedef void (*GTestFunc)        (void);
-typedef void (*GTestDataFunc)    (gconstpointer user_data);
-typedef void (*GTestFixtureFunc) (gpointer      fixture,
-                                  gconstpointer user_data);
-
-/* assertion API */
-#define g_assert_cmpstr(s1, cmp, s2)    do { const char *__s1 = (s1), *__s2 = (s2); \
-                                             if (g_strcmp0 (__s1, __s2) cmp 0) ; else \
-                                               g_assertion_message_cmpstr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #s1 " " #cmp " " #s2, __s1, #cmp, __s2); } while (0)
-#define g_assert_cmpint(n1, cmp, n2)    do { gint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'i'); } while (0)
-#define g_assert_cmpuint(n1, cmp, n2)   do { guint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'i'); } while (0)
-#define g_assert_cmphex(n1, cmp, n2)    do { guint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'x'); } while (0)
-#define g_assert_cmpfloat(n1,cmp,n2)    do { long double __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'f'); } while (0)
-#define g_assert_no_error(err)          do { if (err) \
-                                               g_assertion_message_error (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #err, err, 0, 0); } while (0)
-#define g_assert_error(err, dom, c)	do { if (!err || (err)->domain != dom || (err)->code != c) \
-                                               g_assertion_message_error (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #err, err, dom, c); } while (0)
-#ifdef G_DISABLE_ASSERT
-#define g_assert_not_reached()          do { (void) 0; } while (0)
-#define g_assert(expr)                  do { (void) 0; } while (0)
-#else /* !G_DISABLE_ASSERT */
-#define g_assert_not_reached()          do { g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); } while (0)
-#define g_assert(expr)                  do { if G_LIKELY (expr) ; else \
-                                               g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #expr); } while (0)
-#endif /* !G_DISABLE_ASSERT */
-
-int     g_strcmp0                       (const char     *str1,
-                                         const char     *str2);
-
-/* report performance results */
-void    g_test_minimized_result         (double          minimized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-void    g_test_maximized_result         (double          maximized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-
-/* initialize testing framework */
-void    g_test_init                     (int            *argc,
-                                         char         ***argv,
-                                         ...);
-/* query testing framework config */
-#define g_test_quick()                  (g_test_config_vars->test_quick)
-#define g_test_slow()                   (!g_test_config_vars->test_quick)
-#define g_test_thorough()               (!g_test_config_vars->test_quick)
-#define g_test_perf()                   (g_test_config_vars->test_perf)
-#define g_test_verbose()                (g_test_config_vars->test_verbose)
-#define g_test_quiet()                  (g_test_config_vars->test_quiet)
-#define g_test_undefined()              (g_test_config_vars->test_undefined)
-/* run all tests under toplevel suite (path: /) */
-int     g_test_run                      (void);
-/* hook up a test functions under test path */
-void    g_test_add_func                 (const char     *testpath,
-                                         GTestFunc       test_func);
-
-void    g_test_add_data_func            (const char     *testpath,
-                                         gconstpointer   test_data,
-                                         GTestDataFunc   test_func);
-
-GLIB_AVAILABLE_IN_2_34
-void    g_test_add_data_func_full       (const char     *testpath,
-                                         gpointer        test_data,
-                                         GTestDataFunc   test_func,
-                                         GDestroyNotify  data_free_func);
-
-/* tell about failure */
-void    g_test_fail                     (void);
-
-/* hook up a test with fixture under test path */
-#define g_test_add(testpath, Fixture, tdata, fsetup, ftest, fteardown) \
-					G_STMT_START {			\
-                                         void (*add_vtable) (const char*,       \
-                                                    gsize,             \
-                                                    gconstpointer,     \
-                                                    void (*) (Fixture*, gconstpointer),   \
-                                                    void (*) (Fixture*, gconstpointer),   \
-                                                    void (*) (Fixture*, gconstpointer)) =  (void (*) (const gchar *, gsize, gconstpointer, void (*) (Fixture*, gconstpointer), void (*) (Fixture*, gconstpointer), void (*) (Fixture*, gconstpointer))) g_test_add_vtable; \
-                                         add_vtable \
-                                          (testpath, sizeof (Fixture), tdata, fsetup, ftest, fteardown); \
-					} G_STMT_END
-
-/* add test messages to the test report */
-void    g_test_message                  (const char *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-void    g_test_bug_base                 (const char *uri_pattern);
-void    g_test_bug                      (const char *bug_uri_snippet);
-/* measure test timings */
-void    g_test_timer_start              (void);
-double  g_test_timer_elapsed            (void); /* elapsed seconds */
-double  g_test_timer_last               (void); /* repeat last elapsed() result */
-
-/* automatically g_free or g_object_unref upon teardown */
-void    g_test_queue_free               (gpointer gfree_pointer);
-void    g_test_queue_destroy            (GDestroyNotify destroy_func,
-                                         gpointer       destroy_data);
-#define g_test_queue_unref(gobject)     g_test_queue_destroy (g_object_unref, gobject)
-
-/* test traps are guards used around forked tests */
-typedef enum {
-  G_TEST_TRAP_SILENCE_STDOUT    = 1 << 7,
-  G_TEST_TRAP_SILENCE_STDERR    = 1 << 8,
-  G_TEST_TRAP_INHERIT_STDIN     = 1 << 9
-} GTestTrapFlags;
-gboolean g_test_trap_fork               (guint64              usec_timeout,
-                                         GTestTrapFlags       test_trap_flags);
-gboolean g_test_trap_has_passed         (void);
-gboolean g_test_trap_reached_timeout    (void);
-#define  g_test_trap_assert_passed()                      g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 0, 0)
-#define  g_test_trap_assert_failed()                      g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 1, 0)
-#define  g_test_trap_assert_stdout(soutpattern)           g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 2, soutpattern)
-#define  g_test_trap_assert_stdout_unmatched(soutpattern) g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 3, soutpattern)
-#define  g_test_trap_assert_stderr(serrpattern)           g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 4, serrpattern)
-#define  g_test_trap_assert_stderr_unmatched(serrpattern) g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 5, serrpattern)
-
-/* provide seed-able random numbers for tests */
-#define  g_test_rand_bit()              (0 != (g_test_rand_int() & (1 << 15)))
-gint32   g_test_rand_int                (void);
-gint32   g_test_rand_int_range          (gint32          begin,
-                                         gint32          end);
-double   g_test_rand_double             (void);
-double   g_test_rand_double_range       (double          range_start,
-                                         double          range_end);
-
-/* semi-internal API */
-GTestCase*    g_test_create_case        (const char       *test_name,
-                                         gsize             data_size,
-                                         gconstpointer     test_data,
-                                         GTestFixtureFunc  data_setup,
-                                         GTestFixtureFunc  data_test,
-                                         GTestFixtureFunc  data_teardown);
-GTestSuite*   g_test_create_suite       (const char       *suite_name);
-GTestSuite*   g_test_get_root           (void);
-void          g_test_suite_add          (GTestSuite     *suite,
-                                         GTestCase      *test_case);
-void          g_test_suite_add_suite    (GTestSuite     *suite,
-                                         GTestSuite     *nestedsuite);
-int           g_test_run_suite          (GTestSuite     *suite);
-
-/* internal ABI */
-void    g_test_trap_assertions          (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         guint64         assertion_flags, /* 0-pass, 1-fail, 2-outpattern, 4-errpattern */
-                                         const char     *pattern);
-void    g_assertion_message             (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *message) G_GNUC_NORETURN;
-void    g_assertion_message_expr        (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr) G_GNUC_NORETURN;
-void    g_assertion_message_cmpstr      (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         const char     *arg1,
-                                         const char     *cmp,
-                                         const char     *arg2) G_GNUC_NORETURN;
-void    g_assertion_message_cmpnum      (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         long double     arg1,
-                                         const char     *cmp,
-                                         long double     arg2,
-                                         char            numtype) G_GNUC_NORETURN;
-void    g_assertion_message_error       (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         const GError   *error,
-                                         GQuark          error_domain,
-                                         int             error_code) G_GNUC_NORETURN;
-void    g_test_add_vtable               (const char     *testpath,
-                                         gsize           data_size,
-                                         gconstpointer   test_data,
-                                         GTestFixtureFunc  data_setup,
-                                         GTestFixtureFunc  data_test,
-                                         GTestFixtureFunc  data_teardown);
-typedef struct {
-  gboolean      test_initialized;
-  gboolean      test_quick;     /* disable thorough tests */
-  gboolean      test_perf;      /* run performance tests */
-  gboolean      test_verbose;   /* extra info */
-  gboolean      test_quiet;     /* reduce output */
-  gboolean      test_undefined; /* run tests that are meant to assert */
-} GTestConfig;
-GLIB_VAR const GTestConfig * const g_test_config_vars;
-
-/* internal logging API */
-typedef enum {
-  G_TEST_LOG_NONE,
-  G_TEST_LOG_ERROR,             /* s:msg */
-  G_TEST_LOG_START_BINARY,      /* s:binaryname s:seed */
-  G_TEST_LOG_LIST_CASE,         /* s:testpath */
-  G_TEST_LOG_SKIP_CASE,         /* s:testpath */
-  G_TEST_LOG_START_CASE,        /* s:testpath */
-  G_TEST_LOG_STOP_CASE,         /* d:status d:nforks d:elapsed */
-  G_TEST_LOG_MIN_RESULT,        /* s:blurb d:result */
-  G_TEST_LOG_MAX_RESULT,        /* s:blurb d:result */
-  G_TEST_LOG_MESSAGE            /* s:blurb */
-} GTestLogType;
-
-typedef struct {
-  GTestLogType  log_type;
-  guint         n_strings;
-  gchar       **strings; /* NULL terminated */
-  guint         n_nums;
-  long double  *nums;
-} GTestLogMsg;
-typedef struct {
-  /*< private >*/
-  GString     *data;
-  GSList      *msgs;
-} GTestLogBuffer;
-
-const char*     g_test_log_type_name    (GTestLogType    log_type);
-GTestLogBuffer* g_test_log_buffer_new   (void);
-void            g_test_log_buffer_free  (GTestLogBuffer *tbuffer);
-void            g_test_log_buffer_push  (GTestLogBuffer *tbuffer,
-                                         guint           n_bytes,
-                                         const guint8   *bytes);
-GTestLogMsg*    g_test_log_buffer_pop   (GTestLogBuffer *tbuffer);
-void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
-
-/**
- * GTestLogFatalFunc:
- * @log_domain: the log domain of the message
- * @log_level: the log level of the message (including the fatal and recursion flags)
- * @message: the message to process
- * @user_data: user data, set in g_test_log_set_fatal_handler()
- *
- * Specifies the prototype of fatal log handler functions.
- *
- * Return value: %TRUE if the program should abort, %FALSE otherwise
- *
- * Since: 2.22
- */
-typedef gboolean        (*GTestLogFatalFunc)    (const gchar    *log_domain,
-                                                 GLogLevelFlags  log_level,
-                                                 const gchar    *message,
-                                                 gpointer        user_data);
-void
-g_test_log_set_fatal_handler            (GTestLogFatalFunc log_func,
-                                         gpointer          user_data);
-
-void    g_test_expect_message                    (const gchar    *log_domain,
-                                                  GLogLevelFlags  log_level,
-                                                  const gchar    *pattern);
-void    g_test_assert_expected_messages_internal (const char     *domain,
-                                                  const char     *file,
-                                                  int             line,
-                                                  const char     *func);
-
-#define g_test_assert_expected_messages() g_test_assert_expected_messages_internal (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC)
-
-G_END_DECLS
-
-#endif /* __G_TEST_UTILS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gthread.h b/GstreamerHelper/x64/include/glib-2.0/glib/gthread.h
deleted file mode 100644
index fc927da6..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gthread.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_THREAD_H__
-#define __G_THREAD_H__
-
-#include <glib/gatomic.h>
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_THREAD_ERROR g_thread_error_quark ()
-GQuark g_thread_error_quark (void);
-
-typedef enum
-{
-  G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
-} GThreadError;
-
-typedef gpointer (*GThreadFunc) (gpointer data);
-
-typedef struct _GThread         GThread;
-
-typedef union  _GMutex          GMutex;
-typedef struct _GRecMutex       GRecMutex;
-typedef struct _GRWLock         GRWLock;
-typedef struct _GCond           GCond;
-typedef struct _GPrivate        GPrivate;
-typedef struct _GOnce           GOnce;
-
-union _GMutex
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GRWLock
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GCond
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GRecMutex
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-#define G_PRIVATE_INIT(notify) { NULL, (notify), { NULL, NULL } }
-struct _GPrivate
-{
-  /*< private >*/
-  gpointer       p;
-  GDestroyNotify notify;
-  gpointer future[2];
-};
-
-typedef enum
-{
-  G_ONCE_STATUS_NOTCALLED,
-  G_ONCE_STATUS_PROGRESS,
-  G_ONCE_STATUS_READY
-} GOnceStatus;
-
-#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
-struct _GOnce
-{
-  volatile GOnceStatus status;
-  volatile gpointer retval;
-};
-
-#define G_LOCK_NAME(name)             g__ ## name ## _lock
-#define G_LOCK_DEFINE_STATIC(name)    static G_LOCK_DEFINE (name)
-#define G_LOCK_DEFINE(name)           GMutex G_LOCK_NAME (name)
-#define G_LOCK_EXTERN(name)           extern GMutex G_LOCK_NAME (name)
-
-#ifdef G_DEBUG_LOCKS
-#  define G_LOCK(name)                G_STMT_START{             \
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                   \
-             "file %s: line %d (%s): locking: %s ",             \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name);                                            \
-      g_mutex_lock (&G_LOCK_NAME (name));                       \
-   }G_STMT_END
-#  define G_UNLOCK(name)              G_STMT_START{             \
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                   \
-             "file %s: line %d (%s): unlocking: %s ",           \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name);                                            \
-     g_mutex_unlock (&G_LOCK_NAME (name));                      \
-   }G_STMT_END
-#  define G_TRYLOCK(name)                                       \
-      (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                  \
-             "file %s: line %d (%s): try locking: %s ",         \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name), g_mutex_trylock (&G_LOCK_NAME (name)))
-#else  /* !G_DEBUG_LOCKS */
-#  define G_LOCK(name) g_mutex_lock       (&G_LOCK_NAME (name))
-#  define G_UNLOCK(name) g_mutex_unlock   (&G_LOCK_NAME (name))
-#  define G_TRYLOCK(name) g_mutex_trylock (&G_LOCK_NAME (name))
-#endif /* !G_DEBUG_LOCKS */
-
-GThread *       g_thread_ref                    (GThread        *thread);
-void            g_thread_unref                  (GThread        *thread);
-GThread *       g_thread_new                    (const gchar    *name,
-                                                 GThreadFunc     func,
-                                                 gpointer        data);
-GThread *       g_thread_try_new                (const gchar    *name,
-                                                 GThreadFunc     func,
-                                                 gpointer        data,
-                                                 GError        **error);
-GThread *       g_thread_self                   (void);
-void            g_thread_exit                   (gpointer        retval);
-gpointer        g_thread_join                   (GThread        *thread);
-void            g_thread_yield                  (void);
-
-
-void            g_mutex_init                    (GMutex         *mutex);
-void            g_mutex_clear                   (GMutex         *mutex);
-void            g_mutex_lock                    (GMutex         *mutex);
-gboolean        g_mutex_trylock                 (GMutex         *mutex);
-void            g_mutex_unlock                  (GMutex         *mutex);
-
-void            g_rw_lock_init                  (GRWLock        *rw_lock);
-void            g_rw_lock_clear                 (GRWLock        *rw_lock);
-void            g_rw_lock_writer_lock           (GRWLock        *rw_lock);
-gboolean        g_rw_lock_writer_trylock        (GRWLock        *rw_lock);
-void            g_rw_lock_writer_unlock         (GRWLock        *rw_lock);
-void            g_rw_lock_reader_lock           (GRWLock        *rw_lock);
-gboolean        g_rw_lock_reader_trylock        (GRWLock        *rw_lock);
-void            g_rw_lock_reader_unlock         (GRWLock        *rw_lock);
-
-void            g_rec_mutex_init                (GRecMutex      *rec_mutex);
-void            g_rec_mutex_clear               (GRecMutex      *rec_mutex);
-void            g_rec_mutex_lock                (GRecMutex      *rec_mutex);
-gboolean        g_rec_mutex_trylock             (GRecMutex      *rec_mutex);
-void            g_rec_mutex_unlock              (GRecMutex      *rec_mutex);
-
-void            g_cond_init                     (GCond          *cond);
-void            g_cond_clear                    (GCond          *cond);
-void            g_cond_wait                     (GCond          *cond,
-                                                 GMutex         *mutex);
-void            g_cond_signal                   (GCond          *cond);
-void            g_cond_broadcast                (GCond          *cond);
-gboolean        g_cond_wait_until               (GCond          *cond,
-                                                 GMutex         *mutex,
-                                                 gint64          end_time);
-
-gpointer        g_private_get                   (GPrivate       *key);
-void            g_private_set                   (GPrivate       *key,
-                                                 gpointer        value);
-void            g_private_replace               (GPrivate       *key,
-                                                 gpointer        value);
-
-gpointer        g_once_impl                     (GOnce          *once,
-                                                 GThreadFunc     func,
-                                                 gpointer        arg);
-gboolean        g_once_init_enter               (volatile void  *location);
-void            g_once_init_leave               (volatile void  *location,
-                                                 gsize           result);
-
-#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-# define g_once(once, func, arg) g_once_impl ((once), (func), (arg))
-#else /* !G_ATOMIC_OP_MEMORY_BARRIER_NEEDED*/
-# define g_once(once, func, arg) \
-  (((once)->status == G_ONCE_STATUS_READY) ? \
-   (once)->retval : \
-   g_once_impl ((once), (func), (arg)))
-#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-#ifdef __GNUC__
-# define g_once_init_enter(location) \
-  (G_GNUC_EXTENSION ({                                               \
-    G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer));       \
-    (void) (0 ? (gpointer) *(location) : 0);                         \
-    (!g_atomic_pointer_get (location) &&                             \
-     g_once_init_enter (location));                                  \
-  }))
-# define g_once_init_leave(location, result) \
-  (G_GNUC_EXTENSION ({                                               \
-    G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer));       \
-    (void) (0 ? *(location) = (result) : 0);                         \
-    g_once_init_leave ((location), (gsize) (result));                \
-  }))
-#else
-# define g_once_init_enter(location) \
-  (g_once_init_enter((location)))
-# define g_once_init_leave(location, result) \
-  (g_once_init_leave((location), (gsize) (result)))
-#endif
-
-G_END_DECLS
-
-#endif /* __G_THREAD_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gthreadpool.h b/GstreamerHelper/x64/include/glib-2.0/glib/gthreadpool.h
deleted file mode 100644
index 3a1f2980..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gthreadpool.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_THREADPOOL_H__
-#define __G_THREADPOOL_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GThreadPool GThreadPool;
-
-/* Thread Pools
- */
-
-struct _GThreadPool
-{
-  GFunc func;
-  gpointer user_data;
-  gboolean exclusive;
-};
-
-GThreadPool *   g_thread_pool_new               (GFunc            func,
-                                                 gpointer         user_data,
-                                                 gint             max_threads,
-                                                 gboolean         exclusive,
-                                                 GError         **error);
-void            g_thread_pool_free              (GThreadPool     *pool,
-                                                 gboolean         immediate,
-                                                 gboolean         wait_);
-gboolean        g_thread_pool_push              (GThreadPool     *pool,
-                                                 gpointer         data,
-                                                 GError         **error);
-guint           g_thread_pool_unprocessed       (GThreadPool     *pool);
-void            g_thread_pool_set_sort_function (GThreadPool      *pool,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-gboolean        g_thread_pool_set_max_threads   (GThreadPool     *pool,
-                                                 gint             max_threads,
-                                                 GError         **error);
-gint            g_thread_pool_get_max_threads   (GThreadPool     *pool);
-guint           g_thread_pool_get_num_threads   (GThreadPool     *pool);
-
-void            g_thread_pool_set_max_unused_threads (gint  max_threads);
-gint            g_thread_pool_get_max_unused_threads (void);
-guint           g_thread_pool_get_num_unused_threads (void);
-void            g_thread_pool_stop_unused_threads    (void);
-void            g_thread_pool_set_max_idle_time      (guint interval);
-guint           g_thread_pool_get_max_idle_time      (void);
-
-G_END_DECLS
-
-#endif /* __G_THREADPOOL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gtimer.h b/GstreamerHelper/x64/include/glib-2.0/glib/gtimer.h
deleted file mode 100644
index b927fc37..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gtimer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TIMER_H__
-#define __G_TIMER_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Timer
- */
-
-/* microseconds per second */
-typedef struct _GTimer		GTimer;
-
-#define G_USEC_PER_SEC 1000000
-
-GTimer*  g_timer_new	         (void);
-void	 g_timer_destroy         (GTimer      *timer);
-void	 g_timer_start	         (GTimer      *timer);
-void	 g_timer_stop	         (GTimer      *timer);
-void	 g_timer_reset	         (GTimer      *timer);
-void	 g_timer_continue        (GTimer      *timer);
-gdouble  g_timer_elapsed         (GTimer      *timer,
-				  gulong      *microseconds);
-
-void     g_usleep                (gulong       microseconds);
-
-void     g_time_val_add          (GTimeVal    *time_, 
-                                  glong        microseconds);
-gboolean g_time_val_from_iso8601 (const gchar *iso_date,
-				  GTimeVal    *time_);
-gchar*   g_time_val_to_iso8601   (GTimeVal    *time_) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_TIMER_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gtimezone.h b/GstreamerHelper/x64/include/glib-2.0/glib/gtimezone.h
deleted file mode 100644
index c877e8f4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gtimezone.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TIME_ZONE_H__
-#define __G_TIME_ZONE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTimeZone GTimeZone;
-
-/**
- * GTimeType:
- * @G_TIME_TYPE_STANDARD: the time is in local standard time
- * @G_TIME_TYPE_DAYLIGHT: the time is in local daylight time
- * @G_TIME_TYPE_UNIVERSAL: the time is in UTC
- *
- * Disambiguates a given time in two ways.
- *
- * First, specifies if the given time is in universal or local time.
- *
- * Second, if the time is in local time, specifies if it is local
- * standard time or local daylight time.  This is important for the case
- * where the same local time occurs twice (during daylight savings time
- * transitions, for example).
- */
-typedef enum
-{
-  G_TIME_TYPE_STANDARD,
-  G_TIME_TYPE_DAYLIGHT,
-  G_TIME_TYPE_UNIVERSAL
-} GTimeType;
-
-GTimeZone *             g_time_zone_new                                 (const gchar *identifier);
-GTimeZone *             g_time_zone_new_utc                             (void);
-GTimeZone *             g_time_zone_new_local                           (void);
-
-GTimeZone *             g_time_zone_ref                                 (GTimeZone   *tz);
-void                    g_time_zone_unref                               (GTimeZone   *tz);
-
-gint                    g_time_zone_find_interval                       (GTimeZone   *tz,
-                                                                         GTimeType    type,
-                                                                         gint64       time_);
-
-gint                    g_time_zone_adjust_time                         (GTimeZone   *tz,
-                                                                         GTimeType    type,
-                                                                         gint64      *time_);
-
-const gchar *           g_time_zone_get_abbreviation                    (GTimeZone   *tz,
-                                                                         gint         interval);
-gint32                  g_time_zone_get_offset                          (GTimeZone   *tz,
-                                                                         gint         interval);
-gboolean                g_time_zone_is_dst                              (GTimeZone   *tz,
-                                                                         gint         interval);
-
-G_END_DECLS
-
-#endif /* __G_TIME_ZONE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gtrashstack.h b/GstreamerHelper/x64/include/glib-2.0/glib/gtrashstack.h
deleted file mode 100644
index 3f226fe4..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gtrashstack.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TRASH_STACK_H__
-#define __G_TRASH_STACK_H__
-
-#include <glib/gutils.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTrashStack GTrashStack;
-struct _GTrashStack
-{
-  GTrashStack *next;
-};
-
-G_INLINE_FUNC void      g_trash_stack_push   (GTrashStack **stack_p,
-                                              gpointer      data_p);
-G_INLINE_FUNC gpointer  g_trash_stack_pop    (GTrashStack **stack_p);
-G_INLINE_FUNC gpointer  g_trash_stack_peek   (GTrashStack **stack_p);
-G_INLINE_FUNC guint     g_trash_stack_height (GTrashStack **stack_p);
-
-#if defined (G_CAN_INLINE) || defined (__G_TRASH_STACK_C__)
-
-G_INLINE_FUNC void
-g_trash_stack_push (GTrashStack **stack_p,
-                    gpointer      data_p)
-{
-  GTrashStack *data = (GTrashStack *) data_p;
-
-  data->next = *stack_p;
-  *stack_p = data;
-}
-G_INLINE_FUNC gpointer
-g_trash_stack_pop (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-
-  data = *stack_p;
-  if (data)
-    {
-      *stack_p = data->next;
-      /* NULLify private pointer here, most platforms store NULL as
-       * subsequent 0 bytes
-       */
-      data->next = NULL;
-    }
-
-  return data;
-}
-G_INLINE_FUNC gpointer
-g_trash_stack_peek (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-
-  data = *stack_p;
-
-  return data;
-}
-G_INLINE_FUNC guint
-g_trash_stack_height (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-  guint i = 0;
-
-  for (data = *stack_p; data; data = data->next)
-    i++;
-
-  return i;
-}
-
-#endif  /* G_CAN_INLINE || __G_TRASH_STACK_C__ */
-
-G_END_DECLS
-
-#endif /* __G_UTILS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gtree.h b/GstreamerHelper/x64/include/glib-2.0/glib/gtree.h
deleted file mode 100644
index e17a5182..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gtree.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TREE_H__
-#define __G_TREE_H__
-
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTree  GTree;
-
-typedef gboolean (*GTraverseFunc) (gpointer  key,
-                                   gpointer  value,
-                                   gpointer  data);
-
-/* Balanced binary trees
- */
-GTree*   g_tree_new             (GCompareFunc      key_compare_func);
-GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data);
-GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data,
-                                 GDestroyNotify    key_destroy_func,
-                                 GDestroyNotify    value_destroy_func);
-GTree*   g_tree_ref             (GTree            *tree);
-void     g_tree_unref           (GTree            *tree);
-void     g_tree_destroy         (GTree            *tree);
-void     g_tree_insert          (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-void     g_tree_replace         (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-gboolean g_tree_remove          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_steal           (GTree            *tree,
-                                 gconstpointer     key);
-gpointer g_tree_lookup          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_lookup_extended (GTree            *tree,
-                                 gconstpointer     lookup_key,
-                                 gpointer         *orig_key,
-                                 gpointer         *value);
-void     g_tree_foreach         (GTree            *tree,
-                                 GTraverseFunc	   func,
-                                 gpointer	   user_data);
-
-GLIB_DEPRECATED
-void     g_tree_traverse        (GTree            *tree,
-                                 GTraverseFunc     traverse_func,
-                                 GTraverseType     traverse_type,
-                                 gpointer          user_data);
-
-gpointer g_tree_search          (GTree            *tree,
-                                 GCompareFunc      search_func,
-                                 gconstpointer     user_data);
-gint     g_tree_height          (GTree            *tree);
-gint     g_tree_nnodes          (GTree            *tree);
-
-G_END_DECLS
-
-#endif /* __G_TREE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gtypes.h b/GstreamerHelper/x64/include/glib-2.0/glib/gtypes.h
deleted file mode 100644
index 7e4c8eab..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gtypes.h
+++ /dev/null
@@ -1,484 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TYPES_H__
-#define __G_TYPES_H__
-
-#include <glibconfig.h>
-#include <glib/gmacros.h>
-#include <glib/gversionmacros.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/* Provide type definitions for commonly used types.
- *  These are useful because a "gint8" can be adjusted
- *  to be 1 byte (8 bits) on all platforms. Similarly and
- *  more importantly, "gint32" can be adjusted to be
- *  4 bytes (32 bits) on all platforms.
- */
-
-typedef char   gchar;
-typedef short  gshort;
-typedef long   glong;
-typedef int    gint;
-typedef gint   gboolean;
-
-typedef unsigned char   guchar;
-typedef unsigned short  gushort;
-typedef unsigned long   gulong;
-typedef unsigned int    guint;
-
-typedef float   gfloat;
-typedef double  gdouble;
-
-/* Define min and max constants for the fixed size numerical types */
-#define G_MININT8	((gint8)  0x80)
-#define G_MAXINT8	((gint8)  0x7f)
-#define G_MAXUINT8	((guint8) 0xff)
-
-#define G_MININT16	((gint16)  0x8000)
-#define G_MAXINT16	((gint16)  0x7fff)
-#define G_MAXUINT16	((guint16) 0xffff)
-
-#define G_MININT32	((gint32)  0x80000000)
-#define G_MAXINT32	((gint32)  0x7fffffff)
-#define G_MAXUINT32	((guint32) 0xffffffff)
-
-#define G_MININT64	((gint64) G_GINT64_CONSTANT(0x8000000000000000))
-#define G_MAXINT64	G_GINT64_CONSTANT(0x7fffffffffffffff)
-#define G_MAXUINT64	G_GINT64_CONSTANT(0xffffffffffffffffU)
-
-typedef void* gpointer;
-typedef const void *gconstpointer;
-
-typedef gint            (*GCompareFunc)         (gconstpointer  a,
-                                                 gconstpointer  b);
-typedef gint            (*GCompareDataFunc)     (gconstpointer  a,
-                                                 gconstpointer  b,
-						 gpointer       user_data);
-typedef gboolean        (*GEqualFunc)           (gconstpointer  a,
-                                                 gconstpointer  b);
-typedef void            (*GDestroyNotify)       (gpointer       data);
-typedef void            (*GFunc)                (gpointer       data,
-                                                 gpointer       user_data);
-typedef guint           (*GHashFunc)            (gconstpointer  key);
-typedef void            (*GHFunc)               (gpointer       key,
-                                                 gpointer       value,
-                                                 gpointer       user_data);
-
-/**
- * GFreeFunc:
- * @data: a data pointer
- *
- * Declares a type of function which takes an arbitrary
- * data pointer argument and has no return value. It is
- * not currently used in GLib or GTK+.
- */
-typedef void            (*GFreeFunc)            (gpointer       data);
-
-/**
- * GTranslateFunc:
- * @str: the untranslated string
- * @data: user data specified when installing the function, e.g.
- *  in g_option_group_set_translate_func()
- * 
- * The type of functions which are used to translate user-visible
- * strings, for <option>--help</option> output.
- * 
- * Returns: a translation of the string for the current locale.
- *  The returned string is owned by GLib and must not be freed.
- */
-typedef const gchar *   (*GTranslateFunc)       (const gchar   *str,
-						 gpointer       data);
-
-
-/* Define some mathematical constants that aren't available
- * symbolically in some strict ISO C implementations.
- *
- * Note that the large number of digits used in these definitions
- * doesn't imply that GLib or current computers in general would be
- * able to handle floating point numbers with an accuracy like this.
- * It's mostly an exercise in futility and future proofing. For
- * extended precision floating point support, look somewhere else
- * than GLib.
- */
-#define G_E     2.7182818284590452353602874713526624977572470937000
-#define G_LN2   0.69314718055994530941723212145817656807550013436026
-#define G_LN10  2.3025850929940456840179914546843642076011014886288
-#define G_PI    3.1415926535897932384626433832795028841971693993751
-#define G_PI_2  1.5707963267948966192313216916397514420985846996876
-#define G_PI_4  0.78539816339744830961566084581987572104929234984378
-#define G_SQRT2 1.4142135623730950488016887242096980785696718753769
-
-/* Portable endian checks and conversions
- *
- * glibconfig.h defines G_BYTE_ORDER which expands to one of
- * the below macros.
- */
-#define G_LITTLE_ENDIAN 1234
-#define G_BIG_ENDIAN    4321
-#define G_PDP_ENDIAN    3412		/* unused, need specific PDP check */	
-
-
-/* Basic bit swapping functions
- */
-#define GUINT16_SWAP_LE_BE_CONSTANT(val)	((guint16) ( \
-    (guint16) ((guint16) (val) >> 8) |	\
-    (guint16) ((guint16) (val) << 8)))
-
-#define GUINT32_SWAP_LE_BE_CONSTANT(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x000000ffU) << 24) | \
-    (((guint32) (val) & (guint32) 0x0000ff00U) <<  8) | \
-    (((guint32) (val) & (guint32) 0x00ff0000U) >>  8) | \
-    (((guint32) (val) & (guint32) 0xff000000U) >> 24)))
-
-#define GUINT64_SWAP_LE_BE_CONSTANT(val)	((guint64) ( \
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00000000000000ffU)) << 56) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x000000000000ff00U)) << 40) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x0000000000ff0000U)) << 24) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00000000ff000000U)) <<  8) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x000000ff00000000U)) >>  8) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x0000ff0000000000U)) >> 24) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00ff000000000000U)) >> 40) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0xff00000000000000U)) >> 56)))
-
-/* Arch specific stuff for speed
- */
-#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
-
-#  if __GNUC__ >= 4 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 3
-#    define GUINT32_SWAP_LE_BE(val) ((guint32) __builtin_bswap32 ((gint32) val))
-#    define GUINT64_SWAP_LE_BE(val) ((guint64) __builtin_bswap64 ((gint64) val))
-#  endif
-
-#  if defined (__i386__)
-#    define GUINT16_SWAP_LE_BE_IA32(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint16 __v, __x = ((guint16) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT16_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ ("rorw $8, %w0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x)				\
-		      : "cc");					\
-	    __v; }))
-#    if !defined (__i486__) && !defined (__i586__) \
-	&& !defined (__pentium__) && !defined (__i686__) \
-	&& !defined (__pentiumpro__) && !defined (__pentium4__)
-#       define GUINT32_SWAP_LE_BE_IA32(val) \
-	  (G_GNUC_EXTENSION					\
-	   ({ register guint32 __v, __x = ((guint32) (val));	\
-	      if (__builtin_constant_p (__x))			\
-		__v = GUINT32_SWAP_LE_BE_CONSTANT (__x);	\
-	      else						\
-		__asm__ ("rorw $8, %w0\n\t"			\
-			 "rorl $16, %0\n\t"			\
-			 "rorw $8, %w0"				\
-			 : "=r" (__v)				\
-			 : "0" (__x)				\
-			 : "cc");				\
-	      __v; }))
-#    else /* 486 and higher has bswap */
-#       define GUINT32_SWAP_LE_BE_IA32(val) \
-	  (G_GNUC_EXTENSION					\
-	   ({ register guint32 __v, __x = ((guint32) (val));	\
-	      if (__builtin_constant_p (__x))			\
-		__v = GUINT32_SWAP_LE_BE_CONSTANT (__x);	\
-	      else						\
-		__asm__ ("bswap %0"				\
-			 : "=r" (__v)				\
-			 : "0" (__x));				\
-	      __v; }))
-#    endif /* processor specific 32-bit stuff */
-#    define GUINT64_SWAP_LE_BE_IA32(val) \
-       (G_GNUC_EXTENSION						\
-	({ union { guint64 __ll;					\
-		   guint32 __l[2]; } __w, __r;				\
-	   __w.__ll = ((guint64) (val));				\
-	   if (__builtin_constant_p (__w.__ll))				\
-	     __r.__ll = GUINT64_SWAP_LE_BE_CONSTANT (__w.__ll);		\
-	   else								\
-	     {								\
-	       __r.__l[0] = GUINT32_SWAP_LE_BE (__w.__l[1]);		\
-	       __r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]);		\
-	     }								\
-	   __r.__ll; }))
-     /* Possibly just use the constant version and let gcc figure it out? */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA32 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA32 (val))
-#    endif
-#  elif defined (__ia64__)
-#    define GUINT16_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint16 __v, __x = ((guint16) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT16_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ __volatile__ ("shl %0 = %1, 48 ;;"		\
-				   "mux1 %0 = %0, @rev ;;"	\
-				    : "=r" (__v)		\
-				    : "r" (__x));		\
-	    __v; }))
-#    define GUINT32_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	 ({ register guint32 __v, __x = ((guint32) (val));	\
-	    if (__builtin_constant_p (__x))			\
-	      __v = GUINT32_SWAP_LE_BE_CONSTANT (__x);		\
-	    else						\
-	     __asm__ __volatile__ ("shl %0 = %1, 32 ;;"		\
-				   "mux1 %0 = %0, @rev ;;"	\
-				    : "=r" (__v)		\
-				    : "r" (__x));		\
-	    __v; }))
-#    define GUINT64_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint64 __v, __x = ((guint64) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT64_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ __volatile__ ("mux1 %0 = %1, @rev ;;"	\
-				   : "=r" (__v)			\
-				   : "r" (__x));		\
-	   __v; }))
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA64 (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA64 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA64 (val))
-#    endif
-#  elif defined (__x86_64__)
-#    define GUINT32_SWAP_LE_BE_X86_64(val) \
-       (G_GNUC_EXTENSION					\
-	 ({ register guint32 __v, __x = ((guint32) (val));	\
-	    if (__builtin_constant_p (__x))			\
-	      __v = GUINT32_SWAP_LE_BE_CONSTANT (__x);		\
-	    else						\
-	     __asm__ ("bswapl %0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x));				\
-	    __v; }))
-#    define GUINT64_SWAP_LE_BE_X86_64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint64 __v, __x = ((guint64) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT64_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ ("bswapq %0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x));				\
-	   __v; }))
-     /* gcc seems to figure out optimal code for this on its own */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86_64 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86_64 (val))
-#    endif
-#  else /* generic gcc */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
-#    endif
-#  endif
-#else /* generic */
-#  define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#  define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
-#  define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
-#endif /* generic */
-
-#define GUINT16_SWAP_LE_PDP(val)	((guint16) (val))
-#define GUINT16_SWAP_BE_PDP(val)	(GUINT16_SWAP_LE_BE (val))
-#define GUINT32_SWAP_LE_PDP(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x0000ffffU) << 16) | \
-    (((guint32) (val) & (guint32) 0xffff0000U) >> 16)))
-#define GUINT32_SWAP_BE_PDP(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x00ff00ffU) << 8) | \
-    (((guint32) (val) & (guint32) 0xff00ff00U) >> 8)))
-
-/* The G*_TO_?E() macros are defined in glibconfig.h.
- * The transformation is symmetric, so the FROM just maps to the TO.
- */
-#define GINT16_FROM_LE(val)	(GINT16_TO_LE (val))
-#define GUINT16_FROM_LE(val)	(GUINT16_TO_LE (val))
-#define GINT16_FROM_BE(val)	(GINT16_TO_BE (val))
-#define GUINT16_FROM_BE(val)	(GUINT16_TO_BE (val))
-#define GINT32_FROM_LE(val)	(GINT32_TO_LE (val))
-#define GUINT32_FROM_LE(val)	(GUINT32_TO_LE (val))
-#define GINT32_FROM_BE(val)	(GINT32_TO_BE (val))
-#define GUINT32_FROM_BE(val)	(GUINT32_TO_BE (val))
-
-#define GINT64_FROM_LE(val)	(GINT64_TO_LE (val))
-#define GUINT64_FROM_LE(val)	(GUINT64_TO_LE (val))
-#define GINT64_FROM_BE(val)	(GINT64_TO_BE (val))
-#define GUINT64_FROM_BE(val)	(GUINT64_TO_BE (val))
-
-#define GLONG_FROM_LE(val)	(GLONG_TO_LE (val))
-#define GULONG_FROM_LE(val)	(GULONG_TO_LE (val))
-#define GLONG_FROM_BE(val)	(GLONG_TO_BE (val))
-#define GULONG_FROM_BE(val)	(GULONG_TO_BE (val))
-
-#define GINT_FROM_LE(val)	(GINT_TO_LE (val))
-#define GUINT_FROM_LE(val)	(GUINT_TO_LE (val))
-#define GINT_FROM_BE(val)	(GINT_TO_BE (val))
-#define GUINT_FROM_BE(val)	(GUINT_TO_BE (val))
-
-#define GSIZE_FROM_LE(val)	(GSIZE_TO_LE (val))
-#define GSSIZE_FROM_LE(val)	(GSSIZE_TO_LE (val))
-#define GSIZE_FROM_BE(val)	(GSIZE_TO_BE (val))
-#define GSSIZE_FROM_BE(val)	(GSSIZE_TO_BE (val))
-
-
-/* Portable versions of host-network order stuff
- */
-#define g_ntohl(val) (GUINT32_FROM_BE (val))
-#define g_ntohs(val) (GUINT16_FROM_BE (val))
-#define g_htonl(val) (GUINT32_TO_BE (val))
-#define g_htons(val) (GUINT16_TO_BE (val))
-
-/* IEEE Standard 754 Single Precision Storage Format (gfloat):
- *
- *        31 30           23 22            0
- * +--------+---------------+---------------+
- * | s 1bit | e[30:23] 8bit | f[22:0] 23bit |
- * +--------+---------------+---------------+
- * B0------------------->B1------->B2-->B3-->
- *
- * IEEE Standard 754 Double Precision Storage Format (gdouble):
- *
- *        63 62            52 51            32   31            0
- * +--------+----------------+----------------+ +---------------+
- * | s 1bit | e[62:52] 11bit | f[51:32] 20bit | | f[31:0] 32bit |
- * +--------+----------------+----------------+ +---------------+
- * B0--------------->B1---------->B2--->B3---->  B4->B5->B6->B7->
- */
-/* subtract from biased_exponent to form base2 exponent (normal numbers) */
-typedef union  _GDoubleIEEE754	GDoubleIEEE754;
-typedef union  _GFloatIEEE754	GFloatIEEE754;
-#define G_IEEE754_FLOAT_BIAS	(127)
-#define G_IEEE754_DOUBLE_BIAS	(1023)
-/* multiply with base2 exponent to get base10 exponent (normal numbers) */
-#define G_LOG_2_BASE_10		(0.30102999566398119521)
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-union _GFloatIEEE754
-{
-  gfloat v_float;
-  struct {
-    guint mantissa : 23;
-    guint biased_exponent : 8;
-    guint sign : 1;
-  } mpn;
-};
-union _GDoubleIEEE754
-{
-  gdouble v_double;
-  struct {
-    guint mantissa_low : 32;
-    guint mantissa_high : 20;
-    guint biased_exponent : 11;
-    guint sign : 1;
-  } mpn;
-};
-#elif G_BYTE_ORDER == G_BIG_ENDIAN
-union _GFloatIEEE754
-{
-  gfloat v_float;
-  struct {
-    guint sign : 1;
-    guint biased_exponent : 8;
-    guint mantissa : 23;
-  } mpn;
-};
-union _GDoubleIEEE754
-{
-  gdouble v_double;
-  struct {
-    guint sign : 1;
-    guint biased_exponent : 11;
-    guint mantissa_high : 20;
-    guint mantissa_low : 32;
-  } mpn;
-};
-#else /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-#error unknown ENDIAN type
-#endif /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-
-typedef struct _GTimeVal                GTimeVal;
-
-struct _GTimeVal
-{
-  glong tv_sec;
-  glong tv_usec;
-};
-
-G_END_DECLS
-
-/* We prefix variable declarations so they can
- * properly get exported in Windows DLLs.
- */
-#ifndef GLIB_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GLIB_STATIC_COMPILATION
-#      define GLIB_VAR extern
-#    else /* !GLIB_STATIC_COMPILATION */
-#      ifdef GLIB_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GLIB_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GLIB_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GLIB_COMPILATION */
-#        define GLIB_VAR extern __declspec(dllimport)
-#      endif /* !GLIB_COMPILATION */
-#    endif /* !GLIB_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    define GLIB_VAR extern
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GLIB_VAR */
-
-#endif /* __G_TYPES_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gunicode.h b/GstreamerHelper/x64/include/glib-2.0/glib/gunicode.h
deleted file mode 100644
index f9c2fd56..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gunicode.h
+++ /dev/null
@@ -1,752 +0,0 @@
-/* gunicode.h - Unicode manipulation functions
- *
- *  Copyright (C) 1999, 2000 Tom Tromey
- *  Copyright 2000, 2005 Red Hat, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_UNICODE_H__
-#define __G_UNICODE_H__
-
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * gunichar:
- *
- * A type which can hold any UTF-32 or UCS-4 character code,
- * also known as a Unicode code point.
- *
- * If you want to produce the UTF-8 representation of a #gunichar,
- * use g_ucs4_to_utf8(). See also g_utf8_to_ucs4() for the reverse
- * process.
- *
- * To print/scan values of this type as integer, use
- * %G_GINT32_MODIFIER and/or %G_GUINT32_FORMAT.
- *
- * The notation to express a Unicode code point in running text is
- * as a hexadecimal number with four to six digits and uppercase
- * letters, prefixed by the string "U+". Leading zeros are omitted,
- * unless the code point would have fewer than four hexadecimal digits.
- * For example, "U+0041 LATIN CAPITAL LETTER A". To print a code point
- * in the U+-notation, use the format string "U+\%04"G_GINT32_FORMAT"X".
- * To scan, use the format string "U+\%06"G_GINT32_FORMAT"X".
- *
- * |[
- * gunichar c;
- * sscanf ("U+0041", "U+%06"G_GINT32_FORMAT"X", &amp;c)
- * g_print ("Read U+%04"G_GINT32_FORMAT"X", c);
- * ]|
- */
-typedef guint32 gunichar;
-
-/**
- * gunichar2:
- *
- * A type which can hold any UTF-16 code
- * point<footnote id="utf16_surrogate_pairs">UTF-16 also has so called
- * <firstterm>surrogate pairs</firstterm> to encode characters beyond
- * the BMP as pairs of 16bit numbers. Surrogate pairs cannot be stored
- * in a single gunichar2 field, but all GLib functions accepting gunichar2
- * arrays will correctly interpret surrogate pairs.</footnote>.
- *
- * To print/scan values of this type to/from text you need to convert
- * to/from UTF-8, using g_utf16_to_utf8()/g_utf8_to_utf16().
- *
- * To print/scan values of this type as integer, use
- * %G_GINT16_MODIFIER and/or %G_GUINT16_FORMAT.
- */
-typedef guint16 gunichar2;
-
-/**
- * GUnicodeType:
- * @G_UNICODE_CONTROL: General category "Other, Control" (Cc)
- * @G_UNICODE_FORMAT: General category "Other, Format" (Cf)
- * @G_UNICODE_UNASSIGNED: General category "Other, Not Assigned" (Cn)
- * @G_UNICODE_PRIVATE_USE: General category "Other, Private Use" (Co)
- * @G_UNICODE_SURROGATE: General category "Other, Surrogate" (Cs)
- * @G_UNICODE_LOWERCASE_LETTER: General category "Letter, Lowercase" (Ll)
- * @G_UNICODE_MODIFIER_LETTER: General category "Letter, Modifier" (Lm)
- * @G_UNICODE_OTHER_LETTER: General category "Letter, Other" (Lo)
- * @G_UNICODE_TITLECASE_LETTER: General category "Letter, Titlecase" (Lt)
- * @G_UNICODE_UPPERCASE_LETTER: General category "Letter, Uppercase" (Lu)
- * @G_UNICODE_SPACING_MARK: General category "Mark, Spacing" (Mc)
- * @G_UNICODE_ENCLOSING_MARK: General category "Mark, Enclosing" (Me)
- * @G_UNICODE_NON_SPACING_MARK: General category "Mark, Nonspacing" (Mn)
- * @G_UNICODE_DECIMAL_NUMBER: General category "Number, Decimal Digit" (Nd)
- * @G_UNICODE_LETTER_NUMBER: General category "Number, Letter" (Nl)
- * @G_UNICODE_OTHER_NUMBER: General category "Number, Other" (No)
- * @G_UNICODE_CONNECT_PUNCTUATION: General category "Punctuation, Connector" (Pc)
- * @G_UNICODE_DASH_PUNCTUATION: General category "Punctuation, Dash" (Pd)
- * @G_UNICODE_CLOSE_PUNCTUATION: General category "Punctuation, Close" (Pe)
- * @G_UNICODE_FINAL_PUNCTUATION: General category "Punctuation, Final quote" (Pf)
- * @G_UNICODE_INITIAL_PUNCTUATION: General category "Punctuation, Initial quote" (Pi)
- * @G_UNICODE_OTHER_PUNCTUATION: General category "Punctuation, Other" (Po)
- * @G_UNICODE_OPEN_PUNCTUATION: General category "Punctuation, Open" (Ps)
- * @G_UNICODE_CURRENCY_SYMBOL: General category "Symbol, Currency" (Sc)
- * @G_UNICODE_MODIFIER_SYMBOL: General category "Symbol, Modifier" (Sk)
- * @G_UNICODE_MATH_SYMBOL: General category "Symbol, Math" (Sm)
- * @G_UNICODE_OTHER_SYMBOL: General category "Symbol, Other" (So)
- * @G_UNICODE_LINE_SEPARATOR: General category "Separator, Line" (Zl)
- * @G_UNICODE_PARAGRAPH_SEPARATOR: General category "Separator, Paragraph" (Zp)
- * @G_UNICODE_SPACE_SEPARATOR: General category "Separator, Space" (Zs)
- *
- * These are the possible character classifications from the
- * Unicode specification.
- * See <ulink url="http://www.unicode.org/Public/UNIDATA/UnicodeData.html">http://www.unicode.org/Public/UNIDATA/UnicodeData.html</ulink>.
- */
-typedef enum
-{
-  G_UNICODE_CONTROL,
-  G_UNICODE_FORMAT,
-  G_UNICODE_UNASSIGNED,
-  G_UNICODE_PRIVATE_USE,
-  G_UNICODE_SURROGATE,
-  G_UNICODE_LOWERCASE_LETTER,
-  G_UNICODE_MODIFIER_LETTER,
-  G_UNICODE_OTHER_LETTER,
-  G_UNICODE_TITLECASE_LETTER,
-  G_UNICODE_UPPERCASE_LETTER,
-  G_UNICODE_SPACING_MARK,
-  G_UNICODE_ENCLOSING_MARK,
-  G_UNICODE_NON_SPACING_MARK,
-  G_UNICODE_DECIMAL_NUMBER,
-  G_UNICODE_LETTER_NUMBER,
-  G_UNICODE_OTHER_NUMBER,
-  G_UNICODE_CONNECT_PUNCTUATION,
-  G_UNICODE_DASH_PUNCTUATION,
-  G_UNICODE_CLOSE_PUNCTUATION,
-  G_UNICODE_FINAL_PUNCTUATION,
-  G_UNICODE_INITIAL_PUNCTUATION,
-  G_UNICODE_OTHER_PUNCTUATION,
-  G_UNICODE_OPEN_PUNCTUATION,
-  G_UNICODE_CURRENCY_SYMBOL,
-  G_UNICODE_MODIFIER_SYMBOL,
-  G_UNICODE_MATH_SYMBOL,
-  G_UNICODE_OTHER_SYMBOL,
-  G_UNICODE_LINE_SEPARATOR,
-  G_UNICODE_PARAGRAPH_SEPARATOR,
-  G_UNICODE_SPACE_SEPARATOR
-} GUnicodeType;
-
-/**
- * G_UNICODE_COMBINING_MARK:
- *
- * Older name for %G_UNICODE_SPACING_MARK.
- *
- * Deprecated: 2.30: Use %G_UNICODE_SPACING_MARK.
- */
-#ifndef G_DISABLE_DEPRECATED
-#define G_UNICODE_COMBINING_MARK G_UNICODE_SPACING_MARK
-#endif
-
-/**
- * GUnicodeBreakType:
- * @G_UNICODE_BREAK_MANDATORY: Mandatory Break (BK)
- * @G_UNICODE_BREAK_CARRIAGE_RETURN: Carriage Return (CR)
- * @G_UNICODE_BREAK_LINE_FEED: Line Feed (LF)
- * @G_UNICODE_BREAK_COMBINING_MARK: Attached Characters and Combining Marks (CM)
- * @G_UNICODE_BREAK_SURROGATE: Surrogates (SG)
- * @G_UNICODE_BREAK_ZERO_WIDTH_SPACE: Zero Width Space (ZW)
- * @G_UNICODE_BREAK_INSEPARABLE: Inseparable (IN)
- * @G_UNICODE_BREAK_NON_BREAKING_GLUE: Non-breaking ("Glue") (GL)
- * @G_UNICODE_BREAK_CONTINGENT: Contingent Break Opportunity (CB)
- * @G_UNICODE_BREAK_SPACE: Space (SP)
- * @G_UNICODE_BREAK_AFTER: Break Opportunity After (BA)
- * @G_UNICODE_BREAK_BEFORE: Break Opportunity Before (BB)
- * @G_UNICODE_BREAK_BEFORE_AND_AFTER: Break Opportunity Before and After (B2)
- * @G_UNICODE_BREAK_HYPHEN: Hyphen (HY)
- * @G_UNICODE_BREAK_NON_STARTER: Nonstarter (NS)
- * @G_UNICODE_BREAK_OPEN_PUNCTUATION: Opening Punctuation (OP)
- * @G_UNICODE_BREAK_CLOSE_PUNCTUATION: Closing Punctuation (CL)
- * @G_UNICODE_BREAK_QUOTATION: Ambiguous Quotation (QU)
- * @G_UNICODE_BREAK_EXCLAMATION: Exclamation/Interrogation (EX)
- * @G_UNICODE_BREAK_IDEOGRAPHIC: Ideographic (ID)
- * @G_UNICODE_BREAK_NUMERIC: Numeric (NU)
- * @G_UNICODE_BREAK_INFIX_SEPARATOR: Infix Separator (Numeric) (IS)
- * @G_UNICODE_BREAK_SYMBOL: Symbols Allowing Break After (SY)
- * @G_UNICODE_BREAK_ALPHABETIC: Ordinary Alphabetic and Symbol Characters (AL)
- * @G_UNICODE_BREAK_PREFIX: Prefix (Numeric) (PR)
- * @G_UNICODE_BREAK_POSTFIX: Postfix (Numeric) (PO)
- * @G_UNICODE_BREAK_COMPLEX_CONTEXT: Complex Content Dependent (South East Asian) (SA)
- * @G_UNICODE_BREAK_AMBIGUOUS: Ambiguous (Alphabetic or Ideographic) (AI)
- * @G_UNICODE_BREAK_UNKNOWN: Unknown (XX)
- * @G_UNICODE_BREAK_NEXT_LINE: Next Line (NL)
- * @G_UNICODE_BREAK_WORD_JOINER: Word Joiner (WJ)
- * @G_UNICODE_BREAK_HANGUL_L_JAMO: Hangul L Jamo (JL)
- * @G_UNICODE_BREAK_HANGUL_V_JAMO: Hangul V Jamo (JV)
- * @G_UNICODE_BREAK_HANGUL_T_JAMO: Hangul T Jamo (JT)
- * @G_UNICODE_BREAK_HANGUL_LV_SYLLABLE: Hangul LV Syllable (H2)
- * @G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE: Hangul LVT Syllable (H3)
- * @G_UNICODE_BREAK_CLOSE_PARANTHESIS: Closing Parenthesis (CP). Since 2.28
- * @G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER: Conditional Japanese Starter (CJ). Since: 2.32
- * @G_UNICODE_BREAK_HEBREW_LETTER: Hebrew Letter (HL). Since: 2.32
- *
- * These are the possible line break classifications.
- *
- * The five Hangul types were added in Unicode 4.1, so, has been
- * introduced in GLib 2.10. Note that new types may be added in the future.
- * Applications should be ready to handle unknown values.
- * They may be regarded as %G_UNICODE_BREAK_UNKNOWN.
- *
- * See <ulink url="http://www.unicode.org/unicode/reports/tr14/">http://www.unicode.org/unicode/reports/tr14/</ulink>.
- */
-typedef enum
-{
-  G_UNICODE_BREAK_MANDATORY,
-  G_UNICODE_BREAK_CARRIAGE_RETURN,
-  G_UNICODE_BREAK_LINE_FEED,
-  G_UNICODE_BREAK_COMBINING_MARK,
-  G_UNICODE_BREAK_SURROGATE,
-  G_UNICODE_BREAK_ZERO_WIDTH_SPACE,
-  G_UNICODE_BREAK_INSEPARABLE,
-  G_UNICODE_BREAK_NON_BREAKING_GLUE,
-  G_UNICODE_BREAK_CONTINGENT,
-  G_UNICODE_BREAK_SPACE,
-  G_UNICODE_BREAK_AFTER,
-  G_UNICODE_BREAK_BEFORE,
-  G_UNICODE_BREAK_BEFORE_AND_AFTER,
-  G_UNICODE_BREAK_HYPHEN,
-  G_UNICODE_BREAK_NON_STARTER,
-  G_UNICODE_BREAK_OPEN_PUNCTUATION,
-  G_UNICODE_BREAK_CLOSE_PUNCTUATION,
-  G_UNICODE_BREAK_QUOTATION,
-  G_UNICODE_BREAK_EXCLAMATION,
-  G_UNICODE_BREAK_IDEOGRAPHIC,
-  G_UNICODE_BREAK_NUMERIC,
-  G_UNICODE_BREAK_INFIX_SEPARATOR,
-  G_UNICODE_BREAK_SYMBOL,
-  G_UNICODE_BREAK_ALPHABETIC,
-  G_UNICODE_BREAK_PREFIX,
-  G_UNICODE_BREAK_POSTFIX,
-  G_UNICODE_BREAK_COMPLEX_CONTEXT,
-  G_UNICODE_BREAK_AMBIGUOUS,
-  G_UNICODE_BREAK_UNKNOWN,
-  G_UNICODE_BREAK_NEXT_LINE,
-  G_UNICODE_BREAK_WORD_JOINER,
-  G_UNICODE_BREAK_HANGUL_L_JAMO,
-  G_UNICODE_BREAK_HANGUL_V_JAMO,
-  G_UNICODE_BREAK_HANGUL_T_JAMO,
-  G_UNICODE_BREAK_HANGUL_LV_SYLLABLE,
-  G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
-  G_UNICODE_BREAK_CLOSE_PARANTHESIS,
-  G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
-  G_UNICODE_BREAK_HEBREW_LETTER
-} GUnicodeBreakType;
-
-/**
- * GUnicodeScript:
- * @G_UNICODE_SCRIPT_INVALID_CODE:
- *                               a value never returned from g_unichar_get_script()
- * @G_UNICODE_SCRIPT_COMMON:     a character used by multiple different scripts
- * @G_UNICODE_SCRIPT_INHERITED:  a mark glyph that takes its script from the
- * i                             base glyph to which it is attached
- * @G_UNICODE_SCRIPT_ARABIC:     Arabic
- * @G_UNICODE_SCRIPT_ARMENIAN:   Armenian
- * @G_UNICODE_SCRIPT_BENGALI:    Bengali
- * @G_UNICODE_SCRIPT_BOPOMOFO:   Bopomofo
- * @G_UNICODE_SCRIPT_CHEROKEE:   Cherokee
- * @G_UNICODE_SCRIPT_COPTIC:     Coptic
- * @G_UNICODE_SCRIPT_CYRILLIC:   Cyrillic
- * @G_UNICODE_SCRIPT_DESERET:    Deseret
- * @G_UNICODE_SCRIPT_DEVANAGARI: Devanagari
- * @G_UNICODE_SCRIPT_ETHIOPIC:   Ethiopic
- * @G_UNICODE_SCRIPT_GEORGIAN:   Georgian
- * @G_UNICODE_SCRIPT_GOTHIC:     Gothic
- * @G_UNICODE_SCRIPT_GREEK:      Greek
- * @G_UNICODE_SCRIPT_GUJARATI:   Gujarati
- * @G_UNICODE_SCRIPT_GURMUKHI:   Gurmukhi
- * @G_UNICODE_SCRIPT_HAN:        Han
- * @G_UNICODE_SCRIPT_HANGUL:     Hangul
- * @G_UNICODE_SCRIPT_HEBREW:     Hebrew
- * @G_UNICODE_SCRIPT_HIRAGANA:   Hiragana
- * @G_UNICODE_SCRIPT_KANNADA:    Kannada
- * @G_UNICODE_SCRIPT_KATAKANA:   Katakana
- * @G_UNICODE_SCRIPT_KHMER:      Khmer
- * @G_UNICODE_SCRIPT_LAO:        Lao
- * @G_UNICODE_SCRIPT_LATIN:      Latin
- * @G_UNICODE_SCRIPT_MALAYALAM:  Malayalam
- * @G_UNICODE_SCRIPT_MONGOLIAN:  Mongolian
- * @G_UNICODE_SCRIPT_MYANMAR:    Myanmar
- * @G_UNICODE_SCRIPT_OGHAM:      Ogham
- * @G_UNICODE_SCRIPT_OLD_ITALIC: Old Italic
- * @G_UNICODE_SCRIPT_ORIYA:      Oriya
- * @G_UNICODE_SCRIPT_RUNIC:      Runic
- * @G_UNICODE_SCRIPT_SINHALA:    Sinhala
- * @G_UNICODE_SCRIPT_SYRIAC:     Syriac
- * @G_UNICODE_SCRIPT_TAMIL:      Tamil
- * @G_UNICODE_SCRIPT_TELUGU:     Telugu
- * @G_UNICODE_SCRIPT_THAANA:     Thaana
- * @G_UNICODE_SCRIPT_THAI:       Thai
- * @G_UNICODE_SCRIPT_TIBETAN:    Tibetan
- * @G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL:
- *                               Canadian Aboriginal
- * @G_UNICODE_SCRIPT_YI:         Yi
- * @G_UNICODE_SCRIPT_TAGALOG:    Tagalog
- * @G_UNICODE_SCRIPT_HANUNOO:    Hanunoo
- * @G_UNICODE_SCRIPT_BUHID:      Buhid
- * @G_UNICODE_SCRIPT_TAGBANWA:   Tagbanwa
- * @G_UNICODE_SCRIPT_BRAILLE:    Braille
- * @G_UNICODE_SCRIPT_CYPRIOT:    Cypriot
- * @G_UNICODE_SCRIPT_LIMBU:      Limbu
- * @G_UNICODE_SCRIPT_OSMANYA:    Osmanya
- * @G_UNICODE_SCRIPT_SHAVIAN:    Shavian
- * @G_UNICODE_SCRIPT_LINEAR_B:   Linear B
- * @G_UNICODE_SCRIPT_TAI_LE:     Tai Le
- * @G_UNICODE_SCRIPT_UGARITIC:   Ugaritic
- * @G_UNICODE_SCRIPT_NEW_TAI_LUE:
- *                               New Tai Lue
- * @G_UNICODE_SCRIPT_BUGINESE:   Buginese
- * @G_UNICODE_SCRIPT_GLAGOLITIC: Glagolitic
- * @G_UNICODE_SCRIPT_TIFINAGH:   Tifinagh
- * @G_UNICODE_SCRIPT_SYLOTI_NAGRI:
- *                               Syloti Nagri
- * @G_UNICODE_SCRIPT_OLD_PERSIAN:
- *                               Old Persian
- * @G_UNICODE_SCRIPT_KHAROSHTHI: Kharoshthi
- * @G_UNICODE_SCRIPT_UNKNOWN:    an unassigned code point
- * @G_UNICODE_SCRIPT_BALINESE:   Balinese
- * @G_UNICODE_SCRIPT_CUNEIFORM:  Cuneiform
- * @G_UNICODE_SCRIPT_PHOENICIAN: Phoenician
- * @G_UNICODE_SCRIPT_PHAGS_PA:   Phags-pa
- * @G_UNICODE_SCRIPT_NKO:        N'Ko
- * @G_UNICODE_SCRIPT_KAYAH_LI:   Kayah Li. Since 2.16.3
- * @G_UNICODE_SCRIPT_LEPCHA:     Lepcha. Since 2.16.3
- * @G_UNICODE_SCRIPT_REJANG:     Rejang. Since 2.16.3
- * @G_UNICODE_SCRIPT_SUNDANESE:  Sundanese. Since 2.16.3
- * @G_UNICODE_SCRIPT_SAURASHTRA: Saurashtra. Since 2.16.3
- * @G_UNICODE_SCRIPT_CHAM:       Cham. Since 2.16.3
- * @G_UNICODE_SCRIPT_OL_CHIKI:   Ol Chiki. Since 2.16.3
- * @G_UNICODE_SCRIPT_VAI:        Vai. Since 2.16.3
- * @G_UNICODE_SCRIPT_CARIAN:     Carian. Since 2.16.3
- * @G_UNICODE_SCRIPT_LYCIAN:     Lycian. Since 2.16.3
- * @G_UNICODE_SCRIPT_LYDIAN:     Lydian. Since 2.16.3
- * @G_UNICODE_SCRIPT_AVESTAN:    Avestan. Since 2.26
- * @G_UNICODE_SCRIPT_BAMUM:      Bamum. Since 2.26
- * @G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS:
- *                               Egyptian Hieroglpyhs. Since 2.26
- * @G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC:
- *                               Imperial Aramaic. Since 2.26
- * @G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI:
- *                               Inscriptional Pahlavi. Since 2.26
- * @G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN:
- *                               Inscriptional Parthian. Since 2.26
- * @G_UNICODE_SCRIPT_JAVANESE:   Javanese. Since 2.26
- * @G_UNICODE_SCRIPT_KAITHI:     Kaithi. Since 2.26
- * @G_UNICODE_SCRIPT_LISU:       Lisu. Since 2.26
- * @G_UNICODE_SCRIPT_MEETEI_MAYEK:
- *                               Meetei Mayek. Since 2.26
- * @G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN:
- *                               Old South Arabian. Since 2.26
- * @G_UNICODE_SCRIPT_OLD_TURKIC: Old Turkic. Since 2.28
- * @G_UNICODE_SCRIPT_SAMARITAN:  Samaritan. Since 2.26
- * @G_UNICODE_SCRIPT_TAI_THAM:   Tai Tham. Since 2.26
- * @G_UNICODE_SCRIPT_TAI_VIET:   Tai Viet. Since 2.26
- * @G_UNICODE_SCRIPT_BATAK:      Batak. Since 2.28
- * @G_UNICODE_SCRIPT_BRAHMI:     Brahmi. Since 2.28
- * @G_UNICODE_SCRIPT_MANDAIC:    Mandaic. Since 2.28
- * @G_UNICODE_SCRIPT_CHAKMA:               Chakma. Since: 2.32
- * @G_UNICODE_SCRIPT_MEROITIC_CURSIVE:     Meroitic Cursive. Since: 2.32
- * @G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS: Meroitic Hieroglyphs. Since: 2.32
- * @G_UNICODE_SCRIPT_MIAO:                 Miao. Since: 2.32
- * @G_UNICODE_SCRIPT_SHARADA:              Sharada. Since: 2.32
- * @G_UNICODE_SCRIPT_SORA_SOMPENG:         Sora Sompeng. Since: 2.32
- * @G_UNICODE_SCRIPT_TAKRI:                Takri. Since: 2.32
- *
- * The #GUnicodeScript enumeration identifies different writing
- * systems. The values correspond to the names as defined in the
- * Unicode standard. The enumeration has been added in GLib 2.14,
- * and is interchangeable with #PangoScript.
- *
- * Note that new types may be added in the future. Applications
- * should be ready to handle unknown values.
- * See <ulink
- * url="http://www.unicode.org/reports/tr24/">Unicode Standard Annex
- * #24: Script names</ulink>.
- */
-typedef enum
-{                         /* ISO 15924 code */
-  G_UNICODE_SCRIPT_INVALID_CODE = -1,
-  G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
-  G_UNICODE_SCRIPT_INHERITED,          /* Zinh (Qaai) */
-  G_UNICODE_SCRIPT_ARABIC,             /* Arab */
-  G_UNICODE_SCRIPT_ARMENIAN,           /* Armn */
-  G_UNICODE_SCRIPT_BENGALI,            /* Beng */
-  G_UNICODE_SCRIPT_BOPOMOFO,           /* Bopo */
-  G_UNICODE_SCRIPT_CHEROKEE,           /* Cher */
-  G_UNICODE_SCRIPT_COPTIC,             /* Copt (Qaac) */
-  G_UNICODE_SCRIPT_CYRILLIC,           /* Cyrl (Cyrs) */
-  G_UNICODE_SCRIPT_DESERET,            /* Dsrt */
-  G_UNICODE_SCRIPT_DEVANAGARI,         /* Deva */
-  G_UNICODE_SCRIPT_ETHIOPIC,           /* Ethi */
-  G_UNICODE_SCRIPT_GEORGIAN,           /* Geor (Geon, Geoa) */
-  G_UNICODE_SCRIPT_GOTHIC,             /* Goth */
-  G_UNICODE_SCRIPT_GREEK,              /* Grek */
-  G_UNICODE_SCRIPT_GUJARATI,           /* Gujr */
-  G_UNICODE_SCRIPT_GURMUKHI,           /* Guru */
-  G_UNICODE_SCRIPT_HAN,                /* Hani */
-  G_UNICODE_SCRIPT_HANGUL,             /* Hang */
-  G_UNICODE_SCRIPT_HEBREW,             /* Hebr */
-  G_UNICODE_SCRIPT_HIRAGANA,           /* Hira */
-  G_UNICODE_SCRIPT_KANNADA,            /* Knda */
-  G_UNICODE_SCRIPT_KATAKANA,           /* Kana */
-  G_UNICODE_SCRIPT_KHMER,              /* Khmr */
-  G_UNICODE_SCRIPT_LAO,                /* Laoo */
-  G_UNICODE_SCRIPT_LATIN,              /* Latn (Latf, Latg) */
-  G_UNICODE_SCRIPT_MALAYALAM,          /* Mlym */
-  G_UNICODE_SCRIPT_MONGOLIAN,          /* Mong */
-  G_UNICODE_SCRIPT_MYANMAR,            /* Mymr */
-  G_UNICODE_SCRIPT_OGHAM,              /* Ogam */
-  G_UNICODE_SCRIPT_OLD_ITALIC,         /* Ital */
-  G_UNICODE_SCRIPT_ORIYA,              /* Orya */
-  G_UNICODE_SCRIPT_RUNIC,              /* Runr */
-  G_UNICODE_SCRIPT_SINHALA,            /* Sinh */
-  G_UNICODE_SCRIPT_SYRIAC,             /* Syrc (Syrj, Syrn, Syre) */
-  G_UNICODE_SCRIPT_TAMIL,              /* Taml */
-  G_UNICODE_SCRIPT_TELUGU,             /* Telu */
-  G_UNICODE_SCRIPT_THAANA,             /* Thaa */
-  G_UNICODE_SCRIPT_THAI,               /* Thai */
-  G_UNICODE_SCRIPT_TIBETAN,            /* Tibt */
-  G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL, /* Cans */
-  G_UNICODE_SCRIPT_YI,                 /* Yiii */
-  G_UNICODE_SCRIPT_TAGALOG,            /* Tglg */
-  G_UNICODE_SCRIPT_HANUNOO,            /* Hano */
-  G_UNICODE_SCRIPT_BUHID,              /* Buhd */
-  G_UNICODE_SCRIPT_TAGBANWA,           /* Tagb */
-
-  /* Unicode-4.0 additions */
-  G_UNICODE_SCRIPT_BRAILLE,            /* Brai */
-  G_UNICODE_SCRIPT_CYPRIOT,            /* Cprt */
-  G_UNICODE_SCRIPT_LIMBU,              /* Limb */
-  G_UNICODE_SCRIPT_OSMANYA,            /* Osma */
-  G_UNICODE_SCRIPT_SHAVIAN,            /* Shaw */
-  G_UNICODE_SCRIPT_LINEAR_B,           /* Linb */
-  G_UNICODE_SCRIPT_TAI_LE,             /* Tale */
-  G_UNICODE_SCRIPT_UGARITIC,           /* Ugar */
-
-  /* Unicode-4.1 additions */
-  G_UNICODE_SCRIPT_NEW_TAI_LUE,        /* Talu */
-  G_UNICODE_SCRIPT_BUGINESE,           /* Bugi */
-  G_UNICODE_SCRIPT_GLAGOLITIC,         /* Glag */
-  G_UNICODE_SCRIPT_TIFINAGH,           /* Tfng */
-  G_UNICODE_SCRIPT_SYLOTI_NAGRI,       /* Sylo */
-  G_UNICODE_SCRIPT_OLD_PERSIAN,        /* Xpeo */
-  G_UNICODE_SCRIPT_KHAROSHTHI,         /* Khar */
-
-  /* Unicode-5.0 additions */
-  G_UNICODE_SCRIPT_UNKNOWN,            /* Zzzz */
-  G_UNICODE_SCRIPT_BALINESE,           /* Bali */
-  G_UNICODE_SCRIPT_CUNEIFORM,          /* Xsux */
-  G_UNICODE_SCRIPT_PHOENICIAN,         /* Phnx */
-  G_UNICODE_SCRIPT_PHAGS_PA,           /* Phag */
-  G_UNICODE_SCRIPT_NKO,                /* Nkoo */
-
-  /* Unicode-5.1 additions */
-  G_UNICODE_SCRIPT_KAYAH_LI,           /* Kali */
-  G_UNICODE_SCRIPT_LEPCHA,             /* Lepc */
-  G_UNICODE_SCRIPT_REJANG,             /* Rjng */
-  G_UNICODE_SCRIPT_SUNDANESE,          /* Sund */
-  G_UNICODE_SCRIPT_SAURASHTRA,         /* Saur */
-  G_UNICODE_SCRIPT_CHAM,               /* Cham */
-  G_UNICODE_SCRIPT_OL_CHIKI,           /* Olck */
-  G_UNICODE_SCRIPT_VAI,                /* Vaii */
-  G_UNICODE_SCRIPT_CARIAN,             /* Cari */
-  G_UNICODE_SCRIPT_LYCIAN,             /* Lyci */
-  G_UNICODE_SCRIPT_LYDIAN,             /* Lydi */
-
-  /* Unicode-5.2 additions */
-  G_UNICODE_SCRIPT_AVESTAN,                /* Avst */
-  G_UNICODE_SCRIPT_BAMUM,                  /* Bamu */
-  G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS,   /* Egyp */
-  G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC,       /* Armi */
-  G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI,  /* Phli */
-  G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN, /* Prti */
-  G_UNICODE_SCRIPT_JAVANESE,               /* Java */
-  G_UNICODE_SCRIPT_KAITHI,                 /* Kthi */
-  G_UNICODE_SCRIPT_LISU,                   /* Lisu */
-  G_UNICODE_SCRIPT_MEETEI_MAYEK,           /* Mtei */
-  G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN,      /* Sarb */
-  G_UNICODE_SCRIPT_OLD_TURKIC,             /* Orkh */
-  G_UNICODE_SCRIPT_SAMARITAN,              /* Samr */
-  G_UNICODE_SCRIPT_TAI_THAM,               /* Lana */
-  G_UNICODE_SCRIPT_TAI_VIET,               /* Tavt */
-
-  /* Unicode-6.0 additions */
-  G_UNICODE_SCRIPT_BATAK,                  /* Batk */
-  G_UNICODE_SCRIPT_BRAHMI,                 /* Brah */
-  G_UNICODE_SCRIPT_MANDAIC,                /* Mand */
-
-  /* Unicode-6.1 additions */
-  G_UNICODE_SCRIPT_CHAKMA,                 /* Cakm */
-  G_UNICODE_SCRIPT_MEROITIC_CURSIVE,       /* Merc */
-  G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS,   /* Mero */
-  G_UNICODE_SCRIPT_MIAO,                   /* Plrd */
-  G_UNICODE_SCRIPT_SHARADA,                /* Shrd */
-  G_UNICODE_SCRIPT_SORA_SOMPENG,           /* Sora */
-  G_UNICODE_SCRIPT_TAKRI                   /* Takr */
-} GUnicodeScript;
-
-guint32        g_unicode_script_to_iso15924   (GUnicodeScript script);
-GUnicodeScript g_unicode_script_from_iso15924 (guint32        iso15924);
-
-/* These are all analogs of the <ctype.h> functions.
- */
-gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isalpha   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iscntrl   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdigit   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isgraph   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_islower   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isprint   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ispunct   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isspace   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isupper   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isxdigit  (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide_cjk(gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iszerowidth(gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ismark    (gunichar c) G_GNUC_CONST;
-
-/* More <ctype.h> functions.  These convert between the three cases.
- * See the Unicode book to understand title case.  */
-gunichar g_unichar_toupper (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_tolower (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_totitle (gunichar c) G_GNUC_CONST;
-
-/* If C is a digit (according to `g_unichar_isdigit'), then return its
-   numeric value.  Otherwise return -1.  */
-gint g_unichar_digit_value (gunichar c) G_GNUC_CONST;
-
-gint g_unichar_xdigit_value (gunichar c) G_GNUC_CONST;
-
-/* Return the Unicode character type of a given character.  */
-GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
-
-/* Return the line break property for a given character */
-GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;
-
-/* Returns the combining class for a given character */
-gint g_unichar_combining_class (gunichar uc) G_GNUC_CONST;
-
-gboolean g_unichar_get_mirror_char (gunichar ch,
-                                    gunichar *mirrored_ch);
-
-GUnicodeScript g_unichar_get_script (gunichar ch) G_GNUC_CONST;
-
-/* Validate a Unicode character */
-gboolean g_unichar_validate (gunichar ch) G_GNUC_CONST;
-
-/* Pairwise canonical compose/decompose */
-gboolean g_unichar_compose (gunichar  a,
-                            gunichar  b,
-                            gunichar *ch);
-gboolean g_unichar_decompose (gunichar  ch,
-                              gunichar *a,
-                              gunichar *b);
-
-gsize g_unichar_fully_decompose (gunichar  ch,
-                                 gboolean  compat,
-                                 gunichar *result,
-                                 gsize     result_len);
-
-/**
- * G_UNICHAR_MAX_DECOMPOSITION_LENGTH:
- *
- * The maximum length (in codepoints) of a compatibility or canonical
- * decomposition of a single Unicode character.
- *
- * This is as defined by Unicode 6.1.
- *
- * Since: 2.32
- */
-#define G_UNICHAR_MAX_DECOMPOSITION_LENGTH 18 /* codepoints */
-
-/* Compute canonical ordering of a string in-place.  This rearranges
-   decomposed characters in the string according to their combining
-   classes.  See the Unicode manual for more information.  */
-void g_unicode_canonical_ordering (gunichar *string,
-                                   gsize     len);
-
-
-GLIB_DEPRECATED_IN_2_30
-gunichar *g_unicode_canonical_decomposition (gunichar  ch,
-                                             gsize    *result_len) G_GNUC_MALLOC;
-
-/* Array of skip-bytes-per-initial character.
- */
-GLIB_VAR const gchar * const g_utf8_skip;
-
-/**
- * g_utf8_next_char:
- * @p: Pointer to the start of a valid UTF-8 character
- *
- * Skips to the next character in a UTF-8 string. The string must be
- * valid; this macro is as fast as possible, and has no error-checking.
- * You would use this macro to iterate over a string character by
- * character. The macro returns the start of the next UTF-8 character.
- * Before using this macro, use g_utf8_validate() to validate strings
- * that may contain invalid UTF-8.
- */
-#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(const guchar *)(p)])
-
-gunichar g_utf8_get_char           (const gchar  *p) G_GNUC_PURE;
-gunichar g_utf8_get_char_validated (const  gchar *p,
-                                    gssize        max_len) G_GNUC_PURE;
-
-gchar*   g_utf8_offset_to_pointer (const gchar *str,
-                                   glong        offset) G_GNUC_PURE;
-glong    g_utf8_pointer_to_offset (const gchar *str,
-                                   const gchar *pos) G_GNUC_PURE;
-gchar*   g_utf8_prev_char         (const gchar *p) G_GNUC_PURE;
-gchar*   g_utf8_find_next_char    (const gchar *p,
-                                   const gchar *end) G_GNUC_PURE;
-gchar*   g_utf8_find_prev_char    (const gchar *str,
-                                   const gchar *p) G_GNUC_PURE;
-
-glong    g_utf8_strlen            (const gchar *p,
-                                   gssize       max) G_GNUC_PURE;
-
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_utf8_substring         (const gchar *str,
-                                   glong        start_pos,
-                                   glong        end_pos) G_GNUC_MALLOC;
-
-gchar   *g_utf8_strncpy           (gchar       *dest,
-                                   const gchar *src,
-                                   gsize        n);
-
-/* Find the UTF-8 character corresponding to ch, in string p. These
-   functions are equivalants to strchr and strrchr */
-gchar* g_utf8_strchr  (const gchar *p,
-                       gssize       len,
-                       gunichar     c);
-gchar* g_utf8_strrchr (const gchar *p,
-                       gssize       len,
-                       gunichar     c);
-gchar* g_utf8_strreverse (const gchar *str,
-                          gssize len);
-
-gunichar2 *g_utf8_to_utf16     (const gchar      *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4      (const gchar      *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4_fast (const gchar      *str,
-                                glong             len,
-                                glong            *items_written) G_GNUC_MALLOC;
-gunichar * g_utf16_to_ucs4     (const gunichar2  *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gchar*     g_utf16_to_utf8     (const gunichar2  *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gunichar2 *g_ucs4_to_utf16     (const gunichar   *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gchar*     g_ucs4_to_utf8      (const gunichar   *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-
-gint      g_unichar_to_utf8 (gunichar    c,
-                             gchar      *outbuf);
-
-gboolean g_utf8_validate (const gchar  *str,
-                          gssize        max_len,
-                          const gchar **end);
-
-gchar *g_utf8_strup   (const gchar *str,
-                       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_strdown (const gchar *str,
-                       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_casefold (const gchar *str,
-                        gssize       len) G_GNUC_MALLOC;
-
-/**
- * GNormalizeMode:
- * @G_NORMALIZE_DEFAULT: standardize differences that do not affect the
- *     text content, such as the above-mentioned accent representation
- * @G_NORMALIZE_NFD: another name for %G_NORMALIZE_DEFAULT
- * @G_NORMALIZE_DEFAULT_COMPOSE: like %G_NORMALIZE_DEFAULT, but with
- *     composed forms rather than a maximally decomposed form
- * @G_NORMALIZE_NFC: another name for %G_NORMALIZE_DEFAULT_COMPOSE
- * @G_NORMALIZE_ALL: beyond %G_NORMALIZE_DEFAULT also standardize the
- *     "compatibility" characters in Unicode, such as SUPERSCRIPT THREE
- *     to the standard forms (in this case DIGIT THREE). Formatting
- *     information may be lost but for most text operations such
- *     characters should be considered the same
- * @G_NORMALIZE_NFKD: another name for %G_NORMALIZE_ALL
- * @G_NORMALIZE_ALL_COMPOSE: like %G_NORMALIZE_ALL, but with composed
- *     forms rather than a maximally decomposed form
- * @G_NORMALIZE_NFKC: another name for %G_NORMALIZE_ALL_COMPOSE
- *
- * Defines how a Unicode string is transformed in a canonical
- * form, standardizing such issues as whether a character with
- * an accent is represented as a base character and combining
- * accent or as a single precomposed character. Unicode strings
- * should generally be normalized before comparing them.
- */
-typedef enum {
-  G_NORMALIZE_DEFAULT,
-  G_NORMALIZE_NFD = G_NORMALIZE_DEFAULT,
-  G_NORMALIZE_DEFAULT_COMPOSE,
-  G_NORMALIZE_NFC = G_NORMALIZE_DEFAULT_COMPOSE,
-  G_NORMALIZE_ALL,
-  G_NORMALIZE_NFKD = G_NORMALIZE_ALL,
-  G_NORMALIZE_ALL_COMPOSE,
-  G_NORMALIZE_NFKC = G_NORMALIZE_ALL_COMPOSE
-} GNormalizeMode;
-
-gchar *g_utf8_normalize (const gchar   *str,
-                         gssize         len,
-                         GNormalizeMode mode) G_GNUC_MALLOC;
-
-gint   g_utf8_collate     (const gchar *str1,
-                           const gchar *str2) G_GNUC_PURE;
-gchar *g_utf8_collate_key (const gchar *str,
-                           gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_collate_key_for_filename (const gchar *str,
-                                        gssize       len) G_GNUC_MALLOC;
-
-
-/* private */
-
-gchar *_g_utf8_make_valid (const gchar *name);
-
-G_END_DECLS
-
-#endif /* __G_UNICODE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gurifuncs.h b/GstreamerHelper/x64/include/glib-2.0/glib/gurifuncs.h
deleted file mode 100644
index 6e6b7391..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gurifuncs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_URI_FUNCS_H__
-#define __G_URI_FUNCS_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_URI_RESERVED_CHARS_GENERIC_DELIMITERS:
- * 
- * Generic delimiters characters as defined in RFC 3986. Includes ":/?#[]@".
- **/
-#define G_URI_RESERVED_CHARS_GENERIC_DELIMITERS ":/?#[]@"
-
-/**
- * G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS:
- * 
- * Subcomponent delimiter characters as defined in RFC 3986. Includes "!$&'()*+,;=".
- **/
-#define G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS "!$&'()*+,;="
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT:
- * 
- * Allowed characters in path elements. Includes "!$&'()*+,;=:@".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":@"
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_PATH:
- * 
- * Allowed characters in a path. Includes "!$&'()*+,;=:@/".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_PATH G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT "/"
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO:
- * 
- * Allowed characters in userinfo as defined in RFC 3986. Includes "!$&'()*+,;=:".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":"
-
-char *   g_uri_unescape_string       (const char *escaped_string,
-				      const char *illegal_characters);
-char *   g_uri_unescape_segment      (const char *escaped_string,
-				      const char *escaped_string_end,
-				      const char *illegal_characters);
-char *   g_uri_parse_scheme          (const char *uri);
-char *   g_uri_escape_string         (const char *unescaped,
-				      const char *reserved_chars_allowed,
-				      gboolean    allow_utf8);
-
-G_END_DECLS
-
-#endif /* __G_URI_FUNCS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gutils.h b/GstreamerHelper/x64/include/glib-2.0/glib/gutils.h
deleted file mode 100644
index 213a39fb..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gutils.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_UTILS_H__
-#define __G_UTILS_H__
-
-#include <glib/gtypes.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-/* Define G_VA_COPY() to do the right thing for copying va_list variables.
- * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
- */
-#if !defined (G_VA_COPY)
-#  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
-#    define G_VA_COPY(ap1, ap2)	  (*(ap1) = *(ap2))
-#  elif defined (G_VA_COPY_AS_ARRAY)
-#    define G_VA_COPY(ap1, ap2)	  g_memmove ((ap1), (ap2), sizeof (va_list))
-#  else /* va_list is a pointer */
-#    define G_VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
-#  endif /* va_list is a pointer */
-#endif /* !G_VA_COPY */
-
-/* inlining hassle. for compilers that don't allow the `inline' keyword,
- * mostly because of strict ANSI C compliance or dumbness, we try to fall
- * back to either `__inline__' or `__inline'.
- * G_CAN_INLINE is defined in glibconfig.h if the compiler seems to be 
- * actually *capable* to do function inlining, in which case inline 
- * function bodies do make sense. we also define G_INLINE_FUNC to properly 
- * export the function prototypes if no inlining can be performed.
- * inline function bodies have to be special cased with G_CAN_INLINE and a
- * .c file specific macro to allow one compiled instance with extern linkage
- * of the functions by defining G_IMPLEMENT_INLINES and the .c file macro.
- */
-#if defined (G_HAVE_INLINE) && defined (__GNUC__) && defined (__STRICT_ANSI__)
-#  undef inline
-#  define inline __inline__
-#elif !defined (G_HAVE_INLINE)
-#  undef inline
-#  if defined (G_HAVE___INLINE__)
-#    define inline __inline__
-#  elif defined (G_HAVE___INLINE)
-#    define inline __inline
-#  else /* !inline && !__inline__ && !__inline */
-#    define inline  /* don't inline, then */
-#  endif
-#endif
-#ifdef G_IMPLEMENT_INLINES
-#  define G_INLINE_FUNC
-#  undef  G_CAN_INLINE
-#elif defined (__GNUC__) 
-#  define G_INLINE_FUNC static __inline __attribute__ ((unused))
-#elif defined (G_CAN_INLINE) 
-#  define G_INLINE_FUNC static inline
-#else /* can't inline */
-#  define G_INLINE_FUNC
-#endif /* !G_INLINE_FUNC */
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_get_user_name g_get_user_name_utf8
-#define g_get_real_name g_get_real_name_utf8
-#define g_get_home_dir g_get_home_dir_utf8
-#define g_get_tmp_dir g_get_tmp_dir_utf8
-#endif
-#endif
-
-const gchar *         g_get_user_name        (void);
-const gchar *         g_get_real_name        (void);
-const gchar *         g_get_home_dir         (void);
-const gchar *         g_get_tmp_dir          (void);
-const gchar *         g_get_host_name	     (void);
-gchar *               g_get_prgname          (void);
-void                  g_set_prgname          (const gchar *prgname);
-const gchar *         g_get_application_name (void);
-void                  g_set_application_name (const gchar *application_name);
-
-void      g_reload_user_special_dirs_cache     (void);
-const gchar *         g_get_user_data_dir      (void);
-const gchar *         g_get_user_config_dir    (void);
-const gchar *         g_get_user_cache_dir     (void);
-const gchar * const * g_get_system_data_dirs   (void);
-
-#ifdef G_OS_WIN32
-/* This functions is not part of the public GLib API */
-const gchar * const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
-#endif
-
-#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
-/* This function is not part of the public GLib API either. Just call
- * g_get_system_data_dirs() in your code, never mind that that is
- * actually a macro and you will in fact call this inline function.
- */
-static inline const gchar * const *
-_g_win32_get_system_data_dirs (void)
-{
-  return g_win32_get_system_data_dirs_for_module ((void (*)(void)) &_g_win32_get_system_data_dirs);
-}
-#define g_get_system_data_dirs _g_win32_get_system_data_dirs
-#endif
-
-const gchar * const * g_get_system_config_dirs (void);
-
-const gchar * g_get_user_runtime_dir (void);
-
-/**
- * GUserDirectory:
- * @G_USER_DIRECTORY_DESKTOP: the user's Desktop directory
- * @G_USER_DIRECTORY_DOCUMENTS: the user's Documents directory
- * @G_USER_DIRECTORY_DOWNLOAD: the user's Downloads directory
- * @G_USER_DIRECTORY_MUSIC: the user's Music directory
- * @G_USER_DIRECTORY_PICTURES: the user's Pictures directory
- * @G_USER_DIRECTORY_PUBLIC_SHARE: the user's shared directory
- * @G_USER_DIRECTORY_TEMPLATES: the user's Templates directory
- * @G_USER_DIRECTORY_VIDEOS: the user's Movies directory
- * @G_USER_N_DIRECTORIES: the number of enum values
- *
- * These are logical ids for special directories which are defined
- * depending on the platform used. You should use g_get_user_special_dir()
- * to retrieve the full path associated to the logical id.
- *
- * The #GUserDirectory enumeration can be extended at later date. Not
- * every platform has a directory for every logical id in this
- * enumeration.
- *
- * Since: 2.14
- */
-typedef enum {
-  G_USER_DIRECTORY_DESKTOP,
-  G_USER_DIRECTORY_DOCUMENTS,
-  G_USER_DIRECTORY_DOWNLOAD,
-  G_USER_DIRECTORY_MUSIC,
-  G_USER_DIRECTORY_PICTURES,
-  G_USER_DIRECTORY_PUBLIC_SHARE,
-  G_USER_DIRECTORY_TEMPLATES,
-  G_USER_DIRECTORY_VIDEOS,
-
-  G_USER_N_DIRECTORIES
-} GUserDirectory;
-
-const gchar * g_get_user_special_dir (GUserDirectory directory);
-
-/**
- * GDebugKey:
- * @key: the string
- * @value: the flag
- *
- * Associates a string with a bit flag.
- * Used in g_parse_debug_string().
- */
-typedef struct _GDebugKey GDebugKey;
-struct _GDebugKey
-{
-  const gchar *key;
-  guint	       value;
-};
-
-/* Miscellaneous utility functions
- */
-guint                 g_parse_debug_string (const gchar     *string,
-					    const GDebugKey *keys,
-					    guint            nkeys);
-
-gint                  g_snprintf           (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    ...) G_GNUC_PRINTF (3, 4);
-gint                  g_vsnprintf          (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    va_list      args);
-
-void                  g_nullify_pointer    (gpointer    *nullify_location);
-
-typedef enum
-{
-  G_FORMAT_SIZE_DEFAULT     = 0,
-  G_FORMAT_SIZE_LONG_FORMAT = 1 << 0,
-  G_FORMAT_SIZE_IEC_UNITS   = 1 << 1
-} GFormatSizeFlags;
-
-GLIB_AVAILABLE_IN_2_30
-gchar *g_format_size_full   (guint64          size,
-                             GFormatSizeFlags flags);
-GLIB_AVAILABLE_IN_2_30
-gchar *g_format_size        (guint64          size);
-
-GLIB_DEPRECATED_FOR(g_format_size)
-gchar *g_format_size_for_display (goffset size);
-
-#ifndef G_DISABLE_DEPRECATED
-/**
- * GVoidFunc:
- *
- * Declares a type of function which takes no arguments
- * and has no return value. It is used to specify the type
- * function passed to g_atexit().
- */
-typedef void (*GVoidFunc) (void);
-#ifndef ATEXIT
-# define ATEXIT(proc) g_ATEXIT(proc)
-#else
-# define G_NATIVE_ATEXIT
-#endif /* ATEXIT */
-/* we use a GLib function as a replacement for ATEXIT, so
- * the programmer is not required to check the return value
- * (if there is any in the implementation) and doesn't encounter
- * missing include files.
- */
-GLIB_DEPRECATED
-void	g_atexit		(GVoidFunc    func);
-
-#ifdef G_OS_WIN32
-/* It's a bad idea to wrap atexit() on Windows. If the GLib DLL calls
- * atexit(), the function will be called when the GLib DLL is detached
- * from the program, which is not what the caller wants. The caller
- * wants the function to be called when it *itself* exits (or is
- * detached, in case the caller, too, is a DLL).
- */
-#if (defined(__MINGW_H) && !defined(_STDLIB_H_)) || (defined(_MSC_VER) && !defined(_INC_STDLIB))
-int atexit (void (*)(void));
-#endif
-#define g_atexit(func) atexit(func)
-#endif
-
-#endif  /* G_DISABLE_DEPRECATED */
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_find_program_in_path g_find_program_in_path_utf8
-#endif
-#endif
-
-/* Look for an executable in PATH, following execvp() rules */
-gchar*  g_find_program_in_path  (const gchar *program);
-
-/* Bit tests
- */
-G_INLINE_FUNC gint	g_bit_nth_lsf (gulong  mask,
-				       gint    nth_bit) G_GNUC_CONST;
-G_INLINE_FUNC gint	g_bit_nth_msf (gulong  mask,
-				       gint    nth_bit) G_GNUC_CONST;
-G_INLINE_FUNC guint	g_bit_storage (gulong  number) G_GNUC_CONST;
-
-/* inline function implementations
- */
-#if defined (G_CAN_INLINE) || defined (__G_UTILS_C__)
-G_INLINE_FUNC gint
-g_bit_nth_lsf (gulong mask,
-	       gint   nth_bit)
-{
-  if (G_UNLIKELY (nth_bit < -1))
-    nth_bit = -1;
-  while (nth_bit < ((GLIB_SIZEOF_LONG * 8) - 1))
-    {
-      nth_bit++;
-      if (mask & (1UL << nth_bit))
-	return nth_bit;
-    }
-  return -1;
-}
-G_INLINE_FUNC gint
-g_bit_nth_msf (gulong mask,
-	       gint   nth_bit)
-{
-  if (nth_bit < 0 || G_UNLIKELY (nth_bit > GLIB_SIZEOF_LONG * 8))
-    nth_bit = GLIB_SIZEOF_LONG * 8;
-  while (nth_bit > 0)
-    {
-      nth_bit--;
-      if (mask & (1UL << nth_bit))
-	return nth_bit;
-    }
-  return -1;
-}
-G_INLINE_FUNC guint
-g_bit_storage (gulong number)
-{
-#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
-  return G_LIKELY (number) ?
-	   ((GLIB_SIZEOF_LONG * 8U - 1) ^ (guint) __builtin_clzl(number)) + 1 : 1;
-#else
-  register guint n_bits = 0;
-  
-  do
-    {
-      n_bits++;
-      number >>= 1;
-    }
-  while (number);
-  return n_bits;
-#endif
-}
-#endif  /* G_CAN_INLINE || __G_UTILS_C__ */
-
-G_END_DECLS
-
-#ifndef G_DISABLE_DEPRECATED
-
-/*
- * This macro is deprecated. This DllMain() is too complex. It is
- * recommended to write an explicit minimal DLlMain() that just saves
- * the handle to the DLL and then use that handle instead, for
- * instance passing it to
- * g_win32_get_package_installation_directory_of_module().
- *
- * On Windows, this macro defines a DllMain function that stores the
- * actual DLL name that the code being compiled will be included in.
- * STATIC should be empty or 'static'. DLL_NAME is the name of the
- * (pointer to the) char array where the DLL name will be stored. If
- * this is used, you must also include <windows.h>. If you need a more complex
- * DLL entry point function, you cannot use this.
- *
- * On non-Windows platforms, expands to nothing.
- */
-
-#ifndef G_PLATFORM_WIN32
-# define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
-#else
-# define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)			\
-static char *dll_name;							\
-									\
-BOOL WINAPI								\
-DllMain (HINSTANCE hinstDLL,						\
-	 DWORD     fdwReason,						\
-	 LPVOID    lpvReserved)						\
-{									\
-  wchar_t wcbfr[1000];							\
-  char *tem;								\
-  switch (fdwReason)							\
-    {									\
-    case DLL_PROCESS_ATTACH:						\
-      GetModuleFileNameW ((HMODULE) hinstDLL, wcbfr, G_N_ELEMENTS (wcbfr)); \
-      tem = g_utf16_to_utf8 (wcbfr, -1, NULL, NULL, NULL);		\
-      dll_name = g_path_get_basename (tem);				\
-      g_free (tem);							\
-      break;								\
-    }									\
-									\
-  return TRUE;								\
-}
-
-#endif	/* !G_DISABLE_DEPRECATED */
-
-#endif /* G_PLATFORM_WIN32 */
-
-#endif /* __G_UTILS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gvariant.h b/GstreamerHelper/x64/include/glib-2.0/glib/gvariant.h
deleted file mode 100644
index 3c92d21a..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gvariant.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright © 2007, 2008 Ryan Lortie
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VARIANT_H__
-#define __G_VARIANT_H__
-
-#include <glib/gvarianttype.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GVariant        GVariant;
-
-typedef enum
-{
-  G_VARIANT_CLASS_BOOLEAN       = 'b',
-  G_VARIANT_CLASS_BYTE          = 'y',
-  G_VARIANT_CLASS_INT16         = 'n',
-  G_VARIANT_CLASS_UINT16        = 'q',
-  G_VARIANT_CLASS_INT32         = 'i',
-  G_VARIANT_CLASS_UINT32        = 'u',
-  G_VARIANT_CLASS_INT64         = 'x',
-  G_VARIANT_CLASS_UINT64        = 't',
-  G_VARIANT_CLASS_HANDLE        = 'h',
-  G_VARIANT_CLASS_DOUBLE        = 'd',
-  G_VARIANT_CLASS_STRING        = 's',
-  G_VARIANT_CLASS_OBJECT_PATH   = 'o',
-  G_VARIANT_CLASS_SIGNATURE     = 'g',
-  G_VARIANT_CLASS_VARIANT       = 'v',
-  G_VARIANT_CLASS_MAYBE         = 'm',
-  G_VARIANT_CLASS_ARRAY         = 'a',
-  G_VARIANT_CLASS_TUPLE         = '(',
-  G_VARIANT_CLASS_DICT_ENTRY    = '{'
-} GVariantClass;
-
-void                            g_variant_unref                         (GVariant             *value);
-GVariant *                      g_variant_ref                           (GVariant             *value);
-GVariant *                      g_variant_ref_sink                      (GVariant             *value);
-gboolean                        g_variant_is_floating                   (GVariant             *value);
-GVariant *                      g_variant_take_ref                      (GVariant             *value);
-
-const GVariantType *            g_variant_get_type                      (GVariant             *value);
-const gchar *                   g_variant_get_type_string               (GVariant             *value);
-gboolean                        g_variant_is_of_type                    (GVariant             *value,
-                                                                         const GVariantType   *type);
-gboolean                        g_variant_is_container                  (GVariant             *value);
-GVariantClass                   g_variant_classify                      (GVariant             *value);
-GVariant *                      g_variant_new_boolean                   (gboolean              value);
-GVariant *                      g_variant_new_byte                      (guchar                value);
-GVariant *                      g_variant_new_int16                     (gint16                value);
-GVariant *                      g_variant_new_uint16                    (guint16               value);
-GVariant *                      g_variant_new_int32                     (gint32                value);
-GVariant *                      g_variant_new_uint32                    (guint32               value);
-GVariant *                      g_variant_new_int64                     (gint64                value);
-GVariant *                      g_variant_new_uint64                    (guint64               value);
-GVariant *                      g_variant_new_handle                    (gint32                value);
-GVariant *                      g_variant_new_double                    (gdouble               value);
-GVariant *                      g_variant_new_string                    (const gchar          *string);
-GVariant *                      g_variant_new_object_path               (const gchar          *object_path);
-gboolean                        g_variant_is_object_path                (const gchar          *string);
-GVariant *                      g_variant_new_signature                 (const gchar          *signature);
-gboolean                        g_variant_is_signature                  (const gchar          *string);
-GVariant *                      g_variant_new_variant                   (GVariant             *value);
-GVariant *                      g_variant_new_strv                      (const gchar * const  *strv,
-                                                                         gssize                length);
-GLIB_AVAILABLE_IN_2_30
-GVariant *                      g_variant_new_objv                      (const gchar * const  *strv,
-                                                                         gssize                length);
-GVariant *                      g_variant_new_bytestring                (const gchar          *string);
-GVariant *                      g_variant_new_bytestring_array          (const gchar * const  *strv,
-                                                                         gssize                length);
-GVariant *                      g_variant_new_fixed_array               (const GVariantType   *element_type,
-                                                                         gconstpointer         elements,
-                                                                         gsize                 n_elements,
-                                                                         gsize                 element_size);
-gboolean                        g_variant_get_boolean                   (GVariant             *value);
-guchar                          g_variant_get_byte                      (GVariant             *value);
-gint16                          g_variant_get_int16                     (GVariant             *value);
-guint16                         g_variant_get_uint16                    (GVariant             *value);
-gint32                          g_variant_get_int32                     (GVariant             *value);
-guint32                         g_variant_get_uint32                    (GVariant             *value);
-gint64                          g_variant_get_int64                     (GVariant             *value);
-guint64                         g_variant_get_uint64                    (GVariant             *value);
-gint32                          g_variant_get_handle                    (GVariant             *value);
-gdouble                         g_variant_get_double                    (GVariant             *value);
-GVariant *                      g_variant_get_variant                   (GVariant             *value);
-const gchar *                   g_variant_get_string                    (GVariant             *value,
-                                                                         gsize                *length);
-gchar *                         g_variant_dup_string                    (GVariant             *value,
-                                                                         gsize                *length);
-const gchar **                  g_variant_get_strv                      (GVariant             *value,
-                                                                         gsize                *length);
-gchar **                        g_variant_dup_strv                      (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_2_30
-const gchar **                  g_variant_get_objv                      (GVariant             *value,
-                                                                         gsize                *length);
-gchar **                        g_variant_dup_objv                      (GVariant             *value,
-                                                                         gsize                *length);
-const gchar *                   g_variant_get_bytestring                (GVariant             *value);
-gchar *                         g_variant_dup_bytestring                (GVariant             *value,
-                                                                         gsize                *length);
-const gchar **                  g_variant_get_bytestring_array          (GVariant             *value,
-                                                                         gsize                *length);
-gchar **                        g_variant_dup_bytestring_array          (GVariant             *value,
-                                                                         gsize                *length);
-
-GVariant *                      g_variant_new_maybe                     (const GVariantType   *child_type,
-                                                                         GVariant             *child);
-GVariant *                      g_variant_new_array                     (const GVariantType   *child_type,
-                                                                         GVariant * const     *children,
-                                                                         gsize                 n_children);
-GVariant *                      g_variant_new_tuple                     (GVariant * const     *children,
-                                                                         gsize                 n_children);
-GVariant *                      g_variant_new_dict_entry                (GVariant             *key,
-                                                                         GVariant             *value);
-
-GVariant *                      g_variant_get_maybe                     (GVariant             *value);
-gsize                           g_variant_n_children                    (GVariant             *value);
-void                            g_variant_get_child                     (GVariant             *value,
-                                                                         gsize                 index_,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GVariant *                      g_variant_get_child_value               (GVariant             *value,
-                                                                         gsize                 index_);
-gboolean                        g_variant_lookup                        (GVariant             *dictionary,
-                                                                         const gchar          *key,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GVariant *                      g_variant_lookup_value                  (GVariant             *dictionary,
-                                                                         const gchar          *key,
-                                                                         const GVariantType   *expected_type);
-gconstpointer                   g_variant_get_fixed_array               (GVariant             *value,
-                                                                         gsize                *n_elements,
-                                                                         gsize                 element_size);
-
-gsize                           g_variant_get_size                      (GVariant             *value);
-gconstpointer                   g_variant_get_data                      (GVariant             *value);
-void                            g_variant_store                         (GVariant             *value,
-                                                                         gpointer              data);
-
-gchar *                         g_variant_print                         (GVariant             *value,
-                                                                         gboolean              type_annotate);
-GString *                       g_variant_print_string                  (GVariant             *value,
-                                                                         GString              *string,
-                                                                         gboolean              type_annotate);
-
-guint                           g_variant_hash                          (gconstpointer         value);
-gboolean                        g_variant_equal                         (gconstpointer         one,
-                                                                         gconstpointer         two);
-
-GVariant *                      g_variant_get_normal_form               (GVariant             *value);
-gboolean                        g_variant_is_normal_form                (GVariant             *value);
-GVariant *                      g_variant_byteswap                      (GVariant             *value);
-GVariant *                      g_variant_new_from_data                 (const GVariantType   *type,
-                                                                         gconstpointer         data,
-                                                                         gsize                 size,
-                                                                         gboolean              trusted,
-                                                                         GDestroyNotify        notify,
-                                                                         gpointer              user_data);
-
-typedef struct _GVariantIter GVariantIter;
-struct _GVariantIter {
-  /*< private >*/
-  gsize x[16];
-};
-
-GVariantIter *                  g_variant_iter_new                      (GVariant             *value);
-gsize                           g_variant_iter_init                     (GVariantIter         *iter,
-                                                                         GVariant             *value);
-GVariantIter *                  g_variant_iter_copy                     (GVariantIter         *iter);
-gsize                           g_variant_iter_n_children               (GVariantIter         *iter);
-void                            g_variant_iter_free                     (GVariantIter         *iter);
-GVariant *                      g_variant_iter_next_value               (GVariantIter         *iter);
-gboolean                        g_variant_iter_next                     (GVariantIter         *iter,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-gboolean                        g_variant_iter_loop                     (GVariantIter         *iter,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-
-
-typedef struct _GVariantBuilder GVariantBuilder;
-struct _GVariantBuilder {
-  /*< private >*/
-  gsize x[16];
-};
-
-typedef enum
-{
-  G_VARIANT_PARSE_ERROR_FAILED,
-  G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED,
-  G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE,
-  G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED,
-  G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END,
-  G_VARIANT_PARSE_ERROR_INVALID_CHARACTER,
-  G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING,
-  G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH,
-  G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE,
-  G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING,
-  G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE,
-  G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE,
-  G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG,
-  G_VARIANT_PARSE_ERROR_TYPE_ERROR,
-  G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN,
-  G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD,
-  G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT,
-  G_VARIANT_PARSE_ERROR_VALUE_EXPECTED
-} GVariantParseError;
-#define G_VARIANT_PARSE_ERROR (g_variant_parser_get_error_quark ())
-
-GQuark                          g_variant_parser_get_error_quark        (void);
-
-GVariantBuilder *               g_variant_builder_new                   (const GVariantType   *type);
-void                            g_variant_builder_unref                 (GVariantBuilder      *builder);
-GVariantBuilder *               g_variant_builder_ref                   (GVariantBuilder      *builder);
-void                            g_variant_builder_init                  (GVariantBuilder      *builder,
-                                                                         const GVariantType   *type);
-GVariant *                      g_variant_builder_end                   (GVariantBuilder      *builder);
-void                            g_variant_builder_clear                 (GVariantBuilder      *builder);
-void                            g_variant_builder_open                  (GVariantBuilder      *builder,
-                                                                         const GVariantType   *type);
-void                            g_variant_builder_close                 (GVariantBuilder      *builder);
-void                            g_variant_builder_add_value             (GVariantBuilder      *builder,
-                                                                         GVariant             *value);
-void                            g_variant_builder_add                   (GVariantBuilder      *builder,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-void                            g_variant_builder_add_parsed            (GVariantBuilder      *builder,
-                                                                         const gchar          *format,
-                                                                         ...);
-
-GVariant *                      g_variant_new                           (const gchar          *format_string,
-                                                                         ...);
-void                            g_variant_get                           (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GVariant *                      g_variant_new_va                        (const gchar          *format_string,
-                                                                         const gchar         **endptr,
-                                                                         va_list              *app);
-void                            g_variant_get_va                        (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         const gchar         **endptr,
-                                                                         va_list              *app);
-gboolean                        g_variant_check_format_string           (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         gboolean              copy_only);
-
-GVariant *                      g_variant_parse                         (const GVariantType   *type,
-                                                                         const gchar          *text,
-                                                                         const gchar          *limit,
-                                                                         const gchar         **endptr,
-                                                                         GError              **error);
-GVariant *                      g_variant_new_parsed                    (const gchar          *format,
-                                                                         ...);
-GVariant *                      g_variant_new_parsed_va                 (const gchar          *format,
-                                                                         va_list              *app);
-
-gint                            g_variant_compare                       (gconstpointer one,
-                                                                         gconstpointer two);
-G_END_DECLS
-
-#endif /* __G_VARIANT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gvarianttype.h b/GstreamerHelper/x64/include/glib-2.0/glib/gvarianttype.h
deleted file mode 100644
index fe1ba844..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gvarianttype.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright © 2007, 2008 Ryan Lortie
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VARIANT_TYPE_H__
-#define __G_VARIANT_TYPE_H__
-
-#include <glib/gmessages.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GVariantType:
- *
- * A type in the GVariant type system.
- *
- * Two types may not be compared by value; use g_variant_type_equal() or
- * g_variant_type_is_subtype_of().  May be copied using
- * g_variant_type_copy() and freed using g_variant_type_free().
- **/
-typedef struct _GVariantType GVariantType;
-
-/**
- * G_VARIANT_TYPE_BOOLEAN:
- *
- * The type of a value that can be either %TRUE or %FALSE.
- **/
-#define G_VARIANT_TYPE_BOOLEAN              ((const GVariantType *) "b")
-
-/**
- * G_VARIANT_TYPE_BYTE:
- *
- * The type of an integer value that can range from 0 to 255.
- **/
-#define G_VARIANT_TYPE_BYTE                 ((const GVariantType *) "y")
-
-/**
- * G_VARIANT_TYPE_INT16:
- *
- * The type of an integer value that can range from -32768 to 32767.
- **/
-#define G_VARIANT_TYPE_INT16                ((const GVariantType *) "n")
-
-/**
- * G_VARIANT_TYPE_UINT16:
- *
- * The type of an integer value that can range from 0 to 65535.
- * There were about this many people living in Toronto in the 1870s.
- **/
-#define G_VARIANT_TYPE_UINT16               ((const GVariantType *) "q")
-
-/**
- * G_VARIANT_TYPE_INT32:
- *
- * The type of an integer value that can range from -2147483648 to
- * 2147483647.
- **/
-#define G_VARIANT_TYPE_INT32                ((const GVariantType *) "i")
-
-/**
- * G_VARIANT_TYPE_UINT32:
- *
- * The type of an integer value that can range from 0 to 4294967295.
- * That's one number for everyone who was around in the late 1970s.
- **/
-#define G_VARIANT_TYPE_UINT32               ((const GVariantType *) "u")
-
-/**
- * G_VARIANT_TYPE_INT64:
- *
- * The type of an integer value that can range from
- * -9223372036854775808 to 9223372036854775807.
- **/
-#define G_VARIANT_TYPE_INT64                ((const GVariantType *) "x")
-
-/**
- * G_VARIANT_TYPE_UINT64:
- *
- * The type of an integer value that can range from 0 to
- * 18446744073709551616.  That's a really big number, but a Rubik's
- * cube can have a bit more than twice as many possible positions.
- **/
-#define G_VARIANT_TYPE_UINT64               ((const GVariantType *) "t")
-
-/**
- * G_VARIANT_TYPE_DOUBLE:
- *
- * The type of a double precision IEEE754 floating point number.
- * These guys go up to about 1.80e308 (plus and minus) but miss out on
- * some numbers in between.  In any case, that's far greater than the
- * estimated number of fundamental particles in the observable
- * universe.
- **/
-#define G_VARIANT_TYPE_DOUBLE               ((const GVariantType *) "d")
-
-/**
- * G_VARIANT_TYPE_STRING:
- *
- * The type of a string.  "" is a string.  %NULL is not a string.
- **/
-#define G_VARIANT_TYPE_STRING               ((const GVariantType *) "s")
-
-/**
- * G_VARIANT_TYPE_OBJECT_PATH:
- *
- * The type of a D-Bus object reference.  These are strings of a
- * specific format used to identify objects at a given destination on
- * the bus.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.  If you are, then the D-Bus specification contains a
- * precise description of valid object paths.
- **/
-#define G_VARIANT_TYPE_OBJECT_PATH          ((const GVariantType *) "o")
-
-/**
- * G_VARIANT_TYPE_SIGNATURE:
- *
- * The type of a D-Bus type signature.  These are strings of a specific
- * format used as type signatures for D-Bus methods and messages.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.  If you are, then the D-Bus specification contains a
- * precise description of valid signature strings.
- **/
-#define G_VARIANT_TYPE_SIGNATURE            ((const GVariantType *) "g")
-
-/**
- * G_VARIANT_TYPE_VARIANT:
- *
- * The type of a box that contains any other value (including another
- * variant).
- **/
-#define G_VARIANT_TYPE_VARIANT              ((const GVariantType *) "v")
-
-/**
- * G_VARIANT_TYPE_HANDLE:
- *
- * The type of a 32bit signed integer value, that by convention, is used
- * as an index into an array of file descriptors that are sent alongside
- * a D-Bus message.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.
- **/
-#define G_VARIANT_TYPE_HANDLE               ((const GVariantType *) "h")
-
-/**
- * G_VARIANT_TYPE_UNIT:
- *
- * The empty tuple type.  Has only one instance.  Known also as "triv"
- * or "void".
- **/
-#define G_VARIANT_TYPE_UNIT                 ((const GVariantType *) "()")
-
-/**
- * G_VARIANT_TYPE_ANY:
- *
- * An indefinite type that is a supertype of every type (including
- * itself).
- **/
-#define G_VARIANT_TYPE_ANY                  ((const GVariantType *) "*")
-
-/**
- * G_VARIANT_TYPE_BASIC:
- *
- * An indefinite type that is a supertype of every basic (ie:
- * non-container) type.
- **/
-#define G_VARIANT_TYPE_BASIC                ((const GVariantType *) "?")
-
-/**
- * G_VARIANT_TYPE_MAYBE:
- *
- * An indefinite type that is a supertype of every maybe type.
- **/
-#define G_VARIANT_TYPE_MAYBE                ((const GVariantType *) "m*")
-
-/**
- * G_VARIANT_TYPE_ARRAY:
- *
- * An indefinite type that is a supertype of every array type.
- **/
-#define G_VARIANT_TYPE_ARRAY                ((const GVariantType *) "a*")
-
-/**
- * G_VARIANT_TYPE_TUPLE:
- *
- * An indefinite type that is a supertype of every tuple type,
- * regardless of the number of items in the tuple.
- **/
-#define G_VARIANT_TYPE_TUPLE                ((const GVariantType *) "r")
-
-/**
- * G_VARIANT_TYPE_DICT_ENTRY:
- *
- * An indefinite type that is a supertype of every dictionary entry
- * type.
- **/
-#define G_VARIANT_TYPE_DICT_ENTRY           ((const GVariantType *) "{?*}")
-
-/**
- * G_VARIANT_TYPE_DICTIONARY:
- *
- * An indefinite type that is a supertype of every dictionary type --
- * that is, any array type that has an element type equal to any
- * dictionary entry type.
- **/
-#define G_VARIANT_TYPE_DICTIONARY           ((const GVariantType *) "a{?*}")
-
-/**
- * G_VARIANT_TYPE_STRING_ARRAY:
- *
- * The type of an array of strings.
- **/
-#define G_VARIANT_TYPE_STRING_ARRAY         ((const GVariantType *) "as")
-
-/**
- * G_VARIANT_TYPE_OBJECT_PATH_ARRAY:
- *
- * The type of an array of object paths.
- **/
-#define G_VARIANT_TYPE_OBJECT_PATH_ARRAY    ((const GVariantType *) "ao")
-
-/**
- * G_VARIANT_TYPE_BYTESTRING:
- *
- * The type of an array of bytes.  This type is commonly used to pass
- * around strings that may not be valid utf8.  In that case, the
- * convention is that the nul terminator character should be included as
- * the last character in the array.
- **/
-#define G_VARIANT_TYPE_BYTESTRING           ((const GVariantType *) "ay")
-
-/**
- * G_VARIANT_TYPE_BYTESTRING_ARRAY:
- *
- * The type of an array of byte strings (an array of arrays of bytes).
- **/
-#define G_VARIANT_TYPE_BYTESTRING_ARRAY     ((const GVariantType *) "aay")
-
-/**
- * G_VARIANT_TYPE_VARDICT:
- *
- * The type of a dictionary mapping strings to variants (the ubiquitous
- * "a{sv}" type).
- *
- * Since: 2.30
- **/
-#define G_VARIANT_TYPE_VARDICT              ((const GVariantType *) "a{sv}")
-
-
-/**
- * G_VARIANT_TYPE:
- * @type_string: a well-formed #GVariantType type string
- *
- * Converts a string to a const #GVariantType.  Depending on the
- * current debugging level, this function may perform a runtime check
- * to ensure that @string is a valid GVariant type string.
- *
- * It is always a programmer error to use this macro with an invalid
- * type string. If in doubt, use g_variant_type_string_is_valid() to
- * check if the string is valid.
- *
- * Since 2.24
- **/
-#ifndef G_DISABLE_CHECKS
-# define G_VARIANT_TYPE(type_string)            (g_variant_type_checked_ ((type_string)))
-#else
-# define G_VARIANT_TYPE(type_string)            ((const GVariantType *) (type_string))
-#endif
-
-/* type string checking */
-gboolean                        g_variant_type_string_is_valid          (const gchar         *type_string);
-gboolean                        g_variant_type_string_scan              (const gchar         *string,
-                                                                         const gchar         *limit,
-                                                                         const gchar        **endptr);
-
-/* create/destroy */
-void                            g_variant_type_free                     (GVariantType        *type);
-GVariantType *                  g_variant_type_copy                     (const GVariantType  *type);
-GVariantType *                  g_variant_type_new                      (const gchar         *type_string);
-
-/* getters */
-gsize                           g_variant_type_get_string_length        (const GVariantType  *type);
-const gchar *                   g_variant_type_peek_string              (const GVariantType  *type);
-gchar *                         g_variant_type_dup_string               (const GVariantType  *type);
-
-/* classification */
-gboolean                        g_variant_type_is_definite              (const GVariantType  *type);
-gboolean                        g_variant_type_is_container             (const GVariantType  *type);
-gboolean                        g_variant_type_is_basic                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_maybe                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_array                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_tuple                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_dict_entry            (const GVariantType  *type);
-gboolean                        g_variant_type_is_variant               (const GVariantType  *type);
-
-/* for hash tables */
-guint                           g_variant_type_hash                     (gconstpointer        type);
-gboolean                        g_variant_type_equal                    (gconstpointer        type1,
-                                                                         gconstpointer        type2);
-
-/* subtypes */
-gboolean                        g_variant_type_is_subtype_of            (const GVariantType  *type,
-                                                                         const GVariantType  *supertype);
-
-/* type iterator interface */
-const GVariantType *            g_variant_type_element                  (const GVariantType  *type);
-const GVariantType *            g_variant_type_first                    (const GVariantType  *type);
-const GVariantType *            g_variant_type_next                     (const GVariantType  *type);
-gsize                           g_variant_type_n_items                  (const GVariantType  *type);
-const GVariantType *            g_variant_type_key                      (const GVariantType  *type);
-const GVariantType *            g_variant_type_value                    (const GVariantType  *type);
-
-/* constructors */
-GVariantType *                  g_variant_type_new_array                (const GVariantType  *element);
-GVariantType *                  g_variant_type_new_maybe                (const GVariantType  *element);
-GVariantType *                  g_variant_type_new_tuple                (const GVariantType * const *items,
-                                                                         gint                 length);
-GVariantType *                  g_variant_type_new_dict_entry           (const GVariantType  *key,
-                                                                         const GVariantType  *value);
-
-/*< private >*/
-const GVariantType *            g_variant_type_checked_                 (const gchar *);
-
-G_END_DECLS
-
-#endif /* __G_VARIANT_TYPE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gversion.h b/GstreamerHelper/x64/include/glib-2.0/glib/gversion.h
deleted file mode 100644
index d0581c24..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gversion.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VERSION_H__
-#define __G_VERSION_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_VAR const guint glib_major_version;
-GLIB_VAR const guint glib_minor_version;
-GLIB_VAR const guint glib_micro_version;
-GLIB_VAR const guint glib_interface_age;
-GLIB_VAR const guint glib_binary_age;
-
-const gchar * glib_check_version (guint required_major,
-                                  guint required_minor,
-                                  guint required_micro);
-
-#define GLIB_CHECK_VERSION(major,minor,micro)    \
-    (GLIB_MAJOR_VERSION > (major) || \
-     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION > (minor)) || \
-     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION == (minor) && \
-      GLIB_MICRO_VERSION >= (micro)))
-
-G_END_DECLS
-
-#endif /*  __G_VERSION_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gversionmacros.h b/GstreamerHelper/x64/include/glib-2.0/glib/gversionmacros.h
deleted file mode 100644
index ed8a5ce9..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gversionmacros.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VERSION_MACROS_H__
-#define __G_VERSION_MACROS_H__
-
-/* Version boundaries checks */
-
-#define G_ENCODE_VERSION(major,minor)   ((major) << 16 | (minor) << 8)
-
-/* XXX: Every new stable minor release bump should add a macro here */
-
-/**
- * GLIB_VERSION_2_26:
- *
- * A macro that evaluates to the 2.26 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_26       (G_ENCODE_VERSION (2, 26))
-
-/**
- * GLIB_VERSION_2_28:
- *
- * A macro that evaluates to the 2.28 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_28       (G_ENCODE_VERSION (2, 28))
-
-/**
- * GLIB_VERSION_2_30:
- *
- * A macro that evaluates to the 2.30 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_30       (G_ENCODE_VERSION (2, 30))
-
-/**
- * GLIB_VERSION_2_32:
- *
- * A macro that evaluates to the 2.32 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_32       (G_ENCODE_VERSION (2, 32))
-
-/**
- * GLIB_VERSION_2_34:
- *
- * A macro that evaluates to the 2.34 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.34
- */
-#define GLIB_VERSION_2_34       (G_ENCODE_VERSION (2, 34))
-
-/* evaluates to the current stable version; for development cycles,
- * this means the next stable target
- */
-#if (GLIB_MINOR_VERSION % 2)
-#define GLIB_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION + 1))
-#else
-#define GLIB_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION))
-#endif
-
-/* evaluates to the previous stable version */
-#if (GLIB_MINOR_VERSION % 2)
-#define GLIB_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 1))
-#else
-#define GLIB_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 2))
-#endif
-
-/**
- * GLIB_VERSION_MIN_REQUIRED:
- *
- * A macro that should be defined by the user prior to including
- * the glib.h header.
- * The definition should be one of the predefined GLib version
- * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,...
- *
- * This macro defines the earliest version of GLib that the package is
- * required to be able to compile against.
- *
- * If the compiler is configured to warn about the use of deprecated
- * functions, then using functions that were deprecated in version
- * %GLIB_VERSION_MIN_REQUIRED or earlier will cause warnings (but
- * using functions deprecated in later releases will not).
- *
- * Since: 2.32
- */
-/* If the package sets GLIB_VERSION_MIN_REQUIRED to some future
- * GLIB_VERSION_X_Y value that we don't know about, it will compare as
- * 0 in preprocessor tests.
- */
-#ifndef GLIB_VERSION_MIN_REQUIRED
-# define GLIB_VERSION_MIN_REQUIRED      (GLIB_VERSION_CUR_STABLE)
-#elif GLIB_VERSION_MIN_REQUIRED == 0
-# undef  GLIB_VERSION_MIN_REQUIRED
-# define GLIB_VERSION_MIN_REQUIRED      (GLIB_VERSION_CUR_STABLE + 2)
-#endif
-
-/**
- * GLIB_VERSION_MAX_ALLOWED:
- *
- * A macro that should be defined by the user prior to including
- * the glib.h header.
- * The definition should be one of the predefined GLib version
- * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,...
- *
- * This macro defines the latest version of the GLib API that the
- * package is allowed to make use of.
- *
- * If the compiler is configured to warn about the use of deprecated
- * functions, then using functions added after version
- * %GLIB_VERSION_MAX_ALLOWED will cause warnings.
- *
- * Unless you are using GLIB_CHECK_VERSION() or the like to compile
- * different code depending on the GLib version, then this should be
- * set to the same value as %GLIB_VERSION_MIN_REQUIRED.
- *
- * Since: 2.32
- */
-#if !defined (GLIB_VERSION_MAX_ALLOWED) || (GLIB_VERSION_MAX_ALLOWED == 0)
-# undef GLIB_VERSION_MAX_ALLOWED
-# define GLIB_VERSION_MAX_ALLOWED      (GLIB_VERSION_CUR_STABLE)
-#endif
-
-/* sanity checks */
-#if GLIB_VERSION_MIN_REQUIRED > GLIB_VERSION_CUR_STABLE
-#error "GLIB_VERSION_MIN_REQUIRED must be <= GLIB_VERSION_CUR_STABLE"
-#endif
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_MIN_REQUIRED
-#error "GLIB_VERSION_MAX_ALLOWED must be >= GLIB_VERSION_MIN_REQUIRED"
-#endif
-#if GLIB_VERSION_MIN_REQUIRED < GLIB_VERSION_2_26
-#error "GLIB_VERSION_MIN_REQUIRED must be >= GLIB_VERSION_2_26"
-#endif
-
-/* These macros are used to mark deprecated functions in GLib headers,
- * and thus have to be exposed in installed headers. But please
- * do *not* use them in other projects. Instead, use G_DEPRECATED
- * or define your own wrappers around it.
- */
-
-/* XXX: Every new stable minor release should add a set of macros here */
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_26
-# define GLIB_DEPRECATED_IN_2_26                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_26_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_26
-# define GLIB_DEPRECATED_IN_2_26_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_26
-# define GLIB_AVAILABLE_IN_2_26                 GLIB_UNAVAILABLE(2, 26)
-#else
-# define GLIB_AVAILABLE_IN_2_26
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_28
-# define GLIB_DEPRECATED_IN_2_28                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_28_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_28
-# define GLIB_DEPRECATED_IN_2_28_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_28
-# define GLIB_AVAILABLE_IN_2_28                 GLIB_UNAVAILABLE(2, 28)
-#else
-# define GLIB_AVAILABLE_IN_2_28
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_30
-# define GLIB_DEPRECATED_IN_2_30                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_30_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_30
-# define GLIB_DEPRECATED_IN_2_30_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_30
-# define GLIB_AVAILABLE_IN_2_30                 GLIB_UNAVAILABLE(2, 30)
-#else
-# define GLIB_AVAILABLE_IN_2_30
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_32
-# define GLIB_DEPRECATED_IN_2_32                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_32_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_32
-# define GLIB_DEPRECATED_IN_2_32_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_32
-# define GLIB_AVAILABLE_IN_2_32                 GLIB_UNAVAILABLE(2, 32)
-#else
-# define GLIB_AVAILABLE_IN_2_32
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_34
-# define GLIB_DEPRECATED_IN_2_34                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_34_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_34
-# define GLIB_DEPRECATED_IN_2_34_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_34
-# define GLIB_AVAILABLE_IN_2_34                 GLIB_UNAVAILABLE(2, 34)
-#else
-# define GLIB_AVAILABLE_IN_2_34
-#endif
-
-#endif /*  __G_VERSION_MACROS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/glib/gwin32.h b/GstreamerHelper/x64/include/glib-2.0/glib/gwin32.h
deleted file mode 100644
index b0fb7c04..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/glib/gwin32.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_WIN32_H__
-#define __G_WIN32_H__
-
-#include <glib/gtypes.h>
-
-#ifdef G_PLATFORM_WIN32
-
-G_BEGIN_DECLS
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-#ifdef G_OS_WIN32
-
-/*
- * To get prototypes for the following POSIXish functions, you have to
- * include the indicated non-POSIX headers. The functions are defined
- * in OLDNAMES.LIB (MSVC) or -lmoldname-msvc (mingw32). But note that
- * for POSIX functions that take or return file names in the system
- * codepage, in many cases you would want to use the GLib wrappers in
- * gstdio.h and UTF-8 instead.
- *
- * getcwd: <direct.h> (MSVC), <io.h> (mingw32)
- * getpid: <process.h>
- * access: <io.h>
- * unlink: <stdio.h> or <io.h>
- * open, read, write, lseek, close: <io.h>
- * rmdir: <io.h>
- * pipe: <io.h> (actually, _pipe())
- */
-
-/* For some POSIX functions that are not provided by the MS runtime,
- * we provide emulation functions in glib, which are prefixed with
- * g_win32_. Or that was the idea at some time, but there is just one
- * of those:
- */
-gint		g_win32_ftruncate	(gint		 f,
-					 guint		 size);
-#endif /* G_OS_WIN32 */
-
-/* The MS setlocale uses locale names of the form "English_United
- * States.1252" etc. We want the Unixish standard form "en", "zh_TW"
- * etc. This function gets the current thread locale from Windows and
- * returns it as a string of the above form for use in forming file
- * names etc. The returned string should be deallocated with g_free().
- */
-gchar* 		g_win32_getlocale  (void);
-
-/* Translate a Win32 error code (as returned by GetLastError()) into
- * the corresponding message. The returned string should be deallocated
- * with g_free().
- */
-gchar*          g_win32_error_message (gint error);
-
-#ifndef G_DISABLE_DEPRECATED
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef _WIN64
-#define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8
-#define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8
-#endif
-#endif
-
-gchar*          g_win32_get_package_installation_directory (const gchar *package,
-							    const gchar *dll_name);
-
-gchar*          g_win32_get_package_installation_subdirectory (const gchar *package,
-							       const gchar *dll_name,
-							       const gchar *subdir);
-
-#endif
-
-gchar*          g_win32_get_package_installation_directory_of_module (gpointer hmodule);
-
-guint		g_win32_get_windows_version (void);
-
-gchar*          g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
-
-/* As of GLib 2.14 we only support NT-based Windows */
-#define G_WIN32_IS_NT_BASED() TRUE
-#define G_WIN32_HAVE_WIDECHAR_API() TRUE
-
-G_END_DECLS
-
-#endif	 /* G_PLATFORM_WIN32 */
-
-#endif /* __G_WIN32_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gmodule.h b/GstreamerHelper/x64/include/glib-2.0/gmodule.h
deleted file mode 100644
index 837e5359..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gmodule.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GMODULE - GLIB wrapper code for dynamic module loading
- * Copyright (C) 1998 Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GMODULE_H__
-#define __GMODULE_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* exporting and importing functions, this is special cased
- * to feature Windows dll stubs.
- */
-#define	G_MODULE_IMPORT		extern
-#ifdef G_PLATFORM_WIN32
-#  define	G_MODULE_EXPORT		__declspec(dllexport)
-#else /* !G_PLATFORM_WIN32 */
-#  define	G_MODULE_EXPORT
-#endif /* !G_PLATFORM_WIN32 */
-
-typedef enum
-{
-  G_MODULE_BIND_LAZY	= 1 << 0,
-  G_MODULE_BIND_LOCAL	= 1 << 1,
-  G_MODULE_BIND_MASK	= 0x03
-} GModuleFlags;
-
-typedef	struct _GModule			 GModule;
-typedef const gchar* (*GModuleCheckInit) (GModule	*module);
-typedef void	     (*GModuleUnload)	 (GModule	*module);
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_module_open g_module_open_utf8
-#define g_module_name g_module_name_utf8
-#endif
-#endif
-
-/* return TRUE if dynamic module loading is supported */
-gboolean	g_module_supported	   (void) G_GNUC_CONST;
-
-/* open a module `file_name' and return handle, which is NULL on error */
-GModule*              g_module_open          (const gchar  *file_name,
-					      GModuleFlags  flags);
-
-/* close a previously opened module, returns TRUE on success */
-gboolean              g_module_close         (GModule      *module);
-
-/* make a module resident so g_module_close on it will be ignored */
-void                  g_module_make_resident (GModule      *module);
-
-/* query the last module error as a string */
-const gchar *         g_module_error         (void);
-
-/* retrieve a symbol pointer from `module', returns TRUE on success */
-gboolean              g_module_symbol        (GModule      *module,
-					      const gchar  *symbol_name,
-					      gpointer     *symbol);
-
-/* retrieve the file name from an existing module */
-const gchar *         g_module_name          (GModule      *module);
-
-/* Build the actual file name containing a module. `directory' is the
- * directory where the module file is supposed to be, or NULL or empty
- * in which case it should either be in the current directory or, on
- * some operating systems, in some standard place, for instance on the
- * PATH. Hence, to be absoultely sure to get the correct module,
- * always pass in a directory. The file name consists of the directory,
- * if supplied, and `module_name' suitably decorated according to
- * the operating system's conventions (for instance lib*.so or *.dll).
- *
- * No checks are made that the file exists, or is of correct type.
- */
-gchar*                g_module_build_path    (const gchar  *directory,
-					      const gchar  *module_name);
-
-
-G_END_DECLS
-
-#endif /* __GMODULE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gbinding.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gbinding.h
deleted file mode 100644
index 1b715402..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gbinding.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* gbinding.h: Binding for object properties
- *
- * Copyright (C) 2010  Intel Corp.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Emmanuele Bassi <ebassi@linux.intel.com>
- */
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_BINDING_H__
-#define __G_BINDING_H__
-
-#include <glib.h>
-#include <gobject/gobject.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BINDING_FLAGS    (g_binding_flags_get_type ())
-
-#define G_TYPE_BINDING          (g_binding_get_type ())
-#define G_BINDING(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_BINDING, GBinding))
-#define G_IS_BINDING(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_BINDING))
-
-/**
- * GBinding:
- *
- * <structname>GBinding</structname> is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
-typedef struct _GBinding        GBinding;
-
-/**
- * GBindingTransformFunc:
- * @binding: a #GBinding
- * @source_value: the value of the source property
- * @target_value: the value of the target property
- * @user_data: data passed to the transform function
- *
- * A function to be called to transform the source property of @source
- * from @source_value into the target property of @target
- * using @target_value.
- *
- * Return value: %TRUE if the transformation was successful, and %FALSE
- *   otherwise
- *
- * Since: 2.26
- */
-typedef gboolean (* GBindingTransformFunc) (GBinding     *binding,
-                                            const GValue *source_value,
-                                            GValue       *target_value,
-                                            gpointer      user_data);
-
-/**
- * GBindingFlags:
- * @G_BINDING_DEFAULT: The default binding; if the source property
- *   changes, the target property is updated with its value.
- * @G_BINDING_BIDIRECTIONAL: Bidirectional binding; if either the
- *   property of the source or the property of the target changes,
- *   the other is updated.
- * @G_BINDING_SYNC_CREATE: Synchronize the values of the source and
- *   target properties when creating the binding; the direction of
- *   the synchronization is always from the source to the target.
- * @G_BINDING_INVERT_BOOLEAN: If the two properties being bound are
- *   booleans, setting one to %TRUE will result in the other being
- *   set to %FALSE and vice versa. This flag will only work for
- *   boolean properties, and cannot be used when passing custom
- *   transformation functions to g_object_bind_property_full().
- *
- * Flags to be passed to g_object_bind_property() or
- * g_object_bind_property_full().
- *
- * This enumeration can be extended at later date.
- *
- * Since: 2.26
- */
-typedef enum { /*< prefix=G_BINDING >*/
-  G_BINDING_DEFAULT        = 0,
-
-  G_BINDING_BIDIRECTIONAL  = 1 << 0,
-  G_BINDING_SYNC_CREATE    = 1 << 1,
-  G_BINDING_INVERT_BOOLEAN = 1 << 2
-} GBindingFlags;
-
-GType                 g_binding_flags_get_type      (void) G_GNUC_CONST;
-GType                 g_binding_get_type            (void) G_GNUC_CONST;
-
-GBindingFlags         g_binding_get_flags           (GBinding *binding);
-GObject *             g_binding_get_source          (GBinding *binding);
-GObject *             g_binding_get_target          (GBinding *binding);
-const gchar *         g_binding_get_source_property (GBinding *binding);
-const gchar *         g_binding_get_target_property (GBinding *binding);
-
-GBinding *g_object_bind_property               (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags);
-GBinding *g_object_bind_property_full          (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags,
-                                                GBindingTransformFunc  transform_to,
-                                                GBindingTransformFunc  transform_from,
-                                                gpointer               user_data,
-                                                GDestroyNotify         notify);
-GBinding *g_object_bind_property_with_closures (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags,
-                                                GClosure              *transform_to,
-                                                GClosure              *transform_from);
-
-G_END_DECLS
-
-#endif /* __G_BINDING_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gboxed.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gboxed.h
deleted file mode 100644
index 2b840878..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gboxed.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_BOXED_H__
-#define __G_BOXED_H__
-
-#include        <gobject/gtype.h>
-
-#ifndef __GI_SCANNER__
-#include        <gobject/glib-types.h>
-#endif
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_BOXED(type)      (G_TYPE_FUNDAMENTAL (type) == G_TYPE_BOXED)
-/**
- * G_VALUE_HOLDS_BOXED:
- * @value: a valid #GValue structure
- *
- * Checks whether the given #GValue can hold values derived
- * from type %G_TYPE_BOXED.
- *
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_BOXED(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOXED))
-
-
-/* --- typedefs --- */
-/**
- * GBoxedCopyFunc:
- * @boxed: The boxed structure to be copied.
- *
- * This function is provided by the user and should produce a copy
- * of the passed in boxed structure.
- *
- * Returns: The newly created copy of the boxed structure.
- */
-typedef gpointer (*GBoxedCopyFunc) (gpointer boxed);
-
-/**
- * GBoxedFreeFunc:
- * @boxed: The boxed structure to be freed.
- *
- * This function is provided by the user and should free the boxed
- * structure passed.
- */
-typedef void (*GBoxedFreeFunc) (gpointer boxed);
-
-
-/* --- prototypes --- */
-gpointer g_boxed_copy                     (GType boxed_type,
-                                           gconstpointer  src_boxed);
-void     g_boxed_free                     (GType          boxed_type,
-                                           gpointer       boxed);
-void     g_value_set_boxed                (GValue        *value,
-                                           gconstpointer  v_boxed);
-void     g_value_set_static_boxed         (GValue        *value,
-                                           gconstpointer  v_boxed);
-void     g_value_take_boxed               (GValue        *value,
-                                           gconstpointer  v_boxed);
-GLIB_DEPRECATED_FOR(g_value_take_boxed)
-void     g_value_set_boxed_take_ownership (GValue        *value,
-                                           gconstpointer  v_boxed);
-gpointer g_value_get_boxed                (const GValue  *value);
-gpointer g_value_dup_boxed                (const GValue  *value);
-
-
-/* --- convenience --- */
-GType    g_boxed_type_register_static     (const gchar   *name,
-                                           GBoxedCopyFunc boxed_copy,
-                                           GBoxedFreeFunc boxed_free);
-
-/* --- GObject boxed types --- */
-/**
- * G_TYPE_CLOSURE:
- *
- * The #GType for #GClosure.
- */
-#define G_TYPE_CLOSURE (g_closure_get_type ())
-
-/**
- * G_TYPE_VALUE:
- *
- * The type ID of the "GValue" type which is a boxed type,
- * used to pass around pointers to GValues.
- */
-#define G_TYPE_VALUE (g_value_get_type ())
-
-GType   g_closure_get_type         (void) G_GNUC_CONST;
-GType   g_value_get_type           (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif  /* __G_BOXED_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gclosure.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gclosure.h
deleted file mode 100644
index fffac582..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gclosure.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- * Copyright (C) 2005 Imendio AB
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_CLOSURE_H__
-#define __G_CLOSURE_H__
-
-#include        <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- defines --- */
-/**
- * G_CLOSURE_NEEDS_MARSHAL:
- * @closure: a #GClosure
- * 
- * Check if the closure still needs a marshaller. See g_closure_set_marshal().
- *
- * Returns: %TRUE if a #GClosureMarshal marshaller has not yet been set on 
- * @closure.
- */
-#define	G_CLOSURE_NEEDS_MARSHAL(closure) (((GClosure*) (closure))->marshal == NULL)
-/**
- * G_CLOSURE_N_NOTIFIERS:
- * @cl: a #GClosure
- * 
- * Get the total number of notifiers connected with the closure @cl. 
- * The count includes the meta marshaller, the finalize and invalidate notifiers 
- * and the marshal guards. Note that each guard counts as two notifiers. 
- * See g_closure_set_meta_marshal(), g_closure_add_finalize_notifier(),
- * g_closure_add_invalidate_notifier() and g_closure_add_marshal_guards().
- *
- * Returns: number of notifiers
- */
-#define	G_CLOSURE_N_NOTIFIERS(cl)	 (((cl)->n_guards << 1L) + \
-                                          (cl)->n_fnotifiers + (cl)->n_inotifiers)
-/**
- * G_CCLOSURE_SWAP_DATA:
- * @cclosure: a #GCClosure
- * 
- * Checks whether the user data of the #GCClosure should be passed as the
- * first parameter to the callback. See g_cclosure_new_swap().
- *
- * Returns: %TRUE if data has to be swapped.
- */
-#define	G_CCLOSURE_SWAP_DATA(cclosure)	 (((GClosure*) (cclosure))->derivative_flag)
-/**
- * G_CALLBACK:
- * @f: a function pointer.
- * 
- * Cast a function pointer to a #GCallback.
- */
-#define	G_CALLBACK(f)			 ((GCallback) (f))
-
-
-/* -- typedefs --- */
-typedef struct _GClosure		 GClosure;
-typedef struct _GClosureNotifyData	 GClosureNotifyData;
-
-/**
- * GCallback:
- * 
- * The type used for callback functions in structure definitions and function 
- * signatures. This doesn't mean that all callback functions must take no 
- * parameters and return void. The required signature of a callback function 
- * is determined by the context in which is used (e.g. the signal to which it 
- * is connected). Use G_CALLBACK() to cast the callback function to a #GCallback. 
- */
-typedef void  (*GCallback)              (void);
-/**
- * GClosureNotify:
- * @data: data specified when registering the notification callback
- * @closure: the #GClosure on which the notification is emitted
- * 
- * The type used for the various notification callbacks which can be registered
- * on closures.
- */
-typedef void  (*GClosureNotify)		(gpointer	 data,
-					 GClosure	*closure);
-/**
- * GClosureMarshal:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @n_param_values: the length of the @param_values array
- * @param_values: (array length=n_param_values): an array of
- *  #GValue<!-- -->s holding the arguments on which to invoke the
- *  callback of @closure
- * @invocation_hint: (allow-none): the invocation hint given as the
- *  last argument to g_closure_invoke()
- * @marshal_data: (allow-none): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * 
- * The type used for marshaller functions.
- */
-typedef void  (*GClosureMarshal)	(GClosure	*closure,
-					 GValue         *return_value,
-					 guint           n_param_values,
-					 const GValue   *param_values,
-					 gpointer        invocation_hint,
-					 gpointer	 marshal_data);
-
-typedef void (* GVaClosureMarshal) (GClosure *closure,
-				    GValue   *return_value,
-				    gpointer  instance,
-				    va_list   args,
-				    gpointer  marshal_data,
-				    int       n_params,
-				    GType    *param_types);
-
-/**
- * GCClosure:
- * @closure: the #GClosure
- * @callback: the callback function
- * 
- * A #GCClosure is a specialization of #GClosure for C function callbacks.
- */
-typedef struct _GCClosure		 GCClosure;
-
-
-/* --- structures --- */
-struct _GClosureNotifyData
-{
-  gpointer       data;
-  GClosureNotify notify;
-};
-/**
- * GClosure:
- * @in_marshal: Indicates whether the closure is currently being invoked with 
- *  g_closure_invoke()
- * @is_invalid: Indicates whether the closure has been invalidated by 
- *  g_closure_invalidate()
- * 
- * A #GClosure represents a callback supplied by the programmer.
- */
-struct _GClosure
-{
-  /*< private >*/
-  volatile      	guint	 ref_count : 15;
-  /* meta_marshal is not used anymore but must be zero for historical reasons
-     as it was exposed in the G_CLOSURE_N_NOTIFIERS macro */
-  volatile       	guint	 meta_marshal_nouse : 1;
-  volatile       	guint	 n_guards : 1;
-  volatile       	guint	 n_fnotifiers : 2;	/* finalization notifiers */
-  volatile       	guint	 n_inotifiers : 8;	/* invalidation notifiers */
-  volatile       	guint	 in_inotify : 1;
-  volatile       	guint	 floating : 1;
-  /*< protected >*/
-  volatile         	guint	 derivative_flag : 1;
-  /*< public >*/
-  volatile       	guint	 in_marshal : 1;
-  volatile       	guint	 is_invalid : 1;
-
-  /*< private >*/	void   (*marshal)  (GClosure       *closure,
-					    GValue /*out*/ *return_value,
-					    guint           n_param_values,
-					    const GValue   *param_values,
-					    gpointer        invocation_hint,
-					    gpointer	    marshal_data);
-  /*< protected >*/	gpointer data;
-
-  /*< private >*/	GClosureNotifyData *notifiers;
-
-  /* invariants/constrains:
-   * - ->marshal and ->data are _invalid_ as soon as ->is_invalid==TRUE
-   * - invocation of all inotifiers occours prior to fnotifiers
-   * - order of inotifiers is random
-   *   inotifiers may _not_ free/invalidate parameter values (e.g. ->data)
-   * - order of fnotifiers is random
-   * - each notifier may only be removed before or during its invocation
-   * - reference counting may only happen prior to fnotify invocation
-   *   (in that sense, fnotifiers are really finalization handlers)
-   */
-};
-/* closure for C function calls, callback() is the user function
- */
-struct _GCClosure
-{
-  GClosure	closure;
-  gpointer	callback;
-};
-
-
-/* --- prototypes --- */
-GClosure* g_cclosure_new			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_cclosure_new_swap			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_signal_type_cclosure_new		(GType          itype,
-						 guint          struct_offset);
-
-
-/* --- prototypes --- */
-GClosure* g_closure_ref				(GClosure	*closure);
-void	  g_closure_sink			(GClosure	*closure);
-void	  g_closure_unref			(GClosure	*closure);
-/* intimidating */
-GClosure* g_closure_new_simple			(guint		 sizeof_closure,
-						 gpointer	 data);
-void	  g_closure_add_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_marshal_guards		(GClosure	*closure,
-						 gpointer        pre_marshal_data,
-						 GClosureNotify	 pre_marshal_notify,
-						 gpointer        post_marshal_data,
-						 GClosureNotify	 post_marshal_notify);
-void	  g_closure_set_marshal			(GClosure	*closure,
-						 GClosureMarshal marshal);
-void	  g_closure_set_meta_marshal		(GClosure       *closure,
-						 gpointer	 marshal_data,
-						 GClosureMarshal meta_marshal);
-void	  g_closure_invalidate			(GClosure	*closure);
-void	  g_closure_invoke			(GClosure 	*closure,
-						 GValue	/*out*/	*return_value,
-						 guint		 n_param_values,
-						 const GValue	*param_values,
-						 gpointer	 invocation_hint);
-
-/* FIXME:
-   OK:  data_object::destroy		-> closure_invalidate();
-   MIS:	closure_invalidate()		-> disconnect(closure);
-   MIS:	disconnect(closure)		-> (unlink) closure_unref();
-   OK:	closure_finalize()		-> g_free (data_string);
-
-   random remarks:
-   - need marshaller repo with decent aliasing to base types
-   - provide marshaller collection, virtually covering anything out there
-*/
-
-void g_cclosure_marshal_generic (GClosure     *closure,
-                                 GValue       *return_gvalue,
-                                 guint         n_param_values,
-                                 const GValue *param_values,
-                                 gpointer      invocation_hint,
-                                 gpointer      marshal_data);
-
-void g_cclosure_marshal_generic_va (GClosure *closure,
-				    GValue   *return_value,
-				    gpointer  instance,
-				    va_list   args_list,
-				    gpointer  marshal_data,
-				    int       n_params,
-				    GType    *param_types);
-
-
-G_END_DECLS
-
-#endif /* __G_CLOSURE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/genums.h b/GstreamerHelper/x64/include/glib-2.0/gobject/genums.h
deleted file mode 100644
index bf8a4191..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/genums.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_ENUMS_H__
-#define __G_ENUMS_H__
-
-#include <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_ENUM:
- * @type: a #GType ID.
- * 
- * Checks whether @type "is a" %G_TYPE_ENUM.
- *
- * Returns: %TRUE if @type "is a" %G_TYPE_ENUM.
- */
-#define G_TYPE_IS_ENUM(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_ENUM)
-/**
- * G_ENUM_CLASS:
- * @class: a valid #GEnumClass
- * 
- * Casts a derived #GEnumClass structure into a #GEnumClass structure.
- */
-#define G_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_ENUM, GEnumClass))
-/**
- * G_IS_ENUM_CLASS:
- * @class: a #GEnumClass
- * 
- * Checks whether @class "is a" valid #GEnumClass structure of type %G_TYPE_ENUM
- * or derived.
- */
-#define G_IS_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_ENUM))
-/**
- * G_ENUM_CLASS_TYPE:
- * @class: a #GEnumClass
- * 
- * Get the type identifier from a given #GEnumClass structure.
- *
- * Returns: the #GType
- */
-#define G_ENUM_CLASS_TYPE(class)       (G_TYPE_FROM_CLASS (class))
-/**
- * G_ENUM_CLASS_TYPE_NAME:
- * @class: a #GEnumClass
- * 
- * Get the static type name from a given #GEnumClass structure.
- *
- * Returns: the type name.
- */
-#define G_ENUM_CLASS_TYPE_NAME(class)  (g_type_name (G_ENUM_CLASS_TYPE (class)))
-
-
-/**
- * G_TYPE_IS_FLAGS:
- * @type: a #GType ID.
- *
- * Checks whether @type "is a" %G_TYPE_FLAGS. 
- *
- * Returns: %TRUE if @type "is a" %G_TYPE_FLAGS.
- */
-#define G_TYPE_IS_FLAGS(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_FLAGS)
-/**
- * G_FLAGS_CLASS:
- * @class: a valid #GFlagsClass
- * 
- * Casts a derived #GFlagsClass structure into a #GFlagsClass structure.
- */
-#define G_FLAGS_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_FLAGS, GFlagsClass))
-/**
- * G_IS_FLAGS_CLASS:
- * @class: a #GFlagsClass
- * 
- * Checks whether @class "is a" valid #GFlagsClass structure of type %G_TYPE_FLAGS
- * or derived.
- */
-#define G_IS_FLAGS_CLASS(class)        (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_FLAGS))
-/**
- * G_FLAGS_CLASS_TYPE:
- * @class: a #GFlagsClass
- * 
- * Get the type identifier from a given #GFlagsClass structure.
- *
- * Returns: the #GType
- */
-#define G_FLAGS_CLASS_TYPE(class)      (G_TYPE_FROM_CLASS (class))
-/**
- * G_FLAGS_CLASS_TYPE_NAME:
- * @class: a #GFlagsClass
- * 
- * Get the static type name from a given #GFlagsClass structure.
- *
- * Returns: the type name.
- */
-#define G_FLAGS_CLASS_TYPE_NAME(class) (g_type_name (G_FLAGS_CLASS_TYPE (class)))
-
-
-/**
- * G_VALUE_HOLDS_ENUM:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_ENUM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_ENUM(value)      (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ENUM))
-/**
- * G_VALUE_HOLDS_FLAGS:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_FLAGS.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_FLAGS(value)     (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLAGS))
-
-
-/* --- enum/flag values & classes --- */
-typedef struct _GEnumClass  GEnumClass;
-typedef struct _GFlagsClass GFlagsClass;
-typedef struct _GEnumValue  GEnumValue;
-typedef struct _GFlagsValue GFlagsValue;
-
-/**
- * GEnumClass:
- * @g_type_class: the parent class
- * @minimum: the smallest possible value.
- * @maximum: the largest possible value.
- * @n_values: the number of possible values.
- * @values: an array of #GEnumValue structs describing the 
- *  individual values.
- * 
- * The class of an enumeration type holds information about its 
- * possible values.
- */
-struct	_GEnumClass
-{
-  GTypeClass  g_type_class;
-
-  /*< public >*/  
-  gint	      minimum;
-  gint	      maximum;
-  guint	      n_values;
-  GEnumValue *values;
-};
-/**
- * GFlagsClass:
- * @g_type_class: the parent class
- * @mask: a mask covering all possible values.
- * @n_values: the number of possible values.
- * @values: an array of #GFlagsValue structs describing the 
- *  individual values.
- * 
- * The class of a flags type holds information about its 
- * possible values.
- */
-struct	_GFlagsClass
-{
-  GTypeClass   g_type_class;
-  
-  /*< public >*/  
-  guint	       mask;
-  guint	       n_values;
-  GFlagsValue *values;
-};
-/**
- * GEnumValue:
- * @value: the enum value
- * @value_name: the name of the value
- * @value_nick: the nickname of the value
- * 
- * A structure which contains a single enum value, its name, and its
- * nickname.
- */
-struct _GEnumValue
-{
-  gint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-/**
- * GFlagsValue:
- * @value: the flags value
- * @value_name: the name of the value
- * @value_nick: the nickname of the value
- * 
- * A structure which contains a single flags value, its name, and its
- * nickname.
- */
-struct _GFlagsValue
-{
-  guint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-
-
-/* --- prototypes --- */
-GEnumValue*	g_enum_get_value		(GEnumClass	*enum_class,
-						 gint		 value);
-GEnumValue*	g_enum_get_value_by_name	(GEnumClass	*enum_class,
-						 const gchar	*name);
-GEnumValue*	g_enum_get_value_by_nick	(GEnumClass	*enum_class,
-						 const gchar	*nick);
-GFlagsValue*	g_flags_get_first_value		(GFlagsClass	*flags_class,
-						 guint		 value);
-GFlagsValue*	g_flags_get_value_by_name	(GFlagsClass	*flags_class,
-						 const gchar	*name);
-GFlagsValue*	g_flags_get_value_by_nick	(GFlagsClass	*flags_class,
-						 const gchar	*nick);
-void            g_value_set_enum        	(GValue         *value,
-						 gint            v_enum);
-gint            g_value_get_enum        	(const GValue   *value);
-void            g_value_set_flags       	(GValue         *value,
-						 guint           v_flags);
-guint           g_value_get_flags       	(const GValue   *value);
-
-
-
-/* --- registration functions --- */
-/* const_static_values is a NULL terminated array of enum/flags
- * values that is taken over!
- */
-GType	g_enum_register_static	   (const gchar	      *name,
-				    const GEnumValue  *const_static_values);
-GType	g_flags_register_static	   (const gchar	      *name,
-				    const GFlagsValue *const_static_values);
-/* functions to complete the type information
- * for enums/flags implemented by plugins
- */
-void	g_enum_complete_type_info  (GType	       g_enum_type,
-				    GTypeInfo	      *info,
-				    const GEnumValue  *const_values);
-void	g_flags_complete_type_info (GType	       g_flags_type,
-				    GTypeInfo	      *info,
-				    const GFlagsValue *const_values);
-
-G_END_DECLS
-
-#endif /* __G_ENUMS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/glib-types.h b/GstreamerHelper/x64/include/glib-2.0/gobject/glib-types.h
deleted file mode 100644
index 50bc0339..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/glib-types.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) && !defined(GLIB_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __GLIB_TYPES_H__
-#define __GLIB_TYPES_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* A hack necesssary to preprocess this file with g-ir-scanner */
-#ifdef __GI_SCANNER__
-typedef gsize GType;
-#endif
-
-/* --- GLib boxed types --- */
-/**
- * G_TYPE_DATE:
- *
- * The #GType for #GDate.
- */
-#define G_TYPE_DATE (g_date_get_type ())
-
-/**
- * G_TYPE_STRV:
- *
- * The #GType for a boxed type holding a %NULL-terminated array of strings.
- *
- * The code fragments in the following example show the use of a property of
- * type #G_TYPE_STRV with g_object_class_install_property(), g_object_set()
- * and g_object_get().
- *
- * |[
- * g_object_class_install_property (object_class,
- *                                  PROP_AUTHORS,
- *                                  g_param_spec_boxed ("authors",
- *                                                      _("Authors"),
- *                                                      _("List of authors"),
- *                                                      G_TYPE_STRV,
- *                                                      G_PARAM_READWRITE));
- *
- * gchar *authors[] = { "Owen", "Tim", NULL };
- * g_object_set (obj, "authors", authors, NULL);
- *
- * gchar *writers[];
- * g_object_get (obj, "authors", &writers, NULL);
- * /&ast; do something with writers &ast;/
- * g_strfreev (writers);
- * ]|
- *
- * Since: 2.4
- */
-#define G_TYPE_STRV (g_strv_get_type ())
-
-/**
- * G_TYPE_GSTRING:
- *
- * The #GType for #GString.
- */
-#define G_TYPE_GSTRING (g_gstring_get_type ())
-
-/**
- * G_TYPE_HASH_TABLE:
- *
- * The #GType for a boxed type holding a #GHashTable reference.
- *
- * Since: 2.10
- */
-#define G_TYPE_HASH_TABLE (g_hash_table_get_type ())
-
-/**
- * G_TYPE_REGEX:
- *
- * The #GType for a boxed type holding a #GRegex reference.
- *
- * Since: 2.14
- */
-#define G_TYPE_REGEX (g_regex_get_type ())
-
-/**
- * G_TYPE_MATCH_INFO:
- *
- * The #GType for a boxed type holding a #GMatchInfo reference.
- *
- * Since: 2.30
- */
-#define G_TYPE_MATCH_INFO (g_match_info_get_type ())
-
-/**
- * G_TYPE_ARRAY:
- *
- * The #GType for a boxed type holding a #GArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_ARRAY (g_array_get_type ())
-
-/**
- * G_TYPE_BYTE_ARRAY:
- *
- * The #GType for a boxed type holding a #GByteArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_BYTE_ARRAY (g_byte_array_get_type ())
-
-/**
- * G_TYPE_PTR_ARRAY:
- *
- * The #GType for a boxed type holding a #GPtrArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_PTR_ARRAY (g_ptr_array_get_type ())
-
-/**
- * G_TYPE_BYTES:
- *
- * The #GType for #GBytes.
- *
- * Since: 2.32
- */
-#define G_TYPE_BYTES (g_bytes_get_type ())
-
-/**
- * G_TYPE_VARIANT_TYPE:
- *
- * The #GType for a boxed type holding a #GVariantType.
- *
- * Since: 2.24
- */
-#define G_TYPE_VARIANT_TYPE (g_variant_type_get_gtype ())
-
-/**
- * G_TYPE_ERROR:
- *
- * The #GType for a boxed type holding a #GError.
- *
- * Since: 2.26
- */
-#define G_TYPE_ERROR (g_error_get_type ())
-
-/**
- * G_TYPE_DATE_TIME:
- *
- * The #GType for a boxed type holding a #GDateTime.
- *
- * Since: 2.26
- */
-#define G_TYPE_DATE_TIME (g_date_time_get_type ())
-
-/**
- * G_TYPE_TIME_ZONE:
- *
- * The #GType for a boxed type holding a #GTimeZone.
- *
- * Since: 2.34
- */
-#define G_TYPE_TIME_ZONE (g_time_zone_get_type ())
-
-/**
- * G_TYPE_IO_CHANNEL:
- *
- * The #GType for #GIOChannel.
- */
-#define G_TYPE_IO_CHANNEL (g_io_channel_get_type ())
-
-/**
- * G_TYPE_IO_CONDITION:
- *
- * The #GType for #GIOCondition.
- */
-#define G_TYPE_IO_CONDITION (g_io_condition_get_type ())
-
-/**
- * G_TYPE_VARIANT_BUILDER:
- *
- * The #GType for a boxed type holding a #GVariantBuilder.
- *
- * Since: 2.30
- */
-#define G_TYPE_VARIANT_BUILDER (g_variant_builder_get_type ())
-
-/**
- * G_TYPE_MAIN_LOOP:
- *
- * The #GType for a boxed type holding a #GMainLoop.
- *
- * Since: 2.30
- */
-#define G_TYPE_MAIN_LOOP (g_main_loop_get_type ())
-
-/**
- * G_TYPE_MAIN_CONTEXT:
- *
- * The #GType for a boxed type holding a #GMainContext.
- *
- * Since: 2.30
- */
-#define G_TYPE_MAIN_CONTEXT (g_main_context_get_type ())
-
-/**
- * G_TYPE_SOURCE:
- *
- * The #GType for a boxed type holding a #GSource.
- *
- * Since: 2.30
- */
-#define G_TYPE_SOURCE (g_source_get_type ())
-
-/**
- * G_TYPE_KEY_FILE:
- *
- * The #GType for a boxed type holding a #GKeyFile.
- *
- * Since: 2.32
- */
-#define G_TYPE_KEY_FILE (g_key_file_get_type ())
-
-GType   g_date_get_type            (void) G_GNUC_CONST;
-GType   g_strv_get_type            (void) G_GNUC_CONST;
-GType   g_gstring_get_type         (void) G_GNUC_CONST;
-GType   g_hash_table_get_type      (void) G_GNUC_CONST;
-GType   g_array_get_type           (void) G_GNUC_CONST;
-GType   g_byte_array_get_type      (void) G_GNUC_CONST;
-GType   g_ptr_array_get_type       (void) G_GNUC_CONST;
-GType   g_bytes_get_type           (void) G_GNUC_CONST;
-GType   g_variant_type_get_gtype   (void) G_GNUC_CONST;
-GType   g_regex_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_match_info_get_type      (void) G_GNUC_CONST;
-GType   g_error_get_type           (void) G_GNUC_CONST;
-GType   g_date_time_get_type       (void) G_GNUC_CONST;
-GType   g_time_zone_get_type       (void) G_GNUC_CONST;
-GType   g_io_channel_get_type      (void) G_GNUC_CONST;
-GType   g_io_condition_get_type    (void) G_GNUC_CONST;
-GType   g_variant_builder_get_type (void) G_GNUC_CONST;
-GType   g_key_file_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_main_loop_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_main_context_get_type    (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_source_get_type          (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED_FOR('G_TYPE_VARIANT')
-GType   g_variant_get_gtype        (void) G_GNUC_CONST;
-
-/**
- * GStrv:
- *
- * A C representable type name for #G_TYPE_STRV.
- */
-typedef gchar** GStrv;
-
-G_END_DECLS
-
-#endif  /* __GLIB_TYPES_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gmarshal.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gmarshal.h
deleted file mode 100644
index 0c21be68..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gmarshal.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/* Note: This file is no longer generated.  See the comment in gmarshal.list */
-#ifndef __G_MARSHAL_H__
-#define __G_MARSHAL_H__
-
-G_BEGIN_DECLS
-
-/* VOID:VOID (./gmarshal.list:6) */
-extern void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__VOIDv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:BOOLEAN (./gmarshal.list:7) */
-extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__BOOLEANv (GClosure     *closure,
-                                               GValue       *return_value,
-                                               gpointer      instance,
-                                               va_list       args,
-                                               gpointer      marshal_data,
-                                               int           n_params,
-                                               GType        *param_types);
-
-/* VOID:CHAR (./gmarshal.list:8) */
-extern void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__CHARv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:UCHAR (./gmarshal.list:9) */
-extern void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__UCHARv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:INT (./gmarshal.list:10) */
-extern void g_cclosure_marshal_VOID__INT (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__INTv (GClosure     *closure,
-                                           GValue       *return_value,
-                                           gpointer      instance,
-                                           va_list       args,
-                                           gpointer      marshal_data,
-                                           int           n_params,
-                                           GType        *param_types);
-
-/* VOID:UINT (./gmarshal.list:11) */
-extern void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__UINTv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:LONG (./gmarshal.list:12) */
-extern void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__LONGv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:ULONG (./gmarshal.list:13) */
-extern void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__ULONGv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:ENUM (./gmarshal.list:14) */
-extern void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__ENUMv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:FLAGS (./gmarshal.list:15) */
-extern void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__FLAGSv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:FLOAT (./gmarshal.list:16) */
-extern void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__FLOATv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:DOUBLE (./gmarshal.list:17) */
-extern void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__DOUBLEv (GClosure     *closure,
-                                              GValue       *return_value,
-                                              gpointer      instance,
-                                              va_list       args,
-                                              gpointer      marshal_data,
-                                              int           n_params,
-                                              GType        *param_types);
-
-/* VOID:STRING (./gmarshal.list:18) */
-extern void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__STRINGv (GClosure     *closure,
-                                              GValue       *return_value,
-                                              gpointer      instance,
-                                              va_list       args,
-                                              gpointer      marshal_data,
-                                              int           n_params,
-                                              GType        *param_types);
-
-/* VOID:PARAM (./gmarshal.list:19) */
-extern void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__PARAMv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:BOXED (./gmarshal.list:20) */
-extern void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__BOXEDv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:POINTER (./gmarshal.list:21) */
-extern void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__POINTERv (GClosure     *closure,
-                                               GValue       *return_value,
-                                               gpointer      instance,
-                                               va_list       args,
-                                               gpointer      marshal_data,
-                                               int           n_params,
-                                               GType        *param_types);
-
-/* VOID:OBJECT (./gmarshal.list:22) */
-extern void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__OBJECTv (GClosure     *closure,
-                                              GValue       *return_value,
-                                              gpointer      instance,
-                                              va_list       args,
-                                              gpointer      marshal_data,
-                                              int           n_params,
-                                              GType        *param_types);
-
-/* VOID:VARIANT (./gmarshal.list:23) */
-extern void g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__VARIANTv (GClosure     *closure,
-                                               GValue       *return_value,
-                                               gpointer      instance,
-                                               va_list       args,
-                                               gpointer      marshal_data,
-                                               int           n_params,
-                                               GType        *param_types);
-
-/* VOID:UINT,POINTER (./gmarshal.list:26) */
-extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
-                                                   GValue       *return_value,
-                                                   guint         n_param_values,
-                                                   const GValue *param_values,
-                                                   gpointer      invocation_hint,
-                                                   gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure     *closure,
-                                                    GValue       *return_value,
-                                                    gpointer      instance,
-                                                    va_list       args,
-                                                    gpointer      marshal_data,
-                                                    int           n_params,
-                                                    GType        *param_types);
-
-/* BOOL:FLAGS (./gmarshal.list:27) */
-extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
-extern void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure     *closure,
-                                                GValue       *return_value,
-                                                gpointer      instance,
-                                                va_list       args,
-                                                gpointer      marshal_data,
-                                                int           n_params,
-                                                GType        *param_types);
-#define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
-
-/* STRING:OBJECT,POINTER (./gmarshal.list:28) */
-extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-extern void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure     *closure,
-                                                        GValue       *return_value,
-                                                        gpointer      instance,
-                                                        va_list       args,
-                                                        gpointer      marshal_data,
-                                                        int           n_params,
-                                                        GType        *param_types);
-
-/* BOOL:BOXED,BOXED (./gmarshal.list:29) */
-extern void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
-                                                     GValue       *return_value,
-                                                     guint         n_param_values,
-                                                     const GValue *param_values,
-                                                     gpointer      invocation_hint,
-                                                     gpointer      marshal_data);
-extern void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure     *closure,
-                                                      GValue       *return_value,
-                                                      gpointer      instance,
-                                                      va_list       args,
-                                                      gpointer      marshal_data,
-                                                      int           n_params,
-                                                      GType        *param_types);
-#define g_cclosure_marshal_BOOL__BOXED_BOXED	g_cclosure_marshal_BOOLEAN__BOXED_BOXED
-
-G_END_DECLS
-
-#endif /* __G_MARSHAL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gobject.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gobject.h
deleted file mode 100644
index f63e4d16..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gobject.h
+++ /dev/null
@@ -1,610 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_OBJECT_H__
-#define __G_OBJECT_H__
-
-#include        <gobject/gtype.h>
-#include        <gobject/gvalue.h>
-#include        <gobject/gparam.h>
-#include        <gobject/gclosure.h>
-#include        <gobject/gsignal.h>
-#include        <gobject/gboxed.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_OBJECT:
- * @type: Type id to check
- * 
- * Check if the passed in type id is a %G_TYPE_OBJECT or derived from it.
- * 
- * Returns: %FALSE or %TRUE, indicating whether @type is a %G_TYPE_OBJECT.
- */
-#define G_TYPE_IS_OBJECT(type)      (G_TYPE_FUNDAMENTAL (type) == G_TYPE_OBJECT)
-/**
- * G_OBJECT:
- * @object: Object which is subject to casting.
- * 
- * Casts a #GObject or derived pointer into a (GObject*) pointer.
- * Depending on the current debugging level, this function may invoke
- * certain runtime checks to identify invalid casts.
- */
-#define G_OBJECT(object)            (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_OBJECT, GObject))
-/**
- * G_OBJECT_CLASS:
- * @class: a valid #GObjectClass
- * 
- * Casts a derived #GObjectClass structure into a #GObjectClass structure.
- */
-#define G_OBJECT_CLASS(class)       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_OBJECT, GObjectClass))
-/**
- * G_IS_OBJECT:
- * @object: Instance to check for being a %G_TYPE_OBJECT.
- * 
- * Checks whether a valid #GTypeInstance pointer is of type %G_TYPE_OBJECT.
- */
-#define G_IS_OBJECT(object)         (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_OBJECT))
-/**
- * G_IS_OBJECT_CLASS:
- * @class: a #GObjectClass
- * 
- * Checks whether @class "is a" valid #GObjectClass structure of type
- * %G_TYPE_OBJECT or derived.
- */
-#define G_IS_OBJECT_CLASS(class)    (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_OBJECT))
-/**
- * G_OBJECT_GET_CLASS:
- * @object: a #GObject instance.
- * 
- * Get the class structure associated to a #GObject instance.
- *
- * Returns: pointer to object class structure.
- */
-#define G_OBJECT_GET_CLASS(object)  (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_OBJECT, GObjectClass))
-/**
- * G_OBJECT_TYPE:
- * @object: Object to return the type id for.
- * 
- * Get the type id of an object.
- * 
- * Returns: Type id of @object.
- */
-#define G_OBJECT_TYPE(object)       (G_TYPE_FROM_INSTANCE (object))
-/**
- * G_OBJECT_TYPE_NAME:
- * @object: Object to return the type name for.
- * 
- * Get the name of an object's type.
- * 
- * Returns: Type name of @object. The string is owned by the type system and 
- *  should not be freed.
- */
-#define G_OBJECT_TYPE_NAME(object)  (g_type_name (G_OBJECT_TYPE (object)))
-/**
- * G_OBJECT_CLASS_TYPE:
- * @class: a valid #GObjectClass
- * 
- * Get the type id of a class structure.
- * 
- * Returns: Type id of @class.
- */
-#define G_OBJECT_CLASS_TYPE(class)  (G_TYPE_FROM_CLASS (class))
-/**
- * G_OBJECT_CLASS_NAME:
- * @class: a valid #GObjectClass
- * 
- * Return the name of a class structure's type.
- * 
- * Returns: Type name of @class. The string is owned by the type system and 
- *  should not be freed.
- */
-#define G_OBJECT_CLASS_NAME(class)  (g_type_name (G_OBJECT_CLASS_TYPE (class)))
-/**
- * G_VALUE_HOLDS_OBJECT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_OBJECT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_OBJECT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_OBJECT))
-
-/* --- type macros --- */
-/**
- * G_TYPE_INITIALLY_UNOWNED:
- * 
- * The type for #GInitiallyUnowned.
- */
-#define G_TYPE_INITIALLY_UNOWNED	      (g_initially_unowned_get_type())
-/**
- * G_INITIALLY_UNOWNED:
- * @object: Object which is subject to casting.
- * 
- * Casts a #GInitiallyUnowned or derived pointer into a (GInitiallyUnowned*) 
- * pointer. Depending on the current debugging level, this function may invoke
- * certain runtime checks to identify invalid casts.
- */
-#define G_INITIALLY_UNOWNED(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnowned))
-/**
- * G_INITIALLY_UNOWNED_CLASS:
- * @class: a valid #GInitiallyUnownedClass
- * 
- * Casts a derived #GInitiallyUnownedClass structure into a
- * #GInitiallyUnownedClass structure.
- */
-#define G_INITIALLY_UNOWNED_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
-/**
- * G_IS_INITIALLY_UNOWNED:
- * @object: Instance to check for being a %G_TYPE_INITIALLY_UNOWNED.
- * 
- * Checks whether a valid #GTypeInstance pointer is of type %G_TYPE_INITIALLY_UNOWNED.
- */
-#define G_IS_INITIALLY_UNOWNED(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_INITIALLY_UNOWNED))
-/**
- * G_IS_INITIALLY_UNOWNED_CLASS:
- * @class: a #GInitiallyUnownedClass
- * 
- * Checks whether @class "is a" valid #GInitiallyUnownedClass structure of type
- * %G_TYPE_INITIALLY_UNOWNED or derived.
- */
-#define G_IS_INITIALLY_UNOWNED_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_INITIALLY_UNOWNED))
-/**
- * G_INITIALLY_UNOWNED_GET_CLASS:
- * @object: a #GInitiallyUnowned instance.
- * 
- * Get the class structure associated to a #GInitiallyUnowned instance.
- *
- * Returns: pointer to object class structure.
- */
-#define G_INITIALLY_UNOWNED_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
-/* GInitiallyUnowned ia a GObject with initially floating reference count */
-
-
-/* --- typedefs & structures --- */
-typedef struct _GObject                  GObject;
-typedef struct _GObjectClass             GObjectClass;
-typedef struct _GObject                  GInitiallyUnowned;
-typedef struct _GObjectClass             GInitiallyUnownedClass;
-typedef struct _GObjectConstructParam    GObjectConstructParam;
-/**
- * GObjectGetPropertyFunc:
- * @object: a #GObject
- * @property_id: the numeric id under which the property was registered with
- *  g_object_class_install_property().
- * @value: a #GValue to return the property value in
- * @pspec: the #GParamSpec describing the property
- * 
- * The type of the @get_property function of #GObjectClass. 
- */
-typedef void (*GObjectGetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         GValue       *value,
-                                         GParamSpec   *pspec);
-/**
- * GObjectSetPropertyFunc:
- * @object: a #GObject
- * @property_id: the numeric id under which the property was registered with
- *  g_object_class_install_property().
- * @value: the new value for the property
- * @pspec: the #GParamSpec describing the property
- * 
- * The type of the @set_property function of #GObjectClass. 
- */
-typedef void (*GObjectSetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         const GValue *value,
-                                         GParamSpec   *pspec);
-/**
- * GObjectFinalizeFunc:
- * @object: the #GObject being finalized
- * 
- * The type of the @finalize function of #GObjectClass.
- */
-typedef void (*GObjectFinalizeFunc)     (GObject      *object);
-/**
- * GWeakNotify:
- * @data: data that was provided when the weak reference was established
- * @where_the_object_was: the object being finalized
- * 
- * A #GWeakNotify function can be added to an object as a callback that gets
- * triggered when the object is finalized. Since the object is already being
- * finalized when the #GWeakNotify is called, there's not much you could do 
- * with the object, apart from e.g. using its address as hash-index or the like. 
- */
-typedef void (*GWeakNotify)		(gpointer      data,
-					 GObject      *where_the_object_was);
-/**
- * GObject:
- * 
- * All the fields in the <structname>GObject</structname> structure are private 
- * to the #GObject implementation and should never be accessed directly.
- */
-struct  _GObject
-{
-  GTypeInstance  g_type_instance;
-  
-  /*< private >*/
-  volatile guint ref_count;
-  GData         *qdata;
-};
-/**
- * GObjectClass:
- * @g_type_class: the parent class
- * @constructor: the @constructor function is called by g_object_new () to 
- *  complete the object initialization after all the construction properties are
- *  set. The first thing a @constructor implementation must do is chain up to the
- *  @constructor of the parent class. Overriding @constructor should be rarely 
- *  needed, e.g. to handle construct properties, or to implement singletons.
- * @set_property: the generic setter for all properties of this type. Should be
- *  overridden for every type with properties. Implementations of @set_property
- *  don't need to emit property change notification explicitly, this is handled
- *  by the type system.
- * @get_property: the generic getter for all properties of this type. Should be
- *  overridden for every type with properties.
- * @dispose: the @dispose function is supposed to drop all references to other 
- *  objects, but keep the instance otherwise intact, so that client method 
- *  invocations still work. It may be run multiple times (due to reference 
- *  loops). Before returning, @dispose should chain up to the @dispose method 
- *  of the parent class.
- * @finalize: instance finalization function, should finish the finalization of 
- *  the instance begun in @dispose and chain up to the @finalize method of the 
- *  parent class.
- * @dispatch_properties_changed: emits property change notification for a bunch
- *  of properties. Overriding @dispatch_properties_changed should be rarely 
- *  needed.
- * @notify: the class closure for the notify signal
- * @constructed: the @constructed function is called by g_object_new() as the
- *  final step of the object creation process.  At the point of the call, all
- *  construction properties have been set on the object.  The purpose of this
- *  call is to allow for object initialisation steps that can only be performed
- *  after construction properties have been set.  @constructed implementors
- *  should chain up to the @constructed call of their parent class to allow it
- *  to complete its initialisation.
- * 
- * The class structure for the <structname>GObject</structname> type.
- * 
- * <example>
- * <title>Implementing singletons using a constructor</title>
- * <programlisting>
- * static MySingleton *the_singleton = NULL;
- * 
- * static GObject*
- * my_singleton_constructor (GType                  type,
- *                           guint                  n_construct_params,
- *                           GObjectConstructParam *construct_params)
- * {
- *   GObject *object;
- *   
- *   if (!the_singleton)
- *     {
- *       object = G_OBJECT_CLASS (parent_class)->constructor (type,
- *                                                            n_construct_params,
- *                                                            construct_params);
- *       the_singleton = MY_SINGLETON (object);
- *     }
- *   else
- *     object = g_object_ref (G_OBJECT (the_singleton));
- * 
- *   return object;
- * }
- * </programlisting></example>
- */
-struct  _GObjectClass
-{
-  GTypeClass   g_type_class;
-
-  /*< private >*/
-  GSList      *construct_properties;
-
-  /*< public >*/
-  /* seldom overidden */
-  GObject*   (*constructor)     (GType                  type,
-                                 guint                  n_construct_properties,
-                                 GObjectConstructParam *construct_properties);
-  /* overridable methods */
-  void       (*set_property)		(GObject        *object,
-                                         guint           property_id,
-                                         const GValue   *value,
-                                         GParamSpec     *pspec);
-  void       (*get_property)		(GObject        *object,
-                                         guint           property_id,
-                                         GValue         *value,
-                                         GParamSpec     *pspec);
-  void       (*dispose)			(GObject        *object);
-  void       (*finalize)		(GObject        *object);
-  /* seldom overidden */
-  void       (*dispatch_properties_changed) (GObject      *object,
-					     guint	   n_pspecs,
-					     GParamSpec  **pspecs);
-  /* signals */
-  void	     (*notify)			(GObject	*object,
-					 GParamSpec	*pspec);
-
-  /* called when done constructing */
-  void	     (*constructed)		(GObject	*object);
-
-  /*< private >*/
-  gsize		flags;
-
-  /* padding */
-  gpointer	pdummy[6];
-};
-/**
- * GObjectConstructParam:
- * @pspec: the #GParamSpec of the construct parameter
- * @value: the value to set the parameter to
- * 
- * The <structname>GObjectConstructParam</structname> struct is an auxiliary 
- * structure used to hand #GParamSpec/#GValue pairs to the @constructor of
- * a #GObjectClass.
- */
-struct _GObjectConstructParam
-{
-  GParamSpec *pspec;
-  GValue     *value;
-};
-
-/**
- * GInitiallyUnowned:
- * 
- * All the fields in the <structname>GInitiallyUnowned</structname> structure 
- * are private to the #GInitiallyUnowned implementation and should never be 
- * accessed directly.
- */
-/**
- * GInitiallyUnownedClass:
- * 
- * The class structure for the <structname>GInitiallyUnowned</structname> type.
- */
-
-
-/* --- prototypes --- */
-GType       g_initially_unowned_get_type      (void);
-void        g_object_class_install_property   (GObjectClass   *oclass,
-					       guint           property_id,
-					       GParamSpec     *pspec);
-GParamSpec* g_object_class_find_property      (GObjectClass   *oclass,
-					       const gchar    *property_name);
-GParamSpec**g_object_class_list_properties    (GObjectClass   *oclass,
-					       guint	      *n_properties);
-void        g_object_class_override_property  (GObjectClass   *oclass,
-					       guint           property_id,
-					       const gchar    *name);
-void        g_object_class_install_properties (GObjectClass   *oclass,
-                                               guint           n_pspecs,
-                                               GParamSpec    **pspecs);
-
-void        g_object_interface_install_property (gpointer     g_iface,
-						 GParamSpec  *pspec);
-GParamSpec* g_object_interface_find_property    (gpointer     g_iface,
-						 const gchar *property_name);
-GParamSpec**g_object_interface_list_properties  (gpointer     g_iface,
-						 guint       *n_properties_p);
-
-GType       g_object_get_type                 (void) G_GNUC_CONST;
-gpointer    g_object_new                      (GType           object_type,
-					       const gchar    *first_property_name,
-					       ...);
-gpointer    g_object_newv		      (GType           object_type,
-					       guint	       n_parameters,
-					       GParameter     *parameters);
-GObject*    g_object_new_valist               (GType           object_type,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void	    g_object_set                      (gpointer	       object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-void        g_object_get                      (gpointer        object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-gpointer    g_object_connect                  (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-void	    g_object_disconnect               (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-void        g_object_set_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_get_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_set_property             (GObject        *object,
-					       const gchar    *property_name,
-					       const GValue   *value);
-void        g_object_get_property             (GObject        *object,
-					       const gchar    *property_name,
-					       GValue         *value);
-void        g_object_freeze_notify            (GObject        *object);
-void        g_object_notify                   (GObject        *object,
-					       const gchar    *property_name);
-void        g_object_notify_by_pspec          (GObject        *object,
-					       GParamSpec     *pspec);
-void        g_object_thaw_notify              (GObject        *object);
-gboolean    g_object_is_floating    	      (gpointer        object);
-gpointer    g_object_ref_sink       	      (gpointer	       object);
-gpointer    g_object_ref                      (gpointer        object);
-void        g_object_unref                    (gpointer        object);
-void	    g_object_weak_ref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-void	    g_object_weak_unref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-void        g_object_add_weak_pointer         (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-void        g_object_remove_weak_pointer      (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-
-/**
- * GToggleNotify:
- * @data: Callback data passed to g_object_add_toggle_ref()
- * @object: The object on which g_object_add_toggle_ref() was called.
- * @is_last_ref: %TRUE if the toggle reference is now the
- *  last reference to the object. %FALSE if the toggle
- *  reference was the last reference and there are now other
- *  references.
- * 
- * A callback function used for notification when the state
- * of a toggle reference changes. See g_object_add_toggle_ref().
- */
-typedef void (*GToggleNotify) (gpointer      data,
-			       GObject      *object,
-			       gboolean      is_last_ref);
-
-void g_object_add_toggle_ref    (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-void g_object_remove_toggle_ref (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-
-gpointer    g_object_get_qdata                (GObject        *object,
-					       GQuark          quark);
-void        g_object_set_qdata                (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data);
-void        g_object_set_qdata_full           (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_qdata              (GObject        *object,
-					       GQuark          quark);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer    g_object_dup_qdata                (GObject        *object,
-                                               GQuark          quark,
-                                               GDuplicateFunc  dup_func,
-					       gpointer         user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_object_replace_qdata            (GObject        *object,
-                                               GQuark          quark,
-                                               gpointer        oldval,
-                                               gpointer        newval,
-                                               GDestroyNotify  destroy,
-					       GDestroyNotify *old_destroy);
-
-gpointer    g_object_get_data                 (GObject        *object,
-					       const gchar    *key);
-void        g_object_set_data                 (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data);
-void        g_object_set_data_full            (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_data               (GObject        *object,
-					       const gchar    *key);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer    g_object_dup_data                 (GObject        *object,
-                                               const gchar    *key,
-                                               GDuplicateFunc  dup_func,
-					       gpointer         user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_object_replace_data             (GObject        *object,
-                                               const gchar    *key,
-                                               gpointer        oldval,
-                                               gpointer        newval,
-                                               GDestroyNotify  destroy,
-					       GDestroyNotify *old_destroy);
-
-
-void        g_object_watch_closure            (GObject        *object,
-					       GClosure       *closure);
-GClosure*   g_cclosure_new_object             (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_cclosure_new_object_swap        (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_closure_new_object              (guint           sizeof_closure,
-					       GObject        *object);
-void        g_value_set_object                (GValue         *value,
-					       gpointer        v_object);
-gpointer    g_value_get_object                (const GValue   *value);
-gpointer    g_value_dup_object                (const GValue   *value);
-gulong	    g_signal_connect_object           (gpointer	       instance,
-					       const gchar    *detailed_signal,
-					       GCallback       c_handler,
-					       gpointer	       gobject,
-					       GConnectFlags   connect_flags);
-
-/*< protected >*/
-void        g_object_force_floating           (GObject        *object);
-void        g_object_run_dispose	      (GObject	      *object);
-
-
-void        g_value_take_object               (GValue         *value,
-					       gpointer        v_object);
-GLIB_DEPRECATED_FOR(g_value_take_object)
-void        g_value_set_object_take_ownership (GValue         *value,
-                                               gpointer        v_object);
-
-GLIB_DEPRECATED
-gsize	    g_object_compat_control	      (gsize	       what,
-					       gpointer	       data);
-
-/* --- implementation macros --- */
-#define G_OBJECT_WARN_INVALID_PSPEC(object, pname, property_id, pspec) \
-G_STMT_START { \
-  GObject *_object = (GObject*) (object); \
-  GParamSpec *_pspec = (GParamSpec*) (pspec); \
-  guint _property_id = (property_id); \
-  g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
-             G_STRLOC, \
-             (pname), \
-             _property_id, \
-             _pspec->name, \
-             g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
-             G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
-/**
- * G_OBJECT_WARN_INVALID_PROPERTY_ID:
- * @object: the #GObject on which set_property() or get_property() was called
- * @property_id: the numeric id of the property
- * @pspec: the #GParamSpec of the property
- * 
- * This macro should be used to emit a standard warning about unexpected 
- * properties in set_property() and get_property() implementations.
- */
-#define G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec) \
-    G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
-
-void    g_clear_object (volatile GObject **object_ptr);
-#define g_clear_object(object_ptr) g_clear_pointer ((object_ptr), g_object_unref)
-
-typedef struct {
-    /*<private>*/
-    union { gpointer p; } priv;
-} GWeakRef;
-
-void     g_weak_ref_init       (GWeakRef *weak_ref,
-                                gpointer  object);
-void     g_weak_ref_clear      (GWeakRef *weak_ref);
-gpointer g_weak_ref_get        (GWeakRef *weak_ref);
-void     g_weak_ref_set        (GWeakRef *weak_ref,
-                                gpointer  object);
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gobjectnotifyqueue.c b/GstreamerHelper/x64/include/glib-2.0/gobject/gobjectnotifyqueue.c
deleted file mode 100644
index cfe01ba0..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gobjectnotifyqueue.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* WARNING:
- *
- *    This file is INSTALLED and other projects (outside of glib)
- *    #include its contents.
- */
-
-#ifndef __G_OBJECT_NOTIFY_QUEUE_H__
-#define __G_OBJECT_NOTIFY_QUEUE_H__
-
-#include <string.h> /* memset */
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GObjectNotifyContext          GObjectNotifyContext;
-typedef struct _GObjectNotifyQueue            GObjectNotifyQueue;
-typedef void (*GObjectNotifyQueueDispatcher) (GObject     *object,
-					      guint        n_pspecs,
-					      GParamSpec **pspecs);
-
-
-/* --- structures --- */
-struct _GObjectNotifyContext
-{
-  GQuark                       quark_notify_queue;
-  GObjectNotifyQueueDispatcher dispatcher;
-  GTrashStack                 *_nqueue_trash; /* unused */
-};
-struct _GObjectNotifyQueue
-{
-  GObjectNotifyContext *context;
-  GSList               *pspecs;
-  guint16               n_pspecs;
-  guint16               freeze_count;
-};
-
-G_LOCK_DEFINE_STATIC(notify_lock);
-
-/* --- functions --- */
-static void
-g_object_notify_queue_free (gpointer data)
-{
-  GObjectNotifyQueue *nqueue = data;
-
-  g_slist_free (nqueue->pspecs);
-  g_slice_free (GObjectNotifyQueue, nqueue);
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_freeze (GObject		   *object,
-			      GObjectNotifyContext *context)
-{
-  GObjectNotifyQueue *nqueue;
-
-  G_LOCK(notify_lock);
-  nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-  if (!nqueue)
-    {
-      nqueue = g_slice_new0 (GObjectNotifyQueue);
-      nqueue->context = context;
-      g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
-				   nqueue, g_object_notify_queue_free);
-    }
-
-  if (nqueue->freeze_count >= 65535)
-    g_critical("Free queue for %s (%p) is larger than 65535,"
-               " called g_object_freeze_notify() too often."
-               " Forgot to call g_object_thaw_notify() or infinite loop",
-               G_OBJECT_TYPE_NAME (object), object);
-  else
-    nqueue->freeze_count++;
-  G_UNLOCK(notify_lock);
-
-  return nqueue;
-}
-
-static inline void
-g_object_notify_queue_thaw (GObject            *object,
-			    GObjectNotifyQueue *nqueue)
-{
-  GObjectNotifyContext *context = nqueue->context;
-  GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL;
-  GSList *slist;
-  guint n_pspecs = 0;
-
-  g_return_if_fail (nqueue->freeze_count > 0);
-  g_return_if_fail (g_atomic_int_get(&object->ref_count) > 0);
-
-  G_LOCK(notify_lock);
-
-  /* Just make sure we never get into some nasty race condition */
-  if (G_UNLIKELY(nqueue->freeze_count == 0)) {
-    G_UNLOCK(notify_lock);
-    g_warning ("%s: property-changed notification for %s(%p) is not frozen",
-	       G_STRFUNC, G_OBJECT_TYPE_NAME (object), object);
-    return;
-  }
-
-  nqueue->freeze_count--;
-  if (nqueue->freeze_count) {
-    G_UNLOCK(notify_lock);
-    return;
-  }
-
-  pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem;
-
-  for (slist = nqueue->pspecs; slist; slist = slist->next)
-    {
-      pspecs[n_pspecs++] = slist->data;
-    }
-  g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
-
-  G_UNLOCK(notify_lock);
-
-  if (n_pspecs)
-    context->dispatcher (object, n_pspecs, pspecs);
-  g_free (free_me);
-}
-
-static inline void
-g_object_notify_queue_clear (GObject            *object,
-			     GObjectNotifyQueue *nqueue)
-{
-  g_return_if_fail (nqueue->freeze_count > 0);
-
-  G_LOCK(notify_lock);
-
-  g_slist_free (nqueue->pspecs);
-  nqueue->pspecs = NULL;
-  nqueue->n_pspecs = 0;
-
-  G_UNLOCK(notify_lock);
-}
-
-static inline void
-g_object_notify_queue_add (GObject            *object,
-			   GObjectNotifyQueue *nqueue,
-			   GParamSpec	      *pspec)
-{
-  if (pspec->flags & G_PARAM_READABLE)
-    {
-      GParamSpec *redirect;
-
-      G_LOCK(notify_lock);
-
-      g_return_if_fail (nqueue->n_pspecs < 65535);
-
-      redirect = g_param_spec_get_redirect_target (pspec);
-      if (redirect)
-	pspec = redirect;
-	    
-      /* we do the deduping in _thaw */
-      if (g_slist_find (nqueue->pspecs, pspec) == NULL)
-        {
-          nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
-          nqueue->n_pspecs++;
-        }
-
-      G_UNLOCK(notify_lock);
-    }
-}
-
-/* NB: This function is not threadsafe, do not ever use it if
- * you need a threadsafe notify queue.
- * Use g_object_notify_queue_freeze() to acquire the queue and
- * g_object_notify_queue_thaw() after you are done instead.
- */
-static inline GObjectNotifyQueue*
-g_object_notify_queue_from_object (GObject              *object,
-                                   GObjectNotifyContext *context)
-{
-  return g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-}
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_NOTIFY_QUEUE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gparam.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gparam.h
deleted file mode 100644
index 84b3c445..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gparam.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gparam.h: GParamSpec base class implementation
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_PARAM_H__
-#define __G_PARAM_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-/**
- * G_TYPE_IS_PARAM:
- * @type: a #GType ID
- * 
- * Checks whether @type "is a" %G_TYPE_PARAM.
- */
-#define G_TYPE_IS_PARAM(type)		(G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM)
-/**
- * G_PARAM_SPEC:
- * @pspec: a valid #GParamSpec
- * 
- * Casts a derived #GParamSpec object (e.g. of type #GParamSpecInt) into
- * a #GParamSpec object.
- */
-#define G_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec))
-/**
- * G_IS_PARAM_SPEC:
- * @pspec: a #GParamSpec
- * 
- * Checks whether @pspec "is a" valid #GParamSpec structure of type %G_TYPE_PARAM
- * or derived.
- */
-#define G_IS_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM))
-/**
- * G_PARAM_SPEC_CLASS:
- * @pclass: a valid #GParamSpecClass
- * 
- * Casts a derived #GParamSpecClass structure into a #GParamSpecClass structure.
- */
-#define G_PARAM_SPEC_CLASS(pclass)      (G_TYPE_CHECK_CLASS_CAST ((pclass), G_TYPE_PARAM, GParamSpecClass))
-/**
- * G_IS_PARAM_SPEC_CLASS:
- * @pclass: a #GParamSpecClass
- * 
- * Checks whether @pclass "is a" valid #GParamSpecClass structure of type 
- * %G_TYPE_PARAM or derived.
- */
-#define G_IS_PARAM_SPEC_CLASS(pclass)   (G_TYPE_CHECK_CLASS_TYPE ((pclass), G_TYPE_PARAM))
-/**
- * G_PARAM_SPEC_GET_CLASS:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GParamSpecClass of a #GParamSpec.
- */
-#define G_PARAM_SPEC_GET_CLASS(pspec)	(G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass))
-
-
-/* --- convenience macros --- */
-/**
- * G_PARAM_SPEC_TYPE:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType of this @pspec.
- */
-#define G_PARAM_SPEC_TYPE(pspec)	(G_TYPE_FROM_INSTANCE (pspec))
-/**
- * G_PARAM_SPEC_TYPE_NAME:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType name of this @pspec.
- */
-#define G_PARAM_SPEC_TYPE_NAME(pspec)	(g_type_name (G_PARAM_SPEC_TYPE (pspec)))
-/**
- * G_PARAM_SPEC_VALUE_TYPE:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType to initialize a #GValue for this parameter.
- */
-#define	G_PARAM_SPEC_VALUE_TYPE(pspec)	(G_PARAM_SPEC (pspec)->value_type)
-/**
- * G_VALUE_HOLDS_PARAM:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_PARAM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_PARAM(value)	(G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_PARAM))
-       
-
-/* --- flags --- */
-/**
- * GParamFlags:
- * @G_PARAM_READABLE: the parameter is readable
- * @G_PARAM_WRITABLE: the parameter is writable
- * @G_PARAM_CONSTRUCT: the parameter will be set upon object construction
- * @G_PARAM_CONSTRUCT_ONLY: the parameter will only be set upon object construction
- * @G_PARAM_LAX_VALIDATION: upon parameter conversion (see g_param_value_convert())
- *  strict validation is not required
- * @G_PARAM_STATIC_NAME: the string used as name when constructing the 
- *  parameter is guaranteed to remain valid and
- *  unmodified for the lifetime of the parameter. 
- *  Since 2.8
- * @G_PARAM_STATIC_NICK: the string used as nick when constructing the
- *  parameter is guaranteed to remain valid and
- *  unmmodified for the lifetime of the parameter.
- *  Since 2.8
- * @G_PARAM_STATIC_BLURB: the string used as blurb when constructing the 
- *  parameter is guaranteed to remain valid and 
- *  unmodified for the lifetime of the parameter. 
- *  Since 2.8
- * @G_PARAM_PRIVATE: internal
- * @G_PARAM_DEPRECATED: the parameter is deprecated and will be removed
- *  in a future version. A warning will be generated if it is used
- *  while running with G_ENABLE_DIAGNOSTIC=1.
- *  Since 2.26
- * 
- * Through the #GParamFlags flag values, certain aspects of parameters
- * can be configured.
- */
-typedef enum
-{
-  G_PARAM_READABLE            = 1 << 0,
-  G_PARAM_WRITABLE            = 1 << 1,
-  G_PARAM_CONSTRUCT	      = 1 << 2,
-  G_PARAM_CONSTRUCT_ONLY      = 1 << 3,
-  G_PARAM_LAX_VALIDATION      = 1 << 4,
-  G_PARAM_STATIC_NAME	      = 1 << 5,
-#ifndef G_DISABLE_DEPRECATED
-  G_PARAM_PRIVATE	      = G_PARAM_STATIC_NAME,
-#endif
-  G_PARAM_STATIC_NICK	      = 1 << 6,
-  G_PARAM_STATIC_BLURB	      = 1 << 7,
-  /* User defined flags go up to 30 */
-  G_PARAM_DEPRECATED          = 1 << 31
-} GParamFlags;
-/**
- * G_PARAM_READWRITE:
- * 
- * #GParamFlags value alias for %G_PARAM_READABLE | %G_PARAM_WRITABLE.
- */
-#define	G_PARAM_READWRITE	(G_PARAM_READABLE | G_PARAM_WRITABLE)
-/**
- * G_PARAM_STATIC_STRINGS:
- * 
- * #GParamFlags value alias for %G_PARAM_STATIC_NAME | %G_PARAM_STATIC_NICK | %G_PARAM_STATIC_BLURB.
- * 
- * Since 2.13.0
- */
-#define	G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
-/* bits in the range 0xffffff00 are reserved for 3rd party usage */
-/**
- * G_PARAM_MASK:
- * 
- * Mask containing the bits of #GParamSpec.flags which are reserved for GLib.
- */
-#define	G_PARAM_MASK		(0x000000ff)
-/**
- * G_PARAM_USER_SHIFT:
- * 
- * Minimum shift count to be used for user defined flags, to be stored in
- * #GParamSpec.flags. The maximum allowed is 30 + G_PARAM_USER_SHIFT.
- */
-#define	G_PARAM_USER_SHIFT	(8)
-
-/* --- typedefs & structures --- */
-typedef struct _GParamSpec      GParamSpec;
-typedef struct _GParamSpecClass GParamSpecClass;
-typedef struct _GParameter	GParameter;
-typedef struct _GParamSpecPool  GParamSpecPool;
-/**
- * GParamSpec:
- * @g_type_instance: private #GTypeInstance portion
- * @name: name of this parameter: always an interned string
- * @flags: #GParamFlags flags for this parameter
- * @value_type: the #GValue type for this parameter
- * @owner_type: #GType type that uses (introduces) this parameter
- * 
- * All other fields of the <structname>GParamSpec</structname> struct are private and
- * should not be used directly.
- */
-struct _GParamSpec
-{
-  GTypeInstance  g_type_instance;
-
-  const gchar   *name;          /* interned string */
-  GParamFlags    flags;
-  GType		 value_type;
-  GType		 owner_type;	/* class or interface using this property */
-
-  /*< private >*/
-  gchar         *_nick;
-  gchar         *_blurb;
-  GData		*qdata;
-  guint          ref_count;
-  guint		 param_id;	/* sort-criteria */
-};
-/**
- * GParamSpecClass:
- * @g_type_class: the parent class
- * @value_type: the #GValue type for this parameter
- * @finalize: The instance finalization function (optional), should chain 
- *  up to the finalize method of the parent class.
- * @value_set_default: Resets a @value to the default value for this type
- *  (recommended, the default is g_value_reset()), see 
- *  g_param_value_set_default().
- * @value_validate: Ensures that the contents of @value comply with the 
- *  specifications set out by this type (optional), see 
- *  g_param_value_validate().
- * @values_cmp: Compares @value1 with @value2 according to this type
- *  (recommended, the default is memcmp()), see g_param_values_cmp().
- * 
- * The class structure for the <structname>GParamSpec</structname> type.
- * Normally, <structname>GParamSpec</structname> classes are filled by
- * g_param_type_register_static().
- */
-struct _GParamSpecClass
-{
-  GTypeClass      g_type_class;
-
-  GType		  value_type;
-
-  void	        (*finalize)		(GParamSpec   *pspec);
-
-  /* GParam methods */
-  void          (*value_set_default)    (GParamSpec   *pspec,
-					 GValue       *value);
-  gboolean      (*value_validate)       (GParamSpec   *pspec,
-					 GValue       *value);
-  gint          (*values_cmp)           (GParamSpec   *pspec,
-					 const GValue *value1,
-					 const GValue *value2);
-  /*< private >*/
-  gpointer	  dummy[4];
-};
-/**
- * GParameter:
- * @name: the parameter name
- * @value: the parameter value
- * 
- * The <structname>GParameter</structname> struct is an auxiliary structure used
- * to hand parameter name/value pairs to g_object_newv().
- */
-struct _GParameter /* auxiliary structure for _setv() variants */
-{
-  const gchar *name;
-  GValue       value;
-};
-
-
-/* --- prototypes --- */
-GParamSpec*	g_param_spec_ref		(GParamSpec    *pspec);
-void		g_param_spec_unref		(GParamSpec    *pspec);
-void		g_param_spec_sink		(GParamSpec    *pspec);
-GParamSpec*	g_param_spec_ref_sink   	(GParamSpec    *pspec);
-gpointer        g_param_spec_get_qdata		(GParamSpec    *pspec,
-						 GQuark         quark);
-void            g_param_spec_set_qdata		(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data);
-void            g_param_spec_set_qdata_full	(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data,
-						 GDestroyNotify destroy);
-gpointer        g_param_spec_steal_qdata	(GParamSpec    *pspec,
-						 GQuark         quark);
-GParamSpec*     g_param_spec_get_redirect_target (GParamSpec   *pspec);
-
-void		g_param_value_set_default	(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_defaults		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_validate		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_convert		(GParamSpec    *pspec,
-						 const GValue  *src_value,
-						 GValue	       *dest_value,
-						 gboolean	strict_validation);
-gint		g_param_values_cmp		(GParamSpec    *pspec,
-						 const GValue  *value1,
-						 const GValue  *value2);
-const gchar *   g_param_spec_get_name           (GParamSpec    *pspec);
-const gchar *   g_param_spec_get_nick           (GParamSpec    *pspec);
-const gchar *   g_param_spec_get_blurb          (GParamSpec    *pspec);
-void            g_value_set_param               (GValue	       *value,
-						 GParamSpec    *param);
-GParamSpec*     g_value_get_param               (const GValue  *value);
-GParamSpec*     g_value_dup_param               (const GValue  *value);
-
-
-void           g_value_take_param               (GValue        *value,
-					         GParamSpec    *param);
-GLIB_DEPRECATED_FOR(g_value_take_param)
-void           g_value_set_param_take_ownership (GValue        *value,
-                                                 GParamSpec    *param);
-
-/* --- convenience functions --- */
-typedef struct _GParamSpecTypeInfo GParamSpecTypeInfo;
-/**
- * GParamSpecTypeInfo:
- * @instance_size: Size of the instance (object) structure.
- * @n_preallocs: Prior to GLib 2.10, it specified the number of pre-allocated (cached) instances to reserve memory for (0 indicates no caching). Since GLib 2.10, it is ignored, since instances are allocated with the <link linkend="glib-Memory-Slices">slice allocator</link> now.
- * @instance_init: Location of the instance initialization function (optional).
- * @value_type: The #GType of values conforming to this #GParamSpec
- * @finalize: The instance finalization function (optional).
- * @value_set_default: Resets a @value to the default value for @pspec 
- *  (recommended, the default is g_value_reset()), see 
- *  g_param_value_set_default().
- * @value_validate: Ensures that the contents of @value comply with the 
- *  specifications set out by @pspec (optional), see 
- *  g_param_value_validate().
- * @values_cmp: Compares @value1 with @value2 according to @pspec 
- *  (recommended, the default is memcmp()), see g_param_values_cmp().
- * 
- * This structure is used to provide the type system with the information
- * required to initialize and destruct (finalize) a parameter's class and
- * instances thereof.
- * The initialized structure is passed to the g_param_type_register_static() 
- * The type system will perform a deep copy of this structure, so its memory 
- * does not need to be persistent across invocation of 
- * g_param_type_register_static().
- */
-struct _GParamSpecTypeInfo
-{
-  /* type system portion */
-  guint16         instance_size;                               /* obligatory */
-  guint16         n_preallocs;                                 /* optional */
-  void		(*instance_init)	(GParamSpec   *pspec); /* optional */
-
-  /* class portion */
-  GType           value_type;				       /* obligatory */
-  void          (*finalize)             (GParamSpec   *pspec); /* optional */
-  void          (*value_set_default)    (GParamSpec   *pspec,  /* recommended */
-					 GValue       *value);
-  gboolean      (*value_validate)       (GParamSpec   *pspec,  /* optional */
-					 GValue       *value);
-  gint          (*values_cmp)           (GParamSpec   *pspec,  /* recommended */
-					 const GValue *value1,
-					 const GValue *value2);
-};
-GType	g_param_type_register_static	(const gchar		  *name,
-					 const GParamSpecTypeInfo *pspec_info);
-
-/* For registering builting types */
-GType  _g_param_type_register_static_constant (const gchar              *name,
-					       const GParamSpecTypeInfo *pspec_info,
-					       GType                     opt_type);
-
-
-/* --- protected --- */
-gpointer	g_param_spec_internal		(GType	        param_type,
-						 const gchar   *name,
-						 const gchar   *nick,
-						 const gchar   *blurb,
-						 GParamFlags    flags);
-GParamSpecPool* g_param_spec_pool_new		(gboolean	type_prefixing);
-void		g_param_spec_pool_insert	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec,
-						 GType		 owner_type);
-void		g_param_spec_pool_remove	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec);
-GParamSpec*	g_param_spec_pool_lookup	(GParamSpecPool	*pool,
-						 const gchar	*param_name,
-						 GType		 owner_type,
-						 gboolean	 walk_ancestors);
-GList*		g_param_spec_pool_list_owned	(GParamSpecPool	*pool,
-						 GType		 owner_type);
-GParamSpec**	g_param_spec_pool_list		(GParamSpecPool	*pool,
-						 GType		 owner_type,
-						 guint		*n_pspecs_p);
-
-
-
-/* contracts:
- *
- * gboolean value_validate (GParamSpec *pspec,
- *                          GValue     *value):
- *	modify value contents in the least destructive way, so
- *	that it complies with pspec's requirements (i.e.
- *	according to minimum/maximum ranges etc...). return
- *	whether modification was necessary.
- *
- * gint values_cmp (GParamSpec   *pspec,
- *                  const GValue *value1,
- *                  const GValue *value2):
- *	return value1 - value2, i.e. (-1) if value1 < value2,
- *	(+1) if value1 > value2, and (0) otherwise (equality)
- */
-
-G_END_DECLS
-
-#endif /* __G_PARAM_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gparamspecs.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gparamspecs.h
deleted file mode 100644
index 3e0ff6e3..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gparamspecs.h
+++ /dev/null
@@ -1,1143 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gparamspecs.h: GLib default param specs
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_PARAMSPECS_H__
-#define __G_PARAMSPECS_H__
-
-#include        <gobject/gvalue.h>
-#include        <gobject/genums.h>
-#include        <gobject/gboxed.h>
-#include        <gobject/gobject.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_PARAM_CHAR:
- * 
- * The #GType of #GParamSpecChar.
- */
-#define	G_TYPE_PARAM_CHAR		   (g_param_spec_types[0])
-/**
- * G_IS_PARAM_SPEC_CHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_CHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_CHAR(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_CHAR))
-/**
- * G_PARAM_SPEC_CHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecChar.
- */
-#define G_PARAM_SPEC_CHAR(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_CHAR, GParamSpecChar))
-
-/**
- * G_TYPE_PARAM_UCHAR:
- * 
- * The #GType of #GParamSpecUChar.
- */
-#define	G_TYPE_PARAM_UCHAR		   (g_param_spec_types[1])
-/**
- * G_IS_PARAM_SPEC_UCHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UCHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UCHAR(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UCHAR))
-/**
- * G_PARAM_SPEC_UCHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUChar.
- */
-#define G_PARAM_SPEC_UCHAR(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UCHAR, GParamSpecUChar))
-
-/**
- * G_TYPE_PARAM_BOOLEAN:
- * 
- * The #GType of #GParamSpecBoolean.
- */
-#define	G_TYPE_PARAM_BOOLEAN		   (g_param_spec_types[2])
-/**
- * G_IS_PARAM_SPEC_BOOLEAN:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_BOOLEAN.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_BOOLEAN(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOOLEAN))
-/**
- * G_PARAM_SPEC_BOOLEAN:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecBoolean.
- */
-#define G_PARAM_SPEC_BOOLEAN(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOOLEAN, GParamSpecBoolean))
-
-/**
- * G_TYPE_PARAM_INT:
- * 
- * The #GType of #GParamSpecInt.
- */
-#define	G_TYPE_PARAM_INT		   (g_param_spec_types[3])
-/**
- * G_IS_PARAM_SPEC_INT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_INT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_INT(pspec)         (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT))
-/**
- * G_PARAM_SPEC_INT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecInt.
- */
-#define G_PARAM_SPEC_INT(pspec)            (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT, GParamSpecInt))
-
-/**
- * G_TYPE_PARAM_UINT:
- * 
- * The #GType of #GParamSpecUInt.
- */
-#define	G_TYPE_PARAM_UINT		   (g_param_spec_types[4])
-/**
- * G_IS_PARAM_SPEC_UINT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UINT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UINT(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT))
-/**
- * G_PARAM_SPEC_UINT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUInt.
- */
-#define G_PARAM_SPEC_UINT(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT, GParamSpecUInt))
-
-/**
- * G_TYPE_PARAM_LONG:
- * 
- * The #GType of #GParamSpecLong.
- */
-#define	G_TYPE_PARAM_LONG		   (g_param_spec_types[5])
-/**
- * G_IS_PARAM_SPEC_LONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_LONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_LONG(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_LONG))
-/**
- * G_PARAM_SPEC_LONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecLong.
- */
-#define G_PARAM_SPEC_LONG(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_LONG, GParamSpecLong))
-
-/**
- * G_TYPE_PARAM_ULONG:
- * 
- * The #GType of #GParamSpecULong.
- */
-#define	G_TYPE_PARAM_ULONG		   (g_param_spec_types[6])
-/**
- * G_IS_PARAM_SPEC_ULONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_ULONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_ULONG(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ULONG))
-/**
- * G_PARAM_SPEC_ULONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecULong.
- */
-#define G_PARAM_SPEC_ULONG(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ULONG, GParamSpecULong))
-
-/**
- * G_TYPE_PARAM_INT64:
- * 
- * The #GType of #GParamSpecInt64.
- */
-#define	G_TYPE_PARAM_INT64		   (g_param_spec_types[7])
-/**
- * G_IS_PARAM_SPEC_INT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_INT64.
- *
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_INT64(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT64))
-/**
- * G_PARAM_SPEC_INT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecInt64.
- */
-#define G_PARAM_SPEC_INT64(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT64, GParamSpecInt64))
-
-/**
- * G_TYPE_PARAM_UINT64:
- * 
- * The #GType of #GParamSpecUInt64.
- */
-#define	G_TYPE_PARAM_UINT64		   (g_param_spec_types[8])
-/**
- * G_IS_PARAM_SPEC_UINT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UINT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UINT64(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT64))
-/**
- * G_PARAM_SPEC_UINT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUInt64.
- */
-#define G_PARAM_SPEC_UINT64(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT64, GParamSpecUInt64))
-
-/**
- * G_TYPE_PARAM_UNICHAR:
- * 
- * The #GType of #GParamSpecUnichar.
- */
-#define	G_TYPE_PARAM_UNICHAR		   (g_param_spec_types[9])
-/**
- * G_PARAM_SPEC_UNICHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUnichar.
- */
-#define G_PARAM_SPEC_UNICHAR(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UNICHAR, GParamSpecUnichar))
-/**
- * G_IS_PARAM_SPEC_UNICHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UNICHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UNICHAR(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UNICHAR))
-
-/**
- * G_TYPE_PARAM_ENUM:
- * 
- * The #GType of #GParamSpecEnum.
- */
-#define	G_TYPE_PARAM_ENUM		   (g_param_spec_types[10])
-/**
- * G_IS_PARAM_SPEC_ENUM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_ENUM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_ENUM(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ENUM))
-/**
- * G_PARAM_SPEC_ENUM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecEnum.
- */
-#define G_PARAM_SPEC_ENUM(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ENUM, GParamSpecEnum))
-
-/**
- * G_TYPE_PARAM_FLAGS:
- * 
- * The #GType of #GParamSpecFlags.
- */
-#define	G_TYPE_PARAM_FLAGS		   (g_param_spec_types[11])
-/**
- * G_IS_PARAM_SPEC_FLAGS:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_FLAGS.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_FLAGS(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLAGS))
-/**
- * G_PARAM_SPEC_FLAGS:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecFlags.
- */
-#define G_PARAM_SPEC_FLAGS(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLAGS, GParamSpecFlags))
-
-/**
- * G_TYPE_PARAM_FLOAT:
- * 
- * The #GType of #GParamSpecFloat.
- */
-#define	G_TYPE_PARAM_FLOAT		   (g_param_spec_types[12])
-/**
- * G_IS_PARAM_SPEC_FLOAT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_FLOAT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_FLOAT(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLOAT))
-/**
- * G_PARAM_SPEC_FLOAT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecFloat.
- */
-#define G_PARAM_SPEC_FLOAT(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLOAT, GParamSpecFloat))
-
-/**
- * G_TYPE_PARAM_DOUBLE:
- * 
- * The #GType of #GParamSpecDouble.
- */
-#define	G_TYPE_PARAM_DOUBLE		   (g_param_spec_types[13])
-/**
- * G_IS_PARAM_SPEC_DOUBLE:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_DOUBLE.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_DOUBLE(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_DOUBLE))
-/**
- * G_PARAM_SPEC_DOUBLE:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecDouble.
- */
-#define G_PARAM_SPEC_DOUBLE(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_DOUBLE, GParamSpecDouble))
-
-/**
- * G_TYPE_PARAM_STRING:
- * 
- * The #GType of #GParamSpecString.
- */
-#define	G_TYPE_PARAM_STRING		   (g_param_spec_types[14])
-/**
- * G_IS_PARAM_SPEC_STRING:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_STRING.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_STRING(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_STRING))
-/**
- * G_PARAM_SPEC_STRING:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecString.
- */
-#define G_PARAM_SPEC_STRING(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_STRING, GParamSpecString))
-
-/**
- * G_TYPE_PARAM_PARAM:
- * 
- * The #GType of #GParamSpecParam.
- */
-#define	G_TYPE_PARAM_PARAM		   (g_param_spec_types[15])
-/**
- * G_IS_PARAM_SPEC_PARAM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_PARAM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_PARAM(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_PARAM))
-/**
- * G_PARAM_SPEC_PARAM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecParam.
- */
-#define G_PARAM_SPEC_PARAM(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_PARAM, GParamSpecParam))
-
-/**
- * G_TYPE_PARAM_BOXED:
- * 
- * The #GType of #GParamSpecBoxed.
- */
-#define	G_TYPE_PARAM_BOXED		   (g_param_spec_types[16])
-/**
- * G_IS_PARAM_SPEC_BOXED:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_BOXED.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_BOXED(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOXED))
-/**
- * G_PARAM_SPEC_BOXED:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecBoxed.
- */
-#define G_PARAM_SPEC_BOXED(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOXED, GParamSpecBoxed))
-
-/**
- * G_TYPE_PARAM_POINTER:
- * 
- * The #GType of #GParamSpecPointer.
- */
-#define	G_TYPE_PARAM_POINTER		   (g_param_spec_types[17])
-/**
- * G_IS_PARAM_SPEC_POINTER:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_POINTER.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_POINTER(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_POINTER))
-/**
- * G_PARAM_SPEC_POINTER:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecPointer.
- */
-#define G_PARAM_SPEC_POINTER(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_POINTER, GParamSpecPointer))
-
-/**
- * G_TYPE_PARAM_VALUE_ARRAY:
- * 
- * The #GType of #GParamSpecValueArray.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define	G_TYPE_PARAM_VALUE_ARRAY	   (g_param_spec_types[18])
-/**
- * G_IS_PARAM_SPEC_VALUE_ARRAY:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_VALUE_ARRAY.
- * 
- * Returns: %TRUE on success.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY))
-/**
- * G_PARAM_SPEC_VALUE_ARRAY:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecValueArray.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_PARAM_SPEC_VALUE_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray))
-
-/**
- * G_TYPE_PARAM_OBJECT:
- * 
- * The #GType of #GParamSpecObject.
- */
-#define	G_TYPE_PARAM_OBJECT		   (g_param_spec_types[19])
-/**
- * G_IS_PARAM_SPEC_OBJECT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_OBJECT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_OBJECT(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OBJECT))
-/**
- * G_PARAM_SPEC_OBJECT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecObject.
- */
-#define G_PARAM_SPEC_OBJECT(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OBJECT, GParamSpecObject))
-
-/**
- * G_TYPE_PARAM_OVERRIDE:
- * 
- * The #GType of #GParamSpecOverride.
- * 
- * Since: 2.4
- */
-#define	G_TYPE_PARAM_OVERRIDE		   (g_param_spec_types[20])
-/**
- * G_IS_PARAM_SPEC_OVERRIDE:
- * @pspec: a #GParamSpec
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_OVERRIDE.
- * 
- * Since: 2.4
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_OVERRIDE(pspec)    (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OVERRIDE))
-/**
- * G_PARAM_SPEC_OVERRIDE:
- * @pspec: a #GParamSpec
- * 
- * Casts a #GParamSpec into a #GParamSpecOverride.
- * 
- * Since: 2.4
- */
-#define G_PARAM_SPEC_OVERRIDE(pspec)       (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OVERRIDE, GParamSpecOverride))
-
-/**
- * G_TYPE_PARAM_GTYPE:
- * 
- * The #GType of #GParamSpecGType.
- * 
- * Since: 2.10
- */
-#define	G_TYPE_PARAM_GTYPE		   (g_param_spec_types[21])
-/**
- * G_IS_PARAM_SPEC_GTYPE:
- * @pspec: a #GParamSpec
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_GTYPE.
- * 
- * Since: 2.10
- * Returns: %TRUE on success. 
- */
-#define G_IS_PARAM_SPEC_GTYPE(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_GTYPE))
-/**
- * G_PARAM_SPEC_GTYPE:
- * @pspec: a #GParamSpec
- * 
- * Casts a #GParamSpec into a #GParamSpecGType.
- * 
- * Since: 2.10
- */
-#define G_PARAM_SPEC_GTYPE(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_GTYPE, GParamSpecGType))
-
-/**
- * G_TYPE_PARAM_VARIANT:
- *
- * The #GType of #GParamSpecVariant.
- *
- * Since: 2.26
- */
-#define G_TYPE_PARAM_VARIANT                (g_param_spec_types[22])
-/**
- * G_IS_PARAM_SPEC_VARIANT:
- * @pspec: a #GParamSpec
- *
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_VARIANT.
- *
- * Returns: %TRUE on success
- *
- * Since: 2.26
- */
-#define G_IS_PARAM_SPEC_VARIANT(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VARIANT))
-/**
- * G_PARAM_SPEC_VARIANT:
- * @pspec: a #GParamSpec
- *
- * Casts a #GParamSpec into a #GParamSpecVariant.
- *
- * Since: 2.26
- */
-#define G_PARAM_SPEC_VARIANT(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VARIANT, GParamSpecVariant))
-
-/* --- typedefs & structures --- */
-typedef struct _GParamSpecChar       GParamSpecChar;
-typedef struct _GParamSpecUChar      GParamSpecUChar;
-typedef struct _GParamSpecBoolean    GParamSpecBoolean;
-typedef struct _GParamSpecInt        GParamSpecInt;
-typedef struct _GParamSpecUInt       GParamSpecUInt;
-typedef struct _GParamSpecLong       GParamSpecLong;
-typedef struct _GParamSpecULong      GParamSpecULong;
-typedef struct _GParamSpecInt64      GParamSpecInt64;
-typedef struct _GParamSpecUInt64     GParamSpecUInt64;
-typedef struct _GParamSpecUnichar    GParamSpecUnichar;
-typedef struct _GParamSpecEnum       GParamSpecEnum;
-typedef struct _GParamSpecFlags      GParamSpecFlags;
-typedef struct _GParamSpecFloat      GParamSpecFloat;
-typedef struct _GParamSpecDouble     GParamSpecDouble;
-typedef struct _GParamSpecString     GParamSpecString;
-typedef struct _GParamSpecParam      GParamSpecParam;
-typedef struct _GParamSpecBoxed      GParamSpecBoxed;
-typedef struct _GParamSpecPointer    GParamSpecPointer;
-typedef struct _GParamSpecValueArray GParamSpecValueArray;
-typedef struct _GParamSpecObject     GParamSpecObject;
-typedef struct _GParamSpecOverride   GParamSpecOverride;
-typedef struct _GParamSpecGType      GParamSpecGType;
-typedef struct _GParamSpecVariant    GParamSpecVariant;
-
-/**
- * GParamSpecChar:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for character properties.
- */
-struct _GParamSpecChar
-{
-  GParamSpec    parent_instance;
-  
-  gint8         minimum;
-  gint8         maximum;
-  gint8         default_value;
-};
-/**
- * GParamSpecUChar:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned character properties.
- */
-struct _GParamSpecUChar
-{
-  GParamSpec    parent_instance;
-  
-  guint8        minimum;
-  guint8        maximum;
-  guint8        default_value;
-};
-/**
- * GParamSpecBoolean:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for boolean properties.
- */
-struct _GParamSpecBoolean
-{
-  GParamSpec    parent_instance;
-  
-  gboolean      default_value;
-};
-/**
- * GParamSpecInt:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for integer properties.
- */
-struct _GParamSpecInt
-{
-  GParamSpec    parent_instance;
-  
-  gint          minimum;
-  gint          maximum;
-  gint          default_value;
-};
-/**
- * GParamSpecUInt:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned integer properties.
- */
-struct _GParamSpecUInt
-{
-  GParamSpec    parent_instance;
-  
-  guint         minimum;
-  guint         maximum;
-  guint         default_value;
-};
-/**
- * GParamSpecLong:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for long integer properties.
- */
-struct _GParamSpecLong
-{
-  GParamSpec    parent_instance;
-  
-  glong         minimum;
-  glong         maximum;
-  glong         default_value;
-};
-/**
- * GParamSpecULong:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned long integer properties.
- */
-struct _GParamSpecULong
-{
-  GParamSpec    parent_instance;
-  
-  gulong        minimum;
-  gulong        maximum;
-  gulong        default_value;
-};
-/**
- * GParamSpecInt64:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for 64bit integer properties.
- */
-struct _GParamSpecInt64
-{
-  GParamSpec    parent_instance;
-  
-  gint64        minimum;
-  gint64        maximum;
-  gint64        default_value;
-};
-/**
- * GParamSpecUInt64:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned 64bit integer properties.
- */
-struct _GParamSpecUInt64
-{
-  GParamSpec    parent_instance;
-  
-  guint64       minimum;
-  guint64       maximum;
-  guint64       default_value;
-};
-/**
- * GParamSpecUnichar:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unichar (unsigned integer) properties.
- */
-struct _GParamSpecUnichar
-{
-  GParamSpec    parent_instance;
-  
-  gunichar      default_value;
-};
-/**
- * GParamSpecEnum:
- * @parent_instance: private #GParamSpec portion
- * @enum_class: the #GEnumClass for the enum
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for enum 
- * properties.
- */
-struct _GParamSpecEnum
-{
-  GParamSpec    parent_instance;
-  
-  GEnumClass   *enum_class;
-  gint          default_value;
-};
-/**
- * GParamSpecFlags:
- * @parent_instance: private #GParamSpec portion
- * @flags_class: the #GFlagsClass for the flags
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for flags
- * properties.
- */
-struct _GParamSpecFlags
-{
-  GParamSpec    parent_instance;
-  
-  GFlagsClass  *flags_class;
-  guint         default_value;
-};
-/**
- * GParamSpecFloat:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * @epsilon: values closer than @epsilon will be considered identical
- *  by g_param_values_cmp(); the default value is 1e-30.
- * 
- * A #GParamSpec derived structure that contains the meta data for float properties.
- */
-struct _GParamSpecFloat
-{
-  GParamSpec    parent_instance;
-  
-  gfloat        minimum;
-  gfloat        maximum;
-  gfloat        default_value;
-  gfloat        epsilon;
-};
-/**
- * GParamSpecDouble:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * @epsilon: values closer than @epsilon will be considered identical
- *  by g_param_values_cmp(); the default value is 1e-90.
- * 
- * A #GParamSpec derived structure that contains the meta data for double properties.
- */
-struct _GParamSpecDouble
-{
-  GParamSpec    parent_instance;
-  
-  gdouble       minimum;
-  gdouble       maximum;
-  gdouble       default_value;
-  gdouble       epsilon;
-};
-/**
- * GParamSpecString:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * @cset_first: a string containing the allowed values for the first byte
- * @cset_nth: a string containing the allowed values for the subsequent bytes
- * @substitutor: the replacement byte for bytes which don't match @cset_first or @cset_nth.
- * @null_fold_if_empty: replace empty string by %NULL
- * @ensure_non_null: replace %NULL strings by an empty string
- * 
- * A #GParamSpec derived structure that contains the meta data for string
- * properties.
- */
-struct _GParamSpecString
-{
-  GParamSpec    parent_instance;
-  
-  gchar        *default_value;
-  gchar        *cset_first;
-  gchar        *cset_nth;
-  gchar         substitutor;
-  guint         null_fold_if_empty : 1;
-  guint         ensure_non_null : 1;
-};
-/**
- * GParamSpecParam:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for %G_TYPE_PARAM
- * properties.
- */
-struct _GParamSpecParam
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecBoxed:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for boxed properties.
- */
-struct _GParamSpecBoxed
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecPointer:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for pointer properties.
- */
-struct _GParamSpecPointer
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecValueArray:
- * @parent_instance: private #GParamSpec portion
- * @element_spec: a #GParamSpec describing the elements contained in arrays of this property, may be %NULL
- * @fixed_n_elements: if greater than 0, arrays of this property will always have this many elements
- * 
- * A #GParamSpec derived structure that contains the meta data for #GValueArray properties.
- */
-struct _GParamSpecValueArray
-{
-  GParamSpec    parent_instance;
-  GParamSpec   *element_spec;
-  guint		fixed_n_elements;
-};
-/**
- * GParamSpecObject:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for object properties.
- */
-struct _GParamSpecObject
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecOverride:
- * 
- * This is a type of #GParamSpec type that simply redirects operations to
- * another paramspec.  All operations other than getting or
- * setting the value are redirected, including accessing the nick and
- * blurb, validating a value, and so forth. See
- * g_param_spec_get_redirect_target() for retrieving the overidden
- * property. #GParamSpecOverride is used in implementing
- * g_object_class_override_property(), and will not be directly useful
- * unless you are implementing a new base type similar to GObject.
- * 
- * Since: 2.4
- */
-struct _GParamSpecOverride
-{
-  /*< private >*/
-  GParamSpec    parent_instance;
-  GParamSpec   *overridden;
-};
-/**
- * GParamSpecGType:
- * @parent_instance: private #GParamSpec portion
- * @is_a_type: a #GType whose subtypes can occur as values
- * 
- * A #GParamSpec derived structure that contains the meta data for #GType properties.
- * 
- * Since: 2.10
- */
-struct _GParamSpecGType
-{
-  GParamSpec    parent_instance;
-  GType         is_a_type;
-};
-/**
- * GParamSpecVariant:
- * @parent_instance: private #GParamSpec portion
- * @type: a #GVariantType, or %NULL
- * @default_value: a #GVariant, or %NULL
- *
- * A #GParamSpec derived structure that contains the meta data for #GVariant properties.
- *
- * Since: 2.26
- */
-struct _GParamSpecVariant
-{
-  GParamSpec    parent_instance;
-  GVariantType *type;
-  GVariant     *default_value;
-
-  /*< private >*/
-  gpointer      padding[4];
-};
-
-/* --- GParamSpec prototypes --- */
-GParamSpec*	g_param_spec_char	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint8		  minimum,
-					  gint8		  maximum,
-					  gint8		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uchar	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint8	  minimum,
-					  guint8	  maximum,
-					  guint8	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boolean	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gboolean	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint		  minimum,
-					  gint		  maximum,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint		  minimum,
-					  guint		  maximum,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_long	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  glong		  minimum,
-					  glong		  maximum,
-					  glong		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_ulong	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gulong	  minimum,
-					  gulong	  maximum,
-					  gulong	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint64       	  minimum,
-					  gint64       	  maximum,
-					  gint64       	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint64	  minimum,
-					  guint64	  maximum,
-					  guint64	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_unichar      (const gchar    *name,
-				          const gchar    *nick,
-				          const gchar    *blurb,
-				          gunichar	  default_value,
-				          GParamFlags     flags);
-GParamSpec*	g_param_spec_enum	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  enum_type,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_flags	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  flags_type,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_float	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gfloat	  minimum,
-					  gfloat	  maximum,
-					  gfloat	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_double	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gdouble	  minimum,
-					  gdouble	  maximum,
-					  gdouble	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_string	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  const gchar	 *default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_param	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  param_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boxed	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  boxed_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_pointer	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_value_array (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamSpec	 *element_spec,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_object	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  object_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_override    (const gchar    *name,
-					  GParamSpec     *overridden);
-GParamSpec*	g_param_spec_gtype	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType           is_a_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_variant	 (const gchar        *name,
-					  const gchar        *nick,
-					  const gchar	     *blurb,
-					  const GVariantType *type,
-					  GVariant           *default_value,
-					  GParamFlags         flags);
-
-/* --- internal --- */
-/* We prefix variable declarations so they can
- * properly get exported in windows dlls.
- */
-#ifndef GOBJECT_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GOBJECT_STATIC_COMPILATION
-#      define GOBJECT_VAR extern
-#    else /* !GOBJECT_STATIC_COMPILATION */
-#      ifdef GOBJECT_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GOBJECT_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GOBJECT_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GOBJECT_COMPILATION */
-#        define GOBJECT_VAR extern __declspec(dllimport)
-#      endif /* !GOBJECT_COMPILATION */
-#    endif /* !GOBJECT_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    define GOBJECT_VAR extern
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GOBJECT_VAR */
-
-GOBJECT_VAR GType *g_param_spec_types;
-
-G_END_DECLS
-
-#endif /* __G_PARAMSPECS_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gsignal.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gsignal.h
deleted file mode 100644
index fbf1c19f..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gsignal.h
+++ /dev/null
@@ -1,547 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_SIGNAL_H__
-#define __G_SIGNAL_H__
-
-#include	<gobject/gclosure.h>
-#include	<gobject/gvalue.h>
-#include	<gobject/gparam.h>
-#include	<gobject/gmarshal.h>
-
-G_BEGIN_DECLS
-
-/* --- typedefs --- */
-typedef struct _GSignalQuery		 GSignalQuery;
-typedef struct _GSignalInvocationHint	 GSignalInvocationHint;
-/**
- * GSignalCMarshaller:
- * 
- * This is the signature of marshaller functions, required to marshall
- * arrays of parameter values to signal emissions into C language callback
- * invocations. It is merely an alias to #GClosureMarshal since the #GClosure
- * mechanism takes over responsibility of actual function invocation for the
- * signal system.
- */
-typedef GClosureMarshal			 GSignalCMarshaller;
-/**
- * GSignalCVaMarshaller:
- * 
- * This is the signature of va_list marshaller functions, an optional
- * marshaller that can be used in some situations to avoid
- * marshalling the signal argument into GValues.
- */
-typedef GVaClosureMarshal		 GSignalCVaMarshaller;
-/**
- * GSignalEmissionHook:
- * @ihint: Signal invocation hint, see #GSignalInvocationHint.
- * @n_param_values: the number of parameters to the function, including
- *  the instance on which the signal was emitted.
- * @param_values: (array length=n_param_values): the instance on which
- *  the signal was emitted, followed by the parameters of the emission.
- * @data: user data associated with the hook.
- * 
- * A simple function pointer to get invoked when the signal is emitted. This 
- * allows you to tie a hook to the signal type, so that it will trap all 
- * emissions of that signal, from any object.
- * 
- * You may not attach these to signals created with the #G_SIGNAL_NO_HOOKS flag.
- * 
- * Returns: whether it wants to stay connected. If it returns %FALSE, the signal 
- *  hook is disconnected (and destroyed).
- */
-typedef gboolean (*GSignalEmissionHook) (GSignalInvocationHint *ihint,
-					 guint			n_param_values,
-					 const GValue	       *param_values,
-					 gpointer		data);
-/**
- * GSignalAccumulator:
- * @ihint: Signal invocation hint, see #GSignalInvocationHint.
- * @return_accu: Accumulator to collect callback return values in, this
- *  is the return value of the current signal emission.
- * @handler_return: A #GValue holding the return value of the signal handler.
- * @data: Callback data that was specified when creating the signal.
- * 
- * The signal accumulator is a special callback function that can be used
- * to collect return values of the various callbacks that are called
- * during a signal emission. The signal accumulator is specified at signal
- * creation time, if it is left %NULL, no accumulation of callback return
- * values is performed. The return value of signal emissions is then the
- * value returned by the last callback.
- * 
- * Returns: The accumulator function returns whether the signal emission
- *  should be aborted. Returning %FALSE means to abort the
- *  current emission and %TRUE is returned for continuation.
- */
-typedef gboolean (*GSignalAccumulator)	(GSignalInvocationHint *ihint,
-					 GValue		       *return_accu,
-					 const GValue	       *handler_return,
-					 gpointer               data);
-
-
-/* --- run, match and connect types --- */
-/**
- * GSignalFlags:
- * @G_SIGNAL_RUN_FIRST: Invoke the object method handler in the first emission stage.
- * @G_SIGNAL_RUN_LAST: Invoke the object method handler in the third emission stage.
- * @G_SIGNAL_RUN_CLEANUP: Invoke the object method handler in the last emission stage.
- * @G_SIGNAL_NO_RECURSE: Signals being emitted for an object while currently being in
- *  emission for this very object will not be emitted recursively,
- *  but instead cause the first emission to be restarted.
- * @G_SIGNAL_DETAILED: This signal supports "::detail" appendices to the signal name
- *  upon handler connections and emissions.
- * @G_SIGNAL_ACTION: Action signals are signals that may freely be emitted on alive
- *  objects from user code via g_signal_emit() and friends, without
- *  the need of being embedded into extra code that performs pre or
- *  post emission adjustments on the object. They can also be thought
- *  of as object methods which can be called generically by 
- *  third-party code.
- * @G_SIGNAL_NO_HOOKS: No emissions hooks are supported for this signal.
- * @G_SIGNAL_MUST_COLLECT: Varargs signal emission will always collect the
- *   arguments, even if there are no signal handlers connected.  Since 2.30.
- * @G_SIGNAL_DEPRECATED: The signal is deprecated and will be removed
- *   in a future version. A warning will be generated if it is connected while
- *   running with G_ENABLE_DIAGNOSTIC=1.  Since 2.32.
- * 
- * The signal flags are used to specify a signal's behaviour, the overall
- * signal description outlines how especially the RUN flags control the
- * stages of a signal emission.
- */
-typedef enum
-{
-  G_SIGNAL_RUN_FIRST	= 1 << 0,
-  G_SIGNAL_RUN_LAST	= 1 << 1,
-  G_SIGNAL_RUN_CLEANUP	= 1 << 2,
-  G_SIGNAL_NO_RECURSE	= 1 << 3,
-  G_SIGNAL_DETAILED	= 1 << 4,
-  G_SIGNAL_ACTION	= 1 << 5,
-  G_SIGNAL_NO_HOOKS	= 1 << 6,
-  G_SIGNAL_MUST_COLLECT = 1 << 7,
-  G_SIGNAL_DEPRECATED   = 1 << 8
-} GSignalFlags;
-/**
- * G_SIGNAL_FLAGS_MASK:
- * 
- * A mask for all #GSignalFlags bits.
- */
-#define G_SIGNAL_FLAGS_MASK  0x1ff
-/**
- * GConnectFlags:
- * @G_CONNECT_AFTER: whether the handler should be called before or after the 
- *  default handler of the signal.
- * @G_CONNECT_SWAPPED: whether the instance and data should be swapped when
- *  calling the handler.
- * 
- * The connection flags are used to specify the behaviour of a signal's 
- * connection.
- */
-typedef enum
-{
-  G_CONNECT_AFTER	= 1 << 0,
-  G_CONNECT_SWAPPED	= 1 << 1
-} GConnectFlags;
-/**
- * GSignalMatchType:
- * @G_SIGNAL_MATCH_ID: The signal id must be equal.
- * @G_SIGNAL_MATCH_DETAIL: The signal detail be equal.
- * @G_SIGNAL_MATCH_CLOSURE: The closure must be the same.
- * @G_SIGNAL_MATCH_FUNC: The C closure callback must be the same.
- * @G_SIGNAL_MATCH_DATA: The closure data must be the same.
- * @G_SIGNAL_MATCH_UNBLOCKED: Only unblocked signals may matched.
- * 
- * The match types specify what g_signal_handlers_block_matched(),
- * g_signal_handlers_unblock_matched() and g_signal_handlers_disconnect_matched()
- * match signals by.
- */
-typedef enum
-{
-  G_SIGNAL_MATCH_ID	   = 1 << 0,
-  G_SIGNAL_MATCH_DETAIL	   = 1 << 1,
-  G_SIGNAL_MATCH_CLOSURE   = 1 << 2,
-  G_SIGNAL_MATCH_FUNC	   = 1 << 3,
-  G_SIGNAL_MATCH_DATA	   = 1 << 4,
-  G_SIGNAL_MATCH_UNBLOCKED = 1 << 5
-} GSignalMatchType;
-/**
- * G_SIGNAL_MATCH_MASK:
- * 
- * A mask for all #GSignalMatchType bits.
- */
-#define G_SIGNAL_MATCH_MASK  0x3f
-/**
- * G_SIGNAL_TYPE_STATIC_SCOPE:
- * 
- * This macro flags signal argument types for which the signal system may 
- * assume that instances thereof remain persistent across all signal emissions
- * they are used in. This is only useful for non ref-counted, value-copy types.
- * 
- * To flag a signal argument in this way, add 
- * <literal>| G_SIGNAL_TYPE_STATIC_SCOPE</literal> to the corresponding argument
- * of g_signal_new().
- * |[
- * g_signal_new ("size_request",
- *   G_TYPE_FROM_CLASS (gobject_class),
- * 	 G_SIGNAL_RUN_FIRST,
- * 	 G_STRUCT_OFFSET (GtkWidgetClass, size_request),
- * 	 NULL, NULL,
- * 	 _gtk_marshal_VOID__BOXED,
- * 	 G_TYPE_NONE, 1,
- * 	 GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
- * ]|
- */
-#define	G_SIGNAL_TYPE_STATIC_SCOPE (G_TYPE_FLAG_RESERVED_ID_BIT)
-
-
-/* --- signal information --- */
-/**
- * GSignalInvocationHint:
- * @signal_id: The signal id of the signal invoking the callback
- * @detail: The detail passed on for this emission
- * @run_type: The stage the signal emission is currently in, this
- *  field will contain one of %G_SIGNAL_RUN_FIRST,
- *  %G_SIGNAL_RUN_LAST or %G_SIGNAL_RUN_CLEANUP.
- * 
- * The #GSignalInvocationHint structure is used to pass on additional information
- * to callbacks during a signal emission.
- */
-struct _GSignalInvocationHint
-{
-  guint		signal_id;
-  GQuark	detail;
-  GSignalFlags	run_type;
-};
-/**
- * GSignalQuery:
- * @signal_id: The signal id of the signal being queried, or 0 if the
- *  signal to be queried was unknown.
- * @signal_name: The signal name.
- * @itype: The interface/instance type that this signal can be emitted for.
- * @signal_flags: The signal flags as passed in to g_signal_new().
- * @return_type: The return type for user callbacks.
- * @n_params: The number of parameters that user callbacks take.
- * @param_types: (array length=n_params): The individual parameter types for
- *  user callbacks, note that the effective callback signature is:
- *  <programlisting>
- *  @return_type callback (#gpointer     data1,
- *  [param_types param_names,]
- *  gpointer     data2);
- *  </programlisting>
- * 
- * A structure holding in-depth information for a specific signal. It is
- * filled in by the g_signal_query() function.
- */
-struct _GSignalQuery
-{
-  guint		signal_id;
-  const gchar  *signal_name;
-  GType		itype;
-  GSignalFlags	signal_flags;
-  GType		return_type; /* mangled with G_SIGNAL_TYPE_STATIC_SCOPE flag */
-  guint		n_params;
-  const GType  *param_types; /* mangled with G_SIGNAL_TYPE_STATIC_SCOPE flag */
-};
-
-
-/* --- signals --- */
-guint                 g_signal_newv         (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     GClosure           *class_closure,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     GType              *param_types);
-guint                 g_signal_new_valist   (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     GClosure           *class_closure,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     va_list             args);
-guint                 g_signal_new          (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     guint               class_offset,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     ...);
-guint            g_signal_new_class_handler (const gchar        *signal_name,
-                                             GType               itype,
-                                             GSignalFlags        signal_flags,
-                                             GCallback           class_handler,
-                                             GSignalAccumulator  accumulator,
-                                             gpointer            accu_data,
-                                             GSignalCMarshaller  c_marshaller,
-                                             GType               return_type,
-                                             guint               n_params,
-                                             ...);
-void             g_signal_set_va_marshaller (guint              signal_id,
-					     GType              instance_type,
-					     GSignalCVaMarshaller va_marshaller);
-
-void                  g_signal_emitv        (const GValue       *instance_and_params,
-					     guint               signal_id,
-					     GQuark              detail,
-					     GValue             *return_value);
-void                  g_signal_emit_valist  (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     va_list             var_args);
-void                  g_signal_emit         (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     ...);
-void                  g_signal_emit_by_name (gpointer            instance,
-					     const gchar        *detailed_signal,
-					     ...);
-guint                 g_signal_lookup       (const gchar        *name,
-					     GType               itype);
-const gchar *         g_signal_name         (guint               signal_id);
-void                  g_signal_query        (guint               signal_id,
-					     GSignalQuery       *query);
-guint*                g_signal_list_ids     (GType               itype,
-					     guint              *n_ids);
-gboolean	      g_signal_parse_name   (const gchar	*detailed_signal,
-					     GType		 itype,
-					     guint		*signal_id_p,
-					     GQuark		*detail_p,
-					     gboolean		 force_detail_quark);
-GSignalInvocationHint* g_signal_get_invocation_hint (gpointer    instance);
-
-
-/* --- signal emissions --- */
-void	g_signal_stop_emission		    (gpointer		  instance,
-					     guint		  signal_id,
-					     GQuark		  detail);
-void	g_signal_stop_emission_by_name	    (gpointer		  instance,
-					     const gchar	 *detailed_signal);
-gulong	g_signal_add_emission_hook	    (guint		  signal_id,
-					     GQuark		  detail,
-					     GSignalEmissionHook  hook_func,
-					     gpointer	       	  hook_data,
-					     GDestroyNotify	  data_destroy);
-void	g_signal_remove_emission_hook	    (guint		  signal_id,
-					     gulong		  hook_id);
-
-
-/* --- signal handlers --- */
-gboolean g_signal_has_handler_pending	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       gboolean		  may_be_blocked);
-gulong	 g_signal_connect_closure_by_id	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_closure	      (gpointer		  instance,
-					       const gchar       *detailed_signal,
-					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_data		      (gpointer		  instance,
-					       const gchar	 *detailed_signal,
-					       GCallback	  c_handler,
-					       gpointer		  data,
-					       GClosureNotify	  destroy_data,
-					       GConnectFlags	  connect_flags);
-void	 g_signal_handler_block		      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_unblock	      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_disconnect	      (gpointer		  instance,
-					       gulong		  handler_id);
-gboolean g_signal_handler_is_connected	      (gpointer		  instance,
-					       gulong		  handler_id);
-gulong	 g_signal_handler_find		      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_block_matched      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_unblock_matched    (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_disconnect_matched (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-
-
-/* --- overriding and chaining --- */
-void    g_signal_override_class_closure       (guint              signal_id,
-                                               GType              instance_type,
-                                               GClosure          *class_closure);
-void    g_signal_override_class_handler       (const gchar       *signal_name,
-                                               GType              instance_type,
-                                               GCallback          class_handler);
-void    g_signal_chain_from_overridden        (const GValue      *instance_and_params,
-                                               GValue            *return_value);
-void   g_signal_chain_from_overridden_handler (gpointer           instance,
-                                               ...);
-
-
-/* --- convenience --- */
-/**
- * g_signal_connect:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The handler will be called before the default handler of the signal.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)
-/**
- * g_signal_connect_after:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The handler will be called after the default handler of the signal.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect_after(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER)
-/**
- * g_signal_connect_swapped:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The instance on which the signal is emitted and @data will be swapped when 
- * calling the handler.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect_swapped(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED)
-/**
- * g_signal_handlers_disconnect_by_func:
- * @instance: The instance to remove handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Disconnects all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_disconnect_by_func(instance, func, data)						\
-    g_signal_handlers_disconnect_matched ((instance),								\
-					  (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-					  0, 0, NULL, (func), (data))
-
-/**
- * g_signal_handlers_disconnect_by_data:
- * @instance: The instance to remove handlers from
- * @data: the closure data of the handlers' closures
- *
- * Disconnects all handlers on an instance that match @data.
- *
- * Returns: The number of handlers that matched.
- *
- * Since: 2.32
- */
-#define g_signal_handlers_disconnect_by_data(instance, data) \
-  g_signal_handlers_disconnect_matched ((instance), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, (data))
-
-/**
- * g_signal_handlers_block_by_func:
- * @instance: The instance to block handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Blocks all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_block_by_func(instance, func, data)							\
-    g_signal_handlers_block_matched      ((instance),								\
-				          (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-				          0, 0, NULL, (func), (data))
-/**
- * g_signal_handlers_unblock_by_func:
- * @instance: The instance to unblock handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Unblocks all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_unblock_by_func(instance, func, data)							\
-    g_signal_handlers_unblock_matched    ((instance),								\
-				          (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-				          0, 0, NULL, (func), (data))
-
-
-gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
-
-gboolean g_signal_accumulator_first_wins   (GSignalInvocationHint *ihint,
-                                            GValue                *return_accu,
-                                            const GValue          *handler_return,
-                                            gpointer               dummy);
-
-/*< private >*/
-void	 g_signal_handlers_destroy	      (gpointer		  instance);
-void	 _g_signals_destroy		      (GType		  itype);
-
-G_END_DECLS
-
-#endif /* __G_SIGNAL_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gsourceclosure.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gsourceclosure.h
deleted file mode 100644
index 3cfdacd5..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gsourceclosure.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_SOURCECLOSURE_H__
-#define __G_SOURCECLOSURE_H__
-
-#include <gobject/gclosure.h>
-#include <gobject/glib-types.h>
-
-G_BEGIN_DECLS
-
-void g_source_set_closure        (GSource  *source,
-				  GClosure *closure);
-
-void g_source_set_dummy_callback (GSource  *source);
-
-G_END_DECLS
-
-#endif /* __G_SOURCECLOSURE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gtype.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gtype.h
deleted file mode 100644
index 14206edf..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gtype.h
+++ /dev/null
@@ -1,1727 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_H__
-#define __G_TYPE_H__
-
-#include        <glib.h>
-
-G_BEGIN_DECLS
-
-/* Basic Type Macros
- */
-/**
- * G_TYPE_FUNDAMENTAL:
- * @type: A #GType value.
- * 
- * The fundamental type which is the ancestor of @type.
- * Fundamental types are types that serve as ultimate bases for the derived types, 
- * thus they are the roots of distinct inheritance hierarchies.
- */
-#define G_TYPE_FUNDAMENTAL(type)	(g_type_fundamental (type))
-/**
- * G_TYPE_FUNDAMENTAL_MAX:
- * 
- * An integer constant that represents the number of identifiers reserved
- * for types that are assigned at compile-time.
- */
-#define	G_TYPE_FUNDAMENTAL_MAX		(255 << G_TYPE_FUNDAMENTAL_SHIFT)
-
-/* Constant fundamental types,
- * introduced by g_type_init().
- */
-/**
- * G_TYPE_INVALID:
- * 
- * An invalid #GType used as error return value in some functions which return
- * a #GType. 
- */
-#define G_TYPE_INVALID			G_TYPE_MAKE_FUNDAMENTAL (0)
-/**
- * G_TYPE_NONE:
- * 
- * A fundamental type which is used as a replacement for the C
- * <literal>void</literal> return type.
- */
-#define G_TYPE_NONE			G_TYPE_MAKE_FUNDAMENTAL (1)
-/**
- * G_TYPE_INTERFACE:
- * 
- * The fundamental type from which all interfaces are derived.
- */
-#define G_TYPE_INTERFACE		G_TYPE_MAKE_FUNDAMENTAL (2)
-/**
- * G_TYPE_CHAR:
- * 
- * The fundamental type corresponding to #gchar.
- * The type designated by G_TYPE_CHAR is unconditionally an 8-bit signed integer.
- * This may or may not be the same type a the C type "gchar".
- */
-#define G_TYPE_CHAR			G_TYPE_MAKE_FUNDAMENTAL (3)
-/**
- * G_TYPE_UCHAR:
- * 
- * The fundamental type corresponding to #guchar.
- */
-#define G_TYPE_UCHAR			G_TYPE_MAKE_FUNDAMENTAL (4)
-/**
- * G_TYPE_BOOLEAN:
- * 
- * The fundamental type corresponding to #gboolean.
- */
-#define G_TYPE_BOOLEAN			G_TYPE_MAKE_FUNDAMENTAL (5)
-/**
- * G_TYPE_INT:
- * 
- * The fundamental type corresponding to #gint.
- */
-#define G_TYPE_INT			G_TYPE_MAKE_FUNDAMENTAL (6)
-/**
- * G_TYPE_UINT:
- * 
- * The fundamental type corresponding to #guint.
- */
-#define G_TYPE_UINT			G_TYPE_MAKE_FUNDAMENTAL (7)
-/**
- * G_TYPE_LONG:
- * 
- * The fundamental type corresponding to #glong.
- */
-#define G_TYPE_LONG			G_TYPE_MAKE_FUNDAMENTAL (8)
-/**
- * G_TYPE_ULONG:
- * 
- * The fundamental type corresponding to #gulong.
- */
-#define G_TYPE_ULONG			G_TYPE_MAKE_FUNDAMENTAL (9)
-/**
- * G_TYPE_INT64:
- * 
- * The fundamental type corresponding to #gint64.
- */
-#define G_TYPE_INT64			G_TYPE_MAKE_FUNDAMENTAL (10)
-/**
- * G_TYPE_UINT64:
- * 
- * The fundamental type corresponding to #guint64.
- */
-#define G_TYPE_UINT64			G_TYPE_MAKE_FUNDAMENTAL (11)
-/**
- * G_TYPE_ENUM:
- * 
- * The fundamental type from which all enumeration types are derived.
- */
-#define G_TYPE_ENUM			G_TYPE_MAKE_FUNDAMENTAL (12)
-/**
- * G_TYPE_FLAGS:
- * 
- * The fundamental type from which all flags types are derived.
- */
-#define G_TYPE_FLAGS			G_TYPE_MAKE_FUNDAMENTAL (13)
-/**
- * G_TYPE_FLOAT:
- * 
- * The fundamental type corresponding to #gfloat.
- */
-#define G_TYPE_FLOAT			G_TYPE_MAKE_FUNDAMENTAL (14)
-/**
- * G_TYPE_DOUBLE:
- * 
- * The fundamental type corresponding to #gdouble.
- */
-#define G_TYPE_DOUBLE			G_TYPE_MAKE_FUNDAMENTAL (15)
-/**
- * G_TYPE_STRING:
- * 
- * The fundamental type corresponding to nul-terminated C strings.
- */
-#define G_TYPE_STRING			G_TYPE_MAKE_FUNDAMENTAL (16)
-/**
- * G_TYPE_POINTER:
- * 
- * The fundamental type corresponding to #gpointer.
- */
-#define G_TYPE_POINTER			G_TYPE_MAKE_FUNDAMENTAL (17)
-/**
- * G_TYPE_BOXED:
- * 
- * The fundamental type from which all boxed types are derived.
- */
-#define G_TYPE_BOXED			G_TYPE_MAKE_FUNDAMENTAL (18)
-/**
- * G_TYPE_PARAM:
- * 
- * The fundamental type from which all #GParamSpec types are derived.
- */
-#define G_TYPE_PARAM			G_TYPE_MAKE_FUNDAMENTAL (19)
-/**
- * G_TYPE_OBJECT:
- * 
- * The fundamental type for #GObject.
- */
-#define G_TYPE_OBJECT			G_TYPE_MAKE_FUNDAMENTAL (20)
-/**
- * G_TYPE_VARIANT:
- *
- * The fundamental type corresponding to #GVariant.
- *
- * All floating #GVariant instances passed through the #GType system are
- * consumed.
- * 
- * Note that callbacks in closures, and signal handlers
- * for signals of return type %G_TYPE_VARIANT, must never return floating
- * variants.
- *
- * Note: GLib 2.24 did include a boxed type with this name. It was replaced
- * with this fundamental type in 2.26.
- *
- * Since: 2.26
- */
-#define	G_TYPE_VARIANT                  G_TYPE_MAKE_FUNDAMENTAL (21)
-
-
-/* Reserved fundamental type numbers to create new fundamental
- * type IDs with G_TYPE_MAKE_FUNDAMENTAL().
- * Send email to gtk-devel-list@gnome.org for reservations.
- */
-/**
- * G_TYPE_FUNDAMENTAL_SHIFT:
- *
- * Shift value used in converting numbers to type IDs.
- */
-#define	G_TYPE_FUNDAMENTAL_SHIFT	(2)
-/**
- * G_TYPE_MAKE_FUNDAMENTAL:
- * @x: the fundamental type number.
- * 
- * Get the type ID for the fundamental type number @x.
- * Use g_type_fundamental_next() instead of this macro to create new fundamental 
- * types.
- *
- * Returns: the GType
- */
-#define	G_TYPE_MAKE_FUNDAMENTAL(x)	((GType) ((x) << G_TYPE_FUNDAMENTAL_SHIFT))
-/**
- * G_TYPE_RESERVED_GLIB_FIRST:
- * 
- * First fundamental type number to create a new fundamental type id with
- * G_TYPE_MAKE_FUNDAMENTAL() reserved for GLib.
- */
-#define G_TYPE_RESERVED_GLIB_FIRST	(22)
-/**
- * G_TYPE_RESERVED_GLIB_LAST:
- * 
- * Last fundamental type number reserved for GLib.
- */
-#define G_TYPE_RESERVED_GLIB_LAST	(31)
-/**
- * G_TYPE_RESERVED_BSE_FIRST:
- * 
- * First fundamental type number to create a new fundamental type id with
- * G_TYPE_MAKE_FUNDAMENTAL() reserved for BSE.
- */
-#define G_TYPE_RESERVED_BSE_FIRST	(32)
-/**
- * G_TYPE_RESERVED_BSE_LAST:
- * 
- * Last fundamental type number reserved for BSE.
- */
-#define G_TYPE_RESERVED_BSE_LAST	(48)
-/**
- * G_TYPE_RESERVED_USER_FIRST:
- * 
- * First available fundamental type number to create new fundamental 
- * type id with G_TYPE_MAKE_FUNDAMENTAL().
- */
-#define G_TYPE_RESERVED_USER_FIRST	(49)
-
-
-/* Type Checking Macros
- */
-/**
- * G_TYPE_IS_FUNDAMENTAL:
- * @type: A #GType value.
- * 
- * Checks if @type is a fundamental type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_FUNDAMENTAL(type)             ((type) <= G_TYPE_FUNDAMENTAL_MAX)
-/**
- * G_TYPE_IS_DERIVED:
- * @type: A #GType value.
- * 
- * Checks if @type is derived (or in object-oriented terminology:
- * inherited) from another type (this holds true for all non-fundamental
- * types).
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DERIVED(type)                 ((type) > G_TYPE_FUNDAMENTAL_MAX)
-/**
- * G_TYPE_IS_INTERFACE:
- * @type: A #GType value.
- * 
- * Checks if @type is an interface type.
- * An interface type provides a pure API, the implementation
- * of which is provided by another type (which is then said to conform
- * to the interface).  GLib interfaces are somewhat analogous to Java
- * interfaces and C++ classes containing only pure virtual functions, 
- * with the difference that GType interfaces are not derivable (but see
- * g_type_interface_add_prerequisite() for an alternative).
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_INTERFACE(type)               (G_TYPE_FUNDAMENTAL (type) == G_TYPE_INTERFACE)
-/**
- * G_TYPE_IS_CLASSED:
- * @type: A #GType value.
- * 
- * Checks if @type is a classed type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_CLASSED(type)                 (g_type_test_flags ((type), G_TYPE_FLAG_CLASSED))
-/**
- * G_TYPE_IS_INSTANTIATABLE:
- * @type: A #GType value.
- * 
- * Checks if @type can be instantiated.  Instantiation is the
- * process of creating an instance (object) of this type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_INSTANTIATABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_INSTANTIATABLE))
-/**
- * G_TYPE_IS_DERIVABLE:
- * @type: A #GType value.
- * 
- * Checks if @type is a derivable type.  A derivable type can
- * be used as the base class of a flat (single-level) class hierarchy.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DERIVABLE(type)               (g_type_test_flags ((type), G_TYPE_FLAG_DERIVABLE))
-/**
- * G_TYPE_IS_DEEP_DERIVABLE:
- * @type: A #GType value.
- * 
- * Checks if @type is a deep derivable type.  A deep derivable type
- * can be used as the base class of a deep (multi-level) class hierarchy.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DEEP_DERIVABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_DEEP_DERIVABLE))
-/**
- * G_TYPE_IS_ABSTRACT:
- * @type: A #GType value.
- * 
- * Checks if @type is an abstract type.  An abstract type cannot be
- * instantiated and is normally used as an abstract base class for
- * derived classes.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_ABSTRACT(type)                (g_type_test_flags ((type), G_TYPE_FLAG_ABSTRACT))
-/**
- * G_TYPE_IS_VALUE_ABSTRACT:
- * @type: A #GType value.
- * 
- * Checks if @type is an abstract value type.  An abstract value type introduces
- * a value table, but can't be used for g_value_init() and is normally used as
- * an abstract base type for derived value types.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_VALUE_ABSTRACT(type)          (g_type_test_flags ((type), G_TYPE_FLAG_VALUE_ABSTRACT))
-/**
- * G_TYPE_IS_VALUE_TYPE:
- * @type: A #GType value.
- * 
- * Checks if @type is a value type and can be used with g_value_init(). 
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_VALUE_TYPE(type)              (g_type_check_is_value_type (type))
-/**
- * G_TYPE_HAS_VALUE_TABLE:
- * @type: A #GType value.
- * 
- * Checks if @type has a #GTypeValueTable.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_HAS_VALUE_TABLE(type)            (g_type_value_table_peek (type) != NULL)
-
-
-/* Typedefs
- */
-/**
- * GType:
- * 
- * A numerical value which represents the unique identifier of a registered
- * type.
- */
-#if     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined __cplusplus
-typedef gsize                           GType;
-#else   /* for historic reasons, C++ links against gulong GTypes */
-typedef gulong                          GType;
-#endif
-typedef struct _GValue                  GValue;
-typedef union  _GTypeCValue             GTypeCValue;
-typedef struct _GTypePlugin             GTypePlugin;
-typedef struct _GTypeClass              GTypeClass;
-typedef struct _GTypeInterface          GTypeInterface;
-typedef struct _GTypeInstance           GTypeInstance;
-typedef struct _GTypeInfo               GTypeInfo;
-typedef struct _GTypeFundamentalInfo    GTypeFundamentalInfo;
-typedef struct _GInterfaceInfo          GInterfaceInfo;
-typedef struct _GTypeValueTable         GTypeValueTable;
-typedef struct _GTypeQuery		GTypeQuery;
-
-
-/* Basic Type Structures
- */
-/**
- * GTypeClass:
- * 
- * An opaque structure used as the base of all classes.
- */
-struct _GTypeClass
-{
-  /*< private >*/
-  GType g_type;
-};
-/**
- * GTypeInstance:
- * 
- * An opaque structure used as the base of all type instances.
- */
-struct _GTypeInstance
-{
-  /*< private >*/
-  GTypeClass *g_class;
-};
-/**
- * GTypeInterface:
- * 
- * An opaque structure used as the base of all interface types.
- */
-struct _GTypeInterface
-{
-  /*< private >*/
-  GType g_type;         /* iface type */
-  GType g_instance_type;
-};
-/**
- * GTypeQuery:
- * @type: the #GType value of the type.
- * @type_name: the name of the type.
- * @class_size: the size of the class structure.
- * @instance_size: the size of the instance structure.
- * 
- * A structure holding information for a specific type. It is
- * filled in by the g_type_query() function.
- */
-struct _GTypeQuery
-{
-  GType		type;
-  const gchar  *type_name;
-  guint		class_size;
-  guint		instance_size;
-};
-
-
-/* Casts, checks and accessors for structured types
- * usage of these macros is reserved to type implementations only
- */
-/*< protected >*/
-/**
- * G_TYPE_CHECK_INSTANCE:
- * @instance: Location of a #GTypeInstance structure.
- * 
- * Checks if @instance is a valid #GTypeInstance structure,
- * otherwise issues a warning and returns %FALSE.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_INSTANCE(instance)				(_G_TYPE_CHI ((GTypeInstance*) (instance)))
-/**
- * G_TYPE_CHECK_INSTANCE_CAST:
- * @instance: Location of a #GTypeInstance structure.
- * @g_type: The type to be returned.
- * @c_type: The corresponding C type of @g_type.
- * 
- * Checks that @instance is an instance of the type identified by @g_type
- * and issues a warning if this is not the case. Returns @instance casted 
- * to a pointer to @c_type.
- * 
- * This macro should only be used in type implementations.
- */
-#define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type)    (_G_TYPE_CIC ((instance), (g_type), c_type))
-/**
- * G_TYPE_CHECK_INSTANCE_TYPE:
- * @instance: Location of a #GTypeInstance structure.
- * @g_type: The type to be checked
- * 
- * Checks if @instance is an instance of the type identified by @g_type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_INSTANCE_TYPE(instance, g_type)            (_G_TYPE_CIT ((instance), (g_type)))
-/**
- * G_TYPE_INSTANCE_GET_CLASS:
- * @instance: Location of the #GTypeInstance structure.
- * @g_type: The #GType of the class to be returned.
- * @c_type: The C type of the class structure.
- * 
- * Get the class structure of a given @instance, casted
- * to a specified ancestor type @g_type of the instance.
- * 
- * Note that while calling a GInstanceInitFunc(), the class pointer gets
- * modified, so it might not always return the expected pointer.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: a pointer to the class structure
- */
-#define G_TYPE_INSTANCE_GET_CLASS(instance, g_type, c_type)     (_G_TYPE_IGC ((instance), (g_type), c_type))
-/**
- * G_TYPE_INSTANCE_GET_INTERFACE:
- * @instance: Location of the #GTypeInstance structure.
- * @g_type: The #GType of the interface to be returned.
- * @c_type: The C type of the interface structure.
- * 
- * Get the interface structure for interface @g_type of a given @instance.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: a pointer to the interface structure
- */
-#define G_TYPE_INSTANCE_GET_INTERFACE(instance, g_type, c_type) (_G_TYPE_IGI ((instance), (g_type), c_type))
-/**
- * G_TYPE_CHECK_CLASS_CAST:
- * @g_class: Location of a #GTypeClass structure.
- * @g_type: The type to be returned.
- * @c_type: The corresponding C type of class structure of @g_type.
- * 
- * Checks that @g_class is a class structure of the type identified by @g_type
- * and issues a warning if this is not the case. Returns @g_class casted 
- * to a pointer to @c_type.
- * 
- * This macro should only be used in type implementations.
- */
-#define G_TYPE_CHECK_CLASS_CAST(g_class, g_type, c_type)        (_G_TYPE_CCC ((g_class), (g_type), c_type))
-/**
- * G_TYPE_CHECK_CLASS_TYPE:
- * @g_class: Location of a #GTypeClass structure.
- * @g_type: The type to be checked.
- * 
- * Checks if @g_class is a class structure of the type identified by 
- * @g_type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_CLASS_TYPE(g_class, g_type)                (_G_TYPE_CCT ((g_class), (g_type)))
-/**
- * G_TYPE_CHECK_VALUE:
- * @value: a #GValue
- * 
- * Checks if @value has been initialized to hold values
- * of a value type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_VALUE(value)				(_G_TYPE_CHV ((value)))
-/**
- * G_TYPE_CHECK_VALUE_TYPE:
- * @value: a #GValue
- * @g_type: The type to be checked.
- * 
- * Checks if @value has been initialized to hold values
- * of type @g_type. 
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_VALUE_TYPE(value, g_type)			(_G_TYPE_CVH ((value), (g_type)))
-/**
- * G_TYPE_FROM_INSTANCE:
- * @instance: Location of a valid #GTypeInstance structure.
- * 
- * Get the type identifier from a given @instance structure. 
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_INSTANCE(instance)                          (G_TYPE_FROM_CLASS (((GTypeInstance*) (instance))->g_class))
-/**
- * G_TYPE_FROM_CLASS:
- * @g_class: Location of a valid #GTypeClass structure.
- * 
- * Get the type identifier from a given @class structure.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_CLASS(g_class)                              (((GTypeClass*) (g_class))->g_type)
-/**
- * G_TYPE_FROM_INTERFACE:
- * @g_iface: Location of a valid #GTypeInterface structure.
- * 
- * Get the type identifier from a given @interface structure.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_INTERFACE(g_iface)                          (((GTypeInterface*) (g_iface))->g_type)
-
-/**
- * G_TYPE_INSTANCE_GET_PRIVATE:
- * @instance: the instance of a type deriving from @private_type.
- * @g_type: the type identifying which private data to retrieve.
- * @c_type: The C type for the private structure.
- * 
- * Gets the private structure for a particular type.
- * The private structure must have been registered in the
- * class_init function with g_type_class_add_private().
- * 
- * This macro should only be used in type implementations.
- * 
- * Since: 2.4
- * Returns: a pointer to the private data structure.
- */
-#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type)   ((c_type*) g_type_instance_get_private ((GTypeInstance*) (instance), (g_type)))
-
-/**
- * G_TYPE_CLASS_GET_PRIVATE:
- * @klass: the class of a type deriving from @private_type.
- * @g_type: the type identifying which private data to retrieve.
- * @c_type: The C type for the private structure.
- * 
- * Gets the private class structure for a particular type.
- * The private structure must have been registered in the
- * get_type() function with g_type_add_class_private().
- * 
- * This macro should only be used in type implementations.
- * 
- * Since: 2.24
- * Returns: a pointer to the private data structure.
- */
-#define G_TYPE_CLASS_GET_PRIVATE(klass, g_type, c_type)   ((c_type*) g_type_class_get_private ((GTypeClass*) (klass), (g_type)))
-
-/**
- * GTypeDebugFlags:
- * @G_TYPE_DEBUG_NONE: Print no messages.
- * @G_TYPE_DEBUG_OBJECTS: Print messages about object bookkeeping.
- * @G_TYPE_DEBUG_SIGNALS: Print messages about signal emissions.
- * @G_TYPE_DEBUG_MASK: Mask covering all debug flags.
- * 
- * The <type>GTypeDebugFlags</type> enumeration values can be passed to
- * g_type_init_with_debug_flags() to trigger debugging messages during runtime.
- * Note that the messages can also be triggered by setting the
- * <envar>GOBJECT_DEBUG</envar> environment variable to a ':'-separated list of 
- * "objects" and "signals".
- */
-typedef enum	/*< skip >*/
-{
-  G_TYPE_DEBUG_NONE	= 0,
-  G_TYPE_DEBUG_OBJECTS	= 1 << 0,
-  G_TYPE_DEBUG_SIGNALS	= 1 << 1,
-  G_TYPE_DEBUG_MASK	= 0x03
-} GTypeDebugFlags;
-
-
-/* --- prototypes --- */
-void                  g_type_init                    (void);
-void                  g_type_init_with_debug_flags   (GTypeDebugFlags  debug_flags);
-const gchar *         g_type_name                    (GType            type);
-GQuark                g_type_qname                   (GType            type);
-GType                 g_type_from_name               (const gchar     *name);
-GType                 g_type_parent                  (GType            type);
-guint                 g_type_depth                   (GType            type);
-GType                 g_type_next_base               (GType            leaf_type,
-						      GType            root_type);
-gboolean              g_type_is_a                    (GType            type,
-						      GType            is_a_type);
-gpointer              g_type_class_ref               (GType            type);
-gpointer              g_type_class_peek              (GType            type);
-gpointer              g_type_class_peek_static       (GType            type);
-void                  g_type_class_unref             (gpointer         g_class);
-gpointer              g_type_class_peek_parent       (gpointer         g_class);
-gpointer              g_type_interface_peek          (gpointer         instance_class,
-						      GType            iface_type);
-gpointer              g_type_interface_peek_parent   (gpointer         g_iface);
-
-gpointer              g_type_default_interface_ref   (GType            g_type);
-gpointer              g_type_default_interface_peek  (GType            g_type);
-void                  g_type_default_interface_unref (gpointer         g_iface);
-
-/* g_free() the returned arrays */
-GType*                g_type_children                (GType            type,
-						      guint           *n_children);
-GType*                g_type_interfaces              (GType            type,
-						      guint           *n_interfaces);
-
-/* per-type _static_ data */
-void                  g_type_set_qdata               (GType            type,
-						      GQuark           quark,
-						      gpointer         data);
-gpointer              g_type_get_qdata               (GType            type,
-						      GQuark           quark);
-void		      g_type_query		     (GType	       type,
-						      GTypeQuery      *query);
-
-
-/* --- type registration --- */
-/**
- * GBaseInitFunc:
- * @g_class: The #GTypeClass structure to initialize.
- * 
- * A callback function used by the type system to do base initialization
- * of the class structures of derived types. It is called as part of the
- * initialization process of all derived classes and should reallocate
- * or reset all dynamic class members copied over from the parent class.
- * For example, class members (such as strings) that are not sufficiently
- * handled by a plain memory copy of the parent class into the derived class
- * have to be altered. See GClassInitFunc() for a discussion of the class
- * intialization process.
- */
-typedef void   (*GBaseInitFunc)              (gpointer         g_class);
-/**
- * GBaseFinalizeFunc:
- * @g_class: The #GTypeClass structure to finalize.
- * 
- * A callback function used by the type system to finalize those portions
- * of a derived types class structure that were setup from the corresponding
- * GBaseInitFunc() function. Class finalization basically works the inverse
- * way in which class intialization is performed.
- * See GClassInitFunc() for a discussion of the class intialization process.
- */
-typedef void   (*GBaseFinalizeFunc)          (gpointer         g_class);
-/**
- * GClassInitFunc:
- * @g_class: The #GTypeClass structure to initialize.
- * @class_data: The @class_data member supplied via the #GTypeInfo structure.
- * 
- * A callback function used by the type system to initialize the class
- * of a specific type. This function should initialize all static class
- * members.
- * The initialization process of a class involves:
- * <itemizedlist>
- * <listitem><para>
- * 	1 - Copying common members from the parent class over to the
- * 	derived class structure.
- * </para></listitem>
- * <listitem><para>
- * 	2 -  Zero initialization of the remaining members not copied
- * 	over from the parent class.
- * </para></listitem>
- * <listitem><para>
- * 	3 - Invocation of the GBaseInitFunc() initializers of all parent
- * 	types and the class' type.
- * </para></listitem>
- * <listitem><para>
- * 	4 - Invocation of the class' GClassInitFunc() initializer.
- * </para></listitem>
- * </itemizedlist>
- * Since derived classes are partially initialized through a memory copy
- * of the parent class, the general rule is that GBaseInitFunc() and
- * GBaseFinalizeFunc() should take care of necessary reinitialization
- * and release of those class members that were introduced by the type
- * that specified these GBaseInitFunc()/GBaseFinalizeFunc().
- * GClassInitFunc() should only care about initializing static
- * class members, while dynamic class members (such as allocated strings
- * or reference counted resources) are better handled by a GBaseInitFunc()
- * for this type, so proper initialization of the dynamic class members
- * is performed for class initialization of derived types as well.
- * An example may help to correspond the intend of the different class
- * initializers:
- * 
- * |[
- * typedef struct {
- *   GObjectClass parent_class;
- *   gint         static_integer;
- *   gchar       *dynamic_string;
- * } TypeAClass;
- * static void
- * type_a_base_class_init (TypeAClass *class)
- * {
- *   class->dynamic_string = g_strdup ("some string");
- * }
- * static void
- * type_a_base_class_finalize (TypeAClass *class)
- * {
- *   g_free (class->dynamic_string);
- * }
- * static void
- * type_a_class_init (TypeAClass *class)
- * {
- *   class->static_integer = 42;
- * }
- * 
- * typedef struct {
- *   TypeAClass   parent_class;
- *   gfloat       static_float;
- *   GString     *dynamic_gstring;
- * } TypeBClass;
- * static void
- * type_b_base_class_init (TypeBClass *class)
- * {
- *   class->dynamic_gstring = g_string_new ("some other string");
- * }
- * static void
- * type_b_base_class_finalize (TypeBClass *class)
- * {
- *   g_string_free (class->dynamic_gstring);
- * }
- * static void
- * type_b_class_init (TypeBClass *class)
- * {
- *   class->static_float = 3.14159265358979323846;
- * }
- * ]|
- * Initialization of TypeBClass will first cause initialization of
- * TypeAClass (derived classes reference their parent classes, see
- * g_type_class_ref() on this).
- * Initialization of TypeAClass roughly involves zero-initializing its fields,
- * then calling its GBaseInitFunc() type_a_base_class_init() to allocate
- * its dynamic members (dynamic_string), and finally calling its GClassInitFunc()
- * type_a_class_init() to initialize its static members (static_integer).
- * The first step in the initialization process of TypeBClass is then
- * a plain memory copy of the contents of TypeAClass into TypeBClass and 
- * zero-initialization of the remaining fields in TypeBClass.
- * The dynamic members of TypeAClass within TypeBClass now need
- * reinitialization which is performed by calling type_a_base_class_init()
- * with an argument of TypeBClass.
- * After that, the GBaseInitFunc() of TypeBClass, type_b_base_class_init()
- * is called to allocate the dynamic members of TypeBClass (dynamic_gstring),
- * and finally the GClassInitFunc() of TypeBClass, type_b_class_init(),
- * is called to complete the initialization process with the static members
- * (static_float).
- * Corresponding finalization counter parts to the GBaseInitFunc() functions
- * have to be provided to release allocated resources at class finalization
- * time.
- */
-typedef void   (*GClassInitFunc)             (gpointer         g_class,
-					      gpointer         class_data);
-/**
- * GClassFinalizeFunc:
- * @g_class: The #GTypeClass structure to finalize.
- * @class_data: The @class_data member supplied via the #GTypeInfo structure.
- * 
- * A callback function used by the type system to finalize a class.
- * This function is rarely needed, as dynamically allocated class resources
- * should be handled by GBaseInitFunc() and GBaseFinalizeFunc().
- * Also, specification of a GClassFinalizeFunc() in the #GTypeInfo
- * structure of a static type is invalid, because classes of static types
- * will never be finalized (they are artificially kept alive when their
- * reference count drops to zero).
- */
-typedef void   (*GClassFinalizeFunc)         (gpointer         g_class,
-					      gpointer         class_data);
-/**
- * GInstanceInitFunc:
- * @instance: The instance to initialize.
- * @g_class: The class of the type the instance is created for.
- * 
- * A callback function used by the type system to initialize a new
- * instance of a type. This function initializes all instance members and
- * allocates any resources required by it.
- * Initialization of a derived instance involves calling all its parent
- * types instance initializers, so the class member of the instance
- * is altered during its initialization to always point to the class that
- * belongs to the type the current initializer was introduced for.
- */
-typedef void   (*GInstanceInitFunc)          (GTypeInstance   *instance,
-					      gpointer         g_class);
-/**
- * GInterfaceInitFunc:
- * @g_iface: The interface structure to initialize.
- * @iface_data: The @interface_data supplied via the #GInterfaceInfo structure.
- * 
- * A callback function used by the type system to initialize a new
- * interface.  This function should initialize all internal data and
- * allocate any resources required by the interface.
- */
-typedef void   (*GInterfaceInitFunc)         (gpointer         g_iface,
-					      gpointer         iface_data);
-/**
- * GInterfaceFinalizeFunc:
- * @g_iface: The interface structure to finalize.
- * @iface_data: The @interface_data supplied via the #GInterfaceInfo structure.
- * 
- * A callback function used by the type system to finalize an interface.
- * This function should destroy any internal data and release any resources
- * allocated by the corresponding GInterfaceInitFunc() function.
- */
-typedef void   (*GInterfaceFinalizeFunc)     (gpointer         g_iface,
-					      gpointer         iface_data);
-/**
- * GTypeClassCacheFunc:
- * @cache_data: data that was given to the g_type_add_class_cache_func() call
- * @g_class: The #GTypeClass structure which is unreferenced
- * 
- * A callback function which is called when the reference count of a class 
- * drops to zero. It may use g_type_class_ref() to prevent the class from
- * being freed. You should not call g_type_class_unref() from a 
- * #GTypeClassCacheFunc function to prevent infinite recursion, use 
- * g_type_class_unref_uncached() instead.
- * 
- * The functions have to check the class id passed in to figure 
- * whether they actually want to cache the class of this type, since all
- * classes are routed through the same #GTypeClassCacheFunc chain.
- * 
- * Returns: %TRUE to stop further #GTypeClassCacheFunc<!-- -->s from being 
- *  called, %FALSE to continue.
- */
-typedef gboolean (*GTypeClassCacheFunc)	     (gpointer	       cache_data,
-					      GTypeClass      *g_class);
-/**
- * GTypeInterfaceCheckFunc:
- * @check_data: data passed to g_type_add_interface_check().
- * @g_iface: the interface that has been initialized
- * 
- * A callback called after an interface vtable is initialized.
- * See g_type_add_interface_check().
- * 
- * Since: 2.4
- */
-typedef void     (*GTypeInterfaceCheckFunc)  (gpointer	       check_data,
-					      gpointer         g_iface);
-/**
- * GTypeFundamentalFlags:
- * @G_TYPE_FLAG_CLASSED: Indicates a classed type.
- * @G_TYPE_FLAG_INSTANTIATABLE: Indicates an instantiable type (implies classed).
- * @G_TYPE_FLAG_DERIVABLE: Indicates a flat derivable type.
- * @G_TYPE_FLAG_DEEP_DERIVABLE: Indicates a deep derivable type (implies derivable).
- * 
- * Bit masks used to check or determine specific characteristics of a
- * fundamental type.
- */
-typedef enum    /*< skip >*/
-{
-  G_TYPE_FLAG_CLASSED           = (1 << 0),
-  G_TYPE_FLAG_INSTANTIATABLE    = (1 << 1),
-  G_TYPE_FLAG_DERIVABLE         = (1 << 2),
-  G_TYPE_FLAG_DEEP_DERIVABLE    = (1 << 3)
-} GTypeFundamentalFlags;
-/**
- * GTypeFlags:
- * @G_TYPE_FLAG_ABSTRACT: Indicates an abstract type. No instances can be
- *  created for an abstract type.
- * @G_TYPE_FLAG_VALUE_ABSTRACT: Indicates an abstract value type, i.e. a type
- *  that introduces a value table, but can't be used for
- *  g_value_init().
- * 
- * Bit masks used to check or determine characteristics of a type.
- */
-typedef enum    /*< skip >*/
-{
-  G_TYPE_FLAG_ABSTRACT		= (1 << 4),
-  G_TYPE_FLAG_VALUE_ABSTRACT	= (1 << 5)
-} GTypeFlags;
-/**
- * GTypeInfo:
- * @class_size: Size of the class structure (required for interface, classed and instantiatable types).
- * @base_init: Location of the base initialization function (optional).
- * @base_finalize: Location of the base finalization function (optional).
- * @class_init: Location of the class initialization function for
- *  classed and instantiatable types. Location of the default vtable 
- *  inititalization function for interface types. (optional) This function 
- *  is used both to fill in virtual functions in the class or default vtable, 
- *  and to do type-specific setup such as registering signals and object
- *  properties.
- * @class_finalize: Location of the class finalization function for
- *  classed and instantiatable types. Location fo the default vtable 
- *  finalization function for interface types. (optional)
- * @class_data: User-supplied data passed to the class init/finalize functions.
- * @instance_size: Size of the instance (object) structure (required for instantiatable types only).
- * @n_preallocs: Prior to GLib 2.10, it specified the number of pre-allocated (cached) instances to reserve memory for (0 indicates no caching). Since GLib 2.10, it is ignored, since instances are allocated with the <link linkend="glib-Memory-Slices">slice allocator</link> now.
- * @instance_init: Location of the instance initialization function (optional, for instantiatable types only).
- * @value_table: A #GTypeValueTable function table for generic handling of GValues of this type (usually only
- *  useful for fundamental types).
- * 
- * This structure is used to provide the type system with the information
- * required to initialize and destruct (finalize) a type's class and
- * its instances.
- * The initialized structure is passed to the g_type_register_static() function
- * (or is copied into the provided #GTypeInfo structure in the
- * g_type_plugin_complete_type_info()). The type system will perform a deep
- * copy of this structure, so its memory does not need to be persistent
- * across invocation of g_type_register_static().
- */
-struct _GTypeInfo
-{
-  /* interface types, classed types, instantiated types */
-  guint16                class_size;
-  
-  GBaseInitFunc          base_init;
-  GBaseFinalizeFunc      base_finalize;
-  
-  /* interface types, classed types, instantiated types */
-  GClassInitFunc         class_init;
-  GClassFinalizeFunc     class_finalize;
-  gconstpointer          class_data;
-  
-  /* instantiated types */
-  guint16                instance_size;
-  guint16                n_preallocs;
-  GInstanceInitFunc      instance_init;
-  
-  /* value handling */
-  const GTypeValueTable	*value_table;
-};
-/**
- * GTypeFundamentalInfo:
- * @type_flags: #GTypeFundamentalFlags describing the characteristics of the fundamental type
- * 
- * A structure that provides information to the type system which is
- * used specifically for managing fundamental types.  
- */
-struct _GTypeFundamentalInfo
-{
-  GTypeFundamentalFlags  type_flags;
-};
-/**
- * GInterfaceInfo:
- * @interface_init: location of the interface initialization function
- * @interface_finalize: location of the interface finalization function
- * @interface_data: user-supplied data passed to the interface init/finalize functions
- * 
- * A structure that provides information to the type system which is
- * used specifically for managing interface types.
- */
-struct _GInterfaceInfo
-{
-  GInterfaceInitFunc     interface_init;
-  GInterfaceFinalizeFunc interface_finalize;
-  gpointer               interface_data;
-};
-/**
- * GTypeValueTable:
- * @value_init: Default initialize @values contents by poking values
- *  directly into the value->data array. The data array of
- *  the #GValue passed into this function was zero-filled
- *  with <function>memset()</function>, so no care has to
- *  be taken to free any
- *  old contents. E.g. for the implementation of a string
- *  value that may never be %NULL, the implementation might
- *  look like:
- *  |[
- *  value->data[0].v_pointer = g_strdup ("");
- *  ]|
- * @value_free: Free any old contents that might be left in the
- *  data array of the passed in @value. No resources may
- *  remain allocated through the #GValue contents after
- *  this function returns. E.g. for our above string type:
- *  |[
- *  // only free strings without a specific flag for static storage
- *  if (!(value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS))
- *    g_free (value->data[0].v_pointer);
- *  ]|
- * @value_copy: @dest_value is a #GValue with zero-filled data section
- *  and @src_value is a properly setup #GValue of same or
- *  derived type.
- *  The purpose of this function is to copy the contents of
- *  @src_value into @dest_value in a way, that even after
- *  @src_value has been freed, the contents of @dest_value
- *  remain valid. String type example:
- *  |[
- *  dest_value->data[0].v_pointer = g_strdup (src_value->data[0].v_pointer);
- *  ]|
- * @value_peek_pointer: If the value contents fit into a pointer, such as objects
- *  or strings, return this pointer, so the caller can peek at
- *  the current contents. To extend on our above string example:
- *  |[
- *  return value->data[0].v_pointer;
- *  ]|
- * @collect_format: A string format describing how to collect the contents of
- *  this value bit-by-bit. Each character in the format represents
- *  an argument to be collected, and the characters themselves indicate
- *  the type of the argument. Currently supported arguments are:
- *  <variablelist>
- *  <varlistentry><term /><listitem><para>
- *  'i' - Integers. passed as collect_values[].v_int.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'l' - Longs. passed as collect_values[].v_long.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'd' - Doubles. passed as collect_values[].v_double.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'p' - Pointers. passed as collect_values[].v_pointer.
- *  </para></listitem></varlistentry>
- *  </variablelist>
- *  It should be noted that for variable argument list construction,
- *  ANSI C promotes every type smaller than an integer to an int, and
- *  floats to doubles. So for collection of short int or char, 'i'
- *  needs to be used, and for collection of floats 'd'.
- * @collect_value: The collect_value() function is responsible for converting the
- *  values collected from a variable argument list into contents
- *  suitable for storage in a GValue. This function should setup
- *  @value similar to value_init(); e.g. for a string value that
- *  does not allow %NULL pointers, it needs to either spew an error,
- *  or do an implicit conversion by storing an empty string.
- *  The @value passed in to this function has a zero-filled data
- *  array, so just like for value_init() it is guaranteed to not
- *  contain any old contents that might need freeing.
- *  @n_collect_values is exactly the string length of @collect_format,
- *  and @collect_values is an array of unions #GTypeCValue with
- *  length @n_collect_values, containing the collected values
- *  according to @collect_format.
- *  @collect_flags is an argument provided as a hint by the caller.
- *  It may contain the flag %G_VALUE_NOCOPY_CONTENTS indicating,
- *  that the collected value contents may be considered "static"
- *  for the duration of the @value lifetime.
- *  Thus an extra copy of the contents stored in @collect_values is
- *  not required for assignment to @value.
- *  For our above string example, we continue with:
- *  |[
- *  if (!collect_values[0].v_pointer)
- *    value->data[0].v_pointer = g_strdup ("");
- *  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
- *  {
- *    value->data[0].v_pointer = collect_values[0].v_pointer;
- *    // keep a flag for the value_free() implementation to not free this string
- *    value->data[1].v_uint = G_VALUE_NOCOPY_CONTENTS;
- *  }
- *  else
- *    value->data[0].v_pointer = g_strdup (collect_values[0].v_pointer);
- *  return NULL;
- *  ]|
- *  It should be noted, that it is generally a bad idea to follow the
- *  #G_VALUE_NOCOPY_CONTENTS hint for reference counted types. Due to
- *  reentrancy requirements and reference count assertions performed
- *  by the signal emission code, reference counts should always be
- *  incremented for reference counted contents stored in the value->data
- *  array.  To deviate from our string example for a moment, and taking
- *  a look at an exemplary implementation for collect_value() of
- *  #GObject:
- *  |[
- *  if (collect_values[0].v_pointer)
- *  {
- *    GObject *object = G_OBJECT (collect_values[0].v_pointer);
- *    // never honour G_VALUE_NOCOPY_CONTENTS for ref-counted types
- *    value->data[0].v_pointer = g_object_ref (object);
- *    return NULL;
- *  }
- *  else
- *    return g_strdup_printf ("Object passed as invalid NULL pointer");
- *  }
- *  ]|
- *  The reference count for valid objects is always incremented,
- *  regardless of @collect_flags. For invalid objects, the example
- *  returns a newly allocated string without altering @value.
- *  Upon success, collect_value() needs to return %NULL. If, however,
- *  an error condition occurred, collect_value() may spew an
- *  error by returning a newly allocated non-%NULL string, giving
- *  a suitable description of the error condition.
- *  The calling code makes no assumptions about the @value
- *  contents being valid upon error returns, @value
- *  is simply thrown away without further freeing. As such, it is
- *  a good idea to not allocate #GValue contents, prior to returning
- *  an error, however, collect_values() is not obliged to return
- *  a correctly setup @value for error returns, simply because
- *  any non-%NULL return is considered a fatal condition so further
- *  program behaviour is undefined.
- * @lcopy_format: Format description of the arguments to collect for @lcopy_value,
- *  analogous to @collect_format. Usually, @lcopy_format string consists
- *  only of 'p's to provide lcopy_value() with pointers to storage locations.
- * @lcopy_value: This function is responsible for storing the @value contents into
- *  arguments passed through a variable argument list which got
- *  collected into @collect_values according to @lcopy_format.
- *  @n_collect_values equals the string length of @lcopy_format,
- *  and @collect_flags may contain %G_VALUE_NOCOPY_CONTENTS.
- *  In contrast to collect_value(), lcopy_value() is obliged to
- *  always properly support %G_VALUE_NOCOPY_CONTENTS.
- *  Similar to collect_value() the function may prematurely abort
- *  by returning a newly allocated string describing an error condition.
- *  To complete the string example:
- *  |[
- *  gchar **string_p = collect_values[0].v_pointer;
- *  if (!string_p)
- *    return g_strdup_printf ("string location passed as NULL");
- *  if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
- *    *string_p = value->data[0].v_pointer;
- *  else
- *    *string_p = g_strdup (value->data[0].v_pointer);
- *  ]|
- *  And an illustrative version of lcopy_value() for
- *  reference-counted types:
- *  |[
- *  GObject **object_p = collect_values[0].v_pointer;
- *  if (!object_p)
- *    return g_strdup_printf ("object location passed as NULL");
- *  if (!value->data[0].v_pointer)
- *    *object_p = NULL;
- *  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) /&ast; always honour &ast;/
- *    *object_p = value->data[0].v_pointer;
- *  else
- *    *object_p = g_object_ref (value->data[0].v_pointer);
- *  return NULL;
- *  ]|
- * 
- * The #GTypeValueTable provides the functions required by the #GValue implementation,
- * to serve as a container for values of a type.
- */
-
-struct _GTypeValueTable
-{
-  void     (*value_init)         (GValue       *value);
-  void     (*value_free)         (GValue       *value);
-  void     (*value_copy)         (const GValue *src_value,
-				  GValue       *dest_value);
-  /* varargs functionality (optional) */
-  gpointer (*value_peek_pointer) (const GValue *value);
-  const gchar *collect_format;
-  gchar*   (*collect_value)      (GValue       *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-  const gchar *lcopy_format;
-  gchar*   (*lcopy_value)        (const GValue *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-};
-GType g_type_register_static		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 GTypeFlags		     flags);
-GType g_type_register_static_simple     (GType                       parent_type,
-					 const gchar                *type_name,
-					 guint                       class_size,
-					 GClassInitFunc              class_init,
-					 guint                       instance_size,
-					 GInstanceInitFunc           instance_init,
-					 GTypeFlags	             flags);
-  
-GType g_type_register_dynamic		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 GTypePlugin		    *plugin,
-					 GTypeFlags		     flags);
-GType g_type_register_fundamental	(GType			     type_id,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 const GTypeFundamentalInfo *finfo,
-					 GTypeFlags		     flags);
-void  g_type_add_interface_static	(GType			     instance_type,
-					 GType			     interface_type,
-					 const GInterfaceInfo	    *info);
-void  g_type_add_interface_dynamic	(GType			     instance_type,
-					 GType			     interface_type,
-					 GTypePlugin		    *plugin);
-void  g_type_interface_add_prerequisite (GType			     interface_type,
-					 GType			     prerequisite_type);
-GType*g_type_interface_prerequisites    (GType                       interface_type,
-					 guint                      *n_prerequisites);
-void     g_type_class_add_private       (gpointer                    g_class,
-                                         gsize                       private_size);
-gpointer g_type_instance_get_private    (GTypeInstance              *instance,
-                                         GType                       private_type);
-
-void      g_type_add_class_private      (GType    		     class_type,
-					 gsize    		     private_size);
-gpointer  g_type_class_get_private      (GTypeClass 		    *klass,
-					 GType			     private_type);
-
-GLIB_AVAILABLE_IN_2_34
-void      g_type_ensure                 (GType                       type);
-
-/* --- GType boilerplate --- */
-/**
- * G_DEFINE_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for type implementations, which declares a 
- * class initialization function, an instance initialization function (see #GTypeInfo for information about 
- * these) and a static variable named @t_n<!-- -->_parent_class pointing to the parent class. Furthermore, it defines 
- * a *_get_type() function. See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_TYPE(TN, t_n, T_P)			    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-/**
- * G_DEFINE_TYPE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type in lowercase, with words separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- * 
- * A convenience macro for type implementations.  
- * Similar to G_DEFINE_TYPE(), but allows you to insert custom code into the 
- * *_get_type() function, e.g. interface implementations via G_IMPLEMENT_INTERFACE().
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)	    _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-/**
- * G_DEFINE_ABSTRACT_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for type implementations. 
- * Similar to G_DEFINE_TYPE(), but defines an abstract type. 
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)		    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {})
-/**
- * G_DEFINE_ABSTRACT_TYPE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_C_: Custom code that gets inserted in the @type_name_get_type() function.
- * 
- * A convenience macro for type implementations.
- * Similar to G_DEFINE_TYPE_WITH_CODE(), but defines an abstract type and allows you to 
- * insert custom code into the *_get_type() function, e.g. interface implementations 
- * via G_IMPLEMENT_INTERFACE(). See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-/**
- * G_DEFINE_TYPE_EXTENDED:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words
- *    separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_f_: #GTypeFlags to pass to g_type_register_static()
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * The most general convenience macro for type implementations, on which
- * G_DEFINE_TYPE(), etc are based.
- *
- * |[
- * G_DEFINE_TYPE_EXTENDED (GtkGadget,
- *                         gtk_gadget,
- *                         GTK_TYPE_WIDGET,
- *                         0,
- *                         G_IMPLEMENT_INTERFACE (TYPE_GIZMO,
- *                                                gtk_gadget_gizmo_init));
- * ]|
- * expands to
- * |[
- * static void     gtk_gadget_init       (GtkGadget      *self);
- * static void     gtk_gadget_class_init (GtkGadgetClass *klass);
- * static gpointer gtk_gadget_parent_class = NULL;
- * static void     gtk_gadget_class_intern_init (gpointer klass)
- * {
- *   gtk_gadget_parent_class = g_type_class_peek_parent (klass);
- *   gtk_gadget_class_init ((GtkGadgetClass*) klass);
- * }
- *
- * GType
- * gtk_gadget_get_type (void)
- * {
- *   static volatile gsize g_define_type_id__volatile = 0;
- *   if (g_once_init_enter (&g_define_type_id__volatile))
- *     {
- *       GType g_define_type_id =
- *         g_type_register_static_simple (GTK_TYPE_WIDGET,
- *                                        g_intern_static_string ("GtkGadget"),
- *                                        sizeof (GtkGadgetClass),
- *                                        (GClassInitFunc) gtk_gadget_class_intern_init,
- *                                        sizeof (GtkGadget),
- *                                        (GInstanceInitFunc) gtk_gadget_init,
- *                                        (GTypeFlags) flags);
- *       {
- *         const GInterfaceInfo g_implement_interface_info = {
- *           (GInterfaceInitFunc) gtk_gadget_gizmo_init
- *         };
- *         g_type_add_interface_static (g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
- *       }
- *       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
- *     }
- *   return g_define_type_id__volatile;
- * }
- * ]|
- * The only pieces which have to be manually provided are the definitions of
- * the instance and class structure and the definitions of the instance and
- * class init functions.
- *
- * Since: 2.4
- */
-#define G_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)	    _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, _f_) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-/**
- * G_DEFINE_INTERFACE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words separated by '_'.
- * @T_P: The #GType of the prerequisite type for the interface, or 0
- * (%G_TYPE_INVALID) for no prerequisite type.
- *
- * A convenience macro for #GTypeInterface definitions, which declares
- * a default vtable initialization function and defines a *_get_type()
- * function.
- *
- * The macro expects the interface initialization function to have the
- * name <literal>t_n ## _default_init</literal>, and the interface
- * structure to have the name <literal>TN ## Interface</literal>.
- *
- * Since: 2.24
- */
-#define G_DEFINE_INTERFACE(TN, t_n, T_P)		    G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, ;)
-
-/**
- * G_DEFINE_INTERFACE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words separated by '_'.
- * @T_P: The #GType of the prerequisite type for the interface, or 0
- * (%G_TYPE_INVALID) for no prerequisite type.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for #GTypeInterface definitions. Similar to
- * G_DEFINE_INTERFACE(), but allows you to insert custom code into the
- * *_get_type() function, e.g. additional interface implementations
- * via G_IMPLEMENT_INTERFACE(), or additional prerequisite types. See
- * G_DEFINE_TYPE_EXTENDED() for a similar example using
- * G_DEFINE_TYPE_WITH_CODE().
- *
- * Since: 2.24
- */
-#define G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, _C_)     _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TN, t_n, T_P) {_C_;} _G_DEFINE_INTERFACE_EXTENDED_END()
-
-/**
- * G_IMPLEMENT_INTERFACE:
- * @TYPE_IFACE: The #GType of the interface to add
- * @iface_init: The interface init function
- *
- * A convenience macro to ease interface addition in the @_C_ section
- * of G_DEFINE_TYPE_WITH_CODE() or G_DEFINE_ABSTRACT_TYPE_WITH_CODE().
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- *
- * Note that this macro can only be used together with the G_DEFINE_TYPE_*
- * macros, since it depends on variable names from those macros.
- *
- * Since: 2.4
- */
-#define G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init)       { \
-  const GInterfaceInfo g_implement_interface_info = { \
-    (GInterfaceInitFunc) iface_init, NULL, NULL \
-  }; \
-  g_type_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
-\
-static void     type_name##_init              (TypeName        *self); \
-static void     type_name##_class_init        (TypeName##Class *klass); \
-static gpointer type_name##_parent_class = NULL; \
-static void     type_name##_class_intern_init (gpointer klass) \
-{ \
-  type_name##_parent_class = g_type_class_peek_parent (klass); \
-  type_name##_class_init ((TypeName##Class*) klass); \
-} \
-\
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_type_register_static_simple (TYPE_PARENT, \
-                                       g_intern_static_string (#TypeName), \
-                                       sizeof (TypeName##Class), \
-                                       (GClassInitFunc) type_name##_class_intern_init, \
-                                       sizeof (TypeName), \
-                                       (GInstanceInitFunc) type_name##_init, \
-                                       (GTypeFlags) flags); \
-      { /* custom code follows */
-#define _G_DEFINE_TYPE_EXTENDED_END()	\
-        /* following custom code */	\
-      }					\
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
-    }					\
-  return g_define_type_id__volatile;	\
-} /* closes type_name##_get_type() */
-
-#define _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PREREQ) \
-\
-static void     type_name##_default_init        (TypeName##Interface *klass); \
-\
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_type_register_static_simple (G_TYPE_INTERFACE, \
-                                       g_intern_static_string (#TypeName), \
-                                       sizeof (TypeName##Interface), \
-                                       (GClassInitFunc)type_name##_default_init, \
-                                       0, \
-                                       (GInstanceInitFunc)NULL, \
-                                       (GTypeFlags) 0); \
-      if (TYPE_PREREQ) \
-        g_type_interface_add_prerequisite (g_define_type_id, TYPE_PREREQ); \
-      { /* custom code follows */
-#define _G_DEFINE_INTERFACE_EXTENDED_END()	\
-        /* following custom code */		\
-      }						\
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
-    }						\
-  return g_define_type_id__volatile;			\
-} /* closes type_name##_get_type() */
-
-/**
- * G_DEFINE_BOXED_TYPE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @copy_func: the #GBoxedCopyFunc for the new type
- * @free_func: the #GBoxedFreeFunc for the new type
- *
- * A convenience macro for boxed type implementations, which defines a
- * type_name_get_type() function registering the boxed type.
- *
- * Since: 2.26
- */
-#define G_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) G_DEFINE_BOXED_TYPE_WITH_CODE (TypeName, type_name, copy_func, free_func, {})
-/**
- * G_DEFINE_BOXED_TYPE_WITH_CODE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @copy_func: the #GBoxedCopyFunc for the new type
- * @free_func: the #GBoxedFreeFunc for the new type
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for boxed type implementations.
- * Similar to G_DEFINE_BOXED_TYPE(), but allows to insert custom code into the
- * type_name_get_type() function, e.g. to register value transformations with
- * g_value_register_transform_func().
- *
- * Since: 2.26
- */
-#define G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName, type_name, copy_func, free_func, _C_) _G_DEFINE_BOXED_TYPE_BEGIN (TypeName, type_name, copy_func, free_func) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-#if !defined (__cplusplus) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
-#define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType (* _g_register_boxed) \
-        (const gchar *, \
-         union \
-           { \
-             TypeName * (*do_copy_type) (TypeName *); \
-             TypeName * (*do_const_copy_type) (const TypeName *); \
-             GBoxedCopyFunc do_copy_boxed; \
-           } __attribute__((__transparent_union__)), \
-         union \
-           { \
-             void (* do_free_type) (TypeName *); \
-             GBoxedFreeFunc do_free_boxed; \
-           } __attribute__((__transparent_union__)) \
-        ) = g_boxed_type_register_static; \
-      GType g_define_type_id = \
-        _g_register_boxed (g_intern_static_string (#TypeName), copy_func, free_func); \
-      { /* custom code follows */
-#else
-#define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_boxed_type_register_static (g_intern_static_string (#TypeName), \
-                                      (GBoxedCopyFunc) copy_func, \
-                                      (GBoxedFreeFunc) free_func); \
-      { /* custom code follows */
-#endif /* __GNUC__ */
-
-/**
- * G_DEFINE_POINTER_TYPE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- *
- * A convenience macro for pointer type implementations, which defines a
- * type_name_get_type() function registering the pointer type.
- *
- * Since: 2.26
- */
-#define G_DEFINE_POINTER_TYPE(TypeName, type_name) G_DEFINE_POINTER_TYPE_WITH_CODE (TypeName, type_name, {})
-/**
- * G_DEFINE_POINTER_TYPE_WITH_CODE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for pointer type implementations.
- * Similar to G_DEFINE_POINTER_TYPE(), but allows to insert custom code into the
- * type_name_get_type() function.
- *
- * Since: 2.26
- */
-#define G_DEFINE_POINTER_TYPE_WITH_CODE(TypeName, type_name, _C_) _G_DEFINE_POINTER_TYPE_BEGIN (TypeName, type_name) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-#define _G_DEFINE_POINTER_TYPE_BEGIN(TypeName, type_name) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_pointer_type_register_static (g_intern_static_string (#TypeName)); \
-      { /* custom code follows */
-
-/* --- protected (for fundamental type implementations) --- */
-GTypePlugin*	 g_type_get_plugin		(GType		     type);
-GTypePlugin*	 g_type_interface_get_plugin	(GType		     instance_type,
-						 GType               interface_type);
-GType		 g_type_fundamental_next	(void);
-GType		 g_type_fundamental		(GType		     type_id);
-GTypeInstance*   g_type_create_instance         (GType               type);
-void             g_type_free_instance           (GTypeInstance      *instance);
-
-void		 g_type_add_class_cache_func    (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void		 g_type_remove_class_cache_func (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void             g_type_class_unref_uncached    (gpointer            g_class);
-
-void             g_type_add_interface_check     (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-void             g_type_remove_interface_check  (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-
-GTypeValueTable* g_type_value_table_peek        (GType		     type);
-
-
-/*< private >*/
-gboolean	 g_type_check_instance          (GTypeInstance      *instance) G_GNUC_PURE;
-GTypeInstance*   g_type_check_instance_cast     (GTypeInstance      *instance,
-						 GType               iface_type);
-gboolean         g_type_check_instance_is_a	(GTypeInstance      *instance,
-						 GType               iface_type) G_GNUC_PURE;
-GTypeClass*      g_type_check_class_cast        (GTypeClass         *g_class,
-						 GType               is_a_type);
-gboolean         g_type_check_class_is_a        (GTypeClass         *g_class,
-						 GType               is_a_type) G_GNUC_PURE;
-gboolean	 g_type_check_is_value_type     (GType		     type) G_GNUC_CONST;
-gboolean	 g_type_check_value             (GValue		    *value) G_GNUC_PURE;
-gboolean	 g_type_check_value_holds	(GValue		    *value,
-						 GType		     type) G_GNUC_PURE;
-gboolean         g_type_test_flags              (GType               type,
-						 guint               flags) G_GNUC_CONST;
-
-
-/* --- debugging functions --- */
-const gchar *    g_type_name_from_instance      (GTypeInstance	*instance);
-const gchar *    g_type_name_from_class         (GTypeClass	*g_class);
-
-
-/* --- implementation bits --- */
-#ifndef G_DISABLE_CAST_CHECKS
-#  define _G_TYPE_CIC(ip, gt, ct) \
-    ((ct*) g_type_check_instance_cast ((GTypeInstance*) ip, gt))
-#  define _G_TYPE_CCC(cp, gt, ct) \
-    ((ct*) g_type_check_class_cast ((GTypeClass*) cp, gt))
-#else /* G_DISABLE_CAST_CHECKS */
-#  define _G_TYPE_CIC(ip, gt, ct)       ((ct*) ip)
-#  define _G_TYPE_CCC(cp, gt, ct)       ((ct*) cp)
-#endif /* G_DISABLE_CAST_CHECKS */
-#define _G_TYPE_CHI(ip)			(g_type_check_instance ((GTypeInstance*) ip))
-#define _G_TYPE_CHV(vl)			(g_type_check_value ((GValue*) vl))
-#define _G_TYPE_IGC(ip, gt, ct)         ((ct*) (((GTypeInstance*) ip)->g_class))
-#define _G_TYPE_IGI(ip, gt, ct)         ((ct*) g_type_interface_peek (((GTypeInstance*) ip)->g_class, gt))
-#ifdef	__GNUC__
-#  define _G_TYPE_CIT(ip, gt)             (G_GNUC_EXTENSION ({ \
-  GTypeInstance *__inst = (GTypeInstance*) ip; GType __t = gt; gboolean __r; \
-  if (!__inst) \
-    __r = FALSE; \
-  else if (__inst->g_class && __inst->g_class->g_type == __t) \
-    __r = TRUE; \
-  else \
-    __r = g_type_check_instance_is_a (__inst, __t); \
-  __r; \
-}))
-#  define _G_TYPE_CCT(cp, gt)             (G_GNUC_EXTENSION ({ \
-  GTypeClass *__class = (GTypeClass*) cp; GType __t = gt; gboolean __r; \
-  if (!__class) \
-    __r = FALSE; \
-  else if (__class->g_type == __t) \
-    __r = TRUE; \
-  else \
-    __r = g_type_check_class_is_a (__class, __t); \
-  __r; \
-}))
-#  define _G_TYPE_CVH(vl, gt)             (G_GNUC_EXTENSION ({ \
-  GValue *__val = (GValue*) vl; GType __t = gt; gboolean __r; \
-  if (!__val) \
-    __r = FALSE; \
-  else if (__val->g_type == __t)		\
-    __r = TRUE; \
-  else \
-    __r = g_type_check_value_holds (__val, __t); \
-  __r; \
-}))
-#else  /* !__GNUC__ */
-#  define _G_TYPE_CIT(ip, gt)             (g_type_check_instance_is_a ((GTypeInstance*) ip, gt))
-#  define _G_TYPE_CCT(cp, gt)             (g_type_check_class_is_a ((GTypeClass*) cp, gt))
-#  define _G_TYPE_CVH(vl, gt)             (g_type_check_value_holds ((GValue*) vl, gt))
-#endif /* !__GNUC__ */
-/**
- * G_TYPE_FLAG_RESERVED_ID_BIT:
- * 
- * A bit in the type number that's supposed to be left untouched.
- */
-#define	G_TYPE_FLAG_RESERVED_ID_BIT	((GType) (1 << 0))
-extern GTypeDebugFlags			_g_type_debug_flags;
-
-G_END_DECLS
-
-#endif /* __G_TYPE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gtypemodule.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gtypemodule.h
deleted file mode 100644
index f2d524bd..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gtypemodule.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_MODULE_H__
-#define __G_TYPE_MODULE_H__
-
-#include <gobject/gobject.h>
-#include <gobject/genums.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTypeModule      GTypeModule;
-typedef struct _GTypeModuleClass GTypeModuleClass;
-
-#define G_TYPE_TYPE_MODULE              (g_type_module_get_type ())
-#define G_TYPE_MODULE(module)           (G_TYPE_CHECK_INSTANCE_CAST ((module), G_TYPE_TYPE_MODULE, GTypeModule))
-#define G_TYPE_MODULE_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TYPE_MODULE, GTypeModuleClass))
-#define G_IS_TYPE_MODULE(module)        (G_TYPE_CHECK_INSTANCE_TYPE ((module), G_TYPE_TYPE_MODULE))
-#define G_IS_TYPE_MODULE_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TYPE_MODULE))
-#define G_TYPE_MODULE_GET_CLASS(module) (G_TYPE_INSTANCE_GET_CLASS ((module), G_TYPE_TYPE_MODULE, GTypeModuleClass))
-
-/**
- * GTypeModule:
- * @name: the name of the module
- * 
- * The members of the <structname>GTypeModule</structname> structure should not 
- * be accessed directly, except for the @name field.
- */
-struct _GTypeModule 
-{
-  GObject parent_instance;
-
-  guint use_count;
-  GSList *type_infos;
-  GSList *interface_infos;
-
-  /*< public >*/
-  gchar *name;
-};
-
-/**
- * GTypeModuleClass:
- * @parent_class: the parent class
- * @load: loads the module and registers one or more types using
- *  g_type_module_register_type().
- * @unload: unloads the module
- * 
- * In order to implement dynamic loading of types based on #GTypeModule, 
- * the @load and @unload functions in #GTypeModuleClass must be implemented.
- */
-struct _GTypeModuleClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  gboolean (* load)   (GTypeModule *module);
-  void     (* unload) (GTypeModule *module);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*reserved1) (void);
-  void (*reserved2) (void);
-  void (*reserved3) (void);
-  void (*reserved4) (void);
-};
-
-/**
- * G_DEFINE_DYNAMIC_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for dynamic type implementations, which declares a
- * class initialization function, an instance initialization function (see 
- * #GTypeInfo for information about these) and a static variable named 
- * @t_n<!-- -->_parent_class pointing to the parent class. Furthermore, 
- * it defines a <function>*_get_type()</function> and a static 
- * <function>*_register_type()</function> function for use in your
- * <function>module_init()</function>.
- * See G_DEFINE_DYNAMIC_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.14
- */
-#define G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)          G_DEFINE_DYNAMIC_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-/**
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @TYPE_PARENT: The #GType of the parent type.
- * @flags: #GTypeFlags to pass to g_type_module_register_type()
- * @CODE: Custom code that gets inserted in the *_get_type() function.
- * 
- * A more general version of G_DEFINE_DYNAMIC_TYPE() which
- * allows to specify #GTypeFlags and custom code.
- * 
- * |[
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED (GtkGadget,
- *                                 gtk_gadget,
- *                                 GTK_TYPE_THING,
- *                                 0,
- *                                 G_IMPLEMENT_INTERFACE_DYNAMIC (TYPE_GIZMO,
- *                                                                gtk_gadget_gizmo_init));
- * ]|
- * expands to
- * |[
- * static void     gtk_gadget_init              (GtkGadget      *self);
- * static void     gtk_gadget_class_init        (GtkGadgetClass *klass);
- * static void     gtk_gadget_class_finalize    (GtkGadgetClass *klass);
- * 
- * static gpointer gtk_gadget_parent_class = NULL;
- * static GType    gtk_gadget_type_id = 0;
- * 
- * static void     gtk_gadget_class_intern_init (gpointer klass)
- * {
- *   gtk_gadget_parent_class = g_type_class_peek_parent (klass); 
- *   gtk_gadget_class_init ((GtkGadgetClass*) klass); 
- * }
- * 
- * GType
- * gtk_gadget_get_type (void)
- * {
- *   return gtk_gadget_type_id;
- * }
- * 
- * static void
- * gtk_gadget_register_type (GTypeModule *type_module)
- * {
- *   const GTypeInfo g_define_type_info = {
- *     sizeof (GtkGadgetClass),
- *     (GBaseInitFunc) NULL,
- *     (GBaseFinalizeFunc) NULL,
- *     (GClassInitFunc) gtk_gadget_class_intern_init,
- *     (GClassFinalizeFunc) gtk_gadget_class_finalize,
- *     NULL,   // class_data
- *     sizeof (GtkGadget),
- *     0,      // n_preallocs
- *     (GInstanceInitFunc) gtk_gadget_init, 
- *     NULL    // value_table
- *   };
- *   gtk_gadget_type_id = g_type_module_register_type (type_module,
- *                                                     GTK_TYPE_THING,
- *                                                     "GtkGadget",
- *                                                     &g_define_type_info,
- *                                                     (GTypeFlags) flags);
- *   {
- *     const GInterfaceInfo g_implement_interface_info = {
- *       (GInterfaceInitFunc) gtk_gadget_gizmo_init
- *     };
- *     g_type_module_add_interface (type_module, g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
- *   }
- * }
- * ]|
- * 
- * Since: 2.14
- */
-#define G_DEFINE_DYNAMIC_TYPE_EXTENDED(TypeName, type_name, TYPE_PARENT, flags, CODE) \
-static void     type_name##_init              (TypeName        *self); \
-static void     type_name##_class_init        (TypeName##Class *klass); \
-static void     type_name##_class_finalize    (TypeName##Class *klass); \
-static gpointer type_name##_parent_class = NULL; \
-static GType    type_name##_type_id = 0; \
-static void     type_name##_class_intern_init (gpointer klass) \
-{ \
-  type_name##_parent_class = g_type_class_peek_parent (klass); \
-  type_name##_class_init ((TypeName##Class*) klass); \
-} \
-GType \
-type_name##_get_type (void) \
-{ \
-  return type_name##_type_id; \
-} \
-static void \
-type_name##_register_type (GTypeModule *type_module) \
-{ \
-  GType g_define_type_id G_GNUC_UNUSED; \
-  const GTypeInfo g_define_type_info = { \
-    sizeof (TypeName##Class), \
-    (GBaseInitFunc) NULL, \
-    (GBaseFinalizeFunc) NULL, \
-    (GClassInitFunc) type_name##_class_intern_init, \
-    (GClassFinalizeFunc) type_name##_class_finalize, \
-    NULL,   /* class_data */ \
-    sizeof (TypeName), \
-    0,      /* n_preallocs */ \
-    (GInstanceInitFunc) type_name##_init, \
-    NULL    /* value_table */ \
-  }; \
-  type_name##_type_id = g_type_module_register_type (type_module, \
-						     TYPE_PARENT, \
-						     #TypeName, \
-						     &g_define_type_info, \
-						     (GTypeFlags) flags); \
-  g_define_type_id = type_name##_type_id; \
-  { CODE ; } \
-}
-
-/**
- * G_IMPLEMENT_INTERFACE_DYNAMIC:
- * @TYPE_IFACE: The #GType of the interface to add
- * @iface_init: The interface init function
- *
- * A convenience macro to ease interface addition in the @_C_ section
- * of G_DEFINE_DYNAMIC_TYPE_EXTENDED(). See G_DEFINE_DYNAMIC_TYPE_EXTENDED()
- * for an example.
- *
- * Note that this macro can only be used together with the
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED macros, since it depends on variable
- * names from that macro.
- *
- * Since: 2.24
- */
-#define G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init)       { \
-  const GInterfaceInfo g_implement_interface_info = { \
-    (GInterfaceInitFunc) iface_init, NULL, NULL      \
-  }; \
-  g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-GType    g_type_module_get_type       (void) G_GNUC_CONST;
-gboolean g_type_module_use            (GTypeModule          *module);
-void     g_type_module_unuse          (GTypeModule          *module);
-void     g_type_module_set_name       (GTypeModule          *module,
-                                       const gchar          *name);
-GType    g_type_module_register_type  (GTypeModule          *module,
-                                       GType                 parent_type,
-                                       const gchar          *type_name,
-                                       const GTypeInfo      *type_info,
-                                       GTypeFlags            flags);
-void     g_type_module_add_interface  (GTypeModule          *module,
-                                       GType                 instance_type,
-                                       GType                 interface_type,
-                                       const GInterfaceInfo *interface_info);
-GType    g_type_module_register_enum  (GTypeModule          *module,
-                                       const gchar          *name,
-                                       const GEnumValue     *const_static_values);
-GType    g_type_module_register_flags (GTypeModule          *module,
-                                       const gchar          *name,
-                                       const GFlagsValue    *const_static_values);
-
-G_END_DECLS
-
-#endif /* __G_TYPE_MODULE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gtypeplugin.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gtypeplugin.h
deleted file mode 100644
index ff87a701..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gtypeplugin.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_PLUGIN_H__
-#define __G_TYPE_PLUGIN_H__
-
-#include	<gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_TYPE_PLUGIN		(g_type_plugin_get_type ())
-#define G_TYPE_PLUGIN(inst)		(G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TYPE_PLUGIN, GTypePlugin))
-#define G_TYPE_PLUGIN_CLASS(vtable)	(G_TYPE_CHECK_CLASS_CAST ((vtable), G_TYPE_TYPE_PLUGIN, GTypePluginClass))
-#define G_IS_TYPE_PLUGIN(inst)		(G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TYPE_PLUGIN))
-#define G_IS_TYPE_PLUGIN_CLASS(vtable)	(G_TYPE_CHECK_CLASS_TYPE ((vtable), G_TYPE_TYPE_PLUGIN))
-#define G_TYPE_PLUGIN_GET_CLASS(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TYPE_PLUGIN, GTypePluginClass))
-
-
-/* --- typedefs & structures --- */
-typedef struct _GTypePluginClass		   GTypePluginClass;
-/**
- * GTypePluginUse:
- * @plugin: the #GTypePlugin whose use count should be increased
- * 
- * The type of the @use_plugin function of #GTypePluginClass, which gets called
- * to increase the use count of @plugin.
- */
-typedef void  (*GTypePluginUse)			  (GTypePlugin     *plugin);
-/**
- * GTypePluginUnuse:
- * @plugin: the #GTypePlugin whose use count should be decreased
- * 
- * The type of the @unuse_plugin function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginUnuse)		  (GTypePlugin     *plugin);
-/**
- * GTypePluginCompleteTypeInfo:
- * @plugin: the #GTypePlugin
- * @g_type: the #GType whose info is completed
- * @info: the #GTypeInfo struct to fill in
- * @value_table: the #GTypeValueTable to fill in
- * 
- * The type of the @complete_type_info function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginCompleteTypeInfo)	  (GTypePlugin     *plugin,
-						   GType            g_type,
-						   GTypeInfo       *info,
-						   GTypeValueTable *value_table);
-/**
- * GTypePluginCompleteInterfaceInfo:
- * @plugin: the #GTypePlugin
- * @instance_type: the #GType of an instantiable type to which the interface
- *  is added
- * @interface_type: the #GType of the interface whose info is completed
- * @info: the #GInterfaceInfo to fill in
- * 
- * The type of the @complete_interface_info function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginCompleteInterfaceInfo) (GTypePlugin     *plugin,
-						   GType            instance_type,
-						   GType            interface_type,
-						   GInterfaceInfo  *info);
-/**
- * GTypePlugin:
- * 
- * The <structname>GTypePlugin</structname> typedef is used as a placeholder 
- * for objects that implement the <structname>GTypePlugin</structname> 
- * interface.
- */
-/**
- * GTypePluginClass:
- * @use_plugin: Increases the use count of the plugin.
- * @unuse_plugin: Decreases the use count of the plugin.
- * @complete_type_info: Fills in the #GTypeInfo and 
- *  #GTypeValueTable structs for the type. The structs are initialized
- *  with <literal>memset(s, 0, sizeof (s))</literal> before calling 
- *  this function.
- * @complete_interface_info: Fills in missing parts of the #GInterfaceInfo 
- *  for the interface. The structs is initialized with 
- *  <literal>memset(s, 0, sizeof (s))</literal> before calling
- *  this function.
- * 
- * The #GTypePlugin interface is used by the type system in order to handle
- * the lifecycle of dynamically loaded types.
- */
-struct _GTypePluginClass
-{
-  /*< private >*/
-  GTypeInterface		   base_iface;
-  
-  /*< public >*/
-  GTypePluginUse		   use_plugin;
-  GTypePluginUnuse		   unuse_plugin;
-  GTypePluginCompleteTypeInfo	   complete_type_info;
-  GTypePluginCompleteInterfaceInfo complete_interface_info;
-};
-
-
-/* --- prototypes --- */
-GType	g_type_plugin_get_type			(void)	G_GNUC_CONST;
-void	g_type_plugin_use			(GTypePlugin	 *plugin);
-void	g_type_plugin_unuse			(GTypePlugin	 *plugin);
-void	g_type_plugin_complete_type_info	(GTypePlugin     *plugin,
-						 GType            g_type,
-						 GTypeInfo       *info,
-						 GTypeValueTable *value_table);
-void	g_type_plugin_complete_interface_info	(GTypePlugin     *plugin,
-						 GType            instance_type,
-						 GType            interface_type,
-						 GInterfaceInfo  *info);
-
-G_END_DECLS
-
-#endif /* __G_TYPE_PLUGIN_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gvalue.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gvalue.h
deleted file mode 100644
index 7bebfb14..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gvalue.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvalue.h: generic GValue functions
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUE_H__
-#define __G_VALUE_H__
-
-#include	<gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_VALUE:
- * @type: A #GType value.
- * 
- * Checks whether the passed in type ID can be used for g_value_init().
- * That is, this macro checks whether this type provides an implementation
- * of the #GTypeValueTable functions required for a type to create a #GValue of.
- * 
- * Returns: Whether @type is suitable as a #GValue type.
- */
-#define	G_TYPE_IS_VALUE(type)		(g_type_check_is_value_type (type))
-/**
- * G_IS_VALUE:
- * @value: A #GValue structure.
- * 
- * Checks if @value is a valid and initialized #GValue structure.
- *
- * Returns: %TRUE on success.
- */
-#define	G_IS_VALUE(value)		(G_TYPE_CHECK_VALUE (value))
-/**
- * G_VALUE_TYPE:
- * @value: A #GValue structure.
- *
- * Get the type identifier of @value.
- *
- * Returns: the #GType.
- */
-#define	G_VALUE_TYPE(value)		(((GValue*) (value))->g_type)
-/**
- * G_VALUE_TYPE_NAME:
- * @value: A #GValue structure.
- *
- * Gets the type name of @value.
- *
- * Returns: the type name.
- */
-#define	G_VALUE_TYPE_NAME(value)	(g_type_name (G_VALUE_TYPE (value)))
-/**
- * G_VALUE_HOLDS:
- * @value: A #GValue structure.
- * @type: A #GType value.
- *
- * Checks if @value holds (or contains) a value of @type.
- * This macro will also check for @value != %NULL and issue a
- * warning if the check fails.
- *
- * Returns: %TRUE if @value holds the @type.
- */
-#define G_VALUE_HOLDS(value,type)	(G_TYPE_CHECK_VALUE_TYPE ((value), (type)))
-
-
-/* --- typedefs & structures --- */
-/**
- * GValueTransform:
- * @src_value: Source value.
- * @dest_value: Target value.
- * 
- * The type of value transformation functions which can be registered with
- * g_value_register_transform_func().
- */
-typedef void (*GValueTransform) (const GValue *src_value,
-				 GValue       *dest_value);
-/**
- * GValue:
- * 
- * An opaque structure used to hold different types of values.
- * The data within the structure has protected scope: it is accessible only
- * to functions within a #GTypeValueTable structure, or implementations of
- * the g_value_*() API. That is, code portions which implement new fundamental
- * types.
- * #GValue users cannot make any assumptions about how data is stored
- * within the 2 element @data union, and the @g_type member should
- * only be accessed through the G_VALUE_TYPE() macro.
- */
-struct _GValue
-{
-  /*< private >*/
-  GType		g_type;
-
-  /* public for GTypeValueTable methods */
-  union {
-    gint	v_int;
-    guint	v_uint;
-    glong	v_long;
-    gulong	v_ulong;
-    gint64      v_int64;
-    guint64     v_uint64;
-    gfloat	v_float;
-    gdouble	v_double;
-    gpointer	v_pointer;
-  } data[2];
-};
-
-
-/* --- prototypes --- */
-GValue*         g_value_init	   	(GValue       *value,
-					 GType         g_type);
-void            g_value_copy    	(const GValue *src_value,
-					 GValue       *dest_value);
-GValue*         g_value_reset   	(GValue       *value);
-void            g_value_unset   	(GValue       *value);
-void		g_value_set_instance	(GValue	      *value,
-					 gpointer      instance);
-
-
-/* --- private --- */
-gboolean	g_value_fits_pointer	(const GValue *value);
-gpointer	g_value_peek_pointer	(const GValue *value);
-
-
-/* --- implementation details --- */
-gboolean g_value_type_compatible	(GType		 src_type,
-					 GType		 dest_type);
-gboolean g_value_type_transformable	(GType           src_type,
-					 GType           dest_type);
-gboolean g_value_transform		(const GValue   *src_value,
-					 GValue         *dest_value);
-void	g_value_register_transform_func	(GType		 src_type,
-					 GType		 dest_type,
-					 GValueTransform transform_func);
-
-/**
- * G_VALUE_NOCOPY_CONTENTS:
- *
- * If passed to G_VALUE_COLLECT(), allocated data won't be copied
- * but used verbatim. This does not affect ref-counted types like
- * objects.
- */
-#define G_VALUE_NOCOPY_CONTENTS (1 << 27)
-
-/**
- * G_VALUE_INIT:
- *
- * A #GValue must be initialized before it can be used.
- * This macro can be used as initializer instead of an explicit
- * <literal>{ 0 }</literal> when declaring a variable,
- * but it cannot be assigned to a variable.
- *
- * |[
- *   GValue value = G_VALUE_INIT;
- * ]|
- *
- * Since: 2.30
- */
-#define G_VALUE_INIT  { 0, { { 0 } } }
-
-
-G_END_DECLS
-
-#endif /* __G_VALUE_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluearray.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluearray.h
deleted file mode 100644
index de14934b..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluearray.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluearray.h: GLib array type holding GValues
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUE_ARRAY_H__
-#define __G_VALUE_ARRAY_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TYPE_VALUE_ARRAY:
- *
- * The type ID of the "GValueArray" type which is a boxed type,
- * used to pass around pointers to GValueArrays.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ())
-
-/* --- typedefs & structs --- */
-typedef struct _GValueArray GValueArray;
-/**
- * GValueArray:
- * @n_values: number of values contained in the array
- * @values: array of values
- * 
- * A #GValueArray contains an array of #GValue elements.
- */
-struct _GValueArray
-{
-  guint   n_values;
-  GValue *values;
-
-  /*< private >*/
-  guint   n_prealloced;
-};
-
-/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_get_type)
-GType           g_value_array_get_type       (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_index)
-GValue*		g_value_array_get_nth	     (GValueArray	*value_array,
-					      guint		 index_);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_new)
-GValueArray*	g_value_array_new	     (guint		 n_prealloced);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_unref)
-void		g_value_array_free	     (GValueArray	*value_array);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_ref)
-GValueArray*	g_value_array_copy	     (const GValueArray *value_array);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_prepend_vals)
-GValueArray*	g_value_array_prepend	     (GValueArray	*value_array,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_append_vals)
-GValueArray*	g_value_array_append	     (GValueArray	*value_array,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_insert_vals)
-GValueArray*	g_value_array_insert	     (GValueArray	*value_array,
-					      guint		 index_,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_remove_index)
-GValueArray*	g_value_array_remove	     (GValueArray	*value_array,
-					      guint		 index_);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_sort)
-GValueArray*	g_value_array_sort	     (GValueArray	*value_array,
-					      GCompareFunc	 compare_func);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_sort_with_data)
-GValueArray*	g_value_array_sort_with_data (GValueArray	*value_array,
-					      GCompareDataFunc	 compare_func,
-					      gpointer		 user_data);
-
-
-G_END_DECLS
-
-#endif /* __G_VALUE_ARRAY_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluecollector.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluecollector.h
deleted file mode 100644
index 05a436aa..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluecollector.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluecollector.h: GValue varargs stubs
- */
-/**
- * SECTION:value_collection
- * @Short_description: Converting varargs to generic values
- * @Title: Varargs Value Collection
- * 
- * The macros in this section provide the varargs parsing support needed
- * in variadic GObject functions such as g_object_new() or g_object_set().
- * They currently support the collection of integral types, floating point 
- * types and pointers.
- */
-#ifndef __G_VALUE_COLLECTOR_H__
-#define __G_VALUE_COLLECTOR_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* we may want to add aggregate types here some day, if requested
- * by users. the basic C types are covered already, everything
- * smaller than an int is promoted to an integer and floats are
- * always promoted to doubles for varargs call constructions.
- */
-enum	/*< skip >*/
-{
-  G_VALUE_COLLECT_INT		= 'i',
-  G_VALUE_COLLECT_LONG		= 'l',
-  G_VALUE_COLLECT_INT64         = 'q',
-  G_VALUE_COLLECT_DOUBLE	= 'd',
-  G_VALUE_COLLECT_POINTER	= 'p'
-};
-
-
-/* vararg union holding actual values collected
- */
-/**
- * GTypeCValue:
- * @v_int: the field for holding integer values
- * @v_long: the field for holding long integer values
- * @v_int64: the field for holding 64 bit integer values
- * @v_double: the field for holding floating point values
- * @v_pointer: the field for holding pointers
- * 
- * A union holding one collected value.
- */
-union _GTypeCValue
-{
-  gint     v_int;
-  glong    v_long;
-  gint64   v_int64;
-  gdouble  v_double;
-  gpointer v_pointer;
-};
-
-/**
- * G_VALUE_COLLECT_INIT:
- * @value: a #GValue return location. @value must contain only 0 bytes.
- * @_value_type: the #GType to use for @value.
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the collect_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- * 
- * Collects a variable argument value from a va_list. We have to
- * implement the varargs collection as a macro, because on some systems
- * va_list variables cannot be passed by reference.
- *
- * Since: 2.24
- */
-#define G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error)		\
-G_STMT_START {										\
-  GValue *_val = (value);								\
-  guint _flags = (flags);								\
-  GTypeValueTable *_vtab = g_type_value_table_peek (_value_type);			\
-  const gchar *_collect_format = _vtab->collect_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
-                                                                                        \
-  _val->g_type = _value_type;		/* value_meminit() from gvalue.c */		\
-  while (*_collect_format)								\
-    {											\
-      GTypeCValue *_cvalue = _cvalues + _n_values++;					\
-                                                                                        \
-      switch (*_collect_format++)							\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  _cvalue->v_int = va_arg ((var_args), gint);					\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  _cvalue->v_long = va_arg ((var_args), glong);					\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  _cvalue->v_int64 = va_arg ((var_args), gint64);				\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  _cvalue->v_double = va_arg ((var_args), gdouble);				\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  _cvalue->v_pointer = va_arg ((var_args), gpointer);				\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-  *(__error) = _vtab->collect_value (_val,						\
-				       _n_values,					\
-				       _cvalues,					\
-				       _flags);						\
-} G_STMT_END
-
-/**
- * G_VALUE_COLLECT:
- * @value: a #GValue return location. @value is supposed to be initialized
- *  according to the value type to be collected
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the collect_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- *
- * Collects a variable argument value from a va_list. We have to
- * implement the varargs collection as a macro, because on some systems
- * va_list variables cannot be passed by reference.
- *
- * Note: If you are creating the @value argument just before calling this macro,
- * you should use the #G_VALUE_COLLECT_INIT variant and pass the unitialized
- * #GValue. That variant is faster than #G_VALUE_COLLECT.
- */
-#define G_VALUE_COLLECT(value, var_args, flags, __error) G_STMT_START {			\
-  GValue *_value = (value);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-											\
-  if (_vtable->value_free)								\
-    _vtable->value_free (_value);							\
-  memset (_value->data, 0, sizeof (_value->data));					\
-											\
-  G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error);			\
-} G_STMT_END
-
-#define G_VALUE_COLLECT_SKIP(_value_type, var_args)					\
-G_STMT_START {										\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  const gchar *_collect_format = _vtable->collect_format;				\
-                                                                                        \
-  while (*_collect_format)								\
-    {											\
-      switch (*_collect_format++)							\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  va_arg ((var_args), gint);							\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  va_arg ((var_args), glong);							\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  va_arg ((var_args), gint64);							\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  va_arg ((var_args), gdouble);							\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  va_arg ((var_args), gpointer);						\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-} G_STMT_END
-
-/**
- * G_VALUE_LCOPY:
- * @value: a #GValue return location. @value is supposed to be initialized 
- *  according to the value type to be collected
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the lcopy_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- * 
- * Collects a value's variable argument locations from a va_list. Usage is
- * analogous to G_VALUE_COLLECT().
- */
-#define G_VALUE_LCOPY(value, var_args, flags, __error)					\
-G_STMT_START {										\
-  const GValue *_value = (value);							\
-  guint _flags = (flags);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  const gchar *_lcopy_format = _vtable->lcopy_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
-                                                                                        \
-  while (*_lcopy_format)								\
-    {											\
-      GTypeCValue *_cvalue = _cvalues + _n_values++;					\
-                                                                                        \
-      switch (*_lcopy_format++)								\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  _cvalue->v_int = va_arg ((var_args), gint);					\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  _cvalue->v_long = va_arg ((var_args), glong);					\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  _cvalue->v_int64 = va_arg ((var_args), gint64);				\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  _cvalue->v_double = va_arg ((var_args), gdouble);				\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  _cvalue->v_pointer = va_arg ((var_args), gpointer);				\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-  *(__error) = _vtable->lcopy_value (_value,						\
-				     _n_values,						\
-				     _cvalues,						\
-				     _flags);						\
-} G_STMT_END
-
-
-/**
- * G_VALUE_COLLECT_FORMAT_MAX_LENGTH:
- * 
- * The maximal number of #GTypeCValue<!-- -->s which can be collected for a 
- * single #GValue.
- */
-#define	G_VALUE_COLLECT_FORMAT_MAX_LENGTH	(8)
-
-G_END_DECLS
-
-#endif /* __G_VALUE_COLLECTOR_H__ */
diff --git a/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluetypes.h b/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluetypes.h
deleted file mode 100644
index 584162eb..00000000
--- a/GstreamerHelper/x64/include/glib-2.0/gobject/gvaluetypes.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluetypes.h: GLib default values
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUETYPES_H__
-#define __G_VALUETYPES_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_VALUE_HOLDS_CHAR:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_CHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_CHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_CHAR))
-/**
- * G_VALUE_HOLDS_UCHAR:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UCHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UCHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UCHAR))
-/**
- * G_VALUE_HOLDS_BOOLEAN:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_BOOLEAN.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_BOOLEAN(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOOLEAN))
-/**
- * G_VALUE_HOLDS_INT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_INT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_INT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT))
-/**
- * G_VALUE_HOLDS_UINT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UINT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UINT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT))
-/**
- * G_VALUE_HOLDS_LONG:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_LONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_LONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_LONG))
-/**
- * G_VALUE_HOLDS_ULONG:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_ULONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_ULONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ULONG))
-/**
- * G_VALUE_HOLDS_INT64:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_INT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_INT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT64))
-/**
- * G_VALUE_HOLDS_UINT64:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UINT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UINT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT64))
-/**
- * G_VALUE_HOLDS_FLOAT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_FLOAT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_FLOAT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLOAT))
-/**
- * G_VALUE_HOLDS_DOUBLE:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_DOUBLE.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_DOUBLE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_DOUBLE))
-/**
- * G_VALUE_HOLDS_STRING:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_STRING.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_STRING(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_STRING))
-/**
- * G_VALUE_HOLDS_POINTER:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_POINTER.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_POINTER(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_POINTER))
-/**
- * G_TYPE_GTYPE:
- * 
- * The type for #GType.
- */
-#define	G_TYPE_GTYPE			 (g_gtype_get_type())
-/**
- * G_VALUE_HOLDS_GTYPE:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_GTYPE.
- * 
- * Since: 2.12
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_GTYPE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_GTYPE))
-/**
- * G_VALUE_HOLDS_VARIANT:
- * @value: a valid #GValue structure
- *
- * Checks whether the given #GValue can hold values of type %G_TYPE_VARIANT.
- *
- * Returns: %TRUE on success.
- *
- * Since: 2.26
- */
-#define G_VALUE_HOLDS_VARIANT(value)     (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_VARIANT))
-
-
-/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_32_FOR(g_value_set_schar)
-void                  g_value_set_char          (GValue       *value,
-                                                 gchar         v_char);
-GLIB_DEPRECATED_IN_2_32_FOR(g_value_get_schar)
-gchar                 g_value_get_char          (const GValue *value);
-void		      g_value_set_schar		(GValue	      *value,
-						 gint8	       v_char);
-gint8		      g_value_get_schar		(const GValue *value);
-void		      g_value_set_uchar		(GValue	      *value,
-						 guchar	       v_uchar);
-guchar		      g_value_get_uchar		(const GValue *value);
-void		      g_value_set_boolean	(GValue	      *value,
-						 gboolean      v_boolean);
-gboolean	      g_value_get_boolean	(const GValue *value);
-void		      g_value_set_int		(GValue	      *value,
-						 gint	       v_int);
-gint		      g_value_get_int		(const GValue *value);
-void		      g_value_set_uint		(GValue	      *value,
-						 guint	       v_uint);
-guint		      g_value_get_uint		(const GValue *value);
-void		      g_value_set_long		(GValue	      *value,
-						 glong	       v_long);
-glong		      g_value_get_long		(const GValue *value);
-void		      g_value_set_ulong		(GValue	      *value,
-						 gulong	       v_ulong);
-gulong		      g_value_get_ulong		(const GValue *value);
-void		      g_value_set_int64		(GValue	      *value,
-						 gint64	       v_int64);
-gint64		      g_value_get_int64		(const GValue *value);
-void		      g_value_set_uint64	(GValue	      *value,
-						 guint64      v_uint64);
-guint64		      g_value_get_uint64	(const GValue *value);
-void		      g_value_set_float		(GValue	      *value,
-						 gfloat	       v_float);
-gfloat		      g_value_get_float		(const GValue *value);
-void		      g_value_set_double	(GValue	      *value,
-						 gdouble       v_double);
-gdouble		      g_value_get_double	(const GValue *value);
-void		      g_value_set_string	(GValue	      *value,
-						 const gchar  *v_string);
-void		      g_value_set_static_string (GValue	      *value,
-						 const gchar  *v_string);
-const gchar *         g_value_get_string	(const GValue *value);
-gchar*		      g_value_dup_string	(const GValue *value);
-void		      g_value_set_pointer	(GValue	      *value,
-						 gpointer      v_pointer);
-gpointer	      g_value_get_pointer	(const GValue *value);
-GType		      g_gtype_get_type		(void);
-void		      g_value_set_gtype	        (GValue	      *value,
-						 GType         v_gtype);
-GType	              g_value_get_gtype	        (const GValue *value);
-void		      g_value_set_variant	(GValue	      *value,
-						 GVariant     *variant);
-void		      g_value_take_variant	(GValue	      *value,
-						 GVariant     *variant);
-GVariant*	      g_value_get_variant	(const GValue *value);
-GVariant*	      g_value_dup_variant	(const GValue *value);
-
-
-/* Convenience for registering new pointer types */
-GType                 g_pointer_type_register_static (const gchar *name);
-
-/* debugging aid, describe value contents as string */
-gchar*                g_strdup_value_contents   (const GValue *value);
-
-
-void g_value_take_string		        (GValue		   *value,
-						 gchar		   *v_string);
-GLIB_DEPRECATED_FOR(g_value_take_string)
-void g_value_set_string_take_ownership          (GValue            *value,
-                                                 gchar             *v_string);
-
-
-/* humpf, need a C representable type name for G_TYPE_STRING */
-/**
- * gchararray:
- * 
- * A C representable type name for #G_TYPE_STRING.
- */
-typedef gchar* gchararray;
-
-
-G_END_DECLS
-
-#endif /* __G_VALUETYPES_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/app/gstappsink.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/app/gstappsink.h
deleted file mode 100644
index c1161f01..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/app/gstappsink.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GStreamer
- * Copyright (C) 2007 David Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_APP_SINK_H_
-#define _GST_APP_SINK_H_
-
-#include <gst/gst.h>
-#include <gst/base/gstbasesink.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_APP_SINK \
-  (gst_app_sink_get_type())
-#define GST_APP_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_APP_SINK,GstAppSink))
-#define GST_APP_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_APP_SINK,GstAppSinkClass))
-#define GST_IS_APP_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_APP_SINK))
-#define GST_IS_APP_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_APP_SINK))
-#define GST_APP_SINK_CAST(obj) \
-  ((GstAppSink*)(obj))
-
-typedef struct _GstAppSink GstAppSink;
-typedef struct _GstAppSinkClass GstAppSinkClass;
-typedef struct _GstAppSinkPrivate GstAppSinkPrivate;
-
-/**
- * GstAppSinkCallbacks: (skip)
- * @eos: Called when the end-of-stream has been reached. This callback
- *       is called from the steaming thread.
- * @new_preroll: Called when a new preroll sample is available.
- *       This callback is called from the steaming thread.
- *       The new preroll sample can be retrieved with
- *       gst_app_sink_pull_preroll() either from this callback
- *       or from any other thread.
- * @new_sample: Called when a new sample is available.
- *       This callback is called from the steaming thread.
- *       The new sample can be retrieved with
- *       gst_app_sink_pull_sample() either from this callback
- *       or from any other thread.
- *
- * A set of callbacks that can be installed on the appsink with
- * gst_app_sink_set_callbacks().
- */
-typedef struct {
-  void          (*eos)              (GstAppSink *appsink, gpointer user_data);
-  GstFlowReturn (*new_preroll)      (GstAppSink *appsink, gpointer user_data);
-  GstFlowReturn (*new_sample)       (GstAppSink *appsink, gpointer user_data);
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-} GstAppSinkCallbacks;
-
-struct _GstAppSink
-{
-  GstBaseSink basesink;
-
-  /*< private >*/
-  GstAppSinkPrivate *priv;
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-};
-
-struct _GstAppSinkClass
-{
-  GstBaseSinkClass basesink_class;
-
-  /* signals */
-  void          (*eos)              (GstAppSink *appsink);
-  GstFlowReturn (*new_preroll)      (GstAppSink *appsink);
-  GstFlowReturn (*new_sample)       (GstAppSink *appsink);
-
-  /* actions */
-  GstSample *   (*pull_preroll)      (GstAppSink *appsink);
-  GstSample *   (*pull_sample)       (GstAppSink *appsink);
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-};
-
-GType gst_app_sink_get_type(void);
-
-void            gst_app_sink_set_caps         (GstAppSink *appsink, const GstCaps *caps);
-GstCaps *       gst_app_sink_get_caps         (GstAppSink *appsink);
-
-gboolean        gst_app_sink_is_eos           (GstAppSink *appsink);
-
-void            gst_app_sink_set_emit_signals (GstAppSink *appsink, gboolean emit);
-gboolean        gst_app_sink_get_emit_signals (GstAppSink *appsink);
-
-void            gst_app_sink_set_max_buffers  (GstAppSink *appsink, guint max);
-guint           gst_app_sink_get_max_buffers  (GstAppSink *appsink);
-
-void            gst_app_sink_set_drop         (GstAppSink *appsink, gboolean drop);
-gboolean        gst_app_sink_get_drop         (GstAppSink *appsink);
-
-GstSample *     gst_app_sink_pull_preroll     (GstAppSink *appsink);
-GstSample *     gst_app_sink_pull_sample      (GstAppSink *appsink);
-
-void            gst_app_sink_set_callbacks    (GstAppSink * appsink,
-                                               GstAppSinkCallbacks *callbacks,
-                                               gpointer user_data,
-                                               GDestroyNotify notify);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/app/gstappsrc.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/app/gstappsrc.h
deleted file mode 100644
index 417a56d9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/app/gstappsrc.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* GStreamer
- * Copyright (C) 2007 David Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_APP_SRC_H_
-#define _GST_APP_SRC_H_
-
-#include <gst/gst.h>
-#include <gst/base/gstpushsrc.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_APP_SRC \
-  (gst_app_src_get_type())
-#define GST_APP_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_APP_SRC,GstAppSrc))
-#define GST_APP_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_APP_SRC,GstAppSrcClass))
-#define GST_IS_APP_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_APP_SRC))
-#define GST_IS_APP_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_APP_SRC))
-#define GST_APP_SRC_CAST(obj) \
-  ((GstAppSrc*)(obj))
-
-typedef struct _GstAppSrc GstAppSrc;
-typedef struct _GstAppSrcClass GstAppSrcClass;
-typedef struct _GstAppSrcPrivate GstAppSrcPrivate;
-
-/**
- * GstAppSrcCallbacks: (skip)
- * @need_data: Called when the appsrc needs more data. A buffer or EOS should be
- *    pushed to appsrc from this thread or another thread. @length is just a hint
- *    and when it is set to -1, any number of bytes can be pushed into @appsrc.
- * @enough_data: Called when appsrc has enough data. It is recommended that the
- *    application stops calling push-buffer until the need_data callback is
- *    emitted again to avoid excessive buffer queueing.
- * @seek_data: Called when a seek should be performed to the offset.
- *    The next push-buffer should produce buffers from the new @offset.
- *    This callback is only called for seekable stream types.
- *
- * A set of callbacks that can be installed on the appsrc with
- * gst_app_src_set_callbacks().
- */
-typedef struct {
-  void      (*need_data)    (GstAppSrc *src, guint length, gpointer user_data);
-  void      (*enough_data)  (GstAppSrc *src, gpointer user_data);
-  gboolean  (*seek_data)    (GstAppSrc *src, guint64 offset, gpointer user_data);
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-} GstAppSrcCallbacks;
-
-/**
- * GstAppStreamType:
- * @GST_APP_STREAM_TYPE_STREAM: No seeking is supported in the stream, such as a
- * live stream.
- * @GST_APP_STREAM_TYPE_SEEKABLE: The stream is seekable but seeking might not
- * be very fast, such as data from a webserver.
- * @GST_APP_STREAM_TYPE_RANDOM_ACCESS: The stream is seekable and seeking is fast,
- * such as in a local file.
- *
- * The stream type.
- */
-typedef enum
-{
-  GST_APP_STREAM_TYPE_STREAM,
-  GST_APP_STREAM_TYPE_SEEKABLE,
-  GST_APP_STREAM_TYPE_RANDOM_ACCESS
-} GstAppStreamType;
-
-struct _GstAppSrc
-{
-  GstBaseSrc basesrc;
-
-  /*< private >*/
-  GstAppSrcPrivate *priv;
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-};
-
-struct _GstAppSrcClass
-{
-  GstBaseSrcClass basesrc_class;
-
-  /* signals */
-  void          (*need_data)       (GstAppSrc *appsrc, guint length);
-  void          (*enough_data)     (GstAppSrc *appsrc);
-  gboolean      (*seek_data)       (GstAppSrc *appsrc, guint64 offset);
-
-  /* actions */
-  GstFlowReturn (*push_buffer)     (GstAppSrc *appsrc, GstBuffer *buffer);
-  GstFlowReturn (*end_of_stream)   (GstAppSrc *appsrc);
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-};
-
-GType gst_app_src_get_type(void);
-
-/* GType getter for GstAppStreamType */
-#define GST_TYPE_APP_STREAM_TYPE (gst_app_stream_type_get_type ())
-GType gst_app_stream_type_get_type (void);
-
-void             gst_app_src_set_caps         (GstAppSrc *appsrc, const GstCaps *caps);
-GstCaps*         gst_app_src_get_caps         (GstAppSrc *appsrc);
-
-void             gst_app_src_set_size         (GstAppSrc *appsrc, gint64 size);
-gint64           gst_app_src_get_size         (GstAppSrc *appsrc);
-
-void             gst_app_src_set_stream_type  (GstAppSrc *appsrc, GstAppStreamType type);
-GstAppStreamType gst_app_src_get_stream_type  (GstAppSrc *appsrc);
-
-void             gst_app_src_set_max_bytes    (GstAppSrc *appsrc, guint64 max);
-guint64          gst_app_src_get_max_bytes    (GstAppSrc *appsrc);
-
-void             gst_app_src_set_latency      (GstAppSrc *appsrc, guint64 min, guint64 max);
-void             gst_app_src_get_latency      (GstAppSrc *appsrc, guint64 *min, guint64 *max);
-
-void             gst_app_src_set_emit_signals (GstAppSrc *appsrc, gboolean emit);
-gboolean         gst_app_src_get_emit_signals (GstAppSrc *appsrc);
-
-GstFlowReturn    gst_app_src_push_buffer      (GstAppSrc *appsrc, GstBuffer *buffer);
-GstFlowReturn    gst_app_src_end_of_stream    (GstAppSrc *appsrc);
-
-void             gst_app_src_set_callbacks    (GstAppSrc * appsrc,
-                                               GstAppSrcCallbacks *callbacks,
-                                               gpointer user_data,
-                                               GDestroyNotify notify);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-channels.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-channels.h
deleted file mode 100644
index 7885140d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-channels.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2001> Thomas Vander Stichele <thomas@apestaart.org>
- *               <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_CHANNELS_H__
-#define __GST_AUDIO_CHANNELS_H__
-
-#include <gst/gst.h>
-
-#include <gst/audio/audio-format.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstAudioChannelPosition:
- * @GST_AUDIO_CHANNEL_POSITION_MONO: Mono without direction;
- *     can only be used with 1 channel
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT: Front left
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT: Front right
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER: Front center
- * @GST_AUDIO_CHANNEL_POSITION_LFE1: Low-frequency effects 1 (subwoofer)
- * @GST_AUDIO_CHANNEL_POSITION_REAR_LEFT: Rear left
- * @GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT: Rear right
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER: Front left of center
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER: Front right of center
- * @GST_AUDIO_CHANNEL_POSITION_REAR_CENTER: Rear center
- * @GST_AUDIO_CHANNEL_POSITION_LFE2: Low-frequency effects 2 (subwoofer)
- * @GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT: Side left
- * @GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT: Side right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT: Top front left
- * @GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT: Top front right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER: Top front center
- * @GST_AUDIO_CHANNEL_POSITION_TOP_CENTER: Top center
- * @GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT: Top rear left
- * @GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT: Top rear right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_LEFT: Top side right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_RIGHT: Top rear right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER: Top rear center
- * @GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_CENTER: Bottom front center
- * @GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_LEFT: Bottom front left
- * @GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_RIGHT: Bottom front right
- * @GST_AUDIO_CHANNEL_POSITION_WIDE_LEFT: Wide left (between front left and side left)
- * @GST_AUDIO_CHANNEL_POSITION_WIDE_RIGHT: Wide right (between front right and side right)
- * @GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT: Surround left (between rear left and side left)
- * @GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT: Surround right (between rear right and side right)
- * @GST_AUDIO_CHANNEL_POSITION_NONE: used for position-less channels, e.g.
- *     from a sound card that records 1024 channels; mutually exclusive with
- *     any other channel position
- * @GST_AUDIO_CHANNEL_POSITION_INVALID: invalid position
- *
- * Audio channel positions.
- *
- * These are the channels defined in SMPTE 2036-2-2008
- * Table 1 for 22.2 audio systems with the Surround and Wide channels from
- * DTS Coherent Acoustics (v.1.3.1) and 10.2 and 7.1 layouts. In the caps the
- * actual channel layout is expressed with a channel count and a channel mask,
- * which describes the existing channels. The positions in the bit mask correspond
- * to the enum values.
- * For negotiation it is allowed to have more bits set in the channel mask than
- * the number of channels to specify the allowed channel positions but this is
- * not allowed in negotiated caps. It is not allowed in any situation other
- * than the one mentioned below to have less bits set in the channel mask than
- * the number of channels.
- *
- * @GST_AUDIO_CHANNEL_POSITION_MONO can only be used with a single mono channel that
- * has no direction information and would be mixed into all directional channels.
- * This is expressed in caps by having a single channel and no channel mask.
- *
- * @GST_AUDIO_CHANNEL_POSITION_NONE can only be used if all channels have this position.
- * This is expressed in caps by having a channel mask with no bits set.
- *
- * As another special case it is allowed to have two channels without a channel mask.
- * This implicitely means that this is a stereo stream with a front left and front right
- * channel.
- */
-typedef enum {
-  /* These get negative indices to allow to use
-   * the enum values of the normal cases for the
-   * bit-mask position */
-  GST_AUDIO_CHANNEL_POSITION_NONE = -3,
-  GST_AUDIO_CHANNEL_POSITION_MONO = -2,
-  GST_AUDIO_CHANNEL_POSITION_INVALID = -1,
-
-  /* Normal cases */
-  GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT = 0,
-  GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_LFE1,
-  GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_LFE2,
-  GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_TOP_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_WIDE_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_WIDE_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT
-} GstAudioChannelPosition;
-
-#define GST_AUDIO_CHANNEL_POSITION_MASK(pos) (G_GUINT64_CONSTANT(1)<< GST_AUDIO_CHANNEL_POSITION_ ## pos)
-
-gboolean       gst_audio_buffer_reorder_channels (GstBuffer * buffer,
-                                                  GstAudioFormat format,
-                                                  gint channels,
-                                                  const GstAudioChannelPosition * from,
-                                                  const GstAudioChannelPosition * to);
-
-gboolean       gst_audio_reorder_channels        (gpointer data, gsize size,
-                                                  GstAudioFormat format,
-                                                  gint channels,
-                                                  const GstAudioChannelPosition * from,
-                                                  const GstAudioChannelPosition * to);
-
-gboolean       gst_audio_channel_positions_to_valid_order (GstAudioChannelPosition *position,
-                                                           gint channels);
-
-gboolean       gst_audio_check_valid_channel_positions (const GstAudioChannelPosition *position,
-                                                        gint channels, gboolean force_order);
-
-gboolean       gst_audio_channel_positions_to_mask  (const GstAudioChannelPosition *position,
-                                                     gint channels, gboolean force_order,
-                                                     guint64 *channel_mask);
-
-gboolean       gst_audio_channel_positions_from_mask (gint channels, guint64 channel_mask,
-                                                      GstAudioChannelPosition * position);
-
-gboolean       gst_audio_get_channel_reorder_map (gint channels,
-                                                  const GstAudioChannelPosition * from,
-                                                  const GstAudioChannelPosition * to,
-                                                  gint *reorder_map);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_CHANNELS_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-enumtypes.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-enumtypes.h
deleted file mode 100644
index a323a87d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-enumtypes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-#ifndef __GST_AUDIO_ENUM_TYPES_H__
-#define __GST_AUDIO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "audio-format.h" */
-GType gst_audio_format_get_type (void);
-#define GST_TYPE_AUDIO_FORMAT (gst_audio_format_get_type())
-GType gst_audio_format_flags_get_type (void);
-#define GST_TYPE_AUDIO_FORMAT_FLAGS (gst_audio_format_flags_get_type())
-GType gst_audio_pack_flags_get_type (void);
-#define GST_TYPE_AUDIO_PACK_FLAGS (gst_audio_pack_flags_get_type())
-
-/* enumerations from "audio-channels.h" */
-GType gst_audio_channel_position_get_type (void);
-#define GST_TYPE_AUDIO_CHANNEL_POSITION (gst_audio_channel_position_get_type())
-
-/* enumerations from "audio-info.h" */
-GType gst_audio_flags_get_type (void);
-#define GST_TYPE_AUDIO_FLAGS (gst_audio_flags_get_type())
-GType gst_audio_layout_get_type (void);
-#define GST_TYPE_AUDIO_LAYOUT (gst_audio_layout_get_type())
-
-/* enumerations from "gstaudioringbuffer.h" */
-GType gst_audio_ring_buffer_state_get_type (void);
-#define GST_TYPE_AUDIO_RING_BUFFER_STATE (gst_audio_ring_buffer_state_get_type())
-GType gst_audio_ring_buffer_format_type_get_type (void);
-#define GST_TYPE_AUDIO_RING_BUFFER_FORMAT_TYPE (gst_audio_ring_buffer_format_type_get_type())
-G_END_DECLS
-
-#endif /* __GST_AUDIO_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-format.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-format.h
deleted file mode 100644
index e515d111..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-format.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2001> Thomas Vander Stichele <thomas@apestaart.org>
- *               <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gst/gst.h>
-
-#ifndef __GST_AUDIO_FORMAT_H__
-#define __GST_AUDIO_FORMAT_H__
-
-G_BEGIN_DECLS
-
-#include <gst/audio/audio-enumtypes.h>
-
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-#define _GST_AUDIO_FORMAT_NE(fmt) GST_AUDIO_FORMAT_ ## fmt ## BE
-#define _GST_AUDIO_FORMAT_OE(fmt) GST_AUDIO_FORMAT_ ## fmt ## LE
-#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define _GST_AUDIO_FORMAT_NE(fmt) GST_AUDIO_FORMAT_ ## fmt ## LE
-#define _GST_AUDIO_FORMAT_OE(fmt) GST_AUDIO_FORMAT_ ## fmt ## BE
-#endif
-
-/**
- * GstAudioFormat:
- * @GST_AUDIO_FORMAT_UNKNOWN: unknown or unset audio format
- * @GST_AUDIO_FORMAT_ENCODED: encoded audio format
- * @GST_AUDIO_FORMAT_S8: 8 bits in 8 bits, signed
- * @GST_AUDIO_FORMAT_U8: 8 bits in 8 bits, unsigned
- * @GST_AUDIO_FORMAT_S16LE: 16 bits in 16 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S16BE: 16 bits in 16 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U16LE: 16 bits in 16 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U16BE: 16 bits in 16 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S24_32LE: 24 bits in 32 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S24_32BE: 24 bits in 32 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U24_32LE: 24 bits in 32 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U24_32BE: 24 bits in 32 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S32LE: 32 bits in 32 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S32BE: 32 bits in 32 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U32LE: 32 bits in 32 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U32BE: 32 bits in 32 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S24LE: 24 bits in 24 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S24BE: 24 bits in 24 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U24LE: 24 bits in 24 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U24BE: 24 bits in 24 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S20LE: 20 bits in 24 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S20BE: 20 bits in 24 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U20LE: 20 bits in 24 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U20BE: 20 bits in 24 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S18LE: 18 bits in 24 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S18BE: 18 bits in 24 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U18LE: 18 bits in 24 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U18BE: 18 bits in 24 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_F32LE: 32-bit floating point samples, little endian
- * @GST_AUDIO_FORMAT_F32BE: 32-bit floating point samples, big endian
- * @GST_AUDIO_FORMAT_F64LE: 64-bit floating point samples, little endian
- * @GST_AUDIO_FORMAT_F64BE: 64-bit floating point samples, big endian
- * @GST_AUDIO_FORMAT_S16: 16 bits in 16 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U16: 16 bits in 16 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S24_32: 24 bits in 32 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U24_32: 24 bits in 32 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S32: 32 bits in 32 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U32: 32 bits in 32 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S24: 24 bits in 24 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U24: 24 bits in 24 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S20: 20 bits in 24 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U20: 20 bits in 24 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S18: 18 bits in 24 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U18: 18 bits in 24 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_F32: 32-bit floating point samples, native endianness
- * @GST_AUDIO_FORMAT_F64: 64-bit floating point samples, native endianness
- *
- * Enum value describing the most common audio formats.
- */
-typedef enum {
-  GST_AUDIO_FORMAT_UNKNOWN,
-  GST_AUDIO_FORMAT_ENCODED,
-  /* 8 bit */
-  GST_AUDIO_FORMAT_S8,
-  GST_AUDIO_FORMAT_U8,
-  /* 16 bit */
-  GST_AUDIO_FORMAT_S16LE,
-  GST_AUDIO_FORMAT_S16BE,
-  GST_AUDIO_FORMAT_U16LE,
-  GST_AUDIO_FORMAT_U16BE,
-  /* 24 bit in low 3 bytes of 32 bits*/
-  GST_AUDIO_FORMAT_S24_32LE,
-  GST_AUDIO_FORMAT_S24_32BE,
-  GST_AUDIO_FORMAT_U24_32LE,
-  GST_AUDIO_FORMAT_U24_32BE,
-  /* 32 bit */
-  GST_AUDIO_FORMAT_S32LE,
-  GST_AUDIO_FORMAT_S32BE,
-  GST_AUDIO_FORMAT_U32LE,
-  GST_AUDIO_FORMAT_U32BE,
-  /* 24 bit in 3 bytes*/
-  GST_AUDIO_FORMAT_S24LE,
-  GST_AUDIO_FORMAT_S24BE,
-  GST_AUDIO_FORMAT_U24LE,
-  GST_AUDIO_FORMAT_U24BE,
-  /* 20 bit in 3 bytes*/
-  GST_AUDIO_FORMAT_S20LE,
-  GST_AUDIO_FORMAT_S20BE,
-  GST_AUDIO_FORMAT_U20LE,
-  GST_AUDIO_FORMAT_U20BE,
-  /* 18 bit in 3 bytes*/
-  GST_AUDIO_FORMAT_S18LE,
-  GST_AUDIO_FORMAT_S18BE,
-  GST_AUDIO_FORMAT_U18LE,
-  GST_AUDIO_FORMAT_U18BE,
-  /* float */
-  GST_AUDIO_FORMAT_F32LE,
-  GST_AUDIO_FORMAT_F32BE,
-  GST_AUDIO_FORMAT_F64LE,
-  GST_AUDIO_FORMAT_F64BE,
-  /* native endianness equivalents */
-  GST_AUDIO_FORMAT_S16 = _GST_AUDIO_FORMAT_NE(S16),
-  GST_AUDIO_FORMAT_U16 = _GST_AUDIO_FORMAT_NE(U16),
-  GST_AUDIO_FORMAT_S24_32 = _GST_AUDIO_FORMAT_NE(S24_32),
-  GST_AUDIO_FORMAT_U24_32 = _GST_AUDIO_FORMAT_NE(U24_32),
-  GST_AUDIO_FORMAT_S32 = _GST_AUDIO_FORMAT_NE(S32),
-  GST_AUDIO_FORMAT_U32 = _GST_AUDIO_FORMAT_NE(U32),
-  GST_AUDIO_FORMAT_S24 = _GST_AUDIO_FORMAT_NE(S24),
-  GST_AUDIO_FORMAT_U24 = _GST_AUDIO_FORMAT_NE(U24),
-  GST_AUDIO_FORMAT_S20 = _GST_AUDIO_FORMAT_NE(S20),
-  GST_AUDIO_FORMAT_U20 = _GST_AUDIO_FORMAT_NE(U20),
-  GST_AUDIO_FORMAT_S18 = _GST_AUDIO_FORMAT_NE(S18),
-  GST_AUDIO_FORMAT_U18 = _GST_AUDIO_FORMAT_NE(U18),
-  GST_AUDIO_FORMAT_F32 = _GST_AUDIO_FORMAT_NE(F32),
-  GST_AUDIO_FORMAT_F64 = _GST_AUDIO_FORMAT_NE(F64)
-} GstAudioFormat;
-
-
-typedef struct _GstAudioFormatInfo GstAudioFormatInfo;
-
-/**
- * GstAudioFormatFlags:
- * @GST_AUDIO_FORMAT_FLAG_INTEGER: integer samples
- * @GST_AUDIO_FORMAT_FLAG_FLOAT: float samples
- * @GST_AUDIO_FORMAT_FLAG_SIGNED: signed samples
- * @GST_AUDIO_FORMAT_FLAG_COMPLEX: complex layout
- * @GST_AUDIO_FORMAT_FLAG_UNPACK: the format can be used in
- * #GstAudioFormatUnpack and #GstAudioFormatPack functions
- *
- * The different audio flags that a format info can have.
- */
-typedef enum
-{
-  GST_AUDIO_FORMAT_FLAG_INTEGER  = (1 << 0),
-  GST_AUDIO_FORMAT_FLAG_FLOAT    = (1 << 1),
-  GST_AUDIO_FORMAT_FLAG_SIGNED   = (1 << 2),
-  GST_AUDIO_FORMAT_FLAG_COMPLEX  = (1 << 4),
-  GST_AUDIO_FORMAT_FLAG_UNPACK   = (1 << 5)
-} GstAudioFormatFlags;
-
-/**
- * GstAudioPackFlags:
- * @GST_AUDIO_PACK_FLAG_NONE: No flag
- *
- * The different flags that can be used when packing and unpacking.
- */
-typedef enum
-{
-  GST_AUDIO_PACK_FLAG_NONE       = 0
-} GstAudioPackFlags;
-
-/**
- * GstAudioFormatUnpack:
- * @info: a #GstAudioFormatInfo
- * @dest: (array) (element-type guint8): a destination array
- * @data: (array) (element-type guint8): pointer to the audio data
- * @length: the amount of samples to unpack.
- *
- * Unpacks @length samples from the given data of format @info.
- * The samples will be unpacked into @dest which each channel
- * interleaved. @dest should at least be big enough to hold @length *
- * channels * size(unpack_format) bytes.
- */
-typedef void (*GstAudioFormatUnpack)         (const GstAudioFormatInfo *info,
-                                              GstAudioPackFlags flags, gpointer dest,
-                                              const gpointer data, gint length);
-/**
- * GstAudioFormatPack:
- * @info: a #GstAudioFormatInfo
- * @src: (array) (element-type guint8): a source array
- * @data: (array) (element-type guint8): pointer to the destination
- *   data
- * @length: the amount of samples to pack.
- *
- * Packs @length samples from @src to the data array in format @info.
- * The samples from source have each channel interleaved
- * and will be packed into @data.
- */
-typedef void (*GstAudioFormatPack)           (const GstAudioFormatInfo *info,
-                                              GstAudioPackFlags flags, const gpointer src,
-                                              gpointer data, gint length);
-
-/**
- * GstAudioFormatInfo:
- * @format: #GstAudioFormat
- * @name: string representation of the format
- * @description: user readable description of the format
- * @flags: #GstAudioFormatFlags
- * @endianness: the endianness
- * @width: amount of bits used for one sample
- * @depth: amount of valid bits in @width
- * @silence: @width/8 bytes with 1 silent sample
- * @unpack_format: the format of the unpacked samples
- * @unpack_func: function to unpack samples
- * @pack_func: function to pack samples
- *
- * Information for an audio format.
- */
-struct _GstAudioFormatInfo {
-  GstAudioFormat format;
-  const gchar *name;
-  const gchar *description;
-  GstAudioFormatFlags flags;
-  gint endianness;
-  gint width;
-  gint depth;
-  guint8 silence[8];
-
-  GstAudioFormat unpack_format;
-  GstAudioFormatUnpack unpack_func;
-  GstAudioFormatPack pack_func;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_format_info_get_type (void);
-
-#define GST_AUDIO_FORMAT_INFO_FORMAT(info)           ((info)->format)
-#define GST_AUDIO_FORMAT_INFO_NAME(info)             ((info)->name)
-#define GST_AUDIO_FORMAT_INFO_FLAGS(info)            ((info)->flags)
-
-#define GST_AUDIO_FORMAT_INFO_IS_INTEGER(info)       !!((info)->flags & GST_AUDIO_FORMAT_FLAG_INTEGER)
-#define GST_AUDIO_FORMAT_INFO_IS_FLOAT(info)         !!((info)->flags & GST_AUDIO_FORMAT_FLAG_FLOAT)
-#define GST_AUDIO_FORMAT_INFO_IS_SIGNED(info)        !!((info)->flags & GST_AUDIO_FORMAT_FLAG_SIGNED)
-
-#define GST_AUDIO_FORMAT_INFO_ENDIANNESS(info)       ((info)->endianness)
-#define GST_AUDIO_FORMAT_INFO_IS_LITTLE_ENDIAN(info) ((info)->endianness == G_LITTLE_ENDIAN)
-#define GST_AUDIO_FORMAT_INFO_IS_BIG_ENDIAN(info)    ((info)->endianness == G_BIG_ENDIAN)
-#define GST_AUDIO_FORMAT_INFO_WIDTH(info)            ((info)->width)
-#define GST_AUDIO_FORMAT_INFO_DEPTH(info)            ((info)->depth)
-
-
-GstAudioFormat gst_audio_format_build_integer    (gboolean sign, gint endianness,
-                                                  gint width, gint depth) G_GNUC_CONST;
-
-GstAudioFormat gst_audio_format_from_string      (const gchar *format) G_GNUC_CONST;
-const gchar *  gst_audio_format_to_string        (GstAudioFormat format) G_GNUC_CONST;
-
-const GstAudioFormatInfo *
-               gst_audio_format_get_info         (GstAudioFormat format) G_GNUC_CONST;
-
-void           gst_audio_format_fill_silence     (const GstAudioFormatInfo *info,
-                                                  gpointer dest, gsize length);
-
-#define GST_AUDIO_RATE_RANGE "(int) [ 1, max ]"
-#define GST_AUDIO_CHANNELS_RANGE "(int) [ 1, max ]"
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-# define GST_AUDIO_NE(s) G_STRINGIFY(s)"LE"
-# define GST_AUDIO_OE(s) G_STRINGIFY(s)"BE"
-#else
-# define GST_AUDIO_NE(s) G_STRINGIFY(s)"BE"
-# define GST_AUDIO_OE(s) G_STRINGIFY(s)"LE"
-#endif
-
-#define GST_AUDIO_FORMATS_ALL " { S8, U8, " \
-    "S16LE, S16BE, U16LE, U16BE, " \
-    "S24_32LE, S24_32BE, U24_32LE, U24_32BE, " \
-    "S32LE, S32BE, U32LE, U32BE, " \
-    "S24LE, S24BE, U24LE, U24BE, " \
-    "S20LE, S20BE, U20LE, U20BE, " \
-    "S18LE, S18BE, U18LE, U18BE, " \
-    "F32LE, F32BE, F64LE, F64BE }"
-
-/**
- * GST_AUDIO_CAPS_MAKE:
- * @format: string format that describes the sample layout, as string
- *     (e.g. "S16LE", "S8", etc.)
- *
- * Generic caps string for audio, for use in pad templates.
- */
-#define GST_AUDIO_CAPS_MAKE(format)                                    \
-    "audio/x-raw, "                                                    \
-    "format = (string) " format ", "                                   \
-    "rate = " GST_AUDIO_RATE_RANGE ", "                                \
-    "channels = " GST_AUDIO_CHANNELS_RANGE
-
-/**
- * GST_AUDIO_DEF_RATE:
- *
- * Standard sampling rate used in consumer audio.
- */
-#define GST_AUDIO_DEF_RATE 44100
-/**
- * GST_AUDIO_DEF_CHANNELS:
- *
- * Standard number of channels used in consumer audio.
- */
-#define GST_AUDIO_DEF_CHANNELS 2
-/**
- * GST_AUDIO_DEF_FORMAT:
- *
- * Standard format used in consumer audio.
- */
-#define GST_AUDIO_DEF_FORMAT "S16LE"
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_FORMAT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-info.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-info.h
deleted file mode 100644
index fb6ab260..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio-info.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2001> Thomas Vander Stichele <thomas@apestaart.org>
- *               <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_INFO_H__
-#define __GST_AUDIO_INFO_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio-enumtypes.h>
-#include <gst/audio/audio-format.h>
-#include <gst/audio/audio-channels.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstAudioInfo GstAudioInfo;
-
-/**
- * GstAudioFlags:
- * @GST_AUDIO_FLAG_NONE: no valid flag
- * @GST_AUDIO_FLAG_UNPOSITIONED: the position array explicitly
- *     contains unpositioned channels.
- *
- * Extra audio flags
- */
-typedef enum {
-  GST_AUDIO_FLAG_NONE              = 0,
-  GST_AUDIO_FLAG_UNPOSITIONED      = (1 << 0)
-} GstAudioFlags;
-
-/**
- * GstAudioLayout:
- * @GST_AUDIO_LAYOUT_INTERLEAVED: interleaved audio
- * @GST_AUDIO_LAYOUT_NON_INTERLEAVED: non-interleaved audio
- *
- * Layout of the audio samples for the different channels.
- */
-typedef enum {
-  GST_AUDIO_LAYOUT_INTERLEAVED = 0,
-  GST_AUDIO_LAYOUT_NON_INTERLEAVED
-} GstAudioLayout;
-
-/**
- * GstAudioInfo:
- * @finfo: the format info of the audio
- * @flags: additional audio flags
- * @layout: audio layout
- * @rate: the audio sample rate
- * @channels: the number of channels
- * @bpf: the number of bytes for one frame, this is the size of one
- *         sample * @channels
- * @position: the positions for each channel
- *
- * Information describing audio properties. This information can be filled
- * in from GstCaps with gst_audio_info_from_caps().
- *
- * Use the provided macros to access the info in this structure.
- */
-struct _GstAudioInfo {
-  const GstAudioFormatInfo *finfo;
-  GstAudioFlags             flags;
-  GstAudioLayout            layout;
-  gint                      rate;
-  gint                      channels;
-  gint                      bpf;
-  GstAudioChannelPosition   position[64];
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_info_get_type        (void);
-
-#define GST_AUDIO_INFO_IS_VALID(i)           ((i)->finfo != NULL && (i)->rate > 0 && (i)->channels > 0 && (i)->bpf > 0)
-
-#define GST_AUDIO_INFO_FORMAT(i)             (GST_AUDIO_FORMAT_INFO_FORMAT((i)->finfo))
-#define GST_AUDIO_INFO_NAME(i)               (GST_AUDIO_FORMAT_INFO_NAME((i)->finfo))
-#define GST_AUDIO_INFO_WIDTH(i)              (GST_AUDIO_FORMAT_INFO_WIDTH((i)->finfo))
-#define GST_AUDIO_INFO_DEPTH(i)              (GST_AUDIO_FORMAT_INFO_DEPTH((i)->finfo))
-#define GST_AUDIO_INFO_BPS(info)             (GST_AUDIO_INFO_DEPTH(info) >> 3)
-
-#define GST_AUDIO_INFO_IS_INTEGER(i)         (GST_AUDIO_FORMAT_INFO_IS_INTEGER((i)->finfo))
-#define GST_AUDIO_INFO_IS_FLOAT(i)           (GST_AUDIO_FORMAT_INFO_IS_FLOAT((i)->finfo))
-#define GST_AUDIO_INFO_IS_SIGNED(i)          (GST_AUDIO_FORMAT_INFO_IS_SIGNED((i)->finfo))
-
-#define GST_AUDIO_INFO_ENDIANNESS(i)         (GST_AUDIO_FORMAT_INFO_ENDIANNES((i)->finfo))
-#define GST_AUDIO_INFO_IS_LITTLE_ENDIAN(i)   (GST_AUDIO_FORMAT_INFO_IS_LITTLE_ENDIAN((i)->finfo))
-#define GST_AUDIO_INFO_IS_BIG_ENDIAN(i)      (GST_AUDIO_FORMAT_INFO_IS_BIG_ENDIAN((i)->finfo))
-
-#define GST_AUDIO_INFO_FLAGS(info)           ((info)->flags)
-#define GST_AUDIO_INFO_IS_UNPOSITIONED(info) ((info)->flags & GST_AUDIO_FLAG_UNPOSITIONED)
-#define GST_AUDIO_INFO_LAYOUT(info)          ((info)->layout)
-
-#define GST_AUDIO_INFO_RATE(info)            ((info)->rate)
-#define GST_AUDIO_INFO_CHANNELS(info)        ((info)->channels)
-#define GST_AUDIO_INFO_BPF(info)             ((info)->bpf)
-#define GST_AUDIO_INFO_POSITION(info,c)      ((info)->position[c])
-
-GstAudioInfo * gst_audio_info_new         (void);
-void           gst_audio_info_init        (GstAudioInfo *info);
-GstAudioInfo * gst_audio_info_copy        (const GstAudioInfo *info);
-void           gst_audio_info_free        (GstAudioInfo *info);
-
-void           gst_audio_info_set_format  (GstAudioInfo *info, GstAudioFormat format,
-                                           gint rate, gint channels,
-                                           const GstAudioChannelPosition *position);
-
-gboolean       gst_audio_info_from_caps   (GstAudioInfo *info, const GstCaps *caps);
-GstCaps *      gst_audio_info_to_caps     (const GstAudioInfo *info);
-
-gboolean       gst_audio_info_convert     (const GstAudioInfo * info,
-                                           GstFormat src_fmt, gint64 src_val,
-                                           GstFormat dest_fmt, gint64 * dest_val);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_INFO_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio.h
deleted file mode 100644
index e97fc1ab..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/audio.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2001> Thomas Vander Stichele <thomas@apestaart.org>
- *               <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_AUDIO_H__
-#define __GST_AUDIO_AUDIO_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio-enumtypes.h>
-#include <gst/audio/audio-format.h>
-#include <gst/audio/audio-channels.h>
-#include <gst/audio/audio-info.h>
-
-G_BEGIN_DECLS
-
-/* conversion macros */
-/**
- * GST_FRAMES_TO_CLOCK_TIME:
- * @frames: sample frames
- * @rate: sampling rate
- *
- * Calculate clocktime from sample @frames and @rate.
- */
-#define GST_FRAMES_TO_CLOCK_TIME(frames, rate) \
-  ((GstClockTime) gst_util_uint64_scale_round (frames, GST_SECOND, rate))
-
-/**
- * GST_CLOCK_TIME_TO_FRAMES:
- * @clocktime: clock time
- * @rate: sampling rate
- *
- * Calculate frames from @clocktime and sample @rate.
- */
-#define GST_CLOCK_TIME_TO_FRAMES(clocktime, rate) \
-  gst_util_uint64_scale_round (clocktime, rate, GST_SECOND)
-
-/*
- * this library defines and implements some helper functions for audio
- * handling
- */
-
-GstBuffer *    gst_audio_buffer_clip     (GstBuffer *buffer, GstSegment *segment,
-                                          gint rate, gint bpf);
-
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_AUDIO_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiobasesink.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiobasesink.h
deleted file mode 100644
index d3e65e37..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiobasesink.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudiobasesink.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* a base class for audio sinks.
- *
- * It uses a ringbuffer to schedule playback of samples. This makes
- * it very easy to drop or insert samples to align incoming
- * buffers to the exact playback timestamp.
- *
- * Subclasses must provide a ringbuffer pointing to either DMA
- * memory or regular memory. A subclass should also call a callback
- * function when it has played N segments in the buffer. The subclass
- * is free to use a thread to signal this callback, use EIO or any
- * other mechanism.
- *
- * The base class is able to operate in push or pull mode. The chain
- * mode will queue the samples in the ringbuffer as much as possible.
- * The available space is calculated in the callback function.
- *
- * The pull mode will pull_range() a new buffer of N samples with a
- * configurable latency. This allows for high-end real time
- * audio processing pipelines driven by the audiosink. The callback
- * function will be used to perform a pull_range() on the sinkpad.
- * The thread scheduling the callback can be a real-time thread.
- *
- * Subclasses must implement a GstAudioRingBuffer in addition to overriding
- * the methods in GstBaseSink and this class.
- */
-
-#ifndef __GST_AUDIO_BASE_SINK_H__
-#define __GST_AUDIO_BASE_SINK_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasesink.h>
-#include "gstaudioringbuffer.h"
-#include "gstaudioclock.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_BASE_SINK                (gst_audio_base_sink_get_type())
-#define GST_AUDIO_BASE_SINK(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_BASE_SINK,GstAudioBaseSink))
-#define GST_AUDIO_BASE_SINK_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_BASE_SINK,GstAudioBaseSinkClass))
-#define GST_AUDIO_BASE_SINK_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUDIO_BASE_SINK, GstAudioBaseSinkClass))
-#define GST_IS_AUDIO_BASE_SINK(obj)             (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_BASE_SINK))
-#define GST_IS_AUDIO_BASE_SINK_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_BASE_SINK))
-
-/**
- * GST_AUDIO_BASE_SINK_CLOCK:
- * @obj: a #GstAudioBaseSink
- *
- * Get the #GstClock of @obj.
- */
-#define GST_AUDIO_BASE_SINK_CLOCK(obj)   (GST_AUDIO_BASE_SINK (obj)->clock)
-/**
- * GST_AUDIO_BASE_SINK_PAD:
- * @obj: a #GstAudioBaseSink
- *
- * Get the sink #GstPad of @obj.
- */
-#define GST_AUDIO_BASE_SINK_PAD(obj)     (GST_BASE_SINK (obj)->sinkpad)
-
-/**
- * GstAudioBaseSinkSlaveMethod:
- * @GST_AUDIO_BASE_SINK_SLAVE_RESAMPLE: Resample to match the master clock
- * @GST_AUDIO_BASE_SINK_SLAVE_SKEW: Adjust playout pointer when master clock
- * drifts too much.
- * @GST_AUDIO_BASE_SINK_SLAVE_NONE: No adjustment is done.
- *
- * Different possible clock slaving algorithms used when the internal audio
- * clock is not selected as the pipeline master clock.
- */
-typedef enum
-{
-  GST_AUDIO_BASE_SINK_SLAVE_RESAMPLE,
-  GST_AUDIO_BASE_SINK_SLAVE_SKEW,
-  GST_AUDIO_BASE_SINK_SLAVE_NONE
-} GstAudioBaseSinkSlaveMethod;
-
-#define GST_TYPE_AUDIO_BASE_SINK_SLAVE_METHOD (gst_audio_base_sink_slave_method_get_type ())
-
-typedef struct _GstAudioBaseSink GstAudioBaseSink;
-typedef struct _GstAudioBaseSinkClass GstAudioBaseSinkClass;
-typedef struct _GstAudioBaseSinkPrivate GstAudioBaseSinkPrivate;
-
-/**
- * GstAudioBaseSink:
- *
- * Opaque #GstAudioBaseSink.
- */
-struct _GstAudioBaseSink {
-  GstBaseSink         element;
-
-  /*< protected >*/ /* with LOCK */
-  /* our ringbuffer */
-  GstAudioRingBuffer *ringbuffer;
-
-  /* required buffer and latency in microseconds */
-  guint64             buffer_time;
-  guint64             latency_time;
-
-  /* the next sample to write */
-  guint64             next_sample;
-
-  /* clock */
-  GstClock           *provided_clock;
-
-  /* with g_atomic_; currently rendering eos */
-  gboolean            eos_rendering;
-
-  /*< private >*/
-  GstAudioBaseSinkPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioBaseSinkClass:
- * @parent_class: the parent class.
- * @create_ringbuffer: create and return a #GstAudioRingBuffer to write to.
- * @payload: payload data in a format suitable to write to the sink. If no
- *           payloading is required, returns a reffed copy of the original
- *           buffer, else returns the payloaded buffer with all other metadata
- *           copied.
- *
- * #GstAudioBaseSink class. Override the vmethod to implement
- * functionality.
- */
-struct _GstAudioBaseSinkClass {
-  GstBaseSinkClass     parent_class;
-
-  /* subclass ringbuffer allocation */
-  GstAudioRingBuffer* (*create_ringbuffer)  (GstAudioBaseSink *sink);
-
-  /* subclass payloader */
-  GstBuffer*          (*payload)            (GstAudioBaseSink *sink,
-                                             GstBuffer        *buffer);
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_base_sink_get_type(void);
-GType gst_audio_base_sink_slave_method_get_type (void);
-
-GstAudioRingBuffer *
-           gst_audio_base_sink_create_ringbuffer       (GstAudioBaseSink *sink);
-
-void       gst_audio_base_sink_set_provide_clock       (GstAudioBaseSink *sink, gboolean provide);
-gboolean   gst_audio_base_sink_get_provide_clock       (GstAudioBaseSink *sink);
-
-void       gst_audio_base_sink_set_slave_method        (GstAudioBaseSink *sink,
-                                                        GstAudioBaseSinkSlaveMethod method);
-GstAudioBaseSinkSlaveMethod
-           gst_audio_base_sink_get_slave_method        (GstAudioBaseSink *sink);
-
-void       gst_audio_base_sink_set_drift_tolerance     (GstAudioBaseSink *sink,
-                                                        gint64 drift_tolerance);
-gint64     gst_audio_base_sink_get_drift_tolerance     (GstAudioBaseSink *sink);
-
-void       gst_audio_base_sink_set_alignment_threshold (GstAudioBaseSink * sink,
-                                                        GstClockTime alignment_threshold);
-GstClockTime
-           gst_audio_base_sink_get_alignment_threshold (GstAudioBaseSink * sink);
-
-void       gst_audio_base_sink_set_discont_wait        (GstAudioBaseSink * sink,
-                                                        GstClockTime discont_wait);
-GstClockTime
-           gst_audio_base_sink_get_discont_wait        (GstAudioBaseSink * sink);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_BASE_SINK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiobasesrc.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiobasesrc.h
deleted file mode 100644
index 37be70e8..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiobasesrc.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudiobasesrc.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* a base class for audio sources.
- */
-
-#ifndef __GST_AUDIO_BASE_SRC_H__
-#define __GST_AUDIO_BASE_SRC_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstpushsrc.h>
-#include "gstaudioringbuffer.h"
-#include "gstaudioclock.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_BASE_SRC                 (gst_audio_base_src_get_type())
-#define GST_AUDIO_BASE_SRC(obj)                 (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_BASE_SRC,GstAudioBaseSrc))
-#define GST_AUDIO_BASE_SRC_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_BASE_SRC,GstAudioBaseSrcClass))
-#define GST_AUDIO_BASE_SRC_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUDIO_BASE_SRC, GstAudioBaseSrcClass))
-#define GST_IS_AUDIO_BASE_SRC(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_BASE_SRC))
-#define GST_IS_AUDIO_BASE_SRC_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_BASE_SRC))
-
-/**
- * GST_AUDIO_BASE_SRC_CLOCK:
- * @obj: a #GstAudioBaseSrc
- *
- * Get the #GstClock of @obj.
- */
-#define GST_AUDIO_BASE_SRC_CLOCK(obj)    (GST_AUDIO_BASE_SRC (obj)->clock)
-/**
- * GST_AUDIO_BASE_SRC_PAD:
- * @obj: a #GstAudioBaseSrc
- *
- * Get the source #GstPad of @obj.
- */
-#define GST_AUDIO_BASE_SRC_PAD(obj)      (GST_BASE_SRC (obj)->srcpad)
-
-typedef struct _GstAudioBaseSrc GstAudioBaseSrc;
-typedef struct _GstAudioBaseSrcClass GstAudioBaseSrcClass;
-typedef struct _GstAudioBaseSrcPrivate GstAudioBaseSrcPrivate;
-
-/**
- * GstAudioBaseSrcSlaveMethod:
- * @GST_AUDIO_BASE_SRC_SLAVE_RESAMPLE: Resample to match the master clock.
- * @GST_AUDIO_BASE_SRC_SLAVE_RETIMESTAMP: Retimestamp output buffers with master
- * clock time.
- * @GST_AUDIO_BASE_SRC_SLAVE_SKEW: Adjust capture pointer when master clock
- * drifts too much.
- * @GST_AUDIO_BASE_SRC_SLAVE_NONE: No adjustment is done.
- *
- * Different possible clock slaving algorithms when the internal audio clock was
- * not selected as the pipeline clock.
- */
-typedef enum
-{
-  GST_AUDIO_BASE_SRC_SLAVE_RESAMPLE,
-  GST_AUDIO_BASE_SRC_SLAVE_RETIMESTAMP,
-  GST_AUDIO_BASE_SRC_SLAVE_SKEW,
-  GST_AUDIO_BASE_SRC_SLAVE_NONE
-} GstAudioBaseSrcSlaveMethod;
-
-#define GST_TYPE_AUDIO_BASE_SRC_SLAVE_METHOD (gst_audio_base_src_slave_method_get_type ())
-
-/**
- * GstAudioBaseSrc:
- *
- * Opaque #GstAudioBaseSrc.
- */
-struct _GstAudioBaseSrc {
-  GstPushSrc          element;
-
-  /*< protected >*/ /* with LOCK */
-  /* our ringbuffer */
-  GstAudioRingBuffer *ringbuffer;
-
-  /* required buffer and latency */
-  GstClockTime        buffer_time;
-  GstClockTime        latency_time;
-
-  /* the next sample to write */
-  guint64             next_sample;
-
-  /* clock */
-  GstClock           *clock;
-
-  /*< private >*/
-  GstAudioBaseSrcPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioBaseSrcClass:
- * @parent_class: the parent class.
- * @create_ringbuffer: create and return a #GstAudioRingBuffer to read from.
- *
- * #GstAudioBaseSrc class. Override the vmethod to implement
- * functionality.
- */
-struct _GstAudioBaseSrcClass {
-  GstPushSrcClass      parent_class;
-
-  /* subclass ringbuffer allocation */
-  GstAudioRingBuffer* (*create_ringbuffer)  (GstAudioBaseSrc *src);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_base_src_get_type(void);
-GType gst_audio_base_src_slave_method_get_type (void);
-
-GstAudioRingBuffer *
-           gst_audio_base_src_create_ringbuffer        (GstAudioBaseSrc *src);
-
-void       gst_audio_base_src_set_provide_clock        (GstAudioBaseSrc *src, gboolean provide);
-gboolean   gst_audio_base_src_get_provide_clock        (GstAudioBaseSrc *src);
-
-void       gst_audio_base_src_set_slave_method         (GstAudioBaseSrc *src,
-                                                        GstAudioBaseSrcSlaveMethod method);
-GstAudioBaseSrcSlaveMethod
-           gst_audio_base_src_get_slave_method         (GstAudioBaseSrc *src);
-
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_BASE_SRC_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiocdsrc.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiocdsrc.h
deleted file mode 100644
index 88c96287..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiocdsrc.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* GStreamer Audio CD Source Base Class
- * Copyright (C) 2005 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_CD_SRC_H__
-#define __GST_AUDIO_CD_SRC_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstpushsrc.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_CD_SRC            (gst_audio_cd_src_get_type())
-#define GST_AUDIO_CD_SRC(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AUDIO_CD_SRC, GstAudioCdSrc))
-#define GST_AUDIO_CD_SRC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AUDIO_CD_SRC, GstAudioCdSrcClass))
-#define GST_IS_AUDIO_CD_SRC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AUDIO_CD_SRC))
-#define GST_IS_AUDIO_CD_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AUDIO_CD_SRC))
-#define GST_AUDIO_CD_SRC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUDIO_CD_SRC, GstAudioCdSrcClass))
-
-typedef struct _GstAudioCdSrc GstAudioCdSrc;
-typedef struct _GstAudioCdSrcClass GstAudioCdSrcClass;
-typedef struct _GstAudioCdSrcTrack GstAudioCdSrcTrack;
-typedef struct _GstAudioCdSrcPrivate GstAudioCdSrcPrivate;
-
-/**
- * GstAudioCdSrcMode:
- * @GST_AUDIO_CD_SRC_MODE_NORMAL     : each single track is a stream
- * @GST_AUDIO_CD_SRC_MODE_CONTINUOUS : the entire disc is a single stream
- *
- * Mode in which the CD audio source operates. Influences timestamping,
- * EOS handling and seeking.
- */
-typedef enum {
-  GST_AUDIO_CD_SRC_MODE_NORMAL,          /* stream = one track  */
-  GST_AUDIO_CD_SRC_MODE_CONTINUOUS       /* stream = whole disc */
-} GstAudioCdSrcMode;
-
-#define GST_TYPE_AUDIO_CD_SRC_MODE          (gst_audio_cd_src_mode_get_type ())
-
-/**
- * GstAudioCdSrcTrack:
- * @is_audio: Whether this is an audio track
- * @num: Track number in TOC (usually starts from 1, but not always)
- * @start: The first sector of this track (LBA)
- * @end: The last sector of this track (LBA)
- * @tags: Track-specific tags (e.g. from cd-text information), or NULL
- *
- * CD track abstraction to communicate TOC entries to the base class.
- *
- * This structure is only for use by sub-classed in connection with
- * gst_audio_cd_src_add_track().
- *
- * Applications will be informed of the available tracks via a TOC message
- * on the pipeline's #GstBus instead.
- */
-/* FIXME 2.0: remove this struct and pass values directly to _add_track() */
-struct _GstAudioCdSrcTrack {
-  gboolean     is_audio;      /* TRUE if this is an audio track             */
-  guint        num;           /* real track number (usually starts from 1)  */
-  guint        start;         /* first sector of track (LBA, not LSN!)      */
-  guint        end;           /* last sector of track  (LBA, not LSN!)      */
-  GstTagList  *tags;          /* NULL or tags for track (e.g. from cd-text) */
-
-  /*< private >*/
-  guint        _gst_reserved1[GST_PADDING/2];
-  gpointer     _gst_reserved2[GST_PADDING/2];
-};
-
-struct _GstAudioCdSrc {
-  GstPushSrc            pushsrc;
-
-  /*< protected >*/ /* for use by sub-classes only */
-  GstTagList           *tags;            /* tags that apply to all tracks   */
-
-  /*< private >*/
-  GstAudioCdSrcPrivate *priv;
-
-  /*< private >*/
-  guint                 _gst_reserved1[GST_PADDING/2];
-  gpointer              _gst_reserved2[GST_PADDING/2];
-};
-
-/**
- * GstAudioCdSrcClass:
- * @pushsrc_class: the parent class
- * @open: opening the device
- * @close: closing the device
- * @read_sector: reading a sector
- * @get_default_device: getting the default device
- * @probe_devices: probing possible devices
- *
- * Audio CD source base class.
- */
-struct _GstAudioCdSrcClass {
-  GstPushSrcClass pushsrc_class;
-
-  /* open/close the CD device */
-  gboolean    (*open)               (GstAudioCdSrc *src, const gchar *device);
-  void        (*close)              (GstAudioCdSrc *src);
-
-  /* read one sector (LBA) */
-  GstBuffer * (*read_sector)        (GstAudioCdSrc *src, gint sector);
-
-#if 0
-  /* return default device or NULL (optional) */
-  gchar *     (*get_default_device) (GstAudioCdSrc *src);
-
-  /* return NULL-terminated string array of CD devices, or NULL (optional) */
-  /* FIXME 0.11: reconsider for new probing/device discovery API, remove if in doubt */
-  gchar **    (*probe_devices)      (GstAudioCdSrc *src);
-#endif
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType    gst_audio_cd_src_get_type (void);
-GType    gst_audio_cd_src_mode_get_type (void);
-
-gboolean gst_audio_cd_src_add_track (GstAudioCdSrc      * src,
-                                     GstAudioCdSrcTrack * track);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_CD_SRC_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioclock.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioclock.h
deleted file mode 100644
index 57091874..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioclock.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudioclock.h: Clock for use by audio plugins
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_CLOCK_H__
-#define __GST_AUDIO_CLOCK_H__
-
-#include <gst/gst.h>
-#include <gst/gstsystemclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_CLOCK \
-  (gst_audio_clock_get_type())
-#define GST_AUDIO_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_CLOCK,GstAudioClock))
-#define GST_AUDIO_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_CLOCK,GstAudioClockClass))
-#define GST_IS_AUDIO_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_CLOCK))
-#define GST_IS_AUDIO_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_CLOCK))
-#define GST_AUDIO_CLOCK_CAST(obj) \
-  ((GstAudioClock*)(obj))
-
-typedef struct _GstAudioClock GstAudioClock;
-typedef struct _GstAudioClockClass GstAudioClockClass;
-
-/**
- * GstAudioClockGetTimeFunc:
- * @clock: the #GstAudioClock
- * @user_data: user data
- *
- * This function will be called whenever the current clock time needs to be
- * calculated. If this function returns #GST_CLOCK_TIME_NONE, the last reported
- * time will be returned by the clock.
- *
- * Returns: the current time or #GST_CLOCK_TIME_NONE if the previous time should
- * be used.
- */
-typedef GstClockTime (*GstAudioClockGetTimeFunc) (GstClock *clock, gpointer user_data);
-
-/**
- * GstAudioClock:
- *
- * Opaque #GstAudioClock.
- */
-struct _GstAudioClock {
-  GstSystemClock clock;
-
-  /*< protected >*/
-  GstAudioClockGetTimeFunc func;
-  gpointer                 user_data;
-  GDestroyNotify           destroy_notify;
-
-  /*< private >*/
-  GstClockTime             last_time;
-  GstClockTimeDiff         time_offset;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstAudioClockClass {
-  GstSystemClockClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_audio_clock_get_type        (void);
-GstClock*       gst_audio_clock_new             (const gchar *name, GstAudioClockGetTimeFunc func,
-                                                 gpointer user_data, GDestroyNotify destroy_notify);
-void            gst_audio_clock_reset           (GstAudioClock *clock, GstClockTime time);
-
-GstClockTime    gst_audio_clock_get_time        (GstClock * clock);
-GstClockTime    gst_audio_clock_adjust          (GstClock * clock, GstClockTime time);
-
-void            gst_audio_clock_invalidate      (GstClock * clock);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_CLOCK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiodecoder.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiodecoder.h
deleted file mode 100644
index 27e1fab6..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiodecoder.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Igalia S.L.
- * Author: Iago Toral Quiroga <itoral@igalia.com>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef _GST_AUDIO_DECODER_H_
-#define _GST_AUDIO_DECODER_H_
-
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-#include <gst/base/gstadapter.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_DECODER \
-  (gst_audio_decoder_get_type())
-#define GST_AUDIO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_DECODER,GstAudioDecoder))
-#define GST_AUDIO_DECODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_DECODER,GstAudioDecoderClass))
-#define GST_AUDIO_DECODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_DECODER,GstAudioDecoderClass))
-#define GST_IS_AUDIO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_DECODER))
-#define GST_IS_AUDIO_DECODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_DECODER))
-#define GST_AUDIO_DECODER_CAST(obj) \
-  ((GstAudioDecoder *)(obj))
-
-/**
- * GST_AUDIO_DECODER_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- */
-#define GST_AUDIO_DECODER_SINK_NAME    "sink"
-/**
- * GST_AUDIO_DECODER_SRC_NAME:
- *
- * The name of the templates for the source pad.
- */
-#define GST_AUDIO_DECODER_SRC_NAME     "src"
-
-/**
- * GST_AUDIO_DECODER_SRC_PAD:
- * @obj: base audio codec instance
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_AUDIO_DECODER_SRC_PAD(obj)         (((GstAudioDecoder *) (obj))->srcpad)
-
-/**
- * GST_AUDIO_DECODER_SINK_PAD:
- * @obj: base audio codec instance
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_AUDIO_DECODER_SINK_PAD(obj)        (((GstAudioDecoder *) (obj))->sinkpad)
-
-#define GST_AUDIO_DECODER_STREAM_LOCK(dec)   g_rec_mutex_lock (&GST_AUDIO_DECODER (dec)->stream_lock)
-#define GST_AUDIO_DECODER_STREAM_UNLOCK(dec) g_rec_mutex_unlock (&GST_AUDIO_DECODER (dec)->stream_lock)
-
-/**
- * GST_AUDIO_DECODER_INPUT_SEGMENT:
- * @obj: audio decoder instance
- *
- * Gives the input segment of the element.
- */
-#define GST_AUDIO_DECODER_INPUT_SEGMENT(obj)   (GST_AUDIO_DECODER_CAST (obj)->input_segment)
-
-/**
- * GST_AUDIO_DECODER_OUTPUT_SEGMENT:
- * @obj: audio decoder instance
- *
- * Gives the output segment of the element.
- */
-#define GST_AUDIO_DECODER_OUTPUT_SEGMENT(obj)   (GST_AUDIO_DECODER_CAST (obj)->output_segment)
-
-typedef struct _GstAudioDecoder GstAudioDecoder;
-typedef struct _GstAudioDecoderClass GstAudioDecoderClass;
-
-typedef struct _GstAudioDecoderPrivate GstAudioDecoderPrivate;
-
-/* do not use this one, use macro below */
-GstFlowReturn _gst_audio_decoder_error (GstAudioDecoder *dec, gint weight,
-                                        GQuark domain, gint code,
-                                        gchar *txt, gchar *debug,
-                                        const gchar *file, const gchar *function,
-                                        gint line);
-
-/**
- * GST_AUDIO_DECODER_ERROR:
- * @el:     the base audio decoder element that generates the error
- * @weight: element defined weight of the error, added to error count
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
- *          parentheses)
- * @debug:  debugging information for the message (format string and args
- *          enclosed in parentheses)
- * @ret:    variable to receive return value
- *
- * Utility function that audio decoder elements can use in case they encountered
- * a data processing error that may be fatal for the current "data unit" but
- * need not prevent subsequent decoding.  Such errors are counted and if there
- * are too many, as configured in the context's max_errors, the pipeline will
- * post an error message and the application will be requested to stop further
- * media processing.  Otherwise, it is considered a "glitch" and only a warning
- * is logged. In either case, @ret is set to the proper value to
- * return to upstream/caller (indicating either GST_FLOW_ERROR or GST_FLOW_OK).
- */
-#define GST_AUDIO_DECODER_ERROR(el, weight, domain, code, text, debug, ret) \
-G_STMT_START {                                                              \
-  gchar *__txt = _gst_element_error_printf text;                            \
-  gchar *__dbg = _gst_element_error_printf debug;                           \
-  GstAudioDecoder *dec = GST_AUDIO_DECODER (el);                   \
-  ret = _gst_audio_decoder_error (dec, weight, GST_ ## domain ## _ERROR,    \
-      GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__,            \
-      GST_FUNCTION, __LINE__);                                              \
-} G_STMT_END
-
-
-/**
- * GST_AUDIO_DECODER_MAX_ERRORS:
- *
- * Default maximum number of errors tolerated before signaling error.
- */
-#define GST_AUDIO_DECODER_MAX_ERRORS     10
-
-/**
- * GstAudioDecoder:
- *
- * The opaque #GstAudioDecoder data structure.
- */
-struct _GstAudioDecoder
-{
-  GstElement element;
-
-  /*< protected >*/
-  /* source and sink pads */
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GRecMutex       stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  /*< private >*/
-  GstAudioDecoderPrivate *priv;
-
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstAudioDecoderClass:
- * @element_class:  The parent class structure
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Notifies subclass of incoming data format (caps).
- * @parse:          Optional.
- *                  Allows chopping incoming data into manageable units (frames)
- *                  for subsequent decoding.  This division is at subclass
- *                  discretion and may or may not correspond to 1 (or more)
- *                  frames as defined by audio format.
- * @handle_frame:   Provides input data (or NULL to clear any remaining data)
- *                  to subclass.  Input data ref management is performed by
- *                  base class, subclass should not care or intervene,
- *                  and input data is only valid until next call to base class,
- *                  most notably a call to gst_audio_decoder_finish_frame().
- * @flush:          Optional.
- *                  Instructs subclass to clear any codec caches and discard
- *                  any pending samples and not yet returned decoded data.
- *                  @hard indicates whether a FLUSH is being processed,
- *                  or otherwise a DISCONT (or conceptually similar).
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. Subclasses should chain up to
- *                  the parent implementation to invoke the default handler.
- * @src_event:      Optional.
- *                  Event handler on the src pad. Subclasses should chain up to
- *                  the parent implementation to invoke the default handler.
- * @pre_push:       Optional.
- *                  Called just prior to pushing (encoded data) buffer downstream.
- *                  Subclass has full discretionary access to buffer,
- *                  and a not OK flow return will abort downstream pushing.
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @negotiate:      Optional.
- *                  Negotiate with downstream and configure buffer pools, etc.
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @decide_allocation: Optional.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *                     Subclasses should chain up to the parent implementation to
- *                     invoke the default handler.
- * @propose_allocation: Optional.
- *                      Propose buffer allocation parameters for upstream elements.
- *                      Subclasses should chain up to the parent implementation to
- *                      invoke the default handler.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @handle_frame (and likely @set_format) needs to be
- * overridden.
- */
-struct _GstAudioDecoderClass
-{
-  GstElementClass element_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  gboolean      (*start)              (GstAudioDecoder *dec);
-
-  gboolean      (*stop)               (GstAudioDecoder *dec);
-
-  gboolean      (*set_format)         (GstAudioDecoder *dec,
-                                       GstCaps *caps);
-
-  GstFlowReturn (*parse)              (GstAudioDecoder *dec,
-                                       GstAdapter *adapter,
-                                       gint *offset, gint *length);
-
-  GstFlowReturn (*handle_frame)       (GstAudioDecoder *dec,
-                                       GstBuffer *buffer);
-
-  void          (*flush)              (GstAudioDecoder *dec, gboolean hard);
-
-  GstFlowReturn (*pre_push)           (GstAudioDecoder *dec,
-                                       GstBuffer **buffer);
-
-  gboolean      (*sink_event)         (GstAudioDecoder *dec,
-                                       GstEvent *event);
-  gboolean      (*src_event)          (GstAudioDecoder *dec,
-                                       GstEvent *event);
-
-  gboolean      (*open)               (GstAudioDecoder *dec);
-  
-  gboolean      (*close)              (GstAudioDecoder *dec);
-
-  gboolean      (*negotiate)          (GstAudioDecoder *dec);
-
-  gboolean      (*decide_allocation)  (GstAudioDecoder *dec, GstQuery *query);
-
-  gboolean      (*propose_allocation) (GstAudioDecoder *dec,
-                                       GstQuery * query);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType             gst_audio_decoder_get_type (void);
-
-gboolean          gst_audio_decoder_set_output_format  (GstAudioDecoder    * dec,
-                                                        const GstAudioInfo * info);
-
-gboolean          gst_audio_decoder_negotiate (GstAudioDecoder * dec);
-
-GstFlowReturn     gst_audio_decoder_finish_frame (GstAudioDecoder * dec,
-                                                  GstBuffer * buf, gint frames);
-
-GstBuffer *       gst_audio_decoder_allocate_output_buffer (GstAudioDecoder * dec,
-                                                            gsize              size);
-
-/* context parameters */
-GstAudioInfo    * gst_audio_decoder_get_audio_info (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_plc_aware  (GstAudioDecoder * dec,
-                                                    gboolean          plc);
-
-gint              gst_audio_decoder_get_plc_aware  (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_estimate_rate  (GstAudioDecoder * dec,
-                                                    gboolean          enabled);
-
-gint              gst_audio_decoder_get_estimate_rate  (GstAudioDecoder * dec);
-
-gint              gst_audio_decoder_get_delay      (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_max_errors (GstAudioDecoder * dec,
-                                                   gint               num);
-
-gint              gst_audio_decoder_get_max_errors (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_latency (GstAudioDecoder * dec,
-                                                 GstClockTime      min,
-                                                 GstClockTime      max);
-
-void              gst_audio_decoder_get_latency (GstAudioDecoder * dec,
-                                                 GstClockTime    * min,
-                                                 GstClockTime    * max);
-
-void              gst_audio_decoder_get_parse_state (GstAudioDecoder * dec,
-                                                     gboolean        * sync,
-                                                     gboolean        * eos);
-
-
-/* object properties */
-void              gst_audio_decoder_set_plc (GstAudioDecoder * dec,
-                                             gboolean          enabled);
-
-gboolean          gst_audio_decoder_get_plc (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_min_latency (GstAudioDecoder * dec,
-                                                     GstClockTime      num);
-
-GstClockTime      gst_audio_decoder_get_min_latency (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_tolerance   (GstAudioDecoder * dec,
-                                                     GstClockTime      tolerance);
-
-GstClockTime      gst_audio_decoder_get_tolerance   (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_drainable (GstAudioDecoder * dec,
-                                                   gboolean enabled);
-
-gboolean          gst_audio_decoder_get_drainable (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_needs_format (GstAudioDecoder * dec,
-                                                      gboolean enabled);
-
-gboolean          gst_audio_decoder_get_needs_format (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_get_allocator (GstAudioDecoder * dec,
-                                                   GstAllocator ** allocator,
-                                                   GstAllocationParams * params);
-
-void              gst_audio_decoder_merge_tags (GstAudioDecoder * dec,
-                                                const GstTagList * tags, GstTagMergeMode mode);
-
-G_END_DECLS
-
-#endif /* _GST_AUDIO_DECODER_H_ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioencoder.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioencoder.h
deleted file mode 100644
index e4973aff..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioencoder.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_ENCODER_H__
-#define __GST_AUDIO_ENCODER_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_ENCODER		   (gst_audio_encoder_get_type())
-#define GST_AUDIO_ENCODER(obj)		   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_ENCODER,GstAudioEncoder))
-#define GST_AUDIO_ENCODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_ENCODER,GstAudioEncoderClass))
-#define GST_AUDIO_ENCODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_ENCODER,GstAudioEncoderClass))
-#define GST_IS_AUDIO_ENCODER(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_ENCODER))
-#define GST_IS_AUDIO_ENCODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_ENCODER))
-#define GST_AUDIO_ENCODER_CAST(obj)	((GstAudioEncoder *)(obj))
-
-/**
- * GST_AUDIO_ENCODER_SINK_NAME:
- *
- * the name of the templates for the sink pad
- */
-#define GST_AUDIO_ENCODER_SINK_NAME	"sink"
-/**
- * GST_AUDIO_ENCODER_SRC_NAME:
- *
- * the name of the templates for the source pad
- */
-#define GST_AUDIO_ENCODER_SRC_NAME	        "src"
-
-/**
- * GST_AUDIO_ENCODER_SRC_PAD:
- * @obj: audio encoder instance
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_AUDIO_ENCODER_SRC_PAD(obj)	(GST_AUDIO_ENCODER_CAST (obj)->srcpad)
-
-/**
- * GST_AUDIO_ENCODER_SINK_PAD:
- * @obj: audio encoder instance
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_AUDIO_ENCODER_SINK_PAD(obj)	(GST_AUDIO_ENCODER_CAST (obj)->sinkpad)
-
-/**
- * GST_AUDIO_ENCODER_INPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the input segment of the element.
- */
-#define GST_AUDIO_ENCODER_INPUT_SEGMENT(obj)     (GST_AUDIO_ENCODER_CAST (obj)->input_segment)
-
-/**
- * GST_AUDIO_ENCODER_OUTPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the output segment of the element.
- */
-#define GST_AUDIO_ENCODER_OUTPUT_SEGMENT(obj)     (GST_AUDIO_ENCODER_CAST (obj)->output_segment)
-
-#define GST_AUDIO_ENCODER_STREAM_LOCK(enc)   g_rec_mutex_lock (&GST_AUDIO_ENCODER (enc)->stream_lock)
-#define GST_AUDIO_ENCODER_STREAM_UNLOCK(enc) g_rec_mutex_unlock (&GST_AUDIO_ENCODER (enc)->stream_lock)
-
-typedef struct _GstAudioEncoder GstAudioEncoder;
-typedef struct _GstAudioEncoderClass GstAudioEncoderClass;
-
-typedef struct _GstAudioEncoderPrivate GstAudioEncoderPrivate;
-
-/**
- * GstAudioEncoder:
- *
- * The opaque #GstAudioEncoder data structure.
- */
-struct _GstAudioEncoder {
-  GstElement     element;
-
-  /*< protected >*/
-  /* source and sink pads */
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GRecMutex       stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  /*< private >*/
-  GstAudioEncoderPrivate *priv;
-
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstAudioEncoderClass:
- * @element_class:  The parent class structure
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Notifies subclass of incoming data format.
- *                  GstAudioInfo contains the format according to provided caps.
- * @handle_frame:   Provides input samples (or NULL to clear any remaining data)
- *                  according to directions as configured by the subclass
- *                  using the API.  Input data ref management is performed
- *                  by base class, subclass should not care or intervene,
- *                  and input data is only valid until next call to base class,
- *                  most notably a call to gst_audio_encoder_finish_frame().
- * @flush:          Optional.
- *                  Instructs subclass to clear any codec caches and discard
- *                  any pending samples and not yet returned encoded data.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. Subclasses should chain up to
- *                  the parent implementation to invoke the default handler.
- * @src_event:      Optional.
- *                  Event handler on the src pad. Subclasses should chain up to
- *                  the parent implementation to invoke the default handler.
- * @pre_push:       Optional.
- *                  Called just prior to pushing (encoded data) buffer downstream.
- *                  Subclass has full discretionary access to buffer,
- *                  and a not OK flow return will abort downstream pushing.
- * @getcaps:        Optional.
- *                  Allows for a custom sink getcaps implementation (e.g.
- *                  for multichannel input specification).  If not implemented,
- *                  default returns gst_audio_encoder_proxy_getcaps
- *                  applied to sink template caps.
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @negotiate:      Optional.
- *                  Negotiate with downstream and configure buffer pools, etc.
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @decide_allocation: Optional.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *                     Subclasses should chain up to the parent implementation to
- *                     invoke the default handler.
- * @propose_allocation: Optional.
- *                      Propose buffer allocation parameters for upstream elements.
- *                      Subclasses should chain up to the parent implementation to
- *                      invoke the default handler.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @set_format and @handle_frame needs to be overridden.
- */
-struct _GstAudioEncoderClass {
-  GstElementClass element_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  gboolean      (*start)              (GstAudioEncoder *enc);
-
-  gboolean      (*stop)               (GstAudioEncoder *enc);
-
-  gboolean      (*set_format)         (GstAudioEncoder *enc,
-                                       GstAudioInfo        *info);
-
-  GstFlowReturn (*handle_frame)       (GstAudioEncoder *enc,
-                                       GstBuffer *buffer);
-
-  void          (*flush)              (GstAudioEncoder *enc);
-
-  GstFlowReturn (*pre_push)           (GstAudioEncoder *enc,
-                                       GstBuffer **buffer);
-
-  gboolean      (*sink_event)         (GstAudioEncoder *enc,
-                                       GstEvent *event);
-
-  gboolean      (*src_event)          (GstAudioEncoder *enc,
-                                       GstEvent *event);
-
-  GstCaps *     (*getcaps)            (GstAudioEncoder *enc, GstCaps *filter);
-
-  gboolean      (*open)               (GstAudioEncoder *enc);
-
-  gboolean      (*close)              (GstAudioEncoder *enc);
-
-  gboolean      (*negotiate)          (GstAudioEncoder *enc);
-
-  gboolean      (*decide_allocation)  (GstAudioEncoder *enc, GstQuery *query);
-
-  gboolean      (*propose_allocation) (GstAudioEncoder * enc,
-                                       GstQuery * query);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType           gst_audio_encoder_get_type         (void);
-
-GstFlowReturn   gst_audio_encoder_finish_frame (GstAudioEncoder * enc,
-                                                GstBuffer       * buffer,
-                                                gint              samples);
-
-GstCaps *       gst_audio_encoder_proxy_getcaps (GstAudioEncoder * enc,
-                                                 GstCaps         * caps,
-                                                 GstCaps         * filter);
-
-gboolean        gst_audio_encoder_set_output_format  (GstAudioEncoder    * enc,
-                                                      GstCaps            * caps);
-
-gboolean        gst_audio_encoder_negotiate          (GstAudioEncoder * enc);
-
-GstBuffer *     gst_audio_encoder_allocate_output_buffer (GstAudioEncoder * enc,
-                                                          gsize             size);
-
-/* context parameters */
-GstAudioInfo  * gst_audio_encoder_get_audio_info (GstAudioEncoder * enc);
-
-gint            gst_audio_encoder_get_frame_samples_min (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_frame_samples_min (GstAudioEncoder * enc, gint num);
-
-gint            gst_audio_encoder_get_frame_samples_max (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_frame_samples_max (GstAudioEncoder * enc, gint num);
-
-gint            gst_audio_encoder_get_frame_max (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_frame_max (GstAudioEncoder * enc, gint num);
-
-gint            gst_audio_encoder_get_lookahead (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_lookahead (GstAudioEncoder * enc, gint num);
-
-void            gst_audio_encoder_get_latency (GstAudioEncoder * enc,
-                                               GstClockTime    * min,
-                                               GstClockTime    * max);
-
-void            gst_audio_encoder_set_latency (GstAudioEncoder * enc,
-                                               GstClockTime      min,
-                                               GstClockTime      max);
-
-void            gst_audio_encoder_set_headers (GstAudioEncoder * enc,
-                                               GList           * headers);
-
-/* object properties */
-
-void            gst_audio_encoder_set_mark_granule (GstAudioEncoder * enc,
-                                                    gboolean enabled);
-
-gboolean        gst_audio_encoder_get_mark_granule (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_perfect_timestamp (GstAudioEncoder * enc,
-                                                         gboolean          enabled);
-
-gboolean        gst_audio_encoder_get_perfect_timestamp (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_hard_resync (GstAudioEncoder * enc,
-                                                   gboolean          enabled);
-
-gboolean        gst_audio_encoder_get_hard_resync (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_tolerance (GstAudioEncoder * enc,
-                                                 GstClockTime      tolerance);
-
-GstClockTime    gst_audio_encoder_get_tolerance (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_hard_min (GstAudioEncoder * enc,
-                                                gboolean enabled);
-
-gboolean        gst_audio_encoder_get_hard_min (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_drainable (GstAudioEncoder * enc,
-                                                 gboolean enabled);
-
-gboolean        gst_audio_encoder_get_drainable (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_get_allocator (GstAudioEncoder * enc,
-                                                 GstAllocator ** allocator,
-                                                 GstAllocationParams * params);
-
-void            gst_audio_encoder_merge_tags (GstAudioEncoder * enc,
-                                              const GstTagList * tags, GstTagMergeMode mode);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_ENCODER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiofilter.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiofilter.h
deleted file mode 100644
index 0e5f925a..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiofilter.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_AUDIO_FILTER_H__
-#define __GST_AUDIO_FILTER_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasetransform.h>
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstAudioFilter GstAudioFilter;
-typedef struct _GstAudioFilterClass GstAudioFilterClass;
-
-#define GST_TYPE_AUDIO_FILTER \
-  (gst_audio_filter_get_type())
-#define GST_AUDIO_FILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_FILTER,GstAudioFilter))
-#define GST_AUDIO_FILTER_CAST(obj) \
-  ((GstAudioFilter *) (obj))
-#define GST_AUDIO_FILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_FILTER,GstAudioFilterClass))
-#define GST_AUDIO_FILTER_CLASS_CAST(klass) \
-  ((GstAudioFilterClass *) (klass))
-#define GST_AUDIO_FILTER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_FILTER,GstAudioFilterClass))
-#define GST_IS_AUDIO_FILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_FILTER))
-#define GST_IS_AUDIO_FILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_FILTER))
-
-/**
- * GstAudioFilter:
- *
- * Base class for audio filters with the same format for input and output.
- */
-struct _GstAudioFilter {
-  GstBaseTransform basetransform;
-
-  /*< protected >*/
-  GstAudioInfo info;   /* currently configured format */
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_AUDIO_FILTER_INFO(filter)     (&GST_AUDIO_FILTER_CAST(filter)->info)
-
-#define GST_AUDIO_FILTER_FORMAT(filter)   (GST_AUDIO_INFO_FORMAT(GST_AUDIO_FILTER_INFO(filter)))
-#define GST_AUDIO_FILTER_RATE(filter)     (GST_AUDIO_INFO_RATE(GST_AUDIO_FILTER_INFO(filter)))
-#define GST_AUDIO_FILTER_CHANNELS(filter) (GST_AUDIO_INFO_CHANNELS(GST_AUDIO_FILTER_INFO(filter)))
-#define GST_AUDIO_FILTER_BPF(filter)      (GST_AUDIO_INFO_BPF(GST_AUDIO_FILTER_INFO(filter)))
-#define GST_AUDIO_FILTER_BPS(filter)      (GST_AUDIO_INFO_BPS(GST_AUDIO_FILTER_INFO(filter)))
-
-/**
- * GstAudioFilterClass:
- * @basetransformclass: parent class
- * @setup: virtual function called whenever the format changes
- *
- * In addition to the @setup virtual function, you should also override the
- * GstBaseTransform::transform and/or GstBaseTransform::transform_ip virtual
- * function.
- */
-
-struct _GstAudioFilterClass {
-  GstBaseTransformClass basetransformclass;
-
-  /* virtual function, called whenever the format changes */
-  gboolean  (*setup) (GstAudioFilter * filter, const GstAudioInfo * info);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType   gst_audio_filter_get_type (void);
-
-void    gst_audio_filter_class_add_pad_templates (GstAudioFilterClass * klass,
-                                                  GstCaps             * allowed_caps);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_FILTER_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioiec61937.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioiec61937.h
deleted file mode 100644
index 1cdc6461..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioiec61937.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* GStreamer audio helper functions for IEC 61937 payloading
- * (c) 2011 Intel Corporation
- *     2011 Collabora Multimedia
- *     2011 Arun Raghavan <arun.raghavan@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_IEC61937_H__
-#define __GST_AUDIO_IEC61937_H__
-
-#include <gst/audio/gstaudioringbuffer.h>
-
-guint       gst_audio_iec61937_frame_size  (const GstAudioRingBufferSpec * spec);
-gboolean    gst_audio_iec61937_payload     (const guint8 * src, guint src_n,
-                                            guint8 * dst, guint dst_n,
-                                            const GstAudioRingBufferSpec * spec,
-                                            gint endianness);
-
-#endif /* __GST_AUDIO_IEC61937_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiometa.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiometa.h
deleted file mode 100644
index 822972ba..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiometa.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_META_H__
-#define __GST_AUDIO_META_H__
-
-#include <gst/gst.h>
-
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-#define GST_AUDIO_DOWNMIX_META_API_TYPE (gst_audio_downmix_meta_api_get_type())
-#define GST_AUDIO_DOWNMIX_META_INFO  (gst_audio_downmix_meta_get_info())
-
-typedef struct _GstAudioDownmixMeta GstAudioDownmixMeta;
-
-/**
- * GstAudioDownmixMeta:
- * @meta: parent #GstMeta
- * @from_position: the channel positions of the source
- * @to_position: the channel positions of the destination
- * @from_channels: the number of channels of the source
- * @to_channels: the number of channels of the destination
- * @matrix: the matrix coefficients.
- *
- * Extra buffer metadata describing audio downmixing matrix. This metadata is
- * attached to audio buffers and contains a matrix to downmix the buffer number
- * of channels to @channels.
- *
- * @matrix is an two-dimensional array of @to_channels times @from_channels
- * coefficients, i.e. the i-th output channels is constructed by multiplicating
- * the input channels with the coefficients in @matrix[i] and taking the sum
- * of the results.
- */
-struct _GstAudioDownmixMeta {
-  GstMeta      meta;
-
-  GstAudioChannelPosition *from_position;
-  GstAudioChannelPosition *to_position;
-  gint        from_channels, to_channels;
-  gfloat       **matrix;
-};
-
-GType gst_audio_downmix_meta_api_get_type (void);
-const GstMetaInfo * gst_audio_downmix_meta_get_info (void);
-
-#define gst_buffer_get_audio_downmix_meta(b) ((GstAudioDownmixMeta*)gst_buffer_get_meta((b),GST_AUDIO_DOWNMIX_META_INFO))
-GstAudioDownmixMeta * gst_buffer_get_audio_downmix_meta_for_channels    (GstBuffer *buffer,
-                                                                         const GstAudioChannelPosition *to_position,
-                                                                         gint                           to_channels);
-
-GstAudioDownmixMeta * gst_buffer_add_audio_downmix_meta (GstBuffer    *buffer,
-                                                         const GstAudioChannelPosition *from_position,
-                                                         gint                           from_channels,
-                                                         const GstAudioChannelPosition *to_position,
-                                                         gint                           to_channels,
-                                                         const gfloat                 **matrix);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_META_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioringbuffer.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioringbuffer.h
deleted file mode 100644
index e578aea8..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudioringbuffer.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudioringbuffer.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_RING_BUFFER_H__
-#define __GST_AUDIO_RING_BUFFER_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_RING_BUFFER             (gst_audio_ring_buffer_get_type())
-#define GST_AUDIO_RING_BUFFER(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_RING_BUFFER,GstAudioRingBuffer))
-#define GST_AUDIO_RING_BUFFER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_RING_BUFFER,GstAudioRingBufferClass))
-#define GST_AUDIO_RING_BUFFER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUDIO_RING_BUFFER, GstAudioRingBufferClass))
-#define GST_AUDIO_RING_BUFFER_CAST(obj)        ((GstAudioRingBuffer *)obj)
-#define GST_IS_AUDIO_RING_BUFFER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_RING_BUFFER))
-#define GST_IS_AUDIO_RING_BUFFER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_RING_BUFFER))
-
-typedef struct _GstAudioRingBuffer GstAudioRingBuffer;
-typedef struct _GstAudioRingBufferClass GstAudioRingBufferClass;
-typedef struct _GstAudioRingBufferSpec GstAudioRingBufferSpec;
-
-/**
- * GstAudioRingBufferCallback:
- * @rbuf: a #GstAudioRingBuffer
- * @data: (array length=len): target to fill
- * @len: amount to fill
- * @user_data: user data
- *
- * This function is set with gst_audio_ring_buffer_set_callback() and is
- * called to fill the memory at @data with @len bytes of samples.
- */
-typedef void (*GstAudioRingBufferCallback) (GstAudioRingBuffer *rbuf, guint8* data, guint len, gpointer user_data);
-
-/**
- * GstAudioRingBufferState:
- * @GST_AUDIO_RING_BUFFER_STATE_STOPPED: The ringbuffer is stopped
- * @GST_AUDIO_RING_BUFFER_STATE_PAUSED: The ringbuffer is paused
- * @GST_AUDIO_RING_BUFFER_STATE_STARTED: The ringbuffer is started
- *
- * The state of the ringbuffer.
- */
-typedef enum {
-  GST_AUDIO_RING_BUFFER_STATE_STOPPED,
-  GST_AUDIO_RING_BUFFER_STATE_PAUSED,
-  GST_AUDIO_RING_BUFFER_STATE_STARTED
-} GstAudioRingBufferState;
-
-/**
- * GstAudioRingBufferFormatType:
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW: samples in linear or float
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW: samples in mulaw
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW: samples in alaw
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IMA_ADPCM: samples in ima adpcm
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG: samples in mpeg audio (but not AAC) format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_GSM: samples in gsm format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IEC958: samples in IEC958 frames (e.g. AC3)
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_AC3: samples in AC3 format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3: samples in EAC3 format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS: samples in DTS format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC: samples in MPEG-2 AAC format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC: samples in MPEG-4 AAC format
- *
- * The format of the samples in the ringbuffer.
- */
-typedef enum
-{
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IMA_ADPCM,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_GSM,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IEC958,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_AC3,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC
-} GstAudioRingBufferFormatType;
-
-/**
- * GstAudioRingBufferSpec:
- * @caps: The caps that generated the Spec.
- * @type: the sample type
- * @info: the #GstAudioInfo
- * @latency_time: the latency in microseconds
- * @buffer_time: the total buffer size in microseconds
- * @segsize: the size of one segment in bytes
- * @segtotal: the total number of segments
- * @seglatency: number of segments queued in the lower level device,
- *  defaults to segtotal
- *
- * The structure containing the format specification of the ringbuffer.
- */
-struct _GstAudioRingBufferSpec
-{
-  /*< public >*/
-  /* in */
-  GstCaps  *caps;               /* the caps of the buffer */
-
-  /* in/out */
-  GstAudioRingBufferFormatType  type;
-  GstAudioInfo                  info;
-
-
-  guint64  latency_time;        /* the required/actual latency time, this is the
-				 * actual the size of one segment and the
-				 * minimum possible latency we can achieve. */
-  guint64  buffer_time;         /* the required/actual time of the buffer, this is
-				 * the total size of the buffer and maximum
-				 * latency we can compensate for. */
-  gint     segsize;             /* size of one buffer segment in bytes, this value
-				 * should be chosen to match latency_time as
-				 * well as possible. */
-  gint     segtotal;            /* total number of segments, this value is the
-				 * number of segments of @segsize and should be
-				 * chosen so that it matches buffer_time as
-				 * close as possible. */
-  /* ABI added 0.10.20 */
-  gint     seglatency;          /* number of segments queued in the lower
-				 * level device, defaults to segtotal. */
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_AUDIO_RING_BUFFER_GET_COND(buf) (&(((GstAudioRingBuffer *)buf)->cond))
-#define GST_AUDIO_RING_BUFFER_WAIT(buf)     (g_cond_wait (GST_AUDIO_RING_BUFFER_GET_COND (buf), GST_OBJECT_GET_LOCK (buf)))
-#define GST_AUDIO_RING_BUFFER_SIGNAL(buf)   (g_cond_signal (GST_AUDIO_RING_BUFFER_GET_COND (buf)))
-#define GST_AUDIO_RING_BUFFER_BROADCAST(buf)(g_cond_broadcast (GST_AUDIO_RING_BUFFER_GET_COND (buf)))
-
-/**
- * GstAudioRingBuffer:
- * @cond: used to signal start/stop/pause/resume actions
- * @open: boolean indicating that the ringbuffer is open
- * @acquired: boolean indicating that the ringbuffer is acquired
- * @memory: data in the ringbuffer
- * @size: size of data in the ringbuffer
- * @spec: format and layout of the ringbuffer data
- * @samples_per_seg: number of samples in one segment
- * @empty_seg: pointer to memory holding one segment of silence samples
- * @state: state of the buffer
- * @segdone: readpointer in the ringbuffer
- * @segbase: segment corresponding to segment 0 (unused)
- * @waiting: is a reader or writer waiting for a free segment
- *
- * The ringbuffer base class structure.
- */
-struct _GstAudioRingBuffer {
-  GstObject                   object;
-
-  /*< public >*/ /* with LOCK */
-  GCond                      cond;
-  gboolean                    open;
-  gboolean                    acquired;
-  guint8                     *memory;
-  gsize                       size;
-  GstClockTime               *timestamps;
-  GstAudioRingBufferSpec      spec;
-  gint                        samples_per_seg;
-  guint8                     *empty_seg;
-
-  /*< public >*/ /* ATOMIC */
-  gint                        state;
-  gint                        segdone;
-  gint                        segbase;
-  gint                        waiting;
-
-  /*< private >*/
-  GstAudioRingBufferCallback  callback;
-  gpointer                    cb_data;
-
-  gboolean                    need_reorder;
-  /* gst[channel_reorder_map[i]] = device[i] */
-  gint                        channel_reorder_map[64];
-
-  gboolean                    flushing;
-  /* ATOMIC */
-  gint                        may_start;
-  gboolean                    active;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioRingBufferClass:
- * @parent_class: parent class
- * @open_device:  open the device, don't set any params or allocate anything
- * @acquire: allocate the resources for the ringbuffer using the given spec
- * @release: free resources of the ringbuffer
- * @close_device: close the device
- * @start: start processing of samples
- * @pause: pause processing of samples
- * @resume: resume processing of samples after pause
- * @stop: stop processing of samples
- * @delay: get number of samples queued in device
- * @activate: activate the thread that starts pulling and monitoring the
- * consumed segments in the device.
- * @commit: write samples into the ringbuffer
- * @clear_all: clear the entire ringbuffer.
- *
- * The vmethods that subclasses can override to implement the ringbuffer.
- */
-struct _GstAudioRingBufferClass {
-  GstObjectClass parent_class;
-
-  /*< public >*/
-  gboolean     (*open_device)  (GstAudioRingBuffer *buf);
-  gboolean     (*acquire)      (GstAudioRingBuffer *buf, GstAudioRingBufferSpec *spec);
-  gboolean     (*release)      (GstAudioRingBuffer *buf);
-  gboolean     (*close_device) (GstAudioRingBuffer *buf);
-
-  gboolean     (*start)        (GstAudioRingBuffer *buf);
-  gboolean     (*pause)        (GstAudioRingBuffer *buf);
-  gboolean     (*resume)       (GstAudioRingBuffer *buf);
-  gboolean     (*stop)         (GstAudioRingBuffer *buf);
-
-  guint        (*delay)        (GstAudioRingBuffer *buf);
-
-  /* ABI added */
-  gboolean     (*activate)     (GstAudioRingBuffer *buf, gboolean active);
-
-  guint        (*commit)       (GstAudioRingBuffer * buf, guint64 *sample,
-                                guint8 * data, gint in_samples,
-                                gint out_samples, gint * accum);
-
-  void         (*clear_all)    (GstAudioRingBuffer * buf);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_ring_buffer_get_type(void);
-
-/* callback stuff */
-void            gst_audio_ring_buffer_set_callback    (GstAudioRingBuffer *buf,
-                                                       GstAudioRingBufferCallback cb,
-                                                       gpointer user_data);
-
-gboolean        gst_audio_ring_buffer_parse_caps      (GstAudioRingBufferSpec *spec, GstCaps *caps);
-void            gst_audio_ring_buffer_debug_spec_caps (GstAudioRingBufferSpec *spec);
-void            gst_audio_ring_buffer_debug_spec_buff (GstAudioRingBufferSpec *spec);
-
-gboolean        gst_audio_ring_buffer_convert         (GstAudioRingBuffer * buf, GstFormat src_fmt,
-                                                       gint64 src_val, GstFormat dest_fmt,
-                                                       gint64 * dest_val);
-
-/* device state */
-gboolean        gst_audio_ring_buffer_open_device     (GstAudioRingBuffer *buf);
-gboolean        gst_audio_ring_buffer_close_device    (GstAudioRingBuffer *buf);
-
-gboolean        gst_audio_ring_buffer_device_is_open  (GstAudioRingBuffer *buf);
-
-/* allocate resources */
-gboolean        gst_audio_ring_buffer_acquire         (GstAudioRingBuffer *buf, GstAudioRingBufferSpec *spec);
-gboolean        gst_audio_ring_buffer_release         (GstAudioRingBuffer *buf);
-
-gboolean        gst_audio_ring_buffer_is_acquired     (GstAudioRingBuffer *buf);
-
-/* set the device channel positions */
-void            gst_audio_ring_buffer_set_channel_positions (GstAudioRingBuffer *buf, const GstAudioChannelPosition *position);
-
-/* activating */
-gboolean        gst_audio_ring_buffer_activate        (GstAudioRingBuffer *buf, gboolean active);
-gboolean        gst_audio_ring_buffer_is_active       (GstAudioRingBuffer *buf);
-
-/* flushing */
-void            gst_audio_ring_buffer_set_flushing    (GstAudioRingBuffer *buf, gboolean flushing);
-gboolean        gst_audio_ring_buffer_is_flushing     (GstAudioRingBuffer *buf);
-
-/* playback/pause */
-gboolean        gst_audio_ring_buffer_start           (GstAudioRingBuffer *buf);
-gboolean        gst_audio_ring_buffer_pause           (GstAudioRingBuffer *buf);
-gboolean        gst_audio_ring_buffer_stop            (GstAudioRingBuffer *buf);
-
-/* get status */
-guint           gst_audio_ring_buffer_delay           (GstAudioRingBuffer *buf);
-guint64         gst_audio_ring_buffer_samples_done    (GstAudioRingBuffer *buf);
-
-void            gst_audio_ring_buffer_set_sample      (GstAudioRingBuffer *buf, guint64 sample);
-
-/* clear all segments */
-void            gst_audio_ring_buffer_clear_all       (GstAudioRingBuffer *buf);
-
-/* commit samples */
-guint           gst_audio_ring_buffer_commit          (GstAudioRingBuffer * buf, guint64 *sample,
-                                                       guint8 * data, gint in_samples,
-                                                       gint out_samples, gint * accum);
-
-/* read samples */
-guint           gst_audio_ring_buffer_read            (GstAudioRingBuffer *buf, guint64 sample,
-                                                       guint8 *data, guint len, GstClockTime *timestamp);
-
-/* Set timestamp on buffer */
-void            gst_audio_ring_buffer_set_timestamp   (GstAudioRingBuffer * buf, gint readseg, GstClockTime 
-                                                       timestamp);
-
-/* mostly protected */
-/* not yet implemented
-gboolean        gst_audio_ring_buffer_prepare_write   (GstAudioRingBuffer *buf, gint *segment, guint8 **writeptr, gint *len);
-*/
-gboolean        gst_audio_ring_buffer_prepare_read    (GstAudioRingBuffer *buf, gint *segment,
-                                                       guint8 **readptr, gint *len);
-void            gst_audio_ring_buffer_clear           (GstAudioRingBuffer *buf, gint segment);
-void            gst_audio_ring_buffer_advance         (GstAudioRingBuffer *buf, guint advance);
-
-void            gst_audio_ring_buffer_may_start       (GstAudioRingBuffer *buf, gboolean allowed);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_RING_BUFFER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiosink.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiosink.h
deleted file mode 100644
index f6fac610..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiosink.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudiosink.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_SINK_H__
-#define __GST_AUDIO_SINK_H__
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudiobasesink.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_SINK             (gst_audio_sink_get_type())
-#define GST_AUDIO_SINK(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_SINK,GstAudioSink))
-#define GST_AUDIO_SINK_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_SINK,GstAudioSinkClass))
-#define GST_AUDIO_SINK_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AUDIO_SINK,GstAudioSinkClass))
-#define GST_IS_AUDIO_SINK(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_SINK))
-#define GST_IS_AUDIO_SINK_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_SINK))
-
-typedef struct _GstAudioSink GstAudioSink;
-typedef struct _GstAudioSinkClass GstAudioSinkClass;
-
-/**
- * GstAudioSink:
- *
- * Opaque #GstAudioSink.
- */
-struct _GstAudioSink {
-  GstAudioBaseSink       element;
-
-  /*< private >*/ /* with LOCK */
-  GThread   *thread;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioSinkClass:
- * @parent_class: the parent class structure.
- * @open: Open the device. No configuration needs to be done at this point.
- *        This function is also used to check if the device is available.
- * @prepare: Prepare the device to operate with the specified parameters.
- * @unprepare: Undo operations done in prepare.
- * @close: Close the device.
- * @write: Write data to the device.
- * @delay: Return how many samples are still in the device. This is used to
- *         drive the synchronisation.
- * @reset: Returns as quickly as possible from a write and flush any pending
- *         samples from the device.
- *
- * #GstAudioSink class. Override the vmethods to implement functionality.
- */
-struct _GstAudioSinkClass {
-  GstAudioBaseSinkClass parent_class;
-
-  /* vtable */
-
-  /* open the device with given specs */
-  gboolean (*open)      (GstAudioSink *sink);
-  /* prepare resources and state to operate with the given specs */
-  gboolean (*prepare)   (GstAudioSink *sink, GstAudioRingBufferSpec *spec);
-  /* undo anything that was done in prepare() */
-  gboolean (*unprepare) (GstAudioSink *sink);
-  /* close the device */
-  gboolean (*close)     (GstAudioSink *sink);
-  /* write samples to the device */
-  gint     (*write)     (GstAudioSink *sink, gpointer data, guint length);
-  /* get number of samples queued in the device */
-  guint    (*delay)     (GstAudioSink *sink);
-  /* reset the audio device, unblock from a write */
-  void     (*reset)     (GstAudioSink *sink);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_sink_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_SINK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiosrc.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiosrc.h
deleted file mode 100644
index 47e68274..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/gstaudiosrc.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudiosrc.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_SRC_H__
-#define __GST_AUDIO_SRC_H__
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudiobasesrc.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_SRC              (gst_audio_src_get_type())
-#define GST_AUDIO_SRC(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_SRC,GstAudioSrc))
-#define GST_AUDIO_SRC_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_SRC,GstAudioSrcClass))
-#define GST_AUDIO_SRC_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AUDIO_SRC,GstAudioSrcClass))
-#define GST_IS_AUDIO_SRC(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_SRC))
-#define GST_IS_AUDIO_SRC_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_SRC))
-
-typedef struct _GstAudioSrc GstAudioSrc;
-typedef struct _GstAudioSrcClass GstAudioSrcClass;
-
-/**
- * GstAudioSrc:
- *
- * Base class for simple audio sources.
- */
-struct _GstAudioSrc {
-  GstAudioBaseSrc        element;
-
-  /*< private >*/ /* with LOCK */
-  GThread   *thread;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioSrcClass:
- * @parent_class: the parent class.
- * @open: open the device with the specified caps
- * @prepare: configure device with format
- * @unprepare: undo the configuration
- * @close: close the device
- * @read: read samples to the audio device
- * @delay: the number of samples queued in the device
- * @reset: unblock a read to the device and reset.
- *
- * #GstAudioSrc class. Override the vmethod to implement
- * functionality.
- */
-struct _GstAudioSrcClass {
-  GstAudioBaseSrcClass parent_class;
-
-  /* vtable */
-
-  /* open the device with given specs */
-  gboolean (*open)      (GstAudioSrc *src);
-  /* prepare resources and state to operate with the given specs */
-  gboolean (*prepare)   (GstAudioSrc *src, GstAudioRingBufferSpec *spec);
-  /* undo anything that was done in prepare() */
-  gboolean (*unprepare) (GstAudioSrc *src);
-  /* close the device */
-  gboolean (*close)     (GstAudioSrc *src);
-  /* read samples from the device */
-  guint    (*read)      (GstAudioSrc *src, gpointer data, guint length,
-      GstClockTime *timestamp);
-  /* get number of samples queued in the device */
-  guint    (*delay)     (GstAudioSrc *src);
-  /* reset the audio device, unblock from a write */
-  void     (*reset)     (GstAudioSrc *src);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_src_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_SRC_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/streamvolume.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/streamvolume.h
deleted file mode 100644
index 8dfdc16d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/audio/streamvolume.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GStreamer StreamVolume
- * Copyright (C) 2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_STREAM_VOLUME_H__
-#define __GST_STREAM_VOLUME_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_STREAM_VOLUME \
-  (gst_stream_volume_get_type ())
-#define GST_STREAM_VOLUME(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_STREAM_VOLUME, GstStreamVolume))
-#define GST_STREAM_VOLUME_INTERFACE(iface) \
-  (G_TYPE_CHECK_INTERFACE_CAST ((iface), GST_TYPE_STREAM_VOLUME, GstStreamVolumeInterface))
-#define GST_IS_STREAM_VOLUME(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_STREAM_VOLUME))
-#define GST_IS_STREAM_VOLUME_INTERFACE(iface) \
-  (G_TYPE_CHECK_INTERFACE_TYPE ((iface), GST_TYPE_STREAM_VOLUME))
-#define GST_STREAM_VOLUME_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_STREAM_VOLUME, GstStreamVolumeInterface))
-
-typedef struct _GstStreamVolume GstStreamVolume;
-typedef struct _GstStreamVolumeInterface GstStreamVolumeInterface;
-
-struct _GstStreamVolumeInterface {
-  GTypeInterface iface;
-};
-
-/**
- * GstStreamVolumeFormat:
- * @GST_STREAM_VOLUME_FORMAT_LINEAR: Linear scale factor, 1.0 = 100%
- * @GST_STREAM_VOLUME_FORMAT_CUBIC: Cubic volume scale
- * @GST_STREAM_VOLUME_FORMAT_DB: Logarithmic volume scale (dB, amplitude not power)
- *
- * Different representations of a stream volume. gst_stream_volume_convert_volume()
- * allows to convert between the different representations.
- *
- * Formulas to convert from a linear to a cubic or dB volume are
- * cbrt(val) and 20 * log10 (val).
- */
-typedef enum {
-  GST_STREAM_VOLUME_FORMAT_LINEAR = 0,
-  GST_STREAM_VOLUME_FORMAT_CUBIC,
-  GST_STREAM_VOLUME_FORMAT_DB
-} GstStreamVolumeFormat;
-
-GType           gst_stream_volume_get_type        (void);
-void            gst_stream_volume_set_volume      (GstStreamVolume *volume,
-                                                   GstStreamVolumeFormat format,
-                                                   gdouble val);
-gdouble         gst_stream_volume_get_volume      (GstStreamVolume *volume,
-                                                   GstStreamVolumeFormat format);
-
-void            gst_stream_volume_set_mute        (GstStreamVolume *volume,
-                                                   gboolean mute);
-gboolean        gst_stream_volume_get_mute        (GstStreamVolume *volume);
-
-gdouble         gst_stream_volume_convert_volume  (GstStreamVolumeFormat from,
-                                                   GstStreamVolumeFormat to,
-                                                   gdouble val) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GST_STREAM_VOLUME_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstadapter.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstadapter.h
deleted file mode 100644
index 5b897443..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstadapter.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Benjamin Otte <otte@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gst/gst.h>
-
-#ifndef __GST_ADAPTER_H__
-#define __GST_ADAPTER_H__
-
-G_BEGIN_DECLS
-
-
-#define GST_TYPE_ADAPTER \
-  (gst_adapter_get_type())
-#define GST_ADAPTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_ADAPTER, GstAdapter))
-#define GST_ADAPTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_ADAPTER, GstAdapterClass))
-#define GST_ADAPTER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ADAPTER, GstAdapterClass))
-#define GST_IS_ADAPTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_ADAPTER))
-#define GST_IS_ADAPTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_ADAPTER))
-
-/**
- * GstAdapter:
- *
- * The opaque #GstAdapter data structure.
- */
-typedef struct _GstAdapter GstAdapter;
-typedef struct _GstAdapterClass GstAdapterClass;
-
-GType                   gst_adapter_get_type            (void);
-
-GstAdapter *            gst_adapter_new                 (void) G_GNUC_MALLOC;
-
-void                    gst_adapter_clear               (GstAdapter *adapter);
-void                    gst_adapter_push                (GstAdapter *adapter, GstBuffer* buf);
-gconstpointer           gst_adapter_map                 (GstAdapter *adapter, gsize size);
-void                    gst_adapter_unmap               (GstAdapter *adapter);
-void                    gst_adapter_copy                (GstAdapter *adapter, gpointer dest,
-                                                         gsize offset, gsize size);
-void                    gst_adapter_flush               (GstAdapter *adapter, gsize flush);
-gpointer                gst_adapter_take                (GstAdapter *adapter, gsize nbytes);
-GstBuffer*              gst_adapter_take_buffer         (GstAdapter *adapter, gsize nbytes);
-GList*                  gst_adapter_take_list           (GstAdapter *adapter, gsize nbytes);
-gsize                   gst_adapter_available           (GstAdapter *adapter);
-gsize                   gst_adapter_available_fast      (GstAdapter *adapter);
-
-GstClockTime            gst_adapter_prev_pts            (GstAdapter *adapter, guint64 *distance);
-GstClockTime            gst_adapter_prev_dts            (GstAdapter *adapter, guint64 *distance);
-
-gsize                   gst_adapter_masked_scan_uint32  (GstAdapter * adapter, guint32 mask,
-                                                         guint32 pattern, gsize offset, gsize size);
-
-gsize                   gst_adapter_masked_scan_uint32_peek  (GstAdapter * adapter, guint32 mask,
-                                                         guint32 pattern, gsize offset, gsize size, guint32 * value);
-
-G_END_DECLS
-
-#endif /* __GST_ADAPTER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbaseparse.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbaseparse.h
deleted file mode 100644
index d0a1be46..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbaseparse.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 Nokia Corporation. All rights reserved.
- *
- * Contact: Stefan Kost <stefan.kost@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BASE_PARSE_H__
-#define __GST_BASE_PARSE_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BASE_PARSE            (gst_base_parse_get_type())
-#define GST_BASE_PARSE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_PARSE,GstBaseParse))
-#define GST_BASE_PARSE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_PARSE,GstBaseParseClass))
-#define GST_BASE_PARSE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_BASE_PARSE,GstBaseParseClass))
-#define GST_IS_BASE_PARSE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_PARSE))
-#define GST_IS_BASE_PARSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_PARSE))
-#define GST_BASE_PARSE_CAST(obj)       ((GstBaseParse *)(obj))
-
-/**
- * GST_BASE_PARSE_SRC_PAD:
- * @obj: base parse instance
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_BASE_PARSE_SRC_PAD(obj)    (GST_BASE_PARSE_CAST (obj)->srcpad)
-
-/**
- * GST_BASE_PARSE_SINK_PAD:
- * @obj: base parse instance
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_BASE_PARSE_SINK_PAD(obj)    (GST_BASE_PARSE_CAST (obj)->sinkpad)
-
-/**
- * GST_BASE_PARSE_FLOW_DROPPED:
- *
- * A #GstFlowReturn that can be returned from parse_frame to
- * indicate that no output buffer was generated, or from pre_push_frame to
- * to forego pushing buffer.
- */
-#define GST_BASE_PARSE_FLOW_DROPPED     GST_FLOW_CUSTOM_SUCCESS
-
-/* not public API, use accessor macros below */
-#define GST_BASE_PARSE_FLAG_LOST_SYNC (1 << 0)
-#define GST_BASE_PARSE_FLAG_DRAINING  (1 << 1)
-
-/**
- * GST_BASE_PARSE_LOST_SYNC:
- * @parse: base parse instance
- *
- * Obtains current sync status.
- */
-#define GST_BASE_PARSE_LOST_SYNC(parse) (!!(GST_BASE_PARSE_CAST(parse)->flags & GST_BASE_PARSE_FLAG_LOST_SYNC))
-
-/**
- * GST_BASE_PARSE_DRAINING:
- * @parse: base parse instance
- *
- * Obtains current drain status (ie. whether EOS has been received and
- * the parser is now processing the frames at the end of the stream)
- */
-#define GST_BASE_PARSE_DRAINING(parse)  (!!(GST_BASE_PARSE_CAST(parse)->flags & GST_BASE_PARSE_FLAG_DRAINING))
-
-/**
- * GstBaseParseFrameFlags:
- * @GST_BASE_PARSE_FRAME_FLAG_NONE: no flag
- * @GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME: set by baseclass if current frame
- *   is passed for processing to the subclass for the first time
- *   (and not set on subsequent calls with same data).
- * @GST_BASE_PARSE_FRAME_FLAG_NO_FRAME: set to indicate this buffer should not be
- *   counted as frame, e.g. if this frame is dependent on a previous one.
- *   As it is not counted as a frame, bitrate increases but frame to time
- *   conversions are maintained.
- * @GST_BASE_PARSE_FRAME_FLAG_CLIP: @pre_push_frame can set this to indicate
- *    that regular segment clipping can still be performed (as opposed to
- *    any custom one having been done).
- * @GST_BASE_PARSE_FRAME_FLAG_DROP: indicates to @finish_frame that the
- *    the frame should be dropped (and might be handled internall by subclass)
- * @GST_BASE_PARSE_FRAME_FLAG_QUEUE: indicates to @finish_frame that the
- *    the frame should be queued for now and processed fully later
- *    when the first non-queued frame is finished
- *
- * Flags to be used in a #GstBaseParseFrame.
- */
-typedef enum {
-  GST_BASE_PARSE_FRAME_FLAG_NONE         = 0,
-  GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME    = (1 << 0),
-  GST_BASE_PARSE_FRAME_FLAG_NO_FRAME     = (1 << 1),
-  GST_BASE_PARSE_FRAME_FLAG_CLIP         = (1 << 2),
-  GST_BASE_PARSE_FRAME_FLAG_DROP         = (1 << 3),
-  GST_BASE_PARSE_FRAME_FLAG_QUEUE        = (1 << 4)
-} GstBaseParseFrameFlags;
-
-/**
- * GstBaseParseFrame:
- * @buffer: input data to be parsed for frames.
- * @out_buffer: (optional) (replacement) output data.
- * @offset: media specific offset of input frame
- *   Note that a converter may have a different one on the frame's buffer.
- * @overhead: subclass can set this to indicates the metadata overhead
- *   for the given frame, which is then used to enable more accurate bitrate
- *   computations. If this is -1, it is assumed that this frame should be
- *   skipped in bitrate calculation.
- * @flags: a combination of input and output #GstBaseParseFrameFlags that
- *  convey additional context to subclass or allow subclass to tune
- *  subsequent #GstBaseParse actions.
- *
- * Frame (context) data passed to each frame parsing virtual methods.  In
- * addition to providing the data to be checked for a valid frame or an already
- * identified frame, it conveys additional metadata or control information
- * from and to the subclass w.r.t. the particular frame in question (rather
- * than global parameters).  Some of these may apply to each parsing stage, others
- * only to some a particular one.  These parameters are effectively zeroed at start
- * of each frame's processing, i.e. parsing virtual method invocation sequence.
- */
-typedef struct {
-  GstBuffer * buffer;
-  GstBuffer * out_buffer;
-  guint       flags;
-  guint64     offset;
-  gint        overhead;
-  /*< private >*/
-  gint        size;
-  guint       _gst_reserved_i[2];
-  gpointer    _gst_reserved_p[2];
-  guint       _private_flags;
-} GstBaseParseFrame;
-
-typedef struct _GstBaseParse GstBaseParse;
-typedef struct _GstBaseParseClass GstBaseParseClass;
-typedef struct _GstBaseParsePrivate GstBaseParsePrivate;
-
-/**
- * GstBaseParse:
- * @element: the parent element.
- *
- * The opaque #GstBaseParse data structure.
- */
-struct _GstBaseParse {
-  GstElement     element;
-
-  /*< protected >*/
-  /* source and sink pads */
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  guint           flags;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      segment;
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-  GstBaseParsePrivate *priv;
-};
-
-/**
- * GstBaseParseClass:
- * @parent_class: the parent class
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_sink_caps:  allows the subclass to be notified of the actual caps set.
- * @get_sink_caps:  allows the subclass to do its own sink get caps if needed.
- * @handle_frame:   Parses the input data into valid frames as defined by subclass
- *                  which should be passed to gst_base_parse_finish_frame().
- *                  The frame's input buffer is guaranteed writable,
- *                  whereas the input frame ownership is held by caller
- *                  (so subclass should make a copy if it needs to hang on).
- *                  Input buffer (data) is provided by baseclass with as much
- *                  metadata set as possible by baseclass according to upstream
- *                  information and/or subclass settings,
- *                  though subclass may still set buffer timestamp and duration
- *                  if desired.
- * @convert:        Optional.
- *                  Convert between formats.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. This function should chain
- *                  up to the parent implementation to let the default handler
- *                  run.
- * @src_event:      Optional.
- *                  Event handler on the source pad. Should chain up to the
- *                  parent to let the default handler run.
- * @pre_push_frame: Optional.
- *                   Called just prior to pushing a frame (after any pending
- *                   events have been sent) to give subclass a chance to perform
- *                   additional actions at this time (e.g. tag sending) or to
- *                   decide whether this buffer should be dropped or not
- *                   (e.g. custom segment clipping).
- * @detect:         Optional.
- *                   Called until it doesn't return GST_FLOW_OK anymore for
- *                   the first buffers. Can be used by the subclass to detect
- *                   the stream format.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @check_valid_frame and @parse_frame needs to be
- * overridden.
- */
-struct _GstBaseParseClass {
-  GstElementClass parent_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  gboolean      (*start)              (GstBaseParse * parse);
-
-  gboolean      (*stop)               (GstBaseParse * parse);
-
-  gboolean      (*set_sink_caps)      (GstBaseParse * parse,
-                                       GstCaps      * caps);
-
-  GstFlowReturn (*handle_frame)       (GstBaseParse      * parse,
-                                       GstBaseParseFrame * frame,
-                                       gint              * skipsize);
-
-  GstFlowReturn (*pre_push_frame)     (GstBaseParse      * parse,
-                                       GstBaseParseFrame * frame);
-
-  gboolean      (*convert)            (GstBaseParse * parse,
-                                       GstFormat      src_format,
-                                       gint64         src_value,
-                                       GstFormat      dest_format,
-                                       gint64       * dest_value);
-
-  gboolean      (*sink_event)         (GstBaseParse * parse,
-                                       GstEvent     * event);
-
-  gboolean      (*src_event)          (GstBaseParse * parse,
-                                       GstEvent     * event);
-
-  GstCaps *     (*get_sink_caps)      (GstBaseParse * parse,
-                                       GstCaps      * filter);
-
-  GstFlowReturn (*detect)             (GstBaseParse * parse,
-                                       GstBuffer    * buffer);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType           gst_base_parse_get_type (void);
-
-GType           gst_base_parse_frame_get_type (void);
-
-GstBaseParseFrame * gst_base_parse_frame_new  (GstBuffer              * buffer,
-                                               GstBaseParseFrameFlags   flags,
-                                               gint                     overhead);
-
-void            gst_base_parse_frame_init      (GstBaseParseFrame * frame);
-
-void            gst_base_parse_frame_free      (GstBaseParseFrame * frame);
-
-GstFlowReturn   gst_base_parse_push_frame      (GstBaseParse      * parse,
-                                                GstBaseParseFrame * frame);
-
-GstFlowReturn   gst_base_parse_finish_frame    (GstBaseParse * parse,
-                                                GstBaseParseFrame * frame,
-                                                gint size);
-
-void            gst_base_parse_set_duration    (GstBaseParse      * parse,
-                                                GstFormat           fmt,
-                                                gint64              duration,
-                                                gint                interval);
-
-void            gst_base_parse_set_average_bitrate (GstBaseParse   * parse,
-                                                    guint            bitrate);
-
-void            gst_base_parse_set_min_frame_size (GstBaseParse    * parse,
-                                                   guint             min_size);
-
-void            gst_base_parse_set_has_timing_info (GstBaseParse   * parse,
-                                                    gboolean         has_timing);
-
-void            gst_base_parse_set_syncable    (GstBaseParse * parse,
-                                                gboolean       syncable);
-
-void            gst_base_parse_set_passthrough (GstBaseParse * parse,
-                                                gboolean       passthrough);
-
-void            gst_base_parse_set_pts_interpolation (GstBaseParse * parse,
-                                                      gboolean pts_interpolate);
-
-void            gst_base_parse_set_frame_rate  (GstBaseParse * parse,
-                                                guint          fps_num,
-                                                guint          fps_den,
-                                                guint          lead_in,
-                                                guint          lead_out);
-
-void            gst_base_parse_set_latency     (GstBaseParse * parse,
-                                                GstClockTime min_latency,
-                                                GstClockTime max_latency);
-
-gboolean        gst_base_parse_convert_default (GstBaseParse * parse,
-                                                GstFormat      src_format,
-                                                gint64         src_value,
-                                                GstFormat      dest_format,
-                                                gint64       * dest_value);
-
-gboolean        gst_base_parse_add_index_entry (GstBaseParse * parse,
-                                                guint64        offset,
-                                                GstClockTime   ts,
-                                                gboolean       key,
-                                                gboolean       force);
-
-G_END_DECLS
-
-#endif /* __GST_BASE_PARSE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasesink.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasesink.h
deleted file mode 100644
index e4bb7350..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasesink.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstbasesink.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BASE_SINK_H__
-#define __GST_BASE_SINK_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-
-#define GST_TYPE_BASE_SINK              (gst_base_sink_get_type())
-#define GST_BASE_SINK(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_SINK,GstBaseSink))
-#define GST_BASE_SINK_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_SINK,GstBaseSinkClass))
-#define GST_BASE_SINK_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_SINK, GstBaseSinkClass))
-#define GST_IS_BASE_SINK(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_SINK))
-#define GST_IS_BASE_SINK_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_SINK))
-#define GST_BASE_SINK_CAST(obj)         ((GstBaseSink *) (obj))
-
-/**
- * GST_BASE_SINK_PAD:
- * @obj: base sink instance
- *
- * Gives the pointer to the #GstPad object of the element.
- */
-#define GST_BASE_SINK_PAD(obj)          (GST_BASE_SINK_CAST (obj)->sinkpad)
-
-#define GST_BASE_SINK_GET_PREROLL_LOCK(pad)   (&GST_BASE_SINK_CAST(pad)->preroll_lock)
-#define GST_BASE_SINK_PREROLL_LOCK(pad)       (g_mutex_lock(GST_BASE_SINK_GET_PREROLL_LOCK(pad)))
-#define GST_BASE_SINK_PREROLL_TRYLOCK(pad)    (g_mutex_trylock(GST_BASE_SINK_GET_PREROLL_LOCK(pad)))
-#define GST_BASE_SINK_PREROLL_UNLOCK(pad)     (g_mutex_unlock(GST_BASE_SINK_GET_PREROLL_LOCK(pad)))
-
-#define GST_BASE_SINK_GET_PREROLL_COND(pad)   (&GST_BASE_SINK_CAST(pad)->preroll_cond)
-#define GST_BASE_SINK_PREROLL_WAIT(pad)       \
-      g_cond_wait (GST_BASE_SINK_GET_PREROLL_COND (pad), GST_BASE_SINK_GET_PREROLL_LOCK (pad))
-#define GST_BASE_SINK_PREROLL_WAIT_UNTIL(pad, end_time) \
-      g_cond_wait_until (GST_BASE_SINK_GET_PREROLL_COND (pad), GST_BASE_SINK_GET_PREROLL_LOCK (pad), end_time)
-#define GST_BASE_SINK_PREROLL_SIGNAL(pad)     g_cond_signal (GST_BASE_SINK_GET_PREROLL_COND (pad));
-#define GST_BASE_SINK_PREROLL_BROADCAST(pad)  g_cond_broadcast (GST_BASE_SINK_GET_PREROLL_COND (pad));
-
-typedef struct _GstBaseSink GstBaseSink;
-typedef struct _GstBaseSinkClass GstBaseSinkClass;
-typedef struct _GstBaseSinkPrivate GstBaseSinkPrivate;
-
-/**
- * GstBaseSink:
- *
- * The opaque #GstBaseSink data structure.
- */
-struct _GstBaseSink {
-  GstElement     element;
-
-  /*< protected >*/
-  GstPad        *sinkpad;
-  GstPadMode     pad_mode;
-
-  /*< protected >*/ /* with LOCK */
-  guint64        offset;
-  gboolean       can_activate_pull;
-  gboolean       can_activate_push;
-
-  /*< protected >*/ /* with PREROLL_LOCK */
-  GMutex         preroll_lock;
-  GCond          preroll_cond;
-  gboolean       eos;
-  gboolean       need_preroll;
-  gboolean       have_preroll;
-  gboolean       playing_async;
-
-  /*< protected >*/ /* with STREAM_LOCK */
-  gboolean       have_newsegment;
-  GstSegment     segment;
-
-  /*< private >*/ /* with LOCK */
-  GstClockID     clock_id;
-  gboolean       sync;
-  gboolean       flushing;
-  gboolean       running;
-
-  gint64         max_lateness;
-
-  /*< private >*/
-  GstBaseSinkPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstBaseSinkClass:
- * @parent_class: Element parent class
- * @get_caps: Called to get sink pad caps from the subclass
- * @set_caps: Notify subclass of changed caps
- * @fixate: Only useful in pull mode. Implement if you have
- *     ideas about what should be the default values for the caps you support.
- * @activate_pull: Subclasses should override this when they can provide an
- *     alternate method of spawning a thread to drive the pipeline in pull mode.
- *     Should start or stop the pulling thread, depending on the value of the
- *     "active" argument. Called after actually activating the sink pad in pull
- *     mode. The default implementation starts a task on the sink pad.
- * @get_times: Called to get the start and end times for synchronising
- *     the passed buffer to the clock
- * @propose_allocation: configure the allocation query
- * @start: Start processing. Ideal for opening resources in the subclass
- * @stop: Stop processing. Subclasses should use this to close resources.
- * @unlock: Unlock any pending access to the resource. Subclasses should
- *     unblock any blocked function ASAP
- * @unlock_stop: Clear the previous unlock request. Subclasses should clear
- *     any state they set during unlock(), such as clearing command queues.
- * @query: perform a #GstQuery on the element.
- * @event: Override this to handle events arriving on the sink pad
- * @wait_event: Override this to implement custom logic to wait for the event
- *     time (for events like EOS and GAP). Subclasses should always first
- *     chain up to the default implementation.
- * @prepare: Called to prepare the buffer for @render and @preroll. This
- *     function is called before synchronisation is performed.
- * @prepare_list: Called to prepare the buffer list for @render_list. This
- *     function is called before synchronisation is performed.
- * @preroll: Called to present the preroll buffer if desired.
- * @render: Called when a buffer should be presented or output, at the
- *     correct moment if the #GstBaseSink has been set to sync to the clock.
- * @render_list: Same as @render but used whith buffer lists instead of
- *     buffers.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At the minimum, the @render method should be overridden to
- * output/present buffers.
- */
-struct _GstBaseSinkClass {
-  GstElementClass parent_class;
-
-  /* get caps from subclass */
-  GstCaps*      (*get_caps)     (GstBaseSink *sink, GstCaps *filter);
-  /* notify subclass of new caps */
-  gboolean      (*set_caps)     (GstBaseSink *sink, GstCaps *caps);
-
-  /* fixate sink caps during pull-mode negotiation */
-  GstCaps *     (*fixate)       (GstBaseSink *sink, GstCaps *caps);
-  /* start or stop a pulling thread */
-  gboolean      (*activate_pull)(GstBaseSink *sink, gboolean active);
-
-  /* get the start and end times for syncing on this buffer */
-  void          (*get_times)    (GstBaseSink *sink, GstBuffer *buffer,
-                                 GstClockTime *start, GstClockTime *end);
-
-  /* propose allocation parameters for upstream */
-  gboolean      (*propose_allocation)   (GstBaseSink *sink, GstQuery *query);
-
-  /* start and stop processing, ideal for opening/closing the resource */
-  gboolean      (*start)        (GstBaseSink *sink);
-  gboolean      (*stop)         (GstBaseSink *sink);
-
-  /* unlock any pending access to the resource. subclasses should unlock
-   * any function ASAP. */
-  gboolean      (*unlock)       (GstBaseSink *sink);
-  /* Clear a previously indicated unlock request not that unlocking is
-   * complete. Sub-classes should clear any command queue or indicator they
-   * set during unlock */
-  gboolean      (*unlock_stop)  (GstBaseSink *sink);
-
-  /* notify subclass of query */
-  gboolean      (*query)        (GstBaseSink *sink, GstQuery *query);
-
-  /* notify subclass of event */
-  gboolean      (*event)        (GstBaseSink *sink, GstEvent *event);
-  /* wait for eos or gap, subclasses should chain up to parent first */
-  GstFlowReturn (*wait_event)   (GstBaseSink *sink, GstEvent *event);
-
-  /* notify subclass of buffer or list before doing sync */
-  GstFlowReturn (*prepare)      (GstBaseSink *sink, GstBuffer *buffer);
-  GstFlowReturn (*prepare_list) (GstBaseSink *sink, GstBufferList *buffer_list);
-
-  /* notify subclass of preroll buffer or real buffer */
-  GstFlowReturn (*preroll)      (GstBaseSink *sink, GstBuffer *buffer);
-  GstFlowReturn (*render)       (GstBaseSink *sink, GstBuffer *buffer);
-  /* Render a BufferList */
-  GstFlowReturn (*render_list)  (GstBaseSink *sink, GstBufferList *buffer_list);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType gst_base_sink_get_type(void);
-
-GstFlowReturn   gst_base_sink_do_preroll        (GstBaseSink *sink, GstMiniObject *obj);
-GstFlowReturn   gst_base_sink_wait_preroll      (GstBaseSink *sink);
-
-/* synchronizing against the clock */
-void            gst_base_sink_set_sync          (GstBaseSink *sink, gboolean sync);
-gboolean        gst_base_sink_get_sync          (GstBaseSink *sink);
-
-/* dropping late buffers */
-void            gst_base_sink_set_max_lateness  (GstBaseSink *sink, gint64 max_lateness);
-gint64          gst_base_sink_get_max_lateness  (GstBaseSink *sink);
-
-/* performing QoS */
-void            gst_base_sink_set_qos_enabled   (GstBaseSink *sink, gboolean enabled);
-gboolean        gst_base_sink_is_qos_enabled    (GstBaseSink *sink);
-
-/* doing async state changes */
-void            gst_base_sink_set_async_enabled (GstBaseSink *sink, gboolean enabled);
-gboolean        gst_base_sink_is_async_enabled  (GstBaseSink *sink);
-
-/* tuning synchronisation */
-void            gst_base_sink_set_ts_offset     (GstBaseSink *sink, GstClockTimeDiff offset);
-GstClockTimeDiff gst_base_sink_get_ts_offset    (GstBaseSink *sink);
-
-/* last sample */
-GstSample *     gst_base_sink_get_last_sample   (GstBaseSink *sink);
-void            gst_base_sink_set_last_sample_enabled (GstBaseSink *sink, gboolean enabled);
-gboolean        gst_base_sink_is_last_sample_enabled (GstBaseSink *sink);
-
-/* latency */
-gboolean        gst_base_sink_query_latency     (GstBaseSink *sink, gboolean *live, gboolean *upstream_live,
-                                                 GstClockTime *min_latency, GstClockTime *max_latency);
-GstClockTime    gst_base_sink_get_latency       (GstBaseSink *sink);
-
-/* render delay */
-void            gst_base_sink_set_render_delay  (GstBaseSink *sink, GstClockTime delay);
-GstClockTime    gst_base_sink_get_render_delay  (GstBaseSink *sink);
-
-/* blocksize */
-void            gst_base_sink_set_blocksize     (GstBaseSink *sink, guint blocksize);
-guint           gst_base_sink_get_blocksize     (GstBaseSink *sink);
-
-/* throttle-time */
-void            gst_base_sink_set_throttle_time (GstBaseSink *sink, guint64 throttle);
-guint64         gst_base_sink_get_throttle_time (GstBaseSink *sink);
-
-GstClockReturn  gst_base_sink_wait_clock        (GstBaseSink *sink, GstClockTime time,
-                                                 GstClockTimeDiff * jitter);
-GstFlowReturn   gst_base_sink_wait              (GstBaseSink *sink, GstClockTime time,
-                                                 GstClockTimeDiff *jitter);
-
-G_END_DECLS
-
-#endif /* __GST_BASE_SINK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasesrc.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasesrc.h
deleted file mode 100644
index 466f0fc7..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasesrc.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstbasesrc.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BASE_SRC_H__
-#define __GST_BASE_SRC_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BASE_SRC               (gst_base_src_get_type())
-#define GST_BASE_SRC(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_SRC,GstBaseSrc))
-#define GST_BASE_SRC_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_SRC,GstBaseSrcClass))
-#define GST_BASE_SRC_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_SRC, GstBaseSrcClass))
-#define GST_IS_BASE_SRC(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_SRC))
-#define GST_IS_BASE_SRC_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_SRC))
-#define GST_BASE_SRC_CAST(obj)          ((GstBaseSrc *)(obj))
-
-/**
- * GstBaseSrcFlags:
- * @GST_BASE_SRC_FLAG_STARTING: has source is starting
- * @GST_BASE_SRC_FLAG_STARTED: has source been started
- * @GST_BASE_SRC_FLAG_LAST: offset to define more flags
- *
- * The #GstElement flags that a basesrc element may have.
- */
-typedef enum {
-  GST_BASE_SRC_FLAG_STARTING     = (GST_ELEMENT_FLAG_LAST << 0),
-  GST_BASE_SRC_FLAG_STARTED      = (GST_ELEMENT_FLAG_LAST << 1),
-  /* padding */
-  GST_BASE_SRC_FLAG_LAST         = (GST_ELEMENT_FLAG_LAST << 6)
-} GstBaseSrcFlags;
-
-#define GST_BASE_SRC_IS_STARTING(obj) GST_OBJECT_FLAG_IS_SET ((obj), GST_BASE_SRC_FLAG_STARTING)
-#define GST_BASE_SRC_IS_STARTED(obj)  GST_OBJECT_FLAG_IS_SET ((obj), GST_BASE_SRC_FLAG_STARTED)
-
-typedef struct _GstBaseSrc GstBaseSrc;
-typedef struct _GstBaseSrcClass GstBaseSrcClass;
-typedef struct _GstBaseSrcPrivate GstBaseSrcPrivate;
-
-/**
- * GST_BASE_SRC_PAD:
- * @obj: base source instance
- *
- * Gives the pointer to the #GstPad object of the element.
- */
-#define GST_BASE_SRC_PAD(obj)                 (GST_BASE_SRC_CAST (obj)->srcpad)
-
-
-/**
- * GstBaseSrc:
- *
- * The opaque #GstBaseSrc data structure.
- */
-struct _GstBaseSrc {
-  GstElement     element;
-
-  /*< protected >*/
-  GstPad        *srcpad;
-
-  /* available to subclass implementations */
-  /* MT-protected (with LIVE_LOCK) */
-  GMutex         live_lock;
-  GCond          live_cond;
-  gboolean       is_live;
-  gboolean       live_running;
-
-  /* MT-protected (with LOCK) */
-  guint          blocksize;     /* size of buffers when operating push based */
-  gboolean       can_activate_push;     /* some scheduling properties */
-  gboolean       random_access;
-
-  GstClockID     clock_id;      /* for syncing */
-
-  /* MT-protected (with STREAM_LOCK *and* OBJECT_LOCK) */
-  GstSegment     segment;
-  /* MT-protected (with STREAM_LOCK) */
-  gboolean       need_newsegment;
-
-  gint           num_buffers;
-  gint           num_buffers_left;
-
-  gboolean       typefind;
-  gboolean       running;
-  GstEvent      *pending_seek;
-
-  GstBaseSrcPrivate *priv;
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstBaseSrcClass:
- * @parent_class: Element parent class
- * @get_caps: Called to get the caps to report
- * @negotiate: Negotiated the caps with the peer.
- * @fixate: Called during negotiation if caps need fixating. Implement instead of
- *   setting a fixate function on the source pad.
- * @set_caps: Notify subclass of changed output caps
- * @decide_allocation: configure the allocation query
- * @start: Start processing. Subclasses should open resources and prepare
- *    to produce data. Implementation should call gst_base_src_start_complete()
- *    when the operation completes, either from the current thread or any other
- *    thread that finishes the start operation asynchronously.
- * @stop: Stop processing. Subclasses should use this to close resources.
- * @get_times: Given a buffer, return the start and stop time when it
- *    should be pushed out. The base class will sync on the clock using
- *    these times.
- * @get_size: Return the total size of the resource, in the configured format.
- * @is_seekable: Check if the source can seek
- * @prepare_seek_segment: Prepare the GstSegment that will be passed to the
- *   do_seek vmethod for executing a seek request. Sub-classes should override
- *   this if they support seeking in formats other than the configured native
- *   format. By default, it tries to convert the seek arguments to the
- *   configured native format and prepare a segment in that format.
- * @do_seek: Perform seeking on the resource to the indicated segment.
- * @unlock: Unlock any pending access to the resource. Subclasses should
- *    unblock any blocked function ASAP. In particular, any create() function in
- *    progress should be unblocked and should return GST_FLOW_FLUSHING. Any
- *    future @create<!-- -->() function call should also return GST_FLOW_FLUSHING
- *    until the @unlock_stop<!-- -->() function has been called.
- * @unlock_stop: Clear the previous unlock request. Subclasses should clear
- *    any state they set during unlock(), such as clearing command queues.
- * @query: Handle a requested query.
- * @event: Override this to implement custom event handling.
- * @create: Ask the subclass to create a buffer with offset and size.
- *   When the subclass returns GST_FLOW_OK, it MUST return a buffer of the
- *   requested size unless fewer bytes are available because an EOS condition
- *   is near. No buffer should be returned when the return value is different
- *   from GST_FLOW_OK. A return value of GST_FLOW_EOS signifies that the
- *   end of stream is reached. The default implementation will call @alloc and
- *   then call @fill.
- * @alloc: Ask the subclass to allocate a buffer with for offset and size. The
- *   default implementation will create a new buffer from the negotiated allocator.
- * @fill: Ask the subclass to fill the buffer with data for offset and size. The
- *   passed buffer is guaranteed to hold the requested amount of bytes.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At the minimum, the @create method should be overridden to produce
- * buffers.
- */
-struct _GstBaseSrcClass {
-  GstElementClass parent_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  /* get caps from subclass */
-  GstCaps*      (*get_caps)     (GstBaseSrc *src, GstCaps *filter);
-  /* decide on caps */
-  gboolean      (*negotiate)    (GstBaseSrc *src);
-  /* called if, in negotiation, caps need fixating */
-  GstCaps *     (*fixate)       (GstBaseSrc *src, GstCaps *caps);
-  /* notify the subclass of new caps */
-  gboolean      (*set_caps)     (GstBaseSrc *src, GstCaps *caps);
-
-  /* setup allocation query */
-  gboolean      (*decide_allocation)   (GstBaseSrc *src, GstQuery *query);
-
-  /* start and stop processing, ideal for opening/closing the resource */
-  gboolean      (*start)        (GstBaseSrc *src);
-  gboolean      (*stop)         (GstBaseSrc *src);
-
-  /* given a buffer, return start and stop time when it should be pushed
-   * out. The base class will sync on the clock using these times. */
-  void          (*get_times)    (GstBaseSrc *src, GstBuffer *buffer,
-                                 GstClockTime *start, GstClockTime *end);
-
-  /* get the total size of the resource in bytes */
-  gboolean      (*get_size)     (GstBaseSrc *src, guint64 *size);
-
-  /* check if the resource is seekable */
-  gboolean      (*is_seekable)  (GstBaseSrc *src);
-
-  /* Prepare the segment on which to perform do_seek(), converting to the
-   * current basesrc format. */
-  gboolean      (*prepare_seek_segment) (GstBaseSrc *src, GstEvent *seek,
-                                         GstSegment *segment);
-  /* notify subclasses of a seek */
-  gboolean      (*do_seek)      (GstBaseSrc *src, GstSegment *segment);
-
-  /* unlock any pending access to the resource. subclasses should unlock
-   * any function ASAP. */
-  gboolean      (*unlock)       (GstBaseSrc *src);
-  /* Clear any pending unlock request, as we succeeded in unlocking */
-  gboolean      (*unlock_stop)  (GstBaseSrc *src);
-
-  /* notify subclasses of a query */
-  gboolean      (*query)        (GstBaseSrc *src, GstQuery *query);
-
-  /* notify subclasses of an event */
-  gboolean      (*event)        (GstBaseSrc *src, GstEvent *event);
-
-  /* ask the subclass to create a buffer with offset and size, the default
-   * implementation will call alloc and fill. */
-  GstFlowReturn (*create)       (GstBaseSrc *src, guint64 offset, guint size,
-                                 GstBuffer **buf);
-  /* ask the subclass to allocate an output buffer. The default implementation
-   * will use the negotiated allocator. */
-  GstFlowReturn (*alloc)        (GstBaseSrc *src, guint64 offset, guint size,
-                                 GstBuffer **buf);
-  /* ask the subclass to fill the buffer with data from offset and size */
-  GstFlowReturn (*fill)         (GstBaseSrc *src, guint64 offset, guint size,
-                                 GstBuffer *buf);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType gst_base_src_get_type (void);
-
-GstFlowReturn   gst_base_src_wait_playing     (GstBaseSrc *src);
-
-void            gst_base_src_set_live         (GstBaseSrc *src, gboolean live);
-gboolean        gst_base_src_is_live          (GstBaseSrc *src);
-
-void            gst_base_src_set_format       (GstBaseSrc *src, GstFormat format);
-
-void            gst_base_src_set_dynamic_size (GstBaseSrc * src, gboolean dynamic);
-
-void            gst_base_src_set_async        (GstBaseSrc *src, gboolean async);
-gboolean        gst_base_src_is_async         (GstBaseSrc *src);
-
-void            gst_base_src_start_complete   (GstBaseSrc * basesrc, GstFlowReturn ret);
-GstFlowReturn   gst_base_src_start_wait       (GstBaseSrc * basesrc);
-
-gboolean        gst_base_src_query_latency    (GstBaseSrc *src, gboolean * live,
-                                               GstClockTime * min_latency,
-                                               GstClockTime * max_latency);
-
-void            gst_base_src_set_blocksize    (GstBaseSrc *src, guint blocksize);
-guint           gst_base_src_get_blocksize    (GstBaseSrc *src);
-
-void            gst_base_src_set_do_timestamp (GstBaseSrc *src, gboolean timestamp);
-gboolean        gst_base_src_get_do_timestamp (GstBaseSrc *src);
-
-gboolean        gst_base_src_new_seamless_segment (GstBaseSrc *src, gint64 start, gint64 stop, gint64 time);
-
-gboolean        gst_base_src_set_caps         (GstBaseSrc *src, GstCaps *caps);
-
-GstBufferPool * gst_base_src_get_buffer_pool  (GstBaseSrc *src);
-void            gst_base_src_get_allocator    (GstBaseSrc *src,
-                                               GstAllocator **allocator,
-                                               GstAllocationParams *params);
-
-
-G_END_DECLS
-
-#endif /* __GST_BASE_SRC_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasetransform.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasetransform.h
deleted file mode 100644
index 666fbb19..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbasetransform.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BASE_TRANSFORM_H__
-#define __GST_BASE_TRANSFORM_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BASE_TRANSFORM		   (gst_base_transform_get_type())
-#define GST_BASE_TRANSFORM(obj)		   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_TRANSFORM,GstBaseTransform))
-#define GST_BASE_TRANSFORM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_TRANSFORM,GstBaseTransformClass))
-#define GST_BASE_TRANSFORM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_BASE_TRANSFORM,GstBaseTransformClass))
-#define GST_IS_BASE_TRANSFORM(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_TRANSFORM))
-#define GST_IS_BASE_TRANSFORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_TRANSFORM))
-#define GST_BASE_TRANSFORM_CAST(obj)	((GstBaseTransform *)(obj))
-
-/**
- * GST_BASE_TRANSFORM_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- */
-#define GST_BASE_TRANSFORM_SINK_NAME	"sink"
-/**
- * GST_BASE_TRANSFORM_SRC_NAME:
- *
- * The name of the templates for the source pad.
- */
-#define GST_BASE_TRANSFORM_SRC_NAME	"src"
-
-/**
- * GST_BASE_TRANSFORM_SRC_PAD:
- * @obj: base transform instance
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_BASE_TRANSFORM_SRC_PAD(obj)		(GST_BASE_TRANSFORM_CAST (obj)->srcpad)
-
-/**
- * GST_BASE_TRANSFORM_SINK_PAD:
- * @obj: base transform instance
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_BASE_TRANSFORM_SINK_PAD(obj)	(GST_BASE_TRANSFORM_CAST (obj)->sinkpad)
-
-/**
- * GST_BASE_TRANSFORM_FLOW_DROPPED:
- *
- * A #GstFlowReturn that can be returned from transform and transform_ip to
- * indicate that no output buffer was generated.
- */
-#define GST_BASE_TRANSFORM_FLOW_DROPPED   GST_FLOW_CUSTOM_SUCCESS
-
-typedef struct _GstBaseTransform GstBaseTransform;
-typedef struct _GstBaseTransformClass GstBaseTransformClass;
-typedef struct _GstBaseTransformPrivate GstBaseTransformPrivate;
-
-/**
- * GstBaseTransform:
- *
- * The opaque #GstBaseTransform data structure.
- */
-struct _GstBaseTransform {
-  GstElement	 element;
-
-  /*< protected >*/
-  /* source and sink pads */
-  GstPad	*sinkpad;
-  GstPad	*srcpad;
-
-  /* MT-protected (with STREAM_LOCK) */
-  gboolean       have_segment;
-  GstSegment     segment;
-
-  /*< private >*/
-  GstBaseTransformPrivate *priv;
-
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstBaseTransformClass:
- * @parent_class:   Element parent class
- * @passthrough_on_same_caps: If set to %TRUE, passthrough mode will be
- *                            automatically enabled if the caps are the same.
- *                            Set to %FALSE by default.
- * @transform_ip_on_passthrough: If set to %TRUE, @transform_ip will be called in
- *                           passthrough mode. The passed buffer might not be
- *                           writable. When %FALSE, neither @transform nor
- *                           @transform_ip will be called in passthrough mode.
- *                           Set to %TRUE by default.
- * @transform_caps: Optional.  Given the pad in this direction and the given
- *                  caps, what caps are allowed on the other pad in this
- *                  element ?
- * @fixate_caps:    Optional. Given the pad in this direction and the given
- *                  caps, fixate the caps on the other pad. The function takes
- *                  ownership of @othercaps and returns a fixated version of
- *                  @othercaps. @othercaps is not guaranteed to be writable.
- * @accept_caps:    Optional.
- *                  Subclasses can override this method to check if @caps can be
- *                  handled by the element. The default implementation might not be
- *                  the most optimal way to check this in all cases.
- * @set_caps:       allows the subclass to be notified of the actual caps set.
- * @query:          Optional.
- *                  Handle a requested query. Subclasses that implement this
- *                  should must chain up to the parent if they didn't handle the
- *                  query
- * @decide_allocation: Setup the allocation parameters for allocating output
- *                    buffers. The passed in query contains the result of the
- *                    downstream allocation query. This function is only called
- *                    when not operating in passthrough mode. The default
- *                    implementation will remove all memory dependent metadata.
- *                    If there is ia @filter_meta method implementation, it will
- *                    be called for all metadata API in the downstream query,
- *                    otherwise the metadata API is removed.
- * @filter_meta: Return TRUE if the metadata API should be proposed in the
- *               upstream allocation query. The default implementation is NULL
- *               and will cause all metadata to be removed.
- * @propose_allocation: Propose buffer allocation parameters for upstream elements.
- *                      This function must be implemented if the element reads or
- *                      writes the buffer content. The query that was passed to
- *                      the decide_allocation is passed in this method (or NULL
- *                      when the element is in passthrough mode). The default
- *                      implementation will pass the query downstream when in
- *                      passthrough mode and will copy all the filtered metadata
- *                      API in non-passthrough mode.
- * @transform_size: Optional. Given the size of a buffer in the given direction
- *                  with the given caps, calculate the size in bytes of a buffer
- *                  on the other pad with the given other caps.
- *                  The default implementation uses get_unit_size and keeps
- *                  the number of units the same.
- * @get_unit_size:  Required if the transform is not in-place.
- *                  get the size in bytes of one unit for the given caps.
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. The default implementation
- *                  handles the event and forwards it downstream.
- * @src_event:      Optional.
- *                  Event handler on the source pad. The default implementation
- *                  handles the event and forwards it upstream.
- * @prepare_output_buffer: Optional.
- *                         Subclasses can override this to do their own
- *                         allocation of output buffers.  Elements that only do
- *                         analysis can return a subbuffer or even just
- *                         return a reference to the input buffer (if in
- *                         passthrough mode). The default implementation will
- *                         use the negotiated allocator or bufferpool and
- *                         transform_size to allocate an output buffer or it
- *                         will return the input buffer in passthrough mode.
- * @copy_metadata: Optional.
- *                 Copy the metadata from the input buffer to the output buffer.
- *                 The default implementation will copy the flags, timestamps and
- *                 offsets of the buffer.
- * @transform_meta: Optional. Transform the metadata on the input buffer to the
- *                  output buffer. By default this method is NULL and no
- *                  metadata is copied. subclasses can implement this method and
- *                  return TRUE if the metadata is to be copied.
- * @before_transform: Optional.
- *                    This method is called right before the base class will
- *                    start processing. Dynamic properties or other delayed
- *                    configuration could be performed in this method.
- * @transform:      Required if the element does not operate in-place.
- *                  Transforms one incoming buffer to one outgoing buffer.
- *                  The function is allowed to change size/timestamp/duration
- *                  of the outgoing buffer.
- * @transform_ip:   Required if the element operates in-place.
- *                  Transform the incoming buffer in-place.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum either @transform or @transform_ip need to be overridden.
- * If the element can overwrite the input data with the results (data is of the
- * same type and quantity) it should provide @transform_ip.
- */
-struct _GstBaseTransformClass {
-  GstElementClass parent_class;
-
-  /*< public >*/
-  gboolean       passthrough_on_same_caps;
-  gboolean       transform_ip_on_passthrough;
-
-  /* virtual methods for subclasses */
-  GstCaps*	(*transform_caps) (GstBaseTransform *trans,
-                                   GstPadDirection direction,
-                                   GstCaps *caps, GstCaps *filter);
-  GstCaps*	(*fixate_caps)	  (GstBaseTransform *trans,
-                                   GstPadDirection direction, GstCaps *caps,
-                                   GstCaps *othercaps);
-  gboolean      (*accept_caps)    (GstBaseTransform *trans, GstPadDirection direction,
-                                   GstCaps *caps);
-  gboolean      (*set_caps)       (GstBaseTransform *trans, GstCaps *incaps,
-                                   GstCaps *outcaps);
-  gboolean      (*query)          (GstBaseTransform *trans, GstPadDirection direction,
-                                   GstQuery *query);
-
-  /* decide allocation query for output buffers */
-  gboolean      (*decide_allocation)  (GstBaseTransform *trans, GstQuery *query);
-  gboolean      (*filter_meta)        (GstBaseTransform *trans, GstQuery *query,
-                                       GType api, const GstStructure *params);
-
-  /* propose allocation query parameters for input buffers */
-  gboolean      (*propose_allocation) (GstBaseTransform *trans, GstQuery *decide_query,
-                                       GstQuery *query);
-
-  /* transform size */
-  gboolean      (*transform_size) (GstBaseTransform *trans,
-                                   GstPadDirection direction,
-                                   GstCaps *caps, gsize size,
-                                   GstCaps *othercaps, gsize *othersize);
-
-  gboolean      (*get_unit_size)  (GstBaseTransform *trans, GstCaps *caps,
-                                   gsize *size);
-
-  /* states */
-  gboolean      (*start)        (GstBaseTransform *trans);
-  gboolean      (*stop)         (GstBaseTransform *trans);
-
-  /* sink and src pad event handlers */
-  gboolean      (*sink_event)   (GstBaseTransform *trans, GstEvent *event);
-  gboolean      (*src_event)    (GstBaseTransform *trans, GstEvent *event);
-
-  GstFlowReturn (*prepare_output_buffer) (GstBaseTransform * trans,
-                                          GstBuffer *input, GstBuffer **outbuf);
-
-  /* metadata */
-  gboolean      (*copy_metadata)     (GstBaseTransform *trans, GstBuffer *input,
-                                      GstBuffer *outbuf);
-  gboolean      (*transform_meta)    (GstBaseTransform *trans, GstBuffer *outbuf,
-                                      GstMeta *meta, GstBuffer *inbuf);
-
-  void          (*before_transform)  (GstBaseTransform *trans, GstBuffer *buffer);
-
-  /* transform */
-  GstFlowReturn (*transform)    (GstBaseTransform *trans, GstBuffer *inbuf,
-                                 GstBuffer *outbuf);
-  GstFlowReturn (*transform_ip) (GstBaseTransform *trans, GstBuffer *buf);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType           gst_base_transform_get_type         (void);
-
-void		gst_base_transform_set_passthrough  (GstBaseTransform *trans,
-	                                             gboolean passthrough);
-gboolean	gst_base_transform_is_passthrough   (GstBaseTransform *trans);
-
-void		gst_base_transform_set_in_place     (GstBaseTransform *trans,
-	                                             gboolean in_place);
-gboolean	gst_base_transform_is_in_place      (GstBaseTransform *trans);
-
-void		gst_base_transform_update_qos       (GstBaseTransform *trans,
-						     gdouble proportion,
-						     GstClockTimeDiff diff,
-						     GstClockTime timestamp);
-void		gst_base_transform_set_qos_enabled  (GstBaseTransform *trans,
-		                                     gboolean enabled);
-gboolean	gst_base_transform_is_qos_enabled   (GstBaseTransform *trans);
-
-void            gst_base_transform_set_gap_aware    (GstBaseTransform *trans,
-                                                     gboolean gap_aware);
-
-void            gst_base_transform_set_prefer_passthrough (GstBaseTransform *trans,
-                                                           gboolean prefer_passthrough);
-
-GstBufferPool * gst_base_transform_get_buffer_pool  (GstBaseTransform *trans);
-void            gst_base_transform_get_allocator    (GstBaseTransform *trans,
-                                                     GstAllocator **allocator,
-                                                     GstAllocationParams *params);
-
-void		gst_base_transform_reconfigure_sink (GstBaseTransform *trans);
-void		gst_base_transform_reconfigure_src  (GstBaseTransform *trans);
-G_END_DECLS
-
-#endif /* __GST_BASE_TRANSFORM_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbitreader.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbitreader.h
deleted file mode 100644
index 4a2b4a0d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbitreader.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BIT_READER_H__
-#define __GST_BIT_READER_H__
-
-#include <gst/gst.h>
-
-/* FIXME: inline functions */
-
-G_BEGIN_DECLS
-
-#define GST_BIT_READER(reader) ((GstBitReader *) (reader))
-
-/**
- * GstBitReader:
- * @data: (array length=size): Data from which the bit reader will
- *   read
- * @size: Size of @data in bytes
- * @byte: Current byte position
- * @bit: Bit position in the current byte
- *
- * A bit reader instance.
- */
-typedef struct {
-  const guint8 *data;
-  guint size;
-
-  guint byte;  /* Byte position */
-  guint bit;   /* Bit position in the current byte */
-
-  /* < private > */
-  gpointer _gst_reserved[GST_PADDING];
-} GstBitReader;
-
-GstBitReader *  gst_bit_reader_new              (const guint8 *data, guint size) G_GNUC_MALLOC;
-void            gst_bit_reader_free             (GstBitReader *reader);
-
-void            gst_bit_reader_init             (GstBitReader *reader, const guint8 *data, guint size);
-
-gboolean        gst_bit_reader_set_pos          (GstBitReader *reader, guint pos);
-guint           gst_bit_reader_get_pos          (const GstBitReader *reader);
-
-guint           gst_bit_reader_get_remaining    (const GstBitReader *reader);
-
-guint           gst_bit_reader_get_size         (const GstBitReader *reader);
-
-gboolean        gst_bit_reader_skip             (GstBitReader *reader, guint nbits);
-gboolean        gst_bit_reader_skip_to_byte     (GstBitReader *reader);
-
-gboolean        gst_bit_reader_get_bits_uint8   (GstBitReader *reader, guint8 *val, guint nbits);
-gboolean        gst_bit_reader_get_bits_uint16  (GstBitReader *reader, guint16 *val, guint nbits);
-gboolean        gst_bit_reader_get_bits_uint32  (GstBitReader *reader, guint32 *val, guint nbits);
-gboolean        gst_bit_reader_get_bits_uint64  (GstBitReader *reader, guint64 *val, guint nbits);
-
-gboolean        gst_bit_reader_peek_bits_uint8  (const GstBitReader *reader, guint8 *val, guint nbits);
-gboolean        gst_bit_reader_peek_bits_uint16 (const GstBitReader *reader, guint16 *val, guint nbits);
-gboolean        gst_bit_reader_peek_bits_uint32 (const GstBitReader *reader, guint32 *val, guint nbits);
-gboolean        gst_bit_reader_peek_bits_uint64 (const GstBitReader *reader, guint64 *val, guint nbits);
-
-/**
- * GST_BIT_READER_INIT:
- * @data: Data from which the #GstBitReader should read
- * @size: Size of @data in bytes
- *
- * A #GstBitReader must be initialized with this macro, before it can be
- * used. This macro can used be to initialize a variable, but it cannot
- * be assigned to a variable. In that case you have to use
- * gst_bit_reader_init().
- */
-#define GST_BIT_READER_INIT(data, size) {data, size, 0, 0}
-
-/* Unchecked variants */
-
-static inline void
-gst_bit_reader_skip_unchecked (GstBitReader * reader, guint nbits)
-{
-  reader->bit += nbits;
-  reader->byte += reader->bit / 8;
-  reader->bit = reader->bit % 8;
-}
-
-static inline void
-gst_bit_reader_skip_to_byte_unchecked (GstBitReader * reader)
-{
-  if (reader->bit) {
-    reader->bit = 0;
-    reader->byte++;
-  }
-}
-
-#define __GST_BIT_READER_READ_BITS_UNCHECKED(bits) \
-static inline guint##bits \
-gst_bit_reader_peek_bits_uint##bits##_unchecked (const GstBitReader *reader, guint nbits) \
-{ \
-  guint##bits ret = 0; \
-  const guint8 *data; \
-  guint byte, bit; \
-  \
-  data = reader->data; \
-  byte = reader->byte; \
-  bit = reader->bit; \
-  \
-  while (nbits > 0) { \
-    guint toread = MIN (nbits, 8 - bit); \
-    \
-    ret <<= toread; \
-    ret |= (data[byte] & (0xff >> bit)) >> (8 - toread - bit); \
-    \
-    bit += toread; \
-    if (bit >= 8) { \
-      byte++; \
-      bit = 0; \
-    } \
-    nbits -= toread; \
-  } \
-  \
-  return ret; \
-} \
-\
-static inline guint##bits \
-gst_bit_reader_get_bits_uint##bits##_unchecked (GstBitReader *reader, guint nbits) \
-{ \
-  guint##bits ret; \
-  \
-  ret = gst_bit_reader_peek_bits_uint##bits##_unchecked (reader, nbits); \
-  \
-  gst_bit_reader_skip_unchecked (reader, nbits); \
-  \
-  return ret; \
-}
-
-__GST_BIT_READER_READ_BITS_UNCHECKED (8)
-__GST_BIT_READER_READ_BITS_UNCHECKED (16)
-__GST_BIT_READER_READ_BITS_UNCHECKED (32)
-__GST_BIT_READER_READ_BITS_UNCHECKED (64)
-
-#undef __GST_BIT_READER_READ_BITS_UNCHECKED
-
-/* unchecked variants -- do not use */
-
-static inline guint
-_gst_bit_reader_get_size_unchecked (const GstBitReader * reader)
-{
-  return reader->size * 8;
-}
-
-static inline guint
-_gst_bit_reader_get_pos_unchecked (const GstBitReader * reader)
-{
-  return reader->byte * 8 + reader->bit;
-}
-
-static inline guint
-_gst_bit_reader_get_remaining_unchecked (const GstBitReader * reader)
-{
-  return reader->size * 8 - (reader->byte * 8 + reader->bit);
-}
-
-/* inlined variants -- do not use directly */
-static inline guint
-_gst_bit_reader_get_size_inline (const GstBitReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_bit_reader_get_size_unchecked (reader);
-}
-
-static inline guint
-_gst_bit_reader_get_pos_inline (const GstBitReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_bit_reader_get_pos_unchecked (reader);
-}
-
-static inline guint
-_gst_bit_reader_get_remaining_inline (const GstBitReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_bit_reader_get_remaining_unchecked (reader);
-}
-
-static inline gboolean
-_gst_bit_reader_skip_inline (GstBitReader * reader, guint nbits)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-
-  if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits)
-    return FALSE;
-
-  gst_bit_reader_skip_unchecked (reader, nbits);
-
-  return TRUE;
-}
-
-static inline gboolean
-_gst_bit_reader_skip_to_byte_inline (GstBitReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-
-  if (reader->byte > reader->size)
-    return FALSE;
-
-  gst_bit_reader_skip_to_byte_unchecked (reader);
-
-  return TRUE;
-}
-
-#define __GST_BIT_READER_READ_BITS_INLINE(bits) \
-static inline gboolean \
-_gst_bit_reader_get_bits_uint##bits##_inline (GstBitReader *reader, guint##bits *val, guint nbits) \
-{ \
-  g_return_val_if_fail (reader != NULL, FALSE); \
-  g_return_val_if_fail (val != NULL, FALSE); \
-  g_return_val_if_fail (nbits <= bits, FALSE); \
-  \
-  if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits) \
-    return FALSE; \
-\
-  *val = gst_bit_reader_get_bits_uint##bits##_unchecked (reader, nbits); \
-  return TRUE; \
-} \
-\
-static inline gboolean \
-_gst_bit_reader_peek_bits_uint##bits##_inline (const GstBitReader *reader, guint##bits *val, guint nbits) \
-{ \
-  g_return_val_if_fail (reader != NULL, FALSE); \
-  g_return_val_if_fail (val != NULL, FALSE); \
-  g_return_val_if_fail (nbits <= bits, FALSE); \
-  \
-  if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits) \
-    return FALSE; \
-\
-  *val = gst_bit_reader_peek_bits_uint##bits##_unchecked (reader, nbits); \
-  return TRUE; \
-}
-
-__GST_BIT_READER_READ_BITS_INLINE (8)
-__GST_BIT_READER_READ_BITS_INLINE (16)
-__GST_BIT_READER_READ_BITS_INLINE (32)
-__GST_BIT_READER_READ_BITS_INLINE (64)
-
-#undef __GST_BIT_READER_READ_BITS_INLINE
-
-#ifndef GST_BIT_READER_DISABLE_INLINES
-
-#define gst_bit_reader_get_size(reader) \
-    _gst_bit_reader_get_size_inline (reader)
-#define gst_bit_reader_get_pos(reader) \
-    _gst_bit_reader_get_pos_inline (reader)
-#define gst_bit_reader_get_remaining(reader) \
-    _gst_bit_reader_get_remaining_inline (reader)
-
-/* we use defines here so we can add the G_LIKELY() */
-
-#define gst_bit_reader_skip(reader, nbits)\
-    G_LIKELY (_gst_bit_reader_skip_inline(reader, nbits))
-#define gst_bit_reader_skip_to_byte(reader)\
-    G_LIKELY (_gst_bit_reader_skip_to_byte_inline(reader))
-
-#define gst_bit_reader_get_bits_uint8(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_get_bits_uint8_inline (reader, val, nbits))
-#define gst_bit_reader_get_bits_uint16(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_get_bits_uint16_inline (reader, val, nbits))
-#define gst_bit_reader_get_bits_uint32(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_get_bits_uint32_inline (reader, val, nbits))
-#define gst_bit_reader_get_bits_uint64(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_get_bits_uint64_inline (reader, val, nbits))
-
-#define gst_bit_reader_peek_bits_uint8(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_peek_bits_uint8_inline (reader, val, nbits))
-#define gst_bit_reader_peek_bits_uint16(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_peek_bits_uint16_inline (reader, val, nbits))
-#define gst_bit_reader_peek_bits_uint32(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_peek_bits_uint32_inline (reader, val, nbits))
-#define gst_bit_reader_peek_bits_uint64(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_peek_bits_uint64_inline (reader, val, nbits))
-#endif
-
-G_END_DECLS
-
-#endif /* __GST_BIT_READER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbytereader.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbytereader.h
deleted file mode 100644
index 15ac2ed0..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbytereader.h
+++ /dev/null
@@ -1,513 +0,0 @@
-/* GStreamer byte reader
- *
- * Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>.
- * Copyright (C) 2009 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BYTE_READER_H__
-#define __GST_BYTE_READER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_BYTE_READER(reader) ((GstByteReader *) (reader))
-
-/**
- * GstByteReader:
- * @data: (array length=size): Data from which the bit reader will
- *   read
- * @size: Size of @data in bytes
- * @byte: Current byte position
- *
- * A byte reader instance.
- */
-typedef struct {
-  const guint8 *data;
-  guint size;
-
-  guint byte;  /* Byte position */
-
-  /* < private > */
-  gpointer _gst_reserved[GST_PADDING];
-} GstByteReader;
-
-GstByteReader * gst_byte_reader_new             (const guint8 *data, guint size) G_GNUC_MALLOC;
-void            gst_byte_reader_free            (GstByteReader *reader);
-
-void            gst_byte_reader_init            (GstByteReader *reader, const guint8 *data, guint size);
-
-gboolean        gst_byte_reader_set_pos         (GstByteReader *reader, guint pos);
-guint           gst_byte_reader_get_pos         (const GstByteReader *reader);
-
-guint           gst_byte_reader_get_remaining   (const GstByteReader *reader);
-
-guint           gst_byte_reader_get_size        (const GstByteReader *reader);
-
-gboolean        gst_byte_reader_skip            (GstByteReader *reader, guint nbytes);
-
-gboolean        gst_byte_reader_get_uint8       (GstByteReader *reader, guint8 *val);
-gboolean        gst_byte_reader_get_int8        (GstByteReader *reader, gint8 *val);
-gboolean        gst_byte_reader_get_uint16_le   (GstByteReader *reader, guint16 *val);
-gboolean        gst_byte_reader_get_int16_le    (GstByteReader *reader, gint16 *val);
-gboolean        gst_byte_reader_get_uint16_be   (GstByteReader *reader, guint16 *val);
-gboolean        gst_byte_reader_get_int16_be    (GstByteReader *reader, gint16 *val);
-gboolean        gst_byte_reader_get_uint24_le   (GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_get_int24_le    (GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_get_uint24_be   (GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_get_int24_be    (GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_get_uint32_le   (GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_get_int32_le    (GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_get_uint32_be   (GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_get_int32_be    (GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_get_uint64_le   (GstByteReader *reader, guint64 *val);
-gboolean        gst_byte_reader_get_int64_le    (GstByteReader *reader, gint64 *val);
-gboolean        gst_byte_reader_get_uint64_be   (GstByteReader *reader, guint64 *val);
-gboolean        gst_byte_reader_get_int64_be    (GstByteReader *reader, gint64 *val);
-
-gboolean        gst_byte_reader_peek_uint8      (const GstByteReader *reader, guint8 *val);
-gboolean        gst_byte_reader_peek_int8       (const GstByteReader *reader, gint8 *val);
-gboolean        gst_byte_reader_peek_uint16_le  (const GstByteReader *reader, guint16 *val);
-gboolean        gst_byte_reader_peek_int16_le   (const GstByteReader *reader, gint16 *val);
-gboolean        gst_byte_reader_peek_uint16_be  (const GstByteReader *reader, guint16 *val);
-gboolean        gst_byte_reader_peek_int16_be   (const GstByteReader *reader, gint16 *val);
-gboolean        gst_byte_reader_peek_uint24_le  (const GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_peek_int24_le   (const GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_peek_uint24_be  (const GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_peek_int24_be   (const GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_peek_uint32_le  (const GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_peek_int32_le   (const GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_peek_uint32_be  (const GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_peek_int32_be   (const GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_peek_uint64_le  (const GstByteReader *reader, guint64 *val);
-gboolean        gst_byte_reader_peek_int64_le   (const GstByteReader *reader, gint64 *val);
-gboolean        gst_byte_reader_peek_uint64_be  (const GstByteReader *reader, guint64 *val);
-gboolean        gst_byte_reader_peek_int64_be   (const GstByteReader *reader, gint64 *val);
-
-gboolean        gst_byte_reader_get_float32_le  (GstByteReader *reader, gfloat *val);
-gboolean        gst_byte_reader_get_float32_be  (GstByteReader *reader, gfloat *val);
-gboolean        gst_byte_reader_get_float64_le  (GstByteReader *reader, gdouble *val);
-gboolean        gst_byte_reader_get_float64_be  (GstByteReader *reader, gdouble *val);
-
-gboolean        gst_byte_reader_peek_float32_le (const GstByteReader *reader, gfloat *val);
-gboolean        gst_byte_reader_peek_float32_be (const GstByteReader *reader, gfloat *val);
-gboolean        gst_byte_reader_peek_float64_le (const GstByteReader *reader, gdouble *val);
-gboolean        gst_byte_reader_peek_float64_be (const GstByteReader *reader, gdouble *val);
-
-gboolean        gst_byte_reader_dup_data        (GstByteReader * reader, guint size, guint8       ** val);
-gboolean        gst_byte_reader_get_data        (GstByteReader * reader, guint size, const guint8 ** val);
-gboolean        gst_byte_reader_peek_data       (const GstByteReader * reader, guint size, const guint8 ** val);
-
-#define gst_byte_reader_dup_string(reader,str) \
-    gst_byte_reader_dup_string_utf8(reader,str)
-
-gboolean        gst_byte_reader_dup_string_utf8  (GstByteReader * reader, gchar   ** str);
-gboolean        gst_byte_reader_dup_string_utf16 (GstByteReader * reader, guint16 ** str);
-gboolean        gst_byte_reader_dup_string_utf32 (GstByteReader * reader, guint32 ** str);
-
-#define gst_byte_reader_skip_string(reader) \
-    gst_byte_reader_skip_string_utf8(reader)
-
-gboolean        gst_byte_reader_skip_string_utf8  (GstByteReader * reader);
-gboolean        gst_byte_reader_skip_string_utf16 (GstByteReader * reader);
-gboolean        gst_byte_reader_skip_string_utf32 (GstByteReader * reader);
-
-#define gst_byte_reader_get_string(reader,str) \
-    gst_byte_reader_get_string_utf8(reader,str)
-
-#define gst_byte_reader_peek_string(reader,str) \
-    gst_byte_reader_peek_string_utf8(reader,str)
-
-gboolean        gst_byte_reader_get_string_utf8    (GstByteReader * reader, const gchar ** str);
-gboolean        gst_byte_reader_peek_string_utf8   (const GstByteReader * reader, const gchar ** str);
-
-guint           gst_byte_reader_masked_scan_uint32 (const GstByteReader * reader,
-                                                    guint32               mask,
-                                                    guint32               pattern,
-                                                    guint                 offset,
-                                                    guint                 size);
-
-/**
- * GST_BYTE_READER_INIT:
- * @data: Data from which the #GstByteReader should read
- * @size: Size of @data in bytes
- *
- * A #GstByteReader must be initialized with this macro, before it can be
- * used. This macro can used be to initialize a variable, but it cannot
- * be assigned to a variable. In that case you have to use
- * gst_byte_reader_init().
- */
-#define GST_BYTE_READER_INIT(data, size) {data, size, 0}
-
-/* unchecked variants */
-static inline void
-gst_byte_reader_skip_unchecked (GstByteReader * reader, guint nbytes)
-{
-  reader->byte += nbytes;
-}
-
-#define __GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(bits,type,lower,upper,adj) \
-\
-static inline type \
-gst_byte_reader_peek_##lower##_unchecked (const GstByteReader * reader) \
-{ \
-  type val = (type) GST_READ_##upper (reader->data + reader->byte); \
-  adj \
-  return val; \
-} \
-\
-static inline type \
-gst_byte_reader_get_##lower##_unchecked (GstByteReader * reader) \
-{ \
-  type val = gst_byte_reader_peek_##lower##_unchecked (reader); \
-  reader->byte += bits / 8; \
-  return val; \
-}
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(8,guint8,uint8,UINT8,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(8,gint8,int8,UINT8,/* */)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,guint16,uint16_le,UINT16_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,guint16,uint16_be,UINT16_BE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,gint16,int16_le,UINT16_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,gint16,int16_be,UINT16_BE,/* */)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,guint32,uint32_le,UINT32_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,guint32,uint32_be,UINT32_BE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gint32,int32_le,UINT32_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gint32,int32_be,UINT32_BE,/* */)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,guint32,uint24_le,UINT24_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,guint32,uint24_be,UINT24_BE,/* */)
-
-/* fix up the sign for 24-bit signed ints stored in 32-bit signed ints */
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,gint32,int24_le,UINT24_LE,
-    if (val & 0x00800000) val |= 0xff000000;)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,gint32,int24_be,UINT24_BE,
-    if (val & 0x00800000) val |= 0xff000000;)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,guint64,uint64_le,UINT64_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,guint64,uint64_be,UINT64_BE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gint64,int64_le,UINT64_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gint64,int64_be,UINT64_BE,/* */)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gfloat,float32_le,FLOAT_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gfloat,float32_be,FLOAT_BE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gdouble,float64_le,DOUBLE_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gdouble,float64_be,DOUBLE_BE,/* */)
-
-#undef __GET_PEEK_BITS_UNCHECKED
-
-static inline const guint8 *
-gst_byte_reader_peek_data_unchecked (const GstByteReader * reader)
-{
-  return (const guint8 *) (reader->data + reader->byte);
-}
-
-static inline const guint8 *
-gst_byte_reader_get_data_unchecked (GstByteReader * reader, guint size)
-{
-  const guint8 *data;
-
-  data = gst_byte_reader_peek_data_unchecked (reader);
-  gst_byte_reader_skip_unchecked (reader, size);
-  return data;
-}
-
-static inline guint8 *
-gst_byte_reader_dup_data_unchecked (GstByteReader * reader, guint size)
-{
-  gconstpointer data = gst_byte_reader_get_data_unchecked (reader, size);
-  return (guint8 *) g_memdup (data, size);
-}
-
-/* Unchecked variants that should not be used */
-static inline guint
-_gst_byte_reader_get_pos_unchecked (const GstByteReader * reader)
-{
-  return reader->byte;
-}
-
-static inline guint
-_gst_byte_reader_get_remaining_unchecked (const GstByteReader * reader)
-{
-  return reader->size - reader->byte;
-}
-
-static inline guint
-_gst_byte_reader_get_size_unchecked (const GstByteReader * reader)
-{
-  return reader->size;
-}
-
-/* inlined variants (do not use directly) */
-
-static inline guint
-_gst_byte_reader_get_remaining_inline (const GstByteReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_byte_reader_get_remaining_unchecked (reader);
-}
-
-static inline guint
-_gst_byte_reader_get_size_inline (const GstByteReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_byte_reader_get_size_unchecked (reader);
-}
-
-#define __GST_BYTE_READER_GET_PEEK_BITS_INLINE(bits,type,name) \
-\
-static inline gboolean \
-_gst_byte_reader_peek_##name##_inline (const GstByteReader * reader, type * val) \
-{ \
-  g_return_val_if_fail (reader != NULL, FALSE); \
-  g_return_val_if_fail (val != NULL, FALSE); \
-  \
-  if (_gst_byte_reader_get_remaining_unchecked (reader) < (bits / 8)) \
-    return FALSE; \
-\
-  *val = gst_byte_reader_peek_##name##_unchecked (reader); \
-  return TRUE; \
-} \
-\
-static inline gboolean \
-_gst_byte_reader_get_##name##_inline (GstByteReader * reader, type * val) \
-{ \
-  g_return_val_if_fail (reader != NULL, FALSE); \
-  g_return_val_if_fail (val != NULL, FALSE); \
-  \
-  if (_gst_byte_reader_get_remaining_unchecked (reader) < (bits / 8)) \
-    return FALSE; \
-\
-  *val = gst_byte_reader_get_##name##_unchecked (reader); \
-  return TRUE; \
-}
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(8,guint8,uint8)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(8,gint8,int8)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,guint16,uint16_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,guint16,uint16_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,gint16,int16_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,gint16,int16_be)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,guint32,uint32_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,guint32,uint32_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gint32,int32_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gint32,int32_be)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,guint32,uint24_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,guint32,uint24_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,gint32,int24_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,gint32,int24_be)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,guint64,uint64_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,guint64,uint64_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gint64,int64_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gint64,int64_be)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gfloat,float32_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gfloat,float32_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gdouble,float64_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gdouble,float64_be)
-
-#undef __GST_BYTE_READER_GET_PEEK_BITS_INLINE
-
-#ifndef GST_BYTE_READER_DISABLE_INLINES
-
-#define gst_byte_reader_get_remaining(reader) \
-    _gst_byte_reader_get_remaining_inline(reader)
-
-#define gst_byte_reader_get_size(reader) \
-    _gst_byte_reader_get_size_inline(reader)
-
-#define gst_byte_reader_get_pos(reader) \
-    _gst_byte_reader_get_pos_inline(reader)
-
-/* we use defines here so we can add the G_LIKELY() */
-#define gst_byte_reader_get_uint8(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint8_inline(reader,val))
-#define gst_byte_reader_get_int8(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int8_inline(reader,val))
-#define gst_byte_reader_get_uint16_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint16_le_inline(reader,val))
-#define gst_byte_reader_get_int16_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int16_le_inline(reader,val))
-#define gst_byte_reader_get_uint16_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint16_be_inline(reader,val))
-#define gst_byte_reader_get_int16_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int16_be_inline(reader,val))
-#define gst_byte_reader_get_uint24_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint24_le_inline(reader,val))
-#define gst_byte_reader_get_int24_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int24_le_inline(reader,val))
-#define gst_byte_reader_get_uint24_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint24_be_inline(reader,val))
-#define gst_byte_reader_get_int24_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int24_be_inline(reader,val))
-#define gst_byte_reader_get_uint32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint32_le_inline(reader,val))
-#define gst_byte_reader_get_int32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int32_le_inline(reader,val))
-#define gst_byte_reader_get_uint32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint32_be_inline(reader,val))
-#define gst_byte_reader_get_int32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int32_be_inline(reader,val))
-#define gst_byte_reader_get_uint64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint64_le_inline(reader,val))
-#define gst_byte_reader_get_int64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int64_le_inline(reader,val))
-#define gst_byte_reader_get_uint64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint64_be_inline(reader,val))
-#define gst_byte_reader_get_int64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int64_be_inline(reader,val))
-
-#define gst_byte_reader_peek_uint8(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint8_inline(reader,val))
-#define gst_byte_reader_peek_int8(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int8_inline(reader,val))
-#define gst_byte_reader_peek_uint16_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint16_le_inline(reader,val))
-#define gst_byte_reader_peek_int16_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int16_le_inline(reader,val))
-#define gst_byte_reader_peek_uint16_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint16_be_inline(reader,val))
-#define gst_byte_reader_peek_int16_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int16_be_inline(reader,val))
-#define gst_byte_reader_peek_uint24_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint24_le_inline(reader,val))
-#define gst_byte_reader_peek_int24_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int24_le_inline(reader,val))
-#define gst_byte_reader_peek_uint24_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint24_be_inline(reader,val))
-#define gst_byte_reader_peek_int24_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int24_be_inline(reader,val))
-#define gst_byte_reader_peek_uint32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint32_le_inline(reader,val))
-#define gst_byte_reader_peek_int32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int32_le_inline(reader,val))
-#define gst_byte_reader_peek_uint32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint32_be_inline(reader,val))
-#define gst_byte_reader_peek_int32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int32_be_inline(reader,val))
-#define gst_byte_reader_peek_uint64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint64_le_inline(reader,val))
-#define gst_byte_reader_peek_int64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int64_le_inline(reader,val))
-#define gst_byte_reader_peek_uint64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint64_be_inline(reader,val))
-#define gst_byte_reader_peek_int64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int64_be_inline(reader,val))
-
-#define gst_byte_reader_get_float32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_float32_le_inline(reader,val))
-#define gst_byte_reader_get_float32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_float32_be_inline(reader,val))
-#define gst_byte_reader_get_float64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_float64_le_inline(reader,val))
-#define gst_byte_reader_get_float64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_float64_be_inline(reader,val))
-#define gst_byte_reader_peek_float32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_float32_le_inline(reader,val))
-#define gst_byte_reader_peek_float32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_float32_be_inline(reader,val))
-#define gst_byte_reader_peek_float64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_float64_le_inline(reader,val))
-#define gst_byte_reader_peek_float64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_float64_be_inline(reader,val))
-
-#endif /* GST_BYTE_READER_DISABLE_INLINES */
-
-static inline gboolean
-_gst_byte_reader_dup_data_inline (GstByteReader * reader, guint size, guint8 ** val)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-  g_return_val_if_fail (val != NULL, FALSE);
-
-  if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size))
-    return FALSE;
-
-  *val = gst_byte_reader_dup_data_unchecked (reader, size);
-  return TRUE;
-}
-
-static inline gboolean
-_gst_byte_reader_get_data_inline (GstByteReader * reader, guint size, const guint8 ** val)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-  g_return_val_if_fail (val != NULL, FALSE);
-
-  if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size))
-    return FALSE;
-
-  *val = gst_byte_reader_get_data_unchecked (reader, size);
-  return TRUE;
-}
-
-static inline gboolean
-_gst_byte_reader_peek_data_inline (const GstByteReader * reader, guint size, const guint8 ** val)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-  g_return_val_if_fail (val != NULL, FALSE);
-
-  if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size))
-    return FALSE;
-
-  *val = gst_byte_reader_peek_data_unchecked (reader);
-  return TRUE;
-}
-
-static inline guint
-_gst_byte_reader_get_pos_inline (const GstByteReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_byte_reader_get_pos_unchecked (reader);
-}
-
-static inline gboolean
-_gst_byte_reader_skip_inline (GstByteReader * reader, guint nbytes)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-
-  if (G_UNLIKELY (_gst_byte_reader_get_remaining_unchecked (reader) < nbytes))
-    return FALSE;
-
-  reader->byte += nbytes;
-  return TRUE;
-}
-
-#ifndef GST_BYTE_READER_DISABLE_INLINES
-
-#define gst_byte_reader_dup_data(reader,size,val) \
-    G_LIKELY(_gst_byte_reader_dup_data_inline(reader,size,val))
-#define gst_byte_reader_get_data(reader,size,val) \
-    G_LIKELY(_gst_byte_reader_get_data_inline(reader,size,val))
-#define gst_byte_reader_peek_data(reader,size,val) \
-    G_LIKELY(_gst_byte_reader_peek_data_inline(reader,size,val))
-#define gst_byte_reader_skip(reader,nbytes) \
-    G_LIKELY(_gst_byte_reader_skip_inline(reader,nbytes))
-
-#endif /* GST_BYTE_READER_DISABLE_INLINES */
-
-G_END_DECLS
-
-#endif /* __GST_BYTE_READER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbytewriter.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbytewriter.h
deleted file mode 100644
index 079e16fc..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstbytewriter.h
+++ /dev/null
@@ -1,401 +0,0 @@
-/* GStreamer byte writer
- *
- * Copyright (C) 2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BYTE_WRITER_H__
-#define __GST_BYTE_WRITER_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbytereader.h>
-
-#include <string.h>
-
-G_BEGIN_DECLS
-
-#define GST_BYTE_WRITER(writer) ((GstByteWriter *) (writer))
-
-/**
- * GstByteWriter:
- * @parent: #GstByteReader parent
- * @alloc_size: Allocation size of the data
- * @fixed: If %TRUE no reallocations are allowed
- * @owned: If %FALSE no reallocations are allowed and copies of data are returned
- *
- * A byte writer instance.
- */
-typedef struct {
-  GstByteReader parent;
-
-  guint alloc_size;
-
-  gboolean fixed;
-  gboolean owned;
-
-  /* < private > */
-  gpointer _gst_reserved[GST_PADDING];
-} GstByteWriter;
-
-GstByteWriter * gst_byte_writer_new             (void) G_GNUC_MALLOC;
-GstByteWriter * gst_byte_writer_new_with_size   (guint size, gboolean fixed) G_GNUC_MALLOC;
-GstByteWriter * gst_byte_writer_new_with_data   (guint8 *data, guint size, gboolean initialized) G_GNUC_MALLOC;
-
-void            gst_byte_writer_init            (GstByteWriter *writer);
-void            gst_byte_writer_init_with_size  (GstByteWriter *writer, guint size, gboolean fixed);
-void            gst_byte_writer_init_with_data  (GstByteWriter *writer, guint8 *data,
-                                                 guint size, gboolean initialized);
-
-void            gst_byte_writer_free                    (GstByteWriter *writer);
-guint8 *        gst_byte_writer_free_and_get_data       (GstByteWriter *writer);
-GstBuffer *     gst_byte_writer_free_and_get_buffer     (GstByteWriter *writer) G_GNUC_MALLOC;
-
-void            gst_byte_writer_reset                   (GstByteWriter *writer);
-guint8 *        gst_byte_writer_reset_and_get_data      (GstByteWriter *writer);
-GstBuffer *     gst_byte_writer_reset_and_get_buffer    (GstByteWriter *writer) G_GNUC_MALLOC;
-
-/**
- * gst_byte_writer_get_pos:
- * @writer: #GstByteWriter instance
- *
- * Returns: The current position of the read/write cursor
- */
-/**
- * gst_byte_writer_set_pos:
- * @writer: #GstByteWriter instance
- * @pos: new position
- *
- * Sets the current read/write cursor of @writer. The new position
- * can only be between 0 and the current size.
- *
- * Returns: %TRUE if the new position could be set
- */
-/**
- * gst_byte_writer_get_size:
- * @writer: #GstByteWriter instance
- *
- * Returns: The current, initialized size of the data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC guint     gst_byte_writer_get_pos  (const GstByteWriter *writer);
-G_INLINE_FUNC gboolean  gst_byte_writer_set_pos  (GstByteWriter *writer, guint pos);
-G_INLINE_FUNC guint     gst_byte_writer_get_size (const GstByteWriter *writer);
-#else
-static inline guint
-gst_byte_writer_get_pos (const GstByteWriter *writer)
-{
-  return gst_byte_reader_get_pos ((const GstByteReader *) writer);
-}
-
-static inline gboolean
-gst_byte_writer_set_pos (GstByteWriter *writer, guint pos)
-{
-  return gst_byte_reader_set_pos (GST_BYTE_READER (writer), pos);
-}
-
-static inline guint
-gst_byte_writer_get_size (const GstByteWriter *writer)
-{
-  return gst_byte_reader_get_size ((const GstByteReader *) writer);
-}
-#endif
-
-guint           gst_byte_writer_get_remaining     (const GstByteWriter *writer);
-gboolean        gst_byte_writer_ensure_free_space (GstByteWriter *writer, guint size);
-
-gboolean        gst_byte_writer_put_uint8         (GstByteWriter *writer, guint8 val);
-gboolean        gst_byte_writer_put_int8          (GstByteWriter *writer, gint8 val);
-gboolean        gst_byte_writer_put_uint16_be     (GstByteWriter *writer, guint16 val);
-gboolean        gst_byte_writer_put_uint16_le     (GstByteWriter *writer, guint16 val);
-gboolean        gst_byte_writer_put_int16_be      (GstByteWriter *writer, gint16 val);
-gboolean        gst_byte_writer_put_int16_le      (GstByteWriter *writer, gint16 val);
-gboolean        gst_byte_writer_put_uint24_be     (GstByteWriter *writer, guint32 val);
-gboolean        gst_byte_writer_put_uint24_le     (GstByteWriter *writer, guint32 val);
-gboolean        gst_byte_writer_put_int24_be      (GstByteWriter *writer, gint32 val);
-gboolean        gst_byte_writer_put_int24_le      (GstByteWriter *writer, gint32 val);
-gboolean        gst_byte_writer_put_uint32_be     (GstByteWriter *writer, guint32 val);
-gboolean        gst_byte_writer_put_uint32_le     (GstByteWriter *writer, guint32 val);
-gboolean        gst_byte_writer_put_int32_be      (GstByteWriter *writer, gint32 val);
-gboolean        gst_byte_writer_put_int32_le      (GstByteWriter *writer, gint32 val);
-gboolean        gst_byte_writer_put_uint64_be     (GstByteWriter *writer, guint64 val);
-gboolean        gst_byte_writer_put_uint64_le     (GstByteWriter *writer, guint64 val);
-gboolean        gst_byte_writer_put_int64_be      (GstByteWriter *writer, gint64 val);
-gboolean        gst_byte_writer_put_int64_le      (GstByteWriter *writer, gint64 val);
-
-gboolean        gst_byte_writer_put_float32_be    (GstByteWriter *writer, gfloat val);
-gboolean        gst_byte_writer_put_float32_le    (GstByteWriter *writer, gfloat val);
-gboolean        gst_byte_writer_put_float64_be    (GstByteWriter *writer, gdouble val);
-gboolean        gst_byte_writer_put_float64_le    (GstByteWriter *writer, gdouble val);
-
-gboolean        gst_byte_writer_put_data          (GstByteWriter *writer, const guint8 *data, guint size);
-gboolean        gst_byte_writer_fill              (GstByteWriter *writer, guint8 value, guint size);
-gboolean        gst_byte_writer_put_string_utf8   (GstByteWriter *writer, const gchar *data);
-gboolean        gst_byte_writer_put_string_utf16  (GstByteWriter *writer, const guint16 *data);
-gboolean        gst_byte_writer_put_string_utf32  (GstByteWriter *writer, const guint32 *data);
-gboolean        gst_byte_writer_put_buffer        (GstByteWriter *writer, GstBuffer * buffer, gsize offset, gssize size);
-
-/**
- * gst_byte_writer_put_string:
- * @writer: #GstByteWriter instance
- * @data: (in) (array zero-terminated=1): Null terminated string
- *
- * Write a NUL-terminated string to @writer (including the terminator). The
- * string is assumed to be in an 8-bit encoding (e.g. ASCII,UTF-8 or
- * ISO-8859-1).
- *
- * Returns: %TRUE if the string could be written
- */
-#define gst_byte_writer_put_string(writer, data) \
-  gst_byte_writer_put_string_utf8(writer, data)
-
-static inline guint
-_gst_byte_writer_next_pow2 (guint n)
-{
-  guint ret = 16;
-
-  /* We start with 16, smaller allocations make no sense */
-
-  while (ret < n && ret > 0)
-    ret <<= 1;
-
-  return ret ? ret : n;
-}
-
-static inline gboolean
-_gst_byte_writer_ensure_free_space_inline (GstByteWriter * writer, guint size)
-{
-  gpointer data;
-
-  if (G_LIKELY (size <= writer->alloc_size - writer->parent.byte))
-    return TRUE;
-  if (G_UNLIKELY (writer->fixed || !writer->owned))
-    return FALSE;
-  if (G_UNLIKELY (writer->parent.byte > G_MAXUINT - size))
-    return FALSE;
-
-  writer->alloc_size = _gst_byte_writer_next_pow2 (writer->parent.byte + size);
-  data = g_try_realloc ((guint8 *) writer->parent.data, writer->alloc_size);
-  if (G_UNLIKELY (data == NULL))
-    return FALSE;
-
-  writer->parent.data = (guint8 *) data;
-
-  return TRUE;
-}
-
-#define __GST_BYTE_WRITER_CREATE_WRITE_FUNC(bits,type,name,write_func) \
-static inline void \
-gst_byte_writer_put_##name##_unchecked (GstByteWriter *writer, type val) \
-{ \
-  guint8 *write_data; \
-  \
-  write_data = (guint8 *) writer->parent.data + writer->parent.byte; \
-  write_func (write_data, val); \
-  writer->parent.byte += bits/8; \
-  writer->parent.size = MAX (writer->parent.size, writer->parent.byte); \
-} \
-\
-static inline gboolean \
-_gst_byte_writer_put_##name##_inline (GstByteWriter *writer, type val) \
-{ \
-  g_return_val_if_fail (writer != NULL, FALSE); \
-  \
-  if (G_UNLIKELY (!_gst_byte_writer_ensure_free_space_inline(writer, bits/8))) \
-    return FALSE; \
-  \
-  gst_byte_writer_put_##name##_unchecked (writer, val); \
-  \
-  return TRUE; \
-}
-
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (8, guint8, uint8, GST_WRITE_UINT8)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (8, gint8, int8, GST_WRITE_UINT8)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (16, guint16, uint16_le, GST_WRITE_UINT16_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (16, guint16, uint16_be, GST_WRITE_UINT16_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (16, gint16, int16_le, GST_WRITE_UINT16_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (16, gint16, int16_be, GST_WRITE_UINT16_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (24, guint32, uint24_le, GST_WRITE_UINT24_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (24, guint32, uint24_be, GST_WRITE_UINT24_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (24, gint32, int24_le, GST_WRITE_UINT24_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (24, gint32, int24_be, GST_WRITE_UINT24_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, guint32, uint32_le, GST_WRITE_UINT32_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, guint32, uint32_be, GST_WRITE_UINT32_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, gint32, int32_le, GST_WRITE_UINT32_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, gint32, int32_be, GST_WRITE_UINT32_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, guint64, uint64_le, GST_WRITE_UINT64_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, guint64, uint64_be, GST_WRITE_UINT64_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, gint64, int64_le, GST_WRITE_UINT64_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, gint64, int64_be, GST_WRITE_UINT64_BE)
-
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, gfloat, float32_be, GST_WRITE_FLOAT_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, gfloat, float32_le, GST_WRITE_FLOAT_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, gdouble, float64_be, GST_WRITE_DOUBLE_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, gdouble, float64_le, GST_WRITE_DOUBLE_LE)
-
-#undef __GST_BYTE_WRITER_CREATE_WRITE_FUNC
-
-static inline void
-gst_byte_writer_put_data_unchecked (GstByteWriter * writer, const guint8 * data,
-    guint size)
-{
-  memcpy ((guint8 *) & writer->parent.data[writer->parent.byte], data, size);
-  writer->parent.byte += size;
-  writer->parent.size = MAX (writer->parent.size, writer->parent.byte);
-}
-
-static inline gboolean
-_gst_byte_writer_put_data_inline (GstByteWriter * writer, const guint8 * data,
-    guint size)
-{
-  g_return_val_if_fail (writer != NULL, FALSE);
-
-  if (G_UNLIKELY (!_gst_byte_writer_ensure_free_space_inline (writer, size)))
-    return FALSE;
-
-  gst_byte_writer_put_data_unchecked (writer, data, size);
-
-  return TRUE;
-}
-
-static inline void
-gst_byte_writer_fill_unchecked (GstByteWriter * writer, guint8 value, guint size)
-{
-  memset ((guint8 *) & writer->parent.data[writer->parent.byte], value, size);
-  writer->parent.byte += size;
-  writer->parent.size = MAX (writer->parent.size, writer->parent.byte);
-}
-
-static inline gboolean
-_gst_byte_writer_fill_inline (GstByteWriter * writer, guint8 value, guint size)
-{
-  g_return_val_if_fail (writer != NULL, FALSE);
-
-  if (G_UNLIKELY (!_gst_byte_writer_ensure_free_space_inline (writer, size)))
-    return FALSE;
-
-  gst_byte_writer_fill_unchecked (writer, value, size);
-
-  return TRUE;
-}
-
-static inline void
-gst_byte_writer_put_buffer_unchecked (GstByteWriter * writer, GstBuffer * buffer,
-    gsize offset, gssize size)
-{
-  if (size == -1) {
-    size = gst_buffer_get_size (buffer);
-
-    if (offset >= (gsize) size)
-      return;
-
-    size -= offset;
-  }
-
-  gst_buffer_extract (buffer, offset,
-      (guint8 *) & writer->parent.data[writer->parent.byte], size);
-  writer->parent.byte += size;
-  writer->parent.size = MAX (writer->parent.size, writer->parent.byte);
-}
-
-static inline gboolean
-_gst_byte_writer_put_buffer_inline (GstByteWriter * writer, GstBuffer * buffer,
-    gsize offset, gssize size)
-{
-  g_return_val_if_fail (writer != NULL, FALSE);
-  g_return_val_if_fail (size >= -1, FALSE);
-
-  if (size == -1) {
-    size = gst_buffer_get_size (buffer);
-
-    if (offset >= (gsize) size)
-      return TRUE;
-
-    size -= offset;
-  }
-
-  if (G_UNLIKELY (!_gst_byte_writer_ensure_free_space_inline (writer, size)))
-    return FALSE;
-
-  gst_byte_writer_put_buffer_unchecked (writer, buffer, offset, size);
-
-  return TRUE;
-}
-
-#ifndef GST_BYTE_WRITER_DISABLE_INLINES
-
-/* we use defines here so we can add the G_LIKELY() */
-
-#define gst_byte_writer_ensure_free_space(writer, size) \
-    G_LIKELY (_gst_byte_writer_ensure_free_space_inline (writer, size))
-#define gst_byte_writer_put_uint8(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint8_inline (writer, val))
-#define gst_byte_writer_put_int8(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int8_inline (writer, val))
-#define gst_byte_writer_put_uint16_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint16_be_inline (writer, val))
-#define gst_byte_writer_put_uint16_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint16_le_inline (writer, val))
-#define gst_byte_writer_put_int16_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int16_be_inline (writer, val))
-#define gst_byte_writer_put_int16_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int16_le_inline (writer, val))
-#define gst_byte_writer_put_uint24_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint24_be_inline (writer, val))
-#define gst_byte_writer_put_uint24_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint24_le_inline (writer, val))
-#define gst_byte_writer_put_int24_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int24_be_inline (writer, val))
-#define gst_byte_writer_put_int24_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int24_le_inline (writer, val))
-#define gst_byte_writer_put_uint32_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint32_be_inline (writer, val))
-#define gst_byte_writer_put_uint32_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint32_le_inline (writer, val))
-#define gst_byte_writer_put_int32_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int32_be_inline (writer, val))
-#define gst_byte_writer_put_int32_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int32_le_inline (writer, val))
-#define gst_byte_writer_put_uint64_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint64_be_inline (writer, val))
-#define gst_byte_writer_put_uint64_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint64_le_inline (writer, val))
-#define gst_byte_writer_put_int64_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int64_be_inline (writer, val))
-#define gst_byte_writer_put_int64_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int64_le_inline (writer, val))
-
-#define gst_byte_writer_put_float32_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_float32_be_inline (writer, val))
-#define gst_byte_writer_put_float32_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_float32_le_inline (writer, val))
-#define gst_byte_writer_put_float64_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_float64_be_inline (writer, val))
-#define gst_byte_writer_put_float64_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_float64_le_inline (writer, val))
-
-#define gst_byte_writer_put_data(writer, data, size) \
-    G_LIKELY (_gst_byte_writer_put_data_inline (writer, data, size))
-#define gst_byte_writer_fill(writer, val, size) \
-    G_LIKELY (_gst_byte_writer_fill_inline (writer, val, size))
-#define gst_byte_writer_put_buffer(writer, buffer, offset, size) \
-    G_LIKELY (_gst_byte_writer_put_buffer_inline (writer, buffer, offset, size))
-
-#endif
-
-G_END_DECLS
-
-#endif /* __GST_BYTE_WRITER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstcollectpads.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstcollectpads.h
deleted file mode 100644
index c33ca4f5..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstcollectpads.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Wim Taymans <wim@fluendo.com>
- * Copyright (C) 2008 Mark Nauwelaerts <mnauw@users.sourceforge.net>
- *
- * gstcollectpads.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_COLLECT_PADS_H__
-#define __GST_COLLECT_PADS_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_COLLECT_PADS            (gst_collect_pads_get_type())
-#define GST_COLLECT_PADS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_COLLECT_PADS,GstCollectPads))
-#define GST_COLLECT_PADS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COLLECT_PADS,GstCollectPadsClass))
-#define GST_COLLECT_PADS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_COLLECT_PADS,GstCollectPadsClass))
-#define GST_IS_COLLECT_PADS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COLLECT_PADS))
-#define GST_IS_COLLECT_PADS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COLLECT_PADS))
-
-typedef struct _GstCollectData GstCollectData;
-typedef struct _GstCollectDataPrivate GstCollectDataPrivate;
-typedef struct _GstCollectPads GstCollectPads;
-typedef struct _GstCollectPadsPrivate GstCollectPadsPrivate;
-typedef struct _GstCollectPadsClass GstCollectPadsClass;
-
-/**
- * GstCollectDataDestroyNotify:
- * @data: the #GstCollectData that will be freed
- *
- * A function that will be called when the #GstCollectData will be freed.
- * It is passed the pointer to the structure and should free any custom
- * memory and resources allocated for it.
- */
-typedef void (*GstCollectDataDestroyNotify) (GstCollectData *data);
-
-/**
- * GstCollectPadsStateFlags:
- * @GST_COLLECT_PADS_STATE_EOS:         Set if collectdata's pad is EOS.
- * @GST_COLLECT_PADS_STATE_FLUSHING:    Set if collectdata's pad is flushing.
- * @GST_COLLECT_PADS_STATE_NEW_SEGMENT: Set if collectdata's pad received a
- *                                      new_segment event.
- * @GST_COLLECT_PADS_STATE_WAITING:     Set if collectdata's pad must be waited
- *                                      for when collecting.
- * @GST_COLLECT_PADS_STATE_LOCKED:      Set collectdata's pad WAITING state must
- *                                      not be changed.
- * #GstCollectPadsStateFlags indicate private state of a collectdata('s pad).
- */
-typedef enum {
-  GST_COLLECT_PADS_STATE_EOS = 1 << 0,
-  GST_COLLECT_PADS_STATE_FLUSHING = 1 << 1,
-  GST_COLLECT_PADS_STATE_NEW_SEGMENT = 1 << 2,
-  GST_COLLECT_PADS_STATE_WAITING = 1 << 3,
-  GST_COLLECT_PADS_STATE_LOCKED = 1 << 4
-} GstCollectPadsStateFlags;
-
-/**
- * GST_COLLECT_PADS_STATE:
- * @data: a #GstCollectData.
- *
- * A flags word containing #GstCollectPadsStateFlags flags set
- * on this collected pad.
- */
-#define GST_COLLECT_PADS_STATE(data)                 (((GstCollectData *) data)->state)
-/**
- * GST_COLLECT_PADS_STATE_IS_SET:
- * @data: a #GstCollectData.
- * @flag: the #GstCollectPadsStateFlags to check.
- *
- * Gives the status of a specific flag on a collected pad.
- */
-#define GST_COLLECT_PADS_STATE_IS_SET(data,flag)     !!(GST_COLLECT_PADS_STATE (data) & flag)
-/**
- * GST_COLLECT_PADS_STATE_SET:
- * @data: a #GstCollectData.
- * @flag: the #GstCollectPadsStateFlags to set.
- *
- * Sets a state flag on a collected pad.
- */
-#define GST_COLLECT_PADS_STATE_SET(data,flag)        (GST_COLLECT_PADS_STATE (data) |= flag)
-/**
- * GST_COLLECT_PADS_STATE_UNSET:
- * @data: a #GstCollectData.
- * @flag: the #GstCollectPadsStateFlags to clear.
- *
- * Clears a state flag on a collected pad.
- */
-#define GST_COLLECT_PADS_STATE_UNSET(data,flag)      (GST_COLLECT_PADS_STATE (data) &= ~(flag))
-
-/**
- * GstCollectData:
- * @collect: owner #GstCollectPads
- * @pad: #GstPad managed by this data
- * @buffer: currently queued buffer.
- * @pos: position in the buffer
- * @segment: last segment received.
- *
- * Structure used by the collect_pads.
- */
-struct _GstCollectData
-{
-  /* with STREAM_LOCK of @collect */
-  GstCollectPads        *collect;
-  GstPad                *pad;
-  GstBuffer             *buffer;
-  guint                  pos;
-  GstSegment             segment;
-
-  /*< private >*/
-  /* state: bitfield for easier extension;
-   * eos, flushing, new_segment, waiting */
-  GstCollectPadsStateFlags    state;
-
-  GstCollectDataPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstCollectPadsFunction:
- * @pads: the #GstCollectPads that trigered the callback
- * @user_data: user data passed to gst_collect_pads_set_function()
- *
- * A function that will be called when all pads have received data.
- *
- * Returns: #GST_FLOW_OK for success
- */
-typedef GstFlowReturn (*GstCollectPadsFunction) (GstCollectPads *pads, gpointer user_data);
-
-/**
- * GstCollectPadsBufferFunction:
- * @pads: the #GstCollectPads that trigered the callback
- * @data: the #GstCollectData of pad that has received the buffer
- * @buffer: (transfer full): the #GstBuffer
- * @user_data: user data passed to gst_collect_pads_set_buffer_function()
- *
- * A function that will be called when a (considered oldest) buffer can be muxed.
- * If all pads have reached EOS, this function is called with NULL @buffer
- * and NULL @data.
- *
- * Returns: #GST_FLOW_OK for success
- */
-typedef GstFlowReturn (*GstCollectPadsBufferFunction) (GstCollectPads *pads, GstCollectData *data,
-                                                       GstBuffer *buffer, gpointer user_data);
-
-/**
- * GstCollectPadsCompareFunction:
- * @pads: the #GstCollectPads that is comparing the timestamps
- * @data1: the first #GstCollectData
- * @timestamp1: the first timestamp
- * @data2: the second #GstCollectData
- * @timestamp2: the second timestamp
- * @user_data: user data passed to gst_collect_pads_set_compare_function()
- *
- * A function for comparing two timestamps of buffers or newsegments collected on one pad.
- *
- * Returns: Integer less than zero when first timestamp is deemed older than the second one.
- *          Zero if the timestamps are deemed equally old.
- *          Integer greate than zero when second timestamp is deemed older than the first one.
- */
-typedef gint (*GstCollectPadsCompareFunction) (GstCollectPads *pads,
-                                               GstCollectData * data1, GstClockTime timestamp1,
-                                               GstCollectData * data2, GstClockTime timestamp2,
-                                               gpointer user_data);
-
-/**
- * GstCollectPadsEventFunction:
- * @pads: the #GstCollectPads that trigered the callback
- * @pad: the #GstPad that received an event
- * @event: the #GstEvent received
- * @user_data: user data passed to gst_collect_pads_set_event_function()
- *
- * A function that will be called while processing an event. It takes
- * ownership of the event and is responsible for chaining up (to
- * gst_collect_pads_event_default()) or dropping events (such typical cases
- * being handled by the default handler).
- *
- * Returns: %TRUE if the pad could handle the event
- */
-typedef gboolean (*GstCollectPadsEventFunction)        (GstCollectPads *pads, GstCollectData * pad,
-                                                        GstEvent * event, gpointer user_data);
-
-
-/**
- * GstCollectPadsQueryFunction:
- * @pads: the #GstCollectPads that trigered the callback
- * @pad: the #GstPad that received an event
- * @query: the #GstEvent received
- * @user_data: user data passed to gst_collect_pads_set_query_function()
- *
- * A function that will be called while processing a query. It takes
- * ownership of the query and is responsible for chaining up (to
- * events downstream (with gst_pad_event_default()).
- *
- * Returns: %TRUE if the pad could handle the event
- */
-typedef gboolean (*GstCollectPadsQueryFunction)        (GstCollectPads *pads, GstCollectData * pad,
-                                                        GstQuery * query, gpointer user_data);
-
-/**
- * GstCollectPadsClipFunction:
- * @pads: a #GstCollectPads
- * @data: a #GstCollectData
- * @inbuffer: (transfer full): the input #GstBuffer
- * @outbuffer: the output #GstBuffer
- * @user_data: user data
- *
- * A function that will be called when @inbuffer is received on the pad managed
- * by @data in the collecpad object @pads.
- *
- * The function should use the segment of @data and the negotiated media type on
- * the pad to perform clipping of @inbuffer.
- *
- * This function takes ownership of @inbuffer and should output a buffer in
- * @outbuffer or return %NULL in @outbuffer if the buffer should be dropped.
- *
- * Returns: a #GstFlowReturn that corresponds to the result of clipping.
- */
-typedef GstFlowReturn (*GstCollectPadsClipFunction) (GstCollectPads *pads, GstCollectData *data,
-                                                     GstBuffer *inbuffer, GstBuffer **outbuffer,
-                                                     gpointer user_data);
-
-/**
- * GST_COLLECT_PADS_GET_STREAM_LOCK:
- * @pads: a #GstCollectPads
- *
- * Get the stream lock of @pads. The stream lock is used to coordinate and
- * serialize execution among the various streams being collected, and in
- * protecting the resources used to accomplish this.
- */
-#define GST_COLLECT_PADS_GET_STREAM_LOCK(pads) (&((GstCollectPads *)pads)->stream_lock)
-/**
- * GST_COLLECT_PADS_STREAM_LOCK:
- * @pads: a #GstCollectPads
- *
- * Lock the stream lock of @pads.
- */
-#define GST_COLLECT_PADS_STREAM_LOCK(pads)     g_rec_mutex_lock(GST_COLLECT_PADS_GET_STREAM_LOCK (pads))
-/**
- * GST_COLLECT_PADS_STREAM_UNLOCK:
- * @pads: a #GstCollectPads
- *
- * Unlock the stream lock of @pads.
- */
-#define GST_COLLECT_PADS_STREAM_UNLOCK(pads)   g_rec_mutex_unlock(GST_COLLECT_PADS_GET_STREAM_LOCK (pads))
-
-/**
- * GstCollectPads:
- * @data: #GList of #GstCollectData managed by this #GstCollectPads.
- *
- * Collectpads object.
- */
-struct _GstCollectPads {
-  GstObject      object;
-
-  /*< public >*/ /* with LOCK and/or STREAM_LOCK */
-  GSList        *data;                  /* list of CollectData items */
-
-  /*< private >*/
-  GRecMutex      stream_lock;          /* used to serialize collection among several streams */
-
-  GstCollectPadsPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstCollectPadsClass {
-  GstObjectClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_collect_pads_get_type(void);
-
-/* creating the object */
-GstCollectPads*        gst_collect_pads_new           (void);
-
-/* set the callbacks */
-void            gst_collect_pads_set_function         (GstCollectPads *pads,
-                                                       GstCollectPadsFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_buffer_function  (GstCollectPads *pads,
-                                                       GstCollectPadsBufferFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_event_function   (GstCollectPads *pads,
-                                                       GstCollectPadsEventFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_query_function   (GstCollectPads *pads,
-                                                       GstCollectPadsQueryFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_compare_function (GstCollectPads *pads,
-                                                       GstCollectPadsCompareFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_clip_function    (GstCollectPads *pads,
-                                                       GstCollectPadsClipFunction clipfunc,
-                                                       gpointer user_data);
-
-/* pad management */
-GstCollectData* gst_collect_pads_add_pad       (GstCollectPads *pads, GstPad *pad, guint size,
-                                                GstCollectDataDestroyNotify destroy_notify,
-                                                gboolean lock);
-gboolean        gst_collect_pads_remove_pad    (GstCollectPads *pads, GstPad *pad);
-
-/* start/stop collection */
-void            gst_collect_pads_start         (GstCollectPads *pads);
-void            gst_collect_pads_stop          (GstCollectPads *pads);
-void            gst_collect_pads_set_flushing  (GstCollectPads *pads, gboolean flushing);
-
-/* get collected buffers */
-GstBuffer*      gst_collect_pads_peek          (GstCollectPads *pads, GstCollectData *data);
-GstBuffer*      gst_collect_pads_pop           (GstCollectPads *pads, GstCollectData *data);
-
-/* get collected bytes */
-guint           gst_collect_pads_available     (GstCollectPads *pads);
-guint           gst_collect_pads_flush         (GstCollectPads *pads, GstCollectData *data,
-                                                guint size);
-GstBuffer*      gst_collect_pads_read_buffer   (GstCollectPads * pads, GstCollectData * data,
-                                                guint size);
-GstBuffer*      gst_collect_pads_take_buffer   (GstCollectPads * pads, GstCollectData * data,
-                                                guint size);
-
-/* setting and unsetting waiting mode */
-void            gst_collect_pads_set_waiting   (GstCollectPads *pads, GstCollectData *data,
-                                                gboolean waiting);
-
-/* convenience helper */
-GstFlowReturn	gst_collect_pads_clip_running_time (GstCollectPads * pads,
-					            GstCollectData * cdata,
-                                                    GstBuffer * buf, GstBuffer ** outbuf,
-                                                    gpointer user_data);
-
-/* default handlers */
-gboolean        gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data,
-                                                GstEvent * event, gboolean discard);
-gboolean        gst_collect_pads_query_default (GstCollectPads * pads, GstCollectData * data,
-                                                GstQuery * query, gboolean discard);
-
-
-G_END_DECLS
-
-#endif /* __GST_COLLECT_PADS_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstpushsrc.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstpushsrc.h
deleted file mode 100644
index b936d83f..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gstpushsrc.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstpushsrc.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PUSH_SRC_H__
-#define __GST_PUSH_SRC_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasesrc.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PUSH_SRC               (gst_push_src_get_type())
-#define GST_PUSH_SRC(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PUSH_SRC,GstPushSrc))
-#define GST_PUSH_SRC_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PUSH_SRC,GstPushSrcClass))
-#define GST_PUSH_SRC_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PUSH_SRC, GstPushSrcClass))
-#define GST_IS_PUSH_SRC(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PUSH_SRC))
-#define GST_IS_PUSH_SRC_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PUSH_SRC))
-
-typedef struct _GstPushSrc GstPushSrc;
-typedef struct _GstPushSrcClass GstPushSrcClass;
-
-/**
- * GstPushSrc:
- *
- * The opaque #GstPushSrc data structure.
- */
-struct _GstPushSrc {
-  GstBaseSrc     parent;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstPushSrcClass {
-  GstBaseSrcClass parent_class;
-
-  /* ask the subclass to create a buffer, the default implementation
-   * uses alloc and fill */
-  GstFlowReturn (*create) (GstPushSrc *src, GstBuffer **buf);
-  /* allocate memory for a buffer */
-  GstFlowReturn (*alloc)  (GstPushSrc *src, GstBuffer **buf);
-  /* ask the subclass to fill a buffer */
-  GstFlowReturn (*fill)   (GstPushSrc *src, GstBuffer *buf);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_push_src_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_PUSH_SRC_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gsttypefindhelper.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gsttypefindhelper.h
deleted file mode 100644
index a61c0428..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/base/gsttypefindhelper.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) 2000,2005 Wim Taymans <wim@fluendo.com>
- * Copyright (C) 2006      Tim-Philipp Müller <tim centricular net>
- *
- * gsttypefindhelper.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TYPEFINDHELPER_H__
-#define __GST_TYPEFINDHELPER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-GstCaps * gst_type_find_helper (GstPad *src, guint64 size);
-
-GstCaps * gst_type_find_helper_for_data   (GstObject              *obj,
-                                           const guint8           *data,
-                                           gsize                   size,
-                                           GstTypeFindProbability *prob);
-GstCaps * gst_type_find_helper_for_buffer (GstObject              *obj,
-                                           GstBuffer              *buf,
-                                           GstTypeFindProbability *prob);
-
-GstCaps * gst_type_find_helper_for_extension (GstObject * obj,
-                                              const gchar * extension);
-
-/**
- * GstTypeFindHelperGetRangeFunction:
- * @obj: a #GstObject that will handle the getrange request
- * @parent: the parent of @obj or NULL
- * @offset: the offset of the range
- * @length: the length of the range
- * @buffer: a memory location to hold the result buffer
- *
- * This function will be called by gst_type_find_helper_get_range() when
- * typefinding functions request to peek at the data of a stream at certain
- * offsets. If this function returns GST_FLOW_OK, the result buffer will be
- * stored in @buffer. The  contents of @buffer is invalid for any other
- * return value.
- *
- * This function is supposed to behave exactly like a #GstPadGetRangeFunction.
- *
- * Returns: GST_FLOW_OK for success
- */
-typedef GstFlowReturn (*GstTypeFindHelperGetRangeFunction) (GstObject  *obj,
-                                                            GstObject  *parent,
-                                                            guint64     offset,
-                                                            guint       length,
-                                                            GstBuffer **buffer);
-
-GstCaps * gst_type_find_helper_get_range (GstObject                         *obj,
-                                          GstObject                         *parent,
-                                          GstTypeFindHelperGetRangeFunction  func,
-                                          guint64                            size,
-                                          const gchar                       *extension,
-                                          GstTypeFindProbability            *prob);
-
-G_END_DECLS
-
-#endif /* __GST_TYPEFINDHELPER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstbasecamerasrc.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstbasecamerasrc.h
deleted file mode 100644
index d4979f56..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstbasecamerasrc.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2010 Texas Instruments, Inc
- * Copyright (C) 2011 Thiago Santos <thiago.sousa.santos@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_BASE_CAMERA_SRC_H__
-#define __GST_BASE_CAMERA_SRC_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstBaseCameraSrc is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-#include <gst/gstbin.h>
-#include "gstcamerabin-enum.h"
-#include "gstcamerabinpreview.h"
-
-G_BEGIN_DECLS
-#define GST_TYPE_BASE_CAMERA_SRC \
-  (gst_base_camera_src_get_type())
-#define GST_BASE_CAMERA_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_CAMERA_SRC,GstBaseCameraSrc))
-#define GST_BASE_CAMERA_SRC_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_CAMERA_SRC, GstBaseCameraSrcClass))
-#define GST_BASE_CAMERA_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_CAMERA_SRC,GstBaseCameraSrcClass))
-#define GST_IS_BASE_CAMERA_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_CAMERA_SRC))
-#define GST_IS_BASE_CAMERA_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_CAMERA_SRC))
-#define GST_BASE_CAMERA_SRC_CAST(obj) \
-  ((GstBaseCameraSrc *) (obj))
-GType gst_base_camera_src_get_type (void);
-
-typedef struct _GstBaseCameraSrc GstBaseCameraSrc;
-typedef struct _GstBaseCameraSrcClass GstBaseCameraSrcClass;
-
-#define GST_BASE_CAMERA_SRC_VIEWFINDER_PAD_NAME "vfsrc"
-#define GST_BASE_CAMERA_SRC_IMAGE_PAD_NAME "imgsrc"
-#define GST_BASE_CAMERA_SRC_VIDEO_PAD_NAME "vidsrc"
-
-#define GST_BASE_CAMERA_SRC_PREVIEW_MESSAGE_NAME "preview-image"
-
-/**
- * GstBaseCameraSrc:
- */
-struct _GstBaseCameraSrc
-{
-  GstBin parent;
-
-  GstCameraBinMode mode;
-
-  gboolean capturing;
-  GMutex capturing_mutex;
-
-  /* Preview convert pipeline */
-  GstCaps *preview_caps;
-  gboolean post_preview;
-  GstElement *preview_filter;
-  GstCameraBinPreviewPipelineData *preview_pipeline;
-
-  /* Resolution of the buffers configured to camerabin */
-  gint width;
-  gint height;
-
-  gfloat zoom;
-  gfloat max_zoom;
-
-  gpointer _gst_reserved[GST_PADDING_LARGE];
-};
-
-
-/**
- * GstBaseCameraSrcClass:
- * @construct_pipeline: construct pipeline
- * @setup_pipeline: configure pipeline for the chosen settings
- * @set_zoom: set the zoom
- * @set_mode: set the mode
- */
-struct _GstBaseCameraSrcClass
-{
-  GstBinClass parent;
-
-  /* Construct pipeline. (called in GST_STATE_CHANGE_NULL_TO_READY) Optional. */
-  gboolean    (*construct_pipeline)  (GstBaseCameraSrc *self);
-
-  /* (called in GST_STATE_CHANGE_READY_TO_PAUSED). Optional. */
-  gboolean    (*setup_pipeline)      (GstBaseCameraSrc *self);
-
-  /* Set the zoom. If set, called when changing 'zoom' property. Optional. */
-  void        (*set_zoom)            (GstBaseCameraSrc *self, gfloat zoom);
-
-  /* Set the mode. If set, called when changing 'mode' property. Optional. */
-  gboolean    (*set_mode)            (GstBaseCameraSrc *self,
-                                      GstCameraBinMode mode);
-
-  /* Set preview caps. If set, called called when setting new 'preview-caps'. Optional. */
-  gboolean    (*set_preview)         (GstBaseCameraSrc *self,
-                                      GstCaps *preview_caps);
-
-  /* Called by the handler for 'start-capture'. Mandatory. */
-  gboolean (*start_capture) (GstBaseCameraSrc * src);
-
-  /* Called by the handler for 'stop-capture'. Mandatory. */
-  void (*stop_capture) (GstBaseCameraSrc * src);
-
-  gpointer _gst_reserved[GST_PADDING_LARGE];
-};
-
-
-#define MIN_ZOOM 1.0f
-#define MAX_ZOOM 10.0f
-#define ZOOM_1X MIN_ZOOM
-
-gboolean gst_base_camera_src_set_mode (GstBaseCameraSrc *self, GstCameraBinMode mode);
-void gst_base_camera_src_setup_zoom (GstBaseCameraSrc * self);
-void gst_base_camera_src_setup_preview (GstBaseCameraSrc * self, GstCaps * preview_caps);
-void gst_base_camera_src_finish_capture (GstBaseCameraSrc *self);
-
-
-void gst_base_camera_src_post_preview (GstBaseCameraSrc *self, GstSample * sample);
-// XXX add methods to get/set img capture and vid capture caps..
-
-#endif /* __GST_BASE_CAMERA_SRC_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabin-enum.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabin-enum.h
deleted file mode 100644
index c6dbf043..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabin-enum.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2009 Nokia Corporation <multimedia@maemo.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CAMERABIN_ENUM_H__
-#define __GST_CAMERABIN_ENUM_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "camerabin enums are unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define DEFAULT_WIDTH 640
-#define DEFAULT_HEIGHT 480
-#define DEFAULT_CAPTURE_WIDTH 800
-#define DEFAULT_CAPTURE_HEIGHT 600
-#define DEFAULT_FPS_N 0         /* makes it use the default */
-#define DEFAULT_FPS_D 1
-#define DEFAULT_ZOOM MIN_ZOOM
-
-
-/**
- * GstCameraBinMode:
- * @MODE_IMAGE: image capture
- * @MODE_VIDEO: video capture
- *
- * Capture mode to use.
- */
-typedef enum
-{
-  /* MODE_PREVIEW = 0, No use for this */
-  MODE_IMAGE = 1,
-  MODE_VIDEO = 2,
-} GstCameraBinMode;
-
-
-#define GST_TYPE_CAMERABIN_MODE (gst_camerabin_mode_get_type ())
-GType gst_camerabin_mode_get_type (void);
-
-G_END_DECLS
-
-#endif                          /* #ifndef __GST_CAMERABIN_ENUM_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabinpreview.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabinpreview.h
deleted file mode 100644
index 6627cf66..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabinpreview.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2008 Nokia Corporation <multimedia@maemo.org>
- * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CAMERABIN_PREVIEW_H_
-#define __CAMERABIN_PREVIEW_H_
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "camera bin preview is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-typedef struct
-{
-  GstElement *pipeline;
-
-  GstElement *appsrc;
-  GstElement *filter;
-  GstElement *appsink;
-  GstElement *vscale;
-
-  GstElement *element;
-
-  GstCaps *pending_preview_caps;
-  guint processing;
-  GMutex processing_lock;
-  GCond processing_cond;
-
-} GstCameraBinPreviewPipelineData;
-
-GstCameraBinPreviewPipelineData *gst_camerabin_create_preview_pipeline (GstElement * element, GstElement * filter);
-void gst_camerabin_destroy_preview_pipeline (GstCameraBinPreviewPipelineData * preview);
-gboolean gst_camerabin_preview_pipeline_post (GstCameraBinPreviewPipelineData * preview, GstSample * sample);
-void gst_camerabin_preview_set_caps (GstCameraBinPreviewPipelineData * preview, GstCaps * caps);
-gboolean gst_camerabin_preview_set_filter (GstCameraBinPreviewPipelineData * preview, GstElement * filter);
-
-#endif /* #ifndef __CAMERABIN_PREVIEW_H_ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gsth264parser.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gsth264parser.h
deleted file mode 100644
index 6698922e..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gsth264parser.h
+++ /dev/null
@@ -1,723 +0,0 @@
-/* Gstreamer
- * Copyright (C) <2011> Intel Corporation
- * Copyright (C) <2011> Collabora Ltd.
- * Copyright (C) <2011> Thibault Saunier <thibault.saunier@collabora.com>
- *
- * Some bits C-c,C-v'ed and s/4/3 from h264parse and videoparsers/h264parse.c:
- *    Copyright (C) <2010> Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
- *    Copyright (C) <2010> Collabora Multimedia
- *    Copyright (C) <2010> Nokia Corporation
- *
- *    (C) 2005 Michal Benes <michal.benes@itonis.tv>
- *    (C) 2008 Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_H264_PARSER_H__
-#define __GST_H264_PARSER_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The H.264 parsing library is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_H264_MAX_SPS_COUNT   32
-#define GST_H264_MAX_PPS_COUNT   256
-
-#define GST_H264_IS_P_SLICE(slice)  (((slice)->type % 5) == GST_H264_P_SLICE)
-#define GST_H264_IS_B_SLICE(slice)  (((slice)->type % 5) == GST_H264_B_SLICE)
-#define GST_H264_IS_I_SLICE(slice)  (((slice)->type % 5) == GST_H264_I_SLICE)
-#define GST_H264_IS_SP_SLICE(slice) (((slice)->type % 5) == GST_H264_SP_SLICE)
-#define GST_H264_IS_SI_SLICE(slice) (((slice)->type % 5) == GST_H264_SI_SLICE)
-
-/**
- * GstH264NalUnitType:
- * @GST_H264_NAL_UNKNOWN: Unknown nal type
- * @GST_H264_NAL_SLICE: Slice nal
- * @GST_H264_NAL_SLICE_DPA: DPA slice nal
- * @GST_H264_NAL_SLICE_DPB: DPB slice nal
- * @GST_H264_NAL_SLICE_DPC: DPC slice nal
- * @GST_H264_NAL_SLICE_IDR: DPR slice nal
- * @GST_H264_NAL_SEI: Supplemental enhancement information (SEI) nal unit
- * @GST_H264_NAL_SPS: Sequence parameter set (SPS) nal unit
- * @GST_H264_NAL_PPS: Picture parameter set (PPS) nal unit
- * @GST_H264_NAL_AU_DELIMITER: Access unit (AU) delimiter nal unit
- * @GST_H264_NAL_SEQ_END: End of sequence nal unit
- * @GST_H264_NAL_STREAM_END: End of stream nal unit
- * @GST_H264_NAL_FILLER_DATA: Filler data nal lunit
- *
- * Indicates the type of H264 Nal Units
- */
-typedef enum
-{
-  GST_H264_NAL_UNKNOWN      = 0,
-  GST_H264_NAL_SLICE        = 1,
-  GST_H264_NAL_SLICE_DPA    = 2,
-  GST_H264_NAL_SLICE_DPB    = 3,
-  GST_H264_NAL_SLICE_DPC    = 4,
-  GST_H264_NAL_SLICE_IDR    = 5,
-  GST_H264_NAL_SEI          = 6,
-  GST_H264_NAL_SPS          = 7,
-  GST_H264_NAL_PPS          = 8,
-  GST_H264_NAL_AU_DELIMITER = 9,
-  GST_H264_NAL_SEQ_END      = 10,
-  GST_H264_NAL_STREAM_END   = 11,
-  GST_H264_NAL_FILLER_DATA  = 12
-} GstH264NalUnitType;
-
-/**
- * GstH264ParserResult:
- * @GST_H264_PARSER_OK: The parsing succeded
- * @GST_H264_PARSER_BROKEN_DATA: The data to parse is broken
- * @GST_H264_PARSER_BROKEN_LINK: The link to structure needed for the parsing couldn't be found
- * @GST_H264_PARSER_ERROR: An error accured when parsing
- * @GST_H264_PARSER_NO_NAL: No nal found during the parsing
- * @GST_H264_PARSER_NO_NAL_END: Start of the nal found, but not the end.
- *
- * The result of parsing H264 data.
- */
-typedef enum
-{
-  GST_H264_PARSER_OK,
-  GST_H264_PARSER_BROKEN_DATA,
-  GST_H264_PARSER_BROKEN_LINK,
-  GST_H264_PARSER_ERROR,
-  GST_H264_PARSER_NO_NAL,
-  GST_H264_PARSER_NO_NAL_END
-} GstH264ParserResult;
-
-/**
- * GstH264SEIPayloadType:
- * @GST_H264_SEI_BUF_PERIOD: Buffering Period SEI Message
- * @GST_H264_SEI_PIC_TIMING: Picture Timing SEI Message
- * ...
- *
- * The type of SEI message.
- */
-typedef enum
-{
-  GST_H264_SEI_BUF_PERIOD = 0,
-  GST_H264_SEI_PIC_TIMING = 1
-      /* and more...  */
-} GstH264SEIPayloadType;
-
-/**
- * GstH264SEIPicStructType:
- * @GST_H264_SEI_PIC_STRUCT_FRAME: Picture is a frame
- * @GST_H264_SEI_PIC_STRUCT_TOP_FIELD: Top field of frame
- * @GST_H264_SEI_PIC_STRUCT_BOTTOM_FIELD: Botom field of frame
- * @GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM: Top bottom field of frame
- * @GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP: bottom top field of frame
- * @GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: top bottom top field of frame
- * @GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: bottom top bottom field of frame
- * @GST_H264_SEI_PIC_STRUCT_FRAME_DOUBLING: indicates that the frame should
- *  be displayed two times consecutively
- * @GST_H264_SEI_PIC_STRUCT_FRAME_TRIPLING: indicates that the frame should be
- *  displayed three times consecutively
- *
- * SEI pic_struct type
- */
-typedef enum
-{
-  GST_H264_SEI_PIC_STRUCT_FRAME             = 0,
-  GST_H264_SEI_PIC_STRUCT_TOP_FIELD         = 1,
-  GST_H264_SEI_PIC_STRUCT_BOTTOM_FIELD      = 2,
-  GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM        = 3,
-  GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP        = 4,
-  GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP    = 5,
-  GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM = 6,
-  GST_H264_SEI_PIC_STRUCT_FRAME_DOUBLING    = 7,
-  GST_H264_SEI_PIC_STRUCT_FRAME_TRIPLING    = 8
-} GstH264SEIPicStructType;
-
-/**
- * GstH264SliceType:
- *
- * Type of Picture slice
- */
-
-typedef enum
-{
-  GST_H264_P_SLICE    = 0,
-  GST_H264_B_SLICE    = 1,
-  GST_H264_I_SLICE    = 2,
-  GST_H264_SP_SLICE   = 3,
-  GST_H264_SI_SLICE   = 4,
-  GST_H264_S_P_SLICE  = 5,
-  GST_H264_S_B_SLICE  = 6,
-  GST_H264_S_I_SLICE  = 7,
-  GST_H264_S_SP_SLICE = 8,
-  GST_H264_S_SI_SLICE = 9
-} GstH264SliceType;
-
-typedef struct _GstH264NalParser              GstH264NalParser;
-
-typedef struct _GstH264NalUnit                GstH264NalUnit;
-
-typedef struct _GstH264SPS                    GstH264SPS;
-typedef struct _GstH264PPS                    GstH264PPS;
-typedef struct _GstH264HRDParams              GstH264HRDParams;
-typedef struct _GstH264VUIParams              GstH264VUIParams;
-
-typedef struct _GstH264RefPicListModification GstH264RefPicListModification;
-typedef struct _GstH264DecRefPicMarking       GstH264DecRefPicMarking;
-typedef struct _GstH264RefPicMarking          GstH264RefPicMarking;
-typedef struct _GstH264PredWeightTable        GstH264PredWeightTable;
-typedef struct _GstH264SliceHdr               GstH264SliceHdr;
-
-typedef struct _GstH264ClockTimestamp         GstH264ClockTimestamp;
-typedef struct _GstH264PicTiming              GstH264PicTiming;
-typedef struct _GstH264BufferingPeriod        GstH264BufferingPeriod;
-typedef struct _GstH264SEIMessage             GstH264SEIMessage;
-
-/**
- * GstH264NalUnit:
- * @ref_idc: not equal to 0 specifies that the content of the NAL unit contains a sequence
- *  parameter set, a sequence * parameter set extension, a subset sequence parameter set, a
- *  picture parameter set, a slice of a reference picture, a slice data partition of a
- *  reference picture, or a prefix NAL unit preceding a slice of a reference picture.
- * @type: A #GstH264NalUnitType
- * @idr_pic_flag: calculated idr_pic_flag
- * @size: The size of the nal unit starting from @offset
- * @offset: The offset of the actual start of the nal unit
- * @sc_offset:The offset of the start code of the nal unit
- * @valid: If the nal unit is valid, which mean it has
- * already been parsed
- * @data: The data from which the Nalu has been parsed
- *
- * Structure defining the Nal unit headers
- */
-struct _GstH264NalUnit
-{
-  guint16 ref_idc;
-  guint16 type;
-
-  /* calculated values */
-  guint8 idr_pic_flag;
-  guint size;
-  guint offset;
-  guint sc_offset;
-  gboolean valid;
-
-  guint8 *data;
-};
-
-/**
- * GstH264HRDParams:
- * @cpb_cnt_minus1: plus 1 specifies the number of alternative
- *    CPB specifications in the bitstream
- * @bit_rate_scale: specifies the maximum input bit rate of the
- * SchedSelIdx-th CPB
- * @cpb_size_scale: specifies the CPB size of the SchedSelIdx-th CPB
- * @guint32 bit_rate_value_minus1: specifies the maximum input bit rate for the
- * SchedSelIdx-th CPB
- * @cpb_size_value_minus1: is used together with cpb_size_scale to specify the
- * SchedSelIdx-th CPB size
- * @cbr_flag: Specifies if running in itermediate bitrate mode or constant
- * @initial_cpb_removal_delay_length_minus1: specifies the length in bits of
- * the cpb_removal_delay syntax element
- * @cpb_removal_delay_length_minus1: specifies the length in bits of the
- * dpb_output_delay syntax element
- * @dpb_output_delay_length_minus1: >0 specifies the length in bits of the time_offset syntax element.
- * =0 specifies that the time_offset syntax element is not present
- * @time_offset_length: Length of the time offset
- *
- * Defines the HRD parameters
- */
-struct _GstH264HRDParams
-{
-  guint8 cpb_cnt_minus1;
-  guint8 bit_rate_scale;
-  guint8 cpb_size_scale;
-
-  guint32 bit_rate_value_minus1[32];
-  guint32 cpb_size_value_minus1[32];
-  guint8 cbr_flag[32];
-
-  guint8 initial_cpb_removal_delay_length_minus1;
-  guint8 cpb_removal_delay_length_minus1;
-  guint8 dpb_output_delay_length_minus1;
-  guint8 time_offset_length;
-};
-
-/**
- * GstH264VUIParams:
- * @aspect_ratio_info_present_flag: %TRUE specifies that aspect_ratio_idc is present.
- *  %FALSE specifies that aspect_ratio_idc is not present
- * @aspect_ratio_idc specifies the value of the sample aspect ratio of the luma samples
- * @sar_width indicates the horizontal size of the sample aspect ratio
- * @sar_height indicates the vertical size of the sample aspect ratio
- * @overscan_info_present_flag: %TRUE overscan_appropriate_flag is present %FALSE otherwize
- * @overscan_appropriate_flag: %TRUE indicates that the cropped decoded pictures
- *  output are suitable for display using overscan. %FALSE the cropped decoded pictures
- *  output contain visually important information
- * @video_signal_type_present_flag: %TRUE specifies that video_format, video_full_range_flag and
- *  colour_description_present_flag are present.
- * @video_format: indicates the representation of the picture
- * @video_full_range_flag: indicates the black level and range of the luma and chroma signals
- * @colour_description_present_flag: %TRUE specifies that colour_primaries,
- *  transfer_characteristics and matrix_coefficients are present
- * @colour_primaries: indicates the chromaticity coordinates of the source primaries
- * @transfer_characteristics: indicates the opto-electronic transfer characteristic
- * @matrix_coefficients: describes the matrix coefficients used in deriving luma and chroma signals
- * @chroma_loc_info_present_flag: %TRUE specifies that chroma_sample_loc_type_top_field and
- *  chroma_sample_loc_type_bottom_field are present, %FALSE otherwize
- * @chroma_sample_loc_type_top_field: specify the location of chroma for top field
- * @chroma_sample_loc_type_bottom_field specify the location of chroma for bottom field
- * @timing_info_present_flag: %TRUE specifies that num_units_in_tick,
- *  time_scale and fixed_frame_rate_flag are present in the bitstream
- * @num_units_in_tick: is the number of time units of a clock operating at the frequency time_scale Hz
- * time_scale: is the number of time units that pass in one second
- * @fixed_frame_rate_flag: %TRUE indicates that the temporal distance between the HRD output times
- *  of any two consecutive pictures in output order is constrained as specified in the spec, %FALSE
- *  otherwize.
- * @nal_hrd_parameters_present_flag: %TRUE if nal hrd parameters present in the bitstream
- * @vcl_hrd_parameters_present_flag: %TRUE if nal vlc hrd parameters present in the bitstream
- * @low_delay_hrd_flag: specifies the HRD operational mode
- * @pic_struct_present_flag: %TRUE specifies that picture timing SEI messages are present or not
- * @bitstream_restriction_flag: %TRUE specifies that the following coded video sequence bitstream restriction
- * parameters are present
- * @motion_vectors_over_pic_boundaries_flag: %FALSE indicates that no sample outside the
- *  picture boundaries and no sample at a fractional sample position, %TRUE indicates that one or more
- *  samples outside picture boundaries may be used in inter prediction
- * @max_bytes_per_pic_denom: indicates a number of bytes not exceeded by the sum of the sizes of
- *  the VCL NAL units associated with any coded picture in the coded video sequence.
- * @max_bits_per_mb_denom: indicates the maximum number of coded bits of macroblock_layer
- * @log2_max_mv_length_horizontal: indicate the maximum absolute value of a decoded horizontal
- * motion vector component
- * @log2_max_mv_length_vertical: indicate the maximum absolute value of a decoded vertical
- *  motion vector component
- * @num_reorder_frames: indicates the maximum number of frames, complementary field pairs,
- *  or non-paired fields that precede any frame,
- * @max_dec_frame_buffering: specifies the required size of the HRD decoded picture buffer in
- *  units of frame buffers.
- *
- * The structure representing the VUI parameters.
- */
-struct _GstH264VUIParams
-{
-  guint8 aspect_ratio_info_present_flag;
-  guint8 aspect_ratio_idc;
-  /* if aspect_ratio_idc == 255 */
-  guint16 sar_width;
-  guint16 sar_height;
-
-  guint8 overscan_info_present_flag;
-  /* if overscan_info_present_flag */
-  guint8 overscan_appropriate_flag;
-
-  guint8 video_signal_type_present_flag;
-  guint8 video_format;
-  guint8 video_full_range_flag;
-  guint8 colour_description_present_flag;
-  guint8 colour_primaries;
-  guint8 transfer_characteristics;
-  guint8 matrix_coefficients;
-
-  guint8 chroma_loc_info_present_flag;
-  guint8 chroma_sample_loc_type_top_field;
-  guint8 chroma_sample_loc_type_bottom_field;
-
-  guint8 timing_info_present_flag;
-  /* if timing_info_present_flag */
-  guint32 num_units_in_tick;
-  guint32 time_scale;
-  guint8 fixed_frame_rate_flag;
-
-  guint8 nal_hrd_parameters_present_flag;
-  /* if nal_hrd_parameters_present_flag */
-  GstH264HRDParams nal_hrd_parameters;
-
-  guint8 vcl_hrd_parameters_present_flag;
-  /* if nal_hrd_parameters_present_flag */
-  GstH264HRDParams vcl_hrd_parameters;
-
-  guint8 low_delay_hrd_flag;
-  guint8 pic_struct_present_flag;
-
-  guint8 bitstream_restriction_flag;
-  /*  if bitstream_restriction_flag */
-  guint8 motion_vectors_over_pic_boundaries_flag;
-  guint32 max_bytes_per_pic_denom;
-  guint32 max_bits_per_mb_denom;
-  guint32 log2_max_mv_length_horizontal;
-  guint32 log2_max_mv_length_vertical;
-  guint32 num_reorder_frames;
-  guint32 max_dec_frame_buffering;
-
-  /* calculated values */
-  guint par_n;
-  guint par_d;
-};
-
-/**
- * GstH264SPS:
- * @id: The ID of the sequence parameter set
- * @profile_idc: indicate the profile to which the coded video sequence conforms
- *
- * H264 Sequence Parameter Set (SPS)
- */
-struct _GstH264SPS
-{
-  gint id;
-
-  guint8 profile_idc;
-  guint8 constraint_set0_flag;
-  guint8 constraint_set1_flag;
-  guint8 constraint_set2_flag;
-  guint8 constraint_set3_flag;
-  guint8 level_idc;
-
-  guint8 chroma_format_idc;
-  guint8 separate_colour_plane_flag;
-  guint8 bit_depth_luma_minus8;
-  guint8 bit_depth_chroma_minus8;
-  guint8 qpprime_y_zero_transform_bypass_flag;
-
-  guint8 scaling_matrix_present_flag;
-  guint8 scaling_lists_4x4[6][16];
-  guint8 scaling_lists_8x8[6][64];
-
-  guint8 log2_max_frame_num_minus4;
-  guint8 pic_order_cnt_type;
-
-  /* if pic_order_cnt_type == 0 */
-  guint8 log2_max_pic_order_cnt_lsb_minus4;
-
-  /* else if pic_order_cnt_type == 1 */
-  guint8 delta_pic_order_always_zero_flag;
-  gint32 offset_for_non_ref_pic;
-  gint32 offset_for_top_to_bottom_field;
-  guint8 num_ref_frames_in_pic_order_cnt_cycle;
-  gint32 offset_for_ref_frame[255];
-
-  guint32 num_ref_frames;
-  guint8 gaps_in_frame_num_value_allowed_flag;
-  guint32 pic_width_in_mbs_minus1;
-  guint32 pic_height_in_map_units_minus1;
-  guint8 frame_mbs_only_flag;
-
-  guint8 mb_adaptive_frame_field_flag;
-
-  guint8 direct_8x8_inference_flag;
-
-  guint8 frame_cropping_flag;
-
-  /* if frame_cropping_flag */
-  guint32 frame_crop_left_offset;
-  guint32 frame_crop_right_offset;
-  guint32 frame_crop_top_offset;
-  guint32 frame_crop_bottom_offset;
-
-  guint8 vui_parameters_present_flag;
-  /* if vui_parameters_present_flag */
- GstH264VUIParams vui_parameters;
-
-  /* calculated values */
-  guint8 chroma_array_type;
-  guint32 max_frame_num;
-  gint width, height;
-  gint fps_num, fps_den;
-  gboolean valid;
-};
-
-/**
- * GstH264PPS:
- *
- * H264 Picture Parameter Set
- */
-struct _GstH264PPS
-{
-  gint id;
-
-  GstH264SPS *sequence;
-
-  guint8 entropy_coding_mode_flag;
-  guint8 pic_order_present_flag;
-
-  guint32 num_slice_groups_minus1;
-
-  /* if num_slice_groups_minus1 > 0 */
-  guint8 slice_group_map_type;
-  /* and if slice_group_map_type == 0 */
-  guint32 run_length_minus1[8];
-  /* or if slice_group_map_type == 2 */
-  guint32 top_left[8];
-  guint32 bottom_right[8];
-  /* or if slice_group_map_type == (3, 4, 5) */
-  guint8 slice_group_change_direction_flag;
-  guint32 slice_group_change_rate_minus1;
-  /* or if slice_group_map_type == 6 */
-  guint32 pic_size_in_map_units_minus1;
-  guint8 *slice_group_id;
-
-  guint8 num_ref_idx_l0_active_minus1;
-  guint8 num_ref_idx_l1_active_minus1;
-  guint8 weighted_pred_flag;
-  guint8 weighted_bipred_idc;
-  gint8 pic_init_qp_minus26;
-  gint8 pic_init_qs_minus26;
-  gint8 chroma_qp_index_offset;
-  guint8 deblocking_filter_control_present_flag;
-  guint8 constrained_intra_pred_flag;
-  guint8 redundant_pic_cnt_present_flag;
-
-  guint8 transform_8x8_mode_flag;
-
-  guint8 scaling_lists_4x4[6][16];
-  guint8 scaling_lists_8x8[6][64];
-
-  guint8 second_chroma_qp_index_offset;
-
-  gboolean valid;
-};
-
-struct _GstH264RefPicListModification
-{
-  guint8 modification_of_pic_nums_idc;
-  union
-  {
-    /* if modification_of_pic_nums_idc == 0 || 1 */
-    guint32 abs_diff_pic_num_minus1;
-    /* if modification_of_pic_nums_idc == 2 */
-    guint32 long_term_pic_num;
-  } value;
-};
-
-struct _GstH264PredWeightTable
-{
-  guint8 luma_log2_weight_denom;
-  guint8 chroma_log2_weight_denom;
-
-  gint16 luma_weight_l0[32];
-  gint8 luma_offset_l0[32];
-
-  /* if seq->ChromaArrayType != 0 */
-  gint16 chroma_weight_l0[32][2];
-  gint8 chroma_offset_l0[32][2];
-
-  /* if slice->slice_type % 5 == 1 */
-  gint16 luma_weight_l1[32];
-  gint8 luma_offset_l1[32];
-
-  /* and if seq->ChromaArrayType != 0 */
-  gint16 chroma_weight_l1[32][2];
-  gint8 chroma_offset_l1[32][2];
-};
-
-struct _GstH264RefPicMarking
-{
-  guint8 memory_management_control_operation;
-
-  guint32 difference_of_pic_nums_minus1;
-  guint32 long_term_pic_num;
-  guint32 long_term_frame_idx;
-  guint32 max_long_term_frame_idx_plus1;
-};
-
-struct _GstH264DecRefPicMarking
-{
-  /* if slice->nal_unit.IdrPicFlag */
-  guint8 no_output_of_prior_pics_flag;
-  guint8 long_term_reference_flag;
-
-  guint8 adaptive_ref_pic_marking_mode_flag;
-  GstH264RefPicMarking ref_pic_marking[10];
-  guint8 n_ref_pic_marking;
-};
-
-
-struct _GstH264SliceHdr
-{
-  guint32 first_mb_in_slice;
-  guint32 type;
-  GstH264PPS *pps;
-
-  /* if seq->separate_colour_plane_flag */
-  guint8 colour_plane_id;
-
-  guint16 frame_num;
-
-  guint8 field_pic_flag;
-  guint8 bottom_field_flag;
-
-  /* if nal_unit.type == 5 */
-  guint16 idr_pic_id;
-
-  /* if seq->pic_order_cnt_type == 0 */
-  guint16 pic_order_cnt_lsb;
-  /* if seq->pic_order_present_flag && !field_pic_flag */
-  gint32 delta_pic_order_cnt_bottom;
-
-  gint32 delta_pic_order_cnt[2];
-  guint8 redundant_pic_cnt;
-
-  /* if slice_type == B_SLICE */
-  guint8 direct_spatial_mv_pred_flag;
-
-  guint8 num_ref_idx_l0_active_minus1;
-  guint8 num_ref_idx_l1_active_minus1;
-
-  guint8 ref_pic_list_modification_flag_l0;
-  guint8 n_ref_pic_list_modification_l0;
-  GstH264RefPicListModification ref_pic_list_modification_l0[32];
-  guint8 ref_pic_list_modification_flag_l1;
-  guint8 n_ref_pic_list_modification_l1;
-  GstH264RefPicListModification ref_pic_list_modification_l1[32];
-
-  GstH264PredWeightTable pred_weight_table;
-  /* if nal_unit.ref_idc != 0 */
-  GstH264DecRefPicMarking dec_ref_pic_marking;
-
-  guint8 cabac_init_idc;
-  gint8 slice_qp_delta;
-  gint8 slice_qs_delta;
-
-  guint8 disable_deblocking_filter_idc;
-  gint8 slice_alpha_c0_offset_div2;
-  gint8 slice_beta_offset_div2;
-
-  guint16 slice_group_change_cycle;
-
-  /* calculated values */
-  guint32 max_pic_num;
-  gboolean valid;
-
-  /* Size of the slice_header() in bits */
-  guint header_size;
-
-  /* Number of emulation prevention bytes (EPB) in this slice_header() */
-  guint n_emulation_prevention_bytes;
-};
-
-
-struct _GstH264ClockTimestamp
-{
-  guint8 ct_type;
-  guint8 nuit_field_based_flag;
-  guint8 counting_type;
-  guint8 discontinuity_flag;
-  guint8 cnt_dropped_flag;
-  guint8 n_frames;
-
-  guint8 seconds_flag;
-  guint8 seconds_value;
-
-  guint8 minutes_flag;
-  guint8 minutes_value;
-
-  guint8 hours_flag;
-  guint8 hours_value;
-
-  guint32 time_offset;
-};
-
-struct _GstH264PicTiming
-{
-  guint32 cpb_removal_delay;
-  guint32 dpb_output_delay;
-
-  guint8 pic_struct_present_flag;
-  /* if pic_struct_present_flag */
-  guint8 pic_struct;
-
-  guint8 clock_timestamp_flag[3];
-  GstH264ClockTimestamp clock_timestamp[3];
-};
-
-struct _GstH264BufferingPeriod
-{
-  GstH264SPS *sps;
-
-  /* seq->vui_parameters->nal_hrd_parameters_present_flag */
-  guint8 nal_initial_cpb_removal_delay[32];
-  guint8 nal_initial_cpb_removal_delay_offset[32];
-
-  /* seq->vui_parameters->vcl_hrd_parameters_present_flag */
-  guint8 vcl_initial_cpb_removal_delay[32];
-  guint8 vcl_initial_cpb_removal_delay_offset[32];
-};
-
-struct _GstH264SEIMessage
-{
-  GstH264SEIPayloadType payloadType;
-
-  union {
-    GstH264BufferingPeriod buffering_period;
-    GstH264PicTiming pic_timing;
-    /* ... could implement more */
-  } payload;
-};
-
-/**
- * GstH264NalParser:
- *
- * H264 NAL Parser (opaque structure).
- */
-struct _GstH264NalParser
-{
-  /*< private >*/
-  GstH264SPS sps[GST_H264_MAX_SPS_COUNT];
-  GstH264PPS pps[GST_H264_MAX_PPS_COUNT];
-  GstH264SPS *last_sps;
-  GstH264PPS *last_pps;
-};
-
-GstH264NalParser *gst_h264_nal_parser_new             (void);
-
-GstH264ParserResult gst_h264_parser_identify_nalu     (GstH264NalParser *nalparser,
-                                                       const guint8 *data, guint offset,
-                                                       gsize size, GstH264NalUnit *nalu);
-
-GstH264ParserResult gst_h264_parser_identify_nalu_unchecked (GstH264NalParser *nalparser,
-                                                       const guint8 *data, guint offset,
-                                                       gsize size, GstH264NalUnit *nalu);
-
-GstH264ParserResult gst_h264_parser_identify_nalu_avc (GstH264NalParser *nalparser, const guint8 *data,
-                                                       guint offset, gsize size, guint8 nal_length_size,
-                                                       GstH264NalUnit *nalu);
-
-GstH264ParserResult gst_h264_parser_parse_nal         (GstH264NalParser *nalparser,
-                                                       GstH264NalUnit *nalu);
-
-GstH264ParserResult gst_h264_parser_parse_slice_hdr   (GstH264NalParser *nalparser, GstH264NalUnit *nalu,
-                                                       GstH264SliceHdr *slice, gboolean parse_pred_weight_table,
-                                                       gboolean parse_dec_ref_pic_marking);
-
-GstH264ParserResult gst_h264_parser_parse_sps         (GstH264NalParser *nalparser, GstH264NalUnit *nalu,
-                                                       GstH264SPS *sps, gboolean parse_vui_params);
-
-GstH264ParserResult gst_h264_parser_parse_pps         (GstH264NalParser *nalparser,
-                                                       GstH264NalUnit *nalu, GstH264PPS *pps);
-
-GstH264ParserResult gst_h264_parser_parse_sei         (GstH264NalParser *nalparser,
-                                                       GstH264NalUnit *nalu, GstH264SEIMessage *sei);
-
-void gst_h264_nal_parser_free                         (GstH264NalParser *nalparser);
-
-GstH264ParserResult gst_h264_parse_sps                (GstH264NalUnit *nalu,
-                                                       GstH264SPS *sps, gboolean parse_vui_params);
-
-GstH264ParserResult gst_h264_parse_pps                (GstH264NalParser *nalparser,
-                                                       GstH264NalUnit *nalu, GstH264PPS *pps);
-
-G_END_DECLS
-#endif
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstmpeg4parser.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstmpeg4parser.h
deleted file mode 100644
index 457919a2..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstmpeg4parser.h
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2009 Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_MPEG4UTIL_H__
-#define __GST_MPEG4UTIL_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbitreader.h>
-
-typedef struct _GstMpeg4VisualObjectSequence    GstMpeg4VisualObjectSequence;
-typedef struct _GstMpeg4VisualObject            GstMpeg4VisualObject;
-typedef struct _GstMpeg4VideoObjectLayer        GstMpeg4VideoObjectLayer;
-typedef struct _GstMpeg4GroupOfVOP              GstMpeg4GroupOfVOP;
-typedef struct _GstMpeg4VideoObjectPlane        GstMpeg4VideoObjectPlane;
-typedef struct _GstMpeg4VideoSignalType         GstMpeg4VideoSignalType;
-typedef struct _GstMpeg4VideoPlaneShortHdr      GstMpeg4VideoPlaneShortHdr;
-typedef struct _GstMpeg4VideoPacketHdr          GstMpeg4VideoPacketHdr;
-
-typedef struct _GstMpeg4SpriteTrajectory        GstMpeg4SpriteTrajectory;
-
-typedef struct _GstMpeg4Packet                  GstMpeg4Packet;
-
-/**
- * GstMpeg4StartCode:
- *
- * Defines the different startcodes present in the bitstream as
- * defined in: Table 6-3 — Start code values
- */
-typedef enum
-{
-  GST_MPEG4_VIDEO_OBJ_FIRST      = 0x00,
-  GST_MPEG4_VIDEO_OBJ_LAST       = 0x1f,
-  GST_MPEG4_VIDEO_LAYER_FIRST    = 0x20,
-  GST_MPEG4_VIDEO_LAYER_LAST     = 0x2f,
-  GST_MPEG4_VISUAL_OBJ_SEQ_START = 0xb0,
-  GST_MPEG4_VISUAL_OBJ_SEQ_END   = 0xb1,
-  GST_MPEG4_USER_DATA            = 0xb2,
-  GST_MPEG4_GROUP_OF_VOP         = 0xb3,
-  GST_MPEG4_VIDEO_SESSION_ERR    = 0xb4,
-  GST_MPEG4_VISUAL_OBJ           = 0xb5,
-  GST_MPEG4_VIDEO_OBJ_PLANE      = 0xb6,
-  GST_MPEG4_FBA                  = 0xba,
-  GST_MPEG4_FBA_PLAN             = 0xbb,
-  GST_MPEG4_MESH                 = 0xbc,
-  GST_MPEG4_MESH_PLAN            = 0xbd,
-  GST_MPEG4_STILL_TEXTURE_OBJ    = 0xbe,
-  GST_MPEG4_TEXTURE_SPATIAL      = 0xbf,
-  GST_MPEG4_TEXTURE_SNR_LAYER    = 0xc0,
-  GST_MPEG4_TEXTURE_TILE         = 0xc1,
-  GST_MPEG4_SHAPE_LAYER          = 0xc2,
-  GST_MPEG4_STUFFING             = 0xc3,
-  GST_MPEG4_SYSTEM_FIRST         = 0xc6,
-  GST_MPEG4_SYSTEM_LAST          = 0xff,
-  GST_MPEG4_RESYNC               = 0xfff
-} GstMpeg4StartCode;
-
-/**
- * GstMpeg4VisualObjectType:
- *
- * Defines the different visual object types as
- * defined in: Table 6-5 -- Meaning of visual object type
- */
-typedef enum {
-  GST_MPEG4_VIDEO_ID         = 0x01,
-  GST_MPEG4_STILL_TEXTURE_ID = 0x02,
-  GST_MPEG4_STILL_MESH_ID    = 0x03,
-  GST_MPEG4_STILL_FBA_ID     = 0x04,
-  GST_MPEG4_STILL_3D_MESH_ID = 0x05,
-  /*... reserved */
-
-} GstMpeg4VisualObjectType;
-
-/**
- * GstMpeg4AspectRatioInfo:
- * @GST_MPEG4_SQUARE: 1:1 square
- * @GST_MPEG4_625_TYPE_4_3: 12:11 (625-type for 4:3 picture)
- * @GST_MPEG4_525_TYPE_4_3: 10:11 (525-type for 4:3 picture)
- * @GST_MPEG4_625_TYPE_16_9: 16:11 (625-type stretched for 16:9 picture)
- * @GST_MPEG4_525_TYPE_16_9: 40:33 (525-type stretched for 16:9 picture)
- * @GST_MPEG4_EXTENDED_PAR: Extended par
- *
- * Defines the different pixel aspect ratios as
- * defined in: Table 6-12 -- Meaning of pixel aspect ratio
- */
-typedef enum {
-  GST_MPEG4_SQUARE        = 0x01,
-  GST_MPEG4_625_TYPE_4_3  = 0x02,
-  GST_MPEG4_525_TYPE_4_3  = 0x03,
-  GST_MPEG4_625_TYPE_16_9 = 0x04,
-  GST_MPEG4_525_TYPE_16_9 = 0x05,
-  GST_MPEG4_EXTENDED_PAR  = 0x0f,
-} GstMpeg4AspectRatioInfo;
-
-/**
- * GstMpeg4ParseResult:
- * @GST_MPEG4_PARSER_OK: The parsing went well
- * @GST_MPEG4_PARSER_BROKEN_DATA: The bitstream was broken
- * @GST_MPEG4_PARSER_NO_PACKET: There was no packet in the buffer
- * @GST_MPEG4_PARSER_NO_PACKET_END: There was no packet end in the buffer
- * @GST_MPEG4_PARSER_NO_PACKET_ERROR: An error accured durint the parsing
- *
- * Result type of any parsing function.
- */
-typedef enum {
-  GST_MPEG4_PARSER_OK,
-  GST_MPEG4_PARSER_BROKEN_DATA,
-  GST_MPEG4_PARSER_NO_PACKET,
-  GST_MPEG4_PARSER_NO_PACKET_END,
-  GST_MPEG4_PARSER_ERROR,
-} GstMpeg4ParseResult;
-
-/**
- * GstMpeg4VideoObjectCodingType:
- * @GST_MPEG4_I_VOP: intra-coded (I)
- * @GST_MPEG4_P_VOP: predictive-coded (P)
- * @GST_MPEG4_B_VOP: bidirectionally-predictive-coded (B)
- * @GST_MPEG4_S_VOP: sprite (S)
- *
- * The vop coding types as defined in:
- * Table 6-20 -- Meaning of vop_coding_type
- */
-typedef enum {
-  GST_MPEG4_I_VOP = 0x0,
-  GST_MPEG4_P_VOP = 0x1,
-  GST_MPEG4_B_VOP = 0x2,
-  GST_MPEG4_S_VOP = 0x3
-} GstMpeg4VideoObjectCodingType;
-
-/**
- * GstMpeg4ChromaFormat
- *
- * The chroma format in use as
- * defined in: Table 6-13 -- Meaning of chroma_format
- */
-typedef enum {
-  /* Other value are reserved */
-  GST_MPEG4_CHROMA_4_2_0 = 0x01
-} GstMpeg4ChromaFormat;
-
-/**
- * GstMpeg4VideoObjectLayerShape:
- *
- * The different video object layer shapes as defined in:
- * Table 6-16 — Video Object Layer shape type
- */
-typedef enum {
-  GST_MPEG4_RECTANGULAR,
-  GST_MPEG4_BINARY,
-  GST_MPEG4_BINARY_ONLY,
-  GST_MPEG4_GRAYSCALE
-} GstMpeg4VideoObjectLayerShape;
-
-/**
- * GstMpeg4SpriteEnable:
- *
- * Indicates the usage of static sprite coding
- * or global motion compensation (GMC) as defined in:
- * Table V2 - 2 -- Meaning of sprite_enable codewords
- */
-typedef enum {
-  GST_MPEG4_SPRITE_UNUSED,
-  GST_MPEG4_SPRITE_STATIC,
-  GST_MPEG4_SPRITE_GMG
-} GstMpeg4SpriteEnable;
-
-/**
- * GstMpeg4Profile:
- *
- * Different defined profiles as defined in:
- * 9- Profiles and levels
- *
- * It is computed using:
- * Table G.1 — FLC table for profile_and_level_indication
- */
-typedef enum {
-  GST_MPEG4_PROFILE_CORE,
-  GST_MPEG4_PROFILE_MAIN,
-  GST_MPEG4_PROFILE_N_BIT,
-  GST_MPEG4_PROFILE_SIMPLE,
-  GST_MPEG4_PROFILE_HYBRID,
-  GST_MPEG4_PROFILE_RESERVED,
-  GST_MPEG4_PROFILE_SIMPLE_FBA,
-  GST_MPEG4_PROFILE_CORE_STUDIO,
-  GST_MPEG4_PROFILE_SIMPLE_STUDIO,
-  GST_MPEG4_PROFILE_CORE_SCALABLE,
-  GST_MPEG4_PROFILE_ADVANCED_CORE,
-  GST_MPEG4_PROFILE_ADVANCED_SIMPLE,
-  GST_MPEG4_PROFILE_SIMPLE_SCALABLE,
-  GST_MPEG4_PROFILE_SCALABLE_TEXTURE,
-  GST_MPEG4_PROFILE_SIMPLE_FACE_ANIMATION,
-  GST_MPEG4_PROFILE_BASIC_ANIMATED_TEXTURE,
-  GST_MPEG4_PROFILE_ADVANCED_REALTIME_SIMPLE,
-  GST_MPEG4_PROFILE_ADVANCED_SCALABLE_TEXTURE,
-  GST_MPEG4_PROFILE_FINE_GRANULARITY_SCALABLE,
-  GST_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY
-} GstMpeg4Profile;
-
-/**
- * GstMpeg4Level:
- *
- * Different levels as defined in:
- * 9- Profiles and levels
- *
- * It is computed using:
- * Table G.1 — FLC table for profile_and_level_indication
- */
-typedef enum {
-  GST_MPEG4_LEVEL0,
-  GST_MPEG4_LEVEL1,
-  GST_MPEG4_LEVEL2,
-  GST_MPEG4_LEVEL3,
-  GST_MPEG4_LEVEL3b,
-  GST_MPEG4_LEVEL4,
-  GST_MPEG4_LEVEL5,
-  GST_MPEG4_LEVEL_RESERVED
-} GstMpeg4Level;
-
-/**
- * GstMpeg4VisualObjectSequence:
- *
- * The visual object sequence structure as defined in:
- * 6.2.2 Visual Object Sequence and Visual Object
- */
-struct _GstMpeg4VisualObjectSequence {
-  guint8 profile_and_level_indication;
-
-  /* Computed according to:
-   * Table G.1 — FLC table for profile_and_level_indication */
-  GstMpeg4Level level;
-  GstMpeg4Profile profile;
-};
-
-/**
- * The visual object structure as defined in:
- * 6.2.2 Visual Object Sequence and Visual Object
- */
-struct _GstMpeg4VisualObject {
-  guint8 is_identifier;
-  /* If is_identifier */
-  guint8 verid;
-  guint8 priority;
-
-  GstMpeg4VisualObjectType type;
-};
-
-/**
- * GstMpeg4VideoSignalType:
- *
- * The video signal type structure as defined in:
- * 6.2.2 Visual Object Sequence and Visual Object.
- */
-struct _GstMpeg4VideoSignalType {
-  guint8 type;
-
-  guint8 format;
-  guint8 range;
-  guint8 color_description;
-  guint8 color_primaries;
-  guint8 transfer_characteristics;
-  guint8 matrix_coefficients;
-};
-
-/**
- * GstMpeg4VideoPlaneShortHdr:
- *
- * The video plane short header structure as defined in:
- * 6.2.5.2 Video Plane with Short Header
- */
-struct _GstMpeg4VideoPlaneShortHdr {
-  guint8 temporal_reference;
-  guint8 split_screen_indicator;
-  guint8 document_camera_indicator;
-  guint8 full_picture_freeze_release;
-  guint8 source_format;
-  guint8 picture_coding_type;
-  guint8 vop_quant;
-  guint8 pei;
-  guint8 psupp;
-
-  /*  Gob layer specific fields */
-  guint8 gob_header_empty;
-  guint8 gob_number;
-  guint8 gob_frame_id;
-  guint8 quant_scale;
-
-  /* Computed
-   * If all the values are set to 0, then it is reserved
-   * Table 6-25 -- Parameters Defined by source_format Field
-   */
-  guint16 vop_width;
-  guint16 vop_height;
-  guint16 num_macroblocks_in_gob;
-  guint8 num_gobs_in_vop;
-
-  /* The size in bits */
-  guint size;
-};
-
-/**
- * GstMpeg4VideoObjectLayer:
- *
- * The video object layer structure as defined in:
- * 6.2.3 Video Object Layer
- */
-struct _GstMpeg4VideoObjectLayer {
-  guint8 random_accessible_vol;
-  guint8 video_object_type_indication;
-
-  guint8 is_object_layer_identifier;
-  /* if is_object_layer_identifier */
-  guint8 verid;
-  guint8 priority;
-
-  GstMpeg4AspectRatioInfo aspect_ratio_info;
-  guint8 par_width;
-  guint8 par_height;
-
-  guint8 control_parameters;
-  /* if control_parameters */
-  GstMpeg4ChromaFormat chroma_format;
-  guint8 low_delay;
-  guint8 vbv_parameters;
-  /* if vbv_parameters */
-  guint16 first_half_bitrate;
-  guint16 latter_half_bitrate;
-  guint16 first_half_vbv_buffer_size;
-  guint16 latter_half_vbv_buffer_size;
-  guint16 first_half_vbv_occupancy;
-  guint16 latter_half_vbv_occupancy;
-
-  /* Computed values */
-  guint32 bit_rate;
-  guint32 vbv_buffer_size;
-
-  GstMpeg4VideoObjectLayerShape shape;
-  /* if shape == GST_MPEG4_GRAYSCALE && verid =! 1 */
-  guint8 shape_extension;
-
-  guint16 vop_time_increment_resolution;
-  guint8 vop_time_increment_bits;
-  guint8 fixed_vop_rate;
-  /* if fixed_vop_rate */
-  guint16 fixed_vop_time_increment;
-
-  guint16 width;
-  guint16 height;
-  guint8 interlaced;
-  guint8 obmc_disable;
-
-  GstMpeg4SpriteEnable sprite_enable;
-  /* if vol->sprite_enable == SPRITE_GMG or SPRITE_STATIC*/
-  /* if vol->sprite_enable != GST_MPEG4_SPRITE_GMG */
-  guint16 sprite_width;
-  guint16 sprite_height;
-  guint16 sprite_left_coordinate;
-  guint16 sprite_top_coordinate;
-
-  guint8 no_of_sprite_warping_points;
-  guint8 sprite_warping_accuracy;
-  guint8 sprite_brightness_change;
-  /* if vol->sprite_enable != GST_MPEG4_SPRITE_GMG */
-  guint8 low_latency_sprite_enable;
-
-  /* if shape != GST_MPEG4_RECTANGULAR */
-  guint8 sadct_disable;
-
-  guint8 not_8_bit;
-
-  /* if no_8_bit */
-  guint8 quant_precision;
-  guint8 bits_per_pixel;
-
-  /* if shape == GRAYSCALE */
-  guint8 no_gray_quant_update;
-  guint8 composition_method;
-  guint8 linear_composition;
-
-  guint8 quant_type;
-  /* if quant_type */
-  guint8 load_intra_quant_mat;
-  guint8 intra_quant_mat[64];
-  guint8 load_non_intra_quant_mat;
-  guint8 non_intra_quant_mat[64];
-
-  guint8 quarter_sample;
-  guint8 complexity_estimation_disable;
-  guint8 resync_marker_disable;
-  guint8 data_partitioned;
-  guint8 reversible_vlc;
-  guint8 newpred_enable;
-  guint8 reduced_resolution_vop_enable;
-  guint8 scalability;
-  guint8 enhancement_type;
-
-  GstMpeg4VideoPlaneShortHdr short_hdr;
-};
-
-/**
- * GstMpeg4SpriteTrajectory:
- *
- * The sprite trajectory structure as defined in:
- * 7.8.4 Sprite reference point decoding and
- * 6.2.5.4 Sprite coding
- */
-struct _GstMpeg4SpriteTrajectory {
-  guint16 vop_ref_points[63]; /* Defined as "du" in 6.2.5.4 */
-  guint16 sprite_ref_points[63]; /* Defined as "dv" in 6.2.5.4 */
-};
-
-/**
- * GstMpeg4GroupOfVOP:
- *
- * The group of video object plane structure as defined in:
- * 6.2.4 Group of Video Object Plane
- */
-struct _GstMpeg4GroupOfVOP {
-  guint8 hours;
-  guint8 minutes;
-  guint8 seconds;
-
-  guint8 closed;
-  guint8 broken_link;
-};
-
-/**
- * GstMpeg4VideoObjectPlane:
- *
- * The Video object plane structure as defined in:
- * 6.2.5 Video Object Plane and Video Plane with Short Header
- */
-struct _GstMpeg4VideoObjectPlane {
-  GstMpeg4VideoObjectCodingType coding_type;
-
-  guint8  modulo_time_base;
-  guint16 time_increment;
-
-  guint8  coded;
-  /* if newpred_enable */
-  guint16 id;
-  guint8  id_for_prediction_indication;
-  guint16 id_for_prediction;
-
-  guint16 width;
-  guint16 height;
-  guint16 horizontal_mc_spatial_ref;
-  guint16 vertical_mc_spatial_ref;
-
-  guint8  rounding_type;
-  /*if vol->shape != GST_MPEG4_RECTANGULAR */
-  guint8  background_composition;
-  guint8  change_conv_ratio_disable;
-  guint8  constant_alpha;
-  guint8  constant_alpha_value;
-  guint8  reduced_resolution;
-
-  guint8  intra_dc_vlc_thr;
-
-
-  guint8  top_field_first;
-  guint8  alternate_vertical_scan_flag;
-
-  guint16 quant;
-
-  guint8  fcode_forward;
-  guint8  fcode_backward;
-
-  guint8  shape_coding_type;
-  guint8  load_backward_shape;
-  guint8  ref_select_code;
-
-  /* Computed macroblock informations */
-  guint16 mb_height;
-  guint16 mb_width;
-  guint mb_num;
-
-  /* The size of the header */
-  guint    size;
-};
-
-/**
- * GstMpeg4VideoPacketHdr:
- * @size: Size of the header in bit.
- *
- * The video packet header structure as defined in:
- * 6.2.5.2 Video Plane with Short Header
- */
-struct _GstMpeg4VideoPacketHdr {
-  guint8  header_extension_code;
-  guint16 macroblock_number;
-  guint16 quant_scale;
-  guint   size;
-};
-
-/**
- * GstMpeg4Packet:
- * @type: the type of the packet that start at @offset
- * @data: the data containing packet starting at @offset
- * @offset: offset of the start of the packet (without the 3 bytes startcode), but
- * including the #GstMpeg4StartCode byte.
- * @size: The size in bytes of the packet or %G_MAXUINT if the end wasn't found.
- * @marker_size: The size in bit of the resync marker.
- *
- * A structure that contains the type of a packet, its offset and its size
- */
-struct _GstMpeg4Packet
-{
-  const guint8     *data;
-  guint             offset;
-  gsize             size;
-  guint             marker_size;
-
-  GstMpeg4StartCode type;
-};
-
-GstMpeg4ParseResult gst_h263_parse       (GstMpeg4Packet * packet,
-                                          const guint8 * data, guint offset,
-                                          gsize size);
-
-
-GstMpeg4ParseResult gst_mpeg4_parse      (GstMpeg4Packet * packet,
-                                          gboolean skip_user_data,
-                                          GstMpeg4VideoObjectPlane *vop,
-                                          const guint8 * data, guint offset,
-                                          gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_video_object_plane       (GstMpeg4VideoObjectPlane *vop,
-                                          GstMpeg4SpriteTrajectory *sprite_trajectory,
-                                          GstMpeg4VideoObjectLayer *vol,
-                                          const guint8 * data,
-                                          gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_group_of_vop             (GstMpeg4GroupOfVOP *gov,
-                                          const guint8 * data, gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_video_object_layer       (GstMpeg4VideoObjectLayer *vol,
-                                          GstMpeg4VisualObject *vo,
-                                          const guint8 * data, gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_visual_object            (GstMpeg4VisualObject *vo,
-                                          GstMpeg4VideoSignalType *signal_type,
-                                          const guint8 * data, gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_visual_object_sequence   (GstMpeg4VisualObjectSequence *vos,
-                                          const guint8 * data, gsize size);
-GstMpeg4ParseResult
-gst_mpeg4_parse_video_plane_short_header (GstMpeg4VideoPlaneShortHdr * shorthdr,
-                                          const guint8 * data, gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_video_packet_header      (GstMpeg4VideoPacketHdr * videopackethdr,
-                                          GstMpeg4VideoObjectLayer * vol,
-                                          GstMpeg4VideoObjectPlane * vop,
-                                          GstMpeg4SpriteTrajectory * sprite_trajectory,
-                                          const guint8 * data, gsize size);
-
-#endif /* __GST_MPEG4UTIL_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstmpegvideoparser.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstmpegvideoparser.h
deleted file mode 100644
index 2b13a064..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstmpegvideoparser.h
+++ /dev/null
@@ -1,431 +0,0 @@
-/* Gstreamer
- * Copyright (C) <2011> Intel Corporation
- * Copyright (C) <2011> Collabora Ltd.
- * Copyright (C) <2011> Thibault Saunier <thibault.saunier@collabora.com>
- *
- * From bad/sys/vdpau/mpeg/mpegutil.c:
- *   Copyright (C) <2007> Jan Schmidt <thaytan@mad.scientist.com>
- *   Copyright (C) <2009> Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_MPEG_VIDEO_UTILS_H__
-#define __GST_MPEG_VIDEO_UTILS_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The Mpeg video parsing library is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstMpegVideoPacketTypeCode:
- * @GST_MPEG_VIDEO_PACKET_PICTURE: Picture packet starting code
- * @GST_MPEG_VIDEO_PACKET_SLICE_MIN: Slice min packet starting code
- * @GST_MPEG_VIDEO_PACKET_SLICE_MAX: Slice max packet starting code
- * @GST_MPEG_VIDEO_PACKET_USER_DATA: User data packet starting code
- * @GST_MPEG_VIDEO_PACKET_SEQUENCE : Sequence packet starting code
- * @GST_MPEG_VIDEO_PACKET_EXTENSION: Extension packet starting code
- * @GST_MPEG_VIDEO_PACKET_SEQUENCE_END: Sequence end packet code
- * @GST_MPEG_VIDEO_PACKET_GOP: Group of Picture packet starting code
- * @GST_MPEG_VIDEO_PACKET_NONE: None packet code
- *
- * Indicates the type of MPEG packet
- */
-typedef enum {
-  GST_MPEG_VIDEO_PACKET_PICTURE      = 0x00,
-  GST_MPEG_VIDEO_PACKET_SLICE_MIN    = 0x01,
-  GST_MPEG_VIDEO_PACKET_SLICE_MAX    = 0xaf,
-  GST_MPEG_VIDEO_PACKET_USER_DATA    = 0xb2,
-  GST_MPEG_VIDEO_PACKET_SEQUENCE     = 0xb3,
-  GST_MPEG_VIDEO_PACKET_EXTENSION    = 0xb5,
-  GST_MPEG_VIDEO_PACKET_SEQUENCE_END = 0xb7,
-  GST_MPEG_VIDEO_PACKET_GOP          = 0xb8,
-  GST_MPEG_VIDEO_PACKET_NONE         = 0xff
-} GstMpegVideoPacketTypeCode;
-
-/**
- * GST_MPEG_VIDEO_PACKET_IS_SLICE:
- * @typecode: The MPEG video packet type code
- *
- * Checks whether a packet type code is a slice.
- *
- * Returns: %TRUE if the packet type code corresponds to a slice,
- * else %FALSE.
- */
-#define GST_MPEG_VIDEO_PACKET_IS_SLICE(typecode) ((typecode) >= GST_MPEG_VIDEO_PACKET_SLICE_MIN && \
-						  (typecode) <= GST_MPEG_VIDEO_PACKET_SLICE_MAX)
-
-/**
- * GstMpegVideoPacketExtensionCode:
- * @GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE: Sequence extension code
- * @GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE_DISPLAY: Sequence Display extension code
- * @GST_MPEG_VIDEO_PACKET_EXT_QUANT_MATRIX: Quantization Matrix extension code
- * @GST_MPEG_VIDEO_PACKET_EXT_PICTURE: Picture coding extension
- *
- * Indicates what type of packets are in this block, some are mutually
- * exclusive though - ie, sequence packs are accumulated separately. GOP &
- * Picture may occur together or separately.
- */
-typedef enum {
-  GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE         = 0x01,
-  GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE_DISPLAY = 0x02,
-  GST_MPEG_VIDEO_PACKET_EXT_QUANT_MATRIX     = 0x03,
-  GST_MPEG_VIDEO_PACKET_EXT_PICTURE          = 0x08
-} GstMpegVideoPacketExtensionCode;
-
-/**
- * GstMpegVideoLevel:
- * @GST_MPEG_VIDEO_LEVEL_LOW: Low level (LL)
- * @GST_MPEG_VIDEO_LEVEL_MAIN: Main level (ML)
- * @GST_MPEG_VIDEO_LEVEL_HIGH_1440: High 1440 level (H-14)
- * @GST_MPEG_VIDEO_LEVEL_HIGH: High level (HL)
- *
- * Mpeg-2 Levels.
- **/
-typedef enum {
- GST_MPEG_VIDEO_LEVEL_HIGH      = 0x04,
- GST_MPEG_VIDEO_LEVEL_HIGH_1440 = 0x06,
- GST_MPEG_VIDEO_LEVEL_MAIN      = 0x08,
- GST_MPEG_VIDEO_LEVEL_LOW       = 0x0a
-} GstMpegVideoLevel;
-
-/**
- * GstMpegVideoProfile:
- * @GST_MPEG_VIDEO_PROFILE_422: 4:2:2 profile (422)
- * @GST_MPEG_VIDEO_PROFILE_HIGH: High profile (HP)
- * @GST_MPEG_VIDEO_PROFILE_SPATIALLY_SCALABLE: Spatially Scalable profile (Spatial)
- * @GST_MPEG_VIDEO_PROFILE_SNR_SCALABLE: SNR Scalable profile (SNR)
- * @GST_MPEG_VIDEO_PROFILE_MAIN: Main profile (MP)
- * @GST_MPEG_VIDEO_PROFILE_SIMPLE: Simple profile (SP)
- *
- * Mpeg-2 Profiles.
- **/
-typedef enum {
-  GST_MPEG_VIDEO_PROFILE_422                 = 0x00,
-  GST_MPEG_VIDEO_PROFILE_HIGH                = 0x01,
-  GST_MPEG_VIDEO_PROFILE_SPATIALLY_SCALABLE  = 0x02,
-  GST_MPEG_VIDEO_PROFILE_SNR_SCALABLE        = 0x03,
-  GST_MPEG_VIDEO_PROFILE_MAIN                = 0x04,
-  GST_MPEG_VIDEO_PROFILE_SIMPLE              = 0x05
-} GstMpegVideoProfile;
-
-/**
- * GstMpegVideoChromaFormat:
- * @GST_MPEG_VIDEO_CHROMA_RES: Invalid (reserved for future use)
- * @GST_MPEG_VIDEO_CHROMA_420: 4:2:0 subsampling
- * @GST_MPEG_VIDEO_CHROMA_422: 4:2:2 subsampling
- * @GST_MPEG_VIDEO_CHROMA_444: 4:4:4 (non-subsampled)
- *
- * Chroma subsampling type.
- */
-typedef enum {
-  GST_MPEG_VIDEO_CHROMA_RES = 0x00,
-  GST_MPEG_VIDEO_CHROMA_420 = 0x01,
-  GST_MPEG_VIDEO_CHROMA_422 = 0x02,
-  GST_MPEG_VIDEO_CHROMA_444 = 0x03,
-} GstMpegVideoChromaFormat;
-
-/**
- * GstMpegVideoPictureType:
- * @GST_MPEG_VIDEO_PICTURE_TYPE_I: Intra-coded (I) frame
- * @GST_MPEG_VIDEO_PICTURE_TYPE_P: Predictive-codec (P) frame
- * @GST_MPEG_VIDEO_PICTURE_TYPE_B: Bidirectionally predictive-coded (B) frame
- * @GST_MPEG_VIDEO_PICTURE_TYPE_D: D frame
- *
- * Picture type.
- */
-typedef enum {
-  GST_MPEG_VIDEO_PICTURE_TYPE_I = 0x01,
-  GST_MPEG_VIDEO_PICTURE_TYPE_P = 0x02,
-  GST_MPEG_VIDEO_PICTURE_TYPE_B = 0x03,
-  GST_MPEG_VIDEO_PICTURE_TYPE_D = 0x04
-} GstMpegVideoPictureType;
-
-/**
- * GstMpegVideoPictureStructure:
- * @GST_MPEG_VIDEO_PICTURE_STRUCTURE_TOP_FIELD: Top field
- * @GST_MPEG_VIDEO_PICTURE_STRUCTURE_BOTTOM_FIELD: Bottom field
- * @GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME: Frame picture
- *
- * Picture structure type.
- */
-typedef enum {
-    GST_MPEG_VIDEO_PICTURE_STRUCTURE_TOP_FIELD    = 0x01,
-    GST_MPEG_VIDEO_PICTURE_STRUCTURE_BOTTOM_FIELD = 0x02,
-    GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME        = 0x03
-} GstMpegVideoPictureStructure;
-
-typedef struct _GstMpegVideoSequenceHdr     GstMpegVideoSequenceHdr;
-typedef struct _GstMpegVideoSequenceExt     GstMpegVideoSequenceExt;
-typedef struct _GstMpegVideoSequenceDisplayExt GstMpegVideoSequenceDisplayExt;
-typedef struct _GstMpegVideoPictureHdr      GstMpegVideoPictureHdr;
-typedef struct _GstMpegVideoGop             GstMpegVideoGop;
-typedef struct _GstMpegVideoPictureExt      GstMpegVideoPictureExt;
-typedef struct _GstMpegVideoQuantMatrixExt  GstMpegVideoQuantMatrixExt;
-typedef struct _GstMpegVideoPacket          GstMpegVideoPacket;
-
-/**
- * GstMpegVideoSequenceHdr:
- * @width: Width of each frame
- * @height: Height of each frame
- * @par_w: Calculated Pixel Aspect Ratio width
- * @par_h: Calculated Pixel Aspect Ratio height
- * @fps_n: Calculated Framrate nominator
- * @fps_d: Calculated Framerate denominator
- * @bitrate_value: Value of the bitrate as is in the stream (400bps unit)
- * @bitrate: the real bitrate of the Mpeg video stream in bits per second, 0 if VBR stream
- * @constrained_parameters_flag: %TRUE if this stream uses contrained parameters.
- * @intra_quantizer_matrix: intra-quantization table
- * @non_intra_quantizer_matrix: non-intra quantization table
- *
- * The Mpeg2 Video Sequence Header structure.
- */
-struct _GstMpegVideoSequenceHdr
-{
-  guint16 width, height;
-  guint8  aspect_ratio_info;
-  guint8  frame_rate_code;
-  guint32 bitrate_value;
-  guint16 vbv_buffer_size_value;
-
-  guint8  constrained_parameters_flag;
-
-  guint8  intra_quantizer_matrix[64];
-  guint8  non_intra_quantizer_matrix[64];
-
-  /* Calculated values */
-  guint   par_w, par_h;
-  guint   fps_n, fps_d;
-  guint   bitrate;
-};
-
-/**
- * GstMpegVideoSequenceExt:
- * @profile: mpeg2 decoder profile
- * @level: mpeg2 decoder level
- * @progressive: %TRUE if the frames are progressive %FALSE otherwise
- * @chroma_format: indicates the chrominance format
- * @horiz_size_ext: Horizontal size
- * @vert_size_ext: Vertical size
- * @bitrate_ext: The bitrate
- * @vbv_buffer_size_extension: VBV vuffer size
- * @low_delay: %TRUE if the sequence doesn't contain any B-pictures, %FALSE
- * otherwise
- * @fps_n_ext: Framerate nominator code
- * @fps_d_ext: Framerate denominator code
- *
- * The Mpeg2 Video Sequence Extension structure.
- **/
-struct _GstMpegVideoSequenceExt
-{
-  /* mpeg2 decoder profile */
-  guint8 profile;
-  /* mpeg2 decoder level */
-  guint8 level;
-
-  guint8 progressive;
-  guint8 chroma_format;
-
-  guint8 horiz_size_ext, vert_size_ext;
-
-  guint16 bitrate_ext;
-  guint8 vbv_buffer_size_extension;
-  guint8 low_delay;
-  guint8 fps_n_ext, fps_d_ext;
-
-};
-
-/**
- * GstMpegVideoSequenceDisplayExt:
- * @profile: mpeg2 decoder profil
-
- */
-struct _GstMpegVideoSequenceDisplayExt
-{
-  guint8 video_format;
-  guint8 colour_description_flag;
-
-  /* if colour_description_flag: */
-    guint8 colour_primaries;
-    guint8 transfer_characteristics;
-    guint8 matrix_coefficients;
-
-  guint16 display_horizontal_size;
-  guint16 display_vertical_size;
-};
-
-/**
- * GstMpegVideoQuantMatrixExt:
- * @load_intra_quantiser_matrix:
- * @intra_quantiser_matrix:
- * @load_non_intra_quantiser_matrix:
- * @non_intra_quantiser_matrix:
- * @load_chroma_intra_quantiser_matrix:
- * @chroma_intra_quantiser_matrix:
- * @load_chroma_non_intra_quantiser_matrix:
- * @chroma_non_intra_quantiser_matrix:
- *
- * The Quant Matrix Extension structure
- */
-struct _GstMpegVideoQuantMatrixExt
-{
- guint8 load_intra_quantiser_matrix;
- guint8 intra_quantiser_matrix[64];
- guint8 load_non_intra_quantiser_matrix;
- guint8 non_intra_quantiser_matrix[64];
- guint8 load_chroma_intra_quantiser_matrix;
- guint8 chroma_intra_quantiser_matrix[64];
- guint8 load_chroma_non_intra_quantiser_matrix;
- guint8 chroma_non_intra_quantiser_matrix[64];
-};
-
-/**
- * GstMpegVideoPictureHdr:
- * @tsn: Temporal Sequence Number
- * @pic_type: Type of the frame
- * @full_pel_forward_vector: the full pel forward flag of
- *  the frame: 0 or 1.
- * @full_pel_backward_vector: the full pel backward flag
- *  of the frame: 0 or 1.
- * @f_code: F code
- *
- * The Mpeg2 Video Picture Header structure.
- */
-struct _GstMpegVideoPictureHdr
-{
-  guint16 tsn;
-  guint8 pic_type;
-
-  guint8 full_pel_forward_vector, full_pel_backward_vector;
-
-  guint8 f_code[2][2];
-};
-
-/**
- * GstMpegVideoPictureExt:
- * @intra_dc_precision: Intra DC precision
- * @picture_structure: Structure of the picture
- * @top_field_first: Top field first
- * @frame_pred_frame_dct: Frame
- * @concealment_motion_vectors: Concealment Motion Vectors
- * @q_scale_type: Q Scale Type
- * @intra_vlc_format: Intra Vlc Format
- * @alternate_scan: Alternate Scan
- * @repeat_first_field: Repeat First Field
- * @chroma_420_type: Chroma 420 Type
- * @progressive_frame: %TRUE if the frame is progressive %FALSE otherwize
- *
- * The Mpeg2 Video Picture Extension structure.
- */
-struct _GstMpegVideoPictureExt
-{
-  guint8 f_code[2][2];
-
-  guint8 intra_dc_precision;
-  guint8 picture_structure;
-  guint8 top_field_first;
-  guint8 frame_pred_frame_dct;
-  guint8 concealment_motion_vectors;
-  guint8 q_scale_type;
-  guint8 intra_vlc_format;
-  guint8 alternate_scan;
-  guint8 repeat_first_field;
-  guint8 chroma_420_type;
-  guint8 progressive_frame;
-  guint8 composite_display;
-  guint8 v_axis;
-  guint8 field_sequence;
-  guint8 sub_carrier;
-  guint8 burst_amplitude;
-  guint8 sub_carrier_phase;
-};
-
-/**
- * GstMpegVideoGop:
- * @drop_frame_flag: Drop Frame Flag
- * @hour: Hour (0-23)
- * @minute: Minute (O-59)
- * @second: Second (0-59)
- * @frame: Frame (0-59)
- * @closed_gop: Closed Gop
- * @broken_link: Broken link
- *
- * The Mpeg Video Group of Picture structure.
- */
-struct _GstMpegVideoGop
-{
-  guint8 drop_frame_flag;
-
-  guint8 hour, minute, second, frame;
-
-  guint8 closed_gop;
-  guint8 broken_link;
-};
-
-/**
- * GstMpegVideoTypeOffsetSize:
- *
- * @type: the type of the packet that start at @offset
- * @data: the data containing the packet starting at @offset
- * @offset: the offset of the packet start in bytes, it is the exact, start of the packet, no sync code included
- * @size: The size in bytes of the packet or -1 if the end wasn't found. It is the exact size of the packet, no sync code included
- *
- * A structure that contains the type of a packet, its offset and its size
- */
-struct _GstMpegVideoPacket
-{
-  const guint8 *data;
-  guint8 type;
-  guint  offset;
-  gint   size;
-};
-
-gboolean gst_mpeg_video_parse                         (GstMpegVideoPacket * packet,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_sequence_header         (GstMpegVideoSequenceHdr * params,
-                                                       const guint8 * data, gsize size, guint offset);
-
-/* seqext and displayext may be NULL if not received */
-gboolean gst_mpeg_video_finalise_mpeg2_sequence_header (GstMpegVideoSequenceHdr *hdr,
-   GstMpegVideoSequenceExt *seqext, GstMpegVideoSequenceDisplayExt *displayext);
-
-gboolean gst_mpeg_video_parse_picture_header          (GstMpegVideoPictureHdr* hdr,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_picture_extension       (GstMpegVideoPictureExt *ext,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_gop                     (GstMpegVideoGop * gop,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_sequence_extension      (GstMpegVideoSequenceExt * seqext,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_sequence_display_extension (GstMpegVideoSequenceDisplayExt * seqdisplayext,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_quant_matrix_extension  (GstMpegVideoQuantMatrixExt * quant,
-                                                       const guint8 * data, gsize size, guint offset);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstvc1parser.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstvc1parser.h
deleted file mode 100644
index ce463d72..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/codecparsers/gstvc1parser.h
+++ /dev/null
@@ -1,622 +0,0 @@
-/* Gstreamer
- * Copyright (C) <2011> Intel
- * Copyright (C) <2011> Collabora Ltd.
- * Copyright (C) <2011> Thibault Saunier <thibault.saunier@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VC1_PARSER_H__
-#define __GST_VC1_PARSER_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The VC1 parsing library is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define MAX_HRD_NUM_LEAKY_BUCKETS 31
-
-/**
- * @GST_VC1_BFRACTION_BASIS: The @bfraction variable should be divided
- * by this constant to have the actual value.
- */
-#define GST_VC1_BFRACTION_BASIS 840
-
-#define GST_VC1_BFRACTION_RESERVED (GST_VC1_BFRACTION_BASIS + 1)
-#define GST_VC1_BFRACTION_PTYPE_BI (GST_VC1_BFRACTION_BASIS + 2)
-
-typedef enum {
-  GST_VC1_END_OF_SEQ       = 0x0A,
-  GST_VC1_SLICE            = 0x0B,
-  GST_VC1_FIELD            = 0x0C,
-  GST_VC1_FRAME            = 0x0D,
-  GST_VC1_ENTRYPOINT       = 0x0E,
-  GST_VC1_SEQUENCE         = 0x0F,
-  GST_VC1_SLICE_USER       = 0x1B,
-  GST_VC1_FIELD_USER       = 0x1C,
-  GST_VC1_FRAME_USER       = 0x1D,
-  GST_VC1_ENTRY_POINT_USER = 0x1E,
-  GST_VC1_SEQUENCE_USER    = 0x1F
-} GstVC1StartCode;
-
-typedef enum {
-  GST_VC1_PROFILE_SIMPLE,
-  GST_VC1_PROFILE_MAIN,
-  GST_VC1_PROFILE_RESERVED,
-  GST_VC1_PROFILE_ADVANCED
-} GstVC1Profile;
-
-typedef enum {
-  GST_VC1_PARSER_OK,
-  GST_VC1_PARSER_BROKEN_DATA,
-  GST_VC1_PARSER_NO_BDU,
-  GST_VC1_PARSER_NO_BDU_END,
-  GST_VC1_PARSER_ERROR,
-} GstVC1ParserResult;
-
-typedef enum
-{
-  GST_VC1_PICTURE_TYPE_P,
-  GST_VC1_PICTURE_TYPE_B,
-  GST_VC1_PICTURE_TYPE_I,
-  GST_VC1_PICTURE_TYPE_BI,
-  GST_VC1_PICTURE_TYPE_SKIPPED
-} GstVC1PictureType;
-
-typedef enum
-{
-    GST_VC1_LEVEL_LOW    = 0,    /* Simple/Main profile low level */
-    GST_VC1_LEVEL_MEDIUM = 1,    /* Simple/Main profile medium level */
-    GST_VC1_LEVEL_HIGH   = 2,   /* Main profile high level */
-
-    GST_VC1_LEVEL_L0    = 0,    /* Advanced profile level 0 */
-    GST_VC1_LEVEL_L1    = 1,    /* Advanced profile level 1 */
-    GST_VC1_LEVEL_L2    = 2,    /* Advanced profile level 2 */
-    GST_VC1_LEVEL_L3    = 3,    /* Advanced profile level 3 */
-    GST_VC1_LEVEL_L4    = 4,    /* Advanced profile level 4 */
-
-    /* 5 to 7 reserved */
-    GST_VC1_LEVEL_UNKNOWN = 255  /* Unknown profile */
-} GstVC1Level;
-
-typedef enum
-{
-  GST_VC1_QUANTIZER_IMPLICITLY,
-  GST_VC1_QUANTIZER_EXPLICITLY,
-  GST_VC1_QUANTIZER_NON_UNIFORM,
-  GST_VC1_QUANTIZER_UNIFORM
-} GstVC1QuantizerSpec;
-
-typedef enum {
-  GST_VC1_DQPROFILE_FOUR_EDGES,
-  GST_VC1_DQPROFILE_DOUBLE_EDGES,
-  GST_VC1_DQPROFILE_SINGLE_EDGE,
-  GST_VC1_DQPROFILE_ALL_MBS
-} GstVC1DQProfile;
-
-typedef enum {
-  GST_VC1_CONDOVER_NONE,
-  GST_VC1_CONDOVER_ALL,
-  GST_VC1_CONDOVER_SELECT
-} GstVC1Condover;
-
-/**
- * GstVC1MvMode:
- *
- */
-typedef enum
-{
-  GST_VC1_MVMODE_1MV_HPEL_BILINEAR,
-  GST_VC1_MVMODE_1MV,
-  GST_VC1_MVMODE_1MV_HPEL,
-  GST_VC1_MVMODE_MIXED_MV,
-  GST_VC1_MVMODE_INTENSITY_COMP
-} GstVC1MvMode;
-
-typedef enum
-{
-  GST_VC1_FRAME_PROGRESSIVE = 0x0,
-  GST_VC1_FRAME_INTERLACE   = 0x10,
-  GST_VC1_FIELD_INTERLACE   = 0x11
-} GstVC1FrameCodingMode;
-
-typedef struct _GstVC1SeqHdr            GstVC1SeqHdr;
-typedef struct _GstVC1AdvancedSeqHdr    GstVC1AdvancedSeqHdr;
-typedef struct _GstVC1HrdParam          GstVC1HrdParam;
-typedef struct _GstVC1EntryPointHdr     GstVC1EntryPointHdr;
-
-typedef struct _GstVC1SeqLayer     GstVC1SeqLayer;
-
-typedef struct _GstVC1SeqStructA   GstVC1SeqStructA;
-typedef struct _GstVC1SeqStructB   GstVC1SeqStructB;
-typedef struct _GstVC1SeqStructC   GstVC1SeqStructC;
-
-/* Pictures Structures */
-typedef struct _GstVC1FrameLayer        GstVC1FrameLayer;
-typedef struct _GstVC1FrameHdr          GstVC1FrameHdr;
-typedef struct _GstVC1PicAdvanced       GstVC1PicAdvanced;
-typedef struct _GstVC1PicSimpleMain     GstVC1PicSimpleMain;
-typedef struct _GstVC1Picture           GstVC1Picture;
-
-typedef struct _GstVC1VopDquant         GstVC1VopDquant;
-
-typedef struct _GstVC1BitPlanes         GstVC1BitPlanes;
-
-typedef struct _GstVC1BDU               GstVC1BDU;
-
-struct _GstVC1HrdParam
-{
-  guint8 hrd_num_leaky_buckets;
-  guint8 bit_rate_exponent;
-  guint8 buffer_size_exponent;
-  guint16 hrd_rate[MAX_HRD_NUM_LEAKY_BUCKETS];
-  guint16 hrd_buffer[MAX_HRD_NUM_LEAKY_BUCKETS];
-};
-
-/**
- * GstVC1EntryPointHdr:
- *
- * Structure for entrypoint header, this will be used only in advanced profiles
- */
-struct _GstVC1EntryPointHdr
-{
-  guint8 broken_link;
-  guint8 closed_entry;
-  guint8 panscan_flag;
-  guint8 refdist_flag;
-  guint8 loopfilter;
-  guint8 fastuvmc;
-  guint8 extended_mv;
-  guint8 dquant;
-  guint8 vstransform;
-  guint8 overlap;
-  guint8 quantizer;
-  guint8 coded_size_flag;
-  guint16 coded_width;
-  guint16 coded_height;
-  guint8 extended_dmv;
-  guint8 range_mapy_flag;
-  guint8 range_mapy;
-  guint8 range_mapuv_flag;
-  guint8 range_mapuv;
-
-  guint8 hrd_full[MAX_HRD_NUM_LEAKY_BUCKETS];
-};
-
-/**
- * GstVC1AdvancedSeqHdr:
- *
- * Structure for the advanced profile sequence headers specific parameters.
- */
-struct _GstVC1AdvancedSeqHdr
-{
-  GstVC1Level  level;
-
-  guint8  frmrtq_postproc;
-  guint8  bitrtq_postproc;
-  guint8  postprocflag;
-  guint16 max_coded_width;
-  guint16 max_coded_height;
-  guint8  pulldown;
-  guint8  interlace;
-  guint8  tfcntrflag;
-  guint8  finterpflag;
-  guint8  psf;
-  guint8  display_ext;
-  guint16 disp_horiz_size;
-  guint16 disp_vert_size;
-  guint8  aspect_ratio_flag;
-  guint8  aspect_ratio;
-  guint8  aspect_horiz_size;
-  guint8  aspect_vert_size;
-  guint8  framerate_flag;
-  guint8  framerateind;
-  guint8  frameratenr;
-  guint8  frameratedr;
-  guint16 framerateexp;
-  guint8  color_format_flag;
-  guint8  color_prim;
-  guint8  transfer_char;
-  guint8  matrix_coef;
-  guint8  hrd_param_flag;
-  guint8  colordiff_format;
-
-  GstVC1HrdParam hrd_param;
-
-  /* computed */
-  guint framerate; /* Around in fps, 0 if unknown*/
-  guint bitrate;   /* Around in kpbs, 0 if unknown*/
-  guint par_n;
-  guint par_d;
-  guint fps_n;
-  guint fps_d;
-
-  /* The last parsed entry point */
-  GstVC1EntryPointHdr entrypoint;
-};
-
-struct _GstVC1SeqStructA
-{
-  guint32 vert_size;
-  guint32 horiz_size;
-};
-
-struct _GstVC1SeqStructB
-{
-  GstVC1Level  level;
-
-  guint8 cbr;
-  guint32 framerate;
-
-  /* In simple and main profiles only */
-  guint32 hrd_buffer;
-  guint32 hrd_rate;
-};
-
-struct _GstVC1SeqStructC
-{
-  GstVC1Profile profile;
-
-  /* Only in simple and main profiles */
-  guint8 frmrtq_postproc;
-  guint8 bitrtq_postproc;
-  guint8 res_sprite;
-  guint8 loop_filter;
-  guint8 multires;
-  guint8 fastuvmc;
-  guint8 extended_mv;
-  guint8 dquant;
-  guint8 vstransform;
-  guint8 overlap;
-  guint8 syncmarker;
-  guint8 rangered;
-  guint8 maxbframes;
-  guint8 quantizer;
-  guint8 finterpflag;
-
-  /* Computed */
-  guint framerate; /* Around in fps, 0 if unknown*/
-  guint bitrate;   /* Around in kpbs, 0 if unknown*/
-
-  /* This should be filled by user if previously known */
-  guint16 coded_width;
-  /* This should be filled by user if previously known */
-  guint16 coded_height;
-
-  /* Wmvp specific */
-  guint8 wmvp;          /* Specify if the stream is wmp or not */
-  /* In the wmvp case, the framerate is not computed but in the bistream */
-  guint8 slice_code;
-};
-
-struct _GstVC1SeqLayer
-{
-  guint32 numframes;
-
-  GstVC1SeqStructA struct_a;
-  GstVC1SeqStructB struct_b;
-  GstVC1SeqStructC struct_c;
-};
-
-/**
- * GstVC1SeqHdr:
- *
- * Structure for sequence headers in any profile.
- */
-struct _GstVC1SeqHdr
-{
-  GstVC1Profile profile;
-
-  GstVC1SeqStructC struct_c;
-
-  /*  calculated */
-  guint mb_height;
-  guint mb_width;
-  guint mb_stride;
-
-  GstVC1AdvancedSeqHdr   advanced;
-
-};
-
-/**
- * GstVC1PicSimpleMain:
- * @bfaction: Should be divided by #GST_VC1_BFRACTION_BASIS
- * to get the real value.
- */
-struct _GstVC1PicSimpleMain
-{
-  guint8 frmcnt;
-  guint8 mvrange;
-  guint8 rangeredfrm;
-
-  /* I and P pic simple and main profiles only */
-  guint8 respic;
-
-  /* I and BI pic simple and main profiles only */
-  guint8 transacfrm2;
-  guint8 bf;
-
-  /* B and P pic simple and main profiles only */
-  guint8 mvmode;
-  guint8 mvtab;
-  guint8 ttmbf;
-
-  /* P pic simple and main profiles only */
-  guint8 mvmode2;
-  guint8 lumscale;
-  guint8 lumshift;
-
-  guint8 cbptab;
-  guint8 ttfrm;
-
-  /* B and BI picture only
-   * Should be divided by #GST_VC1_BFRACTION_BASIS
-   * to get the real value. */
-  guint16 bfraction;
-
-  /* Biplane value, those fields only mention the fact
-   * that the bitplane is in raw mode or not */
-  guint8 mvtypemb;
-  guint8 skipmb;
-  guint8 directmb; /* B pic main profile only */
-};
-
-/**
- * GstVC1PicAdvanced:
- * @bfaction: Should be divided by #GST_VC1_BFRACTION_BASIS
- * to get the real value.
- */
-struct _GstVC1PicAdvanced
-{
-  GstVC1FrameCodingMode fcm;
-  guint8  tfcntr;
-
-  guint8  rptfrm;
-  guint8  tff;
-  guint8  rff;
-  guint8  ps_present;
-  guint32 ps_hoffset;
-  guint32 ps_voffset;
-  guint16 ps_width;
-  guint16 ps_height;
-  guint8  rndctrl;
-  guint8  uvsamp;
-  guint8  postproc;
-
-  /*  B and P picture specific */
-  guint8  mvrange;
-  guint8  mvmode;
-  guint8  mvtab;
-  guint8  cbptab;
-  guint8  ttmbf;
-  guint8  ttfrm;
-
-  /* B and BI picture only
-   * Should be divided by #GST_VC1_BFRACTION_BASIS
-   * to get the real value. */
-  guint16 bfraction;
-
-  /* ppic */
-  guint8  mvmode2;
-  guint8  lumscale;
-  guint8  lumshift;
-
-  /* bipic */
-  guint8  bf;
-  guint8  condover;
-  guint8  transacfrm2;
-
-  /* Biplane value, those fields only mention the fact
-   * that the bitplane is in raw mode or not */
-  guint8  acpred;
-  guint8  overflags;
-  guint8  mvtypemb;
-  guint8  skipmb;
-  guint8  directmb;
-  guint8  forwardmb; /* B pic interlace field only */
-
-  /* For interlaced pictures only */
-  guint8  fieldtx;
-
-  /* P and B pictures */
-  guint8  intcomp;
-  guint8  dmvrange;
-  guint8  mbmodetab;
-  guint8  imvtab;
-  guint8  icbptab;
-  guint8  mvbptab2;
-  guint8  mvbptab4; /* If 4mvswitch in ppic */
-
-  /*  P picture */
-  guint8  mvswitch4;
-
-  /* For interlaced fields only */
-  guint16 refdist;
-  guint8 fptype; /* Raw value */
-
-  /* P pic */
-  guint8  numref;
-  guint8  reffield;
-  guint8  lumscale2;
-  guint8  lumshift2;
-  guint8  intcompfield;
-
-};
-
-struct _GstVC1BitPlanes
-{
-  guint8  *acpred;
-  guint8  *fieldtx;
-  guint8  *overflags;
-  guint8  *mvtypemb;
-  guint8  *skipmb;
-  guint8  *directmb;
-  guint8  *forwardmb;
-
-  guint size; /* Size of the arrays */
-};
-
-struct _GstVC1VopDquant
-{
-  guint8 pqdiff;
-  guint8 abspq;
-
-  /* Computed */
-  guint8 altpquant;
-
-  /*  if dqant != 2*/
-  guint8 dquantfrm;
-  guint8 dqprofile;
-
-  /* if dqprofile == GST_VC1_DQPROFILE_SINGLE_EDGE
-   * or GST_VC1_DQPROFILE_DOUBLE_EDGE:*/
-  guint8 dqsbedge;
-
-  /* if dqprofile == GST_VC1_DQPROFILE_SINGLE_EDGE
-   * or GST_VC1_DQPROFILE_DOUBLE_EDGE:*/
-  guint8 dqbedge;
-
-  /* if dqprofile == GST_VC1_DQPROFILE_ALL_MBS */
-  guint8 dqbilevel;
-
-};
-
-struct _GstVC1FrameLayer
-{
-  guint8 key;
-  guint32 framesize;
-
-  guint32 timestamp;
-
-  /* calculated */
-  guint32 next_framelayer_offset;
-  guint8 skiped_p_frame;
-};
-
-/**
- * GstVC1FrameHdr:
- *
- * Structure that represent picture in any profile or mode.
- * You should look at @ptype and @profile to know what is currently
- * in use.
- */
-struct _GstVC1FrameHdr
-{
-  /* common fields */
-  GstVC1PictureType ptype;
-  guint8 interpfrm;
-  guint8 halfqp;
-  guint8 transacfrm;
-  guint8 transdctab;
-  guint8 pqindex;
-  guint8 pquantizer;
-
-  /* Computed */
-  guint8 pquant;
-
-  /* Convenience fields */
-  guint8 profile;
-  guint8 dquant;
-
-  /*  If dquant */
-  GstVC1VopDquant vopdquant;
-
-  union {
-    GstVC1PicSimpleMain simple;
-    GstVC1PicAdvanced advanced;
-  } pic;
-
-  /* Size of the picture layer in bits */
-  guint header_size;
-};
-
-/**
- * GstVC1BDU:
- *
- * Structure that represents a Bitstream Data Unit.
- */
-struct _GstVC1BDU
-{
-  GstVC1StartCode type;
-  guint size;
-  guint sc_offset;
-  guint offset;
-  guint8 * data;
-};
-
-GstVC1ParserResult gst_vc1_identify_next_bdu           (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1BDU *bdu);
-
-
-GstVC1ParserResult gst_vc1_parse_sequence_header       (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqHdr * seqhdr);
-
-GstVC1ParserResult gst_vc1_parse_entry_point_header    (const  guint8 *data,
-                                                        gsize size,
-                                                        GstVC1EntryPointHdr * entrypoint,
-                                                        GstVC1SeqHdr *seqhdr);
-
-GstVC1ParserResult gst_vc1_parse_sequence_layer        (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqLayer * seqlayer);
-
-GstVC1ParserResult
-gst_vc1_parse_sequence_header_struct_a                 (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqStructA *structa);
-GstVC1ParserResult
-gst_vc1_parse_sequence_header_struct_b                 (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqStructB *structb);
-
-GstVC1ParserResult
-gst_vc1_parse_sequence_header_struct_c                 (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqStructC *structc);
-
-GstVC1ParserResult gst_vc1_parse_frame_layer           (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1FrameLayer * framelayer);
-
-GstVC1ParserResult gst_vc1_parse_frame_header          (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1FrameHdr * framehdr,
-                                                        GstVC1SeqHdr *seqhdr,
-                                                        GstVC1BitPlanes *bitplanes);
-
-GstVC1ParserResult gst_vc1_parse_field_header          (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1FrameHdr * fieldhdr,
-                                                        GstVC1SeqHdr *seqhdr,
-                                                        GstVC1BitPlanes *bitplanes);
-
-GstVC1BitPlanes *  gst_vc1_bitplanes_new               (void);
-
-void               gst_vc1_bitplanes_free              (GstVC1BitPlanes *bitplanes);
-
-void               gst_vc1_bitplanes_free_1            (GstVC1BitPlanes *bitplanes);
-
-gboolean           gst_vc1_bitplanes_ensure_size       (GstVC1BitPlanes *bitplanes,
-                                                        GstVC1SeqHdr *seqhdr);
-
-G_END_DECLS
-#endif
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstargbcontrolbinding.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstargbcontrolbinding.h
deleted file mode 100644
index 26bfc6dc..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstargbcontrolbinding.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gstargbcontrolbinding.h: Attachment for multiple control sources to gargb
- *                            properties
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_ARGB_CONTROL_BINDING_H__
-#define __GST_ARGB_CONTROL_BINDING_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-#include <gst/gstcontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ARGB_CONTROL_BINDING \
-  (gst_argb_control_binding_get_type())
-#define GST_ARGB_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ARGB_CONTROL_BINDING,GstARGBControlBinding))
-#define GST_ARGB_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ARGB_CONTROL_BINDING,GstARGBControlBindingClass))
-#define GST_IS_ARGB_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ARGB_CONTROL_BINDING))
-#define GST_IS_ARGB_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARGB_CONTROL_BINDING))
-#define GST_ARGB_CONTROL_BINDING_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_CONTOL_SOURCE, GstARGBControlBindingClass))
-
-typedef struct _GstARGBControlBinding GstARGBControlBinding;
-typedef struct _GstARGBControlBindingClass GstARGBControlBindingClass;
-
-/**
- * GstARGBControlBinding:
- * @name: name of the property of this binding
- *
- * The instance structure of #GstARGBControlBinding.
- */
-struct _GstARGBControlBinding {
-  GstControlBinding parent;
-  
-  /*< private >*/
-  GstControlSource *cs_a;       /* GstControlSources for this property */
-  GstControlSource *cs_r;
-  GstControlSource *cs_g;
-  GstControlSource *cs_b;
-
-  GValue cur_value;
-  guint32 last_value;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstARGBControlBindingClass:
- * @parent_class: Parent class
- * @convert: Class method to convert control-values
- *
- * The class structure of #GstARGBControlBinding.
- */
-
-struct _GstARGBControlBindingClass
-{
-  GstControlBindingClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_argb_control_binding_get_type (void);
-
-/* Functions */
-
-GstControlBinding * gst_argb_control_binding_new   (GstObject * object, const gchar * property_name,
-                                                            GstControlSource * cs_a, GstControlSource * cs_r,
-                                                            GstControlSource * cs_g, GstControlSource * cs_b);
-
-G_END_DECLS
-
-#endif /* __GST_ARGB_CONTROL_BINDING_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstdirectcontrolbinding.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstdirectcontrolbinding.h
deleted file mode 100644
index 24ece6d2..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstdirectcontrolbinding.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gstdirectcontrolbinding.h: Direct attachment for control sources
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_DIRECT_CONTROL_BINDING_H__
-#define __GST_DIRECT_CONTROL_BINDING_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-#include <gst/gstcontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_DIRECT_CONTROL_BINDING \
-  (gst_direct_control_binding_get_type())
-#define GST_DIRECT_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DIRECT_CONTROL_BINDING,GstDirectControlBinding))
-#define GST_DIRECT_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DIRECT_CONTROL_BINDING,GstDirectControlBindingClass))
-#define GST_IS_DIRECT_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DIRECT_CONTROL_BINDING))
-#define GST_IS_DIRECT_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DIRECT_CONTROL_BINDING))
-#define GST_DIRECT_CONTROL_BINDING_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_CONTOL_SOURCE, GstDirectControlBindingClass))
-
-typedef struct _GstDirectControlBinding GstDirectControlBinding;
-typedef struct _GstDirectControlBindingClass GstDirectControlBindingClass;
-
-/**
- * GstDirectControlBindingConvertValue:
- * @self: the #GstDirectControlBinding instance
- * @src_value: the value returned by the cotnrol source
- * @dest_value: the target location
- *
- * Function to map a control-value to the target plain data type.
- */
-typedef void (* GstDirectControlBindingConvertValue) (GstDirectControlBinding *self, gdouble src_value, gpointer dest_value);
-
-/**
- * GstDirectControlBindingConvertGValue:
- * @self: the #GstDirectControlBinding instance
- * @src_value: the value returned by the cotnrol source
- * @dest_value: the target GValue
- *
- * Function to map a control-value to the target GValue.
- */
-typedef void (* GstDirectControlBindingConvertGValue) (GstDirectControlBinding *self, gdouble src_value, GValue *dest_value);
-
-/**
- * GstDirectControlBinding:
- * @name: name of the property of this binding
- *
- * The instance structure of #GstDirectControlBinding.
- */
-struct _GstDirectControlBinding {
-  GstControlBinding parent;
-  
-  /*< private >*/
-  GstControlSource *cs;    /* GstControlSource for this property */
-  GValue cur_value;
-  gdouble last_value;
-  gint byte_size;
-
-  GstDirectControlBindingConvertValue convert_value;
-  GstDirectControlBindingConvertGValue convert_g_value;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstDirectControlBindingClass:
- * @parent_class: Parent class
- * @convert: Class method to convert control-values
- *
- * The class structure of #GstDirectControlBinding.
- */
-
-struct _GstDirectControlBindingClass
-{
-  GstControlBindingClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_direct_control_binding_get_type (void);
-
-/* Functions */
-
-GstControlBinding * gst_direct_control_binding_new (GstObject * object, const gchar * property_name,
-                                                    GstControlSource * cs);
-G_END_DECLS
-
-#endif /* __GST_DIRECT_CONTROL_BINDING_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstinterpolationcontrolsource.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstinterpolationcontrolsource.h
deleted file mode 100644
index daf17bd8..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstinterpolationcontrolsource.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *
- * gstinterpolationcontrolsource.h: Control source that provides several
- *                                  interpolation methods
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_INTERPOLATION_CONTROL_SOURCE_H__
-#define __GST_INTERPOLATION_CONTROL_SOURCE_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-#include <gst/controller/gsttimedvaluecontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_INTERPOLATION_CONTROL_SOURCE \
-  (gst_interpolation_control_source_get_type ())
-#define GST_INTERPOLATION_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_INTERPOLATION_CONTROL_SOURCE, GstInterpolationControlSource))
-#define GST_INTERPOLATION_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), GST_TYPE_INTERPOLATION_CONTROL_SOURCE, GstInterpolationControlSourceClass))
-#define GST_IS_INTERPOLATION_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_INTERPOLATION_CONTROL_SOURCE))
-#define GST_IS_INTERPOLATION_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GST_TYPE_INTERPOLATION_CONTROL_SOURCE))
-#define GST_INTERPOLATION_CONTROL_SOURCE_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_INTERPOLATION_CONTROL_SOURCE, GstInterpolationControlSourceClass))
-
-#define GST_TYPE_INTERPOLATION_MODE (gst_interpolation_mode_get_type ())
-
-typedef struct _GstInterpolationControlSource GstInterpolationControlSource;
-typedef struct _GstInterpolationControlSourceClass GstInterpolationControlSourceClass;
-typedef struct _GstInterpolationControlSourcePrivate GstInterpolationControlSourcePrivate;
-
-/**
- * GstInterpolationMode:
- * @GST_INTERPOLATION_MODE_NONE: steps-like interpolation, default
- * @GST_INTERPOLATION_MODE_LINEAR: linear interpolation
- * @GST_INTERPOLATION_MODE_CUBIC: cubic interpolation
- *
- * The various interpolation modes available.
- */
-typedef enum
-{
-  GST_INTERPOLATION_MODE_NONE,
-  GST_INTERPOLATION_MODE_LINEAR,
-  GST_INTERPOLATION_MODE_CUBIC
-} GstInterpolationMode;
-
-/**
- * GstInterpolationControlSource:
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstInterpolationControlSource {
-  GstTimedValueControlSource parent;
-
-  /*< private >*/
-  GstInterpolationControlSourcePrivate *priv;
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstInterpolationControlSourceClass {
-  GstTimedValueControlSourceClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_interpolation_control_source_get_type (void);
-GType gst_interpolation_mode_get_type (void);
-
-/* Functions */
-
-GstControlSource * gst_interpolation_control_source_new (void);
-
-G_END_DECLS
-
-#endif /* __GST_INTERPOLATION_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstlfocontrolsource.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstlfocontrolsource.h
deleted file mode 100644
index 2ce6d842..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gstlfocontrolsource.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *
- * gstlfocontrolsource.h: Control source that provides some periodic waveforms
- *                        as control values.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_LFO_CONTROL_SOURCE_H__
-#define __GST_LFO_CONTROL_SOURCE_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_LFO_CONTROL_SOURCE \
-  (gst_lfo_control_source_get_type ())
-#define GST_LFO_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_LFO_CONTROL_SOURCE, GstLFOControlSource))
-#define GST_LFO_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), GST_TYPE_LFO_CONTROL_SOURCE, GstLFOControlSourceClass))
-#define GST_IS_LFO_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_LFO_CONTROL_SOURCE))
-#define GST_IS_LFO_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GST_TYPE_LFO_CONTROL_SOURCE))
-#define GST_LFO_CONTROL_SOURCE_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_LFO_CONTROL_SOURCE, GstLFOControlSourceClass))
-
-#define GST_TYPE_LFO_WAVEFORM (gst_lfo_waveform_get_type ())
-
-typedef struct _GstLFOControlSource GstLFOControlSource;
-typedef struct _GstLFOControlSourceClass GstLFOControlSourceClass;
-typedef struct _GstLFOControlSourcePrivate GstLFOControlSourcePrivate;
-
-/**
- * GstLFOWaveform:
- * @GST_LFO_WAVEFORM_SINE: sine waveform
- * @GST_LFO_WAVEFORM_SQUARE: square waveform
- * @GST_LFO_WAVEFORM_SAW: saw waveform
- * @GST_LFO_WAVEFORM_REVERSE_SAW: reverse saw waveform
- * @GST_LFO_WAVEFORM_TRIANGLE: triangle waveform
- *
- * The various waveform modes available.
- */
-typedef enum
-{
-  GST_LFO_WAVEFORM_SINE,
-  GST_LFO_WAVEFORM_SQUARE,
-  GST_LFO_WAVEFORM_SAW,
-  GST_LFO_WAVEFORM_REVERSE_SAW,
-  GST_LFO_WAVEFORM_TRIANGLE
-} GstLFOWaveform;
-
-/**
- * GstLFOControlSource:
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstLFOControlSource {
-  GstControlSource parent;
-
-  /* <private> */
-  GstLFOControlSourcePrivate *priv;
-  GMutex lock;
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstLFOControlSourceClass {
-  GstControlSourceClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_lfo_control_source_get_type (void);
-GType gst_lfo_waveform_get_type (void);
-
-/* Functions */
-
-GstControlSource *gst_lfo_control_source_new (void);
-
-G_END_DECLS
-
-#endif /* __GST_LFO_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gsttimedvaluecontrolsource.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gsttimedvaluecontrolsource.h
deleted file mode 100644
index 06577cb3..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gsttimedvaluecontrolsource.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *               2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gsttimedvaluecontrolsource.h: Base class for timeed value based control
- *                               sources
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TIMED_VALUE_CONTROL_SOURCE_H__
-#define __GST_TIMED_VALUE_CONTROL_SOURCE_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-#include <gst/gstcontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TIMED_VALUE_CONTROL_SOURCE \
-  (gst_timed_value_control_source_get_type ())
-#define GST_TIMED_VALUE_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE, GstTimedValueControlSource))
-#define GST_TIMED_VALUE_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE, GstTimedValueControlSourceClass))
-#define GST_IS_TIMED_VALUE_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE))
-#define GST_IS_TIMED_VALUE_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE))
-#define GST_TIMED_VALUE_CONTROL_SOURCE_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE, GstTimedValueControlSourceClass))
-
-typedef struct _GstTimedValueControlSource GstTimedValueControlSource;
-typedef struct _GstTimedValueControlSourceClass GstTimedValueControlSourceClass;
-typedef struct _GstTimedValueControlSourcePrivate GstTimedValueControlSourcePrivate;
-typedef struct _GstControlPoint GstControlPoint;
-
-/**
- * GstControlPoint:
- *
- * a internal structure for value+time and various temporary
- * values used for interpolation. This "inherits" from
- * GstTimedValue.
- */
-struct _GstControlPoint
-{
-  /* fields from GstTimedValue. DO NOT CHANGE! */
-  GstClockTime timestamp;       /* timestamp of the value change */
-  gdouble value;                /* the new value */
-
-  /* internal fields */
-
-  /* Caches for the interpolators */
-  /* FIXME: we should not have this here already ... */
-  union {
-    struct {
-      gdouble h;
-      gdouble z;
-    } cubic;
-  } cache;
-
-};
-
-/**
- * GstTimedValueControlSource:
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstTimedValueControlSource {
-  GstControlSource parent;
-
-  /*< protected >*/
-  GMutex lock;
-
-  GSequence *values;            /* List of GstControlPoint */
-  gint nvalues;                 /* Number of control points */
-  gboolean valid_cache;
-
-  /*< private >*/
-  GstTimedValueControlSourcePrivate *priv;
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstTimedValueControlSourceClass {
-  GstControlSourceClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_TIMED_VALUE_CONTROL_SOURCE_LOCK(o) \
-  g_mutex_lock(&((GstTimedValueControlSource *)o)->lock)
-#define GST_TIMED_VALUE_CONTROL_SOURCE_UNLOCK(o) \
-  g_mutex_unlock(&((GstTimedValueControlSource *)o)->lock)
-
-GType gst_timed_value_control_source_get_type (void);
-
-/* Functions */
-
-GSequenceIter * gst_timed_value_control_source_find_control_point_iter (
-                                                               GstTimedValueControlSource * self, 
-                                                               GstClockTime timestamp);
-
-gboolean        gst_timed_value_control_source_set            (GstTimedValueControlSource * self,
-                                                               GstClockTime timestamp,
-                                                               const gdouble value);
-gboolean        gst_timed_value_control_source_set_from_list  (GstTimedValueControlSource * self,
-                                                               const GSList * timedvalues);
-gboolean        gst_timed_value_control_source_unset          (GstTimedValueControlSource * self,
-                                                               GstClockTime timestamp);
-void            gst_timed_value_control_source_unset_all      (GstTimedValueControlSource *self);
-GList *         gst_timed_value_control_source_get_all        (GstTimedValueControlSource * self);
-gint            gst_timed_value_control_source_get_count      (GstTimedValueControlSource * self);
-void            gst_timed_value_control_invalidate_cache      (GstTimedValueControlSource * self);
-
-G_END_DECLS
-
-#endif /* __GST_TIMED_VALUE_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gsttriggercontrolsource.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gsttriggercontrolsource.h
deleted file mode 100644
index 1f1f1326..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/controller/gsttriggercontrolsource.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *               2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gsttriggercontrolsource.h: Control source that provides some values at time-
- *                            stamps
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TRIGGER_CONTROL_SOURCE_H__
-#define __GST_TRIGGER_CONTROL_SOURCE_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-#include <gst/controller/gsttimedvaluecontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TRIGGER_CONTROL_SOURCE \
-  (gst_trigger_control_source_get_type ())
-#define GST_TRIGGER_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TRIGGER_CONTROL_SOURCE, GstTriggerControlSource))
-#define GST_TRIGGER_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), GST_TYPE_TRIGGER_CONTROL_SOURCE, GstTriggerControlSourceClass))
-#define GST_IS_TRIGGER_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TRIGGER_CONTROL_SOURCE))
-#define GST_IS_TRIGGER_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GST_TYPE_TRIGGER_CONTROL_SOURCE))
-#define GST_TRIGGER_CONTROL_SOURCE_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_TRIGGER_CONTROL_SOURCE, GstTriggerControlSourceClass))
-
-#define GST_TYPE_TRIGGER_WAVEFORM (gst_trigger_waveform_get_type ())
-
-typedef struct _GstTriggerControlSource GstTriggerControlSource;
-typedef struct _GstTriggerControlSourceClass GstTriggerControlSourceClass;
-typedef struct _GstTriggerControlSourcePrivate GstTriggerControlSourcePrivate;
-
-/**
- * GstTriggerControlSource:
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstTriggerControlSource {
-  GstTimedValueControlSource parent;
-
-  /*< private >*/
-  GstTriggerControlSourcePrivate *priv;
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstTriggerControlSourceClass {
-  GstTimedValueControlSourceClass parent_class;
-  
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_trigger_control_source_get_type (void);
-
-/* Functions */
-
-GstControlSource *gst_trigger_control_source_new (void);
-
-G_END_DECLS
-
-#endif /* __GST_TRIGGER_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfft.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfft.h
deleted file mode 100644
index 9071b1c8..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfft.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-#include <math.h>
-
-#ifndef __GST_FFT_H__
-#define __GST_FFT_H__
-
-G_BEGIN_DECLS
-
-/**
- * GstFFTWindow:
- * @GST_FFT_WINDOW_RECTANGULAR: Rectangular window
- * @GST_FFT_WINDOW_HAMMING: Hamming window
- * @GST_FFT_WINDOW_HANN: Hann (sometimes also called Hanning) window
- * @GST_FFT_WINDOW_BARTLETT: Bartlett window
- * @GST_FFT_WINDOW_BLACKMAN: Blackman window
- *
- * The various window functions available.
- */
-typedef enum
-{
-  GST_FFT_WINDOW_RECTANGULAR,
-  GST_FFT_WINDOW_HAMMING,
-  GST_FFT_WINDOW_HANN,
-  GST_FFT_WINDOW_BARTLETT,
-  GST_FFT_WINDOW_BLACKMAN
-} GstFFTWindow;
-
-/* Functions */
-
-gint gst_fft_next_fast_length (gint n) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GST_FFT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfftf32.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfftf32.h
deleted file mode 100644
index 60bf98c0..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfftf32.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_FFT_F32_H__
-#define __GST_FFT_F32_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfft.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstFFTF32 GstFFTF32;
-typedef struct _GstFFTF32Complex GstFFTF32Complex;
-
-/* Copy of kiss_fft_f32_cpx for documentation reasons,
- * do NOT change! */
-
-/**
- * GstFFTF32Complex:
- * @r: Real part
- * @i: Imaginary part
- *
- * Data type for complex numbers composed of
- * 32 bit float.
- */
-struct _GstFFTF32Complex
-{
-  gfloat r;
-  gfloat i;
-};
-
-/* Functions */
-GstFFTF32 *   gst_fft_f32_new           (gint len, gboolean inverse);
-void          gst_fft_f32_free          (GstFFTF32 *self);
-
-void          gst_fft_f32_fft           (GstFFTF32 *self, const gfloat *timedata,
-                                         GstFFTF32Complex *freqdata);
-void          gst_fft_f32_inverse_fft   (GstFFTF32 *self, const GstFFTF32Complex *freqdata,
-                                         gfloat *timedata);
-
-void          gst_fft_f32_window        (GstFFTF32 *self, gfloat *timedata, GstFFTWindow window);
-
-G_END_DECLS
-
-#endif /* __GST_FFT_F32_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfftf64.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfftf64.h
deleted file mode 100644
index 782bd8b7..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstfftf64.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_FFT_F64_H__
-#define __GST_FFT_F64_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfft.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstFFTF64 GstFFTF64;
-typedef struct _GstFFTF64Complex GstFFTF64Complex;
-
-/* Copy of kiss_fft_f64_cpx for documentation reasons,
- * do NOT change! */
-
-/**
- * GstFFTF64Complex:
- * @r: Real part
- * @i: Imaginary part
- *
- * Data type for complex numbers composed of
- * 64 bit float.
- */
-struct _GstFFTF64Complex
-{
-  gdouble r;
-  gdouble i;
-};
-
-/* Functions */
-GstFFTF64 *     gst_fft_f64_new         (gint len, gboolean inverse);
-void            gst_fft_f64_free        (GstFFTF64 *self);
-
-void            gst_fft_f64_fft         (GstFFTF64 *self, const gdouble *timedata,
-                                         GstFFTF64Complex *freqdata);
-void            gst_fft_f64_inverse_fft (GstFFTF64 *self, const GstFFTF64Complex *freqdata,
-                                         gdouble *timedata);
-
-void            gst_fft_f64_window      (GstFFTF64 *self, gdouble *timedata, GstFFTWindow window);
-
-G_END_DECLS
-
-#endif /* __GST_FFT_F64_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstffts16.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstffts16.h
deleted file mode 100644
index 4f94bb01..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstffts16.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_FFT_S16_H__
-#define __GST_FFT_S16_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfft.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstFFTS16 GstFFTS16;
-typedef struct _GstFFTS16Complex GstFFTS16Complex;
-
-/* Copy of kiss_fft_s16_cpx for documentation reasons,
- * do NOT change! */
-
-/**
- * GstFFTS16Complex:
- * @r: Real part
- * @i: Imaginary part
- *
- * Data type for complex numbers composed of
- * signed 16 bit integers.
- */
-struct _GstFFTS16Complex
-{
-  gint16 r;
-  gint16 i;
-};
-
-/* Functions */
-GstFFTS16 *     gst_fft_s16_new         (gint len, gboolean inverse);
-void            gst_fft_s16_free        (GstFFTS16 *self);
-
-void            gst_fft_s16_fft         (GstFFTS16 *self, const gint16 *timedata,
-                                         GstFFTS16Complex *freqdata);
-void            gst_fft_s16_inverse_fft (GstFFTS16 *self, const GstFFTS16Complex *freqdata,
-                                         gint16 *timedata);
-
-void            gst_fft_s16_window      (GstFFTS16 *self, gint16 *timedata, GstFFTWindow window);
-
-G_END_DECLS
-
-#endif /* __GST_FFT_S16_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstffts32.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstffts32.h
deleted file mode 100644
index 99d7815d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/fft/gstffts32.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_FFT_S32_H__
-#define __GST_FFT_S32_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfft.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstFFTS32 GstFFTS32;
-typedef struct _GstFFTS32Complex GstFFTS32Complex;
-
-/* Copy of kiss_fft_s32_cpx for documentation reasons,
- * do NOT change! */
-
-/**
- * GstFFTS32Complex:
- * @r: Real part
- * @i: Imaginary part
- *
- * Data type for complex numbers composed of
- * signed 32 bit integers.
- */
-struct _GstFFTS32Complex
-{
-  gint32 r;
-  gint32 i;
-};
-
-/* Functions */
-GstFFTS32 *     gst_fft_s32_new         (gint len, gboolean inverse);
-void            gst_fft_s32_free        (GstFFTS32 *self);
-
-void            gst_fft_s32_fft         (GstFFTS32 *self, const gint32 *timedata,
-                                         GstFFTS32Complex *freqdata);
-void            gst_fft_s32_inverse_fft (GstFFTS32 *self, const GstFFTS32Complex *freqdata,
-                                         gint32 *timedata);
-
-void            gst_fft_s32_window      (GstFFTS32 *self, gint32 *timedata, GstFFTWindow window);
-
-G_END_DECLS
-
-#endif /* __GST_FFT_S32_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/glib-compat.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/glib-compat.h
deleted file mode 100644
index 77943068..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/glib-compat.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* GStreamer
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * glib-compat.h: Public GLib compatibility shims
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-/*
- * Modified by the GLib Team and others 1997-2000. See the AUTHORS file from
- * glib-2.8.0 for a list of people on the GLib Team. See the ChangeLog files
- * from glib-2.8.0 for a list of changes. These files are distributed with GLib
- * at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GST_GLIB_COMPAT_H__
-#define __GST_GLIB_COMPAT_H__
-
-G_BEGIN_DECLS
-
-G_END_DECLS
-
-#endif /* __GST_GLIB_COMPAT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gst.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gst.h
deleted file mode 100644
index 31887583..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gst.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gst.h: Main header for GStreamer, apps should include this
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_H__
-#define __GST_H__
-
-#include <glib.h>
-
-#include <gst/glib-compat.h>
-
-#include <gst/gstenumtypes.h>
-#include <gst/gstversion.h>
-
-#include <gst/gstbin.h>
-#include <gst/gstbuffer.h>
-#include <gst/gstbufferlist.h>
-#include <gst/gstbufferpool.h>
-#include <gst/gstcaps.h>
-#include <gst/gstchildproxy.h>
-#include <gst/gstclock.h>
-#include <gst/gstcontrolsource.h>
-#include <gst/gstdatetime.h>
-#include <gst/gstdebugutils.h>
-#include <gst/gstelement.h>
-#include <gst/gstelementmetadata.h>
-#include <gst/gsterror.h>
-#include <gst/gstevent.h>
-#include <gst/gstghostpad.h>
-#include <gst/gstinfo.h>
-#include <gst/gstiterator.h>
-#include <gst/gstmessage.h>
-#include <gst/gstmemory.h>
-#include <gst/gstmeta.h>
-#include <gst/gstminiobject.h>
-#include <gst/gstobject.h>
-#include <gst/gstpad.h>
-#include <gst/gstparamspecs.h>
-#include <gst/gstpipeline.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpoll.h>
-#include <gst/gstpreset.h>
-#include <gst/gstquery.h>
-#include <gst/gstregistry.h>
-#include <gst/gstsample.h>
-#include <gst/gstsegment.h>
-#include <gst/gststructure.h>
-#include <gst/gstsystemclock.h>
-#include <gst/gsttaglist.h>
-#include <gst/gsttagsetter.h>
-#include <gst/gsttask.h>
-#include <gst/gsttaskpool.h>
-#include <gst/gsttoc.h>
-#include <gst/gsttocsetter.h>
-#include <gst/gsttypefind.h>
-#include <gst/gsttypefindfactory.h>
-#include <gst/gsturi.h>
-#include <gst/gstutils.h>
-#include <gst/gstvalue.h>
-
-#include <gst/gstparse.h>
-
-/* API compatibility stuff */
-#include <gst/gstcompat.h>
-
-G_BEGIN_DECLS
-
-void		gst_init			(int *argc, char **argv[]);
-gboolean	gst_init_check			(int *argc, char **argv[],
-						 GError ** err);
-gboolean        gst_is_initialized              (void);
-GOptionGroup *	gst_init_get_option_group	(void);
-void		gst_deinit			(void);
-
-void		gst_version			(guint *major, guint *minor,
-						 guint *micro, guint *nano);
-gchar *		gst_version_string		(void);
-
-gboolean        gst_segtrap_is_enabled          (void);
-void            gst_segtrap_set_enabled         (gboolean enabled);
-
-gboolean        gst_registry_fork_is_enabled    (void);
-void            gst_registry_fork_set_enabled   (gboolean enabled);
-
-gboolean        gst_update_registry             (void);
-
-G_END_DECLS
-
-#endif /* __GST_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstallocator.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstallocator.h
deleted file mode 100644
index f9edd50f..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstallocator.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Wim Taymans <wim.taymans@gmail.be>
- *
- * gstallocator.h: Header for memory allocation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_ALLOCATOR_H__
-#define __GST_ALLOCATOR_H__
-
-#include <gst/gstmemory.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstAllocatorPrivate GstAllocatorPrivate;
-typedef struct _GstAllocatorClass GstAllocatorClass;
-
-#define GST_TYPE_ALLOCATOR                 (gst_allocator_get_type())
-#define GST_IS_ALLOCATOR(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_ALLOCATOR))
-#define GST_IS_ALLOCATOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_ALLOCATOR))
-#define GST_ALLOCATOR_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ALLOCATOR, GstAllocatorClass))
-#define GST_ALLOCATOR(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_ALLOCATOR, GstAllocator))
-#define GST_ALLOCATOR_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_ALLOCATOR, GstAllocatorClass))
-#define GST_ALLOCATOR_CAST(obj)            ((GstAllocator *)(obj))
-
-#define GST_TYPE_ALLOCATION_PARAMS (gst_allocation_params_get_type())
-GType gst_allocation_params_get_type(void);
-
-typedef struct _GstAllocationParams GstAllocationParams;
-
-/**
- * gst_memory_alignment:
- *
- * The default memory alignment in bytes - 1
- * an alignment of 7 would be the same as what malloc() guarantees.
- */
-GST_EXPORT gsize gst_memory_alignment;
-
-/**
- * GST_ALLOCATOR_SYSMEM:
- *
- * The allocator name for the default system memory allocator
- */
-#define GST_ALLOCATOR_SYSMEM   "SystemMemory"
-
-/**
- * GstAllocationParams:
- * @flags: flags to control allocation
- * @align: the desired alignment of the memory
- * @prefix: the desired prefix
- * @padding: the desired padding
- *
- * Parameters to control the allocation of memory
- */
-struct _GstAllocationParams {
-  GstMemoryFlags flags;
-  gsize          align;
-  gsize          prefix;
-  gsize          padding;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAllocatorFlags:
- * @GST_ALLOCATOR_FLAG_CUSTOM_ALLOC: The allocator has a custom alloc function.
- * @GST_ALLOCATOR_FLAG_LAST: first flag that can be used for custom purposes
- *
- * Flags for allocators.
- */
-typedef enum {
-  GST_ALLOCATOR_FLAG_CUSTOM_ALLOC  = (GST_OBJECT_FLAG_LAST << 0),
-
-  GST_ALLOCATOR_FLAG_LAST          = (GST_OBJECT_FLAG_LAST << 16)
-} GstAllocatorFlags;
-
-/**
- * GstAllocator:
- * @object: parent structure
- * @mem_type: the memory type this allocator provides
- * @mem_map: the implementation of the GstMemoryMapFunction
- * @mem_unmap: the implementation of the GstMemoryUnmapFunction
- * @mem_copy: the implementation of the GstMemoryCopyFunction
- * @mem_share: the implementation of the GstMemoryShareFunction
- * @mem_is_span: the implementation of the GstMemoryIsSpanFunction
- *
- * The #GstAllocator is used to create new memory.
- */
-struct _GstAllocator
-{
-  GstObject  object;
-
-  const gchar              *mem_type;
-
-  GstMemoryMapFunction      mem_map;
-  GstMemoryUnmapFunction    mem_unmap;
-
-  GstMemoryCopyFunction     mem_copy;
-  GstMemoryShareFunction    mem_share;
-  GstMemoryIsSpanFunction   mem_is_span;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-
-  GstAllocatorPrivate *priv;
-};
-
-struct _GstAllocatorClass {
-  GstObjectClass object_class;
-
-  GstMemory *  (*alloc)      (GstAllocator *allocator, gsize size,
-                              GstAllocationParams *params);
-  void         (*free)       (GstAllocator *allocator, GstMemory *memory);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_allocator_get_type(void);
-
-/* allocators */
-void           gst_allocator_register        (const gchar *name, GstAllocator *allocator);
-GstAllocator * gst_allocator_find            (const gchar *name);
-void           gst_allocator_set_default     (GstAllocator * allocator);
-
-/* allocation parameters */
-void           gst_allocation_params_init    (GstAllocationParams *params);
-GstAllocationParams *
-               gst_allocation_params_copy    (const GstAllocationParams *params) G_GNUC_MALLOC;
-void           gst_allocation_params_free    (GstAllocationParams *params);
-
-/* allocating memory blocks */
-GstMemory *    gst_allocator_alloc           (GstAllocator * allocator, gsize size,
-                                              GstAllocationParams *params);
-void           gst_allocator_free            (GstAllocator * allocator, GstMemory *memory);
-
-GstMemory *    gst_memory_new_wrapped  (GstMemoryFlags flags, gpointer data, gsize maxsize,
-                                        gsize offset, gsize size, gpointer user_data,
-                                        GDestroyNotify notify);
-
-G_END_DECLS
-
-#endif /* __GST_ALLOCATOR_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstatomicqueue.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstatomicqueue.h
deleted file mode 100644
index af6d693c..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstatomicqueue.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009-2010 Edward Hervey <bilboed@bilboed.com>
- *           (C) 2011 Wim Taymans <wim.taymans@gmail.com>
- *
- * gstatomicqueue.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-
-#ifndef __GST_ATOMIC_QUEUE_H__
-#define __GST_ATOMIC_QUEUE_H__
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ATOMIC_QUEUE (gst_atomic_queue_get_type())
-
-/**
- * GstAtomicQueue:
- *
- * Opaque atomic data queue.
- *
- * Use the acessor functions to get the stored values.
- */
-typedef struct _GstAtomicQueue GstAtomicQueue;
-
-
-GType              gst_atomic_queue_get_type    (void);
-
-GstAtomicQueue *   gst_atomic_queue_new         (guint initial_size) G_GNUC_MALLOC;
-
-void               gst_atomic_queue_ref         (GstAtomicQueue * queue);
-void               gst_atomic_queue_unref       (GstAtomicQueue * queue);
-
-void               gst_atomic_queue_push        (GstAtomicQueue* queue, gpointer data);
-gpointer           gst_atomic_queue_pop         (GstAtomicQueue* queue);
-gpointer           gst_atomic_queue_peek        (GstAtomicQueue* queue);
-
-guint              gst_atomic_queue_length      (GstAtomicQueue * queue);
-
-G_END_DECLS
-
-#endif /* __GST_ATOMIC_QUEUE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbin.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbin.h
deleted file mode 100644
index 06cbc743..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbin.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstbin.h: Header for GstBin container object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_BIN_H__
-#define __GST_BIN_H__
-
-#include <gst/gstelement.h>
-#include <gst/gstiterator.h>
-#include <gst/gstbus.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BIN             (gst_bin_get_type ())
-#define GST_IS_BIN(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_BIN))
-#define GST_IS_BIN_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_BIN))
-#define GST_BIN_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BIN, GstBinClass))
-#define GST_BIN(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_BIN, GstBin))
-#define GST_BIN_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_BIN, GstBinClass))
-#define GST_BIN_CAST(obj)        ((GstBin*)(obj))
-
-/**
- * GstBinFlags:
- * @GST_BIN_FLAG_NO_RESYNC: don't resync a state change when elements are
- *             added or linked in the bin (Since 1.0.5)
- * @GST_BIN_FLAG_LAST: the last enum in the series of flags for bins.
- * Derived classes can use this as first value in a list of flags.
- *
- * GstBinFlags are a set of flags specific to bins. Most are set/used
- * internally. They can be checked using the GST_OBJECT_FLAG_IS_SET () macro,
- * and (un)set using GST_OBJECT_FLAG_SET () and GST_OBJECT_FLAG_UNSET ().
- */
-typedef enum {
-  GST_BIN_FLAG_NO_RESYNC	= (GST_ELEMENT_FLAG_LAST << 0),
-  /* padding */
-  GST_BIN_FLAG_LAST		= (GST_ELEMENT_FLAG_LAST << 5)
-} GstBinFlags;
-
-/**
- * GST_BIN_IS_NO_RESYNC:
- * @bin: A #GstBin
- *
- * Check if @bin will resync its state change when elements are added and
- * removed.
- *
- * Since: 1.0.5
- */
-#define GST_BIN_IS_NO_RESYNC(bin)        (GST_OBJECT_FLAG_IS_SET(bin,GST_BIN_FLAG_NO_RESYNC))
-
-typedef struct _GstBin GstBin;
-typedef struct _GstBinClass GstBinClass;
-typedef struct _GstBinPrivate GstBinPrivate;
-
-/**
- * GST_BIN_NUMCHILDREN:
- * @bin: a #GstBin
- *
- * Gets the number of children in a bin.
- */
-#define GST_BIN_NUMCHILDREN(bin)	(GST_BIN_CAST(bin)->numchildren)
-/**
- * GST_BIN_CHILDREN:
- * @bin: a #GstBin
- *
- * Gets the list with children in a bin.
- */
-#define GST_BIN_CHILDREN(bin)		(GST_BIN_CAST(bin)->children)
-/**
- * GST_BIN_CHILDREN_COOKIE:
- * @bin: a #GstBin
- *
- * Gets the children cookie that watches the children list.
- */
-#define GST_BIN_CHILDREN_COOKIE(bin)	(GST_BIN_CAST(bin)->children_cookie)
-
-/**
- * GstBin:
- * @numchildren: the number of children in this bin
- * @children: (element-type Gst.Element): the list of children in this bin
- * @children_cookie: updated whenever @children changes
- * @child_bus: internal bus for handling child messages
- * @messages: (element-type Gst.Message): queued and cached messages
- * @polling: the bin is currently calculating its state
- * @state_dirty: the bin needs to recalculate its state (deprecated)
- * @clock_dirty: the bin needs to select a new clock
- * @provided_clock: the last clock selected
- * @clock_provider: the element that provided @provided_clock
- *
- * The GstBin base class. Subclasses can access these fields provided
- * the LOCK is taken.
- */
-struct _GstBin {
-  GstElement	 element;
-
-  /*< public >*/ /* with LOCK */
-  /* our children, subclass are supposed to update these
-   * fields to reflect their state with _iterate_*() */
-  gint		 numchildren;
-  GList		*children;
-  guint32	 children_cookie;
-
-  GstBus        *child_bus;
-  GList         *messages;
-
-  gboolean	 polling;
-  gboolean       state_dirty;
-
-  gboolean       clock_dirty;
-  GstClock	*provided_clock;
-  GstElement    *clock_provider;
-
-  /*< private >*/
-  GstBinPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstBinClass:
- * @parent_class: bin parent class
- * @add_element: method to add an element to a bin
- * @remove_element: method to remove an element from a bin
- * @handle_message: method to handle a message from the children
- *
- * Subclasses can override the @add_element and @remove_element to
- * update the list of children in the bin.
- *
- * The @handle_message method can be overridden to implement custom
- * message handling.  @handle_message takes ownership of the message, just like
- * #gst_element_post_message.
- */
-struct _GstBinClass {
-  GstElementClass parent_class;
-
-  /*< private >*/
-  GThreadPool  *pool;
-
-  /* signals */
-  void		(*element_added)	(GstBin *bin, GstElement *child);
-  void		(*element_removed)	(GstBin *bin, GstElement *child);
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-  gboolean	(*add_element)		(GstBin *bin, GstElement *element);
-  gboolean	(*remove_element)	(GstBin *bin, GstElement *element);
-
-  void		(*handle_message)	(GstBin *bin, GstMessage *message);
-
-  /*< private >*/
-  /* signal */
-  gboolean	(*do_latency)           (GstBin *bin);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType		gst_bin_get_type		(void);
-GstElement*	gst_bin_new			(const gchar *name);
-
-/* add and remove elements from the bin */
-gboolean	gst_bin_add			(GstBin *bin, GstElement *element);
-gboolean	gst_bin_remove			(GstBin *bin, GstElement *element);
-
-/* retrieve a single child */
-GstElement*	gst_bin_get_by_name		 (GstBin *bin, const gchar *name);
-GstElement*	gst_bin_get_by_name_recurse_up	 (GstBin *bin, const gchar *name);
-GstElement*	gst_bin_get_by_interface	 (GstBin *bin, GType iface);
-
-/* retrieve multiple children */
-GstIterator*    gst_bin_iterate_elements	 (GstBin *bin);
-GstIterator*    gst_bin_iterate_sorted		 (GstBin *bin);
-GstIterator*    gst_bin_iterate_recurse		 (GstBin *bin);
-
-GstIterator*	gst_bin_iterate_sinks		 (GstBin *bin);
-GstIterator*	gst_bin_iterate_sources		 (GstBin *bin);
-GstIterator*	gst_bin_iterate_all_by_interface (GstBin *bin, GType iface);
-
-/* latency */
-gboolean        gst_bin_recalculate_latency      (GstBin * bin);
-
-
-G_END_DECLS
-
-
-#endif /* __GST_BIN_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbuffer.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbuffer.h
deleted file mode 100644
index 49ad3d54..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbuffer.h
+++ /dev/null
@@ -1,543 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstbuffer.h: Header for GstBuffer object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_BUFFER_H__
-#define __GST_BUFFER_H__
-
-#include <gst/gstminiobject.h>
-#include <gst/gstclock.h>
-#include <gst/gstallocator.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_buffer_type;
-
-typedef struct _GstBuffer GstBuffer;
-typedef struct _GstBufferPool GstBufferPool;
-
-#define GST_TYPE_BUFFER                         (_gst_buffer_type)
-#define GST_IS_BUFFER(obj)                      (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_BUFFER))
-#define GST_BUFFER_CAST(obj)                    ((GstBuffer *)(obj))
-#define GST_BUFFER(obj)                         (GST_BUFFER_CAST(obj))
-
-/**
- * GST_BUFFER_FLAGS:
- * @buf: a #GstBuffer.
- *
- * A flags word containing #GstBufferFlag flags set on this buffer.
- */
-#define GST_BUFFER_FLAGS(buf)                   GST_MINI_OBJECT_FLAGS(buf)
-/**
- * GST_BUFFER_FLAG_IS_SET:
- * @buf: a #GstBuffer.
- * @flag: the #GstBufferFlag to check.
- *
- * Gives the status of a specific flag on a buffer.
- */
-#define GST_BUFFER_FLAG_IS_SET(buf,flag)        GST_MINI_OBJECT_FLAG_IS_SET (buf, flag)
-/**
- * GST_BUFFER_FLAG_SET:
- * @buf: a #GstBuffer.
- * @flag: the #GstBufferFlag to set.
- *
- * Sets a buffer flag on a buffer.
- */
-#define GST_BUFFER_FLAG_SET(buf,flag)           GST_MINI_OBJECT_FLAG_SET (buf, flag)
-/**
- * GST_BUFFER_FLAG_UNSET:
- * @buf: a #GstBuffer.
- * @flag: the #GstBufferFlag to clear.
- *
- * Clears a buffer flag.
- */
-#define GST_BUFFER_FLAG_UNSET(buf,flag)         GST_MINI_OBJECT_FLAG_UNSET (buf, flag)
-
-
-/**
- * GST_BUFFER_PTS:
- * @buf: a #GstBuffer.:
- *
- * The presentation timestamp (pts) in nanoseconds (as a #GstClockTime)
- * of the data in the buffer. This is the timestamp when the media should be
- * presented to the user.
- * Value will be %GST_CLOCK_TIME_NONE if the pts is unknown.
- */
-#define GST_BUFFER_PTS(buf)                     (GST_BUFFER_CAST(buf)->pts)
-/**
- * GST_BUFFER_DTS:
- * @buf: a #GstBuffer.:
- *
- * The decoding timestamp (dts) in nanoseconds (as a #GstClockTime)
- * of the data in the buffer. This is the timestamp when the media should be
- * decoded or processed otherwise.
- * Value will be %GST_CLOCK_TIME_NONE if the dts is unknown.
- */
-#define GST_BUFFER_DTS(buf)                     (GST_BUFFER_CAST(buf)->dts)
-/**
- * GST_BUFFER_DURATION:
- * @buf: a #GstBuffer.
- *
- * The duration in nanoseconds (as a #GstClockTime) of the data in the buffer.
- * Value will be %GST_CLOCK_TIME_NONE if the duration is unknown.
- */
-#define GST_BUFFER_DURATION(buf)                (GST_BUFFER_CAST(buf)->duration)
-/**
- * GST_BUFFER_OFFSET:
- * @buf: a #GstBuffer.
- *
- * The offset in the source file of the beginning of this buffer.
- */
-#define GST_BUFFER_OFFSET(buf)                  (GST_BUFFER_CAST(buf)->offset)
-/**
- * GST_BUFFER_OFFSET_END:
- * @buf: a #GstBuffer.
- *
- * The offset in the source file of the end of this buffer.
- */
-#define GST_BUFFER_OFFSET_END(buf)              (GST_BUFFER_CAST(buf)->offset_end)
-
-/**
- * GST_BUFFER_OFFSET_NONE:
- *
- * Constant for no-offset return results.
- */
-#define GST_BUFFER_OFFSET_NONE  ((guint64)-1)
-
-/**
- * GST_BUFFER_DURATION_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the duration is known.
- */
-#define GST_BUFFER_DURATION_IS_VALID(buffer)    (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DURATION (buffer)))
-/**
- * GST_BUFFER_PTS_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the pts is known.
- */
-#define GST_BUFFER_PTS_IS_VALID(buffer)   (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buffer)))
-/**
- * GST_BUFFER_DTS_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the dts is known.
- */
-#define GST_BUFFER_DTS_IS_VALID(buffer)   (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS (buffer)))
-/**
- * GST_BUFFER_OFFSET_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the start offset is known.
- */
-#define GST_BUFFER_OFFSET_IS_VALID(buffer)      (GST_BUFFER_OFFSET (buffer) != GST_BUFFER_OFFSET_NONE)
-/**
- * GST_BUFFER_OFFSET_END_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the end offset is known.
- */
-#define GST_BUFFER_OFFSET_END_IS_VALID(buffer)  (GST_BUFFER_OFFSET_END (buffer) != GST_BUFFER_OFFSET_NONE)
-/**
- * GST_BUFFER_IS_DISCONT:
- * @buffer: a #GstBuffer
- *
- * Tests if the buffer marks a discontinuity in the stream.
- */
-#define GST_BUFFER_IS_DISCONT(buffer)   (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT))
-
-/**
- * GstBufferFlags:
- * @GST_BUFFER_FLAG_LIVE:        the buffer is live data and should be discarded in
- *                               the PAUSED state.
- * @GST_BUFFER_FLAG_DECODE_ONLY: the buffer contains data that should be dropped
- *                               because it will be clipped against the segment
- *                               boundaries or because it does not contain data
- *                               that should be shown to the user.
- * @GST_BUFFER_FLAG_DISCONT:     the buffer marks a data discontinuity in the stream.
- *                               This typically occurs after a seek or a dropped buffer
- *                               from a live or network source.
- * @GST_BUFFER_FLAG_RESYNC:      the buffer timestamps might have a discontinuity
- *                               and this buffer is a good point to resynchronize.
- * @GST_BUFFER_FLAG_CORRUPTED:   the buffer data is corrupted.
- * @GST_BUFFER_FLAG_MARKER:      the buffer contains a media specific marker. for
- *                               video this is typically the end of a frame boundary, for audio
- *                               this is usually the start of a talkspurt.
- * @GST_BUFFER_FLAG_HEADER:      the buffer contains header information that is
- *                               needed to decode the following data.
- * @GST_BUFFER_FLAG_GAP:         the buffer has been created to fill a gap in the
- *                               stream and contains media neutral data (elements can
- *                               switch to optimized code path that ignores the buffer
- *                               content).
- * @GST_BUFFER_FLAG_DROPPABLE:   the buffer can be dropped without breaking the
- *                               stream, for example to reduce bandwidth.
- * @GST_BUFFER_FLAG_DELTA_UNIT:  this unit cannot be decoded independently.
- * @GST_BUFFER_FLAG_LAST:        additional media specific flags can be added starting from
- *                               this flag.
- *
- * A set of buffer flags used to describe properties of a #GstBuffer.
- */
-typedef enum {
-  GST_BUFFER_FLAG_LIVE        = (GST_MINI_OBJECT_FLAG_LAST << 0),
-  GST_BUFFER_FLAG_DECODE_ONLY = (GST_MINI_OBJECT_FLAG_LAST << 1),
-  GST_BUFFER_FLAG_DISCONT     = (GST_MINI_OBJECT_FLAG_LAST << 2),
-  GST_BUFFER_FLAG_RESYNC      = (GST_MINI_OBJECT_FLAG_LAST << 3),
-  GST_BUFFER_FLAG_CORRUPTED   = (GST_MINI_OBJECT_FLAG_LAST << 4),
-  GST_BUFFER_FLAG_MARKER      = (GST_MINI_OBJECT_FLAG_LAST << 5),
-  GST_BUFFER_FLAG_HEADER      = (GST_MINI_OBJECT_FLAG_LAST << 6),
-  GST_BUFFER_FLAG_GAP         = (GST_MINI_OBJECT_FLAG_LAST << 7),
-  GST_BUFFER_FLAG_DROPPABLE   = (GST_MINI_OBJECT_FLAG_LAST << 8),
-  GST_BUFFER_FLAG_DELTA_UNIT  = (GST_MINI_OBJECT_FLAG_LAST << 9),
-
-  GST_BUFFER_FLAG_LAST        = (GST_MINI_OBJECT_FLAG_LAST << 16)
-} GstBufferFlags;
-
-/**
- * GstBuffer:
- * @mini_object: the parent structure
- * @pool: pointer to the pool owner of the buffer
- * @pts: presentation timestamp of the buffer, can be #GST_CLOCK_TIME_NONE when the
- *     pts is not known or relevant. The pts contains the timestamp when the
- *     media should be presented to the user.
- * @dts: decoding timestamp of the buffer, can be #GST_CLOCK_TIME_NONE when the
- *     dts is not known or relevant. The dts contains the timestamp when the
- *     media should be processed.
- * @duration: duration in time of the buffer data, can be #GST_CLOCK_TIME_NONE
- *     when the duration is not known or relevant.
- * @offset: a media specific offset for the buffer data.
- *     For video frames, this is the frame number of this buffer.
- *     For audio samples, this is the offset of the first sample in this buffer.
- *     For file data or compressed data this is the byte offset of the first
- *       byte in this buffer.
- * @offset_end: the last offset contained in this buffer. It has the same
- *     format as @offset.
- *
- * The structure of a #GstBuffer. Use the associated macros to access the public
- * variables.
- */
-struct _GstBuffer {
-  GstMiniObject          mini_object;
-
-  /*< public >*/ /* with COW */
-  GstBufferPool         *pool;
-
-  /* timestamp */
-  GstClockTime           pts;
-  GstClockTime           dts;
-  GstClockTime           duration;
-
-  /* media specific offset */
-  guint64                offset;
-  guint64                offset_end;
-};
-
-GType       gst_buffer_get_type            (void);
-
-/* allocation */
-GstBuffer * gst_buffer_new                 (void);
-GstBuffer * gst_buffer_new_allocate        (GstAllocator * allocator, gsize size,
-                                            GstAllocationParams * params);
-GstBuffer * gst_buffer_new_wrapped_full    (GstMemoryFlags flags, gpointer data, gsize maxsize,
-                                            gsize offset, gsize size, gpointer user_data,
-                                            GDestroyNotify notify);
-GstBuffer * gst_buffer_new_wrapped         (gpointer data, gsize size);
-
-/* memory blocks */
-guint       gst_buffer_n_memory             (GstBuffer *buffer);
-void        gst_buffer_insert_memory        (GstBuffer *buffer, gint idx, GstMemory *mem);
-void        gst_buffer_replace_memory_range (GstBuffer *buffer, guint idx, gint length, GstMemory *mem);
-GstMemory * gst_buffer_peek_memory          (GstBuffer *buffer, guint idx);
-GstMemory * gst_buffer_get_memory_range     (GstBuffer *buffer, guint idx, gint length);
-void        gst_buffer_remove_memory_range  (GstBuffer *buffer, guint idx, gint length);
-
-void        gst_buffer_prepend_memory       (GstBuffer *buffer, GstMemory *mem);
-void        gst_buffer_append_memory        (GstBuffer *buffer, GstMemory *mem);
-void        gst_buffer_replace_memory       (GstBuffer *buffer, guint idx, GstMemory *mem);
-void        gst_buffer_replace_all_memory   (GstBuffer *buffer, GstMemory *mem);
-GstMemory * gst_buffer_get_memory           (GstBuffer *buffer, guint idx);
-GstMemory * gst_buffer_get_all_memory       (GstBuffer *buffer);
-void        gst_buffer_remove_memory        (GstBuffer *buffer, guint idx);
-void        gst_buffer_remove_all_memory    (GstBuffer *buffer);
-
-gboolean    gst_buffer_find_memory         (GstBuffer *buffer, gsize offset, gsize size,
-                                            guint *idx, guint *length, gsize *skip);
-
-gsize       gst_buffer_fill                (GstBuffer *buffer, gsize offset,
-                                            gconstpointer src, gsize size);
-gsize       gst_buffer_extract             (GstBuffer *buffer, gsize offset,
-                                            gpointer dest, gsize size);
-gint        gst_buffer_memcmp              (GstBuffer *buffer, gsize offset,
-                                            gconstpointer mem, gsize size);
-gsize       gst_buffer_memset              (GstBuffer *buffer, gsize offset,
-                                            guint8 val, gsize size);
-
-gsize       gst_buffer_get_sizes_range     (GstBuffer *buffer, guint idx, gint length,
-                                            gsize *offset, gsize *maxsize);
-void        gst_buffer_resize_range        (GstBuffer *buffer, guint idx, gint length,
-                                            gssize offset, gssize size);
-
-gsize       gst_buffer_get_sizes           (GstBuffer *buffer, gsize *offset, gsize *maxsize);
-gsize       gst_buffer_get_size            (GstBuffer *buffer);
-void        gst_buffer_resize              (GstBuffer *buffer, gssize offset, gssize size);
-void        gst_buffer_set_size            (GstBuffer *buffer, gssize size);
-
-gboolean    gst_buffer_map_range           (GstBuffer *buffer, guint idx, gint length,
-                                            GstMapInfo *info, GstMapFlags flags);
-gboolean    gst_buffer_map                 (GstBuffer *buffer, GstMapInfo *info, GstMapFlags flags);
-
-void        gst_buffer_unmap               (GstBuffer *buffer, GstMapInfo *info);
-
-
-/* refcounting */
-/**
- * gst_buffer_ref:
- * @buf: a #GstBuffer.
- *
- * Increases the refcount of the given buffer by one.
- *
- * Note that the refcount affects the writeability
- * of @buf and its metadata, see gst_buffer_is_writable().
- * It is important to note that keeping additional references to
- * GstBuffer instances can potentially increase the number
- * of memcpy operations in a pipeline.
- *
- * Returns: (transfer full): @buf
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBuffer * gst_buffer_ref (GstBuffer * buf);
-#endif
-
-static inline GstBuffer *
-gst_buffer_ref (GstBuffer * buf)
-{
-  return (GstBuffer *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (buf));
-}
-
-/**
- * gst_buffer_unref:
- * @buf: (transfer full): a #GstBuffer.
- *
- * Decreases the refcount of the buffer. If the refcount reaches 0, the buffer
- * with the associated metadata and memory will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_buffer_unref (GstBuffer * buf);
-#endif
-
-static inline void
-gst_buffer_unref (GstBuffer * buf)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (buf));
-}
-
-/* copy buffer */
-/**
- * gst_buffer_copy:
- * @buf: a #GstBuffer.
- *
- * Create a copy of the given buffer. This will also make a newly allocated
- * copy of the data the source buffer contains.
- *
- * Returns: (transfer full): a new copy of @buf.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBuffer * gst_buffer_copy (const GstBuffer * buf);
-#endif
-
-static inline GstBuffer *
-gst_buffer_copy (const GstBuffer * buf)
-{
-  return GST_BUFFER (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (buf)));
-}
-
-
-/**
- * GstBufferCopyFlags:
- * @GST_BUFFER_COPY_NONE: copy nothing
- * @GST_BUFFER_COPY_FLAGS: flag indicating that buffer flags should be copied
- * @GST_BUFFER_COPY_TIMESTAMPS: flag indicating that buffer pts, dts,
- * duration, offset and offset_end should be copied
- * @GST_BUFFER_COPY_MEMORY: flag indicating that buffer memory should be copied
- * and appended to already existing memory
- * @GST_BUFFER_COPY_MERGE: flag indicating that buffer memory should be
- * merged
- * @GST_BUFFER_COPY_META: flag indicating that buffer meta should be
- * copied
- *
- * A set of flags that can be provided to the gst_buffer_copy_into()
- * function to specify which items should be copied.
- */
-typedef enum {
-  GST_BUFFER_COPY_NONE           = 0,
-  GST_BUFFER_COPY_FLAGS          = (1 << 0),
-  GST_BUFFER_COPY_TIMESTAMPS     = (1 << 1),
-  GST_BUFFER_COPY_META           = (1 << 2),
-  GST_BUFFER_COPY_MEMORY         = (1 << 3),
-  GST_BUFFER_COPY_MERGE          = (1 << 4)
-} GstBufferCopyFlags;
-
-/**
- * GST_BUFFER_COPY_METADATA:
- *
- * Combination of all possible metadata fields that can be copied with
- * gst_buffer_copy_into().
- */
-#define GST_BUFFER_COPY_METADATA       (GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS |\
-                                        GST_BUFFER_COPY_META)
-
-/**
- * GST_BUFFER_COPY_ALL:
- *
- * Combination of all possible fields that can be copied with
- * gst_buffer_copy_into().
- */
-#define GST_BUFFER_COPY_ALL  ((GstBufferCopyFlags)(GST_BUFFER_COPY_METADATA | GST_BUFFER_COPY_MEMORY))
-
-/* copies memory or metadata into newly allocated buffer */
-void            gst_buffer_copy_into            (GstBuffer *dest, GstBuffer *src,
-                                                 GstBufferCopyFlags flags,
-                                                 gsize offset, gsize size);
-
-/**
- * gst_buffer_is_writable:
- * @buf: a #GstBuffer
- *
- * Tests if you can safely write to a buffer's metadata or its memory array.
- * It is only safe to change buffer metadata when the current reference is
- * writable, i.e. nobody can see the modifications you will make.
- */
-#define         gst_buffer_is_writable(buf)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (buf))
-/**
- * gst_buffer_make_writable:
- * @buf: (transfer full): a #GstBuffer
- *
- * Makes a writable buffer from the given buffer. If the source buffer is
- * already writable, this will simply return the same buffer. A copy will
- * otherwise be made using gst_buffer_copy().
- *
- * Returns: (transfer full): a writable buffer which may or may not be the
- *     same as @buf
- */
-#define         gst_buffer_make_writable(buf)   GST_BUFFER_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (buf)))
-
-/**
- * gst_buffer_replace:
- * @obuf: (inout) (transfer full): pointer to a pointer to a #GstBuffer to be
- *     replaced.
- * @nbuf: (transfer none) (allow-none): pointer to a #GstBuffer that will
- *     replace the buffer pointed to by @obuf.
- *
- * Modifies a pointer to a #GstBuffer to point to a different #GstBuffer. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * buffer is unreffed, the new is reffed).
- *
- * Either @nbuf or the #GstBuffer pointed to by @obuf may be NULL.
- *
- * Returns: TRUE when @obuf was different from @nbuf.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf);
-#endif
-
-static inline gboolean
-gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf)
-{
-  return gst_mini_object_replace ((GstMiniObject **) obuf, (GstMiniObject *) nbuf);
-}
-
-/* creating a region */
-GstBuffer*      gst_buffer_copy_region          (GstBuffer *parent, GstBufferCopyFlags flags,
-                                                 gsize offset, gsize size);
-
-/* append two buffers */
-GstBuffer*      gst_buffer_append_region        (GstBuffer *buf1, GstBuffer *buf2,
-                                                 gssize offset, gssize size);
-GstBuffer*      gst_buffer_append               (GstBuffer *buf1, GstBuffer *buf2);
-
-/* metadata */
-#include <gst/gstmeta.h>
-
-/**
- * GstBufferForeachMetaFunc:
- * @buffer: a #GstBuffer
- * @meta: a pointer to a #GstMeta
- * @user_data: user data passed to gst_buffer_foreach_meta()
- *
- * A function that will be called from gst_buffer_foreach_meta(). The @meta
- * field will point to a the reference of the meta.
- *
- * @buffer should not be modified from this callback.
- *
- * When this function returns %TRUE, the next meta will be
- * returned. When %FALSE is returned, gst_buffer_foreach_meta() will return.
- *
- * When @meta is set to NULL, the item will be removed from the buffer.
- *
- * Returns: %FALSE when gst_buffer_foreach_meta() should stop
- */
-typedef gboolean (*GstBufferForeachMetaFunc)    (GstBuffer *buffer, GstMeta **meta,
-                                                 gpointer user_data);
-
-GstMeta *       gst_buffer_get_meta             (GstBuffer *buffer, GType api);
-GstMeta *       gst_buffer_add_meta             (GstBuffer *buffer, const GstMetaInfo *info,
-                                                 gpointer params);
-gboolean        gst_buffer_remove_meta          (GstBuffer *buffer, GstMeta *meta);
-
-GstMeta *       gst_buffer_iterate_meta         (GstBuffer *buffer, gpointer *state);
-
-gboolean        gst_buffer_foreach_meta         (GstBuffer *buffer,
-                                                 GstBufferForeachMetaFunc func,
-                                                 gpointer user_data);
-
-/**
- * gst_value_set_buffer:
- * @v: a #GValue to receive the data
- * @b: (transfer none): a #GstBuffer to assign to the GstValue
- *
- * Sets @b as the value of @v.  Caller retains reference to buffer.
- */
-#define         gst_value_set_buffer(v,b)       g_value_set_boxed((v),(b))
-/**
- * gst_value_take_buffer:
- * @v: a #GValue to receive the data
- * @b: (transfer full): a #GstBuffer to assign to the GstValue
- *
- * Sets @b as the value of @v.  Caller gives away reference to buffer.
- */
-#define         gst_value_take_buffer(v,b)      g_value_take_boxed(v,(b))
-/**
- * gst_value_get_buffer:
- * @v: a #GValue to query
- *
- * Receives a #GstBuffer as the value of @v. Does not return a reference to
- * the buffer, so the pointer is only valid for as long as the caller owns
- * a reference to @v.
- *
- * Returns: (transfer none): buffer
- */
-#define         gst_value_get_buffer(v)         GST_BUFFER_CAST (g_value_get_boxed(v))
-
-G_END_DECLS
-
-#endif /* __GST_BUFFER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbufferlist.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbufferlist.h
deleted file mode 100644
index eff9d9ca..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbufferlist.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Axis Communications <dev-gstreamer at axis dot com>
- * @author Jonas Holmberg <jonas dot holmberg at axis dot com>
- *
- * gstbufferlist.h: Header for GstBufferList object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BUFFER_LIST_H__
-#define __GST_BUFFER_LIST_H__
-
-#include <gst/gstbuffer.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_buffer_list_type;
-
-#define GST_TYPE_BUFFER_LIST      (_gst_buffer_list_type)
-#define GST_IS_BUFFER_LIST(obj)   (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_BUFFER_LIST))
-#define GST_BUFFER_LIST_CAST(obj) ((GstBufferList *)obj)
-#define GST_BUFFER_LIST(obj)      (GST_BUFFER_LIST_CAST(obj))
-
-typedef struct _GstBufferList GstBufferList;
-
-/**
- * GstBufferListFunc:
- * @buffer: pointer the buffer
- * @idx: the index of @buffer
- * @user_data: user data passed to gst_buffer_list_foreach()
- *
- * A function that will be called from gst_buffer_list_foreach(). The @buffer
- * field will point to a the reference of the buffer at @idx.
- *
- * When this function returns %TRUE, the next buffer will be
- * returned. When %FALSE is returned, gst_buffer_list_foreach() will return.
- *
- * When @buffer is set to NULL, the item will be removed from the bufferlist.
- * When @buffer has been made writable, the new buffer reference can be assigned
- * to @buffer. This function is responsible for unreffing the old buffer when
- * removing or modifying.
- *
- * Returns: %FALSE when gst_buffer_list_foreach() should stop
- */
-typedef gboolean   (*GstBufferListFunc)   (GstBuffer **buffer, guint idx,
-                                           gpointer user_data);
-
-
-/* refcounting */
-/**
- * gst_buffer_list_ref:
- * @list: a #GstBufferList
- *
- * Increases the refcount of the given buffer list by one.
- *
- * Note that the refcount affects the writeability of @list and its data, see
- * gst_buffer_list_make_writable(). It is important to note that keeping
- * additional references to GstBufferList instances can potentially increase
- * the number of memcpy operations in a pipeline.
- *
- * Returns: (transfer full): @list
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBufferList * gst_buffer_list_ref (GstBufferList * list);
-#endif
-
-static inline GstBufferList *
-gst_buffer_list_ref (GstBufferList * list)
-{
-  return GST_BUFFER_LIST_CAST (gst_mini_object_ref (GST_MINI_OBJECT_CAST (
-      list)));
-}
-
-/**
- * gst_buffer_list_unref:
- * @list: (transfer full): a #GstBufferList
- *
- * Decreases the refcount of the buffer list. If the refcount reaches 0, the
- * buffer list will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_buffer_list_unref (GstBufferList * list);
-#endif
-
-static inline void
-gst_buffer_list_unref (GstBufferList * list)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (list));
-}
-
-/* copy */
-/**
- * gst_buffer_list_copy:
- * @list: a #GstBufferList
- *
- * Create a shallow copy of the given buffer list. This will make a newly
- * allocated copy of the source list with copies of buffer pointers. The
- * refcount of buffers pointed to will be increased by one.
- *
- * Returns: (transfer full): a new copy of @list.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBufferList * gst_buffer_list_copy (const GstBufferList * list);
-#endif
-
-static inline GstBufferList *
-gst_buffer_list_copy (const GstBufferList * list)
-{
-  return GST_BUFFER_LIST_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (list)));
-}
-
-/**
- * gst_buffer_list_is_writable:
- * @list: a #GstBufferList
- *
- * Tests if you can safely add buffers and groups into a buffer list.
- */
-#define gst_buffer_list_is_writable(list) gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (list))
-
-/**
- * gst_buffer_list_make_writable:
- * @list: (transfer full): a #GstBufferList
- *
- * Makes a writable buffer list from the given buffer list. If the source buffer
- * list is already writable, this will simply return the same buffer list. A
- * copy will otherwise be made using gst_buffer_list_copy().
- *
- * Returns: (transfer full): a writable list, which may or may not be the
- *     same as @list
- */
-#define gst_buffer_list_make_writable(list) GST_BUFFER_LIST_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (list)))
-
-GType                    gst_buffer_list_get_type              (void);
-
-/* allocation */
-GstBufferList *          gst_buffer_list_new                   (void) G_GNUC_MALLOC;
-GstBufferList *          gst_buffer_list_new_sized             (guint size) G_GNUC_MALLOC;
-
-guint                    gst_buffer_list_length                (GstBufferList *list);
-
-GstBuffer *              gst_buffer_list_get                   (GstBufferList *list, guint idx);
-void                     gst_buffer_list_insert                (GstBufferList *list, gint idx, GstBuffer *buffer);
-void                     gst_buffer_list_remove                (GstBufferList *list, guint idx, guint length);
-
-gboolean                 gst_buffer_list_foreach               (GstBufferList *list,
-                                                                GstBufferListFunc func,
-								gpointer user_data);
-
-#define gst_buffer_list_add(l,b) gst_buffer_list_insert((l),-1,(b));
-
-G_END_DECLS
-
-#endif /* __GST_BUFFER_LIST_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbufferpool.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbufferpool.h
deleted file mode 100644
index b718f995..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbufferpool.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* GStreamer
- * Copyright (C) 2010 Wim Taymans <wim.taymans@gmail.com>
- *
- * gstbufferpool.h: Header for GstBufferPool object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_BUFFER_POOL_H__
-#define __GST_BUFFER_POOL_H__
-
-#include <gst/gstminiobject.h>
-#include <gst/gstpad.h>
-#include <gst/gstbuffer.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstBufferPoolPrivate GstBufferPoolPrivate;
-typedef struct _GstBufferPoolClass GstBufferPoolClass;
-
-#define GST_TYPE_BUFFER_POOL                 (gst_buffer_pool_get_type())
-#define GST_IS_BUFFER_POOL(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_BUFFER_POOL))
-#define GST_IS_BUFFER_POOL_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_BUFFER_POOL))
-#define GST_BUFFER_POOL_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BUFFER_POOL, GstBufferPoolClass))
-#define GST_BUFFER_POOL(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_BUFFER_POOL, GstBufferPool))
-#define GST_BUFFER_POOL_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_BUFFER_POOL, GstBufferPoolClass))
-#define GST_BUFFER_POOL_CAST(obj)            ((GstBufferPool *)(obj))
-
-/**
- * GstBufferPoolAcquireFlags:
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_NONE: no flags
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT: buffer is keyframe
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT: when the bufferpool is empty, acquire_buffer
- * will by default block until a buffer is released into the pool again. Setting
- * this flag makes acquire_buffer return #GST_FLOW_EOS instead of blocking.
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT: buffer is discont
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_LAST: last flag, subclasses can use private flags
- *    starting from this value.
- *
- * Additional flags to control the allocation of a buffer
- */
-typedef enum {
-  GST_BUFFER_POOL_ACQUIRE_FLAG_NONE     = 0,
-  GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT = (1 << 0),
-  GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT = (1 << 1),
-  GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT  = (1 << 2),
-  GST_BUFFER_POOL_ACQUIRE_FLAG_LAST     = (1 << 16),
-} GstBufferPoolAcquireFlags;
-
-typedef struct _GstBufferPoolAcquireParams GstBufferPoolAcquireParams;
-
-/**
- * GstBufferPoolAcquireParams:
- * @format: the format of @start and @stop
- * @start: the start position
- * @stop: the stop position
- * @flags: additional flags
- *
- * Parameters passed to the gst_buffer_pool_acquire_buffer() function to control the
- * allocation of the buffer.
- *
- * The default implementation ignores the @start and @stop members but other
- * implementations can use this extra information to decide what buffer to
- * return.
- */
-struct _GstBufferPoolAcquireParams {
-  GstFormat                 format;
-  gint64                    start;
-  gint64                    stop;
-  GstBufferPoolAcquireFlags flags;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GST_BUFFER_POOL_IS_FLUSHING:
- * @pool: a GstBufferPool
- *
- * Check if the bufferpool is flushing. Subclasses might want to check the
- * state of the pool in the acquire function.
- */
-#define GST_BUFFER_POOL_IS_FLUSHING(pool)  (g_atomic_int_get (&pool->flushing))
-
-/**
- * GstBufferPool:
- * @object: the parent structure
- *
- * The structure of a #GstBufferPool. Use the associated macros to access the public
- * variables.
- */
-struct _GstBufferPool {
-  GstObject            object;
-
-  /*< protected >*/
-  gint                 flushing;
-
-  /*< private >*/
-  GstBufferPoolPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstBufferPoolClass:
- * @object_class:  Object parent class
- * @get_options: get a list of options supported by this pool
- * @set_config: apply the bufferpool configuration. The default configuration
- *              will parse the default config parameters
- * @start: start the bufferpool. The default implementation will preallocate
- *         min-buffers buffers and put them in the queue
- * @stop: stop the bufferpool. the default implementation will free the
- *        preallocated buffers. This function is called when all the buffers are
- *        returned to the pool.
- * @acquire_buffer: get a new buffer from the pool. The default implementation
- *        will take a buffer from the queue and optionally wait for a buffer to
- *        be released when there are no buffers available.
- * @alloc_buffer: allocate a buffer. the default implementation allocates
- *        buffers from the configured memory allocator and with the configured
- *        parameters. All metadata that is present on the allocated buffer will
- *        be marked as #GST_META_FLAG_POOLED and #GST_META_FLAG_LOCKED and will
- *        not be removed from the buffer in @reset_buffer.
- * @reset_buffer: reset the buffer to its state when it was freshly allocated.
- *        The default implementation will clear the flags, timestamps and
- *        will remove the metadata without the #GST_META_FLAG_POOLED flag (even
- *        the metadata with #GST_META_FLAG_LOCKED).
- * @release_buffer: release a buffer back in the pool. The default
- *        implementation will put the buffer back in the queue and notify any
- *        blocking acquire_buffer calls.
- * @free_buffer: free a buffer. The default implementation unrefs the buffer.
- *
- * The GstBufferPool class.
- */
-struct _GstBufferPoolClass {
-  GstObjectClass    object_class;
-
-  /* vmethods */
-  const gchar ** (*get_options)    (GstBufferPool *pool);
-  gboolean       (*set_config)     (GstBufferPool *pool, GstStructure *config);
-
-  gboolean       (*start)          (GstBufferPool *pool);
-  gboolean       (*stop)           (GstBufferPool *pool);
-
-  GstFlowReturn  (*acquire_buffer) (GstBufferPool *pool, GstBuffer **buffer,
-                                    GstBufferPoolAcquireParams *params);
-  GstFlowReturn  (*alloc_buffer)   (GstBufferPool *pool, GstBuffer **buffer,
-                                    GstBufferPoolAcquireParams *params);
-  void           (*reset_buffer)   (GstBufferPool *pool, GstBuffer *buffer);
-  void           (*release_buffer) (GstBufferPool *pool, GstBuffer *buffer);
-  void           (*free_buffer)    (GstBufferPool *pool, GstBuffer *buffer);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType       gst_buffer_pool_get_type (void);
-
-/* allocation */
-GstBufferPool *  gst_buffer_pool_new  (void);
-
-/* state management */
-gboolean         gst_buffer_pool_set_active      (GstBufferPool *pool, gboolean active);
-gboolean         gst_buffer_pool_is_active       (GstBufferPool *pool);
-
-gboolean         gst_buffer_pool_set_config      (GstBufferPool *pool, GstStructure *config);
-GstStructure *   gst_buffer_pool_get_config      (GstBufferPool *pool);
-
-const gchar **   gst_buffer_pool_get_options     (GstBufferPool *pool);
-gboolean         gst_buffer_pool_has_option      (GstBufferPool *pool, const gchar *option);
-
-/* helpers for configuring the config structure */
-void             gst_buffer_pool_config_set_params    (GstStructure *config, GstCaps *caps,
-                                                       guint size, guint min_buffers, guint max_buffers);
-gboolean         gst_buffer_pool_config_get_params    (GstStructure *config, GstCaps **caps,
-                                                       guint *size, guint *min_buffers, guint *max_buffers);
-void             gst_buffer_pool_config_set_allocator (GstStructure *config, GstAllocator *allocator,
-                                                       const GstAllocationParams *params);
-gboolean         gst_buffer_pool_config_get_allocator (GstStructure *config, GstAllocator **allocator,
-                                                       GstAllocationParams *params);
-
-/* options */
-guint            gst_buffer_pool_config_n_options   (GstStructure *config);
-void             gst_buffer_pool_config_add_option  (GstStructure *config, const gchar *option);
-const gchar *    gst_buffer_pool_config_get_option  (GstStructure *config, guint index);
-gboolean         gst_buffer_pool_config_has_option  (GstStructure *config, const gchar *option);
-
-/* buffer management */
-GstFlowReturn    gst_buffer_pool_acquire_buffer  (GstBufferPool *pool, GstBuffer **buffer,
-                                                  GstBufferPoolAcquireParams *params);
-void             gst_buffer_pool_release_buffer  (GstBufferPool *pool, GstBuffer *buffer);
-
-G_END_DECLS
-
-#endif /* __GST_BUFFER_POOL_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbus.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbus.h
deleted file mode 100644
index ed05ddba..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstbus.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
- *
- * gstbus.h: Header for GstBus subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BUS_H__
-#define __GST_BUS_H__
-
-typedef struct _GstBus GstBus;
-typedef struct _GstBusPrivate GstBusPrivate;
-typedef struct _GstBusClass GstBusClass;
-
-#include <gst/gstmessage.h>
-#include <gst/gstclock.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-#define GST_TYPE_BUS              (gst_bus_get_type ())
-#define GST_BUS(bus)              (G_TYPE_CHECK_INSTANCE_CAST ((bus), GST_TYPE_BUS, GstBus))
-#define GST_IS_BUS(bus)           (G_TYPE_CHECK_INSTANCE_TYPE ((bus), GST_TYPE_BUS))
-#define GST_BUS_CLASS(bclass)     (G_TYPE_CHECK_CLASS_CAST ((bclass), GST_TYPE_BUS, GstBusClass))
-#define GST_IS_BUS_CLASS(bclass)  (G_TYPE_CHECK_CLASS_TYPE ((bclass), GST_TYPE_BUS))
-#define GST_BUS_GET_CLASS(bus)    (G_TYPE_INSTANCE_GET_CLASS ((bus), GST_TYPE_BUS, GstBusClass))
-#define GST_BUS_CAST(bus)         ((GstBus*)(bus))
-
-/**
- * GstBusFlags:
- * @GST_BUS_FLUSHING: The bus is currently dropping all messages
- * @GST_BUS_FLAG_LAST: offset to define more flags
- *
- * The standard flags that a bus may have.
- */
-typedef enum {
-  GST_BUS_FLUSHING      = (GST_OBJECT_FLAG_LAST << 0),
-  /* padding */
-  GST_BUS_FLAG_LAST     = (GST_OBJECT_FLAG_LAST << 1)
-} GstBusFlags;
-
-/**
- * GstBusSyncReply:
- * @GST_BUS_DROP: drop the message
- * @GST_BUS_PASS: pass the message to the async queue
- * @GST_BUS_ASYNC: pass message to async queue, continue if message is handled
- *
- * The result values for a GstBusSyncHandler.
- */
-typedef enum
-{
-  GST_BUS_DROP = 0,
-  GST_BUS_PASS = 1,
-  GST_BUS_ASYNC = 2
-} GstBusSyncReply;
-
-/**
- * GstBusSyncHandler:
- * @bus: the #GstBus that sent the message
- * @message: the #GstMessage
- * @user_data: user data that has been given, when registering the handler
- *
- * Handler will be invoked synchronously, when a new message has been injected
- * into the bus. This function is mostly used internally. Only one sync handler
- * can be attached to a given bus.
- *
- * If the handler returns GST_BUS_DROP, it should unref the message, else the
- * message should not be unreffed by the sync handler.
- *
- * Returns: #GstBusSyncReply stating what to do with the message
- */
-typedef GstBusSyncReply (*GstBusSyncHandler)    (GstBus * bus, GstMessage * message, gpointer user_data);
-
-/**
- * GstBusFunc:
- * @bus: the #GstBus that sent the message
- * @message: the #GstMessage
- * @user_data: user data that has been given, when registering the handler
- *
- * Specifies the type of function passed to gst_bus_add_watch() or
- * gst_bus_add_watch_full(), which is called from the mainloop when a message
- * is available on the bus.
- *
- * The message passed to the function will be unreffed after execution of this
- * function so it should not be freed in the function.
- *
- * Note that this function is used as a GSourceFunc which means that returning
- * FALSE will remove the GSource from the mainloop.
- *
- * Returns: %FALSE if the event source should be removed.
- */
-typedef gboolean        (*GstBusFunc)           (GstBus * bus, GstMessage * message, gpointer user_data);
-
-/**
- * GstBus:
- *
- * The opaque #GstBus data structure.
- */
-struct _GstBus
-{
-  GstObject         object;
-
-  /*< private >*/
-  GstBusPrivate    *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstBusClass
-{
-  GstObjectClass parent_class;
-
-  /* signals */
-  void (*message)       (GstBus *bus, GstMessage *message);
-  void (*sync_message)  (GstBus *bus, GstMessage *message);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_bus_get_type                (void);
-
-GstBus*                 gst_bus_new                     (void);
-
-gboolean                gst_bus_post                    (GstBus * bus, GstMessage * message);
-
-gboolean                gst_bus_have_pending            (GstBus * bus);
-GstMessage *            gst_bus_peek                    (GstBus * bus);
-GstMessage *            gst_bus_pop                     (GstBus * bus);
-GstMessage *            gst_bus_pop_filtered            (GstBus * bus, GstMessageType types);
-GstMessage *            gst_bus_timed_pop               (GstBus * bus, GstClockTime timeout);
-GstMessage *            gst_bus_timed_pop_filtered      (GstBus * bus, GstClockTime timeout, GstMessageType types);
-void                    gst_bus_set_flushing            (GstBus * bus, gboolean flushing);
-
-/* synchronous dispatching */
-void                    gst_bus_set_sync_handler        (GstBus * bus, GstBusSyncHandler func,
-                                                         gpointer user_data, GDestroyNotify notify);
-/* GSource based dispatching */
-GSource *               gst_bus_create_watch            (GstBus * bus);
-guint                   gst_bus_add_watch_full          (GstBus * bus,
-                                                         gint priority,
-                                                         GstBusFunc func,
-                                                         gpointer user_data,
-                                                         GDestroyNotify notify);
-guint                   gst_bus_add_watch               (GstBus * bus,
-                                                         GstBusFunc func,
-                                                         gpointer user_data);
-
-/* polling the bus */
-GstMessage*             gst_bus_poll                    (GstBus *bus, GstMessageType events,
-                                                         GstClockTime timeout);
-
-/* signal based dispatching helper functions. */
-gboolean                gst_bus_async_signal_func       (GstBus *bus, GstMessage *message,
-                                                         gpointer data);
-GstBusSyncReply         gst_bus_sync_signal_handler     (GstBus *bus, GstMessage *message,
-                                                         gpointer data);
-
-/* convenience api to add/remove a gsource that emits the async signals */
-void                    gst_bus_add_signal_watch        (GstBus * bus);
-void                    gst_bus_add_signal_watch_full   (GstBus * bus, gint priority);
-void                    gst_bus_remove_signal_watch     (GstBus * bus);
-
-void                    gst_bus_enable_sync_message_emission (GstBus * bus);
-void                    gst_bus_disable_sync_message_emission (GstBus * bus);
-
-G_END_DECLS
-
-#endif /* __GST_BUS_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcaps.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcaps.h
deleted file mode 100644
index 923199bd..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcaps.h
+++ /dev/null
@@ -1,447 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 David A. Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CAPS_H__
-#define __GST_CAPS_H__
-
-#include <gst/gstconfig.h>
-#include <gst/gstminiobject.h>
-#include <gst/gststructure.h>
-#include <gst/glib-compat.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_caps_type;
-
-#define GST_TYPE_CAPS             (_gst_caps_type)
-#define GST_IS_CAPS(obj)          (GST_IS_MINI_OBJECT_TYPE((obj), GST_TYPE_CAPS))
-#define GST_CAPS_CAST(obj)        ((GstCaps*)(obj))
-#define GST_CAPS(obj)             (GST_CAPS_CAST(obj))
-
-#define GST_TYPE_STATIC_CAPS      (gst_static_caps_get_type())
-
-/**
- * GstCapsFlags:
- * @GST_CAPS_FLAG_ANY: Caps has no specific content, but can contain
- *    anything.
- *
- * Extra flags for a caps.
- */
-typedef enum {
-  GST_CAPS_FLAG_ANY	= (GST_MINI_OBJECT_FLAG_LAST << 0)
-} GstCapsFlags;
-
-/**
- * GstCapsIntersectMode:
- * @GST_CAPS_INTERSECT_ZIG_ZAG  : Zig-zags over both caps.
- * @GST_CAPS_INTERSECT_FIRST    : Keeps the first caps order.
- *
- * Modes of caps intersection
- *
- * @GST_CAPS_INTERSECT_ZIG_ZAG tries to preserve overall order of both caps
- * by iterating on the caps' structures as the following matrix shows:
- * |[
- *          caps1
- *       +-------------
- *       | 1  2  4  7
- * caps2 | 3  5  8 10
- *       | 6  9 11 12
- * ]|
- * Used when there is no explicit precedence of one caps over the other. e.g.
- * tee's sink pad getcaps function, it will probe its src pad peers' for their
- * caps and intersect them with this mode.
- *
- * @GST_CAPS_INTERSECT_FIRST is useful when an element wants to preserve
- * another element's caps priority order when intersecting with its own caps.
- * Example: If caps1 is [A, B, C] and caps2 is [E, B, D, A], the result
- * would be [A, B], maintaining the first caps priority on the intersection.
- */
-typedef enum {
-  GST_CAPS_INTERSECT_ZIG_ZAG            =  0,
-  GST_CAPS_INTERSECT_FIRST              =  1
-} GstCapsIntersectMode;
-
-/**
- * GST_CAPS_ANY:
- *
- * Means that the element/pad can output 'anything'. Useful for elements
- * that output unknown media, such as filesrc. This macro returns a singleton and
- * should not be unreffed.
- */
-#define GST_CAPS_ANY              _gst_caps_any
-/**
- * GST_CAPS_NONE:
- *
- * The opposite of %GST_CAPS_ANY: it means that the pad/element outputs an
- * undefined media type that can not be detected. This macro returns a singleton
- * and should not be unreffed.
- */
-#define GST_CAPS_NONE             _gst_caps_none
-
-/**
- * GST_STATIC_CAPS_ANY:
- *
- * Creates a new #GstCaps static caps that matches anything.
- * This can be used in pad templates.
- */
-#define GST_STATIC_CAPS_ANY       GST_STATIC_CAPS("ANY")
-/**
- * GST_STATIC_CAPS_NONE:
- *
- * Creates a new #GstCaps static caps that matches nothing.
- * This can be used in pad templates.
- */
-#define GST_STATIC_CAPS_NONE      GST_STATIC_CAPS("NONE")
-
-/**
- * GST_CAPS_IS_SIMPLE:
- * @caps: the #GstCaps instance to check
- *
- * Convenience macro that checks if the number of structures in the given caps
- * is exactly one.
- */
-#define GST_CAPS_IS_SIMPLE(caps) (gst_caps_get_size(caps) == 1)
-
-/**
- * GST_STATIC_CAPS:
- * @string: the string describing the caps
- *
- * Creates a new #GstCaps static caps from an input string.
- * This can be used in pad templates.
- */
-#define GST_STATIC_CAPS(string) \
-{ \
-  /* caps */ NULL, \
-  /* string */ string, \
-  GST_PADDING_INIT \
-}
-
-typedef struct _GstCaps GstCaps;
-typedef struct _GstStaticCaps GstStaticCaps;
-
-GST_EXPORT GstCaps * _gst_caps_any;
-GST_EXPORT GstCaps * _gst_caps_none;
-/**
- * GST_CAPS_FLAGS:
- * @caps: a #GstCaps.
- *
- * A flags word containing #GstCapsFlags flags set on this caps.
- */
-#define GST_CAPS_FLAGS(caps)                    GST_MINI_OBJECT_FLAGS(caps)
-
-/* refcount */
-/**
- * GST_CAPS_REFCOUNT:
- * @caps: a #GstCaps
- *
- * Get access to the reference count field of the caps
- */
-#define GST_CAPS_REFCOUNT(caps)                 GST_MINI_OBJECT_REFCOUNT(caps)
-/**
- * GST_CAPS_REFCOUNT_VALUE:
- * @caps: a #GstCaps
- *
- * Get the reference count value of the caps.
- */
-#define GST_CAPS_REFCOUNT_VALUE(caps)           GST_MINI_OBJECT_REFCOUNT_VALUE(caps)
-
-/**
- * GST_CAPS_FLAG_IS_SET:
- * @caps: a #GstCaps.
- * @flag: the #GstCapsFlags to check.
- *
- * Gives the status of a specific flag on a caps.
- */
-#define GST_CAPS_FLAG_IS_SET(caps,flag)        GST_MINI_OBJECT_FLAG_IS_SET (caps, flag)
-/**
- * GST_CAPS_FLAG_SET:
- * @caps: a #GstCaps.
- * @flag: the #GstCapsFlags to set.
- *
- * Sets a caps flag on a caps.
- */
-#define GST_CAPS_FLAG_SET(caps,flag)           GST_MINI_OBJECT_FLAG_SET (caps, flag)
-/**
- * GST_CAPS_FLAG_UNSET:
- * @caps: a #GstCaps.
- * @flag: the #GstCapsFlags to clear.
- *
- * Clears a caps flag.
- */
-#define GST_CAPS_FLAG_UNSET(caps,flag)         GST_MINI_OBJECT_FLAG_UNSET (caps, flag)
-
-/* refcounting */
-/**
- * gst_caps_ref:
- * @caps: the #GstCaps to reference
- *
- * Add a reference to a #GstCaps object.
- *
- * From this point on, until the caller calls gst_caps_unref() or
- * gst_caps_make_writable(), it is guaranteed that the caps object will not
- * change. This means its structures won't change, etc. To use a #GstCaps
- * object, you must always have a refcount on it -- either the one made
- * implicitly by e.g. gst_caps_new_simple(), or via taking one explicitly with
- * this function.
- *
- * Returns: the same #GstCaps object.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstCaps * gst_caps_ref (GstCaps * caps);
-#endif
-
-static inline GstCaps *
-gst_caps_ref (GstCaps * caps)
-{
-  return (GstCaps *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (caps));
-}
-
-/**
- * gst_caps_unref:
- * @caps: a #GstCaps.
- *
- * Unref a #GstCaps and and free all its structures and the
- * structures' values when the refcount reaches 0.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_caps_unref (GstCaps * caps);
-#endif
-
-static inline void
-gst_caps_unref (GstCaps * caps)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (caps));
-}
-
-/* copy caps */
-/**
- * gst_caps_copy:
- * @caps: a #GstCaps.
- *
- * Creates a new #GstCaps as a copy of the old @caps. The new caps will have a
- * refcount of 1, owned by the caller. The structures are copied as well.
- *
- * Note that this function is the semantic equivalent of a gst_caps_ref()
- * followed by a gst_caps_make_writable(). If you only want to hold on to a
- * reference to the data, you should use gst_caps_ref().
- *
- * When you are finished with the caps, call gst_caps_unref() on it.
- *
- * Returns: the new #GstCaps
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstCaps * gst_caps_copy (const GstCaps * caps);
-#endif
-
-static inline GstCaps *
-gst_caps_copy (const GstCaps * caps)
-{
-  return GST_CAPS (gst_mini_object_copy (GST_MINI_OBJECT_CAST (caps)));
-}
-
-/**
- * gst_caps_is_writable:
- * @caps: a #GstCaps
- *
- * Tests if you can safely modify @caps. It is only safe to modify caps when
- * there is only one owner of the caps - ie, the object is writable.
- */
-#define         gst_caps_is_writable(caps)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (caps))
-
-/**
- * gst_caps_make_writable:
- * @caps: (transfer full): a #GstCaps
- *
- * Returns a writable copy of @caps.
- *
- * If there is only one reference count on @caps, the caller must be the owner,
- * and so this function will return the caps object unchanged. If on the other
- * hand there is more than one reference on the object, a new caps object will
- * be returned. The caller's reference on @caps will be removed, and instead the
- * caller will own a reference to the returned object.
- *
- * In short, this function unrefs the caps in the argument and refs the caps
- * that it returns. Don't access the argument after calling this function. See
- * also: gst_caps_ref().
- *
- * Returns: (transfer full): a writable caps which may or may not be the
- *     same as @caps
- */
-#define         gst_caps_make_writable(caps)   GST_CAPS_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (caps)))
-
-/**
- * gst_caps_replace:
- * @old_caps: (inout) (transfer full): pointer to a pointer to a #GstCaps to be
- *     replaced.
- * @new_caps: (transfer none) (allow-none): pointer to a #GstCaps that will
- *     replace the caps pointed to by @ocaps.
- *
- * Modifies a pointer to a #GstCaps to point to a different #GstCaps. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * caps is unreffed, the new is reffed).
- *
- * Either @ncaps or the #GstCaps pointed to by @ocaps may be NULL.
- *
- * Returns: TRUE if @new_caps was different from @old_caps
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_caps_replace (GstCaps **old_caps, GstCaps *new_caps);
-#endif
-
-static inline gboolean
-gst_caps_replace (GstCaps **old_caps, GstCaps *new_caps)
-{
-    return gst_mini_object_replace ((GstMiniObject **) old_caps, (GstMiniObject *) new_caps);
-}
-
-/**
- * gst_caps_take:
- * @old_caps: (inout) (transfer full): pointer to a pointer to a #GstCaps to be
- *     replaced.
- * @new_caps: (transfer full) (allow-none): pointer to a #GstCaps that will
- *     replace the caps pointed to by @ocaps.
- *
- * Modifies a pointer to a #GstCaps to point to a different #GstCaps. This
- * function is similar to gst_caps_replace() except that it takes ownership
- * of @new_caps.
- *
- * Returns: TRUE if @new_caps was different from @old_caps
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_caps_take (GstCaps **old_caps, GstCaps *new_caps);
-#endif
-
-static inline gboolean
-gst_caps_take (GstCaps **old_caps, GstCaps *new_caps)
-{
-    return gst_mini_object_take ((GstMiniObject **) old_caps, (GstMiniObject *) new_caps);
-}
-
-/**
- * GstCaps:
- * @mini_object: the parent type
- *
- * Object describing media types.
- */
-struct _GstCaps {
-  GstMiniObject mini_object;
-};
-
-/**
- * GstStaticCaps:
- * @caps: the cached #GstCaps
- * @string: a string describing a caps
- *
- * Datastructure to initialize #GstCaps from a string description usually
- * used in conjunction with GST_STATIC_CAPS() and gst_static_caps_get() to
- * instantiate a #GstCaps.
- */
-struct _GstStaticCaps {
-  /*< public >*/
-  GstCaps *caps;
-  const char *string;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType             gst_caps_get_type                (void);
-
-GstCaps *         gst_caps_new_empty               (void);
-GstCaps *         gst_caps_new_any                 (void);
-GstCaps *         gst_caps_new_empty_simple        (const char    *media_type) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_new_simple              (const char    *media_type,
-                                                    const char    *fieldname,
-                                                    ...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_new_full                (GstStructure  *struct1,
-                                                    ...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_new_full_valist         (GstStructure  *structure,
-                                                    va_list        var_args) G_GNUC_WARN_UNUSED_RESULT;
-
-GType             gst_static_caps_get_type         (void);
-GstCaps *         gst_static_caps_get              (GstStaticCaps *static_caps);
-void              gst_static_caps_cleanup          (GstStaticCaps *static_caps);
-
-/* manipulation */
-void              gst_caps_append                  (GstCaps       *caps1,
-                                                    GstCaps       *caps2);
-void              gst_caps_append_structure        (GstCaps       *caps,
-                                                    GstStructure  *structure);
-void              gst_caps_remove_structure        (GstCaps       *caps, guint idx);
-GstCaps *         gst_caps_merge                   (GstCaps       *caps1,
-                                                    GstCaps       *caps2) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_merge_structure         (GstCaps       *caps,
-                                                    GstStructure  *structure) G_GNUC_WARN_UNUSED_RESULT;
-guint             gst_caps_get_size                (const GstCaps *caps);
-GstStructure *    gst_caps_get_structure           (const GstCaps *caps,
-                                                    guint          index);
-GstStructure *    gst_caps_steal_structure         (GstCaps       *caps,
-                                                    guint          index) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_copy_nth                (const GstCaps *caps, guint nth) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_truncate                (GstCaps       *caps) G_GNUC_WARN_UNUSED_RESULT;
-void              gst_caps_set_value               (GstCaps       *caps,
-                                                    const char    *field,
-                                                    const GValue  *value);
-void              gst_caps_set_simple              (GstCaps       *caps,
-                                                    const char    *field, ...) G_GNUC_NULL_TERMINATED;
-void              gst_caps_set_simple_valist       (GstCaps       *caps,
-                                                    const char    *field,
-                                                    va_list        varargs);
-
-/* tests */
-gboolean          gst_caps_is_any                  (const GstCaps *caps);
-gboolean          gst_caps_is_empty                (const GstCaps *caps);
-gboolean          gst_caps_is_fixed                (const GstCaps *caps);
-gboolean          gst_caps_is_always_compatible    (const GstCaps *caps1,
-                                                    const GstCaps *caps2);
-gboolean          gst_caps_is_subset		   (const GstCaps *subset,
-						    const GstCaps *superset);
-gboolean          gst_caps_is_subset_structure     (const GstCaps *caps,
-                                                    const GstStructure *structure);
-gboolean          gst_caps_is_equal		   (const GstCaps *caps1,
-						    const GstCaps *caps2);
-gboolean          gst_caps_is_equal_fixed          (const GstCaps *caps1,
-						    const GstCaps *caps2);
-gboolean          gst_caps_can_intersect           (const GstCaps * caps1,
-						    const GstCaps * caps2);
-gboolean          gst_caps_is_strictly_equal	   (const GstCaps *caps1,
-						    const GstCaps *caps2);
-
-
-/* operations */
-GstCaps *         gst_caps_intersect               (GstCaps *caps1,
-						    GstCaps *caps2) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_intersect_full          (GstCaps *caps1,
-						    GstCaps *caps2,
-                                                    GstCapsIntersectMode mode) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_subtract		   (GstCaps *minuend,
-						    GstCaps *subtrahend) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_normalize               (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_simplify                (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
-
-GstCaps *         gst_caps_fixate                  (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
-
-/* utility */
-gchar *           gst_caps_to_string               (const GstCaps *caps) G_GNUC_MALLOC;
-GstCaps *         gst_caps_from_string             (const gchar   *string) G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS
-
-#endif /* __GST_CAPS_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstchildproxy.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstchildproxy.h
deleted file mode 100644
index 1614d4b1..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstchildproxy.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Stefan Kost <ensonic@users.sf.net>
- *
- * gstchildproxy.h: interface header for multi child elements
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CHILD_PROXY_H__
-#define __GST_CHILD_PROXY_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-
-#define GST_TYPE_CHILD_PROXY               (gst_child_proxy_get_type ())
-#define GST_CHILD_PROXY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_CHILD_PROXY, GstChildProxy))
-#define GST_IS_CHILD_PROXY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_CHILD_PROXY))
-#define GST_CHILD_PROXY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_CHILD_PROXY, GstChildProxyInterface))
-
-/**
- * GstChildProxy:
- *
- * Opaque #GstChildProxy data structure.
- */
-typedef struct _GstChildProxy GstChildProxy;    /* dummy object */
-typedef struct _GstChildProxyInterface GstChildProxyInterface;
-
-/**
- * GstChildProxyInterface:
- * @parent: parent interface type.
- * @get_child_by_name:  virtual method to fetch the child by name
- * @get_child_by_index: virtual method to fetch the child by index
- * @get_children_count: virtual method to get the children count
- *
- * #GstChildProxy interface.
- */
-struct _GstChildProxyInterface
-{
-  GTypeInterface parent;
-
-  /* methods */
-  GObject * (*get_child_by_name)  (GstChildProxy * parent, const gchar * name);
-  GObject * (*get_child_by_index) (GstChildProxy * parent, guint index);
-  guint     (*get_children_count) (GstChildProxy * parent);
-  /*< private >*/
-  /* signals */
-  void      (*child_added)        (GstChildProxy * parent, GObject * child, const gchar * name);
-  void      (*child_removed)      (GstChildProxy * parent, GObject * child, const gchar * name);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType     gst_child_proxy_get_type (void);
-
-GObject * gst_child_proxy_get_child_by_name  (GstChildProxy * parent, const gchar * name);
-
-guint     gst_child_proxy_get_children_count (GstChildProxy * parent);
-GObject * gst_child_proxy_get_child_by_index (GstChildProxy * parent, guint index);
-
-gboolean  gst_child_proxy_lookup             (GstChildProxy *object, const gchar *name,
-                                              GObject **target, GParamSpec **pspec);
-
-void      gst_child_proxy_get_property       (GstChildProxy * object, const gchar *name,
-                                              GValue *value);
-void      gst_child_proxy_get_valist         (GstChildProxy * object,
-                                              const gchar * first_property_name,
-                                              va_list var_args);
-void      gst_child_proxy_get                (GstChildProxy * object,
-                                              const gchar * first_property_name,
-                                              ...) G_GNUC_NULL_TERMINATED;
-
-void      gst_child_proxy_set_property       (GstChildProxy * object, const gchar *name,
-                                              const GValue *value);
-void      gst_child_proxy_set_valist         (GstChildProxy* object,
-                                              const gchar * first_property_name,
-                                              va_list var_args);
-void      gst_child_proxy_set                (GstChildProxy * object,
-                                              const gchar * first_property_name,
-                                              ...) G_GNUC_NULL_TERMINATED;
-
-void      gst_child_proxy_child_added        (GstChildProxy * parent, GObject * child,
-                                              const gchar *name);
-void      gst_child_proxy_child_removed      (GstChildProxy * parent, GObject * child,
-                                              const gchar *name);
-
-G_END_DECLS
-
-#endif /* __GST_CHILD_PROXY_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstclock.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstclock.h
deleted file mode 100644
index 5d42ce60..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstclock.h
+++ /dev/null
@@ -1,521 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstclock.h: Header for clock subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CLOCK_H__
-#define __GST_CLOCK_H__
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-#define GST_TYPE_CLOCK                  (gst_clock_get_type ())
-#define GST_CLOCK(clock)                (G_TYPE_CHECK_INSTANCE_CAST ((clock), GST_TYPE_CLOCK, GstClock))
-#define GST_IS_CLOCK(clock)             (G_TYPE_CHECK_INSTANCE_TYPE ((clock), GST_TYPE_CLOCK))
-#define GST_CLOCK_CLASS(cclass)         (G_TYPE_CHECK_CLASS_CAST ((cclass), GST_TYPE_CLOCK, GstClockClass))
-#define GST_IS_CLOCK_CLASS(cclass)      (G_TYPE_CHECK_CLASS_TYPE ((cclass), GST_TYPE_CLOCK))
-#define GST_CLOCK_GET_CLASS(clock)      (G_TYPE_INSTANCE_GET_CLASS ((clock), GST_TYPE_CLOCK, GstClockClass))
-#define GST_CLOCK_CAST(clock)           ((GstClock*)(clock))
-
-/**
- * GstClockTime:
- *
- * A datatype to hold a time, measured in nanoseconds.
- */
-typedef guint64 GstClockTime;
-
-/**
- * GST_TYPE_CLOCK_TIME:
- *
- * The #GType of a #GstClockTime.
- */
-#define GST_TYPE_CLOCK_TIME G_TYPE_UINT64
-
-/**
- * GstClockTimeDiff:
- *
- * A datatype to hold a time difference, measured in nanoseconds.
- */
-typedef gint64 GstClockTimeDiff;
-/**
- * GstClockID:
- *
- * A datatype to hold the handle to an outstanding sync or async clock callback.
- */
-typedef gpointer GstClockID;
-
-/**
- * GST_CLOCK_TIME_NONE:
- *
- * Constant to define an undefined clock time.
- *
- * Value: 18446744073709551615
- * Type: GstClockTime
- */
-#define GST_CLOCK_TIME_NONE             ((GstClockTime) -1)
-/**
- * GST_CLOCK_TIME_IS_VALID:
- * @time: clock time to validate
- *
- * Tests if a given #GstClockTime represents a valid defined time.
- */
-#define GST_CLOCK_TIME_IS_VALID(time)   (((GstClockTime)(time)) != GST_CLOCK_TIME_NONE)
-
-/* FIXME: still need to explicitly force types on the defines below */
-/**
- * GST_SECOND:
- *
- * Constant that defines one GStreamer second.
- *
- * Value: 1000000000
- * Type: GstClockTime
- */
-#define GST_SECOND  (G_USEC_PER_SEC * G_GINT64_CONSTANT (1000))
-/**
- * GST_MSECOND:
- *
- * Constant that defines one GStreamer millisecond.
- *
- * Value: 1000000
- * Type: GstClockTime
- */
-#define GST_MSECOND (GST_SECOND / G_GINT64_CONSTANT (1000))
-/**
- * GST_USECOND:
- *
- * Constant that defines one GStreamer microsecond.
- *
- * Value: 1000
- * Type: GstClockTime
- */
-#define GST_USECOND (GST_SECOND / G_GINT64_CONSTANT (1000000))
-/**
- * GST_NSECOND:
- *
- * Constant that defines one GStreamer nanosecond
- *
- * Value: 1
- * Type: GstClockTime
- */
-#define GST_NSECOND (GST_SECOND / G_GINT64_CONSTANT (1000000000))
-
-
-/**
- * GST_TIME_AS_SECONDS:
- * @time: the time
- *
- * Convert a #GstClockTime to seconds.
- */
-#define GST_TIME_AS_SECONDS(time)  ((time) / GST_SECOND)
-/**
- * GST_TIME_AS_MSECONDS:
- * @time: the time
- *
- * Convert a #GstClockTime to milliseconds (1/1000 of a second).
- */
-#define GST_TIME_AS_MSECONDS(time) ((time) / G_GINT64_CONSTANT (1000000))
-/**
- * GST_TIME_AS_USECONDS:
- * @time: the time
- *
- * Convert a #GstClockTime to microseconds (1/1000000 of a second).
- */
-#define GST_TIME_AS_USECONDS(time) ((time) / G_GINT64_CONSTANT (1000))
-/**
- * GST_TIME_AS_NSECONDS:
- * @time: the time
- *
- * Convert a #GstClockTime to nanoseconds (1/1000000000 of a second).
- */
-#define GST_TIME_AS_NSECONDS(time) (time)
-
-/**
- * GST_CLOCK_DIFF:
- * @s: the first time
- * @e: the second time
- *
- * Calculate a difference between two clock times as a #GstClockTimeDiff.
- * The difference is calculated as @e - @s.
- */
-#define GST_CLOCK_DIFF(s, e)            (GstClockTimeDiff)((e) - (s))
-
-/**
- * GST_TIMEVAL_TO_TIME:
- * @tv: the timeval to convert
- *
- * Convert a #GTimeVal to a #GstClockTime.
- */
-#define GST_TIMEVAL_TO_TIME(tv)         (GstClockTime)((tv).tv_sec * GST_SECOND + (tv).tv_usec * GST_USECOND)
-
-/**
- * GST_TIME_TO_TIMEVAL:
- * @t: The #GstClockTime to convert
- * @tv: The target timeval
- *
- * Convert a #GstClockTime to a #GTimeVal
- *
- * <note>on 32-bit systems, a timeval has a range of only 2^32 - 1 seconds,
- * which is about 68 years.  Expect trouble if you want to schedule stuff
- * in your pipeline for 2038.</note>
- */
-#define GST_TIME_TO_TIMEVAL(t,tv)                               \
-G_STMT_START {                                                  \
-  g_assert ("Value of time " #t " is out of timeval's range" && \
-      ((t) / GST_SECOND) < G_MAXLONG);                          \
-  (tv).tv_sec  = (glong) (((GstClockTime) (t)) / GST_SECOND);   \
-  (tv).tv_usec = (glong) ((((GstClockTime) (t)) -               \
-                  ((GstClockTime) (tv).tv_sec) * GST_SECOND)    \
-                 / GST_USECOND);                                \
-} G_STMT_END
-
-/**
- * GST_TIMESPEC_TO_TIME:
- * @ts: the timespec to convert
- *
- * Convert a struct timespec (see man pselect) to a #GstClockTime.
- */
-#define GST_TIMESPEC_TO_TIME(ts)        (GstClockTime)((ts).tv_sec * GST_SECOND + (ts).tv_nsec * GST_NSECOND)
-/**
- * GST_TIME_TO_TIMESPEC:
- * @t: The #GstClockTime to convert
- * @ts: The target timespec
- *
- * Convert a #GstClockTime to a struct timespec (see man pselect)
- */
-#define GST_TIME_TO_TIMESPEC(t,ts)                                \
-G_STMT_START {                                                    \
-  g_assert ("Value of time " #t " is out of timespec's range" &&  \
-      ((t) / GST_SECOND) < G_MAXLONG);                            \
-  (ts).tv_sec  =  (glong) ((t) / GST_SECOND);                     \
-  (ts).tv_nsec = (glong) (((t) - (ts).tv_sec * GST_SECOND) / GST_NSECOND);        \
-} G_STMT_END
-
-/* timestamp debugging macros */
-/**
- * GST_TIME_FORMAT:
- *
- * A string that can be used in printf-like format strings to display a
- * #GstClockTime value in h:m:s format.  Use GST_TIME_ARGS() to construct
- * the matching arguments.
- *
- * Example:
- * |[
- * printf("%" GST_TIME_FORMAT "\n", GST_TIME_ARGS(ts));
- * ]|
- */
-#define GST_TIME_FORMAT "u:%02u:%02u.%09u"
-/**
- * GST_TIME_ARGS:
- * @t: a #GstClockTime
- *
- * Format @t for the #GST_TIME_FORMAT format string. Note: @t will be
- * evaluated more than once.
- */
-#define GST_TIME_ARGS(t) \
-        GST_CLOCK_TIME_IS_VALID (t) ? \
-        (guint) (((GstClockTime)(t)) / (GST_SECOND * 60 * 60)) : 99, \
-        GST_CLOCK_TIME_IS_VALID (t) ? \
-        (guint) ((((GstClockTime)(t)) / (GST_SECOND * 60)) % 60) : 99, \
-        GST_CLOCK_TIME_IS_VALID (t) ? \
-        (guint) ((((GstClockTime)(t)) / GST_SECOND) % 60) : 99, \
-        GST_CLOCK_TIME_IS_VALID (t) ? \
-        (guint) (((GstClockTime)(t)) % GST_SECOND) : 999999999
-
-typedef struct _GstClockEntry   GstClockEntry;
-typedef struct _GstClock        GstClock;
-typedef struct _GstClockClass   GstClockClass;
-typedef struct _GstClockPrivate GstClockPrivate;
-
-/* --- prototype for async callbacks --- */
-/**
- * GstClockCallback:
- * @clock: The clock that triggered the callback
- * @time: The time it was triggered
- * @id: The #GstClockID that expired
- * @user_data: user data passed in the gst_clock_id_wait_async() function
- *
- * The function prototype of the callback.
- *
- * Returns: %TRUE or %FALSE (currently unused)
- */
-typedef gboolean        (*GstClockCallback)     (GstClock *clock, GstClockTime time,
-                                                 GstClockID id, gpointer user_data);
-/**
- * GstClockReturn:
- * @GST_CLOCK_OK: The operation succeeded.
- * @GST_CLOCK_EARLY: The operation was scheduled too late.
- * @GST_CLOCK_UNSCHEDULED: The clockID was unscheduled
- * @GST_CLOCK_BUSY: The ClockID is busy
- * @GST_CLOCK_BADTIME: A bad time was provided to a function.
- * @GST_CLOCK_ERROR: An error occurred
- * @GST_CLOCK_UNSUPPORTED: Operation is not supported
- * @GST_CLOCK_DONE: The ClockID is done waiting
- *
- * The return value of a clock operation.
- */
-typedef enum
-{
-  GST_CLOCK_OK          =  0,
-  GST_CLOCK_EARLY       =  1,
-  GST_CLOCK_UNSCHEDULED =  2,
-  GST_CLOCK_BUSY        =  3,
-  GST_CLOCK_BADTIME     =  4,
-  GST_CLOCK_ERROR       =  5,
-  GST_CLOCK_UNSUPPORTED =  6,
-  GST_CLOCK_DONE        =  7
-} GstClockReturn;
-
-/**
- * GstClockEntryType:
- * @GST_CLOCK_ENTRY_SINGLE: a single shot timeout
- * @GST_CLOCK_ENTRY_PERIODIC: a periodic timeout request
- *
- * The type of the clock entry
- */
-typedef enum {
-  GST_CLOCK_ENTRY_SINGLE,
-  GST_CLOCK_ENTRY_PERIODIC
-} GstClockEntryType;
-
-/**
- * GST_CLOCK_ENTRY:
- * @entry: the entry to cast
- *
- * Cast to a clock entry
- */
-#define GST_CLOCK_ENTRY(entry)          ((GstClockEntry *)(entry))
-/**
- * GST_CLOCK_ENTRY_CLOCK:
- * @entry: the entry to query
- *
- * Get the owner clock of the entry
- */
-#define GST_CLOCK_ENTRY_CLOCK(entry)    ((entry)->clock)
-/**
- * GST_CLOCK_ENTRY_TYPE:
- * @entry: the entry to query
- *
- * Get the type of the clock entry
- */
-#define GST_CLOCK_ENTRY_TYPE(entry)     ((entry)->type)
-/**
- * GST_CLOCK_ENTRY_TIME:
- * @entry: the entry to query
- *
- * Get the requested time of this entry
- */
-#define GST_CLOCK_ENTRY_TIME(entry)     ((entry)->time)
-/**
- * GST_CLOCK_ENTRY_INTERVAL:
- * @entry: the entry to query
- *
- * Get the interval of this periodic entry
- */
-#define GST_CLOCK_ENTRY_INTERVAL(entry) ((entry)->interval)
-/**
- * GST_CLOCK_ENTRY_STATUS:
- * @entry: the entry to query
- *
- * The status of the entry
- */
-#define GST_CLOCK_ENTRY_STATUS(entry)   ((entry)->status)
-
-/**
- * GstClockEntry:
- * @refcount: reference counter (read-only)
- *
- * All pending timeouts or periodic notifies are converted into
- * an entry.
- * Note that GstClockEntry should be treated as an opaque structure. It must
- * not be extended or allocated using a custom allocator.
- */
-struct _GstClockEntry {
-  gint                  refcount;
-  /*< protected >*/
-  GstClock              *clock;
-  GstClockEntryType      type;
-  GstClockTime           time;
-  GstClockTime           interval;
-  GstClockReturn         status;
-  GstClockCallback       func;
-  gpointer               user_data;
-  GDestroyNotify         destroy_data;
-  gboolean               unscheduled;
-  gboolean               woken_up;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#include <gst/gstobject.h>
-
-/**
- * GstClockFlags:
- * @GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC: clock can do a single sync timeout request
- * @GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC: clock can do a single async timeout request
- * @GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC: clock can do sync periodic timeout requests
- * @GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC: clock can do async periodic timeout callbacks
- * @GST_CLOCK_FLAG_CAN_SET_RESOLUTION: clock's resolution can be changed
- * @GST_CLOCK_FLAG_CAN_SET_MASTER: clock can be slaved to a master clock
- * @GST_CLOCK_FLAG_LAST: subclasses can add additional flags starting from this flag
- *
- * The capabilities of this clock
- */
-typedef enum {
-  GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC     = (GST_OBJECT_FLAG_LAST << 0),
-  GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC    = (GST_OBJECT_FLAG_LAST << 1),
-  GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC   = (GST_OBJECT_FLAG_LAST << 2),
-  GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC  = (GST_OBJECT_FLAG_LAST << 3),
-  GST_CLOCK_FLAG_CAN_SET_RESOLUTION     = (GST_OBJECT_FLAG_LAST << 4),
-  GST_CLOCK_FLAG_CAN_SET_MASTER         = (GST_OBJECT_FLAG_LAST << 5),
-  /* padding */
-  GST_CLOCK_FLAG_LAST                   = (GST_OBJECT_FLAG_LAST << 8)
-} GstClockFlags;
-
-/**
- * GST_CLOCK_FLAGS:
- * @clock: the clock to query
- *
- * Gets the #GstClockFlags clock flags.
- */
-#define GST_CLOCK_FLAGS(clock)  GST_OBJECT_FLAGS(clock)
-
-/**
- * GstClock:
- *
- * #GstClock base structure. The values of this structure are
- * protected for subclasses, use the methods to use the #GstClock.
- */
-struct _GstClock {
-  GstObject      object;
-
-  /*< private >*/
-  GstClockPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstClockClass:
- * @parent_class: the parent class structure
- * @change_resolution: change the resolution of the clock. Not all values might
- *                     be acceptable. The new resolution should be returned.
- * @get_resolution: get the resolution of the clock.
- * @get_internal_time: get the internal unadjusted time of the clock.
- *        implement @wait_jitter instead.
- * @wait: perform a blocking wait on the given #GstClockEntry and return
- *               the jitter.
- * @wait_async: perform an asynchronous wait for the given #GstClockEntry.
- * @unschedule: unblock a blocking or async wait operation.
- *
- * GStreamer clock class. Override the vmethods to implement the clock
- * functionality.
- */
-struct _GstClockClass {
-  GstObjectClass        parent_class;
-
-  /*< public >*/
-  /* vtable */
-  GstClockTime          (*change_resolution)    (GstClock *clock,
-                                                 GstClockTime old_resolution,
-                                                 GstClockTime new_resolution);
-  GstClockTime          (*get_resolution)       (GstClock *clock);
-
-  GstClockTime          (*get_internal_time)    (GstClock *clock);
-
-  /* waiting on an ID */
-  GstClockReturn        (*wait)                 (GstClock *clock, GstClockEntry *entry,
-                                                 GstClockTimeDiff *jitter);
-  GstClockReturn        (*wait_async)           (GstClock *clock, GstClockEntry *entry);
-  void                  (*unschedule)           (GstClock *clock, GstClockEntry *entry);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_clock_get_type              (void);
-
-GstClockTime            gst_clock_set_resolution        (GstClock *clock,
-                                                         GstClockTime resolution);
-GstClockTime            gst_clock_get_resolution        (GstClock *clock);
-
-GstClockTime            gst_clock_get_time              (GstClock *clock);
-void                    gst_clock_set_calibration       (GstClock *clock, GstClockTime internal,
-                                                         GstClockTime external,
-                                                         GstClockTime rate_num,
-                                                         GstClockTime rate_denom);
-void                    gst_clock_get_calibration       (GstClock *clock, GstClockTime *internal,
-                                                         GstClockTime *external,
-                                                         GstClockTime *rate_num,
-                                                         GstClockTime *rate_denom);
-
-/* master/slave clocks */
-gboolean                gst_clock_set_master            (GstClock *clock, GstClock *master);
-GstClock*               gst_clock_get_master            (GstClock *clock);
-
-void                    gst_clock_set_timeout           (GstClock *clock,
-                                                         GstClockTime timeout);
-GstClockTime            gst_clock_get_timeout           (GstClock *clock);
-
-gboolean                gst_clock_add_observation       (GstClock *clock, GstClockTime slave,
-                                                         GstClockTime master, gdouble *r_squared);
-
-
-/* getting and adjusting internal/external time */
-GstClockTime            gst_clock_get_internal_time     (GstClock *clock);
-GstClockTime            gst_clock_adjust_unlocked       (GstClock *clock, GstClockTime internal);
-GstClockTime            gst_clock_unadjust_unlocked     (GstClock * clock, GstClockTime external);
-
-
-/* creating IDs that can be used to get notifications */
-GstClockID              gst_clock_new_single_shot_id    (GstClock *clock,
-                                                         GstClockTime time);
-GstClockID              gst_clock_new_periodic_id       (GstClock *clock,
-                                                         GstClockTime start_time,
-                                                         GstClockTime interval);
-
-/* reference counting */
-GstClockID              gst_clock_id_ref                (GstClockID id);
-void                    gst_clock_id_unref              (GstClockID id);
-
-/* operations on IDs */
-gint                    gst_clock_id_compare_func       (gconstpointer id1, gconstpointer id2);
-
-GstClockTime            gst_clock_id_get_time           (GstClockID id);
-GstClockReturn          gst_clock_id_wait               (GstClockID id,
-                                                         GstClockTimeDiff *jitter);
-GstClockReturn          gst_clock_id_wait_async         (GstClockID id,
-                                                         GstClockCallback func,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-void                    gst_clock_id_unschedule         (GstClockID id);
-
-gboolean                gst_clock_single_shot_id_reinit (GstClock * clock,
-                                                         GstClockID id,
-                                                         GstClockTime time);
-gboolean                gst_clock_periodic_id_reinit    (GstClock * clock,
-                                                         GstClockID id,
-                                                         GstClockTime start_time,
-                                                         GstClockTime interval);
-
-G_END_DECLS
-
-#endif /* __GST_CLOCK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcompat.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcompat.h
deleted file mode 100644
index cace2e1d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcompat.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2004 Wim Taymans <wim@fluendo.com>
- *
- * gstcompat.h: backwards compatibility stuff
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/**
- * SECTION:gstcompat
- * @short_description: Deprecated API entries
- *
- * Please do not use these in new code.
- * These symbols are only available by defining GST_DISABLE_DEPRECATED.
- * This can be done in CFLAGS for compiling old code.
- */
-
-/* API compatibility stuff */
-#ifndef __GSTCOMPAT_H__
-#define __GSTCOMPAT_H__
-
-G_BEGIN_DECLS
-
-/* added to ease the transition to 0.11 */
-#define gst_element_class_set_details_simple  gst_element_class_set_metadata
-
-#define gst_element_factory_get_longname(f)    gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_LONGNAME)
-#define gst_element_factory_get_klass(f)       gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_KLASS)
-#define gst_element_factory_get_description(f) gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_DESCRIPTION)
-#define gst_element_factory_get_author(f)      gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_AUTHOR)
-#define gst_element_factory_get_documentation_uri(f)  gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_DOC_URI)
-#define gst_element_factory_get_icon_name(f)   gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_ICON_NAME)
-
-#define gst_pad_get_caps_reffed(p)             gst_pad_get_caps(p)
-#define gst_pad_peer_get_caps_reffed(p)        gst_pad_peer_get_caps(p)
-
-#define gst_buffer_new_and_alloc(s)            gst_buffer_new_allocate(NULL, s, NULL)
-
-#define GST_BUFFER_TIMESTAMP          GST_BUFFER_PTS
-#define GST_BUFFER_TIMESTAMP_IS_VALID GST_BUFFER_PTS_IS_VALID
-
-#define gst_adapter_prev_timestamp    gst_adapter_prev_pts
-
-#define gst_tag_list_free(taglist)    gst_tag_list_unref(taglist)
-
-static inline gboolean
-gst_pad_set_caps (GstPad * pad, GstCaps * caps)
-{
-  GstEvent *event;
-  gboolean res = TRUE;
-
-  g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
-  g_return_val_if_fail (caps != NULL && gst_caps_is_fixed (caps), FALSE);
-
-  event = gst_event_new_caps (caps);
-
-  if (GST_PAD_IS_SRC (pad))
-    res = gst_pad_push_event (pad, event);
-  else
-    res = gst_pad_send_event (pad, event);
-
-  return res;
-}
-
-
-#ifndef GST_DISABLE_DEPRECATED
-
-#define GST_MESSAGE_DURATION GST_MESSAGE_DURATION_CHANGED
-#define gst_message_new_duration(src,fmt,dur) \
-    gst_message_new_duration_changed(src)
-#define gst_message_parse_duration(msg,fmt,dur) \
-G_STMT_START { \
-  GstFormat *p_fmt = fmt; \
-  gint64 *p_dur = dur; \
-  if (p_fmt) \
-    *p_fmt = GST_FORMAT_TIME; \
-  if (p_dur) \
-    *p_dur = GST_CLOCK_TIME_NONE; \
-} G_STMT_END
-
-#endif /* not GST_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GSTCOMPAT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstconfig.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstconfig.h
deleted file mode 100644
index b23beb3e..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstconfig.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2004,2005 Wim Taymans <wim@fluendo.com>
- *
- * gstconfig.h: GST_DISABLE_* macros for build configuration
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:gstconfig
- * @short_description: Build configuration options
- *
- * This describes the configuration options for GStreamer. When building
- * GStreamer there are a lot of parts (known internally as "subsystems" ) that
- * can be disabled for various reasons. The most common reasons are speed and
- * size, which is important because GStreamer is designed to run on embedded
- * systems.
- *
- * If a subsystem is disabled, most of this changes are done in an API
- * compatible way, so you don't need to adapt your code in most cases. It is
- * never done in an ABI compatible way though. So if you want to disable a
- * suybsystem, you have to rebuild all programs depending on GStreamer, too.
- *
- * If a subsystem is disabled in GStreamer, a value is defined in
- * &lt;gst/gst.h&gt;. You can check this if you do subsystem-specific stuff.
- * <example id="example-gstconfig">
- * <title>Doing subsystem specific things</title>
- * <programlisting>
- * &hash;ifndef GST_DISABLE_GST_DEBUG
- * // do stuff specific to the debugging subsystem
- * &hash;endif // GST_DISABLE_GST_DEBUG
- * </programlisting>
- * </example>
- */
-
-#ifndef __GST_CONFIG_H__
-#define __GST_CONFIG_H__
-
-/* trick gtk-doc into believing these symbols are defined (yes, it's ugly) */
-
-#if 0
-#define GST_DISABLE_GST_DEBUG 1
-#define GST_DISABLE_PARSE 1
-#define GST_DISABLE_TRACE 1
-#define GST_DISABLE_ALLOC_TRACE 1
-#define GST_DISABLE_REGISTRY 1
-#define GST_DISABLE_PLUGIN 1
-#define GST_HAVE_GLIB_2_8 1
-#endif
-
-/***** default padding of structures *****/
-#define GST_PADDING		4
-#define GST_PADDING_INIT	{ NULL }
-
-/***** padding for very extensible base classes *****/
-#define GST_PADDING_LARGE	20
-
-/***** disabling of subsystems *****/
-
-/**
- * GST_DISABLE_GST_DEBUG:
- *
- * Configures the inclusion of the debugging subsystem
- */
-/* #undef GST_DISABLE_GST_DEBUG */
-
-/**
- * GST_DISABLE_PARSE:
- *
- * Configures the inclusion of the gst-lauch parser
- */
-/* #undef GST_DISABLE_PARSE */
-
-/**
- * GST_DISABLE_TRACE:
- *
- * Configures the inclusion of a resource tracing facillity
- * (seems to be unused)
- */
-/* #undef GST_DISABLE_TRACE */
-
-/**
- * GST_DISABLE_ALLOC_TRACE:
- *
- * Configures the use of a memory tracer based on the resource tracer
- * if TRACE is disabled, ALLOC_TRACE is disabled as well
- */
-/* #undef GST_DISABLE_ALLOC_TRACE */
-
-/**
- * GST_DISABLE_REGISTRY:
- *
- * Configures the use of the plugin registry.
- * If one disables this, required plugins need to be loaded and registered
- * manually
- */
-/* #undef GST_DISABLE_REGISTRY */
-
-/* FIXME: test and document these! */
-/* Configures the use of external plugins */
-/* #undef GST_DISABLE_PLUGIN */
-
-/* printf extension format */
-/**
- * GST_PTR_FORMAT:
- *
- * printf format type used to debug GStreamer types.
- * This can only be used on types whose size is >= sizeof(gpointer).
- */
-#define GST_PTR_FORMAT "p"
-/**
- * GST_SEGMENT_FORMAT:
- *
- * printf format type used to debug GStreamer segments.
- * This can only be used on pointers to GstSegment structures.
- */
-#define GST_SEGMENT_FORMAT "p"
-
-/* whether or not GST_PTR_FORMAT or GST_SEGMENT_FORMAT are using
- * the printf extension mechanism. This is for internal use in our
- * header files so we know whether we can use G_GNUC_PRINTF or not */
-#undef GST_USING_PRINTF_EXTENSION
-
-/* GST_DISABLE_PRINTF_EXTENSION:
- *
- * Define this to debug your debug log messages and make gcc spew warnings
- * if printf format string and arguments don't match up (this is usually
- * not the case when libc and gcc are used because printf format warnings
- * have to be disabled when the printf extension mechanism is in use).
- *
- * Note that using this option disables 'pretty logging' of GStreamer objects
- * like caps, tags, structures, events, pads etc., so that only their address
- * will be printed in the log.
- *
- * This define only disables use of the special registered printf format
- * extensions in the code compiled with it defined. It does not stop
- * GStreamer from registering these extensions in the first place if it
- * was compiled against a libc that supports this.
- *
- * (not official API)
- */
-/* If GLib is not using the system printf, we can't use the registered
- * extensions because the GLib-internal printf won't know how to parse them */
-#if defined(GST_DISABLE_PRINTF_EXTENSION) || !defined(GLIB_USING_SYSTEM_PRINTF)
-  #undef GST_PTR_FORMAT
-  #define GST_PTR_FORMAT "p"
-  #undef GST_SEGMENT_FORMAT
-  #define GST_SEGMENT_FORMAT "p"
-  #undef GST_USING_PRINTF_EXTENSION
-#endif
-
-/* whether or not the CPU supports unaligned access */
-#define GST_HAVE_UNALIGNED_ACCESS 1
-
-/**
- * GST_EXPORT:
- *
- * Export the given variable from the built shared object.
- *
- * On Windows, this exports the variable from the DLL.
- * On other platforms, this gets defined to "extern".
- */
-/**
- * GST_PLUGIN_EXPORT:
- *
- * Export the plugin's definition.
- *
- * On Windows, this exports the plugin definition from the DLL.
- * On other platforms, this gets defined as a no-op.
- */
-#ifdef _MSC_VER
-#define GST_PLUGIN_EXPORT __declspec(dllexport) extern
-#ifdef GST_EXPORTS
-#define GST_EXPORT __declspec(dllexport) extern
-#else
-#define GST_EXPORT __declspec(dllimport) extern
-#endif
-#else /* not _MSC_VER */
-#define GST_PLUGIN_EXPORT
-#if (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#define GST_EXPORT extern __attribute__ ((visibility ("default")))
-#else
-#define GST_EXPORT extern
-#endif
-#endif
-
-#endif /* __GST_CONFIG_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcontrolbinding.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcontrolbinding.h
deleted file mode 100644
index a37be1d4..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcontrolbinding.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gstcontrolbinding.h: Attachment for control sources
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CONTROL_BINDING_H__
-#define __GST_CONTROL_BINDING_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-#include <gst/gstcontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_CONTROL_BINDING \
-  (gst_control_binding_get_type())
-#define GST_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CONTROL_BINDING,GstControlBinding))
-#define GST_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CONTROL_BINDING,GstControlBindingClass))
-#define GST_IS_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CONTROL_BINDING))
-#define GST_IS_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CONTROL_BINDING))
-#define GST_CONTROL_BINDING_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_CONTOL_SOURCE, GstControlBindingClass))
-
-typedef struct _GstControlBinding GstControlBinding;
-typedef struct _GstControlBindingClass GstControlBindingClass;
-
-/**
- * GstControlBindingConvert:
- * @binding: the #GstControlBinding instance
- * @src_value: the value returned by the cotnrol source
- * @dest_value: the target GValue
- *
- * Function to map a control-value to the target GValue.
- */
-typedef void (* GstControlBindingConvert) (GstControlBinding *binding, gdouble src_value, GValue *dest_value);
-
-/**
- * GstControlBinding:
- * @name: name of the property of this binding
- * @pspec: #GParamSpec for this property
- *
- * The instance structure of #GstControlBinding.
- */
-struct _GstControlBinding {
-  GstObject parent;
-  
-  /*< public >*/
-  gchar *name;
-  GParamSpec *pspec;
-
-  /*< private >*/
-  GstObject *object;            /* GstObject owning the property
-                                 * (== parent when bound) */
-  gboolean disabled;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstControlBindingClass:
- * @parent_class: Parent class
- *
- * The class structure of #GstControlBinding.
- */
-
-struct _GstControlBindingClass
-{
-  GstObjectClass parent_class;
-
-  /* virtual methods */
-  gboolean (* sync_values) (GstControlBinding *binding, GstObject *object, GstClockTime timestamp, GstClockTime last_sync);
-  GValue * (* get_value) (GstControlBinding *binding, GstClockTime timestamp);
-  gboolean (* get_value_array) (GstControlBinding *binding, GstClockTime timestamp,GstClockTime interval, guint n_values, gpointer values);
-  gboolean (* get_g_value_array) (GstControlBinding *binding, GstClockTime timestamp,GstClockTime interval, guint n_values, GValue *values);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_CONTROL_BINDING_PSPEC(cb) (((GstControlBinding *) cb)->pspec)
-
-GType gst_control_binding_get_type (void);
-
-/* Functions */
-
-gboolean            gst_control_binding_sync_values        (GstControlBinding * binding, GstObject *object,
-                                                            GstClockTime timestamp, GstClockTime last_sync);
-GValue *            gst_control_binding_get_value          (GstControlBinding *binding,
-                                                            GstClockTime timestamp);
-gboolean            gst_control_binding_get_value_array    (GstControlBinding *binding, GstClockTime timestamp,
-                                                            GstClockTime interval, guint n_values, gpointer values);
-gboolean            gst_control_binding_get_g_value_array  (GstControlBinding *binding, GstClockTime timestamp,
-                                                            GstClockTime interval, guint n_values, GValue *values);
-
-void                gst_control_binding_set_disabled       (GstControlBinding * binding, gboolean disabled);
-gboolean            gst_control_binding_is_disabled        (GstControlBinding * binding);
-G_END_DECLS
-
-#endif /* __GST_CONTROL_BINDING_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcontrolsource.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcontrolsource.h
deleted file mode 100644
index e61c59a7..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstcontrolsource.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *
- * gstcontrolsource.h: Interface declaration for control sources
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CONTROL_SOURCE_H__
-#define __GST_CONTROL_SOURCE_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-#include <gst/gstclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_CONTROL_SOURCE \
-  (gst_control_source_get_type())
-#define GST_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CONTROL_SOURCE,GstControlSource))
-#define GST_CONTROL_SOURCE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CONTROL_SOURCE,GstControlSourceClass))
-#define GST_IS_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CONTROL_SOURCE))
-#define GST_IS_CONTROL_SOURCE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CONTROL_SOURCE))
-#define GST_CONTROL_SOURCE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_CONTOL_SOURCE, GstControlSourceClass))
-
-typedef struct _GstControlSource GstControlSource;
-typedef struct _GstControlSourceClass GstControlSourceClass;
-typedef struct _GstTimedValue GstTimedValue;
-typedef struct _GstValueArray GstValueArray;
-
-/**
- * GstTimedValue:
- * @timestamp: timestamp of the value change
- * @value: the corresponding value
- *
- * Structure for saving a timestamp and a value.
- */
-struct _GstTimedValue
-{
-  GstClockTime timestamp;
-  gdouble      value;
-};
-
-/**
- * GstControlSourceGetValue:
- * @self: the #GstControlSource instance
- * @timestamp: timestamp for which a value should be calculated
- * @value: a #GValue which will be set to the result. It must be initialized to the correct type.
- *
- * Function for returning a value for a given timestamp.
- *
- * Returns: %TRUE if the value was successfully calculated.
- *
- */
-typedef gboolean (* GstControlSourceGetValue) (GstControlSource *self, 
-    GstClockTime timestamp, gdouble *value);
-
-/**
- * GstControlSourceGetValueArray:
- * @self: the #GstControlSource instance
- * @timestamp: timestamp for which a value should be calculated
- * @interval: the time spacing between subsequent values
- * @n_values: the number of values
- * @values: array to put control-values in
- *
- * Function for returning an array of values for starting at a given timestamp.
- *
- * Returns: %TRUE if the values were successfully calculated.
- *
- */
-typedef gboolean (* GstControlSourceGetValueArray) (GstControlSource *self, 
-    GstClockTime timestamp, GstClockTime interval, guint n_values, gdouble *values);
-
-/**
- * GstControlSource:
- * @get_value: Function for returning a value for a given timestamp
- * @get_value_array: Function for returning a #GstValueArray for a given timestamp
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstControlSource {
-  GstObject parent;
-
-  /*< public >*/
-  GstControlSourceGetValue get_value;             /* Returns the value for a property at a given timestamp */
-  GstControlSourceGetValueArray get_value_array;  /* Returns values for a property in a given timespan */
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstControlSourceClass:
- * @parent_class: Parent class
- * @bind: Class method for binding the #GstControlSource to a specific GParamSpec
- *
- * The class structure of #GstControlSource.
- */
-
-struct _GstControlSourceClass
-{
-  GstObjectClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_control_source_get_type (void);
-
-/* Functions */
-gboolean       gst_control_source_get_value             (GstControlSource *self, GstClockTime timestamp,
-                                                         gdouble *value);
-gboolean       gst_control_source_get_value_array       (GstControlSource *self, GstClockTime timestamp,
-                                                         GstClockTime interval, guint n_values,
-                                                         gdouble *values);
-G_END_DECLS
-
-#endif /* __GST_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstdatetime.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstdatetime.h
deleted file mode 100644
index 500b9cc2..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstdatetime.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GStreamer
- * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_DATE_TIME_H__
-#define __GST_DATE_TIME_H__
-
-#include <time.h>
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstDateTime:
- *
- * Opaque, immutable, refcounted struct that stores date, time and timezone
- * information. It currently supports ranges from 0001-01-01 to
- * 9999-12-31 in the Gregorian proleptic calendar.
- *
- * Use the acessor functions to get the stored values.
- */
-typedef struct _GstDateTime GstDateTime;
-
-/* query which fields are set */
-
-gboolean        gst_date_time_has_year                (const GstDateTime * datetime);
-gboolean        gst_date_time_has_month               (const GstDateTime * datetime);
-gboolean        gst_date_time_has_day                 (const GstDateTime * datetime);
-gboolean        gst_date_time_has_time                (const GstDateTime * datetime);
-gboolean        gst_date_time_has_second              (const GstDateTime * datetime);
-
-/* field getters */
-
-gint            gst_date_time_get_year                (const GstDateTime * datetime);
-gint            gst_date_time_get_month               (const GstDateTime * datetime);
-gint            gst_date_time_get_day                 (const GstDateTime * datetime);
-gint            gst_date_time_get_hour                (const GstDateTime * datetime);
-gint            gst_date_time_get_minute              (const GstDateTime * datetime);
-gint            gst_date_time_get_second              (const GstDateTime * datetime);
-gint            gst_date_time_get_microsecond         (const GstDateTime * datetime);
-gfloat          gst_date_time_get_time_zone_offset    (const GstDateTime * datetime);
-
-/* constructors */
-
-GstDateTime *   gst_date_time_new_from_unix_epoch_local_time (gint64 secs) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_from_unix_epoch_utc   (gint64 secs) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_local_time            (gint year,
-                                                         gint month,
-                                                         gint day,
-                                                         gint hour,
-                                                         gint minute,
-                                                         gdouble seconds) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_y                     (gint year) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_ym                    (gint year,
-                                                         gint month) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_ymd                   (gint year,
-                                                         gint month,
-                                                         gint day) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new                       (gfloat tzoffset,
-                                                         gint year, gint month,
-                                                         gint day, gint hour,
-                                                         gint minute,
-                                                         gdouble seconds) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_now_local_time (void) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_now_utc        (void) G_GNUC_MALLOC;
-
-
-gchar *         gst_date_time_to_iso8601_string  (GstDateTime * datetime) G_GNUC_MALLOC;
-GstDateTime *   gst_date_time_new_from_iso8601_string  (const gchar * string) G_GNUC_MALLOC;
-
-GDateTime *     gst_date_time_to_g_date_time       (GstDateTime * datetime);
-
-GstDateTime *   gst_date_time_new_from_g_date_time (GDateTime * dt);
-
-/* refcounting */
-
-GstDateTime *   gst_date_time_ref                (GstDateTime * datetime);
-
-void            gst_date_time_unref              (GstDateTime * datetime);
-
-G_END_DECLS
-
-#endif /* __GST_DATE_TIME_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstdebugutils.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstdebugutils.h
deleted file mode 100644
index 39decd85..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstdebugutils.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GStreamer
- * Copyright (C) 2007 Stefan Kost <ensonic@users.sf.net>
- *
- * gstdebugutils.h: debugging and analysis utillities
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSTDEBUGUTILS_H__
-#define __GSTDEBUGUTILS_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gst/gstconfig.h>
-#include <gst/gstbin.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstDebugGraphDetails:
- * @GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE: show caps-name on edges
- * @GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS: show caps-details on edges
- * @GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS: show modified parameters on elements
- * @GST_DEBUG_GRAPH_SHOW_STATES: show element states
- * @GST_DEBUG_GRAPH_SHOW_ALL: show all details
- *
- * Available details for pipeline graphs produced by GST_DEBUG_BIN_TO_DOT_FILE()
- * and GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS().
- */
-typedef enum {
-  GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE         = (1<<0),
-  GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS       = (1<<1),
-  GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS = (1<<2),
-  GST_DEBUG_GRAPH_SHOW_STATES             = (1<<3),
-  GST_DEBUG_GRAPH_SHOW_ALL                = ((1<<4)-1)
-} GstDebugGraphDetails;
-
-
-/********** pipeline graphs **********/
-
-void gst_debug_bin_to_dot_file (GstBin *bin, GstDebugGraphDetails details, const gchar *file_name);
-void gst_debug_bin_to_dot_file_with_ts (GstBin *bin, GstDebugGraphDetails details, const gchar *file_name);
-
-#ifndef GST_DISABLE_GST_DEBUG
-
-/**
- * GST_DEBUG_BIN_TO_DOT_FILE:
- * @bin: the top-level pipeline that should be analyzed
- * @details: details to show in the graph, e.g. #GST_DEBUG_GRAPH_SHOW_ALL or
- *    one or more other #GstDebugGraphDetails flags.
- * @file_name: output base filename (e.g. "myplayer")
- *
- * To aid debugging applications one can use this method to write out the whole
- * network of gstreamer elements that form the pipeline into an dot file.
- * This file can be processed with graphviz to get an image.
- * <informalexample><programlisting>
- *  dot -Tpng -oimage.png graph_lowlevel.dot
- * </programlisting></informalexample>
- *
- * The macro is only active if gstreamer is configured with
- * &quot;--gst-enable-gst-debug&quot; and the environment variable
- * GST_DEBUG_DUMP_DOT_DIR is set to a basepath (e.g. /tmp).
- */
-#define GST_DEBUG_BIN_TO_DOT_FILE(bin, details, file_name) gst_debug_bin_to_dot_file (bin, details, file_name)
-
-/**
- * GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS:
- * @bin: the top-level pipeline that should be analyzed
- * @details: details to show in the graph, e.g. #GST_DEBUG_GRAPH_SHOW_ALL or
- *    one or more other #GstDebugGraphDetails flags.
- * @file_name: output base filename (e.g. "myplayer")
- *
- * This works like GST_DEBUG_BIN_TO_DOT_FILE(), but adds the current timestamp
- * to the filename, so that it can be used to take multiple snapshots.
- */
-#define GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS(bin, details, file_name) gst_debug_bin_to_dot_file_with_ts (bin, details, file_name)
-
-
-#else /* GST_DISABLE_GST_DEBUG */
-
-
-#define GST_DEBUG_BIN_TO_DOT_FILE(bin, details, file_name)
-#define GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS(bin, details, file_name)
-
-#endif /* GST_DISABLE_GST_DEBUG */
-
-G_END_DECLS
-
-#endif /* __GSTDEBUGUTILS_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelement.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelement.h
deleted file mode 100644
index df71720c..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelement.h
+++ /dev/null
@@ -1,801 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2000,2004 Wim Taymans <wim@fluendo.com>
- *
- * gstelement.h: Header for GstElement
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_ELEMENT_H__
-#define __GST_ELEMENT_H__
-
-/* gstelement.h and gstelementfactory.h include eachother */
-typedef struct _GstElement GstElement;
-typedef struct _GstElementClass GstElementClass;
-
-/* gstmessage.h needs State */
-/**
- * GstState:
- * @GST_STATE_VOID_PENDING: no pending state.
- * @GST_STATE_NULL        : the NULL state or initial state of an element.
- * @GST_STATE_READY       : the element is ready to go to PAUSED.
- * @GST_STATE_PAUSED      : the element is PAUSED, it is ready to accept and
- *                          process data. Sink elements however only accept one
- *                          buffer and then block.
- * @GST_STATE_PLAYING     : the element is PLAYING, the #GstClock is running and
- *                          the data is flowing.
- *
- * The possible states an element can be in. States can be changed using
- * gst_element_set_state() and checked using gst_element_get_state().
- */
-typedef enum {
-  GST_STATE_VOID_PENDING        = 0,
-  GST_STATE_NULL                = 1,
-  GST_STATE_READY               = 2,
-  GST_STATE_PAUSED              = 3,
-  GST_STATE_PLAYING             = 4
-} GstState;
-
-
-#include <gst/gstconfig.h>
-#include <gst/gstobject.h>
-#include <gst/gstpad.h>
-#include <gst/gstbus.h>
-#include <gst/gstclock.h>
-#include <gst/gstelementfactory.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-#include <gst/gstiterator.h>
-#include <gst/gstmessage.h>
-#include <gst/gstquery.h>
-#include <gst/gsttaglist.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ELEMENT                (gst_element_get_type ())
-#define GST_IS_ELEMENT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_ELEMENT))
-#define GST_IS_ELEMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_ELEMENT))
-#define GST_ELEMENT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ELEMENT, GstElementClass))
-#define GST_ELEMENT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_ELEMENT, GstElement))
-#define GST_ELEMENT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_ELEMENT, GstElementClass))
-#define GST_ELEMENT_CAST(obj)           ((GstElement*)(obj))
-
-/**
- * GstStateChangeReturn:
- * @GST_STATE_CHANGE_FAILURE   : the state change failed
- * @GST_STATE_CHANGE_SUCCESS   : the state change succeeded
- * @GST_STATE_CHANGE_ASYNC     : the state change will happen asynchronously
- * @GST_STATE_CHANGE_NO_PREROLL: the state change succeeded but the element
- *                               cannot produce data in %GST_STATE_PAUSED.
- *                               This typically happens with live sources.
- *
- * The possible return values from a state change function such as 
- * gst_element_set_state(). Only @GST_STATE_CHANGE_FAILURE is a real failure.
- */
-typedef enum {
-  GST_STATE_CHANGE_FAILURE             = 0,
-  GST_STATE_CHANGE_SUCCESS             = 1,
-  GST_STATE_CHANGE_ASYNC               = 2,
-  GST_STATE_CHANGE_NO_PREROLL          = 3
-} GstStateChangeReturn;
-
-/* NOTE: this probably should be done with an #ifdef to decide
- * whether to safe-cast or to just do the non-checking cast.
- */
-
-/**
- * GST_STATE:
- * @elem: a #GstElement to return state for.
- *
- * This macro returns the current #GstState of the element.
- */
-#define GST_STATE(elem)                 (GST_ELEMENT_CAST(elem)->current_state)
-
-/**
- * GST_STATE_NEXT:
- * @elem: a #GstElement to return the next state for.
- *
- * This macro returns the next #GstState of the element.
- */
-#define GST_STATE_NEXT(elem)            (GST_ELEMENT_CAST(elem)->next_state)
-
-/**
- * GST_STATE_PENDING:
- * @elem: a #GstElement to return the pending state for.
- *
- * This macro returns the currently pending #GstState of the element.
- */
-#define GST_STATE_PENDING(elem)         (GST_ELEMENT_CAST(elem)->pending_state)
-
-/**
- * GST_STATE_TARGET:
- * @elem: a #GstElement to return the target state for.
- *
- * This macro returns the target #GstState of the element.
- */
-#define GST_STATE_TARGET(elem)          (GST_ELEMENT_CAST(elem)->target_state)
-
-/**
- * GST_STATE_RETURN:
- * @elem: a #GstElement to return the last state result for.
- *
- * This macro returns the last #GstStateChangeReturn value.
- */
-#define GST_STATE_RETURN(elem)          (GST_ELEMENT_CAST(elem)->last_return)
-
-#define __GST_SIGN(val)                 ((val) < 0 ? -1 : ((val) > 0 ? 1 : 0))
-/**
- * GST_STATE_GET_NEXT:
- * @cur: A starting #GstState
- * @pending: A target #GstState
- *
- * Given a current state @cur and a target state @pending, calculate the next (intermediate)
- * #GstState.
- */
-#define GST_STATE_GET_NEXT(cur,pending)         ((GstState)((cur) + __GST_SIGN ((gint)(pending) - (gint)(cur))))
-/**
- * GST_STATE_TRANSITION:
- * @cur: A current state
- * @next: A next state
- *
- * Given a current state @cur and a next state @next, calculate the associated
- * #GstStateChange transition.
- */
-#define GST_STATE_TRANSITION(cur,next)          ((GstStateChange)(((cur)<<3)|(next)))
-/**
- * GST_STATE_TRANSITION_CURRENT:
- * @trans: A #GstStateChange
- *
- * Given a state transition @trans, extract the current #GstState.
- */
-#define GST_STATE_TRANSITION_CURRENT(trans)     ((GstState)((trans)>>3))
-/**
- * GST_STATE_TRANSITION_NEXT:
- * @trans: A #GstStateChange
- *
- * Given a state transition @trans, extract the next #GstState.
- */
-#define GST_STATE_TRANSITION_NEXT(trans)        ((GstState)((trans)&0x7))
-
-/**
- * GstStateChange:
- * @GST_STATE_CHANGE_NULL_TO_READY    : state change from NULL to READY.
- * <itemizedlist>
- *   <listitem><para>
- *     The element must check if the resources it needs are available. Device
- *     sinks and -sources typically try to probe the device to constrain their
- *     caps.
- *   </para></listitem>
- *   <listitem><para>
- *     The element opens the device (in case feature need to be probed).
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_READY_TO_PAUSED  : state change from READY to PAUSED.
- * <itemizedlist>
- *   <listitem><para>
- *     The element pads are activated in order to receive data in PAUSED.
- *     Streaming threads are started.
- *   </para></listitem>
- *   <listitem><para>
- *     Some elements might need to return %GST_STATE_CHANGE_ASYNC and complete
- *     the state change when they have enough information. It is a requirement
- *     for sinks to return %GST_STATE_CHANGE_ASYNC and complete the state change
- *     when they receive the first buffer or %GST_EVENT_EOS (preroll).
- *     Sinks also block the dataflow when in PAUSED.
- *   </para></listitem>
- *   <listitem><para>
- *     A pipeline resets the running_time to 0.
- *   </para></listitem>
- *   <listitem><para>
- *     Live sources return %GST_STATE_CHANGE_NO_PREROLL and don't generate data.
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_PAUSED_TO_PLAYING: state change from PAUSED to PLAYING.
- * <itemizedlist>
- *   <listitem><para>
- *     Most elements ignore this state change.
- *   </para></listitem>
- *   <listitem><para>
- *     The pipeline selects a #GstClock and distributes this to all the children
- *     before setting them to PLAYING. This means that it is only alowed to
- *     synchronize on the #GstClock in the PLAYING state.
- *   </para></listitem>
- *   <listitem><para>
- *     The pipeline uses the #GstClock and the running_time to calculate the
- *     base_time. The base_time is distributed to all children when performing
- *     the state change.
- *   </para></listitem>
- *   <listitem><para>
- *     Sink elements stop blocking on the preroll buffer or event and start
- *     rendering the data.
- *   </para></listitem>
- *   <listitem><para>
- *     Sinks can post %GST_MESSAGE_EOS in the PLAYING state. It is not allowed
- *     to post %GST_MESSAGE_EOS when not in the PLAYING state.
- *   </para></listitem>
- *   <listitem><para>
- *     While streaming in PAUSED or PLAYING elements can create and remove
- *     sometimes pads.
- *   </para></listitem>
- *   <listitem><para>
- *     Live sources start generating data and return %GST_STATE_CHANGE_SUCCESS.
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_PLAYING_TO_PAUSED: state change from PLAYING to PAUSED.
- * <itemizedlist>
- *   <listitem><para>
- *     Most elements ignore this state change.
- *   </para></listitem>
- *   <listitem><para>
- *     The pipeline calculates the running_time based on the last selected
- *     #GstClock and the base_time. It stores this information to continue
- *     playback when going back to the PLAYING state.
- *   </para></listitem>
- *   <listitem><para>
- *     Sinks unblock any #GstClock wait calls.
- *   </para></listitem>
- *   <listitem><para>
- *     When a sink does not have a pending buffer to play, it returns
- *     %GST_STATE_CHANGE_ASYNC from this state change and completes the state
- *     change when it receives a new buffer or an %GST_EVENT_EOS.
- *   </para></listitem>
- *   <listitem><para>
- *     Any queued %GST_MESSAGE_EOS items are removed since they will be reposted
- *     when going back to the PLAYING state. The EOS messages are queued in
- *     #GstBin containers.
- *   </para></listitem>
- *   <listitem><para>
- *     Live sources stop generating data and return %GST_STATE_CHANGE_NO_PREROLL.
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_PAUSED_TO_READY  : state change from PAUSED to READY.
- * <itemizedlist>
- *   <listitem><para>
- *     Sinks unblock any waits in the preroll.
- *   </para></listitem>
- *   <listitem><para>
- *     Elements unblock any waits on devices
- *   </para></listitem>
- *   <listitem><para>
- *     Chain or get_range functions return %GST_FLOW_FLUSHING.
- *   </para></listitem>
- *   <listitem><para>
- *     The element pads are deactivated so that streaming becomes impossible and
- *     all streaming threads are stopped.
- *   </para></listitem>
- *   <listitem><para>
- *     The sink forgets all negotiated formats
- *   </para></listitem>
- *   <listitem><para>
- *     Elements remove all sometimes pads
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_READY_TO_NULL    : state change from READY to NULL.
- * <itemizedlist>
- *   <listitem><para>
- *     Elements close devices
- *   </para></listitem>
- *   <listitem><para>
- *     Elements reset any internal state.
- *   </para></listitem>
- * </itemizedlist>
- *
- * These are the different state changes an element goes through.
- * %GST_STATE_NULL &rArr; %GST_STATE_PLAYING is called an upwards state change
- * and %GST_STATE_PLAYING &rArr; %GST_STATE_NULL a downwards state change.
- */
-typedef enum /*< flags=0 >*/
-{
-  GST_STATE_CHANGE_NULL_TO_READY        = (GST_STATE_NULL<<3) | GST_STATE_READY,
-  GST_STATE_CHANGE_READY_TO_PAUSED      = (GST_STATE_READY<<3) | GST_STATE_PAUSED,
-  GST_STATE_CHANGE_PAUSED_TO_PLAYING    = (GST_STATE_PAUSED<<3) | GST_STATE_PLAYING,
-  GST_STATE_CHANGE_PLAYING_TO_PAUSED    = (GST_STATE_PLAYING<<3) | GST_STATE_PAUSED,
-  GST_STATE_CHANGE_PAUSED_TO_READY      = (GST_STATE_PAUSED<<3) | GST_STATE_READY,
-  GST_STATE_CHANGE_READY_TO_NULL        = (GST_STATE_READY<<3) | GST_STATE_NULL
-} GstStateChange;
-
-/**
- * GstElementFlags:
- * @GST_ELEMENT_FLAG_LOCKED_STATE: ignore state changes from parent
- * @GST_ELEMENT_FLAG_SINK: the element is a sink
- * @GST_ELEMENT_FLAG_SOURCE: the element is a source.
- * @GST_ELEMENT_FLAG_PROVIDE_CLOCK: the element can provide a clock
- * @GST_ELEMENT_FLAG_REQUIRE_CLOCK: the element requires a clock
- * @GST_ELEMENT_FLAG_INDEXABLE: the element can use an index
- * @GST_ELEMENT_FLAG_LAST: offset to define more flags
- *
- * The standard flags that an element may have.
- */
-typedef enum
-{
-  GST_ELEMENT_FLAG_LOCKED_STATE   = (GST_OBJECT_FLAG_LAST << 0),
-  GST_ELEMENT_FLAG_SINK           = (GST_OBJECT_FLAG_LAST << 1),
-  GST_ELEMENT_FLAG_SOURCE         = (GST_OBJECT_FLAG_LAST << 2),
-  GST_ELEMENT_FLAG_PROVIDE_CLOCK  = (GST_OBJECT_FLAG_LAST << 3),
-  GST_ELEMENT_FLAG_REQUIRE_CLOCK  = (GST_OBJECT_FLAG_LAST << 4),
-  GST_ELEMENT_FLAG_INDEXABLE      = (GST_OBJECT_FLAG_LAST << 5),
-  /* padding */
-  GST_ELEMENT_FLAG_LAST           = (GST_OBJECT_FLAG_LAST << 10)
-} GstElementFlags;
-
-/**
- * GST_ELEMENT_IS_LOCKED_STATE:
- * @elem: A #GstElement to query
- *
- * Check if the element is in the locked state and therefore will ignore state
- * changes from its parent object.
- */
-#define GST_ELEMENT_IS_LOCKED_STATE(elem)        (GST_OBJECT_FLAG_IS_SET(elem,GST_ELEMENT_FLAG_LOCKED_STATE))
-
-/**
- * GST_ELEMENT_NAME:
- * @elem: A #GstElement to query
- *
- * Gets the name of this element. Use only in core as this is not
- * ABI-compatible. Others use gst_element_get_name()
- */
-#define GST_ELEMENT_NAME(elem)                  (GST_OBJECT_NAME(elem))
-
-/**
- * GST_ELEMENT_PARENT:
- * @elem: A #GstElement to query
- *
- * Get the parent object of this element.
- */
-#define GST_ELEMENT_PARENT(elem)                (GST_ELEMENT_CAST(GST_OBJECT_PARENT(elem)))
-
-/**
- * GST_ELEMENT_BUS:
- * @elem: A #GstElement to query
- *
- * Get the message bus of this element.
- */
-#define GST_ELEMENT_BUS(elem)                   (GST_ELEMENT_CAST(elem)->bus)
-
-/**
- * GST_ELEMENT_CLOCK:
- * @elem: A #GstElement to query
- *
- * Get the clock of this element
- */
-#define GST_ELEMENT_CLOCK(elem)                 (GST_ELEMENT_CAST(elem)->clock)
-
-/**
- * GST_ELEMENT_PADS:
- * @elem: A #GstElement to query
- *
- * Get the pads of this elements.
- */
-#define GST_ELEMENT_PADS(elem)                  (GST_ELEMENT_CAST(elem)->pads)
-
-/**
- * GST_ELEMENT_START_TIME:
- * @elem: a #GstElement to return the start time for.
- *
- * This macro returns the start_time of the @elem. The start_time is the
- * running_time of the pipeline when the element went to PAUSED.
- */
-#define GST_ELEMENT_START_TIME(elem)            (GST_ELEMENT_CAST(elem)->start_time)
-
-/**
- * GST_ELEMENT_ERROR:
- * @el:     the element that generates the error
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
-            parentheses)
- * @debug:  debugging information for the message (format string and args
-            enclosed in parentheses)
- *
- * Utility function that elements can use in case they encountered a fatal
- * data processing error. The pipeline will post an error message and the
- * application will be requested to stop further media processing.
- */
-#define GST_ELEMENT_ERROR(el, domain, code, text, debug)                \
-G_STMT_START {                                                          \
-  gchar *__txt = _gst_element_error_printf text;                        \
-  gchar *__dbg = _gst_element_error_printf debug;                       \
-  if (__txt)                                                            \
-    GST_WARNING_OBJECT (el, "error: %s", __txt);                        \
-  if (__dbg)                                                            \
-    GST_WARNING_OBJECT (el, "error: %s", __dbg);                        \
-  gst_element_message_full (GST_ELEMENT(el), GST_MESSAGE_ERROR,         \
-    GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code,        \
-    __txt, __dbg, __FILE__, GST_FUNCTION, __LINE__);                    \
-} G_STMT_END
-
-/**
- * GST_ELEMENT_WARNING:
- * @el:     the element that generates the warning
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
-            parentheses)
- * @debug:  debugging information for the message (format string and args
-            enclosed in parentheses)
- *
- * Utility function that elements can use in case they encountered a non-fatal
- * data processing problem. The pipeline will post a warning message and the
- * application will be informed.
- */
-#define GST_ELEMENT_WARNING(el, domain, code, text, debug)              \
-G_STMT_START {                                                          \
-  gchar *__txt = _gst_element_error_printf text;                        \
-  gchar *__dbg = _gst_element_error_printf debug;                       \
-  if (__txt)                                                            \
-    GST_WARNING_OBJECT (el, "warning: %s", __txt);                      \
-  if (__dbg)                                                            \
-    GST_WARNING_OBJECT (el, "warning: %s", __dbg);                      \
-  gst_element_message_full (GST_ELEMENT(el), GST_MESSAGE_WARNING,       \
-    GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code,        \
-  __txt, __dbg, __FILE__, GST_FUNCTION, __LINE__);                      \
-} G_STMT_END
-
-/**
- * GST_ELEMENT_INFO:
- * @el:     the element that generates the information
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
-            parentheses)
- * @debug:  debugging information for the message (format string and args
-            enclosed in parentheses)
- *
- * Utility function that elements can use in case they want to inform
- * the application of something noteworthy that is not an error.
- * The pipeline will post a info message and the
- * application will be informed.
- */
-#define GST_ELEMENT_INFO(el, domain, code, text, debug)                 \
-G_STMT_START {                                                          \
-  gchar *__txt = _gst_element_error_printf text;                        \
-  gchar *__dbg = _gst_element_error_printf debug;                       \
-  if (__txt)                                                            \
-    GST_INFO_OBJECT (el, "info: %s", __txt);                            \
-  if (__dbg)                                                            \
-    GST_INFO_OBJECT (el, "info: %s", __dbg);                            \
-  gst_element_message_full (GST_ELEMENT(el), GST_MESSAGE_INFO,          \
-    GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code,        \
-  __txt, __dbg, __FILE__, GST_FUNCTION, __LINE__);                      \
-} G_STMT_END
-
-/* the state change mutexes and conds */
-/**
- * GST_STATE_GET_LOCK:
- * @elem:   a #GstElement
- *
- * Get a reference to the state lock of @elem.
- * This lock is used by the core.  It is taken while getting or setting
- * the state, during state changes, and while finalizing.
- */
-#define GST_STATE_GET_LOCK(elem)               (&(GST_ELEMENT_CAST(elem)->state_lock))
-/**
- * GST_STATE_GET_COND:
- * @elem: a #GstElement
- *
- * Get the conditional used to signal the completion of a state change.
- */
-#define GST_STATE_GET_COND(elem)               (&GST_ELEMENT_CAST(elem)->state_cond)
-
-#define GST_STATE_LOCK(elem)                   g_rec_mutex_lock(GST_STATE_GET_LOCK(elem))
-#define GST_STATE_TRYLOCK(elem)                g_rec_mutex_trylock(GST_STATE_GET_LOCK(elem))
-#define GST_STATE_UNLOCK(elem)                 g_rec_mutex_unlock(GST_STATE_GET_LOCK(elem))
-#define GST_STATE_UNLOCK_FULL(elem)            g_rec_mutex_unlock_full(GST_STATE_GET_LOCK(elem))
-#define GST_STATE_LOCK_FULL(elem,t)            g_rec_mutex_lock_full(GST_STATE_GET_LOCK(elem), t)
-#define GST_STATE_WAIT(elem)                   g_cond_wait (GST_STATE_GET_COND (elem), \
-                                                        GST_OBJECT_GET_LOCK (elem))
-#define GST_STATE_WAIT_UNTIL(elem, end_time)   g_cond_wait_until (GST_STATE_GET_COND (elem), \
-                                                        GST_OBJECT_GET_LOCK (elem), end_time)
-#define GST_STATE_SIGNAL(elem)                 g_cond_signal (GST_STATE_GET_COND (elem));
-#define GST_STATE_BROADCAST(elem)              g_cond_broadcast (GST_STATE_GET_COND (elem));
-
-/**
- * GstElement:
- * @state_lock: Used to serialize execution of gst_element_set_state()
- * @state_cond: Used to signal completion of a state change
- * @state_cookie: Used to detect concurrent execution of
- * gst_element_set_state() and gst_element_get_state()
- * @target_state: the target state of an element as set by the application
- * @current_state: the current state of an element
- * @next_state: the next state of an element, can be #GST_STATE_VOID_PENDING if
- * the element is in the correct state.
- * @pending_state: the final state the element should go to, can be
- * #GST_STATE_VOID_PENDING if the element is in the correct state
- * @last_return: the last return value of an element state change
- * @bus: the bus of the element. This bus is provided to the element by the
- * parent element or the application. A #GstPipeline has a bus of its own.
- * @clock: the clock of the element. This clock is usually provided to the
- * element by the toplevel #GstPipeline.
- * @base_time: the time of the clock right before the element is set to
- * PLAYING. Subtracting @base_time from the current clock time in the PLAYING
- * state will yield the running_time against the clock.
- * @start_time: the running_time of the last PAUSED state
- * @numpads: number of pads of the element, includes both source and sink pads.
- * @pads: (element-type Gst.Pad): list of pads
- * @numsrcpads: number of source pads of the element.
- * @srcpads: (element-type Gst.Pad): list of source pads
- * @numsinkpads: number of sink pads of the element.
- * @sinkpads: (element-type Gst.Pad): list of sink pads
- * @pads_cookie: updated whenever the a pad is added or removed
- *
- * GStreamer element abstract base class.
- */
-struct _GstElement
-{
-  GstObject             object;
-
-  /*< public >*/ /* with LOCK */
-  GRecMutex             state_lock;
-
-  /* element state */
-  GCond                 state_cond;
-  guint32               state_cookie;
-  GstState              target_state;
-  GstState              current_state;
-  GstState              next_state;
-  GstState              pending_state;
-  GstStateChangeReturn  last_return;
-
-  GstBus               *bus;
-
-  /* allocated clock */
-  GstClock             *clock;
-  GstClockTimeDiff      base_time; /* NULL/READY: 0 - PAUSED: current time - PLAYING: difference to clock */
-  GstClockTime          start_time;
-
-  /* element pads, these lists can only be iterated while holding
-   * the LOCK or checking the cookie after each LOCK. */
-  guint16               numpads;
-  GList                *pads;
-  guint16               numsrcpads;
-  GList                *srcpads;
-  guint16               numsinkpads;
-  GList                *sinkpads;
-  guint32               pads_cookie;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstElementClass:
- * @parent_class: the parent class structure
- * @metadata: metadata for elements of this class
- * @elementfactory: the #GstElementFactory that creates these elements
- * @padtemplates: a #GList of #GstPadTemplate
- * @numpadtemplates: the number of padtemplates
- * @pad_templ_cookie: changed whenever the padtemplates change
- * @request_new_pad: called when a new pad is requested
- * @release_pad: called when a request pad is to be released
- * @get_state: get the state of the element
- * @set_state: set a new state on the element
- * @change_state: called by @set_state to perform an incremental state change
- * @set_bus: set a #GstBus on the element
- * @provide_clock: gets the #GstClock provided by the element
- * @set_clock: set the #GstClock on the element
- * @send_event: send a #GstEvent to the element
- * @query: perform a #GstQuery on the element
- * @state_changed: called immediately after a new state was set.
- * @post_message: called when a message is posted on the element. Chain up to
- *                the parent class' handler to have it posted on the bus.
- *
- * GStreamer element class. Override the vmethods to implement the element
- * functionality.
- */
-struct _GstElementClass
-{
-  GstObjectClass         parent_class;
-
-  /*< public >*/
-  /* the element metadata */
-  gpointer		 metadata;
-
-  /* factory that the element was created from */
-  GstElementFactory     *elementfactory;
-
-  /* templates for our pads */
-  GList                 *padtemplates;
-  gint                   numpadtemplates;
-  guint32                pad_templ_cookie;
-
-  /*< private >*/
-  /* signal callbacks */
-  void (*pad_added)     (GstElement *element, GstPad *pad);
-  void (*pad_removed)   (GstElement *element, GstPad *pad);
-  void (*no_more_pads)  (GstElement *element);
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  /* request/release pads */
-  GstPad*               (*request_new_pad)      (GstElement *element, GstPadTemplate *templ,
-                                                 const gchar* name, const GstCaps *caps);
-  void                  (*release_pad)          (GstElement *element, GstPad *pad);
-
-  /* state changes */
-  GstStateChangeReturn (*get_state)             (GstElement * element, GstState * state,
-                                                 GstState * pending, GstClockTime timeout);
-  GstStateChangeReturn (*set_state)             (GstElement *element, GstState state);
-  GstStateChangeReturn (*change_state)          (GstElement *element, GstStateChange transition);
-  void                 (*state_changed)         (GstElement *element, GstState oldstate,
-                                                 GstState newstate, GstState pending);
-
-  /* bus */
-  void                  (*set_bus)              (GstElement * element, GstBus * bus);
-
-  /* set/get clocks */
-  GstClock*             (*provide_clock)        (GstElement *element);
-  gboolean              (*set_clock)            (GstElement *element, GstClock *clock);
-
-  /* query functions */
-  gboolean              (*send_event)           (GstElement *element, GstEvent *event);
-
-  gboolean              (*query)                (GstElement *element, GstQuery *query);
-
-  gboolean              (*post_message)         (GstElement *element, GstMessage *message);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING_LARGE-1];
-};
-
-/* element class pad templates */
-void                    gst_element_class_add_pad_template      (GstElementClass *klass, GstPadTemplate *templ);
-GstPadTemplate*         gst_element_class_get_pad_template      (GstElementClass *element_class, const gchar *name);
-GList*                  gst_element_class_get_pad_template_list (GstElementClass *element_class);
-
-/* element class meta data */
-void                    gst_element_class_set_metadata          (GstElementClass *klass,
-                                                                 const gchar     *longname,
-                                                                 const gchar     *classification,
-                                                                 const gchar     *description,
-                                                                 const gchar     *author);
-void                    gst_element_class_set_static_metadata   (GstElementClass *klass,
-                                                                 const gchar     *longname,
-                                                                 const gchar     *classification,
-                                                                 const gchar     *description,
-                                                                 const gchar     *author);
-void                    gst_element_class_add_metadata          (GstElementClass * klass,
-                                                                 const gchar * key, const gchar * value);
-void                    gst_element_class_add_static_metadata   (GstElementClass * klass,
-                                                                 const gchar * key, const gchar * value);
-const gchar *           gst_element_class_get_metadata          (GstElementClass * klass,
-                                                                 const gchar * key);
-
-
-/* element instance */
-GType                   gst_element_get_type            (void);
-
-/* basic name and parentage stuff from GstObject */
-
-/**
- * gst_element_get_name:
- * @elem: a #GstElement to get the name of @elem.
- *
- * Returns a copy of the name of @elem.
- * Caller should g_free() the return value after usage.
- * For a nameless element, this returns NULL, which you can safely g_free()
- * as well.
- *
- * Returns: (transfer full): the name of @elem. g_free() after usage. MT safe.
- *
- */
-#define                 gst_element_get_name(elem)      gst_object_get_name(GST_OBJECT_CAST(elem))
-
-/**
- * gst_element_set_name:
- * @elem: a #GstElement to set the name of.
- * @name: the new name
- *
- * Sets the name of the element, getting rid of the old name if there was one.
- */
-#define                 gst_element_set_name(elem,name) gst_object_set_name(GST_OBJECT_CAST(elem),name)
-
-/**
- * gst_element_get_parent:
- * @elem: a #GstElement to get the parent of.
- *
- * Get the parent of an element.
- *
- * Returns: (transfer full): the parent of an element.
- */
-#define                 gst_element_get_parent(elem)    gst_object_get_parent(GST_OBJECT_CAST(elem))
-
-/**
- * gst_element_set_parent:
- * @elem: a #GstElement to set the parent of.
- * @parent: the new parent #GstObject of the element.
- *
- * Sets the parent of an element.
- */
-#define                 gst_element_set_parent(elem,parent)     gst_object_set_parent(GST_OBJECT_CAST(elem),parent)
-
-/* clocking */
-GstClock*               gst_element_provide_clock       (GstElement *element);
-GstClock*               gst_element_get_clock           (GstElement *element);
-gboolean                gst_element_set_clock           (GstElement *element, GstClock *clock);
-void                    gst_element_set_base_time       (GstElement *element, GstClockTime time);
-GstClockTime            gst_element_get_base_time       (GstElement *element);
-void                    gst_element_set_start_time      (GstElement *element, GstClockTime time);
-GstClockTime            gst_element_get_start_time      (GstElement *element);
-
-/* bus */
-void                    gst_element_set_bus             (GstElement * element, GstBus * bus);
-GstBus *                gst_element_get_bus             (GstElement * element);
-
-/* pad management */
-gboolean                gst_element_add_pad             (GstElement *element, GstPad *pad);
-gboolean                gst_element_remove_pad          (GstElement *element, GstPad *pad);
-void                    gst_element_no_more_pads        (GstElement *element);
-
-GstPad*                 gst_element_get_static_pad      (GstElement *element, const gchar *name);
-GstPad*                 gst_element_get_request_pad     (GstElement *element, const gchar *name);
-GstPad*                 gst_element_request_pad         (GstElement *element, GstPadTemplate *templ,
-							 const gchar * name, const GstCaps *caps);
-void                    gst_element_release_request_pad (GstElement *element, GstPad *pad);
-
-GstIterator *           gst_element_iterate_pads        (GstElement * element);
-GstIterator *           gst_element_iterate_src_pads    (GstElement * element);
-GstIterator *           gst_element_iterate_sink_pads   (GstElement * element);
-
-/* event/query/format stuff */
-gboolean                gst_element_send_event          (GstElement *element, GstEvent *event);
-gboolean                gst_element_seek                (GstElement *element, gdouble rate,
-                                                         GstFormat format, GstSeekFlags flags,
-                                                         GstSeekType start_type, gint64 start,
-                                                         GstSeekType stop_type, gint64 stop);
-gboolean                gst_element_query               (GstElement *element, GstQuery *query);
-
-/* messages */
-gboolean                gst_element_post_message        (GstElement * element, GstMessage * message);
-
-/* error handling */
-/* gcc versions < 3.3 warn about NULL being passed as format to printf */
-#if (defined(GST_USING_PRINTF_EXTENSION) || !defined(__GNUC__) || (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 3))
-gchar *                 _gst_element_error_printf       (const gchar *format, ...);
-#else
-gchar *                 _gst_element_error_printf       (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
-#endif
-void                    gst_element_message_full        (GstElement * element, GstMessageType type,
-                                                         GQuark domain, gint code, gchar * text,
-                                                         gchar * debug, const gchar * file,
-                                                         const gchar * function, gint line);
-
-/* state management */
-gboolean                gst_element_is_locked_state     (GstElement *element);
-gboolean                gst_element_set_locked_state    (GstElement *element, gboolean locked_state);
-gboolean                gst_element_sync_state_with_parent (GstElement *element);
-
-GstStateChangeReturn    gst_element_get_state           (GstElement * element,
-                                                         GstState * state,
-                                                         GstState * pending,
-                                                         GstClockTime timeout);
-GstStateChangeReturn    gst_element_set_state           (GstElement *element, GstState state);
-
-void                    gst_element_abort_state         (GstElement * element);
-GstStateChangeReturn    gst_element_change_state        (GstElement * element,
-                                                         GstStateChange transition);
-GstStateChangeReturn    gst_element_continue_state      (GstElement * element,
-                                                         GstStateChangeReturn ret);
-void                    gst_element_lost_state          (GstElement * element);
-
-/* factory management */
-GstElementFactory*      gst_element_get_factory         (GstElement *element);
-
-G_END_DECLS
-
-#endif /* __GST_ELEMENT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelementfactory.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelementfactory.h
deleted file mode 100644
index 337cc4c2..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelementfactory.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2000,2004 Wim Taymans <wim@fluendo.com>
- *
- * gstelement.h: Header for GstElement
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_ELEMENT_FACTORY_H__
-#define __GST_ELEMENT_FACTORY_H__
-
-/**
- * GstElementFactory:
- *
- * The opaque #GstElementFactory data structure.
- */
-typedef struct _GstElementFactory GstElementFactory;
-typedef struct _GstElementFactoryClass GstElementFactoryClass;
-
-#include <gst/gstconfig.h>
-#include <gst/gstelement.h>
-#include <gst/gstpad.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-#include <gst/gsturi.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ELEMENT_FACTORY                (gst_element_factory_get_type())
-#define GST_ELEMENT_FACTORY(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ELEMENT_FACTORY,\
-                                                 GstElementFactory))
-#define GST_ELEMENT_FACTORY_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ELEMENT_FACTORY,\
-                                                 GstElementFactoryClass))
-#define GST_IS_ELEMENT_FACTORY(obj)             (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ELEMENT_FACTORY))
-#define GST_IS_ELEMENT_FACTORY_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ELEMENT_FACTORY))
-#define GST_ELEMENT_FACTORY_CAST(obj)           ((GstElementFactory *)(obj))
-
-GType                   gst_element_factory_get_type            (void);
-
-GstElementFactory *     gst_element_factory_find                (const gchar *name);
-
-GType                   gst_element_factory_get_element_type    (GstElementFactory *factory);
-
-const gchar *           gst_element_factory_get_metadata        (GstElementFactory *factory, const gchar *key);
-gchar **                gst_element_factory_get_metadata_keys   (GstElementFactory *factory);
-
-guint                   gst_element_factory_get_num_pad_templates (GstElementFactory *factory);
-const GList *           gst_element_factory_get_static_pad_templates (GstElementFactory *factory);
-
-GstURIType              gst_element_factory_get_uri_type        (GstElementFactory *factory);
-const gchar * const *   gst_element_factory_get_uri_protocols   (GstElementFactory *factory);
-
-gboolean                gst_element_factory_has_interface       (GstElementFactory *factory,
-                                                                 const gchar *interfacename);
-
-GstElement*             gst_element_factory_create              (GstElementFactory *factory,
-                                                                 const gchar *name) G_GNUC_MALLOC;
-GstElement*             gst_element_factory_make                (const gchar *factoryname, const gchar *name) G_GNUC_MALLOC;
-
-gboolean                gst_element_register                    (GstPlugin *plugin, const gchar *name,
-                                                                 guint rank, GType type);
-
-/* Factory list functions */
-
-/**
- * GstFactoryListType:
- * @GST_ELEMENT_FACTORY_TYPE_DECODER: Decoder elements
- * @GST_ELEMENT_FACTORY_TYPE_ENCODER: Encoder elements
- * @GST_ELEMENT_FACTORY_TYPE_SINK: Sink elements
- * @GST_ELEMENT_FACTORY_TYPE_SRC: Source elements
- * @GST_ELEMENT_FACTORY_TYPE_MUXER: Muxer elements
- * @GST_ELEMENT_FACTORY_TYPE_DEMUXER: Demuxer elements
- * @GST_ELEMENT_FACTORY_TYPE_PARSER: Parser elements
- * @GST_ELEMENT_FACTORY_TYPE_PAYLOADER: Payloader elements
- * @GST_ELEMENT_FACTORY_TYPE_DEPAYLOADER: Depayloader elements
- * @GST_ELEMENT_FACTORY_TYPE_MAX_ELEMENTS: Private, do not use
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO: Elements handling video media types
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO: Elements handling audio media types
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE: Elements handling image media types
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_SUBTITLE: Elements handling subtitle media types
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_METADATA: Elements handling metadata media types
- *
- * The type of #GstElementFactory to filter.
- *
- * All @GstFactoryListType up to @GST_ELEMENT_FACTORY_TYPE_MAX_ELEMENTS are exclusive.
- *
- * If one or more of the MEDIA types are specified, then only elements
- * matching the specified media types will be selected.
- */
-
-typedef guint64 GstElementFactoryListType;
-
-#define  GST_ELEMENT_FACTORY_TYPE_DECODER        (G_GUINT64_CONSTANT (1) << 0)
-#define  GST_ELEMENT_FACTORY_TYPE_ENCODER        (G_GUINT64_CONSTANT (1) << 1)
-#define  GST_ELEMENT_FACTORY_TYPE_SINK           (G_GUINT64_CONSTANT (1) << 2)
-#define  GST_ELEMENT_FACTORY_TYPE_SRC            (G_GUINT64_CONSTANT (1) << 3)
-#define  GST_ELEMENT_FACTORY_TYPE_MUXER          (G_GUINT64_CONSTANT (1) << 4)
-#define  GST_ELEMENT_FACTORY_TYPE_DEMUXER        (G_GUINT64_CONSTANT (1) << 5)
-#define  GST_ELEMENT_FACTORY_TYPE_PARSER         (G_GUINT64_CONSTANT (1) << 6)
-#define  GST_ELEMENT_FACTORY_TYPE_PAYLOADER      (G_GUINT64_CONSTANT (1) << 7)
-#define  GST_ELEMENT_FACTORY_TYPE_DEPAYLOADER    (G_GUINT64_CONSTANT (1) << 8)
-#define  GST_ELEMENT_FACTORY_TYPE_FORMATTER      (G_GUINT64_CONSTANT (1) << 9)
-
-#define  GST_ELEMENT_FACTORY_TYPE_MAX_ELEMENTS   (G_GUINT64_CONSTANT (1) << 48)
-
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO    (G_GUINT64_CONSTANT (1) << 49)
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO    (G_GUINT64_CONSTANT (1) << 50)
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE    (G_GUINT64_CONSTANT (1) << 51)
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_SUBTITLE (G_GUINT64_CONSTANT (1) << 52)
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_METADATA (G_GUINT64_CONSTANT (1) << 53)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_ANY:
- *
- * Elements of any of the defined GST_ELEMENT_FACTORY_LIST types
- *
- * Value: 562949953421311
- * Type: GstElementFactoryListType
- */
-#define  GST_ELEMENT_FACTORY_TYPE_ANY ((G_GUINT64_CONSTANT (1) << 49) - 1)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_MEDIA_ANY:
- *
- * Elements matching any of the defined GST_ELEMENT_FACTORY_TYPE_MEDIA types
- *
- * Note: Do not use this if you wish to not filter against any of the defined
- * media types. If you wish to do this, simply don't specify any
- * GST_ELEMENT_FACTORY_TYPE_MEDIA flag.
- *
- * Value: 18446462598732840960
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_MEDIA_ANY (~G_GUINT64_CONSTANT (0) << 48)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_VIDEO_ENCODER:
- *
- * All encoders handling video or image media types
- *
- * Value: 2814749767106562
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_VIDEO_ENCODER (GST_ELEMENT_FACTORY_TYPE_ENCODER | GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO | GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_AUDIO_ENCODER:
- *
- * All encoders handling audio media types
- *
- * Value: 1125899906842626
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_AUDIO_ENCODER (GST_ELEMENT_FACTORY_TYPE_ENCODER | GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_AUDIOVIDEO_SINKS:
- *
- * All sinks handling audio, video or image media types
- *
- * Value: 3940649673949188
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_AUDIOVIDEO_SINKS (GST_ELEMENT_FACTORY_TYPE_SINK | GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO | GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO | GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_DECODABLE:
- *
- * All elements used to 'decode' streams (decoders, demuxers, parsers, depayloaders)
- *
- * Value: 353
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_DECODABLE \
-  (GST_ELEMENT_FACTORY_TYPE_DECODER | GST_ELEMENT_FACTORY_TYPE_DEMUXER | GST_ELEMENT_FACTORY_TYPE_DEPAYLOADER | GST_ELEMENT_FACTORY_TYPE_PARSER)
-
-/* Element klass defines */
-#define GST_ELEMENT_FACTORY_KLASS_DECODER               "Decoder"
-#define GST_ELEMENT_FACTORY_KLASS_ENCODER               "Encoder"
-#define GST_ELEMENT_FACTORY_KLASS_SINK                  "Sink"
-#define GST_ELEMENT_FACTORY_KLASS_SRC                   "Source"
-#define GST_ELEMENT_FACTORY_KLASS_MUXER                 "Muxer"
-#define GST_ELEMENT_FACTORY_KLASS_DEMUXER               "Demuxer"
-#define GST_ELEMENT_FACTORY_KLASS_PARSER                "Parser"
-#define GST_ELEMENT_FACTORY_KLASS_PAYLOADER             "Payloader"
-#define GST_ELEMENT_FACTORY_KLASS_DEPAYLOADER           "Depayloader"
-#define GST_ELEMENT_FACTORY_KLASS_FORMATTER             "Formatter"
-
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_VIDEO           "Video"
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_AUDIO           "Audio"
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_IMAGE           "Image"
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_SUBTITLE        "Subtitle"
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_METADATA        "Metadata"
-
-gboolean      gst_element_factory_list_is_type      (GstElementFactory *factory,
-                                                     GstElementFactoryListType type);
-
-GList *       gst_element_factory_list_get_elements (GstElementFactoryListType type,
-                                                     GstRank minrank) G_GNUC_MALLOC;
-
-
-GList *       gst_element_factory_list_filter       (GList *list, const GstCaps *caps,
-                                                     GstPadDirection direction,
-                                                     gboolean subsetonly) G_GNUC_MALLOC;
-G_END_DECLS
-
-#endif /* __GST_ELEMENT_FACTORY_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelementmetadata.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelementmetadata.h
deleted file mode 100644
index 6c331d90..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstelementmetadata.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2000,2004 Wim Taymans <wim@fluendo.com>
- *
- * gstelementmetadata.h: Metadata for GstElement classes
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_ELEMENT_METADATA_H__
-#define __GST_ELEMENT_METADATA_H__
-
-G_BEGIN_DECLS
-
-/**
- * GST_ELEMENT_METADATA_LONGNAME:
- *
- * The long English name of the element. E.g. "File Sink"
- */
-#define GST_ELEMENT_METADATA_LONGNAME      "long-name"
-/**
- * GST_ELEMENT_METADATA_KLASS:
- *
- * String describing the type of element, as an unordered list
- * separated with slashes ('/'). See draft-klass.txt of the design docs
- * for more details and common types. E.g: "Sink/File"
- */
-#define GST_ELEMENT_METADATA_KLASS         "klass"
-
-/**
- * GST_ELEMENT_METADATA_DESCRIPTION:
- *
- * Sentence describing the purpose of the element.
- * E.g: "Write stream to a file"
- */
-#define GST_ELEMENT_METADATA_DESCRIPTION   "description"
-/**
- * GST_ELEMENT_METADATA_AUTHOR:
- *
- * Name and contact details of the author(s). Use \n to separate
- * multiple author details.
- * E.g: "Joe Bloggs &lt;joe.blogs at foo.com&gt;"
- */
-#define GST_ELEMENT_METADATA_AUTHOR        "author"
-
-/**
- * GST_ELEMENT_METADATA_DOC_URI:
- *
- * Set uri pointing to user documentation. Applications can use this to show
- * help for e.g. effects to users.
- */
-#define GST_ELEMENT_METADATA_DOC_URI       "doc-uri"
-/**
- * GST_ELEMENT_METADATA_ICON_NAME:
- *
- * Elements that bridge to certain other products can include an icon of that
- * used product. Application can show the icon in menus/selectors to help
- * identifying specific elements.
- */
-#define GST_ELEMENT_METADATA_ICON_NAME     "icon-name"
-
-G_END_DECLS
-
-#endif /* __GST_ELEMENT_METADATA_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstenumtypes.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstenumtypes.h
deleted file mode 100644
index c15314f4..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstenumtypes.h
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-
-#ifndef __GST_ENUM_TYPES_H__
-#define __GST_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "gstobject.h" */
-GType gst_object_flags_get_type (void);
-#define GST_TYPE_OBJECT_FLAGS (gst_object_flags_get_type())
-
-/* enumerations from "gstallocator.h" */
-GType gst_allocator_flags_get_type (void);
-#define GST_TYPE_ALLOCATOR_FLAGS (gst_allocator_flags_get_type())
-
-/* enumerations from "gstbin.h" */
-GType gst_bin_flags_get_type (void);
-#define GST_TYPE_BIN_FLAGS (gst_bin_flags_get_type())
-
-/* enumerations from "gstbuffer.h" */
-GType gst_buffer_flags_get_type (void);
-#define GST_TYPE_BUFFER_FLAGS (gst_buffer_flags_get_type())
-GType gst_buffer_copy_flags_get_type (void);
-#define GST_TYPE_BUFFER_COPY_FLAGS (gst_buffer_copy_flags_get_type())
-
-/* enumerations from "gstbufferpool.h" */
-GType gst_buffer_pool_acquire_flags_get_type (void);
-#define GST_TYPE_BUFFER_POOL_ACQUIRE_FLAGS (gst_buffer_pool_acquire_flags_get_type())
-
-/* enumerations from "gstbus.h" */
-GType gst_bus_flags_get_type (void);
-#define GST_TYPE_BUS_FLAGS (gst_bus_flags_get_type())
-GType gst_bus_sync_reply_get_type (void);
-#define GST_TYPE_BUS_SYNC_REPLY (gst_bus_sync_reply_get_type())
-
-/* enumerations from "gstcaps.h" */
-GType gst_caps_flags_get_type (void);
-#define GST_TYPE_CAPS_FLAGS (gst_caps_flags_get_type())
-GType gst_caps_intersect_mode_get_type (void);
-#define GST_TYPE_CAPS_INTERSECT_MODE (gst_caps_intersect_mode_get_type())
-
-/* enumerations from "gstclock.h" */
-GType gst_clock_return_get_type (void);
-#define GST_TYPE_CLOCK_RETURN (gst_clock_return_get_type())
-GType gst_clock_entry_type_get_type (void);
-#define GST_TYPE_CLOCK_ENTRY_TYPE (gst_clock_entry_type_get_type())
-GType gst_clock_flags_get_type (void);
-#define GST_TYPE_CLOCK_FLAGS (gst_clock_flags_get_type())
-
-/* enumerations from "gstdebugutils.h" */
-GType gst_debug_graph_details_get_type (void);
-#define GST_TYPE_DEBUG_GRAPH_DETAILS (gst_debug_graph_details_get_type())
-
-/* enumerations from "gstelement.h" */
-GType gst_state_get_type (void);
-#define GST_TYPE_STATE (gst_state_get_type())
-GType gst_state_change_return_get_type (void);
-#define GST_TYPE_STATE_CHANGE_RETURN (gst_state_change_return_get_type())
-GType gst_state_change_get_type (void);
-#define GST_TYPE_STATE_CHANGE (gst_state_change_get_type())
-GType gst_element_flags_get_type (void);
-#define GST_TYPE_ELEMENT_FLAGS (gst_element_flags_get_type())
-
-/* enumerations from "gsterror.h" */
-GType gst_core_error_get_type (void);
-#define GST_TYPE_CORE_ERROR (gst_core_error_get_type())
-GType gst_library_error_get_type (void);
-#define GST_TYPE_LIBRARY_ERROR (gst_library_error_get_type())
-GType gst_resource_error_get_type (void);
-#define GST_TYPE_RESOURCE_ERROR (gst_resource_error_get_type())
-GType gst_stream_error_get_type (void);
-#define GST_TYPE_STREAM_ERROR (gst_stream_error_get_type())
-
-/* enumerations from "gstevent.h" */
-GType gst_event_type_flags_get_type (void);
-#define GST_TYPE_EVENT_TYPE_FLAGS (gst_event_type_flags_get_type())
-GType gst_event_type_get_type (void);
-#define GST_TYPE_EVENT_TYPE (gst_event_type_get_type())
-GType gst_qos_type_get_type (void);
-#define GST_TYPE_QOS_TYPE (gst_qos_type_get_type())
-
-/* enumerations from "gstformat.h" */
-GType gst_format_get_type (void);
-#define GST_TYPE_FORMAT (gst_format_get_type())
-
-/* enumerations from "gstinfo.h" */
-GType gst_debug_level_get_type (void);
-#define GST_TYPE_DEBUG_LEVEL (gst_debug_level_get_type())
-GType gst_debug_color_flags_get_type (void);
-#define GST_TYPE_DEBUG_COLOR_FLAGS (gst_debug_color_flags_get_type())
-
-/* enumerations from "gstiterator.h" */
-GType gst_iterator_result_get_type (void);
-#define GST_TYPE_ITERATOR_RESULT (gst_iterator_result_get_type())
-GType gst_iterator_item_get_type (void);
-#define GST_TYPE_ITERATOR_ITEM (gst_iterator_item_get_type())
-
-/* enumerations from "gstmessage.h" */
-GType gst_message_type_get_type (void);
-#define GST_TYPE_MESSAGE_TYPE (gst_message_type_get_type())
-GType gst_structure_change_type_get_type (void);
-#define GST_TYPE_STRUCTURE_CHANGE_TYPE (gst_structure_change_type_get_type())
-GType gst_stream_status_type_get_type (void);
-#define GST_TYPE_STREAM_STATUS_TYPE (gst_stream_status_type_get_type())
-GType gst_progress_type_get_type (void);
-#define GST_TYPE_PROGRESS_TYPE (gst_progress_type_get_type())
-
-/* enumerations from "gstmeta.h" */
-GType gst_meta_flags_get_type (void);
-#define GST_TYPE_META_FLAGS (gst_meta_flags_get_type())
-
-/* enumerations from "gstmemory.h" */
-GType gst_memory_flags_get_type (void);
-#define GST_TYPE_MEMORY_FLAGS (gst_memory_flags_get_type())
-GType gst_map_flags_get_type (void);
-#define GST_TYPE_MAP_FLAGS (gst_map_flags_get_type())
-
-/* enumerations from "gstminiobject.h" */
-GType gst_mini_object_flags_get_type (void);
-#define GST_TYPE_MINI_OBJECT_FLAGS (gst_mini_object_flags_get_type())
-GType gst_lock_flags_get_type (void);
-#define GST_TYPE_LOCK_FLAGS (gst_lock_flags_get_type())
-
-/* enumerations from "gstpad.h" */
-GType gst_pad_direction_get_type (void);
-#define GST_TYPE_PAD_DIRECTION (gst_pad_direction_get_type())
-GType gst_pad_mode_get_type (void);
-#define GST_TYPE_PAD_MODE (gst_pad_mode_get_type())
-GType gst_pad_link_return_get_type (void);
-#define GST_TYPE_PAD_LINK_RETURN (gst_pad_link_return_get_type())
-GType gst_flow_return_get_type (void);
-#define GST_TYPE_FLOW_RETURN (gst_flow_return_get_type())
-GType gst_pad_link_check_get_type (void);
-#define GST_TYPE_PAD_LINK_CHECK (gst_pad_link_check_get_type())
-GType gst_pad_probe_type_get_type (void);
-#define GST_TYPE_PAD_PROBE_TYPE (gst_pad_probe_type_get_type())
-GType gst_pad_probe_return_get_type (void);
-#define GST_TYPE_PAD_PROBE_RETURN (gst_pad_probe_return_get_type())
-GType gst_pad_flags_get_type (void);
-#define GST_TYPE_PAD_FLAGS (gst_pad_flags_get_type())
-
-/* enumerations from "gstpadtemplate.h" */
-GType gst_pad_presence_get_type (void);
-#define GST_TYPE_PAD_PRESENCE (gst_pad_presence_get_type())
-GType gst_pad_template_flags_get_type (void);
-#define GST_TYPE_PAD_TEMPLATE_FLAGS (gst_pad_template_flags_get_type())
-
-/* enumerations from "gstpipeline.h" */
-GType gst_pipeline_flags_get_type (void);
-#define GST_TYPE_PIPELINE_FLAGS (gst_pipeline_flags_get_type())
-
-/* enumerations from "gstplugin.h" */
-GType gst_plugin_error_get_type (void);
-#define GST_TYPE_PLUGIN_ERROR (gst_plugin_error_get_type())
-GType gst_plugin_flags_get_type (void);
-#define GST_TYPE_PLUGIN_FLAGS (gst_plugin_flags_get_type())
-GType gst_plugin_dependency_flags_get_type (void);
-#define GST_TYPE_PLUGIN_DEPENDENCY_FLAGS (gst_plugin_dependency_flags_get_type())
-
-/* enumerations from "gstpluginfeature.h" */
-GType gst_rank_get_type (void);
-#define GST_TYPE_RANK (gst_rank_get_type())
-
-/* enumerations from "gstquery.h" */
-GType gst_query_type_flags_get_type (void);
-#define GST_TYPE_QUERY_TYPE_FLAGS (gst_query_type_flags_get_type())
-GType gst_query_type_get_type (void);
-#define GST_TYPE_QUERY_TYPE (gst_query_type_get_type())
-GType gst_buffering_mode_get_type (void);
-#define GST_TYPE_BUFFERING_MODE (gst_buffering_mode_get_type())
-GType gst_scheduling_flags_get_type (void);
-#define GST_TYPE_SCHEDULING_FLAGS (gst_scheduling_flags_get_type())
-
-/* enumerations from "gstsegment.h" */
-GType gst_seek_type_get_type (void);
-#define GST_TYPE_SEEK_TYPE (gst_seek_type_get_type())
-GType gst_seek_flags_get_type (void);
-#define GST_TYPE_SEEK_FLAGS (gst_seek_flags_get_type())
-GType gst_segment_flags_get_type (void);
-#define GST_TYPE_SEGMENT_FLAGS (gst_segment_flags_get_type())
-
-/* enumerations from "gstsystemclock.h" */
-GType gst_clock_type_get_type (void);
-#define GST_TYPE_CLOCK_TYPE (gst_clock_type_get_type())
-
-/* enumerations from "gsttaglist.h" */
-GType gst_tag_merge_mode_get_type (void);
-#define GST_TYPE_TAG_MERGE_MODE (gst_tag_merge_mode_get_type())
-GType gst_tag_flag_get_type (void);
-#define GST_TYPE_TAG_FLAG (gst_tag_flag_get_type())
-GType gst_tag_scope_get_type (void);
-#define GST_TYPE_TAG_SCOPE (gst_tag_scope_get_type())
-
-/* enumerations from "gsttask.h" */
-GType gst_task_state_get_type (void);
-#define GST_TYPE_TASK_STATE (gst_task_state_get_type())
-
-/* enumerations from "gsttoc.h" */
-GType gst_toc_scope_get_type (void);
-#define GST_TYPE_TOC_SCOPE (gst_toc_scope_get_type())
-GType gst_toc_entry_type_get_type (void);
-#define GST_TYPE_TOC_ENTRY_TYPE (gst_toc_entry_type_get_type())
-
-/* enumerations from "gsttypefind.h" */
-GType gst_type_find_probability_get_type (void);
-#define GST_TYPE_TYPE_FIND_PROBABILITY (gst_type_find_probability_get_type())
-
-/* enumerations from "gsturi.h" */
-GType gst_uri_error_get_type (void);
-#define GST_TYPE_URI_ERROR (gst_uri_error_get_type())
-GType gst_uri_type_get_type (void);
-#define GST_TYPE_URI_TYPE (gst_uri_type_get_type())
-
-/* enumerations from "gstutils.h" */
-GType gst_search_mode_get_type (void);
-#define GST_TYPE_SEARCH_MODE (gst_search_mode_get_type())
-
-/* enumerations from "gstparse.h" */
-GType gst_parse_error_get_type (void);
-#define GST_TYPE_PARSE_ERROR (gst_parse_error_get_type())
-GType gst_parse_flags_get_type (void);
-#define GST_TYPE_PARSE_FLAGS (gst_parse_flags_get_type())
-G_END_DECLS
-
-#endif /* __GST_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsterror.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsterror.h
deleted file mode 100644
index a066be92..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsterror.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_ERROR_H__
-#define __GST_ERROR_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <errno.h>
-
-G_BEGIN_DECLS
-/*
- * we define FIXME error domains:
- * GST_CORE_ERROR
- * GST_LIBRARY_ERROR
- * GST_RESOURCE_ERROR
- * GST_STREAM_ERROR
- *
- * Check GError API docs for rationale for naming.
- */
-/**
- * GstCoreError:
- * @GST_CORE_ERROR_FAILED: a general error which doesn't fit in any other
- * category.  Make sure you add a custom message to the error call.
- * @GST_CORE_ERROR_TOO_LAZY: do not use this except as a placeholder for
- * deciding where to go while developing code.
- * @GST_CORE_ERROR_NOT_IMPLEMENTED: use this when you do not want to implement
- * this functionality yet.
- * @GST_CORE_ERROR_STATE_CHANGE: used for state change errors.
- * @GST_CORE_ERROR_PAD: used for pad-related errors.
- * @GST_CORE_ERROR_THREAD: used for thread-related errors.
- * @GST_CORE_ERROR_NEGOTIATION: used for negotiation-related errors.
- * @GST_CORE_ERROR_EVENT: used for event-related errors.
- * @GST_CORE_ERROR_SEEK: used for seek-related errors.
- * @GST_CORE_ERROR_CAPS: used for caps-related errors.
- * @GST_CORE_ERROR_TAG: used for negotiation-related errors.
- * @GST_CORE_ERROR_MISSING_PLUGIN: used if a plugin is missing.
- * @GST_CORE_ERROR_CLOCK: used for clock related errors.
- * @GST_CORE_ERROR_DISABLED: used if functionality has been disabled at
- *                           compile time.
- * @GST_CORE_ERROR_NUM_ERRORS: the number of core error types.
- *
- * Core errors are errors inside the core GStreamer library.
- */
-/* FIXME: should we divide in numerical blocks so we can easily add
-          for example PAD errors later ? */
-typedef enum
-{
-  GST_CORE_ERROR_FAILED = 1,
-  GST_CORE_ERROR_TOO_LAZY,
-  GST_CORE_ERROR_NOT_IMPLEMENTED,
-  GST_CORE_ERROR_STATE_CHANGE,
-  GST_CORE_ERROR_PAD,
-  GST_CORE_ERROR_THREAD,
-  GST_CORE_ERROR_NEGOTIATION,
-  GST_CORE_ERROR_EVENT,
-  GST_CORE_ERROR_SEEK,
-  GST_CORE_ERROR_CAPS,
-  GST_CORE_ERROR_TAG,
-  GST_CORE_ERROR_MISSING_PLUGIN,
-  GST_CORE_ERROR_CLOCK,
-  GST_CORE_ERROR_DISABLED,
-  GST_CORE_ERROR_NUM_ERRORS
-} GstCoreError;
-
-/**
- * GstLibraryError:
- * @GST_LIBRARY_ERROR_FAILED: a general error which doesn't fit in any other
- * category.  Make sure you add a custom message to the error call.
- * @GST_LIBRARY_ERROR_TOO_LAZY: do not use this except as a placeholder for
- * deciding where to go while developing code.
- * @GST_LIBRARY_ERROR_INIT: used when the library could not be opened.
- * @GST_LIBRARY_ERROR_SHUTDOWN: used when the library could not be closed.
- * @GST_LIBRARY_ERROR_SETTINGS: used when the library doesn't accept settings.
- * @GST_LIBRARY_ERROR_ENCODE: used when the library generated an encoding error.
- * @GST_LIBRARY_ERROR_NUM_ERRORS: the number of library error types.
- *
- * Library errors are for errors from the library being used by elements
- * (initializing, finalizing, settings, ...)
- */
-typedef enum
-{
-  GST_LIBRARY_ERROR_FAILED = 1,
-  GST_LIBRARY_ERROR_TOO_LAZY,
-  GST_LIBRARY_ERROR_INIT,
-  GST_LIBRARY_ERROR_SHUTDOWN,
-  GST_LIBRARY_ERROR_SETTINGS,
-  GST_LIBRARY_ERROR_ENCODE,
-  GST_LIBRARY_ERROR_NUM_ERRORS
-} GstLibraryError;
-
-/**
- * GstResourceError:
- * @GST_RESOURCE_ERROR_FAILED: a general error which doesn't fit in any other
- * category.  Make sure you add a custom message to the error call.
- * @GST_RESOURCE_ERROR_TOO_LAZY: do not use this except as a placeholder for
- * deciding where to go while developing code.
- * @GST_RESOURCE_ERROR_NOT_FOUND: used when the resource could not be found.
- * @GST_RESOURCE_ERROR_BUSY: used when resource is busy.
- * @GST_RESOURCE_ERROR_OPEN_READ: used when resource fails to open for reading.
- * @GST_RESOURCE_ERROR_OPEN_WRITE: used when resource fails to open for writing.
- * @GST_RESOURCE_ERROR_OPEN_READ_WRITE: used when resource cannot be opened for
- * both reading and writing, or either (but unspecified which).
- * @GST_RESOURCE_ERROR_CLOSE: used when the resource can't be closed.
- * @GST_RESOURCE_ERROR_READ: used when the resource can't be read from.
- * @GST_RESOURCE_ERROR_WRITE: used when the resource can't be written to.
- * @GST_RESOURCE_ERROR_SEEK: used when a seek on the resource fails.
- * @GST_RESOURCE_ERROR_SYNC: used when a synchronize on the resource fails.
- * @GST_RESOURCE_ERROR_SETTINGS: used when settings can't be manipulated on.
- * @GST_RESOURCE_ERROR_NO_SPACE_LEFT: used when the resource has no space left.
- * @GST_RESOURCE_ERROR_NUM_ERRORS: the number of resource error types.
- *
- * Resource errors are for any resource used by an element:
- * memory, files, network connections, process space, ...
- * They're typically used by source and sink elements.
- */
-typedef enum
-{
-  GST_RESOURCE_ERROR_FAILED = 1,
-  GST_RESOURCE_ERROR_TOO_LAZY,
-  GST_RESOURCE_ERROR_NOT_FOUND,
-  GST_RESOURCE_ERROR_BUSY,
-  GST_RESOURCE_ERROR_OPEN_READ,
-  GST_RESOURCE_ERROR_OPEN_WRITE,
-  GST_RESOURCE_ERROR_OPEN_READ_WRITE,
-  GST_RESOURCE_ERROR_CLOSE,
-  GST_RESOURCE_ERROR_READ,
-  GST_RESOURCE_ERROR_WRITE,
-  GST_RESOURCE_ERROR_SEEK,
-  GST_RESOURCE_ERROR_SYNC,
-  GST_RESOURCE_ERROR_SETTINGS,
-  GST_RESOURCE_ERROR_NO_SPACE_LEFT,
-  GST_RESOURCE_ERROR_NUM_ERRORS
-} GstResourceError;
-
-/**
- * GstStreamError:
- * @GST_STREAM_ERROR_FAILED: a general error which doesn't fit in any other
- * category.  Make sure you add a custom message to the error call.
- * @GST_STREAM_ERROR_TOO_LAZY: do not use this except as a placeholder for
- * deciding where to go while developing code.
- * @GST_STREAM_ERROR_NOT_IMPLEMENTED: use this when you do not want to implement
- * this functionality yet.
- * @GST_STREAM_ERROR_TYPE_NOT_FOUND: used when the element doesn't know the
- * stream's type.
- * @GST_STREAM_ERROR_WRONG_TYPE: used when the element doesn't handle this type
- * of stream.
- * @GST_STREAM_ERROR_CODEC_NOT_FOUND: used when there's no codec to handle the
- * stream's type.
- * @GST_STREAM_ERROR_DECODE: used when decoding fails.
- * @GST_STREAM_ERROR_ENCODE: used when encoding fails.
- * @GST_STREAM_ERROR_DEMUX: used when demuxing fails.
- * @GST_STREAM_ERROR_MUX: used when muxing fails.
- * @GST_STREAM_ERROR_FORMAT: used when the stream is of the wrong format
- * (for example, wrong caps).
- * @GST_STREAM_ERROR_DECRYPT: used when the stream is encrypted and can't be
- * decrypted because this is not supported by the element.
- * @GST_STREAM_ERROR_DECRYPT_NOKEY: used when the stream is encrypted and
- * can't be decrypted because no suitable key is available.
- * @GST_STREAM_ERROR_NUM_ERRORS: the number of stream error types.
- *
- * Stream errors are for anything related to the stream being processed:
- * format errors, media type errors, ...
- * They're typically used by decoders, demuxers, converters, ...
- */
-typedef enum
-{
-  GST_STREAM_ERROR_FAILED = 1,
-  GST_STREAM_ERROR_TOO_LAZY,
-  GST_STREAM_ERROR_NOT_IMPLEMENTED,
-  GST_STREAM_ERROR_TYPE_NOT_FOUND,
-  GST_STREAM_ERROR_WRONG_TYPE,
-  GST_STREAM_ERROR_CODEC_NOT_FOUND,
-  GST_STREAM_ERROR_DECODE,
-  GST_STREAM_ERROR_ENCODE,
-  GST_STREAM_ERROR_DEMUX,
-  GST_STREAM_ERROR_MUX,
-  GST_STREAM_ERROR_FORMAT,
-  GST_STREAM_ERROR_DECRYPT,
-  GST_STREAM_ERROR_DECRYPT_NOKEY,
-  GST_STREAM_ERROR_NUM_ERRORS
-} GstStreamError;
-
-/**
- * GST_LIBRARY_ERROR:
- *
- * Error domain for library loading. Errors in this domain will
- * be from the #GstLibraryError enumeration.
- * See #GError for information on error domains.
- */
-#define GST_LIBRARY_ERROR   gst_library_error_quark ()
-/**
- * GST_RESOURCE_ERROR:
- *
- * Error domain for resource handling. Errors in this domain will
- * be from the #GstResourceError enumeration.
- * See #GError for information on error domains.
- */
-#define GST_RESOURCE_ERROR  gst_resource_error_quark ()
-/**
- * GST_CORE_ERROR:
- *
- * Error domain for core system. Errors in this domain will
- * be from the #GstCoreError enumeration.
- * See #GError for information on error domains.
- */
-#define GST_CORE_ERROR      gst_core_error_quark ()
-/**
- * GST_STREAM_ERROR:
- *
- * Error domain for media stream processing. Errors in this domain will
- * be from the #GstStreamError enumeration.
- * See #GError for information on error domains.
- */
-#define GST_STREAM_ERROR    gst_stream_error_quark ()
-
-/**
- * GST_ERROR_SYSTEM:
- *
- * Builds a string using errno describing the previously failed system
- * call.  To be used as the debug argument in #GST_ELEMENT_ERROR.
- */
-#define GST_ERROR_SYSTEM    ("system error: %s", g_strerror (errno))
-
-gchar *gst_error_get_message (GQuark domain, gint code);
-GQuark gst_stream_error_quark (void);
-GQuark gst_core_error_quark (void);
-GQuark gst_resource_error_quark (void);
-GQuark gst_library_error_quark (void);
-
-G_END_DECLS
-#endif /* __GST_ERROR_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstevent.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstevent.h
deleted file mode 100644
index 7907a69d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstevent.h
+++ /dev/null
@@ -1,550 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstevent.h: Header for GstEvent subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_EVENT_H__
-#define __GST_EVENT_H__
-
-typedef struct _GstEvent GstEvent;
-
-/**
- * GstEventTypeFlags:
- * @GST_EVENT_TYPE_UPSTREAM:     Set if the event can travel upstream.
- * @GST_EVENT_TYPE_DOWNSTREAM:   Set if the event can travel downstream.
- * @GST_EVENT_TYPE_SERIALIZED:   Set if the event should be serialized with data
- *                               flow.
- * @GST_EVENT_TYPE_STICKY:       Set if the event is sticky on the pads.
- * @GST_EVENT_TYPE_STICKY_MULTI: Multiple sticky events can be on a pad, each
- *                               identified by the event name.
- *
- * #GstEventTypeFlags indicate the aspects of the different #GstEventType
- * values. You can get the type flags of a #GstEventType with the
- * gst_event_type_get_flags() function.
- */
-typedef enum {
-  GST_EVENT_TYPE_UPSTREAM       = 1 << 0,
-  GST_EVENT_TYPE_DOWNSTREAM     = 1 << 1,
-  GST_EVENT_TYPE_SERIALIZED     = 1 << 2,
-  GST_EVENT_TYPE_STICKY         = 1 << 3,
-  GST_EVENT_TYPE_STICKY_MULTI   = 1 << 4
-} GstEventTypeFlags;
-
-/**
- * GST_EVENT_TYPE_BOTH:
- *
- * The same thing as #GST_EVENT_TYPE_UPSTREAM | #GST_EVENT_TYPE_DOWNSTREAM.
- */
-#define GST_EVENT_TYPE_BOTH \
-    (GST_EVENT_TYPE_UPSTREAM | GST_EVENT_TYPE_DOWNSTREAM)
-
-#define GST_EVENT_NUM_SHIFT     (8)
-
-/**
- * GST_EVENT_MAKE_TYPE:
- * @num: the event number to create
- * @flags: the event flags
- *
- * when making custom event types, use this macro with the num and
- * the given flags
- */
-#define GST_EVENT_MAKE_TYPE(num,flags) \
-    (((num) << GST_EVENT_NUM_SHIFT) | (flags))
-
-#define FLAG(name) GST_EVENT_TYPE_##name
-
-/**
- * GstEventType:
- * @GST_EVENT_UNKNOWN: unknown event.
- * @GST_EVENT_FLUSH_START: Start a flush operation. This event clears all data
- *                 from the pipeline and unblock all streaming threads.
- * @GST_EVENT_FLUSH_STOP: Stop a flush operation. This event resets the
- *                 running-time of the pipeline.
- * @GST_EVENT_STREAM_START: Event to mark the start of a new stream. Sent before any
- *                 other serialized event and only sent at the start of a new stream,
- *                 not after flushing seeks.
- * @GST_EVENT_CAPS: #GstCaps event. Notify the pad of a new media type.
- * @GST_EVENT_SEGMENT: A new media segment follows in the dataflow. The
- *                 segment events contains information for clipping buffers and
- *                 converting buffer timestamps to running-time and
- *                 stream-time.
- * @GST_EVENT_TAG: A new set of metadata tags has been found in the stream.
- * @GST_EVENT_BUFFERSIZE: Notification of buffering requirements. Currently not
- *                 used yet.
- * @GST_EVENT_SINK_MESSAGE: An event that sinks turn into a message. Used to
- *                          send messages that should be emitted in sync with
- *                          rendering.
- * @GST_EVENT_EOS: End-Of-Stream. No more data is to be expected to follow
- *                 without a SEGMENT event.
- * @GST_EVENT_SEGMENT_DONE: Marks the end of a segment playback.
- * @GST_EVENT_GAP: Marks a gap in the datastream.
- * @GST_EVENT_TOC: An event which indicates that a new table of contents (TOC)
- *                 was found or updated.
- * @GST_EVENT_QOS: A quality message. Used to indicate to upstream elements
- *                 that the downstream elements should adjust their processing
- *                 rate.
- * @GST_EVENT_SEEK: A request for a new playback position and rate.
- * @GST_EVENT_NAVIGATION: Navigation events are usually used for communicating
- *                        user requests, such as mouse or keyboard movements,
- *                        to upstream elements.
- * @GST_EVENT_LATENCY: Notification of new latency adjustment. Sinks will use
- *                     the latency information to adjust their synchronisation.
- * @GST_EVENT_STEP: A request for stepping through the media. Sinks will usually
- *                  execute the step operation.
- * @GST_EVENT_RECONFIGURE: A request for upstream renegotiating caps and reconfiguring.
- * @GST_EVENT_TOC_SELECT: A request for a new playback position based on TOC
- *                        entry's UID.
- * @GST_EVENT_CUSTOM_UPSTREAM: Upstream custom event
- * @GST_EVENT_CUSTOM_DOWNSTREAM: Downstream custom event that travels in the
- *                        data flow.
- * @GST_EVENT_CUSTOM_DOWNSTREAM_OOB: Custom out-of-band downstream event.
- * @GST_EVENT_CUSTOM_DOWNSTREAM_STICKY: Custom sticky downstream event.
- * @GST_EVENT_CUSTOM_BOTH: Custom upstream or downstream event.
- *                         In-band when travelling downstream.
- * @GST_EVENT_CUSTOM_BOTH_OOB: Custom upstream or downstream out-of-band event.
- *
- * #GstEventType lists the standard event types that can be sent in a pipeline.
- *
- * The custom event types can be used for private messages between elements
- * that can't be expressed using normal
- * GStreamer buffer passing semantics. Custom events carry an arbitrary
- * #GstStructure.
- * Specific custom events are distinguished by the name of the structure.
- */
-/* NOTE: keep in sync with quark registration in gstevent.c */
-typedef enum {
-  GST_EVENT_UNKNOWN               = GST_EVENT_MAKE_TYPE (0, 0),
-
-  /* bidirectional events */
-  GST_EVENT_FLUSH_START           = GST_EVENT_MAKE_TYPE (10, FLAG(BOTH)),
-  GST_EVENT_FLUSH_STOP            = GST_EVENT_MAKE_TYPE (20, FLAG(BOTH) | FLAG(SERIALIZED)),
-
-  /* downstream serialized events */
-  GST_EVENT_STREAM_START          = GST_EVENT_MAKE_TYPE (40, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_CAPS                  = GST_EVENT_MAKE_TYPE (50, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_SEGMENT               = GST_EVENT_MAKE_TYPE (70, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_TAG                   = GST_EVENT_MAKE_TYPE (80, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)),
-  GST_EVENT_BUFFERSIZE            = GST_EVENT_MAKE_TYPE (90, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_SINK_MESSAGE          = GST_EVENT_MAKE_TYPE (100, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)),
-  GST_EVENT_EOS                   = GST_EVENT_MAKE_TYPE (110, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_TOC                   = GST_EVENT_MAKE_TYPE (120, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)),
-
-  /* non-sticky downstream serialized */
-  GST_EVENT_SEGMENT_DONE          = GST_EVENT_MAKE_TYPE (150, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
-  GST_EVENT_GAP                   = GST_EVENT_MAKE_TYPE (160, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
-
-  /* upstream events */
-  GST_EVENT_QOS                   = GST_EVENT_MAKE_TYPE (190, FLAG(UPSTREAM)),
-  GST_EVENT_SEEK                  = GST_EVENT_MAKE_TYPE (200, FLAG(UPSTREAM)),
-  GST_EVENT_NAVIGATION            = GST_EVENT_MAKE_TYPE (210, FLAG(UPSTREAM)),
-  GST_EVENT_LATENCY               = GST_EVENT_MAKE_TYPE (220, FLAG(UPSTREAM)),
-  GST_EVENT_STEP                  = GST_EVENT_MAKE_TYPE (230, FLAG(UPSTREAM)),
-  GST_EVENT_RECONFIGURE           = GST_EVENT_MAKE_TYPE (240, FLAG(UPSTREAM)),
-  GST_EVENT_TOC_SELECT            = GST_EVENT_MAKE_TYPE (250, FLAG(UPSTREAM)),
-
-  /* custom events start here */
-  GST_EVENT_CUSTOM_UPSTREAM          = GST_EVENT_MAKE_TYPE (270, FLAG(UPSTREAM)),
-  GST_EVENT_CUSTOM_DOWNSTREAM        = GST_EVENT_MAKE_TYPE (280, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
-  GST_EVENT_CUSTOM_DOWNSTREAM_OOB    = GST_EVENT_MAKE_TYPE (290, FLAG(DOWNSTREAM)),
-  GST_EVENT_CUSTOM_DOWNSTREAM_STICKY = GST_EVENT_MAKE_TYPE (300, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)),
-  GST_EVENT_CUSTOM_BOTH              = GST_EVENT_MAKE_TYPE (310, FLAG(BOTH) | FLAG(SERIALIZED)),
-  GST_EVENT_CUSTOM_BOTH_OOB          = GST_EVENT_MAKE_TYPE (320, FLAG(BOTH))
-} GstEventType;
-#undef FLAG
-
-#include <gst/gstminiobject.h>
-#include <gst/gstformat.h>
-#include <gst/gstobject.h>
-#include <gst/gstclock.h>
-#include <gst/gststructure.h>
-#include <gst/gsttaglist.h>
-#include <gst/gstsegment.h>
-#include <gst/gstsegment.h>
-#include <gst/gstmessage.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_event_type;
-
-#define GST_TYPE_EVENT                  (_gst_event_type)
-#define GST_IS_EVENT(obj)               (GST_IS_MINI_OBJECT_TYPE (obj, GST_TYPE_EVENT))
-#define GST_EVENT_CAST(obj)             ((GstEvent *)(obj))
-#define GST_EVENT(obj)                  (GST_EVENT_CAST(obj))
-
-/**
- * GST_EVENT_TYPE:
- * @event: the event to query
- *
- * Get the #GstEventType of the event.
- */
-#define GST_EVENT_TYPE(event)           (GST_EVENT_CAST(event)->type)
-
-/**
- * GST_EVENT_TYPE_NAME:
- * @event: the event to query
- *
- * Get a constant string representation of the #GstEventType of the event.
- */
-#define GST_EVENT_TYPE_NAME(event)      (gst_event_type_get_name(GST_EVENT_TYPE(event)))
-
-/**
- * GST_EVENT_TIMESTAMP:
- * @event: the event to query
- *
- * Get the #GstClockTime timestamp of the event. This is the time when the event
- * was created.
- */
-#define GST_EVENT_TIMESTAMP(event)      (GST_EVENT_CAST(event)->timestamp)
-
-/**
- * GST_EVENT_SEQNUM:
- * @event: the event to query
- *
- * The sequence number of @event.
- */
-#define GST_EVENT_SEQNUM(event)         (GST_EVENT_CAST(event)->seqnum)
-
-/**
- * GST_EVENT_IS_UPSTREAM:
- * @ev: the event to query
- *
- * Check if an event can travel upstream.
- */
-#define GST_EVENT_IS_UPSTREAM(ev)       !!(GST_EVENT_TYPE (ev) & GST_EVENT_TYPE_UPSTREAM)
-/**
- * GST_EVENT_IS_DOWNSTREAM:
- * @ev: the event to query
- *
- * Check if an event can travel downstream.
- */
-#define GST_EVENT_IS_DOWNSTREAM(ev)     !!(GST_EVENT_TYPE (ev) & GST_EVENT_TYPE_DOWNSTREAM)
-/**
- * GST_EVENT_IS_SERIALIZED:
- * @ev: the event to query
- *
- * Check if an event is serialized with the data stream.
- */
-#define GST_EVENT_IS_SERIALIZED(ev)     !!(GST_EVENT_TYPE (ev) & GST_EVENT_TYPE_SERIALIZED)
-/**
- * GST_EVENT_IS_STICKY:
- * @ev: the event to query
- *
- * Check if an event is sticky on the pads.
- */
-#define GST_EVENT_IS_STICKY(ev)     !!(GST_EVENT_TYPE (ev) & GST_EVENT_TYPE_STICKY)
-
-/**
- * gst_event_is_writable:
- * @ev: a #GstEvent
- *
- * Tests if you can safely write data into a event's structure or validly
- * modify the seqnum and timestamp field.
- */
-#define         gst_event_is_writable(ev)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (ev))
-/**
- * gst_event_make_writable:
- * @ev: (transfer full): a #GstEvent
- *
- * Makes a writable event from the given event. If the source event is
- * already writable, this will simply return the same event. A copy will
- * otherwise be made using gst_event_copy().
- *
- * Returns: (transfer full): a writable event which may or may not be the
- *     same as @ev
- */
-#define         gst_event_make_writable(ev)   GST_EVENT_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (ev)))
-/**
- * gst_event_replace:
- * @old_event: (inout) (transfer full): pointer to a pointer to a #GstEvent
- *     to be replaced.
- * @new_event: (allow-none) (transfer none): pointer to a #GstEvent that will
- *     replace the event pointed to by @old_event.
- *
- * Modifies a pointer to a #GstEvent to point to a different #GstEvent. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * event is unreffed, the new one is reffed).
- *
- * Either @new_event or the #GstEvent pointed to by @old_event may be NULL.
- *
- * Returns: TRUE if @new_event was different from @old_event
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_event_replace (GstEvent **old_event, GstEvent *new_event);
-#endif
-
-static inline gboolean
-gst_event_replace (GstEvent **old_event, GstEvent *new_event)
-{
-  return gst_mini_object_replace ((GstMiniObject **) old_event, (GstMiniObject *) new_event);
-}
-
-/**
- * gst_event_steal:
- * @old_event: (inout) (transfer full): pointer to a pointer to a #GstEvent
- *     to be stolen.
- *
- * Atomically replace the #GstEvent pointed to by @old_event with NULL and
- * return the original event.
- *
- * Returns: the #GstEvent that was in @old_event
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstEvent * gst_event_steal (GstEvent **old_event);
-#endif
-
-static inline GstEvent *
-gst_event_steal (GstEvent **old_event)
-{
-  return GST_EVENT_CAST (gst_mini_object_steal ((GstMiniObject **) old_event));
-}
-
-/**
- * gst_event_take:
- * @old_event: (inout) (transfer full): pointer to a pointer to a #GstEvent
- *     to be stolen.
- * @new_event: (allow-none) (transfer full): pointer to a #GstEvent that will
- *     replace the event pointed to by @old_event.
- *
- * Modifies a pointer to a #GstEvent to point to a different #GstEvent. This
- * function is similar to gst_event_replace() except that it takes ownership of
- * @new_event.
- *
- * Either @new_event or the #GstEvent pointed to by @old_event may be NULL.
- *
- * Returns: TRUE if @new_event was different from @old_event
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_event_take (GstEvent **old_event, GstEvent *new_event);
-#endif
-
-static inline gboolean
-gst_event_take (GstEvent **old_event, GstEvent *new_event)
-{
-  return gst_mini_object_take ((GstMiniObject **) old_event, (GstMiniObject *) new_event);
-}
-
-/**
- * GstQOSType:
- * @GST_QOS_TYPE_OVERFLOW: The QoS event type that is produced when downstream
- *    elements are producing data too quickly and the element can't keep up
- *    processing the data. Upstream should reduce their processing rate. This
- *    type is also used when buffers arrive early or in time.
- * @GST_QOS_TYPE_UNDERFLOW: The QoS event type that is produced when downstream
- *    elements are producing data too slowly and need to speed up their processing
- *    rate.
- * @GST_QOS_TYPE_THROTTLE: The QoS event type that is produced when the
- *    application enabled throttling to limit the datarate.
- *
- * The different types of QoS events that can be given to the
- * gst_event_new_qos() method.
- */
-typedef enum {
-  GST_QOS_TYPE_OVERFLOW        = 0,
-  GST_QOS_TYPE_UNDERFLOW       = 1,
-  GST_QOS_TYPE_THROTTLE        = 2
-} GstQOSType;
-
-/**
- * GstEvent:
- * @mini_object: the parent structure
- * @type: the #GstEventType of the event
- * @timestamp: the timestamp of the event
- * @seqnum: the sequence number of the event
- *
- * A #GstEvent.
- */
-struct _GstEvent {
-  GstMiniObject mini_object;
-
-  /*< public >*/ /* with COW */
-  GstEventType  type;
-  guint64       timestamp;
-  guint32       seqnum;
-};
-
-const gchar*    gst_event_type_get_name         (GstEventType type);
-GQuark          gst_event_type_to_quark         (GstEventType type);
-GstEventTypeFlags
-                gst_event_type_get_flags        (GstEventType type);
-
-
-/* refcounting */
-/**
- * gst_event_ref:
- * @event: The event to refcount
- *
- * Increase the refcount of this event.
- *
- * Returns: (transfer full): @event (for convenience when doing assignments)
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstEvent * gst_event_ref (GstEvent * event);
-#endif
-
-static inline GstEvent *
-gst_event_ref (GstEvent * event)
-{
-  return (GstEvent *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (event));
-}
-
-/**
- * gst_event_unref:
- * @event: (transfer full): the event to refcount
- *
- * Decrease the refcount of an event, freeing it if the refcount reaches 0.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_event_unref (GstEvent * event);
-#endif
-
-static inline void
-gst_event_unref (GstEvent * event)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (event));
-}
-
-/* copy event */
-/**
- * gst_event_copy:
- * @event: The event to copy
- *
- * Copy the event using the event specific copy function.
- *
- * Returns: (transfer full): the new event
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstEvent * gst_event_copy (const GstEvent * event);
-#endif
-
-static inline GstEvent *
-gst_event_copy (const GstEvent * event)
-{
-  return GST_EVENT_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (event)));
-}
-
-GType           gst_event_get_type              (void);
-
-/* custom event */
-GstEvent*       gst_event_new_custom            (GstEventType type, GstStructure *structure) G_GNUC_MALLOC;
-
-const GstStructure *
-                gst_event_get_structure         (GstEvent *event);
-GstStructure *  gst_event_writable_structure    (GstEvent *event);
-
-gboolean        gst_event_has_name              (GstEvent *event, const gchar *name);
-
-/* identifiers for events and messages */
-guint32         gst_event_get_seqnum            (GstEvent *event);
-void            gst_event_set_seqnum            (GstEvent *event, guint32 seqnum);
-
-/* Stream start event */
-GstEvent *      gst_event_new_stream_start      (const gchar *stream_id) G_GNUC_MALLOC;
-void            gst_event_parse_stream_start    (GstEvent *event, const gchar **stream_id);
-
-/* flush events */
-GstEvent *      gst_event_new_flush_start       (void) G_GNUC_MALLOC;
-
-GstEvent *      gst_event_new_flush_stop        (gboolean reset_time) G_GNUC_MALLOC;
-void            gst_event_parse_flush_stop      (GstEvent *event, gboolean *reset_time);
-
-/* EOS event */
-GstEvent *      gst_event_new_eos               (void) G_GNUC_MALLOC;
-
-/* GAP event */
-GstEvent *      gst_event_new_gap               (GstClockTime   timestamp,
-                                                 GstClockTime   duration) G_GNUC_MALLOC;
-
-void            gst_event_parse_gap             (GstEvent     * event,
-                                                 GstClockTime * timestamp,
-                                                 GstClockTime * duration);
-
-/* Caps events */
-GstEvent *      gst_event_new_caps              (GstCaps *caps) G_GNUC_MALLOC;
-void            gst_event_parse_caps            (GstEvent *event, GstCaps **caps);
-
-/* segment event */
-GstEvent*       gst_event_new_segment           (const GstSegment *segment) G_GNUC_MALLOC;
-void            gst_event_parse_segment         (GstEvent *event, const GstSegment **segment);
-void            gst_event_copy_segment          (GstEvent *event, GstSegment *segment);
-
-/* tag event */
-GstEvent*       gst_event_new_tag               (GstTagList *taglist) G_GNUC_MALLOC;
-void            gst_event_parse_tag             (GstEvent *event, GstTagList **taglist);
-
-/* TOC event */
-GstEvent*      gst_event_new_toc                (GstToc *toc, gboolean updated);
-void           gst_event_parse_toc              (GstEvent *event, GstToc **toc, gboolean *updated);
-
-
-/* buffer */
-GstEvent *      gst_event_new_buffer_size       (GstFormat format, gint64 minsize, gint64 maxsize,
-                                                 gboolean async) G_GNUC_MALLOC;
-void            gst_event_parse_buffer_size     (GstEvent *event, GstFormat *format, gint64 *minsize,
-                                                 gint64 *maxsize, gboolean *async);
-
-/* sink message */
-GstEvent*       gst_event_new_sink_message      (const gchar *name, GstMessage *msg) G_GNUC_MALLOC;
-void            gst_event_parse_sink_message    (GstEvent *event, GstMessage **msg);
-
-/* QOS events */
-GstEvent*       gst_event_new_qos               (GstQOSType type, gdouble proportion,
-                                                 GstClockTimeDiff diff, GstClockTime timestamp) G_GNUC_MALLOC;
-void            gst_event_parse_qos             (GstEvent *event, GstQOSType *type,
-                                                 gdouble *proportion, GstClockTimeDiff *diff,
-                                                 GstClockTime *timestamp);
-/* seek event */
-GstEvent*       gst_event_new_seek              (gdouble rate, GstFormat format, GstSeekFlags flags,
-                                                 GstSeekType start_type, gint64 start,
-                                                 GstSeekType stop_type, gint64 stop) G_GNUC_MALLOC;
-void            gst_event_parse_seek            (GstEvent *event, gdouble *rate, GstFormat *format,
-                                                 GstSeekFlags *flags,
-                                                 GstSeekType *start_type, gint64 *start,
-                                                 GstSeekType *stop_type, gint64 *stop);
-
-/* navigation event */
-GstEvent*       gst_event_new_navigation        (GstStructure *structure) G_GNUC_MALLOC;
-
-/* latency event */
-GstEvent*       gst_event_new_latency           (GstClockTime latency) G_GNUC_MALLOC;
-void            gst_event_parse_latency         (GstEvent *event, GstClockTime *latency);
-
-/* step event */
-GstEvent*       gst_event_new_step              (GstFormat format, guint64 amount, gdouble rate,
-                                                 gboolean flush, gboolean intermediate) G_GNUC_MALLOC;
-void            gst_event_parse_step            (GstEvent *event, GstFormat *format, guint64 *amount,
-                                                 gdouble *rate, gboolean *flush, gboolean *intermediate);
-
-/* renegotiate event */
-GstEvent*       gst_event_new_reconfigure       (void) G_GNUC_MALLOC;
-
-/* TOC select event */
-GstEvent*       gst_event_new_toc_select        (const gchar *uid) G_GNUC_MALLOC;
-void            gst_event_parse_toc_select      (GstEvent *event, gchar **uid);
-
-/* segment-done event */
-GstEvent*       gst_event_new_segment_done      (GstFormat format, gint64 position) G_GNUC_MALLOC;
-void            gst_event_parse_segment_done    (GstEvent *event, GstFormat *format, gint64 *position);
-
-G_END_DECLS
-
-#endif /* __GST_EVENT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstformat.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstformat.h
deleted file mode 100644
index 13dad037..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstformat.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstformat.h: Header for GstFormat types used in queries and
- *              seeking.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_FORMAT_H__
-#define __GST_FORMAT_H__
-
-#include <glib.h>
-
-#include <gst/gstiterator.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstFormat:
- * @GST_FORMAT_UNDEFINED: undefined format
- * @GST_FORMAT_DEFAULT: the default format of the pad/element. This can be
- *    samples for raw audio, frames/fields for raw video (some, but not all,
- *    elements support this; use @GST_FORMAT_TIME if you don't have a good
- *    reason to query for samples/frames)
- * @GST_FORMAT_BYTES: bytes
- * @GST_FORMAT_TIME: time in nanoseconds
- * @GST_FORMAT_BUFFERS: buffers (few, if any, elements implement this as of
- *     May 2009)
- * @GST_FORMAT_PERCENT: percentage of stream (few, if any, elements implement
- *     this as of May 2009)
- *
- * Standard predefined formats
- */
-/* NOTE: don't forget to update the table in gstformat.c when changing
- * this enum */
-typedef enum {
-  GST_FORMAT_UNDEFINED  =  0, /* must be first in list */
-  GST_FORMAT_DEFAULT    =  1,
-  GST_FORMAT_BYTES      =  2,
-  GST_FORMAT_TIME       =  3,
-  GST_FORMAT_BUFFERS    =  4,
-  GST_FORMAT_PERCENT    =  5
-} GstFormat;
-
-/* a percentage is always relative to 1000000 */
-/**
- * GST_FORMAT_PERCENT_MAX:
- *
- * The PERCENT format is between 0 and this value
- */
-#define GST_FORMAT_PERCENT_MAX          G_GINT64_CONSTANT (1000000)
-/**
- * GST_FORMAT_PERCENT_SCALE:
- *
- * The value used to scale down the reported PERCENT format value to
- * its real value.
- */
-#define GST_FORMAT_PERCENT_SCALE        G_GINT64_CONSTANT (10000)
-
-typedef struct _GstFormatDefinition GstFormatDefinition;
-
-/**
- * GstFormatDefinition:
- * @value: The unique id of this format
- * @nick: A short nick of the format
- * @description: A longer description of the format
- * @quark: A quark for the nick
- *
- * A format definition
- */
-struct _GstFormatDefinition
-{
-  GstFormat    value;
-  const gchar *nick;
-  const gchar *description;
-  GQuark       quark;
-};
-
-const gchar*    gst_format_get_name             (GstFormat format);
-GQuark          gst_format_to_quark             (GstFormat format);
-
-/* register a new format */
-GstFormat       gst_format_register             (const gchar *nick,
-                                                 const gchar *description);
-GstFormat       gst_format_get_by_nick          (const gchar *nick);
-
-/* check if a format is in an array of formats */
-gboolean        gst_formats_contains            (const GstFormat *formats, GstFormat format);
-
-/* query for format details */
-const GstFormatDefinition*
-                gst_format_get_details          (GstFormat format);
-GstIterator*    gst_format_iterate_definitions  (void);
-
-G_END_DECLS
-
-#endif /* __GST_FORMAT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstghostpad.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstghostpad.h
deleted file mode 100644
index 77c79c4f..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstghostpad.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *                    2005 Andy Wingo <wingo@pobox.com>
- *
- * gstghostpad.h: Proxy pads
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_GHOST_PAD_H__
-#define __GST_GHOST_PAD_H__
-
-
-#include <gst/gstpad.h>
-
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PROXY_PAD              (gst_proxy_pad_get_type ())
-#define GST_IS_PROXY_PAD(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PROXY_PAD))
-#define GST_IS_PROXY_PAD_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PROXY_PAD))
-#define GST_PROXY_PAD(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PROXY_PAD, GstProxyPad))
-#define GST_PROXY_PAD_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PROXY_PAD, GstProxyPadClass))
-
-typedef struct _GstProxyPad GstProxyPad;
-typedef struct _GstProxyPadPrivate GstProxyPadPrivate;
-typedef struct _GstProxyPadClass GstProxyPadClass;
-
-struct _GstProxyPad
-{
-  GstPad pad;
-
-  /*< private >*/
-  GstProxyPadPrivate *priv;
-};
-
-struct _GstProxyPadClass
-{
-  GstPadClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[1];
-};
-
-GType gst_proxy_pad_get_type (void);
-
-GstProxyPad*     gst_proxy_pad_get_internal     (GstProxyPad *pad);
-
-
-GstIterator*        gst_proxy_pad_iterate_internal_links_default (GstPad *pad, GstObject *parent) G_GNUC_MALLOC;
-GstFlowReturn       gst_proxy_pad_chain_default                  (GstPad *pad, GstObject *parent,
-                                                                  GstBuffer *buffer);
-GstFlowReturn       gst_proxy_pad_chain_list_default             (GstPad *pad, GstObject *parent,
-                                                                  GstBufferList *list);
-GstFlowReturn       gst_proxy_pad_getrange_default               (GstPad *pad, GstObject *parent,
-                                                                  guint64 offset, guint size,
-                                                                  GstBuffer **buffer);
-
-#define GST_TYPE_GHOST_PAD              (gst_ghost_pad_get_type ())
-#define GST_IS_GHOST_PAD(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_GHOST_PAD))
-#define GST_IS_GHOST_PAD_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GHOST_PAD))
-#define GST_GHOST_PAD(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_GHOST_PAD, GstGhostPad))
-#define GST_GHOST_PAD_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_GHOST_PAD, GstGhostPadClass))
-#define GST_GHOST_PAD_CAST(obj)         ((GstGhostPad*)(obj))
-
-/**
- * GstGhostPad:
- *
- * Opaque #GstGhostPad structure.
- */
-typedef struct _GstGhostPad GstGhostPad;
-typedef struct _GstGhostPadPrivate GstGhostPadPrivate;
-typedef struct _GstGhostPadClass GstGhostPadClass;
-
-struct _GstGhostPad
-{
-  GstProxyPad pad;
-
-  /*< private >*/
-  GstGhostPadPrivate *priv;
-};
-
-struct _GstGhostPadClass
-{
-  GstProxyPadClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-
-GType            gst_ghost_pad_get_type          (void);
-
-GstPad*          gst_ghost_pad_new               (const gchar *name, GstPad *target) G_GNUC_MALLOC;
-GstPad*          gst_ghost_pad_new_no_target     (const gchar *name, GstPadDirection dir) G_GNUC_MALLOC;
-
-GstPad*          gst_ghost_pad_new_from_template (const gchar *name, GstPad * target, GstPadTemplate * templ) G_GNUC_MALLOC;
-GstPad*          gst_ghost_pad_new_no_target_from_template (const gchar *name, GstPadTemplate * templ) G_GNUC_MALLOC;
-
-GstPad*          gst_ghost_pad_get_target        (GstGhostPad *gpad);
-gboolean         gst_ghost_pad_set_target        (GstGhostPad *gpad, GstPad *newtarget);
-
-gboolean         gst_ghost_pad_construct         (GstGhostPad *gpad);
-
-gboolean         gst_ghost_pad_activate_mode_default  (GstPad * pad, GstObject * parent,
-                                                       GstPadMode mode, gboolean active);
-
-gboolean         gst_ghost_pad_internal_activate_mode_default   (GstPad * pad, GstObject * parent,
-                                                                 GstPadMode mode, gboolean active);
-
-G_END_DECLS
-
-#endif /* __GST_GHOST_PAD_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstinfo.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstinfo.h
deleted file mode 100644
index 155851cc..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstinfo.h
+++ /dev/null
@@ -1,1515 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gstinfo.h: debugging functions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSTINFO_H__
-#define __GSTINFO_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gst/gstconfig.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstDebugLevel:
- * @GST_LEVEL_NONE: No debugging level specified or desired. Used to deactivate
- *  debugging output.
- * @GST_LEVEL_ERROR: Error messages are to be used only when an error occured
- *  that stops the application from keeping working correctly.
- *  An examples is gst_element_error, which outputs a message with this priority.
- *  It does not mean that the application is terminating as with g_errror.
- * @GST_LEVEL_WARNING: Warning messages are to inform about abnormal behaviour
- *  that could lead to problems or weird behaviour later on. An example of this
- *  would be clocking issues ("your computer is pretty slow") or broken input
- *  data ("Can't synchronize to stream.")
- * @GST_LEVEL_FIXME: Fixme messages are messages that indicate that something
- *  in the executed code path is not fully implemented or handled yet. Note
- *  that this does not replace proper error handling in any way, the purpose
- *  of this message is to make it easier to spot incomplete/unfinished pieces
- *  of code when reading the debug log.
- * @GST_LEVEL_INFO: Informational messages should be used to keep the developer
- *  updated about what is happening.
- *  Examples where this should be used are when a typefind function has
- *  successfully determined the type of the stream or when an mp3 plugin detects
- *  the format to be used. ("This file has mono sound.")
- * @GST_LEVEL_DEBUG: Debugging messages should be used when something common
- *  happens that is not the expected default behavior, or something that's
- *  useful to know but doesn't happen all the time (ie. per loop iteration or
- *  buffer processed or event handled).
- *  An example would be notifications about state changes or receiving/sending
- *  of events.
- * @GST_LEVEL_LOG: Log messages are messages that are very common but might be
- *  useful to know. As a rule of thumb a pipeline that is iterating as expected
- *  should never output anything else but LOG messages. Use this log level to
- *  log recurring information in chain functions and loop functions, for
- *  example.
- * @GST_LEVEL_TRACE: Tracing-related messages.
- *  Examples for this are referencing/dereferencing of objects.
- * @GST_LEVEL_MEMDUMP: memory dump messages are used to log (small) chunks of
- *  data as memory dumps in the log. They will be displayed as hexdump with
- *  ASCII characters.
- * @GST_LEVEL_COUNT: The number of defined debugging levels.
- *
- * The level defines the importance of a debugging message. The more important a
- * message is, the greater the probability that the debugging system outputs it.
- */
-typedef enum {
-  GST_LEVEL_NONE = 0,
-  GST_LEVEL_ERROR = 1,
-  GST_LEVEL_WARNING = 2,
-  GST_LEVEL_FIXME = 3,
-  GST_LEVEL_INFO = 4,
-  GST_LEVEL_DEBUG = 5,
-  GST_LEVEL_LOG = 6,
-  GST_LEVEL_TRACE = 7,
-  /* add more */
-  GST_LEVEL_MEMDUMP = 9,
-  /* add more */
-  GST_LEVEL_COUNT
-} GstDebugLevel;
-
-/**
- * GST_LEVEL_DEFAULT:
- *
- * Defines the default debugging level to be used with GStreamer. It is normally
- * set to #GST_LEVEL_NONE so nothing get printed.
- * As it can be configured at compile time, developer builds may chose to
- * override that though.
- * You can use this as an argument to gst_debug_set_default_threshold() to
- * reset the debugging output to default behaviour.
- */
-#ifndef GST_LEVEL_DEFAULT
-#define GST_LEVEL_DEFAULT GST_LEVEL_NONE
-#endif
-
-/* defines for format (colors etc)
- * don't change them around, it uses terminal layout
- * Terminal color strings:
- * 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
- * Text color codes:
- * 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
- * Background color codes:
- * 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
- */
-/**
- * GstDebugColorFlags:
- * @GST_DEBUG_FG_BLACK: Use black as foreground color.
- * @GST_DEBUG_FG_RED: Use red as foreground color.
- * @GST_DEBUG_FG_GREEN: Use green as foreground color.
- * @GST_DEBUG_FG_YELLOW: Use yellow as foreground color.
- * @GST_DEBUG_FG_BLUE: Use blue as foreground color.
- * @GST_DEBUG_FG_MAGENTA: Use magenta as foreground color.
- * @GST_DEBUG_FG_CYAN: Use cyan as foreground color.
- * @GST_DEBUG_FG_WHITE: Use white as foreground color.
- * @GST_DEBUG_BG_BLACK: Use black as background color.
- * @GST_DEBUG_BG_RED: Use red as background color.
- * @GST_DEBUG_BG_GREEN: Use green as background color.
- * @GST_DEBUG_BG_YELLOW: Use yellow as background color.
- * @GST_DEBUG_BG_BLUE: Use blue as background color.
- * @GST_DEBUG_BG_MAGENTA: Use magenta as background color.
- * @GST_DEBUG_BG_CYAN: Use cyan as background color.
- * @GST_DEBUG_BG_WHITE: Use white as background color.
- * @GST_DEBUG_BOLD: Make the output bold.
- * @GST_DEBUG_UNDERLINE: Underline the output.
- *
- * These are some terminal style flags you can use when creating your
- * debugging categories to make them stand out in debugging output.
- */
-typedef enum {
-  /* colors */
-  GST_DEBUG_FG_BLACK		= 0x0000,
-  GST_DEBUG_FG_RED		= 0x0001,
-  GST_DEBUG_FG_GREEN		= 0x0002,
-  GST_DEBUG_FG_YELLOW		= 0x0003,
-  GST_DEBUG_FG_BLUE		= 0x0004,
-  GST_DEBUG_FG_MAGENTA		= 0x0005,
-  GST_DEBUG_FG_CYAN		= 0x0006,
-  GST_DEBUG_FG_WHITE		= 0x0007,
-  /* background colors */
-  GST_DEBUG_BG_BLACK		= 0x0000,
-  GST_DEBUG_BG_RED		= 0x0010,
-  GST_DEBUG_BG_GREEN		= 0x0020,
-  GST_DEBUG_BG_YELLOW		= 0x0030,
-  GST_DEBUG_BG_BLUE		= 0x0040,
-  GST_DEBUG_BG_MAGENTA		= 0x0050,
-  GST_DEBUG_BG_CYAN		= 0x0060,
-  GST_DEBUG_BG_WHITE		= 0x0070,
-  /* other formats */
-  GST_DEBUG_BOLD		= 0x0100,
-  GST_DEBUG_UNDERLINE		= 0x0200
-} GstDebugColorFlags;
-
-#define GST_DEBUG_FG_MASK	(0x000F)
-#define GST_DEBUG_BG_MASK	(0x00F0)
-#define GST_DEBUG_FORMAT_MASK	(0xFF00)
-
-typedef struct _GstDebugCategory GstDebugCategory;
-/**
- * GstDebugCategory:
- *
- * This is the struct that describes the categories. Once initialized with
- * #GST_DEBUG_CATEGORY_INIT, its values can't be changed anymore.
- */
-struct _GstDebugCategory {
-  /*< private >*/
-  gint                  threshold;
-  guint			color;		/* see defines above */
-
-  const gchar *		name;
-  const gchar *		description;
-};
-
-/********** some convenience macros for debugging **********/
-
-/**
- * GST_STR_NULL:
- * @str: The string to check.
- *
- * Macro to use when a string must not be NULL, but may be NULL. If the string
- * is NULL, "(NULL)" is printed instead.
- * In GStreamer printf string arguments may not be NULL, because on some
- * platforms (ie Solaris) the libc crashes in that case. This includes debugging
- * strings.
- */
-#define GST_STR_NULL(str) ((str) ? (str) : "(NULL)")
-
-/* FIXME, not MT safe */
-/**
- * GST_DEBUG_PAD_NAME:
- * @pad: The pad to debug.
- *
- * Evaluates to 2 strings, that describe the pad. Often used in debugging
- * statements.
- */
-#define GST_DEBUG_PAD_NAME(pad) \
-  (pad != NULL) ?  \
-  ((GST_OBJECT_PARENT(pad) != NULL) ? \
-  GST_STR_NULL (GST_OBJECT_NAME (GST_OBJECT_PARENT(pad))) : \
-  "''" ) : "''", \
-  (pad != NULL) ? GST_STR_NULL (GST_OBJECT_NAME (pad)) : "''"
-
-/**
- * GST_FUNCTION:
- *
- * This macro should evaluate to the name of the current function and be should
- * be defined when configuring your project, as it is compiler dependant. If it
- * is not defined, some default value is used. It is used to provide debugging
- * output with the function name of the message.
- *
- * Note that this is different from G_STRFUNC as we do not want the full
- * function signature in C++ code.
- */
-#ifndef GST_FUNCTION
-#if defined (__GNUC__) || (defined (_MSC_VER) && _MSC_VER >= 1300)
-#  define GST_FUNCTION     ((const char*) (__FUNCTION__))
-#elif defined (__STDC__) && defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#  define GST_FUNCTION     ((const char*) (__func__))
-#else
-#  define GST_FUNCTION     ((const char*) ("???"))
-#endif
-#endif /* ifndef GST_FUNCTION */
-
-
-typedef struct _GstDebugMessage GstDebugMessage;
-
-/**
- * GstLogFunction:
- * @category: a #GstDebugCategory
- * @level: a #GstDebugLevel
- * @file: file name
- * @function: function name
- * @line: line number
- * @object: a #GObject
- * @message: the message
- * @user_data: user data for the log function
- *
- * Function prototype for a logging function that can be registered with
- * gst_debug_add_log_function().
- * Use G_GNUC_NO_INSTRUMENT on that function.
- */
-typedef void (*GstLogFunction)  (GstDebugCategory * category,
-                                 GstDebugLevel      level,
-                                 const gchar      * file,
-                                 const gchar      * function,
-                                 gint               line,
-                                 GObject          * object,
-                                 GstDebugMessage  * message,
-                                 gpointer           user_data);
-
-#ifdef GST_USING_PRINTF_EXTENSION
-
-/* not using G_GNUC_PRINTF, since gcc will choke on GST_PTR_FORMAT being %P */
-void		    gst_debug_log            (GstDebugCategory * category,
-                                          GstDebugLevel      level,
-                                          const gchar      * file,
-                                          const gchar      * function,
-                                          gint               line,
-                                          GObject          * object,
-                                          const gchar      * format,
-                                          ...) G_GNUC_NO_INSTRUMENT;
-
-#else /* GST_USING_PRINTF_EXTENSION */
-
-void		    gst_debug_log            (GstDebugCategory * category,
-                                          GstDebugLevel      level,
-                                          const gchar      * file,
-                                          const gchar      * function,
-                                          gint               line,
-                                          GObject          * object,
-                                          const gchar      * format,
-                                          ...) G_GNUC_PRINTF (7, 8) G_GNUC_NO_INSTRUMENT;
-
-#endif /* GST_USING_PRINTF_EXTENSION */
-
-void            gst_debug_log_valist     (GstDebugCategory * category,
-                                          GstDebugLevel      level,
-                                          const gchar      * file,
-                                          const gchar      * function,
-                                          gint	              line,
-                                          GObject          * object,
-                                          const gchar      * format,
-                                          va_list            args) G_GNUC_NO_INSTRUMENT;
-
-/* do not use this function, use the GST_DEBUG_CATEGORY_INIT macro */
-GstDebugCategory *_gst_debug_category_new (const gchar * name,
-                                           guint         color,
-                                           const gchar * description);
-/* do not use this function, use the GST_DEBUG_CATEGORY_GET macro */
-GstDebugCategory *_gst_debug_get_category (const gchar *name);
-
-
-/* do not use this function, use the GST_CAT_MEMDUMP_* macros */
-void _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
-    const gchar * func, gint line, GObject * obj, const gchar * msg,
-    const guint8 * data, guint length);
-
-/* we define this to avoid a compiler warning regarding a cast from a function
- * pointer to a void pointer
- * (see https://bugzilla.gnome.org/show_bug.cgi?id=309253)
- */
-typedef	void (* GstDebugFuncPtr)	(void);
-
-/* do no use these functions, use the GST_DEBUG*_FUNCPTR macros */
-void	_gst_debug_register_funcptr	(GstDebugFuncPtr	func,
-					 const gchar *		ptrname);
-const gchar *
-	_gst_debug_nameof_funcptr	(GstDebugFuncPtr	func) G_GNUC_NO_INSTRUMENT;
-
-
-const gchar   * gst_debug_message_get    (GstDebugMessage  * message);
-
-void            gst_debug_log_default    (GstDebugCategory * category,
-                                          GstDebugLevel      level,
-                                          const gchar      * file,
-                                          const gchar      * function,
-                                          gint               line,
-                                          GObject          * object,
-                                          GstDebugMessage  * message,
-                                          gpointer           unused) G_GNUC_NO_INSTRUMENT;
-
-const gchar *   gst_debug_level_get_name (GstDebugLevel level);
-
-void            gst_debug_add_log_function            (GstLogFunction func,
-                                                       gpointer       user_data,
-                                                       GDestroyNotify notify);
-
-guint           gst_debug_remove_log_function         (GstLogFunction func);
-guint           gst_debug_remove_log_function_by_data (gpointer       data);
-
-void            gst_debug_set_active  (gboolean active);
-gboolean        gst_debug_is_active   (void);
-
-void            gst_debug_set_colored (gboolean colored);
-gboolean        gst_debug_is_colored  (void);
-
-void            gst_debug_set_default_threshold      (GstDebugLevel level);
-GstDebugLevel   gst_debug_get_default_threshold      (void);
-void            gst_debug_set_threshold_for_name     (const gchar * name,
-                                                      GstDebugLevel level);
-void            gst_debug_unset_threshold_for_name   (const gchar * name);
-
-
-void            gst_debug_category_free              (GstDebugCategory *	category);
-void	            gst_debug_category_set_threshold     (GstDebugCategory *	category,
-                                                      GstDebugLevel		level);
-void            gst_debug_category_reset_threshold   (GstDebugCategory *	category);
-GstDebugLevel   gst_debug_category_get_threshold     (GstDebugCategory *	category);
-const gchar *   gst_debug_category_get_name          (GstDebugCategory *	category);
-guint           gst_debug_category_get_color         (GstDebugCategory *	category);
-const gchar *   gst_debug_category_get_description   (GstDebugCategory *	category);
-GSList *        gst_debug_get_all_categories	(void);
-
-
-gchar * gst_debug_construct_term_color (guint colorinfo);
-gint    gst_debug_construct_win_color  (guint colorinfo);
-
-
-#ifndef GST_DISABLE_GST_DEBUG
-
-#define gst_debug_add_log_function(func,data,notify) \
-G_STMT_START{                                        \
-  if (func == gst_debug_log_default) {               \
-    gst_debug_add_log_function(NULL,data,notify);    \
-  } else {                                           \
-    gst_debug_add_log_function(func,data,notify);    \
-  }                                                  \
-}G_STMT_END
-
-#define gst_debug_remove_log_function(func)   \
-    (func == gst_debug_log_default) ?         \
-        gst_debug_remove_log_function(NULL) : \
-        gst_debug_remove_log_function(func)
-
-/**
- * GST_DEBUG_CATEGORY:
- * @cat: the category
- *
- * Defines a GstDebugCategory variable.
- * This macro expands to nothing if debugging is disabled.
- */
-#define GST_DEBUG_CATEGORY(cat) GstDebugCategory *cat = NULL
-/**
- * GST_DEBUG_CATEGORY_EXTERN:
- * @cat: the category
- *
- * Declares a GstDebugCategory variable as extern. Use in header files.
- * This macro expands to nothing if debugging is disabled.
- */
-#define GST_DEBUG_CATEGORY_EXTERN(cat) extern GstDebugCategory *cat
-
-/**
- * GST_DEBUG_CATEGORY_STATIC:
- * @cat: the category
- *
- * Defines a static GstDebugCategory variable.
- * This macro expands to nothing if debugging is disabled.
- */
-#define GST_DEBUG_CATEGORY_STATIC(cat) static GstDebugCategory *cat = NULL
-
-/**
- * GST_DEBUG_CATEGORY_INIT:
- * @cat: the category to initialize.
- * @name: the name of the category.
- * @color: the colors to use for a color representation or 0 for no color.
- * @description: optional description of the category.
- *
- * Initializes a new #GstDebugCategory with the given properties and set to
- * the default threshold.
- *
- * <note>
- * <para>
- * This macro expands to nothing if debugging is disabled.
- * </para>
- * <para>
- * When naming your category, please follow the following conventions to ensure
- * that the pattern matching for categories works as expected. It is not
- * earth-shattering if you don't follow these conventions, but it would be nice
- * for everyone.
- * </para>
- * <para>
- * If you define a category for a plugin or a feature of it, name the category
- * like the feature. So if you wanted to write a "filesrc" element, you would
- * name the category "filesrc". Use lowercase letters only.
- * If you define more than one category for the same element, append an
- * underscore and an identifier to your categories, like this: "filesrc_cache"
- * </para>
- * <para>
- * If you create a library or an application using debugging categories, use a
- * common prefix followed by an underscore for all your categories. GStreamer
- * uses the GST prefix so GStreamer categories look like "GST_STATES". Be sure
- * to include uppercase letters.
- * </para>
- * </note>
- */
-#define GST_DEBUG_CATEGORY_INIT(cat,name,color,description) G_STMT_START{\
-  if (cat == NULL)							\
-    cat = _gst_debug_category_new (name,color,description);		\
-}G_STMT_END
-
-/**
- * GST_DEBUG_CATEGORY_GET:
- * @cat: the category to initialize.
- * @name: log category name
- *
- * Looks up an existing #GstDebugCategory by its @name and sets @cat. If the
- * category is not found, but GST_CAT_DEFAULT is defined, that is assigned to
- * @cat. Otherwise @cat will be NULL.
- *
- * |[
- * GST_DEBUG_CATEGORY_STATIC (gst_myplugin_debug);
- * #define GST_CAT_DEFAULT gst_myplugin_debug
- * GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
- * ...
- * GST_DEBUG_CATEGORY_INIT (gst_myplugin_debug, "myplugin", 0, "nice element");
- * GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
- * ]|
- */
-#ifdef GST_CAT_DEFAULT
-#define GST_DEBUG_CATEGORY_GET(cat,name)  G_STMT_START{\
-  cat = _gst_debug_get_category (name);			\
-  if (!cat) {						\
-    cat = GST_CAT_DEFAULT;				\
-  }							\
-}G_STMT_END
-#else
-#define GST_DEBUG_CATEGORY_GET(cat,name)  G_STMT_START{\
-  cat = _gst_debug_get_category (name);			\
-}G_STMT_END
-#endif
-
-/**
- * GST_CAT_DEFAULT:
- *
- * Default gstreamer core debug log category. Please define your own.
- */
-GST_EXPORT GstDebugCategory *	GST_CAT_DEFAULT;
-/* this symbol may not be used */
-GST_EXPORT gboolean			_gst_debug_enabled;
-
-/* the min debug level, used for quickly discarding debug
- * messages that fall under the threshold. */
-GST_EXPORT GstDebugLevel            _gst_debug_min;
-
-/**
- * GST_CAT_LEVEL_LOG:
- * @cat: category to use
- * @level: the severity of the message
- * @object: the #GObject the message belongs to or NULL if none
- * @...: A printf-style message to output
- *
- * Outputs a debugging message. This is the most general macro for outputting
- * debugging messages. You will probably want to use one of the ones described
- * below.
- */
-#ifdef G_HAVE_ISO_VARARGS
-#define GST_CAT_LEVEL_LOG(cat,level,object,...) G_STMT_START{		\
-  if (G_UNLIKELY (level <= _gst_debug_min)) {						\
-    gst_debug_log ((cat), (level), __FILE__, GST_FUNCTION, __LINE__,	\
-        (GObject *) (object), __VA_ARGS__);				\
-  }									\
-}G_STMT_END
-#else /* G_HAVE_GNUC_VARARGS */
-#ifdef G_HAVE_GNUC_VARARGS
-#define GST_CAT_LEVEL_LOG(cat,level,object,args...) G_STMT_START{	\
-  if (G_UNLIKELY (level <= _gst_debug_min)) {						\
-    gst_debug_log ((cat), (level), __FILE__, GST_FUNCTION, __LINE__,	\
-        (GObject *) (object), ##args );					\
-  }									\
-}G_STMT_END
-#else /* no variadic macros, use inline */
-static inline void
-GST_CAT_LEVEL_LOG_valist (GstDebugCategory * cat,
-    GstDebugLevel level, gpointer object, const char *format, va_list varargs)
-{
-  if (G_UNLIKELY (level <= _gst_debug_min)) {
-    gst_debug_log_valist (cat, level, "", "", 0, (GObject *) object, format,
-        varargs);
-  }
-}
-
-static inline void
-GST_CAT_LEVEL_LOG (GstDebugCategory * cat, GstDebugLevel level,
-    gpointer object, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, level, object, format, varargs);
-  va_end (varargs);
-}
-#endif
-#endif /* G_HAVE_ISO_VARARGS */
-
-/* This one doesn't have varargs in the macro, so it's different than all the
- * other macros and hence in a separate block right here. Docs chunks are
- * with the other doc chunks below though. */
-#define __GST_CAT_MEMDUMP_LOG(cat,object,msg,data,length) G_STMT_START{       \
-  if (G_UNLIKELY (GST_LEVEL_MEMDUMP <= _gst_debug_min)) {                    \
-    _gst_debug_dump_mem ((cat), __FILE__, GST_FUNCTION, __LINE__,             \
-        (GObject *) (object), (msg), (data), (length));                       \
-  }                                                                           \
-}G_STMT_END
-
-#define GST_CAT_MEMDUMP_OBJECT(cat,obj,msg,data,length)  \
-    __GST_CAT_MEMDUMP_LOG(cat,obj,msg,data,length)
-#define GST_CAT_MEMDUMP(cat,msg,data,length)             \
-    __GST_CAT_MEMDUMP_LOG(cat,NULL,msg,data,length)
-#define GST_MEMDUMP_OBJECT(obj,msg,data,length)          \
-    __GST_CAT_MEMDUMP_LOG(GST_CAT_DEFAULT,obj,msg,data,length)
-#define GST_MEMDUMP(msg,data,length)                     \
-    __GST_CAT_MEMDUMP_LOG(GST_CAT_DEFAULT,NULL,msg,data,length)
-
-/**
- * GST_CAT_ERROR_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an error message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_WARNING_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a warning message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_INFO_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an informational message belonging to the given object in the given
- * category.
- */
-/**
- * GST_CAT_DEBUG_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an debugging message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_LOG_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an logging message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_FIXME_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a fixme message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_TRACE_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a tracing message belonging to the given object in the given
- * category.
- */
-/**
- * GST_CAT_MEMDUMP_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @msg: message string to log with the data
- * @data: pointer to the data to output
- * @length: length of the data to output
- *
- * Output a hexdump of @data relating to the given object in the given
- * category.
- */
-
-
-/**
- * GST_CAT_ERROR:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an error message in the given category.
- */
-/**
- * GST_CAT_WARNING:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an warning message in the given category.
- */
-/**
- * GST_CAT_INFO:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an informational message in the given category.
- */
-/**
- * GST_CAT_DEBUG:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an debugging message in the given category.
- */
-/**
- * GST_CAT_LOG:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an logging message in the given category.
- */
-/**
- * GST_CAT_FIXME:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an fixme message in the given category.
- */
-/**
- * GST_CAT_TRACE:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output a tracing message in the given category.
- */
-/**
- * GST_CAT_MEMDUMP:
- * @cat: category to use
- * @msg: message string to log with the data
- * @data: pointer to the data to output
- * @length: length of the data to output
- *
- * Output a hexdump of @data in the given category.
- */
-
-
-/**
- * GST_ERROR_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an error message belonging to the given object in the default category.
- */
-/**
- * GST_WARNING_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a warning message belonging to the given object in the default category.
- */
-/**
- * GST_INFO_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an informational message belonging to the given object in the default
- * category.
- */
-/**
- * GST_DEBUG_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a debugging message belonging to the given object in the default
- * category.
- */
-/**
- * GST_LOG_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a logging message belonging to the given object in the default category.
- */
-/**
- * GST_FIXME_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a fixme message belonging to the given object in the default category.
- */
-/**
- * GST_TRACE_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a tracing message belonging to the given object in the default category.
- */
-/**
- * GST_MEMDUMP_OBJECT:
- * @obj: the #GObject the message belongs to
- * @msg: message string to log with the data
- * @data: pointer to the data to output
- * @length: length of the data to output
- *
- * Output a logging message belonging to the given object in the default category.
- */
-
-
-/**
- * GST_ERROR:
- * @...: printf-style message to output
- *
- * Output an error message in the default category.
- */
-/**
- * GST_WARNING:
- * @...: printf-style message to output
- *
- * Output a warning message in the default category.
- */
-/**
- * GST_INFO:
- * @...: printf-style message to output
- *
- * Output an informational message in the default category.
- */
-/**
- * GST_DEBUG:
- * @...: printf-style message to output
- *
- * Output a debugging message in the default category.
- */
-/**
- * GST_LOG:
- * @...: printf-style message to output
- *
- * Output a logging message in the default category.
- */
-/**
- * GST_FIXME:
- * @...: printf-style message to output
- *
- * Output a fixme message in the default category.
- */
-/**
- * GST_TRACE:
- * @...: printf-style message to output
- *
- * Output a tracing message in the default category.
- */
-/**
- * GST_MEMDUMP:
- * @msg: message string to log with the data
- * @data: pointer to the data to output
- * @length: length of the data to output
- *
- * Output a hexdump of @data.
- */
-
-#ifdef G_HAVE_ISO_VARARGS
-
-#define GST_CAT_ERROR_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_ERROR,   obj,  __VA_ARGS__)
-#define GST_CAT_WARNING_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_WARNING, obj,  __VA_ARGS__)
-#define GST_CAT_INFO_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_INFO,    obj,  __VA_ARGS__)
-#define GST_CAT_DEBUG_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_DEBUG,   obj,  __VA_ARGS__)
-#define GST_CAT_LOG_OBJECT(cat,obj,...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_LOG,     obj,  __VA_ARGS__)
-#define GST_CAT_FIXME_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_FIXME,   obj,  __VA_ARGS__)
-#define GST_CAT_TRACE_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_TRACE,   obj,  __VA_ARGS__)
-
-#define GST_CAT_ERROR(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_ERROR,   NULL, __VA_ARGS__)
-#define GST_CAT_WARNING(cat,...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_WARNING, NULL, __VA_ARGS__)
-#define GST_CAT_INFO(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_INFO,    NULL, __VA_ARGS__)
-#define GST_CAT_DEBUG(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_DEBUG,   NULL, __VA_ARGS__)
-#define GST_CAT_LOG(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_LOG,     NULL, __VA_ARGS__)
-#define GST_CAT_FIXME(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_FIXME,   NULL, __VA_ARGS__)
-#define GST_CAT_TRACE(cat,...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_TRACE,   NULL, __VA_ARGS__)
-
-#define GST_ERROR_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_ERROR,   obj,  __VA_ARGS__)
-#define GST_WARNING_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_WARNING, obj,  __VA_ARGS__)
-#define GST_INFO_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_INFO,    obj,  __VA_ARGS__)
-#define GST_DEBUG_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_DEBUG,   obj,  __VA_ARGS__)
-#define GST_LOG_OBJECT(obj,...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_LOG,     obj,  __VA_ARGS__)
-#define GST_FIXME_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_FIXME,   obj,  __VA_ARGS__)
-#define GST_TRACE_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_TRACE,   obj,  __VA_ARGS__)
-
-#define GST_ERROR(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_ERROR,   NULL, __VA_ARGS__)
-#define GST_WARNING(...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_WARNING, NULL, __VA_ARGS__)
-#define GST_INFO(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_INFO,    NULL, __VA_ARGS__)
-#define GST_DEBUG(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_DEBUG,   NULL, __VA_ARGS__)
-#define GST_LOG(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_LOG,     NULL, __VA_ARGS__)
-#define GST_FIXME(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_FIXME,   NULL, __VA_ARGS__)
-#define GST_TRACE(...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_TRACE,   NULL, __VA_ARGS__)
-
-#else
-#ifdef G_HAVE_GNUC_VARARGS
-
-#define GST_CAT_ERROR_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_ERROR,   obj,  ##args )
-#define GST_CAT_WARNING_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_WARNING, obj,  ##args )
-#define GST_CAT_INFO_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_INFO,    obj,  ##args )
-#define GST_CAT_DEBUG_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_DEBUG,   obj,  ##args )
-#define GST_CAT_LOG_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_LOG,     obj,  ##args )
-#define GST_CAT_FIXME_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_FIXME,   obj,  ##args )
-#define GST_CAT_TRACE_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_TRACE,   obj,  ##args )
-
-#define GST_CAT_ERROR(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_ERROR,   NULL, ##args )
-#define GST_CAT_WARNING(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_WARNING, NULL, ##args )
-#define GST_CAT_INFO(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_INFO,    NULL, ##args )
-#define GST_CAT_DEBUG(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_DEBUG,   NULL, ##args )
-#define GST_CAT_LOG(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_LOG,     NULL, ##args )
-#define GST_CAT_FIXME(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_FIXME,   NULL, ##args )
-#define GST_CAT_TRACE(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_TRACE,   NULL, ##args )
-
-#define GST_ERROR_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_ERROR,   obj,  ##args )
-#define GST_WARNING_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_WARNING, obj,  ##args )
-#define GST_INFO_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_INFO,    obj,  ##args )
-#define GST_DEBUG_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_DEBUG,   obj,  ##args )
-#define GST_LOG_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_LOG,     obj,  ##args )
-#define GST_FIXME_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_FIXME,   obj,  ##args )
-#define GST_TRACE_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_TRACE,   obj,  ##args )
-
-#define GST_ERROR(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_ERROR,   NULL, ##args )
-#define GST_WARNING(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_WARNING, NULL, ##args )
-#define GST_INFO(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_INFO,    NULL, ##args )
-#define GST_DEBUG(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_DEBUG,   NULL, ##args )
-#define GST_LOG(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_LOG,     NULL, ##args )
-#define GST_FIXME(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_FIXME,   NULL, ##args )
-#define GST_TRACE(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_TRACE,   NULL, ##args )
-
-#else
-/* no variadic macros, use inline */
-static inline void
-GST_CAT_ERROR_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_ERROR, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_WARNING_OBJECT (GstDebugCategory * cat, gpointer obj,
-    const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_WARNING, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_INFO_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_INFO, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_DEBUG_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_DEBUG, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_LOG_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_LOG, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_FIXME_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_FIXME, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_TRACE_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_TRACE, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_ERROR (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_ERROR, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_WARNING (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_WARNING, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_INFO (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_INFO, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_DEBUG (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_DEBUG, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_LOG (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_LOG, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_FIXME (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_FIXME, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_TRACE (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_TRACE, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_ERROR_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_ERROR, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_WARNING_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_WARNING, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_INFO_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_INFO, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_DEBUG_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_DEBUG, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_LOG_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_LOG, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_FIXME_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_FIXME, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_TRACE_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_TRACE, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_ERROR (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_ERROR, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_WARNING (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_WARNING, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_INFO (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_INFO, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_DEBUG (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_DEBUG, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_LOG (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_LOG, NULL,
-      format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_FIXME (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_FIXME, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_TRACE (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_TRACE, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-#endif
-#endif
-
-
-/********** function pointer stuff **********/
-
-/**
- * GST_DEBUG_REGISTER_FUNCPTR:
- * @ptr: pointer to the function to register
- *
- * Register a pointer to a function with its name, so it can later be used by
- * GST_DEBUG_FUNCPTR_NAME().
- *
- * Use this variant of #GST_DEBUG_FUNCPTR if you do not need to use @ptr.
- */
-#define GST_DEBUG_REGISTER_FUNCPTR(ptr) \
-  _gst_debug_register_funcptr((GstDebugFuncPtr)(ptr), #ptr)
-/**
- * GST_DEBUG_FUNCPTR:
- * @ptr: pointer to the function to register
- *
- * Register a pointer to a function with its name, so it can later be used by
- * GST_DEBUG_FUNCPTR_NAME().
- *
- * Returns: the value passed to @ptr.
- */
-#define GST_DEBUG_FUNCPTR(ptr) \
-  (_gst_debug_register_funcptr((GstDebugFuncPtr)(ptr), #ptr) , ptr)
-
-/**
- * GST_DEBUG_FUNCPTR_NAME:
- * @ptr: address of the function of which to look up the name
- *
- * Retrieves the name of the function, if it was previously registered with
- * GST_DEBUG_FUNCPTR(). If not, it returns a description of the pointer.
- *
- * This macro returns a constant string which must not be modified or
- * freed by the caller.
- */
-#define GST_DEBUG_FUNCPTR_NAME(ptr) \
-  _gst_debug_nameof_funcptr((GstDebugFuncPtr)ptr)
-
-
-#else /* GST_DISABLE_GST_DEBUG */
-
-
-#ifndef GST_INFO_C
-
-#if defined(__GNUC__) && __GNUC__ >= 3
-#  pragma GCC poison gst_debug_log
-#  pragma GCC poison gst_debug_log_valist
-#  pragma GCC poison _gst_debug_category_new
-#endif
-
-#define _gst_debug_min GST_LEVEL_NONE
-
-#define gst_debug_set_default_threshold(level)		G_STMT_START{ }G_STMT_END
-#define gst_debug_get_default_threshold()		(GST_LEVEL_NONE)
-
-#define gst_debug_level_get_name(level)				("NONE")
-#define gst_debug_message_get(message)  			("")
-#define gst_debug_add_log_function(func,data,notify)    G_STMT_START{ }G_STMT_END
-#define gst_debug_set_active(active)			G_STMT_START{ }G_STMT_END
-#define gst_debug_is_active()				(FALSE)
-#define gst_debug_set_colored(colored)			G_STMT_START{ }G_STMT_END
-#define gst_debug_is_colored()				(FALSE)
-#define gst_debug_set_default_threshold(level)		G_STMT_START{ }G_STMT_END
-#define gst_debug_get_default_threshold()		(GST_LEVEL_NONE)
-#define gst_debug_set_threshold_for_name(name,level)	G_STMT_START{ }G_STMT_END
-#define gst_debug_unset_threshold_for_name(name)	G_STMT_START{ }G_STMT_END
-
-/* we are using dummy function prototypes here to eat ';' as these macros are
- * used outside of functions */
-#define GST_DEBUG_CATEGORY(var)				void _gst_debug_dummy_##var (void)
-#define GST_DEBUG_CATEGORY_EXTERN(var)			void _gst_debug_dummy_extern_##var (void)
-#define GST_DEBUG_CATEGORY_STATIC(var)			void _gst_debug_dummy_static_##var (void)
-
-#define GST_DEBUG_CATEGORY_INIT(var,name,color,desc)	G_STMT_START{ }G_STMT_END
-#define GST_DEBUG_CATEGORY_GET(var,name)		G_STMT_START{ }G_STMT_END
-#define gst_debug_category_free(category)		G_STMT_START{ }G_STMT_END
-#define gst_debug_category_set_threshold(category,level) G_STMT_START{ }G_STMT_END
-#define gst_debug_category_reset_threshold(category)	G_STMT_START{ }G_STMT_END
-#define gst_debug_category_get_threshold(category)	(GST_LEVEL_NONE)
-#define gst_debug_category_get_name(cat)		("")
-#define gst_debug_category_get_color(cat)		(0)
-#define gst_debug_category_get_description(cat)		("")
-#define gst_debug_get_all_categories()			(NULL)
-#define gst_debug_construct_term_color(colorinfo)	(g_strdup ("00"))
-#define gst_debug_construct_win_color(colorinfo)	(0)
-
-#endif /* !GST_INFO_C */
-
-#ifdef G_HAVE_ISO_VARARGS
-
-#define GST_CAT_LEVEL_LOG(cat,level,...)		G_STMT_START{ }G_STMT_END
-
-#define GST_CAT_ERROR_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_WARNING_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_INFO_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_DEBUG_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_LOG_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_FIXME_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_TRACE_OBJECT(...)			G_STMT_START{ }G_STMT_END
-
-#define GST_CAT_ERROR(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_WARNING(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_INFO(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_DEBUG(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_LOG(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_FIXME(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_TRACE(...)				G_STMT_START{ }G_STMT_END
-
-#define GST_ERROR_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_WARNING_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_INFO_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_DEBUG_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_LOG_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_FIXME_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_TRACE_OBJECT(...)				G_STMT_START{ }G_STMT_END
-
-#define GST_ERROR(...)					G_STMT_START{ }G_STMT_END
-#define GST_WARNING(...)				G_STMT_START{ }G_STMT_END
-#define GST_INFO(...)					G_STMT_START{ }G_STMT_END
-#define GST_DEBUG(...)					G_STMT_START{ }G_STMT_END
-#define GST_LOG(...)					G_STMT_START{ }G_STMT_END
-#define GST_FIXME(...)					G_STMT_START{ }G_STMT_END
-#define GST_TRACE(...)					G_STMT_START{ }G_STMT_END
-
-#else /* !G_HAVE_ISO_VARARGS */
-#ifdef G_HAVE_GNUC_VARARGS
-
-#define GST_CAT_LEVEL_LOG(cat,level,args...)		G_STMT_START{ }G_STMT_END
-
-#define GST_CAT_ERROR_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_WARNING_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_INFO_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_DEBUG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_LOG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_FIXME_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_TRACE_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-
-#define GST_CAT_ERROR(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_WARNING(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_INFO(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_DEBUG(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_LOG(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_FIXME(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_TRACE(args...)				G_STMT_START{ }G_STMT_END
-
-#define GST_ERROR_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_WARNING_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_INFO_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_DEBUG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_LOG_OBJECT(args...)				G_STMT_START{ }G_STMT_END
-#define GST_FIXME_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_TRACE_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-
-#define GST_ERROR(args...)				G_STMT_START{ }G_STMT_END
-#define GST_WARNING(args...)				G_STMT_START{ }G_STMT_END
-#define GST_INFO(args...)				G_STMT_START{ }G_STMT_END
-#define GST_DEBUG(args...)				G_STMT_START{ }G_STMT_END
-#define GST_LOG(args...)				G_STMT_START{ }G_STMT_END
-#define GST_FIXME(args...)				G_STMT_START{ }G_STMT_END
-#define GST_TRACE(args...)				G_STMT_START{ }G_STMT_END
-
-#else /* !G_HAVE_GNUC_VARARGS */
-static inline void
-GST_CAT_LEVEL_LOG_valist (GstDebugCategory * cat,
-    GstDebugLevel level, gpointer object, const char *format, va_list varargs)
-{
-}
-
-static inline void
-GST_CAT_ERROR_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_WARNING_OBJECT (GstDebugCategory * cat, gpointer obj,
-    const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_INFO_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_DEBUG_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_LOG_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_FIXME_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_TRACE_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_ERROR (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_WARNING (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_INFO (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_DEBUG (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_LOG (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_FIXME (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_TRACE (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_ERROR_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_WARNING_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_INFO_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_DEBUG_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_LOG_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_FIXME_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_TRACE_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_ERROR (const char *format, ...)
-{
-}
-
-static inline void
-GST_WARNING (const char *format, ...)
-{
-}
-
-static inline void
-GST_INFO (const char *format, ...)
-{
-}
-
-static inline void
-GST_DEBUG (const char *format, ...)
-{
-}
-
-static inline void
-GST_LOG (const char *format, ...)
-{
-}
-
-static inline void
-GST_FIXME (const char *format, ...)
-{
-}
-
-static inline void
-GST_TRACE (const char *format, ...)
-{
-}
-
-#endif /* G_HAVE_GNUC_VARARGS */
-#endif /* G_HAVE_ISO_VARARGS */
-
-#define GST_DEBUG_REGISTER_FUNCPTR(ptr) G_STMT_START{ }G_STMT_END
-#define GST_DEBUG_FUNCPTR(ptr) (ptr)
-#define GST_DEBUG_FUNCPTR_NAME(ptr) (g_strdup_printf ("%p", ptr))
-
-#define GST_CAT_MEMDUMP_OBJECT(cat,obj,msg,data,length) G_STMT_START{ }G_STMT_END
-#define GST_CAT_MEMDUMP(cat,msg,data,length)            G_STMT_START{ }G_STMT_END
-#define GST_MEMDUMP_OBJECT(obj,msg,data,length)         G_STMT_START{ }G_STMT_END
-#define GST_MEMDUMP(msg,data,length)                    G_STMT_START{ }G_STMT_END
-
-#endif /* GST_DISABLE_GST_DEBUG */
-
-
-void gst_debug_print_stack_trace (void);
-
-G_END_DECLS
-
-#endif /* __GSTINFO_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstiterator.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstiterator.h
deleted file mode 100644
index 2a21f8b3..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstiterator.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
- * Copyright (C) 2011 Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * gstiterator.h: Header for GstIterator
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_ITERATOR_H__
-#define __GST_ITERATOR_H__
-
-#include <glib-object.h> /* for GValue in the fold */
-#include <gst/gstconfig.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ITERATOR (gst_iterator_get_type ())
-
-/**
- * GstIteratorResult:
- * @GST_ITERATOR_DONE:   No more items in the iterator
- * @GST_ITERATOR_OK:     An item was retrieved
- * @GST_ITERATOR_RESYNC: Datastructure changed while iterating
- * @GST_ITERATOR_ERROR:  An error happened
- *
- * The result of gst_iterator_next().
- */
-typedef enum {
-  GST_ITERATOR_DONE     = 0,
-  GST_ITERATOR_OK       = 1,
-  GST_ITERATOR_RESYNC   = 2,
-  GST_ITERATOR_ERROR    = 3
-} GstIteratorResult;
-
-typedef struct _GstIterator GstIterator;
-
-/**
- * GstIteratorItem:
- * @GST_ITERATOR_ITEM_SKIP:  Skip this item
- * @GST_ITERATOR_ITEM_PASS:  Return item
- * @GST_ITERATOR_ITEM_END:   Stop after this item.
- *
- * The result of a #GstIteratorItemFunction.
- */
-typedef enum {
-  GST_ITERATOR_ITEM_SKIP        = 0,
-  GST_ITERATOR_ITEM_PASS        = 1,
-  GST_ITERATOR_ITEM_END         = 2
-} GstIteratorItem;
-
-/**
- * GstIteratorCopyFunction:
- * @it: The original iterator
- * @copy: The copied iterator
- *
- * This function will be called when creating a copy of @it and should
- * create a copy of all custom iterator fields or increase their
- * reference counts.
- */
-typedef void              (*GstIteratorCopyFunction) (const GstIterator *it, GstIterator *copy);
-
-/**
- * GstIteratorItemFunction:
- * @it: the iterator
- * @item: the item being retrieved.
- *
- * The function that will be called after the next item of the iterator
- * has been retrieved. This function can be used to skip items or stop
- * the iterator.
- *
- * The function will be called with the iterator lock held.
- *
- * Returns: the result of the operation.
- */
-typedef GstIteratorItem   (*GstIteratorItemFunction)    (GstIterator *it, const GValue * item);
-
-/**
- * GstIteratorNextFunction:
- * @it: the iterator
- * @result: a pointer to hold the next item
- *
- * The function that will be called when the next element of the iterator
- * should be retrieved.
- *
- * Implementors of a #GstIterator should implement this
- * function and pass it to the constructor of the custom iterator.
- * The function will be called with the iterator lock held.
- *
- * Returns: the result of the operation.
- */
-typedef GstIteratorResult (*GstIteratorNextFunction)    (GstIterator *it, GValue *result);
-/**
- * GstIteratorResyncFunction:
- * @it: the iterator
- *
- * This function will be called whenever a concurrent update happened
- * to the iterated datastructure. The implementor of the iterator should
- * restart the iterator from the beginning and clean up any state it might
- * have.
- *
- * Implementors of a #GstIterator should implement this
- * function and pass it to the constructor of the custom iterator.
- * The function will be called with the iterator lock held.
- */
-typedef void              (*GstIteratorResyncFunction)  (GstIterator *it);
-/**
- * GstIteratorFreeFunction:
- * @it: the iterator
- *
- * This function will be called when the iterator is freed.
- *
- * Implementors of a #GstIterator should implement this
- * function and pass it to the constructor of the custom iterator.
- * The function will be called with the iterator lock held.
- */
-typedef void              (*GstIteratorFreeFunction)    (GstIterator *it);
-
-/**
- * GstIteratorForeachFunction:
- * @item: The item
- * @user_data: User data
- *
- * A function that is called by gst_iterator_foreach() for every element.
- */
-typedef void         (*GstIteratorForeachFunction)     (const GValue * item, gpointer user_data);
-
-/**
- * GstIteratorFoldFunction:
- * @item: the item to fold
- * @ret: a #GValue collecting the result
- * @user_data: data passed to gst_iterator_fold()
- *
- * A function to be passed to gst_iterator_fold().
- *
- * Returns: TRUE if the fold should continue, FALSE if it should stop.
- */
-typedef gboolean          (*GstIteratorFoldFunction)    (const GValue * item, GValue * ret, gpointer user_data);
-
-/**
- * GST_ITERATOR:
- * @it: the #GstIterator value
- *
- * Macro to cast to a #GstIterator
- */
-#define GST_ITERATOR(it)                ((GstIterator*)(it))
-/**
- * GST_ITERATOR_LOCK:
- * @it: the #GstIterator to get the lock of
- *
- * Macro to get the lock protecting the datastructure being iterated.
- */
-#define GST_ITERATOR_LOCK(it)           (GST_ITERATOR(it)->lock)
-/**
- * GST_ITERATOR_COOKIE:
- * @it: the #GstIterator to get the cookie of
- *
- * Macro to get the cookie of a #GstIterator. The cookie of the
- * iterator is the value of the master cookie when the iterator
- * was created.
- * Whenever the iterator is iterated, the value is compared to the
- * value of the master cookie. If they are different, a concurrent
- * modification happened to the iterator and a resync is needed.
- */
-#define GST_ITERATOR_COOKIE(it)         (GST_ITERATOR(it)->cookie)
-/**
- * GST_ITERATOR_ORIG_COOKIE:
- * @it: the #GstIterator to get the master cookie of
- *
- * Macro to get a pointer to where the master cookie is stored. The
- * master cookie protects the structure being iterated and gets updated
- * whenever the datastructure changes.
- */
-#define GST_ITERATOR_ORIG_COOKIE(it)    (GST_ITERATOR(it)->master_cookie)
-
-/**
- * GstIterator:
- * @copy: The function to copy the iterator
- * @next: The function to get the next item in the iterator
- * @item: The function to be called for each item retrieved
- * @resync: The function to call when a resync is needed.
- * @free: The function to call when the iterator is freed
- * @pushed: The iterator that is currently pushed with gst_iterator_push()
- * @type: The type of the object that this iterator will return
- * @lock: The lock protecting the data structure and the cookie.
- * @cookie: The cookie; the value of the master_cookie when this iterator was
- *          created.
- * @master_cookie: A pointer to the master cookie.
- * @size: the size of the iterator
- *
- * #GstIterator base structure. The values of this structure are
- * protected for subclasses, use the methods to use the #GstIterator.
- */
-struct _GstIterator {
-  /*< protected >*/
-  GstIteratorCopyFunction copy;
-  GstIteratorNextFunction next;
-  GstIteratorItemFunction item;
-  GstIteratorResyncFunction resync;
-  GstIteratorFreeFunction free;
-
-  GstIterator *pushed;          /* pushed iterator */
-
-  GType     type;
-  GMutex   *lock;
-  guint32   cookie;             /* cookie of the iterator */
-  guint32  *master_cookie;      /* pointer to guint32 holding the cookie when this
-                                   iterator was created */
-  guint     size;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_iterator_get_type           (void);
-
-/* creating iterators */
-GstIterator*            gst_iterator_new                (guint size,
-                                                         GType type,
-                                                         GMutex *lock,
-                                                         guint32 *master_cookie,
-                                                         GstIteratorCopyFunction copy,
-                                                         GstIteratorNextFunction next,
-                                                         GstIteratorItemFunction item,
-                                                         GstIteratorResyncFunction resync,
-                                                         GstIteratorFreeFunction free) G_GNUC_MALLOC;
-
-GstIterator*            gst_iterator_new_list           (GType type,
-                                                         GMutex *lock,
-                                                         guint32 *master_cookie,
-                                                         GList **list,
-                                                         GObject * owner,
-                                                         GstIteratorItemFunction item) G_GNUC_MALLOC;
-
-GstIterator*            gst_iterator_new_single         (GType type,
-                                                         const GValue * object) G_GNUC_MALLOC;
-
-GstIterator*            gst_iterator_copy               (const GstIterator *it) G_GNUC_MALLOC;
-
-/* using iterators */
-GstIteratorResult       gst_iterator_next               (GstIterator *it, GValue * elem);
-void                    gst_iterator_resync             (GstIterator *it);
-void                    gst_iterator_free               (GstIterator *it);
-
-void                    gst_iterator_push               (GstIterator *it, GstIterator *other);
-
-/* higher-order functions that operate on iterators */
-GstIterator*            gst_iterator_filter             (GstIterator *it, GCompareFunc func,
-                                                         const GValue * user_data) G_GNUC_MALLOC;
-GstIteratorResult       gst_iterator_fold               (GstIterator *it,
-                                                         GstIteratorFoldFunction func,
-                                                         GValue *ret, gpointer user_data);
-GstIteratorResult       gst_iterator_foreach            (GstIterator *it,
-                                                         GstIteratorForeachFunction func, gpointer user_data);
-gboolean                gst_iterator_find_custom        (GstIterator *it, GCompareFunc func,
-                                                         GValue *elem, gpointer user_data);
-
-G_END_DECLS
-
-#endif /* __GST_ITERATOR_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmacros.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmacros.h
deleted file mode 100644
index e38af539..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmacros.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GST_MACROS_H__
-#define __GST_MACROS_H__
-
-G_BEGIN_DECLS
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-# define GST_GNUC_CONSTRUCTOR \
-  __attribute__ ((constructor))
-#else  /* !__GNUC__ */
-# define GST_GNUC_CONSTRUCTOR
-#endif /* !__GNUC__ */
-
-#if defined (__GNUC__) && !defined (GST_IMPLEMENT_INLINES)
-# define GST_INLINE_FUNC extern __inline__
-# define GST_CAN_INLINE 1
-#elif defined(_MSC_VER)
-# define GST_INLINE_FUNC extern __inline
-# define GST_CAN_INLINE 1
-#else
-# define GST_INLINE_FUNC extern
-# undef GST_CAN_INLINE
-#endif
-
-#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(restrict)
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#    define restrict __restrict__
-#  else
-#    define restrict
-#  endif
-#endif
-
-G_END_DECLS
-
-#endif /* __GST_MACROS_H__ */
-
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmemory.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmemory.h
deleted file mode 100644
index 08208186..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmemory.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Wim Taymans <wim.taymans@gmail.be>
- *
- * gstmemory.h: Header for memory blocks
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_MEMORY_H__
-#define __GST_MEMORY_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_MEMORY (gst_memory_get_type())
-GType gst_memory_get_type(void);
-
-typedef struct _GstMemory GstMemory;
-typedef struct _GstAllocator GstAllocator;
-
-#define GST_MEMORY_CAST(mem)   ((GstMemory *)(mem))
-
-/**
- * GstMemoryFlags:
- * @GST_MEMORY_FLAG_READONLY: memory is readonly. It is not allowed to map the
- * memory with #GST_MAP_WRITE.
- * @GST_MEMORY_FLAG_NO_SHARE: memory must not be shared. Copies will have to be
- * made when this memory needs to be shared between buffers.
- * @GST_MEMORY_FLAG_ZERO_PREFIXED: the memory prefix is filled with 0 bytes
- * @GST_MEMORY_FLAG_ZERO_PADDED: the memory padding is filled with 0 bytes
- * @GST_MEMORY_FLAG_LAST: first flag that can be used for custom purposes
- *
- * Flags for wrapped memory.
- */
-typedef enum {
-  GST_MEMORY_FLAG_READONLY      = GST_MINI_OBJECT_FLAG_LOCK_READONLY,
-  GST_MEMORY_FLAG_NO_SHARE      = (GST_MINI_OBJECT_FLAG_LAST << 0),
-  GST_MEMORY_FLAG_ZERO_PREFIXED = (GST_MINI_OBJECT_FLAG_LAST << 1),
-  GST_MEMORY_FLAG_ZERO_PADDED   = (GST_MINI_OBJECT_FLAG_LAST << 2),
-
-  GST_MEMORY_FLAG_LAST          = (GST_MINI_OBJECT_FLAG_LAST << 16)
-} GstMemoryFlags;
-
-/**
- * GST_MEMORY_FLAGS:
- * @mem: a #GstMemory.
- *
- * A flags word containing #GstMemoryFlags flags set on @mem
- */
-#define GST_MEMORY_FLAGS(mem)  GST_MINI_OBJECT_FLAGS (mem)
-/**
- * GST_MEMORY_FLAG_IS_SET:
- * @mem: a #GstMemory.
- * @flag: the #GstMemoryFlags to check.
- *
- * Gives the status of a specific flag on a @mem.
- */
-#define GST_MEMORY_FLAG_IS_SET(mem,flag)   GST_MINI_OBJECT_FLAG_IS_SET (mem,flag)
-/**
- * GST_MEMORY_FLAG_UNSET:
- * @mem: a #GstMemory.
- * @flag: the #GstMemoryFlags to clear.
- *
- * Clear a specific flag on a @mem.
- */
-#define GST_MEMORY_FLAG_UNSET(mem,flag)   GST_MINI_OBJECT_FLAG_UNSET (mem, flag)
-
-/**
- * GST_MEMORY_IS_READONLY:
- * @mem: a #GstMemory.
- *
- * Check if @mem is readonly.
- */
-#define GST_MEMORY_IS_READONLY(mem)        GST_MEMORY_FLAG_IS_SET(mem,GST_MEMORY_FLAG_READONLY)
-/**
- * GST_MEMORY_IS_NO_SHARE:
- * @mem: a #GstMemory.
- *
- * Check if @mem cannot be shared between buffers
- */
-#define GST_MEMORY_IS_NO_SHARE(mem)        GST_MEMORY_FLAG_IS_SET(mem,GST_MEMORY_FLAG_NO_SHARE)
-/**
- * GST_MEMORY_IS_ZERO_PREFIXED:
- * @mem: a #GstMemory.
- *
- * Check if the prefix in @mem is 0 filled.
- */
-#define GST_MEMORY_IS_ZERO_PREFIXED(mem)   GST_MEMORY_FLAG_IS_SET(mem,GST_MEMORY_FLAG_ZERO_PREFIXED)
-/**
- * GST_MEMORY_IS_ZERO_PADDED:
- * @mem: a #GstMemory.
- *
- * Check if the padding in @mem is 0 filled.
- */
-#define GST_MEMORY_IS_ZERO_PADDED(mem)     GST_MEMORY_FLAG_IS_SET(mem,GST_MEMORY_FLAG_ZERO_PADDED)
-
-
-/**
- * GstMemory:
- * @mini_object: parent structure
- * @allocator: pointer to the #GstAllocator
- * @parent: parent memory block
- * @maxsize: the maximum size allocated
- * @align: the alignment of the memory
- * @offset: the offset where valid data starts
- * @size: the size of valid data
- *
- * Base structure for memory implementations. Custom memory will put this structure
- * as the first member of their structure.
- */
-struct _GstMemory {
-  GstMiniObject   mini_object;
-
-  GstAllocator   *allocator;
-
-  GstMemory      *parent;
-  gsize           maxsize;
-  gsize           align;
-  gsize           offset;
-  gsize           size;
-};
-
-/**
- * GstMapFlags:
- * @GST_MAP_READ: map for read access
- * @GST_MAP_WRITE: map for write access
- * @GST_MAP_FLAG_LAST: first flag that can be used for custom purposes
- *
- * Flags used when mapping memory
- */
-typedef enum {
-  GST_MAP_READ      = GST_LOCK_FLAG_READ,
-  GST_MAP_WRITE     = GST_LOCK_FLAG_WRITE,
-
-  GST_MAP_FLAG_LAST = (1 << 16)
-} GstMapFlags;
-
-/**
- * GST_MAP_READWRITE:
- *
- * GstMapFlags value alias for GST_MAP_READ | GST_MAP_WRITE
- */
-#define GST_MAP_READWRITE      (GST_MAP_READ | GST_MAP_WRITE)
-
-
-/**
- * GstMapInfo:
- * @memory: a pointer to the mapped memory
- * @flags: flags used when mapping the memory
- * @data: (array length=size): a pointer to the mapped data
- * @size: the valid size in @data
- * @maxsize: the maximum bytes in @data
- * @user_data: extra private user_data that the implementation of the memory
- *             can use to store extra info.
- *
- * A structure containing the result of a map operation such as
- * gst_memory_map(). It contains the data and size.
- */
-typedef struct {
-  GstMemory *memory;
-  GstMapFlags flags;
-  guint8 *data;
-  gsize size;
-  gsize maxsize;
-  /*< protected >*/
-  gpointer user_data[4];
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-} GstMapInfo;
-
-/**
- * GST_MAP_INFO_INIT:
- *
- * Initializer for #GstMapInfo
- */
-#define GST_MAP_INFO_INIT { NULL, 0, NULL, 0, 0, }
-
-/**
- * GstMemoryMapFunction:
- * @mem: a #GstMemory
- * @maxsize: size to map
- * @flags: access mode for the memory
- *
- * Get the memory of @mem that can be accessed according to the mode specified
- * in @flags. The function should return a pointer that contains at least
- * @maxsize bytes.
- *
- * Returns: a pointer to memory of which at least @maxsize bytes can be
- * accessed according to the access pattern in @flags.
- */
-typedef gpointer    (*GstMemoryMapFunction)       (GstMemory *mem, gsize maxsize, GstMapFlags flags);
-
-/**
- * GstMemoryUnmapFunction:
- * @mem: a #GstMemory
- *
- * Return the pointer previously retrieved with gst_memory_map().
- *
- * Returns: %TRUE on success.
- */
-typedef void        (*GstMemoryUnmapFunction)     (GstMemory *mem);
-
-/**
- * GstMemoryCopyFunction:
- * @mem: a #GstMemory
- * @offset: an offset
- * @size: a size or -1
- *
- * Copy @size bytes from @mem starting at @offset and return them wrapped in a
- * new GstMemory object.
- * If @size is set to -1, all bytes starting at @offset are copied.
- *
- * Returns: a new #GstMemory object wrapping a copy of the requested region in
- * @mem.
- */
-typedef GstMemory * (*GstMemoryCopyFunction)      (GstMemory *mem, gssize offset, gssize size);
-
-/**
- * GstMemoryShareFunction:
- * @mem: a #GstMemory
- * @offset: an offset
- * @size: a size or -1
- *
- * Share @size bytes from @mem starting at @offset and return them wrapped in a
- * new GstMemory object. If @size is set to -1, all bytes starting at @offset are
- * shared. This function does not make a copy of the bytes in @mem.
- *
- * Returns: a new #GstMemory object sharing the requested region in @mem.
- */
-typedef GstMemory * (*GstMemoryShareFunction)     (GstMemory *mem, gssize offset, gssize size);
-
-/**
- * GstMemoryIsSpanFunction:
- * @mem1: a #GstMemory
- * @mem2: a #GstMemory
- * @offset: a result offset
- *
- * Check if @mem1 and @mem2 occupy contiguous memory and return the offset of
- * @mem1 in the parent buffer in @offset.
- *
- * Returns: %TRUE if @mem1 and @mem2 are in contiguous memory.
- */
-typedef gboolean    (*GstMemoryIsSpanFunction)    (GstMemory *mem1, GstMemory *mem2, gsize *offset);
-
-void           gst_memory_init         (GstMemory *mem, GstMemoryFlags flags,
-                                        GstAllocator *allocator, GstMemory *parent,
-                                        gsize maxsize, gsize align,
-                                        gsize offset, gsize size);
-/* refcounting */
-/**
- * gst_memory_ref:
- * @memory: The memory to refcount
- *
- * Increase the refcount of this memory.
- *
- * Returns: (transfer full): @memory (for convenience when doing assignments)
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstMemory * gst_memory_ref (GstMemory * memory);
-#endif
-
-static inline GstMemory *
-gst_memory_ref (GstMemory * memory)
-{
-  return (GstMemory *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (memory));
-}
-
-/**
- * gst_memory_unref:
- * @memory: (transfer full): the memory to refcount
- *
- * Decrease the refcount of an memory, freeing it if the refcount reaches 0.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_memory_unref (GstMemory * memory);
-#endif
-
-static inline void
-gst_memory_unref (GstMemory * memory)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (memory));
-}
-
-/* getting/setting memory properties */
-gsize          gst_memory_get_sizes    (GstMemory *mem, gsize *offset, gsize *maxsize);
-void           gst_memory_resize       (GstMemory *mem, gssize offset, gsize size);
-
-#define        gst_memory_lock(m,f)        gst_mini_object_lock (GST_MINI_OBJECT_CAST (m), (f))
-#define        gst_memory_unlock(m,f)      gst_mini_object_unlock (GST_MINI_OBJECT_CAST (m), (f))
-#define        gst_memory_is_writable(m)   gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (m))
-#define        gst_memory_make_writable(m) GST_MEMORY_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (m)))
-
-/* retrieving data */
-GstMemory *    gst_memory_make_mapped  (GstMemory *mem, GstMapInfo *info, GstMapFlags flags);
-gboolean       gst_memory_map          (GstMemory *mem, GstMapInfo *info, GstMapFlags flags);
-void           gst_memory_unmap        (GstMemory *mem, GstMapInfo *info);
-
-/* copy and subregions */
-GstMemory *    gst_memory_copy         (GstMemory *mem, gssize offset, gssize size);
-GstMemory *    gst_memory_share        (GstMemory *mem, gssize offset, gssize size);
-
-/* span memory */
-gboolean       gst_memory_is_span      (GstMemory *mem1, GstMemory *mem2, gsize *offset);
-
-G_END_DECLS
-
-#endif /* __GST_MEMORY_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmessage.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmessage.h
deleted file mode 100644
index 03286674..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmessage.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
- *
- * gstmessage.h: Header for GstMessage subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_MESSAGE_H__
-#define __GST_MESSAGE_H__
-
-G_BEGIN_DECLS
-
-typedef struct _GstMessage GstMessage;
-
-/**
- * GstMessageType:
- * @GST_MESSAGE_UNKNOWN: an undefined message
- * @GST_MESSAGE_EOS: end-of-stream reached in a pipeline. The application will
- * only receive this message in the PLAYING state and every time it sets a
- * pipeline to PLAYING that is in the EOS state. The application can perform a
- * flushing seek in the pipeline, which will undo the EOS state again.
- * @GST_MESSAGE_ERROR: an error occured. When the application receives an error
- * message it should stop playback of the pipeline and not assume that more
- * data will be played.
- * @GST_MESSAGE_WARNING: a warning occured.
- * @GST_MESSAGE_INFO: an info message occured
- * @GST_MESSAGE_TAG: a tag was found.
- * @GST_MESSAGE_BUFFERING: the pipeline is buffering. When the application
- * receives a buffering message in the PLAYING state for a non-live pipeline it
- * must PAUSE the pipeline until the buffering completes, when the percentage
- * field in the message is 100%. For live pipelines, no action must be
- * performed and the buffering percentage can be used to inform the user about
- * the progress.
- * @GST_MESSAGE_STATE_CHANGED: a state change happened
- * @GST_MESSAGE_STATE_DIRTY: an element changed state in a streaming thread.
- * This message is deprecated.
- * @GST_MESSAGE_STEP_DONE: a stepping operation finished.
- * @GST_MESSAGE_CLOCK_PROVIDE: an element notifies its capability of providing
- *                             a clock. This message is used internally and
- *                             never forwarded to the application.
- * @GST_MESSAGE_CLOCK_LOST: The current clock as selected by the pipeline became
- *                          unusable. The pipeline will select a new clock on
- *                          the next PLAYING state change. The application
- *                          should set the pipeline to PAUSED and back to
- *                          PLAYING when this message is received.
- * @GST_MESSAGE_NEW_CLOCK: a new clock was selected in the pipeline.
- * @GST_MESSAGE_STRUCTURE_CHANGE: the structure of the pipeline changed. This
- * message is used internally and never forwarded to the application.
- * @GST_MESSAGE_STREAM_STATUS: status about a stream, emitted when it starts,
- *                             stops, errors, etc..
- * @GST_MESSAGE_APPLICATION: message posted by the application, possibly
- *                           via an application-specific element.
- * @GST_MESSAGE_ELEMENT: element-specific message, see the specific element's
- *                       documentation
- * @GST_MESSAGE_SEGMENT_START: pipeline started playback of a segment. This
- * message is used internally and never forwarded to the application.
- * @GST_MESSAGE_SEGMENT_DONE: pipeline completed playback of a segment. This
- * message is forwarded to the application after all elements that posted
- * @GST_MESSAGE_SEGMENT_START posted a GST_MESSAGE_SEGMENT_DONE message.
- * @GST_MESSAGE_DURATION_CHANGED: The duration of a pipeline changed. The
- * application can get the new duration with a duration query.
- * @GST_MESSAGE_ASYNC_START: Posted by elements when they start an ASYNC
- * #GstStateChange. This message is not forwarded to the application but is used
- * internally.
- * @GST_MESSAGE_ASYNC_DONE: Posted by elements when they complete an ASYNC
- * #GstStateChange. The application will only receive this message from the toplevel
- * pipeline.
- * @GST_MESSAGE_LATENCY: Posted by elements when their latency changes. The
- * application should recalculate and distribute a new latency.
- * @GST_MESSAGE_REQUEST_STATE: Posted by elements when they want the pipeline to
- * change state. This message is a suggestion to the application which can
- * decide to perform the state change on (part of) the pipeline.
- * @GST_MESSAGE_STEP_START: A stepping operation was started.
- * @GST_MESSAGE_QOS: A buffer was dropped or an element changed its processing
- * strategy for Quality of Service reasons.
- * @GST_MESSAGE_PROGRESS: A progress message.
- * @GST_MESSAGE_TOC: A new table of contents (TOC) was found or previously found TOC
- * was updated.
- * @GST_MESSAGE_RESET_TIME: Message to request resetting the pipeline's
- *     running time from the pipeline. This is an internal message which
- *     applications will likely never receive.
- * @GST_MESSAGE_STREAM_START: Message indicating start of a new stream. Useful
- *     e.g. when using playbin in gapless playback mode, to get notified when
- *     the next title actually starts playing (which will be some time after
- *     the URI for the next title has been set).
- * @GST_MESSAGE_ANY: mask for all of the above messages.
- *
- * The different message types that are available.
- */
-/* NOTE: keep in sync with quark registration in gstmessage.c
- * NOTE: keep GST_MESSAGE_ANY a valid gint to avoid compiler warnings.
- */
-typedef enum
-{
-  GST_MESSAGE_UNKNOWN           = 0,
-  GST_MESSAGE_EOS               = (1 << 0),
-  GST_MESSAGE_ERROR             = (1 << 1),
-  GST_MESSAGE_WARNING           = (1 << 2),
-  GST_MESSAGE_INFO              = (1 << 3),
-  GST_MESSAGE_TAG               = (1 << 4),
-  GST_MESSAGE_BUFFERING         = (1 << 5),
-  GST_MESSAGE_STATE_CHANGED     = (1 << 6),
-  GST_MESSAGE_STATE_DIRTY       = (1 << 7),
-  GST_MESSAGE_STEP_DONE         = (1 << 8),
-  GST_MESSAGE_CLOCK_PROVIDE     = (1 << 9),
-  GST_MESSAGE_CLOCK_LOST        = (1 << 10),
-  GST_MESSAGE_NEW_CLOCK         = (1 << 11),
-  GST_MESSAGE_STRUCTURE_CHANGE  = (1 << 12),
-  GST_MESSAGE_STREAM_STATUS     = (1 << 13),
-  GST_MESSAGE_APPLICATION       = (1 << 14),
-  GST_MESSAGE_ELEMENT           = (1 << 15),
-  GST_MESSAGE_SEGMENT_START     = (1 << 16),
-  GST_MESSAGE_SEGMENT_DONE      = (1 << 17),
-  GST_MESSAGE_DURATION_CHANGED  = (1 << 18),
-  GST_MESSAGE_LATENCY           = (1 << 19),
-  GST_MESSAGE_ASYNC_START       = (1 << 20),
-  GST_MESSAGE_ASYNC_DONE        = (1 << 21),
-  GST_MESSAGE_REQUEST_STATE     = (1 << 22),
-  GST_MESSAGE_STEP_START        = (1 << 23),
-  GST_MESSAGE_QOS               = (1 << 24),
-  GST_MESSAGE_PROGRESS          = (1 << 25),
-  GST_MESSAGE_TOC               = (1 << 26),
-  GST_MESSAGE_RESET_TIME        = (1 << 27),
-  GST_MESSAGE_STREAM_START      = (1 << 28),
-  GST_MESSAGE_ANY               = ~0
-} GstMessageType;
-
-#include <gst/gstminiobject.h>
-#include <gst/gstobject.h>
-#include <gst/gstelement.h>
-#include <gst/gsttaglist.h>
-#include <gst/gststructure.h>
-#include <gst/gstquery.h>
-#include <gst/gsttoc.h>
-
-#define GST_TYPE_MESSAGE                         (gst_message_get_type())
-#define GST_IS_MESSAGE(obj)                      (GST_IS_MINI_OBJECT_TYPE (obj, GST_TYPE_MESSAGE))
-#define GST_MESSAGE_CAST(obj)                    ((GstMessage*)(obj))
-#define GST_MESSAGE(obj)                         (GST_MESSAGE_CAST(obj))
-
-/* the lock is used to handle the synchronous handling of messages,
- * the emiting thread is block until the handling thread processed
- * the message using this mutex/cond pair */
-#define GST_MESSAGE_GET_LOCK(message)   (&GST_MESSAGE_CAST(message)->lock)
-#define GST_MESSAGE_LOCK(message)       g_mutex_lock(GST_MESSAGE_GET_LOCK(message))
-#define GST_MESSAGE_UNLOCK(message)     g_mutex_unlock(GST_MESSAGE_GET_LOCK(message))
-#define GST_MESSAGE_GET_COND(message)   (&GST_MESSAGE_CAST(message)->cond)
-#define GST_MESSAGE_WAIT(message)       g_cond_wait(GST_MESSAGE_GET_COND(message),GST_MESSAGE_GET_LOCK(message))
-#define GST_MESSAGE_SIGNAL(message)     g_cond_signal(GST_MESSAGE_GET_COND(message))
-
-/**
- * GST_MESSAGE_TYPE:
- * @message: a #GstMessage
- *
- * Get the #GstMessageType of @message.
- */
-#define GST_MESSAGE_TYPE(message)       (GST_MESSAGE_CAST(message)->type)
-/**
- * GST_MESSAGE_TYPE_NAME:
- * @message: a #GstMessage
- *
- * Get a constant string representation of the #GstMessageType of @message.
- */
-#define GST_MESSAGE_TYPE_NAME(message)  gst_message_type_get_name(GST_MESSAGE_TYPE(message))
-/**
- * GST_MESSAGE_TIMESTAMP:
- * @message: a #GstMessage
- *
- * Get the timestamp of @message. This is the timestamp when the message
- * was created.
- */
-#define GST_MESSAGE_TIMESTAMP(message)  (GST_MESSAGE_CAST(message)->timestamp)
-/**
- * GST_MESSAGE_SRC:
- * @message: a #GstMessage
- *
- * Get the object that posted @message.
- */
-#define GST_MESSAGE_SRC(message)        (GST_MESSAGE_CAST(message)->src)
-
-/**
- * GST_MESSAGE_SEQNUM:
- * @message: a #GstMessage
- *
- * Get the sequence number of @message.
- */
-#define GST_MESSAGE_SEQNUM(message)     (GST_MESSAGE_CAST(message)->seqnum)
-
-/**
- * GST_MESSAGE_SRC_NAME:
- * @message: a #GstMessage
- *
- * Get the name of the object that posted @message. Returns "(NULL)" if
- * the message has no source object set.
- */
-#define GST_MESSAGE_SRC_NAME(message)   (GST_MESSAGE_SRC(message) ? \
-    GST_OBJECT_NAME (GST_MESSAGE_SRC(message)) : "(NULL)")
-
-/**
- * GstStructureChangeType:
- * @GST_STRUCTURE_CHANGE_TYPE_PAD_LINK: Pad linking is starting or done.
- * @GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK: Pad unlinking is starting or done.
- *
- * The type of a %GST_MESSAGE_STRUCTURE_CHANGE.
- */
-typedef enum {
-  GST_STRUCTURE_CHANGE_TYPE_PAD_LINK   = 0,
-  GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK = 1
-} GstStructureChangeType;
-
-/**
- * GstStreamStatusType:
- * @GST_STREAM_STATUS_TYPE_CREATE: A new thread need to be created.
- * @GST_STREAM_STATUS_TYPE_ENTER: a thread entered its loop function
- * @GST_STREAM_STATUS_TYPE_LEAVE: a thread left its loop function
- * @GST_STREAM_STATUS_TYPE_DESTROY: a thread is destroyed
- * @GST_STREAM_STATUS_TYPE_START: a thread is started
- * @GST_STREAM_STATUS_TYPE_PAUSE: a thread is paused
- * @GST_STREAM_STATUS_TYPE_STOP: a thread is stopped
- *
- * The type of a %GST_MESSAGE_STREAM_STATUS. The stream status messages inform the
- * application of new streaming threads and their status.
- */
-typedef enum {
-  GST_STREAM_STATUS_TYPE_CREATE   = 0,
-  GST_STREAM_STATUS_TYPE_ENTER    = 1,
-  GST_STREAM_STATUS_TYPE_LEAVE    = 2,
-  GST_STREAM_STATUS_TYPE_DESTROY  = 3,
-
-  GST_STREAM_STATUS_TYPE_START    = 8,
-  GST_STREAM_STATUS_TYPE_PAUSE    = 9,
-  GST_STREAM_STATUS_TYPE_STOP     = 10
-} GstStreamStatusType;
-
-/**
- * GstProgressType:
- * @GST_PROGRESS_TYPE_START: A new task started.
- * @GST_PROGRESS_TYPE_CONTINUE: A task completed and a new one continues.
- * @GST_PROGRESS_TYPE_COMPLETE: A task completed.
- * @GST_PROGRESS_TYPE_CANCELED: A task was canceled.
- * @GST_PROGRESS_TYPE_ERROR: A task caused an error. An error message is also
- *          posted on the bus.
- *
- * The type of a %GST_MESSAGE_PROGRESS. The progress messages inform the
- * application of the status of assynchronous tasks.
- */
-typedef enum {
-  GST_PROGRESS_TYPE_START    = 0,
-  GST_PROGRESS_TYPE_CONTINUE = 1,
-  GST_PROGRESS_TYPE_COMPLETE = 2,
-  GST_PROGRESS_TYPE_CANCELED = 3,
-  GST_PROGRESS_TYPE_ERROR    = 4
-} GstProgressType;
-
-/**
- * GstMessage:
- * @mini_object: the parent structure
- * @type: the #GstMessageType of the message
- * @timestamp: the timestamp of the message
- * @src: the src of the message
- * @seqnum: the sequence number of the message
- *
- * A #GstMessage.
- */
-struct _GstMessage
-{
-  GstMiniObject   mini_object;
-
-  /*< public > *//* with COW */
-  GstMessageType  type;
-  guint64         timestamp;
-  GstObject      *src;
-  guint32         seqnum;
-
-  /*< private >*//* with MESSAGE_LOCK */
-  GMutex          lock;                 /* lock and cond for async delivery */
-  GCond           cond;
-};
-
-GType           gst_message_get_type            (void);
-
-const gchar*    gst_message_type_get_name       (GstMessageType type);
-GQuark          gst_message_type_to_quark       (GstMessageType type);
-
-/* refcounting */
-/**
- * gst_message_ref:
- * @msg: the message to ref
- *
- * Convenience macro to increase the reference count of the message.
- *
- * Returns: @msg (for convenience when doing assignments)
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstMessage * gst_message_ref (GstMessage * msg);
-#endif
-
-static inline GstMessage *
-gst_message_ref (GstMessage * msg)
-{
-  return (GstMessage *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (msg));
-}
-
-/**
- * gst_message_unref:
- * @msg: the message to unref
- *
- * Convenience macro to decrease the reference count of the message, possibly
- * freeing it.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_message_unref (GstMessage * msg);
-#endif
-
-static inline void
-gst_message_unref (GstMessage * msg)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (msg));
-}
-
-/* copy message */
-/**
- * gst_message_copy:
- * @msg: the message to copy
- *
- * Creates a copy of the message. Returns a copy of the message.
- *
- * Returns: (transfer full): a new copy of @msg.
- *
- * MT safe
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstMessage * gst_message_copy (const GstMessage * msg);
-#endif
-
-static inline GstMessage *
-gst_message_copy (const GstMessage * msg)
-{
-  return GST_MESSAGE_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (msg)));
-}
-
-/**
- * gst_message_is_writable:
- * @msg: a #GstMessage
- *
- * Tests if you can safely write into a message's structure or validly
- * modify the seqnum and timestamp fields.
- */
-#define         gst_message_is_writable(msg)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (msg))
-/**
- * gst_message_make_writable:
- * @msg: (transfer full): the message to make writable
- *
- * Checks if a message is writable. If not, a writable copy is made and
- * returned.
- *
- * Returns: (transfer full): a message (possibly a duplicate) that is writable.
- *
- * MT safe
- */
-#define         gst_message_make_writable(msg)  GST_MESSAGE_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (msg)))
-/**
- * gst_message_replace:
- * @old_message: (inout) (transfer full): pointer to a pointer to a #GstMessage
- *     to be replaced.
- * @new_message: (allow-none) (transfer none): pointer to a #GstMessage that will
- *     replace the message pointed to by @old_message.
- *
- * Modifies a pointer to a #GstMessage to point to a different #GstMessage. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * message is unreffed, the new one is reffed).
- *
- * Either @new_message or the #GstMessage pointed to by @old_message may be NULL.
- *
- * Returns: TRUE if @new_message was different from @old_message
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_message_replace (GstMessage **old_message, GstMessage *new_message);
-#endif
-
-static inline gboolean
-gst_message_replace (GstMessage **old_message, GstMessage *new_message)
-{
-  return gst_mini_object_replace ((GstMiniObject **) old_message, (GstMiniObject *) new_message);
-}
-
-
-/* custom messages */
-GstMessage *    gst_message_new_custom          (GstMessageType type,
-                                                 GstObject    * src,
-                                                 GstStructure * structure) G_GNUC_MALLOC;
-const GstStructure *
-                gst_message_get_structure       (GstMessage *message);
-
-gboolean        gst_message_has_name            (GstMessage *message, const gchar *name);
-
-/* identifiers for events and messages */
-guint32         gst_message_get_seqnum          (GstMessage *message);
-void            gst_message_set_seqnum          (GstMessage *message, guint32 seqnum);
-
-/* EOS */
-GstMessage *    gst_message_new_eos             (GstObject * src) G_GNUC_MALLOC;
-
-/* ERROR */
-
-GstMessage *    gst_message_new_error           (GstObject * src, GError * error, const gchar * debug) G_GNUC_MALLOC;
-void            gst_message_parse_error         (GstMessage *message, GError **gerror, gchar **debug);
-
-/* WARNING */
-GstMessage *    gst_message_new_warning         (GstObject * src, GError * error, const gchar * debug) G_GNUC_MALLOC;
-void            gst_message_parse_warning       (GstMessage *message, GError **gerror, gchar **debug);
-
-/* INFO */
-GstMessage *    gst_message_new_info            (GstObject * src, GError * error, const gchar * debug) G_GNUC_MALLOC;
-void            gst_message_parse_info          (GstMessage *message, GError **gerror, gchar **debug);
-
-/* TAG */
-GstMessage *    gst_message_new_tag             (GstObject * src, GstTagList * tag_list) G_GNUC_MALLOC;
-void            gst_message_parse_tag           (GstMessage *message, GstTagList **tag_list);
-
-/* BUFFERING */
-GstMessage *    gst_message_new_buffering         (GstObject * src, gint percent) G_GNUC_MALLOC;
-void            gst_message_parse_buffering       (GstMessage *message, gint *percent);
-void            gst_message_set_buffering_stats   (GstMessage *message, GstBufferingMode mode,
-                                                   gint avg_in, gint avg_out,
-                                                   gint64 buffering_left);
-void            gst_message_parse_buffering_stats (GstMessage *message, GstBufferingMode *mode,
-                                                   gint *avg_in, gint *avg_out,
-                                                   gint64 *buffering_left);
-
-/* STATE_CHANGED */
-GstMessage *    gst_message_new_state_changed   (GstObject * src, GstState oldstate,
-                                                 GstState newstate, GstState pending) G_GNUC_MALLOC;
-void            gst_message_parse_state_changed (GstMessage *message, GstState *oldstate,
-                                                 GstState *newstate, GstState *pending);
-
-/* STATE_DIRTY */
-GstMessage *    gst_message_new_state_dirty     (GstObject * src) G_GNUC_MALLOC;
-
-/* STEP_DONE */
-GstMessage *    gst_message_new_step_done       (GstObject * src, GstFormat format, guint64 amount,
-                                                 gdouble rate, gboolean flush, gboolean intermediate,
-                                                 guint64 duration, gboolean eos) G_GNUC_MALLOC;
-void            gst_message_parse_step_done     (GstMessage * message, GstFormat *format, guint64 *amount,
-                                                 gdouble *rate, gboolean *flush, gboolean *intermediate,
-                                                 guint64 *duration, gboolean *eos);
-/* CLOCK_PROVIDE */
-GstMessage *    gst_message_new_clock_provide   (GstObject * src, GstClock *clock, gboolean ready) G_GNUC_MALLOC;
-void            gst_message_parse_clock_provide (GstMessage *message, GstClock **clock,
-                                                 gboolean *ready);
-
-/* CLOCK_LOST */
-GstMessage *    gst_message_new_clock_lost      (GstObject * src, GstClock *clock) G_GNUC_MALLOC;
-void            gst_message_parse_clock_lost    (GstMessage *message, GstClock **clock);
-
-/* NEW_CLOCK */
-GstMessage *    gst_message_new_new_clock       (GstObject * src, GstClock *clock) G_GNUC_MALLOC;
-void            gst_message_parse_new_clock     (GstMessage *message, GstClock **clock);
-
-/* APPLICATION */
-GstMessage *    gst_message_new_application     (GstObject * src, GstStructure * structure) G_GNUC_MALLOC;
-
-/* ELEMENT */
-GstMessage *    gst_message_new_element         (GstObject * src, GstStructure * structure) G_GNUC_MALLOC;
-
-/* SEGMENT_START */
-GstMessage *    gst_message_new_segment_start   (GstObject * src, GstFormat format, gint64 position) G_GNUC_MALLOC;
-void            gst_message_parse_segment_start (GstMessage *message, GstFormat *format,
-                                                 gint64 *position);
-
-/* SEGMENT_DONE */
-GstMessage *    gst_message_new_segment_done    (GstObject * src, GstFormat format, gint64 position) G_GNUC_MALLOC;
-void            gst_message_parse_segment_done  (GstMessage *message, GstFormat *format,
-                                                 gint64 *position);
-
-/* DURATION_CHANGED */
-GstMessage *    gst_message_new_duration_changed (GstObject * src) G_GNUC_MALLOC;
-
-/* LATENCY */
-GstMessage *    gst_message_new_latency         (GstObject * src) G_GNUC_MALLOC;
-
-/* ASYNC_START */
-GstMessage *    gst_message_new_async_start     (GstObject * src) G_GNUC_MALLOC;
-
-/* ASYNC_DONE */
-GstMessage *    gst_message_new_async_done      (GstObject * src, GstClockTime running_time) G_GNUC_MALLOC;
-void            gst_message_parse_async_done    (GstMessage *message, GstClockTime *running_time);
-
-/* STRUCTURE CHANGE */
-GstMessage *    gst_message_new_structure_change   (GstObject * src, GstStructureChangeType type,
-                                                    GstElement *owner, gboolean busy) G_GNUC_MALLOC;
-void            gst_message_parse_structure_change (GstMessage *message, GstStructureChangeType *type,
-                                                    GstElement **owner, gboolean *busy);
-
-/* STREAM STATUS */
-GstMessage *    gst_message_new_stream_status        (GstObject * src, GstStreamStatusType type,
-                                                      GstElement *owner) G_GNUC_MALLOC;
-void            gst_message_parse_stream_status      (GstMessage *message, GstStreamStatusType *type,
-                                                      GstElement **owner);
-void            gst_message_set_stream_status_object (GstMessage *message, const GValue *object);
-const GValue *  gst_message_get_stream_status_object (GstMessage *message);
-
-/* REQUEST_STATE */
-GstMessage *    gst_message_new_request_state   (GstObject * src, GstState state) G_GNUC_MALLOC;
-void            gst_message_parse_request_state (GstMessage * message, GstState *state);
-
-/* STEP_START */
-GstMessage *    gst_message_new_step_start      (GstObject * src, gboolean active, GstFormat format,
-                                                 guint64 amount, gdouble rate, gboolean flush,
-                                                 gboolean intermediate) G_GNUC_MALLOC;
-void            gst_message_parse_step_start    (GstMessage * message, gboolean *active, GstFormat *format,
-                                                 guint64 *amount, gdouble *rate, gboolean *flush,
-                                                 gboolean *intermediate);
-
-/* QOS */
-GstMessage *    gst_message_new_qos             (GstObject * src, gboolean live, guint64 running_time,
-                                                 guint64 stream_time, guint64 timestamp, guint64 duration) G_GNUC_MALLOC;
-void            gst_message_set_qos_values      (GstMessage * message, gint64 jitter, gdouble proportion,
-                                                 gint quality);
-void            gst_message_set_qos_stats       (GstMessage * message, GstFormat format, guint64 processed,
-                                                 guint64 dropped);
-void            gst_message_parse_qos           (GstMessage * message, gboolean * live, guint64 * running_time,
-                                                 guint64 * stream_time, guint64 * timestamp, guint64 * duration);
-void            gst_message_parse_qos_values    (GstMessage * message, gint64 * jitter, gdouble * proportion,
-                                                 gint * quality);
-void            gst_message_parse_qos_stats     (GstMessage * message, GstFormat * format, guint64 * processed,
-                                                 guint64 * dropped);
-/* PROGRESS */
-GstMessage *    gst_message_new_progress           (GstObject * src, GstProgressType type, const gchar *code,
-                                                    const gchar *text) G_GNUC_MALLOC;
-void            gst_message_parse_progress         (GstMessage * message, GstProgressType * type, gchar ** code,
-                                                    gchar ** text);
-
-/* TOC */
-GstMessage *    gst_message_new_toc             (GstObject *src, GstToc *toc, gboolean updated);
-void            gst_message_parse_toc           (GstMessage *message, GstToc **toc, gboolean *updated);
-
-/* RESET_TIME */
-GstMessage *    gst_message_new_reset_time      (GstObject * src, GstClockTime running_time) G_GNUC_MALLOC;
-void            gst_message_parse_reset_time    (GstMessage *message, GstClockTime *running_time);
-
-/* STREAM_START */
-GstMessage *    gst_message_new_stream_start    (GstObject * src) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __GST_MESSAGE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmeta.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmeta.h
deleted file mode 100644
index e6d4f006..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstmeta.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Wim Taymans <wim.taymans@gmail.be>
- *
- * gstmeta.h: Header for Metadata structures
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_META_H__
-#define __GST_META_H__
-
-G_BEGIN_DECLS
-
-typedef struct _GstMeta GstMeta;
-typedef struct _GstMetaInfo GstMetaInfo;
-
-#define GST_META_CAST(meta)   ((GstMeta *)(meta))
-
-/**
- * GstMetaFlags:
- * @GST_META_FLAG_NONE: no flags
- * @GST_META_FLAG_READONLY: metadata should not be modified
- * @GST_META_FLAG_POOLED: metadata is managed by a bufferpool
- * @GST_META_FLAG_LOCKED: metadata should not be removed
- * @GST_META_FLAG_LAST: additional flags can be added starting from this flag.
- *
- * Extra metadata flags.
- */
-typedef enum {
-  GST_META_FLAG_NONE        = 0,
-  GST_META_FLAG_READONLY    = (1 << 0),
-  GST_META_FLAG_POOLED      = (1 << 1),
-  GST_META_FLAG_LOCKED      = (1 << 2),
-
-  GST_META_FLAG_LAST        = (1 << 16)
-} GstMetaFlags;
-
-/**
- * GST_META_FLAGS:
- * @meta: a #GstMeta.
- *
- * A flags word containing #GstMetaFlags flags set on @meta
- */
-#define GST_META_FLAGS(meta)  (GST_META_CAST (meta)->flags)
-/**
- * GST_META_FLAG_IS_SET:
- * @meta: a #GstMeta.
- * @flag: the #GstMetaFlags to check.
- *
- * Gives the status of a specific flag on a metadata.
- */
-#define GST_META_FLAG_IS_SET(meta,flag)        !!(GST_META_FLAGS (meta) & (flag))
-/**
- * GST_META_FLAG_SET:
- * @meta: a #GstMeta.
- * @flag: the #GstMetaFlags to set.
- *
- * Sets a metadata flag on a metadata.
- */
-#define GST_META_FLAG_SET(meta,flag)           (GST_META_FLAGS (meta) |= (flag))
-/**
- * GST_META_FLAG_UNSET:
- * @meta: a #GstMeta.
- * @flag: the #GstMetaFlags to clear.
- *
- * Clears a metadata flag.
- */
-#define GST_META_FLAG_UNSET(meta,flag)         (GST_META_FLAGS (meta) &= ~(flag))
-
-/**
- * GstMeta:
- * @flags: extra flags for the metadata
- * @info: pointer to the #GstMetaInfo
- *
- * Base structure for metadata. Custom metadata will put this structure
- * as the first member of their structure.
- */
-struct _GstMeta {
-  GstMetaFlags       flags;
-  const GstMetaInfo *info;
-};
-
-/**
- * GstMetaInitFunction:
- * @meta: a #GstMeta
- * @params: parameters passed to the init function
- * @buffer: a #GstBuffer
- *
- * Function called when @meta is initialized in @buffer.
- */
-typedef gboolean (*GstMetaInitFunction) (GstMeta *meta, gpointer params, GstBuffer *buffer);
-
-/**
- * GstMetaFreeFunction:
- * @meta: a #GstMeta
- * @buffer: a #GstBuffer
- *
- * Function called when @meta is freed in @buffer.
- */
-typedef void (*GstMetaFreeFunction)     (GstMeta *meta, GstBuffer *buffer);
-
-/**
- * gst_meta_transform_copy:
- *
- * GQuark for the "gst-copy" transform.
- */
-GST_EXPORT GQuark _gst_meta_transform_copy;
-
-/**
- * GST_META_TRANSFORM_IS_COPY:
- * @type: a transform type
- *
- * Check if the transform type is a copy transform
- */
-#define GST_META_TRANSFORM_IS_COPY(type) ((type) == _gst_meta_transform_copy)
-
-/**
- * GstMetaTransformCopy:
- * @region: %TRUE if only region is copied
- * @offset: the offset to copy, 0 if @region is %FALSE, otherwise > 0
- * @size: the size to copy, -1 or the buffer size when @region is %FALSE
- *
- * Extra data passed to a "gst-copy" transform #GstMetaTransformFunction.
- */
-typedef struct {
-  gboolean region;
-  gsize offset;
-  gsize size;
-} GstMetaTransformCopy;
-
-/**
- * GstMetaTransformFunction:
- * @transbuf: a #GstBuffer
- * @meta: a #GstMeta
- * @buffer: a #GstBuffer
- * @type: the transform type
- * @data: transform specific data.
- *
- * Function called for each @meta in @buffer as a result of performing a
- * transformation on @transbuf. Additional @type specific transform data
- * is passed to the function as @data.
- *
- * Implementations should check the @type of the transform and parse
- * additional type specific fields in @data that should be used to update
- * the metadata on @transbuf.
- *
- * Returns: %TRUE if the transform could be performed
- */
-typedef gboolean (*GstMetaTransformFunction) (GstBuffer *transbuf,
-                                              GstMeta *meta, GstBuffer *buffer,
-                                              GQuark type, gpointer data);
-
-/**
- * GstMetaInfo:
- * @api: tag indentifying the metadata structure and api
- * @type: type indentifying the implementor of the api
- * @size: size of the metadata
- * @init_func: function for initializing the metadata
- * @free_func: function for freeing the metadata
- * @transform_func: function for transforming the metadata
- *
- * The #GstMetaInfo provides information about a specific metadata
- * structure.
- */
-struct _GstMetaInfo {
-  GType                      api;
-  GType                      type;
-  gsize                      size;
-
-  GstMetaInitFunction        init_func;
-  GstMetaFreeFunction        free_func;
-  GstMetaTransformFunction   transform_func;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                gst_meta_api_type_register (const gchar *api,
-                                                 const gchar **tags);
-gboolean             gst_meta_api_type_has_tag  (GType api, GQuark tag);
-
-const GstMetaInfo *  gst_meta_register          (GType api, const gchar *impl,
-                                                 gsize size,
-                                                 GstMetaInitFunction      init_func,
-                                                 GstMetaFreeFunction      free_func,
-                                                 GstMetaTransformFunction transform_func);
-const GstMetaInfo *  gst_meta_get_info          (const gchar * impl);
-
-/* some default tags */
-GST_EXPORT GQuark _gst_meta_tag_memory;
-
-/**
- * GST_META_TAG_MEMORY:
- *
- * Metadata tagged with this tag depends on the particular memory
- * or buffer that it is on.
- */
-#define GST_META_TAG_MEMORY (_gst_meta_tag_memory)
-
-G_END_DECLS
-
-#endif /* __GST_META_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstminiobject.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstminiobject.h
deleted file mode 100644
index f873b7a8..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstminiobject.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 David Schleef <ds@schleef.org>
- *
- * gstminiobject.h: Header for GstMiniObject
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_MINI_OBJECT_H__
-#define __GST_MINI_OBJECT_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GST_IS_MINI_OBJECT_TYPE(obj,type)  ((obj) && GST_MINI_OBJECT_TYPE(obj) == (type))
-#define GST_MINI_OBJECT_CAST(obj)          ((GstMiniObject*)(obj))
-#define GST_MINI_OBJECT_CONST_CAST(obj)    ((const GstMiniObject*)(obj))
-#define GST_MINI_OBJECT(obj)               (GST_MINI_OBJECT_CAST(obj))
-
-typedef struct _GstMiniObject GstMiniObject;
-
-/**
- * GstMiniObjectCopyFunction:
- * @obj: MiniObject to copy
- *
- * Function prototype for methods to create copies of instances.
- *
- * Returns: reference to cloned instance.
- */
-typedef GstMiniObject * (*GstMiniObjectCopyFunction) (const GstMiniObject *obj);
-/**
- * GstMiniObjectDisposeFunction:
- * @obj: MiniObject to dispose
- *
- * Function prototype for when a miniobject has lost its last refcount.
- * Implementation of the mini object are allowed to revive the
- * passed object by doing a gst_mini_object_ref(). If the object is not
- * revived after the dispose function, the function should return %TRUE
- * and the memory associated with the object is freed.
- *
- * Returns: %TRUE if the object should be cleaned up.
- */
-typedef gboolean (*GstMiniObjectDisposeFunction) (GstMiniObject *obj);
-/**
- * GstMiniObjectFreeFunction:
- * @obj: MiniObject to free
- *
- * Virtual function prototype for methods to free ressources used by
- * mini-objects.
- */
-typedef void (*GstMiniObjectFreeFunction) (GstMiniObject *obj);
-
- /**
- * GstMiniObjectNotify:
- * @user_data: data that was provided when the notify was added
- * @obj: the mini object
- *
- * A #GstMiniObjectNotify function can be added to a mini object as a
- * callback that gets triggered when gst_mini_object_unref() drops the
- * last ref and @obj is about to be freed.
- */
-typedef void (*GstMiniObjectNotify) (gpointer user_data, GstMiniObject * obj);
-
-/**
- * GST_MINI_OBJECT_TYPE:
- * @obj: MiniObject to return type for.
- *
- * This macro returns the type of the mini-object.
- */
-#define GST_MINI_OBJECT_TYPE(obj)  (GST_MINI_OBJECT_CAST(obj)->type)
-
-/**
- * GST_MINI_OBJECT_FLAGS:
- * @obj: MiniObject to return flags for.
- *
- * This macro returns the entire set of flags for the mini-object.
- */
-#define GST_MINI_OBJECT_FLAGS(obj)  (GST_MINI_OBJECT_CAST(obj)->flags)
-/**
- * GST_MINI_OBJECT_FLAG_IS_SET:
- * @obj: MiniObject to check for flags.
- * @flag: Flag to check for
- *
- * This macro checks to see if the given flag is set.
- */
-#define GST_MINI_OBJECT_FLAG_IS_SET(obj,flag)        !!(GST_MINI_OBJECT_FLAGS (obj) & (flag))
-/**
- * GST_MINI_OBJECT_FLAG_SET:
- * @obj: MiniObject to set flag in.
- * @flag: Flag to set, can by any number of bits in guint32.
- *
- * This macro sets the given bits.
- */
-#define GST_MINI_OBJECT_FLAG_SET(obj,flag)           (GST_MINI_OBJECT_FLAGS (obj) |= (flag))
-/**
- * GST_MINI_OBJECT_FLAG_UNSET:
- * @obj: MiniObject to unset flag in.
- * @flag: Flag to set, must be a single bit in guint32.
- *
- * This macro usets the given bits.
- */
-#define GST_MINI_OBJECT_FLAG_UNSET(obj,flag)         (GST_MINI_OBJECT_FLAGS (obj) &= ~(flag))
-
-/**
- * GstMiniObjectFlags:
- * @GST_MINI_OBJECT_FLAG_LOCKABLE: the object can be locked and unlocked with
- * gst_mini_object_lock() and gst_mini_object_unlock().
- * @GST_MINI_OBJECT_FLAG_LOCK_READONLY: the object is permanently locked in
- * READONLY mode. Only read locks can be performed on the object.
- * @GST_MINI_OBJECT_FLAG_LAST: first flag that can be used by subclasses.
- *
- * Flags for the mini object
- */
-typedef enum
-{
-  GST_MINI_OBJECT_FLAG_LOCKABLE      = (1 << 0),
-  GST_MINI_OBJECT_FLAG_LOCK_READONLY = (1 << 1),
-  /* padding */
-  GST_MINI_OBJECT_FLAG_LAST          = (1 << 4)
-} GstMiniObjectFlags;
-
-/**
- * GST_MINI_OBJECT_IS_LOCKABLE:
- * @obj: a #GstMiniObject
- *
- * Check if @obj is lockable. A lockable object can be locked and unlocked with
- * gst_mini_object_lock() and gst_mini_object_unlock().
- */
-#define GST_MINI_OBJECT_IS_LOCKABLE(obj)  GST_MINI_OBJECT_FLAG_IS_SET(obj, GST_MINI_OBJECT_FLAG_LOCKABLE)
-
-/**
- * GstLockFlags:
- * @GST_LOCK_FLAG_READ: lock for read access
- * @GST_LOCK_FLAG_WRITE: lock for write access
- * @GST_LOCK_FLAG_EXCLUSIVE: lock for exclusive access
- * @GST_LOCK_FLAG_LAST: first flag that can be used for custom purposes
- *
- * Flags used when locking miniobjects
- */
-typedef enum {
-  GST_LOCK_FLAG_READ      = (1 << 0),
-  GST_LOCK_FLAG_WRITE     = (1 << 1),
-  GST_LOCK_FLAG_EXCLUSIVE = (1 << 2),
-
-  GST_LOCK_FLAG_LAST      = (1 << 8)
-} GstLockFlags;
-
-/**
- * GST_LOCK_FLAG_READWRITE:
- *
- * GstLockFlags value alias for GST_LOCK_FLAG_READ | GST_LOCK_FLAG_WRITE
- */
-#define GST_LOCK_FLAG_READWRITE  (GST_LOCK_FLAG_READ | GST_LOCK_FLAG_WRITE)
-
-/**
- * GST_MINI_OBJECT_REFCOUNT:
- * @obj: a #GstMiniObject
- *
- * Get access to the reference count field of the mini-object.
- */
-#define GST_MINI_OBJECT_REFCOUNT(obj)           ((GST_MINI_OBJECT_CAST(obj))->refcount)
-/**
- * GST_MINI_OBJECT_REFCOUNT_VALUE:
- * @obj: a #GstMiniObject
- *
- * Get the reference count value of the mini-object.
- */
-#define GST_MINI_OBJECT_REFCOUNT_VALUE(obj)     (g_atomic_int_get (&(GST_MINI_OBJECT_CAST(obj))->refcount))
-
-/**
- * GstMiniObject:
- * @type: the GType of the object
- * @refcount: atomic refcount
- * @lockstate: atomic state of the locks
- * @flags: extra flags.
- * @copy: a copy function
- * @dispose: a dispose function
- * @free: the free function
- *
- * Base class for refcounted lightweight objects.
- * Ref Func: gst_mini_object_ref
- * Unref Func: gst_mini_object_unref
- * Set Value Func: g_value_set_boxed
- * Get Value Func: g_value_get_boxed
- */
-struct _GstMiniObject {
-  GType   type;
-
-  /*< public >*/ /* with COW */
-  gint    refcount;
-  gint    lockstate;
-  guint   flags;
-
-  GstMiniObjectCopyFunction copy;
-  GstMiniObjectDisposeFunction dispose;
-  GstMiniObjectFreeFunction free;
-
-  /* < private > */
-  /* Used to keep track of weak ref notifies and qdata */
-  guint n_qdata;
-  gpointer qdata;
-};
-
-void            gst_mini_object_init (GstMiniObject *mini_object,
-                                      guint flags, GType type,
-                                      GstMiniObjectCopyFunction copy_func,
-                                      GstMiniObjectDisposeFunction dispose_func,
-                                      GstMiniObjectFreeFunction free_func);
-
-
-/* refcounting */
-GstMiniObject * gst_mini_object_ref		(GstMiniObject *mini_object);
-void            gst_mini_object_unref		(GstMiniObject *mini_object);
-
-void            gst_mini_object_weak_ref        (GstMiniObject *object,
-					         GstMiniObjectNotify notify,
-					         gpointer data);
-void            gst_mini_object_weak_unref	(GstMiniObject *object,
-					         GstMiniObjectNotify notify,
-					         gpointer data);
-
-/* locking */
-gboolean        gst_mini_object_lock            (GstMiniObject *object, GstLockFlags flags);
-void            gst_mini_object_unlock          (GstMiniObject *object, GstLockFlags flags);
-
-gboolean        gst_mini_object_is_writable     (const GstMiniObject *mini_object);
-GstMiniObject * gst_mini_object_make_writable	(GstMiniObject *mini_object);
-
-/* copy */
-GstMiniObject * gst_mini_object_copy		(const GstMiniObject *mini_object) G_GNUC_MALLOC;
-
-
-void            gst_mini_object_set_qdata       (GstMiniObject *object, GQuark quark,
-                                                 gpointer data, GDestroyNotify destroy);
-gpointer        gst_mini_object_get_qdata       (GstMiniObject *object, GQuark quark);
-gpointer        gst_mini_object_steal_qdata     (GstMiniObject *object, GQuark quark);
-
-
-gboolean        gst_mini_object_replace         (GstMiniObject **olddata, GstMiniObject *newdata);
-gboolean        gst_mini_object_take            (GstMiniObject **olddata, GstMiniObject *newdata);
-GstMiniObject * gst_mini_object_steal           (GstMiniObject **olddata);
-
-/**
- * GST_DEFINE_MINI_OBJECT_TYPE:
- * @TypeName: name of the new type in CamelCase
- * @type_name: name of the new type
- *
- * Define a new mini-object type with the given name
- */
-#define GST_DEFINE_MINI_OBJECT_TYPE(TypeName,type_name) \
-   G_DEFINE_BOXED_TYPE(TypeName,type_name,              \
-       (GBoxedCopyFunc) gst_mini_object_ref,            \
-       (GBoxedFreeFunc) gst_mini_object_unref)
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstobject.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstobject.h
deleted file mode 100644
index 6c9f9f5c..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstobject.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstobject.h: Header for base GstObject
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_OBJECT_H__
-#define __GST_OBJECT_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_OBJECT			(gst_object_get_type ())
-#define GST_IS_OBJECT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_OBJECT))
-#define GST_IS_OBJECT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_OBJECT))
-#define GST_OBJECT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_OBJECT, GstObjectClass))
-#define GST_OBJECT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_OBJECT, GstObject))
-#define GST_OBJECT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_OBJECT, GstObjectClass))
-#define GST_OBJECT_CAST(obj)            ((GstObject*)(obj))
-#define GST_OBJECT_CLASS_CAST(klass)    ((GstObjectClass*)(klass))
-
-/**
- * GstObjectFlags:
- * @GST_OBJECT_FLAG_LAST: subclasses can add additional flags starting from this flag
- *
- * The standard flags that an gstobject may have.
- */
-typedef enum
-{
-  /* padding */
-  GST_OBJECT_FLAG_LAST = (1<<4)
-} GstObjectFlags;
-
-/**
- * GST_OBJECT_REFCOUNT:
- * @obj: a #GstObject
- *
- * Get access to the reference count field of the object.
- */
-#define GST_OBJECT_REFCOUNT(obj)                (((GObject*)(obj))->ref_count)
-/**
- * GST_OBJECT_REFCOUNT_VALUE:
- * @obj: a #GstObject
- *
- * Get the reference count value of the object.
- */
-#define GST_OBJECT_REFCOUNT_VALUE(obj)          g_atomic_int_get ((gint *) &GST_OBJECT_REFCOUNT(obj))
-
-/* we do a GST_OBJECT_CAST to avoid type checking, better call these
- * function with a valid object! */
-
-/**
- * GST_OBJECT_GET_LOCK:
- * @obj: a #GstObject
- *
- * Acquire a reference to the mutex of this object.
- */
-#define GST_OBJECT_GET_LOCK(obj)               (&GST_OBJECT_CAST(obj)->lock)
-/**
- * GST_OBJECT_LOCK:
- * @obj: a #GstObject to lock
- *
- * This macro will obtain a lock on the object, making serialization possible.
- * It blocks until the lock can be obtained.
- */
-#define GST_OBJECT_LOCK(obj)                   g_mutex_lock(GST_OBJECT_GET_LOCK(obj))
-/**
- * GST_OBJECT_TRYLOCK:
- * @obj: a #GstObject.
- *
- * This macro will try to obtain a lock on the object, but will return with
- * FALSE if it can't get it immediately.
- */
-#define GST_OBJECT_TRYLOCK(obj)                g_mutex_trylock(GST_OBJECT_GET_LOCK(obj))
-/**
- * GST_OBJECT_UNLOCK:
- * @obj: a #GstObject to unlock.
- *
- * This macro releases a lock on the object.
- */
-#define GST_OBJECT_UNLOCK(obj)                 g_mutex_unlock(GST_OBJECT_GET_LOCK(obj))
-
-
-/**
- * GST_OBJECT_NAME:
- * @obj: a #GstObject
- *
- * Get the name of this object
- */
-#define GST_OBJECT_NAME(obj)            (GST_OBJECT_CAST(obj)->name)
-/**
- * GST_OBJECT_PARENT:
- * @obj: a #GstObject
- *
- * Get the parent of this object
- */
-#define GST_OBJECT_PARENT(obj)          (GST_OBJECT_CAST(obj)->parent)
-
-
-/**
- * GST_OBJECT_FLAGS:
- * @obj: a #GstObject
- *
- * This macro returns the entire set of flags for the object.
- */
-#define GST_OBJECT_FLAGS(obj)                  (GST_OBJECT_CAST (obj)->flags)
-/**
- * GST_OBJECT_FLAG_IS_SET:
- * @obj: a #GstObject
- * @flag: Flag to check for
- *
- * This macro checks to see if the given flag is set.
- */
-#define GST_OBJECT_FLAG_IS_SET(obj,flag)       ((GST_OBJECT_FLAGS (obj) & (flag)) == (flag))
-/**
- * GST_OBJECT_FLAG_SET:
- * @obj: a #GstObject
- * @flag: Flag to set
- *
- * This macro sets the given bits.
- */
-#define GST_OBJECT_FLAG_SET(obj,flag)          (GST_OBJECT_FLAGS (obj) |= (flag))
-/**
- * GST_OBJECT_FLAG_UNSET:
- * @obj: a #GstObject
- * @flag: Flag to set
- *
- * This macro usets the given bits.
- */
-#define GST_OBJECT_FLAG_UNSET(obj,flag)        (GST_OBJECT_FLAGS (obj) &= ~(flag))
-
-typedef struct _GstObject GstObject;
-typedef struct _GstObjectClass GstObjectClass;
-
-/**
- * GstObject:
- * @lock: object LOCK
- * @name: The name of the object
- * @parent: this object's parent, weak ref
- * @flags: flags for this object
- *
- * GStreamer base object class.
- */
-struct _GstObject {
-  GInitiallyUnowned object;
-
-  /*< public >*/ /* with LOCK */
-  GMutex         lock;        /* object LOCK */
-  gchar         *name;        /* object name */
-  GstObject     *parent;      /* this object's parent, weak ref */
-  guint32        flags;
-
-  /*< private >*/
-  GList         *control_bindings;  /* List of GstControlBinding */
-  guint64        control_rate;
-  guint64        last_sync;
-
-  gpointer _gst_reserved;
-};
-
-/**
- * GstObjectClass:
- * @parent_class: parent
- * @path_string_separator: separator used by gst_object_get_path_string()
- * @deep_notify: default signal handler
- *
- * GStreamer base object class.
- */
-struct _GstObjectClass {
-  GInitiallyUnownedClass parent_class;
-
-  const gchar	*path_string_separator;
-
-  /* signals */
-  void          (*deep_notify)      (GstObject * object, GstObject * orig, GParamSpec * pspec);
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/* normal GObject stuff */
-GType		gst_object_get_type		(void);
-
-/* name routines */
-gboolean	gst_object_set_name		(GstObject *object, const gchar *name);
-gchar*		gst_object_get_name		(GstObject *object);
-
-/* parentage routines */
-gboolean	gst_object_set_parent		(GstObject *object, GstObject *parent);
-GstObject*	gst_object_get_parent		(GstObject *object);
-void		gst_object_unparent		(GstObject *object);
-gboolean	gst_object_has_ancestor		(GstObject *object, GstObject *ancestor);
-
-void            gst_object_default_deep_notify  (GObject *object, GstObject *orig,
-                                                 GParamSpec *pspec, gchar **excluded_props);
-
-/* refcounting + life cycle */
-gpointer	gst_object_ref			(gpointer object);
-void		gst_object_unref		(gpointer object);
-gpointer        gst_object_ref_sink		(gpointer object);
-
-/* replace object pointer */
-gboolean        gst_object_replace		(GstObject **oldobj, GstObject *newobj);
-
-/* printing out the 'path' of the object */
-gchar *		gst_object_get_path_string	(GstObject *object);
-
-/* misc utils */
-gboolean	gst_object_check_uniqueness	(GList *list, const gchar *name);
-
-/* controller functions */
-#include <gst/gstcontrolbinding.h>
-#include <gst/gstcontrolsource.h>
-
-GstClockTime    gst_object_suggest_next_sync      (GstObject * object);
-gboolean        gst_object_sync_values            (GstObject * object, GstClockTime timestamp);
-
-gboolean        gst_object_has_active_control_bindings   (GstObject *object);
-void            gst_object_set_control_bindings_disabled (GstObject *object, gboolean disabled);
-void            gst_object_set_control_binding_disabled  (GstObject *object,
-                                                          const gchar * property_name,
-                                                          gboolean disabled);
-
-gboolean        gst_object_add_control_binding    (GstObject * object, GstControlBinding * binding);
-GstControlBinding *
-                gst_object_get_control_binding    (GstObject *object, const gchar * property_name);
-gboolean        gst_object_remove_control_binding (GstObject * object, GstControlBinding * binding);
-
-GValue *        gst_object_get_value              (GstObject * object, const gchar * property_name,
-                                                   GstClockTime timestamp);
-gboolean        gst_object_get_value_array        (GstObject * object, const gchar * property_name,
-                                                   GstClockTime timestamp, GstClockTime interval,
-                                                   guint n_values, gpointer values);
-gboolean        gst_object_get_g_value_array      (GstObject * object, const gchar * property_name,
-                                                   GstClockTime timestamp, GstClockTime interval,
-                                                   guint n_values, GValue *values);
-
-GstClockTime    gst_object_get_control_rate       (GstObject * object);
-void            gst_object_set_control_rate       (GstObject * object, GstClockTime control_rate);
-
-G_END_DECLS
-
-#endif /* __GST_OBJECT_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpad.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpad.h
deleted file mode 100644
index 0170ab42..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpad.h
+++ /dev/null
@@ -1,1006 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstpad.h: Header for GstPad object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PAD_H__
-#define __GST_PAD_H__
-
-#include <gst/gstconfig.h>
-
-typedef struct _GstPad GstPad;
-typedef struct _GstPadPrivate GstPadPrivate;
-typedef struct _GstPadClass GstPadClass;
-typedef struct _GstPadProbeInfo GstPadProbeInfo;
-
-/**
- * GstPadDirection:
- * @GST_PAD_UNKNOWN: direction is unknown.
- * @GST_PAD_SRC: the pad is a source pad.
- * @GST_PAD_SINK: the pad is a sink pad.
- *
- * The direction of a pad.
- */
-typedef enum {
-  GST_PAD_UNKNOWN,
-  GST_PAD_SRC,
-  GST_PAD_SINK
-} GstPadDirection;
-
-/**
- * GstPadMode:
- * @GST_PAD_MODE_NONE: Pad will not handle dataflow
- * @GST_PAD_MODE_PUSH: Pad handles dataflow in downstream push mode
- * @GST_PAD_MODE_PULL: Pad handles dataflow in upstream pull mode
- *
- * The status of a GstPad. After activating a pad, which usually happens when the
- * parent element goes from READY to PAUSED, the GstPadMode defines if the
- * pad operates in push or pull mode.
- */
-typedef enum {
-  GST_PAD_MODE_NONE,
-  GST_PAD_MODE_PUSH,
-  GST_PAD_MODE_PULL
-} GstPadMode;
-
-#include <gst/gstobject.h>
-#include <gst/gstbuffer.h>
-#include <gst/gstbufferlist.h>
-#include <gst/gstcaps.h>
-#include <gst/gstpadtemplate.h>
-#include <gst/gstevent.h>
-#include <gst/gstquery.h>
-#include <gst/gsttask.h>
-
-G_BEGIN_DECLS
-
-/*
- * Pad base class
- */
-#define GST_TYPE_PAD			(gst_pad_get_type ())
-#define GST_IS_PAD(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PAD))
-#define GST_IS_PAD_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PAD))
-#define GST_PAD(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PAD, GstPad))
-#define GST_PAD_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PAD, GstPadClass))
-#define GST_PAD_CAST(obj)		((GstPad*)(obj))
-
-
-
-/**
- * GstPadLinkReturn:
- * @GST_PAD_LINK_OK		: link succeeded
- * @GST_PAD_LINK_WRONG_HIERARCHY: pads have no common grandparent
- * @GST_PAD_LINK_WAS_LINKED	: pad was already linked
- * @GST_PAD_LINK_WRONG_DIRECTION: pads have wrong direction
- * @GST_PAD_LINK_NOFORMAT	: pads do not have common format
- * @GST_PAD_LINK_NOSCHED	: pads cannot cooperate in scheduling
- * @GST_PAD_LINK_REFUSED	: refused for some reason
- *
- * Result values from gst_pad_link and friends.
- */
-typedef enum {
-  GST_PAD_LINK_OK               =  0,
-  GST_PAD_LINK_WRONG_HIERARCHY  = -1,
-  GST_PAD_LINK_WAS_LINKED       = -2,
-  GST_PAD_LINK_WRONG_DIRECTION  = -3,
-  GST_PAD_LINK_NOFORMAT         = -4,
-  GST_PAD_LINK_NOSCHED          = -5,
-  GST_PAD_LINK_REFUSED          = -6
-} GstPadLinkReturn;
-
-/**
- * GST_PAD_LINK_FAILED:
- * @ret: the #GstPadLinkReturn value
- *
- * Macro to test if the given #GstPadLinkReturn value indicates a failed
- * link step.
- */
-#define GST_PAD_LINK_FAILED(ret) ((ret) < GST_PAD_LINK_OK)
-
-/**
- * GST_PAD_LINK_SUCCESSFUL:
- * @ret: the #GstPadLinkReturn value
- *
- * Macro to test if the given #GstPadLinkReturn value indicates a successful
- * link step.
- */
-#define GST_PAD_LINK_SUCCESSFUL(ret) ((ret) >= GST_PAD_LINK_OK)
-
-/**
- * GstFlowReturn:
- * @GST_FLOW_OK:		 Data passing was ok.
- * @GST_FLOW_NOT_LINKED:	 Pad is not linked.
- * @GST_FLOW_FLUSHING:	         Pad is flushing.
- * @GST_FLOW_EOS:                Pad is EOS.
- * @GST_FLOW_NOT_NEGOTIATED:	 Pad is not negotiated.
- * @GST_FLOW_ERROR:		 Some (fatal) error occured. Element generating
- *                               this error should post an error message with more
- *                               details.
- * @GST_FLOW_NOT_SUPPORTED:	 This operation is not supported.
- * @GST_FLOW_CUSTOM_SUCCESS:	 Elements can use values starting from
- *                               this (and higher) to define custom success
- *                               codes.
- * @GST_FLOW_CUSTOM_SUCCESS_1:	 Pre-defined custom success code (define your
- *                               custom success code to this to avoid compiler
- *                               warnings).
- * @GST_FLOW_CUSTOM_SUCCESS_2:	 Pre-defined custom success code.
- * @GST_FLOW_CUSTOM_ERROR:	 Elements can use values starting from
- *                               this (and lower) to define custom error codes.
- * @GST_FLOW_CUSTOM_ERROR_1:	 Pre-defined custom error code (define your
- *                               custom error code to this to avoid compiler
- *                               warnings).
- * @GST_FLOW_CUSTOM_ERROR_2:	 Pre-defined custom error code.
- *
- * The result of passing data to a pad.
- *
- * Note that the custom return values should not be exposed outside of the
- * element scope.
- */
-typedef enum {
-  /* custom success starts here */
-  GST_FLOW_CUSTOM_SUCCESS_2 = 102,
-  GST_FLOW_CUSTOM_SUCCESS_1 = 101,
-  GST_FLOW_CUSTOM_SUCCESS = 100,
-
-  /* core predefined */
-  GST_FLOW_OK		  =  0,
-  /* expected failures */
-  GST_FLOW_NOT_LINKED     = -1,
-  GST_FLOW_FLUSHING       = -2,
-  /* error cases */
-  GST_FLOW_EOS            = -3,
-  GST_FLOW_NOT_NEGOTIATED = -4,
-  GST_FLOW_ERROR	  = -5,
-  GST_FLOW_NOT_SUPPORTED  = -6,
-
-  /* custom error starts here */
-  GST_FLOW_CUSTOM_ERROR   = -100,
-  GST_FLOW_CUSTOM_ERROR_1 = -101,
-  GST_FLOW_CUSTOM_ERROR_2 = -102
-} GstFlowReturn;
-
-const gchar*	        gst_flow_get_name	(GstFlowReturn ret);
-GQuark			gst_flow_to_quark	(GstFlowReturn ret);
-
-/**
- * GstPadLinkCheck:
- * @GST_PAD_LINK_CHECK_NOTHING: Don't check hierarchy or caps compatibility.
- * @GST_PAD_LINK_CHECK_HIERARCHY: Check the pads have same parents/grandparents.
- *   Could be omitted if it is already known that the two elements that own the
- *   pads are in the same bin.
- * @GST_PAD_LINK_CHECK_TEMPLATE_CAPS: Check if the pads are compatible by using
- *   their template caps. This is much faster than @GST_PAD_LINK_CHECK_CAPS, but
- *   would be unsafe e.g. if one pad has %GST_CAPS_ANY.
- * @GST_PAD_LINK_CHECK_CAPS: Check if the pads are compatible by comparing the
- *   caps returned by gst_pad_query_caps().
- * @GST_PAD_LINK_CHECK_DEFAULT: The default checks done when linking
- *   pads (i.e. the ones used by gst_pad_link()).
- *
- * The amount of checking to be done when linking pads. @GST_PAD_LINK_CHECK_CAPS
- * and @GST_PAD_LINK_CHECK_TEMPLATE_CAPS are mutually exclusive. If both are
- * specified, expensive but safe @GST_PAD_LINK_CHECK_CAPS are performed.
- *
- * <warning><para>
- * Only disable some of the checks if you are 100% certain you know the link
- * will not fail because of hierarchy/caps compatibility failures. If uncertain,
- * use the default checks (%GST_PAD_LINK_CHECK_DEFAULT) or the regular methods
- * for linking the pads.
- * </para></warning>
- */
-
-typedef enum {
-  GST_PAD_LINK_CHECK_NOTHING       = 0,
-  GST_PAD_LINK_CHECK_HIERARCHY     = 1 << 0,
-  GST_PAD_LINK_CHECK_TEMPLATE_CAPS = 1 << 1,
-  GST_PAD_LINK_CHECK_CAPS          = 1 << 2,
-
-  GST_PAD_LINK_CHECK_DEFAULT       = GST_PAD_LINK_CHECK_HIERARCHY | GST_PAD_LINK_CHECK_CAPS
-} GstPadLinkCheck;
-
-/* pad states */
-/**
- * GstPadActivateFunction:
- * @pad: a #GstPad
- * @parent: the parent of @pad
- *
- * This function is called when the pad is activated during the element
- * READY to PAUSED state change. By default this function will call the
- * activate function that puts the pad in push mode but elements can
- * override this function to activate the pad in pull mode if they wish.
- *
- * Returns: TRUE if the pad could be activated.
- */
-typedef gboolean		(*GstPadActivateFunction)	(GstPad *pad, GstObject *parent);
-/**
- * GstPadActivateModeFunction:
- * @pad: a #GstPad
- * @parent: the parent of @pad
- * @mode: the requested activation mode of @pad
- * @active: activate or deactivate the pad.
- *
- * The prototype of the push and pull activate functions.
- *
- * Returns: TRUE if the pad could be activated or deactivated.
- */
-typedef gboolean		(*GstPadActivateModeFunction)	(GstPad *pad, GstObject *parent,
-                                                                 GstPadMode mode, gboolean active);
-
-
-/* data passing */
-/**
- * GstPadChainFunction:
- * @pad: the sink #GstPad that performed the chain.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @buffer: the #GstBuffer that is chained, not %NULL.
- *
- * A function that will be called on sinkpads when chaining buffers.
- * The function typically processes the data contained in the buffer and
- * either consumes the data or passes it on to the internally linked pad(s).
- *
- * The implementer of this function receives a refcount to @buffer and should
- * gst_buffer_unref() when the buffer is no longer needed.
- *
- * When a chain function detects an error in the data stream, it must post an
- * error on the bus and return an appropriate #GstFlowReturn value.
- *
- * Returns: #GST_FLOW_OK for success
- */
-typedef GstFlowReturn		(*GstPadChainFunction)		(GstPad *pad, GstObject *parent,
-                                                                 GstBuffer *buffer);
-
-/**
- * GstPadChainListFunction:
- * @pad: the sink #GstPad that performed the chain.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @list: the #GstBufferList that is chained, not %NULL.
- *
- * A function that will be called on sinkpads when chaining buffer lists.
- * The function typically processes the data contained in the buffer list and
- * either consumes the data or passes it on to the internally linked pad(s).
- *
- * The implementer of this function receives a refcount to @list and
- * should gst_buffer_list_unref() when the list is no longer needed.
- *
- * When a chainlist function detects an error in the data stream, it must
- * post an error on the bus and return an appropriate #GstFlowReturn value.
- *
- * Returns: #GST_FLOW_OK for success
- */
-typedef GstFlowReturn		(*GstPadChainListFunction)	(GstPad *pad, GstObject *parent,
-                                                                 GstBufferList *list);
-
-/**
- * GstPadGetRangeFunction:
- * @pad: the src #GstPad to perform the getrange on.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @offset: the offset of the range
- * @length: the length of the range
- * @buffer: a memory location to hold the result buffer, cannot be NULL.
- *
- * This function will be called on source pads when a peer element
- * request a buffer at the specified @offset and @length. If this function
- * returns #GST_FLOW_OK, the result buffer will be stored in @buffer. The
- * contents of @buffer is invalid for any other return value.
- *
- * This function is installed on a source pad with
- * gst_pad_set_getrange_function() and can only be called on source pads after
- * they are successfully activated with gst_pad_activate_mode() with the
- * #GST_PAD_MODE_PULL.
- *
- * @offset and @length are always given in byte units. @offset must normally be a value
- * between 0 and the length in bytes of the data available on @pad. The
- * length (duration in bytes) can be retrieved with a #GST_QUERY_DURATION or with a
- * #GST_QUERY_SEEKING.
- *
- * Any @offset larger or equal than the length will make the function return
- * #GST_FLOW_EOS, which corresponds to EOS. In this case @buffer does not
- * contain a valid buffer.
- *
- * The buffer size of @buffer will only be smaller than @length when @offset is
- * near the end of the stream. In all other cases, the size of @buffer must be
- * exactly the requested size.
- *
- * It is allowed to call this function with a 0 @length and valid @offset, in
- * which case @buffer will contain a 0-sized buffer and the function returns
- * #GST_FLOW_OK.
- *
- * When this function is called with a -1 @offset, the sequentially next buffer
- * of length @length in the stream is returned.
- *
- * When this function is called with a -1 @length, a buffer with a default
- * optimal length is returned in @buffer. The length might depend on the value
- * of @offset.
- *
- * Returns: #GST_FLOW_OK for success and a valid buffer in @buffer. Any other
- * return value leaves @buffer undefined.
- */
-typedef GstFlowReturn		(*GstPadGetRangeFunction)	(GstPad *pad, GstObject *parent,
-                                                                 guint64 offset, guint length,
-                                                                 GstBuffer **buffer);
-
-/**
- * GstPadEventFunction:
- * @pad: the #GstPad to handle the event.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @event: the #GstEvent to handle.
- *
- * Function signature to handle an event for the pad.
- *
- * Returns: TRUE if the pad could handle the event.
- */
-typedef gboolean		(*GstPadEventFunction)		(GstPad *pad, GstObject *parent,
-                                                                 GstEvent *event);
-
-
-/* internal links */
-/**
- * GstPadIterIntLinkFunction:
- * @pad: The #GstPad to query.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- *
- * The signature of the internal pad link iterator function.
- *
- * Returns: a new #GstIterator that will iterate over all pads that are
- * linked to the given pad on the inside of the parent element.
- *
- * the caller must call gst_iterator_free() after usage.
- */
-typedef GstIterator*           (*GstPadIterIntLinkFunction)    (GstPad *pad, GstObject *parent);
-
-/* generic query function */
-/**
- * GstPadQueryFunction:
- * @pad: the #GstPad to query.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @query: the #GstQuery object to execute
- *
- * The signature of the query function.
- *
- * Returns: TRUE if the query could be performed.
- */
-typedef gboolean		(*GstPadQueryFunction)		(GstPad *pad, GstObject *parent,
-                                                                 GstQuery *query);
-
-
-/* linking */
-/**
- * GstPadLinkFunction:
- * @pad: the #GstPad that is linked.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @peer: the peer #GstPad of the link
- *
- * Function signature to handle a new link on the pad.
- *
- * Returns: the result of the link with the specified peer.
- */
-typedef GstPadLinkReturn	(*GstPadLinkFunction)		(GstPad *pad, GstObject *parent, GstPad *peer);
-/**
- * GstPadUnlinkFunction:
- * @pad: the #GstPad that is linked.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- *
- * Function signature to handle a unlinking the pad prom its peer.
- */
-typedef void			(*GstPadUnlinkFunction)		(GstPad *pad, GstObject *parent);
-
-
-/* misc */
-/**
- * GstPadForwardFunction:
- * @pad: the #GstPad that is forwarded.
- * @user_data: the gpointer to optional user data.
- *
- * A forward function is called for all internally linked pads, see
- * gst_pad_forward().
- *
- * Returns: TRUE if the dispatching procedure has to be stopped.
- */
-typedef gboolean		(*GstPadForwardFunction)	(GstPad *pad, gpointer user_data);
-
-/**
- * GstPadProbeType:
- * @GST_PAD_PROBE_TYPE_INVALID: invalid probe type
- * @GST_PAD_PROBE_TYPE_IDLE: probe idle pads and block
- * @GST_PAD_PROBE_TYPE_BLOCK: probe and block pads
- * @GST_PAD_PROBE_TYPE_BUFFER: probe buffers
- * @GST_PAD_PROBE_TYPE_BUFFER_LIST: probe buffer lists
- * @GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM: probe downstream events
- * @GST_PAD_PROBE_TYPE_EVENT_UPSTREAM: probe upstream events
- * @GST_PAD_PROBE_TYPE_EVENT_FLUSH: probe flush events. This probe has to be
- *     explicitly enabled and is not included in the
- *     @@GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM or
- *     @@GST_PAD_PROBE_TYPE_EVENT_UPSTREAM probe types.
- * @GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM: probe downstream queries
- * @GST_PAD_PROBE_TYPE_QUERY_UPSTREAM: probe upstream queries
- * @GST_PAD_PROBE_TYPE_PUSH: probe push
- * @GST_PAD_PROBE_TYPE_PULL: probe pull
- * @GST_PAD_PROBE_TYPE_BLOCKING: probe and block at the next opportunity, at data flow or when idle
- * @GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM: probe downstream data (buffers, buffer lists, and events)
- * @GST_PAD_PROBE_TYPE_DATA_UPSTREAM: probe upstream data (events)
- * @GST_PAD_PROBE_TYPE_DATA_BOTH: probe upstream and downstream data (buffers, buffer lists, and events)
- * @GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM: probe and block downstream data (buffers, buffer lists, and events)
- * @GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM: probe and block upstream data (events)
- * @GST_PAD_PROBE_TYPE_EVENT_BOTH: probe upstream and downstream events
- * @GST_PAD_PROBE_TYPE_QUERY_BOTH: probe upstream and downstream queries
- * @GST_PAD_PROBE_TYPE_ALL_BOTH: probe upstream events and queries and downstream buffers, buffer lists, events and queries
- * @GST_PAD_PROBE_TYPE_SCHEDULING: probe push and pull
- *
- * The different probing types that can occur. When either one of
- * @GST_PAD_PROBE_TYPE_IDLE or @GST_PAD_PROBE_TYPE_BLOCK is used, the probe will be a
- * blocking probe.
- */
-typedef enum
-{
-  GST_PAD_PROBE_TYPE_INVALID          = 0,
-  /* flags to control blocking */
-  GST_PAD_PROBE_TYPE_IDLE             = (1 << 0),
-  GST_PAD_PROBE_TYPE_BLOCK            = (1 << 1),
-  /* flags to select datatypes */
-  GST_PAD_PROBE_TYPE_BUFFER           = (1 << 4),
-  GST_PAD_PROBE_TYPE_BUFFER_LIST      = (1 << 5),
-  GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM = (1 << 6),
-  GST_PAD_PROBE_TYPE_EVENT_UPSTREAM   = (1 << 7),
-  GST_PAD_PROBE_TYPE_EVENT_FLUSH      = (1 << 8),
-  GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM = (1 << 9),
-  GST_PAD_PROBE_TYPE_QUERY_UPSTREAM   = (1 << 10),
-  /* flags to select scheduling mode */
-  GST_PAD_PROBE_TYPE_PUSH             = (1 << 12),
-  GST_PAD_PROBE_TYPE_PULL             = (1 << 13),
-
-  /* flag combinations */
-  GST_PAD_PROBE_TYPE_BLOCKING         = GST_PAD_PROBE_TYPE_IDLE | GST_PAD_PROBE_TYPE_BLOCK,
-  GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM  = GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST | GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
-  GST_PAD_PROBE_TYPE_DATA_UPSTREAM    = GST_PAD_PROBE_TYPE_EVENT_UPSTREAM,
-  GST_PAD_PROBE_TYPE_DATA_BOTH        = GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM | GST_PAD_PROBE_TYPE_DATA_UPSTREAM,
-  GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM = GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM,
-  GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM   = GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_DATA_UPSTREAM,
-  GST_PAD_PROBE_TYPE_EVENT_BOTH       = GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_UPSTREAM,
-  GST_PAD_PROBE_TYPE_QUERY_BOTH       = GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM | GST_PAD_PROBE_TYPE_QUERY_UPSTREAM,
-  GST_PAD_PROBE_TYPE_ALL_BOTH         = GST_PAD_PROBE_TYPE_DATA_BOTH | GST_PAD_PROBE_TYPE_QUERY_BOTH,
-  GST_PAD_PROBE_TYPE_SCHEDULING       = GST_PAD_PROBE_TYPE_PUSH | GST_PAD_PROBE_TYPE_PULL
-} GstPadProbeType;
-
-
-/**
- * GstPadProbeReturn:
- * @GST_PAD_PROBE_OK: normal probe return value
- * @GST_PAD_PROBE_DROP: drop data in data probes. For push mode this means that
- *        the data item is not sent downstream. For pull mode, it means that the
- *        data item is not passed upstream. In both cases, this result code
- *        returns #GST_FLOW_OK or %TRUE to the caller.
- * @GST_PAD_PROBE_REMOVE: remove probe
- * @GST_PAD_PROBE_PASS: pass the data item in the block probe and block on
- *                         the next item
- *
- * Different return values for the #GstPadProbeCallback.
- */
-typedef enum
-{
-  GST_PAD_PROBE_DROP,
-  GST_PAD_PROBE_OK,
-  GST_PAD_PROBE_REMOVE,
-  GST_PAD_PROBE_PASS,
-} GstPadProbeReturn;
-
-
-/**
- * GstPadProbeInfo:
- * @type: the current probe type
- * @id: the id of the probe
- * @data: type specific data, check the @type field to know the datatype.
- *    This field can be NULL.
- * @offset: offset of pull probe, this field is valid when @type contains
- *    #GST_PAD_PROBE_TYPE_PULL
- * @size: size of pull probe, this field is valid when @type contains
- *    #GST_PAD_PROBE_TYPE_PULL
- *
- * Info passed in the #GstPadProbeCallback.
- */
-struct _GstPadProbeInfo
-{
-  GstPadProbeType type;
-  gulong id;
-  gpointer data;
-  guint64 offset;
-  guint size;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_PAD_PROBE_INFO_TYPE(d)         ((d)->type)
-#define GST_PAD_PROBE_INFO_ID(d)           ((d)->id)
-#define GST_PAD_PROBE_INFO_DATA(d)         ((d)->data)
-
-#define GST_PAD_PROBE_INFO_BUFFER(d)       GST_BUFFER_CAST(GST_PAD_PROBE_INFO_DATA(d))
-#define GST_PAD_PROBE_INFO_BUFFER_LIST(d)  GST_BUFFER_LIST_CAST(GST_PAD_PROBE_INFO_DATA(d))
-#define GST_PAD_PROBE_INFO_EVENT(d)        GST_EVENT_CAST(GST_PAD_PROBE_INFO_DATA(d))
-#define GST_PAD_PROBE_INFO_QUERY(d)        GST_QUERY_CAST(GST_PAD_PROBE_INFO_DATA(d))
-
-#define GST_PAD_PROBE_INFO_OFFSET(d)       ((d)->offset)
-#define GST_PAD_PROBE_INFO_SIZE(d)         ((d)->size)
-
-GstEvent*      gst_pad_probe_info_get_event       (GstPadProbeInfo * info);
-GstQuery*      gst_pad_probe_info_get_query       (GstPadProbeInfo * info);
-GstBuffer*     gst_pad_probe_info_get_buffer      (GstPadProbeInfo * info);
-GstBufferList* gst_pad_probe_info_get_buffer_list (GstPadProbeInfo * info);
-
-/**
- * GstPadProbeCallback:
- * @pad: the #GstPad that is blocked
- * @info: #GstPadProbeInfo
- * @user_data: the gpointer to optional user data.
- *
- * Callback used by gst_pad_add_probe(). Gets called to notify about the current
- * blocking type.
- *
- * The callback is allowed to modify the data pointer in @info.
- *
- * Returns: a #GstPadProbeReturn
- */
-typedef GstPadProbeReturn   (*GstPadProbeCallback)   (GstPad *pad, GstPadProbeInfo *info,
-                                                      gpointer user_data);
-
-/**
- * GstPadStickyEventsForeachFunction:
- * @pad: the #GstPad.
- * @event: a sticky #GstEvent.
- * @user_data: the #gpointer to optional user data.
- *
- * Callback used by gst_pad_sticky_events_foreach().
- *
- * When this function returns %TRUE, the next event will be
- * returned. When %FALSE is returned, gst_pad_sticky_events_foreach() will return.
- *
- * When @event is set to NULL, the item will be removed from the list of sticky events.
- * When @event has been made writable, the new buffer reference can be assigned
- * to @event. This function is responsible for unreffing the old event when
- * removing or modifying.
- *
- * Returns: %TRUE if the iteration should continue
- */
-typedef gboolean  (*GstPadStickyEventsForeachFunction) (GstPad *pad, GstEvent **event,
-                                                        gpointer user_data);
-
-/**
- * GstPadFlags:
- * @GST_PAD_FLAG_BLOCKED: is dataflow on a pad blocked
- * @GST_PAD_FLAG_FLUSHING: is pad flushing
- * @GST_PAD_FLAG_EOS: is pad in EOS state
- * @GST_PAD_FLAG_BLOCKING: is pad currently blocking on a buffer or event
- * @GST_PAD_FLAG_NEED_PARENT: ensure that there is a parent object before calling
- *                       into the pad callbacks.
- * @GST_PAD_FLAG_NEED_RECONFIGURE: the pad should be reconfigured/renegotiated.
- *                            The flag has to be unset manually after
- *                            reconfiguration happened.
- * @GST_PAD_FLAG_PENDING_EVENTS: the pad has pending events
- * @GST_PAD_FLAG_FIXED_CAPS: the pad is using fixed caps this means that once the
- *                      caps are set on the pad, the caps query function only
- *                      returns those caps.
- * @GST_PAD_FLAG_PROXY_CAPS: the default event and query handler will forward
- *                      all events and queries to the internally linked pads
- *                      instead of discarding them.
- * @GST_PAD_FLAG_PROXY_ALLOCATION: the default query handler will forward
- *                      allocation queries to the internally linked pads
- *                      instead of discarding them.
- * @GST_PAD_FLAG_PROXY_SCHEDULING: the default query handler will forward
- *                      scheduling queries to the internally linked pads
- *                      instead of discarding them.
- * @GST_PAD_FLAG_LAST: offset to define more flags
- *
- * Pad state flags
- */
-typedef enum {
-  GST_PAD_FLAG_BLOCKED          = (GST_OBJECT_FLAG_LAST << 0),
-  GST_PAD_FLAG_FLUSHING         = (GST_OBJECT_FLAG_LAST << 1),
-  GST_PAD_FLAG_EOS              = (GST_OBJECT_FLAG_LAST << 2),
-  GST_PAD_FLAG_BLOCKING         = (GST_OBJECT_FLAG_LAST << 3),
-  GST_PAD_FLAG_NEED_PARENT      = (GST_OBJECT_FLAG_LAST << 4),
-  GST_PAD_FLAG_NEED_RECONFIGURE = (GST_OBJECT_FLAG_LAST << 5),
-  GST_PAD_FLAG_PENDING_EVENTS   = (GST_OBJECT_FLAG_LAST << 6),
-  GST_PAD_FLAG_FIXED_CAPS       = (GST_OBJECT_FLAG_LAST << 7),
-  GST_PAD_FLAG_PROXY_CAPS       = (GST_OBJECT_FLAG_LAST << 8),
-  GST_PAD_FLAG_PROXY_ALLOCATION = (GST_OBJECT_FLAG_LAST << 9),
-  GST_PAD_FLAG_PROXY_SCHEDULING = (GST_OBJECT_FLAG_LAST << 10),
-  /* padding */
-  GST_PAD_FLAG_LAST        = (GST_OBJECT_FLAG_LAST << 16)
-} GstPadFlags;
-
-/**
- * GstPad:
- * @element_private: private data owned by the parent element
- * @padtemplate: padtemplate for this pad
- * @direction: the direction of the pad, cannot change after creating
- *             the pad.
- *
- * The #GstPad structure. Use the functions to update the variables.
- */
-struct _GstPad {
-  GstObject                      object;
-
-  /*< public >*/
-  gpointer                       element_private;
-
-  GstPadTemplate                *padtemplate;
-
-  GstPadDirection                direction;
-
-  /*< private >*/
-  /* streaming rec_lock */
-  GRecMutex		         stream_rec_lock;
-  GstTask			*task;
-
-  /* block cond, mutex is from the object */
-  GCond				 block_cond;
-  GHookList                      probes;
-
-  GstPadMode		         mode;
-  GstPadActivateFunction	 activatefunc;
-  gpointer                       activatedata;
-  GDestroyNotify                 activatenotify;
-  GstPadActivateModeFunction	 activatemodefunc;
-  gpointer                       activatemodedata;
-  GDestroyNotify                 activatemodenotify;
-
-  /* pad link */
-  GstPad			*peer;
-  GstPadLinkFunction		 linkfunc;
-  gpointer                       linkdata;
-  GDestroyNotify                 linknotify;
-  GstPadUnlinkFunction		 unlinkfunc;
-  gpointer                       unlinkdata;
-  GDestroyNotify                 unlinknotify;
-
-  /* data transport functions */
-  GstPadChainFunction		 chainfunc;
-  gpointer                       chaindata;
-  GDestroyNotify                 chainnotify;
-  GstPadChainListFunction        chainlistfunc;
-  gpointer                       chainlistdata;
-  GDestroyNotify                 chainlistnotify;
-  GstPadGetRangeFunction	 getrangefunc;
-  gpointer                       getrangedata;
-  GDestroyNotify                 getrangenotify;
-  GstPadEventFunction		 eventfunc;
-  gpointer                       eventdata;
-  GDestroyNotify                 eventnotify;
-
-  /* pad offset */
-  gint64                         offset;
-
-  /* generic query method */
-  GstPadQueryFunction		 queryfunc;
-  gpointer                       querydata;
-  GDestroyNotify                 querynotify;
-
-  /* internal links */
-  GstPadIterIntLinkFunction      iterintlinkfunc;
-  gpointer                       iterintlinkdata;
-  GDestroyNotify                 iterintlinknotify;
-
-  /* counts number of probes attached. */
-  gint				 num_probes;
-  gint				 num_blocked;
-
-  GstPadPrivate                 *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstPadClass {
-  GstObjectClass	parent_class;
-
-  /* signal callbacks */
-  void		(*linked)		(GstPad *pad, GstPad *peer);
-  void		(*unlinked)		(GstPad *pad, GstPad *peer);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-
-/***** helper macros *****/
-/* GstPad */
-#define GST_PAD_NAME(pad)		(GST_OBJECT_NAME(pad))
-#define GST_PAD_PARENT(pad)		(GST_ELEMENT_CAST(GST_OBJECT_PARENT(pad)))
-#define GST_PAD_ELEMENT_PRIVATE(pad)    (GST_PAD_CAST(pad)->element_private)
-#define GST_PAD_PAD_TEMPLATE(pad)	(GST_PAD_CAST(pad)->padtemplate)
-#define GST_PAD_DIRECTION(pad)		(GST_PAD_CAST(pad)->direction)
-#define GST_PAD_TASK(pad)		(GST_PAD_CAST(pad)->task)
-#define GST_PAD_MODE(pad)	        (GST_PAD_CAST(pad)->mode)
-
-#define GST_PAD_ACTIVATEFUNC(pad)	(GST_PAD_CAST(pad)->activatefunc)
-#define GST_PAD_ACTIVATEMODEFUNC(pad)	(GST_PAD_CAST(pad)->activatemodefunc)
-#define GST_PAD_CHAINFUNC(pad)		(GST_PAD_CAST(pad)->chainfunc)
-#define GST_PAD_CHAINLISTFUNC(pad)      (GST_PAD_CAST(pad)->chainlistfunc)
-#define GST_PAD_GETRANGEFUNC(pad)	(GST_PAD_CAST(pad)->getrangefunc)
-#define GST_PAD_EVENTFUNC(pad)		(GST_PAD_CAST(pad)->eventfunc)
-#define GST_PAD_QUERYFUNC(pad)		(GST_PAD_CAST(pad)->queryfunc)
-#define GST_PAD_ITERINTLINKFUNC(pad)    (GST_PAD_CAST(pad)->iterintlinkfunc)
-
-#define GST_PAD_PEER(pad)		(GST_PAD_CAST(pad)->peer)
-#define GST_PAD_LINKFUNC(pad)		(GST_PAD_CAST(pad)->linkfunc)
-#define GST_PAD_UNLINKFUNC(pad)		(GST_PAD_CAST(pad)->unlinkfunc)
-
-#define GST_PAD_IS_SRC(pad)		(GST_PAD_DIRECTION(pad) == GST_PAD_SRC)
-#define GST_PAD_IS_SINK(pad)		(GST_PAD_DIRECTION(pad) == GST_PAD_SINK)
-
-#define GST_PAD_IS_LINKED(pad)		(GST_PAD_PEER(pad) != NULL)
-
-#define GST_PAD_IS_ACTIVE(pad)          (GST_PAD_MODE(pad) != GST_PAD_MODE_NONE)
-
-#define GST_PAD_IS_BLOCKED(pad)		(GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKED))
-#define GST_PAD_IS_BLOCKING(pad)	(GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKING))
-
-#define GST_PAD_IS_FLUSHING(pad)	(GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_FLUSHING))
-#define GST_PAD_SET_FLUSHING(pad)	(GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_FLUSHING))
-#define GST_PAD_UNSET_FLUSHING(pad)	(GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_FLUSHING))
-
-#define GST_PAD_IS_EOS(pad)	        (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_EOS))
-
-#define GST_PAD_NEEDS_RECONFIGURE(pad)  (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_NEED_RECONFIGURE))
-#define GST_PAD_HAS_PENDING_EVENTS(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PENDING_EVENTS))
-#define GST_PAD_IS_FIXED_CAPS(pad)	(GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_FIXED_CAPS))
-#define GST_PAD_NEEDS_PARENT(pad)       (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_NEED_PARENT))
-
-#define GST_PAD_IS_PROXY_CAPS(pad)      (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PROXY_CAPS))
-#define GST_PAD_SET_PROXY_CAPS(pad)     (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PROXY_CAPS))
-#define GST_PAD_UNSET_PROXY_CAPS(pad)   (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PROXY_CAPS))
-
-#define GST_PAD_IS_PROXY_ALLOCATION(pad)    (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PROXY_ALLOCATION))
-#define GST_PAD_SET_PROXY_ALLOCATION(pad)   (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PROXY_ALLOCATION))
-#define GST_PAD_UNSET_PROXY_ALLOCATION(pad) (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PROXY_ALLOCATION))
-
-#define GST_PAD_IS_PROXY_SCHEDULING(pad)    (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PROXY_SCHEDULING))
-#define GST_PAD_SET_PROXY_SCHEDULING(pad)   (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PROXY_SCHEDULING))
-#define GST_PAD_UNSET_PROXY_SCHEDULING(pad) (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PROXY_SCHEDULING))
-
-/**
- * GST_PAD_GET_STREAM_LOCK:
- * @pad: a #GstPad
- *
- * Get the stream lock of @pad. The stream lock is protecting the
- * resources used in the data processing functions of @pad.
- */
-#define GST_PAD_GET_STREAM_LOCK(pad)    (&(GST_PAD_CAST(pad)->stream_rec_lock))
-/**
- * GST_PAD_STREAM_LOCK:
- * @pad: a #GstPad
- *
- * Lock the stream lock of @pad.
- */
-#define GST_PAD_STREAM_LOCK(pad)        g_rec_mutex_lock(GST_PAD_GET_STREAM_LOCK(pad))
-/**
- * GST_PAD_STREAM_TRYLOCK:
- * @pad: a #GstPad
- *
- * Try to Lock the stream lock of the pad, return TRUE if the lock could be
- * taken.
- */
-#define GST_PAD_STREAM_TRYLOCK(pad)     g_rec_mutex_trylock(GST_PAD_GET_STREAM_LOCK(pad))
-/**
- * GST_PAD_STREAM_UNLOCK:
- * @pad: a #GstPad
- *
- * Unlock the stream lock of @pad.
- */
-#define GST_PAD_STREAM_UNLOCK(pad)      g_rec_mutex_unlock(GST_PAD_GET_STREAM_LOCK(pad))
-
-#define GST_PAD_BLOCK_GET_COND(pad)     (&GST_PAD_CAST(pad)->block_cond)
-#define GST_PAD_BLOCK_WAIT(pad)         (g_cond_wait(GST_PAD_BLOCK_GET_COND (pad), GST_OBJECT_GET_LOCK (pad)))
-#define GST_PAD_BLOCK_SIGNAL(pad)       (g_cond_signal(GST_PAD_BLOCK_GET_COND (pad)))
-#define GST_PAD_BLOCK_BROADCAST(pad)    (g_cond_broadcast(GST_PAD_BLOCK_GET_COND (pad)))
-
-GType			gst_pad_get_type			(void);
-
-/* creating pads */
-GstPad*			gst_pad_new				(const gchar *name, GstPadDirection direction);
-GstPad*			gst_pad_new_from_template		(GstPadTemplate *templ, const gchar *name);
-GstPad*			gst_pad_new_from_static_template	(GstStaticPadTemplate *templ, const gchar *name);
-
-
-/**
- * gst_pad_get_name:
- * @pad: the pad to get the name from
- *
- * Get a copy of the name of the pad. g_free() after usage.
- *
- * MT safe.
- */
-#define gst_pad_get_name(pad) gst_object_get_name (GST_OBJECT_CAST (pad))
-/**
- * gst_pad_get_parent:
- * @pad: the pad to get the parent of
- *
- * Get the parent of @pad. This function increases the refcount
- * of the parent object so you should gst_object_unref() it after usage.
- * Can return NULL if the pad did not have a parent.
- *
- * MT safe.
- */
-#define gst_pad_get_parent(pad) gst_object_get_parent (GST_OBJECT_CAST (pad))
-
-GstPadDirection		gst_pad_get_direction			(GstPad *pad);
-
-gboolean		gst_pad_set_active			(GstPad *pad, gboolean active);
-gboolean		gst_pad_is_active			(GstPad *pad);
-gboolean		gst_pad_activate_mode			(GstPad *pad, GstPadMode mode,
-                                                                 gboolean active);
-
-gulong                  gst_pad_add_probe                       (GstPad *pad,
-								 GstPadProbeType mask,
-								 GstPadProbeCallback callback,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify destroy_data);
-void                    gst_pad_remove_probe                    (GstPad *pad, gulong id);
-
-gboolean		gst_pad_is_blocked			(GstPad *pad);
-gboolean		gst_pad_is_blocking			(GstPad *pad);
-
-void                    gst_pad_mark_reconfigure                (GstPad *pad);
-gboolean		gst_pad_needs_reconfigure               (GstPad *pad);
-gboolean		gst_pad_check_reconfigure               (GstPad *pad);
-
-void			gst_pad_set_element_private		(GstPad *pad, gpointer priv);
-gpointer		gst_pad_get_element_private		(GstPad *pad);
-
-GstPadTemplate*		gst_pad_get_pad_template		(GstPad *pad);
-
-GstEvent*               gst_pad_get_sticky_event                (GstPad *pad, GstEventType event_type,
-                                                                 guint idx);
-void                    gst_pad_sticky_events_foreach           (GstPad *pad, GstPadStickyEventsForeachFunction foreach_func, gpointer user_data);
-
-/* data passing setup functions */
-void			gst_pad_set_activate_function_full	(GstPad *pad,
-                                                                 GstPadActivateFunction activate,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_activatemode_function_full	(GstPad *pad,
-                                                                 GstPadActivateModeFunction activatemode,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-/* data passing functions */
-void			gst_pad_set_chain_function_full		(GstPad *pad,
-                                                                 GstPadChainFunction chain,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_chain_list_function_full	(GstPad *pad,
-                                                                 GstPadChainListFunction chainlist,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_getrange_function_full	(GstPad *pad,
-                                                                 GstPadGetRangeFunction get,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_event_function_full		(GstPad *pad,
-                                                                 GstPadEventFunction event,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-
-#define gst_pad_set_activate_function(p,f)      gst_pad_set_activate_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_activatemode_function(p,f)  gst_pad_set_activatemode_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_chain_function(p,f)         gst_pad_set_chain_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_chain_list_function(p,f)    gst_pad_set_chain_list_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_getrange_function(p,f)      gst_pad_set_getrange_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_event_function(p,f)         gst_pad_set_event_function_full((p),(f),NULL,NULL)
-
-/* pad links */
-void			gst_pad_set_link_function_full		(GstPad *pad,
-                                                                 GstPadLinkFunction link,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_unlink_function_full        (GstPad *pad,
-                                                                 GstPadUnlinkFunction unlink,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-
-#define gst_pad_set_link_function(p,f)          gst_pad_set_link_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_unlink_function(p,f)        gst_pad_set_unlink_function_full((p),(f),NULL,NULL)
-
-gboolean                gst_pad_can_link                        (GstPad *srcpad, GstPad *sinkpad);
-GstPadLinkReturn        gst_pad_link				(GstPad *srcpad, GstPad *sinkpad);
-GstPadLinkReturn        gst_pad_link_full			(GstPad *srcpad, GstPad *sinkpad, GstPadLinkCheck flags);
-gboolean		gst_pad_unlink				(GstPad *srcpad, GstPad *sinkpad);
-gboolean		gst_pad_is_linked			(GstPad *pad);
-
-GstPad*			gst_pad_get_peer			(GstPad *pad);
-
-GstCaps*                gst_pad_get_pad_template_caps		(GstPad *pad);
-
-/* capsnego function for linked/unlinked pads */
-GstCaps *		gst_pad_get_current_caps                (GstPad * pad);
-gboolean		gst_pad_has_current_caps                (GstPad * pad);
-
-/* capsnego for linked pads */
-GstCaps *		gst_pad_get_allowed_caps		(GstPad * pad);
-
-/* pad offsets */
-gint64                  gst_pad_get_offset                      (GstPad *pad);
-void                    gst_pad_set_offset                      (GstPad *pad, gint64 offset);
-
-/* data passing functions to peer */
-GstFlowReturn		gst_pad_push				(GstPad *pad, GstBuffer *buffer);
-GstFlowReturn		gst_pad_push_list			(GstPad *pad, GstBufferList *list);
-GstFlowReturn		gst_pad_pull_range			(GstPad *pad, guint64 offset, guint size,
-								 GstBuffer **buffer);
-gboolean		gst_pad_push_event			(GstPad *pad, GstEvent *event);
-gboolean		gst_pad_event_default			(GstPad *pad, GstObject *parent,
-                                                                 GstEvent *event);
-
-/* data passing functions on pad */
-GstFlowReturn		gst_pad_chain				(GstPad *pad, GstBuffer *buffer);
-GstFlowReturn		gst_pad_chain_list                      (GstPad *pad, GstBufferList *list);
-GstFlowReturn		gst_pad_get_range			(GstPad *pad, guint64 offset, guint size,
-								 GstBuffer **buffer);
-gboolean		gst_pad_send_event			(GstPad *pad, GstEvent *event);
-
-/* pad tasks */
-gboolean		gst_pad_start_task			(GstPad *pad, GstTaskFunction func,
-								 gpointer user_data, GDestroyNotify notify);
-gboolean		gst_pad_pause_task			(GstPad *pad);
-gboolean		gst_pad_stop_task			(GstPad *pad);
-
-/* internal links */
-void                    gst_pad_set_iterate_internal_links_function_full (GstPad * pad,
-                                                                 GstPadIterIntLinkFunction iterintlink,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-GstIterator *           gst_pad_iterate_internal_links          (GstPad * pad);
-GstIterator *           gst_pad_iterate_internal_links_default  (GstPad * pad, GstObject *parent);
-
-#define gst_pad_set_iterate_internal_links_function(p,f) gst_pad_set_iterate_internal_links_function_full((p),(f),NULL,NULL)
-
-/* generic query function */
-gboolean		gst_pad_query				(GstPad *pad, GstQuery *query);
-gboolean		gst_pad_peer_query			(GstPad *pad, GstQuery *query);
-void			gst_pad_set_query_function_full		(GstPad *pad, GstPadQueryFunction query,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-gboolean		gst_pad_query_default			(GstPad *pad, GstObject *parent,
-                                                                 GstQuery *query);
-
-#define gst_pad_set_query_function(p,f)   gst_pad_set_query_function_full((p),(f),NULL,NULL)
-
-/* misc helper functions */
-gboolean		gst_pad_forward                         (GstPad *pad, GstPadForwardFunction forward,
-								 gpointer user_data);
-
-const gchar   * gst_pad_mode_get_name (GstPadMode mode);
-
-G_END_DECLS
-
-#endif /* __GST_PAD_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpadtemplate.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpadtemplate.h
deleted file mode 100644
index 90f9b252..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpadtemplate.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstpadtemplate.h: Header for GstPadTemplate object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PAD_TEMPLATE_H__
-#define __GST_PAD_TEMPLATE_H__
-
-#include <gst/gstconfig.h>
-
-typedef struct _GstPadTemplate GstPadTemplate;
-typedef struct _GstPadTemplateClass GstPadTemplateClass;
-typedef struct _GstStaticPadTemplate GstStaticPadTemplate;
-
-#include <gst/gstobject.h>
-#include <gst/gstbuffer.h>
-#include <gst/gstcaps.h>
-#include <gst/gstevent.h>
-#include <gst/gstquery.h>
-#include <gst/gsttask.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_STATIC_PAD_TEMPLATE	(gst_static_pad_template_get_type ())
-
-#define GST_TYPE_PAD_TEMPLATE		(gst_pad_template_get_type ())
-#define GST_PAD_TEMPLATE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PAD_TEMPLATE,GstPadTemplate))
-#define GST_PAD_TEMPLATE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PAD_TEMPLATE,GstPadTemplateClass))
-#define GST_IS_PAD_TEMPLATE(obj)	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PAD_TEMPLATE))
-#define GST_IS_PAD_TEMPLATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PAD_TEMPLATE))
-
-/**
- * GstPadPresence:
- * @GST_PAD_ALWAYS: the pad is always available
- * @GST_PAD_SOMETIMES: the pad will become available depending on the media stream
- * @GST_PAD_REQUEST: the pad is only available on request with
- *  gst_element_get_request_pad().
- *
- * Indicates when this pad will become available.
- */
-typedef enum {
-  GST_PAD_ALWAYS,
-  GST_PAD_SOMETIMES,
-  GST_PAD_REQUEST
-} GstPadPresence;
-
-/**
- * GST_PAD_TEMPLATE_NAME_TEMPLATE:
- * @templ: the template to query
- *
- * Get the nametemplate of the padtemplate.
- */
-#define GST_PAD_TEMPLATE_NAME_TEMPLATE(templ)	(((GstPadTemplate *)(templ))->name_template)
-
-/**
- * GST_PAD_TEMPLATE_DIRECTION:
- * @templ: the template to query
- *
- * Get the #GstPadDirection of the padtemplate.
- */
-#define GST_PAD_TEMPLATE_DIRECTION(templ)	(((GstPadTemplate *)(templ))->direction)
-
-/**
- * GST_PAD_TEMPLATE_PRESENCE:
- * @templ: the template to query
- *
- * Get the #GstPadPresence of the padtemplate.
- */
-#define GST_PAD_TEMPLATE_PRESENCE(templ)	(((GstPadTemplate *)(templ))->presence)
-
-/**
- * GST_PAD_TEMPLATE_CAPS:
- * @templ: the template to query
- *
- * Get a handle to the padtemplate #GstCaps
- */
-#define GST_PAD_TEMPLATE_CAPS(templ)		(((GstPadTemplate *)(templ))->caps)
-
-/**
- * GstPadTemplateFlags:
- * @GST_PAD_TEMPLATE_FLAG_LAST: first flag that can be used by subclasses.
- *
- * Flags for the padtemplate
- */
-typedef enum {
-  /* padding */
-  GST_PAD_TEMPLATE_FLAG_LAST    = (GST_OBJECT_FLAG_LAST << 4)
-} GstPadTemplateFlags;
-
-/**
- * GST_PAD_TEMPLATE_IS_FIXED:
- * @templ: the template to query
- *
- * Check if the properties of the padtemplate are fixed
- */
-#define GST_PAD_TEMPLATE_IS_FIXED(templ)	(GST_OBJECT_FLAG_IS_SET(templ, GST_PAD_TEMPLATE_FIXED))
-
-/**
- * GstPadTemplate:
- *
- * The padtemplate object.
- */
-struct _GstPadTemplate {
-  GstObject	   object;
-
-  gchar           *name_template;
-  GstPadDirection  direction;
-  GstPadPresence   presence;
-  GstCaps	  *caps;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstPadTemplateClass {
-  GstObjectClass   parent_class;
-
-  /* signal callbacks */
-  void (*pad_created)	(GstPadTemplate *templ, GstPad *pad);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstStaticPadTemplate:
- * @name_template: the name of the template
- * @direction: the direction of the template
- * @presence: the presence of the template
- * @static_caps: the caps of the template.
- *
- * Structure describing the #GstStaticPadTemplate.
- */
-struct _GstStaticPadTemplate {
-  const gchar     *name_template;
-  GstPadDirection  direction;
-  GstPadPresence   presence;
-  GstStaticCaps    static_caps;
-};
-
-/**
- * GST_STATIC_PAD_TEMPLATE:
- * @padname: the name template of the pad
- * @dir: the GstPadDirection of the pad
- * @pres: the GstPadPresence of the pad
- * @caps: the GstStaticCaps of the pad
- *
- * Convenience macro to fill the values of a GstStaticPadTemplate
- * structure.
- */
-#define GST_STATIC_PAD_TEMPLATE(padname, dir, pres, caps) \
-{ \
-  /* name_template */    padname, \
-  /* direction */        dir, \
-  /* presence */         pres, \
-  /* caps */             caps \
-}
-
-/* templates and factories */
-GType			gst_pad_template_get_type		(void);
-GType			gst_static_pad_template_get_type	(void);
-
-GstPadTemplate*		gst_pad_template_new			(const gchar *name_template,
-								 GstPadDirection direction, GstPadPresence presence,
-								 GstCaps *caps) G_GNUC_MALLOC;
-
-GstPadTemplate *	gst_static_pad_template_get             (GstStaticPadTemplate *pad_template);
-GstCaps*		gst_static_pad_template_get_caps	(GstStaticPadTemplate *templ);
-GstCaps*		gst_pad_template_get_caps		(GstPadTemplate *templ);
-
-void                    gst_pad_template_pad_created            (GstPadTemplate * templ, GstPad * pad);
-
-G_END_DECLS
-
-#endif /* __GST_PAD_TEMPLATE_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstparamspecs.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstparamspecs.h
deleted file mode 100644
index e7e5fd57..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstparamspecs.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* GStreamer - GParamSpecs for some of our types
- * Copyright (C) 2007 Tim-Philipp Müller  <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PARAMSPECS_H__
-#define __GST_PARAMSPECS_H__
-
-#include <gst/gstvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- paramspec flags */
-
-/**
- * GST_PARAM_CONTROLLABLE:
- *
- * Use this flag on GObject properties to signal they can make sense to be.
- * controlled over time. This hint is used by the GstController.
- */
-#define	GST_PARAM_CONTROLLABLE	(1 << (G_PARAM_USER_SHIFT + 1))
-
-/**
- * GST_PARAM_MUTABLE_READY:
- *
- * Use this flag on GObject properties of GstElements to indicate that
- * they can be changed when the element is in the READY or lower state.
- */
-#define GST_PARAM_MUTABLE_READY  (1 << (G_PARAM_USER_SHIFT + 2))
-
-/**
- * GST_PARAM_MUTABLE_PAUSED:
- *
- * Use this flag on GObject properties of GstElements to indicate that
- * they can be changed when the element is in the PAUSED or lower state.
- * This flag implies GST_PARAM_MUTABLE_READY.
- */
-#define GST_PARAM_MUTABLE_PAUSED  (1 << (G_PARAM_USER_SHIFT + 3))
-
-/**
- * GST_PARAM_MUTABLE_PLAYING:
- *
- * Use this flag on GObject properties of GstElements to indicate that
- * they can be changed when the element is in the PLAYING or lower state.
- * This flag implies GST_PARAM_MUTABLE_PAUSED.
- */
-#define GST_PARAM_MUTABLE_PLAYING  (1 << (G_PARAM_USER_SHIFT + 4))
-
-/**
- * GST_PARAM_USER_SHIFT:
- *
- * Bits based on GST_PARAM_USER_SHIFT can be used by 3rd party applications.
- */
-#define	GST_PARAM_USER_SHIFT	(1 << (G_PARAM_USER_SHIFT + 8))
-
-
-/* --- type macros --- */
-
-#define GST_TYPE_PARAM_FRACTION           (gst_param_spec_fraction_get_type ())
-#define GST_IS_PARAM_SPEC_FRACTION(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GST_TYPE_PARAM_FRACTION))
-#define GST_PARAM_SPEC_FRACTION(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GST_TYPE_PARAM_FRACTION, GstParamSpecFraction))
-
-
-/* --- get_type functions --- */
-
-GType  gst_param_spec_fraction_get_type (void);
-
-
-/* --- typedefs & structures --- */
-
-typedef struct _GstParamSpecFraction GstParamSpecFraction;
-
-/**
- * GstParamSpecFraction:
- * @parent_instance: super class
- * @min_num: minimal numerator
- * @min_den: minimal denominator
- * @max_num: maximal numerator
- * @max_den: maximal denominator
- * @def_num: default numerator
- * @def_den: default denominator
- *
- * A GParamSpec derived structure that contains the meta data for fractional
- * properties.
- */
-struct _GstParamSpecFraction {
-  GParamSpec    parent_instance;
-
-  gint          min_num, min_den;
-  gint          max_num, max_den;
-  gint          def_num, def_den;
-};
-
-
-/* --- GParamSpec prototypes --- */
-
-GParamSpec  * gst_param_spec_fraction (const gchar * name,
-                                       const gchar * nick,
-                                       const gchar * blurb,
-                                       gint min_num, gint min_denom,
-                                       gint max_num, gint max_denom,
-                                       gint default_num, gint default_denom,
-                                       GParamFlags flags) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __GST_PARAMSPECS_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstparse.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstparse.h
deleted file mode 100644
index 630c3cef..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstparse.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstparse.h: get a pipeline from a text pipeline description
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PARSE_H__
-#define __GST_PARSE_H__
-
-#include <gst/gstelement.h>
-
-G_BEGIN_DECLS
-
-GQuark gst_parse_error_quark (void);
-/**
- * GST_PARSE_ERROR:
- *
- * Get access to the error quark of the parse subsystem.
- */
-#define GST_PARSE_ERROR gst_parse_error_quark ()
-
-/**
- * GstParseError:
- * @GST_PARSE_ERROR_SYNTAX: A syntax error occured.
- * @GST_PARSE_ERROR_NO_SUCH_ELEMENT: The description contained an unknown element
- * @GST_PARSE_ERROR_NO_SUCH_PROPERTY: An element did not have a specified property
- * @GST_PARSE_ERROR_LINK: There was an error linking two pads.
- * @GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY: There was an error setting a property
- * @GST_PARSE_ERROR_EMPTY_BIN: An empty bin was specified.
- * @GST_PARSE_ERROR_EMPTY: An empty description was specified
- *
- * The different parsing errors that can occur.
- */
-typedef enum
-{
-  GST_PARSE_ERROR_SYNTAX,
-  GST_PARSE_ERROR_NO_SUCH_ELEMENT,
-  GST_PARSE_ERROR_NO_SUCH_PROPERTY,
-  GST_PARSE_ERROR_LINK,
-  GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
-  GST_PARSE_ERROR_EMPTY_BIN,
-  GST_PARSE_ERROR_EMPTY
-} GstParseError;
-
-/**
- * GstParseFlags:
- * @GST_PARSE_FLAG_NONE: Do not use any special parsing options.
- * @GST_PARSE_FLAG_FATAL_ERRORS: Always return NULL when an error occurs
- *     (default behaviour is to return partially constructed bins or elements
- *      in some cases)
- *
- * Parsing options.
- */
-typedef enum
-{
-  GST_PARSE_FLAG_NONE = 0,
-  GST_PARSE_FLAG_FATAL_ERRORS = (1 << 0)
-} GstParseFlags;
-
-#define GST_TYPE_PARSE_CONTEXT (gst_parse_context_get_type())
-
-/**
- * GstParseContext:
- *
- * Opaque structure.
- */
-typedef struct _GstParseContext GstParseContext;
-
-/* create, process and free a parse context */
-
-GType             gst_parse_context_get_type (void);
-GstParseContext * gst_parse_context_new (void) G_GNUC_MALLOC;
-
-gchar          ** gst_parse_context_get_missing_elements (GstParseContext * context) G_GNUC_MALLOC;
-
-void              gst_parse_context_free (GstParseContext * context);
-
-
-/* parse functions */
-
-GstElement      * gst_parse_launch       (const gchar      * pipeline_description,
-                                          GError          ** error) G_GNUC_MALLOC;
-
-GstElement      * gst_parse_launchv      (const gchar     ** argv,
-                                          GError          ** error) G_GNUC_MALLOC;
-
-GstElement      * gst_parse_launch_full  (const gchar      * pipeline_description,
-                                          GstParseContext  * context,
-                                          GstParseFlags      flags,
-                                          GError          ** error) G_GNUC_MALLOC;
-
-GstElement      * gst_parse_launchv_full (const gchar     ** argv,
-                                          GstParseContext  * context,
-                                          GstParseFlags      flags,
-                                          GError          ** error) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __GST_PARSE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpipeline.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpipeline.h
deleted file mode 100644
index 43563cb8..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpipeline.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstpipeline.h: Header for GstPipeline element
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PIPELINE_H__
-#define __GST_PIPELINE_H__
-
-#include <gst/gstbin.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PIPELINE               (gst_pipeline_get_type ())
-#define GST_PIPELINE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PIPELINE, GstPipeline))
-#define GST_IS_PIPELINE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PIPELINE))
-#define GST_PIPELINE_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PIPELINE, GstPipelineClass))
-#define GST_IS_PIPELINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PIPELINE))
-#define GST_PIPELINE_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PIPELINE, GstPipelineClass))
-#define GST_PIPELINE_CAST(obj)          ((GstPipeline*)(obj))
-
-typedef struct _GstPipeline GstPipeline;
-typedef struct _GstPipelineClass GstPipelineClass;
-typedef struct _GstPipelinePrivate GstPipelinePrivate;
-
-/**
- * GstPipelineFlags:
- * @GST_PIPELINE_FLAG_FIXED_CLOCK: this pipeline works with a fixed clock
- * @GST_PIPELINE_FLAG_LAST: offset to define more flags
- *
- * Pipeline flags
- */
-typedef enum {
-  GST_PIPELINE_FLAG_FIXED_CLOCK        = (GST_BIN_FLAG_LAST << 0),
-  /* padding */
-  GST_PIPELINE_FLAG_LAST               = (GST_BIN_FLAG_LAST << 4)
-} GstPipelineFlags;
-
-/**
- * GstPipeline:
- * @fixed_clock: The fixed clock of the pipeline, used when
- *               GST_PIPELINE_FLAG_FIXED_CLOCK is set.
- * @stream_time: The stream time of the pipeline. A better name for this
- *         property would be the running_time, the total time spent in the
- *         PLAYING state without being flushed. (deprecated, use the start_time
- *         on GstElement).
- * @delay: Extra delay added to base_time to compensate for computing delays
- *         when setting elements to PLAYING.
- *
- * The #GstPipeline structure.
- */
-struct _GstPipeline {
-  GstBin         bin;
-
-  /*< public >*/ /* with LOCK */
-  GstClock      *fixed_clock;
-
-  GstClockTime   stream_time;
-  GstClockTime   delay;
-
-  /*< private >*/
-  GstPipelinePrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstPipelineClass {
-  GstBinClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_pipeline_get_type           (void);
-GstElement*     gst_pipeline_new                (const gchar *name) G_GNUC_MALLOC;
-
-GstBus*         gst_pipeline_get_bus            (GstPipeline *pipeline);
-
-void            gst_pipeline_use_clock          (GstPipeline *pipeline, GstClock *clock);
-gboolean        gst_pipeline_set_clock          (GstPipeline *pipeline, GstClock *clock);
-GstClock*       gst_pipeline_get_clock          (GstPipeline *pipeline);
-void            gst_pipeline_auto_clock         (GstPipeline *pipeline);
-
-void            gst_pipeline_set_delay          (GstPipeline *pipeline, GstClockTime delay);
-GstClockTime    gst_pipeline_get_delay          (GstPipeline *pipeline);
-
-void            gst_pipeline_set_auto_flush_bus (GstPipeline *pipeline, gboolean auto_flush);
-gboolean        gst_pipeline_get_auto_flush_bus (GstPipeline *pipeline);
-
-G_END_DECLS
-
-#endif /* __GST_PIPELINE_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstplugin.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstplugin.h
deleted file mode 100644
index 68071865..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstplugin.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstplugin.h: Header for plugin subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PLUGIN_H__
-#define __GST_PLUGIN_H__
-
-#include <gst/gstconfig.h>
-
-#include <gst/gstobject.h>
-#include <gst/gstmacros.h>
-#include <gst/gststructure.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstPlugin:
- *
- * The opaque plugin object
- */
-typedef struct _GstPlugin GstPlugin;
-typedef struct _GstPluginClass GstPluginClass;
-typedef struct _GstPluginDesc GstPluginDesc;
-
-/**
- * gst_plugin_error_quark:
- *
- * Get the error quark.
- *
- * Returns: The error quark used in GError messages
- */
-GQuark gst_plugin_error_quark (void);
-/**
- * GST_PLUGIN_ERROR:
- *
- * The error message category quark
- */
-#define GST_PLUGIN_ERROR gst_plugin_error_quark ()
-
-/**
- * GstPluginError:
- * @GST_PLUGIN_ERROR_MODULE: The plugin could not be loaded
- * @GST_PLUGIN_ERROR_DEPENDENCIES: The plugin has unresolved dependencies
- * @GST_PLUGIN_ERROR_NAME_MISMATCH: The plugin has already be loaded from a different file
- *
- * The plugin loading errors
- */
-typedef enum
-{
-  GST_PLUGIN_ERROR_MODULE,
-  GST_PLUGIN_ERROR_DEPENDENCIES,
-  GST_PLUGIN_ERROR_NAME_MISMATCH
-} GstPluginError;
-
-/**
- * GstPluginFlags:
- * @GST_PLUGIN_FLAG_CACHED: Temporarily loaded plugins
- * @GST_PLUGIN_FLAG_BLACKLISTED: The plugin won't be scanned (again)
- *
- * The plugin loading state
- */
-typedef enum
-{
-  GST_PLUGIN_FLAG_CACHED      = (GST_OBJECT_FLAG_LAST << 0),
-  GST_PLUGIN_FLAG_BLACKLISTED = (GST_OBJECT_FLAG_LAST << 1)
-} GstPluginFlags;
-
-/**
- * GstPluginDependencyFlags:
- * @GST_PLUGIN_DEPENDENCY_FLAG_NONE : no special flags
- * @GST_PLUGIN_DEPENDENCY_FLAG_RECURSE : recurse into subdirectories
- * @GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY : use paths
- *         argument only if none of the environment variables is set
- * @GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX : interpret
- *         filename argument as filter suffix and check all matching files in
- *         the directory
- *
- * Flags used in connection with gst_plugin_add_dependency().
- */
-typedef enum {
-  GST_PLUGIN_DEPENDENCY_FLAG_NONE = 0,
-  GST_PLUGIN_DEPENDENCY_FLAG_RECURSE = (1 << 0),
-  GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY = (1 << 1),
-  GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX = (1 << 2)
-} GstPluginDependencyFlags;
-
-/**
- * GstPluginInitFunc:
- * @plugin: The plugin object
- *
- * A plugin should provide a pointer to a function of this type in the
- * plugin_desc struct.
- * This function will be called by the loader at startup. One would then
- * register each #GstPluginFeature.
- *
- * Returns: %TRUE if plugin initialised successfully
- */
-/* FIXME 0.11: Make return void */
-typedef gboolean (*GstPluginInitFunc) (GstPlugin *plugin);
-
-/**
- * GstPluginInitFullFunc:
- * @plugin: The plugin object
- * @user_data: extra data
- *
- * A plugin should provide a pointer to a function of either #GstPluginInitFunc
- * or this type in the plugin_desc struct.
- * The function will be called by the loader at startup. One would then
- * register each #GstPluginFeature. This version allows
- * user data to be passed to init function (useful for bindings).
- *
- * Returns: %TRUE if plugin initialised successfully
- */
-/* FIXME 0.11: Merge with GstPluginInitFunc */
-typedef gboolean (*GstPluginInitFullFunc) (GstPlugin *plugin, gpointer user_data);
-
-/**
- * GstPluginDesc:
- * @major_version: the major version number of core that plugin was compiled for
- * @minor_version: the minor version number of core that plugin was compiled for
- * @name: a unique name of the plugin
- * @description: description of plugin
- * @plugin_init: pointer to the init function of this plugin.
- * @version: version of the plugin
- * @license: effective license of plugin
- * @source: source module plugin belongs to
- * @package: shipped package plugin belongs to
- * @origin: URL to provider of plugin
- * @release_datetime: date time string in ISO 8601 format (or rather, a
- *     subset thereof), or NULL. Allowed are the following formats:
- *     "YYYY-MM-DD" and "YYY-MM-DDTHH:MMZ" (with 'T' a separator and 'Z'
- *     indicating UTC/Zulu time). This field should be set via the
- *     GST_PACKAGE_RELEASE_DATETIME preprocessor macro.
- *
- * A plugin should export a variable of this type called plugin_desc. The plugin
- * loader will use the data provided there to initialize the plugin.
- *
- * The @licence parameter must be one of: LGPL, GPL, QPL, GPL/QPL, MPL,
- * BSD, MIT/X11, Proprietary, unknown.
- */
-struct _GstPluginDesc {
-  gint major_version;
-  gint minor_version;
-  const gchar *name;
-  const gchar *description;
-  GstPluginInitFunc plugin_init;
-  const gchar *version;
-  const gchar *license;
-  const gchar *source;
-  const gchar *package;
-  const gchar *origin;
-  const gchar *release_datetime;
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-
-#define GST_TYPE_PLUGIN   (gst_plugin_get_type())
-#define GST_IS_PLUGIN(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLUGIN))
-#define GST_IS_PLUGIN_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLUGIN))
-#define GST_PLUGIN_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLUGIN, GstPluginClass))
-#define GST_PLUGIN(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLUGIN, GstPlugin))
-#define GST_PLUGIN_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLUGIN, GstPluginClass))
-#define GST_PLUGIN_CAST(obj)           ((GstPlugin*)(obj))
-
-#ifdef GST_PACKAGE_RELEASE_DATETIME
-#define __GST_PACKAGE_RELEASE_DATETIME GST_PACKAGE_RELEASE_DATETIME
-#else
-#define __GST_PACKAGE_RELEASE_DATETIME NULL
-#endif
-
-/**
- * GST_PLUGIN_DEFINE:
- * @major: major version number of the gstreamer-core that plugin was compiled for
- * @minor: minor version number of the gstreamer-core that plugin was compiled for
- * @name: short, but unique name of the plugin
- * @description: information about the purpose of the plugin
- * @init: function pointer to the plugin_init method with the signature of <code>static gboolean plugin_init (GstPlugin * plugin)</code>.
- * @version: full version string (e.g. VERSION from config.h)
- * @license: under which licence the package has been released, e.g. GPL, LGPL.
- * @package: the package-name (e.g. PACKAGE_NAME from config.h)
- * @origin: a description from where the package comes from (e.g. the homepage URL)
- *
- * This macro needs to be used to define the entry point and meta data of a
- * plugin. One would use this macro to export a plugin, so that it can be used
- * by other applications.
- *
- * The macro uses a define named PACKAGE for the #GstPluginDesc,source field.
- * When using autoconf, this is usually set automatically via the AC_INIT
- * macro, and set in config.h. If you are not using autoconf, you will need to
- * define PACKAGE yourself and set it to a short mnemonic string identifying
- * your application/package, e.g. 'someapp' or 'my-plugins-foo.
- *
- * If defined, the GST_PACKAGE_RELEASE_DATETIME will also be used for the
- * #GstPluginDesc,release_datetime field.
- */
-#define GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,package,origin)	\
-G_BEGIN_DECLS \
-GST_PLUGIN_EXPORT GstPluginDesc gst_plugin_desc = {	\
-  major,						\
-  minor,						\
- #name,						        \
-  (gchar *) description,				\
-  init,							\
-  version,						\
-  license,						\
-  PACKAGE,						\
-  package,						\
-  origin,						\
-  __GST_PACKAGE_RELEASE_DATETIME,                       \
-  GST_PADDING_INIT				        \
-}; \
-G_END_DECLS
-
-/**
- * GST_LICENSE_UNKNOWN:
- *
- * To be used in GST_PLUGIN_DEFINE if usure about the licence.
- */
-#define GST_LICENSE_UNKNOWN "unknown"
-
-
-/* function for filters */
-/**
- * GstPluginFilter:
- * @plugin: the plugin to check
- * @user_data: the user_data that has been passed on e.g. gst_registry_plugin_filter()
- *
- * A function that can be used with e.g. gst_registry_plugin_filter()
- * to get a list of plugins that match certain criteria.
- *
- * Returns: TRUE for a positive match, FALSE otherwise
- */
-typedef gboolean        (*GstPluginFilter)              (GstPlugin *plugin,
-                                                         gpointer user_data);
-
-GType                   gst_plugin_get_type             (void);
-
-gboolean		gst_plugin_register_static	(gint major_version,
-                                                         gint minor_version,
-                                                         const gchar *name,
-                                                         const gchar *description,
-                                                         GstPluginInitFunc init_func,
-                                                         const gchar *version,
-                                                         const gchar *license,
-                                                         const gchar *source,
-                                                         const gchar *package,
-                                                         const gchar *origin);
-
-gboolean		gst_plugin_register_static_full	(gint major_version,
-                                                         gint minor_version,
-                                                         const gchar *name,
-                                                         const gchar *description,
-                                                         GstPluginInitFullFunc init_full_func,
-                                                         const gchar *version,
-                                                         const gchar *license,
-                                                         const gchar *source,
-                                                         const gchar *package,
-                                                         const gchar *origin,
-                                                         gpointer user_data);
-
-const gchar*		gst_plugin_get_name		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_description	(GstPlugin *plugin);
-const gchar*		gst_plugin_get_filename		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_version		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_license		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_source		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_package		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_origin		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_release_date_string (GstPlugin *plugin);
-const GstStructure*	gst_plugin_get_cache_data	(GstPlugin * plugin);
-void			gst_plugin_set_cache_data	(GstPlugin * plugin, GstStructure *cache_data);
-
-gboolean		gst_plugin_is_loaded		(GstPlugin *plugin);
-
-GstPlugin *		gst_plugin_load_file		(const gchar *filename, GError** error);
-
-GstPlugin *             gst_plugin_load                 (GstPlugin *plugin);
-GstPlugin *             gst_plugin_load_by_name         (const gchar *name);
-
-void                    gst_plugin_add_dependency        (GstPlugin    * plugin,
-                                                          const gchar ** env_vars,
-                                                          const gchar ** paths,
-                                                          const gchar ** names,
-                                                          GstPluginDependencyFlags flags);
-void                    gst_plugin_add_dependency_simple (GstPlugin   * plugin,
-                                                          const gchar * env_vars,
-                                                          const gchar * paths,
-                                                          const gchar * names,
-                                                          GstPluginDependencyFlags flags);
-
-void gst_plugin_list_free (GList *list);
-
-G_END_DECLS
-
-#endif /* __GST_PLUGIN_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpluginfeature.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpluginfeature.h
deleted file mode 100644
index 69ba44d4..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpluginfeature.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstpluginfeature.h: Header for base GstPluginFeature
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PLUGIN_FEATURE_H__
-#define __GST_PLUGIN_FEATURE_H__
-
-#include <glib-object.h>
-#include <gst/gstobject.h>
-#include <gst/gstplugin.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PLUGIN_FEATURE                 (gst_plugin_feature_get_type())
-#define GST_PLUGIN_FEATURE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLUGIN_FEATURE, GstPluginFeature))
-#define GST_IS_PLUGIN_FEATURE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLUGIN_FEATURE))
-#define GST_PLUGIN_FEATURE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLUGIN_FEATURE, GstPluginFeatureClass))
-#define GST_IS_PLUGIN_FEATURE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLUGIN_FEATURE))
-#define GST_PLUGIN_FEATURE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLUGIN_FEATURE, GstPluginFeatureClass))
-#define GST_PLUGIN_FEATURE_CAST(obj)            ((GstPluginFeature*)(obj))
-
-/**
- * GstPluginFeature:
- *
- * Opaque #GstPluginFeature structure.
- */
-typedef struct _GstPluginFeature GstPluginFeature;
-typedef struct _GstPluginFeatureClass GstPluginFeatureClass;
-
-/**
- * GstRank:
- * @GST_RANK_NONE: will be chosen last or not at all
- * @GST_RANK_MARGINAL: unlikely to be chosen
- * @GST_RANK_SECONDARY: likely to be chosen
- * @GST_RANK_PRIMARY: will be chosen first
- *
- * Element priority ranks. Defines the order in which the autoplugger (or
- * similar rank-picking mechanisms, such as e.g. gst_element_make_from_uri())
- * will choose this element over an alternative one with the same function.
- *
- * These constants serve as a rough guidance for defining the rank of a
- * #GstPluginFeature. Any value is valid, including values bigger than
- * @GST_RANK_PRIMARY.
- */
-typedef enum {
-  GST_RANK_NONE                 = 0,
-  GST_RANK_MARGINAL             = 64,
-  GST_RANK_SECONDARY            = 128,
-  GST_RANK_PRIMARY              = 256
-} GstRank;
-
-/**
- * gst_plugin_feature_get_name:
- * @feature: a #GstPluginFeature to get the name of @feature.
- *
- * Returns the name of @feature.
- * For a nameless plugin feature, this returns NULL.
- *
- * Returns: (transfer none): the name of @feature. MT safe.
- *
- */
-#define                 gst_plugin_feature_get_name(feature)      GST_OBJECT_NAME(feature)
-
-/**
- * gst_plugin_feature_set_name:
- * @feature: a #GstPluginFeature to set the name of.
- * @name: the new name
- *
- * Sets the name of the plugin feature, getting rid of the old name if there was one.
- */
-#define                 gst_plugin_feature_set_name(feature,name) gst_object_set_name(GST_OBJECT_CAST(feature),name)
-
-/**
- * GstPluginFeatureFilter:
- * @feature: the pluginfeature to check
- * @user_data: the user_data that has been passed on e.g.
- *  gst_registry_feature_filter()
- *
- * A function that can be used with e.g. gst_registry_feature_filter()
- * to get a list of pluginfeature that match certain criteria.
- *
- * Returns: %TRUE for a positive match, %FALSE otherwise
- */
-typedef gboolean        (*GstPluginFeatureFilter)       (GstPluginFeature *feature,
-                                                         gpointer user_data);
-
-/* normal GObject stuff */
-GType           gst_plugin_feature_get_type             (void);
-
-GstPluginFeature *
-                gst_plugin_feature_load                 (GstPluginFeature *feature);
-
-void            gst_plugin_feature_set_rank             (GstPluginFeature *feature, guint rank);
-guint           gst_plugin_feature_get_rank             (GstPluginFeature *feature);
-
-GstPlugin     * gst_plugin_feature_get_plugin           (GstPluginFeature *feature);
-
-void            gst_plugin_feature_list_free            (GList *list);
-GList          *gst_plugin_feature_list_copy            (GList *list) G_GNUC_MALLOC;
-void            gst_plugin_feature_list_debug           (GList *list);
-
-/**
- * GST_PLUGIN_FEATURE_LIST_DEBUG:
- * @list: (transfer none) (element-type Gst.PluginFeature): a #GList of
- *     plugin features
- *
- * Debug the plugin feature names in @list.
- */
-#ifndef GST_DISABLE_GST_DEBUG
-#define GST_PLUGIN_FEATURE_LIST_DEBUG(list) gst_plugin_feature_list_debug(list)
-#else
-#define GST_PLUGIN_FEATURE_LIST_DEBUG(list)
-#endif
-
-gboolean        gst_plugin_feature_check_version        (GstPluginFeature *feature,
-                                                         guint             min_major,
-                                                         guint             min_minor,
-                                                         guint             min_micro);
-gint            gst_plugin_feature_rank_compare_func    (gconstpointer p1,
-							 gconstpointer p2);
-
-G_END_DECLS
-
-
-#endif /* __GST_PLUGIN_FEATURE_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpoll.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpoll.h
deleted file mode 100644
index b0662769..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpoll.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999 Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) 2004 Wim Taymans <wim.taymans@gmail.com>
- * Copyright (C) 2007 Peter Kjellerstedt <pkj@axis.com>
- *
- * gstpoll.h: File descriptor set
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_POLL_H__
-#define __GST_POLL_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <gst/gstclock.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstPoll:
- *
- * A set of file/network descriptors.
- */
-typedef struct _GstPoll GstPoll;
-
-/**
- * GstPollFD:
- * @fd: a file descriptor
- *
- * A file descriptor object.
- */
-typedef struct {
-  int fd;
-
-  /*< private >*/
-  gint idx;
-} GstPollFD;
-
-/**
- * GST_POLL_FD_INIT:
- *
- * A #GstPollFD must be initialized with this macro, before it can be
- * used. This macro can used be to initialize a variable, but it cannot
- * be assigned to a variable. In that case you have to use
- * gst_poll_fd_init().
- */
-#define GST_POLL_FD_INIT  { -1, -1 }
-
-GstPoll*        gst_poll_new              (gboolean controllable) G_GNUC_MALLOC;
-GstPoll*        gst_poll_new_timer        (void) G_GNUC_MALLOC;
-void            gst_poll_free             (GstPoll *set);
-
-void            gst_poll_get_read_gpollfd (GstPoll *set, GPollFD *fd);
-
-void            gst_poll_fd_init          (GstPollFD *fd);
-
-gboolean        gst_poll_add_fd           (GstPoll *set, GstPollFD *fd);
-gboolean        gst_poll_remove_fd        (GstPoll *set, GstPollFD *fd);
-
-gboolean        gst_poll_fd_ctl_write     (GstPoll *set, GstPollFD *fd, gboolean active);
-gboolean        gst_poll_fd_ctl_read      (GstPoll *set, GstPollFD *fd, gboolean active);
-void            gst_poll_fd_ignored       (GstPoll *set, GstPollFD *fd);
-
-gboolean        gst_poll_fd_has_closed    (const GstPoll *set, GstPollFD *fd);
-gboolean        gst_poll_fd_has_error     (const GstPoll *set, GstPollFD *fd);
-gboolean        gst_poll_fd_can_read      (const GstPoll *set, GstPollFD *fd);
-gboolean        gst_poll_fd_can_write     (const GstPoll *set, GstPollFD *fd);
-
-gint            gst_poll_wait             (GstPoll *set, GstClockTime timeout);
-
-gboolean        gst_poll_set_controllable (GstPoll *set, gboolean controllable);
-void            gst_poll_restart          (GstPoll *set);
-void            gst_poll_set_flushing     (GstPoll *set, gboolean flushing);
-
-gboolean        gst_poll_write_control    (GstPoll *set);
-gboolean        gst_poll_read_control     (GstPoll *set);
-
-G_END_DECLS
-
-#endif /* __GST_POLL_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpreset.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpreset.h
deleted file mode 100644
index 30973f3a..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstpreset.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GStreamer
- * Copyright (C) 2006 Stefan Kost <ensonic@users.sf.net>
- *
- * gstpreset.h: helper interface header for element presets
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PRESET_H__
-#define __GST_PRESET_H__
-
-#include <glib-object.h>
-#include <gst/gstconfig.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PRESET               (gst_preset_get_type())
-#define GST_PRESET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PRESET, GstPreset))
-#define GST_IS_PRESET(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PRESET))
-#define GST_PRESET_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_PRESET, GstPresetInterface))
-
-/**
- * GstPreset:
- *
- * Opaque #GstPreset data structure.
- */
-typedef struct _GstPreset GstPreset; /* dummy object */
-typedef struct _GstPresetInterface GstPresetInterface;
-
-/**
- * GstPresetInterface:
- * @parent: parent interface type.
- * @get_preset_names: virtual method to get list of presets
- * @get_property_names: virtual methods to get properties that are persistent
- * @load_preset: virtual methods to load a preset into properties
- * @save_preset: virtual methods to save properties into a preset
- * @rename_preset: virtual methods to rename a preset
- * @delete_preset: virtual methods to remove a preset
- * @set_meta: virtual methods to set textual meta data to a preset
- * @get_meta: virtual methods to get textual meta data from a preset
- *
- * #GstPreset interface.
- */
-struct _GstPresetInterface
-{
-  GTypeInterface parent;
-
-  /* methods */
-  gchar**      (*get_preset_names)    (GstPreset *preset);
-
-  gchar**      (*get_property_names)  (GstPreset *preset);
-
-  gboolean     (*load_preset)         (GstPreset *preset, const gchar *name);
-  gboolean     (*save_preset)         (GstPreset *preset, const gchar *name);
-  gboolean     (*rename_preset)       (GstPreset *preset, const gchar *old_name,
-                                       const gchar *new_name);
-  gboolean     (*delete_preset)       (GstPreset *preset, const gchar *name);
-
-  gboolean     (*set_meta)            (GstPreset *preset, const gchar *name,
-                                       const gchar *tag, const gchar *value);
-  gboolean     (*get_meta)            (GstPreset *preset, const gchar *name,
-                                       const gchar *tag, gchar **value);
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_preset_get_type(void);
-
-gchar**      gst_preset_get_preset_names   (GstPreset *preset) G_GNUC_MALLOC;
-
-gchar**      gst_preset_get_property_names (GstPreset *preset) G_GNUC_MALLOC;
-
-gboolean     gst_preset_load_preset        (GstPreset *preset, const gchar *name);
-gboolean     gst_preset_save_preset        (GstPreset *preset, const gchar *name);
-gboolean     gst_preset_rename_preset      (GstPreset *preset, const gchar *old_name,
-                                            const gchar *new_name);
-gboolean     gst_preset_delete_preset      (GstPreset *preset, const gchar *name);
-
-gboolean     gst_preset_set_meta           (GstPreset *preset, const gchar *name,
-                                            const gchar *tag, const gchar *value);
-gboolean     gst_preset_get_meta           (GstPreset *preset, const gchar *name,
-                                            const gchar *tag, gchar **value);
-
-gboolean     gst_preset_set_app_dir        (const gchar *app_dir);
-const gchar *gst_preset_get_app_dir        (void);
-
-G_END_DECLS
-
-#endif /* __GST_PRESET_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstquery.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstquery.h
deleted file mode 100644
index 47fec237..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstquery.h
+++ /dev/null
@@ -1,481 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *                    2011 Wim Taymans <wim.taymans@gmail.com>
- *
- * gstquery.h: GstQuery API declaration
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_QUERY_H__
-#define __GST_QUERY_H__
-
-#include <glib.h>
-
-#include <gst/gstiterator.h>
-#include <gst/gstminiobject.h>
-#include <gst/gststructure.h>
-#include <gst/gstformat.h>
-#include <gst/gstpad.h>
-#include <gst/gstallocator.h>
-#include <gst/gsttoc.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstQuery GstQuery;
-
-/**
- * GstQueryTypeFlags:
- * @GST_QUERY_TYPE_UPSTREAM:     Set if the query can travel upstream.
- * @GST_QUERY_TYPE_DOWNSTREAM:   Set if the query can travel downstream.
- * @GST_QUERY_TYPE_SERIALIZED:   Set if the query should be serialized with data
- *                               flow.
- *
- * #GstQueryTypeFlags indicate the aspects of the different #GstQueryType
- * values. You can get the type flags of a #GstQueryType with the
- * gst_query_type_get_flags() function.
- */
-typedef enum {
-  GST_QUERY_TYPE_UPSTREAM       = 1 << 0,
-  GST_QUERY_TYPE_DOWNSTREAM     = 1 << 1,
-  GST_QUERY_TYPE_SERIALIZED     = 1 << 2
-} GstQueryTypeFlags;
-
-/**
- * GST_QUERY_TYPE_BOTH:
- *
- * The same thing as #GST_QUERY_TYPE_UPSTREAM | #GST_QUERY_TYPE_DOWNSTREAM.
- */
-#define GST_QUERY_TYPE_BOTH \
-    (GST_QUERY_TYPE_UPSTREAM | GST_QUERY_TYPE_DOWNSTREAM)
-
-#define GST_QUERY_NUM_SHIFT     (8)
-
-/**
- * GST_QUERY_MAKE_TYPE:
- * @num: the query number to create
- * @flags: the query flags
- *
- * when making custom query types, use this macro with the num and
- * the given flags
- */
-#define GST_QUERY_MAKE_TYPE(num,flags) \
-    (((num) << GST_QUERY_NUM_SHIFT) | (flags))
-
-#define FLAG(name) GST_QUERY_TYPE_##name
-
-
-/**
- * GstQueryType:
- * @GST_QUERY_UNKNOWN: unknown query type
- * @GST_QUERY_POSITION: current position in stream
- * @GST_QUERY_DURATION: total duration of the stream
- * @GST_QUERY_LATENCY: latency of stream
- * @GST_QUERY_JITTER: current jitter of stream
- * @GST_QUERY_RATE: current rate of the stream
- * @GST_QUERY_SEEKING: seeking capabilities
- * @GST_QUERY_SEGMENT: segment start/stop positions
- * @GST_QUERY_CONVERT: convert values between formats
- * @GST_QUERY_FORMATS: query supported formats for convert
- * @GST_QUERY_BUFFERING: query available media for efficient seeking.
- * @GST_QUERY_CUSTOM: a custom application or element defined query.
- * @GST_QUERY_URI: query the URI of the source or sink.
- * @GST_QUERY_ALLOCATION: the buffer allocation properties
- * @GST_QUERY_SCHEDULING: the scheduling properties
- * @GST_QUERY_ACCEPT_CAPS: the accept caps query
- * @GST_QUERY_CAPS: the caps query
- * @GST_QUERY_DRAIN: wait till all serialized data is consumed downstream
- *
- * Standard predefined Query types
- */
-/* NOTE: don't forget to update the table in gstquery.c when changing
- * this enum */
-typedef enum {
-  GST_QUERY_UNKNOWN      = GST_QUERY_MAKE_TYPE (0, 0),
-  GST_QUERY_POSITION     = GST_QUERY_MAKE_TYPE (10, FLAG(BOTH)),
-  GST_QUERY_DURATION     = GST_QUERY_MAKE_TYPE (20, FLAG(BOTH)),
-  GST_QUERY_LATENCY      = GST_QUERY_MAKE_TYPE (30, FLAG(BOTH)),
-  GST_QUERY_JITTER       = GST_QUERY_MAKE_TYPE (40, FLAG(BOTH)),
-  GST_QUERY_RATE         = GST_QUERY_MAKE_TYPE (50, FLAG(BOTH)),
-  GST_QUERY_SEEKING      = GST_QUERY_MAKE_TYPE (60, FLAG(BOTH)),
-  GST_QUERY_SEGMENT      = GST_QUERY_MAKE_TYPE (70, FLAG(BOTH)),
-  GST_QUERY_CONVERT      = GST_QUERY_MAKE_TYPE (80, FLAG(BOTH)),
-  GST_QUERY_FORMATS      = GST_QUERY_MAKE_TYPE (90, FLAG(BOTH)),
-  GST_QUERY_BUFFERING    = GST_QUERY_MAKE_TYPE (110, FLAG(BOTH)),
-  GST_QUERY_CUSTOM       = GST_QUERY_MAKE_TYPE (120, FLAG(BOTH)),
-  GST_QUERY_URI          = GST_QUERY_MAKE_TYPE (130, FLAG(BOTH)),
-  GST_QUERY_ALLOCATION   = GST_QUERY_MAKE_TYPE (140, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
-  GST_QUERY_SCHEDULING   = GST_QUERY_MAKE_TYPE (150, FLAG(UPSTREAM)),
-  GST_QUERY_ACCEPT_CAPS  = GST_QUERY_MAKE_TYPE (160, FLAG(BOTH)),
-  GST_QUERY_CAPS         = GST_QUERY_MAKE_TYPE (170, FLAG(BOTH)),
-  GST_QUERY_DRAIN        = GST_QUERY_MAKE_TYPE (180, FLAG(DOWNSTREAM) | FLAG(SERIALIZED))
-} GstQueryType;
-#undef FLAG
-
-#define GST_TYPE_QUERY                         (gst_query_get_type())
-#define GST_IS_QUERY(obj)                      (GST_IS_MINI_OBJECT_TYPE (obj, GST_TYPE_QUERY))
-#define GST_QUERY_CAST(obj)                    ((GstQuery*)(obj))
-#define GST_QUERY(obj)                         (GST_QUERY_CAST(obj))
-
-/**
- * GST_QUERY_TYPE:
- * @query: the query to query
- *
- * Get the #GstQueryType of the query.
- */
-#define GST_QUERY_TYPE(query)  (((GstQuery*)(query))->type)
-
-/**
- * GST_QUERY_TYPE_NAME:
- * @query: the query to query
- *
- * Get a constant string representation of the #GstQueryType of the query.
- */
-#define GST_QUERY_TYPE_NAME(query) (gst_query_type_get_name(GST_QUERY_TYPE(query)))
-
-/**
- * GST_QUERY_IS_UPSTREAM:
- * @ev: the query to query
- *
- * Check if an query can travel upstream.
- */
-#define GST_QUERY_IS_UPSTREAM(ev)       !!(GST_QUERY_TYPE (ev) & GST_QUERY_TYPE_UPSTREAM)
-/**
- * GST_QUERY_IS_DOWNSTREAM:
- * @ev: the query to query
- *
- * Check if an query can travel downstream.
- */
-#define GST_QUERY_IS_DOWNSTREAM(ev)     !!(GST_QUERY_TYPE (ev) & GST_QUERY_TYPE_DOWNSTREAM)
-/**
- * GST_QUERY_IS_SERIALIZED:
- * @ev: the query to query
- *
- * Check if an query is serialized with the data stream.
- */
-#define GST_QUERY_IS_SERIALIZED(ev)     !!(GST_QUERY_TYPE (ev) & GST_QUERY_TYPE_SERIALIZED)
-
-
-/**
- * GstQuery:
- * @mini_object: The parent #GstMiniObject type
- * @type: the #GstQueryType
- *
- * The #GstQuery structure.
- */
-struct _GstQuery
-{
-  GstMiniObject mini_object;
-
-  /*< public > *//* with COW */
-  GstQueryType type;
-};
-
-const gchar*    gst_query_type_get_name        (GstQueryType type);
-GQuark          gst_query_type_to_quark        (GstQueryType type);
-GstQueryTypeFlags
-                gst_query_type_get_flags       (GstQueryType type);
-
-
-GType           gst_query_get_type             (void);
-
-/* refcounting */
-/**
- * gst_query_ref:
- * @q: a #GstQuery to increase the refcount of.
- *
- * Increases the refcount of the given query by one.
- *
- * Returns: @q
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstQuery * gst_query_ref (GstQuery * q);
-#endif
-
-static inline GstQuery *
-gst_query_ref (GstQuery * q)
-{
-  return GST_QUERY_CAST (gst_mini_object_ref (GST_MINI_OBJECT_CAST (q)));
-}
-
-/**
- * gst_query_unref:
- * @q: a #GstQuery to decrease the refcount of.
- *
- * Decreases the refcount of the query. If the refcount reaches 0, the query
- * will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_query_unref (GstQuery * q);
-#endif
-
-static inline void
-gst_query_unref (GstQuery * q)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (q));
-}
-
-/* copy query */
-/**
- * gst_query_copy:
- * @q: a #GstQuery to copy.
- *
- * Copies the given query using the copy function of the parent #GstStructure.
- *
- * Free-function: gst_query_unref
- *
- * Returns: (transfer full): a new copy of @q.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstQuery * gst_query_copy (const GstQuery * q);
-#endif
-
-static inline GstQuery *
-gst_query_copy (const GstQuery * q)
-{
-  return GST_QUERY_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (q)));
-}
-
-/**
- * gst_query_is_writable:
- * @q: a #GstQuery
- *
- * Tests if you can safely write data into a query's structure.
- */
-#define         gst_query_is_writable(q)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (q))
-/**
- * gst_query_make_writable:
- * @q: (transfer full): a #GstQuery to make writable
- *
- * Makes a writable query from the given query.
- *
- * Returns: (transfer full): a new writable query (possibly same as @q)
- */
-#define         gst_query_make_writable(q)      GST_QUERY_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (q)))
-/**
- * gst_query_replace:
- * @old_query: (inout) (transfer full): pointer to a pointer to a #GstQuery
- *     to be replaced.
- * @new_query: (allow-none) (transfer none): pointer to a #GstQuery that will
- *     replace the query pointed to by @old_query.
- *
- * Modifies a pointer to a #GstQuery to point to a different #GstQuery. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * query is unreffed, the new one is reffed).
- *
- * Either @new_query or the #GstQuery pointed to by @old_query may be NULL.
- *
- * Returns: TRUE if @new_query was different from @old_query
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_query_replace (GstQuery **old_query, GstQuery *new_query);
-#endif
-
-static inline gboolean
-gst_query_replace (GstQuery **old_query, GstQuery *new_query)
-{
-  return gst_mini_object_replace ((GstMiniObject **) old_query, (GstMiniObject *) new_query);
-}
-
-/* application specific query */
-GstQuery *      gst_query_new_custom            (GstQueryType type, GstStructure *structure) G_GNUC_MALLOC;
-const GstStructure *
-                gst_query_get_structure         (GstQuery *query);
-GstStructure *  gst_query_writable_structure    (GstQuery *query);
-
-/* position query */
-GstQuery*       gst_query_new_position          (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_position          (GstQuery *query, GstFormat format, gint64 cur);
-void            gst_query_parse_position        (GstQuery *query, GstFormat *format, gint64 *cur);
-
-/* duration query */
-GstQuery*       gst_query_new_duration          (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_duration          (GstQuery *query, GstFormat format, gint64 duration);
-void            gst_query_parse_duration        (GstQuery *query, GstFormat *format, gint64 *duration);
-
-/* latency query */
-GstQuery*       gst_query_new_latency           (void) G_GNUC_MALLOC;
-void            gst_query_set_latency           (GstQuery *query, gboolean live, GstClockTime min_latency,
-                                                 GstClockTime max_latency);
-void            gst_query_parse_latency         (GstQuery *query, gboolean *live, GstClockTime *min_latency,
-                                                 GstClockTime *max_latency);
-
-/* convert query */
-GstQuery*       gst_query_new_convert           (GstFormat src_format, gint64 value, GstFormat dest_format) G_GNUC_MALLOC;
-void            gst_query_set_convert           (GstQuery *query, GstFormat src_format, gint64 src_value,
-                                                 GstFormat dest_format, gint64 dest_value);
-void            gst_query_parse_convert         (GstQuery *query, GstFormat *src_format, gint64 *src_value,
-                                                 GstFormat *dest_format, gint64 *dest_value);
-/* segment query */
-GstQuery*       gst_query_new_segment           (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_segment           (GstQuery *query, gdouble rate, GstFormat format,
-                                                 gint64 start_value, gint64 stop_value);
-void            gst_query_parse_segment         (GstQuery *query, gdouble *rate, GstFormat *format,
-                                                 gint64 *start_value, gint64 *stop_value);
-
-/* seeking query */
-GstQuery*       gst_query_new_seeking           (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_seeking           (GstQuery *query, GstFormat format,
-                                                 gboolean seekable,
-                                                 gint64 segment_start,
-                                                 gint64 segment_end);
-void            gst_query_parse_seeking         (GstQuery *query, GstFormat *format,
-                                                 gboolean *seekable,
-                                                 gint64 *segment_start,
-                                                 gint64 *segment_end);
-/* formats query */
-GstQuery*       gst_query_new_formats           (void) G_GNUC_MALLOC;
-void            gst_query_set_formats           (GstQuery *query, gint n_formats, ...);
-void            gst_query_set_formatsv          (GstQuery *query, gint n_formats, const GstFormat *formats);
-void            gst_query_parse_n_formats       (GstQuery *query, guint *n_formats);
-void            gst_query_parse_nth_format      (GstQuery *query, guint nth, GstFormat *format);
-
-/* buffering query */
-/**
- * GstBufferingMode:
- * @GST_BUFFERING_STREAM: a small amount of data is buffered
- * @GST_BUFFERING_DOWNLOAD: the stream is being downloaded
- * @GST_BUFFERING_TIMESHIFT: the stream is being downloaded in a ringbuffer
- * @GST_BUFFERING_LIVE: the stream is a live stream
- *
- * The different types of buffering methods.
- */
-typedef enum {
-  GST_BUFFERING_STREAM,
-  GST_BUFFERING_DOWNLOAD,
-  GST_BUFFERING_TIMESHIFT,
-  GST_BUFFERING_LIVE
-} GstBufferingMode;
-
-GstQuery*       gst_query_new_buffering           (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_buffering_percent   (GstQuery *query, gboolean busy, gint percent);
-void            gst_query_parse_buffering_percent (GstQuery *query, gboolean *busy, gint *percent);
-
-void            gst_query_set_buffering_stats     (GstQuery *query, GstBufferingMode mode,
-                                                   gint avg_in, gint avg_out,
-                                                   gint64 buffering_left);
-void            gst_query_parse_buffering_stats    (GstQuery *query, GstBufferingMode *mode,
-                                                   gint *avg_in, gint *avg_out,
-                                                   gint64 *buffering_left);
-
-void            gst_query_set_buffering_range     (GstQuery *query, GstFormat format,
-                                                   gint64 start, gint64 stop,
-                                                   gint64 estimated_total);
-void            gst_query_parse_buffering_range   (GstQuery *query, GstFormat *format,
-                                                   gint64 *start, gint64 *stop,
-                                                   gint64 *estimated_total);
-
-gboolean        gst_query_add_buffering_range       (GstQuery *query,
-                                                     gint64 start, gint64 stop);
-guint           gst_query_get_n_buffering_ranges    (GstQuery *query);
-gboolean        gst_query_parse_nth_buffering_range (GstQuery *query,
-                                                     guint index, gint64 *start,
-                                                     gint64 *stop);
-
-/* URI query */
-GstQuery *      gst_query_new_uri                    (void) G_GNUC_MALLOC;
-void            gst_query_parse_uri                  (GstQuery *query, gchar **uri);
-void            gst_query_set_uri                    (GstQuery *query, const gchar *uri);
-
-/* allocation query */
-GstQuery *      gst_query_new_allocation             (GstCaps *caps, gboolean need_pool) G_GNUC_MALLOC;
-void            gst_query_parse_allocation           (GstQuery *query, GstCaps **caps, gboolean *need_pool);
-
-/* pools */
-void            gst_query_add_allocation_pool        (GstQuery *query, GstBufferPool *pool,
-                                                      guint size, guint min_buffers,
-                                                      guint max_buffers);
-guint           gst_query_get_n_allocation_pools     (GstQuery *query);
-void            gst_query_parse_nth_allocation_pool  (GstQuery *query, guint index,
-                                                      GstBufferPool **pool,
-                                                      guint *size, guint *min_buffers,
-                                                      guint *max_buffers);
-void            gst_query_set_nth_allocation_pool    (GstQuery *query, guint index,
-                                                      GstBufferPool *pool,
-                                                      guint size, guint min_buffers,
-                                                      guint max_buffers);
-
-/* allocators */
-void            gst_query_add_allocation_param       (GstQuery *query, GstAllocator *allocator,
-                                                      const GstAllocationParams *params);
-guint           gst_query_get_n_allocation_params    (GstQuery *query);
-void            gst_query_parse_nth_allocation_param (GstQuery *query, guint index,
-                                                      GstAllocator **allocator,
-                                                      GstAllocationParams *params);
-void            gst_query_set_nth_allocation_param   (GstQuery *query, guint index,
-                                                      GstAllocator *allocator,
-                                                      const GstAllocationParams *params);
-
-/* metadata */
-void            gst_query_add_allocation_meta        (GstQuery *query, GType api, const GstStructure *params);
-guint           gst_query_get_n_allocation_metas     (GstQuery *query);
-GType           gst_query_parse_nth_allocation_meta  (GstQuery *query, guint index,
-                                                      const GstStructure **params);
-void            gst_query_remove_nth_allocation_meta (GstQuery *query, guint index);
-gboolean        gst_query_find_allocation_meta       (GstQuery *query, GType api, guint *index);
-
-
-/* scheduling query */
-/**
- * GstSchedulingFlags:
- * @GST_SCHEDULING_FLAG_SEEKABLE: if seeking is possible
- * @GST_SCHEDULING_FLAG_SEQUENTIAL: if sequential access is recommended
- *
- * The different scheduling flags.
- */
-typedef enum {
-  GST_SCHEDULING_FLAG_SEEKABLE      = (1 << 0),
-  GST_SCHEDULING_FLAG_SEQUENTIAL    = (1 << 1)
-} GstSchedulingFlags;
-
-GstQuery *      gst_query_new_scheduling          (void) G_GNUC_MALLOC;
-
-void            gst_query_set_scheduling          (GstQuery *query, GstSchedulingFlags flags,
-                                                   gint minsize, gint maxsize, gint align);
-void            gst_query_parse_scheduling        (GstQuery *query, GstSchedulingFlags *flags,
-                                                   gint *minsize, gint *maxsize, gint *align);
-
-void            gst_query_add_scheduling_mode       (GstQuery *query, GstPadMode mode);
-guint           gst_query_get_n_scheduling_modes    (GstQuery *query);
-GstPadMode      gst_query_parse_nth_scheduling_mode (GstQuery *query, guint index);
-gboolean        gst_query_has_scheduling_mode       (GstQuery *query, GstPadMode mode);
-gboolean        gst_query_has_scheduling_mode_with_flags (GstQuery * query, GstPadMode mode,
-                                                    GstSchedulingFlags flags);
-
-/* accept-caps query */
-GstQuery *      gst_query_new_accept_caps          (GstCaps *caps) G_GNUC_MALLOC;
-void            gst_query_parse_accept_caps        (GstQuery *query, GstCaps **caps);
-void            gst_query_set_accept_caps_result   (GstQuery *query, gboolean result);
-void            gst_query_parse_accept_caps_result (GstQuery *query, gboolean *result);
-
-/* caps query */
-GstQuery *      gst_query_new_caps                 (GstCaps *filter) G_GNUC_MALLOC;
-void            gst_query_parse_caps               (GstQuery *query, GstCaps **filter);
-
-void            gst_query_set_caps_result          (GstQuery *query, GstCaps *caps);
-void            gst_query_parse_caps_result        (GstQuery *query, GstCaps **caps);
-
-/* drain query */
-GstQuery *      gst_query_new_drain                (void) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __GST_QUERY_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstregistry.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstregistry.h
deleted file mode 100644
index f17fe7f9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstregistry.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstregistry.h: Header for registry handling
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_REGISTRY_H__
-#define __GST_REGISTRY_H__
-
-#include <gst/gstconfig.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_REGISTRY               (gst_registry_get_type ())
-#define GST_REGISTRY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_REGISTRY, GstRegistry))
-#define GST_IS_REGISTRY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_REGISTRY))
-#define GST_REGISTRY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_REGISTRY, GstRegistryClass))
-#define GST_IS_REGISTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_REGISTRY))
-#define GST_REGISTRY_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_REGISTRY, GstRegistryClass))
-
-typedef struct _GstRegistry GstRegistry;
-typedef struct _GstRegistryClass GstRegistryClass;
-typedef struct _GstRegistryPrivate GstRegistryPrivate;
-
-/**
- * GstRegistry:
- *
- * Opaque #GstRegistry structure.
- */
-struct _GstRegistry {
-  GstObject      object;
-
-  /*< private >*/
-  GstRegistryPrivate *priv;
-};
-
-struct _GstRegistryClass {
-  GstObjectClass        parent_class;
-};
-
-GType                   gst_registry_get_type           (void);
-
-GstRegistry *           gst_registry_get                (void);
-
-gboolean                gst_registry_scan_path          (GstRegistry *registry, const gchar *path);
-
-#if 0
-void                    gst_registry_add_path           (GstRegistry * registry, const gchar * path);
-GList*                  gst_registry_get_path_list      (GstRegistry *registry);
-#endif
-
-gboolean                gst_registry_add_plugin         (GstRegistry *registry, GstPlugin *plugin);
-void                    gst_registry_remove_plugin      (GstRegistry *registry, GstPlugin *plugin);
-gboolean                gst_registry_add_feature        (GstRegistry * registry, GstPluginFeature * feature);
-void                    gst_registry_remove_feature     (GstRegistry * registry, GstPluginFeature * feature);
-
-GList*                  gst_registry_get_plugin_list    (GstRegistry *registry);
-GList*                  gst_registry_plugin_filter      (GstRegistry *registry,
-                                                         GstPluginFilter filter,
-                                                         gboolean first,
-                                                         gpointer user_data);
-GList*                  gst_registry_feature_filter     (GstRegistry *registry,
-                                                         GstPluginFeatureFilter filter,
-                                                         gboolean first,
-                                                         gpointer user_data);
-GList *                 gst_registry_get_feature_list   (GstRegistry *registry,
-                                                         GType type);
-GList *                 gst_registry_get_feature_list_by_plugin (GstRegistry *registry, const gchar *name);
-guint32                 gst_registry_get_feature_list_cookie (GstRegistry *registry);
-
-GstPlugin*              gst_registry_find_plugin        (GstRegistry *registry, const gchar *name);
-GstPluginFeature*       gst_registry_find_feature       (GstRegistry *registry, const gchar *name, GType type);
-
-GstPlugin *             gst_registry_lookup             (GstRegistry *registry, const char *filename);
-GstPluginFeature *      gst_registry_lookup_feature     (GstRegistry *registry, const char *name);
-
-gboolean                gst_registry_check_feature_version (GstRegistry *registry,
-                                                            const gchar *feature_name,
-                                                            guint        min_major,
-                                                            guint        min_minor,
-                                                            guint        min_micro);
-
-G_END_DECLS
-
-#endif /* __GST_REGISTRY_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsample.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsample.h
deleted file mode 100644
index 97a3843b..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsample.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstsample.h: Header for GstSample object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_SAMPLE_H__
-#define __GST_SAMPLE_H__
-
-#include <gst/gstbuffer.h>
-#include <gst/gstcaps.h>
-#include <gst/gstsegment.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_sample_type;
-
-#define GST_TYPE_SAMPLE      (_gst_sample_type)
-#define GST_IS_SAMPLE(obj)   (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_SAMPLE))
-#define GST_SAMPLE_CAST(obj) ((GstSample *)obj)
-#define GST_SAMPLE(obj)      (GST_SAMPLE_CAST(obj))
-
-/**
- * GstSample:
- *
- * The opaque structure of a #GstSample. A sample contains a typed memory
- * block and the associated timing information. It is mainly used to
- * exchange buffers with an application.
- */
-typedef struct _GstSample GstSample;
-
-GType gst_sample_get_type            (void);
-
-/* allocation */
-GstSample *          gst_sample_new           (GstBuffer          *buffer,
-                                               GstCaps            *caps,
-                                               const GstSegment   *segment,
-                                               GstStructure       *info);
-
-GstBuffer *          gst_sample_get_buffer    (GstSample *sample);
-GstCaps *            gst_sample_get_caps      (GstSample *sample);
-GstSegment *         gst_sample_get_segment   (GstSample *sample);
-const GstStructure * gst_sample_get_info      (GstSample *sample);
-
-/* refcounting */
-/**
- * gst_sample_ref:
- * @sample: a #GstSample
- *
- * Increases the refcount of the given sample by one.
- *
- * Returns: (transfer full): @sample
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstSample * gst_sample_ref (GstSample * sample);
-#endif
-
-static inline GstSample *
-gst_sample_ref (GstSample * sample)
-{
-  return GST_SAMPLE_CAST (gst_mini_object_ref (GST_MINI_OBJECT_CAST (
-      sample)));
-}
-
-/**
- * gst_sample_unref:
- * @sample: (transfer full): a #GstSample
- *
- * Decreases the refcount of the sample. If the refcount reaches 0, the
- * sample will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_sample_unref (GstSample * sample);
-#endif
-
-static inline void
-gst_sample_unref (GstSample * sample)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (sample));
-}
-
-/**
- * gst_value_set_sample:
- * @v: a #GValue to receive the data
- * @b: (transfer none): a #GstSample to assign to the GstValue
- *
- * Sets @b as the value of @v.  Caller retains reference to sample.
- */
-#define         gst_value_set_sample(v,b)       g_value_set_boxed((v),(b))
-/**
- * gst_value_take_sample:
- * @v: a #GValue to receive the data
- * @b: (transfer full): a #GstSample to assign to the GstValue
- *
- * Sets @b as the value of @v.  Caller gives away reference to sample.
- */
-#define         gst_value_take_sample(v,b)      g_value_take_boxed(v,(b))
-/**
- * gst_value_get_sample:
- * @v: a #GValue to query
- *
- * Receives a #GstSample as the value of @v. Does not return a reference to
- * the sample, so the pointer is only valid for as long as the caller owns
- * a reference to @v.
- *
- * Returns: (transfer none): sample
- */
-#define         gst_value_get_sample(v)         GST_SAMPLE_CAST (g_value_get_boxed(v))
-
-G_END_DECLS
-
-#endif /* __GST_SAMPLE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsegment.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsegment.h
deleted file mode 100644
index c364ce60..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsegment.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Wim Taymans <wim@fluendo.com>
- *
- * gstsegment.h: Header for GstSegment subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_SEGMENT_H__
-#define __GST_SEGMENT_H__
-
-#include <gst/gstformat.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_SEGMENT             (gst_segment_get_type())
-
-typedef struct _GstSegment GstSegment;
-
-/**
- * GstSeekType:
- * @GST_SEEK_TYPE_NONE: no change in position is required
- * @GST_SEEK_TYPE_SET: absolute position is requested
- * @GST_SEEK_TYPE_END: relative position to duration is requested
- *
- * The different types of seek events. When constructing a seek event with
- * gst_event_new_seek() or when doing gst_segment_do_seek ().
- */
-typedef enum {
-  /* one of these */
-  GST_SEEK_TYPE_NONE            = 0,
-  GST_SEEK_TYPE_SET             = 1,
-  GST_SEEK_TYPE_END             = 2
-} GstSeekType;
-
-/**
- * GstSeekFlags:
- * @GST_SEEK_FLAG_NONE: no flag
- * @GST_SEEK_FLAG_FLUSH: flush pipeline
- * @GST_SEEK_FLAG_ACCURATE: accurate position is requested, this might
- *                     be considerably slower for some formats.
- * @GST_SEEK_FLAG_KEY_UNIT: seek to the nearest keyframe. This might be
- *                     faster but less accurate.
- * @GST_SEEK_FLAG_SEGMENT: perform a segment seek.
- * @GST_SEEK_FLAG_SKIP: when doing fast foward or fast reverse playback, allow
- *                     elements to skip frames instead of generating all
- *                     frames.
- * @GST_SEEK_FLAG_SNAP_BEFORE: go to a location before the requested position,
- *                     if KEY_UNIT this means the keyframe at or before the
- *                     requested position the one at or before the seek target.
- * @GST_SEEK_FLAG_SNAP_AFTER: go to a location after the requested position,
- *                     if KEY_UNIT this means the keyframe at of after the
- *                     requested position.
- * @GST_SEEK_FLAG_SNAP_NEAREST: go to a position near the requested position,
- *                     if KEY_UNIT this means the keyframe closest to the
- *                     requested position, if both keyframes are at an equal
- *                     distance, behaves like SNAP_BEFORE.
- *
- * Flags to be used with gst_element_seek() or gst_event_new_seek(). All flags
- * can be used together.
- *
- * A non flushing seek might take some time to perform as the currently
- * playing data in the pipeline will not be cleared.
- *
- * An accurate seek might be slower for formats that don't have any indexes
- * or timestamp markers in the stream. Specifying this flag might require a
- * complete scan of the file in those cases.
- *
- * When performing a segment seek: after the playback of the segment completes,
- * no EOS will be emmited by the element that performed the seek, but a
- * #GST_MESSAGE_SEGMENT_DONE message will be posted on the bus by the element.
- * When this message is posted, it is possible to send a new seek event to
- * continue playback. With this seek method it is possible to perform seamless
- * looping or simple linear editing.
- *
- * When doing fast forward (rate > 1.0) or fast reverse (rate < -1.0) trickmode
- * playback, the @GST_SEEK_FLAG_SKIP flag can be used to instruct decoders
- * and demuxers to adjust the playback rate by skipping frames. This can improve
- * performance and decrease CPU usage because not all frames need to be decoded.
- *
- * The @GST_SEEK_FLAG_SNAP_BEFORE flag can be used to snap to the previous
- * relevant location, and the @GST_SEEK_FLAG_SNAP_AFTER flag can be used to
- * select the next relevant location. If KEY_UNIT is specified, the relevant
- * location is a keyframe. If both flags are specified, the nearest of these
- * locations will be selected. If none are specified, the implementation is
- * free to select whichever it wants.
- * The before and after here are in running time, so when playing backwards,
- * the next location refers to the one that will played in next, and not the
- * one that is located after in the actual source stream.
- *
- * Also see part-seeking.txt in the GStreamer design documentation for more
- * details on the meaning of these flags and the behaviour expected of
- * elements that handle them.
- */
-typedef enum {
-  GST_SEEK_FLAG_NONE            = 0,
-  GST_SEEK_FLAG_FLUSH           = (1 << 0),
-  GST_SEEK_FLAG_ACCURATE        = (1 << 1),
-  GST_SEEK_FLAG_KEY_UNIT        = (1 << 2),
-  GST_SEEK_FLAG_SEGMENT         = (1 << 3),
-  GST_SEEK_FLAG_SKIP            = (1 << 4),
-  GST_SEEK_FLAG_SNAP_BEFORE     = (1 << 5),
-  GST_SEEK_FLAG_SNAP_AFTER      = (1 << 6),
-  GST_SEEK_FLAG_SNAP_NEAREST    = GST_SEEK_FLAG_SNAP_BEFORE | GST_SEEK_FLAG_SNAP_AFTER,
-  /* Careful to restart next flag with 1<<7 here */
-} GstSeekFlags;
-
-/**
- * GstSegmentFlags:
- * @GST_SEGMENT_FLAG_NONE: no flags
- * @GST_SEGMENT_FLAG_RESET: reset the pipeline running_time to the segment
- *                          running_time
- * @GST_SEGMENT_FLAG_SKIP: perform skip playback
- * @GST_SEGMENT_FLAG_SEGMENT: send SEGMENT_DONE instead of EOS
- *
- * Flags for the GstSegment structure. Currently mapped to the corresponding
- * values of the seek flags.
- */
-/* Note: update gst_segment_do_seek() when adding new flags here */
-typedef enum { /*< flags >*/
-  GST_SEGMENT_FLAG_NONE            = GST_SEEK_FLAG_NONE,
-  GST_SEGMENT_FLAG_RESET           = GST_SEEK_FLAG_FLUSH,
-  GST_SEGMENT_FLAG_SKIP            = GST_SEEK_FLAG_SKIP,
-  GST_SEGMENT_FLAG_SEGMENT         = GST_SEEK_FLAG_SEGMENT
-} GstSegmentFlags;
-
-/**
- * GstSegment:
- * @flags: flags for this segment
- * @rate: the rate of the segment
- * @applied_rate: the already applied rate to the segment
- * @format: the format of the segment values
- * @base: the base of the segment
- * @offset: the offset to apply to @start or @stop
- * @start: the start of the segment
- * @stop: the stop of the segment
- * @time: the stream time of the segment
- * @position: the position in the segment
- * @duration: the duration of the segment
- *
- * A helper structure that holds the configured region of
- * interest in a media file.
- */
-struct _GstSegment {
-  /*< public >*/
-  GstSegmentFlags flags;
-
-  gdouble         rate;
-  gdouble         applied_rate;
-
-  GstFormat       format;
-  guint64         base;
-  guint64         offset;
-  guint64         start;
-  guint64         stop;
-  guint64         time;
-
-  guint64         position;
-  guint64         duration;
-
-  /* < private > */
-  gpointer        _gst_reserved[GST_PADDING];
-};
-
-GType        gst_segment_get_type            (void);
-
-GstSegment * gst_segment_new                 (void) G_GNUC_MALLOC;
-GstSegment * gst_segment_copy                (const GstSegment *segment) G_GNUC_MALLOC;
-void         gst_segment_copy_into           (const GstSegment *src, GstSegment *dest);
-void         gst_segment_free                (GstSegment *segment);
-
-void         gst_segment_init                (GstSegment *segment, GstFormat format);
-
-guint64      gst_segment_to_stream_time      (const GstSegment *segment, GstFormat format, guint64 position);
-guint64      gst_segment_to_running_time     (const GstSegment *segment, GstFormat format, guint64 position);
-guint64      gst_segment_to_position         (const GstSegment *segment, GstFormat format, guint64 running_time);
-
-gboolean     gst_segment_set_running_time    (GstSegment *segment, GstFormat format, guint64 running_time);
-
-gboolean     gst_segment_clip                (const GstSegment *segment, GstFormat format, guint64 start,
-                                              guint64 stop, guint64 *clip_start, guint64 *clip_stop);
-
-
-gboolean     gst_segment_do_seek             (GstSegment * segment, gdouble rate,
-                                              GstFormat format, GstSeekFlags flags,
-                                              GstSeekType start_type, guint64 start,
-                                              GstSeekType stop_type, guint64 stop, gboolean * update);
-
-G_END_DECLS
-
-#endif /* __GST_SEGMENT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gststructure.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gststructure.h
deleted file mode 100644
index 90c4b59b..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gststructure.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 David A. Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_STRUCTURE_H__
-#define __GST_STRUCTURE_H__
-
-#include <gst/gstconfig.h>
-#include <glib-object.h>
-#include <gst/gstclock.h>
-#include <gst/gstdatetime.h>
-#include <gst/glib-compat.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_structure_type;
-
-typedef struct _GstStructure GstStructure;
-
-#define GST_TYPE_STRUCTURE             (_gst_structure_type)
-#define GST_IS_STRUCTURE(object)       ((object) && (GST_STRUCTURE(object)->type == GST_TYPE_STRUCTURE))
-#define GST_STRUCTURE_CAST(object)     ((GstStructure *)(object))
-#define GST_STRUCTURE(object)          (GST_STRUCTURE_CAST(object))
-
-
-/**
- * GstStructureForeachFunc:
- * @field_id: the #GQuark of the field name
- * @value: the #GValue of the field
- * @user_data: user data
- *
- * A function that will be called in gst_structure_foreach(). The function may
- * not modify @value.
- *
- * Returns: TRUE if the foreach operation should continue, FALSE if
- * the foreach operation should stop with FALSE.
- */
-typedef gboolean (*GstStructureForeachFunc) (GQuark   field_id,
-					     const GValue * value,
-					     gpointer user_data);
-
-/**
- * GstStructureMapFunc:
- * @field_id: the #GQuark of the field name
- * @value: the #GValue of the field
- * @user_data: user data
- *
- * A function that will be called in gst_structure_map_in_place(). The function
- * may modify @value.
- *
- * Returns: TRUE if the map operation should continue, FALSE if
- * the map operation should stop with FALSE.
- */
-typedef gboolean (*GstStructureMapFunc)     (GQuark   field_id,
-					     GValue * value,
-					     gpointer user_data);
-
-/**
- * GstStructure:
- * @type: the GType of a structure
- *
- * The GstStructure object. Most fields are private.
- */
-struct _GstStructure {
-  GType type;
-
-  /*< private >*/
-  GQuark name;
-};
-
-GType                   gst_structure_get_type             (void);
-
-GstStructure *          gst_structure_new_empty            (const gchar *            name) G_GNUC_MALLOC;
-GstStructure *          gst_structure_new_id_empty         (GQuark                   quark) G_GNUC_MALLOC;
-GstStructure *          gst_structure_new                  (const gchar *            name,
-					                    const gchar *            firstfield,
-							    ...) G_GNUC_NULL_TERMINATED  G_GNUC_MALLOC;
-GstStructure *          gst_structure_new_valist           (const gchar *            name,
-						            const gchar *            firstfield,
-							    va_list                  varargs) G_GNUC_MALLOC;
-GstStructure *          gst_structure_new_id               (GQuark                   name_quark,
-                                                            GQuark                   field_quark,
-                                                            ...) G_GNUC_MALLOC;
-GstStructure *          gst_structure_copy                 (const GstStructure      *structure) G_GNUC_MALLOC;
-gboolean		gst_structure_set_parent_refcount  (GstStructure            *structure,
-                                                            gint                    *refcount);
-void                    gst_structure_free                 (GstStructure            *structure);
-
-const gchar *		gst_structure_get_name             (const GstStructure      *structure);
-GQuark			gst_structure_get_name_id          (const GstStructure      *structure);
-gboolean                gst_structure_has_name             (const GstStructure      *structure,
-							    const gchar             *name);
-void                    gst_structure_set_name             (GstStructure            *structure,
-							    const gchar             *name);
-
-void                    gst_structure_id_set_value         (GstStructure            *structure,
-							    GQuark                   field,
-							    const GValue            *value);
-void                    gst_structure_set_value            (GstStructure            *structure,
-							    const gchar             *fieldname,
-							    const GValue            *value);
-void                    gst_structure_id_take_value         (GstStructure            *structure,
-							    GQuark                   field,
-							    GValue                  *value);
-void                    gst_structure_take_value            (GstStructure            *structure,
-							    const gchar             *fieldname,
-							    GValue                  *value);
-void                    gst_structure_set                  (GstStructure            *structure,
-							    const gchar             *fieldname,
-							    ...) G_GNUC_NULL_TERMINATED;
-
-void                    gst_structure_set_valist           (GstStructure            *structure,
-							    const gchar             *fieldname,
-							    va_list varargs);
-
-void                    gst_structure_id_set                (GstStructure            *structure,
-							    GQuark                   fieldname,
-							    ...) G_GNUC_NULL_TERMINATED;
-
-void                    gst_structure_id_set_valist         (GstStructure            *structure,
-							    GQuark                   fieldname,
-							    va_list varargs);
-
-gboolean                gst_structure_get_valist           (const GstStructure      *structure,
-                                                            const char              *first_fieldname,
-                                                            va_list                  args);
-
-gboolean                gst_structure_get                  (const GstStructure      *structure,
-                                                            const char              *first_fieldname,
-                                                            ...) G_GNUC_NULL_TERMINATED;
-
-gboolean                gst_structure_id_get_valist        (const GstStructure      *structure,
-                                                            GQuark                   first_field_id,
-                                                            va_list                  args);
-
-gboolean                gst_structure_id_get               (const GstStructure      *structure,
-                                                            GQuark                   first_field_id,
-                                                            ...) G_GNUC_NULL_TERMINATED;
-
-const GValue *		gst_structure_id_get_value         (const GstStructure      *structure,
-							    GQuark                   field);
-const GValue *		gst_structure_get_value            (const GstStructure      *structure,
-							    const gchar             *fieldname);
-void                    gst_structure_remove_field         (GstStructure            *structure,
-							    const gchar             *fieldname);
-void                    gst_structure_remove_fields        (GstStructure            *structure,
-							     const gchar            *fieldname,
-							    ...) G_GNUC_NULL_TERMINATED;
-void                    gst_structure_remove_fields_valist (GstStructure             *structure,
-							    const gchar             *fieldname,
-							    va_list                  varargs);
-void                    gst_structure_remove_all_fields    (GstStructure            *structure);
-
-GType                   gst_structure_get_field_type       (const GstStructure      *structure,
-							    const gchar             *fieldname);
-gboolean                gst_structure_foreach              (const GstStructure      *structure,
-							    GstStructureForeachFunc  func,
-							    gpointer                 user_data);
-gboolean                gst_structure_map_in_place         (GstStructure            *structure,
-							    GstStructureMapFunc      func,
-							    gpointer                 user_data);
-gint                    gst_structure_n_fields             (const GstStructure      *structure);
-const gchar *           gst_structure_nth_field_name       (const GstStructure      *structure, guint index);
-gboolean                gst_structure_id_has_field         (const GstStructure      *structure,
-							    GQuark                   field);
-gboolean                gst_structure_id_has_field_typed   (const GstStructure      *structure,
-							    GQuark                   field,
-							    GType                    type);
-gboolean                gst_structure_has_field            (const GstStructure      *structure,
-							    const gchar             *fieldname);
-gboolean                gst_structure_has_field_typed      (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    GType                    type);
-
-/* utility functions */
-gboolean                gst_structure_get_boolean          (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    gboolean                *value);
-gboolean                gst_structure_get_int              (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    gint                    *value);
-gboolean                gst_structure_get_uint             (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    guint                   *value);
-gboolean                gst_structure_get_double           (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    gdouble                 *value);
-gboolean                gst_structure_get_date             (const GstStructure      *structure,
-							    const gchar             *fieldname,
-                                                            GDate                  **value);
-gboolean                gst_structure_get_date_time        (const GstStructure      *structure,
-							    const gchar             *fieldname,
-                                                            GstDateTime              **value);
-gboolean                gst_structure_get_clock_time       (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    GstClockTime            *value);
-const gchar *		gst_structure_get_string           (const GstStructure      *structure,
-							    const gchar             *fieldname);
-gboolean                gst_structure_get_enum             (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    GType                    enumtype,
-							    gint                    *value);
-gboolean                gst_structure_get_fraction         (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    gint *value_numerator,
-							    gint *value_denominator);
-
-gchar *                 gst_structure_to_string            (const GstStructure      *structure) G_GNUC_MALLOC;
-GstStructure *          gst_structure_from_string          (const gchar             *string,
-							    gchar                  **end) G_GNUC_MALLOC;
-
-gboolean                 gst_structure_fixate_field_nearest_int    (GstStructure *structure,
-									 const char   *field_name,
-									 int           target);
-gboolean                 gst_structure_fixate_field_nearest_double (GstStructure *structure,
-									 const char   *field_name,
-									 double        target);
-
-gboolean                 gst_structure_fixate_field_boolean (GstStructure *structure,
-									 const char   *field_name,
-									 gboolean        target);
-gboolean                 gst_structure_fixate_field_string (GstStructure *structure,
-									 const char   *field_name,
-									 const gchar  *target);
-gboolean                 gst_structure_fixate_field_nearest_fraction (GstStructure *structure,
-									 const char   *field_name,
-									 const gint target_numerator,
-									 const gint target_denominator);
-gboolean                 gst_structure_fixate_field  (GstStructure *structure,
-						      const char   *field_name);
-
-gboolean                 gst_structure_is_equal(const GstStructure *structure1,
-						const GstStructure *structure2);
-gboolean                 gst_structure_is_subset(const GstStructure *subset,
-                                                 const GstStructure *superset);
-gboolean                 gst_structure_can_intersect(const GstStructure *struct1,
-						     const GstStructure *struct2);
-GstStructure*            gst_structure_intersect (const GstStructure *struct1,
-                                                  const GstStructure *struct2)  G_GNUC_MALLOC;
-void                     gst_structure_fixate    (GstStructure *structure);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsystemclock.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsystemclock.h
deleted file mode 100644
index fc3b9b18..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstsystemclock.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstsystemclock.h: A clock implementation based on system time
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_SYSTEM_CLOCK_H__
-#define __GST_SYSTEM_CLOCK_H__
-
-#include <gst/gstclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_SYSTEM_CLOCK                   (gst_system_clock_get_type ())
-#define GST_SYSTEM_CLOCK(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SYSTEM_CLOCK, GstSystemClock))
-#define GST_SYSTEM_CLOCK_CAST(obj)              ((GstSystemClock *)(obj))
-#define GST_IS_SYSTEM_CLOCK(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SYSTEM_CLOCK))
-#define GST_SYSTEM_CLOCK_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SYSTEM_CLOCK, GstSystemClockClass))
-#define GST_IS_SYSTEM_CLOCK_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SYSTEM_CLOCK))
-#define GST_SYSTEM_CLOCK_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_SYSTEM_CLOCK, GstSystemClockClass))
-
-
-typedef struct _GstSystemClock GstSystemClock;
-typedef struct _GstSystemClockClass GstSystemClockClass;
-typedef struct _GstSystemClockPrivate GstSystemClockPrivate;
-
-/**
- * GstClockType:
- * @GST_CLOCK_TYPE_REALTIME: time since Epoch
- * @GST_CLOCK_TYPE_MONOTONIC: monotonic time since some unspecified starting
- *                            point
- * @GST_CLOCK_TYPE_OTHER: some other time source is used (Since: 1.0.5)
- *
- * The different kind of clocks.
- */
-typedef enum {
-  GST_CLOCK_TYPE_REALTIME       = 0,
-  GST_CLOCK_TYPE_MONOTONIC      = 1,
-  GST_CLOCK_TYPE_OTHER          = 2
-} GstClockType;
-
-/**
- * GstSystemClock:
- *
- * The default implementation of a #GstClock that uses the system time.
- */
-struct _GstSystemClock {
-  GstClock       clock;
-
-  /*< private >*/
-  GstSystemClockPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstSystemClockClass {
-  GstClockClass  parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_system_clock_get_type       (void);
-
-GstClock*               gst_system_clock_obtain         (void);
-
-G_END_DECLS
-
-#endif /* __GST_SYSTEM_CLOCK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttaglist.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttaglist.h
deleted file mode 100644
index a818105e..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttaglist.h
+++ /dev/null
@@ -1,1049 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttaglist.h: Header for tag support
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TAGLIST_H__
-#define __GST_TAGLIST_H__
-
-#include <gst/gstdatetime.h>
-#include <gst/gstsample.h>
-#include <gst/gstbuffer.h>
-#include <gst/glib-compat.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstTagMergeMode:
- * @GST_TAG_MERGE_UNDEFINED: undefined merge mode
- * @GST_TAG_MERGE_REPLACE_ALL: replace all tags (clear list and append)
- * @GST_TAG_MERGE_REPLACE: replace tags
- * @GST_TAG_MERGE_APPEND: append tags
- * @GST_TAG_MERGE_PREPEND: prepend tags
- * @GST_TAG_MERGE_KEEP: keep existing tags
- * @GST_TAG_MERGE_KEEP_ALL: keep all existing tags
- * @GST_TAG_MERGE_COUNT: the number of merge modes
- *
- * The different tag merging modes are basically replace, overwrite and append,
- * but they can be seen from two directions. Given two taglists: (A) the tags
- * already in the element and (B) the ones that are supplied to the element (
- * e.g. via gst_tag_setter_merge_tags() / gst_tag_setter_add_tags() or a
- * %GST_EVENT_TAG), how are these tags merged?
- * In the table below this is shown for the cases that a tag exists in the list
- * (A) or does not exists (!A) and combinations thereof.
- *
- * <table frame="all" colsep="1" rowsep="1">
- *   <title>merge mode</title>
- *   <tgroup cols='5' align='left'>
- *     <thead>
- *       <row>
- *         <entry>merge mode</entry>
- *         <entry>A + B</entry>
- *         <entry>A + !B</entry>
- *         <entry>!A + B</entry>
- *         <entry>!A + !B</entry>
- *       </row>
- *     </thead>
- *     <tbody>
- *       <row>
- *         <entry>REPLACE_ALL</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>REPLACE</entry>
- *         <entry>B</entry>
- *         <entry>A</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>APPEND</entry>
- *         <entry>A, B</entry>
- *         <entry>A</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>PREPEND</entry>
- *         <entry>B, A</entry>
- *         <entry>A</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>KEEP</entry>
- *         <entry>A</entry>
- *         <entry>A</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>KEEP_ALL</entry>
- *         <entry>A</entry>
- *         <entry>A</entry>
- *         <entry>-</entry>
- *         <entry>-</entry>
- *       </row>
- *     </tbody>
- *   </tgroup>
- * </table>
- */
-typedef enum {
-  GST_TAG_MERGE_UNDEFINED,
-  GST_TAG_MERGE_REPLACE_ALL,
-  GST_TAG_MERGE_REPLACE,
-  GST_TAG_MERGE_APPEND,
-  GST_TAG_MERGE_PREPEND,
-  GST_TAG_MERGE_KEEP,
-  GST_TAG_MERGE_KEEP_ALL,
-  /* add more */
-  GST_TAG_MERGE_COUNT
-} GstTagMergeMode;
-
-#define GST_TAG_MODE_IS_VALID(mode)     (((mode) > GST_TAG_MERGE_UNDEFINED) && ((mode) < GST_TAG_MERGE_COUNT))
-
-/**
- * GstTagFlag:
- * @GST_TAG_FLAG_UNDEFINED: undefined flag
- * @GST_TAG_FLAG_META: tag is meta data
- * @GST_TAG_FLAG_ENCODED: tag is encoded
- * @GST_TAG_FLAG_DECODED: tag is decoded
- * @GST_TAG_FLAG_COUNT: number of tag flags
- *
- * Extra tag flags used when registering tags.
- */
-/* FIXME: these are not really flags .. */
-typedef enum {
-  GST_TAG_FLAG_UNDEFINED,
-  GST_TAG_FLAG_META,
-  GST_TAG_FLAG_ENCODED,
-  GST_TAG_FLAG_DECODED,
-  GST_TAG_FLAG_COUNT
-} GstTagFlag;
-
-#define GST_TAG_FLAG_IS_VALID(flag)     (((flag) > GST_TAG_FLAG_UNDEFINED) && ((flag) < GST_TAG_FLAG_COUNT))
-
-/**
- * GstTagList:
- * @mini_object: the parent type
- *
- * Object describing tags / metadata.
- */
-typedef struct _GstTagList GstTagList;
-struct _GstTagList {
-  GstMiniObject mini_object;
-};
-
-#define GST_TAG_LIST(x)       ((GstTagList *) (x))
-#define GST_TYPE_TAG_LIST     (gst_tag_list_get_type ())
-#define GST_IS_TAG_LIST(obj)  (GST_IS_MINI_OBJECT_TYPE((obj), GST_TYPE_TAG_LIST))
-
-/**
- * GstTagForeachFunc:
- * @list: the #GstTagList
- * @tag: a name of a tag in @list
- * @user_data: user data
- *
- * A function that will be called in gst_tag_list_foreach(). The function may
- * not modify the tag list.
- */
-typedef void (*GstTagForeachFunc) (const GstTagList * list,
-                                   const gchar      * tag,
-                                   gpointer           user_data);
-
-/**
- * GstTagMergeFunc:
- * @dest: the destination #GValue
- * @src: the source #GValue
- *
- * A function for merging multiple values of a tag used when registering
- * tags.
- */
-typedef void (* GstTagMergeFunc) (GValue *dest, const GValue *src);
-
-GType        gst_tag_list_get_type (void);
-
-/* tag registration */
-void         gst_tag_register      (const gchar     * name,
-                                    GstTagFlag        flag,
-                                    GType             type,
-                                    const gchar     * nick,
-                                    const gchar     * blurb,
-                                    GstTagMergeFunc   func);
-
-void         gst_tag_register_static (const gchar   * name,
-                                      GstTagFlag      flag,
-                                      GType           type,
-                                      const gchar   * nick,
-                                      const gchar   * blurb,
-                                      GstTagMergeFunc func);
-
-/* some default merging functions */
-void      gst_tag_merge_use_first          (GValue * dest, const GValue * src);
-void      gst_tag_merge_strings_with_comma (GValue * dest, const GValue * src);
-
-/* basic tag support */
-gboolean               gst_tag_exists          (const gchar * tag);
-GType                  gst_tag_get_type        (const gchar * tag);
-const gchar *          gst_tag_get_nick        (const gchar * tag);
-const gchar *          gst_tag_get_description (const gchar * tag);
-GstTagFlag             gst_tag_get_flag        (const gchar * tag);
-gboolean               gst_tag_is_fixed        (const gchar * tag);
-
-/* tag lists */
-
-/**
- * GstTagScope:
- * @GST_TAG_SCOPE_STREAM: tags specific to this single stream
- * @GST_TAG_SCOPE_GLOBAL: global tags for the complete medium
- *
- * GstTagScope specifies if a taglist applies to the complete
- * medium or only to one single stream.
- */
-typedef enum {
-  GST_TAG_SCOPE_STREAM,
-  GST_TAG_SCOPE_GLOBAL
-} GstTagScope;
-
-GstTagList * gst_tag_list_new_empty         (void) G_GNUC_MALLOC;
-GstTagList * gst_tag_list_new               (const gchar * tag, ...) G_GNUC_MALLOC;
-GstTagList * gst_tag_list_new_valist        (va_list var_args) G_GNUC_MALLOC;
-
-void         gst_tag_list_set_scope         (GstTagList * list, GstTagScope scope);
-GstTagScope  gst_tag_list_get_scope         (const GstTagList * list);
-
-gchar      * gst_tag_list_to_string         (const GstTagList * list) G_GNUC_MALLOC;
-GstTagList * gst_tag_list_new_from_string   (const gchar      * str) G_GNUC_MALLOC;
-
-gint         gst_tag_list_n_tags            (const GstTagList * list);
-const gchar* gst_tag_list_nth_tag_name      (const GstTagList * list, guint index);
-gboolean     gst_tag_list_is_empty          (const GstTagList * list);
-gboolean     gst_tag_list_is_equal          (const GstTagList * list1,
-                                             const GstTagList * list2);
-void         gst_tag_list_insert            (GstTagList       * into,
-                                             const GstTagList * from,
-                                             GstTagMergeMode    mode);
-GstTagList * gst_tag_list_merge             (const GstTagList * list1,
-                                             const GstTagList * list2,
-                                             GstTagMergeMode    mode) G_GNUC_MALLOC;
-guint        gst_tag_list_get_tag_size      (const GstTagList * list,
-                                             const gchar      * tag);
-void         gst_tag_list_add               (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             ...) G_GNUC_NULL_TERMINATED;
-void         gst_tag_list_add_values        (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             ...) G_GNUC_NULL_TERMINATED;
-void         gst_tag_list_add_valist        (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             va_list        var_args);
-void         gst_tag_list_add_valist_values (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             va_list            var_args);
-void         gst_tag_list_add_value         (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             const GValue     * value);
-void         gst_tag_list_remove_tag        (GstTagList       * list,
-                                             const gchar      * tag);
-void         gst_tag_list_foreach           (const GstTagList * list,
-                                             GstTagForeachFunc  func,
-                                             gpointer           user_data);
-
-const GValue *
-             gst_tag_list_get_value_index   (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index);
-gboolean     gst_tag_list_copy_value        (GValue           * dest,
-                                             const GstTagList * list,
-                                             const gchar      * tag);
-
-/* simplifications (FIXME: do we want them?) */
-gboolean     gst_tag_list_get_boolean       (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gboolean         * value);
-gboolean     gst_tag_list_get_boolean_index (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gboolean         * value);
-gboolean     gst_tag_list_get_int           (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gint             * value);
-gboolean     gst_tag_list_get_int_index     (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gint             * value);
-gboolean     gst_tag_list_get_uint          (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint            * value);
-gboolean     gst_tag_list_get_uint_index    (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             guint            * value);
-gboolean     gst_tag_list_get_int64         (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gint64           * value);
-gboolean     gst_tag_list_get_int64_index   (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gint64           * value);
-gboolean     gst_tag_list_get_uint64        (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint64          * value);
-gboolean     gst_tag_list_get_uint64_index  (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             guint64          * value);
-gboolean     gst_tag_list_get_float         (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gfloat           * value);
-gboolean     gst_tag_list_get_float_index   (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gfloat           * value);
-gboolean     gst_tag_list_get_double        (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gdouble          * value);
-gboolean     gst_tag_list_get_double_index  (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gdouble          * value);
-gboolean     gst_tag_list_get_string        (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gchar           ** value);
-gboolean     gst_tag_list_get_string_index  (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gchar           ** value);
-gboolean     gst_tag_list_peek_string_index (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             const gchar     ** value);
-gboolean     gst_tag_list_get_pointer       (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gpointer         * value);
-gboolean     gst_tag_list_get_pointer_index (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gpointer         * value);
-gboolean     gst_tag_list_get_date          (const GstTagList * list,
-                                             const gchar      * tag,
-                                             GDate           ** value);
-gboolean     gst_tag_list_get_date_index    (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             GDate           ** value);
-gboolean     gst_tag_list_get_date_time     (const GstTagList * list,
-                                             const gchar      * tag,
-                                             GstDateTime     ** value);
-gboolean     gst_tag_list_get_date_time_index (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             GstDateTime     ** value);
-gboolean     gst_tag_list_get_sample        (const GstTagList * list,
-                                             const gchar      * tag,
-                                             GstSample       ** sample);
-gboolean     gst_tag_list_get_sample_index  (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             GstSample       ** sample);
-
-/* refcounting */
-/**
- * gst_tag_list_ref:
- * @taglist: the #GstTagList to reference
- *
- * Add a reference to a #GstTagList mini object.
- *
- * From this point on, until the caller calls gst_tag_list_unref() or
- * gst_tag_list_make_writable(), it is guaranteed that the taglist object will
- * not change. To use a #GstTagList object, you must always have a refcount on
- * it -- either the one made implicitly by e.g. gst_tag_list_new(), or via
- * taking one explicitly with this function.
- *
- * Returns: the same #GstTagList mini object.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstTagList * gst_tag_list_ref (GstTagList * taglist);
-#endif
-
-static inline GstTagList *
-gst_tag_list_ref (GstTagList * taglist)
-{
-  return (GstTagList *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (taglist));
-}
-
-/**
- * gst_tag_list_unref:
- * @taglist: a #GstTagList.
- *
- * Unref a #GstTagList, and and free all its memory when the refcount reaches 0.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_tag_list_unref (GstTagList * taglist);
-#endif
-
-static inline void
-gst_tag_list_unref (GstTagList * taglist)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (taglist));
-}
-
-/**
- * gst_tag_list_copy:
- * @taglist: a #GstTagList.
- *
- * Creates a new #GstTagList as a copy of the old @taglist. The new taglist
- * will have a refcount of 1, owned by the caller, and will be writable as
- * a result.
- *
- * Note that this function is the semantic equivalent of a gst_tag_list_ref()
- * followed by a gst_tag_list_make_writable(). If you only want to hold on to a
- * reference to the data, you should use gst_tag_list_ref().
- *
- * When you are finished with the taglist, call gst_tag_list_unref() on it.
- *
- * Returns: the new #GstTagList
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstTagList * gst_tag_list_copy (const GstTagList * taglist);
-#endif
-
-static inline GstTagList *
-gst_tag_list_copy (const GstTagList * taglist)
-{
-  return GST_TAG_LIST (gst_mini_object_copy (GST_MINI_OBJECT_CAST (taglist)));
-}
-
-/**
- * gst_tag_list_is_writable:
- * @taglist: a #GstTagList
- *
- * Tests if you can safely modify @taglist. It is only safe to modify taglist
- * when there is only one owner of the taglist - ie, the refcount is 1.
- */
-#define gst_tag_list_is_writable(taglist)    gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (taglist))
-
-/**
- * gst_tag_list_make_writable:
- * @taglist: (transfer full): a #GstTagList
- *
- * Returns a writable copy of @taglist.
- *
- * If there is only one reference count on @taglist, the caller must be the
- * owner, and so this function will return the taglist object unchanged. If on
- * the other hand there is more than one reference on the object, a new taglist
- * object will be returned (which will be a copy of @taglist). The caller's
- * reference on @taglist will be removed, and instead the caller will own a
- * reference to the returned object.
- *
- * In short, this function unrefs the taglist in the argument and refs the
- * taglist that it returns. Don't access the argument after calling this
- * function. See also: gst_tag_list_ref().
- *
- * Returns: (transfer full): a writable taglist which may or may not be the
- *     same as @taglist
- */
-#define gst_tag_list_make_writable(taglist)   GST_TAG_LIST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (taglist)))
-
-/* GStreamer core tags */
-/**
- * GST_TAG_TITLE:
- *
- * commonly used title (string)
- *
- * The title as it should be displayed, e.g. 'The Doll House'
- */
-#define GST_TAG_TITLE                  "title"
-/**
- * GST_TAG_TITLE_SORTNAME:
- *
- * commonly used title, as used for sorting (string)
- *
- * The title as it should be sorted, e.g. 'Doll House, The'
- */
-#define GST_TAG_TITLE_SORTNAME         "title-sortname"
-/**
- * GST_TAG_ARTIST:
- *
- * person(s) responsible for the recording (string)
- *
- * The artist name as it should be displayed, e.g. 'Jimi Hendrix' or
- * 'The Guitar Heroes'
- */
-#define GST_TAG_ARTIST                 "artist"
-/**
- * GST_TAG_ARTIST_SORTNAME:
- *
- * person(s) responsible for the recording, as used for sorting (string)
- *
- * The artist name as it should be sorted, e.g. 'Hendrix, Jimi' or
- * 'Guitar Heroes, The'
- */
-#define GST_TAG_ARTIST_SORTNAME        "artist-sortname"
-/**
- * GST_TAG_ALBUM:
- *
- * album containing this data (string)
- *
- * The album name as it should be displayed, e.g. 'The Jazz Guitar'
- */
-#define GST_TAG_ALBUM                  "album"
-/**
- * GST_TAG_ALBUM_SORTNAME:
- *
- * album containing this data, as used for sorting (string)
- *
- * The album name as it should be sorted, e.g. 'Jazz Guitar, The'
- */
-#define GST_TAG_ALBUM_SORTNAME         "album-sortname"
-/**
- * GST_TAG_ALBUM_ARTIST:
- *
- * The artist of the entire album, as it should be displayed.
- */
-#define GST_TAG_ALBUM_ARTIST           "album-artist"
-/**
- * GST_TAG_ALBUM_ARTIST_SORTNAME:
- *
- * The artist of the entire album, as it should be sorted.
- */
-#define GST_TAG_ALBUM_ARTIST_SORTNAME  "album-artist-sortname"
-/**
- * GST_TAG_COMPOSER:
- *
- * person(s) who composed the recording (string)
- */
-#define GST_TAG_COMPOSER               "composer"
-/**
- * GST_TAG_DATE:
- *
- * date the data was created (#GDate structure)
- */
-#define GST_TAG_DATE                   "date"
-/**
- * GST_TAG_DATE_TIME:
- *
- * date and time the data was created (#GstDateTime structure)
- */
-#define GST_TAG_DATE_TIME              "datetime"
-/**
- * GST_TAG_GENRE:
- *
- * genre this data belongs to (string)
- */
-#define GST_TAG_GENRE                  "genre"
-/**
- * GST_TAG_COMMENT:
- *
- * free text commenting the data (string)
- */
-#define GST_TAG_COMMENT                "comment"
-/**
- * GST_TAG_EXTENDED_COMMENT:
- *
- * key/value text commenting the data (string)
- *
- * Must be in the form of 'key=comment' or
- * 'key[lc]=comment' where 'lc' is an ISO-639
- * language code.
- *
- * This tag is used for unknown Vorbis comment tags,
- * unknown APE tags and certain ID3v2 comment fields.
- */
-#define GST_TAG_EXTENDED_COMMENT       "extended-comment"
-/**
- * GST_TAG_TRACK_NUMBER:
- *
- * track number inside a collection (unsigned integer)
- */
-#define GST_TAG_TRACK_NUMBER           "track-number"
-/**
- * GST_TAG_TRACK_COUNT:
- *
- * count of tracks inside collection this track belongs to (unsigned integer)
- */
-#define GST_TAG_TRACK_COUNT            "track-count"
-/**
- * GST_TAG_ALBUM_VOLUME_NUMBER:
- *
- * disc number inside a collection (unsigned integer)
- */
-#define GST_TAG_ALBUM_VOLUME_NUMBER    "album-disc-number"
-/**
- * GST_TAG_ALBUM_VOLUME_COUNT:
- *
- * count of discs inside collection this disc belongs to (unsigned integer)
- */
-#define GST_TAG_ALBUM_VOLUME_COUNT    "album-disc-count"
-/**
- * GST_TAG_LOCATION:
- *
- * Origin of media as a URI (location, where the original of the file or stream
- * is hosted) (string)
- */
-#define GST_TAG_LOCATION               "location"
-/**
- * GST_TAG_HOMEPAGE:
- *
- * Homepage for this media (i.e. artist or movie homepage) (string)
- */
-#define GST_TAG_HOMEPAGE               "homepage"
-/**
- * GST_TAG_DESCRIPTION:
- *
- * short text describing the content of the data (string)
- */
-#define GST_TAG_DESCRIPTION            "description"
-/**
- * GST_TAG_VERSION:
- *
- * version of this data (string)
- */
-#define GST_TAG_VERSION                "version"
-/**
- * GST_TAG_ISRC:
- *
- * International Standard Recording Code - see http://www.ifpi.org/isrc/ (string)
- */
-#define GST_TAG_ISRC                   "isrc"
-/**
- * GST_TAG_ORGANIZATION:
- *
- * organization (string)
- */
-#define GST_TAG_ORGANIZATION           "organization"
-/**
- * GST_TAG_COPYRIGHT:
- *
- * copyright notice of the data (string)
- */
-#define GST_TAG_COPYRIGHT              "copyright"
-/**
- * GST_TAG_COPYRIGHT_URI:
- *
- * URI to location where copyright details can be found (string)
- */
-#define GST_TAG_COPYRIGHT_URI          "copyright-uri"
-/**
- * GST_TAG_ENCODED_BY:
- *
- * name of the person or organisation that encoded the file. May contain a
- * copyright message if the person or organisation also holds the copyright
- * (string)
- *
- * Note: do not use this field to describe the encoding application. Use
- * #GST_TAG_APPLICATION_NAME or #GST_TAG_COMMENT for that.
- */
-#define GST_TAG_ENCODED_BY             "encoded-by"
-/**
- * GST_TAG_CONTACT:
- *
- * contact information (string)
- */
-#define GST_TAG_CONTACT                "contact"
-/**
- * GST_TAG_LICENSE:
- *
- * license of data (string)
- */
-#define GST_TAG_LICENSE                "license"
-/**
- * GST_TAG_LICENSE_URI:
- *
- * URI to location where license details can be found (string)
- */
-#define GST_TAG_LICENSE_URI            "license-uri"
-/**
- * GST_TAG_PERFORMER:
- *
- * person(s) performing (string)
- */
-#define GST_TAG_PERFORMER              "performer"
-/**
- * GST_TAG_DURATION:
- *
- * length in GStreamer time units (nanoseconds) (unsigned 64-bit integer)
- */
-#define GST_TAG_DURATION               "duration"
-/**
- * GST_TAG_CODEC:
- *
- * codec the data is stored in (string)
- */
-#define GST_TAG_CODEC                  "codec"
-/**
- * GST_TAG_VIDEO_CODEC:
- *
- * codec the video data is stored in (string)
- */
-#define GST_TAG_VIDEO_CODEC            "video-codec"
-/**
- * GST_TAG_AUDIO_CODEC:
- *
- * codec the audio data is stored in (string)
- */
-#define GST_TAG_AUDIO_CODEC            "audio-codec"
-/**
- * GST_TAG_SUBTITLE_CODEC:
- *
- * codec/format the subtitle data is stored in (string)
- */
-#define GST_TAG_SUBTITLE_CODEC         "subtitle-codec"
-/**
- * GST_TAG_CONTAINER_FORMAT:
- *
- * container format the data is stored in (string)
- */
-#define GST_TAG_CONTAINER_FORMAT       "container-format"
-/**
- * GST_TAG_BITRATE:
- *
- * exact or average bitrate in bits/s (unsigned integer)
- */
-#define GST_TAG_BITRATE                "bitrate"
-/**
- * GST_TAG_NOMINAL_BITRATE:
- *
- * nominal bitrate in bits/s (unsigned integer). The actual bitrate might be
- * different from this target bitrate.
- */
-#define GST_TAG_NOMINAL_BITRATE        "nominal-bitrate"
-/**
- * GST_TAG_MINIMUM_BITRATE:
- *
- * minimum bitrate in bits/s (unsigned integer)
- */
-#define GST_TAG_MINIMUM_BITRATE        "minimum-bitrate"
-/**
- * GST_TAG_MAXIMUM_BITRATE:
- *
- * maximum bitrate in bits/s (unsigned integer)
- */
-#define GST_TAG_MAXIMUM_BITRATE        "maximum-bitrate"
-/**
- * GST_TAG_SERIAL:
- *
- * serial number of track (unsigned integer)
- */
-#define GST_TAG_SERIAL                 "serial"
-/**
- * GST_TAG_ENCODER:
- *
- * encoder used to encode this stream (string)
- */
-#define GST_TAG_ENCODER                "encoder"
-/**
- * GST_TAG_ENCODER_VERSION:
- *
- * version of the encoder used to encode this stream (unsigned integer)
- */
-#define GST_TAG_ENCODER_VERSION        "encoder-version"
-/**
- * GST_TAG_TRACK_GAIN:
- *
- * track gain in db (double)
- */
-#define GST_TAG_TRACK_GAIN             "replaygain-track-gain"
-/**
- * GST_TAG_TRACK_PEAK:
- *
- * peak of the track (double)
- */
-#define GST_TAG_TRACK_PEAK             "replaygain-track-peak"
-/**
- * GST_TAG_ALBUM_GAIN:
- *
- * album gain in db (double)
- */
-#define GST_TAG_ALBUM_GAIN             "replaygain-album-gain"
-/**
- * GST_TAG_ALBUM_PEAK:
- *
- * peak of the album (double)
- */
-#define GST_TAG_ALBUM_PEAK             "replaygain-album-peak"
-/**
- * GST_TAG_REFERENCE_LEVEL:
- *
- * reference level of track and album gain values (double)
- */
-#define GST_TAG_REFERENCE_LEVEL        "replaygain-reference-level"
-/**
- * GST_TAG_LANGUAGE_CODE:
- *
- * ISO-639-2 or ISO-639-1 code for the language the content is in (string)
- *
- * There is utility API in libgsttag in gst-plugins-base to obtain a translated
- * language name from the language code: gst_tag_get_language_name()
- */
-#define GST_TAG_LANGUAGE_CODE          "language-code"
-/**
- * GST_TAG_LANGUAGE_NAME:
- *
- * Name of the language the content is in (string)
- *
- * Free-form name of the language the content is in, if a language code
- * is not available. This tag should not be set in addition to a language
- * code. It is undefined what language or locale the language name is in.
- */
-#define GST_TAG_LANGUAGE_NAME          "language-name"
-/**
- * GST_TAG_IMAGE:
- *
- * image (sample) (sample taglist should specify the content type and preferably
- * also set "image-type" field as #GstTagImageType)
- */
-#define GST_TAG_IMAGE                  "image"
-/**
- * GST_TAG_PREVIEW_IMAGE:
- *
- * image that is meant for preview purposes, e.g. small icon-sized version
- * (sample) (sample taglist should specify the content type)
- */
-#define GST_TAG_PREVIEW_IMAGE          "preview-image"
-
-/**
- * GST_TAG_ATTACHMENT:
- *
- * generic file attachment (sample) (sample taglist should specify the content
- * type and if possible set "filename" to the file name of the
- * attachment)
- */
-#define GST_TAG_ATTACHMENT             "attachment"
-
-/**
- * GST_TAG_BEATS_PER_MINUTE:
- *
- * number of beats per minute in audio (double)
- */
-#define GST_TAG_BEATS_PER_MINUTE       "beats-per-minute"
-
-/**
- * GST_TAG_KEYWORDS:
- *
- * comma separated keywords describing the content (string).
- */
-#define GST_TAG_KEYWORDS               "keywords"
-
-/**
- * GST_TAG_GEO_LOCATION_NAME:
- *
- * human readable descriptive location of where the media has been recorded or
- * produced. (string).
- */
-#define GST_TAG_GEO_LOCATION_NAME               "geo-location-name"
-
-/**
- * GST_TAG_GEO_LOCATION_LATITUDE:
- *
- * geo latitude location of where the media has been recorded or produced in
- * degrees according to WGS84 (zero at the equator, negative values for southern
- * latitudes) (double).
- */
-#define GST_TAG_GEO_LOCATION_LATITUDE               "geo-location-latitude"
-
-/**
- * GST_TAG_GEO_LOCATION_LONGITUDE:
- *
- * geo longitude location of where the media has been recorded or produced in
- * degrees according to WGS84 (zero at the prime meridian in Greenwich/UK,
- * negative values for western longitudes). (double).
- */
-#define GST_TAG_GEO_LOCATION_LONGITUDE               "geo-location-longitude"
-
-/**
- * GST_TAG_GEO_LOCATION_ELEVATION:
- *
- * geo elevation of where the media has been recorded or produced in meters
- * according to WGS84 (zero is average sea level) (double).
- */
-#define GST_TAG_GEO_LOCATION_ELEVATION               "geo-location-elevation"
-/**
- * GST_TAG_GEO_LOCATION_COUNTRY:
- *
- * The country (english name) where the media has been produced (string).
- */
-#define GST_TAG_GEO_LOCATION_COUNTRY                 "geo-location-country"
-/**
- * GST_TAG_GEO_LOCATION_CITY:
- *
- * The city (english name) where the media has been produced (string).
- */
-#define GST_TAG_GEO_LOCATION_CITY                    "geo-location-city"
-/**
- * GST_TAG_GEO_LOCATION_SUBLOCATION:
- *
- * A location 'smaller' than GST_TAG_GEO_LOCATION_CITY that specifies better
- * where the media has been produced. (e.g. the neighborhood) (string).
- *
- * This tag has been added as this is how it is handled/named in XMP's
- * Iptc4xmpcore schema.
- */
-#define GST_TAG_GEO_LOCATION_SUBLOCATION             "geo-location-sublocation"
-/**
- * GST_TAG_GEO_LOCATION_HORIZONTAL_ERROR:
- *
- * Represents the expected error on the horizontal positioning in
- * meters (double).
- */
-#define GST_TAG_GEO_LOCATION_HORIZONTAL_ERROR   "geo-location-horizontal-error"
-/**
- * GST_TAG_GEO_LOCATION_MOVEMENT_SPEED:
- *
- * Speed of the capturing device when performing the capture.
- * Represented in m/s. (double)
- *
- * See also #GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION
- */
-#define GST_TAG_GEO_LOCATION_MOVEMENT_SPEED       "geo-location-movement-speed"
-/**
- * GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION:
- *
- * Indicates the movement direction of the device performing the capture
- * of a media. It is represented as degrees in floating point representation,
- * 0 means the geographic north, and increases clockwise (double from 0 to 360)
- *
- * See also #GST_TAG_GEO_LOCATION_CAPTURE_DIRECTION
- */
-#define GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION "geo-location-movement-direction"
-/**
- * GST_TAG_GEO_LOCATION_CAPTURE_DIRECTION:
- *
- * Indicates the direction the device is pointing to when capturing
- * a media. It is represented as degrees in floating point representation,
- * 0 means the geographic north, and increases clockwise (double from 0 to 360)
- *
- * See also #GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION
- */
-#define GST_TAG_GEO_LOCATION_CAPTURE_DIRECTION  "geo-location-capture-direction"
-/**
- * GST_TAG_SHOW_NAME:
- *
- * Name of the show, used for displaying (string)
- */
-#define GST_TAG_SHOW_NAME                         "show-name"
-/**
- * GST_TAG_SHOW_SORTNAME:
- *
- * Name of the show, used for sorting (string)
- */
-#define GST_TAG_SHOW_SORTNAME                     "show-sortname"
-/**
- * GST_TAG_SHOW_EPISODE_NUMBER:
- *
- * Number of the episode within a season/show (unsigned integer)
- */
-#define GST_TAG_SHOW_EPISODE_NUMBER               "show-episode-number"
-/**
- * GST_TAG_SHOW_SEASON_NUMBER:
- *
- * Number of the season of a show/series (unsigned integer)
- */
-#define GST_TAG_SHOW_SEASON_NUMBER                "show-season-number"
-/**
- * GST_TAG_LYRICS:
- *
- * The lyrics of the media (string)
- */
-#define GST_TAG_LYRICS                            "lyrics"
-/**
- * GST_TAG_COMPOSER_SORTNAME:
- *
- * The composer's name, used for sorting (string)
- */
-#define GST_TAG_COMPOSER_SORTNAME                 "composer-sortname"
-/**
- * GST_TAG_GROUPING:
- *
- * Groups together media that are related and spans multiple tracks. An
- * example are multiple pieces of a concerto. (string)
- */
-#define GST_TAG_GROUPING                          "grouping"
-/**
- * GST_TAG_USER_RATING:
- *
- * Rating attributed by a person (likely the application user).
- * The higher the value, the more the user likes this media
- * (unsigned int from 0 to 100)
- */
-#define GST_TAG_USER_RATING                       "user-rating"
-/**
- * GST_TAG_DEVICE_MANUFACTURER:
- *
- * Manufacturer of the device used to create the media (string)
- */
-#define GST_TAG_DEVICE_MANUFACTURER               "device-manufacturer"
-/**
- * GST_TAG_DEVICE_MODEL:
- *
- * Model of the device used to create the media (string)
- */
-#define GST_TAG_DEVICE_MODEL                      "device-model"
-/**
- * GST_TAG_APPLICATION_NAME:
- *
- * Name of the application used to create the media (string)
- */
-#define GST_TAG_APPLICATION_NAME                  "application-name"
-/**
- * GST_TAG_APPLICATION_DATA:
- *
- * Arbitrary application data (sample)
- *
- * Some formats allow applications to add their own arbitrary data
- * into files. This data is application dependent.
- */
-#define GST_TAG_APPLICATION_DATA          "application-data"
-/**
- * GST_TAG_IMAGE_ORIENTATION:
- *
- * Represents the 'Orientation' tag from EXIF. Defines how the image
- * should be rotated and mirrored for display. (string)
- *
- * This tag has a predefined set of allowed values:
- *   "rotate-0"
- *   "rotate-90"
- *   "rotate-180"
- *   "rotate-270"
- *   "flip-rotate-0"
- *   "flip-rotate-90"
- *   "flip-rotate-180"
- *   "flip-rotate-270"
- *
- * The naming is adopted according to a possible transformation to perform
- * on the image to fix its orientation, obviously equivalent operations will
- * yield the same result.
- *
- * Rotations indicated by the values are in clockwise direction and
- * 'flip' means an horizontal mirroring.
- */
-#define GST_TAG_IMAGE_ORIENTATION            "image-orientation"
-
-G_END_DECLS
-
-#endif /* __GST_TAGLIST_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttagsetter.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttagsetter.h
deleted file mode 100644
index 580053cc..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttagsetter.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttagsetter.h: Interfaces for tagging
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TAG_SETTER_H__
-#define __GST_TAG_SETTER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_SETTER             (gst_tag_setter_get_type ())
-#define GST_TAG_SETTER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TAG_SETTER, GstTagSetter))
-#define GST_IS_TAG_SETTER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TAG_SETTER))
-#define GST_TAG_SETTER_GET_INTERFACE(obj)       (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_TAG_SETTER, GstTagSetterInterface))
-
-/**
- * GstTagSetter:
- *
- * Opaque #GstTagSetter data structure.
- */
-typedef struct _GstTagSetter                    GstTagSetter; /* Dummy typedef */
-typedef struct _GstTagSetterInterface           GstTagSetterInterface;
-
-/**
- * GstTagSetterInterface:
- * @g_iface: parent interface type.
- *
- * #GstTagSetterInterface interface.
- */
-/* use an empty interface here to allow detection of elements using user-set
-   tags */
-struct _GstTagSetterInterface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  /* virtual table */
-};
-
-GType           gst_tag_setter_get_type             (void);
-
-void            gst_tag_setter_reset_tags             (GstTagSetter * setter);
-
-void            gst_tag_setter_merge_tags           (GstTagSetter *     setter,
-                                                     const GstTagList * list,
-                                                     GstTagMergeMode    mode);
-void            gst_tag_setter_add_tags             (GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     ...) G_GNUC_NULL_TERMINATED;
-
-void            gst_tag_setter_add_tag_values       (GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     ...) G_GNUC_NULL_TERMINATED;
-
-void            gst_tag_setter_add_tag_valist       (GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     va_list            var_args);
-
-void            gst_tag_setter_add_tag_valist_values(GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     va_list            var_args);
-
-void            gst_tag_setter_add_tag_value        (GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     const GValue *     value);
-
-const GstTagList *
-                gst_tag_setter_get_tag_list          (GstTagSetter *    setter);
-
-void            gst_tag_setter_set_tag_merge_mode    (GstTagSetter *    setter,
-                                                      GstTagMergeMode   mode);
-GstTagMergeMode gst_tag_setter_get_tag_merge_mode    (GstTagSetter *    setter);
-
-G_END_DECLS
-
-#endif /* __GST_TAG_SETTER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttask.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttask.h
deleted file mode 100644
index 6464d865..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttask.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *               <2005> Wim Taymans <wim@fluendo.com>
- *
- * gsttask.h: Streaming tasks
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TASK_H__
-#define __GST_TASK_H__
-
-#include <gst/gstobject.h>
-#include <gst/gsttaskpool.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstTaskFunction:
- * @user_data: user data passed to the function
- *
- * A function that will repeatedly be called in the thread created by
- * a #GstTask.
- */
-typedef void         (*GstTaskFunction)          (gpointer user_data);
-
-/* --- standard type macros --- */
-#define GST_TYPE_TASK                   (gst_task_get_type ())
-#define GST_TASK(task)                  (G_TYPE_CHECK_INSTANCE_CAST ((task), GST_TYPE_TASK, GstTask))
-#define GST_IS_TASK(task)               (G_TYPE_CHECK_INSTANCE_TYPE ((task), GST_TYPE_TASK))
-#define GST_TASK_CLASS(tclass)          (G_TYPE_CHECK_CLASS_CAST ((tclass), GST_TYPE_TASK, GstTaskClass))
-#define GST_IS_TASK_CLASS(tclass)       (G_TYPE_CHECK_CLASS_TYPE ((tclass), GST_TYPE_TASK))
-#define GST_TASK_GET_CLASS(task)        (G_TYPE_INSTANCE_GET_CLASS ((task), GST_TYPE_TASK, GstTaskClass))
-#define GST_TASK_CAST(task)             ((GstTask*)(task))
-
-typedef struct _GstTask GstTask;
-typedef struct _GstTaskClass GstTaskClass;
-typedef struct _GstTaskPrivate GstTaskPrivate;
-
-/**
- * GstTaskState:
- * @GST_TASK_STARTED: the task is started and running
- * @GST_TASK_STOPPED: the task is stopped
- * @GST_TASK_PAUSED: the task is paused
- *
- * The different states a task can be in
- */
-typedef enum {
-  GST_TASK_STARTED,
-  GST_TASK_STOPPED,
-  GST_TASK_PAUSED
-} GstTaskState;
-
-/**
- * GST_TASK_STATE:
- * @task: Task to get the state of
- *
- * Get access to the state of the task.
- */
-#define GST_TASK_STATE(task)            (GST_TASK_CAST(task)->state)
-
-/**
- * GST_TASK_GET_COND:
- * @task: Task to get the cond of
- *
- * Get access to the cond of the task.
- */
-#define GST_TASK_GET_COND(task)         (&GST_TASK_CAST(task)->cond)
-/**
- * GST_TASK_WAIT:
- * @task: Task to wait for
- *
- * Wait for the task cond to be signalled
- */
-#define GST_TASK_WAIT(task)             g_cond_wait(GST_TASK_GET_COND (task), GST_OBJECT_GET_LOCK (task))
-/**
- * GST_TASK_SIGNAL:
- * @task: Task to signal
- *
- * Signal the task cond
- */
-#define GST_TASK_SIGNAL(task)           g_cond_signal(GST_TASK_GET_COND (task))
-/**
- * GST_TASK_BROADCAST:
- * @task: Task to broadcast
- *
- * Send a broadcast signal to all waiting task conds
- */
-#define GST_TASK_BROADCAST(task)        g_cond_broadcast(GST_TASK_GET_COND (task))
-
-/**
- * GST_TASK_GET_LOCK:
- * @task: Task to get the lock of
- *
- * Get access to the task lock.
- */
-#define GST_TASK_GET_LOCK(task)         (GST_TASK_CAST(task)->lock)
-
-/**
- * GstTaskThreadFunc:
- * @task: The #GstTask
- * @thread: The #GThread
- * @user_data: user data
- *
- * Custom GstTask thread callback functions that can be installed.
- */
-typedef void (*GstTaskThreadFunc) (GstTask *task, GThread *thread, gpointer user_data);
-
-/**
- * GstTask:
- * @state: the state of the task
- * @cond: used to pause/resume the task
- * @lock: The lock taken when iterating the task function
- * @func: the function executed by this task
- * @user_data: user_data passed to the task function
- * @notify: GDestroyNotify for @user_data
- * @running: a flag indicating that the task is running
- *
- * The #GstTask object.
- */
-struct _GstTask {
-  GstObject      object;
-
-  /*< public >*/ /* with LOCK */
-  GstTaskState     state;
-  GCond            cond;
-
-  GRecMutex       *lock;
-
-  GstTaskFunction  func;
-  gpointer         user_data;
-  GDestroyNotify   notify;
-
-  gboolean         running;
-
-  /*< private >*/
-  GThread         *thread;
-
-  GstTaskPrivate  *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstTaskClass {
-  GstObjectClass parent_class;
-
-  /*< private >*/
-  GstTaskPool *pool;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-void            gst_task_cleanup_all    (void);
-
-GType           gst_task_get_type       (void);
-
-GstTask*        gst_task_new            (GstTaskFunction func,
-                                         gpointer user_data, GDestroyNotify notify);
-
-void            gst_task_set_lock       (GstTask *task, GRecMutex *mutex);
-
-GstTaskPool *   gst_task_get_pool       (GstTask *task);
-void            gst_task_set_pool       (GstTask *task, GstTaskPool *pool);
-
-void            gst_task_set_enter_callback  (GstTask *task,
-                                              GstTaskThreadFunc enter_func,
-                                              gpointer user_data,
-                                              GDestroyNotify notify);
-void            gst_task_set_leave_callback  (GstTask *task,
-                                              GstTaskThreadFunc leave_func,
-                                              gpointer user_data,
-                                              GDestroyNotify notify);
-
-GstTaskState    gst_task_get_state      (GstTask *task);
-gboolean        gst_task_set_state      (GstTask *task, GstTaskState state);
-
-gboolean        gst_task_start          (GstTask *task);
-gboolean        gst_task_stop           (GstTask *task);
-gboolean        gst_task_pause          (GstTask *task);
-
-gboolean        gst_task_join           (GstTask *task);
-
-G_END_DECLS
-
-#endif /* __GST_TASK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttaskpool.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttaskpool.h
deleted file mode 100644
index 4eccbfb9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttaskpool.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GStreamer
- * Copyright (C) <2009> Wim Taymans <wim.taymans@gmail.com>
- *
- * gsttaskpool.h: Pool for creating streaming threads
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TASK_POOL_H__
-#define __GST_TASK_POOL_H__
-
-#include <gst/gstobject.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-#define GST_TYPE_TASK_POOL             (gst_task_pool_get_type ())
-#define GST_TASK_POOL(pool)            (G_TYPE_CHECK_INSTANCE_CAST ((pool), GST_TYPE_TASK_POOL, GstTaskPool))
-#define GST_IS_TASK_POOL(pool)         (G_TYPE_CHECK_INSTANCE_TYPE ((pool), GST_TYPE_TASK_POOL))
-#define GST_TASK_POOL_CLASS(pclass)    (G_TYPE_CHECK_CLASS_CAST ((pclass), GST_TYPE_TASK_POOL, GstTaskPoolClass))
-#define GST_IS_TASK_POOL_CLASS(pclass) (G_TYPE_CHECK_CLASS_TYPE ((pclass), GST_TYPE_TASK_POOL))
-#define GST_TASK_POOL_GET_CLASS(pool)  (G_TYPE_INSTANCE_GET_CLASS ((pool), GST_TYPE_TASK_POOL, GstTaskPoolClass))
-#define GST_TASK_POOL_CAST(pool)       ((GstTaskPool*)(pool))
-
-typedef struct _GstTaskPool GstTaskPool;
-typedef struct _GstTaskPoolClass GstTaskPoolClass;
-
-/**
- * GstTaskPoolFunction:
- * @user_data: user data for the task function
- *
- * Task function, see gst_task_pool_push().
- */
-typedef void   (*GstTaskPoolFunction)          (void *user_data);
-
-/**
- * GstTaskPool:
- *
- * The #GstTaskPool object.
- */
-struct _GstTaskPool {
-  GstObject      object;
-
-  /*< private >*/
-  GThreadPool   *pool;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstTaskPoolClass:
- * @parent_class: the parent class structure
- * @prepare: prepare the threadpool
- * @cleanup: make sure all threads are stopped
- * @push: start a new thread
- * @join: join a thread
- *
- * The #GstTaskPoolClass object.
- */
-struct _GstTaskPoolClass {
-  GstObjectClass parent_class;
-
-  /*< public >*/
-  void      (*prepare)  (GstTaskPool *pool, GError **error);
-  void      (*cleanup)  (GstTaskPool *pool);
-
-  gpointer  (*push)     (GstTaskPool *pool, GstTaskPoolFunction func,
-                         gpointer user_data, GError **error);
-  void      (*join)     (GstTaskPool *pool, gpointer id);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_task_pool_get_type    (void);
-
-GstTaskPool *   gst_task_pool_new         (void);
-void            gst_task_pool_prepare     (GstTaskPool *pool, GError **error);
-
-gpointer        gst_task_pool_push        (GstTaskPool *pool, GstTaskPoolFunction func,
-                                           gpointer user_data, GError **error);
-void            gst_task_pool_join        (GstTaskPool *pool, gpointer id);
-
-void		gst_task_pool_cleanup     (GstTaskPool *pool);
-
-G_END_DECLS
-
-#endif /* __GST_TASK_POOL_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttoc.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttoc.h
deleted file mode 100644
index 9439cca2..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttoc.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* GStreamer
- * (c) 2010, 2012 Alexander Saprykin <xelfium@gmail.com>
- *
- * gsttoc.h: generic TOC API declaration
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TOC_H__
-#define __GST_TOC_H__
-
-#include <gst/gstconfig.h>
-#include <gst/gstminiobject.h>
-#include <gst/gststructure.h>
-#include <gst/gsttaglist.h>
-#include <gst/gstformat.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TOC (gst_toc_get_type ())
-#define GST_TYPE_TOC_ENTRY (gst_toc_entry_get_type ())
-
-typedef struct _GstTocEntry GstTocEntry;
-typedef struct _GstToc GstToc;
-
-/**
- * GstTocScope:
- * @GST_TOC_SCOPE_GLOBAL: global TOC representing all selectable options
- *     (this is what applications are usually interested in)
- * @GST_TOC_SCOPE_CURRENT: TOC for the currently active/selected stream
- *     (this is a TOC representing the current stream from start to EOS,
- *     and is what a TOC writer / muxer is usually interested in; it will
- *     usually be a subset of the global TOC, e.g. just the chapters of
- *     the current title, or the chapters selected for playback from the
- *     current title)
- *
- * The scope of a TOC.
- */
-typedef enum {
-  GST_TOC_SCOPE_GLOBAL = 1,
-  GST_TOC_SCOPE_CURRENT = 2
-} GstTocScope;
-
-/**
- * GstTocEntryType:
- * @GST_TOC_ENTRY_TYPE_ANGLE: entry is an angle (i.e. an alternative)
- * @GST_TOC_ENTRY_TYPE_VERSION: entry is a version (i.e. alternative)
- * @GST_TOC_ENTRY_TYPE_EDITION: entry is an edition (i.e. alternative)
- * @GST_TOC_ENTRY_TYPE_INVALID: invalid entry type value
- * @GST_TOC_ENTRY_TYPE_TITLE: entry is a title (i.e. a part of a sequence)
- * @GST_TOC_ENTRY_TYPE_TRACK: entry is a track (i.e. a part of a sequence)
- * @GST_TOC_ENTRY_TYPE_CHAPTER: entry is a chapter (i.e. a part of a sequence)
- *
- * The different types of TOC entries (see #GstTocEntry).
- *
- * There are two types of TOC entries: alternatives or parts in a sequence.
- */
-typedef enum {
-  GST_TOC_ENTRY_TYPE_ANGLE       = -3,
-  GST_TOC_ENTRY_TYPE_VERSION     = -2,
-  GST_TOC_ENTRY_TYPE_EDITION     = -1,
-  GST_TOC_ENTRY_TYPE_INVALID     = 0,
-  GST_TOC_ENTRY_TYPE_TITLE       = 1,
-  GST_TOC_ENTRY_TYPE_TRACK       = 2,
-  GST_TOC_ENTRY_TYPE_CHAPTER     = 3,
-} GstTocEntryType;
-
-#define GST_TOC_ENTRY_TYPE_IS_ALTERNATIVE(entry_type)  (entry_type < 0)
-#define GST_TOC_ENTRY_TYPE_IS_SEQUENCE(entry_type)     (entry_type > 0)
-
-/* functions to return type structures */
-GType           gst_toc_get_type                (void);
-GType           gst_toc_entry_get_type          (void);
-
-/* functions to create, ref and unref/free TOCs */
-GstToc *           gst_toc_new                     (GstTocScope scope);
-
-GstTocScope        gst_toc_get_scope               (const GstToc *toc);
-
-void               gst_toc_set_tags                (GstToc *toc, GstTagList * tags);
-void               gst_toc_merge_tags              (GstToc *toc, GstTagList *tags, GstTagMergeMode mode);
-GstTagList *       gst_toc_get_tags                (const GstToc *toc);
-
-void               gst_toc_append_entry               (GstToc *toc, GstTocEntry *entry);
-GList *            gst_toc_get_entries             (const GstToc *toc);
-
-void               gst_toc_dump                    (GstToc *toc);
-
-#define gst_toc_ref(toc)            (GstToc*)gst_mini_object_ref(GST_MINI_OBJECT_CAST(toc))
-#define gst_toc_unref(toc)          gst_mini_object_unref(GST_MINI_OBJECT_CAST(toc))
-#define gst_toc_copy(toc)           (GstToc*)gst_mini_object_copy(GST_MINI_OBJECT_CAST(toc))
-#define gst_toc_make_writable(toc)  (GstToc*)gst_mini_object_make_writable(GST_MINI_OBJECT_CAST(toc))
-
-/* functions to create, ref and unref/free TOC entries */
-GstTocEntry *   gst_toc_entry_new               (GstTocEntryType type, const gchar *uid);
-
-#define gst_toc_entry_ref(entry)            (GstTocEntry*)gst_mini_object_ref(GST_MINI_OBJECT_CAST(entry))
-#define gst_toc_entry_unref(entry)          gst_mini_object_unref(GST_MINI_OBJECT_CAST(entry))
-#define gst_toc_entry_copy(entry)           (GstTocEntry*)gst_mini_object_copy(GST_MINI_OBJECT_CAST(entry))
-#define gst_toc_entry_make_writable(entry)  (GstTocEntry*)gst_mini_object_make_writable(GST_MINI_OBJECT_CAST(entry))
-
-GstTocEntry *      gst_toc_find_entry                    (const GstToc *toc, const gchar *uid);
-
-GstTocEntryType    gst_toc_entry_get_entry_type          (const GstTocEntry *entry);
-const gchar *      gst_toc_entry_get_uid                 (const GstTocEntry *entry);
-
-void               gst_toc_entry_append_sub_entry           (GstTocEntry *entry, GstTocEntry *subentry);
-GList *            gst_toc_entry_get_sub_entries         (const GstTocEntry *entry);
-
-void               gst_toc_entry_set_tags                (GstTocEntry *entry, GstTagList *tags);
-void               gst_toc_entry_merge_tags              (GstTocEntry *entry, GstTagList *tags, GstTagMergeMode mode);
-GstTagList *       gst_toc_entry_get_tags                (const GstTocEntry *entry);
-
-gboolean           gst_toc_entry_is_alternative          (const GstTocEntry *entry);
-gboolean           gst_toc_entry_is_sequence             (const GstTocEntry *entry);
-
-void               gst_toc_entry_set_start_stop_times    (GstTocEntry *entry, gint64 start, gint64 stop);
-gboolean           gst_toc_entry_get_start_stop_times    (const GstTocEntry *entry, gint64 *start, gint64 *stop);
-
-GstToc *           gst_toc_entry_get_toc                 (GstTocEntry *entry);
-GstTocEntry *      gst_toc_entry_get_parent              (GstTocEntry *entry);
-
-
-const gchar *      gst_toc_entry_type_get_nick     (GstTocEntryType type);
-
-G_END_DECLS
-
-#endif /* __GST_TOC_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttocsetter.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttocsetter.h
deleted file mode 100644
index 9c59fa56..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttocsetter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GStreamer
- * Copyright (C) 2010, 2012 Alexander Saprykin <xelfium@gmail.com>
- *
- * gsttocsetter.h: Interfaces for TOC
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TOC_SETTER_H__
-#define __GST_TOC_SETTER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TOC_SETTER              (gst_toc_setter_get_type ())
-#define GST_TOC_SETTER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TOC_SETTER, GstTocSetter))
-#define GST_IS_TOC_SETTER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TOC_SETTER))
-#define GST_TOC_SETTER_GET_IFACE(obj)    (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_TOC_SETTER, GstTocSetterInterface))
-/**
- * GstTocSetter:
- *
- * Opaque #GstTocSetter data structure.
- */
-typedef struct _GstTocSetter GstTocSetter;
-typedef struct _GstTocSetterInterface GstTocSetterInterface;
-
-/**
- * GstTocSetterInterface:
- * @g_iface: parent interface type.
- *
- * #GstTocSetterInterface interface.
- */
-
-struct _GstTocSetterInterface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  /* virtual table */
-};
-
-GType         gst_toc_setter_get_type (void);
-
-void          gst_toc_setter_reset   (GstTocSetter *setter);
-
-GstToc *      gst_toc_setter_get_toc (GstTocSetter *setter);
-
-void          gst_toc_setter_set_toc (GstTocSetter *setter, GstToc *toc);
-
-G_END_DECLS
-
-#endif /* __GST_TOC_SETTER_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttypefind.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttypefind.h
deleted file mode 100644
index 0a987e4a..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttypefind.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttypefind.h: typefinding subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TYPE_FIND_H__
-#define __GST_TYPE_FIND_H__
-
-#include <gst/gstcaps.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TYPE_FIND  (gst_type_find_get_type())
-
-typedef struct _GstTypeFind GstTypeFind;
-
-/**
- * GstTypeFindFunction:
- * @find: A #GstTypeFind structure
- * @user_data: optionnal data to pass to the function
- *
- * A function that will be called by typefinding.
- */
-typedef void (* GstTypeFindFunction) (GstTypeFind *find, gpointer user_data);
-
-/**
- * GstTypeFindProbability:
- * @GST_TYPE_FIND_NONE: type undetected.
- * @GST_TYPE_FIND_MINIMUM: unlikely typefind.
- * @GST_TYPE_FIND_POSSIBLE: possible type detected.
- * @GST_TYPE_FIND_LIKELY: likely a type was detected.
- * @GST_TYPE_FIND_NEARLY_CERTAIN: nearly certain that a type was detected.
- * @GST_TYPE_FIND_MAXIMUM: very certain a type was detected.
- *
- * The probability of the typefind function. Higher values have more certainty
- * in doing a reliable typefind.
- */
-typedef enum {
-  GST_TYPE_FIND_NONE = 0,
-  GST_TYPE_FIND_MINIMUM = 1,
-  GST_TYPE_FIND_POSSIBLE = 50,
-  GST_TYPE_FIND_LIKELY = 80,
-  GST_TYPE_FIND_NEARLY_CERTAIN = 99,
-  GST_TYPE_FIND_MAXIMUM = 100
-} GstTypeFindProbability;
-
-/**
- * GstTypeFind:
- * @peek: Method to peek data.
- * @suggest: Method to suggest #GstCaps with a given probability.
- * @data: The data used by the caller of the typefinding function.
- * @get_length: Returns the length of current data.
- *
- * Object that stores typefind callbacks. To use with #GstTypeFindFactory.
- */
-struct _GstTypeFind {
-  /* private to the caller of the typefind function */
-  const guint8 *  (* peek)       (gpointer         data,
-                                  gint64           offset,
-                                  guint            size);
-
-  void            (* suggest)    (gpointer         data,
-                                  guint            probability,
-                                  GstCaps         *caps);
-
-  gpointer         data;
-
-  /* optional */
-  guint64         (* get_length) (gpointer data);
-
-  /* <private> */
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType     gst_type_find_get_type   (void);
-
-/* typefind function interface */
-const guint8 *  gst_type_find_peek       (GstTypeFind   * find,
-                                          gint64          offset,
-                                          guint           size);
-
-void            gst_type_find_suggest    (GstTypeFind   * find,
-                                          guint           probability,
-                                          GstCaps       * caps);
-
-void            gst_type_find_suggest_simple (GstTypeFind * find,
-                                              guint         probability,
-                                              const char  * media_type,
-                                              const char  * fieldname, ...);
-
-guint64   gst_type_find_get_length (GstTypeFind   * find);
-
-/* registration interface */
-gboolean  gst_type_find_register   (GstPlugin            * plugin,
-                                    const gchar          * name,
-                                    guint                  rank,
-                                    GstTypeFindFunction    func,
-                                    const gchar          * extensions,
-                                    GstCaps              * possible_caps,
-                                    gpointer               data,
-                                    GDestroyNotify         data_notify);
-
-G_END_DECLS
-
-#endif /* __GST_TYPE_FIND_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttypefindfactory.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttypefindfactory.h
deleted file mode 100644
index 332134bf..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsttypefindfactory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttypefindfactory.h: typefinding subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TYPE_FIND_FACTORY_H__
-#define __GST_TYPE_FIND_FACTORY_H__
-
-#include <gst/gstcaps.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-#include <gst/gsttypefind.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TYPE_FIND_FACTORY                 (gst_type_find_factory_get_type())
-#define GST_TYPE_FIND_FACTORY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TYPE_FIND_FACTORY, GstTypeFindFactory))
-#define GST_IS_TYPE_FIND_FACTORY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TYPE_FIND_FACTORY))
-#define GST_TYPE_FIND_FACTORY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TYPE_FIND_FACTORY, GstTypeFindFactoryClass))
-#define GST_IS_TYPE_FIND_FACTORY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TYPE_FIND_FACTORY))
-#define GST_TYPE_FIND_FACTORY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_TYPE_FIND_FACTORY, GstTypeFindFactoryClass))
-
-/**
- * GstTypeFindFactory:
- *
- * Opaque object that stores information about a typefind function.
- */
-typedef struct _GstTypeFindFactory GstTypeFindFactory;
-typedef struct _GstTypeFindFactoryClass GstTypeFindFactoryClass;
-
-/* typefinding interface */
-
-GType           gst_type_find_factory_get_type          (void);
-
-GList *         gst_type_find_factory_get_list          (void);
-
-const gchar * const * gst_type_find_factory_get_extensions (GstTypeFindFactory *factory);
-
-GstCaps *       gst_type_find_factory_get_caps          (GstTypeFindFactory *factory);
-gboolean        gst_type_find_factory_has_function      (GstTypeFindFactory *factory);
-void            gst_type_find_factory_call_function     (GstTypeFindFactory *factory,
-                                                         GstTypeFind *find);
-
-G_END_DECLS
-
-#endif /* __GST_TYPE_FIND_FACTORY_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsturi.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsturi.h
deleted file mode 100644
index d140c3d4..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gsturi.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gsturi.h: Header for uri to element mappings
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_URI_H__
-#define __GST_URI_H__
-
-#include <glib.h>
-#include <gst/gstelement.h>
-
-G_BEGIN_DECLS
-
-GQuark gst_uri_error_quark (void);
-
-/**
- * GST_URI_ERROR:
- *
- * Get access to the error quark of the uri subsystem.
- */
-#define GST_URI_ERROR gst_uri_error_quark ()
-
-/**
- * GstURIError:
- * @GST_URI_ERROR_UNSUPPORTED_PROTOCOL: The protocol is not supported
- * @GST_URI_ERROR_BAD_URI: There was a problem with the URI
- * @GST_URI_ERROR_BAD_STATE: Could not set or change the URI because the
- *     URI handler was in a state where that is not possible or not permitted
- * @GST_URI_ERROR_BAD_REFERENCE: There was a problem with the entity that
- *     the URI references
- *
- * Different URI-related errors that can occur.
- */
-typedef enum
-{
-  GST_URI_ERROR_UNSUPPORTED_PROTOCOL,
-  GST_URI_ERROR_BAD_URI,
-  GST_URI_ERROR_BAD_STATE,
-  GST_URI_ERROR_BAD_REFERENCE
-} GstURIError;
-
-/**
- * GstURIType:
- * @GST_URI_UNKNOWN: The URI direction is unknown
- * @GST_URI_SINK: The URI is a consumer.
- * @GST_URI_SRC: The URI is a producer.
- *
- * The different types of URI direction.
- */
-
-typedef enum {
-  GST_URI_UNKNOWN,
-  GST_URI_SINK,
-  GST_URI_SRC
-} GstURIType;
-
-/**
- * GST_URI_TYPE_IS_VALID:
- * @type: A #GstURIType
- *
- * Tests if the type direction is valid.
- */
-#define GST_URI_TYPE_IS_VALID(type) ((type) == GST_URI_SRC || (type) == GST_URI_SINK)
-
-/* uri handler functions */
-#define GST_TYPE_URI_HANDLER               (gst_uri_handler_get_type ())
-#define GST_URI_HANDLER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_URI_HANDLER, GstURIHandler))
-#define GST_IS_URI_HANDLER(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_URI_HANDLER))
-#define GST_URI_HANDLER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_URI_HANDLER, GstURIHandlerInterface))
-
-/**
- * GstURIHandler:
- *
- * Opaque #GstURIHandler structure.
- */
-typedef struct _GstURIHandler GstURIHandler;
-typedef struct _GstURIHandlerInterface GstURIHandlerInterface;
-
-/**
- * GstURIHandlerInterface:
- * @parent: The parent interface type
- * @get_type: Method to tell whether the element handles source or sink URI.
- * @get_protocols: Method to return the list of protocols handled by the element.
- * @get_uri: Method to return the URI currently handled by the element.
- * @set_uri: Method to set a new URI.
- *
- * Any #GstElement using this interface should implement these methods.
- */
-struct _GstURIHandlerInterface {
-  GTypeInterface parent;
-
-  /* vtable */
-  /*< public >*/
-  /* querying capabilities */
-  GstURIType             (* get_type)           (GType type);
-  const gchar * const *  (* get_protocols)      (GType type);
-
-  /* using the interface */
-  gchar *                (* get_uri)            (GstURIHandler * handler);
-  gboolean               (* set_uri)            (GstURIHandler * handler,
-                                                 const gchar   * uri,
-                                                 GError       ** error);
-};
-
-/* general URI functions */
-
-gboolean        gst_uri_protocol_is_valid       (const gchar * protocol);
-gboolean        gst_uri_protocol_is_supported   (const GstURIType type,
-                                                 const gchar *protocol);
-gboolean        gst_uri_is_valid                (const gchar * uri);
-gchar *         gst_uri_get_protocol            (const gchar * uri) G_GNUC_MALLOC;
-gboolean        gst_uri_has_protocol            (const gchar * uri,
-                                                 const gchar * protocol);
-gchar *         gst_uri_get_location            (const gchar * uri) G_GNUC_MALLOC;
-gchar *         gst_uri_construct               (const gchar * protocol,
-                                                 const gchar * location) G_GNUC_MALLOC;
-
-gchar *         gst_filename_to_uri             (const gchar * filename,
-                                                 GError     ** error) G_GNUC_MALLOC;
-
-GstElement *    gst_element_make_from_uri       (const GstURIType type,
-                                                 const gchar *    uri,
-                                                 const gchar *    elementname,
-                                                 GError      **   error) G_GNUC_MALLOC;
-
-/* accessing the interface */
-GType                 gst_uri_handler_get_type (void);
-
-GstURIType            gst_uri_handler_get_uri_type  (GstURIHandler * handler);
-const gchar * const * gst_uri_handler_get_protocols (GstURIHandler * handler);
-gchar *               gst_uri_handler_get_uri       (GstURIHandler * handler) G_GNUC_MALLOC;
-gboolean              gst_uri_handler_set_uri       (GstURIHandler * handler,
-                                                     const gchar   * uri,
-                                                     GError       ** error);
-
-G_END_DECLS
-
-#endif /* __GST_URI_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstutils.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstutils.h
deleted file mode 100644
index 269b3752..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstutils.h
+++ /dev/null
@@ -1,948 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2002 Thomas Vander Stichele <thomas@apestaart.org>
- *
- * gstutils.h: Header for various utility functions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_UTILS_H__
-#define __GST_UTILS_H__
-
-#include <glib.h>
-#include <gst/gstconfig.h>
-#include <gst/gstbin.h>
-#include <gst/gstparse.h>
-
-G_BEGIN_DECLS
-
-void            gst_util_set_value_from_string  (GValue *value, const gchar *value_str);
-void            gst_util_set_object_arg         (GObject *object, const gchar *name, const gchar *value);
-void            gst_util_dump_mem               (const guchar *mem, guint size);
-
-guint64         gst_util_gdouble_to_guint64     (gdouble value)  G_GNUC_CONST;
-gdouble         gst_util_guint64_to_gdouble     (guint64 value)  G_GNUC_CONST;
-
-/**
- * gst_guint64_to_gdouble:
- * @value: the #guint64 value to convert
- *
- * Convert @value to a gdouble.
- *
- * Returns: @value converted to a #gdouble.
- */
-
-/**
- * gst_gdouble_to_guint64:
- * @value: the #gdouble value to convert
- *
- * Convert @value to a guint64.
- *
- * Returns: @value converted to a #guint64.
- */
-#ifdef WIN32
-#define         gst_gdouble_to_guint64(value)   gst_util_gdouble_to_guint64(value)
-#define         gst_guint64_to_gdouble(value)   gst_util_guint64_to_gdouble(value)
-#else
-#define         gst_gdouble_to_guint64(value)   ((guint64) (value))
-#define         gst_guint64_to_gdouble(value)   ((gdouble) (value))
-#endif
-
-guint64         gst_util_uint64_scale           (guint64 val, guint64 num, guint64 denom);
-guint64         gst_util_uint64_scale_round     (guint64 val, guint64 num, guint64 denom);
-guint64         gst_util_uint64_scale_ceil      (guint64 val, guint64 num, guint64 denom);
-
-guint64         gst_util_uint64_scale_int       (guint64 val, gint num, gint denom);
-guint64         gst_util_uint64_scale_int_round (guint64 val, gint num, gint denom);
-guint64         gst_util_uint64_scale_int_ceil  (guint64 val, gint num, gint denom);
-
-guint32         gst_util_seqnum_next            (void);
-gint32          gst_util_seqnum_compare         (guint32 s1, guint32 s2);
-
-
-/**
- * GST_CALL_PARENT:
- * @parent_class_cast: the name of the class cast macro for the parent type
- * @name: name of the function to call
- * @args: arguments enclosed in '( )'
- *
- * Just call the parent handler.  This assumes that there is a variable
- * named parent_class that points to the (duh!) parent class.  Note that
- * this macro is not to be used with things that return something, use
- * the _WITH_DEFAULT version for that
- */
-#define GST_CALL_PARENT(parent_class_cast, name, args)                  \
-        ((parent_class_cast(parent_class)->name != NULL) ?              \
-         parent_class_cast(parent_class)->name args : (void) 0)
-
-/**
- * GST_CALL_PARENT_WITH_DEFAULT:
- * @parent_class_cast: the name of the class cast macro for the parent type
- * @name: name of the function to call
- * @args: arguments enclosed in '( )'
- * @def_return: default result
- *
- * Same as GST_CALL_PARENT(), but in case there is no implementation, it
- * evaluates to @def_return.
- */
-#define GST_CALL_PARENT_WITH_DEFAULT(parent_class_cast, name, args, def_return)\
-        ((parent_class_cast(parent_class)->name != NULL) ?              \
-         parent_class_cast(parent_class)->name args : def_return)
-
-/* Define PUT and GET functions for unaligned memory */
-#define _GST_GET(__data, __idx, __size, __shift) \
-    (((guint##__size) (((const guint8 *) (__data))[__idx])) << (__shift))
-
-#define _GST_PUT(__data, __idx, __size, __shift, __num) \
-    (((guint8 *) (__data))[__idx] = (((guint##__size) (__num)) >> (__shift)) & 0xff)
-
-#if GST_HAVE_UNALIGNED_ACCESS
-static inline guint16 __gst_fast_read16(const guint8 *v) {
-  return *(const guint16*)(v);
-}
-static inline guint32 __gst_fast_read32(const guint8 *v) {
-  return *(const guint32*)(v);
-}
-static inline guint64 __gst_fast_read64(const guint8 *v) {
-  return *(const guint64*)(v);
-}
-static inline guint16 __gst_fast_read_swap16(const guint8 *v) {
-  return GUINT16_SWAP_LE_BE(*(const guint16*)(v));
-}
-static inline guint32 __gst_fast_read_swap32(const guint8 *v) {
-  return GUINT32_SWAP_LE_BE(*(const guint32*)(v));
-}
-static inline guint64 __gst_fast_read_swap64(const guint8 *v) {
-  return GUINT64_SWAP_LE_BE(*(const guint64*)(v));
-}
-# define _GST_FAST_READ(s, d) __gst_fast_read##s((const guint8 *)(d))
-# define _GST_FAST_READ_SWAP(s, d) __gst_fast_read_swap##s((const guint8 *)(d))
-#endif
-
-
-/**
- * GST_READ_UINT64_BE:
- * @data: memory location
- *
- * Read a 64 bit unsigned integer value in big endian format from the memory buffer.
- */
-
-/**
- * GST_READ_UINT64_LE:
- * @data: memory location
- *
- * Read a 64 bit unsigned integer value in little endian format from the memory buffer.
- */
-#if GST_HAVE_UNALIGNED_ACCESS
-# if (G_BYTE_ORDER == G_BIG_ENDIAN)
-#  define GST_READ_UINT64_BE(data)      _GST_FAST_READ (64, data)
-#  define GST_READ_UINT64_LE(data)      _GST_FAST_READ_SWAP (64, data)
-# else
-#  define GST_READ_UINT64_BE(data)      _GST_FAST_READ_SWAP (64, data)
-#  define GST_READ_UINT64_LE(data)      _GST_FAST_READ (64, data)
-# endif
-#else
-# define GST_READ_UINT64_BE(data)	(_GST_GET (data, 0, 64, 56) | \
-					 _GST_GET (data, 1, 64, 48) | \
-					 _GST_GET (data, 2, 64, 40) | \
-					 _GST_GET (data, 3, 64, 32) | \
-					 _GST_GET (data, 4, 64, 24) | \
-					 _GST_GET (data, 5, 64, 16) | \
-					 _GST_GET (data, 6, 64,  8) | \
-					 _GST_GET (data, 7, 64,  0))
-
-# define GST_READ_UINT64_LE(data)	(_GST_GET (data, 7, 64, 56) | \
-					 _GST_GET (data, 6, 64, 48) | \
-					 _GST_GET (data, 5, 64, 40) | \
-					 _GST_GET (data, 4, 64, 32) | \
-					 _GST_GET (data, 3, 64, 24) | \
-					 _GST_GET (data, 2, 64, 16) | \
-					 _GST_GET (data, 1, 64,  8) | \
-					 _GST_GET (data, 0, 64,  0))
-#endif
-
-/**
- * GST_READ_UINT32_BE:
- * @data: memory location
- *
- * Read a 32 bit unsigned integer value in big endian format from the memory buffer.
- */
-
-/**
- * GST_READ_UINT32_LE:
- * @data: memory location
- *
- * Read a 32 bit unsigned integer value in little endian format from the memory buffer.
- */
-#if GST_HAVE_UNALIGNED_ACCESS
-# if (G_BYTE_ORDER == G_BIG_ENDIAN)
-#  define GST_READ_UINT32_BE(data)      _GST_FAST_READ (32, data)
-#  define GST_READ_UINT32_LE(data)      _GST_FAST_READ_SWAP (32, data)
-# else
-#  define GST_READ_UINT32_BE(data)      _GST_FAST_READ_SWAP (32, data)
-#  define GST_READ_UINT32_LE(data)      _GST_FAST_READ (32, data)
-# endif
-#else
-# define GST_READ_UINT32_BE(data)	(_GST_GET (data, 0, 32, 24) | \
-					 _GST_GET (data, 1, 32, 16) | \
-					 _GST_GET (data, 2, 32,  8) | \
-					 _GST_GET (data, 3, 32,  0))
-
-# define GST_READ_UINT32_LE(data)	(_GST_GET (data, 3, 32, 24) | \
-					 _GST_GET (data, 2, 32, 16) | \
-					 _GST_GET (data, 1, 32,  8) | \
-					 _GST_GET (data, 0, 32,  0))
-#endif
-
-/**
- * GST_READ_UINT24_BE:
- * @data: memory location
- *
- * Read a 24 bit unsigned integer value in big endian format from the memory buffer.
- */
-#define GST_READ_UINT24_BE(data)        (_GST_GET (data, 0, 32, 16) | \
-                                         _GST_GET (data, 1, 32,  8) | \
-                                         _GST_GET (data, 2, 32,  0))
-
-/**
- * GST_READ_UINT24_LE:
- * @data: memory location
- *
- * Read a 24 bit unsigned integer value in little endian format from the memory buffer.
- */
-#define GST_READ_UINT24_LE(data)        (_GST_GET (data, 2, 32, 16) | \
-                                         _GST_GET (data, 1, 32,  8) | \
-                                         _GST_GET (data, 0, 32,  0))
-
-/**
- * GST_READ_UINT16_BE:
- * @data: memory location
- *
- * Read a 16 bit unsigned integer value in big endian format from the memory buffer.
- */
-/**
- * GST_READ_UINT16_LE:
- * @data: memory location
- *
- * Read a 16 bit unsigned integer value in little endian format from the memory buffer.
- */
-#if GST_HAVE_UNALIGNED_ACCESS
-# if (G_BYTE_ORDER == G_BIG_ENDIAN)
-#  define GST_READ_UINT16_BE(data)      _GST_FAST_READ (16, data)
-#  define GST_READ_UINT16_LE(data)      _GST_FAST_READ_SWAP (16, data)
-# else
-#  define GST_READ_UINT16_BE(data)      _GST_FAST_READ_SWAP (16, data)
-#  define GST_READ_UINT16_LE(data)      _GST_FAST_READ (16, data)
-# endif
-#else
-# define GST_READ_UINT16_BE(data)	(_GST_GET (data, 0, 16,  8) | \
-					 _GST_GET (data, 1, 16,  0))
-
-# define GST_READ_UINT16_LE(data)	(_GST_GET (data, 1, 16,  8) | \
-					 _GST_GET (data, 0, 16,  0))
-#endif
-
-/**
- * GST_READ_UINT8:
- * @data: memory location
- *
- * Read an 8 bit unsigned integer value from the memory buffer.
- */
-#define GST_READ_UINT8(data)            (_GST_GET (data, 0,  8,  0))
-
-/**
- * GST_WRITE_UINT64_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 64 bit unsigned integer value in big endian format into the memory buffer.
- */
-#define GST_WRITE_UINT64_BE(data, num)  do { \
-                                          _GST_PUT (data, 0, 64, 56, num); \
-                                          _GST_PUT (data, 1, 64, 48, num); \
-                                          _GST_PUT (data, 2, 64, 40, num); \
-                                          _GST_PUT (data, 3, 64, 32, num); \
-                                          _GST_PUT (data, 4, 64, 24, num); \
-                                          _GST_PUT (data, 5, 64, 16, num); \
-                                          _GST_PUT (data, 6, 64,  8, num); \
-                                          _GST_PUT (data, 7, 64,  0, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT64_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 64 bit unsigned integer value in little endian format into the memory buffer.
- */
-#define GST_WRITE_UINT64_LE(data, num)  do { \
-                                          _GST_PUT (data, 0, 64,  0, num); \
-                                          _GST_PUT (data, 1, 64,  8, num); \
-                                          _GST_PUT (data, 2, 64, 16, num); \
-                                          _GST_PUT (data, 3, 64, 24, num); \
-                                          _GST_PUT (data, 4, 64, 32, num); \
-                                          _GST_PUT (data, 5, 64, 40, num); \
-                                          _GST_PUT (data, 6, 64, 48, num); \
-                                          _GST_PUT (data, 7, 64, 56, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT32_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 32 bit unsigned integer value in big endian format into the memory buffer.
- */
-#define GST_WRITE_UINT32_BE(data, num)  do { \
-                                          _GST_PUT (data, 0, 32, 24, num); \
-                                          _GST_PUT (data, 1, 32, 16, num); \
-                                          _GST_PUT (data, 2, 32,  8, num); \
-                                          _GST_PUT (data, 3, 32,  0, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT32_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 32 bit unsigned integer value in little endian format into the memory buffer.
- */
-#define GST_WRITE_UINT32_LE(data, num)  do { \
-                                          _GST_PUT (data, 0, 32,  0, num); \
-                                          _GST_PUT (data, 1, 32,  8, num); \
-                                          _GST_PUT (data, 2, 32, 16, num); \
-                                          _GST_PUT (data, 3, 32, 24, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT24_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 24 bit unsigned integer value in big endian format into the memory buffer.
- */
-#define GST_WRITE_UINT24_BE(data, num)  do { \
-                                          _GST_PUT (data, 0, 32,  16, num); \
-                                          _GST_PUT (data, 1, 32,  8, num); \
-                                          _GST_PUT (data, 2, 32,  0, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT24_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 24 bit unsigned integer value in little endian format into the memory buffer.
- */
-#define GST_WRITE_UINT24_LE(data, num)  do { \
-                                          _GST_PUT (data, 0, 32,  0, num); \
-                                          _GST_PUT (data, 1, 32,  8, num); \
-                                          _GST_PUT (data, 2, 32,  16, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT16_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 16 bit unsigned integer value in big endian format into the memory buffer.
- */
-#define GST_WRITE_UINT16_BE(data, num)  do { \
-                                          _GST_PUT (data, 0, 16,  8, num); \
-                                          _GST_PUT (data, 1, 16,  0, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT16_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 16 bit unsigned integer value in little endian format into the memory buffer.
- */
-#define GST_WRITE_UINT16_LE(data, num)  do { \
-                                          _GST_PUT (data, 0, 16,  0, num); \
-                                          _GST_PUT (data, 1, 16,  8, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT8:
- * @data: memory location
- * @num: value to store
- *
- * Store an 8 bit unsigned integer value into the memory buffer.
- */
-#define GST_WRITE_UINT8(data, num)      do { \
-                                          _GST_PUT (data, 0,  8,  0, num); \
-                                        } while (0)
-
-/* Float endianness conversion macros */
-
-/* FIXME: Remove this once we depend on a GLib version with this */
-#ifndef GFLOAT_FROM_LE
-/**
- * GFLOAT_SWAP_LE_BE:
- * @in: input value
- *
- * Swap byte order of a 32-bit floating point value (float).
- *
- * Returns: @in byte-swapped.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gfloat GFLOAT_SWAP_LE_BE (gfloat in);
-#endif
-
-inline static gfloat
-GFLOAT_SWAP_LE_BE(gfloat in)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.f = in;
-  u.i = GUINT32_SWAP_LE_BE (u.i);
-  return u.f;
-}
-
-/**
- * GDOUBLE_SWAP_LE_BE:
- * @in: input value
- *
- * Swap byte order of a 64-bit floating point value (double).
- *
- * Returns: @in byte-swapped.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gdouble GDOUBLE_SWAP_LE_BE (gdouble in);
-#endif
-
-inline static gdouble
-GDOUBLE_SWAP_LE_BE(gdouble in)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.d = in;
-  u.i = GUINT64_SWAP_LE_BE (u.i);
-  return u.d;
-}
-
-/**
- * GDOUBLE_TO_LE:
- * @val: value
- *
- * Convert 64-bit floating point value (double) from native byte order into
- * little endian byte order.
- */
-/**
- * GDOUBLE_TO_BE:
- * @val: value
- *
- * Convert 64-bit floating point value (double) from native byte order into
- * big endian byte order.
- */
-/**
- * GDOUBLE_FROM_LE:
- * @val: value
- *
- * Convert 64-bit floating point value (double) from little endian byte order
- * into native byte order.
- */
-/**
- * GDOUBLE_FROM_BE:
- * @val: value
- *
- * Convert 64-bit floating point value (double) from big endian byte order
- * into native byte order.
- */
-
-/**
- * GFLOAT_TO_LE:
- * @val: value
- *
- * Convert 32-bit floating point value (float) from native byte order into
- * little endian byte order.
- */
-/**
- * GFLOAT_TO_BE:
- * @val: value
- *
- * Convert 32-bit floating point value (float) from native byte order into
- * big endian byte order.
- */
-/**
- * GFLOAT_FROM_LE:
- * @val: value
- *
- * Convert 32-bit floating point value (float) from little endian byte order
- * into native byte order.
- */
-/**
- * GFLOAT_FROM_BE:
- * @val: value
- *
- * Convert 32-bit floating point value (float) from big endian byte order
- * into native byte order.
- */
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define GFLOAT_TO_LE(val)    ((gfloat) (val))
-#define GFLOAT_TO_BE(val)    (GFLOAT_SWAP_LE_BE (val))
-#define GDOUBLE_TO_LE(val)   ((gdouble) (val))
-#define GDOUBLE_TO_BE(val)   (GDOUBLE_SWAP_LE_BE (val))
-
-#elif G_BYTE_ORDER == G_BIG_ENDIAN
-#define GFLOAT_TO_LE(val)    (GFLOAT_SWAP_LE_BE (val))
-#define GFLOAT_TO_BE(val)    ((gfloat) (val))
-#define GDOUBLE_TO_LE(val)   (GDOUBLE_SWAP_LE_BE (val))
-#define GDOUBLE_TO_BE(val)   ((gdouble) (val))
-
-#else /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-#error unknown ENDIAN type
-#endif /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-
-#define GFLOAT_FROM_LE(val)  (GFLOAT_TO_LE (val))
-#define GFLOAT_FROM_BE(val)  (GFLOAT_TO_BE (val))
-#define GDOUBLE_FROM_LE(val) (GDOUBLE_TO_LE (val))
-#define GDOUBLE_FROM_BE(val) (GDOUBLE_TO_BE (val))
-
-#endif /* !defined(GFLOAT_FROM_LE) */
-
-/**
- * GST_READ_FLOAT_LE:
- * @data: memory location
- *
- * Read a 32 bit float value in little endian format from the memory buffer.
- *
- * Returns: The floating point value read from @data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gfloat GST_READ_FLOAT_LE (const guint8 *data);
-#endif
-
-inline static gfloat
-GST_READ_FLOAT_LE(const guint8 *data)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.i = GST_READ_UINT32_LE (data);
-  return u.f;
-}
-
-/**
- * GST_READ_FLOAT_BE:
- * @data: memory location
- *
- * Read a 32 bit float value in big endian format from the memory buffer.
- *
- * Returns: The floating point value read from @data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gfloat GST_READ_FLOAT_BE (const guint8 *data);
-#endif
-
-inline static gfloat
-GST_READ_FLOAT_BE(const guint8 *data)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.i = GST_READ_UINT32_BE (data);
-  return u.f;
-}
-
-/**
- * GST_READ_DOUBLE_LE:
- * @data: memory location
- *
- * Read a 64 bit double value in little endian format from the memory buffer.
- *
- * Returns: The double-precision floating point value read from @data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gdouble GST_READ_DOUBLE_LE (const guint8 *data);
-#endif
-
-inline static gdouble
-GST_READ_DOUBLE_LE(const guint8 *data)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.i = GST_READ_UINT64_LE (data);
-  return u.d;
-}
-
-/**
- * GST_READ_DOUBLE_BE:
- * @data: memory location
- *
- * Read a 64 bit double value in big endian format from the memory buffer.
- *
- * Returns: The double-precision floating point value read from @data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gdouble GST_READ_DOUBLE_BE (const guint8 *data);
-#endif
-
-inline static gdouble
-GST_READ_DOUBLE_BE(const guint8 *data)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.i = GST_READ_UINT64_BE (data);
-  return u.d;
-}
-
-/**
- * GST_WRITE_FLOAT_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 32 bit float value in little endian format into the memory buffer.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void GST_WRITE_FLOAT_LE (guint8 *data, gfloat num);
-#endif
-
-inline static void
-GST_WRITE_FLOAT_LE(guint8 *data, gfloat num)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.f = num;
-  GST_WRITE_UINT32_LE (data, u.i);
-}
-
-/**
- * GST_WRITE_FLOAT_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 32 bit float value in big endian format into the memory buffer.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void GST_WRITE_FLOAT_BE (guint8 *data, gfloat num);
-#endif
-
-inline static void
-GST_WRITE_FLOAT_BE(guint8 *data, gfloat num)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.f = num;
-  GST_WRITE_UINT32_BE (data, u.i);
-}
-
-/**
- * GST_WRITE_DOUBLE_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 64 bit double value in little endian format into the memory buffer.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void GST_WRITE_DOUBLE_LE (guint8 *data, gdouble num);
-#endif
-
-inline static void
-GST_WRITE_DOUBLE_LE(guint8 *data, gdouble num)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.d = num;
-  GST_WRITE_UINT64_LE (data, u.i);
-}
-
-/**
- * GST_WRITE_DOUBLE_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 64 bit double value in big endian format into the memory buffer.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void GST_WRITE_DOUBLE_BE (guint8 *data, gdouble num);
-#endif
-
-inline static void
-GST_WRITE_DOUBLE_BE(guint8 *data, gdouble num)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.d = num;
-  GST_WRITE_UINT64_BE (data, u.i);
-}
-
-/* Miscellaneous utility macros */
-
-/**
- * GST_ROUND_UP_2:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 2.
- */
-#define GST_ROUND_UP_2(num)  (((num)+1)&~1)
-/**
- * GST_ROUND_UP_4:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 4.
- */
-#define GST_ROUND_UP_4(num)  (((num)+3)&~3)
-/**
- * GST_ROUND_UP_8:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 8.
- */
-#define GST_ROUND_UP_8(num)  (((num)+7)&~7)
-/**
- * GST_ROUND_UP_16:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 16.
- */
-#define GST_ROUND_UP_16(num) (((num)+15)&~15)
-/**
- * GST_ROUND_UP_32:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 32.
- */
-#define GST_ROUND_UP_32(num) (((num)+31)&~31)
-/**
- * GST_ROUND_UP_64:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 64.
- */
-#define GST_ROUND_UP_64(num) (((num)+63)&~63)
-
-/**
- * GST_ROUND_DOWN_2:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 2.
- */
-#define GST_ROUND_DOWN_2(num)  ((num)&(~1))
-/**
- * GST_ROUND_DOWN_4:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 4.
- */
-#define GST_ROUND_DOWN_4(num)  ((num)&(~3))
-/**
- * GST_ROUND_DOWN_8:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 8.
- */
-#define GST_ROUND_DOWN_8(num)  ((num)&(~7))
-/**
- * GST_ROUND_DOWN_16:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 16.
- */
-#define GST_ROUND_DOWN_16(num) ((num)&(~15))
-/**
- * GST_ROUND_DOWN_32:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 32.
- */
-#define GST_ROUND_DOWN_32(num) ((num)&(~31))
-/**
- * GST_ROUND_DOWN_64:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 64.
- */
-#define GST_ROUND_DOWN_64(num) ((num)&(~63))
-
-void                    gst_object_default_error        (GstObject    * source,
-                                                         const GError * error,
-                                                         const gchar  * debug);
-
-/* element functions */
-void                    gst_element_create_all_pads     (GstElement *element);
-GstPad*                 gst_element_get_compatible_pad  (GstElement *element, GstPad *pad,
-                                                         GstCaps *caps);
-
-GstPadTemplate*         gst_element_get_compatible_pad_template (GstElement *element, GstPadTemplate *compattempl);
-
-const gchar*            gst_element_state_get_name      (GstState state);
-const gchar *           gst_element_state_change_return_get_name (GstStateChangeReturn state_ret);
-
-gboolean                gst_element_link                (GstElement *src, GstElement *dest);
-gboolean                gst_element_link_many           (GstElement *element_1,
-                                                         GstElement *element_2, ...) G_GNUC_NULL_TERMINATED;
-gboolean                gst_element_link_filtered       (GstElement * src,
-                                                         GstElement * dest,
-                                                         GstCaps *filter);
-void                    gst_element_unlink              (GstElement *src, GstElement *dest);
-void                    gst_element_unlink_many         (GstElement *element_1,
-                                                         GstElement *element_2, ...) G_GNUC_NULL_TERMINATED;
-
-gboolean                gst_element_link_pads           (GstElement *src, const gchar *srcpadname,
-                                                         GstElement *dest, const gchar *destpadname);
-gboolean                gst_element_link_pads_full      (GstElement *src, const gchar *srcpadname,
-                                                         GstElement *dest, const gchar *destpadname,
-                                                         GstPadLinkCheck flags);
-void                    gst_element_unlink_pads         (GstElement *src, const gchar *srcpadname,
-                                                         GstElement *dest, const gchar *destpadname);
-
-gboolean                gst_element_link_pads_filtered  (GstElement * src, const gchar * srcpadname,
-                                                         GstElement * dest, const gchar * destpadname,
-                                                         GstCaps *filter);
-
-gboolean                gst_element_seek_simple         (GstElement   *element,
-                                                         GstFormat     format,
-                                                         GstSeekFlags  seek_flags,
-                                                         gint64        seek_pos);
-
-/* util elementfactory functions */
-gboolean gst_element_factory_can_sink_all_caps (GstElementFactory *factory, const GstCaps *caps);
-gboolean gst_element_factory_can_src_all_caps  (GstElementFactory *factory, const GstCaps *caps);
-gboolean gst_element_factory_can_sink_any_caps (GstElementFactory *factory, const GstCaps *caps);
-gboolean gst_element_factory_can_src_any_caps  (GstElementFactory *factory, const GstCaps *caps);
-
-/* util query functions */
-gboolean                gst_element_query_position      (GstElement *element, GstFormat format, gint64 *cur);
-gboolean                gst_element_query_duration      (GstElement *element, GstFormat format, gint64 *duration);
-gboolean                gst_element_query_convert       (GstElement *element, GstFormat src_format, gint64 src_val,
-                                                         GstFormat dest_format, gint64 *dest_val);
-
-/* pad functions */
-void                    gst_pad_use_fixed_caps          (GstPad *pad);
-GstElement*             gst_pad_get_parent_element      (GstPad *pad);
-
-/* util query functions */
-gboolean                gst_pad_proxy_query_accept_caps (GstPad *pad, GstQuery *query);
-gboolean                gst_pad_proxy_query_caps        (GstPad *pad, GstQuery *query);
-
-gboolean                gst_pad_query_position          (GstPad *pad, GstFormat format, gint64 *cur);
-gboolean                gst_pad_query_duration          (GstPad *pad, GstFormat format, gint64 *duration);
-gboolean                gst_pad_query_convert           (GstPad *pad, GstFormat src_format, gint64 src_val,
-                                                         GstFormat dest_format, gint64 *dest_val);
-GstCaps *               gst_pad_query_caps              (GstPad *pad, GstCaps *filter);
-gboolean                gst_pad_query_accept_caps       (GstPad *pad, GstCaps *caps);
-
-
-gboolean                gst_pad_peer_query_position     (GstPad *pad, GstFormat format, gint64 *cur);
-gboolean                gst_pad_peer_query_duration     (GstPad *pad, GstFormat format, gint64 *duration);
-gboolean                gst_pad_peer_query_convert      (GstPad *pad, GstFormat src_format, gint64 src_val,
-                                                         GstFormat dest_format, gint64 *dest_val);
-GstCaps *               gst_pad_peer_query_caps         (GstPad * pad, GstCaps *filter);
-gboolean                gst_pad_peer_query_accept_caps  (GstPad * pad, GstCaps *caps);
-
-gchar *                 gst_pad_create_stream_id               (GstPad * pad, GstElement * parent, const gchar *stream_id);
-gchar *                 gst_pad_create_stream_id_printf        (GstPad * pad, GstElement * parent, const gchar *stream_id, ...);
-gchar *                 gst_pad_create_stream_id_printf_valist (GstPad * pad, GstElement * parent, const gchar *stream_id, va_list var_args);
-
-/* bin functions */
-void                    gst_bin_add_many                (GstBin *bin, GstElement *element_1, ...) G_GNUC_NULL_TERMINATED;
-void                    gst_bin_remove_many             (GstBin *bin, GstElement *element_1, ...) G_GNUC_NULL_TERMINATED;
-GstPad *                gst_bin_find_unlinked_pad       (GstBin *bin, GstPadDirection direction);
-
-/* parse utility functions */
-GstElement *            gst_parse_bin_from_description      (const gchar     * bin_description,
-                                                             gboolean          ghost_unlinked_pads,
-                                                             GError         ** err);
-
-GstElement *            gst_parse_bin_from_description_full (const gchar     * bin_description,
-                                                             gboolean          ghost_unlinked_pads,
-                                                             GstParseContext * context,
-                                                             GstParseFlags     flags,
-                                                             GError         ** err);
-
-GstClockTime            gst_util_get_timestamp          (void);
-
-/**
- * GstSearchMode:
- * @GST_SEARCH_MODE_EXACT : Only search for exact matches.
- * @GST_SEARCH_MODE_BEFORE: Search for an exact match or the element just before.
- * @GST_SEARCH_MODE_AFTER : Search for an exact match or the element just after.
- *
- * The different search modes.
- */
-typedef enum {
-  GST_SEARCH_MODE_EXACT = 0,
-  GST_SEARCH_MODE_BEFORE,
-  GST_SEARCH_MODE_AFTER
-} GstSearchMode;
-
-gpointer      gst_util_array_binary_search      (gpointer array, guint num_elements,
-                                                 gsize element_size, GCompareDataFunc search_func,
-                                                 GstSearchMode mode, gconstpointer search_data,
-                                                 gpointer user_data);
-
-/* fraction operations */
-gint          gst_util_greatest_common_divisor  (gint a, gint b);
-gint64        gst_util_greatest_common_divisor_int64 (gint64 a, gint64 b);
-
-void          gst_util_fraction_to_double       (gint src_n, gint src_d, gdouble *dest);
-void          gst_util_double_to_fraction       (gdouble src, gint *dest_n, gint *dest_d);
-
-gboolean      gst_util_fraction_multiply        (gint a_n, gint a_d, gint b_n, gint b_d,
-                                                 gint *res_n, gint *res_d);
-gboolean      gst_util_fraction_add             (gint a_n, gint a_d, gint b_n, gint b_d,
-                                                 gint *res_n, gint *res_d);
-gint          gst_util_fraction_compare         (gint a_n, gint a_d, gint b_n, gint b_d);
-
-
-G_END_DECLS
-
-#endif /* __GST_UTILS_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstvalue.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstvalue.h
deleted file mode 100644
index 4ea492fc..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstvalue.h
+++ /dev/null
@@ -1,528 +0,0 @@
-/* GStreamer
- * Copyright (C) <2003> David A. Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VALUE_H__
-#define __GST_VALUE_H__
-
-#include <gst/gstconfig.h>
-#include <gst/gstcaps.h>
-#include <gst/gststructure.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_MAKE_FOURCC:
- * @a: the first character
- * @b: the second character
- * @c: the third character
- * @d: the fourth character
- *
- * Transform four characters into a #guint32 fourcc value with host
- * endianness.
- * <informalexample>
- * <programlisting>
- * guint32 fourcc = GST_MAKE_FOURCC ('M', 'J', 'P', 'G');
- * </programlisting>
- * </informalexample>
- */
-#define GST_MAKE_FOURCC(a,b,c,d)        ((guint32)((a)|(b)<<8|(c)<<16|(d)<<24))
-
-/**
- * GST_STR_FOURCC:
- * @f: a string with at least four characters
- *
- * Transform an input string into a #guint32 fourcc value with host
- * endianness.
- * Caller is responsible for ensuring the input string consists of at least
- * four characters.
- * <informalexample>
- * <programlisting>
- * guint32 fourcc = GST_STR_FOURCC ("MJPG");
- * </programlisting>
- * </informalexample>
- */
-#define GST_STR_FOURCC(f)               ((guint32)(((f)[0])|((f)[1]<<8)|((f)[2]<<16)|((f)[3]<<24)))
-
-/**
- * GST_FOURCC_FORMAT:
- *
- * Can be used together with #GST_FOURCC_ARGS to properly output a
- * #guint32 fourcc value in a printf()-style text message.
- * <informalexample>
- * <programlisting>
- * printf ("fourcc: %" GST_FOURCC_FORMAT "\n", GST_FOURCC_ARGS (fcc));
- * </programlisting>
- * </informalexample>
- */
-#define GST_FOURCC_FORMAT "c%c%c%c"
-
-/**
- * GST_FOURCC_ARGS:
- * @fourcc: a #guint32 fourcc value to output
- *
- * Can be used together with #GST_FOURCC_FORMAT to properly output a
- * #guint32 fourcc value in a printf()-style text message.
- */
-#define GST_FOURCC_ARGS(fourcc) \
-        ((gchar) ((fourcc)     &0xff)), \
-        ((gchar) (((fourcc)>>8 )&0xff)), \
-        ((gchar) (((fourcc)>>16)&0xff)), \
-        ((gchar) (((fourcc)>>24)&0xff))
-
-/**
- * GST_VALUE_HOLDS_INT_RANGE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_INT_RANGE value.
- */
-#define GST_VALUE_HOLDS_INT_RANGE(x)    (G_VALUE_HOLDS((x), gst_int_range_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_INT64_RANGE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_INT64_RANGE value.
- */
-#define GST_VALUE_HOLDS_INT64_RANGE(x)    (G_VALUE_HOLDS((x), gst_int64_range_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_DOUBLE_RANGE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_DOUBLE_RANGE value.
- */
-#define GST_VALUE_HOLDS_DOUBLE_RANGE(x) (G_VALUE_HOLDS((x), gst_double_range_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_FRACTION_RANGE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_FRACTION_RANGE value.
- */
-#define GST_VALUE_HOLDS_FRACTION_RANGE(x)    (G_VALUE_HOLDS((x), gst_fraction_range_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_LIST:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_LIST value.
- */
-#define GST_VALUE_HOLDS_LIST(x)         (G_VALUE_HOLDS((x), gst_value_list_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_ARRAY:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_ARRAY value.
- */
-#define GST_VALUE_HOLDS_ARRAY(x)        (G_VALUE_HOLDS((x), gst_value_array_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_CAPS:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_CAPS value.
- */
-#define GST_VALUE_HOLDS_CAPS(x)         (G_VALUE_HOLDS((x), GST_TYPE_CAPS))
-
-/**
- * GST_VALUE_HOLDS_STRUCTURE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_STRUCTURE value.
- */
-#define GST_VALUE_HOLDS_STRUCTURE(x)            (G_VALUE_HOLDS((x), GST_TYPE_STRUCTURE))
-
-/**
- * GST_VALUE_HOLDS_BUFFER:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_BUFFER value.
- */
-#define GST_VALUE_HOLDS_BUFFER(x)       (G_VALUE_HOLDS((x), GST_TYPE_BUFFER))
-
-/**
- * GST_VALUE_HOLDS_SAMPLE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_SAMPLE value.
- */
-#define GST_VALUE_HOLDS_SAMPLE(x)       (G_VALUE_HOLDS((x), GST_TYPE_SAMPLE))
-
-/**
- * GST_VALUE_HOLDS_FRACTION:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_FRACTION value.
- */
-#define GST_VALUE_HOLDS_FRACTION(x)     (G_VALUE_HOLDS((x), gst_fraction_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_DATE_TIME:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_DATE_TIME value.
- */
-#define GST_VALUE_HOLDS_DATE_TIME(x)    (G_VALUE_HOLDS((x), gst_date_time_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_BITMASK:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_BITMASK value.
- */
-#define GST_VALUE_HOLDS_BITMASK(x)      (G_VALUE_HOLDS((x), gst_bitmask_get_type ()))
-
-/**
- * GST_TYPE_INT_RANGE:
- *
- * a #GValue type that represents an integer range
- *
- * Returns: the #GType of GstIntRange
- */
-#define GST_TYPE_INT_RANGE               gst_int_range_get_type ()
-
-/**
- * GST_TYPE_INT64_RANGE:
- *
- * a #GValue type that represents an #gint64 range
- *
- * Returns: the #GType of GstInt64Range
- */
-#define GST_TYPE_INT64_RANGE             gst_int64_range_get_type ()
-
-/**
- * GST_TYPE_DOUBLE_RANGE:
- *
- * a #GValue type that represents a floating point range with double precission
- *
- * Returns: the #GType of GstIntRange
- */
-#define GST_TYPE_DOUBLE_RANGE            gst_double_range_get_type ()
-
-/**
- * GST_TYPE_FRACTION_RANGE:
- *
- * a #GValue type that represents a GstFraction range
- *
- * Returns: the #GType of GstFractionRange
- */
-#define GST_TYPE_FRACTION_RANGE            gst_fraction_range_get_type ()
-
-/**
- * GST_TYPE_LIST:
- *
- * a #GValue type that represents an unordered list of #GValue values. This
- * is used for example to express a list of possible values for a field in
- * a caps structure, like a list of possible sample rates, of which only one
- * will be chosen in the end. This means that all values in the list are
- * meaningful on their own.
- *
- * Returns: the #GType of GstValueList (which is not explicitly typed)
- */
-#define GST_TYPE_LIST                    gst_value_list_get_type ()
-
-/**
- * GST_TYPE_ARRAY:
- *
- * a #GValue type that represents an ordered list of #GValue values. This is
- * used to express a set of values that is meaningful only in their specific
- * combination and order of values. Each value on its own is not particularly
- * meaningful, only the ordered array in its entirety is meaningful. This is
- * used for example to express channel layouts for multichannel audio where
- * each channel needs to be mapped to a position in the room.
- *
- * Returns: the #GType of GstArrayList (which is not explicitly typed)
- */
-#define GST_TYPE_ARRAY                   gst_value_array_get_type ()
-
-/**
- * GST_TYPE_FRACTION:
- *
- * a #GValue type that represents a fraction of an integer numerator over
- * an integer denominator
- *
- * Returns: the #GType of GstFraction (which is not explicitly typed)
- */
-
-#define GST_TYPE_FRACTION                gst_fraction_get_type ()
-
-/**
- * GST_TYPE_DATE_TIME:
- *
- * a boxed #GValue type for #GstDateTime that represents a date and time.
- *
- * Returns: the #GType of GstDateTime
- */
-
-#define GST_TYPE_DATE_TIME               gst_date_time_get_type ()
-
-/**
- * GST_TYPE_BITMASK:
- *
- * a #GValue type that represents a 64-bit bitmask.
- *
- * Returns: the #GType of GstBitmask (which is not explicitly typed)
- */
-
-#define GST_TYPE_BITMASK                 gst_bitmask_get_type ()
-
-/**
- * GST_VALUE_LESS_THAN:
- *
- * Indicates that the first value provided to a comparison function
- * (gst_value_compare()) is lesser than the second one.
- */
-#define GST_VALUE_LESS_THAN              (-1)
-
-/**
- * GST_VALUE_EQUAL:
- *
- * Indicates that the first value provided to a comparison function
- * (gst_value_compare()) is equal to the second one.
- */
-#define GST_VALUE_EQUAL                   0
-
-/**
- * GST_VALUE_GREATER_THAN:
- *
- * Indicates that the first value provided to a comparison function
- * (gst_value_compare()) is greater than the second one.
- */
-#define GST_VALUE_GREATER_THAN            1
-
-/**
- * GST_VALUE_UNORDERED:
- *
- * Indicates that the comparison function (gst_value_compare()) can not
- * determine a order for the two provided values.
- */
-#define GST_VALUE_UNORDERED               2
-
-/**
- * GstValueCompareFunc:
- * @value1: first value for comparison
- * @value2: second value for comparison
- *
- * Used together with gst_value_compare() to compare #GValue items.
- *
- * Returns: one of GST_VALUE_LESS_THAN, GST_VALUE_EQUAL, GST_VALUE_GREATER_THAN
- * or GST_VALUE_UNORDERED
- */
-typedef gint     (* GstValueCompareFunc)     (const GValue *value1,
-                                              const GValue *value2);
-
-/**
- * GstValueSerializeFunc:
- * @value1: a #GValue
- *
- * Used by gst_value_serialize() to obtain a non-binary form of the #GValue.
- *
- * Free-function: g_free
- *
- * Returns: (transfer full): the string representation of the value
- */
-typedef gchar *  (* GstValueSerializeFunc)   (const GValue *value1);
-
-/**
- * GstValueDeserializeFunc:
- * @dest: a #GValue
- * @s: a string
- *
- * Used by gst_value_deserialize() to parse a non-binary form into the #GValue.
- *
- * Returns: %TRUE for success
- */
-typedef gboolean (* GstValueDeserializeFunc) (GValue       *dest,
-                                              const gchar  *s);
-
-typedef struct _GstValueTable GstValueTable;
-/**
- * GstValueTable:
- * @type: a #GType
- * @compare: a #GstValueCompareFunc
- * @serialize: a #GstValueSerializeFunc
- * @deserialize: a #GstValueDeserializeFunc
- *
- * VTable for the #GValue @type.
- */
-struct _GstValueTable {
-  GType type;
-  GstValueCompareFunc compare;
-  GstValueSerializeFunc serialize;
-  GstValueDeserializeFunc deserialize;
-
-  /*< private >*/
-  gpointer _gst_reserved [GST_PADDING];
-};
-
-GType gst_int_range_get_type (void);
-GType gst_int64_range_get_type (void);
-GType gst_double_range_get_type (void);
-GType gst_fraction_range_get_type (void);
-GType gst_fraction_get_type (void);
-GType gst_value_list_get_type (void);
-GType gst_value_array_get_type (void);
-GType gst_bitmask_get_type (void);
-
-GType gst_date_time_get_type (void);
-
-void            gst_value_register              (const GstValueTable   *table);
-void            gst_value_init_and_copy         (GValue                *dest,
-                                                 const GValue          *src);
-
-gchar *         gst_value_serialize             (const GValue          *value) G_GNUC_MALLOC;
-gboolean        gst_value_deserialize           (GValue                *dest,
-                                                 const gchar           *src);
-
-/* list */
-void            gst_value_list_append_value     (GValue         *value,
-                                                 const GValue   *append_value);
-void            gst_value_list_prepend_value    (GValue         *value,
-                                                 const GValue   *prepend_value);
-void            gst_value_list_concat           (GValue         *dest,
-                                                 const GValue   *value1,
-                                                 const GValue   *value2);
-void            gst_value_list_merge            (GValue         *dest,
-                                                 const GValue   *value1,
-                                                 const GValue   *value2);
-guint           gst_value_list_get_size         (const GValue   *value);
-const GValue *  gst_value_list_get_value        (const GValue   *value,
-                                                 guint          index);
-
-/* array */
-void            gst_value_array_append_value    (GValue         *value,
-                                                 const GValue   *append_value);
-void            gst_value_array_prepend_value   (GValue         *value,
-                                                 const GValue   *prepend_value);
-guint           gst_value_array_get_size        (const GValue   *value);
-const GValue *  gst_value_array_get_value       (const GValue   *value,
-                                                 guint          index);
-
-/* int range */
-void            gst_value_set_int_range         (GValue         *value,
-                                                 gint           start,
-                                                 gint           end);
-void            gst_value_set_int_range_step    (GValue         *value,
-                                                 gint           start,
-                                                 gint           end,
-                                                 gint           step);
-gint            gst_value_get_int_range_min     (const GValue   *value);
-gint            gst_value_get_int_range_max     (const GValue   *value);
-gint            gst_value_get_int_range_step    (const GValue   *value);
-
-/* int64 range */
-void            gst_value_set_int64_range       (GValue         *value,
-                                                 gint64         start,
-                                                 gint64         end);
-void            gst_value_set_int64_range_step  (GValue         *value,
-                                                 gint64         start,
-                                                 gint64         end,
-                                                 gint64         step);
-gint64          gst_value_get_int64_range_min   (const GValue   *value);
-gint64          gst_value_get_int64_range_max   (const GValue   *value);
-gint64          gst_value_get_int64_range_step  (const GValue   *value);
-
-/* double range */
-void            gst_value_set_double_range      (GValue         *value,
-                                                 gdouble        start,
-                                                 gdouble        end);
-gdouble         gst_value_get_double_range_min  (const GValue   *value);
-gdouble         gst_value_get_double_range_max  (const GValue   *value);
-
-/* caps */
-const GstCaps * gst_value_get_caps              (const GValue   *value);
-void            gst_value_set_caps              (GValue         *value,
-                                                 const GstCaps  *caps);
-
-/* structure */
-const GstStructure *
-                gst_value_get_structure         (const GValue   *value);
-void            gst_value_set_structure         (GValue         *value,
-                                                 const GstStructure  *structure);
-
-/* fraction */
-void            gst_value_set_fraction          (GValue         *value,
-                                                 gint           numerator,
-                                                 gint           denominator);
-gint            gst_value_get_fraction_numerator   (const GValue  *value);
-gint            gst_value_get_fraction_denominator (const GValue *value);
-gboolean        gst_value_fraction_multiply        (GValue         *product,
-                                                    const GValue   *factor1,
-                                                    const GValue   *factor2);
-gboolean        gst_value_fraction_subtract     (GValue * dest,
-                                                 const GValue * minuend,
-                                                 const GValue * subtrahend);
-
-/* fraction range */
-void            gst_value_set_fraction_range    (GValue         *value,
-                                                 const GValue   *start,
-                                                 const GValue   *end);
-void            gst_value_set_fraction_range_full (GValue       *value,
-                                                 gint numerator_start,
-                                                 gint denominator_start,
-                                                 gint numerator_end,
-                                                 gint denominator_end);
-const GValue    *gst_value_get_fraction_range_min (const GValue *value);
-const GValue    *gst_value_get_fraction_range_max (const GValue *value);
-
-/* bitmask */
-guint64         gst_value_get_bitmask           (const GValue   *value);
-void            gst_value_set_bitmask           (GValue         *value,
-                                                 guint64         bitmask);
-
-/* compare */
-gint            gst_value_compare               (const GValue   *value1,
-                                                 const GValue   *value2);
-gboolean        gst_value_can_compare           (const GValue   *value1,
-                                                 const GValue   *value2);
-gboolean        gst_value_is_subset             (const GValue   *value1,
-                                                 const GValue   *value2);
-
-/* union */
-gboolean        gst_value_union                 (GValue         *dest,
-                                                 const GValue   *value1,
-                                                 const GValue   *value2);
-gboolean        gst_value_can_union             (const GValue   *value1,
-                                                 const GValue   *value2);
-
-/* intersection */
-gboolean        gst_value_intersect             (GValue         *dest,
-                                                 const GValue   *value1,
-                                                 const GValue   *value2);
-gboolean        gst_value_can_intersect         (const GValue   *value1,
-                                                 const GValue   *value2);
-
-/* subtraction */
-gboolean        gst_value_subtract              (GValue         *dest,
-                                                 const GValue   *minuend,
-                                                 const GValue   *subtrahend);
-gboolean        gst_value_can_subtract          (const GValue   *minuend,
-                                                 const GValue   *subtrahend);
-
-/* fixation */
-gboolean        gst_value_is_fixed              (const GValue   *value);
-gboolean        gst_value_fixate                (GValue         *dest,
-                                                 const GValue   *src);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstversion.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstversion.h
deleted file mode 100644
index 82b17344..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/gstversion.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstversion.h: Version information for GStreamer
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/**
- * SECTION:gstversion
- * @short_description: GStreamer version macros.
- *
- * Use the GST_VERSION_* macros e.g. when defining own plugins. The GStreamer
- * runtime checks if these plugin and core version match and refuses to use a
- * plugin compiled against a different version of GStreamer.
- * You can also use the macros to keep the GStreamer version information in
- * your application.
- *
- * Use the gst_version() function if you want to know which version of
- * GStreamer you are currently linked against.
- *
- * The version macros get defined by including "gst/gst.h".
- */
-
-#ifndef __GST_VERSION_H__
-#define __GST_VERSION_H__
-
-G_BEGIN_DECLS
-
-/**
- * GST_VERSION_MAJOR:
- *
- * The major version of GStreamer at compile time:
- */
-#define GST_VERSION_MAJOR (1)
-/**
- * GST_VERSION_MINOR:
- *
- * The minor version of GStreamer at compile time:
- */
-#define GST_VERSION_MINOR (0)
-/**
- * GST_VERSION_MICRO:
- *
- * The micro version of GStreamer at compile time:
- */
-#define GST_VERSION_MICRO (5)
-/**
- * GST_VERSION_NANO:
- *
- * The nano version of GStreamer at compile time:
- * Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
- */
-#define GST_VERSION_NANO (0)
-
-/**
- * GST_CHECK_VERSION:
- * @major: a number indicating the major version
- * @minor: a number indicating the minor version
- * @micro: a number indicating the micro version
- *
- * Check whether a GStreamer version equal to or greater than
- * major.minor.micro is present.
- */
-#define	GST_CHECK_VERSION(major,minor,micro)	\
-    (GST_VERSION_MAJOR > (major) || \
-     (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR > (minor)) || \
-     (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \
-      GST_VERSION_MICRO >= (micro)) || \
-     (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \
-      GST_VERSION_MICRO + 1 == (micro) && GST_VERSION_NANO > 0))
-
-G_END_DECLS
-
-#endif /* __GST_VERSION_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/interfaces/photography-enumtypes.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/interfaces/photography-enumtypes.h
deleted file mode 100644
index 4c0a5aa3..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/interfaces/photography-enumtypes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-#ifndef __GST_PHOTOGRAPHY_ENUM_TYPES_H__
-#define __GST_PHOTOGRAPHY_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "photography.h" */
-GType gst_photography_noise_reduction_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_NOISE_REDUCTION (gst_photography_noise_reduction_get_type())
-GType gst_photography_white_balance_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_WHITE_BALANCE_MODE (gst_photography_white_balance_mode_get_type())
-GType gst_photography_color_tone_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_COLOR_TONE_MODE (gst_photography_color_tone_mode_get_type())
-GType gst_photography_scene_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_SCENE_MODE (gst_photography_scene_mode_get_type())
-GType gst_photography_flash_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_FLASH_MODE (gst_photography_flash_mode_get_type())
-GType gst_photography_focus_status_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_FOCUS_STATUS (gst_photography_focus_status_get_type())
-GType gst_photography_caps_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_CAPS (gst_photography_caps_get_type())
-GType gst_photography_shake_risk_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_SHAKE_RISK (gst_photography_shake_risk_get_type())
-GType gst_photography_flicker_reduction_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_FLICKER_REDUCTION_MODE (gst_photography_flicker_reduction_mode_get_type())
-GType gst_photography_focus_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_FOCUS_MODE (gst_photography_focus_mode_get_type())
-GType gst_photography_exposure_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_EXPOSURE_MODE (gst_photography_exposure_mode_get_type())
-G_END_DECLS
-
-#endif /* __GST_PHOTOGRAPHY_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/interfaces/photography.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/interfaces/photography.h
deleted file mode 100644
index d3a16e9d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/interfaces/photography.h
+++ /dev/null
@@ -1,590 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2008 Nokia Corporation <multimedia@maemo.org>
- *
- * photography.h: photography interface for digital imaging
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PHOTOGRAPHY_H__
-#define __GST_PHOTOGRAPHY_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The GstPhotography interface is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning." 
-#endif
-
-#include <gst/gst.h>
-#include <gst/interfaces/photography-enumtypes.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PHOTOGRAPHY \
-  (gst_photography_get_type ())
-#define GST_PHOTOGRAPHY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PHOTOGRAPHY, GstPhotography))
-#define GST_IS_PHOTOGRAPHY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PHOTOGRAPHY))
-#define GST_PHOTOGRAPHY_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_PHOTOGRAPHY, GstPhotographyInterface))
-
-
-/**
- * GST_PHOTOGRAPHY_AUTOFOCUS_DONE:
- *
- * Name of custom GstMessage that will be posted to #GstBus when autofocusing
- * is complete.
- * This message contains following fields:
- * <itemizedlist>
- * <listitem>
- *   <para>
- *   #GstPhotographyFocusStatus
- *   <classname>&quot;status&quot;</classname>:
- *   Tells if focusing succeeded or failed.
- *   </para>
- * </listitem>
- * <listitem>
- *   <para>
- *   #G_TYPE_INT
- *   <classname>&quot;focus-window-rows&quot;</classname>:
- *   Tells number of focus matrix rows.
- *   </para>
- * </listitem>
- * <listitem>
- *   <para>
- *   #G_TYPE_INT
- *   <classname>&quot;focus-window-columns&quot;</classname>:
- *   Tells number of focus matrix columns.
- *   </para>
- * </listitem>
- * <listitem>
- *   <para>
- *   #G_TYPE_INT
- *   <classname>&quot;focus-window-mask&quot;</classname>:
- *   Bitmask containing rows x columns bits which mark the focus points in the
- *   focus matrix. Lowest bit (LSB) always represents the top-left corner of the
- *   focus matrix. This field is only valid when focusing status is SUCCESS.
- *   </para>
- * </listitem>
- * </itemizedlist>
- */
-#define GST_PHOTOGRAPHY_AUTOFOCUS_DONE "autofocus-done"
-
-/**
- * GST_PHOTOGRAPHY_SHAKE_RISK:
- *
- * Name of custom GstMessage that is posted to #GstBus during autofocusing
- * process. It is posted if there is change in the risk of captured image
- * becoming "shaken" due to camera movement and too long exposure time.
- *
- * This message contains following fields:
- * <itemizedlist>
- * <listitem>
- *   <para>
- *   #GstPhotographyShakeRisk
- *   <classname>&quot;status&quot;</classname>:
- *   Tells risk level of capturing shaken image.
- *   </para>
- * </listitem>
- * </itemizedlist>
- */
-#define GST_PHOTOGRAPHY_SHAKE_RISK "shake-risk"
-
-/* Maximum white point values used in #GstPhotographySettings */
-#define MAX_WHITE_POINT_VALUES 4
-
-/* Interface property names */
-#define GST_PHOTOGRAPHY_PROP_WB_MODE      "white-balance-mode"
-#define GST_PHOTOGRAPHY_PROP_COLOR_TONE   "color-tone-mode"
-#define GST_PHOTOGRAPHY_PROP_SCENE_MODE   "scene-mode"
-#define GST_PHOTOGRAPHY_PROP_FLASH_MODE   "flash-mode"
-#define GST_PHOTOGRAPHY_PROP_NOISE_REDUCTION   "noise-reduction"
-#define GST_PHOTOGRAPHY_PROP_FOCUS_STATUS "focus-status"
-#define GST_PHOTOGRAPHY_PROP_CAPABILITIES "capabilities"
-#define GST_PHOTOGRAPHY_PROP_SHAKE_RISK   "shake-risk"
-#define GST_PHOTOGRAPHY_PROP_EV_COMP      "ev-compensation"
-#define GST_PHOTOGRAPHY_PROP_ISO_SPEED    "iso-speed"
-#define GST_PHOTOGRAPHY_PROP_APERTURE     "aperture"
-#define GST_PHOTOGRAPHY_PROP_EXPOSURE_TIME     "exposure-time"
-#define GST_PHOTOGRAPHY_PROP_IMAGE_CAPTURE_SUPPORTED_CAPS \
-    "image-capture-supported-caps"
-#define GST_PHOTOGRAPHY_PROP_IMAGE_PREVIEW_SUPPORTED_CAPS \
-    "image-preview-supported-caps"
-#define GST_PHOTOGRAPHY_PROP_FLICKER_MODE "flicker-mode"
-#define GST_PHOTOGRAPHY_PROP_FOCUS_MODE   "focus-mode"
-#define GST_PHOTOGRAPHY_PROP_ZOOM   "zoom"
-#define GST_PHOTOGRAPHY_PROP_COLOR_TEMPERATURE "color-temperature"
-#define GST_PHOTOGRAPHY_PROP_WHITE_POINT  "white-point"
-#define GST_PHOTOGRAPHY_PROP_ANALOG_GAIN  "analog-gain"
-#define GST_PHOTOGRAPHY_PROP_EXPOSURE_MODE     "exposure-mode"
-#define GST_PHOTOGRAPHY_PROP_LENS_FOCUS   "lens-focus"
-#define GST_PHOTOGRAPHY_PROP_MIN_EXPOSURE_TIME "min-exposure-time"
-#define GST_PHOTOGRAPHY_PROP_MAX_EXPOSURE_TIME "max-exposure-time"
-
-/**
- * GstPhotography:
- *
- * Opaque #GstPhotography data structure.
- */
-typedef struct _GstPhotography GstPhotography;
-
-/**
- * GstPhotographyNoiseReduction:
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_BAYER: Adaptive noise reduction on Bayer
- * format
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_YCC: reduces the noise on Y and 2-chroma
- * images.
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_TEMPORAL: Multi-frame adaptive NR,
- * provided for the video mode
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_FIXED: Fixed Pattern Noise refers to noise
- * that does not change between frames. The noise is removed from the sensor
- * image, by subtracting a previously-captured black image in memory.
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_EXTRA: Extra Noise Reduction. In the case
- * of high-ISO capturing, some noise remains after YCC NR. XNR reduces this
- * remaining noise.
- *
- * Noise Reduction features of a photography capture or filter element.
- *
- * Since: 0.10.21
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_BAYER = ( 1<<0 ),
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_YCC = ( 1<<1 ),
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_TEMPORAL= ( 1<< 2),
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_FIXED = (1 << 3),
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_EXTRA = (1 << 4)
-} GstPhotographyNoiseReduction;
-
-/**
- * GstPhotographyWhiteBalanceMode:
- * @GST_PHOTOGRAPHY_WB_MODE_AUTO: Choose white balance mode automatically
- * @GST_PHOTOGRAPHY_WB_MODE_DAYLIGHT: Mode for daylight conditions
- * @GST_PHOTOGRAPHY_WB_MODE_CLOUDY: Mode for cloudy conditions
- * @GST_PHOTOGRAPHY_WB_MODE_SUNSET: Mode for sunset conditions
- * @GST_PHOTOGRAPHY_WB_MODE_TUNGSTEN: Mode for tungsten lighting
- * @GST_PHOTOGRAPHY_WB_MODE_FLUORESCENT: Mode for fluorescent lighting
- * @GST_PHOTOGRAPHY_WB_MODE_MANUAL: Disable automatic white balance adjustment
- * and keep current values.
- *
- * Modes for white balance control.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_WB_MODE_AUTO = 0,
-  GST_PHOTOGRAPHY_WB_MODE_DAYLIGHT,
-  GST_PHOTOGRAPHY_WB_MODE_CLOUDY,
-  GST_PHOTOGRAPHY_WB_MODE_SUNSET,
-  GST_PHOTOGRAPHY_WB_MODE_TUNGSTEN,
-  GST_PHOTOGRAPHY_WB_MODE_FLUORESCENT,
-  GST_PHOTOGRAPHY_WB_MODE_MANUAL
-} GstPhotographyWhiteBalanceMode;
-
-/**
- * GstPhotographyColorToneMode:
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_NORMAL: No effects
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SEPIA: Sepia
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_NEGATIVE: Negative
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRAYSCALE: Grayscale
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_NATURAL: Natural
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_VIVID: Vivid
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_COLORSWAP: Colorswap
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SOLARIZE: Solarize
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_OUT_OF_FOCUS: Out of focus
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKY_BLUE: Sky blue
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRASS_GREEN: Grass green
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKIN_WHITEN: Skin whiten
- *
- * Modes for special color effects.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_NORMAL = 0,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SEPIA,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_NEGATIVE,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRAYSCALE,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_NATURAL,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_VIVID,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_COLORSWAP,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SOLARIZE,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_OUT_OF_FOCUS,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKY_BLUE,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRASS_GREEN,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKIN_WHITEN
-} GstPhotographyColorToneMode;
-
-/**
- * GstPhotographySceneMode:
- * @GST_PHOTOGRAPHY_SCENE_MODE_MANUAL: Set individual options manually
- * @GST_PHOTOGRAPHY_SCENE_MODE_CLOSEUP: Mode for close objects
- * @GST_PHOTOGRAPHY_SCENE_MODE_PORTRAIT: Mode for portraits
- * @GST_PHOTOGRAPHY_SCENE_MODE_LANDSCAPE: Mode for landscapes
- * @GST_PHOTOGRAPHY_SCENE_MODE_SPORT: Mode for scene with fast motion
- * @GST_PHOTOGRAPHY_SCENE_MODE_NIGHT: Mode for night conditions
- * @GST_PHOTOGRAPHY_SCENE_MODE_AUTO: Choose scene mode automatically
- *
- * Each mode contains preset #GstPhotography options in order to produce
- * good capturing result in certain scene.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_SCENE_MODE_MANUAL = 0,
-  GST_PHOTOGRAPHY_SCENE_MODE_CLOSEUP,
-  GST_PHOTOGRAPHY_SCENE_MODE_PORTRAIT,
-  GST_PHOTOGRAPHY_SCENE_MODE_LANDSCAPE,
-  GST_PHOTOGRAPHY_SCENE_MODE_SPORT,
-  GST_PHOTOGRAPHY_SCENE_MODE_NIGHT,
-  GST_PHOTOGRAPHY_SCENE_MODE_AUTO
-} GstPhotographySceneMode;
-
-/**
- * GstPhotographyFlashMode:
- * @GST_PHOTOGRAPHY_FLASH_MODE_AUTO: Fire flash automatically according to
- * lighting conditions.
- * @GST_PHOTOGRAPHY_FLASH_MODE_OFF: Never fire flash
- * @GST_PHOTOGRAPHY_FLASH_MODE_ON: Always fire flash
- * @GST_PHOTOGRAPHY_FLASH_MODE_FILL_IN: Fill in flash
- * @GST_PHOTOGRAPHY_FLASH_MODE_RED_EYE: Flash mode for reducing chance of
- * capturing red eyes
- *
- * Modes for flash control.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_FLASH_MODE_AUTO = 0,
-  GST_PHOTOGRAPHY_FLASH_MODE_OFF,
-  GST_PHOTOGRAPHY_FLASH_MODE_ON,
-  GST_PHOTOGRAPHY_FLASH_MODE_FILL_IN,
-  GST_PHOTOGRAPHY_FLASH_MODE_RED_EYE
-} GstPhotographyFlashMode;
-
-/**
- * GstPhotographyFocusStatus:
- * @GST_PHOTOGRAPHY_FOCUS_STATUS_NONE: No status available
- * @GST_PHOTOGRAPHY_FOCUS_STATUS_RUNNING: Focusing is ongoing
- * @GST_PHOTOGRAPHY_FOCUS_STATUS_FAIL: Focusing failed
- * @GST_PHOTOGRAPHY_FOCUS_STATUS_SUCCESS: Focusing succeeded
- *
- * Status of the focusing operation, used in #GST_PHOTOGRAPHY_AUTOFOCUS_DONE
- * message.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_FOCUS_STATUS_NONE = 0,
-  GST_PHOTOGRAPHY_FOCUS_STATUS_RUNNING,
-  GST_PHOTOGRAPHY_FOCUS_STATUS_FAIL,
-  GST_PHOTOGRAPHY_FOCUS_STATUS_SUCCESS
-} GstPhotographyFocusStatus;
-
-/**
- * GstPhotographyCaps:
- *
- * Bitmask that indicates which #GstPhotography interface features an instance
- * supports.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_CAPS_NONE = (0 << 0),
-  GST_PHOTOGRAPHY_CAPS_EV_COMP = (1 << 0),
-  GST_PHOTOGRAPHY_CAPS_ISO_SPEED = (1 << 1),
-  GST_PHOTOGRAPHY_CAPS_WB_MODE = (1 << 2),
-  GST_PHOTOGRAPHY_CAPS_TONE = (1 << 3),
-  GST_PHOTOGRAPHY_CAPS_SCENE = (1 << 4),
-  GST_PHOTOGRAPHY_CAPS_FLASH = (1 << 5),
-  GST_PHOTOGRAPHY_CAPS_ZOOM = (1 << 6),
-  GST_PHOTOGRAPHY_CAPS_FOCUS = (1 << 7),
-  GST_PHOTOGRAPHY_CAPS_APERTURE = (1 << 8),
-  GST_PHOTOGRAPHY_CAPS_EXPOSURE = (1 << 9),
-  GST_PHOTOGRAPHY_CAPS_SHAKE = (1 << 10),
-  GST_PHOTOGRAPHY_CAPS_WHITE_BALANCE = (1 << 11),
-  GST_PHOTOGRAPHY_CAPS_NOISE_REDUCTION = (1 << 12),
-  GST_PHOTOGRAPHY_CAPS_FLICKER_REDUCTION = (1 << 13),
-  GST_PHOTOGRAPHY_CAPS_ALL = (~0)
-} GstPhotographyCaps;
-
-/**
- * GstPhotographyShakeRisk:
- * @GST_PHOTOGRAPHY_SHAKE_RISK_LOW: Low risk
- * @GST_PHOTOGRAPHY_SHAKE_RISK_MEDIUM: Medium risk
- * @GST_PHOTOGRAPHY_SHAKE_RISK_HIGH: High risk
- *
- * Risk level of captured image becoming "shaken" due to camera movement and
- * too long exposure time. Used in #GST_PHOTOGRAPHY_SHAKE_RISK #GstMessage.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_SHAKE_RISK_LOW = 0,
-  GST_PHOTOGRAPHY_SHAKE_RISK_MEDIUM,
-  GST_PHOTOGRAPHY_SHAKE_RISK_HIGH,
-} GstPhotographyShakeRisk;
-
-/**
- * GstPhotographyFlickerReductionMode:
- * @GST_PHOTOGRAPHY_FLICKER_REDUCTION_OFF: Disable flicker reduction
- * @GST_PHOTOGRAPHY_FLICKER_REDUCTION_50HZ: 50Hz flicker reduction
- * @GST_PHOTOGRAPHY_FLICKER_REDUCTION_60HZ: 60Hz flicker reduction
- * @GST_PHOTOGRAPHY_FLICKER_REDUCTION_AUTO: Choose mode automatically
- *
- * Reduce flicker in video caused by light source fluctuation.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_FLICKER_REDUCTION_OFF = 0,
-  GST_PHOTOGRAPHY_FLICKER_REDUCTION_50HZ,
-  GST_PHOTOGRAPHY_FLICKER_REDUCTION_60HZ,
-  GST_PHOTOGRAPHY_FLICKER_REDUCTION_AUTO,
-} GstPhotographyFlickerReductionMode;
-
-/**
- * GstPhotographyFocusMode:
- * @GST_PHOTOGRAPHY_FOCUS_MODE_AUTO: Choose focus mode automatically
- * @GST_PHOTOGRAPHY_FOCUS_MODE_MACRO: Mode for focusing objects close to lens
- * @GST_PHOTOGRAPHY_FOCUS_MODE_PORTRAIT: Mode for portraits
- * @GST_PHOTOGRAPHY_FOCUS_MODE_INFINITY: Mode for landscapes and far away objects
- * @GST_PHOTOGRAPHY_FOCUS_MODE_HYPERFOCAL: Mode for maximum depth of field, keeping
- * focus acceptable both in infinify and as close objects as possible
- * @GST_PHOTOGRAPHY_FOCUS_MODE_EXTENDED: Extended focus mode
- * @GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_NORMAL: Continuous autofocus mode
- * @GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_EXTENDED: Extended continuous
- * autofocus mode
- * @GST_PHOTOGRAPHY_FOCUS_MODE_MANUAL: Disable automatic focusing
- * and keep current value. #GstPhotography:lens-focus property can
- * be used to change focus manually.
- *
- * Choose mode for focusing algorithm.
- */
-typedef enum {
-    GST_PHOTOGRAPHY_FOCUS_MODE_AUTO = 0,
-    GST_PHOTOGRAPHY_FOCUS_MODE_MACRO,
-    GST_PHOTOGRAPHY_FOCUS_MODE_PORTRAIT,
-    GST_PHOTOGRAPHY_FOCUS_MODE_INFINITY,
-    GST_PHOTOGRAPHY_FOCUS_MODE_HYPERFOCAL,
-    GST_PHOTOGRAPHY_FOCUS_MODE_EXTENDED,
-    GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_NORMAL,
-    GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_EXTENDED,
-    GST_PHOTOGRAPHY_FOCUS_MODE_MANUAL
-} GstPhotographyFocusMode;
-
-/**
- * GstPhotographyExposureMode:
- * @GST_PHOTOGRAPHY_EXPOSURE_MODE_AUTO: Adjust exposure automatically
- * @GST_PHOTOGRAPHY_EXPOSURE_MODE_MANUAL: Disable automatic exposure adjustment
- * and keep current values.
- *
- */
-typedef enum {
-    GST_PHOTOGRAPHY_EXPOSURE_MODE_AUTO = 0,
-    GST_PHOTOGRAPHY_EXPOSURE_MODE_MANUAL
-} GstPhotographyExposureMode;
-
-/**
- * GstPhotographySettings:
- *
- * Structure containing all #GstPhotography settings, used to set all
- * settings in one call with @gst_photography_set_config().
- */
-typedef struct
-{
-  GstPhotographyWhiteBalanceMode wb_mode;
-  GstPhotographyColorToneMode tone_mode;
-  GstPhotographySceneMode scene_mode;
-  GstPhotographyFlashMode flash_mode;
-  guint32 exposure_time;
-  guint aperture;
-  gfloat ev_compensation;
-  guint iso_speed;
-  gfloat zoom;
-  GstPhotographyFlickerReductionMode flicker_mode;
-  GstPhotographyFocusMode focus_mode;
-  GstPhotographyNoiseReduction noise_reduction;
-  GstPhotographyExposureMode exposure_mode;
-  guint color_temperature;
-  guint white_point[MAX_WHITE_POINT_VALUES];
-  gfloat analog_gain;
-  gfloat lens_focus;
-  guint min_exposure_time;
-  guint max_exposure_time;
-} GstPhotographySettings;
-
-/**
- * GstPhotographyCapturePrepared:
- * @data: user data that has been given, when registering the callback
- * @configured_caps: #GstCaps defining the configured capture format.
- *     Ownership of these caps stays in the element.
- *
- * This callback will be called when the element has finished preparations
- * and is ready for image capture. The next buffer that element produces
- * will be of @configured_caps format, so this callback allows the application
- * to e.g. reconfigure capsfilters in pipeline if any.
- */
-typedef void (*GstPhotographyCapturePrepared) (gpointer data,
-    const GstCaps *configured_caps);
-
-/**
- * GstPhotographyInterface:
- * @parent: parent interface type.
- * @get_ev_compensation: vmethod to get ev exposure compensation value
- * @get_iso_speed: vmethod to get iso speed (light sensitivity) value
- * @get_aperture: vmethod to get aperture value
- * @get_exposure: vmethod to get exposure time value
- * @get_white_balance_mode: vmethod to get white balance mode value
- * @get_color_tone_mode: vmethod to get color tone mode value
- * @get_scene_mode: vmethod to get scene mode value
- * @get_flash_mode: vmethod to get flash mode value
- * @get_noise_reduction: vmethod to get noise reduction mode value
- * @get_zoom: vmethod to get zoom factor value
- * @set_ev_compensation: vmethod to set ev exposure compensation value
- * @set_iso_speed: vmethod to set iso speed (light sensitivity) value
- * @set_aperture: vmethod to set aperture value
- * @set_exposure: vmethod to set exposure time value
- * @set_white_balance_mode: vmethod to set white balance mode value
- * @set_color_tone_mode: vmethod to set color tone mode value
- * @set_scene_mode: vmethod to set scene mode value
- * @set_flash_mode: vmethod to set flash mode value
- * @set_noise_reduction: vmethod to set noise reduction mode value
- * @set_zoom: vmethod to set zoom factor value
- * @get_capabilities: vmethod to get supported capabilities of the interface
- * @prepare_for_capture: vmethod to tell the element to prepare for capturing
- * @set_autofocus: vmethod to set autofocus on/off
- * @set_config: vmethod to set all configuration parameters at once
- * @get_config: vmethod to get all configuration parameters at once
- * @get_image_capture_supported_caps: vmethod to get caps describing supported image capture formats
- *
- * #GstPhotographyInterface interface.
- */
-typedef struct _GstPhotographyInterface
-{
-  GTypeInterface parent;
-
-  /* virtual functions */
-  gboolean (*get_ev_compensation) (GstPhotography * photo, gfloat * ev_comp);
-  gboolean (*get_iso_speed) (GstPhotography * photo, guint * iso_speed);
-  gboolean (*get_aperture) (GstPhotography * photo, guint * aperture);
-  gboolean (*get_exposure) (GstPhotography * photo, guint32 * exposure);
-  gboolean (*get_white_balance_mode) (GstPhotography * photo,
-    GstPhotographyWhiteBalanceMode * wb_mode);
-  gboolean (*get_color_tone_mode) (GstPhotography * photo,
-    GstPhotographyColorToneMode * tone_mode);
-  gboolean (*get_scene_mode) (GstPhotography * photo,
-    GstPhotographySceneMode * scene_mode);
-  gboolean (*get_flash_mode) (GstPhotography * photo,
-    GstPhotographyFlashMode * flash_mode);
-  gboolean (*get_zoom) (GstPhotography * photo, gfloat * zoom);
-    gboolean (*get_flicker_mode) (GstPhotography * photo,
-    GstPhotographyFlickerReductionMode * flicker_mode);
-  gboolean (*get_focus_mode) (GstPhotography * photo,
-    GstPhotographyFocusMode * focus_mode);
-
-  gboolean (*set_ev_compensation) (GstPhotography * photo, gfloat ev_comp);
-  gboolean (*set_iso_speed) (GstPhotography * photo, guint iso_speed);
-  gboolean (*set_aperture) (GstPhotography * photo, guint aperture);
-  gboolean (*set_exposure) (GstPhotography * photo, guint32 exposure);
-  gboolean (*set_white_balance_mode) (GstPhotography * photo,
-    GstPhotographyWhiteBalanceMode wb_mode);
-  gboolean (*set_color_tone_mode) (GstPhotography * photo,
-    GstPhotographyColorToneMode tone_mode);
-  gboolean (*set_scene_mode) (GstPhotography * photo,
-    GstPhotographySceneMode scene_mode);
-  gboolean (*set_flash_mode) (GstPhotography * photo,
-    GstPhotographyFlashMode flash_mode);
-  gboolean (*set_zoom) (GstPhotography * photo, gfloat zoom);
-  gboolean (*set_flicker_mode) (GstPhotography * photo,
-    GstPhotographyFlickerReductionMode flicker_mode);
-  gboolean (*set_focus_mode) (GstPhotography * photo,
-    GstPhotographyFocusMode focus_mode);
-
-  GstPhotographyCaps (*get_capabilities) (GstPhotography * photo);
-  gboolean (*prepare_for_capture) (GstPhotography * photo,
-    GstPhotographyCapturePrepared func, GstCaps *capture_caps, gpointer user_data);
-  void (*set_autofocus) (GstPhotography * photo, gboolean on);
-  gboolean (*set_config) (GstPhotography * photo, GstPhotographySettings * config);
-  gboolean (*get_config) (GstPhotography * photo, GstPhotographySettings * config);
-
-  gboolean (*get_noise_reduction) (GstPhotography * photo,
-    GstPhotographyNoiseReduction * noise_reduction);
-  gboolean (*set_noise_reduction) (GstPhotography * photo,
-    GstPhotographyNoiseReduction noise_reduction);
-
-  /*< private > */
-  gpointer _gst_reserved[GST_PADDING];
-} GstPhotographyInterface;
-
-GType gst_photography_get_type (void);
-
-/* virtual class function wrappers */
-gboolean gst_photography_get_ev_compensation (GstPhotography * photo,
-    gfloat * ev_comp);
-gboolean gst_photography_get_iso_speed (GstPhotography * photo,
-    guint * iso_speed);
-gboolean gst_photography_get_aperture (GstPhotography * photo,
-    guint * aperture);
-gboolean gst_photography_get_exposure (GstPhotography * photo,
-    guint32 * exposure);
-gboolean gst_photography_get_white_balance_mode (GstPhotography * photo,
-    GstPhotographyWhiteBalanceMode * wb_mode);
-gboolean gst_photography_get_color_tone_mode (GstPhotography * photo,
-    GstPhotographyColorToneMode * tone_mode);
-gboolean gst_photography_get_scene_mode (GstPhotography * photo,
-    GstPhotographySceneMode * scene_mode);
-gboolean gst_photography_get_flash_mode (GstPhotography * photo,
-    GstPhotographyFlashMode * flash_mode);
-gboolean gst_photography_get_noise_reduction (GstPhotography * photo,
-    GstPhotographyNoiseReduction * noise_reduction);
-gboolean gst_photography_get_zoom (GstPhotography * photo, gfloat * zoom);
-gboolean gst_photography_get_flicker_mode (GstPhotography * photo,
-    GstPhotographyFlickerReductionMode *mode);
-gboolean gst_photography_get_focus_mode (GstPhotography * photo,
-    GstPhotographyFocusMode *mode);
-
-gboolean gst_photography_set_ev_compensation (GstPhotography * photo,
-    gfloat ev_comp);
-gboolean gst_photography_set_iso_speed (GstPhotography * photo,
-    guint iso_speed);
-gboolean gst_photography_set_aperture (GstPhotography * photo, guint aperture);
-gboolean gst_photography_set_exposure (GstPhotography * photo, guint exposure);
-gboolean gst_photography_set_white_balance_mode (GstPhotography * photo,
-    GstPhotographyWhiteBalanceMode wb_mode);
-gboolean gst_photography_set_color_tone_mode (GstPhotography * photo,
-    GstPhotographyColorToneMode tone_mode);
-gboolean gst_photography_set_scene_mode (GstPhotography * photo,
-    GstPhotographySceneMode scene_mode);
-gboolean gst_photography_set_flash_mode (GstPhotography * photo,
-    GstPhotographyFlashMode flash_mode);
-gboolean gst_photography_set_noise_reduction (GstPhotography * photo,
-    GstPhotographyNoiseReduction noise_reduction);
-gboolean gst_photography_set_zoom (GstPhotography * photo, gfloat zoom);
-gboolean gst_photography_set_flicker_mode (GstPhotography * photo,
-    GstPhotographyFlickerReductionMode mode);
-gboolean gst_photography_set_focus_mode (GstPhotography * photo,
-    GstPhotographyFocusMode mode);
-
-GstPhotographyCaps gst_photography_get_capabilities (GstPhotography * photo);
-
-gboolean gst_photography_prepare_for_capture (GstPhotography * photo,
-    GstPhotographyCapturePrepared func, GstCaps *capture_caps, gpointer user_data);
-
-void gst_photography_set_autofocus (GstPhotography * photo, gboolean on);
-
-gboolean gst_photography_set_config (GstPhotography * photo,
-    GstPhotographySettings * config);
-gboolean gst_photography_get_config (GstPhotography * photo,
-    GstPhotographySettings * config);
-
-G_END_DECLS
-
-#endif /* __GST_PHOTOGRAPHY_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/math-compat.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/math-compat.h
deleted file mode 100644
index d160c2cf..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/math-compat.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GStreamer
- * Copyright (C) 2010 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_MATH_COMPAT_H__
-#define __GST_MATH_COMPAT_H__
-
-/* This header is not included automatically via gst/gst.h, you need to
- * include it explicitly if you need it. */
-
-#ifndef _USE_MATH_DEFINES
-#define _USE_MATH_DEFINES /* so MSVC defines M_PI etc. */
-#endif
-#include <math.h>
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* http://en.wikipedia.org/wiki/Math.h */
-
-#define __GST_MATH_COMPAT_NEED_RINT
-#define __GST_MATH_COMPAT_NEED_RINTF
-#define __GST_MATH_COMPAT_NEED_ISNAN
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#undef __GST_MATH_COMPAT_NEED_RINT
-#undef __GST_MATH_COMPAT_NEED_RINTF
-#undef __GST_MATH_COMPAT_NEED_ISNAN
-#endif
-
-#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
-#undef __GST_MATH_COMPAT_NEED_RINT
-#undef __GST_MATH_COMPAT_NEED_RINTF
-#undef __GST_MATH_COMPAT_NEED_ISNAN
-#endif
-
-#ifndef M_PI
-#define M_PI G_PI
-#endif
-
-#ifndef M_PI_2
-#define M_PI_2 G_PI_2
-#endif
-
-#ifndef M_PI_4
-#define M_PI_4 G_PI_4
-#endif
-
-static inline double
-__gst_math_compat_rint (double x)
-{
-  return floor (x + 0.5);
-}
-
-static inline float
-__gst_math_compat_rintf (float x)
-{
-  return floorf (x + 0.5);
-}
-
-static inline gboolean
-__gst_math_compat_isnan (double x)
-{
-  return x != x;
-}
-
-#if defined (__GST_MATH_COMPAT_NEED_RINT) && !defined (rint)
-#define rint(x) __gst_math_compat_rint(x)
-#endif
-
-#if defined (__GST_MATH_COMPAT_NEED_RINTF) && !defined (rintf)
-#define rintf(x) __gst_math_compat_rintf(x)
-#endif
-
-#if defined (__GST_MATH_COMPAT_NEED_ISNAN) && !defined (isnan)
-#define isnan(x) __gst_math_compat_isnan (x)
-#endif
-
-#ifndef NAN
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-#define __GST_NAN_BYTES        { 0x7f, 0xc0, 0, 0 }
-#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define __GST_NAN_BYTES        { 0, 0, 0xc0, 0x7f }
-#endif
-static union {
-  unsigned char __c[4];
-  float __d;
-} __gst_nan_union G_GNUC_UNUSED = {
-  __GST_NAN_BYTES
-};
-#define NAN    (__gst_nan_union.__d)
-#endif
-
-G_END_DECLS
-
-#endif /* __GST_MATH_COMPAT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnet.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnet.h
deleted file mode 100644
index 078cad59..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnet.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_NET_H__
-#define __GST_NET_H__
-
-
-#include <gst/net/gstnetclientclock.h>
-#include <gst/net/gstnettimepacket.h>
-#include <gst/net/gstnettimeprovider.h>
-
-
-#endif /* __GST_NET_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnetaddressmeta.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnetaddressmeta.h
deleted file mode 100644
index 0173d874..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnetaddressmeta.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_NET_ADDRESS_META_H__
-#define __GST_NET_ADDRESS_META_H__
-
-#include <gst/gst.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstNetAddressMeta GstNetAddressMeta;
-
-/**
- * GstNetAddressMeta:
- *
- * Buffer metadata for network addresses.
- */
-struct _GstNetAddressMeta {
-  GstMeta       meta;
-
-  GSocketAddress *addr;
-};
-
-GType gst_net_address_meta_api_get_type (void);
-#define GST_NET_ADDRESS_META_API_TYPE (gst_net_address_meta_api_get_type())
-
-#define gst_buffer_get_net_address_meta(b) \
-  ((GstNetAddressMeta*)gst_buffer_get_meta((b),GST_NET_ADDRESS_META_API_TYPE))
-
-/* implementation */
-const GstMetaInfo *gst_net_address_meta_get_info (void);
-#define GST_NET_ADDRESS_META_INFO (gst_net_address_meta_get_info())
-
-GstNetAddressMeta * gst_buffer_add_net_address_meta (GstBuffer      *buffer,
-                                                     GSocketAddress *addr);
-
-G_END_DECLS
-
-#endif /* __GST_NET_ADDRESS_META_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnetclientclock.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnetclientclock.h
deleted file mode 100644
index a0fcf1f9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnetclientclock.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *                    2005 Andy Wingo <wingo@pobox.com>
- * Copyright (C) 2012 Collabora Ltd. <tim.muller@collabora.co.uk>
- *
- * gstnetclientclock.h: clock that synchronizes itself to a time provider over
- * the network
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_NET_CLIENT_CLOCK_H__
-#define __GST_NET_CLIENT_CLOCK_H__
-
-#include <gst/gst.h>
-#include <gst/gstsystemclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_NET_CLIENT_CLOCK \
-  (gst_net_client_clock_get_type())
-#define GST_NET_CLIENT_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_NET_CLIENT_CLOCK,GstNetClientClock))
-#define GST_NET_CLIENT_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NET_CLIENT_CLOCK,GstNetClientClockClass))
-#define GST_IS_NET_CLIENT_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NET_CLIENT_CLOCK))
-#define GST_IS_NET_CLIENT_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NET_CLIENT_CLOCK))
-
-typedef struct _GstNetClientClock GstNetClientClock;
-typedef struct _GstNetClientClockClass GstNetClientClockClass;
-typedef struct _GstNetClientClockPrivate GstNetClientClockPrivate;
-
-/**
- * GstNetClientClock:
- *
- * Opaque #GstNetClientClock structure.
- */
-struct _GstNetClientClock {
-  GstSystemClock clock;
-
-  /*< private >*/
-  GstNetClientClockPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstNetClientClockClass {
-  GstSystemClockClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_net_client_clock_get_type	(void);
-
-GstClock*	gst_net_client_clock_new	(gchar *name, const gchar *remote_address,
-                                                 gint remote_port, GstClockTime base_time);
-
-G_END_DECLS
-
-#endif /* __GST_NET_CLIENT_CLOCK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnettimepacket.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnettimepacket.h
deleted file mode 100644
index 88395967..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnettimepacket.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_NET_TIME_PACKET_H__
-#define __GST_NET_TIME_PACKET_H__
-
-#include <gst/gst.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_NET_TIME_PACKET_SIZE:
- *
- * The size of the packets sent between network clocks.
- */
-#define GST_NET_TIME_PACKET_SIZE 16
-
-typedef struct _GstNetTimePacket GstNetTimePacket;
-
-/**
- * GstNetTimePacket:
- * @local_time: the local time when this packet was sent
- * @remote_time: the remote time observation
- *
- * Content of a #GstNetTimePacket.
- */
-struct _GstNetTimePacket {
-  GstClockTime local_time;
-  GstClockTime remote_time;
-};
-
-GType gst_net_time_packet_get_type(void);
-
-GstNetTimePacket*       gst_net_time_packet_new         (const guint8 *buffer);
-GstNetTimePacket*       gst_net_time_packet_copy        (const GstNetTimePacket *packet);
-void                    gst_net_time_packet_free        (GstNetTimePacket *packet);
-
-guint8*                 gst_net_time_packet_serialize   (const GstNetTimePacket *packet);
-
-GstNetTimePacket*	gst_net_time_packet_receive     (GSocket         * socket,
-                                                         GSocketAddress ** src_address,
-                                                         GError         ** error);
-
-gboolean                gst_net_time_packet_send        (const GstNetTimePacket * packet,
-                                                         GSocket                * socket,
-                                                         GSocketAddress         * dest_address,
-                                                         GError                ** error);
-
-G_END_DECLS
-
-
-#endif /* __GST_NET_TIME_PACKET_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnettimeprovider.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnettimeprovider.h
deleted file mode 100644
index 81c0fbe9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/net/gstnettimeprovider.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
- *               2006 Joni Valtanen <joni.valtanen@movial.fi>
- * Copyright (C) 2012 Collabora Ltd. <tim.muller@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_NET_TIME_PROVIDER_H__
-#define __GST_NET_TIME_PROVIDER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_NET_TIME_PROVIDER \
-  (gst_net_time_provider_get_type())
-#define GST_NET_TIME_PROVIDER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_NET_TIME_PROVIDER,GstNetTimeProvider))
-#define GST_NET_TIME_PROVIDER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NET_TIME_PROVIDER,GstNetTimeProviderClass))
-#define GST_IS_NET_TIME_PROVIDER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NET_TIME_PROVIDER))
-#define GST_IS_NET_TIME_PROVIDER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NET_TIME_PROVIDER))
-
-typedef struct _GstNetTimeProvider GstNetTimeProvider;
-typedef struct _GstNetTimeProviderClass GstNetTimeProviderClass;
-typedef struct _GstNetTimeProviderPrivate GstNetTimeProviderPrivate;
-
-/**
- * GstNetTimeProvider:
- *
- * Opaque #GstNetTimeProvider structure.
- */
-struct _GstNetTimeProvider {
-  GstObject parent;
-
-  /*< private >*/
-  GstNetTimeProviderPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstNetTimeProviderClass {
-  GstObjectClass parent_class;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_net_time_provider_get_type  (void);
-
-GstNetTimeProvider*     gst_net_time_provider_new       (GstClock *clock,
-                                                         const gchar *address,
-                                                         gint port);
-
-G_END_DECLS
-
-
-#endif /* __GST_NET_TIME_PROVIDER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/codec-utils.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/codec-utils.h
deleted file mode 100644
index 7c2febf7..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/codec-utils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GStreamer base utils library codec-specific utility functions
- * Copyright (C) 2010 Arun Raghavan <arun.raghavan@collabora.co.uk>
- *               2010 Collabora Multimedia
- *               2010 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_CODEC_UTILS_H__
-#define __GST_PB_UTILS_CODEC_UTILS_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/* AAC */
-
-guint         gst_codec_utils_aac_get_sample_rate_from_index (guint sr_idx);
-
-const gchar * gst_codec_utils_aac_get_profile (const guint8 * audio_config, guint len);
-
-const gchar * gst_codec_utils_aac_get_level   (const guint8 * audio_config, guint len);
-
-gboolean      gst_codec_utils_aac_caps_set_level_and_profile (GstCaps      * caps,
-                                                              const guint8 * audio_config,
-                                                              guint          len);
-
-/* H.264 */
-
-const gchar * gst_codec_utils_h264_get_profile (const guint8 * sps, guint len);
-
-const gchar * gst_codec_utils_h264_get_level   (const guint8 * sps, guint len);
-
-guint8        gst_codec_utils_h264_get_level_idc (const gchar * level);
-
-gboolean      gst_codec_utils_h264_caps_set_level_and_profile (GstCaps      * caps,
-                                                               const guint8 * sps,
-                                                               guint          len);
-
-/* MPEG-4 part 2 */
-
-const gchar * gst_codec_utils_mpeg4video_get_profile (const guint8 * vis_obj_seq, guint len);
-
-const gchar * gst_codec_utils_mpeg4video_get_level   (const guint8 * vis_obj_seq, guint len);
-
-gboolean      gst_codec_utils_mpeg4video_caps_set_level_and_profile (GstCaps      * caps,
-                                                                     const guint8 * vis_obj_seq,
-                                                                     guint          len);
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_CODEC_UTILS_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/descriptions.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/descriptions.h
deleted file mode 100644
index 5b19ecca..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/descriptions.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GStreamer base utils library source/sink/codec description support
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_DESCRIPTIONS_H__
-#define __GST_PB_UTILS_DESCRIPTIONS_H__
-
-#include <gst/gsttaglist.h>
-#include <gst/gstcaps.h>
-
-G_BEGIN_DECLS
-
-/*
- * functions for use by demuxers or decoders to add CODEC tags to tag lists
- * from caps
- */
-
-gboolean   gst_pb_utils_add_codec_description_to_tag_list (GstTagList    * taglist,
-                                                             const gchar   * codec_tag,
-                                                             const GstCaps * caps);
-
-gchar    * gst_pb_utils_get_codec_description (const GstCaps * caps);
-
-/*
- * functions mainly used by the missing plugins message creation functions to
- * find descriptions of what exactly is missing
- */
-
-gchar    * gst_pb_utils_get_source_description (const gchar * protocol);
-
-gchar    * gst_pb_utils_get_sink_description (const gchar * protocol);
-
-gchar    * gst_pb_utils_get_decoder_description (const GstCaps * caps);
-
-gchar    * gst_pb_utils_get_encoder_description (const GstCaps * caps);
-
-gchar    * gst_pb_utils_get_element_description (const gchar * factory_name);
-
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_DESCRIPTIONS_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/encoding-profile.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/encoding-profile.h
deleted file mode 100644
index f6de6ed3..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/encoding-profile.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* GStreamer encoding profiles library
- * Copyright (C) 2009-2010 Edward Hervey <edward.hervey@collabora.co.uk>
- *           (C) 2009-2010 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PROFILE_H__
-#define __GST_PROFILE_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#include <gst/pbutils/pbutils-enumtypes.h>
-#include <gst/pbutils/gstdiscoverer.h>
-
-/**
- * GstEncodingProfile:
- *
- * The opaque base class object for all encoding profiles. This contains generic
- * information like name, description, format and preset.
- */
-
-#define GST_TYPE_ENCODING_PROFILE                       \
-  (gst_encoding_profile_get_type ())
-#define GST_ENCODING_PROFILE(obj)                       \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_PROFILE, GstEncodingProfile))
-#define GST_IS_ENCODING_PROFILE(obj)                    \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_PROFILE))
-typedef struct _GstEncodingProfile GstEncodingProfile;
-typedef struct _GstEncodingProfileClass GstEncodingProfileClass;
-GType gst_encoding_profile_get_type (void);
-
-
-
-/**
- * GstEncodingContainerProfile:
- *
- * Encoding profiles for containers. Keeps track of a list of #GstEncodingProfile
- */
-#define GST_TYPE_ENCODING_CONTAINER_PROFILE                     \
-  (gst_encoding_container_profile_get_type ())
-#define GST_ENCODING_CONTAINER_PROFILE(obj)                     \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_CONTAINER_PROFILE, GstEncodingContainerProfile))
-#define GST_IS_ENCODING_CONTAINER_PROFILE(obj)                  \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_CONTAINER_PROFILE))
-typedef struct _GstEncodingContainerProfile GstEncodingContainerProfile;
-typedef struct _GstEncodingContainerProfileClass GstEncodingContainerProfileClass;
-GType gst_encoding_container_profile_get_type (void);
-
-
-
-/**
- * GstEncodingVideoProfile:
- *
- * Variant of #GstEncodingProfile for video streams, allows specifying the @pass.
- */
-#define GST_TYPE_ENCODING_VIDEO_PROFILE                 \
-  (gst_encoding_video_profile_get_type ())
-#define GST_ENCODING_VIDEO_PROFILE(obj)                 \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_VIDEO_PROFILE, GstEncodingVideoProfile))
-#define GST_IS_ENCODING_VIDEO_PROFILE(obj)                      \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_VIDEO_PROFILE))
-typedef struct _GstEncodingVideoProfile GstEncodingVideoProfile;
-typedef struct _GstEncodingVideoProfileClass GstEncodingVideoProfileClass;
-GType gst_encoding_video_profile_get_type (void);
-
-
-
-/**
- * GstEncodingAudioProfile:
- *
- * Variant of #GstEncodingProfile for audio streams.
- */
-#define GST_TYPE_ENCODING_AUDIO_PROFILE                 \
-  (gst_encoding_audio_profile_get_type ())
-#define GST_ENCODING_AUDIO_PROFILE(obj)                 \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_AUDIO_PROFILE, GstEncodingAudioProfile))
-#define GST_IS_ENCODING_AUDIO_PROFILE(obj)                      \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_AUDIO_PROFILE))
-typedef struct _GstEncodingAudioProfile GstEncodingAudioProfile;
-typedef struct _GstEncodingAudioProfileClass GstEncodingAudioProfileClass;
-GType gst_encoding_audio_profile_get_type (void);
-
-
-
-/* GstEncodingProfile API */
-
-/**
- * gst_encoding_profile_unref:
- * @profile: a #GstEncodingProfile
- *
- * Decreases the reference count of the @profile, possibly freeing the @profile.
- */
-#define gst_encoding_profile_unref(profile) (g_object_unref ((GObject*) profile))
-
-/**
- * gst_encoding_profile_ref:
- * @profile: a #GstEncodingProfile
- *
- * Increases the reference count of the @profile.
- */
-#define gst_encoding_profile_ref(profile) (g_object_ref ((GObject*) profile))
-
-const gchar *   gst_encoding_profile_get_name           (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_name           (GstEncodingProfile *profile,
-                                                         const gchar *name);
-const gchar *   gst_encoding_profile_get_description    (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_description    (GstEncodingProfile *profile,
-                                                         const gchar *description);
-GstCaps *       gst_encoding_profile_get_format         (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_format         (GstEncodingProfile *profile,
-                                                         GstCaps *format);
-const gchar *   gst_encoding_profile_get_preset         (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_preset         (GstEncodingProfile *profile,
-                                                         const gchar *preset);
-guint           gst_encoding_profile_get_presence       (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_presence       (GstEncodingProfile *profile,
-                                                         guint presence);
-GstCaps *       gst_encoding_profile_get_restriction    (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_restriction    (GstEncodingProfile *profile,
-                                                         GstCaps *restriction);
-
-gboolean        gst_encoding_profile_is_equal           (GstEncodingProfile *a,
-                                                         GstEncodingProfile *b);
-GstCaps *       gst_encoding_profile_get_input_caps     (GstEncodingProfile *profile);
-const gchar *   gst_encoding_profile_get_type_nick      (GstEncodingProfile *profile);
-
-GstEncodingProfile * gst_encoding_profile_find (const gchar *targetname,
-                                                const gchar *profilename,
-                                                const gchar *category);
-
-/* GstEncodingContainerProfile API */
-gboolean        gst_encoding_container_profile_add_profile       (GstEncodingContainerProfile *container,
-                                                                  GstEncodingProfile *profile);
-gboolean        gst_encoding_container_profile_contains_profile  (GstEncodingContainerProfile * container,
-                                                                  GstEncodingProfile *profile);
-const GList *   gst_encoding_container_profile_get_profiles      (GstEncodingContainerProfile *profile);
-
-
-GstEncodingContainerProfile *  gst_encoding_container_profile_new (const gchar *name,
-                                                                   const gchar *description,
-                                                                   GstCaps *format,
-                                                                   const gchar *preset);
-
-
-/* Invidual stream encodingprofile API */
-GstEncodingVideoProfile * gst_encoding_video_profile_new (GstCaps *format,
-                                                          const gchar *preset,
-                                                          GstCaps *restriction,
-                                                          guint presence);
-GstEncodingAudioProfile * gst_encoding_audio_profile_new (GstCaps *format,
-                                                          const gchar *preset,
-                                                          GstCaps *restriction,
-                                                          guint presence);
-
-guint    gst_encoding_video_profile_get_pass              (GstEncodingVideoProfile *prof);
-gboolean gst_encoding_video_profile_get_variableframerate (GstEncodingVideoProfile *prof);
-
-void     gst_encoding_video_profile_set_pass              (GstEncodingVideoProfile *prof,
-                                                           guint pass);
-void     gst_encoding_video_profile_set_variableframerate (GstEncodingVideoProfile *prof,
-                                                           gboolean variableframerate);
-
-GstEncodingProfile * gst_encoding_profile_from_discoverer (GstDiscovererInfo *info);
-
-G_END_DECLS
-
-#endif /* __GST_PROFILE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/encoding-target.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/encoding-target.h
deleted file mode 100644
index bdfe3065..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/encoding-target.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* GStreamer encoding profile registry
- * Copyright (C) 2010 Edward Hervey <edward.hervey@collabora.co.uk>
- *           (C) 2010 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PROFILE_REGISTRY_H__
-#define __GST_PROFILE_REGISTRY_H__
-
-#include <gst/pbutils/encoding-profile.h>
-
-G_BEGIN_DECLS
-
-
-/* FIXME/UNKNOWNS
- *
- * Should encoding categories be well-known strings/quarks ?
- *
- */
-
-/**
- * GST_ENCODING_CATEGORY_DEVICE:
- *
- * #GstEncodingTarget category for device-specific targets.
- * The name of the target will usually be the constructor and model of the device,
- * and that target will contain #GstEncodingProfiles suitable for that device.
- */
-#define GST_ENCODING_CATEGORY_DEVICE            "device"
-
-/**
- * GST_ENCODING_CATEGORY_ONLINE_SERVICE:
- *
- * #GstEncodingTarget category for online-services.
- * The name of the target will usually be the name of the online service
- * and that target will contain #GstEncodingProfiles suitable for that online
- * service.
- */
-
-#define GST_ENCODING_CATEGORY_ONLINE_SERVICE    "online-service"
-
-/**
- * GST_ENCODING_CATEGORY_STORAGE_EDITING:
- *
- * #GstEncodingTarget category for storage, archiving and editing targets.
- * Those targets can be lossless and/or provide very fast random access content.
- * The name of the target will usually be the container type or editing target,
- * and that target will contain #GstEncodingProfiles suitable for editing or
- * storage.
- */
-#define GST_ENCODING_CATEGORY_STORAGE_EDITING   "storage-editing"
-
-/**
- * GST_ENCODING_CATEGORY_CAPTURE:
- *
- * #GstEncodingTarget category for recording and capture.
- * Targets within this category are optimized for low latency encoding.
- */
-#define GST_ENCODING_CATEGORY_CAPTURE           "capture"
-
-/**
- * GstEncodingTarget:
- *
- * Collection of #GstEncodingProfile for a specific target or use-case.
- *
- * When being stored/loaded, targets come from a specific category, like
- * #GST_ENCODING_CATEGORY_DEVICE.
- */
-#define GST_TYPE_ENCODING_TARGET                        \
-  (gst_encoding_target_get_type ())
-#define GST_ENCODING_TARGET(obj)                        \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_TARGET, GstEncodingTarget))
-#define GST_IS_ENCODING_TARGET(obj)                     \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_TARGET))
-
-typedef struct _GstEncodingTarget GstEncodingTarget;
-typedef GObjectClass GstEncodingTargetClass;
-
-GType gst_encoding_target_get_type (void);
-
-/**
- * gst_encoding_target_unref:
- * @target: a #GstEncodingTarget
- *
- * Decreases the reference count of the @target, possibly freeing it.
- */
-#define gst_encoding_target_unref(target) \
-  (g_object_unref ((GObject*) target))
-
-/**
- * gst_encoding_target_ref:
- * @target: a #GstEncodingTarget
- *
- * Increases the reference count of the @target.
- */
-#define gst_encoding_target_ref(target) \
-  (g_object_ref ((GObject*) target))
-
-GstEncodingTarget *     gst_encoding_target_new                 (const gchar *name,
-                                                                 const gchar *category,
-                                                                 const gchar *description,
-                                                                 const GList *profiles);
-
-const gchar *           gst_encoding_target_get_name            (GstEncodingTarget *target);
-const gchar *           gst_encoding_target_get_category        (GstEncodingTarget *target);
-const gchar *           gst_encoding_target_get_description     (GstEncodingTarget *target);
-const GList *           gst_encoding_target_get_profiles        (GstEncodingTarget *target);
-GstEncodingProfile *    gst_encoding_target_get_profile         (GstEncodingTarget *target,
-                                                                 const gchar *name);
-
-gboolean                gst_encoding_target_add_profile         (GstEncodingTarget *target,
-                                                                 GstEncodingProfile *profile);
-
-gboolean                gst_encoding_target_save                (GstEncodingTarget *target,
-                                                                 GError **error);
-gboolean                gst_encoding_target_save_to_file        (GstEncodingTarget *target,
-                                                                 const gchar *filepath,
-                                                                 GError **error);
-GstEncodingTarget *     gst_encoding_target_load                (const gchar *name,
-                                                                 const gchar *category,
-                                                                 GError **error);
-GstEncodingTarget *     gst_encoding_target_load_from_file      (const gchar *filepath,
-                                                                 GError **error);
-
-GList *                 gst_encoding_list_available_categories  (void);
-GList *                 gst_encoding_list_all_targets           (const gchar * categoryname);
-
-G_END_DECLS
-
-#endif  /* __GST_PROFILE_REGISTRY_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/gstdiscoverer.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/gstdiscoverer.h
deleted file mode 100644
index d71272ca..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/gstdiscoverer.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Edward Hervey <edward.hervey@collabora.co.uk>
- *               2009 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_DISCOVERER_H_
-#define _GST_DISCOVERER_H_
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_DISCOVERER_STREAM_INFO \
-  (gst_discoverer_stream_info_get_type ())
-#define GST_DISCOVERER_STREAM_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_STREAM_INFO, GstDiscovererStreamInfo))
-#define GST_IS_DISCOVERER_STREAM_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_STREAM_INFO))
-typedef struct _GstDiscovererStreamInfo GstDiscovererStreamInfo;
-typedef GObjectClass GstDiscovererStreamInfoClass;
-GType gst_discoverer_stream_info_get_type (void);
-
-/**
- * GstDiscovererStreamInfo:
- *
- * Base structure for information concerning a media stream. Depending on the
- * stream type, one can find more media-specific information in
- * #GstDiscovererAudioInfo, #GstDiscovererVideoInfo, and
- * #GstDiscovererContainerInfo.
- *
- * The #GstDiscovererStreamInfo represents the topology of the stream. Siblings
- * can be iterated over with gst_discoverer_stream_info_get_next() and
- * gst_discoverer_stream_info_get_previous(). Children (sub-streams) of a
- * stream can be accessed using the #GstDiscovererContainerInfo API.
- *
- * As a simple example, if you run #GstDiscoverer on an AVI file with one audio
- * and one video stream, you will get a #GstDiscovererContainerInfo
- * corresponding to the AVI container, which in turn will have a
- * #GstDiscovererAudioInfo sub-stream and a #GstDiscovererVideoInfo sub-stream
- * for the audio and video streams respectively.
- */
-#define gst_discoverer_stream_info_ref(info) ((GstDiscovererStreamInfo*) g_object_ref((GObject*) info))
-#define gst_discoverer_stream_info_unref(info) (g_object_unref((GObject*) info))
-
-GstDiscovererStreamInfo* gst_discoverer_stream_info_get_previous(GstDiscovererStreamInfo* info);
-GstDiscovererStreamInfo* gst_discoverer_stream_info_get_next(GstDiscovererStreamInfo* info);
-GstCaps*                 gst_discoverer_stream_info_get_caps(GstDiscovererStreamInfo* info);
-const GstTagList*        gst_discoverer_stream_info_get_tags(GstDiscovererStreamInfo* info);
-const GstToc*            gst_discoverer_stream_info_get_toc(GstDiscovererStreamInfo* info);
-const GstStructure*      gst_discoverer_stream_info_get_misc(GstDiscovererStreamInfo* info);
-const gchar *            gst_discoverer_stream_info_get_stream_type_nick(GstDiscovererStreamInfo* info);
-
-/**
- * GstDiscovererContainerInfo:
- *
- * #GstDiscovererStreamInfo specific to container streams.
- */
-#define GST_TYPE_DISCOVERER_CONTAINER_INFO \
-  (gst_discoverer_container_info_get_type ())
-#define GST_DISCOVERER_CONTAINER_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_CONTAINER_INFO, GstDiscovererContainerInfo))
-#define GST_IS_DISCOVERER_CONTAINER_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_CONTAINER_INFO))
-typedef struct _GstDiscovererContainerInfo GstDiscovererContainerInfo;
-typedef GObjectClass GstDiscovererContainerInfoClass;
-
-GType gst_discoverer_container_info_get_type (void);
-
-GList *gst_discoverer_container_info_get_streams(GstDiscovererContainerInfo *info);
-
-
-/**
- * GstDiscovererAudioInfo:
- *
- * #GstDiscovererStreamInfo specific to audio streams.
- */
-#define GST_TYPE_DISCOVERER_AUDIO_INFO \
-  (gst_discoverer_audio_info_get_type ())
-#define GST_DISCOVERER_AUDIO_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_AUDIO_INFO, GstDiscovererAudioInfo))
-#define GST_IS_DISCOVERER_AUDIO_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_AUDIO_INFO))
-typedef struct _GstDiscovererAudioInfo GstDiscovererAudioInfo;
-typedef GObjectClass GstDiscovererAudioInfoClass;
-
-GType gst_discoverer_audio_info_get_type (void);
-
-guint gst_discoverer_audio_info_get_channels(const GstDiscovererAudioInfo* info);
-guint gst_discoverer_audio_info_get_sample_rate(const GstDiscovererAudioInfo* info);
-guint gst_discoverer_audio_info_get_depth(const GstDiscovererAudioInfo* info);
-guint gst_discoverer_audio_info_get_bitrate(const GstDiscovererAudioInfo* info);
-guint gst_discoverer_audio_info_get_max_bitrate(const GstDiscovererAudioInfo* info);
-const gchar * gst_discoverer_audio_info_get_language(const GstDiscovererAudioInfo* info);
-
-/**
- * GstDiscovererVideoInfo:
- *
- * #GstDiscovererStreamInfo specific to video streams (this includes images).
- */
-#define GST_TYPE_DISCOVERER_VIDEO_INFO \
-  (gst_discoverer_video_info_get_type ())
-#define GST_DISCOVERER_VIDEO_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_VIDEO_INFO, GstDiscovererVideoInfo))
-#define GST_IS_DISCOVERER_VIDEO_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_VIDEO_INFO))
-typedef struct _GstDiscovererVideoInfo GstDiscovererVideoInfo;
-typedef GObjectClass GstDiscovererVideoInfoClass;
-GType gst_discoverer_video_info_get_type (void);
-
-guint           gst_discoverer_video_info_get_width(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_height(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_depth(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_framerate_num(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_framerate_denom(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_par_num(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_par_denom(const GstDiscovererVideoInfo* info);
-gboolean        gst_discoverer_video_info_is_interlaced(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_bitrate(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_max_bitrate(const GstDiscovererVideoInfo* info);
-gboolean        gst_discoverer_video_info_is_image(const GstDiscovererVideoInfo* info);
-
-/**
- * GstDiscovererSubtitleInfo:
- *
- * #GstDiscovererStreamInfo specific to subtitle streams (this includes text and
- * image based ones).
- */
-#define GST_TYPE_DISCOVERER_SUBTITLE_INFO \
-  (gst_discoverer_subtitle_info_get_type ())
-#define GST_DISCOVERER_SUBTITLE_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_SUBTITLE_INFO, GstDiscovererSubtitleInfo))
-#define GST_IS_DISCOVERER_SUBTITLE_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_SUBTITLE_INFO))
-typedef struct _GstDiscovererSubtitleInfo GstDiscovererSubtitleInfo;
-typedef GObjectClass GstDiscovererSubtitleInfoClass;
-GType gst_discoverer_subtitle_info_get_type (void);
-
-const gchar *   gst_discoverer_subtitle_info_get_language(const GstDiscovererSubtitleInfo* info);
-
-/**
- * GstDiscovererResult:
- * @GST_DISCOVERER_OK: The discovery was successful
- * @GST_DISCOVERER_URI_INVALID: the URI is invalid
- * @GST_DISCOVERER_ERROR: an error happened and the GError is set
- * @GST_DISCOVERER_TIMEOUT: the discovery timed-out
- * @GST_DISCOVERER_BUSY: the discoverer was already discovering a file
- * @GST_DISCOVERER_MISSING_PLUGINS: Some plugins are missing for full discovery
- *
- * Result values for the discovery process.
- */
-typedef enum {
-  GST_DISCOVERER_OK               = 0,
-  GST_DISCOVERER_URI_INVALID      = 1,
-  GST_DISCOVERER_ERROR            = 2,
-  GST_DISCOVERER_TIMEOUT          = 3,
-  GST_DISCOVERER_BUSY             = 4,
-  GST_DISCOVERER_MISSING_PLUGINS  = 5
-} GstDiscovererResult;
-
-
-/**
- * GstDiscovererInfo:
- *
- * Structure containing the information of a URI analyzed by #GstDiscoverer.
- */
-typedef struct _GstDiscovererInfo GstDiscovererInfo;
-
-#define GST_TYPE_DISCOVERER_INFO \
-  (gst_discoverer_info_get_type ())
-#define GST_DISCOVERER_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_INFO, GstDiscovererInfo))
-#define GST_IS_DISCOVERER_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_INFO))
-typedef GObjectClass GstDiscovererInfoClass;
-GType gst_discoverer_info_get_type (void);
-
-#define gst_discoverer_info_unref(info) (g_object_unref((GObject*)info))
-#define gst_discoverer_info_ref(info) (g_object_ref((Gbject*)info))
-
-GstDiscovererInfo*        gst_discoverer_info_copy (GstDiscovererInfo * ptr);
-
-const gchar*              gst_discoverer_info_get_uri(const GstDiscovererInfo* info);
-GstDiscovererResult       gst_discoverer_info_get_result(const GstDiscovererInfo* info);
-GstDiscovererStreamInfo*  gst_discoverer_info_get_stream_info(GstDiscovererInfo* info);
-GList*                    gst_discoverer_info_get_stream_list(GstDiscovererInfo* info);
-GstClockTime              gst_discoverer_info_get_duration(const GstDiscovererInfo* info);
-gboolean                  gst_discoverer_info_get_seekable(const GstDiscovererInfo* info);
-const GstStructure*       gst_discoverer_info_get_misc(const GstDiscovererInfo* info);
-const GstTagList*         gst_discoverer_info_get_tags(const GstDiscovererInfo* info); 
-const GstToc*             gst_discoverer_info_get_toc(const GstDiscovererInfo* info);
-
-GList *                   gst_discoverer_info_get_streams (GstDiscovererInfo *info,
-							   GType streamtype);
-GList *                   gst_discoverer_info_get_audio_streams (GstDiscovererInfo *info);
-GList *                   gst_discoverer_info_get_video_streams (GstDiscovererInfo *info);
-GList *                   gst_discoverer_info_get_subtitle_streams (GstDiscovererInfo *info);
-GList *                   gst_discoverer_info_get_container_streams (GstDiscovererInfo *info);
-
-void                      gst_discoverer_stream_info_list_free (GList *infos);
-
-#define GST_TYPE_DISCOVERER \
-  (gst_discoverer_get_type())
-#define GST_DISCOVERER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER,GstDiscoverer))
-#define GST_DISCOVERER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DISCOVERER,GstDiscovererClass))
-#define GST_IS_DISCOVERER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER))
-#define GST_IS_DISCOVERER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DISCOVERER))
-
-typedef struct _GstDiscoverer GstDiscoverer;
-typedef struct _GstDiscovererClass GstDiscovererClass;
-typedef struct _GstDiscovererPrivate GstDiscovererPrivate;
-
-/**
- * GstDiscoverer:
- *
- * The #GstDiscoverer structure.
- **/
-struct _GstDiscoverer {
-  GObject parent;
-
-  /*< private >*/
-  GstDiscovererPrivate *priv;
-
-  gpointer _reserved[GST_PADDING];
-};
-
-struct _GstDiscovererClass {
-  GObjectClass parentclass;
-
-  /* signals */
-  void        (*finished)        (GstDiscoverer *discoverer);
-  void        (*starting)        (GstDiscoverer *discoverer);
-  void        (*discovered)      (GstDiscoverer *discoverer,
-                                  GstDiscovererInfo *info,
-				  const GError *err);
-  void        (*source_setup)    (GstDiscoverer *discoverer,
-                                  GstElement *source);
-
-  gpointer _reserved[GST_PADDING];
-};
-
-GType          gst_discoverer_get_type (void);
-GstDiscoverer *gst_discoverer_new (GstClockTime timeout, GError **err);
-
-/* Asynchronous API */
-void           gst_discoverer_start (GstDiscoverer *discoverer);
-void           gst_discoverer_stop (GstDiscoverer *discoverer);
-gboolean       gst_discoverer_discover_uri_async (GstDiscoverer *discoverer,
-						  const gchar *uri);
-
-/* Synchronous API */
-GstDiscovererInfo *
-gst_discoverer_discover_uri (GstDiscoverer * discoverer,
-			     const gchar * uri,
-			     GError ** err);
-
-G_END_DECLS
-
-#endif /* _GST_DISCOVERER_H */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/gstpluginsbaseversion.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/gstpluginsbaseversion.h
deleted file mode 100644
index c8ff07a2..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/gstpluginsbaseversion.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GStreamer base plugins libraries version information
- * Copyright (C) 2010 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PLUGINS_BASE_VERSION_H__
-#define __GST_PLUGINS_BASE_VERSION_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_PLUGINS_BASE_VERSION_MAJOR:
- *
- * The major version of GStreamer's gst-plugins-base libraries at compile time.
- */
-#define GST_PLUGINS_BASE_VERSION_MAJOR (1)
-/**
- * GST_PLUGINS_BASE_VERSION_MINOR:
- *
- * The minor version of GStreamer's gst-plugins-base libraries at compile time.
- */
-#define GST_PLUGINS_BASE_VERSION_MINOR (0)
-/**
- * GST_PLUGINS_BASE_VERSION_MICRO:
- *
- * The micro version of GStreamer's gst-plugins-base libraries at compile time.
- */
-#define GST_PLUGINS_BASE_VERSION_MICRO (5)
-/**
- * GST_PLUGINS_BASE_VERSION_NANO:
- *
- * The nano version of GStreamer's gst-plugins-base libraries at compile time.
- * Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
- */
-#define GST_PLUGINS_BASE_VERSION_NANO (0)
-
-/**
- * GST_CHECK_PLUGIN_BASE_VERSION:
- * @major: a number indicating the major version
- * @minor: a number indicating the minor version
- * @micro: a number indicating the micro version
- *
- * Check whether a GStreamer's gst-plugins-base libraries' version equal to
- * or greater than major.minor.micro is present.
- */
-#define	GST_CHECK_PLUGINS_BASE_VERSION(major,minor,micro)	\
-    (GST_PLUGINS_BASE_VERSION_MAJOR > (major) || \
-     (GST_PLUGINS_BASE_VERSION_MAJOR == (major) && GST_PLUGINS_BASE_VERSION_MINOR > (minor)) || \
-     (GST_PLUGINS_BASE_VERSION_MAJOR == (major) && GST_PLUGINS_BASE_VERSION_MINOR == (minor) && \
-      GST_PLUGINS_BASE_VERSION_MICRO >= (micro)) || \
-     (GST_PLUGINS_BASE_VERSION_MAJOR == (major) && GST_PLUGINS_BASE_VERSION_MINOR == (minor) && \
-      GST_PLUGINS_BASE_VERSION_MICRO + 1 == (micro) && GST_PLUGINS_BASE_VERSION_NANO > 0))
-
-void     gst_plugins_base_version (guint *major, guint *minor, guint *micro, guint *nano);
-
-gchar *  gst_plugins_base_version_string (void);
-
-G_END_DECLS
-
-#endif /* __GST_PLUGINS_BASE_VERSION_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/install-plugins.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/install-plugins.h
deleted file mode 100644
index 173adb1b..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/install-plugins.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GStreamer base utils library plugin install support for applications
- * Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
- * Copyright (C) 2006 Ryan Lortie <desrt desrt ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_INSTALL_PLUGINS_H__
-#define __GST_PB_UTILS_INSTALL_PLUGINS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/*
- * functions for use by applications to initiate installation of missing plugins
- */
-
-/**
- * GstInstallPluginsReturn:
- * @GST_INSTALL_PLUGINS_SUCCESS: all of the requested plugins could be
- *     installed
- * @GST_INSTALL_PLUGINS_NOT_FOUND: no appropriate installation candidate for
- *     any of the requested plugins could be found. Only return this if nothing
- *     has been installed. Return #GST_INSTALL_PLUGINS_PARTIAL_SUCCESS if
- *     some (but not all) of the requested plugins could be installed.
- * @GST_INSTALL_PLUGINS_ERROR: an error occured during the installation. If
- *     this happens, the  user has already seen an error message and another
- *     one should not be displayed
- * @GST_INSTALL_PLUGINS_CRASHED: the installer had an unclean exit code
- *     (ie. death by signal)
- * @GST_INSTALL_PLUGINS_PARTIAL_SUCCESS: some of the requested plugins could
- *     be installed, but not all
- * @GST_INSTALL_PLUGINS_USER_ABORT: the user has aborted the installation
- * @GST_INSTALL_PLUGINS_INVALID: the helper returned an invalid status code
- * @GST_INSTALL_PLUGINS_STARTED_OK: returned by gst_install_plugins_async() to
- *     indicate that everything went fine so far and the provided callback
- *     will be called with the result of the installation later
- * @GST_INSTALL_PLUGINS_INTERNAL_FAILURE: some internal failure has
- *     occured when trying to start the installer
- * @GST_INSTALL_PLUGINS_HELPER_MISSING: the helper script to call the
- *     actual installer is not installed
- * @GST_INSTALL_PLUGINS_INSTALL_IN_PROGRESS: a previously-started plugin
- *     installation is still in progress, try again later
- *
- * Result codes returned by gst_install_plugins_async() and
- * gst_install_plugins_sync(), and also the result code passed to the
- * #GstInstallPluginsResultFunc specified with gst_install_plugins_async().
- *
- * These codes indicate success or failure of starting an external installer
- * program and to what extent the requested plugins could be installed.
- */
-typedef enum {
-  /* Return codes from the installer. Returned by gst_install_plugins_sync(),
-   * or passed as result code to your #GstInstallPluginsResultFunc */
-  GST_INSTALL_PLUGINS_SUCCESS = 0,
-  GST_INSTALL_PLUGINS_NOT_FOUND = 1,
-  GST_INSTALL_PLUGINS_ERROR = 2,
-  GST_INSTALL_PLUGINS_PARTIAL_SUCCESS = 3,
-  GST_INSTALL_PLUGINS_USER_ABORT = 4,
-
-  /* Returned by gst_install_plugins_sync(), or passed as result code to your
-   * #GstInstallPluginsResultFunc */
-  GST_INSTALL_PLUGINS_CRASHED = 100,
-  GST_INSTALL_PLUGINS_INVALID,
-
-  /* Return codes from starting the external helper, may be returned by both
-   * gst_install_plugins_sync() and gst_install_plugins_async(), but should
-   * never be seen by a #GstInstallPluginsResultFunc */
-  GST_INSTALL_PLUGINS_STARTED_OK = 200,
-  GST_INSTALL_PLUGINS_INTERNAL_FAILURE,
-  GST_INSTALL_PLUGINS_HELPER_MISSING,
-  GST_INSTALL_PLUGINS_INSTALL_IN_PROGRESS
-} GstInstallPluginsReturn;
-
-/**
- * GstInstallPluginsContext:
- *
- * Opaque context structure for the plugin installation. Use the provided
- * API to set details on it.
- */
-
-#define GST_TYPE_INSTALL_PLUGINS_CONTEXT	(gst_install_plugins_context_get_type())
-
-typedef struct _GstInstallPluginsContext GstInstallPluginsContext;
-
-GstInstallPluginsContext * gst_install_plugins_context_new (void);
-
-void   gst_install_plugins_context_free    (GstInstallPluginsContext * ctx);
-
-void   gst_install_plugins_context_set_xid (GstInstallPluginsContext * ctx,
-                                            guint                      xid);
-
-GType  gst_install_plugins_context_get_type (void);
-
-/**
- * GstInstallPluginsResultFunc:
- * @result: whether the installation of the requested plugins succeeded or not
- * @user_data: the user data passed to gst_install_plugins_async()
- *
- * The prototype of the callback function that will be called once the
- * external plugin installer program has returned. You only need to provide
- * a callback function if you are using the asynchronous interface.
- */
-typedef void (*GstInstallPluginsResultFunc) (GstInstallPluginsReturn  result,
-                                             gpointer                 user_data);
-
-GstInstallPluginsReturn  gst_install_plugins_async (const gchar * const * details,
-                                                    GstInstallPluginsContext  * ctx,
-                                                    GstInstallPluginsResultFunc func,
-                                                    gpointer                    user_data);
-
-GstInstallPluginsReturn  gst_install_plugins_sync  (const gchar * const       * details,
-                                                    GstInstallPluginsContext  * ctx);
-
-const gchar * gst_install_plugins_return_get_name (GstInstallPluginsReturn ret);
-
-gboolean      gst_install_plugins_installation_in_progress (void);
-
-gboolean      gst_install_plugins_supported (void);
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_INSTALL_PLUGINS_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/missing-plugins.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/missing-plugins.h
deleted file mode 100644
index 508304e4..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/missing-plugins.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer base utils library missing plugins support
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_MISSING_PLUGINS_H__
-#define __GST_PB_UTILS_MISSING_PLUGINS_H__
-
-#include <gst/gstmessage.h>
-#include <gst/gstcaps.h>
-
-G_BEGIN_DECLS
-
-/*
- * functions to create missing-plugin messages, for use by plugins primarily
- */
-
-GstMessage * gst_missing_uri_source_message_new (GstElement    * element,
-                                                 const gchar   * protocol);
-
-GstMessage * gst_missing_uri_sink_message_new   (GstElement    * element,
-                                                 const gchar   * protocol);
-
-GstMessage * gst_missing_element_message_new    (GstElement    * element,
-                                                 const gchar   * factory_name);
-
-GstMessage * gst_missing_decoder_message_new    (GstElement    * element,
-                                                 const GstCaps * decode_caps);
-
-GstMessage * gst_missing_encoder_message_new    (GstElement    * element,
-                                                 const GstCaps * encode_caps);
-
-/*
- * functions for use by applications when dealing with missing-plugin messages
- */
-
-gchar       * gst_missing_plugin_message_get_installer_detail (GstMessage * msg);
-
-gchar       * gst_missing_plugin_message_get_description (GstMessage * msg);
-
-gboolean      gst_is_missing_plugin_message (GstMessage * msg);
-
-
-/*
- * functions for use by applications that know exactly what plugins they are
- * missing and want to request them directly rather than just react to
- * missing-plugin messages posted by elements such as playbin or decodebin
- */
-
-gchar * gst_missing_uri_source_installer_detail_new (const gchar * protocol);
-
-gchar * gst_missing_uri_sink_installer_detail_new (const gchar * protocol);
-
-gchar * gst_missing_element_installer_detail_new (const gchar * factory_name);
-
-gchar * gst_missing_decoder_installer_detail_new (const GstCaps * decode_caps);
-
-gchar * gst_missing_encoder_installer_detail_new (const GstCaps * encode_caps);
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_MISSING_PLUGINS_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/pbutils-enumtypes.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/pbutils-enumtypes.h
deleted file mode 100644
index 30dadfd9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/pbutils-enumtypes.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-#ifndef __PB_UTILS_ENUM_TYPES_H__
-#define __PB_UTILS_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "install-plugins.h" */
-GType gst_install_plugins_return_get_type (void);
-#define GST_TYPE_INSTALL_PLUGINS_RETURN (gst_install_plugins_return_get_type())
-
-/* enumerations from "gstdiscoverer.h" */
-GType gst_discoverer_result_get_type (void);
-#define GST_TYPE_DISCOVERER_RESULT (gst_discoverer_result_get_type())
-G_END_DECLS
-
-#endif /* __PB_UTILS_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/pbutils.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/pbutils.h
deleted file mode 100644
index b9277b13..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/pbutils/pbutils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* GStreamer base utils library
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_BASE_UTILS_H__
-#define __GST_PB_UTILS_BASE_UTILS_H__
-
-#include <gst/gst.h>
-
-#include <gst/pbutils/gstpluginsbaseversion.h>
-#include <gst/pbutils/descriptions.h>
-#include <gst/pbutils/missing-plugins.h>
-#include <gst/pbutils/install-plugins.h>
-#include <gst/pbutils/codec-utils.h>
-#include <gst/pbutils/pbutils-enumtypes.h>
-#include <gst/pbutils/gstdiscoverer.h>
-#include <gst/pbutils/encoding-profile.h>
-#include <gst/pbutils/encoding-target.h>
-
-G_BEGIN_DECLS
-
-void    gst_pb_utils_init (void);
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_BASE_UTILS_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-ids.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-ids.h
deleted file mode 100644
index ab561792..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-ids.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/* GStreamer RIFF I/O
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * riff-ids.h: RIFF IDs and structs
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RIFF_IDS_H__
-#define __GST_RIFF_IDS_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/* RIFF types */
-#define GST_RIFF_RIFF_WAVE GST_MAKE_FOURCC ('W','A','V','E')
-#define GST_RIFF_RIFF_AVI  GST_MAKE_FOURCC ('A','V','I',' ')
-#define GST_RIFF_RIFF_CDXA GST_MAKE_FOURCC ('C','D','X','A')
-
-/* tags */
-#define GST_RIFF_TAG_RIFF GST_MAKE_FOURCC ('R','I','F','F')
-#define GST_RIFF_TAG_AVF0 GST_MAKE_FOURCC ('A','V','F','0')
-#define GST_RIFF_TAG_RIFX GST_MAKE_FOURCC ('R','I','F','X')
-#define GST_RIFF_TAG_LIST GST_MAKE_FOURCC ('L','I','S','T')
-#define GST_RIFF_TAG_avih GST_MAKE_FOURCC ('a','v','i','h')
-#define GST_RIFF_TAG_strd GST_MAKE_FOURCC ('s','t','r','d')
-#define GST_RIFF_TAG_strn GST_MAKE_FOURCC ('s','t','r','n')
-#define GST_RIFF_TAG_strh GST_MAKE_FOURCC ('s','t','r','h')
-#define GST_RIFF_TAG_strf GST_MAKE_FOURCC ('s','t','r','f')
-#define GST_RIFF_TAG_vedt GST_MAKE_FOURCC ('v','e','d','t')
-#define GST_RIFF_TAG_JUNK GST_MAKE_FOURCC ('J','U','N','K')
-#define GST_RIFF_TAG_JUNQ GST_MAKE_FOURCC ('J','U','N','Q')
-#define GST_RIFF_TAG_idx1 GST_MAKE_FOURCC ('i','d','x','1')
-#define GST_RIFF_TAG_dmlh GST_MAKE_FOURCC ('d','m','l','h')
-#define GST_RIFF_TAG_ID32 GST_MAKE_FOURCC ('I','D','3','2')
-#define GST_RIFF_TAG_IDVX GST_MAKE_FOURCC ('I','D','V','X')
-/* WAV stuff */
-#define GST_RIFF_TAG_fmt  GST_MAKE_FOURCC ('f','m','t',' ')
-#define GST_RIFF_TAG_data GST_MAKE_FOURCC ('d','a','t','a')
-#define GST_RIFF_TAG_plst GST_MAKE_FOURCC ('p','l','s','t')
-#define GST_RIFF_TAG_cue  GST_MAKE_FOURCC ('c','u','e',' ')
-#define GST_RIFF_TAG_bext GST_MAKE_FOURCC ('b','e','x','t')
-#define GST_RIFF_TAG_BEXT GST_MAKE_FOURCC ('B','E','X','T')
-#define GST_RIFF_TAG_fact GST_MAKE_FOURCC ('f','a','c','t')
-#define GST_RIFF_TAG_acid GST_MAKE_FOURCC ('a','c','i','d')
-#define GST_RIFF_TAG_labl GST_MAKE_FOURCC ('l','a','b','l')
-
-/* LIST types */
-#define GST_RIFF_LIST_movi GST_MAKE_FOURCC ('m','o','v','i')
-#define GST_RIFF_LIST_hdrl GST_MAKE_FOURCC ('h','d','r','l')
-#define GST_RIFF_LIST_odml GST_MAKE_FOURCC ('o','d','m','l')
-#define GST_RIFF_LIST_strl GST_MAKE_FOURCC ('s','t','r','l')
-#define GST_RIFF_LIST_INFO GST_MAKE_FOURCC ('I','N','F','O')
-#define GST_RIFF_LIST_AVIX GST_MAKE_FOURCC ('A','V','I','X')
-#define GST_RIFF_LIST_adtl GST_MAKE_FOURCC ('a','d','t','l')
-
-/* fcc types */
-#define GST_RIFF_FCC_vids GST_MAKE_FOURCC ('v','i','d','s')
-#define GST_RIFF_FCC_auds GST_MAKE_FOURCC ('a','u','d','s')
-#define GST_RIFF_FCC_pads GST_MAKE_FOURCC ('p','a','d','s')
-#define GST_RIFF_FCC_txts GST_MAKE_FOURCC ('t','x','t','s')
-#define GST_RIFF_FCC_vidc GST_MAKE_FOURCC ('v','i','d','c')
-#define GST_RIFF_FCC_iavs GST_MAKE_FOURCC ('i','a','v','s')
-/* fcc handlers */
-#define GST_RIFF_FCCH_RLE  GST_MAKE_FOURCC ('R','L','E',' ')
-#define GST_RIFF_FCCH_msvc GST_MAKE_FOURCC ('m','s','v','c')
-#define GST_RIFF_FCCH_MSVC GST_MAKE_FOURCC ('M','S','V','C')
-
-/* INFO types - see http://www.saettler.com/RIFFMCI/riffmci.html */
-#define GST_RIFF_INFO_IARL GST_MAKE_FOURCC ('I','A','R','L') /* location */
-#define GST_RIFF_INFO_IART GST_MAKE_FOURCC ('I','A','R','T') /* artist */
-#define GST_RIFF_INFO_ICMS GST_MAKE_FOURCC ('I','C','M','S') /* commissioned */
-#define GST_RIFF_INFO_ICMT GST_MAKE_FOURCC ('I','C','M','T') /* comment */
-#define GST_RIFF_INFO_ICOP GST_MAKE_FOURCC ('I','C','O','P') /* copyright */
-#define GST_RIFF_INFO_ICRD GST_MAKE_FOURCC ('I','C','R','D') /* creation date */
-#define GST_RIFF_INFO_ICRP GST_MAKE_FOURCC ('I','C','R','P') /* cropped */
-#define GST_RIFF_INFO_IDIM GST_MAKE_FOURCC ('I','D','I','M') /* dimensions */
-#define GST_RIFF_INFO_IDPI GST_MAKE_FOURCC ('I','D','P','I') /* dots-per-inch */
-#define GST_RIFF_INFO_IENG GST_MAKE_FOURCC ('I','E','N','G') /* engineer(s) */
-#define GST_RIFF_INFO_IGNR GST_MAKE_FOURCC ('I','G','N','R') /* genre */
-#define GST_RIFF_INFO_IKEY GST_MAKE_FOURCC ('I','K','E','Y') /* keywords */
-#define GST_RIFF_INFO_ILGT GST_MAKE_FOURCC ('I','L','G','T') /* lightness */
-#define GST_RIFF_INFO_IMED GST_MAKE_FOURCC ('I','M','E','D') /* medium */
-#define GST_RIFF_INFO_INAM GST_MAKE_FOURCC ('I','N','A','M') /* name */
-#define GST_RIFF_INFO_IPLT GST_MAKE_FOURCC ('I','P','L','T') /* palette setting */
-#define GST_RIFF_INFO_IPRD GST_MAKE_FOURCC ('I','P','R','D') /* product (album) */
-#define GST_RIFF_INFO_ISBJ GST_MAKE_FOURCC ('I','S','B','J') /* subject */
-#define GST_RIFF_INFO_ISFT GST_MAKE_FOURCC ('I','S','F','T') /* software */
-#define GST_RIFF_INFO_ISHP GST_MAKE_FOURCC ('I','S','H','P') /* sharpness */
-#define GST_RIFF_INFO_ISRC GST_MAKE_FOURCC ('I','S','R','C') /* source */
-#define GST_RIFF_INFO_ISRF GST_MAKE_FOURCC ('I','S','R','F') /* source form */
-#define GST_RIFF_INFO_ITCH GST_MAKE_FOURCC ('I','T','C','H') /* technician(s) */
-
-#define GST_RIFF_INFO_IAAR GST_MAKE_FOURCC ('I','A','A','R') /* album artist */
-#define GST_RIFF_INFO_ITRK GST_MAKE_FOURCC ('I','T','R','K') /* track number */
-
-/*********Chunk Names***************/
-#define GST_RIFF_FF00 GST_MAKE_FOURCC (0xFF,0xFF,0x00,0x00)
-#define GST_RIFF_00   GST_MAKE_FOURCC ('0', '0',0x00,0x00)
-#define GST_RIFF_01   GST_MAKE_FOURCC ('0', '1',0x00,0x00)
-#define GST_RIFF_02   GST_MAKE_FOURCC ('0', '2',0x00,0x00)
-#define GST_RIFF_03   GST_MAKE_FOURCC ('0', '3',0x00,0x00)
-#define GST_RIFF_04   GST_MAKE_FOURCC ('0', '4',0x00,0x00)
-#define GST_RIFF_05   GST_MAKE_FOURCC ('0', '5',0x00,0x00)
-#define GST_RIFF_06   GST_MAKE_FOURCC ('0', '6',0x00,0x00)
-#define GST_RIFF_07   GST_MAKE_FOURCC ('0', '7',0x00,0x00)
-#define GST_RIFF_00pc GST_MAKE_FOURCC ('0', '0', 'p', 'c')
-#define GST_RIFF_01pc GST_MAKE_FOURCC ('0', '1', 'p', 'c')
-#define GST_RIFF_00dc GST_MAKE_FOURCC ('0', '0', 'd', 'c')
-#define GST_RIFF_00dx GST_MAKE_FOURCC ('0', '0', 'd', 'x')
-#define GST_RIFF_00db GST_MAKE_FOURCC ('0', '0', 'd', 'b')
-#define GST_RIFF_00xx GST_MAKE_FOURCC ('0', '0', 'x', 'x')
-#define GST_RIFF_00id GST_MAKE_FOURCC ('0', '0', 'i', 'd')
-#define GST_RIFF_00rt GST_MAKE_FOURCC ('0', '0', 'r', 't')
-#define GST_RIFF_0021 GST_MAKE_FOURCC ('0', '0', '2', '1')
-#define GST_RIFF_00iv GST_MAKE_FOURCC ('0', '0', 'i', 'v')
-#define GST_RIFF_0031 GST_MAKE_FOURCC ('0', '0', '3', '1')
-#define GST_RIFF_0032 GST_MAKE_FOURCC ('0', '0', '3', '2')
-#define GST_RIFF_00vc GST_MAKE_FOURCC ('0', '0', 'v', 'c')
-#define GST_RIFF_00xm GST_MAKE_FOURCC ('0', '0', 'x', 'm')
-#define GST_RIFF_01wb GST_MAKE_FOURCC ('0', '1', 'w', 'b')
-#define GST_RIFF_01dc GST_MAKE_FOURCC ('0', '1', 'd', 'c')
-#define GST_RIFF_00__ GST_MAKE_FOURCC ('0', '0', '_', '_')
-
-/*********VIDEO CODECS**************/
-#define GST_RIFF_cram GST_MAKE_FOURCC ('c', 'r', 'a', 'm')
-#define GST_RIFF_CRAM GST_MAKE_FOURCC ('C', 'R', 'A', 'M')
-#define GST_RIFF_wham GST_MAKE_FOURCC ('w', 'h', 'a', 'm')
-#define GST_RIFF_WHAM GST_MAKE_FOURCC ('W', 'H', 'A', 'M')
-#define GST_RIFF_rgb  GST_MAKE_FOURCC (0x00,0x00,0x00,0x00)
-#define GST_RIFF_RGB  GST_MAKE_FOURCC ('R', 'G', 'B', ' ')
-#define GST_RIFF_RAW  GST_MAKE_FOURCC ('R', 'A', 'W', ' ')
-#define GST_RIFF_DIB  GST_MAKE_FOURCC ('D', 'I', 'B', ' ')
-#define GST_RIFF_rle8 GST_MAKE_FOURCC (0x01,0x00,0x00,0x00)
-#define GST_RIFF_RLE8 GST_MAKE_FOURCC ('R', 'L', 'E', '8')
-#define GST_RIFF_rle4 GST_MAKE_FOURCC (0x02,0x00,0x00,0x00)
-#define GST_RIFF_RLE4 GST_MAKE_FOURCC ('R', 'L', 'E', '4')
-#define GST_RIFF_none GST_MAKE_FOURCC (0x00,0x00,0xFF,0xFF)
-#define GST_RIFF_NONE GST_MAKE_FOURCC ('N', 'O', 'N', 'E')
-#define GST_RIFF_pack GST_MAKE_FOURCC (0x01,0x00,0xFF,0xFF)
-#define GST_RIFF_PACK GST_MAKE_FOURCC ('P', 'A', 'C', 'K')
-#define GST_RIFF_tran GST_MAKE_FOURCC (0x02,0x00,0xFF,0xFF)
-#define GST_RIFF_TRAN GST_MAKE_FOURCC ('T', 'R', 'A', 'N')
-#define GST_RIFF_ccc  GST_MAKE_FOURCC (0x03,0x00,0xFF,0xFF)
-#define GST_RIFF_CCC  GST_MAKE_FOURCC ('C', 'C', 'C', ' ')
-#define GST_RIFF_cyuv GST_MAKE_FOURCC ('c', 'y', 'u', 'v')
-#define GST_RIFF_CYUV GST_MAKE_FOURCC ('C', 'Y', 'U', 'V')
-#define GST_RIFF_jpeg GST_MAKE_FOURCC (0x04,0x00,0xFF,0xFF)
-#define GST_RIFF_JPEG GST_MAKE_FOURCC ('J', 'P', 'E', 'G')
-#define GST_RIFF_MJPG GST_MAKE_FOURCC ('M', 'J', 'P', 'G')
-#define GST_RIFF_mJPG GST_MAKE_FOURCC ('m', 'J', 'P', 'G')
-#define GST_RIFF_IJPG GST_MAKE_FOURCC ('I', 'J', 'P', 'G')
-#define GST_RIFF_rt21 GST_MAKE_FOURCC ('r', 't', '2', '1')
-#define GST_RIFF_RT21 GST_MAKE_FOURCC ('R', 'T', '2', '1')
-#define GST_RIFF_iv31 GST_MAKE_FOURCC ('i', 'v', '3', '1')
-#define GST_RIFF_IV31 GST_MAKE_FOURCC ('I', 'V', '3', '1')
-#define GST_RIFF_iv32 GST_MAKE_FOURCC ('i', 'v', '3', '2')
-#define GST_RIFF_IV32 GST_MAKE_FOURCC ('I', 'V', '3', '2')
-#define GST_RIFF_iv41 GST_MAKE_FOURCC ('i', 'v', '4', '1')
-#define GST_RIFF_IV41 GST_MAKE_FOURCC ('I', 'V', '4', '1')
-#define GST_RIFF_iv50 GST_MAKE_FOURCC ('i', 'v', '5', '0')
-#define GST_RIFF_IV50 GST_MAKE_FOURCC ('I', 'V', '5', '0')
-#define GST_RIFF_cvid GST_MAKE_FOURCC ('c', 'v', 'i', 'd')
-#define GST_RIFF_CVID GST_MAKE_FOURCC ('C', 'V', 'I', 'D')
-#define GST_RIFF_ULTI GST_MAKE_FOURCC ('U', 'L', 'T', 'I')
-#define GST_RIFF_ulti GST_MAKE_FOURCC ('u', 'l', 't', 'i')
-#define GST_RIFF_YUV9 GST_MAKE_FOURCC ('Y', 'V', 'U', '9')
-#define GST_RIFF_YVU9 GST_MAKE_FOURCC ('Y', 'U', 'V', '9')
-#define GST_RIFF_XMPG GST_MAKE_FOURCC ('X', 'M', 'P', 'G')
-#define GST_RIFF_xmpg GST_MAKE_FOURCC ('x', 'm', 'p', 'g')
-#define GST_RIFF_VDOW GST_MAKE_FOURCC ('V', 'D', 'O', 'W')
-#define GST_RIFF_MVI1 GST_MAKE_FOURCC ('M', 'V', 'I', '1')
-#define GST_RIFF_v422 GST_MAKE_FOURCC ('v', '4', '2', '2')
-#define GST_RIFF_V422 GST_MAKE_FOURCC ('V', '4', '2', '2')
-#define GST_RIFF_mvi1 GST_MAKE_FOURCC ('m', 'v', 'i', '1')
-#define GST_RIFF_MPIX GST_MAKE_FOURCC (0x04,0x00, 'i', '1')     /* MotionPixels munged their id */
-#define GST_RIFF_AURA GST_MAKE_FOURCC ('A', 'U', 'R', 'A')
-#define GST_RIFF_DMB1 GST_MAKE_FOURCC ('D', 'M', 'B', '1')
-#define GST_RIFF_dmb1 GST_MAKE_FOURCC ('d', 'm', 'b', '1')
-
-#define GST_RIFF_BW10 GST_MAKE_FOURCC ('B', 'W', '1', '0')
-#define GST_RIFF_bw10 GST_MAKE_FOURCC ('b', 'w', '1', '0')
-
-#define GST_RIFF_yuy2 GST_MAKE_FOURCC ('y', 'u', 'y', '2')
-#define GST_RIFF_YUY2 GST_MAKE_FOURCC ('Y', 'U', 'Y', '2')
-#define GST_RIFF_YUV8 GST_MAKE_FOURCC ('Y', 'U', 'V', '8')
-#define GST_RIFF_WINX GST_MAKE_FOURCC ('W', 'I', 'N', 'X')
-#define GST_RIFF_WPY2 GST_MAKE_FOURCC ('W', 'P', 'Y', '2')
-#define GST_RIFF_m263 GST_MAKE_FOURCC ('m', '2', '6', '3')
-#define GST_RIFF_M263 GST_MAKE_FOURCC ('M', '2', '6', '3')
-#define GST_RIFF_H263 GST_MAKE_FOURCC ('H', '2', '6', '3')
-#define GST_RIFF_h263 GST_MAKE_FOURCC ('h', '2', '6', '3')
-#define GST_RIFF_i263 GST_MAKE_FOURCC ('i', '2', '6', '3')
-#define GST_RIFF_L263 GST_MAKE_FOURCC ('L', '2', '6', '3')
-#define GST_RIFF_x263 GST_MAKE_FOURCC ('x', '2', '6', '3')
-#define GST_RIFF_VSSH GST_MAKE_FOURCC ( 'V', 'S', 'S', 'H') /* H2.64 */
-
-#define GST_RIFF_Q1_0 GST_MAKE_FOURCC ('Q', '1',0x2e, '0')
-#define GST_RIFF_SFMC GST_MAKE_FOURCC ('S', 'F', 'M', 'C')
-
-#define GST_RIFF_y41p GST_MAKE_FOURCC ('y', '4', '1', 'p')
-#define GST_RIFF_Y41P GST_MAKE_FOURCC ('Y', '4', '1', 'P')
-#define GST_RIFF_yv12 GST_MAKE_FOURCC ('y', 'v', '1', '2')
-#define GST_RIFF_YV12 GST_MAKE_FOURCC ('Y', 'V', '1', '2')
-#define GST_RIFF_vixl GST_MAKE_FOURCC ('v', 'i', 'x', 'l')
-#define GST_RIFF_VIXL GST_MAKE_FOURCC ('V', 'I', 'X', 'L')
-#define GST_RIFF_iyuv GST_MAKE_FOURCC ('i', 'y', 'u', 'v')
-#define GST_RIFF_IYUV GST_MAKE_FOURCC ('I', 'Y', 'U', 'V')
-#define GST_RIFF_i420 GST_MAKE_FOURCC ('i', '4', '2', '0')
-#define GST_RIFF_I420 GST_MAKE_FOURCC ('I', '4', '2', '0')
-#define GST_RIFF_vyuy GST_MAKE_FOURCC ('v', 'y', 'u', 'y')
-#define GST_RIFF_VYUY GST_MAKE_FOURCC ('V', 'Y', 'U', 'Y')
-
-#define GST_RIFF_DIV3 GST_MAKE_FOURCC ('D', 'I', 'V', '3')
-
-#define GST_RIFF_rpza GST_MAKE_FOURCC ('r', 'p', 'z', 'a')
-/* And this here's the mistakes that need to be supported */
-#define GST_RIFF_azpr GST_MAKE_FOURCC ('a', 'z', 'p', 'r')  /* recognize Apple's rpza mangled? */
-
-/*********** FND in MJPG **********/
-#define GST_RIFF_ISFT GST_MAKE_FOURCC ('I', 'S', 'F', 'T')
-#define GST_RIFF_IDIT GST_MAKE_FOURCC ('I', 'D', 'I', 'T')
-
-#define GST_RIFF_00AM GST_MAKE_FOURCC ('0', '0', 'A', 'M')
-#define GST_RIFF_DISP GST_MAKE_FOURCC ('D', 'I', 'S', 'P')
-#define GST_RIFF_ISBJ GST_MAKE_FOURCC ('I', 'S', 'B', 'J')
-
-#define GST_RIFF_rec  GST_MAKE_FOURCC ('r', 'e', 'c', ' ')
-
-/* common data structures */
-typedef struct _gst_riff_strh {
-  guint32 type;             /* stream type */
-  guint32 fcc_handler;       /* fcc_handler */
-  guint32 flags;
-/* flags values */
-#define GST_RIFF_STRH_DISABLED        0x000000001
-#define GST_RIFF_STRH_VIDEOPALCHANGES 0x000010000
-  guint32 priority;
-  guint32 init_frames;       /* initial frames (???) */
-  guint32 scale;
-  guint32 rate;
-  guint32 start;
-  guint32 length;
-  guint32 bufsize;           /* suggested buffer size */
-  guint32 quality;
-  guint32 samplesize;
-  /* rcFrame, RECT structure(struct of 4 shorts)
-  gint32  left;
-  gint32  top;
-  gint32  right;
-  gint32  bottom;
-  */
-} gst_riff_strh;
-
-typedef struct _gst_riff_strf_vids {       /* == BitMapInfoHeader */
-  guint32 size;
-  guint32 width;
-  guint32 height;
-  guint16 planes;
-  guint16 bit_cnt;
-  guint32 compression;
-  guint32 image_size;
-  guint32 xpels_meter;
-  guint32 ypels_meter;
-  guint32 num_colors;        /* used colors */
-  guint32 imp_colors;        /* important colors */
-  /* may be more for some codecs */
-} gst_riff_strf_vids;
-
-
-typedef struct _gst_riff_strf_auds {       /* == WaveHeader (?) */
-  guint16 format;
-/**** from public Microsoft RIFF docs ******/
-#define GST_RIFF_WAVE_FORMAT_UNKNOWN        (0x0000)
-#define GST_RIFF_WAVE_FORMAT_PCM            (0x0001)
-#define GST_RIFF_WAVE_FORMAT_ADPCM          (0x0002)
-#define GST_RIFF_WAVE_FORMAT_IEEE_FLOAT     (0x0003)
-#define GST_RIFF_WAVE_FORMAT_VSELP          (0x0004)
-#define GST_RIFF_WAVE_FORMAT_IBM_CVSD       (0x0005)
-#define GST_RIFF_WAVE_FORMAT_ALAW           (0x0006)
-#define GST_RIFF_WAVE_FORMAT_MULAW          (0x0007)
-#define GST_RIFF_WAVE_FORMAT_WMS            (0x000a) /* WMS Windows Media Audio Speech */
-#define GST_RIFF_WAVE_FORMAT_OKI_ADPCM      (0x0010)
-#define GST_RIFF_WAVE_FORMAT_DVI_ADPCM      (0x0011)
-#define GST_RIFF_WAVE_FORMAT_MEDIASPACE_ADPCM (0x0012)
-#define GST_RIFF_WAVE_FORMAT_SIERRA_ADPCM   (0x0013)
-#define GST_RIFF_WAVE_FORMAT_G723_ADPCM     (0x0014)
-#define GST_RIFF_WAVE_FORMAT_DIGISTD        (0x0015)
-#define GST_RIFF_WAVE_FORMAT_DIGIFIX        (0x0016)
-#define GST_RIFF_WAVE_FORMAT_DIALOGIC_OKI_ADPCM (0x0017)
-#define GST_RIFF_WAVE_FORMAT_MEDIAVISION_ADPCM  (0x0018)
-#define GST_RIFF_WAVE_FORMAT_CU_CODEC       (0x0019)
-#define GST_RIFF_WAVE_FORMAT_YAMAHA_ADPCM   (0x0020)
-#define GST_RIFF_WAVE_FORMAT_SONARC         (0x0021)
-#define GST_RIFF_WAVE_FORMAT_DSP_TRUESPEECH (0x0022)
-#define GST_RIFF_WAVE_FORMAT_ECHOSC1        (0x0023)
-#define GST_RIFF_WAVE_FORMAT_AUDIOFILE_AF36 (0x0024)
-#define GST_RIFF_WAVE_FORMAT_APTX           (0x0025)
-#define GST_RIFF_WAVE_FORMAT_AUDIOFILE_AF10 (0x0026)
-#define GST_RIFF_WAVE_FORMAT_PROSODY_1612   (0x0027)
-#define GST_RIFF_WAVE_FORMAT_LRC            (0x0028)
-#define GST_RIFF_WAVE_FORMAT_DOLBY_AC2      (0x0030)
-#define GST_RIFF_WAVE_FORMAT_GSM610         (0x0031)
-#define GST_RIFF_WAVE_FORMAT_MSN            (0x0032)
-#define GST_RIFF_WAVE_FORMAT_ANTEX_ADPCME   (0x0033 
-#define GST_RIFF_WAVE_FORMAT_CONTROL_RES_VQLPC (0x0034)
-#define GST_RIFF_WAVE_FORMAT_DIGIREAL       (0x0035)
-#define GST_RIFF_WAVE_FORMAT_DIGIADPCM      (0x0036)
-#define GST_RIFF_WAVE_FORMAT_CONTROL_RES_CR10  (0x0037)
-#define GST_RIFF_WAVE_FORMAT_NMS_VBXADPCM   (0x0038)
-#define GST_RIFF_WAVE_FORMAT_CS_IMAADPCM    (0x0039)
-#define GST_RIFF_WAVE_FORMAT_ECHOSC3        (0x003A)
-#define GST_RIFF_WAVE_FORMAT_ROCKWELL_ADPCM (0x003B)
-#define GST_RIFF_WAVE_FORMAT_ROCKWELL_DIGITALK (0x003C)
-#define GST_RIFF_WAVE_FORMAT_XEBEC          (0x003D)
-#define GST_RIFF_WAVE_FORMAT_ITU_G721_ADPCM (0x0040)
-#define GST_RIFF_WAVE_FORMAT_G728_CELP      (0x0041)
-#define GST_RIFF_WAVE_FORMAT_MSG723         (0x0042)
-#define GST_RIFF_WAVE_FORMAT_MPEGL12        (0x0050)
-#define GST_RIFF_WAVE_FORMAT_RT24           (0x0052)
-#define GST_RIFF_WAVE_FORMAT_PAC            (0x0053)
-#define GST_RIFF_WAVE_FORMAT_MPEGL3         (0x0055)
-#define GST_RIFF_WAVE_FORMAT_AMR_NB         (0x0057)
-#define GST_RIFF_WAVE_FORMAT_AMR_WB         (0x0058)
-#define GST_RIFF_WAVE_FORMAT_LUCENT_G723    (0x0059)
-#define GST_RIFF_WAVE_FORMAT_CIRRUS         (0x0060)
-#define GST_RIFF_WAVE_FORMAT_ADPCM_IMA_DK4  (0x0061)  /* not official */
-#define GST_RIFF_WAVE_FORMAT_ADPCM_IMA_DK3  (0x0062)  /* not official */
-/* FIXME: where are these from? are they used at all? */
-#if 0
-#define GST_RIFF_WAVE_FORMAT_ESPCM          (0x0061)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE        (0x0062)
-#endif
-#define GST_RIFF_WAVE_FORMAT_CANOPUS_ATRAC  (0x0063)
-#define GST_RIFF_WAVE_FORMAT_G726_ADPCM     (0x0064)
-#define GST_RIFF_WAVE_FORMAT_G722_ADPCM     (0x0065)
-#define GST_RIFF_WAVE_FORMAT_DSAT_DISPLAY   (0x0067)
-#define GST_RIFF_WAVE_FORMAT_ADPCM_IMA_WAV (0x0069)
-/* FIXME: where are these from? are they used at all? */
-#if 0
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_BYTE_ALIGNED (0x0069)
-#endif
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC8    (0x0070)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC10   (0x0071)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC16   (0x0072)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC20   (0x0073)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_METAVOICE (0x0074)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_METASOUND (0x0075)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_RT29HW (0x0076)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_VR12   (0x0077)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_VR18   (0x0078)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_TQ40   (0x0079)
-#define GST_RIFF_WAVE_FORMAT_SOFTSOUND      (0x0080)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_TQ60   (0x0081)
-#define GST_RIFF_WAVE_FORMAT_MSRT24         (0x0082)
-#define GST_RIFF_WAVE_FORMAT_G729A          (0x0083)
-#define GST_RIFF_WAVE_FORMAT_MVI_MVI2       (0x0084)
-#define GST_RIFF_WAVE_FORMAT_DF_G726        (0x0085)
-#define GST_RIFF_WAVE_FORMAT_DF_GSM610      (0x0086)
-#define GST_RIFF_WAVE_FORMAT_ISIAUDIO       (0x0088)
-#define GST_RIFF_WAVE_FORMAT_ONLIVE         (0x0089)
-#define GST_RIFF_WAVE_FORMAT_SBC24          (0x0091)
-#define GST_RIFF_WAVE_FORMAT_DOLBY_AC3_SPDIF  (0x0092)
-#define GST_RIFF_WAVE_FORMAT_MEDIASONIC_G723  (0x0093)
-#define GST_RIFF_WAVE_FORMAT_PROSODY_8KBPS  (0x0094)
-#define GST_RIFF_WAVE_FORMAT_ZYXEL_ADPCM    (0x0097)
-#define GST_RIFF_WAVE_FORMAT_PHILIPS_LPCBB  (0x0098)
-#define GST_RIFF_WAVE_FORMAT_PACKED         (0x0099)
-#define GST_RIFF_WAVE_FORMAT_MALDEN_PHONYTALK (0x00A0)
-#define GST_RIFF_WAVE_FORMAT_AAC            (0x00ff)
-#define GST_RIFF_WAVE_FORMAT_RHETOREX_ADPCM (0x0100)
-#define GST_RIFF_IBM_FORMAT_MULAW           (0x0101)
-#define GST_RIFF_IBM_FORMAT_ALAW            (0x0102)
-#define GST_RIFF_IBM_FORMAT_ADPCM           (0x0103)
-#define GST_RIFF_WAVE_FORMAT_VIVO_G723      (0x0111)
-#define GST_RIFF_WAVE_FORMAT_VIVO_SIREN     (0x0112)
-#define GST_RIFF_WAVE_FORMAT_DIGITAL_G723   (0x0123)
-#define GST_RIFF_WAVE_FORMAT_SANYO_LD_ADPCM (0x0125)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_ACEPLNET  (0x0130)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_ACELP4800 (0x0131)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_ACELP8V3  (0x0132)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_G729   (0x0133)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_G729A  (0x0134)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_KELVIN (0x0135)
-#define GST_RIFF_WAVE_FORMAT_G726ADPCM       (0x0140)
-#define GST_RIFF_WAVE_FORMAT_QUALCOMM_PUREVOICE (0x0150)
-#define GST_RIFF_WAVE_FORMAT_QUALCOMM_HALFRATE  (0x0151)
-#define GST_RIFF_WAVE_FORMAT_TUBGSM             (0x0155)
-#define GST_RIFF_WAVE_FORMAT_WMAV1          (0x0160)
-#define GST_RIFF_WAVE_FORMAT_WMAV2          (0x0161)
-#define GST_RIFF_WAVE_FORMAT_WMAV3          (0x0162)
-#define GST_RIFF_WAVE_FORMAT_WMAV3_L        (0x0163)
-#define GST_RIFF_WAVE_FORMAT_CREATIVE_ADPCM (0x0200)
-#define GST_RIFF_WAVE_FORMAT_CREATIVE_FASTSPEECH8  (0x0202)
-#define GST_RIFF_WAVE_FORMAT_CREATIVE_FASTSPEECH10 (0x0203)
-#define GST_RIFF_WAVE_FORMAT_UHER_ADPCM     (0x0210)
-#define GST_RIFF_WAVE_FORMAT_QUARTERDECK    (0x0220)
-#define GST_RIFF_WAVE_FORMAT_ILINK_VC       (0x0230)
-#define GST_RIFF_WAVE_FORMAT_RAW_SPORT      (0x0240)
-#define GST_RIFF_WAVE_FORMAT_IPI_HSX        (0x0250)
-#define GST_RIFF_WAVE_FORMAT_IPI_RPELP      (0x0251)
-#define GST_RIFF_WAVE_FORMAT_CS2            (0x0260)
-#define GST_RIFF_WAVE_FORMAT_SONY_ATRAC3    (0x0270)
-#define GST_RIFF_WAVE_FORMAT_SIREN          (0x028E)
-#define GST_RIFF_WAVE_FORMAT_FM_TOWNS_SND   (0x0300)
-#define GST_RIFF_WAVE_FORMAT_BTV_DIGITAL    (0x0400)
-#define GST_RIFF_WAVE_FORMAT_IMC            (0x0401)
-#define GST_RIFF_WAVE_FORMAT_QDESIGN_MUSIC  (0x0450)
-#define GST_RIFF_WAVE_FORMAT_VME_VMPCM      (0x0680)
-#define GST_RIFF_WAVE_FORMAT_TPC            (0x0681)
-#define GST_RIFF_WAVE_FORMAT_OLIGSM         (0x1000)
-#define GST_RIFF_WAVE_FORMAT_OLIADPCM       (0x1001)
-#define GST_RIFF_WAVE_FORMAT_OLICELP        (0x1002)
-#define GST_RIFF_WAVE_FORMAT_OLISBC         (0x1003)
-#define GST_RIFF_WAVE_FORMAT_OLIOPR         (0x1004)
-#define GST_RIFF_WAVE_FORMAT_LH_CODEC       (0x1100)
-#define GST_RIFF_WAVE_FORMAT_NORRIS         (0x1400)
-#define GST_RIFF_WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS (0x1500)
-#define GST_RIFF_WAVE_FORMAT_A52            (0x2000)
-#define GST_RIFF_WAVE_FORMAT_DTS            (0x2001)
-#define GST_RIFF_WAVE_FORMAT_SONIC          (0x2048)
-#define GST_RIFF_WAVE_FORMAT_SONIC_LS       (0x2048)
-#define GST_RIFF_WAVE_FORMAT_AAC_AC         (0x4143)
-#define GST_RIFF_WAVE_FORMAT_VORBIS1        (0x674f)
-#define GST_RIFF_WAVE_FORMAT_VORBIS2        (0x6750)
-#define GST_RIFF_WAVE_FORMAT_VORBIS3        (0x6751)
-#define GST_RIFF_WAVE_FORMAT_VORBIS1PLUS    (0x676f)
-#define GST_RIFF_WAVE_FORMAT_VORBIS2PLUS    (0x6770)
-#define GST_RIFF_WAVE_FORMAT_VORBIS3PLUS    (0x6771)
-#define GST_RIFF_WAVE_FORMAT_AAC_pm         (0x706d)
-#define GST_RIFF_WAVE_FORMAT_GSM_AMR_CBR    (0x7A21)
-#define GST_RIFF_WAVE_FORMAT_GSM_AMR_VBR    (0x7A22)
-#define GST_RIFF_WAVE_FORMAT_FLAC           (0xF1AC)
-#define GST_RIFF_WAVE_FORMAT_EXTENSIBLE     (0xFFFE)
-  guint16 channels;
-  guint32 rate;
-  guint32 av_bps;
-  guint16 blockalign;
-  guint16 bits_per_sample;
-#if 0
-  /* missing field */
-  guint16 extra_size;
-#endif
-} gst_riff_strf_auds;
-
-typedef struct _gst_riff_strf_iavs {    
-  guint32 DVAAuxSrc;
-  guint32 DVAAuxCtl;
-  guint32 DVAAuxSrc1;
-  guint32 DVAAuxCtl1;
-  guint32 DVVAuxSrc;
-  guint32 DVVAuxCtl;
-  guint32 DVReserved1;
-  guint32 DVReserved2;
-} gst_riff_strf_iavs;
-
-typedef struct _gst_riff_index_entry {  
-  guint32 id;
-  guint32 flags;
-#define GST_RIFF_IF_LIST                (0x00000001L)
-#define GST_RIFF_IF_KEYFRAME            (0x00000010L)
-#define GST_RIFF_IF_NO_TIME             (0x00000100L)
-#define GST_RIFF_IF_COMPUSE             (0x0FFF0000L)
-  guint32 offset;
-  guint32 size;
-} gst_riff_index_entry;
-
-typedef struct _gst_riff_dmlh {
-  guint32 totalframes;
-} gst_riff_dmlh;
-
-/* taken from libsndfile/wav.c (LGPL) */
-typedef struct _gst_riff_acid {
-  /* 4 bytes (int)     type of file:
-   *  this appears to be a bit mask,however some combinations
-   *  are probably impossible and/or qualified as "errors"
-   *
-   *  0x01 On: One Shot         Off: Loop
-   *  0x02 On: Root note is Set Off: No root
-   *  0x04 On: Stretch is On,   Off: Strech is OFF
-   *  0x08 On: Disk Based       Off: Ram based
-   *  0x10 On: ??????????       Off: ????????? (Acidizer puts that ON)
-   */
-  guint32 loop_type;
-  /* 2 bytes (short)      root note
-   *  if type 0x10 is OFF : [C,C#,(...),B] -> [0x30 to 0x3B]
-   *  if type 0x10 is ON  : [C,C#,(...),B] -> [0x3C to 0x47]
-   *  (both types fit on same MIDI pitch albeit different octaves, so who cares)
-   */
-  guint16 root_note;
-  /* 2 bytes (short)      ??? always set to 0x8000
-   * 4 bytes (float)      ??? seems to be always 0
-   */
-  guint16 unknown1;
-  gfloat unknown2;
-  /* 4 bytes (int)        number of beats
-   * 2 bytes (short)      meter denominator   //always 4 in SF/ACID
-   * 2 bytes (short)      meter numerator     //always 4 in SF/ACID
-   *                      //are we sure about the order?? usually its num/denom
-   * 4 bytes (float)      tempo
-   */
-  guint32 number_of_beats;
-  guint16 meter_d, meter_n;
-  gfloat tempo;
-} gst_riff_acid;
-
-G_END_DECLS
-
-#endif /* __GST_RIFF_IDS_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-media.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-media.h
deleted file mode 100644
index ef5bc2bc..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-media.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GStreamer RIFF I/O
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * riff-media.h: RIFF-id to/from caps routines
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RIFF_MEDIA_H__
-#define __GST_RIFF_MEDIA_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-#include "riff-ids.h"
-
-G_BEGIN_DECLS
-
-/*
- * Create caos. strh/strf, strf/strd_data and codec_name can be NULL.
- */
-
-GstCaps * gst_riff_create_video_caps (guint32              codec_fcc,
-                                      gst_riff_strh      * strh,
-                                      gst_riff_strf_vids * strf,
-                                      GstBuffer          * strf_data,
-                                      GstBuffer          * strd_data,
-                                      char              ** codec_name);
-
-GstCaps * gst_riff_create_audio_caps (guint16              codec_id,
-                                      gst_riff_strh      * strh,
-                                      gst_riff_strf_auds * strf,
-                                      GstBuffer          * strf_data,
-                                      GstBuffer          * strd_data,
-                                      char              ** codec_name,
-                                      gint                 channel_reorder_map[18]);
-
-GstCaps * gst_riff_create_iavs_caps  (guint32              codec_fcc,
-                                      gst_riff_strh      * strh,
-                                      gst_riff_strf_iavs * strf,
-                                      GstBuffer          * strf_data,
-                                      GstBuffer          * strd_data,
-                                      char              ** codec_name);
-/*
- * Create template caps (includes all known types).
- */
-
-GstCaps * gst_riff_create_video_template_caps (void);
-GstCaps * gst_riff_create_audio_template_caps (void);
-GstCaps * gst_riff_create_iavs_template_caps  (void);
-
-G_END_DECLS
-
-#endif /* __GST_RIFF_READ_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-read.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-read.h
deleted file mode 100644
index cf07dda2..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/riff/riff-read.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GStreamer RIFF I/O
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * riff-read.h: function declarations for parsing a RIFF file
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RIFF_READ_H__
-#define __GST_RIFF_READ_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "riff-ids.h"
-
-G_BEGIN_DECLS
-
-/*
- * Operate using pull_range().
- */
-
-GstFlowReturn gst_riff_read_chunk   (GstElement * element,
-                                     GstPad     * pad,
-                                     guint64    * offset,
-                                     guint32    * tag,
-                                     GstBuffer ** chunk_data);
-
-/*
- * These functions operate on provided data (the caller is
- * supposed to strip the chunk headers). The buffer is
- * provided by the caller, the strf/strh/data are filled in
- * by the function.
- */
-
-gboolean gst_riff_parse_chunk       (GstElement * element,
-                                     GstBuffer  * buf,
-                                     guint      * offset,
-                                     guint32    * fourcc,
-                                     GstBuffer ** chunk_data);
-
-gboolean gst_riff_parse_file_header (GstElement * element,
-                                     GstBuffer  * buf,
-                                     guint32    * doctype);
-
-gboolean gst_riff_parse_strh        (GstElement     * element,
-                                     GstBuffer      * buf,
-                                     gst_riff_strh ** strh);
-
-gboolean gst_riff_parse_strf_vids   (GstElement          * element,
-                                     GstBuffer           * buf,
-                                     gst_riff_strf_vids ** strf,
-                                     GstBuffer          ** data);
-gboolean gst_riff_parse_strf_auds   (GstElement          * element,
-                                     GstBuffer           * buf,
-                                     gst_riff_strf_auds ** strf,
-                                     GstBuffer          ** data);
-gboolean gst_riff_parse_strf_iavs   (GstElement          * element,
-                                     GstBuffer           * buf,
-                                     gst_riff_strf_iavs ** strf,
-                                     GstBuffer          ** data);
-
-void gst_riff_parse_info            (GstElement  * element,
-                                     GstBuffer   * buf,
-                                     GstTagList ** taglist);
-
-/*
- * Init.
- */
-void gst_riff_init                  (void);
-
-G_END_DECLS
-
-#endif /* __GST_RIFF_READ_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtcpbuffer.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtcpbuffer.h
deleted file mode 100644
index b1a76559..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtcpbuffer.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Wim Taymans <wim@fluendo.com>
- *
- * gstrtcpbuffer.h: various helper functions to manipulate buffers
- *     with RTCP payload.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTCPBUFFER_H__
-#define __GST_RTCPBUFFER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_RTCP_VERSION:
- *
- * The supported RTCP version 2.
- */
-#define GST_RTCP_VERSION 2
-
-/**
- * GstRTCPType:
- * @GST_RTCP_TYPE_INVALID: Invalid type
- * @GST_RTCP_TYPE_SR: Sender report
- * @GST_RTCP_TYPE_RR: Receiver report
- * @GST_RTCP_TYPE_SDES: Source description
- * @GST_RTCP_TYPE_BYE: Goodbye
- * @GST_RTCP_TYPE_APP: Application defined
- * @GST_RTCP_TYPE_RTPFB: Transport layer feedback.
- * @GST_RTCP_TYPE_PSFB: Payload-specific feedback.
- *
- * Different RTCP packet types.
- */
-typedef enum
-{
-  GST_RTCP_TYPE_INVALID = 0,
-  GST_RTCP_TYPE_SR      = 200,
-  GST_RTCP_TYPE_RR      = 201,
-  GST_RTCP_TYPE_SDES    = 202,
-  GST_RTCP_TYPE_BYE     = 203,
-  GST_RTCP_TYPE_APP     = 204,
-  GST_RTCP_TYPE_RTPFB   = 205,
-  GST_RTCP_TYPE_PSFB    = 206
-} GstRTCPType;
-
-/**
- * GstRTCPFBType:
- * @GST_RTCP_FB_TYPE_INVALID: Invalid type
- * @GST_RTCP_RTPFB_TYPE_NACK: Generic NACK
- * @GST_RTCP_RTPFB_TYPE_TMMBR: Temporary Maximum Media Stream Bit Rate Request
- * @GST_RTCP_RTPFB_TYPE_TMMBN: Temporary Maximum Media Stream Bit Rate
- *    Notification
- * @GST_RTCP_PSFB_TYPE_PLI: Picture Loss Indication
- * @GST_RTCP_PSFB_TYPE_SLI: Slice Loss Indication
- * @GST_RTCP_PSFB_TYPE_RPSI: Reference Picture Selection Indication
- * @GST_RTCP_PSFB_TYPE_AFB: Application layer Feedback
- * @GST_RTCP_PSFB_TYPE_FIR: Full Intra Request Command
- * @GST_RTCP_PSFB_TYPE_TSTR: Temporal-Spatial Trade-off Request
- * @GST_RTCP_PSFB_TYPE_TSTN: Temporal-Spatial Trade-off Notification
- * @GST_RTCP_PSFB_TYPE_VBCN: Video Back Channel Message
- *
- * Different types of feedback messages.
- */
-typedef enum
-{
-  /* generic */
-  GST_RTCP_FB_TYPE_INVALID    = 0,
-  /* RTPFB types */
-  GST_RTCP_RTPFB_TYPE_NACK    = 1,
-  /* RTPFB types assigned in RFC 5104 */
-  GST_RTCP_RTPFB_TYPE_TMMBR   = 3,
-  GST_RTCP_RTPFB_TYPE_TMMBN   = 4,
-  /* PSFB types */
-  GST_RTCP_PSFB_TYPE_PLI      = 1,
-  GST_RTCP_PSFB_TYPE_SLI      = 2,
-  GST_RTCP_PSFB_TYPE_RPSI     = 3,
-  GST_RTCP_PSFB_TYPE_AFB      = 15,
-  /* PSFB types assigned in RFC 5104 */
-  GST_RTCP_PSFB_TYPE_FIR      = 4,
-  GST_RTCP_PSFB_TYPE_TSTR     = 5,
-  GST_RTCP_PSFB_TYPE_TSTN     = 6,
-  GST_RTCP_PSFB_TYPE_VBCN     = 7,
-} GstRTCPFBType;
-
-/**
- * GstRTCPSDESType:
- * @GST_RTCP_SDES_INVALID: Invalid SDES entry
- * @GST_RTCP_SDES_END: End of SDES list
- * @GST_RTCP_SDES_CNAME: Canonical name
- * @GST_RTCP_SDES_NAME: User name
- * @GST_RTCP_SDES_EMAIL: User's electronic mail address
- * @GST_RTCP_SDES_PHONE: User's phone number
- * @GST_RTCP_SDES_LOC: Geographic user location
- * @GST_RTCP_SDES_TOOL: Name of application or tool
- * @GST_RTCP_SDES_NOTE: Notice about the source
- * @GST_RTCP_SDES_PRIV: Private extensions
- *
- * Different types of SDES content.
- */
-typedef enum
-{
-  GST_RTCP_SDES_INVALID  = -1,
-  GST_RTCP_SDES_END      = 0,
-  GST_RTCP_SDES_CNAME    = 1,
-  GST_RTCP_SDES_NAME     = 2,
-  GST_RTCP_SDES_EMAIL    = 3,
-  GST_RTCP_SDES_PHONE    = 4,
-  GST_RTCP_SDES_LOC      = 5,
-  GST_RTCP_SDES_TOOL     = 6,
-  GST_RTCP_SDES_NOTE     = 7,
-  GST_RTCP_SDES_PRIV     = 8
-} GstRTCPSDESType;
-
-/**
- * GST_RTCP_MAX_SDES:
- *
- * The maximum text length for an SDES item.
- */
-#define GST_RTCP_MAX_SDES 255
-
-/**
- * GST_RTCP_MAX_RB_COUNT:
- *
- * The maximum amount of Receiver report blocks in RR and SR messages.
- */
-#define GST_RTCP_MAX_RB_COUNT   31
-
-/**
- * GST_RTCP_MAX_SDES_ITEM_COUNT:
- *
- * The maximum amount of SDES items.
- */
-#define GST_RTCP_MAX_SDES_ITEM_COUNT   31
-
-/**
- * GST_RTCP_MAX_BYE_SSRC_COUNT:
- *
- * The maximum amount of SSRCs in a BYE packet.
- */
-#define GST_RTCP_MAX_BYE_SSRC_COUNT   31
-
-/**
- * GST_RTCP_VALID_MASK:
- *
- * Mask for version, padding bit and packet type pair
- */
-#define GST_RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe)
-/**
- * GST_RTCP_VALID_VALUE:
- *
- * Valid value for the first two bytes of an RTCP packet after applying
- * #GST_RTCP_VALID_MASK to them.
- */
-#define GST_RTCP_VALID_VALUE ((GST_RTCP_VERSION << 14) | GST_RTCP_TYPE_SR)
-
-typedef struct _GstRTCPBuffer GstRTCPBuffer;
-typedef struct _GstRTCPPacket GstRTCPPacket;
-
-struct _GstRTCPBuffer
-{
-  GstBuffer   *buffer;
-  GstMapInfo   map;
-};
-
-#define GST_RTCP_BUFFER_INIT { NULL, GST_MAP_INFO_INIT }
-
-/**
- * GstRTCPPacket:
- * @rtcp: pointer to RTCP buffer
- * @offset: offset of packet in buffer data
- *
- * Data structure that points to a packet at @offset in @buffer.
- * The size of the structure is made public to allow stack allocations.
- */
-struct _GstRTCPPacket
-{
-  GstRTCPBuffer *rtcp;
-  guint          offset;
-
-  /*< private >*/
-  gboolean       padding;      /* padding field of current packet */
-  guint8         count;        /* count field of current packet */
-  GstRTCPType    type;         /* type of current packet */
-  guint16        length;       /* length of current packet in 32-bits words */
-
-  guint          item_offset;  /* current item offset for navigating SDES */
-  guint          item_count;   /* current item count */
-  guint          entry_offset; /* current entry offset for navigating SDES items */
-};
-
-/* creating buffers */
-GstBuffer*      gst_rtcp_buffer_new_take_data     (gpointer data, guint len);
-GstBuffer*      gst_rtcp_buffer_new_copy_data     (gpointer data, guint len);
-
-gboolean        gst_rtcp_buffer_validate_data     (guint8 *data, guint len);
-gboolean        gst_rtcp_buffer_validate          (GstBuffer *buffer);
-
-GstBuffer*      gst_rtcp_buffer_new               (guint mtu);
-
-gboolean        gst_rtcp_buffer_map               (GstBuffer *buffer, GstMapFlags flags, GstRTCPBuffer *rtcp);
-gboolean        gst_rtcp_buffer_unmap             (GstRTCPBuffer *rtcp);
-
-/* adding/retrieving packets */
-guint           gst_rtcp_buffer_get_packet_count  (GstRTCPBuffer *rtcp);
-gboolean        gst_rtcp_buffer_get_first_packet  (GstRTCPBuffer *rtcp, GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_move_to_next      (GstRTCPPacket *packet);
-
-gboolean        gst_rtcp_buffer_add_packet        (GstRTCPBuffer *rtcp, GstRTCPType type,
-                                                   GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_remove            (GstRTCPPacket *packet);
-
-/* working with packets */
-gboolean        gst_rtcp_packet_get_padding       (GstRTCPPacket *packet);
-guint8          gst_rtcp_packet_get_count         (GstRTCPPacket *packet);
-GstRTCPType     gst_rtcp_packet_get_type          (GstRTCPPacket *packet);
-guint16         gst_rtcp_packet_get_length        (GstRTCPPacket *packet);
-
-
-/* sender reports */
-void            gst_rtcp_packet_sr_get_sender_info    (GstRTCPPacket *packet, guint32 *ssrc,
-                                                       guint64 *ntptime, guint32 *rtptime,
-                                                       guint32 *packet_count, guint32 *octet_count);
-void            gst_rtcp_packet_sr_set_sender_info    (GstRTCPPacket *packet, guint32 ssrc,
-                                                       guint64 ntptime, guint32 rtptime,
-                                                       guint32 packet_count, guint32 octet_count);
-/* receiver reports */
-guint32         gst_rtcp_packet_rr_get_ssrc           (GstRTCPPacket *packet);
-void            gst_rtcp_packet_rr_set_ssrc           (GstRTCPPacket *packet, guint32 ssrc);
-
-
-/* report blocks for SR and RR */
-guint           gst_rtcp_packet_get_rb_count          (GstRTCPPacket *packet);
-void            gst_rtcp_packet_get_rb                (GstRTCPPacket *packet, guint nth, guint32 *ssrc,
-                                                       guint8 *fractionlost, gint32 *packetslost,
-                                                       guint32 *exthighestseq, guint32 *jitter,
-                                                       guint32 *lsr, guint32 *dlsr);
-gboolean        gst_rtcp_packet_add_rb                (GstRTCPPacket *packet, guint32 ssrc,
-                                                       guint8 fractionlost, gint32 packetslost,
-                                                       guint32 exthighestseq, guint32 jitter,
-                                                       guint32 lsr, guint32 dlsr);
-void            gst_rtcp_packet_set_rb                (GstRTCPPacket *packet, guint nth, guint32 ssrc,
-                                                       guint8 fractionlost, gint32 packetslost,
-                                                       guint32 exthighestseq, guint32 jitter,
-                                                       guint32 lsr, guint32 dlsr);
-
-/* source description packet */
-guint           gst_rtcp_packet_sdes_get_item_count   (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_first_item       (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_next_item        (GstRTCPPacket *packet);
-guint32         gst_rtcp_packet_sdes_get_ssrc         (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_first_entry      (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_next_entry       (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_get_entry        (GstRTCPPacket *packet,
-                                                       GstRTCPSDESType *type, guint8 *len,
-                                                       guint8 **data);
-gboolean        gst_rtcp_packet_sdes_copy_entry       (GstRTCPPacket *packet,
-                                                       GstRTCPSDESType *type, guint8 *len,
-                                                       guint8 **data);
-
-gboolean        gst_rtcp_packet_sdes_add_item         (GstRTCPPacket *packet, guint32 ssrc);
-gboolean        gst_rtcp_packet_sdes_add_entry        (GstRTCPPacket *packet, GstRTCPSDESType type,
-                                                       guint8 len, const guint8 *data);
-
-/* bye packet */
-guint           gst_rtcp_packet_bye_get_ssrc_count    (GstRTCPPacket *packet);
-guint32         gst_rtcp_packet_bye_get_nth_ssrc      (GstRTCPPacket *packet, guint nth);
-gboolean        gst_rtcp_packet_bye_add_ssrc          (GstRTCPPacket *packet, guint32 ssrc);
-gboolean        gst_rtcp_packet_bye_add_ssrcs         (GstRTCPPacket *packet, guint32 *ssrc, guint len);
-guint8          gst_rtcp_packet_bye_get_reason_len    (GstRTCPPacket *packet);
-gchar*          gst_rtcp_packet_bye_get_reason        (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_bye_set_reason        (GstRTCPPacket *packet, const gchar *reason);
-
-/* feedback packets */
-guint32         gst_rtcp_packet_fb_get_sender_ssrc    (GstRTCPPacket *packet);
-void            gst_rtcp_packet_fb_set_sender_ssrc    (GstRTCPPacket *packet, guint32 ssrc);
-guint32         gst_rtcp_packet_fb_get_media_ssrc     (GstRTCPPacket *packet);
-void            gst_rtcp_packet_fb_set_media_ssrc     (GstRTCPPacket *packet, guint32 ssrc);
-GstRTCPFBType   gst_rtcp_packet_fb_get_type           (GstRTCPPacket *packet);
-void            gst_rtcp_packet_fb_set_type           (GstRTCPPacket *packet, GstRTCPFBType type);
-guint16         gst_rtcp_packet_fb_get_fci_length     (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_fb_set_fci_length     (GstRTCPPacket *packet, guint16 wordlen);
-guint8 *        gst_rtcp_packet_fb_get_fci            (GstRTCPPacket *packet);
-
-/* helper functions */
-guint64         gst_rtcp_ntp_to_unix                  (guint64 ntptime);
-guint64         gst_rtcp_unix_to_ntp                  (guint64 unixtime);
-
-const gchar *   gst_rtcp_sdes_type_to_name            (GstRTCPSDESType type);
-GstRTCPSDESType gst_rtcp_sdes_name_to_type            (const gchar *name);
-
-G_END_DECLS
-
-#endif /* __GST_RTCPBUFFER_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbaseaudiopayload.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbaseaudiopayload.h
deleted file mode 100644
index a6dedd86..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbaseaudiopayload.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GStreamer
- * Copyright (C) <2006> Philippe Khalaf <philippe.kalaf@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTP_BASE_AUDIO_PAYLOAD_H__
-#define __GST_RTP_BASE_AUDIO_PAYLOAD_H__
-
-#include <gst/gst.h>
-#include <gst/rtp/gstrtpbasepayload.h>
-#include <gst/base/gstadapter.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstRTPBaseAudioPayload GstRTPBaseAudioPayload;
-typedef struct _GstRTPBaseAudioPayloadClass GstRTPBaseAudioPayloadClass;
-
-typedef struct _GstRTPBaseAudioPayloadPrivate GstRTPBaseAudioPayloadPrivate;
-
-#define GST_TYPE_RTP_BASE_AUDIO_PAYLOAD \
-  (gst_rtp_base_audio_payload_get_type())
-#define GST_RTP_BASE_AUDIO_PAYLOAD(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-  GST_TYPE_RTP_BASE_AUDIO_PAYLOAD,GstRTPBaseAudioPayload))
-#define GST_RTP_BASE_AUDIO_PAYLOAD_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-  GST_TYPE_RTP_BASE_AUDIO_PAYLOAD,GstRTPBaseAudioPayloadClass))
-#define GST_IS_RTP_BASE_AUDIO_PAYLOAD(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_BASE_AUDIO_PAYLOAD))
-#define GST_IS_RTP_BASE_AUDIO_PAYLOAD_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_BASE_AUDIO_PAYLOAD))
-#define GST_RTP_BASE_AUDIO_PAYLOAD_CAST(obj) \
-  ((GstRTPBaseAudioPayload *) (obj))
-
-struct _GstRTPBaseAudioPayload
-{
-  GstRTPBasePayload payload;
-
-  GstRTPBaseAudioPayloadPrivate *priv;
-
-  GstClockTime base_ts;
-  gint frame_size;
-  gint frame_duration;
-
-  gint sample_size;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstRTPBaseAudioPayloadClass:
- * @parent_class: the parent class
- *
- * Base class for audio RTP payloader.
- */
-struct _GstRTPBaseAudioPayloadClass
-{
-  GstRTPBasePayloadClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_rtp_base_audio_payload_get_type (void);
-
-/* configure frame based */
-void            gst_rtp_base_audio_payload_set_frame_based        (GstRTPBaseAudioPayload *rtpbaseaudiopayload);
-
-void            gst_rtp_base_audio_payload_set_frame_options      (GstRTPBaseAudioPayload *rtpbaseaudiopayload,
-                                                                   gint frame_duration, gint frame_size);
-
-/* configure sample based */
-void            gst_rtp_base_audio_payload_set_sample_based       (GstRTPBaseAudioPayload *rtpbaseaudiopayload);
-void            gst_rtp_base_audio_payload_set_sample_options     (GstRTPBaseAudioPayload *rtpbaseaudiopayload,
-                                                                   gint sample_size);
-void            gst_rtp_base_audio_payload_set_samplebits_options (GstRTPBaseAudioPayload *rtpbaseaudiopayload,
-                                                                   gint sample_size);
-
-/* get the internal adapter */
-GstAdapter*     gst_rtp_base_audio_payload_get_adapter            (GstRTPBaseAudioPayload *rtpbaseaudiopayload);
-
-/* push and flushing data */
-GstFlowReturn   gst_rtp_base_audio_payload_push                   (GstRTPBaseAudioPayload * baseaudiopayload,
-                                                                   const guint8 * data, guint payload_len,
-                                                                   GstClockTime timestamp);
-GstFlowReturn   gst_rtp_base_audio_payload_flush                  (GstRTPBaseAudioPayload * baseaudiopayload,
-                                                                   guint payload_len, GstClockTime timestamp);
-
-G_END_DECLS
-
-#endif /* __GST_RTP_BASE_AUDIO_PAYLOAD_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbasedepayload.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbasedepayload.h
deleted file mode 100644
index fc838a2c..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbasedepayload.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005> Philippe Khalaf <burger@speedy.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTP_BASE_DEPAYLOAD_H__
-#define __GST_RTP_BASE_DEPAYLOAD_H__
-
-#include <gst/gst.h>
-#include <gst/rtp/gstrtpbuffer.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_RTP_BASE_DEPAYLOAD (gst_rtp_base_depayload_get_type())
-#define GST_RTP_BASE_DEPAYLOAD(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_BASE_DEPAYLOAD,GstRTPBaseDepayload))
-#define GST_RTP_BASE_DEPAYLOAD_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_BASE_DEPAYLOAD,GstRTPBaseDepayloadClass))
-#define GST_RTP_BASE_DEPAYLOAD_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_RTP_BASE_DEPAYLOAD,GstRTPBaseDepayloadClass))
-#define GST_IS_RTP_BASE_DEPAYLOAD(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_BASE_DEPAYLOAD))
-#define GST_IS_RTP_BASE_DEPAYLOAD_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_BASE_DEPAYLOAD))
-
-#define GST_RTP_BASE_DEPAYLOAD_SINKPAD(depayload) (GST_RTP_BASE_DEPAYLOAD (depayload)->sinkpad)
-#define GST_RTP_BASE_DEPAYLOAD_SRCPAD(depayload)  (GST_RTP_BASE_DEPAYLOAD (depayload)->srcpad)
-
-typedef struct _GstRTPBaseDepayload      GstRTPBaseDepayload;
-typedef struct _GstRTPBaseDepayloadClass GstRTPBaseDepayloadClass;
-typedef struct _GstRTPBaseDepayloadPrivate GstRTPBaseDepayloadPrivate;
-
-struct _GstRTPBaseDepayload
-{
-  GstElement parent;
-
-  GstPad *sinkpad, *srcpad;
-
-  /* this attribute must be set by the child */
-  guint clock_rate;
-
-  GstSegment segment;
-  gboolean need_newsegment;
-
-  /*< private >*/
-  GstRTPBaseDepayloadPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstRTPBaseDepayloadClass:
- * @parent_class: the parent class
- * @set_caps: configure the depayloader
- * @process: process incoming rtp packets
- * @packet_lost: signal the depayloader about packet loss
- * @handle_event: custom event handling
- *
- * Base class for audio RTP payloader.
- */
-struct _GstRTPBaseDepayloadClass
-{
-  GstElementClass parent_class;
-
-  /* virtuals, inform the subclass of the caps. */
-  gboolean (*set_caps) (GstRTPBaseDepayload *filter, GstCaps *caps);
-
-  /* pure virtual function, child must use this to process incoming
-   * rtp packets. If the child returns a buffer without a valid timestamp,
-   * the timestamp of @in will be applied to the result buffer and the
-   * buffer will be pushed. If this function returns %NULL, nothing is
-   * pushed.  */
-  GstBuffer * (*process) (GstRTPBaseDepayload *base, GstBuffer *in);
-
-  /* non-pure function used to to signal the depayloader about packet loss. the
-   * timestamp and duration are the estimated values of the lost packet.
-   * The default implementation of this message pushes a segment update. */
-  gboolean (*packet_lost) (GstRTPBaseDepayload *filter, GstEvent *event);
-
-  /* the default implementation does the default actions for events but
-   * implementation can override. */
-  gboolean (*handle_event) (GstRTPBaseDepayload * filter, GstEvent * event);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_rtp_base_depayload_get_type (void);
-
-GstFlowReturn   gst_rtp_base_depayload_push       (GstRTPBaseDepayload *filter, GstBuffer *out_buf);
-GstFlowReturn   gst_rtp_base_depayload_push_list  (GstRTPBaseDepayload *filter, GstBufferList *out_list);
-
-
-G_END_DECLS
-
-#endif /* __GST_RTP_BASE_DEPAYLOAD_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbasepayload.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbasepayload.h
deleted file mode 100644
index 39ce430a..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbasepayload.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTP_BASE_PAYLOAD_H__
-#define __GST_RTP_BASE_PAYLOAD_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_RTP_BASE_PAYLOAD \
-        (gst_rtp_base_payload_get_type())
-#define GST_RTP_BASE_PAYLOAD(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_BASE_PAYLOAD,GstRTPBasePayload))
-#define GST_RTP_BASE_PAYLOAD_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_BASE_PAYLOAD,GstRTPBasePayloadClass))
-#define GST_RTP_BASE_PAYLOAD_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_RTP_BASE_PAYLOAD, GstRTPBasePayloadClass))
-#define GST_IS_RTP_BASE_PAYLOAD(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_BASE_PAYLOAD))
-#define GST_IS_RTP_BASE_PAYLOAD_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_BASE_PAYLOAD))
-#define GST_RTP_BASE_PAYLOAD_CAST(obj) \
-        ((GstRTPBasePayload*)(obj))
-
-typedef struct _GstRTPBasePayload GstRTPBasePayload;
-typedef struct _GstRTPBasePayloadPrivate GstRTPBasePayloadPrivate;
-typedef struct _GstRTPBasePayloadClass GstRTPBasePayloadClass;
-
-/**
- * GST_RTP_BASE_PAYLOAD_SINKPAD:
- * @payload: a #GstRTPBasePayload
- *
- * Get access to the sinkpad of @payload.
- */
-#define GST_RTP_BASE_PAYLOAD_SINKPAD(payload) (GST_RTP_BASE_PAYLOAD (payload)->sinkpad)
-/**
- * GST_RTP_BASE_PAYLOAD_SRCPAD:
- * @payload: a #GstRTPBasePayload
- *
- * Get access to the srcpad of @payload.
- */
-#define GST_RTP_BASE_PAYLOAD_SRCPAD(payload)  (GST_RTP_BASE_PAYLOAD (payload)->srcpad)
-
-/**
- * GST_RTP_BASE_PAYLOAD_PT:
- * @payload: a #GstRTPBasePayload
- *
- * Get access to the configured payload type of @payload.
- */
-#define GST_RTP_BASE_PAYLOAD_PT(payload)  (GST_RTP_BASE_PAYLOAD (payload)->pt)
-/**
- * GST_RTP_BASE_PAYLOAD_MTU:
- * @payload: a #GstRTPBasePayload
- *
- * Get access to the configured MTU of @payload.
- */
-#define GST_RTP_BASE_PAYLOAD_MTU(payload) (GST_RTP_BASE_PAYLOAD (payload)->mtu)
-
-struct _GstRTPBasePayload
-{
-  GstElement element;
-
-  /*< private >*/
-  GstPad  *sinkpad;
-  GstPad  *srcpad;
-
-  guint32  ts_base;
-  guint16  seqnum_base;
-
-  gchar   *media;
-  gchar   *encoding_name;
-  gboolean dynamic;
-  guint32  clock_rate;
-
-  gint32   ts_offset;
-  guint32  timestamp;
-  gint16   seqnum_offset;
-  guint16  seqnum;
-  gint64   max_ptime;
-  guint    pt;
-  guint    ssrc;
-  guint    current_ssrc;
-  guint    mtu;
-
-  GstSegment segment;
-
-  guint64  min_ptime;
-  guint64  ptime; /* in ns */
-  guint64  ptime_multiple; /* in ns */
-
-  /*< private >*/
-  GstRTPBasePayloadPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstRTPBasePayloadClass:
- * @parent_class: the parent class
- * @get_caps: get desired caps
- * @set_caps: configure the payloader
- * @handle_buffer: process data
- * @sink_event: custom event handling on the sinkpad
- * @src_event: custom event handling on the srcpad
- * @query: custom query handling
- *
- * Base class for audio RTP payloader.
- */
-struct _GstRTPBasePayloadClass
-{
-  GstElementClass parent_class;
-
-  /* query accepted caps */
-  GstCaps *     (*get_caps)             (GstRTPBasePayload *payload, GstPad * pad, GstCaps * filter);
-  /* receive caps on the sink pad, configure the payloader. */
-  gboolean      (*set_caps)             (GstRTPBasePayload *payload, GstCaps *caps);
-
-  /* handle a buffer, perform 0 or more gst_rtp_base_payload_push() on
-   * the RTP buffers. This function takes ownership of the buffer. */
-  GstFlowReturn (*handle_buffer)        (GstRTPBasePayload *payload,
-                                         GstBuffer *buffer);
-  /* handle events and queries */
-  gboolean      (*sink_event)           (GstRTPBasePayload *payload, GstEvent * event);
-  gboolean      (*src_event)            (GstRTPBasePayload *payload, GstEvent * event);
-  gboolean      (*query)                (GstRTPBasePayload *payload, GstPad *pad, GstQuery * query);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_rtp_base_payload_get_type           (void);
-
-void            gst_rtp_base_payload_set_options        (GstRTPBasePayload *payload,
-                                                         const gchar *media,
-                                                         gboolean dynamic,
-                                                         const gchar *encoding_name,
-                                                         guint32 clock_rate);
-
-gboolean        gst_rtp_base_payload_set_outcaps        (GstRTPBasePayload *payload,
-                                                         const gchar *fieldname, ...);
-
-gboolean        gst_rtp_base_payload_is_filled          (GstRTPBasePayload *payload,
-                                                         guint size, GstClockTime duration);
-
-GstFlowReturn   gst_rtp_base_payload_push               (GstRTPBasePayload *payload,
-                                                         GstBuffer *buffer);
-
-GstFlowReturn   gst_rtp_base_payload_push_list          (GstRTPBasePayload *payload,
-                                                         GstBufferList *list);
-
-G_END_DECLS
-
-#endif /* __GST_RTP_BASE_PAYLOAD_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbuffer.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbuffer.h
deleted file mode 100644
index 5551c5a3..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtpbuffer.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005> Philippe Khalaf <burger@speedy.org>
- *               <2005> Wim Taymans <wim@fluendo.com>
- *
- * gstrtpbuffer.h: various helper functions to manipulate buffers
- *     with RTP payload.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTPBUFFER_H__
-#define __GST_RTPBUFFER_H__
-
-#include <gst/gst.h>
-#include <gst/rtp/gstrtppayloads.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_RTP_VERSION:
- *
- * The supported RTP version 2.
- */
-#define GST_RTP_VERSION 2
-
-
-typedef struct _GstRTPBuffer GstRTPBuffer;
-
-/**
- * GstRTPBuffer:
- * @buffer: pointer to RTP buffer
- * @state: internal state
- * @data: array of data
- * @size: array of size
- * @map: array of #GstMapInfo
- *
- * Data structure that points to an RTP packet.
- * The size of the structure is made public to allow stack allocations.
- */
-struct _GstRTPBuffer
-{
-  GstBuffer   *buffer;
-  guint        state;
-  gpointer     data[4];
-  gsize        size[4];
-  GstMapInfo   map[4];
-};
-
-#define GST_RTP_BUFFER_INIT { NULL, 0, { NULL, NULL, NULL, NULL}, { 0, 0, 0, 0 }, \
-  { GST_MAP_INFO_INIT, GST_MAP_INFO_INIT, GST_MAP_INFO_INIT, GST_MAP_INFO_INIT} }
-
-/* creating buffers */
-void            gst_rtp_buffer_allocate_data         (GstBuffer *buffer, guint payload_len,
-                                                      guint8 pad_len, guint8 csrc_count);
-
-GstBuffer*      gst_rtp_buffer_new_take_data         (gpointer data, gsize len);
-GstBuffer*      gst_rtp_buffer_new_copy_data         (gpointer data, gsize len);
-GstBuffer*      gst_rtp_buffer_new_allocate          (guint payload_len, guint8 pad_len, guint8 csrc_count);
-GstBuffer*      gst_rtp_buffer_new_allocate_len      (guint packet_len, guint8 pad_len, guint8 csrc_count);
-
-guint           gst_rtp_buffer_calc_header_len       (guint8 csrc_count);
-guint           gst_rtp_buffer_calc_packet_len       (guint payload_len, guint8 pad_len, guint8 csrc_count);
-guint           gst_rtp_buffer_calc_payload_len      (guint packet_len, guint8 pad_len, guint8 csrc_count);
-
-gboolean        gst_rtp_buffer_map                   (GstBuffer *buffer, GstMapFlags flags, GstRTPBuffer *rtp);
-void            gst_rtp_buffer_unmap                 (GstRTPBuffer *rtp);
-
-void            gst_rtp_buffer_set_packet_len        (GstRTPBuffer *rtp, guint len);
-guint           gst_rtp_buffer_get_packet_len        (GstRTPBuffer *rtp);
-
-guint           gst_rtp_buffer_get_header_len        (GstRTPBuffer *rtp);
-
-guint8          gst_rtp_buffer_get_version           (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_version           (GstRTPBuffer *rtp, guint8 version);
-
-gboolean        gst_rtp_buffer_get_padding           (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_padding           (GstRTPBuffer *rtp, gboolean padding);
-void            gst_rtp_buffer_pad_to                (GstRTPBuffer *rtp, guint len);
-
-gboolean        gst_rtp_buffer_get_extension         (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_extension         (GstRTPBuffer *rtp, gboolean extension);
-gboolean        gst_rtp_buffer_get_extension_data    (GstRTPBuffer *rtp, guint16 *bits,
-                                                      gpointer *data, guint *wordlen);
-gboolean        gst_rtp_buffer_set_extension_data    (GstRTPBuffer *rtp, guint16 bits, guint16 length);
-
-guint32         gst_rtp_buffer_get_ssrc              (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_ssrc              (GstRTPBuffer *rtp, guint32 ssrc);
-
-guint8          gst_rtp_buffer_get_csrc_count        (GstRTPBuffer *rtp);
-guint32         gst_rtp_buffer_get_csrc              (GstRTPBuffer *rtp, guint8 idx);
-void            gst_rtp_buffer_set_csrc              (GstRTPBuffer *rtp, guint8 idx, guint32 csrc);
-
-gboolean        gst_rtp_buffer_get_marker            (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_marker            (GstRTPBuffer *rtp, gboolean marker);
-
-guint8          gst_rtp_buffer_get_payload_type      (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_payload_type      (GstRTPBuffer *rtp, guint8 payload_type);
-
-guint16         gst_rtp_buffer_get_seq               (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_seq               (GstRTPBuffer *rtp, guint16 seq);
-
-guint32         gst_rtp_buffer_get_timestamp         (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_timestamp         (GstRTPBuffer *rtp, guint32 timestamp);
-
-GstBuffer*      gst_rtp_buffer_get_payload_buffer    (GstRTPBuffer *rtp);
-GstBuffer*      gst_rtp_buffer_get_payload_subbuffer (GstRTPBuffer *rtp, guint offset, guint len);
-
-guint           gst_rtp_buffer_get_payload_len       (GstRTPBuffer *rtp);
-gpointer        gst_rtp_buffer_get_payload           (GstRTPBuffer *rtp);
-
-/* some helpers */
-guint32         gst_rtp_buffer_default_clock_rate    (guint8 payload_type);
-gint            gst_rtp_buffer_compare_seqnum        (guint16 seqnum1, guint16 seqnum2);
-guint64         gst_rtp_buffer_ext_timestamp         (guint64 *exttimestamp, guint32 timestamp);
-
-gboolean        gst_rtp_buffer_get_extension_onebyte_header  (GstRTPBuffer *rtp,
-                                                              guint8 id,
-                                                              guint nth,
-                                                              gpointer * data,
-                                                              guint * size);
-gboolean        gst_rtp_buffer_get_extension_twobytes_header (GstRTPBuffer *rtp,
-                                                              guint8 * appbits,
-                                                              guint8 id,
-                                                              guint nth,
-                                                              gpointer * data,
-                                                              guint * size);
-
-gboolean       gst_rtp_buffer_add_extension_onebyte_header  (GstRTPBuffer *rtp,
-                                                             guint8 id,
-                                                             gpointer data,
-                                                             guint size);
-gboolean       gst_rtp_buffer_add_extension_twobytes_header (GstRTPBuffer *rtp,
-                                                             guint8 appbits,
-                                                             guint8 id,
-                                                             gpointer data,
-                                                             guint size);
-
-
-G_END_DECLS
-
-#endif /* __GST_RTPBUFFER_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtppayloads.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtppayloads.h
deleted file mode 100644
index cdfef135..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtp/gstrtppayloads.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com>
- *
- * gstrtppayloads.h: various helper functions to deal with RTP payload
- *     types.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTPPAYLOADS_H__
-#define __GST_RTPPAYLOADS_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTPPayload:
- * @GST_RTP_PAYLOAD_PCMU: ITU-T G.711. mu-law audio (RFC 3551)
- * @GST_RTP_PAYLOAD_1016: RFC 3551 says reserved
- * @GST_RTP_PAYLOAD_G721: RFC 3551 says reserved
- * @GST_RTP_PAYLOAD_GSM: GSM audio
- * @GST_RTP_PAYLOAD_G723: ITU G.723.1 audio
- * @GST_RTP_PAYLOAD_DVI4_8000: IMA ADPCM wave type (RFC 3551)
- * @GST_RTP_PAYLOAD_DVI4_16000: IMA ADPCM wave type (RFC 3551)
- * @GST_RTP_PAYLOAD_LPC: experimental linear predictive encoding
- * @GST_RTP_PAYLOAD_PCMA: ITU-T G.711 A-law audio (RFC 3551)
- * @GST_RTP_PAYLOAD_G722: ITU-T G.722 (RFC 3551)
- * @GST_RTP_PAYLOAD_L16_STEREO: stereo PCM
- * @GST_RTP_PAYLOAD_L16_MONO: mono PCM
- * @GST_RTP_PAYLOAD_QCELP: EIA & TIA standard IS-733
- * @GST_RTP_PAYLOAD_CN: Comfort Noise (RFC 3389)
- * @GST_RTP_PAYLOAD_MPA: Audio MPEG 1-3.
- * @GST_RTP_PAYLOAD_G728: ITU-T G.728 Speech coder (RFC 3551)
- * @GST_RTP_PAYLOAD_DVI4_11025: IMA ADPCM wave type (RFC 3551)
- * @GST_RTP_PAYLOAD_DVI4_22050: IMA ADPCM wave type (RFC 3551)
- * @GST_RTP_PAYLOAD_G729: ITU-T G.729 Speech coder (RFC 3551)
- * @GST_RTP_PAYLOAD_CELLB: See RFC 2029
- * @GST_RTP_PAYLOAD_JPEG: ISO Standards 10918-1 and 10918-2 (RFC 2435)
- * @GST_RTP_PAYLOAD_NV: nv encoding by Ron Frederick
- * @GST_RTP_PAYLOAD_H261: ITU-T Recommendation H.261 (RFC 2032)
- * @GST_RTP_PAYLOAD_MPV: Video MPEG 1 & 2 (RFC 2250)
- * @GST_RTP_PAYLOAD_MP2T: MPEG-2 transport stream (RFC 2250)
- * @GST_RTP_PAYLOAD_H263: Video H263 (RFC 2190)
- *
- *
- * Standard predefined fixed payload types.
- *
- * The official list is at:
- * http://www.iana.org/assignments/rtp-parameters
- *
- * Audio:
- * reserved: 19
- * unassigned: 20-23,
- *
- * Video:
- * unassigned: 24, 27, 29, 30, 35-71, 77-95
- * Reserved for RTCP conflict avoidance: 72-76
- */
-typedef enum
-{
-  /* Audio: */
-  GST_RTP_PAYLOAD_PCMU = 0,
-  GST_RTP_PAYLOAD_1016 = 1, /* RFC 3551 says reserved */
-  GST_RTP_PAYLOAD_G721 = 2, /* RFC 3551 says reserved */
-  GST_RTP_PAYLOAD_GSM = 3,
-  GST_RTP_PAYLOAD_G723 = 4,
-  GST_RTP_PAYLOAD_DVI4_8000 = 5,
-  GST_RTP_PAYLOAD_DVI4_16000 = 6,
-  GST_RTP_PAYLOAD_LPC = 7,
-  GST_RTP_PAYLOAD_PCMA = 8,
-  GST_RTP_PAYLOAD_G722 = 9,
-  GST_RTP_PAYLOAD_L16_STEREO = 10,
-  GST_RTP_PAYLOAD_L16_MONO = 11,
-  GST_RTP_PAYLOAD_QCELP = 12,
-  GST_RTP_PAYLOAD_CN = 13,
-  GST_RTP_PAYLOAD_MPA = 14,
-  GST_RTP_PAYLOAD_G728 = 15,
-  GST_RTP_PAYLOAD_DVI4_11025 = 16,
-  GST_RTP_PAYLOAD_DVI4_22050 = 17,
-  GST_RTP_PAYLOAD_G729 = 18,
-
-  /* Video: */
-
-  GST_RTP_PAYLOAD_CELLB = 25,
-  GST_RTP_PAYLOAD_JPEG = 26,
-  GST_RTP_PAYLOAD_NV = 28,
-  GST_RTP_PAYLOAD_H261 = 31,
-  GST_RTP_PAYLOAD_MPV = 32,
-  GST_RTP_PAYLOAD_MP2T = 33,
-  GST_RTP_PAYLOAD_H263 = 34,
-
-  /* BOTH */
-} GstRTPPayload;
-
-/* backward compatibility */
-#define GST_RTP_PAYLOAD_G723_63 16
-#define GST_RTP_PAYLOAD_G723_53 17
-#define GST_RTP_PAYLOAD_TS48 18
-#define GST_RTP_PAYLOAD_TS41 19
-
-#define GST_RTP_PAYLOAD_G723_63_STRING "16"
-#define GST_RTP_PAYLOAD_G723_53_STRING "17"
-#define GST_RTP_PAYLOAD_TS48_STRING "18"
-#define GST_RTP_PAYLOAD_TS41_STRING "19"
-
-/* Defining the above as strings, to make the declaration of pad_templates
- * easier. So if please keep these synchronized with the above.
- */
-#define GST_RTP_PAYLOAD_PCMU_STRING "0"
-#define GST_RTP_PAYLOAD_1016_STRING "1"
-#define GST_RTP_PAYLOAD_G721_STRING "2"
-#define GST_RTP_PAYLOAD_GSM_STRING "3"
-#define GST_RTP_PAYLOAD_G723_STRING "4"
-#define GST_RTP_PAYLOAD_DVI4_8000_STRING "5"
-#define GST_RTP_PAYLOAD_DVI4_16000_STRING "6"
-#define GST_RTP_PAYLOAD_LPC_STRING "7"
-#define GST_RTP_PAYLOAD_PCMA_STRING "8"
-#define GST_RTP_PAYLOAD_G722_STRING "9"
-#define GST_RTP_PAYLOAD_L16_STEREO_STRING "10"
-#define GST_RTP_PAYLOAD_L16_MONO_STRING "11"
-#define GST_RTP_PAYLOAD_QCELP_STRING "12"
-#define GST_RTP_PAYLOAD_CN_STRING "13"
-#define GST_RTP_PAYLOAD_MPA_STRING "14"
-#define GST_RTP_PAYLOAD_G728_STRING "15"
-#define GST_RTP_PAYLOAD_DVI4_11025_STRING "16"
-#define GST_RTP_PAYLOAD_DVI4_22050_STRING "17"
-#define GST_RTP_PAYLOAD_G729_STRING "18"
-
-#define GST_RTP_PAYLOAD_CELLB_STRING "25"
-#define GST_RTP_PAYLOAD_JPEG_STRING "26"
-#define GST_RTP_PAYLOAD_NV_STRING "28"
-
-#define GST_RTP_PAYLOAD_H261_STRING "31"
-#define GST_RTP_PAYLOAD_MPV_STRING "32"
-#define GST_RTP_PAYLOAD_MP2T_STRING "33"
-#define GST_RTP_PAYLOAD_H263_STRING "34"
-
-#define GST_RTP_PAYLOAD_DYNAMIC_STRING "[96, 127]"
-
-/**
- * GST_RTP_PAYLOAD_IS_DYNAMIC:
- * @pt: a payload type
- *
- * Check if @pt is a dynamic payload type.
- */
-#define GST_RTP_PAYLOAD_IS_DYNAMIC(pt) ((pt) >= 96 && (pt) <= 127)
-
-typedef struct _GstRTPPayloadInfo GstRTPPayloadInfo;
-
-/**
- * GstRTPPayloadInfo:
- * @payload_type: payload type, -1 means dynamic
- * @media: the media type(s), usually "audio", "video", "application", "text",
- * "message".
- * @encoding_name: the encoding name of @pt
- * @clock_rate: default clock rate, 0 = unknown/variable
- * @encoding_parameters: encoding parameters. For audio this is the number of
- * channels. NULL = not applicable.
- * @bitrate: the bitrate of the media. 0 = unknown/variable.
- *
- * Structure holding default payload type information.
- */
-struct _GstRTPPayloadInfo
-{
-  guint8       payload_type;
-  const gchar *media;
-  const gchar *encoding_name;
-  guint        clock_rate;
-  const gchar *encoding_parameters;
-  guint        bitrate;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-const GstRTPPayloadInfo *  gst_rtp_payload_info_for_pt     (guint8 payload_type);
-const GstRTPPayloadInfo *  gst_rtp_payload_info_for_name   (const gchar *media, const gchar *encoding_name);
-
-G_END_DECLS
-
-#endif /* __GST_RTPPAYLOADS_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsp-enumtypes.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsp-enumtypes.h
deleted file mode 100644
index 3254324f..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsp-enumtypes.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-#ifndef __gst_rtsp_ENUM_TYPES_H__
-#define __gst_rtsp_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "gstrtspdefs.h" */
-GType gst_rtsp_result_get_type (void);
-#define GST_TYPE_RTSP_RESULT (gst_rtsp_result_get_type())
-GType gst_rtsp_event_get_type (void);
-#define GST_TYPE_RTSP_EVENT (gst_rtsp_event_get_type())
-GType gst_rtsp_family_get_type (void);
-#define GST_TYPE_RTSP_FAMILY (gst_rtsp_family_get_type())
-GType gst_rtsp_state_get_type (void);
-#define GST_TYPE_RTSP_STATE (gst_rtsp_state_get_type())
-GType gst_rtsp_version_get_type (void);
-#define GST_TYPE_RTSP_VERSION (gst_rtsp_version_get_type())
-GType gst_rtsp_method_get_type (void);
-#define GST_TYPE_RTSP_METHOD (gst_rtsp_method_get_type())
-GType gst_rtsp_auth_method_get_type (void);
-#define GST_TYPE_RTSP_AUTH_METHOD (gst_rtsp_auth_method_get_type())
-GType gst_rtsp_header_field_get_type (void);
-#define GST_TYPE_RTSP_HEADER_FIELD (gst_rtsp_header_field_get_type())
-GType gst_rtsp_status_code_get_type (void);
-#define GST_TYPE_RTSP_STATUS_CODE (gst_rtsp_status_code_get_type())
-G_END_DECLS
-
-#endif /* __gst_rtsp_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspconnection.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspconnection.h
deleted file mode 100644
index c004535a..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspconnection.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2009> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_CONNECTION_H__
-#define __GST_RTSP_CONNECTION_H__
-
-#include <glib.h>
-
-#include <gst/gstconfig.h>
-#include <gst/rtsp/gstrtspdefs.h>
-#include <gst/rtsp/gstrtspurl.h>
-#include <gst/rtsp/gstrtspmessage.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTSPConnection:
- *
- * Opaque RTSP connection object.
- */
-typedef struct _GstRTSPConnection GstRTSPConnection;
-
-/* opening/closing a connection */
-GstRTSPResult      gst_rtsp_connection_create         (const GstRTSPUrl *url, GstRTSPConnection **conn);
-GstRTSPResult      gst_rtsp_connection_create_from_socket (GSocket * socket,
-                                                       const gchar * ip,
-                                                       guint16 port,
-                                                       const gchar * initial_buffer,
-                                                       GstRTSPConnection ** conn);
-GstRTSPResult      gst_rtsp_connection_accept         (GSocket *socket, GstRTSPConnection **conn, GCancellable *cancellable);
-GstRTSPResult      gst_rtsp_connection_connect        (GstRTSPConnection *conn, GTimeVal *timeout);
-GstRTSPResult      gst_rtsp_connection_close          (GstRTSPConnection *conn);
-GstRTSPResult      gst_rtsp_connection_free           (GstRTSPConnection *conn);
-
-
-/* sending/receiving raw bytes */
-GstRTSPResult      gst_rtsp_connection_read           (GstRTSPConnection * conn, guint8 * data,
-                                                       guint size, GTimeVal * timeout);
-GstRTSPResult      gst_rtsp_connection_write          (GstRTSPConnection * conn, const guint8 * data,
-                                                       guint size, GTimeVal * timeout);
-
-/* sending/receiving messages */
-GstRTSPResult      gst_rtsp_connection_send           (GstRTSPConnection *conn, GstRTSPMessage *message,
-                                                       GTimeVal *timeout);
-GstRTSPResult      gst_rtsp_connection_receive        (GstRTSPConnection *conn, GstRTSPMessage *message,
-                                                       GTimeVal *timeout);
-
-/* status management */
-GstRTSPResult      gst_rtsp_connection_poll           (GstRTSPConnection *conn, GstRTSPEvent events,
-                                                       GstRTSPEvent *revents, GTimeVal *timeout);
-
-/* reset the timeout */
-GstRTSPResult      gst_rtsp_connection_next_timeout   (GstRTSPConnection *conn, GTimeVal *timeout);
-GstRTSPResult      gst_rtsp_connection_reset_timeout  (GstRTSPConnection *conn);
-
-/* flushing state */
-GstRTSPResult      gst_rtsp_connection_flush          (GstRTSPConnection *conn, gboolean flush);
-
-/* HTTP proxy support */
-GstRTSPResult      gst_rtsp_connection_set_proxy      (GstRTSPConnection *conn,
-                                                       const gchar *host, guint port);
-
-/* configure authentication data */
-GstRTSPResult      gst_rtsp_connection_set_auth       (GstRTSPConnection *conn, GstRTSPAuthMethod method,
-                                                       const gchar *user, const gchar *pass);
-
-void               gst_rtsp_connection_set_auth_param    (GstRTSPConnection *conn,
-                                                          const gchar * param,
-                                                          const gchar *value);
-void               gst_rtsp_connection_clear_auth_params (GstRTSPConnection *conn);
-
-/* configure DSCP */
-GstRTSPResult      gst_rtsp_connection_set_qos_dscp   (GstRTSPConnection *conn,
-                                                       guint qos_dscp);
-
-/* accessors */
-GstRTSPUrl *       gst_rtsp_connection_get_url        (const GstRTSPConnection *conn);
-const gchar *      gst_rtsp_connection_get_ip         (const GstRTSPConnection *conn);
-void               gst_rtsp_connection_set_ip         (GstRTSPConnection *conn, const gchar *ip);
-
-GSocket *          gst_rtsp_connection_get_read_socket  (const GstRTSPConnection *conn);
-GSocket *          gst_rtsp_connection_get_write_socket (const GstRTSPConnection *conn);
-
-void               gst_rtsp_connection_set_http_mode  (GstRTSPConnection *conn,
-                                                       gboolean enable);
-
-/* tunneling */
-void               gst_rtsp_connection_set_tunneled   (GstRTSPConnection *conn, gboolean tunneled);
-gboolean           gst_rtsp_connection_is_tunneled    (const GstRTSPConnection *conn);
-
-const gchar *      gst_rtsp_connection_get_tunnelid   (const GstRTSPConnection *conn);
-GstRTSPResult      gst_rtsp_connection_do_tunnel      (GstRTSPConnection *conn, GstRTSPConnection *conn2);
-
-/* async IO */
-
-/**
- * GstRTSPWatch:
- *
- * Opaque RTSP watch object that can be used for asynchronous RTSP
- * operations.
- */
-typedef struct _GstRTSPWatch GstRTSPWatch;
-
-/**
- * GstRTSPWatchFuncs:
- * @message_received: callback when a message was received
- * @message_sent: callback when a message was sent
- * @closed: callback when the connection is closed
- * @error: callback when an error occured
- * @tunnel_start: a client started a tunneled connection. The tunnelid of the
- *   connection must be saved.
- * @tunnel_complete: a client finished a tunneled connection. In this callback
- *   you usually pair the tunnelid of this connection with the saved one using
- *   gst_rtsp_connection_do_tunnel().
- * @error_full: callback when an error occured with more information than
- *   the @error callback.
- * @tunnel_lost: callback when the post connection of a tunnel is closed.
- *
- * Callback functions from a #GstRTSPWatch.
- */
-typedef struct {
-  GstRTSPResult     (*message_received) (GstRTSPWatch *watch, GstRTSPMessage *message,
-                                         gpointer user_data);
-  GstRTSPResult     (*message_sent)     (GstRTSPWatch *watch, guint id,
-                                         gpointer user_data);
-  GstRTSPResult     (*closed)           (GstRTSPWatch *watch, gpointer user_data);
-  GstRTSPResult     (*error)            (GstRTSPWatch *watch, GstRTSPResult result,
-                                         gpointer user_data);
-  GstRTSPStatusCode (*tunnel_start)     (GstRTSPWatch *watch, gpointer user_data);
-  GstRTSPResult     (*tunnel_complete)  (GstRTSPWatch *watch, gpointer user_data);
-  GstRTSPResult     (*error_full)       (GstRTSPWatch *watch, GstRTSPResult result,
-                                         GstRTSPMessage *message, guint id,
-                                         gpointer user_data);
-  GstRTSPResult     (*tunnel_lost)      (GstRTSPWatch *watch, gpointer user_data);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-} GstRTSPWatchFuncs;
-
-GstRTSPWatch *     gst_rtsp_watch_new                (GstRTSPConnection *conn,
-                                                      GstRTSPWatchFuncs *funcs,
-                                                      gpointer user_data,
-                                                      GDestroyNotify notify);
-void               gst_rtsp_watch_reset              (GstRTSPWatch *watch);
-void               gst_rtsp_watch_unref              (GstRTSPWatch *watch);
-
-guint              gst_rtsp_watch_attach             (GstRTSPWatch *watch,
-                                                      GMainContext *context);
-
-GstRTSPResult      gst_rtsp_watch_write_data         (GstRTSPWatch *watch,
-                                                      const guint8 *data,
-                                                      guint size, guint *id);
-GstRTSPResult      gst_rtsp_watch_send_message       (GstRTSPWatch *watch,
-                                                      GstRTSPMessage *message,
-                                                      guint *id);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_CONNECTION_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspdefs.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspdefs.h
deleted file mode 100644
index e0b37935..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspdefs.h
+++ /dev/null
@@ -1,410 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_DEFS_H__
-#define __GST_RTSP_DEFS_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_RTSP_CHECK:
- * @stmt: a statement
- * @label: a label
- *
- * Macro that checks the return value of @stmt and jumps to @label when it does
- * not equal #GST_RTSP_OK.
- */
-#define GST_RTSP_CHECK(stmt, label)  \
-G_STMT_START { \
-  if (G_UNLIKELY ((res = (stmt)) != GST_RTSP_OK)) \
-    goto label; \
-} G_STMT_END
-
-/**
- * GstRTSPResult:
- * @GST_RTSP_OK: no error
- * @GST_RTSP_ERROR: some unspecified error occured
- * @GST_RTSP_EINVAL: invalid arguments were provided to a function
- * @GST_RTSP_EINTR: an operation was canceled
- * @GST_RTSP_ENOMEM: no memory was available for the operation
- * @GST_RTSP_ERESOLV: a host resolve error occured
- * @GST_RTSP_ENOTIMPL: function not implemented
- * @GST_RTSP_ESYS: a system error occured, errno contains more details
- * @GST_RTSP_EPARSE: a persing error occured
- * @GST_RTSP_EWSASTART: windows networking could not start
- * @GST_RTSP_EWSAVERSION: windows networking stack has wrong version
- * @GST_RTSP_EEOF: end-of-file was reached
- * @GST_RTSP_ENET: a network problem occured, h_errno contains more details
- * @GST_RTSP_ENOTIP: the host is not an IP host
- * @GST_RTSP_ETIMEOUT: a timeout occured
- * @GST_RTSP_ETGET: the tunnel GET request has been performed
- * @GST_RTSP_ETPOST: the tunnel POST request has been performed
- * @GST_RTSP_ELAST: last error
- *
- * Result codes from the RTSP functions.
- */
-typedef enum {
-  GST_RTSP_OK          =  0,
-  /* errors */
-  GST_RTSP_ERROR       = -1,
-  GST_RTSP_EINVAL      = -2,
-  GST_RTSP_EINTR       = -3,
-  GST_RTSP_ENOMEM      = -4,
-  GST_RTSP_ERESOLV     = -5,
-  GST_RTSP_ENOTIMPL    = -6,
-  GST_RTSP_ESYS        = -7,
-  GST_RTSP_EPARSE      = -8,
-  GST_RTSP_EWSASTART   = -9,
-  GST_RTSP_EWSAVERSION = -10,
-  GST_RTSP_EEOF        = -11,
-  GST_RTSP_ENET        = -12,
-  GST_RTSP_ENOTIP      = -13,
-  GST_RTSP_ETIMEOUT    = -14,
-  GST_RTSP_ETGET       = -15,
-  GST_RTSP_ETPOST      = -16,
-
-  GST_RTSP_ELAST       = -17
-} GstRTSPResult;
-
-/**
- * GstRTSPEvent:
- * @GST_RTSP_EV_READ: connection is readable
- * @GST_RTSP_EV_WRITE: connection is writable
- *
- * The possible events for the connection.
- */
-typedef enum {
-  GST_RTSP_EV_READ  = (1 << 0),
-  GST_RTSP_EV_WRITE = (1 << 1)
-} GstRTSPEvent;
-
-/**
- * GstRTSPFamily:
- * @GST_RTSP_FAM_NONE: unknown network family
- * @GST_RTSP_FAM_INET: internet
- * @GST_RTSP_FAM_INET6: internet V6
- *
- * The possible network families.
- */
-typedef enum {
-  GST_RTSP_FAM_NONE,
-  GST_RTSP_FAM_INET,
-  GST_RTSP_FAM_INET6
-} GstRTSPFamily;
-
-/**
- * GstRTSPState:
- * @GST_RTSP_STATE_INVALID: invalid state
- * @GST_RTSP_STATE_INIT: initializing
- * @GST_RTSP_STATE_READY: ready for operation
- * @GST_RTSP_STATE_SEEKING: seeking in progress
- * @GST_RTSP_STATE_PLAYING: playing
- * @GST_RTSP_STATE_RECORDING: recording
- *
- * The different RTSP states.
- */
-typedef enum {
-  GST_RTSP_STATE_INVALID,
-  GST_RTSP_STATE_INIT,
-  GST_RTSP_STATE_READY,
-  GST_RTSP_STATE_SEEKING,
-  GST_RTSP_STATE_PLAYING,
-  GST_RTSP_STATE_RECORDING
-} GstRTSPState;
-
-/**
- * GstRTSPVersion:
- * @GST_RTSP_VERSION_INVALID: unknown/invalid version
- * @GST_RTSP_VERSION_1_0: version 1.0
- * @GST_RTSP_VERSION_1_1: version 1.1.
- *
- * The supported RTSP versions.
- */
-typedef enum {
-  GST_RTSP_VERSION_INVALID = 0x00,
-  GST_RTSP_VERSION_1_0     = 0x10,
-  GST_RTSP_VERSION_1_1     = 0x11
-} GstRTSPVersion;
-
-/**
- * GstRTSPMethod:
- * @GST_RTSP_INVALID: invalid method
- * @GST_RTSP_DESCRIBE: the DESCRIBE method
- * @GST_RTSP_ANNOUNCE: the ANNOUNCE method
- * @GST_RTSP_GET_PARAMETER: the GET_PARAMETER method
- * @GST_RTSP_OPTIONS: the OPTIONS method
- * @GST_RTSP_PAUSE: the PAUSE method
- * @GST_RTSP_PLAY: the PLAY method
- * @GST_RTSP_RECORD: the RECORD method
- * @GST_RTSP_REDIRECT: the REDIRECT method
- * @GST_RTSP_SETUP: the SETUP method
- * @GST_RTSP_SET_PARAMETER: the SET_PARAMETER method
- * @GST_RTSP_TEARDOWN: the TEARDOWN method
- * @GST_RTSP_GET: the GET method (HTTP).
- * @GST_RTSP_POST: the POST method (HTTP).
- *
- * The different supported RTSP methods.
- */
-typedef enum {
-  GST_RTSP_INVALID          = 0,
-  GST_RTSP_DESCRIBE         = (1 <<  0),
-  GST_RTSP_ANNOUNCE         = (1 <<  1),
-  GST_RTSP_GET_PARAMETER    = (1 <<  2),
-  GST_RTSP_OPTIONS          = (1 <<  3),
-  GST_RTSP_PAUSE            = (1 <<  4),
-  GST_RTSP_PLAY             = (1 <<  5),
-  GST_RTSP_RECORD           = (1 <<  6),
-  GST_RTSP_REDIRECT         = (1 <<  7),
-  GST_RTSP_SETUP            = (1 <<  8),
-  GST_RTSP_SET_PARAMETER    = (1 <<  9),
-  GST_RTSP_TEARDOWN         = (1 << 10),
-  GST_RTSP_GET              = (1 << 11),
-  GST_RTSP_POST             = (1 << 12)
-} GstRTSPMethod;
-
-/**
- * GstRTSPAuthMethod:
- * @GST_RTSP_AUTH_NONE: no authentication
- * @GST_RTSP_AUTH_BASIC: basic authentication
- * @GST_RTSP_AUTH_DIGEST: digest authentication
- *
- * Authentication methods, ordered by strength
- */
-typedef enum {
-  GST_RTSP_AUTH_NONE    = 0x00,
-  GST_RTSP_AUTH_BASIC   = 0x01,
-  GST_RTSP_AUTH_DIGEST  = 0x02
-} GstRTSPAuthMethod;
-
-/**
- * GST_RTSP_AUTH_MAX:
- *
- * Strongest available authentication method
- */
-#define GST_RTSP_AUTH_MAX GST_RTSP_AUTH_DIGEST
-
-/**
- * GstRTSPHeaderField:
- *
- * Enumeration of rtsp header fields
- */
-typedef enum {
-  GST_RTSP_HDR_INVALID,
-
-  /*
-   * R = Request
-   * r = response
-   * g = general
-   * e = entity
-   */
-  GST_RTSP_HDR_ACCEPT,              /* Accept               R      opt.      entity */
-  GST_RTSP_HDR_ACCEPT_ENCODING,     /* Accept-Encoding      R      opt.      entity */
-  GST_RTSP_HDR_ACCEPT_LANGUAGE,     /* Accept-Language      R      opt.      all */
-  GST_RTSP_HDR_ALLOW,               /* Allow                r      opt.      all */
-  GST_RTSP_HDR_AUTHORIZATION,       /* Authorization        R      opt.      all */
-  GST_RTSP_HDR_BANDWIDTH,           /* Bandwidth            R      opt.      all */
-  GST_RTSP_HDR_BLOCKSIZE,           /* Blocksize            R      opt.      all but OPTIONS, TEARDOWN */
-  GST_RTSP_HDR_CACHE_CONTROL,       /* Cache-Control        g      opt.      SETUP */
-  GST_RTSP_HDR_CONFERENCE,          /* Conference           R      opt.      SETUP */
-  GST_RTSP_HDR_CONNECTION,          /* Connection           g      req.      all */
-  GST_RTSP_HDR_CONTENT_BASE,        /* Content-Base         e      opt.      entity */
-  GST_RTSP_HDR_CONTENT_ENCODING,    /* Content-Encoding     e      req.      SET_PARAMETER, DESCRIBE, ANNOUNCE */
-  GST_RTSP_HDR_CONTENT_LANGUAGE,    /* Content-Language     e      req.      DESCRIBE, ANNOUNCE */
-  GST_RTSP_HDR_CONTENT_LENGTH,      /* Content-Length       e      req.      SET_PARAMETER, ANNOUNCE, entity */
-  GST_RTSP_HDR_CONTENT_LOCATION,    /* Content-Location     e      opt.      entity */
-  GST_RTSP_HDR_CONTENT_TYPE,        /* Content-Type         e      req.      SET_PARAMETER, ANNOUNCE, entity */
-  GST_RTSP_HDR_CSEQ,                /* CSeq                 g      req.      all */
-  GST_RTSP_HDR_DATE,                /* Date                 g      opt.      all */
-  GST_RTSP_HDR_EXPIRES,             /* Expires              e      opt.      DESCRIBE, ANNOUNCE */
-  GST_RTSP_HDR_FROM,                /* From                 R      opt.      all */
-  GST_RTSP_HDR_IF_MODIFIED_SINCE,   /* If-Modified-Since    R      opt.      DESCRIBE, SETUP */
-  GST_RTSP_HDR_LAST_MODIFIED,       /* Last-Modified        e      opt.      entity */
-  GST_RTSP_HDR_PROXY_AUTHENTICATE,  /* Proxy-Authenticate */
-  GST_RTSP_HDR_PROXY_REQUIRE,       /* Proxy-Require        R      req.      all */
-  GST_RTSP_HDR_PUBLIC,              /* Public               r      opt.      all */
-  GST_RTSP_HDR_RANGE,               /* Range                Rr     opt.      PLAY, PAUSE, RECORD */
-  GST_RTSP_HDR_REFERER,             /* Referer              R      opt.      all */
-  GST_RTSP_HDR_REQUIRE,             /* Require              R      req.      all */
-  GST_RTSP_HDR_RETRY_AFTER,         /* Retry-After          r      opt.      all */
-  GST_RTSP_HDR_RTP_INFO,            /* RTP-Info             r      req.      PLAY */
-  GST_RTSP_HDR_SCALE,               /* Scale                Rr     opt.      PLAY, RECORD */
-  GST_RTSP_HDR_SESSION,             /* Session              Rr     req.      all but SETUP, OPTIONS */
-  GST_RTSP_HDR_SERVER,              /* Server               r      opt.      all */
-  GST_RTSP_HDR_SPEED,               /* Speed                Rr     opt.      PLAY */
-  GST_RTSP_HDR_TRANSPORT,           /* Transport            Rr     req.      SETUP */
-  GST_RTSP_HDR_UNSUPPORTED,         /* Unsupported          r      req.      all */
-  GST_RTSP_HDR_USER_AGENT,          /* User-Agent           R      opt.      all */
-  GST_RTSP_HDR_VIA,                 /* Via                  g      opt.      all */
-  GST_RTSP_HDR_WWW_AUTHENTICATE,    /* WWW-Authenticate     r      opt.      all */
-
-  /* Real extensions */
-  GST_RTSP_HDR_CLIENT_CHALLENGE,    /* ClientChallenge */
-  GST_RTSP_HDR_REAL_CHALLENGE1,     /* RealChallenge1 */
-  GST_RTSP_HDR_REAL_CHALLENGE2,     /* RealChallenge2 */
-  GST_RTSP_HDR_REAL_CHALLENGE3,     /* RealChallenge3 */
-  GST_RTSP_HDR_SUBSCRIBE,           /* Subscribe */
-  GST_RTSP_HDR_ALERT,               /* Alert */
-  GST_RTSP_HDR_CLIENT_ID,           /* ClientID */
-  GST_RTSP_HDR_COMPANY_ID,          /* CompanyID */
-  GST_RTSP_HDR_GUID,                /* GUID */
-  GST_RTSP_HDR_REGION_DATA,         /* RegionData */
-  GST_RTSP_HDR_MAX_ASM_WIDTH,       /* SupportsMaximumASMBandwidth */
-  GST_RTSP_HDR_LANGUAGE,            /* Language */
-  GST_RTSP_HDR_PLAYER_START_TIME,   /* PlayerStarttime */
-
-  /* Since 0.10.16 */
-  GST_RTSP_HDR_LOCATION,            /* Location */
-
-  /* Since 0.10.23 */
-  GST_RTSP_HDR_ETAG,                /* ETag */
-  GST_RTSP_HDR_IF_MATCH,            /* If-Match */
-
-  /* WM extensions [MS-RTSP] Since 0.10.23 */
-  GST_RTSP_HDR_ACCEPT_CHARSET,      /* Accept-Charset */
-  GST_RTSP_HDR_SUPPORTED,           /* Supported */
-  GST_RTSP_HDR_VARY,                /* Vary */
-  GST_RTSP_HDR_X_ACCELERATE_STREAMING,    /* X-Accelerate-Streaming */
-  GST_RTSP_HDR_X_ACCEPT_AUTHENT,    /* X-Accept-Authentication */
-  GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT,    /* X-Accept-Proxy-Authentication */
-  GST_RTSP_HDR_X_BROADCAST_ID,      /* X-Broadcast-Id */
-  GST_RTSP_HDR_X_BURST_STREAMING,   /* X-Burst-Streaming */
-  GST_RTSP_HDR_X_NOTICE,            /* X-Notice */
-  GST_RTSP_HDR_X_PLAYER_LAG_TIME,   /* X-Player-Lag-Time */
-  GST_RTSP_HDR_X_PLAYLIST,          /* X-Playlist */
-  GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE,  /* X-Playlist-Change-Notice */
-  GST_RTSP_HDR_X_PLAYLIST_GEN_ID,   /* X-Playlist-Gen-Id */
-  GST_RTSP_HDR_X_PLAYLIST_SEEK_ID,  /* X-Playlist-Seek-Id */
-  GST_RTSP_HDR_X_PROXY_CLIENT_AGENT,      /* X-Proxy-Client-Agent */
-  GST_RTSP_HDR_X_PROXY_CLIENT_VERB, /* X-Proxy-Client-Verb */
-  GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE, /* X-Receding-PlaylistChange */
-  GST_RTSP_HDR_X_RTP_INFO,          /* X-RTP-Info */
-  GST_RTSP_HDR_X_STARTUPPROFILE,    /* X-StartupProfile */
-
-  /* Since 0.10.24 */
-  GST_RTSP_HDR_TIMESTAMP,           /* Timestamp */
-
-  /* Since 0.10.25 */
-  GST_RTSP_HDR_AUTHENTICATION_INFO, /* Authentication-Info */
-  GST_RTSP_HDR_HOST,                /* Host */
-  GST_RTSP_HDR_PRAGMA,              /* Pragma */
-  GST_RTSP_HDR_X_SERVER_IP_ADDRESS, /* X-Server-IP-Address */
-  GST_RTSP_HDR_X_SESSIONCOOKIE,     /* X-Sessioncookie */
-
-  /* Since 0.10.36 */
-  GST_RTSP_HDR_RTCP_INTERVAL,       /* RTCP-Interval */
-
-  GST_RTSP_HDR_LAST
-} GstRTSPHeaderField;
-
-/**
- * GstRTSPStatusCode:
- *
- * Enumeration of rtsp status codes
- */
-typedef enum {
-  GST_RTSP_STS_INVALID                              = 0,
-  GST_RTSP_STS_CONTINUE                             = 100,
-  GST_RTSP_STS_OK                                   = 200,
-  GST_RTSP_STS_CREATED                              = 201,
-  GST_RTSP_STS_LOW_ON_STORAGE                       = 250,
-  GST_RTSP_STS_MULTIPLE_CHOICES                     = 300,
-  GST_RTSP_STS_MOVED_PERMANENTLY                    = 301,
-  GST_RTSP_STS_MOVE_TEMPORARILY                     = 302,
-  GST_RTSP_STS_SEE_OTHER                            = 303,
-  GST_RTSP_STS_NOT_MODIFIED                         = 304,
-  GST_RTSP_STS_USE_PROXY                            = 305,
-  GST_RTSP_STS_BAD_REQUEST                          = 400,
-  GST_RTSP_STS_UNAUTHORIZED                         = 401,
-  GST_RTSP_STS_PAYMENT_REQUIRED                     = 402,
-  GST_RTSP_STS_FORBIDDEN                            = 403,
-  GST_RTSP_STS_NOT_FOUND                            = 404,
-  GST_RTSP_STS_METHOD_NOT_ALLOWED                   = 405,
-  GST_RTSP_STS_NOT_ACCEPTABLE                       = 406,
-  GST_RTSP_STS_PROXY_AUTH_REQUIRED                  = 407,
-  GST_RTSP_STS_REQUEST_TIMEOUT                      = 408,
-  GST_RTSP_STS_GONE                                 = 410,
-  GST_RTSP_STS_LENGTH_REQUIRED                      = 411,
-  GST_RTSP_STS_PRECONDITION_FAILED                  = 412,
-  GST_RTSP_STS_REQUEST_ENTITY_TOO_LARGE             = 413,
-  GST_RTSP_STS_REQUEST_URI_TOO_LARGE                = 414,
-  GST_RTSP_STS_UNSUPPORTED_MEDIA_TYPE               = 415,
-  GST_RTSP_STS_PARAMETER_NOT_UNDERSTOOD             = 451,
-  GST_RTSP_STS_CONFERENCE_NOT_FOUND                 = 452,
-  GST_RTSP_STS_NOT_ENOUGH_BANDWIDTH                 = 453,
-  GST_RTSP_STS_SESSION_NOT_FOUND                    = 454,
-  GST_RTSP_STS_METHOD_NOT_VALID_IN_THIS_STATE       = 455,
-  GST_RTSP_STS_HEADER_FIELD_NOT_VALID_FOR_RESOURCE  = 456,
-  GST_RTSP_STS_INVALID_RANGE                        = 457,
-  GST_RTSP_STS_PARAMETER_IS_READONLY                = 458,
-  GST_RTSP_STS_AGGREGATE_OPERATION_NOT_ALLOWED      = 459,
-  GST_RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED     = 460,
-  GST_RTSP_STS_UNSUPPORTED_TRANSPORT                = 461,
-  GST_RTSP_STS_DESTINATION_UNREACHABLE              = 462,
-  GST_RTSP_STS_INTERNAL_SERVER_ERROR                = 500,
-  GST_RTSP_STS_NOT_IMPLEMENTED                      = 501,
-  GST_RTSP_STS_BAD_GATEWAY                          = 502,
-  GST_RTSP_STS_SERVICE_UNAVAILABLE                  = 503,
-  GST_RTSP_STS_GATEWAY_TIMEOUT                      = 504,
-  GST_RTSP_STS_RTSP_VERSION_NOT_SUPPORTED           = 505,
-  GST_RTSP_STS_OPTION_NOT_SUPPORTED                 = 551
-} GstRTSPStatusCode;
-
-gchar*             gst_rtsp_strresult          (GstRTSPResult result);
-
-const gchar*       gst_rtsp_method_as_text     (GstRTSPMethod method);
-const gchar*       gst_rtsp_version_as_text    (GstRTSPVersion version);
-const gchar*       gst_rtsp_header_as_text     (GstRTSPHeaderField field);
-const gchar*       gst_rtsp_status_as_text     (GstRTSPStatusCode code);
-
-gchar*             gst_rtsp_options_as_text    (GstRTSPMethod options);
-
-GstRTSPHeaderField gst_rtsp_find_header_field  (const gchar *header);
-GstRTSPMethod      gst_rtsp_find_method        (const gchar *method);
-
-gboolean           gst_rtsp_header_allow_multiple (GstRTSPHeaderField field);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_DEFS_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspextension.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspextension.h
deleted file mode 100644
index 66aa7ac7..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspextension.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GStreamer RTSP Extension
- * Copyright (C) 2007 Wim Taymans <wim@fluendo.com>
- *
- * gstrtspextension.h: RTSP Extension interface.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTSP_EXTENSION_H__
-#define __GST_RTSP_EXTENSION_H__
-
-#include <gst/gst.h>
-
-#include <gst/sdp/gstsdpmessage.h>
-#include <gst/rtsp/gstrtsptransport.h>
-#include <gst/rtsp/gstrtspmessage.h>
-#include <gst/rtsp/gstrtspurl.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_RTSP_EXTENSION \
-  (gst_rtsp_extension_get_type ())
-#define GST_RTSP_EXTENSION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_RTSP_EXTENSION, GstRTSPExtension))
-#define GST_IS_RTSP_EXTENSION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_RTSP_EXTENSION))
-#define GST_RTSP_EXTENSION_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_RTSP_EXTENSION, GstRTSPExtensionInterface))
-
-typedef struct _GstRTSPExtension GstRTSPExtension;
-typedef struct _GstRTSPExtensionInterface GstRTSPExtensionInterface;
-
-struct _GstRTSPExtensionInterface {
-  GTypeInterface parent;
-
-  /* vfunctions */
-  gboolean      (*detect_server)    (GstRTSPExtension *ext, GstRTSPMessage *resp);
-
-  GstRTSPResult (*before_send)      (GstRTSPExtension *ext, GstRTSPMessage *req);
-  GstRTSPResult (*after_send)       (GstRTSPExtension *ext, GstRTSPMessage *req, GstRTSPMessage *resp);
-
-  GstRTSPResult (*parse_sdp)        (GstRTSPExtension *ext, GstSDPMessage *sdp, GstStructure *s);
-  GstRTSPResult (*setup_media)      (GstRTSPExtension *ext, GstSDPMedia *media);
-
-  gboolean      (*configure_stream) (GstRTSPExtension *ext, GstCaps *caps);
-
-  GstRTSPResult (*get_transports)   (GstRTSPExtension *ext, GstRTSPLowerTrans protocols, gchar **transport);
-
-  GstRTSPResult (*stream_select)    (GstRTSPExtension *ext, GstRTSPUrl *url);
-
-  /* signals */
-  GstRTSPResult (*send)             (GstRTSPExtension *ext, GstRTSPMessage *req, GstRTSPMessage *resp);
-
-  /* ABI: more vfunctions added later */
-  GstRTSPResult (*receive_request)  (GstRTSPExtension *ext, GstRTSPMessage *req);
-
-  /*< private >*/
-  gpointer                 _gst_reserved[GST_PADDING];
-};
-
-GType           gst_rtsp_extension_get_type          (void);
-
-/* invoke vfunction on interface */
-gboolean        gst_rtsp_extension_detect_server     (GstRTSPExtension *ext, GstRTSPMessage *resp);
-
-GstRTSPResult   gst_rtsp_extension_before_send       (GstRTSPExtension *ext, GstRTSPMessage *req);
-GstRTSPResult   gst_rtsp_extension_after_send        (GstRTSPExtension *ext, GstRTSPMessage *req,
-                                                      GstRTSPMessage *resp);
-GstRTSPResult   gst_rtsp_extension_parse_sdp         (GstRTSPExtension *ext, GstSDPMessage *sdp,
-                                                      GstStructure *s);
-GstRTSPResult   gst_rtsp_extension_setup_media       (GstRTSPExtension *ext, GstSDPMedia *media);
-gboolean        gst_rtsp_extension_configure_stream  (GstRTSPExtension *ext, GstCaps *caps);
-GstRTSPResult   gst_rtsp_extension_get_transports    (GstRTSPExtension *ext, GstRTSPLowerTrans protocols,
-                                                      gchar **transport);
-GstRTSPResult   gst_rtsp_extension_stream_select     (GstRTSPExtension *ext, GstRTSPUrl *url);
-GstRTSPResult   gst_rtsp_extension_receive_request   (GstRTSPExtension *ext, GstRTSPMessage *req);
-
-/* signal emision */
-GstRTSPResult   gst_rtsp_extension_send              (GstRTSPExtension *ext, GstRTSPMessage *req,
-                                                      GstRTSPMessage *resp);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_EXTENSION_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspmessage.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspmessage.h
deleted file mode 100644
index b430ce29..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspmessage.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_MESSAGE_H__
-#define __GST_RTSP_MESSAGE_H__
-
-#include <glib.h>
-
-#include <gst/rtsp/gstrtspdefs.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTSPMsgType:
- * @GST_RTSP_MESSAGE_INVALID: invalid message type
- * @GST_RTSP_MESSAGE_REQUEST: RTSP request message
- * @GST_RTSP_MESSAGE_RESPONSE: RTSP response message
- * @GST_RTSP_MESSAGE_HTTP_REQUEST: HTTP request message.
- * @GST_RTSP_MESSAGE_HTTP_RESPONSE: HTTP response message.
- * @GST_RTSP_MESSAGE_DATA: data message
- *
- * The type of a message.
- */
-typedef enum
-{
-  GST_RTSP_MESSAGE_INVALID,
-  GST_RTSP_MESSAGE_REQUEST,
-  GST_RTSP_MESSAGE_RESPONSE,
-  GST_RTSP_MESSAGE_HTTP_REQUEST,
-  GST_RTSP_MESSAGE_HTTP_RESPONSE,
-  GST_RTSP_MESSAGE_DATA
-} GstRTSPMsgType;
-
-typedef struct _GstRTSPMessage GstRTSPMessage;
-
-/**
- * GstRTSPMessage:
- * @type: the message type
- *
- * An RTSP message containing request, response or data messages. Depending on
- * the @type, the appropriate structure may be accessed.
- */
-struct _GstRTSPMessage
-{
-  GstRTSPMsgType    type;
-
-  union {
-    struct {
-      GstRTSPMethod      method;
-      gchar             *uri;
-      GstRTSPVersion     version;
-    } request;
-    struct {
-      GstRTSPStatusCode  code;
-      gchar             *reason;
-      GstRTSPVersion     version;
-    } response;
-    struct {
-      guint8             channel;
-    } data;
-  } type_data;
-
-  /*< private >*/
-  GArray        *hdr_fields;
-
-  guint8        *body;
-  guint          body_size;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/* memory management */
-GstRTSPResult      gst_rtsp_message_new             (GstRTSPMessage **msg);
-GstRTSPResult      gst_rtsp_message_init            (GstRTSPMessage *msg);
-GstRTSPResult      gst_rtsp_message_unset           (GstRTSPMessage *msg);
-GstRTSPResult      gst_rtsp_message_free            (GstRTSPMessage *msg);
-
-GstRTSPMsgType     gst_rtsp_message_get_type        (GstRTSPMessage *msg);
-
-/* request */
-GstRTSPResult      gst_rtsp_message_new_request     (GstRTSPMessage **msg,
-                                                     GstRTSPMethod method,
-                                                     const gchar *uri);
-GstRTSPResult      gst_rtsp_message_init_request    (GstRTSPMessage *msg,
-                                                     GstRTSPMethod method,
-                                                     const gchar *uri);
-GstRTSPResult      gst_rtsp_message_parse_request   (GstRTSPMessage *msg,
-                                                     GstRTSPMethod *method,
-                                                     const gchar **uri,
-						     GstRTSPVersion *version);
-
-/* response */
-GstRTSPResult      gst_rtsp_message_new_response    (GstRTSPMessage **msg,
-                                                     GstRTSPStatusCode code,
-                                                     const gchar *reason,
-                                                     const GstRTSPMessage *request);
-GstRTSPResult      gst_rtsp_message_init_response   (GstRTSPMessage *msg,
-                                                     GstRTSPStatusCode code,
-                                                     const gchar *reason,
-                                                     const GstRTSPMessage *request);
-GstRTSPResult      gst_rtsp_message_parse_response  (GstRTSPMessage *msg,
-                                                     GstRTSPStatusCode *code,
-                                                     const gchar **reason,
-                                                     GstRTSPVersion *version);
-
-/* data */
-GstRTSPResult      gst_rtsp_message_new_data        (GstRTSPMessage **msg,
-                                                     guint8 channel);
-GstRTSPResult      gst_rtsp_message_init_data       (GstRTSPMessage *msg,
-                                                     guint8 channel);
-GstRTSPResult      gst_rtsp_message_parse_data      (GstRTSPMessage *msg,
-                                                     guint8 *channel);
-
-/* headers */
-GstRTSPResult      gst_rtsp_message_add_header      (GstRTSPMessage *msg,
-                                                     GstRTSPHeaderField field,
-                                                     const gchar *value);
-GstRTSPResult      gst_rtsp_message_take_header     (GstRTSPMessage *msg,
-                                                     GstRTSPHeaderField field,
-                                                     gchar *value);
-GstRTSPResult      gst_rtsp_message_remove_header   (GstRTSPMessage *msg,
-                                                     GstRTSPHeaderField field,
-                                                     gint indx);
-GstRTSPResult      gst_rtsp_message_get_header      (const GstRTSPMessage *msg,
-                                                     GstRTSPHeaderField field,
-                                                     gchar **value,
-                                                     gint indx);
-GstRTSPResult      gst_rtsp_message_append_headers  (const GstRTSPMessage *msg,
-                                                     GString *str);
-
-/* handling the body */
-GstRTSPResult      gst_rtsp_message_set_body        (GstRTSPMessage *msg,
-                                                     const guint8 *data,
-                                                     guint size);
-GstRTSPResult      gst_rtsp_message_take_body       (GstRTSPMessage *msg,
-                                                     guint8 *data,
-                                                     guint size);
-GstRTSPResult      gst_rtsp_message_get_body        (const GstRTSPMessage *msg,
-                                                     guint8 **data,
-                                                     guint *size);
-GstRTSPResult      gst_rtsp_message_steal_body      (GstRTSPMessage *msg,
-                                                     guint8 **data,
-                                                     guint *size);
-
-/* debug */
-GstRTSPResult      gst_rtsp_message_dump            (GstRTSPMessage *msg);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_MESSAGE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsprange.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsprange.h
deleted file mode 100644
index 6778fea8..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsprange.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_RANGE_H__
-#define __GST_RTSP_RANGE_H__
-
-#include <glib.h>
-
-#include <gst/rtsp/gstrtspdefs.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTSPRangeUnit:
- * @GST_RTSP_RANGE_SMPTE: SMPTE timecode
- * @GST_RTSP_RANGE_SMPTE_30_DROP: 29.97 frames per second
- * @GST_RTSP_RANGE_SMPTE_25: 25 frames per second
- * @GST_RTSP_RANGE_NPT: Normal play time
- * @GST_RTSP_RANGE_CLOCK: Absolute time expressed as ISO 8601 timestamps
- *
- * Different possible time range units.
- */
-typedef enum
-{
-  GST_RTSP_RANGE_SMPTE,
-  GST_RTSP_RANGE_SMPTE_30_DROP,
-  GST_RTSP_RANGE_SMPTE_25,
-  GST_RTSP_RANGE_NPT,
-  GST_RTSP_RANGE_CLOCK
-} GstRTSPRangeUnit;
-
-typedef struct _GstRTSPTimeRange GstRTSPTimeRange;
-typedef struct _GstRTSPTime GstRTSPTime;
-
-/**
- * GstRTSPTimeType:
- * @GST_RTSP_TIME_SECONDS: seconds
- * @GST_RTSP_TIME_NOW: now
- * @GST_RTSP_TIME_END: end
- *
- * Possible time types.
- */
-typedef enum {
-  GST_RTSP_TIME_SECONDS,
-  GST_RTSP_TIME_NOW,
-  GST_RTSP_TIME_END
-} GstRTSPTimeType;
-
-/**
- * GstRTSPTime:
- * @type: the time of the time
- * @seconds: seconds when @type is GST_RTSP_TIME_SECONDS
- *
- * A time indication.
- */
-struct _GstRTSPTime {
-  GstRTSPTimeType type;
-  gdouble         seconds;
-};
-
-/**
- * GstRTSPTimeRange:
- * @unit: the time units used
- * @min: the minimum interval
- * @max: the maximum interval
- *
- * A time range.
- */
-struct _GstRTSPTimeRange {
-  GstRTSPRangeUnit unit;
-
-  GstRTSPTime min;
-  GstRTSPTime max;
-};
-
-GstRTSPResult   gst_rtsp_range_parse        (const gchar *rangestr, GstRTSPTimeRange **range);
-gchar *         gst_rtsp_range_to_string    (const GstRTSPTimeRange *range);
-void            gst_rtsp_range_free         (GstRTSPTimeRange *range);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_RANGE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsptransport.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsptransport.h
deleted file mode 100644
index e971ef7b..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtsptransport.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_TRANSPORT_H__
-#define __GST_RTSP_TRANSPORT_H__
-
-#include <gst/gstconfig.h>
-#include <gst/rtsp/gstrtspdefs.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTSPTransMode:
- * @GST_RTSP_TRANS_UNKNOWN: invalid tansport mode
- * @GST_RTSP_TRANS_RTP: transfer RTP data
- * @GST_RTSP_TRANS_RDT: transfer RDT (RealMedia) data
- *
- * The transfer mode to use.
- */
-typedef enum {
-  GST_RTSP_TRANS_UNKNOWN =  0,
-  GST_RTSP_TRANS_RTP     = (1 << 0),
-  GST_RTSP_TRANS_RDT     = (1 << 1)
-} GstRTSPTransMode;
-
-/**
- * GstRTSPProfile:
- * @GST_RTSP_PROFILE_UNKNOWN: invalid profile
- * @GST_RTSP_PROFILE_AVP: the Audio/Visual profile
- * @GST_RTSP_PROFILE_SAVP: the secure Audio/Visual profile
- *
- * The transfer profile to use.
- */
-typedef enum {
-  GST_RTSP_PROFILE_UNKNOWN =  0,
-  GST_RTSP_PROFILE_AVP     = (1 << 0),
-  GST_RTSP_PROFILE_SAVP    = (1 << 1)
-} GstRTSPProfile;
-
-/**
- * GstRTSPLowerTrans:
- * @GST_RTSP_LOWER_TRANS_UNKNOWN: invalid transport flag
- * @GST_RTSP_LOWER_TRANS_UDP: stream data over UDP
- * @GST_RTSP_LOWER_TRANS_UDP_MCAST: stream data over UDP multicast
- * @GST_RTSP_LOWER_TRANS_TCP: stream data over TCP
- * @GST_RTSP_LOWER_TRANS_HTTP: stream data tunneled over HTTP.
- *
- * The different transport methods.
- */
-typedef enum {
-  GST_RTSP_LOWER_TRANS_UNKNOWN   = 0,
-  GST_RTSP_LOWER_TRANS_UDP       = (1 << 0),
-  GST_RTSP_LOWER_TRANS_UDP_MCAST = (1 << 1),
-  GST_RTSP_LOWER_TRANS_TCP       = (1 << 2),
-  GST_RTSP_LOWER_TRANS_HTTP      = (1 << 4)
-} GstRTSPLowerTrans;
-
-#define GST_TYPE_RTSP_LOWER_TRANS (gst_rtsp_lower_trans_get_type())
-GType gst_rtsp_lower_trans_get_type (void);
-
-typedef struct _GstRTSPRange GstRTSPRange;
-typedef struct _GstRTSPTransport GstRTSPTransport;
-
-/**
- * GstRTSPRange:
- * @min: minimum value of the range
- * @max: maximum value of the range
- *
- * A type to specify a range.
- */
-
-struct _GstRTSPRange {
-  gint min;
-  gint max;
-};
-
-/**
- * GstRTSPTransport:
- * @trans: the transport mode
- * @profile: the tansport profile
- * @lower_transport: the lower transport
- * @destination: the destination ip/hostname
- * @source: the source ip/hostname
- * @layers: the number of layers
- * @mode_play: if play mode was selected
- * @mode_record: if record mode was selected
- * @append: is append mode was selected
- * @interleaved: the interleave range
- * @ttl: the time to live for multicast UDP
- * @port: the port pair for multicast sessions
- * @client_port: the client port pair for receiving data
- * @server_port: the server port pair for receiving data
- * @ssrc: the ssrc that the sender/receiver will use
- *
- * A structure holding the RTSP transport values.
- */
-
-struct _GstRTSPTransport {
-  GstRTSPTransMode  trans;
-  GstRTSPProfile    profile;
-  GstRTSPLowerTrans lower_transport;
-
-  gchar         *destination;
-  gchar         *source;
-  guint          layers;
-  gboolean       mode_play;
-  gboolean       mode_record;
-  gboolean       append;
-  GstRTSPRange   interleaved;
-
-  /* multicast specific */
-  guint  ttl;
-
-  /* UDP specific */
-  GstRTSPRange   port;
-  GstRTSPRange   client_port;
-  GstRTSPRange   server_port;
-  /* RTP specific */
-  guint          ssrc;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GstRTSPResult      gst_rtsp_transport_new          (GstRTSPTransport **transport);
-GstRTSPResult      gst_rtsp_transport_init         (GstRTSPTransport *transport);
-
-GstRTSPResult      gst_rtsp_transport_parse        (const gchar *str, GstRTSPTransport *transport);
-gchar*             gst_rtsp_transport_as_text      (GstRTSPTransport *transport);
-
-GstRTSPResult      gst_rtsp_transport_get_mime     (GstRTSPTransMode trans, const gchar **mime);
-GstRTSPResult      gst_rtsp_transport_get_manager  (GstRTSPTransMode trans, const gchar **manager, guint option);
-
-GstRTSPResult      gst_rtsp_transport_free         (GstRTSPTransport *transport);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_TRANSPORT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspurl.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspurl.h
deleted file mode 100644
index 61b2dfaa..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/rtsp/gstrtspurl.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_URL_H__
-#define __GST_RTSP_URL_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <gst/rtsp/gstrtspdefs.h>
-#include <gst/rtsp/gstrtsptransport.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_RTSP_DEFAULT_PORT:
- *
- * The default RTSP port to connect to.
- */
-#define GST_RTSP_DEFAULT_PORT       554
-
-#define GST_TYPE_RTSP_URL  (gst_rtsp_url_get_type())
-
-typedef struct _GstRTSPUrl GstRTSPUrl;
-
-/**
- * GstRTSPUrl:
- * @transports: the transports allowed
- * @family: the family
- * @user: the user
- * @passwd: the password
- * @host: the host
- * @port: the port
- * @abspath: the absolute path
- * @query: additional query parameters
- *
- * This structure contains the result of a parsed RTSP URL
- */
-struct _GstRTSPUrl {
-  GstRTSPLowerTrans  transports;
-  GstRTSPFamily      family;
-  gchar             *user;
-  gchar             *passwd;
-  gchar             *host;
-  guint16            port;
-  gchar             *abspath;
-  gchar             *query;
-};
-
-GType gst_rtsp_url_get_type (void);
-
-GstRTSPResult      gst_rtsp_url_parse           (const gchar *urlstr, GstRTSPUrl **url);
-GstRTSPUrl*        gst_rtsp_url_copy            (const GstRTSPUrl *url);
-void               gst_rtsp_url_free            (GstRTSPUrl *url);
-gchar*             gst_rtsp_url_get_request_uri (const GstRTSPUrl *url);
-gchar**            gst_rtsp_url_decode_path_components
-                                                (const GstRTSPUrl *url);
-
-GstRTSPResult      gst_rtsp_url_set_port        (GstRTSPUrl *url, guint16 port);
-GstRTSPResult      gst_rtsp_url_get_port        (const GstRTSPUrl *url, guint16 *port);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_URL_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/sdp/gstsdp.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/sdp/gstsdp.h
deleted file mode 100644
index 3dbd86d2..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/sdp/gstsdp.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_SDP_H__
-#define __GST_SDP_H__
-
-/**
- * GstSDPResult:
- * @GST_SDP_OK: A successful return value
- * @GST_SDP_EINVAL: a function was given invalid parameters
- *
- * Return values for the SDP functions.
- */
-typedef enum {
-  GST_SDP_OK     = 0,
-  GST_SDP_EINVAL = -1
-} GstSDPResult;
-
-#endif /* __GST_SDP_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/sdp/gstsdpmessage.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/sdp/gstsdpmessage.h
deleted file mode 100644
index d1e65ddb..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/sdp/gstsdpmessage.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_SDP_MESSAGE_H__
-#define __GST_SDP_MESSAGE_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-#include <gst/sdp/gstsdp.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstSDPOrigin:
- * @username: the user's login on the originating host, or it is "-"
- *    if the originating host does not support the concept of user ids.
- * @sess_id: is a numeric string such that the tuple of @username, @sess_id,
- *    @nettype, @addrtype and @addr form a globally unique identifier for the
- *    session.
- * @sess_version: a version number for this announcement
- * @nettype: the type of network. "IN" is defined to have the meaning
- *    "Internet".
- * @addrtype: the type of @addr.
- * @addr: the globally unique address of the machine from which the session was
- *     created.
- *
- * The contents of the SDP "o=" field which gives the originator of the session
- * (their username and the address of the user's host) plus a session id and
- * session version number.
- */
-typedef struct {
-  gchar *username;
-  gchar *sess_id;
-  gchar *sess_version;
-  gchar *nettype;
-  gchar *addrtype;
-  gchar *addr;
-} GstSDPOrigin;
-
-/**
- * GstSDPConnection:
- * @nettype: the type of network. "IN" is defined to have the meaning
- *    "Internet".
- * @addrtype: the type of @address.
- * @address: the address
- * @ttl: the time to live of the address
- * @addr_number: the number of layers
- *
- * The contents of the SDP "c=" field which contains connection data.
- */
-typedef struct {
-  gchar *nettype;
-  gchar *addrtype;
-  gchar *address;
-  guint  ttl;
-  guint  addr_number;
-} GstSDPConnection;
-
-/**
- * GST_SDP_BWTYPE_CT:
- *
- * The Conference Total bandwidth modifier.
- */
-#define GST_SDP_BWTYPE_CT               "CT"
-/**
- * GST_SDP_BWTYPE_AS:
- *
- * The Application-Specific Maximum bandwidth modifier.
- */
-#define GST_SDP_BWTYPE_AS               "AS"
-/**
- * GST_SDP_BWTYPE_EXT_PREFIX:
- *
- * The extension prefix bandwidth modifier.
- */
-#define GST_SDP_BWTYPE_EXT_PREFIX       "X-"
-
-/**
- * GST_SDP_BWTYPE_RS:
- *
- * RTCP bandwidth allocated to active data senders (RFC 3556).
- */
-#define GST_SDP_BWTYPE_RS               "RS"
-/**
- * GST_SDP_BWTYPE_RR:
- *
- * RTCP bandwidth allocated to data receivers (RFC 3556).
- */
-#define GST_SDP_BWTYPE_RR               "RR"
-/**
- * GST_SDP_BWTYPE_TIAS:
- *
- * Transport Independent Application Specific Maximum bandwidth (RFC 3890).
- */
-#define GST_SDP_BWTYPE_TIAS             "TIAS"
-
-
-/**
- * GstSDPBandwidth:
- * @bwtype: the bandwidth modifier type
- * @bandwidth: the bandwidth in kilobits per second
- *
- * The contents of the SDP "b=" field which specifies the proposed bandwidth to
- * be used by the session or media.
- */
-typedef struct {
-  gchar *bwtype;
-  guint  bandwidth;
-} GstSDPBandwidth;
-
-/**
- * GstSDPTime:
- * @start: start time for the conference. The value is the decimal
- *     representation of Network Time Protocol (NTP) time values in seconds
- * @stop: stop time for the conference. The value is the decimal
- *     representation of Network Time Protocol (NTP) time values in seconds
- * @repeat: repeat times for a session
- *
- * The contents of the SDP "t=" field which specify the start and stop times for
- * a conference session.
- */
-typedef struct {
-  gchar  *start;
-  gchar  *stop;
-  GArray *repeat;
-} GstSDPTime;
-
-/**
- * GstSDPZone:
- * @time: the NTP time that a time zone adjustment happens
- * @typed_time: the offset from the time when the session was first scheduled
- *
- * The contents of the SDP "z=" field which allows the sender to
- * specify a list of time zone adjustments and offsets from the base
- * time.
- */
-typedef struct {
-  gchar *time;
-  gchar *typed_time;
-} GstSDPZone;
-
-/**
- * GstSDPKey:
- * @type: the encryption type
- * @data: the encryption data
- *
- * The contents of the SDP "k=" field which is used to convey encryption
- * keys.
- */
-typedef struct {
-  gchar *type;
-  gchar *data;
-} GstSDPKey;
-
-/**
- * GstSDPAttribute:
- * @key: the attribute key
- * @value: the attribute value or NULL when it was a property attribute
- *
- * The contents of the SDP "a=" field which contains a key/value pair.
- */
-typedef struct {
-  gchar *key;
-  gchar *value;
-} GstSDPAttribute;
-
-/**
- * GstSDPMedia:
- * @media: the media type
- * @port: the transport port to which the media stream will be sent
- * @num_ports: the number of ports or -1 if only one port was specified
- * @proto: the transport protocol
- * @fmts: an array of #gchar formats
- * @information: the media title
- * @connections: array of #GstSDPConnection with media connection information
- * @bandwidths: array of #GstSDPBandwidth with media bandwidth information
- * @key: the encryption key
- * @attributes: array of #GstSDPAttribute with the additional media attributes
- *
- * The contents of the SDP "m=" field with all related fields.
- */
-typedef struct {
-  gchar            *media;
-  guint             port;
-  guint             num_ports;
-  gchar            *proto;
-  GArray           *fmts;
-  gchar            *information;
-  GArray           *connections;
-  GArray           *bandwidths;
-  GstSDPKey         key;
-  GArray           *attributes;
-} GstSDPMedia;
-
-/**
- * GstSDPMessage:
- * @version: the protocol version
- * @origin: owner/creator and session identifier
- * @session_name: session name
- * @information: session information
- * @uri: URI of description
- * @emails: array of #gchar with email addresses
- * @phones: array of #gchar with phone numbers
- * @connection: connection information for the session
- * @bandwidths: array of #GstSDPBandwidth with bandwidth information
- * @times: array of #GstSDPTime with time descriptions
- * @zones: array of #GstSDPZone with time zone adjustments
- * @key: encryption key
- * @attributes: array of #GstSDPAttribute with session attributes
- * @medias: array of #GstSDPMedia with media descriptions
- *
- * The contents of the SDP message.
- */
-typedef struct {
-  gchar            *version;
-  GstSDPOrigin      origin;
-  gchar            *session_name;
-  gchar            *information;
-  gchar            *uri;
-  GArray           *emails;
-  GArray           *phones;
-  GstSDPConnection  connection;
-  GArray           *bandwidths;
-  GArray           *times;
-  GArray           *zones;
-  GstSDPKey         key;
-  GArray           *attributes;
-  GArray           *medias;
-} GstSDPMessage;
-
-/* Session descriptions */
-GstSDPResult            gst_sdp_message_new                 (GstSDPMessage **msg);
-GstSDPResult            gst_sdp_message_init                (GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_uninit              (GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_free                (GstSDPMessage *msg);
-
-GstSDPResult            gst_sdp_message_parse_buffer        (const guint8 *data, guint size, GstSDPMessage *msg);
-gchar*                  gst_sdp_message_as_text             (const GstSDPMessage *msg);
-
-/* convert from/to uri */
-GstSDPResult            gst_sdp_message_parse_uri           (const gchar *uri, GstSDPMessage *msg);
-gchar*                  gst_sdp_message_as_uri              (const gchar *scheme, const GstSDPMessage *msg);
-
-/* utils */
-gboolean                gst_sdp_address_is_multicast        (const gchar *nettype, const gchar *addrtype,
-                                                             const gchar *addr);
-/* v=.. */
-const gchar*            gst_sdp_message_get_version         (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_version         (GstSDPMessage *msg, const gchar *version);
-
-/* o=<username> <sess-id> <sess-version> <nettype> <addrtype> <unicast-address> */
-const GstSDPOrigin*     gst_sdp_message_get_origin          (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_origin          (GstSDPMessage *msg, const gchar *username,
-                                                             const gchar *sess_id, const gchar *sess_version,
-                                                             const gchar *nettype, const gchar *addrtype,
-                                                             const gchar *addr);
-
-/* s=<session name> */
-const gchar*            gst_sdp_message_get_session_name    (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_session_name    (GstSDPMessage *msg, const gchar *session_name);
-
-/* i=<session description> */
-const gchar*            gst_sdp_message_get_information     (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_information     (GstSDPMessage *msg, const gchar *information);
-
-/* u=<uri> */
-const gchar*            gst_sdp_message_get_uri             (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_uri             (GstSDPMessage *msg, const gchar *uri);
-
-/* e=<email-address> */
-guint                   gst_sdp_message_emails_len          (const GstSDPMessage *msg);
-const gchar*            gst_sdp_message_get_email           (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_email           (GstSDPMessage *msg, const gchar *email);
-
-/* p=<phone-number> */
-guint                   gst_sdp_message_phones_len          (const GstSDPMessage *msg);
-const gchar*            gst_sdp_message_get_phone           (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_phone           (GstSDPMessage *msg, const gchar *phone);
-
-/* c=<nettype> <addrtype> <connection-address>[/<ttl>][/<number of addresses>] */
-const GstSDPConnection* gst_sdp_message_get_connection      (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_connection      (GstSDPMessage *msg, const gchar *nettype,
-                                                             const gchar *addrtype, const gchar *address,
-                                                             guint ttl, guint addr_number);
-/* b=<bwtype>:<bandwidth> */
-guint                   gst_sdp_message_bandwidths_len      (const GstSDPMessage *msg);
-const GstSDPBandwidth*  gst_sdp_message_get_bandwidth       (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_bandwidth       (GstSDPMessage *msg, const gchar *bwtype,
-                                                             guint bandwidth);
-/* t=<start-time> <stop-time> and
- * r=<repeat interval> <active duration> <offsets from start-time> */
-guint                   gst_sdp_message_times_len           (const GstSDPMessage *msg);
-const GstSDPTime*       gst_sdp_message_get_time            (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_time            (GstSDPMessage *msg, const gchar *start, const gchar *stop, const gchar **repeat);
-
-/* z=<adjustment time> <offset> <adjustment time> <offset> .... */
-guint                   gst_sdp_message_zones_len           (const GstSDPMessage *msg);
-const GstSDPZone*       gst_sdp_message_get_zone            (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_zone            (GstSDPMessage *msg, const gchar *adj_time,
-                                                             const gchar *typed_time);
-
-/* k=<method>[:<encryption key>] */
-const GstSDPKey*        gst_sdp_message_get_key             (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_key             (GstSDPMessage *msg, const gchar *type,
-                                                             const gchar *data);
-/* a=... */
-guint                   gst_sdp_message_attributes_len      (const GstSDPMessage *msg);
-const GstSDPAttribute*  gst_sdp_message_get_attribute       (const GstSDPMessage *msg, guint idx);
-const gchar*            gst_sdp_message_get_attribute_val   (const GstSDPMessage *msg, const gchar *key);
-const gchar*            gst_sdp_message_get_attribute_val_n (const GstSDPMessage *msg, const gchar *key,
-                                                             guint nth);
-GstSDPResult            gst_sdp_message_add_attribute       (GstSDPMessage *msg, const gchar *key,
-                                                             const gchar *value);
-
-/* m=.. sections */
-guint                   gst_sdp_message_medias_len          (const GstSDPMessage *msg);
-const GstSDPMedia*      gst_sdp_message_get_media           (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_media           (GstSDPMessage *msg, GstSDPMedia *media);
-
-GstSDPResult            gst_sdp_message_dump                (const GstSDPMessage *msg);
-
-/* Media descriptions */
-GstSDPResult            gst_sdp_media_new                   (GstSDPMedia **media);
-GstSDPResult            gst_sdp_media_init                  (GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_uninit                (GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_free                  (GstSDPMedia *media);
-
-gchar*                  gst_sdp_media_as_text               (const GstSDPMedia *media);
-
-/* m=<media> <port>/<number of ports> <proto> <fmt> ... */
-const gchar*            gst_sdp_media_get_media             (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_media             (GstSDPMedia *media, const gchar *med);
-
-guint                   gst_sdp_media_get_port              (const GstSDPMedia *media);
-guint                   gst_sdp_media_get_num_ports         (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_port_info         (GstSDPMedia *media, guint port,
-                                                             guint num_ports);
-
-const gchar*            gst_sdp_media_get_proto             (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_proto             (GstSDPMedia *media, const gchar *proto);
-
-guint                   gst_sdp_media_formats_len           (const GstSDPMedia *media);
-const gchar*            gst_sdp_media_get_format            (const GstSDPMedia *media, guint idx);
-GstSDPResult            gst_sdp_media_add_format            (GstSDPMedia *media, const gchar *format);
-
-/* i=<session description> */
-const gchar*            gst_sdp_media_get_information       (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_information       (GstSDPMedia *media, const gchar *information);
-
-/* c=<nettype> <addrtype> <connection-address>[/<ttl>][/<number of addresses>] */
-guint                   gst_sdp_media_connections_len       (const GstSDPMedia *media);
-const GstSDPConnection* gst_sdp_media_get_connection        (const GstSDPMedia *media, guint idx);
-GstSDPResult            gst_sdp_media_add_connection        (GstSDPMedia *media, const gchar *nettype,
-                                                             const gchar *addrtype, const gchar *address,
-                                                             guint ttl, guint addr_number);
-
-/* b=<bwtype>:<bandwidth> */
-guint                   gst_sdp_media_bandwidths_len        (const GstSDPMedia *media);
-const GstSDPBandwidth*  gst_sdp_media_get_bandwidth         (const GstSDPMedia *media, guint idx);
-GstSDPResult            gst_sdp_media_add_bandwidth         (GstSDPMedia *media, const gchar *bwtype,
-                                                             guint bandwidth);
-
-/* k=<method>:<encryption key> */
-const GstSDPKey*        gst_sdp_media_get_key               (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_key               (GstSDPMedia *media, const gchar *type,
-                                                             const gchar *data);
-/* a=... */
-guint                   gst_sdp_media_attributes_len        (const GstSDPMedia *media);
-const GstSDPAttribute * gst_sdp_media_get_attribute         (const GstSDPMedia *media, guint idx);
-const gchar*            gst_sdp_media_get_attribute_val     (const GstSDPMedia *media, const gchar *key);
-const gchar*            gst_sdp_media_get_attribute_val_n   (const GstSDPMedia *media, const gchar *key,
-                                                             guint nth);
-GstSDPResult            gst_sdp_media_add_attribute         (GstSDPMedia *media, const gchar *key,
-                                                             const gchar *value);
-
-G_END_DECLS
-
-#endif /* __GST_SDP_MESSAGE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/signalprocessor/gstsignalprocessor.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/signalprocessor/gstsignalprocessor.h
deleted file mode 100644
index 05dd3dee..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/signalprocessor/gstsignalprocessor.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstsignalprocessor.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_SIGNAL_PROCESSOR_H__
-#define __GST_SIGNAL_PROCESSOR_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-
-typedef enum 
-{
-  GST_SIGNAL_PROCESSOR_CLASS_FLAG_CAN_PROCESS_IN_PLACE = 1<<0
-} GstSignalProcessorClassFlags;
-
-#define GST_SIGNAL_PROCESSOR_CLASS_CAN_PROCESS_IN_PLACE(klass)		\
-  (GST_SIGNAL_PROCESSOR_CLASS (klass)->flags & 				\
-   GST_SIGNAL_PROCESSOR_CLASS_FLAG_CAN_PROCESS_IN_PLACE)
-#define GST_SIGNAL_PROCESSOR_CLASS_SET_CAN_PROCESS_IN_PLACE(klass)	\
-  GST_SIGNAL_PROCESSOR_CLASS (klass)->flags |=				\
-    GST_SIGNAL_PROCESSOR_CLASS_FLAG_CAN_PROCESS_IN_PLACE
-
-typedef enum 
-{
-  GST_SIGNAL_PROCESSOR_STATE_NULL,
-  GST_SIGNAL_PROCESSOR_STATE_INITIALIZED,
-  GST_SIGNAL_PROCESSOR_STATE_RUNNING
-} GstSignalProcessorState;
-
-
-#define GST_TYPE_SIGNAL_PROCESSOR            (gst_signal_processor_get_type())
-#define GST_SIGNAL_PROCESSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessor))
-#define GST_SIGNAL_PROCESSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessorClass))
-#define GST_SIGNAL_PROCESSOR_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessorClass))
-#define GST_IS_SIGNAL_PROCESSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SIGNAL_PROCESSOR))
-#define GST_IS_SIGNAL_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SIGNAL_PROCESSOR))
-
-#define GST_SIGNAL_PROCESSOR_IS_INITIALIZED(obj) \
-  (GST_SIGNAL_PROCESSOR (obj)->state >= GST_SIGNAL_PROCESSOR_STATE_INITIALIZED)
-#define GST_SIGNAL_PROCESSOR_IS_RUNNING(obj) \
-  (GST_SIGNAL_PROCESSOR (obj)->state == GST_SIGNAL_PROCESSOR_STATE_RUNNING)
-
-typedef struct _GstSignalProcessorGroup GstSignalProcessorGroup;
-typedef struct _GstSignalProcessor GstSignalProcessor;
-typedef struct _GstSignalProcessorClass GstSignalProcessorClass;
-
-
-struct _GstSignalProcessorGroup {
-  guint channels; /**< Number of channels in buffers */
-  guint nframes; /**< Number of frames currently allocated per channel */
-  GstMapInfo interleaved_map; /**< Interleaved buffer (c1c2c1c2...)*/
-  gfloat *buffer; /**< De-interleaved buffer (c1c1...c2c2...) */
-};
-
-struct _GstSignalProcessor {
-  GstElement     element;
-
-  /* state */
-  GstCaps *caps;
-  GstSignalProcessorState state;
-  GstFlowReturn flow_state;
-  GstPadMode mode;
-
-  /* pending inputs before processing can take place */
-  guint pending_in;
-  /* pending outputs to be filled */
-  guint pending_out;
-
-  /* multi-channel signal pads */
-  GstSignalProcessorGroup *group_in;
-  GstSignalProcessorGroup *group_out;
-
-  /* single channel signal pads */
-  GstMapInfo *audio_in;
-  GstMapInfo *audio_out;
-
-  /* sampling rate */
-  gint sample_rate;
-
-};
-
-struct _GstSignalProcessorClass {
-  GstElementClass parent_class;
-
-  /*< public >*/
-  guint num_group_in;
-  guint num_group_out;
-  guint num_audio_in;
-  guint num_audio_out;
-
-  guint flags;
-
-  /* virtual methods for subclasses */
-
-  gboolean      (*setup)        (GstSignalProcessor *self, GstCaps *caps);
-  gboolean      (*start)        (GstSignalProcessor *self);
-  void          (*stop)         (GstSignalProcessor *self);
-  void          (*cleanup)      (GstSignalProcessor *self);
-  void          (*process)      (GstSignalProcessor *self, guint num_frames);
-  gboolean      (*event)        (GstSignalProcessor *self, GstEvent *event);
-};
-
-
-GType gst_signal_processor_get_type (void);
-void gst_signal_processor_class_add_pad_template (GstSignalProcessorClass *klass,
-    const gchar *name, GstPadDirection direction, guint index, guint channels);
-
-
-
-G_END_DECLS
-
-
-#endif /* __GST_SIGNAL_PROCESSOR_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/gsttagdemux.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/gsttagdemux.h
deleted file mode 100644
index ba49447a..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/gsttagdemux.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GStreamer Base Class for Tag Demuxing
- * Copyright (C) 2005  Jan Schmidt <thaytan@mad.scientist.com>
- * Copyright (C) 2006  Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TAG_DEMUX_H__
-#define __GST_TAG_DEMUX_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_DEMUX            (gst_tag_demux_get_type())
-#define GST_TAG_DEMUX(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TAG_DEMUX,GstTagDemux))
-#define GST_TAG_DEMUX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TAG_DEMUX,GstTagDemuxClass))
-#define GST_IS_TAG_DEMUX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TAG_DEMUX))
-#define GST_IS_TAG_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TAG_DEMUX))
-
-typedef struct _GstTagDemux        GstTagDemux;
-typedef struct _GstTagDemuxClass   GstTagDemuxClass;
-typedef struct _GstTagDemuxPrivate GstTagDemuxPrivate;
-
-/**
- * GstTagDemuxResult:
- * @GST_TAG_DEMUX_RESULT_BROKEN_TAG: cannot parse tag, just skip it
- * @GST_TAG_DEMUX_RESULT_AGAIN     : call again with less or more data
- * @GST_TAG_DEMUX_RESULT_OK	   : parsed tag successfully
- *
- * Result values from the parse_tag virtual function.
- */
-typedef enum {
-  GST_TAG_DEMUX_RESULT_BROKEN_TAG,
-  GST_TAG_DEMUX_RESULT_AGAIN,
-  GST_TAG_DEMUX_RESULT_OK
-} GstTagDemuxResult;
-
-GType gst_tag_demux_result_get_type (void);
-#define GST_TYPE_TAG_DEMUX_RESULT (gst_tag_demux_result_get_type())
-
-/**
- * GstTagDemux:
- * @element: parent element
- *
- * Opaque #GstTagDemux structure.
- */
-struct _GstTagDemux
-{
-  GstElement element;
-
-  /*< private >*/
-  GstTagDemuxPrivate  *priv;
-
-  gpointer             reserved[GST_PADDING];
-};
-
-/**
- * GstTagDemuxClass:
- * @parent_class: the parent class.
- * @min_start_size: minimum size required to identify a tag at the start and
- * determine its total size. Set to 0 if not interested in start tags.
- * Subclasses should set this in their class_init function.
- * @min_end_size: minimum size required to identify a tag at the end and
- * determine its total size. Set to 0 if not interested in end tags.
- * Subclasses should set this in their class_init function.
- * @identify_tag: identify tag and determine the size required to parse the
- * tag. Buffer may be larger than the specified minimum size.
- * Subclassed MUST override this vfunc in their class_init function.
- * @parse_tag: parse the tag. Buffer will be exactly of the size determined by
- * the identify_tag vfunc before. The parse_tag vfunc may change the size
- * stored in *tag_size and return GST_TAG_DEMUX_RESULT_AGAIN to request a
- * larger or smaller buffer. It is also permitted to adjust the tag_size to a
- * smaller value and then return GST_TAG_DEMUX_RESULT_OK in one go.
- * Subclassed MUST override the parse_tag vfunc in their class_init function.
- * @merge_tags: merge start and end tags. Subclasses may want to override this
- * vfunc to allow prioritising of start or end tag according to user
- * preference.  Note that both start_tags and end_tags may be NULL. By default
- * start tags are prefered over end tags.
- *
- * The #GstTagDemuxClass structure.  See documentation at beginning of section
- * for details about what subclasses need to override and do.
- */
-struct _GstTagDemuxClass
-{
-  GstElementClass parent_class;
-
-  /* minimum size required to identify a tag at the start and determine
-   * its total size */
-  guint                  min_start_size;
-
-  /* minimum size required to identify a tag at the end and determine
-   * its total size */
-  guint                  min_end_size;
-
-  /* vtable */
-
-  /* identify tag and determine the size required to parse the tag */
-  gboolean               (*identify_tag)  (GstTagDemux * demux,
-                                           GstBuffer   * buffer,
-                                           gboolean      start_tag,
-                                           guint       * tag_size);
-
-  /* parse the tag once it is identified and its size is known */
-  GstTagDemuxResult      (*parse_tag)     (GstTagDemux * demux,
-                                           GstBuffer   * buffer,
-                                           gboolean      start_tag,
-                                           guint       * tag_size,
-                                           GstTagList ** tags);
-
-  /* merge start and end tags (optional) */
-  GstTagList *           (*merge_tags)    (GstTagDemux      * demux,
-                                           const GstTagList * start_tags,
-                                           const GstTagList * end_tags);
-
-  /*< private >*/
-  gpointer               reserved[GST_PADDING];
-};
-
-GType     gst_tag_demux_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_TAG_DEMUX_H__ */
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/gsttagmux.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/gsttagmux.h
deleted file mode 100644
index 8b103e06..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/gsttagmux.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GStreamer tag muxer base class
- * Copyright (C) 2006 Christophe Fergeau  <teuf@gnome.org>
- * Copyright (C) 2006,2011 Tim-Philipp Müller <tim centricular net>
- * Copyright (C) 2009 Pioneers of the Inevitable <songbird@songbirdnest.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GST_TAG_MUX_H
-#define GST_TAG_MUX_H
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_MUX \
-  (gst_tag_mux_get_type())
-#define GST_TAG_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TAG_MUX,GstTagMux))
-#define GST_TAG_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TAG_MUX,GstTagMuxClass))
-#define GST_IS_TAG_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TAG_MUX))
-#define GST_IS_TAG_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TAG_MUX))
-
-typedef struct _GstTagMux GstTagMux;
-typedef struct _GstTagMuxClass GstTagMuxClass;
-typedef struct _GstTagMuxPrivate GstTagMuxPrivate;
-
-/**
- * GstTagMux:
- * @element: parent element
- *
- * Opaque #GstTagMux structure.
- */
-struct _GstTagMux {
-  GstElement    element;
-
-  /*< private >*/
-  GstTagMuxPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstTagMuxClass:
- * @parent_class: the parent class.
- * @render_start_tag: create a tag buffer to add to the beginning of the
- *     input stream given a tag list, or NULL
- * @render_end_tag: create a tag buffer to add to the end of the
- *     input stream given a tag list, or NULL
- *
- * The #GstTagMuxClass structure. Subclasses need to override at least one
- * of the two render vfuncs.
- */
-struct _GstTagMuxClass {
-  GstElementClass parent_class;
-
-  /* vfuncs */
-  GstBuffer  * (*render_start_tag) (GstTagMux * mux, const GstTagList * tag_list);
-  GstBuffer  * (*render_end_tag)   (GstTagMux * mux, const GstTagList * tag_list);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_tag_mux_get_type (void);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/tag.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/tag.h
deleted file mode 100644
index b75ad6ea..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/tag.h
+++ /dev/null
@@ -1,591 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- * Copyright (C) 2006-2011 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TAG_TAG_H__
-#define __GST_TAG_TAG_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/* Tag names */
-
-/**
- * GST_TAG_MUSICBRAINZ_TRACKID:
- *
- * MusicBrainz track ID
- */
-#define GST_TAG_MUSICBRAINZ_TRACKID	"musicbrainz-trackid"
-/**
- * GST_TAG_MUSICBRAINZ_ARTISTID:
- *
- * MusicBrainz artist ID
- */
-#define GST_TAG_MUSICBRAINZ_ARTISTID	"musicbrainz-artistid"
-/**
- * GST_TAG_MUSICBRAINZ_ALBUMID:
- *
- * MusicBrainz album ID
- */
-#define GST_TAG_MUSICBRAINZ_ALBUMID	"musicbrainz-albumid"
-/**
- * GST_TAG_MUSICBRAINZ_ALBUMARTISTID:
- *
- * MusicBrainz album artist ID
- */
-#define GST_TAG_MUSICBRAINZ_ALBUMARTISTID	"musicbrainz-albumartistid"
-/**
- * GST_TAG_MUSICBRAINZ_TRMID:
- *
- * MusicBrainz track TRM ID
- */
-#define GST_TAG_MUSICBRAINZ_TRMID	"musicbrainz-trmid"
-
-/**
- * GST_TAG_CMML_STREAM:
- *
- * Annodex CMML stream element tag
- */
-#define GST_TAG_CMML_STREAM "cmml-stream"
-/**
- * GST_TAG_CMML_HEAD:
- *
- * Annodex CMML head element tag
- */
-
-#define GST_TAG_CMML_HEAD "cmml-head"
-/**
- * GST_TAG_CMML_CLIP:
- *
- * Annodex CMML clip element tag
- */
-#define GST_TAG_CMML_CLIP "cmml-clip"
-
-/* CDDA tags */
-
-/**
- * GST_TAG_CDDA_CDDB_DISCID:
- *
- * CDDB disc id in its short form (e.g. 'aa063d0f')
- */
-#define GST_TAG_CDDA_CDDB_DISCID              "discid"
-
-/**
- * GST_TAG_CDDA_CDDB_DISCID_FULL:
- *
- * CDDB disc id including all details
- */
-#define GST_TAG_CDDA_CDDB_DISCID_FULL         "discid-full"
-
-/**
- * GST_TAG_CDDA_MUSICBRAINZ_DISCID:
- *
- * Musicbrainz disc id (e.g. 'ahg7JUcfR3vCYBphSDIogOOWrr0-')
- */
-#define GST_TAG_CDDA_MUSICBRAINZ_DISCID       "musicbrainz-discid"
-
-/**
- * GST_TAG_CDDA_MUSICBRAINZ_DISCID_FULL:
- *
- * Musicbrainz disc id details
- */
-#define GST_TAG_CDDA_MUSICBRAINZ_DISCID_FULL  "musicbrainz-discid-full"
-
-/**
- * GST_TAG_CAPTURING_SHUTTER_SPEED:
- *
- * Shutter speed used when capturing an image, in seconds. (fraction)
- */
-#define GST_TAG_CAPTURING_SHUTTER_SPEED        "capturing-shutter-speed"
-
-/**
- * GST_TAG_CAPTURING_FOCAL_RATIO:
- *
- * Focal ratio (f-number) used when capturing an image. (double)
- *
- * The value stored is the denominator of the focal ratio (f-number).
- * For example, if this tag value is 2, the focal ratio is f/2.
- */
-#define GST_TAG_CAPTURING_FOCAL_RATIO          "capturing-focal-ratio"
-
-/**
- * GST_TAG_CAPTURING_FOCAL_LENGTH:
- *
- * Focal length used when capturing an image, in mm. (double)
- */
-#define GST_TAG_CAPTURING_FOCAL_LENGTH         "capturing-focal-length"
-
-/**
- * GST_TAG_CAPTURING_DIGITAL_ZOOM_RATIO:
- *
- * Digital zoom ratio used when capturing an image. (double)
- */
-#define GST_TAG_CAPTURING_DIGITAL_ZOOM_RATIO   "capturing-digital-zoom-ratio"
-
-/**
- * GST_TAG_CAPTURING_ISO_SPEED:
- *
- * ISO speed used when capturing an image. (integer)
- */
-#define GST_TAG_CAPTURING_ISO_SPEED           "capturing-iso-speed"
-
-/**
- * GST_TAG_CAPTURING_EXPOSURE_PROGRAM:
- *
- * Type of exposure control used when capturing an image. (string)
- *
- * The allowed values are:
- *   "undefined"
- *   "manual"
- *   "normal" - automatically controlled
- *   "aperture-priority" - user selects aperture value
- *   "shutter-priority" - user selects shutter speed
- *   "creative" - biased towards depth of field
- *   "action" - biased towards fast shutter speed
- *   "portrait" - closeup, leaving background out of focus
- *   "landscape" - landscape photos, background in focus
- */
-#define GST_TAG_CAPTURING_EXPOSURE_PROGRAM     "capturing-exposure-program"
-
-/**
- * GST_TAG_CAPTURING_EXPOSURE_MODE:
- *
- * Exposure mode used when capturing an image. (string)
- *
- * The allowed values are:
- *   "auto-exposure"
- *   "manual-exposure"
- *   "auto-bracket"
- */
-#define GST_TAG_CAPTURING_EXPOSURE_MODE       "capturing-exposure-mode"
-
-/**
- * GST_TAG_CAPTURING_EXPOSURE_COMPENSATION:
- *
- * Exposure compensation using when capturing an image in EV. (double)
- */
-#define GST_TAG_CAPTURING_EXPOSURE_COMPENSATION "capturing-exposure-compensation"
-
-/**
- * GST_TAG_CAPTURING_SCENE_CAPTURE_TYPE:
- *
- * Scene mode used when capturing an image. (string)
- *
- * The allowed values are:
- *   "standard"
- *   "landscape"
- *   "portrait"
- *   "night-scene"
- */
-#define GST_TAG_CAPTURING_SCENE_CAPTURE_TYPE  "capturing-scene-capture-type"
-
-/**
- * GST_TAG_CAPTURING_GAIN_ADJUSTMENT:
- *
- * Gain adjustment applied to an image. (string)
- *
- * The allowed values are:
- *   "none"
- *   "low-gain-up"
- *   "high-gain-up"
- *   "low-gain-down"
- *   "high-gain-down"
- */
-#define GST_TAG_CAPTURING_GAIN_ADJUSTMENT     "capturing-gain-adjustment"
-
-/**
- * GST_TAG_CAPTURING_WHITE_BALANCE:
- *
- * White balance mode used when capturing an image. (string)
- *
- * The allowed values are:
- *   "auto"
- *   "manual"
- *   "daylight"
- *   "cloudy"
- *   "tungsten"
- *   "fluorescent"
- *   "fluorescent h" (newer daylight-calibrated fluorescents)
- *   "flash"
- */
-#define GST_TAG_CAPTURING_WHITE_BALANCE       "capturing-white-balance"
-
-/**
- * GST_TAG_CAPTURING_CONTRAST:
- *
- * Direction of contrast processing applied when capturing an image. (string)
- *
- * The allowed values are:
- *  "normal"
- *  "soft"
- *  "hard"
- */
-#define GST_TAG_CAPTURING_CONTRAST            "capturing-contrast"
-
-/**
- * GST_TAG_CAPTURING_SATURATION:
- *
- * Direction of saturation processing applied when capturing an image. (string)
- *
- * The allowed values are:
- *  "normal"
- *  "low-saturation"
- *  "high-saturation"
- */
-#define GST_TAG_CAPTURING_SATURATION          "capturing-saturation"
-
-/**
- * GST_TAG_CAPTURING_SHARPNESS:
- *
- * Direction of sharpness processing applied when capturing an image. (string)
- *
- * The allowed values are:
- *  "normal"
- *  "soft"
- *  "hard"
- */
-#define GST_TAG_CAPTURING_SHARPNESS          "capturing-sharpness"
-
-/**
- * GST_TAG_CAPTURING_FLASH_FIRED:
- *
- * If flash was fired during the capture of an image. (boolean)
- *
- * Note that if this tag isn't present, it should not be assumed that
- * the flash did not fire. It should be treated as unknown.
- */
-#define GST_TAG_CAPTURING_FLASH_FIRED         "capturing-flash-fired"
-
-/**
- * GST_TAG_CAPTURING_FLASH_MODE:
- *
- * The flash mode selected during the capture of an image. (string)
- *
- * The allowed values are:
- *  "auto"
- *  "always"
- *  "never"
- */
-#define GST_TAG_CAPTURING_FLASH_MODE         "capturing-flash-mode"
-
-/**
- * GST_TAG_CAPTURING_METERING_MODE:
- *
- * Defines the way a camera determines the exposure. (string)
- *
- * The allowed values are:
- *   "unknown"
- *   "average"
- *   "center-weighted-average"
- *   "spot"
- *   "multi-spot"
- *   "pattern"
- *   "partial"
- *   "other"
- */
-#define GST_TAG_CAPTURING_METERING_MODE      "capturing-metering-mode"
-
-/**
- * GST_TAG_CAPTURING_SOURCE:
- *
- * Indicates the source of capture. The device/medium used to do the
- * capture. (string)
- *
- * Allowed values are:
- *   "dsc" (= digital still camera)
- *   "transparent-scanner"
- *   "reflex-scanner"
- *   "other"
- */
-#define GST_TAG_CAPTURING_SOURCE             "capturing-source"
-
-/**
- * GST_TAG_IMAGE_HORIZONTAL_PPI:
- *
- * Media (image/video) intended horizontal pixel density in ppi. (double)
- */
-#define GST_TAG_IMAGE_HORIZONTAL_PPI         "image-horizontal-ppi"
-/**
- * GST_TAG_IMAGE_VERTICAL_PPI:
- *
- * Media (image/video) intended vertical pixel density in ppi. (double)
- */
-#define GST_TAG_IMAGE_VERTICAL_PPI           "image-vertical-ppi"
-
-
-/* additional information for image tags */
-
-/**
- * GstTagImageType:
- * @GST_TAG_IMAGE_TYPE_NONE                  : No image type. Can be used to
- *      tell functions such as gst_tag_image_data_to_image_sample() that no
- *      image type should be set.
- * @GST_TAG_IMAGE_TYPE_UNDEFINED             : Undefined/other image type
- * @GST_TAG_IMAGE_TYPE_FRONT_COVER           : Cover (front)
- * @GST_TAG_IMAGE_TYPE_BACK_COVER            : Cover (back)
- * @GST_TAG_IMAGE_TYPE_LEAFLET_PAGE          : Leaflet page
- * @GST_TAG_IMAGE_TYPE_MEDIUM                : Medium (e.g. label side of CD)
- * @GST_TAG_IMAGE_TYPE_LEAD_ARTIST           : Lead artist/lead performer/soloist
- * @GST_TAG_IMAGE_TYPE_ARTIST                : Artist/performer
- * @GST_TAG_IMAGE_TYPE_CONDUCTOR             : Conductor
- * @GST_TAG_IMAGE_TYPE_BAND_ORCHESTRA        : Band/orchestra
- * @GST_TAG_IMAGE_TYPE_COMPOSER              : Composer
- * @GST_TAG_IMAGE_TYPE_LYRICIST              : Lyricist/text writer
- * @GST_TAG_IMAGE_TYPE_RECORDING_LOCATION    : Recording location
- * @GST_TAG_IMAGE_TYPE_DURING_RECORDING      : During recording
- * @GST_TAG_IMAGE_TYPE_DURING_PERFORMANCE    : During performance
- * @GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE         : Movie/video screen capture
- * @GST_TAG_IMAGE_TYPE_FISH                  : A fish as funny as the ID3v2 spec
- * @GST_TAG_IMAGE_TYPE_ILLUSTRATION          : Illustration
- * @GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO      : Band/artist logotype
- * @GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO : Publisher/studio logotype
- *
- * Type of image contained in an image tag (specified as field in
- * the image buffer's caps structure)
- */
-/* Note: keep in sync with register_tag_image_type_enum() */
-typedef enum {
-  GST_TAG_IMAGE_TYPE_NONE = -1,
-  GST_TAG_IMAGE_TYPE_UNDEFINED = 0,
-  GST_TAG_IMAGE_TYPE_FRONT_COVER,
-  GST_TAG_IMAGE_TYPE_BACK_COVER,
-  GST_TAG_IMAGE_TYPE_LEAFLET_PAGE,
-  GST_TAG_IMAGE_TYPE_MEDIUM,
-  GST_TAG_IMAGE_TYPE_LEAD_ARTIST,
-  GST_TAG_IMAGE_TYPE_ARTIST,
-  GST_TAG_IMAGE_TYPE_CONDUCTOR,
-  GST_TAG_IMAGE_TYPE_BAND_ORCHESTRA,
-  GST_TAG_IMAGE_TYPE_COMPOSER,
-  GST_TAG_IMAGE_TYPE_LYRICIST,
-  GST_TAG_IMAGE_TYPE_RECORDING_LOCATION,
-  GST_TAG_IMAGE_TYPE_DURING_RECORDING,
-  GST_TAG_IMAGE_TYPE_DURING_PERFORMANCE,
-  GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE,
-  GST_TAG_IMAGE_TYPE_FISH,
-  GST_TAG_IMAGE_TYPE_ILLUSTRATION,
-  GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO,
-  GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO
-} GstTagImageType;
-
-#define GST_TYPE_TAG_IMAGE_TYPE  (gst_tag_image_type_get_type ())
-GType   gst_tag_image_type_get_type (void);
-
-/**
- * GST_TAG_ID3V2_HEADER_SIZE:
- *
- * ID3V2 header size considered minimum input for some functions such as
- * gst_tag_list_from_id3v2_tag() and gst_tag_get_id3v2_tag_size() for example.
- */
-#define GST_TAG_ID3V2_HEADER_SIZE            10
-
-/* functions for vorbis comment manipulation */
-
-const gchar *           gst_tag_from_vorbis_tag                 (const gchar *          vorbis_tag);
-const gchar *           gst_tag_to_vorbis_tag                   (const gchar *          gst_tag);
-void                    gst_vorbis_tag_add                      (GstTagList *           list, 
-                                                                 const gchar *          tag, 
-                                                                 const gchar *          value);
-
-GList *                 gst_tag_to_vorbis_comments              (const GstTagList *     list, 
-                                                                 const gchar *          tag);
-
-/* functions to convert GstBuffers with vorbiscomment contents to GstTagLists and back */
-GstTagList *            gst_tag_list_from_vorbiscomment         (const guint8 *         data,
-                                                                 gsize                  size,
-                                                                 const guint8 *         id_data,
-                                                                 const guint            id_data_length,
-                                                                 gchar **               vendor_string);
-GstTagList *            gst_tag_list_from_vorbiscomment_buffer  (GstBuffer *            buffer,
-                                                                 const guint8 *         id_data,
-                                                                 const guint            id_data_length,
-                                                                 gchar **               vendor_string);
-GstBuffer *             gst_tag_list_to_vorbiscomment_buffer    (const GstTagList *     list,
-                                                                 const guint8 *         id_data,
-                                                                 const guint            id_data_length,
-                                                                 const gchar *          vendor_string);
-
-/* functions for ID3 tag manipulation */
-
-/* FIXME 0.11: inconsistent API naming: gst_tag_list_new_from_id3v1(), gst_tag_list_from_*_buffer(),
- * gst_tag_list_from_id3v2_tag(). Also, note gst.tag.list_xyz() namespace vs. gst.tag_list_xyz(),
- * which is a bit confusing and possibly doesn't map too well */
-
-guint                   gst_tag_id3_genre_count                 (void);
-const gchar *           gst_tag_id3_genre_get                   (const guint            id);
-GstTagList *            gst_tag_list_new_from_id3v1             (const guint8 *         data);
-
-const gchar *           gst_tag_from_id3_tag                    (const gchar *          id3_tag);
-const gchar *           gst_tag_from_id3_user_tag               (const gchar *          type,
-                                                                 const gchar *          id3_user_tag);
-const gchar *           gst_tag_to_id3_tag                      (const gchar *          gst_tag);
-
-gboolean                gst_tag_list_add_id3_image (GstTagList   * tag_list,
-                                                    const guint8 * image_data,
-                                                    guint          image_data_len,
-                                                    guint          id3_picture_type);
-
-GstTagList *            gst_tag_list_from_id3v2_tag (GstBuffer * buffer);
-
-guint                   gst_tag_get_id3v2_tag_size  (GstBuffer * buffer);
-
-/* functions to  convert GstBuffers with xmp packets contents to GstTagLists and back */
-GstTagList *            gst_tag_list_from_xmp_buffer (GstBuffer *  buffer);
-GstBuffer *		          gst_tag_list_to_xmp_buffer   (const GstTagList * list,
-							                                        gboolean read_only,
-							                                        const gchar ** schemas);
-const gchar**		        gst_tag_xmp_list_schemas     (void);
-
-/* functions related to exif */
-GstBuffer *             gst_tag_list_to_exif_buffer (const GstTagList * taglist,
-                                                     gint byte_order,
-                                                     guint32 base_offset);
-
-GstBuffer *             gst_tag_list_to_exif_buffer_with_tiff_header (const GstTagList * taglist);
-
-GstTagList *            gst_tag_list_from_exif_buffer (GstBuffer * buffer,
-                                                       gint byte_order,
-                                                       guint32 base_offset);
-
-GstTagList *            gst_tag_list_from_exif_buffer_with_tiff_header (
-                                                      GstBuffer * buffer);
-
-/* other tag-related functions */
-
-gboolean                gst_tag_parse_extended_comment (const gchar  * ext_comment,
-                                                        gchar       ** key,
-                                                        gchar       ** lang,
-                                                        gchar       ** value,
-                                                        gboolean       fail_if_no_key);
-
-gchar                 * gst_tag_freeform_string_to_utf8 (const gchar  * data,
-                                                         gint           size,
-                                                         const gchar ** env_vars);
-
-GstSample             * gst_tag_image_data_to_image_sample (const guint8   * image_data,
-                                                            guint            image_data_len,
-                                                            GstTagImageType  image_type);
-
-/* FIXME 0.11: get rid of this awkward register/init function, see tags.c */
-void                    gst_tag_register_musicbrainz_tags (void);
-
-
-/* language tag related functions */
-
-gchar **       gst_tag_get_language_codes (void);
-
-const gchar *  gst_tag_get_language_name (const gchar * language_code);
-
-const gchar *  gst_tag_get_language_code_iso_639_1 (const gchar * lang_code);
-
-const gchar *  gst_tag_get_language_code_iso_639_2B (const gchar * lang_code);
-
-const gchar *  gst_tag_get_language_code_iso_639_2T (const gchar * lang_code);
-
-gboolean       gst_tag_check_language_code          (const gchar * lang_code);
-
-/**
- * gst_tag_get_language_code:
- * @lang_code: ISO-639 language code (e.g. "deu" or "ger" or "de")
- *
- * Convenience macro wrapping gst_tag_get_language_code_iso_639_1().
- */
-#define gst_tag_get_language_code(lang_code) \
-    gst_tag_get_language_code_iso_639_1(lang_code)
-
-
-/* functions to deal with (mostly) Creative Commons licenses */
-
-/**
- * GstTagLicenseFlags:
- * @GST_TAG_LICENSE_PERMITS_REPRODUCTION: making multiple copies
- *     is allowed
- * @GST_TAG_LICENSE_PERMITS_DISTRIBUTION: distribution, public display
- *     and public performance are allowed
- * @GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS: distribution of derivative
- *     works is allowed
- * @GST_TAG_LICENSE_PERMITS_SHARING: commercial derivatives are allowed,
- *     but only non-commercial distribution is allowed
- * @GST_TAG_LICENSE_REQUIRES_NOTICE: copyright and license notices
- *     must be kept intact
- * @GST_TAG_LICENSE_REQUIRES_ATTRIBUTION: credit must be given to
- *     copyright holder and/or author
- * @GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE: derivative works must be
- *     licensed under the same terms or compatible terms as the original work
- * @GST_TAG_LICENSE_REQUIRES_SOURCE_CODE: source code (the preferred
- *     form for making modifications) must be provided when exercising some
- *     rights granted by the license
- * @GST_TAG_LICENSE_REQUIRES_COPYLEFT: derivative and combined works
- *     must be licensed under specified terms, similar to those of the original
- *     work
- * @GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT: derivative works must be
- *     licensed under specified terms, with at least the same conditions as
- *     the original work; combinations with the work may be licensed under
- *     different terms
- * @GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE: exercising rights for
- *     commercial purposes is prohibited
- * @GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE: use in a
- *     non-developing country is prohibited
- * @GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE: this license was created
- *     by the Creative Commons project
- * @GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE: this license was
- *     created by the Free Software Foundation (FSF)
- *
- * See http://creativecommons.org/ns for more information.
- */
-typedef enum {
-  GST_TAG_LICENSE_PERMITS_REPRODUCTION             = (1 << 0),
-  GST_TAG_LICENSE_PERMITS_DISTRIBUTION             = (1 << 1),
-  GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS         = (1 << 2),
-  GST_TAG_LICENSE_PERMITS_SHARING                  = (1 << 3),
-
-  GST_TAG_LICENSE_REQUIRES_NOTICE                  = (1 << 8),
-  GST_TAG_LICENSE_REQUIRES_ATTRIBUTION             = (1 << 9),
-  GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE             = (1 << 10),
-  GST_TAG_LICENSE_REQUIRES_SOURCE_CODE             = (1 << 11),
-  GST_TAG_LICENSE_REQUIRES_COPYLEFT                = (1 << 12),
-  GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT         = (1 << 13),
-
-  GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE         = (1 << 16),
-  GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE = (1 << 17),
-
-  GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE         = (1 << 24),
-  GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE = (1 << 25)
-} GstTagLicenseFlags;
-
-gchar **            gst_tag_get_licenses (void);
-
-GstTagLicenseFlags  gst_tag_get_license_flags (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_nick  (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_title (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_version (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_description  (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_jurisdiction (const gchar * license_ref);
-
-GType               gst_tag_license_flags_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_TAG_TAG_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/xmpwriter.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/xmpwriter.h
deleted file mode 100644
index a7f6e4a9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/tag/xmpwriter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GStreamer XmpConfig
- * Copyright (C) 2011 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TAG_XMP_WRITER_H__
-#define __TAG_XMP_WRITER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_XMP_WRITER \
-  (gst_tag_xmp_writer_get_type ())
-#define GST_TAG_XMP_WRITER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TAG_XMP_WRITER, GstTagXmpWriter))
-#define GST_TAG_XMP_WRITER_INTERFACE(iface) \
-  (G_TYPE_CHECK_INTERFACE_CAST ((iface), GST_TYPE_TAG_XMP_WRITER, GstTagXmpWriterInterface))
-#define GST_IS_TAG_XMP_WRITER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TAG_XMP_WRITER))
-#define GST_IS_TAG_XMP_WRITER_INTERFACE(iface) \
-  (G_TYPE_CHECK_INTERFACE_TYPE ((iface), GST_TYPE_TAG_XMP_WRITER))
-#define GST_TAG_XMP_WRITER_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_TAG_XMP_WRITER, GstTagXmpWriterInterface))
-
-typedef struct _GstTagXmpWriter GstTagXmpWriter;
-typedef struct _GstTagXmpWriterInterface GstTagXmpWriterInterface;
-
-struct _GstTagXmpWriterInterface {
-  GTypeInterface parent;
-};
-
-GType           gst_tag_xmp_writer_get_type		(void);
-
-void		gst_tag_xmp_writer_add_all_schemas	(GstTagXmpWriter * config);
-
-void		gst_tag_xmp_writer_add_schema	(GstTagXmpWriter * config,
-						const gchar * schema);
-
-gboolean	gst_tag_xmp_writer_has_schema	(GstTagXmpWriter * config,
-						const gchar * schema);
-
-void		gst_tag_xmp_writer_remove_schema	(GstTagXmpWriter * config,
-						const gchar * schema);
-
-void		gst_tag_xmp_writer_remove_all_schemas (GstTagXmpWriter * config);
-
-GstBuffer*	gst_tag_xmp_writer_tag_list_to_xmp_buffer 	(GstTagXmpWriter * config,
-							 const GstTagList * taglist,
-							 gboolean read_only);
-
-G_END_DECLS
-
-#endif /* __TAG_XMP_WRITER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/colorbalance.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/colorbalance.h
deleted file mode 100644
index ec5d1722..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/colorbalance.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* GStreamer Color Balance
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * color-balance.h: image color balance interface design
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_COLOR_BALANCE_H__
-#define __GST_COLOR_BALANCE_H__
-
-#include <gst/gst.h>
-#include <gst/video/colorbalancechannel.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_COLOR_BALANCE \
-  (gst_color_balance_get_type ())
-#define GST_COLOR_BALANCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE, GstColorBalance))
-#define GST_IS_COLOR_BALANCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE))
-#define GST_COLOR_BALANCE_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceInterface))
-
-typedef struct _GstColorBalance GstColorBalance;
-typedef struct _GstColorBalanceInterface GstColorBalanceInterface;
-
-/**
- * GstColorBalanceType:
- * @GST_COLOR_BALANCE_HARDWARE: Color balance is implemented with dedicated
- *         hardware.
- * @GST_COLOR_BALANCE_SOFTWARE: Color balance is implemented via software
- *         processing.
- *
- * An enumeration indicating whether an element implements color balancing
- * operations in software or in dedicated hardware. In general, dedicated
- * hardware implementations (such as those provided by xvimagesink) are
- * preferred.
- */
-typedef enum
-{
-  GST_COLOR_BALANCE_HARDWARE,
-  GST_COLOR_BALANCE_SOFTWARE
-} GstColorBalanceType;
-
-/**
- * GstColorBalanceInterface:
- * @iface: the parent interface
- * @balance_type: implementation type
- * @list_channels: list handled channels
- * @set_value: set a channel value
- * @get_value: get a channel value
- * @value_changed: default handler for value changed notification
- *
- * Color-balance interface.
- */
-struct _GstColorBalanceInterface {
-  GTypeInterface iface;
-
-  /* virtual functions */
-  const GList * (* list_channels) (GstColorBalance        *balance);
-
-  void          (* set_value)     (GstColorBalance        *balance,
-                                   GstColorBalanceChannel *channel,
-                                   gint                    value);
-  gint          (* get_value)     (GstColorBalance        *balance,
-                                   GstColorBalanceChannel *channel);
-  GstColorBalanceType (*get_balance_type)  (GstColorBalance *balance);
-
-  /* signals */
-  void (* value_changed) (GstColorBalance        *balance,
-                          GstColorBalanceChannel *channel,
-                          gint                    value);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType   gst_color_balance_get_type      (void);
-
-/* virtual class function wrappers */
-const GList *
-        gst_color_balance_list_channels (GstColorBalance        *balance);
-void    gst_color_balance_set_value     (GstColorBalance        *balance,
-                                         GstColorBalanceChannel *channel,
-                                         gint                    value);
-gint    gst_color_balance_get_value     (GstColorBalance        *balance,
-                                         GstColorBalanceChannel *channel);
-
-GstColorBalanceType
-        gst_color_balance_get_balance_type (GstColorBalance        *balance);
-
-/* trigger signal */
-void    gst_color_balance_value_changed (GstColorBalance        *balance,
-                                         GstColorBalanceChannel *channel,
-                                         gint                    value);
-
-G_END_DECLS
-
-#endif /* __GST_COLOR_BALANCE_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/colorbalancechannel.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/colorbalancechannel.h
deleted file mode 100644
index ca23ee2c..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/colorbalancechannel.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GStreamer Color Balance
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * colorbalancechannel.h: individual channel object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_COLOR_BALANCE_CHANNEL_H__
-#define __GST_COLOR_BALANCE_CHANNEL_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_COLOR_BALANCE_CHANNEL \
-  (gst_color_balance_channel_get_type ())
-#define GST_COLOR_BALANCE_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE_CHANNEL, \
-                               GstColorBalanceChannel))
-#define GST_COLOR_BALANCE_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL, \
-                            GstColorBalanceChannelClass))
-#define GST_IS_COLOR_BALANCE_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE_CHANNEL))
-#define GST_IS_COLOR_BALANCE_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL))
-
-typedef struct _GstColorBalanceChannel GstColorBalanceChannel;
-typedef struct _GstColorBalanceChannelClass GstColorBalanceChannelClass;
-
-/**
- * GstColorBalanceChannel:
- * @label: A string containing a descriptive name for this channel
- * @min_value: The minimum valid value for this channel.
- * @max_value: The maximum valid value for this channel.
- */
-struct _GstColorBalanceChannel {
-  GObject parent;
-
-  /*< public >*/
-  gchar  *label;
-  gint    min_value;
-  gint    max_value;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstColorBalanceChannelClass:
- * @parent: the parent class
- * @value_changed: default handler for value changed notification
- *
- * Color-balance channel class.
- */
-struct _GstColorBalanceChannelClass {
-  GObjectClass parent;
-
-  /* signals */
-  void (* value_changed) (GstColorBalanceChannel *channel,
-                          gint                    value);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType   gst_color_balance_channel_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_COLOR_BALANCE_CHANNEL_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstsurfaceconverter.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstsurfaceconverter.h
deleted file mode 100644
index 70249449..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstsurfaceconverter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Collabora Ltd.
- * Copyright (C) 2011 Intel
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_SURFACE_CONVERTER_H_
-#define _GST_SURFACE_CONVERTER_H_
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstSurfaceConverter is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_SURFACE_CONVERTER             (gst_surface_converter_get_type ())
-#define GST_SURFACE_CONVERTER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SURFACE_CONVERTER, GstSurfaceConverter))
-#define GST_IS_SURFACE_CONVERTER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SURFACE_CONVERTER))
-#define GST_SURFACE_CONVERTER_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_SURFACE_CONVERTER, GstSurfaceConverterInterface))
-
-typedef struct _GstSurfaceConverter GstSurfaceConverter;
-typedef struct _GstSurfaceConverterInterface GstSurfaceConverterInterface;
-
-/**
- * GstSurfaceConverterInterface:
- * @parent: parent interface type.
- * @upload: vmethod to upload #GstSurfaceBuffer.
- *
- * #GstSurfaceConverterInterface interface.
- */
-struct _GstSurfaceConverterInterface
-{
-  GTypeInterface parent;
-
-  gboolean (*upload) (GstSurfaceConverter *converter,
-                      GstBuffer *buffer);
-};
-
-GType     gst_surface_converter_get_type (void);
-
-gboolean  gst_surface_converter_upload (GstSurfaceConverter *converter,
-                                        GstBuffer *buffer);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstsurfacemeta.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstsurfacemeta.h
deleted file mode 100644
index ed04bc28..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstsurfacemeta.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Collabora Ltd.
- * Copyright (C) 2011 Intel
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_SURFACE_META_H_
-#define _GST_SURFACE_META_H_
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstSurfaceMeta is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-#include <gst/video/gstsurfaceconverter.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstSurfaceMeta GstSurfaceMeta;
-
-/**
- * GstSurfaceMeta:
- * @create_converter: vmethod to create a converter.
- *
- */
-struct _GstSurfaceMeta {
-  GstMeta       meta;
-
-  GstSurfaceConverter * (*create_converter) (GstSurfaceMeta *meta,
-                                             const gchar *type,
-                                             GValue *dest);
-};
-
-GType gst_surface_meta_api_get_type (void);
-#define GST_SURFACE_META_API_TYPE (gst_surface_meta_api_get_type())
-
-const GstMetaInfo *gst_surface_meta_get_info (void);
-#define GST_SURFACE_META_INFO (gst_surface_meta_get_info())
-
-#define gst_buffer_get_surface_meta(b) \
-  ((GstSurfaceMeta*)gst_buffer_get_meta((b),GST_SURFACE_META_API_TYPE))
-#define gst_buffer_add_surface_meta(b) \
-  ((GstSurfaceMeta*)gst_buffer_add_meta((b),GST_SURFACE_META_INFO,NULL))
-
-GstSurfaceConverter  *gst_surface_meta_create_converter (GstSurfaceMeta *meta,
-                                                           const gchar *type,
-                                                           GValue *dest);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideodecoder.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideodecoder.h
deleted file mode 100644
index 8e2b7c70..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideodecoder.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_DECODER_H_
-#define _GST_VIDEO_DECODER_H_
-
-#include <gst/base/gstadapter.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideoutils.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_DECODER \
-  (gst_video_decoder_get_type())
-#define GST_VIDEO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_DECODER,GstVideoDecoder))
-#define GST_VIDEO_DECODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_DECODER,GstVideoDecoderClass))
-#define GST_VIDEO_DECODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_DECODER,GstVideoDecoderClass))
-#define GST_IS_VIDEO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_DECODER))
-#define GST_IS_VIDEO_DECODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_DECODER))
-
-/**
- * GST_VIDEO_DECODER_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- */
-#define GST_VIDEO_DECODER_SINK_NAME    "sink"
-/**
- * GST_VIDEO_DECODER_SRC_NAME:
- *
- * The name of the templates for the source pad.
- */
-#define GST_VIDEO_DECODER_SRC_NAME     "src"
-
-/**
- * GST_VIDEO_DECODER_SRC_PAD:
- * @obj: a #GstVideoDecoder
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_VIDEO_DECODER_SRC_PAD(obj)         (((GstVideoDecoder *) (obj))->srcpad)
-
-/**
- * GST_VIDEO_DECODER_SINK_PAD:
- * @obj: a #GstVideoDecoder
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_VIDEO_DECODER_SINK_PAD(obj)        (((GstVideoDecoder *) (obj))->sinkpad)
-/**
- * GST_VIDEO_DECODER_FLOW_NEED_DATA:
- *
- * Returned while parsing to indicate more data is needed.
- **/
-#define GST_VIDEO_DECODER_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
-
-/**
- * GST_VIDEO_DECODER_INPUT_SEGMENT:
- * @obj: base decoder instance
- *
- * Gives the segment of the element.
- */
-#define GST_VIDEO_DECODER_INPUT_SEGMENT(obj)     (GST_VIDEO_DECODER_CAST (obj)->input_segment)
-
-/**
- * GST_VIDEO_DECODER_OUTPUT_SEGMENT:
- * @obj: base decoder instance
- *
- * Gives the segment of the element.
- */
-#define GST_VIDEO_DECODER_OUTPUT_SEGMENT(obj)     (GST_VIDEO_DECODER_CAST (obj)->output_segment)
-
-/**
- * GST_VIDEO_DECODER_STREAM_LOCK:
- * @decoder: video decoder instance
- *
- * Obtain a lock to protect the decoder function from concurrent access.
- */
-#define GST_VIDEO_DECODER_STREAM_LOCK(decoder) g_rec_mutex_lock (&GST_VIDEO_DECODER (decoder)->stream_lock)
-
-/**
- * GST_VIDEO_DECODER_STREAM_UNLOCK:
- * @decoder: video decoder instance
- *
- * Release the lock that protects the decoder function from concurrent access.
- */
-#define GST_VIDEO_DECODER_STREAM_UNLOCK(decoder) g_rec_mutex_unlock (&GST_VIDEO_DECODER (decoder)->stream_lock)
-
-typedef struct _GstVideoDecoder GstVideoDecoder;
-typedef struct _GstVideoDecoderClass GstVideoDecoderClass;
-typedef struct _GstVideoDecoderPrivate GstVideoDecoderPrivate;
-
-
-/* do not use this one, use macro below */
-GstFlowReturn _gst_video_decoder_error (GstVideoDecoder *dec, gint weight,
-                                             GQuark domain, gint code,
-                                             gchar *txt, gchar *debug,
-                                             const gchar *file, const gchar *function,
-                                             gint line);
-
-/**
- * GST_VIDEO_DECODER_ERROR:
- * @el:     the base video decoder element that generates the error
- * @w:      element defined weight of the error, added to error count
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
- *          parentheses)
- * @debug:  debugging information for the message (format string and args
- *          enclosed in parentheses)
- * @ret:    variable to receive return value
- *
- * Utility function that video decoder elements can use in case they encountered
- * a data processing error that may be fatal for the current "data unit" but
- * need not prevent subsequent decoding.  Such errors are counted and if there
- * are too many, as configured in the context's max_errors, the pipeline will
- * post an error message and the application will be requested to stop further
- * media processing.  Otherwise, it is considered a "glitch" and only a warning
- * is logged. In either case, @ret is set to the proper value to
- * return to upstream/caller (indicating either GST_FLOW_ERROR or GST_FLOW_OK).
- */
-#define GST_VIDEO_DECODER_ERROR(el, w, domain, code, text, debug, ret) \
-G_STMT_START {                                                              \
-  gchar *__txt = _gst_element_error_printf text;                            \
-  gchar *__dbg = _gst_element_error_printf debug;                           \
-  GstVideoDecoder *dec = GST_VIDEO_DECODER (el);                   \
-  ret = _gst_video_decoder_error (dec, w, GST_ ## domain ## _ERROR,    \
-      GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__,            \
-      GST_FUNCTION, __LINE__);                                              \
-} G_STMT_END
-
-/**
- * GST_VIDEO_DECODER_MAX_ERRORS:
- *
- * Default maximum number of errors tolerated before signaling error.
- */
-#define GST_VIDEO_DECODER_MAX_ERRORS     10
-
-
-/**
- * GstVideoDecoder:
- *
- * The opaque #GstVideoDecoder data structure.
- */
-struct _GstVideoDecoder
-{
-  /*< private >*/
-  GstElement     element;
-
-  /*< protected >*/
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GRecMutex stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  GstVideoDecoderPrivate *priv;
-
-  /*< private >*/
-  void             *padding[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoDecoderClass:
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Notifies subclass of incoming data format (caps).
- * @parse:          Required for non-packetized input.
- *                  Allows chopping incoming data into manageable units (frames)
- *                  for subsequent decoding.
- * @reset:          Optional.
- *                  Allows subclass (decoder) to perform post-seek semantics reset.
- * @handle_frame:   Provides input data frame to subclass.
- * @finish:         Optional.
- *                  Called to request subclass to dispatch any pending remaining
- *                  data (e.g. at EOS).
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @src_event:      Optional.
- *                  Event handler on the source pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @negotiate:      Optional.
- *                  Negotiate with downstream and configure buffer pools, etc.
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @decide_allocation: Optional.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *                     Subclasses should chain up to the parent implementation to
- *                     invoke the default handler.
- * @propose_allocation: Optional.
- *                      Propose buffer allocation parameters for upstream elements.
- *                      Subclasses should chain up to the parent implementation to
- *                      invoke the default handler.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @handle_frame needs to be overridden, and @set_format
- * and likely as well.  If non-packetized input is supported or expected,
- * @parse needs to be overridden as well.
- */
-struct _GstVideoDecoderClass
-{
-  /*< private >*/
-  GstElementClass element_class;
-
-  /*< public >*/
-  gboolean      (*open)           (GstVideoDecoder *decoder);
-
-  gboolean      (*close)          (GstVideoDecoder *decoder);
-
-  gboolean      (*start)          (GstVideoDecoder *decoder);
-
-  gboolean      (*stop)           (GstVideoDecoder *decoder);
-
-  GstFlowReturn (*parse)          (GstVideoDecoder *decoder,
-				   GstVideoCodecFrame *frame,
-				   GstAdapter *adapter,
-				   gboolean at_eos);
-
-  gboolean      (*set_format)     (GstVideoDecoder *decoder,
-				   GstVideoCodecState * state);
-
-  gboolean      (*reset)          (GstVideoDecoder *decoder,
-				   gboolean hard);
-
-  GstFlowReturn (*finish)         (GstVideoDecoder *decoder);
-
-  GstFlowReturn (*handle_frame)   (GstVideoDecoder *decoder,
-				   GstVideoCodecFrame *frame);
-
-  gboolean      (*sink_event)     (GstVideoDecoder *decoder,
-				   GstEvent *event);
-
-  gboolean      (*src_event)      (GstVideoDecoder *decoder,
-				   GstEvent *event);
-
-  gboolean      (*negotiate)      (GstVideoDecoder *decoder);
-
-  gboolean      (*decide_allocation)  (GstVideoDecoder *decoder, GstQuery *query);
-
-  gboolean      (*propose_allocation) (GstVideoDecoder *decoder, GstQuery * query);
-
-  /*< private >*/
-  void         *padding[GST_PADDING_LARGE];
-};
-
-GType    gst_video_decoder_get_type (void);
-
-/* Context parameters */
-void     gst_video_decoder_set_packetized (GstVideoDecoder * decoder,
-					   gboolean packetized);
-
-gboolean gst_video_decoder_get_packetized (GstVideoDecoder * decoder);
-
-void     gst_video_decoder_set_estimate_rate (GstVideoDecoder * dec,
-					      gboolean          enabled);
-
-gint     gst_video_decoder_get_estimate_rate (GstVideoDecoder * dec);
-
-void     gst_video_decoder_set_max_errors (GstVideoDecoder * dec,
-					   gint              num);
-
-gint     gst_video_decoder_get_max_errors (GstVideoDecoder * dec);
-
-void     gst_video_decoder_set_latency (GstVideoDecoder *decoder,
-					GstClockTime min_latency,
-					GstClockTime max_latency);
-void     gst_video_decoder_get_latency (GstVideoDecoder *decoder,
-					GstClockTime *min_latency,
-					GstClockTime *max_latency);
-
-void     gst_video_decoder_get_allocator (GstVideoDecoder *decoder,
-                                          GstAllocator **allocator,
-                                          GstAllocationParams *params);
-GstBufferPool *gst_video_decoder_get_buffer_pool (GstVideoDecoder *decoder);
-
-/* Object methods */
-
-GstVideoCodecFrame *gst_video_decoder_get_frame        (GstVideoDecoder *decoder,
-						        int frame_number);
-
-GstVideoCodecFrame *gst_video_decoder_get_oldest_frame (GstVideoDecoder *decoder);
-
-GList *             gst_video_decoder_get_frames       (GstVideoDecoder *decoder);
-
-/* Parsing related methods */
-void           gst_video_decoder_add_to_frame     (GstVideoDecoder *decoder,
-						   int n_bytes);
-GstFlowReturn  gst_video_decoder_have_frame       (GstVideoDecoder *decoder);
-
-GstBuffer     *gst_video_decoder_allocate_output_buffer (GstVideoDecoder * decoder);
-
-GstFlowReturn  gst_video_decoder_allocate_output_frame  (GstVideoDecoder *decoder,
-						         GstVideoCodecFrame *frame);
-
-GstVideoCodecState *gst_video_decoder_set_output_state (GstVideoDecoder *decoder,
-							GstVideoFormat fmt, guint width, guint height,
-							GstVideoCodecState *reference);
-
-GstVideoCodecState *gst_video_decoder_get_output_state (GstVideoDecoder *decoder);
-
-gboolean         gst_video_decoder_negotiate           (GstVideoDecoder * decoder);
-
-GstClockTimeDiff gst_video_decoder_get_max_decode_time (GstVideoDecoder *decoder,
-							GstVideoCodecFrame *frame);
-
-gdouble          gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder);
-
-GstFlowReturn    gst_video_decoder_finish_frame (GstVideoDecoder *decoder,
-						 GstVideoCodecFrame *frame);
-
-GstFlowReturn    gst_video_decoder_drop_frame (GstVideoDecoder *dec,
-					       GstVideoCodecFrame *frame);
-
-void             gst_video_decoder_merge_tags (GstVideoDecoder *dec,
-                                               const GstTagList *tags,
-                                               GstTagMergeMode mode);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideoencoder.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideoencoder.h
deleted file mode 100644
index da420365..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideoencoder.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_ENCODER_H_
-#define _GST_VIDEO_ENCODER_H_
-
-#include <gst/video/gstvideoutils.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_ENCODER \
-  (gst_video_encoder_get_type())
-#define GST_VIDEO_ENCODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_ENCODER,GstVideoEncoder))
-#define GST_VIDEO_ENCODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_ENCODER,GstVideoEncoderClass))
-#define GST_VIDEO_ENCODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_ENCODER,GstVideoEncoderClass))
-#define GST_IS_VIDEO_ENCODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_ENCODER))
-#define GST_IS_VIDEO_ENCODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_ENCODER))
-#define GST_VIDEO_ENCODER_CAST(enc) ((GstVideoEncoder*)enc)
-
-/**
- * GST_VIDEO_ENCODER_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- */
-#define GST_VIDEO_ENCODER_SINK_NAME    "sink"
-/**
- * GST_VIDEO_ENCODER_SRC_NAME:
- *
- * The name of the templates for the source pad.
- */
-#define GST_VIDEO_ENCODER_SRC_NAME     "src"
-
-/**
- * GST_VIDEO_ENCODER_SRC_PAD:
- * @obj: a #GstVideoEncoder
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_VIDEO_ENCODER_SRC_PAD(obj)         (((GstVideoEncoder *) (obj))->srcpad)
-
-/**
- * GST_VIDEO_ENCODER_SINK_PAD:
- * @obj: a #GstVideoEncoder
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_VIDEO_ENCODER_SINK_PAD(obj)        (((GstVideoEncoder *) (obj))->sinkpad)
-
-/**
- * GST_VIDEO_ENCODER_FLOW_NEED_DATA:
- *
- * Returned while parsing to indicate more data is needed.
- **/
-#define GST_VIDEO_ENCODER_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
-
-/**
- * GST_VIDEO_ENCODER_FLOW_DROPPED:
- *
- * Returned when the event/buffer should be dropped.
- */
-#define GST_VIDEO_ENCODER_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS_1
-
-/**
- * GST_VIDEO_ENCODER_INPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the segment of the element.
- */
-#define GST_VIDEO_ENCODER_INPUT_SEGMENT(obj)     (GST_VIDEO_ENCODER_CAST (obj)->input_segment)
-
-/**
- * GST_VIDEO_ENCODER_OUTPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the segment of the element.
- */
-#define GST_VIDEO_ENCODER_OUTPUT_SEGMENT(obj)     (GST_VIDEO_ENCODER_CAST (obj)->output_segment)
-
-/**
- * GST_VIDEO_ENCODER_STREAM_LOCK:
- * @encoder: video encoder instance
- *
- * Obtain a lock to protect the encoder function from concurrent access.
- */
-#define GST_VIDEO_ENCODER_STREAM_LOCK(encoder) g_rec_mutex_lock (&GST_VIDEO_ENCODER (encoder)->stream_lock)
-
-/**
- * GST_VIDEO_ENCODER_STREAM_UNLOCK:
- * @encoder: video encoder instance
- *
- * Release the lock that protects the encoder function from concurrent access.
- */
-#define GST_VIDEO_ENCODER_STREAM_UNLOCK(encoder) g_rec_mutex_unlock (&GST_VIDEO_ENCODER (encoder)->stream_lock)
-
-typedef struct _GstVideoEncoder GstVideoEncoder;
-typedef struct _GstVideoEncoderPrivate GstVideoEncoderPrivate;
-typedef struct _GstVideoEncoderClass GstVideoEncoderClass;
-
-/**
- * GstVideoEncoder:
- *
- * The opaque #GstVideoEncoder data structure.
- */
-struct _GstVideoEncoder
-{
-  /*< private >*/
-  GstElement    element;
-
-  /*< protected >*/
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GRecMutex stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  /*< private >*/
-  GstVideoEncoderPrivate *priv;
-
-  void         *padding[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoEncoderClass:
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Optional.
- *                  Notifies subclass of incoming data format.
- *                  GstVideoCodecState fields have already been
- *                  set according to provided caps.
- * @handle_frame:   Provides input frame to subclass.
- * @reset:          Optional.
- *                  Allows subclass (encoder) to perform post-seek semantics reset.
- * @finish:         Optional.
- *                  Called to request subclass to dispatch any pending remaining
- *                  data (e.g. at EOS).
- * @pre_push:   Optional.
- *                  Allows subclass to push frame downstream in whatever
- *                  shape or form it deems appropriate.  If not provided,
- *                  provided encoded frame data is simply pushed downstream.
- * @getcaps:        Optional.
- *                  Allows for a custom sink getcaps implementation (e.g.
- *                  for multichannel input specification).  If not implemented,
- *                  default returns gst_video_encoder_proxy_getcaps
- *                  applied to sink template caps.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @src_event:      Optional.
- *                  Event handler on the source pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @negotiate:      Optional.
- *                  Negotiate with downstream and configure buffer pools, etc.
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @decide_allocation: Optional.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *                     Subclasses should chain up to the parent implementation to
- *                     invoke the default handler.
- * @propose_allocation: Optional.
- *                      Propose buffer allocation parameters for upstream elements.
- *                      Subclasses should chain up to the parent implementation to
- *                      invoke the default handler.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @handle_frame needs to be overridden, and @set_format
- * and @get_caps are likely needed as well.
- */
-struct _GstVideoEncoderClass
-{
-  /*< private >*/
-  GstElementClass  element_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-  gboolean      (*open)         (GstVideoEncoder *encoder);
-
-  gboolean      (*close)        (GstVideoEncoder *encoder);
-
-  gboolean      (*start)        (GstVideoEncoder *encoder);
-
-  gboolean      (*stop)         (GstVideoEncoder *encoder);
-
-  gboolean      (*set_format)   (GstVideoEncoder *encoder,
-				 GstVideoCodecState *state);
-
-  GstFlowReturn (*handle_frame) (GstVideoEncoder *encoder,
-				 GstVideoCodecFrame *frame);
-
-  gboolean      (*reset)        (GstVideoEncoder *encoder,
-				 gboolean hard);
-
-  GstFlowReturn (*finish)       (GstVideoEncoder *encoder);
-
-  GstFlowReturn (*pre_push)     (GstVideoEncoder *encoder,
-				 GstVideoCodecFrame *frame);
-
-  GstCaps *     (*getcaps)      (GstVideoEncoder *enc,
-                                 GstCaps *filter);
-
-  gboolean      (*sink_event)   (GstVideoEncoder *encoder,
-				 GstEvent *event);
-
-  gboolean      (*src_event)    (GstVideoEncoder *encoder,
-				 GstEvent *event);
-
-  gboolean      (*negotiate)    (GstVideoEncoder *encoder);
-
-  gboolean      (*decide_allocation)  (GstVideoEncoder *encoder, GstQuery *query);
-
-  gboolean      (*propose_allocation) (GstVideoEncoder * encoder,
-                                       GstQuery * query);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType                gst_video_encoder_get_type (void);
-
-GstVideoCodecState*  gst_video_encoder_get_output_state (GstVideoEncoder *encoder);
-
-GstVideoCodecState*  gst_video_encoder_set_output_state (GstVideoEncoder * encoder,
-							 GstCaps * caps,
-							 GstVideoCodecState * reference);
-
-gboolean             gst_video_encoder_negotiate        (GstVideoEncoder * encoder);
-
-GstVideoCodecFrame*  gst_video_encoder_get_frame        (GstVideoEncoder *encoder,
-						         int frame_number);
-GstVideoCodecFrame*  gst_video_encoder_get_oldest_frame (GstVideoEncoder *encoder);
-
-GList *              gst_video_encoder_get_frames       (GstVideoEncoder *encoder);
-
-GstBuffer *          gst_video_encoder_allocate_output_buffer (GstVideoEncoder * encoder,
-                                                               gsize size);
-
-GstFlowReturn        gst_video_encoder_allocate_output_frame  (GstVideoEncoder *encoder,
-						               GstVideoCodecFrame *frame,
-                                                               gsize size);
-
-GstFlowReturn        gst_video_encoder_finish_frame (GstVideoEncoder *encoder,
-						     GstVideoCodecFrame *frame);
-
-GstCaps *            gst_video_encoder_proxy_getcaps (GstVideoEncoder * enc,
-						      GstCaps         * caps,
-                                                      GstCaps         * filter);
-void                 gst_video_encoder_set_discont (GstVideoEncoder *encoder);
-gboolean             gst_video_encoder_get_discont (GstVideoEncoder *encoder);
-
-void                 gst_video_encoder_set_latency (GstVideoEncoder *encoder,
-						    GstClockTime min_latency,
-						    GstClockTime max_latency);
-void		     gst_video_encoder_get_latency (GstVideoEncoder *encoder,
-						    GstClockTime *min_latency,
-						    GstClockTime *max_latency);
-
-void                 gst_video_encoder_set_headers (GstVideoEncoder *encoder,
-						    GList *headers);
-
-void                 gst_video_encoder_merge_tags  (GstVideoEncoder *encoder,
-                                                    const GstTagList *tags,
-                                                    GstTagMergeMode mode);
-
-void                 gst_video_encoder_get_allocator (GstVideoEncoder *encoder,
-                                                      GstAllocator **allocator,
-                                                      GstAllocationParams *params);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideofilter.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideofilter.h
deleted file mode 100644
index 8e21ba5d..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideofilter.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_VIDEO_FILTER_H__
-#define __GST_VIDEO_FILTER_H__
-
-#include <gst/base/gstbasetransform.h>
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstVideoFilter GstVideoFilter;
-typedef struct _GstVideoFilterClass GstVideoFilterClass;
-
-#define GST_TYPE_VIDEO_FILTER \
-  (gst_video_filter_get_type())
-#define GST_VIDEO_FILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_FILTER,GstVideoFilter))
-#define GST_VIDEO_FILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_FILTER,GstVideoFilterClass))
-#define GST_VIDEO_FILTER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_VIDEO_FILTER, GstVideoFilterClass))
-#define GST_IS_VIDEO_FILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_FILTER))
-#define GST_IS_VIDEO_FILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_FILTER))
-#define GST_VIDEO_FILTER_CAST(obj)  ((GstVideoFilter *)(obj))
-
-struct _GstVideoFilter {
-  GstBaseTransform element;
-
-  gboolean negotiated;
-  GstVideoInfo in_info;
-  GstVideoInfo out_info;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstVideoFilterClass:
- * @parent_class: the parent class structure
- * @set_info: function to be called with the negotiated caps and video infos
- * @transform_frame: transform a video frame
- * @transform_frame_ip: transform a video frame in place
- *
- * The video filter class structure.
- */
-struct _GstVideoFilterClass {
-  GstBaseTransformClass parent_class;
-
-  gboolean      (*set_info)           (GstVideoFilter *filter,
-                                       GstCaps *incaps, GstVideoInfo *in_info,
-                                       GstCaps *outcaps, GstVideoInfo *out_info);
-
-  /* transform */
-  GstFlowReturn (*transform_frame)    (GstVideoFilter *filter,
-                                       GstVideoFrame *inframe, GstVideoFrame *outframe);
-  GstFlowReturn (*transform_frame_ip) (GstVideoFilter *trans, GstVideoFrame *frame);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_video_filter_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_FILTER_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideometa.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideometa.h
deleted file mode 100644
index ffba35eb..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideometa.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_META_H__
-#define __GST_VIDEO_META_H__
-
-#include <gst/gst.h>
-
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-#define GST_VIDEO_META_API_TYPE (gst_video_meta_api_get_type())
-#define GST_VIDEO_META_INFO  (gst_video_meta_get_info())
-typedef struct _GstVideoMeta GstVideoMeta;
-
-#define GST_VIDEO_CROP_META_API_TYPE  (gst_video_crop_meta_api_get_type())
-#define GST_VIDEO_CROP_META_INFO  (gst_video_crop_meta_get_info())
-typedef struct _GstVideoCropMeta GstVideoCropMeta;
-
-/**
- * GstVideoMeta:
- * @meta: parent #GstMeta
- * @buffer: the buffer this metadata belongs to
- * @flags: additional video flags
- * @format: the video format
- * @id: identifier of the frame
- * @width: the video width
- * @height: the video height
- * @n_planes: the number of planes in the image
- * @offset: array of offsets for the planes. This field might not always be
- *          valid, it is used by the default implementation of @map.
- * @stride: array of strides for the planes. This field might not always be
- *          valid, it is used by the default implementation of @map.
- * @map: map the memory of a plane
- * @unmap: unmap the memory of a plane
- *
- * Extra buffer metadata describing image properties
- */
-struct _GstVideoMeta {
-  GstMeta            meta;
-
-  GstBuffer         *buffer;
-
-  GstVideoFrameFlags flags;
-  GstVideoFormat     format;
-  gint               id;
-  guint              width;
-  guint              height;
-
-  guint              n_planes;
-  gsize              offset[GST_VIDEO_MAX_PLANES];
-  gint               stride[GST_VIDEO_MAX_PLANES];
-
-  gboolean (*map)    (GstVideoMeta *meta, guint plane, GstMapInfo *info,
-                      gpointer *data, gint * stride, GstMapFlags flags);
-  gboolean (*unmap)  (GstVideoMeta *meta, guint plane, GstMapInfo *info);
-};
-
-GType gst_video_meta_api_get_type (void);
-const GstMetaInfo * gst_video_meta_get_info (void);
-
-#define gst_buffer_get_video_meta(b) ((GstVideoMeta*)gst_buffer_get_meta((b),GST_VIDEO_META_API_TYPE))
-GstVideoMeta * gst_buffer_get_video_meta_id    (GstBuffer *buffer, gint id);
-
-GstVideoMeta * gst_buffer_add_video_meta       (GstBuffer *buffer, GstVideoFrameFlags flags,
-                                                GstVideoFormat format, guint width, guint height);
-GstVideoMeta * gst_buffer_add_video_meta_full  (GstBuffer *buffer, GstVideoFrameFlags flags,
-                                                GstVideoFormat format, guint width, guint height,
-                                                guint n_planes, gsize offset[GST_VIDEO_MAX_PLANES],
-                                                gint stride[GST_VIDEO_MAX_PLANES]);
-
-gboolean       gst_video_meta_map        (GstVideoMeta *meta, guint plane, GstMapInfo *info,
-                                          gpointer *data, gint *stride, GstMapFlags flags);
-gboolean       gst_video_meta_unmap      (GstVideoMeta *meta, guint plane, GstMapInfo *info);
-
-/**
- * GstVideoCropMeta:
- * @meta: parent #GstMeta
- * @x: the horizontal offset
- * @y: the vertical offset
- * @width: the cropped width
- * @height: the cropped height
- *
- * Extra buffer metadata describing image cropping.
- */
-struct _GstVideoCropMeta {
-  GstMeta       meta;
-
-  guint         x;
-  guint         y;
-  guint         width;
-  guint         height;
-};
-
-GType gst_video_crop_meta_api_get_type (void);
-const GstMetaInfo * gst_video_crop_meta_get_info (void);
-
-#define gst_buffer_get_video_crop_meta(b) ((GstVideoCropMeta*)gst_buffer_get_meta((b),GST_VIDEO_CROP_META_API_TYPE))
-#define gst_buffer_add_video_crop_meta(b) ((GstVideoCropMeta*)gst_buffer_add_meta((b),GST_VIDEO_CROP_META_INFO, NULL))
-
-/* video metadata transforms */
-
-GQuark gst_video_meta_transform_scale_get_quark (void);
-/**
- * gst_video_meta_transform_scale:
- *
- * GQuark for the video "gst-video-scale" transform.
- */
-#define GST_VIDEO_META_TRANSFORM_IS_SCALE(type) ((type) == gst_video_meta_transform_scale_get_quark())
-
-/**
- * GstVideoMetaTransform:
- * @old_info: the old #GstVideoInfo
- * @new_info: the new #GstVideoInfo
- *
- * Extra data passed to a video transform #GstMetaTransformFunction such as:
- * "gst-video-scale".
- */
-typedef struct {
-  GstVideoInfo *in_info;
-  GstVideoInfo *out_info;
-} GstVideoMetaTransform;
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_META_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideopool.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideopool.h
deleted file mode 100644
index c1b3e1e9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideopool.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_POOL_H__
-#define __GST_VIDEO_POOL_H__
-
-#include <gst/gst.h>
-
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_BUFFER_POOL_OPTION_VIDEO_META:
- *
- * An option that can be activated on bufferpool to request video metadata
- * on buffers from the pool.
- */
-#define GST_BUFFER_POOL_OPTION_VIDEO_META "GstBufferPoolOptionVideoMeta"
-
-/**
- * GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT:
- *
- * A bufferpool option to enable extra padding. When a bufferpool supports this
- * option, gst_buffer_pool_config_set_video_alignment() can be called.
- *
- * When this option is enabled on the bufferpool,
- * #GST_BUFFER_POOL_OPTION_VIDEO_META should also be enabled.
- */
-#define GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT "GstBufferPoolOptionVideoAlignment"
-
-/* setting a bufferpool config */
-void             gst_buffer_pool_config_set_video_alignment  (GstStructure *config, GstVideoAlignment *align);
-gboolean         gst_buffer_pool_config_get_video_alignment  (GstStructure *config, GstVideoAlignment *align);
-
-/* video bufferpool */
-typedef struct _GstVideoBufferPool GstVideoBufferPool;
-typedef struct _GstVideoBufferPoolClass GstVideoBufferPoolClass;
-typedef struct _GstVideoBufferPoolPrivate GstVideoBufferPoolPrivate;
-
-#define GST_TYPE_VIDEO_BUFFER_POOL      (gst_video_buffer_pool_get_type())
-#define GST_IS_VIDEO_BUFFER_POOL(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_BUFFER_POOL))
-#define GST_VIDEO_BUFFER_POOL(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_BUFFER_POOL, GstVideoBufferPool))
-#define GST_VIDEO_BUFFER_POOL_CAST(obj) ((GstVideoBufferPool*)(obj))
-
-struct _GstVideoBufferPool
-{
-  GstBufferPool bufferpool;
-
-  GstVideoBufferPoolPrivate *priv;
-};
-
-struct _GstVideoBufferPoolClass
-{
-  GstBufferPoolClass parent_class;
-};
-
-GType             gst_video_buffer_pool_get_type      (void);
-
-GstBufferPool *   gst_video_buffer_pool_new           (void);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_POOL_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideosink.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideosink.h
deleted file mode 100644
index ac8dc956..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideosink.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*  GStreamer video sink base class
- *  Copyright (C) <2003> Julien Moutte <julien@moutte.net>
- *  Copyright (C) <2009> Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* FIXME 0.11: turn this into a proper base class */
-
-#ifndef __GST_VIDEO_SINK_H__
-#define __GST_VIDEO_SINK_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasesink.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_SINK (gst_video_sink_get_type())
-#define GST_VIDEO_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_SINK, GstVideoSink))
-#define GST_VIDEO_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VIDEO_SINK, GstVideoSinkClass))
-#define GST_IS_VIDEO_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_SINK))
-#define GST_IS_VIDEO_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VIDEO_SINK))
-#define GST_VIDEO_SINK_GET_CLASS(klass) \
-  (G_TYPE_INSTANCE_GET_CLASS ((klass), GST_TYPE_VIDEO_SINK, GstVideoSinkClass))
-
-/**
- * GST_VIDEO_SINK_CAST:
- * @obj: a #GstVideoSink or derived object
- *
- * Cast @obj to a #GstVideoSink without runtime type check.
- */
-#define GST_VIDEO_SINK_CAST(obj)  ((GstVideoSink *) (obj))
-
-/**
- * GST_VIDEO_SINK_PAD:
- * @obj: a #GstVideoSink
- *
- * Get the sink #GstPad of @obj.
- */
-#define GST_VIDEO_SINK_PAD(obj) GST_BASE_SINK_PAD(obj)
-
-#define GST_VIDEO_SINK_WIDTH(obj) (GST_VIDEO_SINK_CAST (obj)->width)
-#define GST_VIDEO_SINK_HEIGHT(obj) (GST_VIDEO_SINK_CAST (obj)->height)
-
-typedef struct _GstVideoSink GstVideoSink;
-typedef struct _GstVideoSinkClass GstVideoSinkClass;
-typedef struct _GstVideoRectangle GstVideoRectangle;
-typedef struct _GstVideoSinkPrivate GstVideoSinkPrivate;
-
-/**
- * GstVideoRectangle:
- * @x: X coordinate of rectangle's top-left point
- * @y: Y coordinate of rectangle's top-left point
- * @w: width of the rectangle
- * @h: height of the rectangle
- *
- * Helper structure representing a rectangular area.
- */
-struct _GstVideoRectangle {
-  gint x;
-  gint y;
-  gint w;
-  gint h;
-};
-
-/**
- * GstVideoSink:
- * @height: video height (derived class needs to set this)
- * @width: video width (derived class needs to set this)
- *
- * The video sink instance structure. Derived video sinks should set the
- * @height and @width members.
- */
-struct _GstVideoSink {
-  GstBaseSink element;    /* FIXME 0.11: this should not be called 'element' */
-
-  /*< public >*/
-  gint width, height;
-
-  /*< private >*/
-  GstVideoSinkPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstVideoSinkClass:
- * @parent_class: the parent class structure
- * @show_frame: render a video frame. Maps to #GstBaseSinkClass.render() and
- *     #GstBaseSinkClass.preroll() vfuncs. Rendering during preroll will be
- *     suppressed if the #GstVideoSink:show-preroll-frame property is set to 
- *     %FALSE.
- *
- * The video sink class structure. Derived classes should override the
- * @show_frame virtual function.
- */
-struct _GstVideoSinkClass {
-  GstBaseSinkClass parent_class;
-
-  GstFlowReturn  (*show_frame) (GstVideoSink *video_sink, GstBuffer *buf);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_video_sink_get_type (void);
-
-void gst_video_sink_center_rect (GstVideoRectangle src, GstVideoRectangle dst,
-                                 GstVideoRectangle *result, gboolean scaling);
-
-G_END_DECLS
-
-#endif  /* __GST_VIDEO_SINK_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideoutils.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideoutils.h
deleted file mode 100644
index 63833e23..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/gstvideoutils.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_UTILS_H_
-#define _GST_VIDEO_UTILS_H_
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-#define GST_TYPE_VIDEO_CODEC_STATE \
-  (gst_video_codec_state_get_type())
-
-#define GST_TYPE_VIDEO_CODEC_FRAME \
-  (gst_video_codec_frame_get_type())
-
-typedef struct _GstVideoCodecState GstVideoCodecState;
-typedef struct _GstVideoCodecFrame GstVideoCodecFrame;
-
-/**
- * GstVideoCodecState:
- * @info: The #GstVideoInfo describing the stream
- * @caps: The #GstCaps
- * @codec_data: (optional) a #GstBuffer corresponding to the
- *     'codec_data' field of a stream.
- *
- * Structure representing the state of an incoming or outgoing video
- * stream for encoders and decoders.
- *
- * Decoders and encoders will receive such a state through their
- * respective @set_format vmethods.
- *
- * Decoders and encoders can set the downstream state, by using the
- * @gst_video_decoder_set_output_state() or
- * @gst_video_encoder_set_output_state() methods.
- */
-struct _GstVideoCodecState
-{
-  /*< private >*/
-  gint ref_count;
-
-  /*< public >*/
-  GstVideoInfo info;
-
-  GstCaps *caps;
-
-  GstBuffer *codec_data;
-
-  /*< private >*/
-  void         *padding[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoCodecFrameFlags:
- * @GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY: is the frame only meant to be decoded
- * @GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT: is the frame a synchronization point (keyframe)
- * @GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME: should the output frame be made a keyframe
- * @GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS: should the encoder output stream headers
- *
- * Flags for #GstVideoCodecFrame
- */
-typedef enum
-{
-  GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY            = (1<<0),
-  GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT             = (1<<1),
-  GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME         = (1<<2),
-  GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS = (1<<3)
-} GstVideoCodecFrameFlags;
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAGS:
- * @frame: a #GstVideoCodecFrame
- *
- * The entire set of flags for the @frame
- */
-#define GST_VIDEO_CODEC_FRAME_FLAGS(frame) ((frame)->flags)
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_IS_SET:
- * @frame: a #GstVideoCodecFrame
- * @flag: a flag to check for
- *
- * Checks whether the given @flag is set
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame,flag)   !!(GST_VIDEO_CODEC_FRAME_FLAGS(frame) & (flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_SET:
- * @frame: a #GstVideoCodecFrame
- * @flag: Flag to set, can be any number of bits in guint32.
- *
- * This macro sets the given bits
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_SET(frame,flag)     (GST_VIDEO_CODEC_FRAME_FLAGS(frame) |= (flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_UNSET:
- * @frame: a #GstVideoCodecFrame
- * @flag: Flag to unset
- *
- * This macro usets the given bits.
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame,flag)   (GST_VIDEO_CODEC_FRAME_FLAGS(frame) &= ~(flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the buffer should only be decoded but not sent downstream.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY))
-
-/**
- * GST_VIDEO_CODEC_FRAME_SET_DECODE_ONLY:
- * @frame: a #GstVideoCodecFrame
- *
- * Sets the buffer to not be sent downstream.
- *
- * Decoder implementation can use this if they have frames that
- * are not meant to be displayed.
- *
- * Encoder implementation can safely ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_SET_DECODE_ONLY(frame)    (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the frame is a synchronization point (like a keyframe).
- *
- * Decoder implementations can use this to detect keyframes.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-
-/**
- * GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT:
- * @frame: a #GstVideoCodecFrame
- *
- * Sets the frame to be a synchronization point (like a keyframe).
- *
- * Encoder implementations should set this accordingly.
- *
- * Decoder implementing parsing features should set this when they
- * detect such a synchronization point.
- */
-#define GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-#define GST_VIDEO_CODEC_FRAME_UNSET_SYNC_POINT(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the frame must be encoded as a keyframe. Applies only to
- * frames provided to encoders. Decoders can safely ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-#define GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-#define GST_VIDEO_CODEC_FRAME_UNSET_FORCE_KEYFRAME(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME_HEADERS:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if encoder should output stream headers before outputting the
- * resulting encoded buffer for the given frame.
- *
- * Applies only to frames provided to encoders. Decoders can safely
- * ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME_HEADERS(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-#define GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME_HEADERS(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-#define GST_VIDEO_CODEC_FRAME_UNSET_FORCE_KEYFRAME_HEADERS(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-
-/**
- * GstVideoCodecFrame:
- * @pts: Presentation timestamp
- * @dts: Decoding timestamp
- * @duration: Duration of the frame
- * @system_frame_number: Unique identifier for the frame. Use this if you need
- *       to get hold of the frame later (like when data is being decoded).
- *       Typical usage in decoders is to set this on the opaque value provided
- *       to the library and get back the frame using gst_video_decoder_get_frame()
- * @distance_from_sync: Distance in frames from the last synchronization point.
- * @input_buffer: the input #GstBuffer that created this frame. The buffer is owned
- *           by the frame and references to the frame instead of the buffer should
- * @output_buffer: the output #GstBuffer. Implementations should set this either
- *           directly, or by using the @gst_video_decoder_alloc_output_frame() or
- *           @gst_video_decoder_alloc_output_buffer() methods. The buffer is owned
- *           by the frame and references to the frame instead of the buffer should
- *           be kept.
- * @deadline: Running time when the frame will be used.
- * @events: Events that will be pushed downstream before this frame is pushed.
- *
- * A #GstVideoCodecFrame represents a video frame both in raw and
- * encoded form.
- */
-struct _GstVideoCodecFrame
-{
-  /*< private >*/
-  gint ref_count;
-
-  guint32 flags;
-
-  /*< public >*/
-  guint32 system_frame_number;	/* ED */
-  guint32 decode_frame_number;	/* ED */
-  guint32 presentation_frame_number; /* ED */
-
-  GstClockTime dts;       /* ED */
-  GstClockTime pts;       /* ED */
-  GstClockTime duration;  /* ED */
-
-  int distance_from_sync;	/* ED */
-
-  GstBuffer *input_buffer;	/* ED */
-  GstBuffer *output_buffer;	/* ED */
-
-  GstClockTime deadline;	/* D */
-
-  /*< private >*/
-
-  /* Events that should be pushed downstream *before*
-   * the next output_buffer */
-  GList *events;		/* ED */
-
-  gpointer       user_data;
-  GDestroyNotify user_data_destroy_notify;
-
-  union {
-    struct {
-      GstClockTime ts;
-      GstClockTime ts2;
-    } ABI;
-    void         *padding[GST_PADDING_LARGE];
-  } abidata;
-};
-
-/* GstVideoCodecState */
-GType           gst_video_codec_state_get_type (void);
-
-GstVideoCodecState *gst_video_codec_state_ref (GstVideoCodecState * state);
-
-void                gst_video_codec_state_unref (GstVideoCodecState * state);
-
-
-/* GstVideoCodecFrame */
-GType                gst_video_codec_frame_get_type (void);
-
-GstVideoCodecFrame  *gst_video_codec_frame_ref (GstVideoCodecFrame * frame);
-void                 gst_video_codec_frame_unref (GstVideoCodecFrame * frame);
-void                 gst_video_codec_frame_set_user_data (GstVideoCodecFrame *frame,
-						          gpointer user_data,
-				                          GDestroyNotify notify);
-gpointer             gst_video_codec_frame_get_user_data (GstVideoCodecFrame *frame);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/navigation.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/navigation.h
deleted file mode 100644
index 2cec16d9..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/navigation.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/* GStreamer Navigation
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2003 David A. Schleef <ds@schleef.org>
- *
- * navigation.h: navigation interface design
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_NAVIGATION_H__
-#define __GST_NAVIGATION_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_NAVIGATION \
-  (gst_navigation_get_type ())
-#define GST_NAVIGATION(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_NAVIGATION, GstNavigation))
-#define GST_IS_NAVIGATION(obj) \
-      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_NAVIGATION))
-#define GST_NAVIGATION_GET_INTERFACE(obj) \
-    (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_NAVIGATION, GstNavigationInterface))
-
-typedef struct _GstNavigation GstNavigation;
-typedef struct _GstNavigationInterface GstNavigationInterface;
-
-/**
- * GstNavigationInterface:
- * @iface: the parent interface
- * @send_event: sending a navigation event
- *
- * Navigation interface.
- */
-struct _GstNavigationInterface {
-  GTypeInterface iface;
-
-  /* virtual functions */
-  void (*send_event) (GstNavigation *navigation, GstStructure *structure);
-};
-
-GType           gst_navigation_get_type (void);
-
-/* Navigation commands */
-
-/**
- * GstNavigationCommand:
- * @GST_NAVIGATION_COMMAND_INVALID: An invalid command entry
- * @GST_NAVIGATION_COMMAND_MENU1: Execute navigation menu command 1. For DVD,
- * this enters the DVD root menu, or exits back to the title from the menu.
- * @GST_NAVIGATION_COMMAND_MENU2: Execute navigation menu command 2. For DVD,
- * this jumps to the DVD title menu.
- * @GST_NAVIGATION_COMMAND_MENU3: Execute navigation menu command 3. For DVD,
- * this jumps into the DVD root menu.
- * @GST_NAVIGATION_COMMAND_MENU4: Execute navigation menu command 4. For DVD,
- * this jumps to the Subpicture menu.
- * @GST_NAVIGATION_COMMAND_MENU5: Execute navigation menu command 5. For DVD,
- * the jumps to the audio menu.
- * @GST_NAVIGATION_COMMAND_MENU6: Execute navigation menu command 6. For DVD,
- * this jumps to the angles menu.
- * @GST_NAVIGATION_COMMAND_MENU7: Execute navigation menu command 7. For DVD,
- * this jumps to the chapter menu.
- * @GST_NAVIGATION_COMMAND_LEFT: Select the next button to the left in a menu,
- * if such a button exists.
- * @GST_NAVIGATION_COMMAND_RIGHT: Select the next button to the right in a menu,
- * if such a button exists.
- * @GST_NAVIGATION_COMMAND_UP: Select the button above the current one in a
- * menu, if such a button exists.
- * @GST_NAVIGATION_COMMAND_DOWN: Select the button below the current one in a
- * menu, if such a button exists.
- * @GST_NAVIGATION_COMMAND_ACTIVATE: Activate (click) the currently selected
- * button in a menu, if such a button exists.
- * @GST_NAVIGATION_COMMAND_PREV_ANGLE: Switch to the previous angle in a
- * multiangle feature.
- * @GST_NAVIGATION_COMMAND_NEXT_ANGLE: Switch to the next angle in a multiangle
- * feature.
- *
- * A set of commands that may be issued to an element providing the
- * #GstNavigation interface. The available commands can be queried via
- * the gst_navigation_query_new_commands() query.
- *
- * For convenience in handling DVD navigation, the MENU commands are aliased as:
- *    GST_NAVIGATION_COMMAND_DVD_MENU            = @GST_NAVIGATION_COMMAND_MENU1
- *    GST_NAVIGATION_COMMAND_DVD_TITLE_MENU      = @GST_NAVIGATION_COMMAND_MENU2
- *    GST_NAVIGATION_COMMAND_DVD_ROOT_MENU       = @GST_NAVIGATION_COMMAND_MENU3
- *    GST_NAVIGATION_COMMAND_DVD_SUBPICTURE_MENU = @GST_NAVIGATION_COMMAND_MENU4
- *    GST_NAVIGATION_COMMAND_DVD_AUDIO_MENU      = @GST_NAVIGATION_COMMAND_MENU5
- *    GST_NAVIGATION_COMMAND_DVD_ANGLE_MENU      = @GST_NAVIGATION_COMMAND_MENU6
- *    GST_NAVIGATION_COMMAND_DVD_CHAPTER_MENU    = @GST_NAVIGATION_COMMAND_MENU7
- */
-typedef enum {
-  GST_NAVIGATION_COMMAND_INVALID  = 0,
-
-  GST_NAVIGATION_COMMAND_MENU1    = 1,
-  GST_NAVIGATION_COMMAND_MENU2    = 2,
-  GST_NAVIGATION_COMMAND_MENU3    = 3,
-  GST_NAVIGATION_COMMAND_MENU4    = 4,
-  GST_NAVIGATION_COMMAND_MENU5    = 5,
-  GST_NAVIGATION_COMMAND_MENU6    = 6,
-  GST_NAVIGATION_COMMAND_MENU7    = 7,
-
-  GST_NAVIGATION_COMMAND_LEFT     = 20,
-  GST_NAVIGATION_COMMAND_RIGHT    = 21,
-  GST_NAVIGATION_COMMAND_UP       = 22,
-  GST_NAVIGATION_COMMAND_DOWN     = 23,
-  GST_NAVIGATION_COMMAND_ACTIVATE = 24,
-
-  GST_NAVIGATION_COMMAND_PREV_ANGLE = 30,
-  GST_NAVIGATION_COMMAND_NEXT_ANGLE = 31
-} GstNavigationCommand;
-
-/* Some aliases for the menu command types */
-#define GST_NAVIGATION_COMMAND_DVD_MENU            GST_NAVIGATION_COMMAND_MENU1
-#define GST_NAVIGATION_COMMAND_DVD_TITLE_MENU      GST_NAVIGATION_COMMAND_MENU2
-#define GST_NAVIGATION_COMMAND_DVD_ROOT_MENU       GST_NAVIGATION_COMMAND_MENU3
-#define GST_NAVIGATION_COMMAND_DVD_SUBPICTURE_MENU GST_NAVIGATION_COMMAND_MENU4
-#define GST_NAVIGATION_COMMAND_DVD_AUDIO_MENU      GST_NAVIGATION_COMMAND_MENU5
-#define GST_NAVIGATION_COMMAND_DVD_ANGLE_MENU      GST_NAVIGATION_COMMAND_MENU6
-#define GST_NAVIGATION_COMMAND_DVD_CHAPTER_MENU    GST_NAVIGATION_COMMAND_MENU7
-
-/* Queries */
-/**
- * GstNavigationQueryType:
- * @GST_NAVIGATION_QUERY_INVALID: invalid query
- * @GST_NAVIGATION_QUERY_COMMANDS: command query
- * @GST_NAVIGATION_QUERY_ANGLES: viewing angle query
- *
- * Tyoes of navigation interface queries.
- */
-typedef enum
-{
-  GST_NAVIGATION_QUERY_INVALID     = 0,
-  GST_NAVIGATION_QUERY_COMMANDS    = 1,
-  GST_NAVIGATION_QUERY_ANGLES      = 2
-} GstNavigationQueryType;
-
-GstNavigationQueryType gst_navigation_query_get_type (GstQuery *query);
-
-GstQuery *      gst_navigation_query_new_commands       (void);
-void            gst_navigation_query_set_commands       (GstQuery *query, gint n_cmds, ...);
-void            gst_navigation_query_set_commandsv      (GstQuery *query, gint n_cmds,
-                                                         GstNavigationCommand *cmds);
-gboolean        gst_navigation_query_parse_commands_length     (GstQuery *query,
-                                                                guint *n_cmds);
-gboolean        gst_navigation_query_parse_commands_nth        (GstQuery *query, guint nth,
-                                                                GstNavigationCommand *cmd);
-
-GstQuery *      gst_navigation_query_new_angles         (void);
-void            gst_navigation_query_set_angles         (GstQuery *query, guint cur_angle,
-                                                         guint n_angles);
-gboolean        gst_navigation_query_parse_angles       (GstQuery *query, guint *cur_angle,
-                                                         guint *n_angles);
-
-/* Element messages */
-/**
- * GstNavigationMessageType:
- * @GST_NAVIGATION_MESSAGE_INVALID: Returned from
- * gst_navigation_message_get_type() when the passed message is not a
- * navigation message.
- * @GST_NAVIGATION_MESSAGE_MOUSE_OVER: Sent when the mouse moves over or leaves a
- * clickable region of the output, such as a DVD menu button.
- * @GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED: Sent when the set of available commands
- * changes and should re-queried by interested applications.
- * @GST_NAVIGATION_MESSAGE_ANGLES_CHANGED: Sent when display angles in a multi-angle
- * feature (such as a multiangle DVD) change - either angles have appeared or
- * disappeared.
- *
- * A set of notifications that may be received on the bus when navigation
- * related status changes.
- */
-typedef enum {
-  GST_NAVIGATION_MESSAGE_INVALID,
-  GST_NAVIGATION_MESSAGE_MOUSE_OVER,
-  GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED,
-  GST_NAVIGATION_MESSAGE_ANGLES_CHANGED
-} GstNavigationMessageType;
-
-GstNavigationMessageType gst_navigation_message_get_type (GstMessage *message);
-
-GstMessage *    gst_navigation_message_new_mouse_over       (GstObject *src,
-                                                             gboolean active);
-gboolean        gst_navigation_message_parse_mouse_over     (GstMessage *message,
-                                                             gboolean *active);
-
-GstMessage *    gst_navigation_message_new_commands_changed (GstObject *src);
-
-GstMessage *    gst_navigation_message_new_angles_changed   (GstObject *src,
-                                                             guint cur_angle,
-                                                             guint n_angles);
-gboolean        gst_navigation_message_parse_angles_changed (GstMessage *message,
-                                                             guint *cur_angle,
-                                                             guint *n_angles);
-
-/* event parsing functions */
-/**
- * GstNavigationEventType:
- * @GST_NAVIGATION_EVENT_INVALID: Returned from
- * gst_navigation_event_get_type() when the passed event is not a navigation event.
- * @GST_NAVIGATION_EVENT_KEY_PRESS: A key press event. Use
- * gst_navigation_event_parse_key_event() to extract the details from the event.
- * @GST_NAVIGATION_EVENT_KEY_RELEASE: A key release event. Use
- * gst_navigation_event_parse_key_event() to extract the details from the event.
- * @GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS: A mouse button press event. Use
- * gst_navigation_event_parse_mouse_button_event() to extract the details from the
- * event.
- * @GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE: A mouse button release event. Use
- * gst_navigation_event_parse_mouse_button_event() to extract the details from the
- * event.
- * @GST_NAVIGATION_EVENT_MOUSE_MOVE: A mouse movement event. Use
- * gst_navigation_event_parse_mouse_move_event() to extract the details from the
- * event.
- * @GST_NAVIGATION_EVENT_COMMAND: A navigation command event. Use
- * gst_navigation_event_parse_command() to extract the details from the event.
- *
- * Enum values for the various events that an element implementing the
- * GstNavigation interface might send up the pipeline.
- */
-typedef enum {
-  GST_NAVIGATION_EVENT_INVALID                    = 0,
-  GST_NAVIGATION_EVENT_KEY_PRESS                  = 1,
-  GST_NAVIGATION_EVENT_KEY_RELEASE                = 2,
-  GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS         = 3,
-  GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE       = 4,
-  GST_NAVIGATION_EVENT_MOUSE_MOVE                 = 5,
-  GST_NAVIGATION_EVENT_COMMAND                    = 6
-} GstNavigationEventType;
-
-GstNavigationEventType gst_navigation_event_get_type          (GstEvent *event);
-
-gboolean        gst_navigation_event_parse_key_event          (GstEvent *event,
-                                                               const gchar **key);
-gboolean        gst_navigation_event_parse_mouse_button_event (GstEvent *event,
-                                                               gint *button, gdouble *x, gdouble *y);
-gboolean        gst_navigation_event_parse_mouse_move_event   (GstEvent *event,
-                                                               gdouble *x, gdouble *y);
-gboolean        gst_navigation_event_parse_command            (GstEvent *event,
-                                                               GstNavigationCommand *command);
-
-/* interface virtual function wrappers */
-void    gst_navigation_send_event       (GstNavigation *navigation,
-                                         GstStructure *structure);
-void    gst_navigation_send_key_event   (GstNavigation *navigation,
-                                         const char *event, const char *key);
-void    gst_navigation_send_mouse_event (GstNavigation *navigation,
-                                         const char *event, int button, double x, double y);
-void    gst_navigation_send_command     (GstNavigation *navigation,
-                                         GstNavigationCommand command);
-
-G_END_DECLS
-
-#endif /* __GST_NAVIGATION_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-blend.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-blend.h
deleted file mode 100644
index 906752ba..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-blend.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Gstreamer video blending utility functions
- *
- * Copyright (C) <2011> Intel Corporation
- * Copyright (C) <2011> Collabora Ltd.
- * Copyright (C) <2011> Thibault Saunier <thibault.saunier@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef  __GST_VIDEO_BLEND__
-#define  __GST_VIDEO_BLEND__
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-void       gst_video_blend_scale_linear_RGBA  (GstVideoInfo * src, GstBuffer * src_buffer,
-                                               gint dest_height, gint dest_width,
-                                               GstVideoInfo * dest, GstBuffer ** dest_buffer);
-
-gboolean   gst_video_blend                    (GstVideoFrame * dest,
-                                               GstVideoFrame * src,
-                                               gint x, gint y,
-                                               gfloat global_alpha);
-
-#endif
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-color.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-color.h
deleted file mode 100644
index dcbb66f4..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-color.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_COLOR_H__
-#define __GST_VIDEO_COLOR_H__
-
-#include <gst/gst.h>
-
-#include <gst/video/video-format.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstVideoColorRange:
- * @GST_VIDEO_COLOR_RANGE_UNKNOWN: unknown range
- * @GST_VIDEO_COLOR_RANGE_0_255: [0..255] for 8 bit components
- * @GST_VIDEO_COLOR_RANGE_16_235: [16..235] for 8 bit components. Chroma has
- *                 [16..240] range.
- *
- * Possible color range values. These constants are defined for 8 bit color
- * values and can be scaled for other bit depths.
- */
-typedef enum {
-  GST_VIDEO_COLOR_RANGE_UNKNOWN = 0,
-  GST_VIDEO_COLOR_RANGE_0_255,
-  GST_VIDEO_COLOR_RANGE_16_235
-} GstVideoColorRange;
-
-/**
- * GstVideoColorMatrix:
- * @GST_VIDEO_COLOR_MATRIX_UNKNOWN: unknown matrix
- * @GST_VIDEO_COLOR_MATRIX_RGB: identity matrix
- * @GST_VIDEO_COLOR_MATRIX_FCC: FCC color matrix
- * @GST_VIDEO_COLOR_MATRIX_BT709: ITU-R BT.709 color matrix
- * @GST_VIDEO_COLOR_MATRIX_BT601: ITU-R BT.601 color matrix
- * @GST_VIDEO_COLOR_MATRIX_SMPTE240M: SMPTE 240M color matrix
- *
- * The color matrix is used to convert between Y'PbPr and
- * non-linear RGB (R'G'B')
- */
-typedef enum {
-  GST_VIDEO_COLOR_MATRIX_UNKNOWN = 0,
-  GST_VIDEO_COLOR_MATRIX_RGB,
-  GST_VIDEO_COLOR_MATRIX_FCC,
-  GST_VIDEO_COLOR_MATRIX_BT709,
-  GST_VIDEO_COLOR_MATRIX_BT601,
-  GST_VIDEO_COLOR_MATRIX_SMPTE240M
-} GstVideoColorMatrix;
-
-/**
- * GstVideoTransferFunction:
- * @GST_VIDEO_TRANSFER_UNKNOWN: unknown transfer function
- * @GST_VIDEO_TRANSFER_GAMMA10: linear RGB, gamma 1.0 curve
- * @GST_VIDEO_TRANSFER_GAMMA18: Gamma 1.8 curve
- * @GST_VIDEO_TRANSFER_GAMMA20: Gamma 2.0 curve
- * @GST_VIDEO_TRANSFER_GAMMA22: Gamma 2.2 curve
- * @GST_VIDEO_TRANSFER_BT709: Gamma 2.2 curve with a linear segment in the lower
- *                           range
- * @GST_VIDEO_TRANSFER_SMPTE240M: Gamma 2.2 curve with a linear segment in the
- *                               lower range
- * @GST_VIDEO_TRANSFER_SRGB: Gamma 2.4 curve with a linear segment in the lower
- *                          range
- * @GST_VIDEO_TRANSFER_GAMMA28: Gamma 2.8 curve
- * @GST_VIDEO_TRANSFER_LOG100: Logarithmic transfer characteristic
- *                             100:1 range
- * @GST_VIDEO_TRANSFER_LOG316: Logarithmic transfer characteristic
- *                             316.22777:1 range
- *
- * The video transfer function defines the formula for converting between
- * non-linear RGB (R'G'B') and linear RGB
- */
-typedef enum {
-  GST_VIDEO_TRANSFER_UNKNOWN = 0,
-  GST_VIDEO_TRANSFER_GAMMA10,
-  GST_VIDEO_TRANSFER_GAMMA18,
-  GST_VIDEO_TRANSFER_GAMMA20,
-  GST_VIDEO_TRANSFER_GAMMA22,
-  GST_VIDEO_TRANSFER_BT709,
-  GST_VIDEO_TRANSFER_SMPTE240M,
-  GST_VIDEO_TRANSFER_SRGB,
-  GST_VIDEO_TRANSFER_GAMMA28,
-  GST_VIDEO_TRANSFER_LOG100,
-  GST_VIDEO_TRANSFER_LOG316
-} GstVideoTransferFunction;
-
-/**
- * GstVideoColorPrimaries:
- * @GST_VIDEO_COLOR_PRIMARIES_UNKNOWN: unknown color primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT709: BT709 primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT470M: BT470M primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT470BG: BT470BG primaries
- * @GST_VIDEO_COLOR_PRIMARIES_SMPTE170M: SMPTE170M primaries
- * @GST_VIDEO_COLOR_PRIMARIES_SMPTE240M: SMPTE240M primaries
- * @GST_VIDEO_COLOR_PRIMARIES_FILM: Generic film
- *
- * The color primaries define the how to transform linear RGB values to and from
- * the CIE XYZ colorspace.
- */
-typedef enum {
-  GST_VIDEO_COLOR_PRIMARIES_UNKNOWN = 0,
-  GST_VIDEO_COLOR_PRIMARIES_BT709,
-  GST_VIDEO_COLOR_PRIMARIES_BT470M,
-  GST_VIDEO_COLOR_PRIMARIES_BT470BG,
-  GST_VIDEO_COLOR_PRIMARIES_SMPTE170M,
-  GST_VIDEO_COLOR_PRIMARIES_SMPTE240M,
-  GST_VIDEO_COLOR_PRIMARIES_FILM
-} GstVideoColorPrimaries;
-
-/**
- * GstVideoColorimetry:
- * @range: the color range. This is the valid range for the samples.
- *         It is used to convert the samples to Y'PbPr values.
- * @matrix: the color matrix. Used to convert between Y'PbPr and
- *          non-linear RGB (R'G'B')
- * @transfer: the transfer function. used to convert between R'G'B' and RGB
- * @primaries: color primaries. used to convert between R'G'B' and CIE XYZ
- *
- * Structure describing the color info.
- */
-typedef struct {
-  GstVideoColorRange        range;
-  GstVideoColorMatrix       matrix;
-  GstVideoTransferFunction  transfer;
-  GstVideoColorPrimaries    primaries;
-} GstVideoColorimetry;
-
-/* predefined colorimetry */
-#define GST_VIDEO_COLORIMETRY_BT601       "bt601"
-#define GST_VIDEO_COLORIMETRY_BT709       "bt709"
-#define GST_VIDEO_COLORIMETRY_SMPTE240M   "smpte240m"
-
-gboolean     gst_video_colorimetry_matches     (GstVideoColorimetry *cinfo, const gchar *color);
-gboolean     gst_video_colorimetry_from_string (GstVideoColorimetry *cinfo, const gchar *color);
-gchar *      gst_video_colorimetry_to_string   (GstVideoColorimetry *cinfo);
-
-/* compute offset and scale */
-void         gst_video_color_range_offsets     (GstVideoColorRange range,
-                                                const GstVideoFormatInfo *info,
-                                                gint offset[GST_VIDEO_MAX_COMPONENTS],
-                                                gint scale[GST_VIDEO_MAX_COMPONENTS]);
-
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_COLOR_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-enumtypes.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-enumtypes.h
deleted file mode 100644
index 6e78a829..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-enumtypes.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-#ifndef __GST_VIDEO_ENUM_TYPES_H__
-#define __GST_VIDEO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "video-format.h" */
-GType gst_video_format_get_type (void);
-#define GST_TYPE_VIDEO_FORMAT (gst_video_format_get_type())
-GType gst_video_chroma_site_get_type (void);
-#define GST_TYPE_VIDEO_CHROMA_SITE (gst_video_chroma_site_get_type())
-GType gst_video_format_flags_get_type (void);
-#define GST_TYPE_VIDEO_FORMAT_FLAGS (gst_video_format_flags_get_type())
-GType gst_video_pack_flags_get_type (void);
-#define GST_TYPE_VIDEO_PACK_FLAGS (gst_video_pack_flags_get_type())
-
-/* enumerations from "video-color.h" */
-GType gst_video_color_range_get_type (void);
-#define GST_TYPE_VIDEO_COLOR_RANGE (gst_video_color_range_get_type())
-GType gst_video_color_matrix_get_type (void);
-#define GST_TYPE_VIDEO_COLOR_MATRIX (gst_video_color_matrix_get_type())
-GType gst_video_transfer_function_get_type (void);
-#define GST_TYPE_VIDEO_TRANSFER_FUNCTION (gst_video_transfer_function_get_type())
-GType gst_video_color_primaries_get_type (void);
-#define GST_TYPE_VIDEO_COLOR_PRIMARIES (gst_video_color_primaries_get_type())
-
-/* enumerations from "video-info.h" */
-GType gst_video_interlace_mode_get_type (void);
-#define GST_TYPE_VIDEO_INTERLACE_MODE (gst_video_interlace_mode_get_type())
-GType gst_video_flags_get_type (void);
-#define GST_TYPE_VIDEO_FLAGS (gst_video_flags_get_type())
-
-/* enumerations from "colorbalance.h" */
-GType gst_color_balance_type_get_type (void);
-#define GST_TYPE_COLOR_BALANCE_TYPE (gst_color_balance_type_get_type())
-
-/* enumerations from "navigation.h" */
-GType gst_navigation_command_get_type (void);
-#define GST_TYPE_NAVIGATION_COMMAND (gst_navigation_command_get_type())
-GType gst_navigation_query_type_get_type (void);
-#define GST_TYPE_NAVIGATION_QUERY_TYPE (gst_navigation_query_type_get_type())
-GType gst_navigation_message_type_get_type (void);
-#define GST_TYPE_NAVIGATION_MESSAGE_TYPE (gst_navigation_message_type_get_type())
-GType gst_navigation_event_type_get_type (void);
-#define GST_TYPE_NAVIGATION_EVENT_TYPE (gst_navigation_event_type_get_type())
-G_END_DECLS
-
-#endif /* __GST_VIDEO_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-event.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-event.h
deleted file mode 100644
index 78559f6f..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-event.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_EVENT_H__
-#define __GST_VIDEO_EVENT_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/* video still frame event creation and parsing */
-
-GstEvent *     gst_video_event_new_still_frame   (gboolean in_still);
-
-gboolean       gst_video_event_parse_still_frame (GstEvent * event, gboolean * in_still);
-
-/* video force key unit event creation and parsing */
-
-GstEvent * gst_video_event_new_downstream_force_key_unit (GstClockTime timestamp,
-                                                          GstClockTime stream_time,
-                                                          GstClockTime running_time,
-                                                          gboolean all_headers,
-                                                          guint count);
-
-gboolean gst_video_event_parse_downstream_force_key_unit (GstEvent * event,
-                                                          GstClockTime * timestamp,
-                                                          GstClockTime * stream_time,
-                                                          GstClockTime * running_time,
-                                                          gboolean * all_headers,
-                                                          guint * count);
-
-GstEvent * gst_video_event_new_upstream_force_key_unit (GstClockTime running_time,
-                                                        gboolean all_headers,
-                                                        guint count);
-
-gboolean gst_video_event_parse_upstream_force_key_unit (GstEvent * event,
-                                                        GstClockTime * running_time,
-                                                        gboolean * all_headers,
-                                                        guint * count);
-
-gboolean gst_video_event_is_force_key_unit(GstEvent *event);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_EVENT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-format.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-format.h
deleted file mode 100644
index 25229cc8..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-format.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_FORMAT_H__
-#define __GST_VIDEO_FORMAT_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#include <gst/video/video-enumtypes.h>
-
-/**
- * GstVideoFormat:
- * @GST_VIDEO_FORMAT_UNKNOWN: Unknown or unset video format id
- * @GST_VIDEO_FORMAT_ENCODED: Encoded video format
- * @GST_VIDEO_FORMAT_I420: planar 4:2:0 YUV
- * @GST_VIDEO_FORMAT_YV12: planar 4:2:0 YVU (like I420 but UV planes swapped)
- * @GST_VIDEO_FORMAT_YUY2: packed 4:2:2 YUV (Y0-U0-Y1-V0 Y2-U2-Y3-V2 Y4 ...)
- * @GST_VIDEO_FORMAT_UYVY: packed 4:2:2 YUV (U0-Y0-V0-Y1 U2-Y2-V2-Y3 U4 ...)
- * @GST_VIDEO_FORMAT_AYUV: packed 4:4:4 YUV with alpha channel (A0-Y0-U0-V0 ...)
- * @GST_VIDEO_FORMAT_RGBx: sparse rgb packed into 32 bit, space last
- * @GST_VIDEO_FORMAT_BGRx: sparse reverse rgb packed into 32 bit, space last
- * @GST_VIDEO_FORMAT_xRGB: sparse rgb packed into 32 bit, space first
- * @GST_VIDEO_FORMAT_xBGR: sparse reverse rgb packed into 32 bit, space first
- * @GST_VIDEO_FORMAT_RGBA: rgb with alpha channel last
- * @GST_VIDEO_FORMAT_BGRA: reverse rgb with alpha channel last
- * @GST_VIDEO_FORMAT_ARGB: rgb with alpha channel first
- * @GST_VIDEO_FORMAT_ABGR: reverse rgb with alpha channel first
- * @GST_VIDEO_FORMAT_RGB: rgb
- * @GST_VIDEO_FORMAT_BGR: reverse rgb
- * @GST_VIDEO_FORMAT_Y41B: planar 4:1:1 YUV
- * @GST_VIDEO_FORMAT_Y42B: planar 4:2:2 YUV
- * @GST_VIDEO_FORMAT_YVYU: packed 4:2:2 YUV (Y0-V0-Y1-U0 Y2-V2-Y3-U2 Y4 ...)
- * @GST_VIDEO_FORMAT_Y444: planar 4:4:4 YUV
- * @GST_VIDEO_FORMAT_v210: packed 4:2:2 10-bit YUV, complex format
- * @GST_VIDEO_FORMAT_v216: packed 4:2:2 16-bit YUV, Y0-U0-Y1-V1 order
- * @GST_VIDEO_FORMAT_NV12: planar 4:2:0 YUV with interleaved UV plane
- * @GST_VIDEO_FORMAT_NV21: planar 4:2:0 YUV with interleaved VU plane
- * @GST_VIDEO_FORMAT_GRAY8: 8-bit grayscale
- * @GST_VIDEO_FORMAT_GRAY16_BE: 16-bit grayscale, most significant byte first
- * @GST_VIDEO_FORMAT_GRAY16_LE: 16-bit grayscale, least significant byte first
- * @GST_VIDEO_FORMAT_v308: packed 4:4:4 YUV
- * @GST_VIDEO_FORMAT_RGB16: rgb 5-6-5 bits per component
- * @GST_VIDEO_FORMAT_BGR16: reverse rgb 5-6-5 bits per component
- * @GST_VIDEO_FORMAT_RGB15: rgb 5-5-5 bits per component
- * @GST_VIDEO_FORMAT_BGR15: reverse rgb 5-5-5 bits per component
- * @GST_VIDEO_FORMAT_UYVP: packed 10-bit 4:2:2 YUV (U0-Y0-V0-Y1 U2-Y2-V2-Y3 U4 ...)
- * @GST_VIDEO_FORMAT_A420: planar 4:4:2:0 AYUV
- * @GST_VIDEO_FORMAT_RGB8P: 8-bit paletted RGB
- * @GST_VIDEO_FORMAT_YUV9: planar 4:1:0 YUV
- * @GST_VIDEO_FORMAT_YVU9: planar 4:1:0 YUV (like YUV9 but UV planes swapped)
- * @GST_VIDEO_FORMAT_IYU1: packed 4:1:1 YUV (Cb-Y0-Y1-Cr-Y2-Y3 ...)
- * @GST_VIDEO_FORMAT_ARGB64: rgb with alpha channel first, 16 bits per channel
- * @GST_VIDEO_FORMAT_AYUV64: packed 4:4:4 YUV with alpha channel, 16 bits per channel (A0-Y0-U0-V0 ...)
- * @GST_VIDEO_FORMAT_r210: packed 4:4:4 RGB, 10 bits per channel
- * @GST_VIDEO_FORMAT_I420_10BE: planar 4:2:0 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I420_10LE: planar 4:2:0 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I422_10BE: planar 4:2:2 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I422_10LE: planar 4:2:2 YUV, 10 bits per channel
- *
- * Enum value describing the most common video formats.
- */
-typedef enum {
-  GST_VIDEO_FORMAT_UNKNOWN,
-  GST_VIDEO_FORMAT_ENCODED,
-  GST_VIDEO_FORMAT_I420,
-  GST_VIDEO_FORMAT_YV12,
-  GST_VIDEO_FORMAT_YUY2,
-  GST_VIDEO_FORMAT_UYVY,
-  GST_VIDEO_FORMAT_AYUV,
-  GST_VIDEO_FORMAT_RGBx,
-  GST_VIDEO_FORMAT_BGRx,
-  GST_VIDEO_FORMAT_xRGB,
-  GST_VIDEO_FORMAT_xBGR,
-  GST_VIDEO_FORMAT_RGBA,
-  GST_VIDEO_FORMAT_BGRA,
-  GST_VIDEO_FORMAT_ARGB,
-  GST_VIDEO_FORMAT_ABGR,
-  GST_VIDEO_FORMAT_RGB,
-  GST_VIDEO_FORMAT_BGR,
-  GST_VIDEO_FORMAT_Y41B,
-  GST_VIDEO_FORMAT_Y42B,
-  GST_VIDEO_FORMAT_YVYU,
-  GST_VIDEO_FORMAT_Y444,
-  GST_VIDEO_FORMAT_v210,
-  GST_VIDEO_FORMAT_v216,
-  GST_VIDEO_FORMAT_NV12,
-  GST_VIDEO_FORMAT_NV21,
-  GST_VIDEO_FORMAT_GRAY8,
-  GST_VIDEO_FORMAT_GRAY16_BE,
-  GST_VIDEO_FORMAT_GRAY16_LE,
-  GST_VIDEO_FORMAT_v308,
-  GST_VIDEO_FORMAT_RGB16,
-  GST_VIDEO_FORMAT_BGR16,
-  GST_VIDEO_FORMAT_RGB15,
-  GST_VIDEO_FORMAT_BGR15,
-  GST_VIDEO_FORMAT_UYVP,
-  GST_VIDEO_FORMAT_A420,
-  GST_VIDEO_FORMAT_RGB8P,
-  GST_VIDEO_FORMAT_YUV9,
-  GST_VIDEO_FORMAT_YVU9,
-  GST_VIDEO_FORMAT_IYU1,
-  GST_VIDEO_FORMAT_ARGB64,
-  GST_VIDEO_FORMAT_AYUV64,
-  GST_VIDEO_FORMAT_r210,
-  GST_VIDEO_FORMAT_I420_10BE,
-  GST_VIDEO_FORMAT_I420_10LE,
-  GST_VIDEO_FORMAT_I422_10BE,
-  GST_VIDEO_FORMAT_I422_10LE,
-} GstVideoFormat;
-
-#define GST_VIDEO_MAX_PLANES 4
-#define GST_VIDEO_MAX_COMPONENTS 4
-
-typedef struct _GstVideoFormatInfo GstVideoFormatInfo;
-
-/**
- * GstVideoChromaSite:
- * @GST_VIDEO_CHROMA_SITE_UNKNOWN: unknown cositing
- * @GST_VIDEO_CHROMA_SITE_NONE: no cositing
- * @GST_VIDEO_CHROMA_SITE_H_COSITED: chroma is horizontally cosited
- * @GST_VIDEO_CHROMA_SITE_V_COSITED: chroma is vertically cosited
- * @GST_VIDEO_CHROMA_SITE_ALT_LINE: choma samples are sited on alternate lines
- * @GST_VIDEO_CHROMA_SITE_COSITED: chroma samples cosited with luma samples
- * @GST_VIDEO_CHROMA_SITE_JPEG: jpeg style cositing, also for mpeg1 and mjpeg
- * @GST_VIDEO_CHROMA_SITE_MPEG2: mpeg2 style cositing
- * @GST_VIDEO_CHROMA_SITE_DV: DV style cositing
- *
- * Various Chroma sitings.
- */
-typedef enum {
-  GST_VIDEO_CHROMA_SITE_UNKNOWN   =  0,
-  GST_VIDEO_CHROMA_SITE_NONE      = (1 << 0),
-  GST_VIDEO_CHROMA_SITE_H_COSITED = (1 << 1),
-  GST_VIDEO_CHROMA_SITE_V_COSITED = (1 << 2),
-  GST_VIDEO_CHROMA_SITE_ALT_LINE  = (1 << 3),
-  /* some common chroma cositing */
-  GST_VIDEO_CHROMA_SITE_COSITED   = (GST_VIDEO_CHROMA_SITE_H_COSITED | GST_VIDEO_CHROMA_SITE_V_COSITED),
-  GST_VIDEO_CHROMA_SITE_JPEG      = (GST_VIDEO_CHROMA_SITE_NONE),
-  GST_VIDEO_CHROMA_SITE_MPEG2     = (GST_VIDEO_CHROMA_SITE_H_COSITED),
-  GST_VIDEO_CHROMA_SITE_DV        = (GST_VIDEO_CHROMA_SITE_COSITED | GST_VIDEO_CHROMA_SITE_ALT_LINE),
-} GstVideoChromaSite;
-
-GstVideoChromaSite    gst_video_chroma_from_string   (const gchar * s);
-const gchar *         gst_video_chroma_to_string     (GstVideoChromaSite site);
-
-/**
- * GstVideoFormatFlags:
- * @GST_VIDEO_FORMAT_FLAG_YUV: The video format is YUV, components are numbered
- *   0=Y, 1=U, 2=V.
- * @GST_VIDEO_FORMAT_FLAG_RGB: The video format is RGB, components are numbered
- *   0=R, 1=G, 2=B.
- * @GST_VIDEO_FORMAT_FLAG_GRAY: The video is gray, there is one gray component
- *   with index 0.
- * @GST_VIDEO_FORMAT_FLAG_ALPHA: The video format has an alpha components with
- *   the number 3.
- * @GST_VIDEO_FORMAT_FLAG_LE: The video format has data stored in little
- *   endianness.
- * @GST_VIDEO_FORMAT_FLAG_PALETTE: The video format has a palette. The palette
- *   is stored in the second plane and indexes are stored in the first plane.
- * @GST_VIDEO_FORMAT_FLAG_COMPLEX: The video format has a complex layout that
- *   can't be described with the usual information in the #GstVideoFormatInfo.
- * @GST_VIDEO_FORMAT_FLAG_UNPACK: This format can be used in a
- *   #GstVideoFormatUnpack and #GstVideoFormatPack function.
- *
- * The different video flags that a format info can have.
- */
-typedef enum
-{
-  GST_VIDEO_FORMAT_FLAG_YUV      = (1 << 0),
-  GST_VIDEO_FORMAT_FLAG_RGB      = (1 << 1),
-  GST_VIDEO_FORMAT_FLAG_GRAY     = (1 << 2),
-  GST_VIDEO_FORMAT_FLAG_ALPHA    = (1 << 3),
-  GST_VIDEO_FORMAT_FLAG_LE       = (1 << 4),
-  GST_VIDEO_FORMAT_FLAG_PALETTE  = (1 << 5),
-  GST_VIDEO_FORMAT_FLAG_COMPLEX  = (1 << 6),
-  GST_VIDEO_FORMAT_FLAG_UNPACK   = (1 << 7)
-} GstVideoFormatFlags;
-
-/* YUV components */
-#define GST_VIDEO_COMP_Y  0
-#define GST_VIDEO_COMP_U  1
-#define GST_VIDEO_COMP_V  2
-
-/* RGB components */
-#define GST_VIDEO_COMP_R  0
-#define GST_VIDEO_COMP_G  1
-#define GST_VIDEO_COMP_B  2
-
-/* alpha component */
-#define GST_VIDEO_COMP_A  3
-
-/* palette components */
-#define GST_VIDEO_COMP_INDEX    0
-#define GST_VIDEO_COMP_PALETTE  1
-
-/**
- * GstVideoPackFlags:
- * @GST_VIDEO_PACK_FLAG_NONE: No flag
- * @GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE: When the source has a smaller depth
- *   than the target format, set the least significant bits of the target
- *   to 0. This is likely sightly faster but less accurate. When this flag
- *   is not specified, the most significant bits of the source are duplicated
- *   in the least significant bits of the destination.
- *
- * The different flags that can be used when packing and unpacking.
- */
-typedef enum
-{
-  GST_VIDEO_PACK_FLAG_NONE           = 0,
-  GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE = 1
-} GstVideoPackFlags;
-
-/**
- * GstVideoFormatUnpack:
- * @info: a #GstVideoFormatInfo
- * @flags: flags to control the unpacking
- * @dest: a destination array
- * @data: pointers to the data planes
- * @stride: strides of the planes
- * @x: the x position in the image to start from
- * @y: the y position in the image to start from
- * @width: the amount of pixels to unpack.
- *
- * Unpacks @width pixels from the given planes and strides containing data of
- * format @info. The pixels will be unpacked into @dest which each component
- * interleaved. @dest should at least be big enough to hold @width *
- * n_components * size(unpack_format) bytes.
- */
-typedef void (*GstVideoFormatUnpack)         (const GstVideoFormatInfo *info,
-                                              GstVideoPackFlags flags, gpointer dest,
-                                              const gpointer data[GST_VIDEO_MAX_PLANES],
-                                              const gint stride[GST_VIDEO_MAX_PLANES],
-                                              gint x, gint y, gint width);
-/**
- * GstVideoFormatPack:
- * @info: a #GstVideoFormatInfo
- * @flags: flags to control the packing
- * @src: a source array
- * @sstride: the source array stride
- * @data: pointers to the destination data planes
- * @stride: strides of the destination planes
- * @chroma_site: the chroma siting of the target when subsampled
- * @y: the y position in the image to pack to
- * @width: the amount of pixels to pack.
- *
- * Packs @width pixels from @src to the given planes and strides in the
- * format @info. The pixels from source have each component interleaved
- * and will be packed into the planes in @data.
- *
- * This function operates on pack_lines lines, meaning that @src should
- * contain at least pack_lines lines with a stride of @sstride and @y
- * should be a multiple of pack_lines.
- */
-typedef void (*GstVideoFormatPack)           (const GstVideoFormatInfo *info,
-                                              GstVideoPackFlags flags,
-                                              const gpointer src, gint sstride,
-                                              gpointer data[GST_VIDEO_MAX_PLANES],
-                                              const gint stride[GST_VIDEO_MAX_PLANES],
-                                              GstVideoChromaSite chroma_site,
-                                              gint y, gint width);
-
-/**
- * GstVideoFormatInfo:
- * @format: #GstVideoFormat
- * @name: string representation of the format
- * @description: use readable description of the format
- * @flags: #GstVideoFormatFlags
- * @bits: The number of bits used to pack data items. This can be less than 8
- *    when multiple pixels are stored in a byte. for values > 8 multiple bytes
- *    should be read according to the endianness flag before applying the shift
- *    and mask.
- * @n_components: the number of components in the video format.
- * @shift: the number of bits to shift away to get the component data
- * @depth: the depth in bits for each component
- * @pixel_stride: the pixel stride of each component. This is the amount of
- *    bytes to the pixel immediately to the right. When bits < 8, the stride is
- *    expressed in bits. For 24-bit RGB, this would be 3 bytes, for example,
- *    while it would be 4 bytes for RGBx or ARGB.
- * @n_planes: the number of planes for this format. The number of planes can be
- *    less than the amount of components when multiple components are packed into
- *    one plane.
- * @plane: the plane number where a component can be found
- * @poffset: the offset in the plane where the first pixel of the components
- *    can be found.
- * @w_sub: subsampling factor of the width for the component. Use
- *     GST_VIDEO_SUB_SCALE to scale a width.
- * @h_sub: subsampling factor of the height for the component. Use
- *     GST_VIDEO_SUB_SCALE to scale a height.
- * @unpack_format: the format of the unpacked pixels. This format must have the
- *     #GST_VIDEO_FORMAT_FLAG_UNPACK flag set.
- * @unpack_func: an unpack function for this format
- * @pack_lines: the amount of lines that will be packed
- * @pack_func: an pack function for this format
- *
- * Information for a video format.
- */
-struct _GstVideoFormatInfo {
-  GstVideoFormat format;
-  const gchar *name;
-  const gchar *description;
-  GstVideoFormatFlags flags;
-  guint bits;
-  guint n_components;
-  guint shift[GST_VIDEO_MAX_COMPONENTS];
-  guint depth[GST_VIDEO_MAX_COMPONENTS];
-  gint  pixel_stride[GST_VIDEO_MAX_COMPONENTS];
-  guint n_planes;
-  guint plane[GST_VIDEO_MAX_COMPONENTS];
-  guint poffset[GST_VIDEO_MAX_COMPONENTS];
-  guint w_sub[GST_VIDEO_MAX_COMPONENTS];
-  guint h_sub[GST_VIDEO_MAX_COMPONENTS];
-
-  GstVideoFormat unpack_format;
-  GstVideoFormatUnpack unpack_func;
-  gint pack_lines;
-  GstVideoFormatPack pack_func;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_VIDEO_FORMAT_INFO_FORMAT(info)       ((info)->format)
-#define GST_VIDEO_FORMAT_INFO_NAME(info)         ((info)->name)
-#define GST_VIDEO_FORMAT_INFO_FLAGS(info)        ((info)->flags)
-
-#define GST_VIDEO_FORMAT_INFO_IS_YUV(info)       ((info)->flags & GST_VIDEO_FORMAT_FLAG_YUV)
-#define GST_VIDEO_FORMAT_INFO_IS_RGB(info)       ((info)->flags & GST_VIDEO_FORMAT_FLAG_RGB)
-#define GST_VIDEO_FORMAT_INFO_IS_GRAY(info)      ((info)->flags & GST_VIDEO_FORMAT_FLAG_GRAY)
-#define GST_VIDEO_FORMAT_INFO_HAS_ALPHA(info)    ((info)->flags & GST_VIDEO_FORMAT_FLAG_ALPHA)
-#define GST_VIDEO_FORMAT_INFO_IS_LE(info)        ((info)->flags & GST_VIDEO_FORMAT_FLAG_LE)
-#define GST_VIDEO_FORMAT_INFO_HAS_PALETTE(info)  ((info)->flags & GST_VIDEO_FORMAT_FLAG_PALETTE)
-#define GST_VIDEO_FORMAT_INFO_IS_COMPLEX(info)   ((info)->flags & GST_VIDEO_FORMAT_FLAG_COMPLEX)
-
-#define GST_VIDEO_FORMAT_INFO_BITS(info)         ((info)->bits)
-#define GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info) ((info)->n_components)
-#define GST_VIDEO_FORMAT_INFO_SHIFT(info,c)      ((info)->shift[c])
-#define GST_VIDEO_FORMAT_INFO_DEPTH(info,c)      ((info)->depth[c])
-/**
- * GST_VIDEO_FORMAT_INFO_PSTRIDE:
- *
- * pixel stride for the given component. This is the amount of bytes to the
- * pixel immediately to the right, so basically bytes from one pixel to the
- * next. When bits < 8, the stride is expressed in bits.
- *
- * Examples: for 24-bit RGB, the pixel stride would be 3 bytes, while it
- * would be 4 bytes for RGBx or ARGB, and 8 bytes for ARGB64 or AYUV64.
- * For planar formats such as I420 the pixel stride is usually 1. For
- * YUY2 it would be 2 bytes.
- */
-#define GST_VIDEO_FORMAT_INFO_PSTRIDE(info,c)    ((info)->pixel_stride[c])
-/**
- * GST_VIDEO_FORMAT_INFO_N_PLANES:
- *
- * Number of planes. This is the number of planes the pixel layout is
- * organized in in memory. The number of planes can be less than the
- * number of components (e.g. Y,U,V,A or R, G, B, A) when multiple
- * components are packed into one plane.
- *
- * Examples: RGB/RGBx/RGBA: 1 plane, 3/3/4 components;
- * I420: 3 planes, 3 components; NV21/NV12: 2 planes, 3 components.
- */
-#define GST_VIDEO_FORMAT_INFO_N_PLANES(info)     ((info)->n_planes)
-/**
- * GST_VIDEO_FORMAT_INFO_PLANE:
- *
- * Plane number where the given component can be found. A plane may
- * contain data for multiple components.
- */
-#define GST_VIDEO_FORMAT_INFO_PLANE(info,c)      ((info)->plane[c])
-#define GST_VIDEO_FORMAT_INFO_POFFSET(info,c)    ((info)->poffset[c])
-#define GST_VIDEO_FORMAT_INFO_W_SUB(info,c)      ((info)->w_sub[c])
-#define GST_VIDEO_FORMAT_INFO_H_SUB(info,c)      ((info)->h_sub[c])
-
-/* rounds up */
-#define GST_VIDEO_SUB_SCALE(scale,val)   (-((-((gint)(val)))>>(scale)))
-
-#define GST_VIDEO_FORMAT_INFO_SCALE_WIDTH(info,c,w)  GST_VIDEO_SUB_SCALE ((info)->w_sub[c],(w))
-#define GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT(info,c,h) GST_VIDEO_SUB_SCALE ((info)->h_sub[c],(h))
-
-#define GST_VIDEO_FORMAT_INFO_DATA(info,planes,comp) \
-  (((guint8*)(planes)[(info)->plane[comp]]) + (info)->poffset[comp])
-/**
- * GST_VIDEO_FORMAT_INFO_STRIDE:
- *
- * Row stride in bytes, that is number of bytes from the first pixel component
- * of a row to the first pixel component in the next row. This might include
- * some row padding (memory not actually used for anything, to make sure the
- * beginning of the next row is aligned in a particular way).
- */
-#define GST_VIDEO_FORMAT_INFO_STRIDE(info,strides,comp) ((strides)[(info)->plane[comp]])
-#define GST_VIDEO_FORMAT_INFO_OFFSET(info,offsets,comp) \
-  (((offsets)[(info)->plane[comp]]) + (info)->poffset[comp])
-
-/* format properties */
-GstVideoFormat gst_video_format_from_masks           (gint depth, gint bpp, gint endianness,
-                                                      gint red_mask, gint green_mask,
-                                                      gint blue_mask, gint alpha_mask) G_GNUC_CONST;
-
-GstVideoFormat gst_video_format_from_fourcc          (guint32 fourcc) G_GNUC_CONST;
-GstVideoFormat gst_video_format_from_string          (const gchar *format) G_GNUC_CONST;
-
-guint32        gst_video_format_to_fourcc            (GstVideoFormat format) G_GNUC_CONST;
-const gchar *  gst_video_format_to_string            (GstVideoFormat format) G_GNUC_CONST;
-
-const GstVideoFormatInfo *
-               gst_video_format_get_info             (GstVideoFormat format) G_GNUC_CONST;
-
-#define GST_VIDEO_SIZE_RANGE "(int) [ 1, max ]"
-#define GST_VIDEO_FPS_RANGE "(fraction) [ 0, max ]"
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-# define GST_VIDEO_NE(s) G_STRINGIFY(s)"_LE"
-# define GST_VIDEO_OE(s) G_STRINGIFY(s)"_BE"
-#else
-# define GST_VIDEO_NE(s) G_STRINGIFY(s)"_BE"
-# define GST_VIDEO_OE(s) G_STRINGIFY(s)"_LE"
-#endif
-
-#define GST_VIDEO_FORMATS_ALL "{ I420, YV12, YUY2, UYVY, AYUV, RGBx, "  \
-    "BGRx, xRGB, xBGR, RGBA, BGRA, ARGB, ABGR, RGB, BGR, Y41B, Y42B, "  \
-    "YVYU, Y444, v210, v216, NV12, NV21, GRAY8, GRAY16_BE, GRAY16_LE, " \
-    "v308, RGB16, BGR16, RGB15, BGR15, UYVP, A420, RGB8P, YUV9, YVU9, " \
-    "IYU1, ARGB64, AYUV64, r210, I420_10LE, I420_10BE, I422_10LE, I422_10BE }"
-
-/**
- * GST_VIDEO_CAPS_MAKE:
- * @format: string format that describes the pixel layout, as string
- *     (e.g. "I420", "RGB", "YV12", "YUY2", "AYUV", etc.)
- *
- * Generic caps string for video, for use in pad templates.
- */
-#define GST_VIDEO_CAPS_MAKE(format)                                     \
-    "video/x-raw, "                                                     \
-    "format = (string) " format ", "                                    \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_FORMAT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-frame.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-frame.h
deleted file mode 100644
index 8f55fbd3..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-frame.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_FRAME_H__
-#define __GST_VIDEO_FRAME_H__
-
-#include <gst/gst.h>
-#include <gst/video/video-info.h>
-
-G_BEGIN_DECLS
-
-#include <gst/video/video-enumtypes.h>
-
-typedef struct _GstVideoFrame GstVideoFrame;
-
-/**
- * GstVideoFrameFlags:
- * @GST_VIDEO_FRAME_FLAG_NONE: no flags
- * @GST_VIDEO_FRAME_FLAG_INTERLACED: The video frame is interlaced. In mixed
- *           interlace-mode, this flags specifies if the frame is interlace or
- *           progressive.
- * @GST_VIDEO_FRAME_FLAG_TFF: The video frame has the top field first
- * @GST_VIDEO_FRAME_FLAG_RFF: The video frame has the repeat flag
- * @GST_VIDEO_FRAME_FLAG_ONEFIELD: The video frame has one field
- *
- * Extra video frame flags
- */
-typedef enum {
-  GST_VIDEO_FRAME_FLAG_NONE         = 0,
-  GST_VIDEO_FRAME_FLAG_INTERLACED   = (1 << 0),
-  GST_VIDEO_FRAME_FLAG_TFF          = (1 << 1),
-  GST_VIDEO_FRAME_FLAG_RFF          = (1 << 2),
-  GST_VIDEO_FRAME_FLAG_ONEFIELD     = (1 << 3)
-} GstVideoFrameFlags;
-
-/**
- * GstVideoFrame:
- * @info: the #GstVideoInfo
- * @buffer: the mapped buffer
- * @meta: pointer to metadata if any
- * @id: id of the mapped frame. the id can for example be used to
- *   indentify the frame in case of multiview video.
- * @data: pointers to the plane data
- * @map: mappings of the planes
- *
- * A video frame obtained from gst_video_frame_map()
- */
-struct _GstVideoFrame {
-  GstVideoInfo info;
-  GstVideoFrameFlags flags;
-
-  GstBuffer *buffer;
-  gpointer   meta;
-  gint       id;
-
-  gpointer   data[GST_VIDEO_MAX_PLANES];
-  GstMapInfo map[GST_VIDEO_MAX_PLANES];
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-gboolean    gst_video_frame_map           (GstVideoFrame *frame, GstVideoInfo *info,
-                                           GstBuffer *buffer, GstMapFlags flags);
-gboolean    gst_video_frame_map_id        (GstVideoFrame *frame, GstVideoInfo *info,
-                                           GstBuffer *buffer, gint id, GstMapFlags flags);
-void        gst_video_frame_unmap         (GstVideoFrame *frame);
-
-gboolean    gst_video_frame_copy          (GstVideoFrame *dest, const GstVideoFrame *src);
-gboolean    gst_video_frame_copy_plane    (GstVideoFrame *dest, const GstVideoFrame *src,
-                                           guint plane);
-
-/* general info */
-#define GST_VIDEO_FRAME_FORMAT(f)         (GST_VIDEO_INFO_FORMAT(&(f)->info))
-#define GST_VIDEO_FRAME_WIDTH(f)          (GST_VIDEO_INFO_WIDTH(&(f)->info))
-#define GST_VIDEO_FRAME_HEIGHT(f)         (GST_VIDEO_INFO_HEIGHT(&(f)->info))
-#define GST_VIDEO_FRAME_SIZE(f)           (GST_VIDEO_INFO_SIZE(&(f)->info))
-
-/* flags */
-#define GST_VIDEO_FRAME_FLAGS(f)          ((f)->flags)
-#define GST_VIDEO_FRAME_FLAG_IS_SET(f,fl) ((GST_VIDEO_FRAME_FLAGS(f) & (fl)) == (fl))
-#define GST_VIDEO_FRAME_IS_INTERLACED(f)  (GST_VIDEO_FRAME_FLAG_IS_SET(f, GST_VIDEO_FRAME_FLAG_INTERLACED))
-#define GST_VIDEO_FRAME_IS_TFF(f)         (GST_VIDEO_FRAME_FLAG_IS_SET(f, GST_VIDEO_FRAME_FLAG_TFF))
-#define GST_VIDEO_FRAME_IS_RFF(f)         (GST_VIDEO_FRAME_FLAG_IS_SET(f, GST_VIDEO_FRAME_FLAG_RFF))
-#define GST_VIDEO_FRAME_IS_ONEFIELD(f)    (GST_VIDEO_FRAME_FLAG_IS_SET(f, GST_VIDEO_FRAME_FLAG_ONEFIELD))
-
-/* dealing with planes */
-#define GST_VIDEO_FRAME_N_PLANES(f)       (GST_VIDEO_INFO_N_PLANES(&(f)->info))
-#define GST_VIDEO_FRAME_PLANE_DATA(f,p)   ((f)->data[p])
-#define GST_VIDEO_FRAME_PLANE_OFFSET(f,p) (GST_VIDEO_INFO_PLANE_OFFSET(&(f)->info,(p)))
-#define GST_VIDEO_FRAME_PLANE_STRIDE(f,p) (GST_VIDEO_INFO_PLANE_STRIDE(&(f)->info,(p)))
-
-/* dealing with components */
-#define GST_VIDEO_FRAME_N_COMPONENTS(f)   GST_VIDEO_INFO_N_COMPONENTS(&(f)->info)
-#define GST_VIDEO_FRAME_COMP_DEPTH(f,c)   GST_VIDEO_INFO_COMP_DEPTH(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_DATA(f,c)    GST_VIDEO_INFO_COMP_DATA(&(f)->info,(f)->data,(c))
-#define GST_VIDEO_FRAME_COMP_STRIDE(f,c)  GST_VIDEO_INFO_COMP_STRIDE(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_OFFSET(f,c)  GST_VIDEO_INFO_COMP_OFFSET(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_WIDTH(f,c)   GST_VIDEO_INFO_COMP_WIDTH(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_HEIGHT(f,c)  GST_VIDEO_INFO_COMP_HEIGHT(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_PLANE(f,c)   GST_VIDEO_INFO_COMP_PLANE(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_PSTRIDE(f,c) GST_VIDEO_INFO_COMP_PSTRIDE(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_POFFSET(f,c) GST_VIDEO_INFO_COMP_POFFSET(&(f)->info,(c))
-
-/* buffer flags */
-
-/**
- * GstVideoBufferFlags:
- * @GST_VIDEO_BUFFER_FLAG_INTERLACED:  If the #GstBuffer is interlaced. In mixed
- *                                     interlace-mode, this flags specifies if the frame is
- *                                     interlaced or progressive.
- * @GST_VIDEO_BUFFER_FLAG_TFF:         If the #GstBuffer is interlaced, then the first field
- *                                     in the video frame is the top field.  If unset, the
- *                                     bottom field is first.
- * @GST_VIDEO_BUFFER_FLAG_RFF:         If the #GstBuffer is interlaced, then the first field
- *                                     (as defined by the %GST_VIDEO_BUFFER_TFF flag setting)
- *                                     is repeated.
- * @GST_VIDEO_BUFFER_FLAG_ONEFIELD:    If the #GstBuffer is interlaced, then only the
- *                                     first field (as defined by the %GST_VIDEO_BUFFER_TFF
- *                                     flag setting) is to be displayed.
- *
- * Additional video buffer flags.
- */
-typedef enum {
-  GST_VIDEO_BUFFER_FLAG_INTERLACED  = (GST_BUFFER_FLAG_LAST << 0),
-  GST_VIDEO_BUFFER_FLAG_TFF         = (GST_BUFFER_FLAG_LAST << 1),
-  GST_VIDEO_BUFFER_FLAG_RFF         = (GST_BUFFER_FLAG_LAST << 2),
-  GST_VIDEO_BUFFER_FLAG_ONEFIELD    = (GST_BUFFER_FLAG_LAST << 3),
-
-  GST_VIDEO_BUFFER_FLAG_LAST        = (GST_BUFFER_FLAG_LAST << 8)
-} GstVideoBufferFlags;
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_FRAME_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-info.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-info.h
deleted file mode 100644
index ce0f0fef..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-info.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_INFO_H__
-#define __GST_VIDEO_INFO_H__
-
-#include <gst/gst.h>
-#include <gst/video/video-format.h>
-#include <gst/video/video-color.h>
-
-G_BEGIN_DECLS
-
-#include <gst/video/video-enumtypes.h>
-
-typedef struct _GstVideoInfo GstVideoInfo;
-
-/**
- * GstVideoInterlaceMode:
- * @GST_VIDEO_INTERLACE_MODE_PROGRESSIVE: all frames are progressive
- * @GST_VIDEO_INTERLACE_MODE_INTERLEAVED: 2 fields are interleaved in one video
- *     frame. Extra buffer flags describe the field order.
- * @GST_VIDEO_INTERLACE_MODE_MIXED: frames contains both interlaced and
- *     progressive video, the buffer flags describe the frame and fields.
- * @GST_VIDEO_INTERLACE_MODE_FIELDS: 2 fields are stored in one buffer, use the
- *     frame ID to get access to the required field. For multiview (the
- *     'views' property > 1) the fields of view N can be found at frame ID
- *     (N * 2) and (N * 2) + 1.
- *     Each field has only half the amount of lines as noted in the
- *     height property. This mode requires multiple GstVideoMeta metadata
- *     to describe the fields.
- *
- * The possible values of the #GstVideoInterlaceMode describing the interlace
- * mode of the stream.
- */
-typedef enum {
-  GST_VIDEO_INTERLACE_MODE_PROGRESSIVE = 0,
-  GST_VIDEO_INTERLACE_MODE_INTERLEAVED,
-  GST_VIDEO_INTERLACE_MODE_MIXED,
-  GST_VIDEO_INTERLACE_MODE_FIELDS
-} GstVideoInterlaceMode;
-
-/**
- * GstVideoFlags:
- * @GST_VIDEO_FLAG_NONE: no flags
- * @GST_VIDEO_FLAG_VARIABLE_FPS: a variable fps is selected, fps_n and fps_d
- *     denote the maximum fps of the video
- * @GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA: Each color has been scaled by the alpha
- *     value.
- *
- * Extra video flags
- */
-typedef enum {
-  GST_VIDEO_FLAG_NONE                = 0,
-  GST_VIDEO_FLAG_VARIABLE_FPS        = (1 << 0),
-  GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA = (1 << 1)
-} GstVideoFlags;
-
-/**
- * GstVideoInfo:
- * @finfo: the format info of the video
- * @interlace_mode: the interlace mode
- * @flags: additional video flags
- * @width: the width of the video
- * @height: the height of the video
- * @views: the number of views for multiview video
- * @size: the default size of one frame
- * @chroma_site: a #GstVideoChromaSite.
- * @colorimetry: the colorimetry info
- * @par_n: the pixel-aspect-ratio numerator
- * @par_d: the pixel-aspect-ratio demnominator
- * @fps_n: the framerate numerator
- * @fps_d: the framerate demnominator
- * @offset: offsets of the planes
- * @stride: strides of the planes
- *
- * Information describing image properties. This information can be filled
- * in from GstCaps with gst_video_info_from_caps(). The information is also used
- * to store the specific video info when mapping a video frame with
- * gst_video_frame_map().
- *
- * Use the provided macros to access the info in this structure.
- */
-struct _GstVideoInfo {
-  const GstVideoFormatInfo *finfo;
-
-  GstVideoInterlaceMode     interlace_mode;
-  GstVideoFlags             flags;
-  gint                      width;
-  gint                      height;
-  gsize                     size;
-  gint                      views;
-
-  GstVideoChromaSite        chroma_site;
-  GstVideoColorimetry       colorimetry;
-
-  gint                      par_n;
-  gint                      par_d;
-  gint                      fps_n;
-  gint                      fps_d;
-
-  gsize                     offset[GST_VIDEO_MAX_PLANES];
-  gint                      stride[GST_VIDEO_MAX_PLANES];
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/* general info */
-#define GST_VIDEO_INFO_FORMAT(i)         (GST_VIDEO_FORMAT_INFO_FORMAT((i)->finfo))
-#define GST_VIDEO_INFO_NAME(i)           (GST_VIDEO_FORMAT_INFO_NAME((i)->finfo))
-#define GST_VIDEO_INFO_IS_YUV(i)         (GST_VIDEO_FORMAT_INFO_IS_YUV((i)->finfo))
-#define GST_VIDEO_INFO_IS_RGB(i)         (GST_VIDEO_FORMAT_INFO_IS_RGB((i)->finfo))
-#define GST_VIDEO_INFO_IS_GRAY(i)        (GST_VIDEO_FORMAT_INFO_IS_GRAY((i)->finfo))
-#define GST_VIDEO_INFO_HAS_ALPHA(i)      (GST_VIDEO_FORMAT_INFO_HAS_ALPHA((i)->finfo))
-
-#define GST_VIDEO_INFO_INTERLACE_MODE(i) ((i)->interlace_mode)
-#define GST_VIDEO_INFO_IS_INTERLACED(i)  ((i)->interlace_mode != GST_VIDEO_INTERLACE_MODE_PROGRESSIVE)
-#define GST_VIDEO_INFO_FLAGS(i)          ((i)->flags)
-#define GST_VIDEO_INFO_WIDTH(i)          ((i)->width)
-#define GST_VIDEO_INFO_HEIGHT(i)         ((i)->height)
-#define GST_VIDEO_INFO_SIZE(i)           ((i)->size)
-#define GST_VIDEO_INFO_VIEWS(i)          ((i)->views)
-#define GST_VIDEO_INFO_PAR_N(i)          ((i)->par_n)
-#define GST_VIDEO_INFO_PAR_D(i)          ((i)->par_d)
-#define GST_VIDEO_INFO_FPS_N(i)          ((i)->fps_n)
-#define GST_VIDEO_INFO_FPS_D(i)          ((i)->fps_d)
-
-/* dealing with GstVideoInfo flags */
-#define GST_VIDEO_INFO_FLAG_IS_SET(i,flag) ((GST_VIDEO_INFO_FLAGS(i) & (flag)) == (flag))
-#define GST_VIDEO_INFO_FLAG_SET(i,flag)    (GST_VIDEO_INFO_FLAGS(i) |= (flag))
-#define GST_VIDEO_INFO_FLAG_UNSET(i,flag)  (GST_VIDEO_INFO_FLAGS(i) &= ~(flag))
-
-/* dealing with planes */
-#define GST_VIDEO_INFO_N_PLANES(i)       (GST_VIDEO_FORMAT_INFO_N_PLANES((i)->finfo))
-#define GST_VIDEO_INFO_PLANE_OFFSET(i,p) ((i)->offset[p])
-#define GST_VIDEO_INFO_PLANE_STRIDE(i,p) ((i)->stride[p])
-
-/* dealing with components */
-#define GST_VIDEO_INFO_N_COMPONENTS(i)   GST_VIDEO_FORMAT_INFO_N_COMPONENTS((i)->finfo)
-#define GST_VIDEO_INFO_COMP_DEPTH(i,c)   GST_VIDEO_FORMAT_INFO_DEPTH((i)->finfo,(c))
-#define GST_VIDEO_INFO_COMP_DATA(i,d,c)  GST_VIDEO_FORMAT_INFO_DATA((i)->finfo,d,(c))
-#define GST_VIDEO_INFO_COMP_OFFSET(i,c)  GST_VIDEO_FORMAT_INFO_OFFSET((i)->finfo,(i)->offset,(c))
-#define GST_VIDEO_INFO_COMP_STRIDE(i,c)  GST_VIDEO_FORMAT_INFO_STRIDE((i)->finfo,(i)->stride,(c))
-#define GST_VIDEO_INFO_COMP_WIDTH(i,c)   GST_VIDEO_FORMAT_INFO_SCALE_WIDTH((i)->finfo,(c),(i)->width)
-#define GST_VIDEO_INFO_COMP_HEIGHT(i,c)  GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT((i)->finfo,(c),(i)->height)
-#define GST_VIDEO_INFO_COMP_PLANE(i,c)   GST_VIDEO_FORMAT_INFO_PLANE((i)->finfo,(c))
-#define GST_VIDEO_INFO_COMP_PSTRIDE(i,c) GST_VIDEO_FORMAT_INFO_PSTRIDE((i)->finfo,(c))
-#define GST_VIDEO_INFO_COMP_POFFSET(i,c) GST_VIDEO_FORMAT_INFO_POFFSET((i)->finfo,(c))
-
-void         gst_video_info_init        (GstVideoInfo *info);
-
-void         gst_video_info_set_format  (GstVideoInfo *info, GstVideoFormat format,
-                                         guint width, guint height);
-
-gboolean     gst_video_info_from_caps   (GstVideoInfo *info, const GstCaps  * caps);
-
-GstCaps *    gst_video_info_to_caps     (GstVideoInfo *info);
-
-gboolean     gst_video_info_convert     (GstVideoInfo *info,
-                                         GstFormat     src_format,
-                                         gint64        src_value,
-                                         GstFormat     dest_format,
-                                         gint64       *dest_value);
-gboolean     gst_video_info_is_equal    (const GstVideoInfo *info,
-					 const GstVideoInfo *other);
-
-#include <gst/video/video.h>
-
-void         gst_video_info_align       (GstVideoInfo * info, GstVideoAlignment * align);
-
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_INFO_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-overlay-composition.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-overlay-composition.h
deleted file mode 100644
index d2f62d03..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video-overlay-composition.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* GStreamer Video Overlay Composition
- * Copyright (C) 2011 Intel Corporation
- * Copyright (C) 2011 Collabora Ltd.
- * Copyright (C) 2011 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_OVERLAY_COMPOSITION_H__
-#define __GST_VIDEO_OVERLAY_COMPOSITION_H__
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstVideoOverlayRectangle:
- *
- * An opaque video overlay rectangle object. A rectangle contains a single
- * overlay rectangle which can be added to a composition.
- */
-#define GST_TYPE_VIDEO_OVERLAY_RECTANGLE			\
-  (gst_video_overlay_rectangle_get_type ())
-#define GST_VIDEO_OVERLAY_RECTANGLE_CAST(obj)			\
-  ((GstVideoOverlayRectangle *)(obj)
-#define GST_VIDEO_OVERLAY_RECTANGLE(obj)			\
-  (GST_VIDEO_OVERLAY_RECTANGLE_CAST(obj))
-#define GST_IS_VIDEO_OVERLAY_RECTANGLE(obj)			\
-  (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_VIDEO_OVERLAY_RECTANGLE))
-
-typedef struct _GstVideoOverlayRectangle      GstVideoOverlayRectangle;
-
-/**
- * gst_video_overlay_rectangle_ref:
- * @comp: a a #GstVideoOverlayRectangle.
- *
- * Increases the refcount of the given rectangle by one.
- *
- * Note that the refcount affects the writeability
- * of @comp, use gst_video_overlay_rectangle_copy() to ensure a rectangle can
- * be modified (there is no gst_video_overlay_rectangle_make_writable() because
- * it is unlikely that someone will hold the single reference to the rectangle
- * and not know that that's the case).
- *
- * Returns: (transfer full): @comp
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstVideoOverlayRectangle *
-gst_video_overlay_rectangle_ref (GstVideoOverlayRectangle * comp);
-#endif
-
-static inline GstVideoOverlayRectangle *
-gst_video_overlay_rectangle_ref (GstVideoOverlayRectangle * comp)
-{
-  return (GstVideoOverlayRectangle *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (comp));
-}
-
-/**
- * gst_video_overlay_rectangle_unref:
- * @comp: (transfer full): a #GstVideoOverlayRectangle.
- *
- * Decreases the refcount of the rectangle. If the refcount reaches 0, the
- * rectangle will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void
-gst_video_overlay_rectangle_unref (GstVideoOverlayRectangle * comp);
-#endif
-
-static inline void
-gst_video_overlay_rectangle_unref (GstVideoOverlayRectangle * comp)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (comp));
-}
-
-/**
- * GstVideoOverlayFormatFlags:
- * @GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE: no flags
- * @GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA: RGB are premultiplied by A/255.
- * @GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA: a global-alpha value != 1 is set.
- *
- * Overlay format flags.
- */
-typedef enum {
-  GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE = 0,
-  GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA = 1,
-  GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA = 2
-} GstVideoOverlayFormatFlags;
-
-/**
-  * GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_RGB:
-  *
-  * Supported RGB overlay video format.
-  */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_RGB      GST_VIDEO_FORMAT_BGRA
-#else
-#define GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_RGB      GST_VIDEO_FORMAT_ARGB
-#endif
-
-/**
-  * GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_YUV:
-  *
-  * Supported YUV overlay video format.
-  */
-#define GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_YUV      GST_VIDEO_FORMAT_AYUV
-
-GType                        gst_video_overlay_rectangle_get_type (void);
-
-GstVideoOverlayRectangle *   gst_video_overlay_rectangle_new_raw  (GstBuffer * pixels,
-                                                                   gint render_x, gint render_y,
-                                                                   guint render_width, guint render_height,
-                                                                   GstVideoOverlayFormatFlags flags);
-
-GstVideoOverlayRectangle *   gst_video_overlay_rectangle_copy     (GstVideoOverlayRectangle * rectangle);
-
-guint                        gst_video_overlay_rectangle_get_seqnum (GstVideoOverlayRectangle  * rectangle);
-
-void                         gst_video_overlay_rectangle_set_render_rectangle     (GstVideoOverlayRectangle  * rectangle,
-                                                                                   gint                        render_x,
-                                                                                   gint                        render_y,
-                                                                                   guint                       render_width,
-                                                                                   guint                       render_height);
-
-gboolean                     gst_video_overlay_rectangle_get_render_rectangle     (GstVideoOverlayRectangle  * rectangle,
-                                                                                   gint                      * render_x,
-                                                                                   gint                      * render_y,
-                                                                                   guint                     * render_width,
-                                                                                   guint                     * render_height);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_raw           (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_argb          (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_ayuv          (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_unscaled_raw  (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_unscaled_argb (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_unscaled_ayuv (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstVideoOverlayFormatFlags   gst_video_overlay_rectangle_get_flags                (GstVideoOverlayRectangle  * rectangle);
-
-gfloat                       gst_video_overlay_rectangle_get_global_alpha         (GstVideoOverlayRectangle  * rectangle);
-void                         gst_video_overlay_rectangle_set_global_alpha         (GstVideoOverlayRectangle  * rectangle,
-                                                                                   gfloat                      global_alpha);
-
-/**
- * GstVideoOverlayComposition:
- *
- * An opaque video overlay composition object. A composition contains
- * multiple overlay rectangles.
- */
-#define GST_TYPE_VIDEO_OVERLAY_COMPOSITION			\
-  (gst_video_overlay_composition_get_type ())
-#define GST_VIDEO_OVERLAY_COMPOSITION_CAST(obj)			\
-  ((GstVideoOverlayComposition *)(obj)
-#define GST_VIDEO_OVERLAY_COMPOSITION(obj)			\
-  (GST_VIDEO_OVERLAY_COMPOSITION_CAST(obj))
-#define GST_IS_VIDEO_OVERLAY_COMPOSITION(obj)			\
-  (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_VIDEO_OVERLAY_COMPOSITION))
-
-typedef struct _GstVideoOverlayComposition      GstVideoOverlayComposition;
-
-/**
- * gst_video_overlay_composition_ref:
- * @comp: a a #GstVideoOverlayComposition.
- *
- * Increases the refcount of the given composition by one.
- *
- * Note that the refcount affects the writeability
- * of @comp, use gst_video_overlay_composition_make_writable() to ensure
- * a composition and its rectangles can be modified.
- *
- * Returns: (transfer full): @comp
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstVideoOverlayComposition *
-gst_video_overlay_composition_ref (GstVideoOverlayComposition * comp);
-#endif
-
-static inline GstVideoOverlayComposition *
-gst_video_overlay_composition_ref (GstVideoOverlayComposition * comp)
-{
-  return (GstVideoOverlayComposition *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (comp));
-}
-
-/**
- * gst_video_overlay_composition_unref:
- * @comp: (transfer full): a #GstVideoOverlayComposition.
- *
- * Decreases the refcount of the composition. If the refcount reaches 0, the
- * composition will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void
-gst_video_overlay_composition_unref (GstVideoOverlayComposition * comp);
-#endif
-
-static inline void
-gst_video_overlay_composition_unref (GstVideoOverlayComposition * comp)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (comp));
-}
-
-GType                        gst_video_overlay_composition_get_type (void);
-
-GstVideoOverlayComposition * gst_video_overlay_composition_copy          (GstVideoOverlayComposition * comp);
-
-GstVideoOverlayComposition * gst_video_overlay_composition_make_writable (GstVideoOverlayComposition * comp);
-
-GstVideoOverlayComposition * gst_video_overlay_composition_new           (GstVideoOverlayRectangle * rectangle);
-
-void                         gst_video_overlay_composition_add_rectangle (GstVideoOverlayComposition * comp,
-                                                                          GstVideoOverlayRectangle   * rectangle);
-
-guint                        gst_video_overlay_composition_n_rectangles  (GstVideoOverlayComposition * comp);
-
-GstVideoOverlayRectangle *   gst_video_overlay_composition_get_rectangle (GstVideoOverlayComposition * comp, guint n);
-
-guint                        gst_video_overlay_composition_get_seqnum    (GstVideoOverlayComposition * comp);
-
-/* blend composition onto raw video buffer */
-
-gboolean                     gst_video_overlay_composition_blend         (GstVideoOverlayComposition * comp,
-                                                                          GstVideoFrame              * video_buf);
-
-/* attach/retrieve composition from buffers */
-
-#define GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE \
-    (gst_video_overlay_composition_meta_api_get_type())
-#define GST_VIDEO_OVERLAY_COMPOSITION_META_INFO \
-    (gst_video_overlay_composition_meta_get_info())
-
-typedef struct _GstVideoOverlayCompositionMeta GstVideoOverlayCompositionMeta;
-
-/**
- * GstVideoOverlayCompositionMeta:
- * @meta: parent #GstMeta
- * @overlay: the attached #GstVideoOverlayComposition
- *
- * Extra buffer metadata describing image overlay data.
- */
-struct _GstVideoOverlayCompositionMeta
-{
-  GstMeta meta;
-
-  GstVideoOverlayComposition *overlay;
-};
-
-GType gst_video_overlay_composition_meta_api_get_type (void);
-const GstMetaInfo *gst_video_overlay_composition_meta_get_info (void);
-
-GstVideoOverlayCompositionMeta * gst_buffer_add_video_overlay_composition_meta (GstBuffer                  * buf,
-                                                                                GstVideoOverlayComposition * comp);
-
-#define gst_buffer_get_video_overlay_composition_meta(b) \
-  ((GstVideoOverlayCompositionMeta*)gst_buffer_get_meta((b),GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE))
-#define gst_buffer_remove_video_overlay_composition_meta(b,m) \
-  gst_buffer_remove_meta((b),((GstMeta *) m))
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_OVERLAY_COMPOSITION_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video.h
deleted file mode 100644
index cafa58c6..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/video.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_H__
-#define __GST_VIDEO_H__
-
-#include <gst/gst.h>
-
-typedef struct _GstVideoAlignment GstVideoAlignment;
-
-#include <gst/video/video-event.h>
-#include <gst/video/video-format.h>
-#include <gst/video/video-color.h>
-#include <gst/video/video-info.h>
-#include <gst/video/video-frame.h>
-#include <gst/video/video-enumtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstVideoAlignment:
- * @padding_left: extra pixels on the left side
- * @padding_right: extra pixels on the right side
- * @padding_top: extra pixels on the top
- * @padding_bottom: extra pixels on the bottom
- * @stride_align: array with extra alignment requirements for the strides
- *
- * Extra alignment paramters for the memory of video buffers. This
- * structure is usually used to configure the bufferpool if it supports the
- * #GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT.
- */
-struct _GstVideoAlignment
-{
-  guint padding_top;
-  guint padding_bottom;
-  guint padding_left;
-  guint padding_right;
-  guint stride_align[GST_VIDEO_MAX_PLANES];
-};
-
-void           gst_video_alignment_reset         (GstVideoAlignment *align);
-
-
-/* some helper functions */
-gboolean       gst_video_calculate_display_ratio (guint * dar_n,
-                                                  guint * dar_d,
-                                                  guint   video_width,
-                                                  guint   video_height,
-                                                  guint   video_par_n,
-                                                  guint   video_par_d,
-                                                  guint   display_par_n,
-                                                  guint   display_par_d);
-
-/* convert/encode video sample from one format to another */
-
-typedef void (*GstVideoConvertSampleCallback) (GstSample * sample, GError *error, gpointer user_data);
-
-void          gst_video_convert_sample_async (GstSample                    * sample,
-                                              const GstCaps                * to_caps,
-                                              GstClockTime                   timeout,
-                                              GstVideoConvertSampleCallback  callback,
-                                              gpointer                       user_data,
-                                              GDestroyNotify                 destroy_notify);
-
-GstSample *   gst_video_convert_sample       (GstSample     * sample,
-                                              const GstCaps * to_caps,
-                                              GstClockTime    timeout,
-                                              GError       ** error);
-G_END_DECLS
-
-#endif /* __GST_VIDEO_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videocontext.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videocontext.h
deleted file mode 100644
index 98d4b542..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videocontext.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2011 Intel
- * Copyright (C) 2011 Collabora Ltd.
- *   Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- *
- * video-context.h: Video Context interface and helpers
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_CONTEXT_H__
-#define __GST_VIDEO_CONTEXT_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The GstVideoContext interface is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_CONTEXT              (gst_video_context_iface_get_type ())
-#define GST_VIDEO_CONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_CONTEXT, GstVideoContext))
-#define GST_IS_VIDEO_CONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_CONTEXT))
-#define GST_VIDEO_CONTEXT_GET_IFACE(inst)   (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_CONTEXT, GstVideoContextInterface))
-
-/**
- * GstVideoContext:
- *
- * Opaque #GstVideoContext data structure.
- */
-typedef struct _GstVideoContext GstVideoContext;
-typedef struct _GstVideoContextInterface GstVideoContextInterface;
-
-/**
- * GstVideoContextInterface:
- * @parent: parent interface type.
- * @set_context: vmethod to set video context.
- *
- * #GstVideoContextInterface interface.
- */
-struct _GstVideoContextInterface
-{
-  GTypeInterface parent;
-
-  /* virtual functions */
-  void (*set_context) (GstVideoContext * context,
-                       const gchar * type,
-                       const GValue * value);
-
-};
-
-GType    gst_video_context_iface_get_type (void);
-
-/* virtual class method and associated helpers */
-void     gst_video_context_set_context           (GstVideoContext * context,
-                                                  const gchar * type,
-                                                  const GValue * value);
-void     gst_video_context_set_context_string    (GstVideoContext * context,
-                                                  const gchar * type,
-                                                  const gchar * value);
-void     gst_video_context_set_context_pointer   (GstVideoContext * context,
-                                                  const gchar * type,
-                                                  gpointer value);
-void     gst_video_context_set_context_object    (GstVideoContext * context,
-                                                  const gchar * type,
-                                                  GObject * value);
-
-
-/* message helpers */
-void      gst_video_context_prepare                (GstVideoContext *context,
-                                                    const gchar ** types);
-
-gboolean  gst_video_context_message_parse_prepare  (GstMessage * message,
-                                                    const gchar *** types,
-                                                    GstVideoContext ** ctx);
-
-/* query helpers */
-GstQuery     * gst_video_context_query_new                    (const gchar ** types);
-gboolean       gst_video_context_run_query                    (GstElement *element,
-                                                               GstQuery *query);
-const gchar ** gst_video_context_query_get_supported_types    (GstQuery * query);
-void           gst_video_context_query_parse_value            (GstQuery * query,
-                                                               const gchar ** type,
-                                                               const GValue ** value);
-void           gst_video_context_query_set_value              (GstQuery * query,
-                                                               const gchar * type,
-                                                               GValue * value);
-void           gst_video_context_query_set_string             (GstQuery * query,
-                                                               const gchar * type,
-                                                               const gchar * value);
-void           gst_video_context_query_set_pointer            (GstQuery * query,
-                                                               const gchar * type,
-                                                               gpointer value);
-void           gst_video_context_query_set_object             (GstQuery * query,
-                                                               const gchar * type,
-                                                               GObject * value);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_CONTEXT_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videoorientation.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videoorientation.h
deleted file mode 100644
index c7407b71..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videoorientation.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* GStreamer
- * Copyright (C) 2006 Nokia <stefan.kost@nokia.com
- *
- * videoorientation.h: video flipping and centering interface
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_ORIENTATION_H__
-#define __GST_VIDEO_ORIENTATION_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_ORIENTATION \
-  (gst_video_orientation_get_type ())
-#define GST_VIDEO_ORIENTATION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_ORIENTATION, GstVideoOrientation))
-#define GST_IS_VIDEO_ORIENTATION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_ORIENTATION))
-#define GST_VIDEO_ORIENTATION_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_ORIENTATION, GstVideoOrientationInterface))
-
-/**
- * GstVideoOrientation:
- *
- * Opaque #GstVideoOrientation data structure.
- */
-typedef struct _GstVideoOrientation GstVideoOrientation;
-typedef struct _GstVideoOrientationInterface GstVideoOrientationInterface;
-
-/**
- * GstVideoOrientationInterface:
- * @iface: parent interface type.
- * @get_hflip: virtual method to get horizontal flipping state
- * @get_vflip: virtual method to get vertical flipping state
- * @get_hcenter: virtual method to get horizontal centering state
- * @get_vcenter: virtual method to get vertical centering state
- * @set_hflip: virtual method to set horizontal flipping state
- * @set_vflip: virtual method to set vertical flipping state
- * @set_hcenter: virtual method to set horizontal centering state
- * @set_vcenter: virtual method to set vertical centering state
- *
- * #GstVideoOrientationInterface interface.
- */
-struct _GstVideoOrientationInterface {
-  GTypeInterface iface;
-
-  /* FIXME 0.11: fix awkward API? add some kind of get_supported flags thing
-   * and then just return booleans/int from all vfuncs requiring the caller
-   * to check the flags first */
-
-  /* virtual functions */
-  gboolean (* get_hflip)   (GstVideoOrientation *video_orientation, gboolean *flip);
-  gboolean (* get_vflip)   (GstVideoOrientation *video_orientation, gboolean *flip);
-  gboolean (* get_hcenter) (GstVideoOrientation *video_orientation, gint *center);
-  gboolean (* get_vcenter) (GstVideoOrientation *video_orientation, gint *center);
-
-  gboolean (* set_hflip)   (GstVideoOrientation *video_orientation, gboolean flip);
-  gboolean (* set_vflip)   (GstVideoOrientation *video_orientation, gboolean flip);
-  gboolean (* set_hcenter) (GstVideoOrientation *video_orientation, gint center);
-  gboolean (* set_vcenter) (GstVideoOrientation *video_orientation, gint center);
-};
-
-GType           gst_video_orientation_get_type              (void);
-
-/* virtual class function wrappers */
-gboolean gst_video_orientation_get_hflip (GstVideoOrientation *video_orientation, gboolean *flip);
-gboolean gst_video_orientation_get_vflip (GstVideoOrientation *video_orientation, gboolean *flip);
-gboolean gst_video_orientation_get_hcenter (GstVideoOrientation *video_orientation, gint *center);
-gboolean gst_video_orientation_get_vcenter (GstVideoOrientation *video_orientation, gint *center);
-
-gboolean gst_video_orientation_set_hflip (GstVideoOrientation *video_orientation, gboolean flip);
-gboolean gst_video_orientation_set_vflip (GstVideoOrientation *video_orientation, gboolean flip);
-gboolean gst_video_orientation_set_hcenter (GstVideoOrientation *video_orientation, gint center);
-gboolean gst_video_orientation_set_vcenter (GstVideoOrientation *video_orientation, gint center);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_ORIENTATION_H__ */
diff --git a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videooverlay.h b/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videooverlay.h
deleted file mode 100644
index 2c01c5d6..00000000
--- a/GstreamerHelper/x64/include/gstreamer-1.0/gst/video/videooverlay.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GStreamer Video Overlay Interface
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2003 Julien Moutte <julien@moutte.net>
- * Copyright (C) 2011 Tim-Philipp Müller <tim@centricular.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_OVERLAY_H__
-#define __GST_VIDEO_OVERLAY_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_OVERLAY \
-    (gst_video_overlay_get_type ())
-#define GST_VIDEO_OVERLAY(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_OVERLAY, GstVideoOverlay))
-#define GST_IS_VIDEO_OVERLAY(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_OVERLAY))
-#define GST_VIDEO_OVERLAY_GET_INTERFACE(inst) \
-    (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_OVERLAY, GstVideoOverlayInterface))
-
-/**
- * GstVideoOverlay:
- *
- * Opaque #GstVideoOverlay interface structure
- */
-typedef struct _GstVideoOverlay GstVideoOverlay;
-typedef struct _GstVideoOverlayInterface GstVideoOverlayInterface;
-
-/**
- * GstVideoOverlayInterface:
- * @iface: parent interface type.
- * @expose: virtual method to handle expose events
- * @handle_events: virtual method to handle events
- * @set_render_rectangle: virtual method to set the render rectangle
- * @set_window_handle: virtual method to configure the window handle
- *
- * #GstVideoOverlay interface
- */
-struct _GstVideoOverlayInterface {
-  GTypeInterface iface;
-
-  /* virtual functions */
-  void (*expose)               (GstVideoOverlay *overlay);
-
-  void (*handle_events)        (GstVideoOverlay *overlay, gboolean handle_events);
-
-  void (*set_render_rectangle) (GstVideoOverlay *overlay,
-                                gint x, gint y,
-                                gint width, gint height);
-
-  void (*set_window_handle)    (GstVideoOverlay *overlay, guintptr handle);
-};
-
-GType   gst_video_overlay_get_type (void);
-
-/* virtual function wrappers */
-
-gboolean        gst_video_overlay_set_render_rectangle  (GstVideoOverlay * overlay,
-                                                         gint              x,
-                                                         gint              y,
-                                                         gint              width,
-                                                         gint              height);
-
-void            gst_video_overlay_expose                (GstVideoOverlay * overlay);
-
-void            gst_video_overlay_handle_events         (GstVideoOverlay * overlay,
-                                                         gboolean          handle_events);
-
-void            gst_video_overlay_set_window_handle     (GstVideoOverlay * overlay,
-                                                         guintptr handle);
-
-/* public methods to dispatch bus messages */
-void            gst_video_overlay_got_window_handle     (GstVideoOverlay * overlay,
-                                                         guintptr          handle);
-
-void            gst_video_overlay_prepare_window_handle (GstVideoOverlay * overlay);
-
-gboolean        gst_is_video_overlay_prepare_window_handle_message (GstMessage * msg);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_OVERLAY_H__ */
diff --git a/GstreamerHelper/x64/lib/glib-2.0.lib b/GstreamerHelper/x64/lib/glib-2.0.lib
deleted file mode 100644
index b02dd3f9..00000000
Binary files a/GstreamerHelper/x64/lib/glib-2.0.lib and /dev/null differ
diff --git a/GstreamerHelper/x64/lib/glib-2.0/include/glibconfig.h b/GstreamerHelper/x64/lib/glib-2.0/include/glibconfig.h
deleted file mode 100644
index 4d169fb2..00000000
--- a/GstreamerHelper/x64/lib/glib-2.0/include/glibconfig.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/* glibconfig.h.win32.in. Originally merged from two versions of
- * glibconfig.h, generated by the GLib configure script, for gcc and
- * MSVC.
- */
-
-/* glibconfig.h
- *
- * This is a generated file.  Please modify 'glibconfig.h.win32.in'
- */
-
-#ifndef __G_LIBCONFIG_H__
-#define __G_LIBCONFIG_H__
-
-#include <glib/gmacros.h>
-
-#include <limits.h>
-#include <float.h>
-
-G_BEGIN_DECLS
-
-#define G_MINFLOAT	FLT_MIN
-#define G_MAXFLOAT	FLT_MAX
-#define G_MINDOUBLE	DBL_MIN
-#define G_MAXDOUBLE	DBL_MAX
-#define G_MINSHORT	SHRT_MIN
-#define G_MAXSHORT	SHRT_MAX
-#define G_MAXUSHORT	USHRT_MAX
-#define G_MININT	INT_MIN
-#define G_MAXINT	INT_MAX
-#define G_MAXUINT	UINT_MAX
-#define G_MINLONG	LONG_MIN
-#define G_MAXLONG	LONG_MAX
-#define G_MAXULONG	ULONG_MAX
-
-typedef signed char gint8;
-typedef unsigned char guint8;
-typedef signed short gint16;
-typedef unsigned short guint16;
-#define G_GINT16_MODIFIER "h"
-#define G_GINT16_FORMAT "hi"
-#define G_GUINT16_FORMAT "hu"
-typedef signed int gint32;
-typedef unsigned int guint32;
-#define G_GINT32_MODIFIER ""
-#define G_GINT32_FORMAT "i"
-#define G_GUINT32_FORMAT "u"
-#define G_HAVE_GINT64 1          /* deprecated, always true */
-
-#ifndef _MSC_VER
-G_GNUC_EXTENSION typedef signed long long gint64;
-G_GNUC_EXTENSION typedef unsigned long long guint64;
-#else /* _MSC_VER */
-typedef signed __int64 gint64;
-typedef unsigned __int64 guint64;
-#endif /* _MSC_VER */
-
-#ifndef _MSC_VER
-#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
-#else /* _MSC_VER */
-#define G_GINT64_CONSTANT(val)	(val##i64)
-#endif /* _MSC_VER */
-#ifndef _MSC_VER
-#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
-#else /* _MSC_VER */
-#define G_GUINT64_CONSTANT(val)	(val##Ui64)
-#endif /* _MSC_VER */
-#define G_GINT64_MODIFIER "I64"
-#define G_GINT64_FORMAT "I64i"
-#define G_GUINT64_FORMAT "I64u"
-
-#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
-
-#define GLIB_SIZEOF_VOID_P 8
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 8
-
-typedef signed long long gssize;
-typedef unsigned long long gsize;
-#define G_GSIZE_MODIFIER "I64"
-#define G_GSSIZE_FORMAT "I64d"
-#define G_GSIZE_FORMAT "I64u"
-
-#define G_MAXSIZE	G_MAXUINT64
-#define G_MINSSIZE	G_MININT64
-#define G_MAXSSIZE	G_MAXINT64
-
-#else
-
-#define GLIB_SIZEOF_VOID_P 4
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 4
-
-typedef signed int gssize;
-typedef unsigned int gsize;
-#define G_GSIZE_MODIFIER ""
-#define G_GSSIZE_FORMAT "i"
-#define G_GSIZE_FORMAT "u"
-
-#define G_MAXSIZE	G_MAXUINT
-#define G_MINSSIZE	G_MININT
-#define G_MAXSSIZE	G_MAXINT
-
-#endif
-
-typedef gint64 goffset;
-#define G_MINOFFSET	G_MININT64
-#define G_MAXOFFSET	G_MAXINT64
-
-#define G_GOFFSET_MODIFIER      G_GINT64_MODIFIER
-#define G_GOFFSET_FORMAT        G_GINT64_FORMAT
-#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
-
-
-#ifndef _WIN64
-
-#define GPOINTER_TO_INT(p)	((gint)   (p))
-#define GPOINTER_TO_UINT(p)	((guint)  (p))
-
-#define GINT_TO_POINTER(i)	((gpointer)  (i))
-#define GUINT_TO_POINTER(u)	((gpointer)  (u))
-
-typedef signed int gintptr;
-typedef unsigned int guintptr;
-
-#define G_GINTPTR_MODIFIER      ""
-#define G_GINTPTR_FORMAT        "i"
-#define G_GUINTPTR_FORMAT       "u"
-
-#else
-
-#define GPOINTER_TO_INT(p)	((gint)  (gint64) (p))
-#define GPOINTER_TO_UINT(p)	((guint) (guint64) (p))
-
-#define GINT_TO_POINTER(i)	((gpointer) (gint64) (i))
-#define GUINT_TO_POINTER(u)	((gpointer) (guint64) (u))
-
-#ifndef _MSC_VER
-typedef signed long long gintptr;
-typedef unsigned long long guintptr;
-#else
-typedef signed __int64 gintptr;
-typedef unsigned __int64 guintptr;
-#endif
-
-#define G_GINTPTR_MODIFIER      "I64"
-#define G_GINTPTR_FORMAT        "I64i"
-#define G_GUINTPTR_FORMAT       "I64u"
-
-#endif
-
-#ifdef NeXT /* @#%@! NeXTStep */
-# define g_ATEXIT(proc)	(!atexit (proc))
-#else
-# define g_ATEXIT(proc)	(atexit (proc))
-#endif
-
-#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
-
-#define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 34
-#define GLIB_MICRO_VERSION 2
-
-#define G_OS_WIN32
-#define G_PLATFORM_WIN32
-
-
-#ifndef _MSC_VER
-#define G_VA_COPY	va_copy
-#endif /* not _MSC_VER */
-
-#ifdef	__cplusplus
-#define	G_HAVE_INLINE	1
-#else	/* !__cplusplus */
-#ifndef _MSC_VER
-#define G_HAVE_INLINE 1
-#endif /* _MSC_VER */
-#define G_HAVE___INLINE 1
-#if !defined(_MSC_VER) && !defined(__DMC__)
-#define G_HAVE___INLINE__ 1
-#endif /* !_MSC_VER and !__DMC__ */
-#endif	/* !__cplusplus */
-
-#define G_CAN_INLINE	1
-
-#ifndef _MSC_VER
-#define G_HAVE_ISO_VARARGS 1
-
-/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
- * is passed ISO vararg support is turned off, and there is no work
- * around to turn it on, so we unconditionally turn it off.
- */
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
-#  undef G_HAVE_ISO_VARARGS
-#endif
-
-#define G_HAVE_GNUC_VARARGS 1
-#else /* _MSC_VER */
-/* varargs macros available since msvc8 (vs2005) */
-#  if _MSC_VER >= 1400
-#    define G_HAVE_ISO_VARARGS 1
-#   endif
-#endif /* not _MSC_VER */
-#define G_HAVE_GROWING_STACK 0
-
-#define G_GNUC_INTERNAL
-
-#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_WIN32
-
-#define G_ATOMIC_LOCK_FREE
-
-#define GINT16_TO_LE(val)	((gint16) (val))
-#define GUINT16_TO_LE(val)	((guint16) (val))
-#define GINT16_TO_BE(val)	((gint16) GUINT16_SWAP_LE_BE (val))
-#define GUINT16_TO_BE(val)	(GUINT16_SWAP_LE_BE (val))
-#define GINT32_TO_LE(val)	((gint32) (val))
-#define GUINT32_TO_LE(val)	((guint32) (val))
-#define GINT32_TO_BE(val)	((gint32) GUINT32_SWAP_LE_BE (val))
-#define GUINT32_TO_BE(val)	(GUINT32_SWAP_LE_BE (val))
-#define GINT64_TO_LE(val)	((gint64) (val))
-#define GUINT64_TO_LE(val)	((guint64) (val))
-#define GINT64_TO_BE(val)	((gint64) GUINT64_SWAP_LE_BE (val))
-#define GUINT64_TO_BE(val)	(GUINT64_SWAP_LE_BE (val))
-#define GLONG_TO_LE(val)	((glong) GINT32_TO_LE (val))
-#define GULONG_TO_LE(val)	((gulong) GUINT32_TO_LE (val))
-#define GLONG_TO_BE(val)	((glong) GINT32_TO_BE (val))
-#define GULONG_TO_BE(val)	((gulong) GUINT32_TO_BE (val))
-#define GINT_TO_LE(val)		((gint) GINT32_TO_LE (val))
-#define GUINT_TO_LE(val)	((guint) GUINT32_TO_LE (val))
-#define GINT_TO_BE(val)		((gint) GINT32_TO_BE (val))
-#define GUINT_TO_BE(val)	((guint) GUINT32_TO_BE (val))
-#define GSIZE_TO_LE(val)	((gsize) GUINT32_TO_LE (val))
-#define GSSIZE_TO_LE(val)	((gssize) GINT32_TO_LE (val))
-#define GSIZE_TO_BE(val)	((gsize) GUINT32_TO_BE (val))
-#define GSSIZE_TO_BE(val)	((gssize) GINT32_TO_BE (val))
-#define G_BYTE_ORDER G_LITTLE_ENDIAN
-
-#define GLIB_SYSDEF_POLLIN =1
-#define GLIB_SYSDEF_POLLOUT =4
-#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLHUP =16
-#define GLIB_SYSDEF_POLLERR =8
-#define GLIB_SYSDEF_POLLNVAL =32
-
-#define G_MODULE_SUFFIX "dll"
-
-/* A GPid is an abstraction for a process "handle". It is *not* an
- * abstraction for a process identifier in general. GPid is used in
- * GLib only for descendant processes spawned with the g_spawn*
- * functions. On POSIX there is no "process handle" concept as such,
- * but on Windows a GPid is a handle to a process, a kind of pointer,
- * not a process identifier.
- */
-typedef void * GPid;
-
-#define GLIB_SYSDEF_AF_UNIX 1
-#define GLIB_SYSDEF_AF_INET 2
-#define GLIB_SYSDEF_AF_INET6 23
-
-#define GLIB_SYSDEF_MSG_OOB       1
-#define GLIB_SYSDEF_MSG_PEEK      2
-#define GLIB_SYSDEF_MSG_DONTROUTE 4
-
-G_END_DECLS
-
-#endif /* GLIBCONFIG_H */
diff --git a/GstreamerHelper/x64/lib/gobject-2.0.lib b/GstreamerHelper/x64/lib/gobject-2.0.lib
deleted file mode 100644
index 2104b942..00000000
Binary files a/GstreamerHelper/x64/lib/gobject-2.0.lib and /dev/null differ
diff --git a/GstreamerHelper/x64/lib/gstcontroller-1.0.lib b/GstreamerHelper/x64/lib/gstcontroller-1.0.lib
deleted file mode 100644
index 9472b960..00000000
Binary files a/GstreamerHelper/x64/lib/gstcontroller-1.0.lib and /dev/null differ
diff --git a/GstreamerHelper/x64/lib/gstreamer-1.0.lib b/GstreamerHelper/x64/lib/gstreamer-1.0.lib
deleted file mode 100644
index ebd01a0b..00000000
Binary files a/GstreamerHelper/x64/lib/gstreamer-1.0.lib and /dev/null differ
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gaction.h b/GstreamerHelper/x86/include/glib-2.0/gio/gaction.h
deleted file mode 100644
index 0a4e8c39..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gaction.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_H__
-#define __G_ACTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ACTION                                       (g_action_get_type ())
-#define G_ACTION(inst)                                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_ACTION, GAction))
-#define G_IS_ACTION(inst)                                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_ACTION))
-#define G_ACTION_GET_IFACE(inst)                            (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             G_TYPE_ACTION, GActionInterface))
-
-typedef struct _GActionInterface                            GActionInterface;
-
-struct _GActionInterface
-{
-  GTypeInterface g_iface;
-
-  /* virtual functions */
-  const gchar *        (* get_name)             (GAction  *action);
-  const GVariantType * (* get_parameter_type)   (GAction  *action);
-  const GVariantType * (* get_state_type)       (GAction  *action);
-  GVariant *           (* get_state_hint)       (GAction  *action);
-
-  gboolean             (* get_enabled)          (GAction  *action);
-  GVariant *           (* get_state)            (GAction  *action);
-
-  void                 (* change_state)         (GAction  *action,
-                                                 GVariant *value);
-  void                 (* activate)             (GAction  *action,
-                                                 GVariant *parameter);
-};
-
-GLIB_AVAILABLE_IN_2_30
-GType                   g_action_get_type                               (void) G_GNUC_CONST;
-
-const gchar *           g_action_get_name                               (GAction            *action);
-const GVariantType *    g_action_get_parameter_type                     (GAction            *action);
-const GVariantType *    g_action_get_state_type                         (GAction            *action);
-GVariant *              g_action_get_state_hint                         (GAction            *action);
-
-gboolean                g_action_get_enabled                            (GAction            *action);
-GVariant *              g_action_get_state                              (GAction            *action);
-
-void                    g_action_change_state                           (GAction            *action,
-                                                                         GVariant           *value);
-void                    g_action_activate                               (GAction            *action,
-                                                                         GVariant           *parameter);
-G_END_DECLS
-
-#endif /* __G_ACTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gactiongroup.h b/GstreamerHelper/x86/include/glib-2.0/gio/gactiongroup.h
deleted file mode 100644
index b300aefd..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gactiongroup.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_GROUP_H__
-#define __G_ACTION_GROUP_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_ACTION_GROUP                                 (g_action_group_get_type ())
-#define G_ACTION_GROUP(inst)                                (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_ACTION_GROUP, GActionGroup))
-#define G_IS_ACTION_GROUP(inst)                             (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_ACTION_GROUP))
-#define G_ACTION_GROUP_GET_IFACE(inst)                      (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             G_TYPE_ACTION_GROUP, GActionGroupInterface))
-
-typedef struct _GActionGroupInterface                       GActionGroupInterface;
-
-struct _GActionGroupInterface
-{
-  GTypeInterface g_iface;
-
-  /* virtual functions */
-  gboolean              (* has_action)                 (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  gchar **              (* list_actions)               (GActionGroup  *action_group);
-
-  gboolean              (* get_action_enabled)         (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  const GVariantType *  (* get_action_parameter_type)  (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  const GVariantType *  (* get_action_state_type)      (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  GVariant *            (* get_action_state_hint)      (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  GVariant *            (* get_action_state)           (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-
-  void                  (* change_action_state)        (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        GVariant      *value);
-
-  void                  (* activate_action)            (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        GVariant      *parameter);
-
-  /* signals */
-  void                  (* action_added)               (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-  void                  (* action_removed)             (GActionGroup  *action_group,
-                                                        const gchar   *action_name);
-  void                  (* action_enabled_changed)     (GActionGroup  *action_group,
-                                                        const gchar   *action_name,
-                                                        gboolean       enabled);
-  void                  (* action_state_changed)       (GActionGroup   *action_group,
-                                                        const gchar    *action_name,
-                                                        GVariant       *state);
-
-  /* more virtual functions */
-  gboolean              (* query_action)               (GActionGroup        *action_group,
-                                                        const gchar         *action_name,
-                                                        gboolean            *enabled,
-                                                        const GVariantType **parameter_type,
-                                                        const GVariantType **state_type,
-                                                        GVariant           **state_hint,
-                                                        GVariant           **state);
-};
-
-GType                   g_action_group_get_type                         (void) G_GNUC_CONST;
-
-gboolean                g_action_group_has_action                       (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-gchar **                g_action_group_list_actions                     (GActionGroup *action_group);
-
-const GVariantType *    g_action_group_get_action_parameter_type        (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-const GVariantType *    g_action_group_get_action_state_type            (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-GVariant *              g_action_group_get_action_state_hint            (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-
-gboolean                g_action_group_get_action_enabled               (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-
-GVariant *              g_action_group_get_action_state                 (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-void                    g_action_group_change_action_state              (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *value);
-
-void                    g_action_group_activate_action                  (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *parameter);
-
-/* signals */
-void                    g_action_group_action_added                     (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-void                    g_action_group_action_removed                   (GActionGroup *action_group,
-                                                                         const gchar  *action_name);
-void                    g_action_group_action_enabled_changed           (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         gboolean      enabled);
-
-void                    g_action_group_action_state_changed             (GActionGroup *action_group,
-                                                                         const gchar  *action_name,
-                                                                         GVariant     *state);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean                g_action_group_query_action                     (GActionGroup        *action_group,
-                                                                         const gchar         *action_name,
-                                                                         gboolean            *enabled,
-                                                                         const GVariantType **parameter_type,
-                                                                         const GVariantType **state_type,
-                                                                         GVariant           **state_hint,
-                                                                         GVariant           **state);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_GROUP_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gactiongroupexporter.h b/GstreamerHelper/x86/include/glib-2.0/gio/gactiongroupexporter.h
deleted file mode 100644
index eaa18e66..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gactiongroupexporter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_GROUP_EXPORTER_H__
-#define __G_ACTION_GROUP_EXPORTER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_32
-guint                   g_dbus_connection_export_action_group           (GDBusConnection  *connection,
-                                                                         const gchar      *object_path,
-                                                                         GActionGroup     *action_group,
-                                                                         GError          **error);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_dbus_connection_unexport_action_group         (GDBusConnection  *connection,
-                                                                         guint             export_id);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_GROUP_EXPORTER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gactionmap.h b/GstreamerHelper/x86/include/glib-2.0/gio/gactionmap.h
deleted file mode 100644
index 8e5993e2..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gactionmap.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ACTION_MAP_H__
-#define __G_ACTION_MAP_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_ACTION_MAP                                   (g_action_map_get_type ())
-#define G_ACTION_MAP(inst)                                  (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                             G_TYPE_ACTION_MAP, GActionMap))
-#define G_IS_ACTION_MAP(inst)                               (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                             G_TYPE_ACTION_MAP))
-#define G_ACTION_MAP_GET_IFACE(inst)                        (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                   \
-                                                             G_TYPE_ACTION_MAP, GActionMapInterface))
-
-typedef struct _GActionMapInterface                         GActionMapInterface;
-typedef struct _GActionEntry                                GActionEntry;
-
-struct _GActionMapInterface
-{
-  GTypeInterface g_iface;
-
-  GAction * (* lookup_action) (GActionMap  *action_map,
-                               const gchar *action_name);
-  void      (* add_action)    (GActionMap  *action_map,
-                               GAction     *action);
-  void      (* remove_action) (GActionMap  *action_map,
-                               const gchar *action_name);
-};
-
-struct _GActionEntry
-{
-  const gchar *name;
-
-  void (* activate) (GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       user_data);
-
-  const gchar *parameter_type;
-
-  const gchar *state;
-
-  void (* change_state) (GSimpleAction *action,
-                         GVariant      *value,
-                         gpointer       user_data);
-
-  /*< private >*/
-  gsize padding[3];
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_action_map_get_type                           (void) G_GNUC_CONST;
-
-GAction *               g_action_map_lookup_action                      (GActionMap         *action_map,
-                                                                         const gchar        *action_name);
-void                    g_action_map_add_action                         (GActionMap         *action_map,
-                                                                         GAction            *action);
-void                    g_action_map_remove_action                      (GActionMap         *action_map,
-                                                                         const gchar        *action_name);
-void                    g_action_map_add_action_entries                 (GActionMap         *action_map,
-                                                                         const GActionEntry *entries,
-                                                                         gint                n_entries,
-                                                                         gpointer            user_data);
-
-G_END_DECLS
-
-#endif /* __G_ACTION_MAP_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gappinfo.h b/GstreamerHelper/x86/include/glib-2.0/gio/gappinfo.h
deleted file mode 100644
index 578f62f1..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gappinfo.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APP_INFO_H__
-#define __G_APP_INFO_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APP_INFO            (g_app_info_get_type ())
-#define G_APP_INFO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_APP_INFO, GAppInfo))
-#define G_IS_APP_INFO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_APP_INFO))
-#define G_APP_INFO_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_APP_INFO, GAppInfoIface))
-
-#define G_TYPE_APP_LAUNCH_CONTEXT         (g_app_launch_context_get_type ())
-#define G_APP_LAUNCH_CONTEXT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContext))
-#define G_APP_LAUNCH_CONTEXT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-#define G_IS_APP_LAUNCH_CONTEXT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_APP_LAUNCH_CONTEXT))
-#define G_IS_APP_LAUNCH_CONTEXT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LAUNCH_CONTEXT))
-#define G_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-
-typedef struct _GAppLaunchContextClass   GAppLaunchContextClass;
-typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
-
-/**
- * GAppInfo:
- *
- * Information about an installed application and methods to launch
- * it (with file arguments).
- */
-
-/**
- * GAppInfoIface:
- * @g_iface: The parent interface.
- * @dup: Copies a #GAppInfo.
- * @equal: Checks two #GAppInfo<!-- -->s for equality.
- * @get_id: Gets a string identifier for a #GAppInfo.
- * @get_name: Gets the name of the application for a #GAppInfo.
- * @get_description: Gets a short description for the application described by the #GAppInfo.
- * @get_executable: Gets the executable name for the #GAppInfo.
- * @get_icon: Gets the #GIcon for the #GAppInfo.
- * @launch: Launches an application specified by the #GAppInfo.
- * @supports_uris: Indicates whether the application specified supports launching URIs.
- * @supports_files: Indicates whether the application specified accepts filename arguments.
- * @launch_uris: Launches an application with a list of URIs.
- * @should_show: Returns whether an application should be shown (e.g. when getting a list of installed applications).
- * <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">
- * <citetitle>FreeDesktop.Org Startup Notification Specification</citetitle></ulink>.
- * @set_as_default_for_type: Sets an application as default for a given content type.
- * @set_as_default_for_extension: Sets an application as default for a given file extension.
- * @add_supports_type: Adds to the #GAppInfo information about supported file types.
- * @can_remove_supports_type: Checks for support for removing supported file types from a #GAppInfo.
- * @remove_supports_type: Removes a supported application type from a #GAppInfo.
- * @can_delete: Checks if a #GAppInfo can be deleted. Since 2.20
- * @do_delete: Deletes a #GAppInfo. Since 2.20
- * @get_commandline: Gets the commandline for the #GAppInfo. Since 2.20
- * @get_display_name: Gets the display name for the #GAppInfo. Since 2.24
- * @set_as_last_used_for_type: Sets the application as the last used. See g_app_info_set_as_last_used_for_type().
- *
- * Application Information interface, for operating system portability.
- */
-typedef struct _GAppInfoIface    GAppInfoIface;
-
-struct _GAppInfoIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GAppInfo *   (* dup)                          (GAppInfo           *appinfo);
-  gboolean     (* equal)                        (GAppInfo           *appinfo1,
-                                                 GAppInfo           *appinfo2);
-  const char * (* get_id)                       (GAppInfo           *appinfo);
-  const char * (* get_name)                     (GAppInfo           *appinfo);
-  const char * (* get_description)              (GAppInfo           *appinfo);
-  const char * (* get_executable)               (GAppInfo           *appinfo);
-  GIcon *      (* get_icon)                     (GAppInfo           *appinfo);
-  gboolean     (* launch)                       (GAppInfo           *appinfo,
-                                                 GList              *files,
-                                                 GAppLaunchContext  *launch_context,
-                                                 GError            **error);
-  gboolean     (* supports_uris)                (GAppInfo           *appinfo);
-  gboolean     (* supports_files)               (GAppInfo           *appinfo);
-  gboolean     (* launch_uris)                  (GAppInfo           *appinfo,
-                                                 GList              *uris,
-                                                 GAppLaunchContext  *launch_context,
-                                                 GError            **error);
-  gboolean     (* should_show)                  (GAppInfo           *appinfo);
-
-  /* For changing associations */
-  gboolean     (* set_as_default_for_type)      (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* set_as_default_for_extension) (GAppInfo           *appinfo,
-                                                 const char         *extension,
-                                                 GError            **error);
-  gboolean     (* add_supports_type)            (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* can_remove_supports_type)     (GAppInfo           *appinfo);
-  gboolean     (* remove_supports_type)         (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  gboolean     (* can_delete)                   (GAppInfo           *appinfo);
-  gboolean     (* do_delete)                    (GAppInfo           *appinfo);
-  const char * (* get_commandline)              (GAppInfo           *appinfo);
-  const char * (* get_display_name)             (GAppInfo           *appinfo);
-  gboolean     (* set_as_last_used_for_type)    (GAppInfo           *appinfo,
-                                                 const char         *content_type,
-                                                 GError            **error);
-  const char ** (* get_supported_types)         (GAppInfo           *appinfo);
-};
-
-GType       g_app_info_get_type                     (void) G_GNUC_CONST;
-GAppInfo *  g_app_info_create_from_commandline      (const char           *commandline,
-                                                     const char           *application_name,
-                                                     GAppInfoCreateFlags   flags,
-                                                     GError              **error);
-GAppInfo *  g_app_info_dup                          (GAppInfo             *appinfo);
-gboolean    g_app_info_equal                        (GAppInfo             *appinfo1,
-                                                     GAppInfo             *appinfo2);
-const char *g_app_info_get_id                       (GAppInfo             *appinfo);
-const char *g_app_info_get_name                     (GAppInfo             *appinfo);
-const char *g_app_info_get_display_name             (GAppInfo             *appinfo);
-const char *g_app_info_get_description              (GAppInfo             *appinfo);
-const char *g_app_info_get_executable               (GAppInfo             *appinfo);
-const char *g_app_info_get_commandline              (GAppInfo             *appinfo);
-GIcon *     g_app_info_get_icon                     (GAppInfo             *appinfo);
-gboolean    g_app_info_launch                       (GAppInfo             *appinfo,
-                                                     GList                *files,
-                                                     GAppLaunchContext    *launch_context,
-                                                     GError              **error);
-gboolean    g_app_info_supports_uris                (GAppInfo             *appinfo);
-gboolean    g_app_info_supports_files               (GAppInfo             *appinfo);
-gboolean    g_app_info_launch_uris                  (GAppInfo             *appinfo,
-                                                     GList                *uris,
-                                                     GAppLaunchContext    *launch_context,
-                                                     GError              **error);
-gboolean    g_app_info_should_show                  (GAppInfo             *appinfo);
-
-gboolean    g_app_info_set_as_default_for_type      (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-gboolean    g_app_info_set_as_default_for_extension (GAppInfo             *appinfo,
-                                                     const char           *extension,
-                                                     GError              **error);
-gboolean    g_app_info_add_supports_type            (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-gboolean    g_app_info_can_remove_supports_type     (GAppInfo             *appinfo);
-gboolean    g_app_info_remove_supports_type         (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-GLIB_AVAILABLE_IN_2_34
-const char **g_app_info_get_supported_types         (GAppInfo             *appinfo);
-
-gboolean    g_app_info_can_delete                   (GAppInfo   *appinfo);
-gboolean    g_app_info_delete                       (GAppInfo   *appinfo);
-
-gboolean    g_app_info_set_as_last_used_for_type    (GAppInfo             *appinfo,
-                                                     const char           *content_type,
-                                                     GError              **error);
-
-GList *   g_app_info_get_all                     (void);
-GList *   g_app_info_get_all_for_type            (const char  *content_type);
-GList *   g_app_info_get_recommended_for_type    (const gchar *content_type);
-GList *   g_app_info_get_fallback_for_type       (const gchar *content_type);
-
-void      g_app_info_reset_type_associations     (const char  *content_type);
-GAppInfo *g_app_info_get_default_for_type        (const char  *content_type,
-                                                  gboolean     must_support_uris);
-GAppInfo *g_app_info_get_default_for_uri_scheme  (const char  *uri_scheme);
-
-gboolean  g_app_info_launch_default_for_uri      (const char              *uri,
-                                                  GAppLaunchContext       *launch_context,
-                                                  GError                 **error);
-
-/**
- * GAppLaunchContext:
- *
- * Integrating the launch with the launching application. This is used to
- * handle for instance startup notification and launching the new application
- * on the same screen as the launching window.
- */
-struct _GAppLaunchContext
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GAppLaunchContextPrivate *priv;
-};
-
-struct _GAppLaunchContextClass
-{
-  GObjectClass parent_class;
-
-  char * (* get_display)           (GAppLaunchContext *context,
-                                    GAppInfo          *info,
-                                    GList             *files);
-  char * (* get_startup_notify_id) (GAppLaunchContext *context,
-                                    GAppInfo          *info,
-                                    GList             *files);
-  void   (* launch_failed)         (GAppLaunchContext *context,
-                                    const char        *startup_notify_id);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType              g_app_launch_context_get_type              (void) G_GNUC_CONST;
-GAppLaunchContext *g_app_launch_context_new                   (void);
-
-GLIB_AVAILABLE_IN_2_32
-void               g_app_launch_context_setenv                (GAppLaunchContext *context,
-                                                               const char        *variable,
-                                                               const char        *value);
-GLIB_AVAILABLE_IN_2_32
-void               g_app_launch_context_unsetenv              (GAppLaunchContext *context,
-                                                               const char        *variable);
-GLIB_AVAILABLE_IN_2_32
-char **            g_app_launch_context_get_environment       (GAppLaunchContext *context);
-
-char *             g_app_launch_context_get_display           (GAppLaunchContext *context,
-                                                               GAppInfo          *info,
-                                                               GList             *files);
-char *             g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
-                                                               GAppInfo          *info,
-                                                               GList             *files);
-void               g_app_launch_context_launch_failed         (GAppLaunchContext *context,
-                                                               const char *       startup_notify_id);
-
-G_END_DECLS
-
-#endif /* __G_APP_INFO_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gapplication.h b/GstreamerHelper/x86/include/glib-2.0/gio/gapplication.h
deleted file mode 100644
index 087682eb..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gapplication.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APPLICATION_H__
-#define __G_APPLICATION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APPLICATION                                  (g_application_get_type ())
-#define G_APPLICATION(inst)                                 (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_APPLICATION, GApplication))
-#define G_APPLICATION_CLASS(class)                          (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_APPLICATION, GApplicationClass))
-#define G_IS_APPLICATION(inst)                              (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_APPLICATION))
-#define G_IS_APPLICATION_CLASS(class)                       (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_APPLICATION))
-#define G_APPLICATION_GET_CLASS(inst)                       (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_APPLICATION, GApplicationClass))
-
-typedef struct _GApplicationPrivate                         GApplicationPrivate;
-typedef struct _GApplicationClass                           GApplicationClass;
-
-/**
- * GApplication:
- *
- * Since: 2.28
- */
-struct _GApplication
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GApplicationPrivate *priv;
-};
-
-struct _GApplicationClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void                      (* startup)             (GApplication              *application);
-
-  void                      (* activate)            (GApplication              *application);
-
-  void                      (* open)                (GApplication              *application,
-                                                     GFile                    **files,
-                                                     gint                       n_files,
-                                                     const gchar               *hint);
-
-  int                       (* command_line)        (GApplication              *application,
-                                                     GApplicationCommandLine   *command_line);
-
-  /* vfuncs */
-  gboolean                  (* local_command_line)  (GApplication              *application,
-                                                     gchar                   ***arguments,
-                                                     int                       *exit_status);
-
-  void                      (* before_emit)         (GApplication              *application,
-                                                     GVariant                  *platform_data);
-  void                      (* after_emit)          (GApplication              *application,
-                                                     GVariant                  *platform_data);
-  void                      (* add_platform_data)   (GApplication              *application,
-                                                     GVariantBuilder           *builder);
-  void                      (* quit_mainloop)       (GApplication              *application);
-  void                      (* run_mainloop)        (GApplication              *application);
-  void                      (* shutdown)            (GApplication              *application);
-
-  gboolean                  (* dbus_register)       (GApplication              *application,
-                                                     GDBusConnection           *connection,
-                                                     const gchar               *object_path,
-                                                     GError                   **error);
-  void                      (* dbus_unregister)     (GApplication              *application,
-                                                     GDBusConnection           *connection,
-                                                     const gchar               *object_path);
-
-  /*< private >*/
-  gpointer padding[9];
-};
-
-GType                   g_application_get_type                          (void) G_GNUC_CONST;
-
-gboolean                g_application_id_is_valid                       (const gchar              *application_id);
-
-GApplication *          g_application_new                               (const gchar              *application_id,
-                                                                         GApplicationFlags         flags);
-
-const gchar *           g_application_get_application_id                (GApplication             *application);
-void                    g_application_set_application_id                (GApplication             *application,
-                                                                         const gchar              *application_id);
-
-GLIB_AVAILABLE_IN_2_34
-GDBusConnection *       g_application_get_dbus_connection               (GApplication             *application);
-GLIB_AVAILABLE_IN_2_34
-const gchar *           g_application_get_dbus_object_path              (GApplication             *application);
-
-guint                   g_application_get_inactivity_timeout            (GApplication             *application);
-void                    g_application_set_inactivity_timeout            (GApplication             *application,
-                                                                         guint                     inactivity_timeout);
-
-GApplicationFlags       g_application_get_flags                         (GApplication             *application);
-void                    g_application_set_flags                         (GApplication             *application,
-                                                                         GApplicationFlags         flags);
-
-GLIB_DEPRECATED
-void                    g_application_set_action_group                  (GApplication             *application,
-                                                                         GActionGroup             *action_group);
-
-gboolean                g_application_get_is_registered                 (GApplication             *application);
-gboolean                g_application_get_is_remote                     (GApplication             *application);
-
-gboolean                g_application_register                          (GApplication             *application,
-                                                                         GCancellable             *cancellable,
-                                                                         GError                  **error);
-
-void                    g_application_hold                              (GApplication             *application);
-void                    g_application_release                           (GApplication             *application);
-
-void                    g_application_activate                          (GApplication             *application);
-
-void                    g_application_open                              (GApplication             *application,
-                                                                         GFile                   **files,
-                                                                         gint                      n_files,
-                                                                         const gchar              *hint);
-
-int                     g_application_run                               (GApplication             *application,
-                                                                         int                       argc,
-                                                                         char                    **argv);
-
-void                    g_application_quit                              (GApplication             *application);
-
-GLIB_AVAILABLE_IN_2_32
-GApplication *          g_application_get_default                       (void);
-GLIB_AVAILABLE_IN_2_32
-void                    g_application_set_default                       (GApplication             *application);
-
-G_END_DECLS
-
-#endif /* __G_APPLICATION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gapplicationcommandline.h b/GstreamerHelper/x86/include/glib-2.0/gio/gapplicationcommandline.h
deleted file mode 100644
index 25def211..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gapplicationcommandline.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_APPLICATION_COMMAND_LINE_H__
-#define __G_APPLICATION_COMMAND_LINE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_APPLICATION_COMMAND_LINE                     (g_application_command_line_get_type ())
-#define G_APPLICATION_COMMAND_LINE(inst)                    (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLine))
-#define G_APPLICATION_COMMAND_LINE_CLASS(class)             (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLineClass))
-#define G_IS_APPLICATION_COMMAND_LINE(inst)                 (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE))
-#define G_IS_APPLICATION_COMMAND_LINE_CLASS(class)          (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE))
-#define G_APPLICATION_COMMAND_LINE_GET_CLASS(inst)          (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_APPLICATION_COMMAND_LINE,                        \
-                                                             GApplicationCommandLineClass))
-
-typedef struct _GApplicationCommandLinePrivate               GApplicationCommandLinePrivate;
-typedef struct _GApplicationCommandLineClass                 GApplicationCommandLineClass;
-
-struct _GApplicationCommandLine
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GApplicationCommandLinePrivate *priv;
-};
-
-struct _GApplicationCommandLineClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  void (* print_literal)    (GApplicationCommandLine *cmdline,
-                             const gchar             *message);
-  void (* printerr_literal) (GApplicationCommandLine *cmdline,
-                             const gchar             *message);
-
-  gpointer padding[12];
-};
-
-GType                   g_application_command_line_get_type             (void) G_GNUC_CONST;
-
-gchar **                g_application_command_line_get_arguments        (GApplicationCommandLine   *cmdline,
-                                                                         int                       *argc);
-
-const gchar * const *   g_application_command_line_get_environ          (GApplicationCommandLine   *cmdline);
-
-const gchar *           g_application_command_line_getenv               (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *name);
-
-const gchar *           g_application_command_line_get_cwd              (GApplicationCommandLine   *cmdline);
-
-gboolean                g_application_command_line_get_is_remote        (GApplicationCommandLine   *cmdline);
-
-void                    g_application_command_line_print                (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *format,
-                                                                         ...) G_GNUC_PRINTF(2, 3);
-void                    g_application_command_line_printerr             (GApplicationCommandLine   *cmdline,
-                                                                         const gchar               *format,
-                                                                         ...) G_GNUC_PRINTF(2, 3);
-
-int                     g_application_command_line_get_exit_status      (GApplicationCommandLine   *cmdline);
-void                    g_application_command_line_set_exit_status      (GApplicationCommandLine   *cmdline,
-                                                                         int                        exit_status);
-
-GVariant *              g_application_command_line_get_platform_data    (GApplicationCommandLine   *cmdline);
-
-G_END_DECLS
-
-#endif /* __G_APPLICATION_COMMAND_LINE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gasyncinitable.h b/GstreamerHelper/x86/include/glib-2.0/gio/gasyncinitable.h
deleted file mode 100644
index 84428215..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gasyncinitable.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNC_INITABLE_H__
-#define __G_ASYNC_INITABLE_H__
-
-#include <gio/giotypes.h>
-#include <gio/ginitable.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ASYNC_INITABLE            (g_async_initable_get_type ())
-#define G_ASYNC_INITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ASYNC_INITABLE, GAsyncInitable))
-#define G_IS_ASYNC_INITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ASYNC_INITABLE))
-#define G_ASYNC_INITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ASYNC_INITABLE, GAsyncInitableIface))
-#define G_TYPE_IS_ASYNC_INITABLE(type)   (g_type_is_a ((type), G_TYPE_ASYNC_INITABLE))
-
-/**
- * GAsyncInitable:
- *
- * Interface for asynchronously initializable objects.
- *
- * Since: 2.22
- **/
-typedef struct _GAsyncInitableIface GAsyncInitableIface;
-
-/**
- * GAsyncInitableIface:
- * @g_iface: The parent interface.
- * @init_async: Starts initialization of the object.
- * @init_finish: Finishes initialization of the object.
- *
- * Provides an interface for asynchronous initializing object such that
- * initialization may fail.
- *
- * Since: 2.22
- **/
-struct _GAsyncInitableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  void     (* init_async)  (GAsyncInitable      *initable,
-			    int                  io_priority,
-			    GCancellable        *cancellable,
-			    GAsyncReadyCallback  callback,
-			    gpointer             user_data);
-  gboolean (* init_finish) (GAsyncInitable      *initable,
-			    GAsyncResult        *res,
-			    GError             **error);
-};
-
-GType    g_async_initable_get_type    (void) G_GNUC_CONST;
-
-
-void     g_async_initable_init_async       (GAsyncInitable       *initable,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-gboolean g_async_initable_init_finish      (GAsyncInitable       *initable,
-					    GAsyncResult         *res,
-					    GError              **error);
-
-void     g_async_initable_new_async        (GType                 object_type,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data,
-					    const gchar          *first_property_name,
-					    ...);
-void     g_async_initable_newv_async       (GType                 object_type,
-					    guint                 n_parameters,
-					    GParameter           *parameters,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-void     g_async_initable_new_valist_async (GType                 object_type,
-					    const gchar          *first_property_name,
-					    va_list               var_args,
-					    int                   io_priority,
-					    GCancellable         *cancellable,
-					    GAsyncReadyCallback   callback,
-					    gpointer              user_data);
-GObject *g_async_initable_new_finish       (GAsyncInitable       *initable,
-					    GAsyncResult         *res,
-					    GError              **error);
-
-
-
-G_END_DECLS
-
-
-#endif /* __G_ASYNC_INITABLE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gasyncresult.h b/GstreamerHelper/x86/include/glib-2.0/gio/gasyncresult.h
deleted file mode 100644
index e898401a..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gasyncresult.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNC_RESULT_H__
-#define __G_ASYNC_RESULT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ASYNC_RESULT            (g_async_result_get_type ())
-#define G_ASYNC_RESULT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ASYNC_RESULT, GAsyncResult))
-#define G_IS_ASYNC_RESULT(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ASYNC_RESULT))
-#define G_ASYNC_RESULT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ASYNC_RESULT, GAsyncResultIface))
-
-/**
- * GAsyncResult:
- *
- * Holds results information for an asynchronous operation,
- * usually passed directly to a asynchronous _finish() operation.
- **/
-typedef struct _GAsyncResultIface    GAsyncResultIface;
-
-
-/**
- * GAsyncResultIface:
- * @g_iface: The parent interface.
- * @get_user_data: Gets the user data passed to the callback.
- * @get_source_object: Gets the source object that issued the asynchronous operation.
- * @is_tagged: Checks if a result is tagged with a particular source.
- *
- * Interface definition for #GAsyncResult.
- **/
-struct _GAsyncResultIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  gpointer  (* get_user_data)     (GAsyncResult *res);
-  GObject * (* get_source_object) (GAsyncResult *res);
-
-  gboolean  (* is_tagged)         (GAsyncResult *res,
-				   gpointer      tag);
-};
-
-GType    g_async_result_get_type          (void) G_GNUC_CONST;
-
-gpointer g_async_result_get_user_data     (GAsyncResult *res);
-GObject *g_async_result_get_source_object (GAsyncResult *res);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean g_async_result_legacy_propagate_error (GAsyncResult  *res,
-						GError       **error);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_async_result_is_tagged              (GAsyncResult  *res,
-						gpointer       source_tag);
-
-G_END_DECLS
-
-#endif /* __G_ASYNC_RESULT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gbufferedinputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gbufferedinputstream.h
deleted file mode 100644
index 029426c2..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gbufferedinputstream.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_BUFFERED_INPUT_STREAM_H__
-#define __G_BUFFERED_INPUT_STREAM_H__
-
-#include <gio/gfilterinputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BUFFERED_INPUT_STREAM         (g_buffered_input_stream_get_type ())
-#define G_BUFFERED_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStream))
-#define G_BUFFERED_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStreamClass))
-#define G_IS_BUFFERED_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_BUFFERED_INPUT_STREAM))
-#define G_IS_BUFFERED_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_BUFFERED_INPUT_STREAM))
-#define G_BUFFERED_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_BUFFERED_INPUT_STREAM, GBufferedInputStreamClass))
-
-/**
- * GBufferedInputStream:
- *
- * Implements #GFilterInputStream with a sized input buffer.
- **/
-typedef struct _GBufferedInputStreamClass    GBufferedInputStreamClass;
-typedef struct _GBufferedInputStreamPrivate  GBufferedInputStreamPrivate;
-
-struct _GBufferedInputStream
-{
-  GFilterInputStream parent_instance;
-
-  /*< private >*/
-  GBufferedInputStreamPrivate *priv;
-};
-
-struct _GBufferedInputStreamClass
-{
-  GFilterInputStreamClass parent_class;
-
-  gssize   (* fill)        (GBufferedInputStream *stream,
-			    gssize                count,
-			    GCancellable         *cancellable,
-			    GError              **error);
-
-  /* Async ops: (optional in derived classes) */
-  void     (* fill_async)  (GBufferedInputStream *stream,
-			    gssize                count,
-			    int                   io_priority,
-			    GCancellable         *cancellable,
-			    GAsyncReadyCallback   callback,
-			    gpointer              user_data);
-  gssize   (* fill_finish) (GBufferedInputStream *stream,
-			    GAsyncResult         *result,
-			    GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GType         g_buffered_input_stream_get_type        (void) G_GNUC_CONST;
-GInputStream* g_buffered_input_stream_new             (GInputStream          *base_stream);
-GInputStream* g_buffered_input_stream_new_sized       (GInputStream          *base_stream,
-						       gsize                  size);
-
-gsize         g_buffered_input_stream_get_buffer_size (GBufferedInputStream  *stream);
-void          g_buffered_input_stream_set_buffer_size (GBufferedInputStream  *stream,
-						       gsize                  size);
-gsize         g_buffered_input_stream_get_available   (GBufferedInputStream  *stream);
-gsize         g_buffered_input_stream_peek            (GBufferedInputStream  *stream,
-						       void                  *buffer,
-						       gsize                  offset,
-						       gsize                  count);
-const void*   g_buffered_input_stream_peek_buffer     (GBufferedInputStream  *stream,
-						       gsize                 *count);
-
-gssize        g_buffered_input_stream_fill            (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       GCancellable          *cancellable,
-						       GError               **error);
-void          g_buffered_input_stream_fill_async      (GBufferedInputStream  *stream,
-						       gssize                 count,
-						       int                    io_priority,
-						       GCancellable          *cancellable,
-						       GAsyncReadyCallback    callback,
-						       gpointer               user_data);
-gssize        g_buffered_input_stream_fill_finish     (GBufferedInputStream  *stream,
-						       GAsyncResult          *result,
-						       GError               **error);
-
-int           g_buffered_input_stream_read_byte       (GBufferedInputStream  *stream,
-						       GCancellable          *cancellable,
-						       GError               **error);
-
-G_END_DECLS
-
-#endif /* __G_BUFFERED_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gbufferedoutputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gbufferedoutputstream.h
deleted file mode 100644
index 0d84790b..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gbufferedoutputstream.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
-#define __G_BUFFERED_OUTPUT_STREAM_H__
-
-#include <gio/gfilteroutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BUFFERED_OUTPUT_STREAM         (g_buffered_output_stream_get_type ())
-#define G_BUFFERED_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStream))
-#define G_BUFFERED_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStreamClass))
-#define G_IS_BUFFERED_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_BUFFERED_OUTPUT_STREAM))
-#define G_IS_BUFFERED_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_BUFFERED_OUTPUT_STREAM))
-#define G_BUFFERED_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_BUFFERED_OUTPUT_STREAM, GBufferedOutputStreamClass))
-
-/**
- * GBufferedOutputStream:
- *
- * An implementation of #GFilterOutputStream with a sized buffer.
- **/
-typedef struct _GBufferedOutputStreamClass    GBufferedOutputStreamClass;
-typedef struct _GBufferedOutputStreamPrivate  GBufferedOutputStreamPrivate;
-
-struct _GBufferedOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< protected >*/
-  GBufferedOutputStreamPrivate *priv;
-};
-
-struct _GBufferedOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-};
-
-
-GType          g_buffered_output_stream_get_type        (void) G_GNUC_CONST;
-GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
-GOutputStream* g_buffered_output_stream_new_sized       (GOutputStream         *base_stream,
-							 gsize                  size);
-gsize          g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream);
-void           g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream,
-							 gsize                  size);
-gboolean       g_buffered_output_stream_get_auto_grow   (GBufferedOutputStream *stream);
-void           g_buffered_output_stream_set_auto_grow   (GBufferedOutputStream *stream,
-							 gboolean               auto_grow);
-
-G_END_DECLS
-
-#endif /* __G_BUFFERED_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gcancellable.h b/GstreamerHelper/x86/include/glib-2.0/gio/gcancellable.h
deleted file mode 100644
index d8fa6336..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gcancellable.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CANCELLABLE_H__
-#define __G_CANCELLABLE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CANCELLABLE         (g_cancellable_get_type ())
-#define G_CANCELLABLE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CANCELLABLE, GCancellable))
-#define G_CANCELLABLE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CANCELLABLE, GCancellableClass))
-#define G_IS_CANCELLABLE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CANCELLABLE))
-#define G_IS_CANCELLABLE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CANCELLABLE))
-#define G_CANCELLABLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CANCELLABLE, GCancellableClass))
-
-/**
- * GCancellable:
- *
- * Allows actions to be cancelled.
- */
-typedef struct _GCancellableClass   GCancellableClass;
-typedef struct _GCancellablePrivate GCancellablePrivate;
-
-struct _GCancellable
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GCancellablePrivate *priv;
-};
-
-struct _GCancellableClass
-{
-  GObjectClass parent_class;
-
-  void (* cancelled) (GCancellable *cancellable);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType         g_cancellable_get_type               (void) G_GNUC_CONST;
-
-GCancellable *g_cancellable_new                    (void);
-
-/* These are only safe to call inside a cancellable op */
-gboolean      g_cancellable_is_cancelled           (GCancellable  *cancellable);
-gboolean      g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
-						    GError       **error);
-
-int           g_cancellable_get_fd                 (GCancellable  *cancellable);
-gboolean      g_cancellable_make_pollfd            (GCancellable  *cancellable,
-						    GPollFD       *pollfd);
-void          g_cancellable_release_fd             (GCancellable  *cancellable);
-
-GSource *     g_cancellable_source_new             (GCancellable  *cancellable);
-
-GCancellable *g_cancellable_get_current            (void);
-void          g_cancellable_push_current           (GCancellable  *cancellable);
-void          g_cancellable_pop_current            (GCancellable  *cancellable);
-void          g_cancellable_reset                  (GCancellable  *cancellable);
-gulong        g_cancellable_connect                (GCancellable  *cancellable,
-						    GCallback      callback,
-						    gpointer       data,
-						    GDestroyNotify data_destroy_func);
-void          g_cancellable_disconnect             (GCancellable  *cancellable,
-						    gulong         handler_id);
-
-
-/* This is safe to call from another thread */
-void          g_cancellable_cancel       (GCancellable  *cancellable);
-
-G_END_DECLS
-
-#endif /* __G_CANCELLABLE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gcharsetconverter.h b/GstreamerHelper/x86/include/glib-2.0/gio/gcharsetconverter.h
deleted file mode 100644
index 5198d463..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gcharsetconverter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CHARSET_CONVERTER_H__
-#define __G_CHARSET_CONVERTER_H__
-
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CHARSET_CONVERTER         (g_charset_converter_get_type ())
-#define G_CHARSET_CONVERTER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CHARSET_CONVERTER, GCharsetConverter))
-#define G_CHARSET_CONVERTER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CHARSET_CONVERTER, GCharsetConverterClass))
-#define G_IS_CHARSET_CONVERTER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CHARSET_CONVERTER))
-#define G_IS_CHARSET_CONVERTER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CHARSET_CONVERTER))
-#define G_CHARSET_CONVERTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CHARSET_CONVERTER, GCharsetConverterClass))
-
-typedef struct _GCharsetConverterClass   GCharsetConverterClass;
-
-struct _GCharsetConverterClass
-{
-  GObjectClass parent_class;
-};
-
-GType              g_charset_converter_get_type      (void) G_GNUC_CONST;
-
-GCharsetConverter *g_charset_converter_new            (const gchar  *to_charset,
-						       const gchar  *from_charset,
-						       GError **error);
-void               g_charset_converter_set_use_fallback (GCharsetConverter *converter,
-							 gboolean use_fallback);
-gboolean           g_charset_converter_get_use_fallback (GCharsetConverter *converter);
-guint              g_charset_converter_get_num_fallbacks (GCharsetConverter *converter);
-
-G_END_DECLS
-
-#endif /* __G_CHARSET_CONVERTER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gcontenttype.h b/GstreamerHelper/x86/include/glib-2.0/gio/gcontenttype.h
deleted file mode 100644
index fb4b8619..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gcontenttype.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONTENT_TYPE_H__
-#define __G_CONTENT_TYPE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-gboolean g_content_type_equals            (const gchar  *type1,
-                                           const gchar  *type2);
-gboolean g_content_type_is_a              (const gchar  *type,
-                                           const gchar  *supertype);
-gboolean g_content_type_is_unknown        (const gchar  *type);
-gchar *  g_content_type_get_description   (const gchar  *type);
-gchar *  g_content_type_get_mime_type     (const gchar  *type);
-GIcon *  g_content_type_get_icon          (const gchar  *type);
-GIcon *  g_content_type_get_symbolic_icon (const gchar  *type);
-GLIB_AVAILABLE_IN_2_34
-gchar *  g_content_type_get_generic_icon_name (const gchar  *type);
-
-gboolean g_content_type_can_be_executable (const gchar  *type);
-
-gchar *  g_content_type_from_mime_type    (const gchar  *mime_type);
-
-gchar *  g_content_type_guess             (const gchar  *filename,
-                                           const guchar *data,
-                                           gsize         data_size,
-                                           gboolean     *result_uncertain);
-
-gchar ** g_content_type_guess_for_tree    (GFile        *root);
-
-GList *  g_content_types_get_registered   (void);
-
-G_END_DECLS
-
-#endif /* __G_CONTENT_TYPE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gconverter.h b/GstreamerHelper/x86/include/glib-2.0/gio/gconverter.h
deleted file mode 100644
index 6770aaf9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gconverter.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERTER_H__
-#define __G_CONVERTER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER            (g_converter_get_type ())
-#define G_CONVERTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_CONVERTER, GConverter))
-#define G_IS_CONVERTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_CONVERTER))
-#define G_CONVERTER_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_CONVERTER, GConverterIface))
-
-/**
- * GConverter:
- *
- * Seek object for streaming operations.
- *
- * Since: 2.24
- **/
-typedef struct _GConverterIface   GConverterIface;
-
-/**
- * GConverterIface:
- * @g_iface: The parent interface.
- * @convert: Converts data.
- * @reset: Reverts the internal state of the converter to its initial state.
- *
- * Provides an interface for converting data from one type
- * to another type. The conversion can be stateful
- * and may fail at any place.
- *
- * Since: 2.24
- **/
-struct _GConverterIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GConverterResult (* convert) (GConverter *converter,
-				const void *inbuf,
-				gsize       inbuf_size,
-				void       *outbuf,
-				gsize       outbuf_size,
-				GConverterFlags flags,
-				gsize      *bytes_read,
-				gsize      *bytes_written,
-				GError    **error);
-  void  (* reset)   (GConverter *converter);
-};
-
-GType            g_converter_get_type     (void) G_GNUC_CONST;
-
-GConverterResult g_converter_convert (GConverter       *converter,
-				      const void       *inbuf,
-				      gsize             inbuf_size,
-				      void             *outbuf,
-				      gsize             outbuf_size,
-				      GConverterFlags   flags,
-				      gsize            *bytes_read,
-				      gsize            *bytes_written,
-				      GError          **error);
-void             g_converter_reset   (GConverter       *converter);
-
-
-G_END_DECLS
-
-
-#endif /* __G_CONVERTER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gconverterinputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gconverterinputstream.h
deleted file mode 100644
index 8e4f1d4f..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gconverterinputstream.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERTER_INPUT_STREAM_H__
-#define __G_CONVERTER_INPUT_STREAM_H__
-
-#include <gio/gfilterinputstream.h>
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER_INPUT_STREAM         (g_converter_input_stream_get_type ())
-#define G_CONVERTER_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStream))
-#define G_CONVERTER_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStreamClass))
-#define G_IS_CONVERTER_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CONVERTER_INPUT_STREAM))
-#define G_IS_CONVERTER_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CONVERTER_INPUT_STREAM))
-#define G_CONVERTER_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CONVERTER_INPUT_STREAM, GConverterInputStreamClass))
-
-/**
- * GConverterInputStream:
- *
- * An implementation of #GFilterInputStream that allows data
- * conversion.
- **/
-typedef struct _GConverterInputStreamClass    GConverterInputStreamClass;
-typedef struct _GConverterInputStreamPrivate  GConverterInputStreamPrivate;
-
-struct _GConverterInputStream
-{
-  GFilterInputStream parent_instance;
-
-  /*< private >*/
-  GConverterInputStreamPrivate *priv;
-};
-
-struct _GConverterInputStreamClass
-{
-  GFilterInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType                  g_converter_input_stream_get_type      (void) G_GNUC_CONST;
-GInputStream          *g_converter_input_stream_new           (GInputStream          *base_stream,
-                                                               GConverter            *converter);
-GConverter            *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream);
-
-G_END_DECLS
-
-#endif /* __G_CONVERTER_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gconverteroutputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gconverteroutputstream.h
deleted file mode 100644
index ceac2008..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gconverteroutputstream.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERTER_OUTPUT_STREAM_H__
-#define __G_CONVERTER_OUTPUT_STREAM_H__
-
-#include <gio/gfilteroutputstream.h>
-#include <gio/gconverter.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CONVERTER_OUTPUT_STREAM         (g_converter_output_stream_get_type ())
-#define G_CONVERTER_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStream))
-#define G_CONVERTER_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStreamClass))
-#define G_IS_CONVERTER_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CONVERTER_OUTPUT_STREAM))
-#define G_IS_CONVERTER_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CONVERTER_OUTPUT_STREAM))
-#define G_CONVERTER_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CONVERTER_OUTPUT_STREAM, GConverterOutputStreamClass))
-
-/**
- * GConverterOutputStream:
- *
- * An implementation of #GFilterOutputStream that allows data
- * conversion.
- **/
-typedef struct _GConverterOutputStreamClass    GConverterOutputStreamClass;
-typedef struct _GConverterOutputStreamPrivate  GConverterOutputStreamPrivate;
-
-struct _GConverterOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< private >*/
-  GConverterOutputStreamPrivate *priv;
-};
-
-struct _GConverterOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType                   g_converter_output_stream_get_type      (void) G_GNUC_CONST;
-GOutputStream          *g_converter_output_stream_new           (GOutputStream         *base_stream,
-                                                                 GConverter            *converter);
-GConverter             *g_converter_output_stream_get_converter (GConverterOutputStream *converter_stream);
-
-G_END_DECLS
-
-#endif /* __G_CONVERTER_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gcredentials.h b/GstreamerHelper/x86/include/glib-2.0/gio/gcredentials.h
deleted file mode 100644
index 8e09f779..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gcredentials.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_CREDENTIALS_H__
-#define __G_CREDENTIALS_H__
-
-#include <gio/giotypes.h>
-
-#ifdef G_OS_UNIX
-/* To get the uid_t type */
-#include <unistd.h>
-#include <sys/types.h>
-#endif
-
-G_BEGIN_DECLS
-
-#define G_TYPE_CREDENTIALS         (g_credentials_get_type ())
-#define G_CREDENTIALS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CREDENTIALS, GCredentials))
-#define G_CREDENTIALS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CREDENTIALS, GCredentialsClass))
-#define G_CREDENTIALS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CREDENTIALS, GCredentialsClass))
-#define G_IS_CREDENTIALS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CREDENTIALS))
-#define G_IS_CREDENTIALS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CREDENTIALS))
-
-typedef struct _GCredentialsClass   GCredentialsClass;
-
-GType            g_credentials_get_type           (void) G_GNUC_CONST;
-
-GCredentials    *g_credentials_new                (void);
-
-gchar           *g_credentials_to_string          (GCredentials    *credentials);
-
-gpointer         g_credentials_get_native         (GCredentials    *credentials,
-                                                   GCredentialsType native_type);
-
-void             g_credentials_set_native         (GCredentials    *credentials,
-                                                   GCredentialsType native_type,
-                                                   gpointer         native);
-
-gboolean         g_credentials_is_same_user       (GCredentials    *credentials,
-                                                   GCredentials    *other_credentials,
-                                                   GError         **error);
-
-#ifdef G_OS_UNIX
-uid_t            g_credentials_get_unix_user      (GCredentials    *credentials,
-                                                   GError         **error);
-gboolean         g_credentials_set_unix_user      (GCredentials    *credentials,
-                                                   uid_t           uid,
-                                                   GError         **error);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_DBUS_PROXY_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdatainputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdatainputstream.h
deleted file mode 100644
index 0f205c65..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdatainputstream.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DATA_INPUT_STREAM_H__
-#define __G_DATA_INPUT_STREAM_H__
-
-#include <gio/gbufferedinputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DATA_INPUT_STREAM         (g_data_input_stream_get_type ())
-#define G_DATA_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DATA_INPUT_STREAM, GDataInputStream))
-#define G_DATA_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DATA_INPUT_STREAM, GDataInputStreamClass))
-#define G_IS_DATA_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DATA_INPUT_STREAM))
-#define G_IS_DATA_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DATA_INPUT_STREAM))
-#define G_DATA_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DATA_INPUT_STREAM, GDataInputStreamClass))
-
-/**
- * GDataInputStream:
- *
- * An implementation of #GBufferedInputStream that allows for high-level
- * data manipulation of arbitrary data (including binary operations).
- **/
-typedef struct _GDataInputStreamClass    GDataInputStreamClass;
-typedef struct _GDataInputStreamPrivate  GDataInputStreamPrivate;
-
-struct _GDataInputStream
-{
-  GBufferedInputStream parent_instance;
-
-  /*< private >*/
-  GDataInputStreamPrivate *priv;
-};
-
-struct _GDataInputStreamClass
-{
-  GBufferedInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType                  g_data_input_stream_get_type             (void) G_GNUC_CONST;
-GDataInputStream *     g_data_input_stream_new                  (GInputStream            *base_stream);
-
-void                   g_data_input_stream_set_byte_order       (GDataInputStream        *stream,
-                                                                 GDataStreamByteOrder     order);
-GDataStreamByteOrder   g_data_input_stream_get_byte_order       (GDataInputStream        *stream);
-void                   g_data_input_stream_set_newline_type     (GDataInputStream        *stream,
-                                                                 GDataStreamNewlineType   type);
-GDataStreamNewlineType g_data_input_stream_get_newline_type     (GDataInputStream        *stream);
-guchar                 g_data_input_stream_read_byte            (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-gint16                 g_data_input_stream_read_int16           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-guint16                g_data_input_stream_read_uint16          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-gint32                 g_data_input_stream_read_int32           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-guint32                g_data_input_stream_read_uint32          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-gint64                 g_data_input_stream_read_int64           (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-guint64                g_data_input_stream_read_uint64          (GDataInputStream        *stream,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-char *                 g_data_input_stream_read_line            (GDataInputStream        *stream,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_2_30
-char *                 g_data_input_stream_read_line_utf8       (GDataInputStream        *stream,
-								 gsize                   *length,
-								 GCancellable            *cancellable,
-								 GError                 **error);
-void                   g_data_input_stream_read_line_async      (GDataInputStream        *stream,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-char *                 g_data_input_stream_read_line_finish     (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-GLIB_AVAILABLE_IN_2_30
-char *                 g_data_input_stream_read_line_finish_utf8(GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-char *                 g_data_input_stream_read_until           (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-void                   g_data_input_stream_read_until_async     (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-char *                 g_data_input_stream_read_until_finish    (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-
-char *                 g_data_input_stream_read_upto            (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gssize                   stop_chars_len,
-                                                                 gsize                   *length,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-void                   g_data_input_stream_read_upto_async      (GDataInputStream        *stream,
-                                                                 const gchar             *stop_chars,
-                                                                 gssize                   stop_chars_len,
-                                                                 gint                     io_priority,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-char *                 g_data_input_stream_read_upto_finish     (GDataInputStream        *stream,
-                                                                 GAsyncResult            *result,
-                                                                 gsize                   *length,
-                                                                 GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_DATA_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdataoutputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdataoutputstream.h
deleted file mode 100644
index 0fb3cbfe..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdataoutputstream.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DATA_OUTPUT_STREAM_H__
-#define __G_DATA_OUTPUT_STREAM_H__
-
-#include <gio/gfilteroutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DATA_OUTPUT_STREAM         (g_data_output_stream_get_type ())
-#define G_DATA_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStream))
-#define G_DATA_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStreamClass))
-#define G_IS_DATA_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DATA_OUTPUT_STREAM))
-#define G_IS_DATA_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DATA_OUTPUT_STREAM))
-#define G_DATA_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DATA_OUTPUT_STREAM, GDataOutputStreamClass))
-
-/**
- * GDataOutputStream:
- *
- * An implementation of #GBufferedOutputStream that allows for high-level
- * data manipulation of arbitrary data (including binary operations).
- **/
-typedef struct _GDataOutputStream         GDataOutputStream;
-typedef struct _GDataOutputStreamClass    GDataOutputStreamClass;
-typedef struct _GDataOutputStreamPrivate  GDataOutputStreamPrivate;
-
-struct _GDataOutputStream
-{
-  GFilterOutputStream parent_instance;
-
-  /*< private >*/
-  GDataOutputStreamPrivate *priv;
-};
-
-struct _GDataOutputStreamClass
-{
-  GFilterOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GType                g_data_output_stream_get_type       (void) G_GNUC_CONST;
-GDataOutputStream *  g_data_output_stream_new            (GOutputStream         *base_stream);
-
-void                 g_data_output_stream_set_byte_order (GDataOutputStream     *stream,
-							  GDataStreamByteOrder   order);
-GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream     *stream);
-
-gboolean             g_data_output_stream_put_byte       (GDataOutputStream     *stream,
-							  guchar                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int16      (GDataOutputStream     *stream,
-							  gint16                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint16     (GDataOutputStream     *stream,
-							  guint16                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int32      (GDataOutputStream     *stream,
-							  gint32                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint32     (GDataOutputStream     *stream,
-							  guint32                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_int64      (GDataOutputStream     *stream,
-							  gint64                 data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_uint64     (GDataOutputStream     *stream,
-							  guint64                data,
-							  GCancellable          *cancellable,
-							  GError               **error);
-gboolean             g_data_output_stream_put_string     (GDataOutputStream     *stream,
-							  const char            *str,
-							  GCancellable          *cancellable,
-							  GError               **error);
-
-G_END_DECLS
-
-#endif /* __G_DATA_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusactiongroup.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusactiongroup.h
deleted file mode 100644
index 12a2f60c..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusactiongroup.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_ACTION_GROUP_H__
-#define __G_DBUS_ACTION_GROUP_H__
-
-#include "giotypes.h"
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_ACTION_GROUP                            (g_dbus_action_group_get_type ())
-#define G_DBUS_ACTION_GROUP(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroup))
-#define G_DBUS_ACTION_GROUP_CLASS(class)                    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-#define G_IS_DBUS_ACTION_GROUP(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_IS_DBUS_ACTION_GROUP_CLASS(class)                 (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_DBUS_ACTION_GROUP_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-
-GType                   g_dbus_action_group_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GDBusActionGroup *      g_dbus_action_group_get                       (GDBusConnection        *connection,
-                                                                       const gchar            *bus_name,
-                                                                       const gchar            *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ACTION_GROUP_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusaddress.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusaddress.h
deleted file mode 100644
index 955c39e9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusaddress.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_ADDRESS_H__
-#define __G_DBUS_ADDRESS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-gboolean g_dbus_is_address (const gchar *string);
-gboolean g_dbus_is_supported_address (const gchar  *string,
-                                      GError      **error);
-
-void                 g_dbus_address_get_stream        (const gchar          *address,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-
-GIOStream           *g_dbus_address_get_stream_finish (GAsyncResult         *res,
-                                                       gchar               **out_guid,
-                                                       GError              **error);
-
-GIOStream           *g_dbus_address_get_stream_sync   (const gchar          *address,
-                                                       gchar               **out_guid,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-
-gchar               *g_dbus_address_get_for_bus_sync  (GBusType              bus_type,
-                                                       GCancellable  *cancellable,
-                                                       GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ADDRESS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusauthobserver.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusauthobserver.h
deleted file mode 100644
index ffb1ddf1..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusauthobserver.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_AUTH_OBSERVER_H__
-#define __G_DBUS_AUTH_OBSERVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_AUTH_OBSERVER         (g_dbus_auth_observer_get_type ())
-#define G_DBUS_AUTH_OBSERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_AUTH_OBSERVER, GDBusAuthObserver))
-#define G_IS_DBUS_AUTH_OBSERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_AUTH_OBSERVER))
-
-GType              g_dbus_auth_observer_get_type                     (void) G_GNUC_CONST;
-GDBusAuthObserver *g_dbus_auth_observer_new                          (void);
-gboolean           g_dbus_auth_observer_authorize_authenticated_peer (GDBusAuthObserver  *observer,
-                                                                      GIOStream          *stream,
-                                                                      GCredentials       *credentials);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean           g_dbus_auth_observer_allow_mechanism (GDBusAuthObserver  *observer,
-                                                         const gchar        *mechanism);
-
-G_END_DECLS
-
-#endif /* _G_DBUS_AUTH_OBSERVER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusconnection.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusconnection.h
deleted file mode 100644
index 6c1ec5c3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusconnection.h
+++ /dev/null
@@ -1,599 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_CONNECTION_H__
-#define __G_DBUS_CONNECTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_CONNECTION         (g_dbus_connection_get_type ())
-#define G_DBUS_CONNECTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_CONNECTION, GDBusConnection))
-#define G_IS_DBUS_CONNECTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_CONNECTION))
-
-GType            g_dbus_connection_get_type                   (void) G_GNUC_CONST;
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void              g_bus_get                    (GBusType             bus_type,
-                                                GCancellable        *cancellable,
-                                                GAsyncReadyCallback  callback,
-                                                gpointer             user_data);
-GDBusConnection  *g_bus_get_finish             (GAsyncResult        *res,
-                                                GError             **error);
-GDBusConnection  *g_bus_get_sync               (GBusType            bus_type,
-                                                GCancellable       *cancellable,
-                                                GError            **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void             g_dbus_connection_new                        (GIOStream              *stream,
-                                                               const gchar            *guid,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GAsyncReadyCallback     callback,
-                                                               gpointer                user_data);
-GDBusConnection *g_dbus_connection_new_finish                 (GAsyncResult           *res,
-                                                               GError                **error);
-GDBusConnection *g_dbus_connection_new_sync                   (GIOStream              *stream,
-                                                               const gchar            *guid,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GError                **error);
-
-void             g_dbus_connection_new_for_address            (const gchar            *address,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GAsyncReadyCallback     callback,
-                                                               gpointer                user_data);
-GDBusConnection *g_dbus_connection_new_for_address_finish     (GAsyncResult           *res,
-                                                               GError                **error);
-GDBusConnection *g_dbus_connection_new_for_address_sync       (const gchar            *address,
-                                                               GDBusConnectionFlags    flags,
-                                                               GDBusAuthObserver      *observer,
-                                                               GCancellable           *cancellable,
-                                                               GError                **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void             g_dbus_connection_start_message_processing   (GDBusConnection    *connection);
-gboolean         g_dbus_connection_is_closed                  (GDBusConnection    *connection);
-GIOStream       *g_dbus_connection_get_stream                 (GDBusConnection    *connection);
-const gchar     *g_dbus_connection_get_guid                   (GDBusConnection    *connection);
-const gchar     *g_dbus_connection_get_unique_name            (GDBusConnection    *connection);
-GCredentials    *g_dbus_connection_get_peer_credentials       (GDBusConnection    *connection);
-
-GLIB_AVAILABLE_IN_2_34
-guint32          g_dbus_connection_get_last_serial            (GDBusConnection    *connection);
-
-gboolean         g_dbus_connection_get_exit_on_close          (GDBusConnection    *connection);
-void             g_dbus_connection_set_exit_on_close          (GDBusConnection    *connection,
-                                                               gboolean            exit_on_close);
-GDBusCapabilityFlags  g_dbus_connection_get_capabilities      (GDBusConnection    *connection);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void             g_dbus_connection_close                          (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-gboolean         g_dbus_connection_close_finish                   (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-gboolean         g_dbus_connection_close_sync                     (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void             g_dbus_connection_flush                          (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-gboolean         g_dbus_connection_flush_finish                   (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-gboolean         g_dbus_connection_flush_sync                     (GDBusConnection     *connection,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-gboolean         g_dbus_connection_send_message                   (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   volatile guint32    *out_serial,
-                                                                   GError             **error);
-void             g_dbus_connection_send_message_with_reply        (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   gint                 timeout_msec,
-                                                                   volatile guint32    *out_serial,
-                                                                   GCancellable        *cancellable,
-                                                                   GAsyncReadyCallback  callback,
-                                                                   gpointer             user_data);
-GDBusMessage    *g_dbus_connection_send_message_with_reply_finish (GDBusConnection     *connection,
-                                                                   GAsyncResult        *res,
-                                                                   GError             **error);
-GDBusMessage    *g_dbus_connection_send_message_with_reply_sync   (GDBusConnection     *connection,
-                                                                   GDBusMessage        *message,
-                                                                   GDBusSendMessageFlags flags,
-                                                                   gint                 timeout_msec,
-                                                                   volatile guint32    *out_serial,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-gboolean  g_dbus_connection_emit_signal                       (GDBusConnection    *connection,
-                                                               const gchar        *destination_bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *signal_name,
-                                                               GVariant           *parameters,
-                                                               GError            **error);
-void      g_dbus_connection_call                              (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GCancellable       *cancellable,
-                                                               GAsyncReadyCallback callback,
-                                                               gpointer            user_data);
-GVariant *g_dbus_connection_call_finish                       (GDBusConnection    *connection,
-                                                               GAsyncResult       *res,
-                                                               GError            **error);
-GVariant *g_dbus_connection_call_sync                         (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GCancellable       *cancellable,
-                                                               GError            **error);
-GLIB_AVAILABLE_IN_2_30
-void      g_dbus_connection_call_with_unix_fd_list            (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GUnixFDList        *fd_list,
-                                                               GCancellable       *cancellable,
-                                                               GAsyncReadyCallback callback,
-                                                               gpointer            user_data);
-GLIB_AVAILABLE_IN_2_30
-GVariant *g_dbus_connection_call_with_unix_fd_list_finish     (GDBusConnection    *connection,
-                                                               GUnixFDList       **out_fd_list,
-                                                               GAsyncResult       *res,
-                                                               GError            **error);
-GLIB_AVAILABLE_IN_2_30
-GVariant *g_dbus_connection_call_with_unix_fd_list_sync       (GDBusConnection    *connection,
-                                                               const gchar        *bus_name,
-                                                               const gchar        *object_path,
-                                                               const gchar        *interface_name,
-                                                               const gchar        *method_name,
-                                                               GVariant           *parameters,
-                                                               const GVariantType *reply_type,
-                                                               GDBusCallFlags      flags,
-                                                               gint                timeout_msec,
-                                                               GUnixFDList        *fd_list,
-                                                               GUnixFDList       **out_fd_list,
-                                                               GCancellable       *cancellable,
-                                                               GError            **error);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-
-/**
- * GDBusInterfaceMethodCallFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name the method was invoked on.
- * @method_name: The name of the method that was invoked.
- * @parameters: A #GVariant tuple with parameters.
- * @invocation: A #GDBusMethodInvocation object that can be used to return a value or error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @method_call function in #GDBusInterfaceVTable.
- *
- * Since: 2.26
- */
-typedef void (*GDBusInterfaceMethodCallFunc) (GDBusConnection       *connection,
-                                              const gchar           *sender,
-                                              const gchar           *object_path,
-                                              const gchar           *interface_name,
-                                              const gchar           *method_name,
-                                              GVariant              *parameters,
-                                              GDBusMethodInvocation *invocation,
-                                              gpointer               user_data);
-
-/**
- * GDBusInterfaceGetPropertyFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name for the property.
- * @property_name: The name of the property to get the value of.
- * @error: Return location for error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @get_property function in #GDBusInterfaceVTable.
- *
- * Returns: A #GVariant with the value for @property_name or %NULL if
- *     @error is set. If the returned #GVariant is floating, it is
- *     consumed - otherwise its reference count is decreased by one.
- *
- * Since: 2.26
- */
-typedef GVariant *(*GDBusInterfaceGetPropertyFunc) (GDBusConnection       *connection,
-                                                    const gchar           *sender,
-                                                    const gchar           *object_path,
-                                                    const gchar           *interface_name,
-                                                    const gchar           *property_name,
-                                                    GError               **error,
-                                                    gpointer               user_data);
-
-/**
- * GDBusInterfaceSetPropertyFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that the method was invoked on.
- * @interface_name: The D-Bus interface name for the property.
- * @property_name: The name of the property to get the value of.
- * @value: The value to set the property to.
- * @error: Return location for error.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_object().
- *
- * The type of the @set_property function in #GDBusInterfaceVTable.
- *
- * Returns: %TRUE if the property was set to @value, %FALSE if @error is set.
- *
- * Since: 2.26
- */
-typedef gboolean  (*GDBusInterfaceSetPropertyFunc) (GDBusConnection       *connection,
-                                                    const gchar           *sender,
-                                                    const gchar           *object_path,
-                                                    const gchar           *interface_name,
-                                                    const gchar           *property_name,
-                                                    GVariant              *value,
-                                                    GError               **error,
-                                                    gpointer               user_data);
-
-/**
- * GDBusInterfaceVTable:
- * @method_call: Function for handling incoming method calls.
- * @get_property: Function for getting a property.
- * @set_property: Function for setting a property.
- *
- * Virtual table for handling properties and method calls for a D-Bus
- * interface.
- *
- * If you want to handle getting/setting D-Bus properties asynchronously, simply
- * register an object with the <literal>org.freedesktop.DBus.Properties</literal>
- * D-Bus interface using g_dbus_connection_register_object().
- *
- * Since: 2.26
- */
-struct _GDBusInterfaceVTable
-{
-  GDBusInterfaceMethodCallFunc  method_call;
-  GDBusInterfaceGetPropertyFunc get_property;
-  GDBusInterfaceSetPropertyFunc set_property;
-
-  /*< private >*/
-  /* Padding for future expansion - also remember to update
-   * gdbusconnection.c:_g_dbus_interface_vtable_copy() when
-   * changing this.
-   */
-  gpointer padding[8];
-};
-
-guint            g_dbus_connection_register_object            (GDBusConnection            *connection,
-                                                               const gchar                *object_path,
-                                                               GDBusInterfaceInfo         *interface_info,
-                                                               const GDBusInterfaceVTable *vtable,
-                                                               gpointer                    user_data,
-                                                               GDestroyNotify              user_data_free_func,
-                                                               GError                    **error);
-gboolean         g_dbus_connection_unregister_object          (GDBusConnection            *connection,
-                                                               guint                       registration_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusSubtreeEnumerateFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @enumerate function in #GDBusSubtreeVTable.
- *
- * This function is called when generating introspection data and also
- * when preparing to dispatch incoming messages in the event that the
- * %G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES flag is not
- * specified (ie: to verify that the object path is valid).
- *
- * Hierarchies are not supported; the items that you return should not
- * contain the '/' character.
- *
- * The return value will be freed with g_strfreev().
- *
- * Returns: A newly allocated array of strings for node names that are children of @object_path.
- *
- * Since: 2.26
- */
-typedef gchar** (*GDBusSubtreeEnumerateFunc) (GDBusConnection       *connection,
-                                              const gchar           *sender,
-                                              const gchar           *object_path,
-                                              gpointer               user_data);
-
-/**
- * GDBusSubtreeIntrospectFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @node: A node that is a child of @object_path (relative to @object_path) or %NULL for the root of the subtree.
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @introspect function in #GDBusSubtreeVTable.
- *
- * Subtrees are flat.  @node, if non-%NULL, is always exactly one
- * segment of the object path (ie: it never contains a slash).
- *
- * This function should return %NULL to indicate that there is no object
- * at this node.
- *
- * If this function returns non-%NULL, the return value is expected to
- * be a %NULL-terminated array of pointers to #GDBusInterfaceInfo
- * structures describing the interfaces implemented by @node.  This
- * array will have g_dbus_interface_info_unref() called on each item
- * before being freed with g_free().
- *
- * The difference between returning %NULL and an array containing zero
- * items is that the standard DBus interfaces will returned to the
- * remote introspector in the empty array case, but not in the %NULL
- * case.
- *
- * Returns: A %NULL-terminated array of pointers to #GDBusInterfaceInfo, or %NULL.
- *
- * Since: 2.26
- */
-typedef GDBusInterfaceInfo ** (*GDBusSubtreeIntrospectFunc) (GDBusConnection       *connection,
-                                                             const gchar           *sender,
-                                                             const gchar           *object_path,
-                                                             const gchar           *node,
-                                                             gpointer               user_data);
-
-/**
- * GDBusSubtreeDispatchFunc:
- * @connection: A #GDBusConnection.
- * @sender: The unique bus name of the remote caller.
- * @object_path: The object path that was registered with g_dbus_connection_register_subtree().
- * @interface_name: The D-Bus interface name that the method call or property access is for.
- * @node: A node that is a child of @object_path (relative to @object_path) or %NULL for the root of the subtree.
- * @out_user_data: Return location for user data to pass to functions in the returned #GDBusInterfaceVTable (never %NULL).
- * @user_data: The @user_data #gpointer passed to g_dbus_connection_register_subtree().
- *
- * The type of the @dispatch function in #GDBusSubtreeVTable.
- *
- * Subtrees are flat.  @node, if non-%NULL, is always exactly one
- * segment of the object path (ie: it never contains a slash).
- *
- * Returns: A #GDBusInterfaceVTable or %NULL if you don't want to handle the methods.
- *
- * Since: 2.26
- */
-typedef const GDBusInterfaceVTable * (*GDBusSubtreeDispatchFunc) (GDBusConnection             *connection,
-                                                                  const gchar                 *sender,
-                                                                  const gchar                 *object_path,
-                                                                  const gchar                 *interface_name,
-                                                                  const gchar                 *node,
-                                                                  gpointer                    *out_user_data,
-                                                                  gpointer                     user_data);
-
-/**
- * GDBusSubtreeVTable:
- * @enumerate: Function for enumerating child nodes.
- * @introspect: Function for introspecting a child node.
- * @dispatch: Function for dispatching a remote call on a child node.
- *
- * Virtual table for handling subtrees registered with g_dbus_connection_register_subtree().
- *
- * Since: 2.26
- */
-struct _GDBusSubtreeVTable
-{
-  GDBusSubtreeEnumerateFunc  enumerate;
-  GDBusSubtreeIntrospectFunc introspect;
-  GDBusSubtreeDispatchFunc   dispatch;
-
-  /*< private >*/
-  /* Padding for future expansion - also remember to update
-   * gdbusconnection.c:_g_dbus_subtree_vtable_copy() when
-   * changing this.
-   */
-  gpointer padding[8];
-};
-
-guint            g_dbus_connection_register_subtree           (GDBusConnection            *connection,
-                                                               const gchar                *object_path,
-                                                               const GDBusSubtreeVTable   *vtable,
-                                                               GDBusSubtreeFlags           flags,
-                                                               gpointer                    user_data,
-                                                               GDestroyNotify              user_data_free_func,
-                                                               GError                    **error);
-gboolean         g_dbus_connection_unregister_subtree         (GDBusConnection            *connection,
-                                                               guint                       registration_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusSignalCallback:
- * @connection: A #GDBusConnection.
- * @sender_name: The unique bus name of the sender of the signal.
- * @object_path: The object path that the signal was emitted on.
- * @interface_name: The name of the interface.
- * @signal_name: The name of the signal.
- * @parameters: A #GVariant tuple with parameters for the signal.
- * @user_data: User data passed when subscribing to the signal.
- *
- * Signature for callback function used in g_dbus_connection_signal_subscribe().
- *
- * Since: 2.26
- */
-typedef void (*GDBusSignalCallback) (GDBusConnection  *connection,
-                                     const gchar      *sender_name,
-                                     const gchar      *object_path,
-                                     const gchar      *interface_name,
-                                     const gchar      *signal_name,
-                                     GVariant         *parameters,
-                                     gpointer          user_data);
-
-guint            g_dbus_connection_signal_subscribe           (GDBusConnection     *connection,
-                                                               const gchar         *sender,
-                                                               const gchar         *interface_name,
-                                                               const gchar         *member,
-                                                               const gchar         *object_path,
-                                                               const gchar         *arg0,
-                                                               GDBusSignalFlags     flags,
-                                                               GDBusSignalCallback  callback,
-                                                               gpointer             user_data,
-                                                               GDestroyNotify       user_data_free_func);
-void             g_dbus_connection_signal_unsubscribe         (GDBusConnection     *connection,
-                                                               guint                subscription_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/**
- * GDBusMessageFilterFunction:
- * @connection: (transfer none): A #GDBusConnection.
- * @message: (transfer full): A locked #GDBusMessage that the filter function takes ownership of.
- * @incoming: %TRUE if it is a message received from the other peer, %FALSE if it is
- * a message to be sent to the other peer.
- * @user_data: User data passed when adding the filter.
- *
- * Signature for function used in g_dbus_connection_add_filter().
- *
- * A filter function is passed a #GDBusMessage and expected to return
- * a #GDBusMessage too. Passive filter functions that don't modify the
- * message can simply return the @message object:
- * |[
- * static GDBusMessage *
- * passive_filter (GDBusConnection *connection
- *                 GDBusMessage    *message,
- *                 gboolean         incoming,
- *                 gpointer         user_data)
- * {
- *   /<!-- -->* inspect @message *<!-- -->/
- *   return message;
- * }
- * ]|
- * Filter functions that wants to drop a message can simply return %NULL:
- * |[
- * static GDBusMessage *
- * drop_filter (GDBusConnection *connection
- *              GDBusMessage    *message,
- *              gboolean         incoming,
- *              gpointer         user_data)
- * {
- *   if (should_drop_message)
- *     {
- *       g_object_unref (message);
- *       message = NULL;
- *     }
- *   return message;
- * }
- * ]|
- * Finally, a filter function may modify a message by copying it:
- * |[
- * static GDBusMessage *
- * modifying_filter (GDBusConnection *connection
- *                   GDBusMessage    *message,
- *                   gboolean         incoming,
- *                   gpointer         user_data)
- * {
- *   GDBusMessage *copy;
- *   GError *error;
- *
- *   error = NULL;
- *   copy = g_dbus_message_copy (message, &error);
- *   /<!-- -->* handle @error being is set *<!-- -->/
- *   g_object_unref (message);
- *
- *   /<!-- -->* modify @copy *<!-- -->/
- *
- *   return copy;
- * }
- * ]|
- * If the returned #GDBusMessage is different from @message and cannot
- * be sent on @connection (it could use features, such as file
- * descriptors, not compatible with @connection), then a warning is
- * logged to <emphasis>standard error</emphasis>. Applications can
- * check this ahead of time using g_dbus_message_to_blob() passing a
- * #GDBusCapabilityFlags value obtained from @connection.
- *
- * Returns: (transfer full) (allow-none): A #GDBusMessage that will be freed with
- * g_object_unref() or %NULL to drop the message. Passive filter
- * functions can simply return the passed @message object.
- *
- * Since: 2.26
- */
-typedef GDBusMessage *(*GDBusMessageFilterFunction) (GDBusConnection *connection,
-                                                     GDBusMessage    *message,
-                                                     gboolean         incoming,
-                                                     gpointer         user_data);
-
-guint g_dbus_connection_add_filter (GDBusConnection            *connection,
-                                    GDBusMessageFilterFunction  filter_function,
-                                    gpointer                    user_data,
-                                    GDestroyNotify              user_data_free_func);
-
-void  g_dbus_connection_remove_filter (GDBusConnection    *connection,
-                                       guint               filter_id);
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-
-G_END_DECLS
-
-#endif /* __G_DBUS_CONNECTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbuserror.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbuserror.h
deleted file mode 100644
index 85e2f881..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbuserror.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_ERROR_H__
-#define __G_DBUS_ERROR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_DBUS_ERROR:
- *
- * Error domain for errors generated by a remote message bus. Errors
- * in this domain will be from the #GDBusError enumeration.  See
- * #GError for more information on error domains.
- *
- * Note that errors in this error domain is intended only for
- * returning errors from a remote message bus process. Errors
- * generated locally in-process by e.g. #GDBusConnection is from the
- * %G_IO_ERROR domain.
- *
- * Since: 2.26
- */
-#define G_DBUS_ERROR g_dbus_error_quark()
-
-GQuark g_dbus_error_quark (void);
-
-/* Used by applications to check, get and strip the D-Bus error name */
-gboolean g_dbus_error_is_remote_error       (const GError    *error);
-gchar   *g_dbus_error_get_remote_error      (const GError    *error);
-gboolean g_dbus_error_strip_remote_error    (GError          *error);
-
-/**
- * GDBusErrorEntry:
- * @error_code: An error code.
- * @dbus_error_name: The D-Bus error name to associate with @error_code.
- *
- * Struct used in g_dbus_error_register_error_domain().
- *
- * Since: 2.26
- */
-struct _GDBusErrorEntry
-{
-  gint         error_code;
-  const gchar *dbus_error_name;
-};
-
-gboolean g_dbus_error_register_error        (GQuark                 error_domain,
-                                             gint                   error_code,
-                                             const gchar           *dbus_error_name);
-gboolean g_dbus_error_unregister_error      (GQuark                 error_domain,
-                                             gint                   error_code,
-                                             const gchar           *dbus_error_name);
-void     g_dbus_error_register_error_domain (const gchar           *error_domain_quark_name,
-                                             volatile gsize        *quark_volatile,
-                                             const GDBusErrorEntry *entries,
-                                             guint                  num_entries);
-
-/* Only used by object mappings to map back and forth to GError */
-GError  *g_dbus_error_new_for_dbus_error    (const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message);
-void     g_dbus_error_set_dbus_error        (GError         **error,
-                                             const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message,
-                                             const gchar     *format,
-                                             ...);
-void     g_dbus_error_set_dbus_error_valist (GError         **error,
-                                             const gchar     *dbus_error_name,
-                                             const gchar     *dbus_error_message,
-                                             const gchar     *format,
-                                             va_list          var_args);
-gchar   *g_dbus_error_encode_gerror         (const GError    *error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_ERROR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusinterface.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusinterface.h
deleted file mode 100644
index 9536e627..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusinterface.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_INTERFACE_H__
-#define __G_DBUS_INTERFACE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_INTERFACE         (g_dbus_interface_get_type())
-#define G_DBUS_INTERFACE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_INTERFACE, GDBusInterface))
-#define G_IS_DBUS_INTERFACE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_INTERFACE))
-#define G_DBUS_INTERFACE_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_INTERFACE, GDBusInterfaceIface))
-
-/**
- * GDBusInterface:
- *
- * Base type for D-Bus interfaces.
- *
- * Since: 2.30
- */
-
-typedef struct _GDBusInterfaceIface GDBusInterfaceIface;
-
-/**
- * GDBusInterfaceIface:
- * @parent_iface: The parent interface.
- * @get_info: Returns a #GDBusInterfaceInfo. See g_dbus_interface_get_info().
- * @get_object: Gets the enclosing #GDBusObject. See g_dbus_interface_get_object().
- * @set_object: Sets the enclosing #GDBusObject. See g_dbus_interface_set_object().
- * @dup_object: Gets a reference to the enclosing #GDBusObject. See g_dbus_interface_dup_object(). Added in 2.32.
- *
- * Base type for D-Bus interfaces.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  GDBusInterfaceInfo   *(*get_info)   (GDBusInterface      *interface_);
-  GDBusObject          *(*get_object) (GDBusInterface      *interface_);
-  void                  (*set_object) (GDBusInterface      *interface_,
-                                       GDBusObject         *object);
-  GDBusObject          *(*dup_object) (GDBusInterface      *interface_);
-};
-
-GType                 g_dbus_interface_get_type         (void) G_GNUC_CONST;
-GDBusInterfaceInfo   *g_dbus_interface_get_info         (GDBusInterface      *interface_);
-GDBusObject          *g_dbus_interface_get_object       (GDBusInterface      *interface_);
-void                  g_dbus_interface_set_object       (GDBusInterface      *interface_,
-                                                         GDBusObject         *object);
-GLIB_AVAILABLE_IN_2_32
-GDBusObject          *g_dbus_interface_dup_object       (GDBusInterface      *interface_);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTERFACE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusinterfaceskeleton.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusinterfaceskeleton.h
deleted file mode 100644
index 5f1c1663..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusinterfaceskeleton.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_INTERFACE_SKELETON_H__
-#define __G_DBUS_INTERFACE_SKELETON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_INTERFACE_SKELETON         (g_dbus_interface_skeleton_get_type ())
-#define G_DBUS_INTERFACE_SKELETON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeleton))
-#define G_DBUS_INTERFACE_SKELETON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeletonClass))
-#define G_DBUS_INTERFACE_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_INTERFACE_SKELETON, GDBusInterfaceSkeletonClass))
-#define G_IS_DBUS_INTERFACE_SKELETON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_INTERFACE_SKELETON))
-#define G_IS_DBUS_INTERFACE_SKELETON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_INTERFACE_SKELETON))
-
-typedef struct _GDBusInterfaceSkeletonClass   GDBusInterfaceSkeletonClass;
-typedef struct _GDBusInterfaceSkeletonPrivate GDBusInterfaceSkeletonPrivate;
-
-/**
- * GDBusInterfaceSkeleton:
- *
- * The #GDBusInterfaceSkeleton structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceSkeleton
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusInterfaceSkeletonPrivate *priv;
-};
-
-/**
- * GDBusInterfaceSkeletonClass:
- * @parent_class: The parent class.
- * @get_info: Returns a #GDBusInterfaceInfo. See g_dbus_interface_skeleton_get_info() for details.
- * @get_vtable: Returns a #GDBusInterfaceVTable. See g_dbus_interface_skeleton_get_vtable() for details.
- * @get_properties: Returns a #GVariant with all properties. See g_dbus_interface_skeleton_get_properties().
- * @flush: Emits outstanding changes, if any. See g_dbus_interface_skeleton_flush().
- * @g_authorize_method: Signal class handler for the #GDBusInterfaceSkeleton::g-authorize-method signal.
- *
- * Class structure for #GDBusInterfaceSkeleton.
- *
- * Since: 2.30
- */
-struct _GDBusInterfaceSkeletonClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Functions */
-  GDBusInterfaceInfo   *(*get_info)       (GDBusInterfaceSkeleton  *interface_);
-  GDBusInterfaceVTable *(*get_vtable)     (GDBusInterfaceSkeleton  *interface_);
-  GVariant             *(*get_properties) (GDBusInterfaceSkeleton  *interface_);
-  void                  (*flush)          (GDBusInterfaceSkeleton  *interface_);
-
-  /*< private >*/
-  gpointer vfunc_padding[8];
-  /*< public >*/
-
-  /* Signals */
-  gboolean (*g_authorize_method) (GDBusInterfaceSkeleton  *interface_,
-                                  GDBusMethodInvocation   *invocation);
-
-  /*< private >*/
-  gpointer signal_padding[8];
-};
-
-GType                        g_dbus_interface_skeleton_get_type        (void) G_GNUC_CONST;
-GDBusInterfaceSkeletonFlags  g_dbus_interface_skeleton_get_flags       (GDBusInterfaceSkeleton      *interface_);
-void                         g_dbus_interface_skeleton_set_flags       (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusInterfaceSkeletonFlags  flags);
-GDBusInterfaceInfo          *g_dbus_interface_skeleton_get_info        (GDBusInterfaceSkeleton      *interface_);
-GDBusInterfaceVTable        *g_dbus_interface_skeleton_get_vtable      (GDBusInterfaceSkeleton      *interface_);
-GVariant                    *g_dbus_interface_skeleton_get_properties  (GDBusInterfaceSkeleton      *interface_);
-void                         g_dbus_interface_skeleton_flush           (GDBusInterfaceSkeleton      *interface_);
-
-gboolean                     g_dbus_interface_skeleton_export          (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection,
-                                                                        const gchar                 *object_path,
-                                                                        GError                     **error);
-void                         g_dbus_interface_skeleton_unexport        (GDBusInterfaceSkeleton      *interface_);
-void                g_dbus_interface_skeleton_unexport_from_connection (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection);
-
-GDBusConnection             *g_dbus_interface_skeleton_get_connection  (GDBusInterfaceSkeleton      *interface_);
-GList                       *g_dbus_interface_skeleton_get_connections (GDBusInterfaceSkeleton      *interface_);
-gboolean                     g_dbus_interface_skeleton_has_connection  (GDBusInterfaceSkeleton      *interface_,
-                                                                        GDBusConnection             *connection);
-const gchar                 *g_dbus_interface_skeleton_get_object_path (GDBusInterfaceSkeleton      *interface_);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTERFACE_SKELETON_H */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusintrospection.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusintrospection.h
deleted file mode 100644
index 884c733c..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusintrospection.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_INTROSPECTION_H__
-#define __G_DBUS_INTROSPECTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GDBusAnnotationInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @key: The name of the annotation, e.g. "org.freedesktop.DBus.Deprecated".
- * @value: The value of the annotation.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about an annotation.
- *
- * Since: 2.26
- */
-struct _GDBusAnnotationInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *key;
-  gchar                *value;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusArgInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: Name of the argument, e.g. @unix_user_id.
- * @signature: D-Bus signature of the argument (a single complete type).
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about an argument for a method or a signal.
- *
- * Since: 2.26
- */
-struct _GDBusArgInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  gchar                *signature;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusMethodInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus method, e.g. @RequestName.
- * @in_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no in arguments.
- * @out_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no out arguments.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a method on an D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusMethodInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusArgInfo        **in_args;
-  GDBusArgInfo        **out_args;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusSignalInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus signal, e.g. "NameOwnerChanged".
- * @args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no arguments.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a signal on a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusSignalInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusArgInfo        **args;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusPropertyInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus property, e.g. "SupportedFilesystems".
- * @signature: The D-Bus signature of the property (a single complete type).
- * @flags: Access control flags for the property.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a D-Bus property on a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusPropertyInfo
-{
-  /*< public >*/
-  volatile gint             ref_count;
-  gchar                    *name;
-  gchar                    *signature;
-  GDBusPropertyInfoFlags    flags;
-  GDBusAnnotationInfo     **annotations;
-};
-
-/**
- * GDBusInterfaceInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @name: The name of the D-Bus interface, e.g. "org.freedesktop.DBus.Properties".
- * @methods: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusMethodInfo structures or %NULL if there are no methods.
- * @signals: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusSignalInfo structures or %NULL if there are no signals.
- * @properties: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusPropertyInfo structures or %NULL if there are no properties.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about a D-Bus interface.
- *
- * Since: 2.26
- */
-struct _GDBusInterfaceInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *name;
-  GDBusMethodInfo     **methods;
-  GDBusSignalInfo     **signals;
-  GDBusPropertyInfo   **properties;
-  GDBusAnnotationInfo **annotations;
-};
-
-/**
- * GDBusNodeInfo:
- * @ref_count: The reference count or -1 if statically allocated.
- * @path: The path of the node or %NULL if omitted. Note that this may be a relative path. See the D-Bus specification for more details.
- * @interfaces: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusInterfaceInfo structures or %NULL if there are no interfaces.
- * @nodes: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusNodeInfo structures or %NULL if there are no nodes.
- * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
- *
- * Information about nodes in a remote object hierarchy.
- *
- * Since: 2.26
- */
-struct _GDBusNodeInfo
-{
-  /*< public >*/
-  volatile gint         ref_count;
-  gchar                *path;
-  GDBusInterfaceInfo  **interfaces;
-  GDBusNodeInfo       **nodes;
-  GDBusAnnotationInfo **annotations;
-};
-
-const gchar        *g_dbus_annotation_info_lookup          (GDBusAnnotationInfo **annotations,
-                                                            const gchar          *name);
-GDBusMethodInfo    *g_dbus_interface_info_lookup_method    (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-GDBusSignalInfo    *g_dbus_interface_info_lookup_signal    (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-GDBusPropertyInfo  *g_dbus_interface_info_lookup_property  (GDBusInterfaceInfo   *info,
-                                                            const gchar          *name);
-void                g_dbus_interface_info_cache_build      (GDBusInterfaceInfo   *info);
-void                g_dbus_interface_info_cache_release    (GDBusInterfaceInfo   *info);
-
-void                g_dbus_interface_info_generate_xml     (GDBusInterfaceInfo   *info,
-                                                            guint                 indent,
-                                                            GString              *string_builder);
-
-GDBusNodeInfo      *g_dbus_node_info_new_for_xml           (const gchar          *xml_data,
-                                                            GError              **error);
-GDBusInterfaceInfo *g_dbus_node_info_lookup_interface      (GDBusNodeInfo        *info,
-                                                            const gchar          *name);
-void                g_dbus_node_info_generate_xml          (GDBusNodeInfo        *info,
-                                                            guint                 indent,
-                                                            GString              *string_builder);
-
-GDBusNodeInfo       *g_dbus_node_info_ref                  (GDBusNodeInfo        *info);
-GDBusInterfaceInfo  *g_dbus_interface_info_ref             (GDBusInterfaceInfo   *info);
-GDBusMethodInfo     *g_dbus_method_info_ref                (GDBusMethodInfo      *info);
-GDBusSignalInfo     *g_dbus_signal_info_ref                (GDBusSignalInfo      *info);
-GDBusPropertyInfo   *g_dbus_property_info_ref              (GDBusPropertyInfo    *info);
-GDBusArgInfo        *g_dbus_arg_info_ref                   (GDBusArgInfo         *info);
-GDBusAnnotationInfo *g_dbus_annotation_info_ref            (GDBusAnnotationInfo  *info);
-
-void                 g_dbus_node_info_unref                (GDBusNodeInfo        *info);
-void                 g_dbus_interface_info_unref           (GDBusInterfaceInfo   *info);
-void                 g_dbus_method_info_unref              (GDBusMethodInfo      *info);
-void                 g_dbus_signal_info_unref              (GDBusSignalInfo      *info);
-void                 g_dbus_property_info_unref            (GDBusPropertyInfo    *info);
-void                 g_dbus_arg_info_unref                 (GDBusArgInfo         *info);
-void                 g_dbus_annotation_info_unref          (GDBusAnnotationInfo  *info);
-
-/**
- * G_TYPE_DBUS_NODE_INFO:
- *
- * The #GType for a boxed type holding a #GDBusNodeInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_NODE_INFO       (g_dbus_node_info_get_type ())
-
-/**
- * G_TYPE_DBUS_INTERFACE_INFO:
- *
- * The #GType for a boxed type holding a #GDBusInterfaceInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_INTERFACE_INFO  (g_dbus_interface_info_get_type ())
-
-/**
- * G_TYPE_DBUS_METHOD_INFO:
- *
- * The #GType for a boxed type holding a #GDBusMethodInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_METHOD_INFO     (g_dbus_method_info_get_type ())
-
-/**
- * G_TYPE_DBUS_SIGNAL_INFO:
- *
- * The #GType for a boxed type holding a #GDBusSignalInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_SIGNAL_INFO     (g_dbus_signal_info_get_type ())
-
-/**
- * G_TYPE_DBUS_PROPERTY_INFO:
- *
- * The #GType for a boxed type holding a #GDBusPropertyInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_PROPERTY_INFO   (g_dbus_property_info_get_type ())
-
-/**
- * G_TYPE_DBUS_ARG_INFO:
- *
- * The #GType for a boxed type holding a #GDBusArgInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_ARG_INFO        (g_dbus_arg_info_get_type ())
-
-/**
- * G_TYPE_DBUS_ANNOTATION_INFO:
- *
- * The #GType for a boxed type holding a #GDBusAnnotationInfo.
- *
- * Since: 2.26
- */
-#define G_TYPE_DBUS_ANNOTATION_INFO (g_dbus_annotation_info_get_type ())
-
-GType g_dbus_node_info_get_type       (void) G_GNUC_CONST;
-GType g_dbus_interface_info_get_type  (void) G_GNUC_CONST;
-GType g_dbus_method_info_get_type     (void) G_GNUC_CONST;
-GType g_dbus_signal_info_get_type     (void) G_GNUC_CONST;
-GType g_dbus_property_info_get_type   (void) G_GNUC_CONST;
-GType g_dbus_arg_info_get_type        (void) G_GNUC_CONST;
-GType g_dbus_annotation_info_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_DBUS_INTROSPECTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmenumodel.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmenumodel.h
deleted file mode 100644
index 4cbdf2d6..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmenumodel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_DBUS_MENU_MODEL_H__
-#define __G_DBUS_MENU_MODEL_H__
-
-#include <gio/gdbusconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_MENU_MODEL          (g_dbus_menu_model_get_type ())
-#define G_DBUS_MENU_MODEL(inst)         (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                         G_TYPE_DBUS_MENU_MODEL, GDBusMenuModel))
-#define G_IS_DBUS_MENU_MODEL(inst)      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                         G_TYPE_DBUS_MENU_MODEL))
-
-typedef struct _GDBusMenuModel GDBusMenuModel;
-
-GType                   g_dbus_menu_model_get_type     (void) G_GNUC_CONST;
-
-GDBusMenuModel *        g_dbus_menu_model_get          (GDBusConnection *connection,
-                                                        const gchar     *bus_name,
-                                                        const gchar     *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_MENU_MODEL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmessage.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmessage.h
deleted file mode 100644
index 5c4febd2..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmessage.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_MESSAGE_H__
-#define __G_DBUS_MESSAGE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_MESSAGE         (g_dbus_message_get_type ())
-#define G_DBUS_MESSAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_MESSAGE, GDBusMessage))
-#define G_IS_DBUS_MESSAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_MESSAGE))
-
-GType                     g_dbus_message_get_type           (void) G_GNUC_CONST;
-GDBusMessage             *g_dbus_message_new                (void);
-GDBusMessage             *g_dbus_message_new_signal         (const gchar              *path,
-                                                             const gchar              *interface_,
-                                                             const gchar              *signal);
-GDBusMessage             *g_dbus_message_new_method_call    (const gchar              *name,
-                                                             const gchar              *path,
-                                                             const gchar              *interface_,
-                                                             const gchar              *method);
-GDBusMessage             *g_dbus_message_new_method_reply   (GDBusMessage             *method_call_message);
-GDBusMessage             *g_dbus_message_new_method_error   (GDBusMessage             *method_call_message,
-                                                             const gchar              *error_name,
-                                                             const gchar              *error_message_format,
-                                                             ...);
-GDBusMessage             *g_dbus_message_new_method_error_valist (GDBusMessage             *method_call_message,
-                                                                  const gchar              *error_name,
-                                                                  const gchar              *error_message_format,
-                                                                  va_list                   var_args);
-GDBusMessage             *g_dbus_message_new_method_error_literal (GDBusMessage             *method_call_message,
-                                                                   const gchar              *error_name,
-                                                                   const gchar              *error_message);
-gchar                    *g_dbus_message_print              (GDBusMessage             *message,
-                                                             guint                     indent);
-gboolean                  g_dbus_message_get_locked         (GDBusMessage             *message);
-void                      g_dbus_message_lock               (GDBusMessage             *message);
-GDBusMessage             *g_dbus_message_copy               (GDBusMessage             *message,
-                                                             GError                  **error);
-GDBusMessageByteOrder     g_dbus_message_get_byte_order     (GDBusMessage             *message);
-void                      g_dbus_message_set_byte_order     (GDBusMessage             *message,
-                                                             GDBusMessageByteOrder     byte_order);
-
-GDBusMessageType          g_dbus_message_get_message_type   (GDBusMessage             *message);
-void                      g_dbus_message_set_message_type   (GDBusMessage             *message,
-                                                             GDBusMessageType          type);
-GDBusMessageFlags         g_dbus_message_get_flags          (GDBusMessage             *message);
-void                      g_dbus_message_set_flags          (GDBusMessage             *message,
-                                                             GDBusMessageFlags         flags);
-guint32                   g_dbus_message_get_serial         (GDBusMessage             *message);
-void                      g_dbus_message_set_serial         (GDBusMessage             *message,
-                                                             guint32                   serial);
-GVariant                 *g_dbus_message_get_header         (GDBusMessage             *message,
-                                                             GDBusMessageHeaderField   header_field);
-void                      g_dbus_message_set_header         (GDBusMessage             *message,
-                                                             GDBusMessageHeaderField   header_field,
-                                                             GVariant                 *value);
-guchar                   *g_dbus_message_get_header_fields  (GDBusMessage             *message);
-GVariant                 *g_dbus_message_get_body           (GDBusMessage             *message);
-void                      g_dbus_message_set_body           (GDBusMessage             *message,
-                                                             GVariant                 *body);
-GUnixFDList              *g_dbus_message_get_unix_fd_list   (GDBusMessage             *message);
-void                      g_dbus_message_set_unix_fd_list   (GDBusMessage             *message,
-                                                             GUnixFDList              *fd_list);
-
-guint32                   g_dbus_message_get_reply_serial   (GDBusMessage             *message);
-void                      g_dbus_message_set_reply_serial   (GDBusMessage             *message,
-                                                             guint32                   value);
-
-const gchar              *g_dbus_message_get_interface      (GDBusMessage             *message);
-void                      g_dbus_message_set_interface      (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_member         (GDBusMessage             *message);
-void                      g_dbus_message_set_member         (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_path           (GDBusMessage             *message);
-void                      g_dbus_message_set_path           (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_sender         (GDBusMessage             *message);
-void                      g_dbus_message_set_sender         (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_destination    (GDBusMessage             *message);
-void                      g_dbus_message_set_destination    (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_error_name     (GDBusMessage             *message);
-void                      g_dbus_message_set_error_name     (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-const gchar              *g_dbus_message_get_signature      (GDBusMessage             *message);
-void                      g_dbus_message_set_signature      (GDBusMessage             *message,
-                                                             const gchar              *value);
-
-guint32                   g_dbus_message_get_num_unix_fds   (GDBusMessage             *message);
-void                      g_dbus_message_set_num_unix_fds   (GDBusMessage             *message,
-                                                             guint32                   value);
-
-const gchar              *g_dbus_message_get_arg0           (GDBusMessage             *message);
-
-
-GDBusMessage             *g_dbus_message_new_from_blob      (guchar                   *blob,
-                                                             gsize                     blob_len,
-                                                             GDBusCapabilityFlags      capabilities,
-                                                             GError                  **error);
-
-gssize                    g_dbus_message_bytes_needed       (guchar                   *blob,
-                                                             gsize                     blob_len,
-                                                             GError                  **error);
-
-guchar                   *g_dbus_message_to_blob            (GDBusMessage             *message,
-                                                             gsize                    *out_size,
-                                                             GDBusCapabilityFlags      capabilities,
-                                                             GError                  **error);
-
-gboolean                  g_dbus_message_to_gerror          (GDBusMessage             *message,
-                                                             GError                  **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_MESSAGE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmethodinvocation.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmethodinvocation.h
deleted file mode 100644
index b1a87ac9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusmethodinvocation.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_METHOD_INVOCATION_H__
-#define __G_DBUS_METHOD_INVOCATION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_METHOD_INVOCATION         (g_dbus_method_invocation_get_type ())
-#define G_DBUS_METHOD_INVOCATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_METHOD_INVOCATION, GDBusMethodInvocation))
-#define G_IS_DBUS_METHOD_INVOCATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_METHOD_INVOCATION))
-
-GType                  g_dbus_method_invocation_get_type             (void) G_GNUC_CONST;
-const gchar           *g_dbus_method_invocation_get_sender           (GDBusMethodInvocation *invocation);
-const gchar           *g_dbus_method_invocation_get_object_path      (GDBusMethodInvocation *invocation);
-const gchar           *g_dbus_method_invocation_get_interface_name   (GDBusMethodInvocation *invocation);
-const gchar           *g_dbus_method_invocation_get_method_name      (GDBusMethodInvocation *invocation);
-const GDBusMethodInfo *g_dbus_method_invocation_get_method_info      (GDBusMethodInvocation *invocation);
-GDBusConnection       *g_dbus_method_invocation_get_connection       (GDBusMethodInvocation *invocation);
-GDBusMessage          *g_dbus_method_invocation_get_message          (GDBusMethodInvocation *invocation);
-GVariant              *g_dbus_method_invocation_get_parameters       (GDBusMethodInvocation *invocation);
-gpointer               g_dbus_method_invocation_get_user_data        (GDBusMethodInvocation *invocation);
-
-void                   g_dbus_method_invocation_return_value         (GDBusMethodInvocation *invocation,
-                                                                      GVariant              *parameters);
-void                   g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation *invocation,
-                                                                                GVariant              *parameters,
-                                                                                GUnixFDList           *fd_list);
-void                   g_dbus_method_invocation_return_error         (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *format,
-                                                                      ...);
-void                   g_dbus_method_invocation_return_error_valist  (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *format,
-                                                                      va_list                var_args);
-void                   g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation,
-                                                                      GQuark                 domain,
-                                                                      gint                   code,
-                                                                      const gchar           *message);
-void                   g_dbus_method_invocation_return_gerror        (GDBusMethodInvocation *invocation,
-                                                                      const GError          *error);
-void                   g_dbus_method_invocation_take_error           (GDBusMethodInvocation *invocation,
-                                                                      GError                *error);
-void                   g_dbus_method_invocation_return_dbus_error    (GDBusMethodInvocation *invocation,
-                                                                      const gchar           *error_name,
-                                                                      const gchar           *error_message);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_METHOD_INVOCATION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusnameowning.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusnameowning.h
deleted file mode 100644
index fc4b92c9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusnameowning.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_NAME_OWNING_H__
-#define __G_DBUS_NAME_OWNING_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GBusAcquiredCallback:
- * @connection: The #GDBusConnection to a message bus.
- * @name: The name that is requested to be owned.
- * @user_data: User data passed to g_bus_own_name().
- *
- * Invoked when a connection to a message bus has been obtained.
- *
- * Since: 2.26
- */
-typedef void (*GBusAcquiredCallback) (GDBusConnection *connection,
-                                      const gchar     *name,
-                                      gpointer         user_data);
-
-/**
- * GBusNameAcquiredCallback:
- * @connection: The #GDBusConnection on which to acquired the name.
- * @name: The name being owned.
- * @user_data: User data passed to g_bus_own_name() or g_bus_own_name_on_connection().
- *
- * Invoked when the name is acquired.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameAcquiredCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          gpointer         user_data);
-
-/**
- * GBusNameLostCallback:
- * @connection: The #GDBusConnection on which to acquire the name or %NULL if
- * the connection was disconnected.
- * @name: The name being owned.
- * @user_data: User data passed to g_bus_own_name() or g_bus_own_name_on_connection().
- *
- * Invoked when the name is lost or @connection has been closed.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameLostCallback) (GDBusConnection *connection,
-                                      const gchar     *name,
-                                      gpointer         user_data);
-
-guint g_bus_own_name                 (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GBusAcquiredCallback      bus_acquired_handler,
-                                      GBusNameAcquiredCallback  name_acquired_handler,
-                                      GBusNameLostCallback      name_lost_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-
-guint g_bus_own_name_on_connection   (GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GBusNameAcquiredCallback  name_acquired_handler,
-                                      GBusNameLostCallback      name_lost_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-
-guint g_bus_own_name_with_closures   (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GClosure                 *bus_acquired_closure,
-                                      GClosure                 *name_acquired_closure,
-                                      GClosure                 *name_lost_closure);
-
-guint g_bus_own_name_on_connection_with_closures (
-                                      GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameOwnerFlags        flags,
-                                      GClosure                 *name_acquired_closure,
-                                      GClosure                 *name_lost_closure);
-
-void  g_bus_unown_name               (guint                     owner_id);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_NAME_OWNING_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusnamewatching.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusnamewatching.h
deleted file mode 100644
index 3e3f75a2..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusnamewatching.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_NAME_WATCHING_H__
-#define __G_DBUS_NAME_WATCHING_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GBusNameAppearedCallback:
- * @connection: The #GDBusConnection the name is being watched on.
- * @name: The name being watched.
- * @name_owner: Unique name of the owner of the name being watched.
- * @user_data: User data passed to g_bus_watch_name().
- *
- * Invoked when the name being watched is known to have to have a owner.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameAppearedCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          const gchar     *name_owner,
-                                          gpointer         user_data);
-
-/**
- * GBusNameVanishedCallback:
- * @connection: The #GDBusConnection the name is being watched on.
- * @name: The name being watched.
- * @user_data: User data passed to g_bus_watch_name().
- *
- * Invoked when the name being watched is known not to have to have a owner.
- *
- * Since: 2.26
- */
-typedef void (*GBusNameVanishedCallback) (GDBusConnection *connection,
-                                          const gchar     *name,
-                                          gpointer         user_data);
-
-
-guint g_bus_watch_name               (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GBusNameAppearedCallback  name_appeared_handler,
-                                      GBusNameVanishedCallback  name_vanished_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-guint g_bus_watch_name_on_connection (GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GBusNameAppearedCallback  name_appeared_handler,
-                                      GBusNameVanishedCallback  name_vanished_handler,
-                                      gpointer                  user_data,
-                                      GDestroyNotify            user_data_free_func);
-guint g_bus_watch_name_with_closures (GBusType                  bus_type,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GClosure                 *name_appeared_closure,
-                                      GClosure                 *name_vanished_closure);
-guint g_bus_watch_name_on_connection_with_closures (
-                                      GDBusConnection          *connection,
-                                      const gchar              *name,
-                                      GBusNameWatcherFlags      flags,
-                                      GClosure                 *name_appeared_closure,
-                                      GClosure                 *name_vanished_closure);
-void  g_bus_unwatch_name             (guint                     watcher_id);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_NAME_WATCHING_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobject.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobject.h
deleted file mode 100644
index 30983b11..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobject.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_H__
-#define __G_DBUS_OBJECT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT         (g_dbus_object_get_type())
-#define G_DBUS_OBJECT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT, GDBusObject))
-#define G_IS_DBUS_OBJECT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT))
-#define G_DBUS_OBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_OBJECT, GDBusObjectIface))
-
-typedef struct _GDBusObjectIface GDBusObjectIface;
-
-/**
- * GDBusObjectIface:
- * @parent_iface: The parent interface.
- * @get_object_path: Returns the object path. See g_dbus_object_get_object_path().
- * @get_interfaces: Returns all interfaces. See g_dbus_object_get_interfaces().
- * @get_interface: Returns an interface by name. See g_dbus_object_get_interface().
- * @interface_added: Signal handler for the #GDBusObject::interface-added signal.
- * @interface_removed: Signal handler for the #GDBusObject::interface-removed signal.
- *
- * Base object type for D-Bus objects.
- *
- * Since: 2.30
- */
-struct _GDBusObjectIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  const gchar     *(*get_object_path) (GDBusObject  *object);
-  GList           *(*get_interfaces)  (GDBusObject  *object);
-  GDBusInterface  *(*get_interface)   (GDBusObject  *object,
-                                       const gchar  *interface_name);
-
-  /* Signals */
-  void (*interface_added)   (GDBusObject     *object,
-                             GDBusInterface  *interface_);
-  void (*interface_removed) (GDBusObject     *object,
-                             GDBusInterface  *interface_);
-
-};
-
-GType            g_dbus_object_get_type        (void) G_GNUC_CONST;
-const gchar     *g_dbus_object_get_object_path (GDBusObject  *object);
-GList           *g_dbus_object_get_interfaces  (GDBusObject  *object);
-GDBusInterface  *g_dbus_object_get_interface   (GDBusObject  *object,
-                                                const gchar  *interface_name);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanager.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanager.h
deleted file mode 100644
index 05cec1a4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanager.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_H__
-#define __G_DBUS_OBJECT_MANAGER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER         (g_dbus_object_manager_get_type())
-#define G_DBUS_OBJECT_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER, GDBusObjectManager))
-#define G_IS_DBUS_OBJECT_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER))
-#define G_DBUS_OBJECT_MANAGER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), G_TYPE_DBUS_OBJECT_MANAGER, GDBusObjectManagerIface))
-
-typedef struct _GDBusObjectManagerIface GDBusObjectManagerIface;
-
-/**
- * GDBusObjectManagerIface:
- * @parent_iface: The parent interface.
- * @get_object_path: Virtual function for g_dbus_object_manager_get_object_path().
- * @get_objects: Virtual function for g_dbus_object_manager_get_objects().
- * @get_object: Virtual function for g_dbus_object_manager_get_object().
- * @get_interface: Virtual function for g_dbus_object_manager_get_interface().
- * @object_added: Signal handler for the #GDBusObjectManager::object-added signal.
- * @object_removed: Signal handler for the #GDBusObjectManager::object-removed signal.
- * @interface_added: Signal handler for the #GDBusObjectManager::interface-added signal.
- * @interface_removed: Signal handler for the #GDBusObjectManager::interface-removed signal.
- *
- * Base type for D-Bus object managers.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerIface
-{
-  GTypeInterface parent_iface;
-
-  /* Virtual Functions */
-  const gchar     *(*get_object_path) (GDBusObjectManager    *manager);
-  GList           *(*get_objects)     (GDBusObjectManager    *manager);
-  GDBusObject     *(*get_object)      (GDBusObjectManager    *manager,
-                                       const gchar           *object_path);
-  GDBusInterface  *(*get_interface)   (GDBusObjectManager    *manager,
-                                       const gchar           *object_path,
-                                       const gchar           *interface_name);
-
-  /* Signals */
-  void    (*object_added)                 (GDBusObjectManager   *manager,
-                                           GDBusObject          *object);
-  void    (*object_removed)               (GDBusObjectManager   *manager,
-                                           GDBusObject          *object);
-
-  void    (*interface_added)              (GDBusObjectManager   *manager,
-                                           GDBusObject          *object,
-                                           GDBusInterface       *interface_);
-  void    (*interface_removed)            (GDBusObjectManager   *manager,
-                                           GDBusObject          *object,
-                                           GDBusInterface       *interface_);
-};
-
-GType            g_dbus_object_manager_get_type        (void) G_GNUC_CONST;
-const gchar     *g_dbus_object_manager_get_object_path (GDBusObjectManager    *manager);
-GList           *g_dbus_object_manager_get_objects     (GDBusObjectManager    *manager);
-GDBusObject     *g_dbus_object_manager_get_object      (GDBusObjectManager    *manager,
-                                                        const gchar           *object_path);
-GDBusInterface  *g_dbus_object_manager_get_interface   (GDBusObjectManager    *manager,
-                                                        const gchar           *object_path,
-                                                        const gchar           *interface_name);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanagerclient.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanagerclient.h
deleted file mode 100644
index ad41fee6..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanagerclient.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_CLIENT_H__
-#define __G_DBUS_OBJECT_MANAGER_CLIENT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER_CLIENT         (g_dbus_object_manager_client_get_type ())
-#define G_DBUS_OBJECT_MANAGER_CLIENT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClient))
-#define G_DBUS_OBJECT_MANAGER_CLIENT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClientClass))
-#define G_DBUS_OBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT, GDBusObjectManagerClientClass))
-#define G_IS_DBUS_OBJECT_MANAGER_CLIENT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT))
-#define G_IS_DBUS_OBJECT_MANAGER_CLIENT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_MANAGER_CLIENT))
-
-typedef struct _GDBusObjectManagerClientClass   GDBusObjectManagerClientClass;
-typedef struct _GDBusObjectManagerClientPrivate GDBusObjectManagerClientPrivate;
-
-/**
- * GDBusObjectManagerClient:
-  *
- * The #GDBusObjectManagerClient structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerClient
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectManagerClientPrivate *priv;
-};
-
-/**
- * GDBusObjectManagerClientClass:
- * @parent_class: The parent class.
- * @interface_proxy_signal: Signal class handler for the #GDBusObjectManagerClient::interface-proxy-signal signal.
- * @interface_proxy_properties_changed: Signal class handler for the #GDBusObjectManagerClient::interface-proxy-properties-changed signal.
- *
- * Class structure for #GDBusObjectManagerClient.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerClientClass
-{
-  GObjectClass parent_class;
-
-  /* signals */
-  void    (*interface_proxy_signal)             (GDBusObjectManagerClient *manager,
-                                                 GDBusObjectProxy         *object_proxy,
-                                                 GDBusProxy               *interface_proxy,
-                                                 const gchar              *sender_name,
-                                                 const gchar              *signal_name,
-                                                 GVariant                 *parameters);
-
-  void    (*interface_proxy_properties_changed) (GDBusObjectManagerClient   *manager,
-                                                 GDBusObjectProxy           *object_proxy,
-                                                 GDBusProxy                 *interface_proxy,
-                                                 GVariant                   *changed_properties,
-                                                 const gchar* const         *invalidated_properties);
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GType                         g_dbus_object_manager_client_get_type           (void) G_GNUC_CONST;
-void                          g_dbus_object_manager_client_new                (GDBusConnection               *connection,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GAsyncReadyCallback            callback,
-                                                                               gpointer                       user_data);
-GDBusObjectManager           *g_dbus_object_manager_client_new_finish         (GAsyncResult                  *res,
-                                                                               GError                       **error);
-GDBusObjectManager           *g_dbus_object_manager_client_new_sync           (GDBusConnection               *connection,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GError                       **error);
-void                          g_dbus_object_manager_client_new_for_bus        (GBusType                       bus_type,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GAsyncReadyCallback            callback,
-                                                                               gpointer                       user_data);
-GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_finish (GAsyncResult                  *res,
-                                                                               GError                       **error);
-GDBusObjectManager           *g_dbus_object_manager_client_new_for_bus_sync   (GBusType                       bus_type,
-                                                                               GDBusObjectManagerClientFlags  flags,
-                                                                               const gchar                   *name,
-                                                                               const gchar                   *object_path,
-                                                                               GDBusProxyTypeFunc             get_proxy_type_func,
-                                                                               gpointer                       get_proxy_type_user_data,
-                                                                               GDestroyNotify                 get_proxy_type_destroy_notify,
-                                                                               GCancellable                  *cancellable,
-                                                                               GError                       **error);
-GDBusConnection              *g_dbus_object_manager_client_get_connection     (GDBusObjectManagerClient      *manager);
-GDBusObjectManagerClientFlags g_dbus_object_manager_client_get_flags          (GDBusObjectManagerClient      *manager);
-const gchar                  *g_dbus_object_manager_client_get_name           (GDBusObjectManagerClient      *manager);
-gchar                        *g_dbus_object_manager_client_get_name_owner     (GDBusObjectManagerClient      *manager);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_CLIENT_H */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanagerserver.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanagerserver.h
deleted file mode 100644
index 90668dd8..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectmanagerserver.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_MANAGER_SERVER_H__
-#define __G_DBUS_OBJECT_MANAGER_SERVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_MANAGER_SERVER         (g_dbus_object_manager_server_get_type ())
-#define G_DBUS_OBJECT_MANAGER_SERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServer))
-#define G_DBUS_OBJECT_MANAGER_SERVER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServerClass))
-#define G_DBUS_OBJECT_MANAGER_SERVER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER, GDBusObjectManagerServerClass))
-#define G_IS_DBUS_OBJECT_MANAGER_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_MANAGER_SERVER))
-#define G_IS_DBUS_OBJECT_MANAGER_SERVER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_MANAGER_SERVER))
-
-typedef struct _GDBusObjectManagerServerClass   GDBusObjectManagerServerClass;
-typedef struct _GDBusObjectManagerServerPrivate GDBusObjectManagerServerPrivate;
-
-/**
- * GDBusObjectManagerServer:
- *
- * The #GDBusObjectManagerServer structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerServer
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectManagerServerPrivate *priv;
-};
-
-/**
- * GDBusObjectManagerServerClass:
- * @parent_class: The parent class.
- *
- * Class structure for #GDBusObjectManagerServer.
- *
- * Since: 2.30
- */
-struct _GDBusObjectManagerServerClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GType                     g_dbus_object_manager_server_get_type            (void) G_GNUC_CONST;
-GDBusObjectManagerServer *g_dbus_object_manager_server_new                 (const gchar               *object_path);
-GDBusConnection          *g_dbus_object_manager_server_get_connection      (GDBusObjectManagerServer  *manager);
-void                      g_dbus_object_manager_server_set_connection      (GDBusObjectManagerServer  *manager,
-                                                                            GDBusConnection           *connection);
-void                      g_dbus_object_manager_server_export              (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-void                      g_dbus_object_manager_server_export_uniquely     (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-gboolean                  g_dbus_object_manager_server_is_exported         (GDBusObjectManagerServer  *manager,
-                                                                            GDBusObjectSkeleton       *object);
-gboolean                  g_dbus_object_manager_server_unexport            (GDBusObjectManagerServer  *manager,
-                                                                            const gchar               *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_MANAGER_SERVER_H */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectproxy.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectproxy.h
deleted file mode 100644
index 58aef853..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectproxy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_PROXY_H__
-#define __G_DBUS_OBJECT_PROXY_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_PROXY         (g_dbus_object_proxy_get_type ())
-#define G_DBUS_OBJECT_PROXY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxy))
-#define G_DBUS_OBJECT_PROXY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxyClass))
-#define G_DBUS_OBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_PROXY, GDBusObjectProxyClass))
-#define G_IS_DBUS_OBJECT_PROXY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_PROXY))
-#define G_IS_DBUS_OBJECT_PROXY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_PROXY))
-
-typedef struct _GDBusObjectProxyClass   GDBusObjectProxyClass;
-typedef struct _GDBusObjectProxyPrivate GDBusObjectProxyPrivate;
-
-/**
- * GDBusObjectProxy:
- *
- * The #GDBusObjectProxy structure contains private data and should
- * only be accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectProxy
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectProxyPrivate *priv;
-};
-
-/**
- * GDBusObjectProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #GDBusObjectProxy.
- *
- * Since: 2.30
- */
-struct _GDBusObjectProxyClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GType             g_dbus_object_proxy_get_type       (void) G_GNUC_CONST;
-GDBusObjectProxy *g_dbus_object_proxy_new            (GDBusConnection   *connection,
-                                                      const gchar       *object_path);
-GDBusConnection  *g_dbus_object_proxy_get_connection (GDBusObjectProxy  *proxy);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_PROXY_H */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectskeleton.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectskeleton.h
deleted file mode 100644
index 918a3353..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusobjectskeleton.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#ifndef __G_DBUS_OBJECT_SKELETON_H__
-#define __G_DBUS_OBJECT_SKELETON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_OBJECT_SKELETON         (g_dbus_object_skeleton_get_type ())
-#define G_DBUS_OBJECT_SKELETON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeleton))
-#define G_DBUS_OBJECT_SKELETON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeletonClass))
-#define G_DBUS_OBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_OBJECT_SKELETON, GDBusObjectSkeletonClass))
-#define G_IS_DBUS_OBJECT_SKELETON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_OBJECT_SKELETON))
-#define G_IS_DBUS_OBJECT_SKELETON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_OBJECT_SKELETON))
-
-typedef struct _GDBusObjectSkeletonClass   GDBusObjectSkeletonClass;
-typedef struct _GDBusObjectSkeletonPrivate GDBusObjectSkeletonPrivate;
-
-/**
- * GDBusObjectSkeleton:
- *
- * The #GDBusObjectSkeleton structure contains private data and should only be
- * accessed using the provided API.
- *
- * Since: 2.30
- */
-struct _GDBusObjectSkeleton
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusObjectSkeletonPrivate *priv;
-};
-
-/**
- * GDBusObjectSkeletonClass:
- * @parent_class: The parent class.
- * @authorize_method: Signal class handler for the #GDBusObjectSkeleton::authorize-method signal.
- *
- * Class structure for #GDBusObjectSkeleton.
- *
- * Since: 2.30
- */
-struct _GDBusObjectSkeletonClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  gboolean (*authorize_method) (GDBusObjectSkeleton       *object,
-                                GDBusInterfaceSkeleton    *interface_,
-                                GDBusMethodInvocation *invocation);
-
-  /*< private >*/
-  gpointer padding[8];
-};
-
-GType                g_dbus_object_skeleton_get_type                  (void) G_GNUC_CONST;
-GDBusObjectSkeleton *g_dbus_object_skeleton_new                       (const gchar            *object_path);
-void                 g_dbus_object_skeleton_flush                     (GDBusObjectSkeleton    *object);
-void                 g_dbus_object_skeleton_add_interface             (GDBusObjectSkeleton    *object,
-                                                                       GDBusInterfaceSkeleton *interface_);
-void                 g_dbus_object_skeleton_remove_interface          (GDBusObjectSkeleton    *object,
-                                                                       GDBusInterfaceSkeleton *interface_);
-void                 g_dbus_object_skeleton_remove_interface_by_name  (GDBusObjectSkeleton    *object,
-                                                                       const gchar            *interface_name);
-void                 g_dbus_object_skeleton_set_object_path           (GDBusObjectSkeleton    *object,
-                                                                       const gchar            *object_path);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_OBJECT_SKELETON_H */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusproxy.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusproxy.h
deleted file mode 100644
index 1e920d30..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusproxy.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_PROXY_H__
-#define __G_DBUS_PROXY_H__
-
-#include <gio/giotypes.h>
-#include <gio/gdbusintrospection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_PROXY         (g_dbus_proxy_get_type ())
-#define G_DBUS_PROXY(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_PROXY, GDBusProxy))
-#define G_DBUS_PROXY_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_PROXY, GDBusProxyClass))
-#define G_DBUS_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_PROXY, GDBusProxyClass))
-#define G_IS_DBUS_PROXY(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_PROXY))
-#define G_IS_DBUS_PROXY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_DBUS_PROXY))
-
-typedef struct _GDBusProxyClass   GDBusProxyClass;
-typedef struct _GDBusProxyPrivate GDBusProxyPrivate;
-
-/**
- * GDBusProxy:
- *
- * The #GDBusProxy structure contains only private data and
- * should only be accessed using the provided API.
- *
- * Since: 2.26
- */
-struct _GDBusProxy
-{
-  /*< private >*/
-  GObject parent_instance;
-  GDBusProxyPrivate *priv;
-};
-
-/**
- * GDBusProxyClass:
- * @g_properties_changed: Signal class handler for the #GDBusProxy::g-properties-changed signal.
- * @g_signal: Signal class handler for the #GDBusProxy::g-signal signal.
- *
- * Class structure for #GDBusProxy.
- *
- * Since: 2.26
- */
-struct _GDBusProxyClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* Signals */
-  void (*g_properties_changed) (GDBusProxy          *proxy,
-                                GVariant            *changed_properties,
-                                const gchar* const  *invalidated_properties);
-  void (*g_signal)             (GDBusProxy          *proxy,
-                                const gchar         *sender_name,
-                                const gchar         *signal_name,
-                                GVariant            *parameters);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[32];
-};
-
-GType            g_dbus_proxy_get_type                  (void) G_GNUC_CONST;
-void             g_dbus_proxy_new                       (GDBusConnection     *connection,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GDBusProxy      *g_dbus_proxy_new_finish                (GAsyncResult        *res,
-                                                         GError             **error);
-GDBusProxy      *g_dbus_proxy_new_sync                  (GDBusConnection     *connection,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-void             g_dbus_proxy_new_for_bus               (GBusType             bus_type,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GDBusProxy      *g_dbus_proxy_new_for_bus_finish        (GAsyncResult        *res,
-                                                         GError             **error);
-GDBusProxy      *g_dbus_proxy_new_for_bus_sync          (GBusType             bus_type,
-                                                         GDBusProxyFlags      flags,
-                                                         GDBusInterfaceInfo *info,
-                                                         const gchar         *name,
-                                                         const gchar         *object_path,
-                                                         const gchar         *interface_name,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-GDBusConnection *g_dbus_proxy_get_connection            (GDBusProxy          *proxy);
-GDBusProxyFlags  g_dbus_proxy_get_flags                 (GDBusProxy          *proxy);
-const gchar     *g_dbus_proxy_get_name                  (GDBusProxy          *proxy);
-gchar           *g_dbus_proxy_get_name_owner            (GDBusProxy          *proxy);
-const gchar     *g_dbus_proxy_get_object_path           (GDBusProxy          *proxy);
-const gchar     *g_dbus_proxy_get_interface_name        (GDBusProxy          *proxy);
-gint             g_dbus_proxy_get_default_timeout       (GDBusProxy          *proxy);
-void             g_dbus_proxy_set_default_timeout       (GDBusProxy          *proxy,
-                                                         gint                 timeout_msec);
-GDBusInterfaceInfo *g_dbus_proxy_get_interface_info     (GDBusProxy          *proxy);
-void             g_dbus_proxy_set_interface_info        (GDBusProxy           *proxy,
-                                                         GDBusInterfaceInfo   *info);
-GVariant        *g_dbus_proxy_get_cached_property       (GDBusProxy          *proxy,
-                                                         const gchar         *property_name);
-void             g_dbus_proxy_set_cached_property       (GDBusProxy          *proxy,
-                                                         const gchar         *property_name,
-                                                         GVariant            *value);
-gchar          **g_dbus_proxy_get_cached_property_names (GDBusProxy          *proxy);
-void             g_dbus_proxy_call                      (GDBusProxy          *proxy,
-                                                         const gchar         *method_name,
-                                                         GVariant            *parameters,
-                                                         GDBusCallFlags       flags,
-                                                         gint                 timeout_msec,
-                                                         GCancellable        *cancellable,
-                                                         GAsyncReadyCallback  callback,
-                                                         gpointer             user_data);
-GVariant        *g_dbus_proxy_call_finish               (GDBusProxy          *proxy,
-                                                         GAsyncResult        *res,
-                                                         GError             **error);
-GVariant        *g_dbus_proxy_call_sync                 (GDBusProxy          *proxy,
-                                                         const gchar         *method_name,
-                                                         GVariant            *parameters,
-                                                         GDBusCallFlags       flags,
-                                                         gint                 timeout_msec,
-                                                         GCancellable        *cancellable,
-                                                         GError             **error);
-
-void             g_dbus_proxy_call_with_unix_fd_list        (GDBusProxy          *proxy,
-                                                             const gchar         *method_name,
-                                                             GVariant            *parameters,
-                                                             GDBusCallFlags       flags,
-                                                             gint                 timeout_msec,
-                                                             GUnixFDList         *fd_list,
-                                                             GCancellable        *cancellable,
-                                                             GAsyncReadyCallback  callback,
-                                                             gpointer             user_data);
-GVariant        *g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy          *proxy,
-                                                             GUnixFDList        **out_fd_list,
-                                                             GAsyncResult        *res,
-                                                             GError             **error);
-GVariant        *g_dbus_proxy_call_with_unix_fd_list_sync   (GDBusProxy          *proxy,
-                                                             const gchar         *method_name,
-                                                             GVariant            *parameters,
-                                                             GDBusCallFlags       flags,
-                                                             gint                 timeout_msec,
-                                                             GUnixFDList         *fd_list,
-                                                             GUnixFDList        **out_fd_list,
-                                                             GCancellable        *cancellable,
-                                                             GError             **error);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_PROXY_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusserver.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusserver.h
deleted file mode 100644
index 3d10c1b4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusserver.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_SERVER_H__
-#define __G_DBUS_SERVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DBUS_SERVER         (g_dbus_server_get_type ())
-#define G_DBUS_SERVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_SERVER, GDBusServer))
-#define G_IS_DBUS_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_SERVER))
-
-GType             g_dbus_server_get_type           (void) G_GNUC_CONST;
-GDBusServer      *g_dbus_server_new_sync           (const gchar       *address,
-                                                    GDBusServerFlags   flags,
-                                                    const gchar       *guid,
-                                                    GDBusAuthObserver *observer,
-                                                    GCancellable      *cancellable,
-                                                    GError           **error);
-const gchar      *g_dbus_server_get_client_address (GDBusServer       *server);
-const gchar      *g_dbus_server_get_guid           (GDBusServer       *server);
-GDBusServerFlags  g_dbus_server_get_flags          (GDBusServer       *server);
-void              g_dbus_server_start              (GDBusServer       *server);
-void              g_dbus_server_stop               (GDBusServer       *server);
-gboolean          g_dbus_server_is_active          (GDBusServer       *server);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_SERVER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusutils.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdbusutils.h
deleted file mode 100644
index a05a2300..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdbusutils.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GDBus - GLib D-Bus Library
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DBUS_UTILS_H__
-#define __G_DBUS_UTILS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-gboolean g_dbus_is_guid (const gchar *string);
-gchar *g_dbus_generate_guid (void);
-
-gboolean g_dbus_is_name (const gchar *string);
-gboolean g_dbus_is_unique_name (const gchar *string);
-gboolean g_dbus_is_member_name (const gchar *string);
-gboolean g_dbus_is_interface_name (const gchar *string);
-
-void g_dbus_gvariant_to_gvalue (GVariant  *value,
-                                GValue    *out_gvalue);
-GVariant *g_dbus_gvalue_to_gvariant (const GValue         *gvalue,
-                                     const GVariantType   *type);
-
-G_END_DECLS
-
-#endif /* __G_DBUS_UTILS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gdrive.h b/GstreamerHelper/x86/include/glib-2.0/gio/gdrive.h
deleted file mode 100644
index d42b0b70..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gdrive.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_DRIVE_H__
-#define __G_DRIVE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_DRIVE           (g_drive_get_type ())
-#define G_DRIVE(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DRIVE, GDrive))
-#define G_IS_DRIVE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DRIVE))
-#define G_DRIVE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DRIVE, GDriveIface))
-
-/**
- * GDriveIface:
- * @g_iface: The parent interface.
- * @changed: Signal emitted when the drive is changed.
- * @disconnected: The removed signal that is emitted when the #GDrive have been disconnected. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @eject_button: Signal emitted when the physical eject button (if any) of a drive have been pressed.
- * @get_name: Returns the name for the given #GDrive.
- * @get_icon: Returns a #GIcon for the given #GDrive.
- * @has_volumes: Returns %TRUE if the #GDrive has mountable volumes.
- * @get_volumes: Returns a list #GList of #GVolume for the #GDrive.
- * @is_media_removable: Returns %TRUE if the #GDrive supports removal and insertion of media.
- * @has_media: Returns %TRUE if the #GDrive has media inserted.
- * @is_media_check_automatic: Returns %TRUE if the #GDrive is capabable of automatically detecting media changes.
- * @can_poll_for_media: Returns %TRUE if the #GDrive is capable of manually polling for media change.
- * @can_eject: Returns %TRUE if the #GDrive can eject media.
- * @eject: Ejects a #GDrive.
- * @eject_finish: Finishes an eject operation.
- * @poll_for_media: Poll for media insertion/removal on a #GDrive.
- * @poll_for_media_finish: Finishes a media poll operation.
- * @get_identifier: Returns the identifier of the given kind, or %NULL if
- *    the #GDrive doesn't have one.
- * @enumerate_identifiers: Returns an array strings listing the kinds
- *    of identifiers which the #GDrive has.
- * @get_start_stop_type: Gets a #GDriveStartStopType with details about starting/stopping the drive. Since 2.22.
- * @can_stop: Returns %TRUE if a #GDrive can be stopped. Since 2.22.
- * @stop: Stops a #GDrive. Since 2.22.
- * @stop_finish: Finishes a stop operation. Since 2.22.
- * @can_start: Returns %TRUE if a #GDrive can be started. Since 2.22.
- * @can_start_degraded: Returns %TRUE if a #GDrive can be started degraded. Since 2.22.
- * @start: Starts a #GDrive. Since 2.22.
- * @start_finish: Finishes a start operation. Since 2.22.
- * @stop_button: Signal emitted when the physical stop button (if any) of a drive have been pressed. Since 2.22.
- * @eject_with_operation: Starts ejecting a #GDrive using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_sort_key: Gets a key used for sorting #GDrive instances or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Returns a symbolic #GIcon for the given #GDrive. Since 2.34.
- *
- * Interface for creating #GDrive implementations.
- */
-typedef struct _GDriveIface    GDriveIface;
-
-struct _GDriveIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-  void     (* changed)                  (GDrive              *drive);
-  void     (* disconnected)             (GDrive              *drive);
-  void     (* eject_button)             (GDrive              *drive);
-
-  /* Virtual Table */
-  char *   (* get_name)                 (GDrive              *drive);
-  GIcon *  (* get_icon)                 (GDrive              *drive);
-  gboolean (* has_volumes)              (GDrive              *drive);
-  GList *  (* get_volumes)              (GDrive              *drive);
-  gboolean (* is_media_removable)       (GDrive              *drive);
-  gboolean (* has_media)                (GDrive              *drive);
-  gboolean (* is_media_check_automatic) (GDrive              *drive);
-  gboolean (* can_eject)                (GDrive              *drive);
-  gboolean (* can_poll_for_media)       (GDrive              *drive);
-  void     (* eject)                    (GDrive              *drive,
-                                         GMountUnmountFlags   flags,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* eject_finish)             (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  void     (* poll_for_media)           (GDrive              *drive,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* poll_for_media_finish)    (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  char *   (* get_identifier)           (GDrive              *drive,
-                                         const char          *kind);
-  char **  (* enumerate_identifiers)    (GDrive              *drive);
-
-  GDriveStartStopType (* get_start_stop_type) (GDrive        *drive);
-
-  gboolean (* can_start)                (GDrive              *drive);
-  gboolean (* can_start_degraded)       (GDrive              *drive);
-  void     (* start)                    (GDrive              *drive,
-                                         GDriveStartFlags     flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* start_finish)             (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  gboolean (* can_stop)                 (GDrive              *drive);
-  void     (* stop)                     (GDrive              *drive,
-                                         GMountUnmountFlags   flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean (* stop_finish)              (GDrive              *drive,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  /* signal, not VFunc */
-  void     (* stop_button)              (GDrive              *drive);
-
-  void        (* eject_with_operation)      (GDrive              *drive,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GDrive            *drive,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  const gchar * (* get_sort_key)        (GDrive              *drive);
-  GIcon *       (* get_symbolic_icon)   (GDrive              *drive);
-
-};
-
-GType    g_drive_get_type                 (void) G_GNUC_CONST;
-
-char *   g_drive_get_name                 (GDrive               *drive);
-GIcon *  g_drive_get_icon                 (GDrive               *drive);
-GIcon *  g_drive_get_symbolic_icon        (GDrive               *drive);
-gboolean g_drive_has_volumes              (GDrive               *drive);
-GList *  g_drive_get_volumes              (GDrive               *drive);
-gboolean g_drive_is_media_removable       (GDrive               *drive);
-gboolean g_drive_has_media                (GDrive               *drive);
-gboolean g_drive_is_media_check_automatic (GDrive               *drive);
-gboolean g_drive_can_poll_for_media       (GDrive               *drive);
-gboolean g_drive_can_eject                (GDrive               *drive);
-GLIB_DEPRECATED_FOR(g_drive_eject_with_operation)
-void     g_drive_eject                    (GDrive               *drive,
-                                           GMountUnmountFlags    flags,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-
-GLIB_DEPRECATED_FOR(g_drive_eject_with_operation_finish)
-gboolean g_drive_eject_finish             (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-void     g_drive_poll_for_media           (GDrive               *drive,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-gboolean g_drive_poll_for_media_finish    (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-char *   g_drive_get_identifier           (GDrive              *drive,
-                                           const char          *kind);
-char **  g_drive_enumerate_identifiers    (GDrive              *drive);
-
-GDriveStartStopType g_drive_get_start_stop_type (GDrive        *drive);
-
-gboolean g_drive_can_start                (GDrive              *drive);
-gboolean g_drive_can_start_degraded       (GDrive              *drive);
-void     g_drive_start                    (GDrive              *drive,
-                                           GDriveStartFlags     flags,
-                                           GMountOperation     *mount_operation,
-                                           GCancellable        *cancellable,
-                                           GAsyncReadyCallback  callback,
-                                           gpointer             user_data);
-gboolean g_drive_start_finish             (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-
-gboolean g_drive_can_stop                 (GDrive               *drive);
-void     g_drive_stop                     (GDrive               *drive,
-                                           GMountUnmountFlags    flags,
-                                           GMountOperation      *mount_operation,
-                                           GCancellable         *cancellable,
-                                           GAsyncReadyCallback   callback,
-                                           gpointer              user_data);
-gboolean g_drive_stop_finish              (GDrive               *drive,
-                                           GAsyncResult         *result,
-                                           GError              **error);
-
-void        g_drive_eject_with_operation      (GDrive              *drive,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_drive_eject_with_operation_finish (GDrive            *drive,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_2_32
-const gchar *g_drive_get_sort_key         (GDrive               *drive);
-
-G_END_DECLS
-
-#endif /* __G_DRIVE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gemblem.h b/GstreamerHelper/x86/include/glib-2.0/gio/gemblem.h
deleted file mode 100644
index 06816e12..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gemblem.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Clemens N. Buss <cebuzz@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_EMBLEM_H__
-#define __G_EMBLEM_H__
-
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_EMBLEM         (g_emblem_get_type ())
-#define G_EMBLEM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_EMBLEM, GEmblem))
-#define G_EMBLEM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_EMBLEM, GEmblemClass))
-#define G_IS_EMBLEM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_EMBLEM))
-#define G_IS_EMBLEM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_EMBLEM))
-#define G_EMBLEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_EMBLEM, GEmblemClass))
-
-/**
- * GEmblem:
- *
- * An object for Emblems
- */
-typedef struct _GEmblem        GEmblem;
-typedef struct _GEmblemClass   GEmblemClass;
-
-GType          g_emblem_get_type        (void) G_GNUC_CONST;
-
-GEmblem       *g_emblem_new             (GIcon         *icon);
-GEmblem       *g_emblem_new_with_origin (GIcon         *icon,
-                                         GEmblemOrigin  origin);
-GIcon         *g_emblem_get_icon        (GEmblem       *emblem);
-GEmblemOrigin  g_emblem_get_origin      (GEmblem       *emblem);
-
-G_END_DECLS
-
-#endif /* __G_EMBLEM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gemblemedicon.h b/GstreamerHelper/x86/include/glib-2.0/gio/gemblemedicon.h
deleted file mode 100644
index ded69281..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gemblemedicon.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Gio - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Matthias Clasen <mclasen@redhat.com>
- *         Clemens N. Buss <cebuzz@gmail.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_EMBLEMED_ICON_H__
-#define __G_EMBLEMED_ICON_H__
-
-#include <gio/gicon.h>
-#include <gio/gemblem.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_EMBLEMED_ICON         (g_emblemed_icon_get_type ())
-#define G_EMBLEMED_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_EMBLEMED_ICON, GEmblemedIcon))
-#define G_EMBLEMED_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_EMBLEMED_ICON, GEmblemedIconClass))
-#define G_IS_EMBLEMED_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_EMBLEMED_ICON))
-#define G_IS_EMBLEMED_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_EMBLEMED_ICON))
-#define G_EMBLEMED_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_EMBLEMED_ICON, GEmblemedIconClass))
-
-/**
- * GEmblemedIcon:
- *
- * An implementation of #GIcon for icons with emblems.
- **/
-typedef struct _GEmblemedIcon        GEmblemedIcon;
-typedef struct _GEmblemedIconClass   GEmblemedIconClass;
-typedef struct _GEmblemedIconPrivate GEmblemedIconPrivate;
-
-struct _GEmblemedIcon
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GEmblemedIconPrivate *priv;
-};
-
-struct _GEmblemedIconClass
-{
-  GObjectClass parent_class;
-};
-
-GType  g_emblemed_icon_get_type    (void) G_GNUC_CONST;
-
-GIcon *g_emblemed_icon_new         (GIcon         *icon,
-                                    GEmblem       *emblem);
-GIcon *g_emblemed_icon_get_icon    (GEmblemedIcon *emblemed);
-GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed);
-void   g_emblemed_icon_add_emblem  (GEmblemedIcon *emblemed,
-                                    GEmblem       *emblem);
-void   g_emblemed_icon_clear_emblems  (GEmblemedIcon *emblemed);
-
-G_END_DECLS
-
-#endif /* __G_EMBLEMED_ICON_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfile.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfile.h
deleted file mode 100644
index 1a724db6..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfile.h
+++ /dev/null
@@ -1,1042 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_H__
-#define __G_FILE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE            (g_file_get_type ())
-#define G_FILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_FILE, GFile))
-#define G_IS_FILE(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE))
-#define G_FILE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_FILE, GFileIface))
-
-#if 0
-/**
- * GFile:
- *
- * A handle to an object implementing the #GFileIface interface.
- * Generally stores a location within the file system. Handles do not
- * necessarily represent files or directories that currently exist.
- **/
-typedef struct _GFile         		GFile; /* Dummy typedef */
-#endif
-typedef struct _GFileIface    		GFileIface;
-
-
-/**
- * GFileIface:
- * @g_iface: The parent interface.
- * @dup: Duplicates a #GFile.
- * @hash: Creates a hash of a #GFile.
- * @equal: Checks equality of two given #GFile<!-- -->s.
- * @is_native: Checks to see if a file is native to the system.
- * @has_uri_scheme: Checks to see if a #GFile has a given URI scheme.
- * @get_uri_scheme: Gets the URI scheme for a #GFile.
- * @get_basename: Gets the basename for a given #GFile.
- * @get_path: Gets the current path within a #GFile.
- * @get_uri: Gets a URI for the path within a #GFile.
- * @get_parse_name: Gets the parsed name for the #GFile.
- * @get_parent: Gets the parent directory for the #GFile.
- * @prefix_matches: Checks whether a #GFile contains a specified file.
- * @get_relative_path: Gets the path for a #GFile relative to a given path.
- * @resolve_relative_path: Resolves a relative path for a #GFile to an absolute path.
- * @get_child_for_display_name: Gets the child #GFile for a given display name.
- * @enumerate_children: Gets a #GFileEnumerator with the children of a #GFile.
- * @enumerate_children_async: Asynchronously gets a #GFileEnumerator with the children of a #GFile.
- * @enumerate_children_finish: Finishes asynchronously enumerating the children.
- * @query_info: Gets the #GFileInfo for a #GFile.
- * @query_info_async: Asynchronously gets the #GFileInfo for a #GFile.
- * @query_info_finish: Finishes an asynchronous query info operation.
- * @query_filesystem_info: Gets a #GFileInfo for the file system #GFile is on.
- * @query_filesystem_info_async: Asynchronously gets a #GFileInfo for the file system #GFile is on.
- * @query_filesystem_info_finish: Finishes asynchronously getting the file system info.
- * @find_enclosing_mount: Gets a #GMount for the #GFile.
- * @find_enclosing_mount_async: Asynchronously gets the #GMount for a #GFile.
- * @find_enclosing_mount_finish: Finishes asynchronously getting the volume.
- * @set_display_name: Sets the display name for a #GFile.
- * @set_display_name_async: Asynchronously sets a #GFile's display name.
- * @set_display_name_finish: Finishes asynchronously setting a #GFile's display name.
- * @query_settable_attributes: Returns a list of #GFileAttribute<!-- -->s that can be set.
- * @_query_settable_attributes_async: Asynchronously gets a list of #GFileAttribute<!-- -->s that can be set.
- * @_query_settable_attributes_finish: Finishes asynchronously querying settable attributes.
- * @query_writable_namespaces: Returns a list of #GFileAttribute namespaces that are writable.
- * @_query_writable_namespaces_async: Asynchronously gets a list of #GFileAttribute namespaces that are writable.
- * @_query_writable_namespaces_finish: Finishes asynchronously querying the writable namespaces.
- * @set_attribute: Sets a #GFileAttribute.
- * @set_attributes_from_info: Sets a #GFileAttribute with information from a #GFileInfo.
- * @set_attributes_async: Asynchronously sets a file's attributes.
- * @set_attributes_finish: Finishes setting a file's attributes asynchronously.
- * @read_fn: Reads a file asynchronously.
- * @read_async: Asynchronously reads a file.
- * @read_finish: Finishes asynchronously reading a file.
- * @append_to: Writes to the end of a file.
- * @append_to_async: Asynchronously writes to the end of a file.
- * @append_to_finish: Finishes an asynchronous file append operation.
- * @create: Creates a new file.
- * @create_async: Asynchronously creates a file.
- * @create_finish: Finishes asynchronously creating a file.
- * @replace: Replaces the contents of a file.
- * @replace_async: Asynchronously replaces the contents of a file.
- * @replace_finish: Finishes asynchronously replacing a file.
- * @delete_file: Deletes a file.
- * @delete_file_async: Asynchronously deletes a file.
- * @delete_file_finish: Finishes an asynchronous delete.
- * @trash: Sends a #GFile to the Trash location.
- * @_trash_async: Asynchronously sends a #GFile to the Trash location.
- * @_trash_finish: Finishes an asynchronous file trashing operation.
- * @make_directory: Makes a directory.
- * @_make_directory_async: Asynchronously makes a directory.
- * @_make_directory_finish: Finishes making a directory asynchronously.
- * @make_symbolic_link: Makes a symbolic link.
- * @_make_symbolic_link_async: Asynchronously makes a symbolic link
- * @_make_symbolic_link_finish: Finishes making a symbolic link asynchronously.
- * @copy: Copies a file.
- * @copy_async: Asynchronously copies a file.
- * @copy_finish: Finishes an asynchronous copy operation.
- * @move: Moves a file.
- * @_move_async: Asynchronously moves a file.
- * @_move_finish: Finishes an asynchronous move operation.
- * @mount_mountable: Mounts a mountable object.
- * @mount_mountable_finish: Finishes a mounting operation.
- * @unmount_mountable: Unmounts a mountable object.
- * @unmount_mountable_finish: Finishes an unmount operation.
- * @eject_mountable: Ejects a mountable.
- * @eject_mountable_finish: Finishes an eject operation.
- * @mount_enclosing_volume: Mounts a specified location.
- * @mount_enclosing_volume_finish: Finishes mounting a specified location.
- * @monitor_dir: Creates a #GFileMonitor for the location.
- * @monitor_file: Creates a #GFileMonitor for the location.
- * @open_readwrite: Open file read/write. Since 2.22.
- * @open_readwrite_async: Asynchronously opens file read/write. Since 2.22.
- * @open_readwrite_finish: Finishes an asynchronous open read/write. Since 2.22.
- * @create_readwrite: Creates file read/write. Since 2.22.
- * @create_readwrite_async: Asynchronously creates file read/write. Since 2.22.
- * @create_readwrite_finish: Finishes an asynchronous creates read/write. Since 2.22.
- * @replace_readwrite: Replaces file read/write. Since 2.22.
- * @replace_readwrite_async: Asynchronously replaces file read/write. Since 2.22.
- * @replace_readwrite_finish: Finishes an asynchronous replace read/write. Since 2.22.
- * @start_mountable: Starts a mountable object. Since 2.22.
- * @start_mountable_finish: Finishes an start operation. Since 2.22.
- * @stop_mountable: Stops a mountable. Since 2.22.
- * @stop_mountable_finish: Finishes an stop operation. Since 2.22.
- * @supports_thread_contexts: a boolean that indicates whether the #GFile implementation supports thread-default contexts. Since 2.22.
- * @unmount_mountable_with_operation: Unmounts a mountable object using a #GMountOperation. Since 2.22.
- * @unmount_mountable_with_operation_finish: Finishes an unmount operation using a #GMountOperation. Since 2.22.
- * @eject_mountable_with_operation: Ejects a mountable object using a #GMountOperation. Since 2.22.
- * @eject_mountable_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @poll_mountable: Polls a mountable object for media changes. Since 2.22.
- * @poll_mountable_finish: Finishes an poll operation for media changes. Since 2.22.
- *
- * An interface for writing VFS file handles.
- **/
-struct _GFileIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GFile *             (* dup)                         (GFile         *file);
-  guint               (* hash)                        (GFile         *file);
-  gboolean            (* equal)                       (GFile         *file1,
-                                                       GFile         *file2);
-  gboolean            (* is_native)                   (GFile         *file);
-  gboolean            (* has_uri_scheme)              (GFile         *file,
-                                                       const char    *uri_scheme);
-  char *              (* get_uri_scheme)              (GFile         *file);
-  char *              (* get_basename)                (GFile         *file);
-  char *              (* get_path)                    (GFile         *file);
-  char *              (* get_uri)                     (GFile         *file);
-  char *              (* get_parse_name)              (GFile         *file);
-  GFile *             (* get_parent)                  (GFile         *file);
-  gboolean            (* prefix_matches)              (GFile         *prefix,
-                                                       GFile         *file);
-  char *              (* get_relative_path)           (GFile         *parent,
-                                                       GFile         *descendant);
-  GFile *             (* resolve_relative_path)       (GFile        *file,
-                                                       const char   *relative_path);
-  GFile *             (* get_child_for_display_name)  (GFile        *file,
-                                                       const char   *display_name,
-                                                       GError      **error);
-
-  GFileEnumerator *   (* enumerate_children)          (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* enumerate_children_async)    (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileEnumerator *   (* enumerate_children_finish)   (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileInfo *         (* query_info)                  (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* query_info_async)            (GFile                *file,
-                                                       const char           *attributes,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInfo *         (* query_info_finish)           (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileInfo *         (* query_filesystem_info)       (GFile                *file,
-                                                       const char           *attributes,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* query_filesystem_info_async) (GFile                *file,
-                                                       const char           *attributes,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInfo *         (* query_filesystem_info_finish)(GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GMount *            (* find_enclosing_mount)        (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* find_enclosing_mount_async)  (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GMount *            (* find_enclosing_mount_finish) (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFile *             (* set_display_name)            (GFile                *file,
-                                                       const char           *display_name,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* set_display_name_async)      (GFile                *file,
-                                                       const char           *display_name,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFile *             (* set_display_name_finish)     (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileAttributeInfoList * (* query_settable_attributes)    (GFile          *file,
-                                                             GCancellable   *cancellable,
-                                                             GError        **error);
-  void                (* _query_settable_attributes_async)  (void);
-  void                (* _query_settable_attributes_finish) (void);
-
-  GFileAttributeInfoList * (* query_writable_namespaces)    (GFile          *file,
-                                                             GCancellable   *cancellable,
-                                                             GError        **error);
-  void                (* _query_writable_namespaces_async)  (void);
-  void                (* _query_writable_namespaces_finish) (void);
-
-  gboolean            (* set_attribute)               (GFile                *file,
-                                                       const char           *attribute,
-                                                       GFileAttributeType    type,
-                                                       gpointer              value_p,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  gboolean            (* set_attributes_from_info)    (GFile                *file,
-                                                       GFileInfo            *info,
-                                                       GFileQueryInfoFlags   flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* set_attributes_async)        (GFile                *file,
-                                                       GFileInfo            *info,
-                                                       GFileQueryInfoFlags   flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* set_attributes_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GFileInfo           **info,
-                                                       GError              **error);
-
-  GFileInputStream *  (* read_fn)                     (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* read_async)                  (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileInputStream *  (* read_finish)                 (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* append_to)                   (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* append_to_async)             (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* append_to_finish)            (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* create)                      (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* create_async)                (GFile                *file,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* create_finish)               (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  GFileOutputStream * (* replace)                     (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* replace_async)               (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileOutputStream * (* replace_finish)              (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  gboolean            (* delete_file)                 (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* delete_file_async)           (GFile                *file,
-						       int                   io_priority,
-						       GCancellable         *cancellable,
-						       GAsyncReadyCallback   callback,
-						       gpointer              user_data);
-  gboolean            (* delete_file_finish)          (GFile                *file,
-						       GAsyncResult         *result,
-						       GError              **error);
-
-  gboolean            (* trash)                       (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* _trash_async)                (void);
-  void                (* _trash_finish)               (void);
-
-  gboolean            (* make_directory)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* _make_directory_async)       (void);
-  void                (* _make_directory_finish)      (void);
-
-  gboolean            (* make_symbolic_link)          (GFile                *file,
-                                                       const char           *symlink_value,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* _make_symbolic_link_async)   (void);
-  void                (* _make_symbolic_link_finish)  (void);
-
-  gboolean            (* copy)                        (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GError              **error);
-  void                (* copy_async)                  (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* copy_finish)                 (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  gboolean            (* move)                        (GFile                *source,
-                                                       GFile                *destination,
-                                                       GFileCopyFlags        flags,
-                                                       GCancellable         *cancellable,
-                                                       GFileProgressCallback progress_callback,
-                                                       gpointer              progress_callback_data,
-                                                       GError              **error);
-  void                (* _move_async)                 (void);
-  void                (* _move_finish)                (void);
-
-  void                (* mount_mountable)             (GFile                *file,
-                                                       GMountMountFlags      flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFile *             (* mount_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* unmount_mountable)           (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* unmount_mountable_finish)    (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* eject_mountable)             (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* eject_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* mount_enclosing_volume)      (GFile                *location,
-                                                       GMountMountFlags      flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean         (* mount_enclosing_volume_finish)  (GFile                *location,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  GFileMonitor *      (* monitor_dir)                 (GFile                *file,
-                                                       GFileMonitorFlags     flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  GFileMonitor *      (* monitor_file)                (GFile                *file,
-                                                       GFileMonitorFlags     flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-
-  GFileIOStream *     (* open_readwrite)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* open_readwrite_async)        (GFile                *file,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* open_readwrite_finish)       (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-  GFileIOStream *     (* create_readwrite)            (GFile                *file,
-						       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* create_readwrite_async)      (GFile                *file,
-						       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* create_readwrite_finish)      (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-  GFileIOStream *     (* replace_readwrite)           (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       GCancellable         *cancellable,
-                                                       GError              **error);
-  void                (* replace_readwrite_async)     (GFile                *file,
-                                                       const char           *etag,
-                                                       gboolean              make_backup,
-                                                       GFileCreateFlags      flags,
-                                                       int                   io_priority,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  GFileIOStream *     (* replace_readwrite_finish)    (GFile                *file,
-                                                       GAsyncResult         *res,
-                                                       GError              **error);
-
-  void                (* start_mountable)             (GFile                *file,
-                                                       GDriveStartFlags      flags,
-                                                       GMountOperation      *start_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* start_mountable_finish)      (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* stop_mountable)              (GFile                *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* stop_mountable_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  gboolean            supports_thread_contexts;
-
-  void                (* unmount_mountable_with_operation) (GFile           *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* unmount_mountable_with_operation_finish) (GFile    *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* eject_mountable_with_operation) (GFile             *file,
-                                                       GMountUnmountFlags    flags,
-                                                       GMountOperation      *mount_operation,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* eject_mountable_with_operation_finish) (GFile      *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-
-  void                (* poll_mountable)              (GFile                *file,
-                                                       GCancellable         *cancellable,
-                                                       GAsyncReadyCallback   callback,
-                                                       gpointer              user_data);
-  gboolean            (* poll_mountable_finish)       (GFile                *file,
-                                                       GAsyncResult         *result,
-                                                       GError              **error);
-};
-
-GType                   g_file_get_type                   (void) G_GNUC_CONST;
-
-GFile *                 g_file_new_for_path               (const char                 *path);
-GFile *                 g_file_new_for_uri                (const char                 *uri);
-GFile *                 g_file_new_for_commandline_arg    (const char                 *arg);
-GLIB_AVAILABLE_IN_2_32
-GFile *                 g_file_new_tmp                    (const char                 *tmpl,
-                                                           GFileIOStream             **iostream,
-                                                           GError                    **error);
-GFile *                 g_file_parse_name                 (const char                 *parse_name);
-GFile *                 g_file_dup                        (GFile                      *file);
-guint                   g_file_hash                       (gconstpointer               file);
-gboolean                g_file_equal                      (GFile                      *file1,
-							   GFile                      *file2);
-char *                  g_file_get_basename               (GFile                      *file);
-char *                  g_file_get_path                   (GFile                      *file);
-char *                  g_file_get_uri                    (GFile                      *file);
-char *                  g_file_get_parse_name             (GFile                      *file);
-GFile *                 g_file_get_parent                 (GFile                      *file);
-gboolean                g_file_has_parent                 (GFile                      *file,
-                                                           GFile                      *parent);
-GFile *                 g_file_get_child                  (GFile                      *file,
-							   const char                 *name);
-GFile *                 g_file_get_child_for_display_name (GFile                      *file,
-							   const char                 *display_name,
-							   GError                    **error);
-gboolean                g_file_has_prefix                 (GFile                      *file,
-							   GFile                      *prefix);
-char *                  g_file_get_relative_path          (GFile                      *parent,
-							   GFile                      *descendant);
-GFile *                 g_file_resolve_relative_path      (GFile                      *file,
-							   const char                 *relative_path);
-gboolean                g_file_is_native                  (GFile                      *file);
-gboolean                g_file_has_uri_scheme             (GFile                      *file,
-							   const char                 *uri_scheme);
-char *                  g_file_get_uri_scheme             (GFile                      *file);
-GFileInputStream *      g_file_read                       (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_read_async                 (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInputStream *      g_file_read_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileOutputStream *     g_file_append_to                  (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileOutputStream *     g_file_create                     (GFile                      *file,
-							   GFileCreateFlags             flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileOutputStream *     g_file_replace                    (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_append_to_async            (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_append_to_finish           (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-void                    g_file_create_async               (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_create_finish              (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-void                    g_file_replace_async              (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileOutputStream *     g_file_replace_finish             (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileIOStream *         g_file_open_readwrite             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_open_readwrite_async       (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileIOStream *         g_file_open_readwrite_finish      (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileIOStream *         g_file_create_readwrite           (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_create_readwrite_async     (GFile                      *file,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileIOStream *         g_file_create_readwrite_finish    (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileIOStream *         g_file_replace_readwrite          (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_replace_readwrite_async    (GFile                      *file,
-							   const char                 *etag,
-							   gboolean                    make_backup,
-							   GFileCreateFlags            flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileIOStream *         g_file_replace_readwrite_finish   (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_query_exists               (GFile                      *file,
-							   GCancellable               *cancellable);
-GFileType               g_file_query_file_type            (GFile                      *file,
-                                                           GFileQueryInfoFlags         flags,
-                                                           GCancellable               *cancellable);
-GFileInfo *             g_file_query_info                 (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_query_info_async           (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInfo *             g_file_query_info_finish          (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFileInfo *             g_file_query_filesystem_info      (GFile                      *file,
-							   const char                 *attributes,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_query_filesystem_info_async (GFile                      *file,
-							   const char                 *attributes,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileInfo *             g_file_query_filesystem_info_finish (GFile                      *file,
-                                                           GAsyncResult               *res,
-							   GError                    **error);
-GMount *                g_file_find_enclosing_mount       (GFile                      *file,
-                                                           GCancellable               *cancellable,
-                                                           GError                    **error);
-void                    g_file_find_enclosing_mount_async (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GMount *                g_file_find_enclosing_mount_finish (GFile                     *file,
-							    GAsyncResult              *res,
-							    GError                   **error);
-GFileEnumerator *       g_file_enumerate_children         (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_enumerate_children_async   (GFile                      *file,
-							   const char                 *attributes,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFileEnumerator *       g_file_enumerate_children_finish  (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-GFile *                 g_file_set_display_name           (GFile                      *file,
-							   const char                 *display_name,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_set_display_name_async     (GFile                      *file,
-							   const char                 *display_name,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFile *                 g_file_set_display_name_finish    (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_delete                     (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-GLIB_AVAILABLE_IN_2_34
-void                    g_file_delete_async               (GFile                      *file,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean                g_file_delete_finish              (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-gboolean                g_file_trash                      (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_copy                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-void                    g_file_copy_async                 (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_copy_finish                (GFile                      *file,
-							   GAsyncResult               *res,
-							   GError                    **error);
-gboolean                g_file_move                       (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GFileProgressCallback       progress_callback,
-							   gpointer                    progress_callback_data,
-							   GError                    **error);
-gboolean                g_file_make_directory             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_make_directory_with_parents (GFile                     *file,
-		                                           GCancellable               *cancellable,
-		                                           GError                    **error);
-gboolean                g_file_make_symbolic_link         (GFile                      *file,
-							   const char                 *symlink_value,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileAttributeInfoList *g_file_query_settable_attributes  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-GFileAttributeInfoList *g_file_query_writable_namespaces  (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute              (GFile                      *file,
-							   const char                 *attribute,
-							   GFileAttributeType          type,
-							   gpointer                    value_p,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attributes_from_info   (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_set_attributes_async       (GFile                      *file,
-							   GFileInfo                  *info,
-							   GFileQueryInfoFlags         flags,
-							   int                         io_priority,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_set_attributes_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GFileInfo                 **info,
-							   GError                    **error);
-gboolean                g_file_set_attribute_string       (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_byte_string  (GFile                      *file,
-							   const char                 *attribute,
-							   const char                 *value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_uint32       (GFile                      *file,
-							   const char                 *attribute,
-							   guint32                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_int32        (GFile                      *file,
-							   const char                 *attribute,
-							   gint32                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_uint64       (GFile                      *file,
-							   const char                 *attribute,
-							   guint64                     value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-gboolean                g_file_set_attribute_int64        (GFile                      *file,
-							   const char                 *attribute,
-							   gint64                      value,
-							   GFileQueryInfoFlags         flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-void                    g_file_mount_enclosing_volume     (GFile                      *location,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_mount_enclosing_volume_finish (GFile                      *location,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_mount_mountable            (GFile                      *file,
-							   GMountMountFlags            flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-GFile *                 g_file_mount_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation)
-void                    g_file_unmount_mountable          (GFile                      *file,
-                                                           GMountUnmountFlags          flags,
-                                                           GCancellable               *cancellable,
-                                                           GAsyncReadyCallback         callback,
-                                                           gpointer                    user_data);
-
-GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish)
-gboolean                g_file_unmount_mountable_finish   (GFile                      *file,
-                                                           GAsyncResult               *result,
-                                                           GError                    **error);
-void                    g_file_unmount_mountable_with_operation (GFile                *file,
-							   GMountUnmountFlags          flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_unmount_mountable_with_operation_finish (GFile         *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation)
-void                    g_file_eject_mountable            (GFile                      *file,
-                                                           GMountUnmountFlags          flags,
-                                                           GCancellable               *cancellable,
-                                                           GAsyncReadyCallback         callback,
-                                                           gpointer                    user_data);
-
-GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish)
-gboolean                g_file_eject_mountable_finish     (GFile                      *file,
-                                                           GAsyncResult               *result,
-                                                           GError                    **error);
-void                    g_file_eject_mountable_with_operation (GFile                  *file,
-							   GMountUnmountFlags          flags,
-							   GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_eject_mountable_with_operation_finish (GFile           *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-gboolean                g_file_copy_attributes            (GFile                      *source,
-							   GFile                      *destination,
-							   GFileCopyFlags              flags,
-							   GCancellable               *cancellable,
-							   GError                    **error);
-
-
-GFileMonitor*           g_file_monitor_directory          (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-GFileMonitor*           g_file_monitor_file               (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-GFileMonitor*           g_file_monitor                    (GFile                  *file,
-							   GFileMonitorFlags       flags,
-							   GCancellable           *cancellable,
-							   GError                **error);
-
-void                    g_file_start_mountable            (GFile                      *file,
-							   GDriveStartFlags            flags,
-							   GMountOperation            *start_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_start_mountable_finish     (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-void                    g_file_stop_mountable             (GFile                      *file,
-							   GMountUnmountFlags          flags,
-                                                           GMountOperation            *mount_operation,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_stop_mountable_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-void                    g_file_poll_mountable             (GFile                      *file,
-							   GCancellable               *cancellable,
-							   GAsyncReadyCallback         callback,
-							   gpointer                    user_data);
-gboolean                g_file_poll_mountable_finish      (GFile                      *file,
-							   GAsyncResult               *result,
-							   GError                    **error);
-
-/* Utilities */
-
-GAppInfo *g_file_query_default_handler       (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GError                **error);
-gboolean g_file_load_contents                (GFile                  *file,
-					      GCancellable           *cancellable,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-void     g_file_load_contents_async          (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_load_contents_finish         (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-void     g_file_load_partial_contents_async  (GFile                  *file,
-					      GCancellable           *cancellable,
-					      GFileReadMoreCallback   read_more_callback,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_load_partial_contents_finish (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **contents,
-					      gsize                  *length,
-					      char                  **etag_out,
-					      GError                **error);
-gboolean g_file_replace_contents             (GFile                  *file,
-					      const char             *contents,
-					      gsize                   length,
-					      const char             *etag,
-					      gboolean                make_backup,
-					      GFileCreateFlags        flags,
-					      char                  **new_etag,
-					      GCancellable           *cancellable,
-					      GError                **error);
-void     g_file_replace_contents_async       (GFile                  *file,
-					      const char             *contents,
-					      gsize                   length,
-					      const char             *etag,
-					      gboolean                make_backup,
-					      GFileCreateFlags        flags,
-					      GCancellable           *cancellable,
-					      GAsyncReadyCallback     callback,
-					      gpointer                user_data);
-gboolean g_file_replace_contents_finish      (GFile                  *file,
-					      GAsyncResult           *res,
-					      char                  **new_etag,
-					      GError                **error);
-
-gboolean g_file_supports_thread_contexts     (GFile                  *file);
-
-G_END_DECLS
-
-#endif /* __G_FILE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfileattribute.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfileattribute.h
deleted file mode 100644
index 445cdd77..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfileattribute.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ATTRIBUTE_H__
-#define __G_FILE_ATTRIBUTE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GFileAttributeInfo:
- * @name: the name of the attribute.
- * @type: the #GFileAttributeType type of the attribute.
- * @flags: a set of #GFileAttributeInfoFlags.
- *
- * Information about a specific attribute.
- **/
-struct _GFileAttributeInfo
-{
-  char                    *name;
-  GFileAttributeType       type;
-  GFileAttributeInfoFlags  flags;
-};
-
-/**
- * GFileAttributeInfoList:
- * @infos: an array of #GFileAttributeInfo<!-- -->s.
- * @n_infos: the number of values in the array.
- *
- * Acts as a lightweight registry for possible valid file attributes.
- * The registry stores Key-Value pair formats as #GFileAttributeInfo<!-- -->s.
- **/
-struct _GFileAttributeInfoList
-{
-  GFileAttributeInfo *infos;
-  int                 n_infos;
-};
-
-#define G_TYPE_FILE_ATTRIBUTE_INFO_LIST (g_file_attribute_info_list_get_type ())
-GType g_file_attribute_info_list_get_type (void);
-
-GFileAttributeInfoList *  g_file_attribute_info_list_new    (void);
-GFileAttributeInfoList *  g_file_attribute_info_list_ref    (GFileAttributeInfoList *list);
-void                      g_file_attribute_info_list_unref  (GFileAttributeInfoList *list);
-GFileAttributeInfoList *  g_file_attribute_info_list_dup    (GFileAttributeInfoList *list);
-const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list,
-							     const char             *name);
-void                      g_file_attribute_info_list_add    (GFileAttributeInfoList *list,
-							     const char             *name,
-							     GFileAttributeType      type,
-							     GFileAttributeInfoFlags flags);
-
-G_END_DECLS
-
-#endif /* __G_FILE_INFO_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfileenumerator.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfileenumerator.h
deleted file mode 100644
index 9cd2f3ec..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfileenumerator.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ENUMERATOR_H__
-#define __G_FILE_ENUMERATOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_ENUMERATOR         (g_file_enumerator_get_type ())
-#define G_FILE_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_ENUMERATOR, GFileEnumerator))
-#define G_FILE_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_ENUMERATOR, GFileEnumeratorClass))
-#define G_IS_FILE_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_ENUMERATOR))
-#define G_IS_FILE_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_ENUMERATOR))
-#define G_FILE_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_ENUMERATOR, GFileEnumeratorClass))
-
-/**
- * GFileEnumerator:
- *
- * A per matched file iterator.
- **/
-typedef struct _GFileEnumeratorClass    GFileEnumeratorClass;
-typedef struct _GFileEnumeratorPrivate  GFileEnumeratorPrivate;
-
-struct _GFileEnumerator
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GFileEnumeratorPrivate *priv;
-};
-
-struct _GFileEnumeratorClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  GFileInfo * (* next_file)         (GFileEnumerator      *enumerator,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* close_fn)          (GFileEnumerator      *enumerator,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-
-  void        (* next_files_async)  (GFileEnumerator      *enumerator,
-                                     int                   num_files,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GList *     (* next_files_finish) (GFileEnumerator      *enumerator,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  void        (* close_async)       (GFileEnumerator      *enumerator,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  gboolean    (* close_finish)      (GFileEnumerator      *enumerator,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-};
-
-GType      g_file_enumerator_get_type          (void) G_GNUC_CONST;
-
-GFileInfo *g_file_enumerator_next_file         (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-gboolean   g_file_enumerator_close             (GFileEnumerator      *enumerator,
-						GCancellable         *cancellable,
-						GError              **error);
-void       g_file_enumerator_next_files_async  (GFileEnumerator      *enumerator,
-						int                   num_files,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-GList *    g_file_enumerator_next_files_finish (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-void       g_file_enumerator_close_async       (GFileEnumerator      *enumerator,
-						int                   io_priority,
-						GCancellable         *cancellable,
-						GAsyncReadyCallback   callback,
-						gpointer              user_data);
-gboolean   g_file_enumerator_close_finish      (GFileEnumerator      *enumerator,
-						GAsyncResult         *result,
-						GError              **error);
-gboolean   g_file_enumerator_is_closed         (GFileEnumerator      *enumerator);
-gboolean   g_file_enumerator_has_pending       (GFileEnumerator      *enumerator);
-void       g_file_enumerator_set_pending       (GFileEnumerator      *enumerator,
-						gboolean              pending);
-GFile *    g_file_enumerator_get_container     (GFileEnumerator *enumerator);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ENUMERATOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfileicon.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfileicon.h
deleted file mode 100644
index 08ae7919..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfileicon.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_ICON_H__
-#define __G_FILE_ICON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_ICON         (g_file_icon_get_type ())
-#define G_FILE_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_ICON, GFileIcon))
-#define G_FILE_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_ICON, GFileIconClass))
-#define G_IS_FILE_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_ICON))
-#define G_IS_FILE_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_ICON))
-#define G_FILE_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_ICON, GFileIconClass))
-
-/**
- * GFileIcon:
- *
- * Gets an icon for a #GFile. Implements #GLoadableIcon.
- **/
-typedef struct _GFileIconClass   GFileIconClass;
-
-GType   g_file_icon_get_type (void) G_GNUC_CONST;
-
-GIcon * g_file_icon_new      (GFile     *file);
-
-GFile * g_file_icon_get_file (GFileIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_FILE_ICON_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfileinfo.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfileinfo.h
deleted file mode 100644
index 9399e534..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfileinfo.h
+++ /dev/null
@@ -1,983 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_INFO_H__
-#define __G_FILE_INFO_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_INFO         (g_file_info_get_type ())
-#define G_FILE_INFO(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_INFO, GFileInfo))
-#define G_FILE_INFO_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_INFO, GFileInfoClass))
-#define G_IS_FILE_INFO(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_INFO))
-#define G_IS_FILE_INFO_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_INFO))
-#define G_FILE_INFO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_INFO, GFileInfoClass))
-
-/**
- * GFileInfo:
- *
- * Stores information about a file system object referenced by a #GFile.
- **/
-typedef struct _GFileInfoClass   GFileInfoClass;
-
-
-/* Common Attributes:  */
-/**
- * G_FILE_ATTRIBUTE_STANDARD_TYPE:
- *
- * A key in the "standard" namespace for storing file types.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- * The value for this key should contain a #GFileType.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_TYPE "standard::type"                     /* uint32 (GFileType) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN:
- *
- * A key in the "standard" namespace for checking if a file is hidden.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "standard::is-hidden"           /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP:
- *
- * A key in the "standard" namespace for checking if a file is a backup file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP "standard::is-backup"           /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK:
- *
- * A key in the "standard" namespace for checking if the file is a symlink.
- * Typically the actual type is something else, if we followed the symlink
- * to get the type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK "standard::is-symlink"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL:
- *
- * A key in the "standard" namespace for checking if a file is virtual.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL "standard::is-virtual"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_NAME:
- *
- * A key in the "standard" namespace for getting the name of the file.
- * The name is the on-disk filename which may not be in any known encoding,
- * and can thus not be generally displayed as is.
- * Use #G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME if you need to display the
- * name in a user interface.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_NAME "standard::name"                     /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME:
- *
- * A key in the "standard" namespace for getting the display name of the file.
- * A display name is guaranteed to be in UTF8 and can thus be displayed in
- * the UI.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME "standard::display-name"     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME:
- *
- * A key in the "standard" namespace for edit name of the file.
- * An edit name is similar to the display name, but it is meant to be
- * used when you want to rename the file in the UI. The display name
- * might contain information you don't want in the new filename (such as
- * "(invalid unicode)" if the filename was in an invalid encoding).
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME "standard::edit-name"           /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_COPY_NAME:
- *
- * A key in the "standard" namespace for getting the copy name of the file.
- * The copy name is an optional version of the name. If available it's always
- * in UTF8, and corresponds directly to the original filename (only transcoded to
- * UTF8). This is useful if you want to copy the file to another filesystem that
- * might have a different encoding. If the filename is not a valid string in the
- * encoding selected for the filesystem it is in then the copy name will not be set.
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_COPY_NAME "standard::copy-name"           /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION:
- *
- * A key in the "standard" namespace for getting the description of the file.
- * The description is a utf8 string that describes the file, generally containing
- * the filename, but can also contain furter information. Example descriptions
- * could be "filename (on hostname)" for a remote file or "filename (in trash)"
- * for a file in the trash. This is useful for instance as the window title
- * when displaying a directory or for a bookmarks menu.
- *
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION "standard::description"        /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_ICON:
- *
- * A key in the "standard" namespace for getting the icon for the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.
- * The value for this key should contain a #GIcon.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_ICON "standard::icon"                     /* object (GIcon) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON:
- *
- * A key in the "standard" namespace for getting the symbolic icon for the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.
- * The value for this key should contain a #GIcon.
- *
- * Since: 2.34
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON "standard::symbolic-icon"   /* object (GIcon) */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE:
- *
- * A key in the "standard" namespace for getting the content type of the file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * The value for this key should contain a valid content type.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "standard::content-type"     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE:
- *
- * A key in the "standard" namespace for getting the fast content type.
- * The fast content type isn't as reliable as the regular one, as it
- * only uses the filename to guess it, but it is faster to calculate than the
- * regular content type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE "standard::fast-content-type" /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SIZE:
- *
- * A key in the "standard" namespace for getting the file's size (in bytes).
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SIZE "standard::size"                     /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE:
- *
- * A key in the "standard" namespace for getting the amount of disk space
- * that is consumed by the file (in bytes).  This will generally be larger
- * than the file size (due to block size overhead) but can occasionally be
- * smaller (for example, for sparse files).
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- *
- * Since: 2.20
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_ALLOCATED_SIZE "standard::allocated-size" /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET:
- *
- * A key in the "standard" namespace for getting the symlink target, if the file
- * is a symlink. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET "standard::symlink-target" /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_TARGET_URI:
- *
- * A key in the "standard" namespace for getting the target URI for the file, in
- * the case of %G_FILE_TYPE_SHORTCUT or %G_FILE_TYPE_MOUNTABLE files.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_TARGET_URI "standard::target-uri"         /* string */
-
-/**
- * G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER:
- *
- * A key in the "standard" namespace for setting the sort order of a file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_INT32.
- * An example use would be in file managers, which would use this key
- * to set the order files are displayed. Files with smaller sort order
- * should be sorted first, and files without sort order as if sort order
- * was zero.
- **/
-#define G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER "standard::sort-order"         /* int32  */
-
-/* Entity tags, used to avoid missing updates on save */
-
-/**
- * G_FILE_ATTRIBUTE_ETAG_VALUE:
- *
- * A key in the "etag" namespace for getting the value of the file's
- * entity tag. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_ETAG_VALUE "etag::value"                 /* string */
-
-/* File identifier, for e.g. avoiding loops when doing recursive
- * directory scanning
- */
-
-/**
- * G_FILE_ATTRIBUTE_ID_FILE:
- *
- * A key in the "id" namespace for getting a file identifier.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * An example use would be during listing files, to avoid recursive
- * directory scanning.
- **/
-#define G_FILE_ATTRIBUTE_ID_FILE "id::file"                     /* string */
-
-/**
- * G_FILE_ATTRIBUTE_ID_FILESYSTEM:
- *
- * A key in the "id" namespace for getting the file system identifier.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- * An example use would be during drag and drop to see if the source
- * and target are on the same filesystem (default to move) or not (default
- * to copy).
- **/
-#define G_FILE_ATTRIBUTE_ID_FILESYSTEM "id::filesystem"         /* string */
-
-/* Calculated Access Rights for current user */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_READ:
- *
- * A key in the "access" namespace for getting read privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to read the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_READ "access::can-read"       /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE:
- *
- * A key in the "access" namespace for getting write privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to write to the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE "access::can-write"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE:
- *
- * A key in the "access" namespace for getting execution privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to execute the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE "access::can-execute" /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE:
- *
- * A key in the "access" namespace for checking deletion privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to delete the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE "access::can-delete"   /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH:
- *
- * A key in the "access" namespace for checking trashing privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to move the file to
- * the trash.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH "access::can-trash"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME:
- *
- * A key in the "access" namespace for checking renaming privileges.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to rename the file.
- **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME "access::can-rename"   /* boolean */
-
-/* TODO: Should we have special version for directories? can_enumerate, etc */
-
-/* Mountable attributes */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) is mountable.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT "mountable::can-mount"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE)  is unmountable.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT "mountable::can-unmount" /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be ejected.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT "mountable::can-eject"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE:
- *
- * A key in the "mountable" namespace for getting the unix device.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE "mountable::unix-device" /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE:
- *
- * A key in the "mountable" namespace for getting the unix device file.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- * Since: 2.22
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE_FILE "mountable::unix-device-file" /* string */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI:
- *
- * A key in the "mountable" namespace for getting the HAL UDI for the mountable
- * file. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI "mountable::hal-udi"         /* string */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be started.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START "mountable::can-start"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START_DEGRADED:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be started
- * degraded.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_START_DEGRADED "mountable::can-start-degraded"     /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_STOP:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be stopped.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_STOP "mountable::can-stop"      /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE:
- *
- * A key in the "mountable" namespace for getting the #GDriveStartStopType.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_START_STOP_TYPE "mountable::start-stop-type" /* uint32 (GDriveStartStopType) */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be polled.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_POLL "mountable::can-poll"      /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC:
- *
- * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE)
- * is automatically polled for media.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.22
- */
-#define G_FILE_ATTRIBUTE_MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC "mountable::is-media-check-automatic"      /* boolean */
-
-/* Time attributes */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_MODIFIED:
- *
- * A key in the "time" namespace for getting the time the file was last
- * modified. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
- * file was modified.
- **/
-#define G_FILE_ATTRIBUTE_TIME_MODIFIED "time::modified"           /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC:
- *
- * A key in the "time" namespace for getting the miliseconds of the time
- * the file was last modified. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_MODIFIED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC "time::modified-usec" /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_ACCESS:
- *
- * A key in the "time" namespace for getting the time the file was last
- * accessed. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
- * file was last accessed.
- **/
-#define G_FILE_ATTRIBUTE_TIME_ACCESS "time::access"               /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_ACCESS_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was last accessed. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_ACCESS. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_ACCESS_USEC "time::access-usec"     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CHANGED:
- *
- * A key in the "time" namespace for getting the time the file was last
- * changed. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
- * and contains the UNIX time since the file was last changed.
- *
- * This corresponds to the traditional UNIX ctime.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CHANGED "time::changed"             /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CHANGED_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was last changed. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_CHANGED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CHANGED_USEC "time::changed-usec"   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CREATED:
- *
- * A key in the "time" namespace for getting the time the file was created.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
- * and contains the UNIX time since the file was created.
- *
- * This corresponds to the NTFS ctime.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CREATED "time::created"             /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_TIME_CREATED_USEC:
- *
- * A key in the "time" namespace for getting the microseconds of the time
- * the file was created. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_CREATED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TIME_CREATED_USEC "time::created-usec"   /* uint32 */
-
-/* Unix specific attributes */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_DEVICE:
- *
- * A key in the "unix" namespace for getting the device id of the device the
- * file is located on (see stat() documentation). This attribute is only
- * available for UNIX file systems. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_DEVICE "unix::device"               /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_INODE:
- *
- * A key in the "unix" namespace for getting the inode of the file.
- * This attribute is only available for UNIX file systems. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_INODE "unix::inode"                 /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_MODE:
- *
- * A key in the "unix" namespace for getting the mode of the file
- * (e.g. whether the file is a regular file, symlink, etc). See lstat()
- * documentation. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_MODE "unix::mode"                   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_NLINK:
- *
- * A key in the "unix" namespace for getting the number of hard links
- * for a file. See lstat() documentation. This attribute is only available
- * for UNIX file systems. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_NLINK "unix::nlink"                 /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_UID:
- *
- * A key in the "unix" namespace for getting the user ID for the file.
- * This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_UID "unix::uid"                     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_GID:
- *
- * A key in the "unix" namespace for getting the group ID for the file.
- * This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_GID "unix::gid"                     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_RDEV:
- *
- * A key in the "unix" namespace for getting the device ID for the file
- * (if it is a special file). See lstat() documentation. This attribute
- * is only available for UNIX file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_RDEV "unix::rdev"                   /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE:
- *
- * A key in the "unix" namespace for getting the block size for the file
- * system. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE "unix::block-size"       /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_BLOCKS:
- *
- * A key in the "unix" namespace for getting the number of blocks allocated
- * for the file. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_BLOCKS "unix::blocks"               /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT:
- *
- * A key in the "unix" namespace for checking if the file represents a
- * UNIX mount point. This attribute is %TRUE if the file is a UNIX mount
- * point. This attribute is only available for UNIX file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT "unix::is-mountpoint" /* boolean */
-
-/* DOS specific attributes */
-
-/**
- * G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE:
- *
- * A key in the "dos" namespace for checking if the file's archive flag
- * is set. This attribute is %TRUE if the archive flag is set. This attribute
- * is only available for DOS file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE "dos::is-archive"         /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_DOS_IS_SYSTEM:
- *
- * A key in the "dos" namespace for checking if the file's backup flag
- * is set. This attribute is %TRUE if the backup flag is set. This attribute
- * is only available for DOS file systems. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_DOS_IS_SYSTEM "dos::is-system"           /* boolean */
-
-/* Owner attributes */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_USER:
- *
- * A key in the "owner" namespace for getting the user name of the
- * file's owner. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_USER "owner::user"                 /* string */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_USER_REAL:
- *
- * A key in the "owner" namespace for getting the real name of the
- * user that owns the file. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_USER_REAL "owner::user-real"       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_OWNER_GROUP:
- *
- * A key in the "owner" namespace for getting the file owner's group.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_OWNER_GROUP "owner::group"               /* string */
-
-/* Thumbnails */
-
-/**
- * G_FILE_ATTRIBUTE_THUMBNAIL_PATH:
- *
- * A key in the "thumbnail" namespace for getting the path to the thumbnail
- * image. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH "thumbnail::path"         /* bytestring */
-/**
- * G_FILE_ATTRIBUTE_THUMBNAILING_FAILED:
- *
- * A key in the "thumbnail" namespace for checking if thumbnailing failed.
- * This attribute is %TRUE if thumbnailing failed. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED "thumbnail::failed"         /* boolean */
-
-/* Preview */
-
-/**
- * G_FILE_ATTRIBUTE_PREVIEW_ICON:
- *
- * A key in the "preview" namespace for getting a #GIcon that can be
- * used to get preview of the file. For example, it may be a low
- * resolution thumbnail without metadata. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.  The value
- * for this key should contain a #GIcon.
- *
- * Since: 2.20
- **/
-#define G_FILE_ATTRIBUTE_PREVIEW_ICON "preview::icon"         /* object (GIcon) */
-
-/* File system info (for g_file_get_filesystem_info) */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_SIZE:
- *
- * A key in the "filesystem" namespace for getting the total size (in bytes) of the file system,
- * used in g_file_query_filesystem_info(). Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_SIZE "filesystem::size"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_FREE:
- *
- * A key in the "filesystem" namespace for getting the number of bytes of free space left on the
- * file system. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_FREE "filesystem::free"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_USED:
- *
- * A key in the "filesystem" namespace for getting the number of bytes of used on the
- * file system. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64.
- *
- * Since: 2.32
- */
-#define G_FILE_ATTRIBUTE_FILESYSTEM_USED "filesystem::used"                       /* uint64 */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_TYPE:
- *
- * A key in the "filesystem" namespace for getting the file system's type.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_TYPE "filesystem::type"                       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_READONLY:
- *
- * A key in the "filesystem" namespace for checking if the file system
- * is read only. Is set to %TRUE if the file system is read only.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_READONLY "filesystem::readonly"               /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW:
- *
- * A key in the "filesystem" namespace for hinting a file manager
- * application whether it should preview (e.g. thumbnail) files on the
- * file system. The value for this key contain a
- * #GFilesystemPreviewType.
- **/
-#define G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW "filesystem::use-preview"        /* uint32 (GFilesystemPreviewType) */
-
-/**
- * G_FILE_ATTRIBUTE_GVFS_BACKEND:
- *
- * A key in the "gvfs" namespace that gets the name of the current
- * GVFS backend in use. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING.
- **/
-#define G_FILE_ATTRIBUTE_GVFS_BACKEND "gvfs::backend"             /* string */
-
-/**
- * G_FILE_ATTRIBUTE_SELINUX_CONTEXT:
- *
- * A key in the "selinux" namespace for getting the file's SELinux
- * context. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_STRING. Note that this attribute is only
- * available if GLib has been built with SELinux support.
- **/
-#define G_FILE_ATTRIBUTE_SELINUX_CONTEXT "selinux::context"       /* string */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT:
- *
- * A key in the "trash" namespace.  When requested against
- * "trash:///" returns the number of (toplevel) items in the trash folder.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT "trash::item-count"     /* uint32 */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_ORIG_PATH:
- *
- * A key in the "trash" namespace.  When requested against
- * items in "trash:///", will return the original path to the file before it
- * was trashed. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
- *
- * Since: 2.24.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_ORIG_PATH "trash::orig-path"     /* byte string */
-
-/**
- * G_FILE_ATTRIBUTE_TRASH_DELETION_DATE:
- *
- * A key in the "trash" namespace.  When requested against
- * items in "trash:///", will return the date and time when the file
- * was trashed. The format of the returned string is YYYY-MM-DDThh:mm:ss.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
- * Since: 2.24.
- **/
-#define G_FILE_ATTRIBUTE_TRASH_DELETION_DATE "trash::deletion-date"  /* string */
-
-GType              g_file_info_get_type                  (void) G_GNUC_CONST;
-
-GFileInfo *        g_file_info_new                       (void);
-GFileInfo *        g_file_info_dup                       (GFileInfo  *other);
-void               g_file_info_copy_into                 (GFileInfo  *src_info,
-							  GFileInfo  *dest_info);
-gboolean           g_file_info_has_attribute             (GFileInfo  *info,
-							  const char *attribute);
-gboolean           g_file_info_has_namespace             (GFileInfo  *info,
-							  const char *name_space);
-char **            g_file_info_list_attributes           (GFileInfo  *info,
-							  const char *name_space);
-gboolean           g_file_info_get_attribute_data        (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType *type,
-							  gpointer   *value_pp,
-							  GFileAttributeStatus *status);
-GFileAttributeType g_file_info_get_attribute_type        (GFileInfo  *info,
-							  const char *attribute);
-void               g_file_info_remove_attribute          (GFileInfo  *info,
-							  const char *attribute);
-GFileAttributeStatus g_file_info_get_attribute_status    (GFileInfo  *info,
-							  const char *attribute);
-gboolean           g_file_info_set_attribute_status      (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeStatus status);
-char *             g_file_info_get_attribute_as_string   (GFileInfo  *info,
-							  const char *attribute);
-const char *       g_file_info_get_attribute_string      (GFileInfo  *info,
-							  const char *attribute);
-const char *       g_file_info_get_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute);
-gboolean           g_file_info_get_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute);
-guint32            g_file_info_get_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute);
-gint32             g_file_info_get_attribute_int32       (GFileInfo  *info,
-							  const char *attribute);
-guint64            g_file_info_get_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute);
-gint64             g_file_info_get_attribute_int64       (GFileInfo  *info,
-							  const char *attribute);
-GObject *          g_file_info_get_attribute_object      (GFileInfo  *info,
-							  const char *attribute);
-char **            g_file_info_get_attribute_stringv     (GFileInfo  *info,
-							  const char *attribute);
-
-void               g_file_info_set_attribute             (GFileInfo  *info,
-							  const char *attribute,
-							  GFileAttributeType type,
-							  gpointer    value_p);
-void               g_file_info_set_attribute_string      (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-void               g_file_info_set_attribute_byte_string (GFileInfo  *info,
-							  const char *attribute,
-							  const char *attr_value);
-void               g_file_info_set_attribute_boolean     (GFileInfo  *info,
-							  const char *attribute,
-							  gboolean    attr_value);
-void               g_file_info_set_attribute_uint32      (GFileInfo  *info,
-							  const char *attribute,
-							  guint32     attr_value);
-void               g_file_info_set_attribute_int32       (GFileInfo  *info,
-							  const char *attribute,
-							  gint32      attr_value);
-void               g_file_info_set_attribute_uint64      (GFileInfo  *info,
-							  const char *attribute,
-							  guint64     attr_value);
-void               g_file_info_set_attribute_int64       (GFileInfo  *info,
-							  const char *attribute,
-							  gint64      attr_value);
-void               g_file_info_set_attribute_object      (GFileInfo  *info,
-							  const char *attribute,
-							  GObject    *attr_value);
-void               g_file_info_set_attribute_stringv     (GFileInfo  *info,
-							  const char *attribute,
-							  char      **attr_value);
-
-void               g_file_info_clear_status              (GFileInfo  *info);
-
-/* Helper getters: */
-GFileType         g_file_info_get_file_type          (GFileInfo         *info);
-gboolean          g_file_info_get_is_hidden          (GFileInfo         *info);
-gboolean          g_file_info_get_is_backup          (GFileInfo         *info);
-gboolean          g_file_info_get_is_symlink         (GFileInfo         *info);
-const char *      g_file_info_get_name               (GFileInfo         *info);
-const char *      g_file_info_get_display_name       (GFileInfo         *info);
-const char *      g_file_info_get_edit_name          (GFileInfo         *info);
-GIcon *           g_file_info_get_icon               (GFileInfo         *info);
-GIcon *           g_file_info_get_symbolic_icon      (GFileInfo         *info);
-const char *      g_file_info_get_content_type       (GFileInfo         *info);
-goffset           g_file_info_get_size               (GFileInfo         *info);
-void              g_file_info_get_modification_time  (GFileInfo         *info,
-						      GTimeVal          *result);
-const char *      g_file_info_get_symlink_target     (GFileInfo         *info);
-const char *      g_file_info_get_etag               (GFileInfo         *info);
-gint32            g_file_info_get_sort_order         (GFileInfo         *info);
-
-void              g_file_info_set_attribute_mask     (GFileInfo         *info,
-						      GFileAttributeMatcher *mask);
-void              g_file_info_unset_attribute_mask   (GFileInfo         *info);
-
-/* Helper setters: */
-void              g_file_info_set_file_type          (GFileInfo         *info,
-						      GFileType          type);
-void              g_file_info_set_is_hidden          (GFileInfo         *info,
-						      gboolean           is_hidden);
-void              g_file_info_set_is_symlink         (GFileInfo         *info,
-						      gboolean           is_symlink);
-void              g_file_info_set_name               (GFileInfo         *info,
-						      const char        *name);
-void              g_file_info_set_display_name       (GFileInfo         *info,
-						      const char        *display_name);
-void              g_file_info_set_edit_name          (GFileInfo         *info,
-						      const char        *edit_name);
-void              g_file_info_set_icon               (GFileInfo         *info,
-						      GIcon             *icon);
-void              g_file_info_set_symbolic_icon      (GFileInfo         *info,
-						      GIcon             *icon);
-void              g_file_info_set_content_type       (GFileInfo         *info,
-						      const char        *content_type);
-void              g_file_info_set_size               (GFileInfo         *info,
-						      goffset            size);
-void              g_file_info_set_modification_time  (GFileInfo         *info,
-						      GTimeVal          *mtime);
-void              g_file_info_set_symlink_target     (GFileInfo         *info,
-						      const char        *symlink_target);
-void              g_file_info_set_sort_order         (GFileInfo         *info,
-						      gint32             sort_order);
-
-#define G_TYPE_FILE_ATTRIBUTE_MATCHER (g_file_attribute_matcher_get_type ())
-GType g_file_attribute_matcher_get_type (void) G_GNUC_CONST;
-
-GFileAttributeMatcher *g_file_attribute_matcher_new            (const char            *attributes);
-GFileAttributeMatcher *g_file_attribute_matcher_ref            (GFileAttributeMatcher *matcher);
-void                   g_file_attribute_matcher_unref          (GFileAttributeMatcher *matcher);
-GFileAttributeMatcher *g_file_attribute_matcher_subtract       (GFileAttributeMatcher *matcher,
-                                                                GFileAttributeMatcher *subtract);
-gboolean               g_file_attribute_matcher_matches        (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-gboolean               g_file_attribute_matcher_matches_only   (GFileAttributeMatcher *matcher,
-								const char            *attribute);
-gboolean               g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
-								     const char            *ns);
-const char *           g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
-GLIB_AVAILABLE_IN_2_32
-char *                 g_file_attribute_matcher_to_string      (GFileAttributeMatcher *matcher);
-
-G_END_DECLS
-
-#endif /* __G_FILE_INFO_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfileinputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfileinputstream.h
deleted file mode 100644
index 08c056e1..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfileinputstream.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_INPUT_STREAM_H__
-#define __G_FILE_INPUT_STREAM_H__
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_INPUT_STREAM         (g_file_input_stream_get_type ())
-#define G_FILE_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_INPUT_STREAM, GFileInputStream))
-#define G_FILE_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_INPUT_STREAM, GFileInputStreamClass))
-#define G_IS_FILE_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_INPUT_STREAM))
-#define G_IS_FILE_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_INPUT_STREAM))
-#define G_FILE_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_INPUT_STREAM, GFileInputStreamClass))
-
-/**
- * GFileInputStream:
- *
- * A subclass of GInputStream for opened files. This adds
- * a few file-specific operations and seeking.
- *
- * #GFileInputStream implements #GSeekable.
- **/
-typedef struct _GFileInputStreamClass    GFileInputStreamClass;
-typedef struct _GFileInputStreamPrivate  GFileInputStreamPrivate;
-
-struct _GFileInputStream
-{
-  GInputStream parent_instance;
-
-  /*< private >*/
-  GFileInputStreamPrivate *priv;
-};
-
-struct _GFileInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  goffset     (* tell)              (GFileInputStream     *stream);
-  gboolean    (* can_seek)          (GFileInputStream     *stream);
-  gboolean    (* seek)	            (GFileInputStream     *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileInputStream     *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileInputStream     *stream,
-                                     const char           *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileInputStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType      g_file_input_stream_get_type          (void) G_GNUC_CONST;
-
-GFileInfo *g_file_input_stream_query_info        (GFileInputStream     *stream,
-						  const char           *attributes,
-						  GCancellable         *cancellable,
-						  GError              **error);
-void       g_file_input_stream_query_info_async  (GFileInputStream     *stream,
-						  const char           *attributes,
-						  int                   io_priority,
-						  GCancellable         *cancellable,
-						  GAsyncReadyCallback   callback,
-						  gpointer              user_data);
-GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream     *stream,
-						  GAsyncResult         *result,
-						  GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfileiostream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfileiostream.h
deleted file mode 100644
index 31497e38..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfileiostream.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* GIO - GLib Input, Io and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_IO_STREAM_H__
-#define __G_FILE_IO_STREAM_H__
-
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_IO_STREAM         (g_file_io_stream_get_type ())
-#define G_FILE_IO_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_IO_STREAM, GFileIOStream))
-#define G_FILE_IO_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_IO_STREAM, GFileIOStreamClass))
-#define G_IS_FILE_IO_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_IO_STREAM))
-#define G_IS_FILE_IO_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_IO_STREAM))
-#define G_FILE_IO_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_IO_STREAM, GFileIOStreamClass))
-
-/**
- * GFileIOStream:
- *
- * A subclass of GIOStream for opened files. This adds
- * a few file-specific operations and seeking and truncating.
- *
- * #GFileIOStream implements GSeekable.
- **/
-typedef struct _GFileIOStreamClass    GFileIOStreamClass;
-typedef struct _GFileIOStreamPrivate  GFileIOStreamPrivate;
-
-struct _GFileIOStream
-{
-  GIOStream parent_instance;
-
-  /*< private >*/
-  GFileIOStreamPrivate *priv;
-};
-
-struct _GFileIOStreamClass
-{
-  GIOStreamClass parent_class;
-
-  goffset     (* tell)              (GFileIOStream    *stream);
-  gboolean    (* can_seek)          (GFileIOStream    *stream);
-  gboolean    (* seek)	            (GFileIOStream    *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* can_truncate)      (GFileIOStream    *stream);
-  gboolean    (* truncate_fn)       (GFileIOStream    *stream,
-                                     goffset               size,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileIOStream    *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileIOStream     *stream,
-                                     const char            *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileIOStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  char      * (* get_etag)          (GFileIOStream    *stream);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType      g_file_io_stream_get_type          (void) G_GNUC_CONST;
-
-GFileInfo *g_file_io_stream_query_info        (GFileIOStream    *stream,
-					       const char           *attributes,
-					       GCancellable         *cancellable,
-					       GError              **error);
-void       g_file_io_stream_query_info_async  (GFileIOStream    *stream,
-					       const char           *attributes,
-					       int                   io_priority,
-					       GCancellable         *cancellable,
-					       GAsyncReadyCallback   callback,
-					       gpointer              user_data);
-GFileInfo *g_file_io_stream_query_info_finish (GFileIOStream    *stream,
-					       GAsyncResult         *result,
-					       GError              **error);
-char *     g_file_io_stream_get_etag          (GFileIOStream    *stream);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_IO_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfilemonitor.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfilemonitor.h
deleted file mode 100644
index 8e27d22e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfilemonitor.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_MONITOR_H__
-#define __G_FILE_MONITOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_MONITOR         (g_file_monitor_get_type ())
-#define G_FILE_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_MONITOR, GFileMonitor))
-#define G_FILE_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_MONITOR, GFileMonitorClass))
-#define G_IS_FILE_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_MONITOR))
-#define G_IS_FILE_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_MONITOR))
-#define G_FILE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_MONITOR, GFileMonitorClass))
-
-typedef struct _GFileMonitorClass       GFileMonitorClass;
-typedef struct _GFileMonitorPrivate	GFileMonitorPrivate;
-
-/**
- * GFileMonitor:
- *
- * Watches for changes to a file.
- **/
-struct _GFileMonitor
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GFileMonitorPrivate *priv;
-};
-
-struct _GFileMonitorClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  void     (* changed) (GFileMonitor      *monitor,
-                        GFile             *file,
-                        GFile             *other_file,
-                        GFileMonitorEvent  event_type);
-
-  /* Virtual Table */
-  gboolean (* cancel)  (GFileMonitor      *monitor);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType    g_file_monitor_get_type       (void) G_GNUC_CONST;
-
-gboolean g_file_monitor_cancel         (GFileMonitor      *monitor);
-gboolean g_file_monitor_is_cancelled   (GFileMonitor      *monitor);
-void     g_file_monitor_set_rate_limit (GFileMonitor      *monitor,
-                                        gint               limit_msecs);
-
-
-/* For implementations */
-void     g_file_monitor_emit_event     (GFileMonitor      *monitor,
-                                        GFile             *child,
-                                        GFile             *other_file,
-                                        GFileMonitorEvent  event_type);
-
-G_END_DECLS
-
-#endif /* __G_FILE_MONITOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfilenamecompleter.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfilenamecompleter.h
deleted file mode 100644
index 1899c27d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfilenamecompleter.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILENAME_COMPLETER_H__
-#define __G_FILENAME_COMPLETER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILENAME_COMPLETER         (g_filename_completer_get_type ())
-#define G_FILENAME_COMPLETER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILENAME_COMPLETER, GFilenameCompleter))
-#define G_FILENAME_COMPLETER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILENAME_COMPLETER, GFilenameCompleterClass))
-#define G_FILENAME_COMPLETER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILENAME_COMPLETER, GFilenameCompleterClass))
-#define G_IS_FILENAME_COMPLETER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILENAME_COMPLETER))
-#define G_IS_FILENAME_COMPLETER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILENAME_COMPLETER))
-
-/**
- * GFilenameCompleter:
- *
- * Completes filenames based on files that exist within the file system.
- **/
-typedef struct _GFilenameCompleterClass GFilenameCompleterClass;
-
-struct _GFilenameCompleterClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void (* got_completion_data) (GFilenameCompleter *filename_completer);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-GType               g_filename_completer_get_type              (void) G_GNUC_CONST;
-
-GFilenameCompleter *g_filename_completer_new                   (void);
-
-char *              g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
-                                                                const char *initial_text);
-char **             g_filename_completer_get_completions       (GFilenameCompleter *completer,
-                                                                const char *initial_text);
-void                g_filename_completer_set_dirs_only         (GFilenameCompleter *completer,
-                                                                gboolean dirs_only);
-
-G_END_DECLS
-
-#endif /* __G_FILENAME_COMPLETER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfileoutputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfileoutputstream.h
deleted file mode 100644
index 3b5f85d3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfileoutputstream.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILE_OUTPUT_STREAM_H__
-#define __G_FILE_OUTPUT_STREAM_H__
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILE_OUTPUT_STREAM         (g_file_output_stream_get_type ())
-#define G_FILE_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStream))
-#define G_FILE_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStreamClass))
-#define G_IS_FILE_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILE_OUTPUT_STREAM))
-#define G_IS_FILE_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_OUTPUT_STREAM))
-#define G_FILE_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_OUTPUT_STREAM, GFileOutputStreamClass))
-
-/**
- * GFileOutputStream:
- *
- * A subclass of GOutputStream for opened files. This adds
- * a few file-specific operations and seeking and truncating.
- *
- * #GFileOutputStream implements GSeekable.
- **/
-typedef struct _GFileOutputStreamClass    GFileOutputStreamClass;
-typedef struct _GFileOutputStreamPrivate  GFileOutputStreamPrivate;
-
-struct _GFileOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< private >*/
-  GFileOutputStreamPrivate *priv;
-};
-
-struct _GFileOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  goffset     (* tell)              (GFileOutputStream    *stream);
-  gboolean    (* can_seek)          (GFileOutputStream    *stream);
-  gboolean    (* seek)	            (GFileOutputStream    *stream,
-                                     goffset               offset,
-                                     GSeekType             type,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  gboolean    (* can_truncate)      (GFileOutputStream    *stream);
-  gboolean    (* truncate_fn)       (GFileOutputStream    *stream,
-                                     goffset               size,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  GFileInfo * (* query_info)        (GFileOutputStream    *stream,
-                                     const char           *attributes,
-                                     GCancellable         *cancellable,
-                                     GError              **error);
-  void        (* query_info_async)  (GFileOutputStream     *stream,
-                                     const char            *attributes,
-                                     int                   io_priority,
-                                     GCancellable         *cancellable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              user_data);
-  GFileInfo * (* query_info_finish) (GFileOutputStream     *stream,
-                                     GAsyncResult         *result,
-                                     GError              **error);
-  char      * (* get_etag)          (GFileOutputStream    *stream);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType      g_file_output_stream_get_type          (void) G_GNUC_CONST;
-
-
-GFileInfo *g_file_output_stream_query_info        (GFileOutputStream    *stream,
-                                                   const char           *attributes,
-                                                   GCancellable         *cancellable,
-                                                   GError              **error);
-void       g_file_output_stream_query_info_async  (GFileOutputStream    *stream,
-						   const char           *attributes,
-						   int                   io_priority,
-						   GCancellable         *cancellable,
-						   GAsyncReadyCallback   callback,
-						   gpointer              user_data);
-GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream    *stream,
-						   GAsyncResult         *result,
-						   GError              **error);
-char *     g_file_output_stream_get_etag          (GFileOutputStream    *stream);
-
-G_END_DECLS
-
-#endif /* __G_FILE_FILE_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfilterinputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfilterinputstream.h
deleted file mode 100644
index 1514104a..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfilterinputstream.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILTER_INPUT_STREAM_H__
-#define __G_FILTER_INPUT_STREAM_H__
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILTER_INPUT_STREAM         (g_filter_input_stream_get_type ())
-#define G_FILTER_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStream))
-#define G_FILTER_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStreamClass))
-#define G_IS_FILTER_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILTER_INPUT_STREAM))
-#define G_IS_FILTER_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILTER_INPUT_STREAM))
-#define G_FILTER_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILTER_INPUT_STREAM, GFilterInputStreamClass))
-
-/**
- * GFilterInputStream:
- *
- * A base class for all input streams that work on an underlying stream.
- **/
-typedef struct _GFilterInputStreamClass    GFilterInputStreamClass;
-
-struct _GFilterInputStream
-{
-  GInputStream parent_instance;
-
-  /*<protected >*/
-  GInputStream *base_stream;
-};
-
-struct _GFilterInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-
-GType          g_filter_input_stream_get_type              (void) G_GNUC_CONST;
-GInputStream * g_filter_input_stream_get_base_stream       (GFilterInputStream *stream);
-gboolean       g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream);
-void           g_filter_input_stream_set_close_base_stream (GFilterInputStream *stream,
-                                                            gboolean            close_base);
-
-G_END_DECLS
-
-#endif /* __G_FILTER_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gfilteroutputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gfilteroutputstream.h
deleted file mode 100644
index 10350e5a..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gfilteroutputstream.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_FILTER_OUTPUT_STREAM_H__
-#define __G_FILTER_OUTPUT_STREAM_H__
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_FILTER_OUTPUT_STREAM         (g_filter_output_stream_get_type ())
-#define G_FILTER_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStream))
-#define G_FILTER_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamClass))
-#define G_IS_FILTER_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_FILTER_OUTPUT_STREAM))
-#define G_IS_FILTER_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILTER_OUTPUT_STREAM))
-#define G_FILTER_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamClass))
-
-/**
- * GFilterOutputStream:
- *
- * A base class for all output streams that work on an underlying stream.
- **/
-typedef struct _GFilterOutputStreamClass    GFilterOutputStreamClass;
-
-struct _GFilterOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< protected >*/
-  GOutputStream *base_stream;
-};
-
-struct _GFilterOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-};
-
-
-GType           g_filter_output_stream_get_type              (void) G_GNUC_CONST;
-GOutputStream * g_filter_output_stream_get_base_stream       (GFilterOutputStream *stream);
-gboolean        g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream);
-void            g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
-                                                              gboolean             close_base);
-
-G_END_DECLS
-
-#endif /* __G_FILTER_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gicon.h b/GstreamerHelper/x86/include/glib-2.0/gio/gicon.h
deleted file mode 100644
index 8f339f69..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gicon.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ICON_H__
-#define __G_ICON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ICON            (g_icon_get_type ())
-#define G_ICON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_ICON, GIcon))
-#define G_IS_ICON(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ICON))
-#define G_ICON_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ICON, GIconIface))
-
-/**
- * GIcon:
- *
- * An abstract type that specifies an icon.
- **/
-typedef struct _GIconIface GIconIface;
-
-/**
- * GIconIface:
- * @g_iface: The parent interface.
- * @hash: A hash for a given #GIcon.
- * @equal: Checks if two #GIcon<!-- -->s are equal.
- * @to_tokens: Serializes a #GIcon into tokens. The tokens must not
- * contain any whitespace. Don't implement if the #GIcon can't be
- * serialized (Since 2.20).
- * @from_tokens: Constructs a #GIcon from tokens. Set the #GError if
- * the tokens are malformed. Don't implement if the #GIcon can't be
- * serialized (Since 2.20).
- *
- * GIconIface is used to implement GIcon types for various
- * different systems. See #GThemedIcon and #GLoadableIcon for
- * examples of how to implement this interface.
- */
-struct _GIconIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  guint       (* hash)        (GIcon   *icon);
-  gboolean    (* equal)       (GIcon   *icon1,
-                               GIcon   *icon2);
-  gboolean    (* to_tokens)   (GIcon   *icon,
-			       GPtrArray *tokens,
-                               gint    *out_version);
-  GIcon *     (* from_tokens) (gchar  **tokens,
-                               gint     num_tokens,
-                               gint     version,
-                               GError **error);
-};
-
-GType    g_icon_get_type  (void) G_GNUC_CONST;
-
-guint    g_icon_hash            (gconstpointer  icon);
-gboolean g_icon_equal           (GIcon         *icon1,
-                                 GIcon         *icon2);
-gchar   *g_icon_to_string       (GIcon         *icon);
-GIcon   *g_icon_new_for_string  (const gchar   *str,
-                                 GError       **error);
-
-G_END_DECLS
-
-#endif /* __G_ICON_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/ginetaddress.h b/GstreamerHelper/x86/include/glib-2.0/gio/ginetaddress.h
deleted file mode 100644
index d523cd65..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/ginetaddress.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INET_ADDRESS_H__
-#define __G_INET_ADDRESS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_ADDRESS         (g_inet_address_get_type ())
-#define G_INET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_ADDRESS, GInetAddress))
-#define G_INET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_ADDRESS, GInetAddressClass))
-#define G_IS_INET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_ADDRESS))
-#define G_IS_INET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_ADDRESS))
-#define G_INET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_ADDRESS, GInetAddressClass))
-
-typedef struct _GInetAddressClass   GInetAddressClass;
-typedef struct _GInetAddressPrivate GInetAddressPrivate;
-
-struct _GInetAddress
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInetAddressPrivate *priv;
-};
-
-struct _GInetAddressClass
-{
-  GObjectClass parent_class;
-
-  gchar *        (*to_string) (GInetAddress *address);
-  const guint8 * (*to_bytes)  (GInetAddress *address);
-};
-
-GType                 g_inet_address_get_type             (void) G_GNUC_CONST;
-
-GInetAddress *        g_inet_address_new_from_string      (const gchar          *string);
-
-GInetAddress *        g_inet_address_new_from_bytes       (const guint8         *bytes,
-							   GSocketFamily         family);
-
-GInetAddress *        g_inet_address_new_loopback         (GSocketFamily         family);
-
-GInetAddress *        g_inet_address_new_any              (GSocketFamily         family);
-
-gboolean              g_inet_address_equal                (GInetAddress         *address,
-                                                           GInetAddress         *other_address);
-
-gchar *               g_inet_address_to_string            (GInetAddress         *address);
-
-const guint8 *        g_inet_address_to_bytes             (GInetAddress         *address);
-
-gsize                 g_inet_address_get_native_size      (GInetAddress         *address);
-
-GSocketFamily         g_inet_address_get_family           (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_any           (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_loopback      (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_link_local    (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_site_local    (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_multicast     (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_global     (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_link_local (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_node_local (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_org_local  (GInetAddress         *address);
-
-gboolean              g_inet_address_get_is_mc_site_local (GInetAddress         *address);
-
-G_END_DECLS
-
-#endif /* __G_INET_ADDRESS_H__ */
-
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/ginetaddressmask.h b/GstreamerHelper/x86/include/glib-2.0/gio/ginetaddressmask.h
deleted file mode 100644
index 53b0aac6..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/ginetaddressmask.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INET_ADDRESS_MASK_H__
-#define __G_INET_ADDRESS_MASK_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_ADDRESS_MASK         (g_inet_address_mask_get_type ())
-#define G_INET_ADDRESS_MASK(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_ADDRESS_MASK, GInetAddressMask))
-#define G_INET_ADDRESS_MASK_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_ADDRESS_MASK, GInetAddressMaskClass))
-#define G_IS_INET_ADDRESS_MASK(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_ADDRESS_MASK))
-#define G_IS_INET_ADDRESS_MASK_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_ADDRESS_MASK))
-#define G_INET_ADDRESS_MASK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_ADDRESS_MASK, GInetAddressMaskClass))
-
-typedef struct _GInetAddressMaskClass   GInetAddressMaskClass;
-typedef struct _GInetAddressMaskPrivate GInetAddressMaskPrivate;
-
-struct _GInetAddressMask
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInetAddressMaskPrivate *priv;
-};
-
-struct _GInetAddressMaskClass
-{
-  GObjectClass parent_class;
-
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType g_inet_address_mask_get_type (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GInetAddressMask *g_inet_address_mask_new             (GInetAddress      *addr,
-						       guint              length,
-						       GError           **error);
-
-GLIB_AVAILABLE_IN_2_32
-GInetAddressMask *g_inet_address_mask_new_from_string (const gchar       *mask_string,
-						       GError           **error);
-gchar            *g_inet_address_mask_to_string       (GInetAddressMask  *mask);
-
-GSocketFamily     g_inet_address_mask_get_family      (GInetAddressMask  *mask);
-GInetAddress     *g_inet_address_mask_get_address     (GInetAddressMask  *mask);
-guint             g_inet_address_mask_get_length      (GInetAddressMask  *mask);
-
-gboolean          g_inet_address_mask_matches         (GInetAddressMask  *mask,
-						       GInetAddress      *address);
-gboolean          g_inet_address_mask_equal           (GInetAddressMask  *mask,
-						       GInetAddressMask  *mask2);
-
-G_END_DECLS
-
-#endif /* __G_INET_ADDRESS_MASK_H__ */
-
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/ginetsocketaddress.h b/GstreamerHelper/x86/include/glib-2.0/gio/ginetsocketaddress.h
deleted file mode 100644
index ab20235d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/ginetsocketaddress.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INET_SOCKET_ADDRESS_H__
-#define __G_INET_SOCKET_ADDRESS_H__
-
-#include <gio/gsocketaddress.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INET_SOCKET_ADDRESS         (g_inet_socket_address_get_type ())
-#define G_INET_SOCKET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddress))
-#define G_INET_SOCKET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddressClass))
-#define G_IS_INET_SOCKET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INET_SOCKET_ADDRESS))
-#define G_IS_INET_SOCKET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_SOCKET_ADDRESS))
-#define G_INET_SOCKET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_SOCKET_ADDRESS, GInetSocketAddressClass))
-
-typedef struct _GInetSocketAddressClass   GInetSocketAddressClass;
-typedef struct _GInetSocketAddressPrivate GInetSocketAddressPrivate;
-
-struct _GInetSocketAddress
-{
-  GSocketAddress parent_instance;
-
-  /*< private >*/
-  GInetSocketAddressPrivate *priv;
-};
-
-struct _GInetSocketAddressClass
-{
-  GSocketAddressClass parent_class;
-};
-
-GType           g_inet_socket_address_get_type     (void) G_GNUC_CONST;
-
-GSocketAddress *g_inet_socket_address_new          (GInetAddress       *address,
-						    guint16             port);
-
-GInetAddress *  g_inet_socket_address_get_address  (GInetSocketAddress *address);
-guint16         g_inet_socket_address_get_port     (GInetSocketAddress *address);
-
-GLIB_AVAILABLE_IN_2_32
-guint32         g_inet_socket_address_get_flowinfo (GInetSocketAddress *address);
-GLIB_AVAILABLE_IN_2_32
-guint32         g_inet_socket_address_get_scope_id (GInetSocketAddress *address);
-
-G_END_DECLS
-
-#endif /* __G_INET_SOCKET_ADDRESS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/ginitable.h b/GstreamerHelper/x86/include/glib-2.0/gio/ginitable.h
deleted file mode 100644
index 1a2d13d9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/ginitable.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INITABLE_H__
-#define __G_INITABLE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INITABLE            (g_initable_get_type ())
-#define G_INITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_INITABLE, GInitable))
-#define G_IS_INITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_INITABLE))
-#define G_INITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_INITABLE, GInitableIface))
-#define G_TYPE_IS_INITABLE(type)   (g_type_is_a ((type), G_TYPE_INITABLE))
-
-/**
- * GInitable:
- *
- * Interface for initializable objects.
- *
- * Since: 2.22
- **/
-typedef struct _GInitableIface GInitableIface;
-
-/**
- * GInitableIface:
- * @g_iface: The parent interface.
- * @init: Initializes the object.
- *
- * Provides an interface for initializing object such that initialization
- * may fail.
- *
- * Since: 2.22
- **/
-struct _GInitableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  gboolean    (* init) (GInitable    *initable,
-			GCancellable *cancellable,
-			GError      **error);
-};
-
-
-GType    g_initable_get_type   (void) G_GNUC_CONST;
-
-gboolean g_initable_init       (GInitable     *initable,
-				GCancellable  *cancellable,
-				GError       **error);
-
-gpointer g_initable_new        (GType          object_type,
-				GCancellable  *cancellable,
-				GError       **error,
-				const gchar   *first_property_name,
-				...);
-gpointer g_initable_newv       (GType          object_type,
-				guint          n_parameters,
-				GParameter    *parameters,
-				GCancellable  *cancellable,
-				GError       **error);
-GObject* g_initable_new_valist (GType          object_type,
-				const gchar   *first_property_name,
-				va_list        var_args,
-				GCancellable  *cancellable,
-				GError       **error);
-
-G_END_DECLS
-
-
-#endif /* __G_INITABLE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/ginputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/ginputstream.h
deleted file mode 100644
index e9b36f7e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/ginputstream.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_INPUT_STREAM_H__
-#define __G_INPUT_STREAM_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_INPUT_STREAM         (g_input_stream_get_type ())
-#define G_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_INPUT_STREAM, GInputStream))
-#define G_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_INPUT_STREAM, GInputStreamClass))
-#define G_IS_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_INPUT_STREAM))
-#define G_IS_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INPUT_STREAM))
-#define G_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INPUT_STREAM, GInputStreamClass))
-
-/**
- * GInputStream:
- *
- * Base class for streaming input operations.
- **/
-typedef struct _GInputStreamClass    GInputStreamClass;
-typedef struct _GInputStreamPrivate  GInputStreamPrivate;
-
-struct _GInputStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GInputStreamPrivate *priv;
-};
-
-struct _GInputStreamClass
-{
-  GObjectClass parent_class;
-
-  /* Sync ops: */
-
-  gssize   (* read_fn)      (GInputStream        *stream,
-                             void                *buffer,
-                             gsize                count,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  gssize   (* skip)         (GInputStream        *stream,
-                             gsize                count,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  gboolean (* close_fn)	    (GInputStream        *stream,
-                             GCancellable        *cancellable,
-                             GError             **error);
-
-  /* Async ops: (optional in derived classes) */
-  void     (* read_async)   (GInputStream        *stream,
-                             void                *buffer,
-                             gsize                count,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gssize   (* read_finish)  (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  void     (* skip_async)   (GInputStream        *stream,
-                             gsize                count,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gssize   (* skip_finish)  (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  void     (* close_async)  (GInputStream        *stream,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gboolean (* close_finish) (GInputStream        *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-GType    g_input_stream_get_type      (void) G_GNUC_CONST;
-
-gssize   g_input_stream_read          (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gboolean g_input_stream_read_all      (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       gsize                 *bytes_read,
-				       GCancellable          *cancellable,
-				       GError               **error);
-GLIB_AVAILABLE_IN_2_34
-GBytes  *g_input_stream_read_bytes    (GInputStream          *stream,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gssize   g_input_stream_skip          (GInputStream          *stream,
-				       gsize                  count,
-				       GCancellable          *cancellable,
-				       GError               **error);
-gboolean g_input_stream_close         (GInputStream          *stream,
-				       GCancellable          *cancellable,
-				       GError               **error);
-void     g_input_stream_read_async    (GInputStream          *stream,
-				       void                  *buffer,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gssize   g_input_stream_read_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-GLIB_AVAILABLE_IN_2_34
-void     g_input_stream_read_bytes_async  (GInputStream          *stream,
-					   gsize                  count,
-					   int                    io_priority,
-					   GCancellable          *cancellable,
-					   GAsyncReadyCallback    callback,
-					   gpointer               user_data);
-GLIB_AVAILABLE_IN_2_34
-GBytes  *g_input_stream_read_bytes_finish (GInputStream          *stream,
-					   GAsyncResult          *result,
-					   GError               **error);
-void     g_input_stream_skip_async    (GInputStream          *stream,
-				       gsize                  count,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gssize   g_input_stream_skip_finish   (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-void     g_input_stream_close_async   (GInputStream          *stream,
-				       int                    io_priority,
-				       GCancellable          *cancellable,
-				       GAsyncReadyCallback    callback,
-				       gpointer               user_data);
-gboolean g_input_stream_close_finish  (GInputStream          *stream,
-				       GAsyncResult          *result,
-				       GError               **error);
-
-/* For implementations: */
-
-gboolean g_input_stream_is_closed     (GInputStream          *stream);
-gboolean g_input_stream_has_pending   (GInputStream          *stream);
-gboolean g_input_stream_set_pending   (GInputStream          *stream,
-				       GError               **error);
-void     g_input_stream_clear_pending (GInputStream          *stream);
-
-G_END_DECLS
-
-#endif /* __G_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gio.h b/GstreamerHelper/x86/include/glib-2.0/gio/gio.h
deleted file mode 100644
index 3fb914d2..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gio.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#ifndef __G_IO_H__
-#define __G_IO_H__
-
-#define __GIO_GIO_H_INSIDE__
-
-#include <gio/giotypes.h>
-
-#include <gio/gaction.h>
-#include <gio/gactiongroup.h>
-#include <gio/gactiongroupexporter.h>
-#include <gio/gactionmap.h>
-#include <gio/gappinfo.h>
-#include <gio/gapplication.h>
-#include <gio/gapplicationcommandline.h>
-#include <gio/gasyncinitable.h>
-#include <gio/gasyncresult.h>
-#include <gio/gbufferedinputstream.h>
-#include <gio/gbufferedoutputstream.h>
-#include <gio/gcancellable.h>
-#include <gio/gcharsetconverter.h>
-#include <gio/gcontenttype.h>
-#include <gio/gconverter.h>
-#include <gio/gconverterinputstream.h>
-#include <gio/gconverteroutputstream.h>
-#include <gio/gcredentials.h>
-#include <gio/gdatainputstream.h>
-#include <gio/gdataoutputstream.h>
-#include <gio/gdbusaddress.h>
-#include <gio/gdbusauthobserver.h>
-#include <gio/gdbusconnection.h>
-#include <gio/gdbuserror.h>
-#include <gio/gdbusintrospection.h>
-#include <gio/gdbusmessage.h>
-#include <gio/gdbusmethodinvocation.h>
-#include <gio/gdbusnameowning.h>
-#include <gio/gdbusnamewatching.h>
-#include <gio/gdbusproxy.h>
-#include <gio/gdbusserver.h>
-#include <gio/gdbusutils.h>
-#include <gio/gdrive.h>
-#include <gio/gemblemedicon.h>
-#include <gio/gfileattribute.h>
-#include <gio/gfileenumerator.h>
-#include <gio/gfile.h>
-#include <gio/gfileicon.h>
-#include <gio/gfileinfo.h>
-#include <gio/gfileinputstream.h>
-#include <gio/gfileiostream.h>
-#include <gio/gfilemonitor.h>
-#include <gio/gfilenamecompleter.h>
-#include <gio/gfileoutputstream.h>
-#include <gio/gfilterinputstream.h>
-#include <gio/gfilteroutputstream.h>
-#include <gio/gicon.h>
-#include <gio/ginetaddress.h>
-#include <gio/ginetaddressmask.h>
-#include <gio/ginetsocketaddress.h>
-#include <gio/ginitable.h>
-#include <gio/ginputstream.h>
-#include <gio/gioenums.h>
-#include <gio/gioenumtypes.h>
-#include <gio/gioerror.h>
-#include <gio/giomodule.h>
-#include <gio/gioscheduler.h>
-#include <gio/giostream.h>
-#include <gio/gloadableicon.h>
-#include <gio/gmemoryinputstream.h>
-#include <gio/gmemoryoutputstream.h>
-#include <gio/gmount.h>
-#include <gio/gmountoperation.h>
-#include <gio/gnativevolumemonitor.h>
-#include <gio/gnetworkaddress.h>
-#include <gio/gnetworkmonitor.h>
-#include <gio/gnetworkservice.h>
-#include <gio/goutputstream.h>
-#include <gio/gpermission.h>
-#include <gio/gpollableinputstream.h>
-#include <gio/gpollableoutputstream.h>
-#include <gio/gpollableutils.h>
-#include <gio/gproxy.h>
-#include <gio/gproxyaddress.h>
-#include <gio/gproxyaddressenumerator.h>
-#include <gio/gproxyresolver.h>
-#include <gio/gresolver.h>
-#include <gio/gresource.h>
-#include <gio/gseekable.h>
-#include <gio/gsettingsschema.h>
-#include <gio/gsettings.h>
-#include <gio/gsimpleaction.h>
-#include <gio/gsimpleactiongroup.h>
-#include <gio/gsimpleasyncresult.h>
-#include <gio/gsimplepermission.h>
-#include <gio/gsocketaddressenumerator.h>
-#include <gio/gsocketaddress.h>
-#include <gio/gsocketclient.h>
-#include <gio/gsocketconnectable.h>
-#include <gio/gsocketconnection.h>
-#include <gio/gsocketcontrolmessage.h>
-#include <gio/gsocket.h>
-#include <gio/gsocketlistener.h>
-#include <gio/gsocketservice.h>
-#include <gio/gsrvtarget.h>
-#include <gio/gtcpconnection.h>
-#include <gio/gtcpwrapperconnection.h>
-#include <gio/gtestdbus.h>
-#include <gio/gthemedicon.h>
-#include <gio/gthreadedsocketservice.h>
-#include <gio/gtlsbackend.h>
-#include <gio/gtlscertificate.h>
-#include <gio/gtlsclientconnection.h>
-#include <gio/gtlsconnection.h>
-#include <gio/gtlsdatabase.h>
-#include <gio/gtlsfiledatabase.h>
-#include <gio/gtlsinteraction.h>
-#include <gio/gtlsserverconnection.h>
-#include <gio/gtlspassword.h>
-#include <gio/gvfs.h>
-#include <gio/gvolume.h>
-#include <gio/gvolumemonitor.h>
-#include <gio/gzlibcompressor.h>
-#include <gio/gzlibdecompressor.h>
-#include <gio/gdbusinterface.h>
-#include <gio/gdbusinterfaceskeleton.h>
-#include <gio/gdbusobject.h>
-#include <gio/gdbusobjectskeleton.h>
-#include <gio/gdbusobjectproxy.h>
-#include <gio/gdbusobjectmanager.h>
-#include <gio/gdbusobjectmanagerclient.h>
-#include <gio/gdbusobjectmanagerserver.h>
-#include <gio/gdbusactiongroup.h>
-#include <gio/gremoteactiongroup.h>
-#include <gio/gmenumodel.h>
-#include <gio/gmenu.h>
-#include <gio/gmenuexporter.h>
-#include <gio/gdbusmenumodel.h>
-
-#undef __GIO_GIO_H_INSIDE__
-
-#endif /* __G_IO_H__ */
-
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gioenums.h b/GstreamerHelper/x86/include/glib-2.0/gio/gioenums.h
deleted file mode 100644
index b3706237..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gioenums.h
+++ /dev/null
@@ -1,1658 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __GIO_ENUMS_H__
-#define __GIO_ENUMS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/**
- * GAppInfoCreateFlags:
- * @G_APP_INFO_CREATE_NONE: No flags.
- * @G_APP_INFO_CREATE_NEEDS_TERMINAL: Application opens in a terminal window.
- * @G_APP_INFO_CREATE_SUPPORTS_URIS: Application supports URI arguments.
- * @G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION: Application supports startup notification. Since 2.26
- *
- * Flags used when creating a #GAppInfo.
- */
-typedef enum {
-  G_APP_INFO_CREATE_NONE                           = 0,         /*< nick=none >*/
-  G_APP_INFO_CREATE_NEEDS_TERMINAL                 = (1 << 0),  /*< nick=needs-terminal >*/
-  G_APP_INFO_CREATE_SUPPORTS_URIS                  = (1 << 1),  /*< nick=supports-uris >*/
-  G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION  = (1 << 2)   /*< nick=supports-startup-notification >*/
-} GAppInfoCreateFlags;
-
-/**
- * GConverterFlags:
- * @G_CONVERTER_NO_FLAGS: No flags.
- * @G_CONVERTER_INPUT_AT_END: At end of input data
- * @G_CONVERTER_FLUSH: Flush data
- *
- * Flags used when calling a g_converter_convert().
- *
- * Since: 2.24
- */
-typedef enum {
-  G_CONVERTER_NO_FLAGS     = 0,         /*< nick=none >*/
-  G_CONVERTER_INPUT_AT_END = (1 << 0),  /*< nick=input-at-end >*/
-  G_CONVERTER_FLUSH        = (1 << 1)   /*< nick=flush >*/
-} GConverterFlags;
-
-/**
- * GConverterResult:
- * @G_CONVERTER_ERROR: There was an error during conversion.
- * @G_CONVERTER_CONVERTED: Some data was consumed or produced
- * @G_CONVERTER_FINISHED: The conversion is finished
- * @G_CONVERTER_FLUSHED: Flushing is finished
- *
- * Results returned from g_converter_convert().
- *
- * Since: 2.24
- */
-typedef enum {
-  G_CONVERTER_ERROR     = 0,  /*< nick=error >*/
-  G_CONVERTER_CONVERTED = 1,  /*< nick=converted >*/
-  G_CONVERTER_FINISHED  = 2,  /*< nick=finished >*/
-  G_CONVERTER_FLUSHED   = 3   /*< nick=flushed >*/
-} GConverterResult;
-
-
-/**
- * GDataStreamByteOrder:
- * @G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN: Selects Big Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN: Selects Little Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN: Selects endianness based on host machine's architecture.
- *
- * #GDataStreamByteOrder is used to ensure proper endianness of streaming data sources
- * across various machine architectures.
- *
- **/
-typedef enum {
-  G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN,
-  G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN,
-  G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN
-} GDataStreamByteOrder;
-
-
-/**
- * GDataStreamNewlineType:
- * @G_DATA_STREAM_NEWLINE_TYPE_LF: Selects "LF" line endings, common on most modern UNIX platforms.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR: Selects "CR" line endings.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR_LF: Selects "CR, LF" line ending, common on Microsoft Windows.
- * @G_DATA_STREAM_NEWLINE_TYPE_ANY: Automatically try to handle any line ending type.
- *
- * #GDataStreamNewlineType is used when checking for or setting the line endings for a given file.
- **/
-typedef enum {
-  G_DATA_STREAM_NEWLINE_TYPE_LF,
-  G_DATA_STREAM_NEWLINE_TYPE_CR,
-  G_DATA_STREAM_NEWLINE_TYPE_CR_LF,
-  G_DATA_STREAM_NEWLINE_TYPE_ANY
-} GDataStreamNewlineType;
-
-
-/**
- * GFileAttributeType:
- * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitalized type.
- * @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated UTF8 string.
- * @G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: a zero terminated string of non-zero bytes.
- * @G_FILE_ATTRIBUTE_TYPE_BOOLEAN: a boolean value.
- * @G_FILE_ATTRIBUTE_TYPE_UINT32: an unsigned 4-byte/32-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_INT32: a signed 4-byte/32-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_UINT64: an unsigned 8-byte/64-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_INT64: a signed 8-byte/64-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_OBJECT: a #GObject.
- * @G_FILE_ATTRIBUTE_TYPE_STRINGV: a %NULL terminated char **. Since 2.22
- *
- * The data types for file attributes.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_TYPE_INVALID = 0,
-  G_FILE_ATTRIBUTE_TYPE_STRING,
-  G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, /* zero terminated string of non-zero bytes */
-  G_FILE_ATTRIBUTE_TYPE_BOOLEAN,
-  G_FILE_ATTRIBUTE_TYPE_UINT32,
-  G_FILE_ATTRIBUTE_TYPE_INT32,
-  G_FILE_ATTRIBUTE_TYPE_UINT64,
-  G_FILE_ATTRIBUTE_TYPE_INT64,
-  G_FILE_ATTRIBUTE_TYPE_OBJECT,
-  G_FILE_ATTRIBUTE_TYPE_STRINGV
-} GFileAttributeType;
-
-
-/**
- * GFileAttributeInfoFlags:
- * @G_FILE_ATTRIBUTE_INFO_NONE: no flags set.
- * @G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE: copy the attribute values when the file is copied.
- * @G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED: copy the attribute values when the file is moved.
- *
- * Flags specifying the behaviour of an attribute.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_INFO_NONE            = 0,
-  G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE  = (1 << 0),
-  G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED = (1 << 1)
-} GFileAttributeInfoFlags;
-
-
-/**
- * GFileAttributeStatus:
- * @G_FILE_ATTRIBUTE_STATUS_UNSET: Attribute value is unset (empty).
- * @G_FILE_ATTRIBUTE_STATUS_SET: Attribute value is set.
- * @G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING: Indicates an error in setting the value.
- *
- * Used by g_file_set_attributes_from_info() when setting file attributes.
- **/
-typedef enum {
-  G_FILE_ATTRIBUTE_STATUS_UNSET = 0,
-  G_FILE_ATTRIBUTE_STATUS_SET,
-  G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING
-} GFileAttributeStatus;
-
-
-/**
- * GFileQueryInfoFlags:
- * @G_FILE_QUERY_INFO_NONE: No flags set.
- * @G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- *
- * Flags used when querying a #GFileInfo.
- */
-typedef enum {
-  G_FILE_QUERY_INFO_NONE              = 0,
-  G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS = (1 << 0)   /*< nick=nofollow-symlinks >*/
-} GFileQueryInfoFlags;
-
-
-/**
- * GFileCreateFlags:
- * @G_FILE_CREATE_NONE: No flags set.
- * @G_FILE_CREATE_PRIVATE: Create a file that can only be
- *    accessed by the current user.
- * @G_FILE_CREATE_REPLACE_DESTINATION: Replace the destination
- *    as if it didn't exist before. Don't try to keep any old
- *    permissions, replace instead of following links. This
- *    is generally useful if you're doing a "copy over"
- *    rather than a "save new version of" replace operation.
- *    You can think of it as "unlink destination" before
- *    writing to it, although the implementation may not
- *    be exactly like that. Since 2.20
- *
- * Flags used when an operation may create a file.
- */
-typedef enum {
-  G_FILE_CREATE_NONE    = 0,
-  G_FILE_CREATE_PRIVATE = (1 << 0),
-  G_FILE_CREATE_REPLACE_DESTINATION = (1 << 1)
-} GFileCreateFlags;
-
-
-/**
- * GMountMountFlags:
- * @G_MOUNT_MOUNT_NONE: No flags set.
- *
- * Flags used when mounting a mount.
- */
-typedef enum /*< flags >*/ {
-  G_MOUNT_MOUNT_NONE = 0
-} GMountMountFlags;
-
-
-/**
- * GMountUnmountFlags:
- * @G_MOUNT_UNMOUNT_NONE: No flags set.
- * @G_MOUNT_UNMOUNT_FORCE: Unmount even if there are outstanding
- *  file operations on the mount.
- *
- * Flags used when an unmounting a mount.
- */
-typedef enum {
-  G_MOUNT_UNMOUNT_NONE  = 0,
-  G_MOUNT_UNMOUNT_FORCE = (1 << 0)
-} GMountUnmountFlags;
-
-/**
- * GDriveStartFlags:
- * @G_DRIVE_START_NONE: No flags set.
- *
- * Flags used when starting a drive.
- *
- * Since: 2.22
- */
-typedef enum /*< flags >*/ {
-  G_DRIVE_START_NONE = 0
-} GDriveStartFlags;
-
-/**
- * GDriveStartStopType:
- * @G_DRIVE_START_STOP_TYPE_UNKNOWN: Unknown or drive doesn't support
- *    start/stop.
- * @G_DRIVE_START_STOP_TYPE_SHUTDOWN: The stop method will physically
- *    shut down the drive and e.g. power down the port the drive is
- *    attached to.
- * @G_DRIVE_START_STOP_TYPE_NETWORK: The start/stop methods are used
- *    for connecting/disconnect to the drive over the network.
- * @G_DRIVE_START_STOP_TYPE_MULTIDISK: The start/stop methods will
- *    assemble/disassemble a virtual drive from several physical
- *    drives.
- * @G_DRIVE_START_STOP_TYPE_PASSWORD: The start/stop methods will
- *    unlock/lock the disk (for example using the ATA <quote>SECURITY
- *    UNLOCK DEVICE</quote> command)
- *
- * Enumeration describing how a drive can be started/stopped.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_DRIVE_START_STOP_TYPE_UNKNOWN,
-  G_DRIVE_START_STOP_TYPE_SHUTDOWN,
-  G_DRIVE_START_STOP_TYPE_NETWORK,
-  G_DRIVE_START_STOP_TYPE_MULTIDISK,
-  G_DRIVE_START_STOP_TYPE_PASSWORD
-} GDriveStartStopType;
-
-/**
- * GFileCopyFlags:
- * @G_FILE_COPY_NONE: No flags set.
- * @G_FILE_COPY_OVERWRITE: Overwrite any existing files
- * @G_FILE_COPY_BACKUP: Make a backup of any existing files.
- * @G_FILE_COPY_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- * @G_FILE_COPY_ALL_METADATA: Copy all file metadata instead of just default set used for copy (see #GFileInfo).
- * @G_FILE_COPY_NO_FALLBACK_FOR_MOVE: Don't use copy and delete fallback if native move not supported.
- * @G_FILE_COPY_TARGET_DEFAULT_PERMS: Leaves target file with default perms, instead of setting the source file perms.
- *
- * Flags used when copying or moving files.
- */
-typedef enum {
-  G_FILE_COPY_NONE                 = 0,          /*< nick=none >*/
-  G_FILE_COPY_OVERWRITE            = (1 << 0),
-  G_FILE_COPY_BACKUP               = (1 << 1),
-  G_FILE_COPY_NOFOLLOW_SYMLINKS    = (1 << 2),
-  G_FILE_COPY_ALL_METADATA         = (1 << 3),
-  G_FILE_COPY_NO_FALLBACK_FOR_MOVE = (1 << 4),
-  G_FILE_COPY_TARGET_DEFAULT_PERMS = (1 << 5)
-} GFileCopyFlags;
-
-
-/**
- * GFileMonitorFlags:
- * @G_FILE_MONITOR_NONE: No flags set.
- * @G_FILE_MONITOR_WATCH_MOUNTS: Watch for mount events.
- * @G_FILE_MONITOR_SEND_MOVED: Pair DELETED and CREATED events caused
- *   by file renames (moves) and send a single G_FILE_MONITOR_EVENT_MOVED
- *   event instead (NB: not supported on all backends; the default
- *   behaviour -without specifying this flag- is to send single DELETED
- *   and CREATED events).
- *
- * Flags used to set what a #GFileMonitor will watch for.
- */
-typedef enum {
-  G_FILE_MONITOR_NONE         = 0,
-  G_FILE_MONITOR_WATCH_MOUNTS = (1 << 0),
-  G_FILE_MONITOR_SEND_MOVED   = (1 << 1)
-} GFileMonitorFlags;
-
-
-/**
- * GFileType:
- * @G_FILE_TYPE_UNKNOWN: File's type is unknown.
- * @G_FILE_TYPE_REGULAR: File handle represents a regular file.
- * @G_FILE_TYPE_DIRECTORY: File handle represents a directory.
- * @G_FILE_TYPE_SYMBOLIC_LINK: File handle represents a symbolic link
- *    (Unix systems).
- * @G_FILE_TYPE_SPECIAL: File is a "special" file, such as a socket, fifo,
- *    block device, or character device.
- * @G_FILE_TYPE_SHORTCUT: File is a shortcut (Windows systems).
- * @G_FILE_TYPE_MOUNTABLE: File is a mountable location.
- *
- * Indicates the file's on-disk type.
- **/
-typedef enum {
-  G_FILE_TYPE_UNKNOWN = 0,
-  G_FILE_TYPE_REGULAR,
-  G_FILE_TYPE_DIRECTORY,
-  G_FILE_TYPE_SYMBOLIC_LINK,
-  G_FILE_TYPE_SPECIAL, /* socket, fifo, blockdev, chardev */
-  G_FILE_TYPE_SHORTCUT,
-  G_FILE_TYPE_MOUNTABLE
-} GFileType;
-
-
-/**
- * GFilesystemPreviewType:
- * @G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS: Only preview files if user has explicitly requested it.
- * @G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL: Preview files if user has requested preview of "local" files.
- * @G_FILESYSTEM_PREVIEW_TYPE_NEVER: Never preview files.
- *
- * Indicates a hint from the file system whether files should be
- * previewed in a file manager. Returned as the value of the key
- * #G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW.
- **/
-typedef enum {
-  G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS = 0,
-  G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL,
-  G_FILESYSTEM_PREVIEW_TYPE_NEVER
-} GFilesystemPreviewType;
-
-
-/**
- * GFileMonitorEvent:
- * @G_FILE_MONITOR_EVENT_CHANGED: a file changed.
- * @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: a hint that this was probably the last change in a set of changes.
- * @G_FILE_MONITOR_EVENT_DELETED: a file was deleted.
- * @G_FILE_MONITOR_EVENT_CREATED: a file was created.
- * @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: a file attribute was changed.
- * @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: the file location will soon be unmounted.
- * @G_FILE_MONITOR_EVENT_UNMOUNTED: the file location was unmounted.
- * @G_FILE_MONITOR_EVENT_MOVED: the file was moved.
- *
- * Specifies what type of event a monitor event is.
- **/
-typedef enum {
-  G_FILE_MONITOR_EVENT_CHANGED,
-  G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
-  G_FILE_MONITOR_EVENT_DELETED,
-  G_FILE_MONITOR_EVENT_CREATED,
-  G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED,
-  G_FILE_MONITOR_EVENT_PRE_UNMOUNT,
-  G_FILE_MONITOR_EVENT_UNMOUNTED,
-  G_FILE_MONITOR_EVENT_MOVED
-} GFileMonitorEvent;
-
-
-/* This enumeration conflicts with GIOError in giochannel.h. However,
- * that is only used as a return value in some deprecated functions.
- * So, we reuse the same prefix for the enumeration values, but call
- * the actual enumeration (which is rarely used) GIOErrorEnum.
- */
-/**
- * GIOErrorEnum:
- * @G_IO_ERROR_FAILED: Generic error condition for when any operation fails.
- * @G_IO_ERROR_NOT_FOUND: File not found.
- * @G_IO_ERROR_EXISTS: File already exists.
- * @G_IO_ERROR_IS_DIRECTORY: File is a directory.
- * @G_IO_ERROR_NOT_DIRECTORY: File is not a directory.
- * @G_IO_ERROR_NOT_EMPTY: File is a directory that isn't empty.
- * @G_IO_ERROR_NOT_REGULAR_FILE: File is not a regular file.
- * @G_IO_ERROR_NOT_SYMBOLIC_LINK: File is not a symbolic link.
- * @G_IO_ERROR_NOT_MOUNTABLE_FILE: File cannot be mounted.
- * @G_IO_ERROR_FILENAME_TOO_LONG: Filename is too many characters.
- * @G_IO_ERROR_INVALID_FILENAME: Filename is invalid or contains invalid characters.
- * @G_IO_ERROR_TOO_MANY_LINKS: File contains too many symbolic links.
- * @G_IO_ERROR_NO_SPACE: No space left on drive.
- * @G_IO_ERROR_INVALID_ARGUMENT: Invalid argument.
- * @G_IO_ERROR_PERMISSION_DENIED: Permission denied.
- * @G_IO_ERROR_NOT_SUPPORTED: Operation not supported for the current backend.
- * @G_IO_ERROR_NOT_MOUNTED: File isn't mounted.
- * @G_IO_ERROR_ALREADY_MOUNTED: File is already mounted.
- * @G_IO_ERROR_CLOSED: File was closed.
- * @G_IO_ERROR_CANCELLED: Operation was cancelled. See #GCancellable.
- * @G_IO_ERROR_PENDING: Operations are still pending.
- * @G_IO_ERROR_READ_ONLY: File is read only.
- * @G_IO_ERROR_CANT_CREATE_BACKUP: Backup couldn't be created.
- * @G_IO_ERROR_WRONG_ETAG: File's Entity Tag was incorrect.
- * @G_IO_ERROR_TIMED_OUT: Operation timed out.
- * @G_IO_ERROR_WOULD_RECURSE: Operation would be recursive.
- * @G_IO_ERROR_BUSY: File is busy.
- * @G_IO_ERROR_WOULD_BLOCK: Operation would block.
- * @G_IO_ERROR_HOST_NOT_FOUND: Host couldn't be found (remote operations).
- * @G_IO_ERROR_WOULD_MERGE: Operation would merge files.
- * @G_IO_ERROR_FAILED_HANDLED: Operation failed and a helper program has
- *     already interacted with the user. Do not display any error dialog.
- * @G_IO_ERROR_TOO_MANY_OPEN_FILES: The current process has too many files
- *     open and can't open any more. Duplicate descriptors do count toward
- *     this limit. Since 2.20
- * @G_IO_ERROR_NOT_INITIALIZED: The object has not been initialized. Since 2.22
- * @G_IO_ERROR_ADDRESS_IN_USE: The requested address is already in use. Since 2.22
- * @G_IO_ERROR_PARTIAL_INPUT: Need more input to finish operation. Since 2.24
- * @G_IO_ERROR_INVALID_DATA: There input data was invalid. Since 2.24
- * @G_IO_ERROR_DBUS_ERROR: A remote object generated an error that
- *     doesn't correspond to a locally registered #GError error
- *     domain. Use g_dbus_error_get_remote_error() to extract the D-Bus
- *     error name and g_dbus_error_strip_remote_error() to fix up the
- *     message so it matches what was received on the wire. Since 2.26.
- * @G_IO_ERROR_HOST_UNREACHABLE: Host unreachable. Since 2.26
- * @G_IO_ERROR_NETWORK_UNREACHABLE: Network unreachable. Since 2.26
- * @G_IO_ERROR_CONNECTION_REFUSED: Connection refused. Since 2.26
- * @G_IO_ERROR_PROXY_FAILED: Connection to proxy server failed. Since 2.26
- * @G_IO_ERROR_PROXY_AUTH_FAILED: Proxy authentication failed. Since 2.26
- * @G_IO_ERROR_PROXY_NEED_AUTH: Proxy server needs authentication. Since 2.26
- * @G_IO_ERROR_PROXY_NOT_ALLOWED: Proxy connection is not allowed by ruleset.
- *     Since 2.26
- *
- * Error codes returned by GIO functions.
- *
- **/
-typedef enum {
-  G_IO_ERROR_FAILED,
-  G_IO_ERROR_NOT_FOUND,
-  G_IO_ERROR_EXISTS,
-  G_IO_ERROR_IS_DIRECTORY,
-  G_IO_ERROR_NOT_DIRECTORY,
-  G_IO_ERROR_NOT_EMPTY,
-  G_IO_ERROR_NOT_REGULAR_FILE,
-  G_IO_ERROR_NOT_SYMBOLIC_LINK,
-  G_IO_ERROR_NOT_MOUNTABLE_FILE,
-  G_IO_ERROR_FILENAME_TOO_LONG,
-  G_IO_ERROR_INVALID_FILENAME,
-  G_IO_ERROR_TOO_MANY_LINKS,
-  G_IO_ERROR_NO_SPACE,
-  G_IO_ERROR_INVALID_ARGUMENT,
-  G_IO_ERROR_PERMISSION_DENIED,
-  G_IO_ERROR_NOT_SUPPORTED,
-  G_IO_ERROR_NOT_MOUNTED,
-  G_IO_ERROR_ALREADY_MOUNTED,
-  G_IO_ERROR_CLOSED,
-  G_IO_ERROR_CANCELLED,
-  G_IO_ERROR_PENDING,
-  G_IO_ERROR_READ_ONLY,
-  G_IO_ERROR_CANT_CREATE_BACKUP,
-  G_IO_ERROR_WRONG_ETAG,
-  G_IO_ERROR_TIMED_OUT,
-  G_IO_ERROR_WOULD_RECURSE,
-  G_IO_ERROR_BUSY,
-  G_IO_ERROR_WOULD_BLOCK,
-  G_IO_ERROR_HOST_NOT_FOUND,
-  G_IO_ERROR_WOULD_MERGE,
-  G_IO_ERROR_FAILED_HANDLED,
-  G_IO_ERROR_TOO_MANY_OPEN_FILES,
-  G_IO_ERROR_NOT_INITIALIZED,
-  G_IO_ERROR_ADDRESS_IN_USE,
-  G_IO_ERROR_PARTIAL_INPUT,
-  G_IO_ERROR_INVALID_DATA,
-  G_IO_ERROR_DBUS_ERROR,
-  G_IO_ERROR_HOST_UNREACHABLE,
-  G_IO_ERROR_NETWORK_UNREACHABLE,
-  G_IO_ERROR_CONNECTION_REFUSED,
-  G_IO_ERROR_PROXY_FAILED,
-  G_IO_ERROR_PROXY_AUTH_FAILED,
-  G_IO_ERROR_PROXY_NEED_AUTH,
-  G_IO_ERROR_PROXY_NOT_ALLOWED
-} GIOErrorEnum;
-
-
-/**
- * GAskPasswordFlags:
- * @G_ASK_PASSWORD_NEED_PASSWORD: operation requires a password.
- * @G_ASK_PASSWORD_NEED_USERNAME: operation requires a username.
- * @G_ASK_PASSWORD_NEED_DOMAIN: operation requires a domain.
- * @G_ASK_PASSWORD_SAVING_SUPPORTED: operation supports saving settings.
- * @G_ASK_PASSWORD_ANONYMOUS_SUPPORTED: operation supports anonymous users.
- *
- * #GAskPasswordFlags are used to request specific information from the
- * user, or to notify the user of their choices in an authentication
- * situation.
- **/
-typedef enum {
-  G_ASK_PASSWORD_NEED_PASSWORD       = (1 << 0),
-  G_ASK_PASSWORD_NEED_USERNAME       = (1 << 1),
-  G_ASK_PASSWORD_NEED_DOMAIN         = (1 << 2),
-  G_ASK_PASSWORD_SAVING_SUPPORTED    = (1 << 3),
-  G_ASK_PASSWORD_ANONYMOUS_SUPPORTED = (1 << 4)
-} GAskPasswordFlags;
-
-
-/**
- * GPasswordSave:
- * @G_PASSWORD_SAVE_NEVER: never save a password.
- * @G_PASSWORD_SAVE_FOR_SESSION: save a password for the session.
- * @G_PASSWORD_SAVE_PERMANENTLY: save a password permanently.
- *
- * #GPasswordSave is used to indicate the lifespan of a saved password.
- *
- * #Gvfs stores passwords in the Gnome keyring when this flag allows it
- * to, and later retrieves it again from there.
- **/
-typedef enum {
-  G_PASSWORD_SAVE_NEVER,
-  G_PASSWORD_SAVE_FOR_SESSION,
-  G_PASSWORD_SAVE_PERMANENTLY
-} GPasswordSave;
-
-
-/**
- * GMountOperationResult:
- * @G_MOUNT_OPERATION_HANDLED: The request was fulfilled and the
- *     user specified data is now available
- * @G_MOUNT_OPERATION_ABORTED: The user requested the mount operation
- *     to be aborted
- * @G_MOUNT_OPERATION_UNHANDLED: The request was unhandled (i.e. not
- *     implemented)
- *
- * #GMountOperationResult is returned as a result when a request for
- * information is send by the mounting operation.
- **/
-typedef enum {
-  G_MOUNT_OPERATION_HANDLED,
-  G_MOUNT_OPERATION_ABORTED,
-  G_MOUNT_OPERATION_UNHANDLED
-} GMountOperationResult;
-
-
-/**
- * GOutputStreamSpliceFlags:
- * @G_OUTPUT_STREAM_SPLICE_NONE: Do not close either stream.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE: Close the source stream after
- *     the splice.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET: Close the target stream after
- *     the splice.
- *
- * GOutputStreamSpliceFlags determine how streams should be spliced.
- **/
-typedef enum {
-  G_OUTPUT_STREAM_SPLICE_NONE         = 0,
-  G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE = (1 << 0),
-  G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET = (1 << 1)
-} GOutputStreamSpliceFlags;
-
-
-/**
- * GIOStreamSpliceFlags:
- * @G_IO_STREAM_SPLICE_NONE: Do not close either stream.
- * @G_IO_STREAM_SPLICE_CLOSE_STREAM1: Close the first stream after
- *     the splice.
- * @G_IO_STREAM_SPLICE_CLOSE_STREAM2: Close the second stream after
- *     the splice.
- * @G_IO_STREAM_SPLICE_WAIT_FOR_BOTH: Wait for both splice operations to finish
- *     before calling the callback.
- *
- * GIOStreamSpliceFlags determine how streams should be spliced.
- *
- * Since: 2.28
- **/
-typedef enum {
-  G_IO_STREAM_SPLICE_NONE          = 0,
-  G_IO_STREAM_SPLICE_CLOSE_STREAM1 = (1 << 0),
-  G_IO_STREAM_SPLICE_CLOSE_STREAM2 = (1 << 1),
-  G_IO_STREAM_SPLICE_WAIT_FOR_BOTH = (1 << 2)
-} GIOStreamSpliceFlags;
-
-/**
- * GEmblemOrigin:
- * @G_EMBLEM_ORIGIN_UNKNOWN: Emblem of unknown origin
- * @G_EMBLEM_ORIGIN_DEVICE: Emblem adds device-specific information
- * @G_EMBLEM_ORIGIN_LIVEMETADATA: Emblem depicts live metadata, such as "readonly"
- * @G_EMBLEM_ORIGIN_TAG: Emblem comes from a user-defined tag, e.g. set by nautilus (in the future)
- *
- * GEmblemOrigin is used to add information about the origin of the emblem
- * to #GEmblem.
- *
- * Since: 2.18
- */
-typedef enum  {
-  G_EMBLEM_ORIGIN_UNKNOWN,
-  G_EMBLEM_ORIGIN_DEVICE,
-  G_EMBLEM_ORIGIN_LIVEMETADATA,
-  G_EMBLEM_ORIGIN_TAG
-} GEmblemOrigin;
-
-/**
- * GResolverError:
- * @G_RESOLVER_ERROR_NOT_FOUND: the requested name/address/service was not
- *     found
- * @G_RESOLVER_ERROR_TEMPORARY_FAILURE: the requested information could not
- *     be looked up due to a network error or similar problem
- * @G_RESOLVER_ERROR_INTERNAL: unknown error
- *
- * An error code used with %G_RESOLVER_ERROR in a #GError returned
- * from a #GResolver routine.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_RESOLVER_ERROR_NOT_FOUND,
-  G_RESOLVER_ERROR_TEMPORARY_FAILURE,
-  G_RESOLVER_ERROR_INTERNAL
-} GResolverError;
-
-/**
- * GResolverRecordType:
- * @G_RESOLVER_RECORD_SRV: lookup DNS SRV records for a domain
- * @G_RESOLVER_RECORD_MX: lookup DNS MX records for a domain
- * @G_RESOLVER_RECORD_TXT: lookup DNS TXT records for a name
- * @G_RESOLVER_RECORD_SOA: lookup DNS SOA records for a zone
- * @G_RESOLVER_RECORD_NS: lookup DNS NS records for a domain
- *
- * The type of record that g_resolver_lookup_records() or
- * g_resolver_lookup_records_async() should retrieve. The records are returned
- * as lists of #GVariant tuples. Each record type has different values in
- * the variant tuples returned.
- *
- * %G_RESOLVER_RECORD_SRV records are returned as variants with the signature
- * '(qqqs)', containing a guint16 with the priority, a guint16 with the
- * weight, a guint16 with the port, and a string of the hostname.
- *
- * %G_RESOLVER_RECORD_MX records are returned as variants with the signature
- * '(qs)', representing a guint16 with the preference, and a string containing
- * the mail exchanger hostname.
- *
- * %G_RESOLVER_RECORD_TXT records are returned as variants with the signature
- * '(as)', representing an array of the strings in the text record.
- *
- * %G_RESOLVER_RECORD_SOA records are returned as variants with the signature
- * '(ssuuuuu)', representing a string containing the primary name server, a
- * string containing the administrator, the serial as a guint32, the refresh
- * interval as guint32, the retry interval as a guint32, the expire timeout
- * as a guint32, and the ttl as a guint32.
- *
- * %G_RESOLVER_RECORD_NS records are returned as variants with the signature
- * '(s)', representing a string of the hostname of the name server.
- *
- * Since: 2.34
- */
-typedef enum {
-  G_RESOLVER_RECORD_SRV = 1,
-  G_RESOLVER_RECORD_MX,
-  G_RESOLVER_RECORD_TXT,
-  G_RESOLVER_RECORD_SOA,
-  G_RESOLVER_RECORD_NS
-} GResolverRecordType;
-
-/**
- * GResourceError:
- * @G_RESOURCE_ERROR_NOT_FOUND: no file was found at the requested path
- * @G_RESOURCE_ERROR_INTERNAL: unknown error
- *
- * An error code used with %G_RESOURCE_ERROR in a #GError returned
- * from a #GResource routine.
- *
- * Since: 2.32
- */
-typedef enum {
-  G_RESOURCE_ERROR_NOT_FOUND,
-  G_RESOURCE_ERROR_INTERNAL
-} GResourceError;
-
-/**
- * GResourceFlags:
- * @G_RESOURCE_FLAGS_NONE: No flags set.
- * @G_RESOURCE_FLAGS_COMPRESSED: The file is compressed.
- *
- * GResourceFlags give information about a particular file inside a resource
- * bundle.
- * 
- * Since: 2.32
- **/
-typedef enum {
-  G_RESOURCE_FLAGS_NONE       = 0,
-  G_RESOURCE_FLAGS_COMPRESSED = (1<<0)
-} GResourceFlags;
-
-/**
- * GResourceLookupFlags:
- * @G_RESOURCE_LOOKUP_FLAGS_NONE: No flags set.
- *
- * GResourceLookupFlags determine how resource path lookups are handled.
- * 
- * Since: 2.32
- **/
-typedef enum /*< flags >*/ {
-  G_RESOURCE_LOOKUP_FLAGS_NONE       = 0
-} GResourceLookupFlags;
-
-/**
- * GSocketFamily:
- * @G_SOCKET_FAMILY_INVALID: no address family
- * @G_SOCKET_FAMILY_IPV4: the IPv4 family
- * @G_SOCKET_FAMILY_IPV6: the IPv6 family
- * @G_SOCKET_FAMILY_UNIX: the UNIX domain family
- *
- * The protocol family of a #GSocketAddress. (These values are
- * identical to the system defines %AF_INET, %AF_INET6 and %AF_UNIX,
- * if available.)
- *
- * Since: 2.22
- */
-typedef enum {
-  G_SOCKET_FAMILY_INVALID,
-  G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
-  G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
-  G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
-} GSocketFamily;
-
-/**
- * GSocketType:
- * @G_SOCKET_TYPE_INVALID: Type unknown or wrong
- * @G_SOCKET_TYPE_STREAM: Reliable connection-based byte streams (e.g. TCP).
- * @G_SOCKET_TYPE_DATAGRAM: Connectionless, unreliable datagram passing.
- *     (e.g. UDP)
- * @G_SOCKET_TYPE_SEQPACKET: Reliable connection-based passing of datagrams
- *     of fixed maximum length (e.g. SCTP).
- *
- * Flags used when creating a #GSocket. Some protocols may not implement
- * all the socket types.
- *
- * Since: 2.22
- */
-typedef enum
-{
-  G_SOCKET_TYPE_INVALID,
-  G_SOCKET_TYPE_STREAM,
-  G_SOCKET_TYPE_DATAGRAM,
-  G_SOCKET_TYPE_SEQPACKET
-} GSocketType;
-
-/**
- * GSocketMsgFlags:
- * @G_SOCKET_MSG_NONE: No flags.
- * @G_SOCKET_MSG_OOB: Request to send/receive out of band data.
- * @G_SOCKET_MSG_PEEK: Read data from the socket without removing it from
- *     the queue.
- * @G_SOCKET_MSG_DONTROUTE: Don't use a gateway to send out the packet,
- *     only send to hosts on directly connected networks.
- *
- * Flags used in g_socket_receive_message() and g_socket_send_message().
- * The flags listed in the enum are some commonly available flags, but the
- * values used for them are the same as on the platform, and any other flags
- * are passed in/out as is. So to use a platform specific flag, just include
- * the right system header and pass in the flag.
- *
- * Since: 2.22
- */
-typedef enum /*< flags >*/
-{
-  G_SOCKET_MSG_NONE,
-  G_SOCKET_MSG_OOB = GLIB_SYSDEF_MSG_OOB,
-  G_SOCKET_MSG_PEEK = GLIB_SYSDEF_MSG_PEEK,
-  G_SOCKET_MSG_DONTROUTE = GLIB_SYSDEF_MSG_DONTROUTE
-} GSocketMsgFlags;
-
-/**
- * GSocketProtocol:
- * @G_SOCKET_PROTOCOL_UNKNOWN: The protocol type is unknown
- * @G_SOCKET_PROTOCOL_DEFAULT: The default protocol for the family/type
- * @G_SOCKET_PROTOCOL_TCP: TCP over IP
- * @G_SOCKET_PROTOCOL_UDP: UDP over IP
- * @G_SOCKET_PROTOCOL_SCTP: SCTP over IP
- *
- * A protocol identifier is specified when creating a #GSocket, which is a
- * family/type specific identifier, where 0 means the default protocol for
- * the particular family/type.
- *
- * This enum contains a set of commonly available and used protocols. You
- * can also pass any other identifiers handled by the platform in order to
- * use protocols not listed here.
- *
- * Since: 2.22
- */
-typedef enum {
-  G_SOCKET_PROTOCOL_UNKNOWN = -1,
-  G_SOCKET_PROTOCOL_DEFAULT = 0,
-  G_SOCKET_PROTOCOL_TCP     = 6,
-  G_SOCKET_PROTOCOL_UDP     = 17,
-  G_SOCKET_PROTOCOL_SCTP    = 132
-} GSocketProtocol;
-
-/**
- * GZlibCompressorFormat:
- * @G_ZLIB_COMPRESSOR_FORMAT_ZLIB: deflate compression with zlib header
- * @G_ZLIB_COMPRESSOR_FORMAT_GZIP: gzip file format
- * @G_ZLIB_COMPRESSOR_FORMAT_RAW: deflate compression with no header
- *
- * Used to select the type of data format to use for #GZlibDecompressor
- * and #GZlibCompressor.
- *
- * Since: 2.24
- */
-typedef enum {
-  G_ZLIB_COMPRESSOR_FORMAT_ZLIB,
-  G_ZLIB_COMPRESSOR_FORMAT_GZIP,
-  G_ZLIB_COMPRESSOR_FORMAT_RAW
-} GZlibCompressorFormat;
-
-/**
- * GUnixSocketAddressType:
- * @G_UNIX_SOCKET_ADDRESS_INVALID: invalid
- * @G_UNIX_SOCKET_ADDRESS_ANONYMOUS: anonymous
- * @G_UNIX_SOCKET_ADDRESS_PATH: a filesystem path
- * @G_UNIX_SOCKET_ADDRESS_ABSTRACT: an abstract name
- * @G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED: an abstract name, 0-padded
- *   to the full length of a unix socket name
- *
- * The type of name used by a #GUnixSocketAddress.
- * %G_UNIX_SOCKET_ADDRESS_PATH indicates a traditional unix domain
- * socket bound to a filesystem path. %G_UNIX_SOCKET_ADDRESS_ANONYMOUS
- * indicates a socket not bound to any name (eg, a client-side socket,
- * or a socket created with socketpair()).
- *
- * For abstract sockets, there are two incompatible ways of naming
- * them; the man pages suggest using the entire <literal>struct
- * sockaddr_un</literal> as the name, padding the unused parts of the
- * %sun_path field with zeroes; this corresponds to
- * %G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED. However, many programs
- * instead just use a portion of %sun_path, and pass an appropriate
- * smaller length to bind() or connect(). This is
- * %G_UNIX_SOCKET_ADDRESS_ABSTRACT.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_UNIX_SOCKET_ADDRESS_INVALID,
-  G_UNIX_SOCKET_ADDRESS_ANONYMOUS,
-  G_UNIX_SOCKET_ADDRESS_PATH,
-  G_UNIX_SOCKET_ADDRESS_ABSTRACT,
-  G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED
-} GUnixSocketAddressType;
-
-/**
- * GBusType:
- * @G_BUS_TYPE_STARTER: An alias for the message bus that activated the process, if any.
- * @G_BUS_TYPE_NONE: Not a message bus.
- * @G_BUS_TYPE_SYSTEM: The system-wide message bus.
- * @G_BUS_TYPE_SESSION: The login session message bus.
- *
- * An enumeration for well-known message buses.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_TYPE_STARTER = -1,
-  G_BUS_TYPE_NONE = 0,
-  G_BUS_TYPE_SYSTEM  = 1,
-  G_BUS_TYPE_SESSION = 2
-} GBusType;
-
-/**
- * GBusNameOwnerFlags:
- * @G_BUS_NAME_OWNER_FLAGS_NONE: No flags set.
- * @G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT: Allow another message bus connection to claim the name.
- * @G_BUS_NAME_OWNER_FLAGS_REPLACE: If another message bus connection owns the name and have
- * specified #G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT, then take the name from the other connection.
- *
- * Flags used in g_bus_own_name().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_NAME_OWNER_FLAGS_NONE = 0,                    /*< nick=none >*/
-  G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0),  /*< nick=allow-replacement >*/
-  G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1)            /*< nick=replace >*/
-} GBusNameOwnerFlags;
-
-/**
- * GBusNameWatcherFlags:
- * @G_BUS_NAME_WATCHER_FLAGS_NONE: No flags set.
- * @G_BUS_NAME_WATCHER_FLAGS_AUTO_START: If no-one owns the name when
- * beginning to watch the name, ask the bus to launch an owner for the
- * name.
- *
- * Flags used in g_bus_watch_name().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_BUS_NAME_WATCHER_FLAGS_NONE = 0,
-  G_BUS_NAME_WATCHER_FLAGS_AUTO_START = (1<<0)
-} GBusNameWatcherFlags;
-
-/**
- * GDBusProxyFlags:
- * @G_DBUS_PROXY_FLAGS_NONE: No flags set.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES: Don't load properties.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS: Don't connect to signals on the remote object.
- * @G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START: If not set and the proxy if for a well-known name,
- * then request the bus to launch an owner for the name if no-one owns the name. This flag can
- * only be used in proxies for well-known names.
- * @G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES: If set, the property value for any <emphasis>invalidated property</emphasis> will be (asynchronously) retrieved upon receiving the <ulink url="http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-properties">PropertiesChanged</ulink> D-Bus signal and the property will not cause emission of the #GDBusProxy::g-properties-changed signal. When the value is received the #GDBusProxy::g-properties-changed signal is emitted for the property along with the retrieved value. Since 2.32.
- *
- * Flags used when constructing an instance of a #GDBusProxy derived class.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_PROXY_FLAGS_NONE = 0,
-  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0),
-  G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1),
-  G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = (1<<2),
-  G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES = (1<<3)
-} GDBusProxyFlags;
-
-/**
- * GDBusError:
- * @G_DBUS_ERROR_FAILED:
- * A generic error; "something went wrong" - see the error message for
- * more.
- * @G_DBUS_ERROR_NO_MEMORY:
- * There was not enough memory to complete an operation.
- * @G_DBUS_ERROR_SERVICE_UNKNOWN:
- * The bus doesn't know how to launch a service to supply the bus name
- * you wanted.
- * @G_DBUS_ERROR_NAME_HAS_NO_OWNER:
- * The bus name you referenced doesn't exist (i.e. no application owns
- * it).
- * @G_DBUS_ERROR_NO_REPLY:
- * No reply to a message expecting one, usually means a timeout occurred.
- * @G_DBUS_ERROR_IO_ERROR:
- * Something went wrong reading or writing to a socket, for example.
- * @G_DBUS_ERROR_BAD_ADDRESS:
- * A D-Bus bus address was malformed.
- * @G_DBUS_ERROR_NOT_SUPPORTED:
- * Requested operation isn't supported (like ENOSYS on UNIX).
- * @G_DBUS_ERROR_LIMITS_EXCEEDED:
- * Some limited resource is exhausted.
- * @G_DBUS_ERROR_ACCESS_DENIED:
- * Security restrictions don't allow doing what you're trying to do.
- * @G_DBUS_ERROR_AUTH_FAILED:
- * Authentication didn't work.
- * @G_DBUS_ERROR_NO_SERVER:
- * Unable to connect to server (probably caused by ECONNREFUSED on a
- * socket).
- * @G_DBUS_ERROR_TIMEOUT:
- * Certain timeout errors, possibly ETIMEDOUT on a socket.  Note that
- * %G_DBUS_ERROR_NO_REPLY is used for message reply timeouts. Warning:
- * this is confusingly-named given that %G_DBUS_ERROR_TIMED_OUT also
- * exists. We can't fix it for compatibility reasons so just be
- * careful.
- * @G_DBUS_ERROR_NO_NETWORK:
- * No network access (probably ENETUNREACH on a socket).
- * @G_DBUS_ERROR_ADDRESS_IN_USE:
- * Can't bind a socket since its address is in use (i.e. EADDRINUSE).
- * @G_DBUS_ERROR_DISCONNECTED:
- * The connection is disconnected and you're trying to use it.
- * @G_DBUS_ERROR_INVALID_ARGS:
- * Invalid arguments passed to a method call.
- * @G_DBUS_ERROR_FILE_NOT_FOUND:
- * Missing file.
- * @G_DBUS_ERROR_FILE_EXISTS:
- * Existing file and the operation you're using does not silently overwrite.
- * @G_DBUS_ERROR_UNKNOWN_METHOD:
- * Method name you invoked isn't known by the object you invoked it on.
- * @G_DBUS_ERROR_TIMED_OUT:
- * Certain timeout errors, e.g. while starting a service. Warning: this is
- * confusingly-named given that %G_DBUS_ERROR_TIMEOUT also exists. We
- * can't fix it for compatibility reasons so just be careful.
- * @G_DBUS_ERROR_MATCH_RULE_NOT_FOUND:
- * Tried to remove or modify a match rule that didn't exist.
- * @G_DBUS_ERROR_MATCH_RULE_INVALID:
- * The match rule isn't syntactically valid.
- * @G_DBUS_ERROR_SPAWN_EXEC_FAILED:
- * While starting a new process, the exec() call failed.
- * @G_DBUS_ERROR_SPAWN_FORK_FAILED:
- * While starting a new process, the fork() call failed.
- * @G_DBUS_ERROR_SPAWN_CHILD_EXITED:
- * While starting a new process, the child exited with a status code.
- * @G_DBUS_ERROR_SPAWN_CHILD_SIGNALED:
- * While starting a new process, the child exited on a signal.
- * @G_DBUS_ERROR_SPAWN_FAILED:
- * While starting a new process, something went wrong.
- * @G_DBUS_ERROR_SPAWN_SETUP_FAILED:
- * We failed to setup the environment correctly.
- * @G_DBUS_ERROR_SPAWN_CONFIG_INVALID:
- * We failed to setup the config parser correctly.
- * @G_DBUS_ERROR_SPAWN_SERVICE_INVALID:
- * Bus name was not valid.
- * @G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND:
- * Service file not found in system-services directory.
- * @G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID:
- * Permissions are incorrect on the setuid helper.
- * @G_DBUS_ERROR_SPAWN_FILE_INVALID:
- * Service file invalid (Name, User or Exec missing).
- * @G_DBUS_ERROR_SPAWN_NO_MEMORY:
- * Tried to get a UNIX process ID and it wasn't available.
- * @G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN:
- * Tried to get a UNIX process ID and it wasn't available.
- * @G_DBUS_ERROR_INVALID_SIGNATURE:
- * A type signature is not valid.
- * @G_DBUS_ERROR_INVALID_FILE_CONTENT:
- * A file contains invalid syntax or is otherwise broken.
- * @G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
- * Asked for SELinux security context and it wasn't available.
- * @G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN:
- * Asked for ADT audit data and it wasn't available.
- * @G_DBUS_ERROR_OBJECT_PATH_IN_USE:
- * There's already an object with the requested object path.
- *
- * Error codes for the %G_DBUS_ERROR error domain.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  /* Well-known errors in the org.freedesktop.DBus.Error namespace */
-  G_DBUS_ERROR_FAILED,                           /* org.freedesktop.DBus.Error.Failed */
-  G_DBUS_ERROR_NO_MEMORY,                        /* org.freedesktop.DBus.Error.NoMemory */
-  G_DBUS_ERROR_SERVICE_UNKNOWN,                  /* org.freedesktop.DBus.Error.ServiceUnknown */
-  G_DBUS_ERROR_NAME_HAS_NO_OWNER,                /* org.freedesktop.DBus.Error.NameHasNoOwner */
-  G_DBUS_ERROR_NO_REPLY,                         /* org.freedesktop.DBus.Error.NoReply */
-  G_DBUS_ERROR_IO_ERROR,                         /* org.freedesktop.DBus.Error.IOError */
-  G_DBUS_ERROR_BAD_ADDRESS,                      /* org.freedesktop.DBus.Error.BadAddress */
-  G_DBUS_ERROR_NOT_SUPPORTED,                    /* org.freedesktop.DBus.Error.NotSupported */
-  G_DBUS_ERROR_LIMITS_EXCEEDED,                  /* org.freedesktop.DBus.Error.LimitsExceeded */
-  G_DBUS_ERROR_ACCESS_DENIED,                    /* org.freedesktop.DBus.Error.AccessDenied */
-  G_DBUS_ERROR_AUTH_FAILED,                      /* org.freedesktop.DBus.Error.AuthFailed */
-  G_DBUS_ERROR_NO_SERVER,                        /* org.freedesktop.DBus.Error.NoServer */
-  G_DBUS_ERROR_TIMEOUT,                          /* org.freedesktop.DBus.Error.Timeout */
-  G_DBUS_ERROR_NO_NETWORK,                       /* org.freedesktop.DBus.Error.NoNetwork */
-  G_DBUS_ERROR_ADDRESS_IN_USE,                   /* org.freedesktop.DBus.Error.AddressInUse */
-  G_DBUS_ERROR_DISCONNECTED,                     /* org.freedesktop.DBus.Error.Disconnected */
-  G_DBUS_ERROR_INVALID_ARGS,                     /* org.freedesktop.DBus.Error.InvalidArgs */
-  G_DBUS_ERROR_FILE_NOT_FOUND,                   /* org.freedesktop.DBus.Error.FileNotFound */
-  G_DBUS_ERROR_FILE_EXISTS,                      /* org.freedesktop.DBus.Error.FileExists */
-  G_DBUS_ERROR_UNKNOWN_METHOD,                   /* org.freedesktop.DBus.Error.UnknownMethod */
-  G_DBUS_ERROR_TIMED_OUT,                        /* org.freedesktop.DBus.Error.TimedOut */
-  G_DBUS_ERROR_MATCH_RULE_NOT_FOUND,             /* org.freedesktop.DBus.Error.MatchRuleNotFound */
-  G_DBUS_ERROR_MATCH_RULE_INVALID,               /* org.freedesktop.DBus.Error.MatchRuleInvalid */
-  G_DBUS_ERROR_SPAWN_EXEC_FAILED,                /* org.freedesktop.DBus.Error.Spawn.ExecFailed */
-  G_DBUS_ERROR_SPAWN_FORK_FAILED,                /* org.freedesktop.DBus.Error.Spawn.ForkFailed */
-  G_DBUS_ERROR_SPAWN_CHILD_EXITED,               /* org.freedesktop.DBus.Error.Spawn.ChildExited */
-  G_DBUS_ERROR_SPAWN_CHILD_SIGNALED,             /* org.freedesktop.DBus.Error.Spawn.ChildSignaled */
-  G_DBUS_ERROR_SPAWN_FAILED,                     /* org.freedesktop.DBus.Error.Spawn.Failed */
-  G_DBUS_ERROR_SPAWN_SETUP_FAILED,               /* org.freedesktop.DBus.Error.Spawn.FailedToSetup */
-  G_DBUS_ERROR_SPAWN_CONFIG_INVALID,             /* org.freedesktop.DBus.Error.Spawn.ConfigInvalid */
-  G_DBUS_ERROR_SPAWN_SERVICE_INVALID,            /* org.freedesktop.DBus.Error.Spawn.ServiceNotValid */
-  G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND,          /* org.freedesktop.DBus.Error.Spawn.ServiceNotFound */
-  G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID,        /* org.freedesktop.DBus.Error.Spawn.PermissionsInvalid */
-  G_DBUS_ERROR_SPAWN_FILE_INVALID,               /* org.freedesktop.DBus.Error.Spawn.FileInvalid */
-  G_DBUS_ERROR_SPAWN_NO_MEMORY,                  /* org.freedesktop.DBus.Error.Spawn.NoMemory */
-  G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN,          /* org.freedesktop.DBus.Error.UnixProcessIdUnknown */
-  G_DBUS_ERROR_INVALID_SIGNATURE,                /* org.freedesktop.DBus.Error.InvalidSignature */
-  G_DBUS_ERROR_INVALID_FILE_CONTENT,             /* org.freedesktop.DBus.Error.InvalidFileContent */
-  G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */
-  G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN,           /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */
-  G_DBUS_ERROR_OBJECT_PATH_IN_USE                /* org.freedesktop.DBus.Error.ObjectPathInUse */
-} GDBusError;
-/* Remember to update g_dbus_error_quark() in gdbuserror.c if you extend this enumeration */
-
-/**
- * GDBusConnectionFlags:
- * @G_DBUS_CONNECTION_FLAGS_NONE: No flags set.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT: Perform authentication against server.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER: Perform authentication against client.
- * @G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS: When
- * authenticating as a server, allow the anonymous authentication
- * method.
- * @G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION: Pass this flag if connecting to a peer that is a
- * message bus. This means that the Hello() method will be invoked as part of the connection setup.
- * @G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING: If set, processing of D-Bus messages is
- * delayed until g_dbus_connection_start_message_processing() is called.
- *
- * Flags used when creating a new #GDBusConnection.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CONNECTION_FLAGS_NONE = 0,
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT = (1<<0),
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER = (1<<1),
-  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<2),
-  G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION = (1<<3),
-  G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING = (1<<4)
-} GDBusConnectionFlags;
-
-/**
- * GDBusCapabilityFlags:
- * @G_DBUS_CAPABILITY_FLAGS_NONE: No flags set.
- * @G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING: The connection
- * supports exchanging UNIX file descriptors with the remote peer.
- *
- * Capabilities negotiated with the remote peer.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CAPABILITY_FLAGS_NONE = 0,
-  G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0)
-} GDBusCapabilityFlags;
-
-/**
- * GDBusCallFlags:
- * @G_DBUS_CALL_FLAGS_NONE: No flags set.
- * @G_DBUS_CALL_FLAGS_NO_AUTO_START: The bus must not launch
- * an owner for the destination name in response to this method
- * invocation.
- *
- * Flags used in g_dbus_connection_call() and similar APIs.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_CALL_FLAGS_NONE = 0,
-  G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0)
-} GDBusCallFlags;
-/* (1<<31) is reserved for internal use by GDBusConnection, do not use it. */
-
-/**
- * GDBusMessageType:
- * @G_DBUS_MESSAGE_TYPE_INVALID: Message is of invalid type.
- * @G_DBUS_MESSAGE_TYPE_METHOD_CALL: Method call.
- * @G_DBUS_MESSAGE_TYPE_METHOD_RETURN: Method reply.
- * @G_DBUS_MESSAGE_TYPE_ERROR: Error reply.
- * @G_DBUS_MESSAGE_TYPE_SIGNAL: Signal emission.
- *
- * Message types used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_TYPE_INVALID,
-  G_DBUS_MESSAGE_TYPE_METHOD_CALL,
-  G_DBUS_MESSAGE_TYPE_METHOD_RETURN,
-  G_DBUS_MESSAGE_TYPE_ERROR,
-  G_DBUS_MESSAGE_TYPE_SIGNAL
-} GDBusMessageType;
-
-/**
- * GDBusMessageFlags:
- * @G_DBUS_MESSAGE_FLAGS_NONE: No flags set.
- * @G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED: A reply is not expected.
- * @G_DBUS_MESSAGE_FLAGS_NO_AUTO_START: The bus must not launch an
- * owner for the destination name in response to this message.
- *
- * Message flags used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_FLAGS_NONE = 0,
-  G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED = (1<<0),
-  G_DBUS_MESSAGE_FLAGS_NO_AUTO_START = (1<<1)
-} GDBusMessageFlags;
-
-/**
- * GDBusMessageHeaderField:
- * @G_DBUS_MESSAGE_HEADER_FIELD_INVALID: Not a valid header field.
- * @G_DBUS_MESSAGE_HEADER_FIELD_PATH: The object path.
- * @G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE: The interface name.
- * @G_DBUS_MESSAGE_HEADER_FIELD_MEMBER: The method or signal name.
- * @G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME: The name of the error that occurred.
- * @G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL: The serial number the message is a reply to.
- * @G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION: The name the message is intended for.
- * @G_DBUS_MESSAGE_HEADER_FIELD_SENDER: Unique name of the sender of the message (filled in by the bus).
- * @G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE: The signature of the message body.
- * @G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS: The number of UNIX file descriptors that accompany the message.
- *
- * Header fields used in #GDBusMessage.
- *
- * Since: 2.26
- */
-typedef enum {
-  G_DBUS_MESSAGE_HEADER_FIELD_INVALID,
-  G_DBUS_MESSAGE_HEADER_FIELD_PATH,
-  G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE,
-  G_DBUS_MESSAGE_HEADER_FIELD_MEMBER,
-  G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME,
-  G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL,
-  G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION,
-  G_DBUS_MESSAGE_HEADER_FIELD_SENDER,
-  G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE,
-  G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS
-} GDBusMessageHeaderField;
-
-/**
- * GDBusPropertyInfoFlags:
- * @G_DBUS_PROPERTY_INFO_FLAGS_NONE: No flags set.
- * @G_DBUS_PROPERTY_INFO_FLAGS_READABLE: Property is readable.
- * @G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE: Property is writable.
- *
- * Flags describing the access control of a D-Bus property.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_PROPERTY_INFO_FLAGS_NONE = 0,
-  G_DBUS_PROPERTY_INFO_FLAGS_READABLE = (1<<0),
-  G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1)
-} GDBusPropertyInfoFlags;
-
-/**
- * GDBusSubtreeFlags:
- * @G_DBUS_SUBTREE_FLAGS_NONE: No flags set.
- * @G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES: Method calls to objects not in the enumerated range
- *                                                       will still be dispatched. This is useful if you want
- *                                                       to dynamically spawn objects in the subtree.
- *
- * Flags passed to g_dbus_connection_register_subtree().
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SUBTREE_FLAGS_NONE = 0,
-  G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0)
-} GDBusSubtreeFlags;
-
-/**
- * GDBusServerFlags:
- * @G_DBUS_SERVER_FLAGS_NONE: No flags set.
- * @G_DBUS_SERVER_FLAGS_RUN_IN_THREAD: All #GDBusServer::new-connection
- * signals will run in separated dedicated threads (see signal for
- * details).
- * @G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS: Allow the anonymous
- * authentication method.
- *
- * Flags used when creating a #GDBusServer.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SERVER_FLAGS_NONE = 0,
-  G_DBUS_SERVER_FLAGS_RUN_IN_THREAD = (1<<0),
-  G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<1)
-} GDBusServerFlags;
-
-/**
- * GDBusSignalFlags:
- * @G_DBUS_SIGNAL_FLAGS_NONE: No flags set.
- * @G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE: Don't actually send the AddMatch
- * D-Bus call for this signal subscription.  This gives you more control
- * over which match rules you add (but you must add them manually).
- *
- * Flags used when subscribing to signals via g_dbus_connection_signal_subscribe().
- *
- * Since: 2.26
- */
-typedef enum /*< flags >*/
-{
-  G_DBUS_SIGNAL_FLAGS_NONE = 0,
-  G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE = (1<<0)
-} GDBusSignalFlags;
-
-/**
- * GDBusSendMessageFlags:
- * @G_DBUS_SEND_MESSAGE_FLAGS_NONE: No flags set.
- * @G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL: Do not automatically
- * assign a serial number from the #GDBusConnection object when
- * sending a message.
- *
- * Flags used when sending #GDBusMessage<!-- -->s on a #GDBusConnection.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_SEND_MESSAGE_FLAGS_NONE = 0,
-  G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL = (1<<0)
-} GDBusSendMessageFlags;
-/* (1<<31) is reserved for internal use by GDBusConnection, do not use it. */
-
-/**
- * GCredentialsType:
- * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type.
- * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>.
- * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
- * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
- *
- * Enumeration describing different kinds of native credential types.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_CREDENTIALS_TYPE_INVALID,
-  G_CREDENTIALS_TYPE_LINUX_UCRED,
-  G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-  G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED
-} GCredentialsType;
-
-/**
- * GDBusMessageByteOrder:
- * @G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN: The byte order is big endian.
- * @G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN: The byte order is little endian.
- *
- * Enumeration used to describe the byte order of a D-Bus message.
- *
- * Since: 2.26
- */
-typedef enum
-{
-  G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN    = 'B',
-  G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN = 'l'
-} GDBusMessageByteOrder;
-
-/**
- * GApplicationFlags:
- * @G_APPLICATION_FLAGS_NONE: Default
- * @G_APPLICATION_IS_SERVICE: Run as a service. In this mode, registration
- *      fails if the service is already running, and the application will
- *      stay around for a while when the use count falls to zero.
- * @G_APPLICATION_IS_LAUNCHER: Don't try to become the primary instance.
- * @G_APPLICATION_HANDLES_OPEN: This application handles opening files (in
- *     the primary instance). Note that this flag only affects the default
- *     implementation of local_command_line(), and has no effect if
- *     %G_APPLICATION_HANDLES_COMMAND_LINE is given.
- *     See g_application_run() for details.
- * @G_APPLICATION_HANDLES_COMMAND_LINE: This application handles command line
- *     arguments (in the primary instance). Note that this flag only affect
- *     the default implementation of local_command_line().
- *     See g_application_run() for details.
- * @G_APPLICATION_SEND_ENVIRONMENT: Send the environment of the
- *     launching process to the primary instance. Set this flag if your
- *     application is expected to behave differently depending on certain
- *     environment variables. For instance, an editor might be expected
- *     to use the <envar>GIT_COMMITTER_NAME</envar> environment variable
- *     when editing a git commit message. The environment is available
- *     to the #GApplication::command-line signal handler, via
- *     g_application_command_line_getenv().
- * @G_APPLICATION_NON_UNIQUE: Make no attempts to do any of the typical
- *     single-instance application negotiation, even if the application
- *     ID is given.  The application neither attempts to become the
- *     owner of the application ID nor does it check if an existing
- *     owner already exists.  Everything occurs in the local process.
- *     Since: 2.30.
- *
- * Flags used to define the behaviour of a #GApplication.
- *
- * Since: 2.28
- **/
-typedef enum
-{
-  G_APPLICATION_FLAGS_NONE,
-  G_APPLICATION_IS_SERVICE  =          (1 << 0),
-  G_APPLICATION_IS_LAUNCHER =          (1 << 1),
-
-  G_APPLICATION_HANDLES_OPEN =         (1 << 2),
-  G_APPLICATION_HANDLES_COMMAND_LINE = (1 << 3),
-  G_APPLICATION_SEND_ENVIRONMENT    =  (1 << 4),
-
-  G_APPLICATION_NON_UNIQUE =           (1 << 5)
-} GApplicationFlags;
-
-/**
- * GTlsError:
- * @G_TLS_ERROR_UNAVAILABLE: No TLS provider is available
- * @G_TLS_ERROR_MISC: Miscellaneous TLS error
- * @G_TLS_ERROR_BAD_CERTIFICATE: A certificate could not be parsed
- * @G_TLS_ERROR_NOT_TLS: The TLS handshake failed because the
- *   peer does not seem to be a TLS server.
- * @G_TLS_ERROR_HANDSHAKE: The TLS handshake failed because the
- *   peer's certificate was not acceptable.
- * @G_TLS_ERROR_CERTIFICATE_REQUIRED: The TLS handshake failed because
- *   the server requested a client-side certificate, but none was
- *   provided. See g_tls_connection_set_certificate().
- * @G_TLS_ERROR_EOF: The TLS connection was closed without proper
- *   notice, which may indicate an attack. See
- *   g_tls_connection_set_require_close_notify().
- *
- * An error code used with %G_TLS_ERROR in a #GError returned from a
- * TLS-related routine.
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_ERROR_UNAVAILABLE,
-  G_TLS_ERROR_MISC,
-  G_TLS_ERROR_BAD_CERTIFICATE,
-  G_TLS_ERROR_NOT_TLS,
-  G_TLS_ERROR_HANDSHAKE,
-  G_TLS_ERROR_CERTIFICATE_REQUIRED,
-  G_TLS_ERROR_EOF
-} GTlsError;
-
-/**
- * GTlsCertificateFlags:
- * @G_TLS_CERTIFICATE_UNKNOWN_CA: The signing certificate authority is
- *   not known.
- * @G_TLS_CERTIFICATE_BAD_IDENTITY: The certificate does not match the
- *   expected identity of the site that it was retrieved from.
- * @G_TLS_CERTIFICATE_NOT_ACTIVATED: The certificate's activation time
- *   is still in the future
- * @G_TLS_CERTIFICATE_EXPIRED: The certificate has expired
- * @G_TLS_CERTIFICATE_REVOKED: The certificate has been revoked
- *   according to the #GTlsConnection's certificate revocation list.
- * @G_TLS_CERTIFICATE_INSECURE: The certificate's algorithm is
- *   considered insecure.
- * @G_TLS_CERTIFICATE_GENERIC_ERROR: Some other error occurred validating
- *   the certificate
- * @G_TLS_CERTIFICATE_VALIDATE_ALL: the combination of all of the above
- *   flags
- *
- * A set of flags describing TLS certification validation. This can be
- * used to set which validation steps to perform (eg, with
- * g_tls_client_connection_set_validation_flags()), or to describe why
- * a particular certificate was rejected (eg, in
- * #GTlsConnection::accept-certificate).
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_CERTIFICATE_UNKNOWN_CA    = (1 << 0),
-  G_TLS_CERTIFICATE_BAD_IDENTITY  = (1 << 1),
-  G_TLS_CERTIFICATE_NOT_ACTIVATED = (1 << 2),
-  G_TLS_CERTIFICATE_EXPIRED       = (1 << 3),
-  G_TLS_CERTIFICATE_REVOKED       = (1 << 4),
-  G_TLS_CERTIFICATE_INSECURE      = (1 << 5),
-  G_TLS_CERTIFICATE_GENERIC_ERROR = (1 << 6),
-
-  G_TLS_CERTIFICATE_VALIDATE_ALL  = 0x007f
-} GTlsCertificateFlags;
-
-/**
- * GTlsAuthenticationMode:
- * @G_TLS_AUTHENTICATION_NONE: client authentication not required
- * @G_TLS_AUTHENTICATION_REQUESTED: client authentication is requested
- * @G_TLS_AUTHENTICATION_REQUIRED: client authentication is required
- *
- * The client authentication mode for a #GTlsServerConnection.
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_AUTHENTICATION_NONE,
-  G_TLS_AUTHENTICATION_REQUESTED,
-  G_TLS_AUTHENTICATION_REQUIRED
-} GTlsAuthenticationMode;
-
-/**
- * GTlsRehandshakeMode:
- * @G_TLS_REHANDSHAKE_NEVER: Never allow rehandshaking
- * @G_TLS_REHANDSHAKE_SAFELY: Allow safe rehandshaking only
- * @G_TLS_REHANDSHAKE_UNSAFELY: Allow unsafe rehandshaking
- *
- * When to allow rehandshaking. See
- * g_tls_connection_set_rehandshake_mode().
- *
- * Since: 2.28
- */
-typedef enum {
-  G_TLS_REHANDSHAKE_NEVER,
-  G_TLS_REHANDSHAKE_SAFELY,
-  G_TLS_REHANDSHAKE_UNSAFELY
-} GTlsRehandshakeMode;
-
-/**
- * GTlsPasswordFlags:
- * @G_TLS_PASSWORD_NONE: No flags
- * @G_TLS_PASSWORD_RETRY: The password was wrong, and the user should retry.
- * @G_TLS_PASSWORD_MANY_TRIES: Hint to the user that the password has been
- *    wrong many times, and the user may not have many chances left.
- * @G_TLS_PASSWORD_FINAL_TRY: Hint to the user that this is the last try to get
- *    this password right.
- *
- * Various flags for the password.
- *
- * Since: 2.30
- */
-
-typedef enum _GTlsPasswordFlags
-{
-  G_TLS_PASSWORD_NONE = 0,
-  G_TLS_PASSWORD_RETRY = 1 << 1,
-  G_TLS_PASSWORD_MANY_TRIES = 1 << 2,
-  G_TLS_PASSWORD_FINAL_TRY = 1 << 3
-} GTlsPasswordFlags;
-
-/**
- * GTlsInteractionResult:
- * @G_TLS_INTERACTION_UNHANDLED: The interaction was unhandled (i.e. not
- *     implemented).
- * @G_TLS_INTERACTION_HANDLED: The interaction completed, and resulting data
- *     is available.
- * @G_TLS_INTERACTION_FAILED: The interaction has failed, or was cancelled.
- *     and the operation should be aborted.
- *
- * #GTlsInteractionResult is returned by various functions in #GTlsInteraction
- * when finishing an interaction request.
- *
- * Since: 2.30
- */
-typedef enum {
-  G_TLS_INTERACTION_UNHANDLED,
-  G_TLS_INTERACTION_HANDLED,
-  G_TLS_INTERACTION_FAILED
-} GTlsInteractionResult;
-
-/**
- * GDBusInterfaceSkeletonFlags:
- * @G_DBUS_INTERFACE_SKELETON_FLAGS_NONE: No flags set.
- * @G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD: Each method invocation is handled in
- *   a thread dedicated to the invocation. This means that the method implementation can use blocking IO
- *   without blocking any other part of the process. It also means that the method implementation must
- *   use locking to access data structures used by other threads.
- *
- * Flags describing the behavior of a #GDBusInterfaceSkeleton instance.
- *
- * Since: 2.30
- */
-typedef enum
-{
-  G_DBUS_INTERFACE_SKELETON_FLAGS_NONE = 0,
-  G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD = (1<<0)
-} GDBusInterfaceSkeletonFlags;
-
-/**
- * GDBusObjectManagerClientFlags:
- * @G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE: No flags set.
- * @G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START: If not set and the
- *   manager is for a well-known name, then request the bus to launch
- *   an owner for the name if no-one owns the name. This flag can only
- *   be used in managers for well-known names.
- *
- * Flags used when constructing a #GDBusObjectManagerClient.
- *
- * Since: 2.30
- */
-typedef enum
-{
-  G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE = 0,
-  G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START = (1<<0)
-} GDBusObjectManagerClientFlags;
-
-/**
- * GTlsDatabaseVerifyFlags:
- * @G_TLS_DATABASE_VERIFY_NONE: No verification flags
- *
- * Flags for g_tls_database_verify_chain().
- *
- * Since: 2.30
- */
-typedef enum /*< flags >*/ {
-  G_TLS_DATABASE_VERIFY_NONE = 0
-} GTlsDatabaseVerifyFlags;
-
-/**
- * GTlsDatabaseLookupFlags:
- * @G_TLS_DATABASE_LOOKUP_NONE: No lookup flags
- * @G_TLS_DATABASE_LOOKUP_KEYPAIR: Restrict lookup to certificates that have
- *     a private key.
- *
- * Flags for g_tls_database_lookup_certificate_handle(),
- * g_tls_database_lookup_certificate_issuer(),
- * and g_tls_database_lookup_certificates_issued_by().
- *
- * Since: 2.30
- */
-typedef enum {
-  G_TLS_DATABASE_LOOKUP_NONE = 0,
-  G_TLS_DATABASE_LOOKUP_KEYPAIR = 1
-} GTlsDatabaseLookupFlags;
-
-/**
- * GIOModuleScopeFlags:
- * @G_IO_MODULE_SCOPE_NONE: No module scan flags
- * @G_IO_MODULE_SCOPE_BLOCK_DUPLICATES: When using this scope to load or
- *     scan modules, automatically block a modules which has the same base
- *     basename as previously loaded module.
- *
- * Flags for use with g_io_module_scope_new().
- *
- * Since: 2.30
- */
-typedef enum {
-  G_IO_MODULE_SCOPE_NONE,
-  G_IO_MODULE_SCOPE_BLOCK_DUPLICATES
-} GIOModuleScopeFlags;
-
-/**
- * GSocketClientEvent:
- * @G_SOCKET_CLIENT_RESOLVING: The client is doing a DNS lookup.
- * @G_SOCKET_CLIENT_RESOLVED: The client has completed a DNS lookup.
- * @G_SOCKET_CLIENT_CONNECTING: The client is connecting to a remote
- *   host (either a proxy or the destination server).
- * @G_SOCKET_CLIENT_CONNECTED: The client has connected to a remote
- *   host.
- * @G_SOCKET_CLIENT_PROXY_NEGOTIATING: The client is negotiating
- *   with a proxy to connect to the destination server.
- * @G_SOCKET_CLIENT_PROXY_NEGOTIATED: The client has negotiated
- *   with the proxy server.
- * @G_SOCKET_CLIENT_TLS_HANDSHAKING: The client is performing a
- *   TLS handshake.
- * @G_SOCKET_CLIENT_TLS_HANDSHAKED: The client has performed a
- *   TLS handshake.
- * @G_SOCKET_CLIENT_COMPLETE: The client is done with a particular
- *   #GSocketConnectable.
- *
- * Describes an event occurring on a #GSocketClient. See the
- * #GSocketClient::event signal for more details.
- *
- * Additional values may be added to this type in the future.
- *
- * Since: 2.32
- */
-typedef enum {
-  G_SOCKET_CLIENT_RESOLVING,
-  G_SOCKET_CLIENT_RESOLVED,
-  G_SOCKET_CLIENT_CONNECTING,
-  G_SOCKET_CLIENT_CONNECTED,
-  G_SOCKET_CLIENT_PROXY_NEGOTIATING,
-  G_SOCKET_CLIENT_PROXY_NEGOTIATED,
-  G_SOCKET_CLIENT_TLS_HANDSHAKING,
-  G_SOCKET_CLIENT_TLS_HANDSHAKED,
-  G_SOCKET_CLIENT_COMPLETE
-} GSocketClientEvent;
-
-/**
- * GTestDBusFlags:
- * @G_TEST_DBUS_NONE: No flags.
- *
- * Flags to define future #GTestDBus behaviour.
- *
- * Since: 2.34
- */
-typedef enum /*< flags >*/ {
-  G_TEST_DBUS_NONE = 0
-} GTestDBusFlags;
-
-G_END_DECLS
-
-#endif /* __GIO_ENUMS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gioenumtypes.h b/GstreamerHelper/x86/include/glib-2.0/gio/gioenumtypes.h
deleted file mode 100644
index 70b2630e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gioenumtypes.h
+++ /dev/null
@@ -1,159 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef __GIO_ENUM_TYPES_H__
-#define __GIO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "gioenums.h" */
-GType g_app_info_create_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_APP_INFO_CREATE_FLAGS (g_app_info_create_flags_get_type ())
-GType g_converter_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CONVERTER_FLAGS (g_converter_flags_get_type ())
-GType g_converter_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CONVERTER_RESULT (g_converter_result_get_type ())
-GType g_data_stream_byte_order_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DATA_STREAM_BYTE_ORDER (g_data_stream_byte_order_get_type ())
-GType g_data_stream_newline_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DATA_STREAM_NEWLINE_TYPE (g_data_stream_newline_type_get_type ())
-GType g_file_attribute_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_TYPE (g_file_attribute_type_get_type ())
-GType g_file_attribute_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS (g_file_attribute_info_flags_get_type ())
-GType g_file_attribute_status_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_ATTRIBUTE_STATUS (g_file_attribute_status_get_type ())
-GType g_file_query_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_QUERY_INFO_FLAGS (g_file_query_info_flags_get_type ())
-GType g_file_create_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_CREATE_FLAGS (g_file_create_flags_get_type ())
-GType g_mount_mount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_MOUNT_FLAGS (g_mount_mount_flags_get_type ())
-GType g_mount_unmount_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_UNMOUNT_FLAGS (g_mount_unmount_flags_get_type ())
-GType g_drive_start_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DRIVE_START_FLAGS (g_drive_start_flags_get_type ())
-GType g_drive_start_stop_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DRIVE_START_STOP_TYPE (g_drive_start_stop_type_get_type ())
-GType g_file_copy_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_COPY_FLAGS (g_file_copy_flags_get_type ())
-GType g_file_monitor_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_FLAGS (g_file_monitor_flags_get_type ())
-GType g_file_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_TYPE (g_file_type_get_type ())
-GType g_filesystem_preview_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILESYSTEM_PREVIEW_TYPE (g_filesystem_preview_type_get_type ())
-GType g_file_monitor_event_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE_MONITOR_EVENT (g_file_monitor_event_get_type ())
-GType g_io_error_enum_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_ERROR_ENUM (g_io_error_enum_get_type ())
-GType g_ask_password_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_ASK_PASSWORD_FLAGS (g_ask_password_flags_get_type ())
-GType g_password_save_get_type (void) G_GNUC_CONST;
-#define G_TYPE_PASSWORD_SAVE (g_password_save_get_type ())
-GType g_mount_operation_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_MOUNT_OPERATION_RESULT (g_mount_operation_result_get_type ())
-GType g_output_stream_splice_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_OUTPUT_STREAM_SPLICE_FLAGS (g_output_stream_splice_flags_get_type ())
-GType g_io_stream_splice_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_STREAM_SPLICE_FLAGS (g_io_stream_splice_flags_get_type ())
-GType g_emblem_origin_get_type (void) G_GNUC_CONST;
-#define G_TYPE_EMBLEM_ORIGIN (g_emblem_origin_get_type ())
-GType g_resolver_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOLVER_ERROR (g_resolver_error_get_type ())
-GType g_resolver_record_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOLVER_RECORD_TYPE (g_resolver_record_type_get_type ())
-GType g_resource_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_ERROR (g_resource_error_get_type ())
-GType g_resource_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_FLAGS (g_resource_flags_get_type ())
-GType g_resource_lookup_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_RESOURCE_LOOKUP_FLAGS (g_resource_lookup_flags_get_type ())
-GType g_socket_family_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_FAMILY (g_socket_family_get_type ())
-GType g_socket_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_TYPE (g_socket_type_get_type ())
-GType g_socket_msg_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_MSG_FLAGS (g_socket_msg_flags_get_type ())
-GType g_socket_protocol_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_PROTOCOL (g_socket_protocol_get_type ())
-GType g_zlib_compressor_format_get_type (void) G_GNUC_CONST;
-#define G_TYPE_ZLIB_COMPRESSOR_FORMAT (g_zlib_compressor_format_get_type ())
-GType g_unix_socket_address_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_UNIX_SOCKET_ADDRESS_TYPE (g_unix_socket_address_type_get_type ())
-GType g_bus_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_TYPE (g_bus_type_get_type ())
-GType g_bus_name_owner_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_NAME_OWNER_FLAGS (g_bus_name_owner_flags_get_type ())
-GType g_bus_name_watcher_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_BUS_NAME_WATCHER_FLAGS (g_bus_name_watcher_flags_get_type ())
-GType g_dbus_proxy_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_PROXY_FLAGS (g_dbus_proxy_flags_get_type ())
-GType g_dbus_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_ERROR (g_dbus_error_get_type ())
-GType g_dbus_connection_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CONNECTION_FLAGS (g_dbus_connection_flags_get_type ())
-GType g_dbus_capability_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CAPABILITY_FLAGS (g_dbus_capability_flags_get_type ())
-GType g_dbus_call_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_CALL_FLAGS (g_dbus_call_flags_get_type ())
-GType g_dbus_message_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_TYPE (g_dbus_message_type_get_type ())
-GType g_dbus_message_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_FLAGS (g_dbus_message_flags_get_type ())
-GType g_dbus_message_header_field_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_HEADER_FIELD (g_dbus_message_header_field_get_type ())
-GType g_dbus_property_info_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_PROPERTY_INFO_FLAGS (g_dbus_property_info_flags_get_type ())
-GType g_dbus_subtree_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SUBTREE_FLAGS (g_dbus_subtree_flags_get_type ())
-GType g_dbus_server_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SERVER_FLAGS (g_dbus_server_flags_get_type ())
-GType g_dbus_signal_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SIGNAL_FLAGS (g_dbus_signal_flags_get_type ())
-GType g_dbus_send_message_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_SEND_MESSAGE_FLAGS (g_dbus_send_message_flags_get_type ())
-GType g_credentials_type_get_type (void) G_GNUC_CONST;
-#define G_TYPE_CREDENTIALS_TYPE (g_credentials_type_get_type ())
-GType g_dbus_message_byte_order_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_MESSAGE_BYTE_ORDER (g_dbus_message_byte_order_get_type ())
-GType g_application_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_APPLICATION_FLAGS (g_application_flags_get_type ())
-GType g_tls_error_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_ERROR (g_tls_error_get_type ())
-GType g_tls_certificate_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_CERTIFICATE_FLAGS (g_tls_certificate_flags_get_type ())
-GType g_tls_authentication_mode_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_AUTHENTICATION_MODE (g_tls_authentication_mode_get_type ())
-GType g_tls_rehandshake_mode_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_REHANDSHAKE_MODE (g_tls_rehandshake_mode_get_type ())
-GType g_tls_password_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_PASSWORD_FLAGS (g_tls_password_flags_get_type ())
-GType g_tls_interaction_result_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_INTERACTION_RESULT (g_tls_interaction_result_get_type ())
-GType g_dbus_interface_skeleton_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_INTERFACE_SKELETON_FLAGS (g_dbus_interface_skeleton_flags_get_type ())
-GType g_dbus_object_manager_client_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_DBUS_OBJECT_MANAGER_CLIENT_FLAGS (g_dbus_object_manager_client_flags_get_type ())
-GType g_tls_database_verify_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_DATABASE_VERIFY_FLAGS (g_tls_database_verify_flags_get_type ())
-GType g_tls_database_lookup_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TLS_DATABASE_LOOKUP_FLAGS (g_tls_database_lookup_flags_get_type ())
-GType g_io_module_scope_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_IO_MODULE_SCOPE_FLAGS (g_io_module_scope_flags_get_type ())
-GType g_socket_client_event_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SOCKET_CLIENT_EVENT (g_socket_client_event_get_type ())
-GType g_test_dbus_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_TEST_DBUS_FLAGS (g_test_dbus_flags_get_type ())
-
-/* enumerations from "gsettings.h" */
-GType g_settings_bind_flags_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SETTINGS_BIND_FLAGS (g_settings_bind_flags_get_type ())
-G_END_DECLS
-
-#endif /* __GIO_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gioerror.h b/GstreamerHelper/x86/include/glib-2.0/gio/gioerror.h
deleted file mode 100644
index 12c2b062..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gioerror.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_ERROR_H__
-#define __G_IO_ERROR_H__
-
-#include <glib.h>
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_IO_ERROR:
- *
- * Error domain for GIO. Errors in this domain will be from the #GIOErrorEnum enumeration.
- * See #GError for more information on error domains.
- **/
-#define G_IO_ERROR g_io_error_quark()
-
-GQuark       g_io_error_quark      (void);
-GIOErrorEnum g_io_error_from_errno (gint err_no);
-
-#ifdef G_OS_WIN32
-GIOErrorEnum g_io_error_from_win32_error (gint error_code);
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IO_ERROR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/giomodule.h b/GstreamerHelper/x86/include/glib-2.0/gio/giomodule.h
deleted file mode 100644
index e98dd9d2..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/giomodule.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_MODULE_H__
-#define __G_IO_MODULE_H__
-
-#include <gio/giotypes.h>
-#include <gmodule.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GIOModuleScope GIOModuleScope;
-
-GIOModuleScope *   g_io_module_scope_new     (GIOModuleScopeFlags  flags);
-void               g_io_module_scope_free    (GIOModuleScope      *scope);
-void               g_io_module_scope_block   (GIOModuleScope      *scope,
-                                              const gchar         *basename);
-
-#define G_IO_TYPE_MODULE         (g_io_module_get_type ())
-#define G_IO_MODULE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_IO_TYPE_MODULE, GIOModule))
-#define G_IO_MODULE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_IO_TYPE_MODULE, GIOModuleClass))
-#define G_IO_IS_MODULE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_IO_TYPE_MODULE))
-#define G_IO_IS_MODULE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_IO_TYPE_MODULE))
-#define G_IO_MODULE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_IO_TYPE_MODULE, GIOModuleClass))
-
-/**
- * GIOModule:
- *
- * Opaque module base class for extending GIO.
- **/
-typedef struct _GIOModuleClass GIOModuleClass;
-
-GType              g_io_module_get_type                       (void) G_GNUC_CONST;
-GIOModule         *g_io_module_new                            (const gchar       *filename);
-
-void               g_io_modules_scan_all_in_directory         (const char        *dirname);
-GList             *g_io_modules_load_all_in_directory         (const gchar       *dirname);
-
-void               g_io_modules_scan_all_in_directory_with_scope   (const gchar       *dirname,
-                                                                    GIOModuleScope    *scope);
-GList             *g_io_modules_load_all_in_directory_with_scope   (const gchar       *dirname,
-                                                                    GIOModuleScope    *scope);
-
-gboolean              g_io_module_load_static_module              (const char *name);
-
-GIOExtensionPoint *g_io_extension_point_register              (const char        *name);
-GIOExtensionPoint *g_io_extension_point_lookup                (const char        *name);
-void               g_io_extension_point_set_required_type     (GIOExtensionPoint *extension_point,
-							       GType              type);
-GType              g_io_extension_point_get_required_type     (GIOExtensionPoint *extension_point);
-GList             *g_io_extension_point_get_extensions        (GIOExtensionPoint *extension_point);
-GIOExtension *     g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point,
-							       const char        *name);
-GIOExtension *     g_io_extension_point_implement             (const char        *extension_point_name,
-							       GType              type,
-							       const char        *extension_name,
-							       gint               priority);
-
-GType              g_io_extension_get_type                    (GIOExtension      *extension);
-const char *       g_io_extension_get_name                    (GIOExtension      *extension);
-gint               g_io_extension_get_priority                (GIOExtension      *extension);
-GTypeClass*        g_io_extension_ref_class                   (GIOExtension      *extension);
-
-
-/* API for the modules to implement */
-
-/**
- * g_io_module_load:
- * @module: a #GIOModule.
- *
- * Required API for GIO modules to implement.
- * This function is ran after the module has been loaded into GIO,
- * to initialize the module.
- **/
-void   g_io_module_load   (GIOModule *module);
-
-/**
- * g_io_module_unload:
- * @module: a #GIOModule.
- *
- * Required API for GIO modules to implement.
- * This function is ran when the module is being unloaded from GIO,
- * to finalize the module.
- **/
-void   g_io_module_unload (GIOModule *module);
-
-/**
- * g_io_module_query:
- *
- * Optional API for GIO modules to implement.
- *
- * Should return a list of all the extension points that may be
- * implemented in this module.
- *
- * This method will not be called in normal use, however it may be
- * called when probing existing modules and recording which extension
- * points that this model is used for. This means we won't have to
- * load and initialze this module unless its needed.
- *
- * If this function is not implemented by the module the module will
- * always be loaded, initialized and then unloaded on application startup
- * so that it can register its extension points during init.
- *
- * Note that a module need not actually implement all the extension points
- * that g_io_module_query returns, since the exact list of extension may
- * depend on runtime issues. However all extension points actually implemented
- * must be returned by g_io_module_query() (if defined).
- *
- * When installing a module that implements g_io_module_query you must
- * run gio-querymodules in order to build the cache files required for
- * lazy loading.
- *
- * Returns: (transfer full): A %NULL-terminated array of strings, listing the supported
- *     extension points of the module. The array must be suitable for
- *     freeing with g_strfreev().
- *
- * Since: 2.24
- **/
-char **g_io_module_query (void);
-
-#define G_IO_MODULE_DECLARE(name) \
-extern gboolean G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void);
-
-#define G_IO_MODULE_LOAD(name) \
-G_PASTE(g_io_module_, G_PASTE(name, _load_static)) ()
-
-#ifdef G_IO_MODULE_BUILD_STATIC
-#define G_IO_MODULE_DEFINE(name) \
-G_BEGIN_DECLS \
-void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void); \
-void G_PASTE(g_io_module_, G_PASTE(name, _load_static)) (void) \
-{g_io_module_load_static_module (#name);} \
-void G_PASTE(g_io_module_, G_PASTE(name, _load)) (GIOModule *module); \
-void G_PASTE(g_io_module_, G_PASTE(name, _unload)) (GIOModule *module); \
-gchar ** G_PASTE(g_io_module_, G_PASTE(name, _query)) (void); \
-void G_PASTE(g_io_module_, G_PASTE(name, _load)) (GIOModule *module) \
-{_g_io_module_load(module);} \
-void G_PASTE(g_io_module_, G_PASTE(name, _unload)) (GIOModule *module) \
-{_g_io_module_unload(module);} \
-gchar ** G_PASTE(g_io_module_, G_PASTE(name, _query)) (void) \
-{return _g_io_module_query();} \
-G_END_DECLS
-#else
-#define G_IO_MODULE_DEFINE(name) \
-G_BEGIN_DECLS \
-g_io_module_load(GIOModule *module) { _g_io_module_load(module);} \
-g_io_module_unload(GIOModule *module) { _g_io_module_unload(module);} \
-gchar ** g_io_module_query(void) {return _g_io_module_query();} \
-G_END_DECLS
-#endif
-
-G_END_DECLS
-#endif /* __G_IO_MODULE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gioscheduler.h b/GstreamerHelper/x86/include/glib-2.0/gio/gioscheduler.h
deleted file mode 100644
index 7d6b5273..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gioscheduler.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_SCHEDULER_H__
-#define __G_IO_SCHEDULER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-void     g_io_scheduler_push_job                   (GIOSchedulerJobFunc  job_func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify,
-						    gint                 io_priority,
-						    GCancellable        *cancellable);
-void     g_io_scheduler_cancel_all_jobs            (void);
-gboolean g_io_scheduler_job_send_to_mainloop       (GIOSchedulerJob     *job,
-						    GSourceFunc          func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify);
-void     g_io_scheduler_job_send_to_mainloop_async (GIOSchedulerJob     *job,
-						    GSourceFunc          func,
-						    gpointer             user_data,
-						    GDestroyNotify       notify);
-
-G_END_DECLS
-
-#endif /* __G_IO_SCHEDULER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/giostream.h b/GstreamerHelper/x86/include/glib-2.0/gio/giostream.h
deleted file mode 100644
index 90283ddb..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/giostream.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * See the included COPYING file for more information.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_IO_STREAM_H__
-#define __G_IO_STREAM_H__
-
-#include <gio/ginputstream.h>
-#include <gio/goutputstream.h>
-#include <gio/gcancellable.h>
-#include <gio/gioerror.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_IO_STREAM         (g_io_stream_get_type ())
-#define G_IO_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_IO_STREAM, GIOStream))
-#define G_IO_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_IO_STREAM, GIOStreamClass))
-#define G_IS_IO_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_IO_STREAM))
-#define G_IS_IO_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_IO_STREAM))
-#define G_IO_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_IO_STREAM, GIOStreamClass))
-
-typedef struct _GIOStreamPrivate                            GIOStreamPrivate;
-typedef struct _GIOStreamClass                              GIOStreamClass;
-
-/**
- * GIOStream:
- *
- * Base class for read-write streams.
- **/
-struct _GIOStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GIOStreamPrivate *priv;
-};
-
-struct _GIOStreamClass
-{
-  GObjectClass parent_class;
-
-  GInputStream *  (*get_input_stream)  (GIOStream *stream);
-  GOutputStream * (*get_output_stream) (GIOStream *stream);
-
-  gboolean (* close_fn)	    (GIOStream           *stream,
-                             GCancellable        *cancellable,
-                             GError             **error);
-  void     (* close_async)  (GIOStream           *stream,
-                             int                  io_priority,
-                             GCancellable        *cancellable,
-                             GAsyncReadyCallback  callback,
-                             gpointer             user_data);
-  gboolean (* close_finish) (GIOStream           *stream,
-                             GAsyncResult        *result,
-                             GError             **error);
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-  void (*_g_reserved10) (void);
-};
-
-GType          g_io_stream_get_type          (void)  G_GNUC_CONST;
-
-GInputStream * g_io_stream_get_input_stream  (GIOStream            *stream);
-GOutputStream *g_io_stream_get_output_stream (GIOStream            *stream);
-
-void           g_io_stream_splice_async      (GIOStream            *stream1,
-					      GIOStream            *stream2,
-					      GIOStreamSpliceFlags  flags,
-					      int                   io_priority,
-					      GCancellable         *cancellable,
-					      GAsyncReadyCallback   callback,
-					      gpointer              user_data);
-
-gboolean       g_io_stream_splice_finish     (GAsyncResult         *result,
-                                              GError              **error);
-
-gboolean       g_io_stream_close             (GIOStream            *stream,
-					      GCancellable         *cancellable,
-					      GError              **error);
-
-void           g_io_stream_close_async       (GIOStream            *stream,
-					      int                   io_priority,
-					      GCancellable         *cancellable,
-					      GAsyncReadyCallback   callback,
-					      gpointer              user_data);
-gboolean       g_io_stream_close_finish      (GIOStream            *stream,
-					      GAsyncResult         *result,
-					      GError              **error);
-
-gboolean       g_io_stream_is_closed         (GIOStream            *stream);
-gboolean       g_io_stream_has_pending       (GIOStream            *stream);
-gboolean       g_io_stream_set_pending       (GIOStream            *stream,
-					      GError              **error);
-void           g_io_stream_clear_pending     (GIOStream            *stream);
-
-G_END_DECLS
-
-#endif /* __G_IO_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/giotypes.h b/GstreamerHelper/x86/include/glib-2.0/gio/giotypes.h
deleted file mode 100644
index 876d856c..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/giotypes.h
+++ /dev/null
@@ -1,472 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __GIO_TYPES_H__
-#define __GIO_TYPES_H__
-
-#include <gio/gioenums.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAppLaunchContext             GAppLaunchContext;
-typedef struct _GAppInfo                      GAppInfo; /* Dummy typedef */
-typedef struct _GAsyncResult                  GAsyncResult; /* Dummy typedef */
-typedef struct _GAsyncInitable                GAsyncInitable;
-typedef struct _GBufferedInputStream          GBufferedInputStream;
-typedef struct _GBufferedOutputStream         GBufferedOutputStream;
-typedef struct _GCancellable                  GCancellable;
-typedef struct _GCharsetConverter             GCharsetConverter;
-typedef struct _GConverter                    GConverter;
-typedef struct _GConverterInputStream         GConverterInputStream;
-typedef struct _GConverterOutputStream        GConverterOutputStream;
-typedef struct _GDataInputStream              GDataInputStream;
-typedef struct _GSimplePermission             GSimplePermission;
-typedef struct _GZlibCompressor               GZlibCompressor;
-typedef struct _GZlibDecompressor             GZlibDecompressor;
-
-typedef struct _GSimpleActionGroup            GSimpleActionGroup;
-typedef struct _GRemoteActionGroup            GRemoteActionGroup;
-typedef struct _GDBusActionGroup              GDBusActionGroup;
-typedef struct _GActionMap                    GActionMap;
-typedef struct _GActionGroup                  GActionGroup;
-typedef struct _GSimpleAction                 GSimpleAction;
-typedef struct _GAction                       GAction;
-typedef struct _GApplication                  GApplication;
-typedef struct _GApplicationCommandLine       GApplicationCommandLine;
-typedef struct _GSettingsBackend              GSettingsBackend;
-typedef struct _GSettings                     GSettings;
-typedef struct _GPermission                   GPermission;
-
-typedef struct _GMenuModel                    GMenuModel;
-
-/**
- * GDrive:
- *
- * Opaque drive object.
- **/
-typedef struct _GDrive                        GDrive; /* Dummy typedef */
-typedef struct _GFileEnumerator               GFileEnumerator;
-typedef struct _GFileMonitor                  GFileMonitor;
-typedef struct _GFilterInputStream            GFilterInputStream;
-typedef struct _GFilterOutputStream           GFilterOutputStream;
-
-/**
- * GFile:
- *
- * A handle to an object implementing the #GFileIface interface.
- * Generally stores a location within the file system. Handles do not
- * necessarily represent files or directories that currently exist.
- **/
-typedef struct _GFile                         GFile; /* Dummy typedef */
-typedef struct _GFileInfo                     GFileInfo;
-
-/**
- * GFileAttributeMatcher:
- *
- * Determines if a string matches a file attribute.
- **/
-typedef struct _GFileAttributeMatcher         GFileAttributeMatcher;
-typedef struct _GFileAttributeInfo            GFileAttributeInfo;
-typedef struct _GFileAttributeInfoList        GFileAttributeInfoList;
-typedef struct _GFileDescriptorBased          GFileDescriptorBased;
-typedef struct _GFileInputStream              GFileInputStream;
-typedef struct _GFileOutputStream             GFileOutputStream;
-typedef struct _GFileIOStream                 GFileIOStream;
-typedef struct _GFileIcon                     GFileIcon;
-typedef struct _GFilenameCompleter            GFilenameCompleter;
-
-
-typedef struct _GIcon                         GIcon; /* Dummy typedef */
-typedef struct _GInetAddress                  GInetAddress;
-typedef struct _GInetAddressMask              GInetAddressMask;
-typedef struct _GInetSocketAddress            GInetSocketAddress;
-typedef struct _GInputStream                  GInputStream;
-typedef struct _GInitable                     GInitable;
-typedef struct _GIOModule                     GIOModule;
-typedef struct _GIOExtensionPoint             GIOExtensionPoint;
-typedef struct _GIOExtension                  GIOExtension;
-
-/**
- * GIOSchedulerJob:
- *
- * Opaque class for defining and scheduling IO jobs.
- **/
-typedef struct _GIOSchedulerJob               GIOSchedulerJob;
-typedef struct _GIOStreamAdapter              GIOStreamAdapter;
-typedef struct _GLoadableIcon                 GLoadableIcon; /* Dummy typedef */
-typedef struct _GMemoryInputStream            GMemoryInputStream;
-typedef struct _GMemoryOutputStream           GMemoryOutputStream;
-
-/**
- * GMount:
- *
- * A handle to an object implementing the #GMountIface interface.
- **/
-typedef struct _GMount                        GMount; /* Dummy typedef */
-typedef struct _GMountOperation               GMountOperation;
-typedef struct _GNetworkAddress               GNetworkAddress;
-typedef struct _GNetworkMonitor               GNetworkMonitor;
-typedef struct _GNetworkService               GNetworkService;
-typedef struct _GOutputStream                 GOutputStream;
-typedef struct _GIOStream                     GIOStream;
-typedef struct _GPollableInputStream          GPollableInputStream; /* Dummy typedef */
-typedef struct _GPollableOutputStream         GPollableOutputStream; /* Dummy typedef */
-typedef struct _GResolver                     GResolver;
-/**
- * GResource:
- *
- * A resource bundle.
- *
- * Since: 2.32
- */
-typedef struct _GResource                     GResource;
-typedef struct _GSeekable                     GSeekable;
-typedef struct _GSimpleAsyncResult            GSimpleAsyncResult;
-
-/**
- * GSocket:
- *
- * A lowlevel network socket object.
- *
- * Since: 2.22
- **/
-typedef struct _GSocket                       GSocket;
-
-/**
- * GSocketControlMessage:
- *
- * Base class for socket-type specific control messages that can be sent and
- * received over #GSocket.
- **/
-typedef struct _GSocketControlMessage         GSocketControlMessage;
-/**
- * GSocketClient:
- *
- * A helper class for network clients to make connections.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketClient                               GSocketClient;
-/**
- * GSocketConnection:
- *
- * A socket connection GIOStream object for connection-oriented sockets.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketConnection                           GSocketConnection;
-/**
- * GSocketListener:
- *
- * A helper class for network servers to listen for and accept connections.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketListener                             GSocketListener;
-/**
- * GSocketService:
- *
- * A helper class for handling accepting incomming connections in the
- * glib mainloop.
- *
- * Since: 2.22
- **/
-typedef struct _GSocketService                              GSocketService;
-typedef struct _GSocketAddress                GSocketAddress;
-typedef struct _GSocketAddressEnumerator      GSocketAddressEnumerator;
-typedef struct _GSocketConnectable            GSocketConnectable;
-typedef struct _GSrvTarget                    GSrvTarget;
-/**
- * GTcpConnection:
- *
- * A #GSocketConnection for TCP/IP connections.
- *
- * Since: 2.22
- **/
-typedef struct _GTcpConnection                              GTcpConnection;
-typedef struct _GTcpWrapperConnection                       GTcpWrapperConnection;
-/**
- * GThreadedSocketService:
- *
- * A helper class for handling accepting incoming connections in the
- * glib mainloop and handling them in a thread.
- *
- * Since: 2.22
- **/
-typedef struct _GThreadedSocketService                      GThreadedSocketService;
-typedef struct _GThemedIcon                   GThemedIcon;
-typedef struct _GTlsCertificate               GTlsCertificate;
-typedef struct _GTlsClientConnection          GTlsClientConnection; /* Dummy typedef */
-typedef struct _GTlsConnection                GTlsConnection;
-typedef struct _GTlsDatabase                  GTlsDatabase;
-typedef struct _GTlsFileDatabase              GTlsFileDatabase;
-typedef struct _GTlsInteraction               GTlsInteraction;
-typedef struct _GTlsPassword                  GTlsPassword;
-typedef struct _GTlsServerConnection          GTlsServerConnection; /* Dummy typedef */
-typedef struct _GVfs                          GVfs; /* Dummy typedef */
-
-/**
- * GProxyResolver:
- *
- * A helper class to enumerate proxies base on URI.
- *
- * Since: 2.26
- **/
-typedef struct _GProxyResolver                GProxyResolver;
-typedef struct _GProxy			      GProxy;
-typedef struct _GProxyAddress		      GProxyAddress;
-typedef struct _GProxyAddressEnumerator	      GProxyAddressEnumerator;
-
-/**
- * GVolume:
- *
- * Opaque mountable volume object.
- **/
-typedef struct _GVolume                       GVolume; /* Dummy typedef */
-typedef struct _GVolumeMonitor                GVolumeMonitor;
-
-/**
- * GAsyncReadyCallback:
- * @source_object: the object the asynchronous operation was started with.
- * @res: a #GAsyncResult.
- * @user_data: user data passed to the callback.
- *
- * Type definition for a function that will be called back when an asynchronous
- * operation within GIO has been completed.
- **/
-typedef void (*GAsyncReadyCallback) (GObject *source_object,
-				     GAsyncResult *res,
-				     gpointer user_data);
-
-/**
- * GFileProgressCallback:
- * @current_num_bytes: the current number of bytes in the operation.
- * @total_num_bytes: the total number of bytes in the operation.
- * @user_data: user data passed to the callback.
- *
- * When doing file operations that may take a while, such as moving
- * a file or copying a file, a progress callback is used to pass how
- * far along that operation is to the application.
- **/
-typedef void (*GFileProgressCallback) (goffset current_num_bytes,
-                                       goffset total_num_bytes,
-                                       gpointer user_data);
-
-/**
- * GFileReadMoreCallback:
- * @file_contents: the data as currently read.
- * @file_size: the size of the data currently read.
- * @callback_data: data passed to the callback.
- *
- * When loading the partial contents of a file with g_file_load_partial_contents_async(),
- * it may become necessary to determine if any more data from the file should be loaded.
- * A #GFileReadMoreCallback function facilitates this by returning %TRUE if more data
- * should be read, or %FALSE otherwise.
- *
- * Returns: %TRUE if more data should be read back. %FALSE otherwise.
- **/
-typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
-                                            goffset file_size,
-                                            gpointer callback_data);
-
-
-/**
- * GIOSchedulerJobFunc:
- * @job: a #GIOSchedulerJob.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @user_data: the data to pass to callback function
- *
- * I/O Job function.
- *
- * Long-running jobs should periodically check the @cancellable
- * to see if they have been cancelled.
- *
- * Returns: %TRUE if this function should be called again to
- *    complete the job, %FALSE if the job is complete (or cancelled)
- **/
-typedef gboolean (*GIOSchedulerJobFunc) (GIOSchedulerJob *job,
-					 GCancellable    *cancellable,
-					 gpointer         user_data);
-
-/**
- * GSimpleAsyncThreadFunc:
- * @res: a #GSimpleAsyncResult.
- * @object: a #GObject.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- *
- * Simple thread function that runs an asynchronous operation and
- * checks for cancellation.
- **/
-typedef void (*GSimpleAsyncThreadFunc) (GSimpleAsyncResult *res,
-                                        GObject *object,
-                                        GCancellable *cancellable);
-
-/**
- * GSocketSourceFunc:
- * @socket: the #GSocket
- * @condition: the current condition at the source fired.
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_socket_create_source().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.22
- */
-typedef gboolean (*GSocketSourceFunc) (GSocket *socket,
-				       GIOCondition condition,
-				       gpointer user_data);
-
-/**
- * GInputVector:
- * @buffer: Pointer to a buffer where data will be written.
- * @size: the available size in @buffer.
- *
- * Structure used for scatter/gather data input.
- * You generally pass in an array of #GInputVector<!-- -->s
- * and the operation will store the read data starting in the
- * first buffer, switching to the next as needed.
- *
- * Since: 2.22
- */
-typedef struct _GInputVector GInputVector;
-
-struct _GInputVector {
-  gpointer buffer;
-  gsize size;
-};
-
-/**
- * GOutputVector:
- * @buffer: Pointer to a buffer of data to read.
- * @size: the size of @buffer.
- *
- * Structure used for scatter/gather data output.
- * You generally pass in an array of #GOutputVector<!-- -->s
- * and the operation will use all the buffers as if they were
- * one buffer.
- *
- * Since: 2.22
- */
-typedef struct _GOutputVector GOutputVector;
-
-struct _GOutputVector {
-  gconstpointer buffer;
-  gsize size;
-};
-
-typedef struct _GCredentials                  GCredentials;
-typedef struct _GUnixCredentialsMessage       GUnixCredentialsMessage;
-typedef struct _GUnixFDList                   GUnixFDList;
-typedef struct _GDBusMessage                  GDBusMessage;
-typedef struct _GDBusConnection               GDBusConnection;
-typedef struct _GDBusProxy                    GDBusProxy;
-typedef struct _GDBusMethodInvocation         GDBusMethodInvocation;
-typedef struct _GDBusServer                   GDBusServer;
-typedef struct _GDBusAuthObserver             GDBusAuthObserver;
-typedef struct _GDBusErrorEntry               GDBusErrorEntry;
-typedef struct _GDBusInterfaceVTable          GDBusInterfaceVTable;
-typedef struct _GDBusSubtreeVTable            GDBusSubtreeVTable;
-typedef struct _GDBusAnnotationInfo           GDBusAnnotationInfo;
-typedef struct _GDBusArgInfo                  GDBusArgInfo;
-typedef struct _GDBusMethodInfo               GDBusMethodInfo;
-typedef struct _GDBusSignalInfo               GDBusSignalInfo;
-typedef struct _GDBusPropertyInfo             GDBusPropertyInfo;
-typedef struct _GDBusInterfaceInfo            GDBusInterfaceInfo;
-typedef struct _GDBusNodeInfo                 GDBusNodeInfo;
-
-/**
- * GCancellableSourceFunc:
- * @cancellable: the #GCancellable
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_cancellable_source_new().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.28
- */
-typedef gboolean (*GCancellableSourceFunc) (GCancellable *cancellable,
-					    gpointer      user_data);
-
-/**
- * GPollableSourceFunc:
- * @pollable_stream: the #GPollableInputStream or #GPollableOutputStream
- * @user_data: data passed in by the user.
- *
- * This is the function type of the callback used for the #GSource
- * returned by g_pollable_input_stream_create_source() and
- * g_pollable_output_stream_create_source().
- *
- * Returns: it should return %FALSE if the source should be removed.
- *
- * Since: 2.28
- */
-typedef gboolean (*GPollableSourceFunc) (GObject  *pollable_stream,
-					 gpointer  user_data);
-
-typedef struct _GDBusInterface              GDBusInterface; /* Dummy typedef */
-typedef struct _GDBusInterfaceSkeleton      GDBusInterfaceSkeleton;
-typedef struct _GDBusObject                 GDBusObject;  /* Dummy typedef */
-typedef struct _GDBusObjectSkeleton         GDBusObjectSkeleton;
-typedef struct _GDBusObjectProxy            GDBusObjectProxy;
-typedef struct _GDBusObjectManager          GDBusObjectManager;  /* Dummy typedef */
-typedef struct _GDBusObjectManagerClient    GDBusObjectManagerClient;
-typedef struct _GDBusObjectManagerServer    GDBusObjectManagerServer;
-
-/**
- * GDBusProxyTypeFunc:
- * @manager: A #GDBusObjectManagerClient.
- * @object_path: The object path of the remote object.
- * @interface_name: (allow-none): The interface name of the remote object or %NULL if a #GDBusObjectProxy #GType is requested.
- * @user_data: User data.
- *
- * Function signature for a function used to determine the #GType to
- * use for an interface proxy (if @interface_name is not %NULL) or
- * object proxy (if @interface_name is %NULL).
- *
- * This function is called in the
- * <link linkend="g-main-context-push-thread-default">thread-default main loop</link>
- * that @manager was constructed in.
- *
- * Returns: A #GType to use for the remote object. The returned type
- *   must be a #GDBusProxy<!-- -->- or #GDBusObjectProxy<!-- -->-derived
- *   type.
- *
- * Since: 2.30
- */
-typedef GType (*GDBusProxyTypeFunc) (GDBusObjectManagerClient   *manager,
-                                     const gchar                *object_path,
-                                     const gchar                *interface_name,
-                                     gpointer                    user_data);
-
-typedef struct _GTestDBus GTestDBus;
-
-G_END_DECLS
-
-#endif /* __GIO_TYPES_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gloadableicon.h b/GstreamerHelper/x86/include/glib-2.0/gio/gloadableicon.h
deleted file mode 100644
index 754090fe..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gloadableicon.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_LOADABLE_ICON_H__
-#define __G_LOADABLE_ICON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_LOADABLE_ICON            (g_loadable_icon_get_type ())
-#define G_LOADABLE_ICON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_LOADABLE_ICON, GLoadableIcon))
-#define G_IS_LOADABLE_ICON(obj)	        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_LOADABLE_ICON))
-#define G_LOADABLE_ICON_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_LOADABLE_ICON, GLoadableIconIface))
-
-/**
- * GLoadableIcon:
- *
- * Generic type for all kinds of icons that can be loaded
- * as a stream.
- **/
-typedef struct _GLoadableIconIface    		GLoadableIconIface;
-
-/**
- * GLoadableIconIface:
- * @g_iface: The parent interface.
- * @load: Loads an icon.
- * @load_async: Loads an icon asynchronously.
- * @load_finish: Finishes an asynchronous icon load.
- *
- * Interface for icons that can be loaded as a stream.
- **/
-struct _GLoadableIconIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GInputStream * (* load)        (GLoadableIcon       *icon,
-                                  int                  size,
-                                  char               **type,
-                                  GCancellable        *cancellable,
-                                  GError             **error);
-  void           (* load_async)  (GLoadableIcon       *icon,
-                                  int                  size,
-                                  GCancellable        *cancellable,
-                                  GAsyncReadyCallback  callback,
-                                  gpointer             user_data);
-  GInputStream * (* load_finish) (GLoadableIcon       *icon,
-                                  GAsyncResult        *res,
-                                  char               **type,
-                                  GError             **error);
-};
-
-GType         g_loadable_icon_get_type    (void) G_GNUC_CONST;
-
-GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
-					   int                   size,
-					   char                **type,
-					   GCancellable         *cancellable,
-					   GError              **error);
-void          g_loadable_icon_load_async  (GLoadableIcon        *icon,
-					   int                   size,
-					   GCancellable         *cancellable,
-					   GAsyncReadyCallback   callback,
-					   gpointer              user_data);
-GInputStream *g_loadable_icon_load_finish (GLoadableIcon        *icon,
-					   GAsyncResult         *res,
-					   char                **type,
-					   GError              **error);
-
-G_END_DECLS
-
-#endif /* __G_LOADABLE_ICON_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gmemoryinputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gmemoryinputstream.h
deleted file mode 100644
index 1625ae94..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gmemoryinputstream.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MEMORY_INPUT_STREAM_H__
-#define __G_MEMORY_INPUT_STREAM_H__
-
-#include <gio/ginputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MEMORY_INPUT_STREAM         (g_memory_input_stream_get_type ())
-#define G_MEMORY_INPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStream))
-#define G_MEMORY_INPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStreamClass))
-#define G_IS_MEMORY_INPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MEMORY_INPUT_STREAM))
-#define G_IS_MEMORY_INPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MEMORY_INPUT_STREAM))
-#define G_MEMORY_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MEMORY_INPUT_STREAM, GMemoryInputStreamClass))
-
-/**
- * GMemoryInputStream:
- *
- * Implements #GInputStream for arbitrary memory chunks.
- **/
-typedef struct _GMemoryInputStreamClass    GMemoryInputStreamClass;
-typedef struct _GMemoryInputStreamPrivate  GMemoryInputStreamPrivate;
-
-struct _GMemoryInputStream
-{
-  GInputStream parent_instance;
-
-  /*< private >*/
-  GMemoryInputStreamPrivate *priv;
-};
-
-struct _GMemoryInputStreamClass
-{
-  GInputStreamClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-
-GType          g_memory_input_stream_get_type      (void) G_GNUC_CONST;
-GInputStream * g_memory_input_stream_new           (void);
-GInputStream * g_memory_input_stream_new_from_data (const void         *data,
-                                                    gssize              len,
-                                                    GDestroyNotify      destroy);
-GLIB_AVAILABLE_IN_2_34
-GInputStream * g_memory_input_stream_new_from_bytes (GBytes            *bytes);
-
-void           g_memory_input_stream_add_data      (GMemoryInputStream *stream,
-                                                    const void         *data,
-                                                    gssize              len,
-                                                    GDestroyNotify      destroy);
-GLIB_AVAILABLE_IN_2_34
-void           g_memory_input_stream_add_bytes     (GMemoryInputStream     *stream,
-						    GBytes                 *bytes);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_INPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gmemoryoutputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gmemoryoutputstream.h
deleted file mode 100644
index faf0364c..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gmemoryoutputstream.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Christian Kellner <gicmo@gnome.org>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MEMORY_OUTPUT_STREAM_H__
-#define __G_MEMORY_OUTPUT_STREAM_H__
-
-#include <gio/goutputstream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MEMORY_OUTPUT_STREAM         (g_memory_output_stream_get_type ())
-#define G_MEMORY_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStream))
-#define G_MEMORY_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStreamClass))
-#define G_IS_MEMORY_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MEMORY_OUTPUT_STREAM))
-#define G_IS_MEMORY_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MEMORY_OUTPUT_STREAM))
-#define G_MEMORY_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MEMORY_OUTPUT_STREAM, GMemoryOutputStreamClass))
-
-/**
- * GMemoryOutputStream:
- *
- * Implements #GOutputStream for arbitrary memory chunks.
- **/
-typedef struct _GMemoryOutputStreamClass    GMemoryOutputStreamClass;
-typedef struct _GMemoryOutputStreamPrivate  GMemoryOutputStreamPrivate;
-
-struct _GMemoryOutputStream
-{
-  GOutputStream parent_instance;
-
-  /*< private >*/
-  GMemoryOutputStreamPrivate *priv;
-};
-
-struct _GMemoryOutputStreamClass
-{
-  GOutputStreamClass parent_class;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-/**
- * GReallocFunc:
- * @data: memory block to reallocate
- * @size: size to reallocate @data to
- *
- * Changes the size of the memory block pointed to by @data to
- * @size bytes.
- *
- * The function should have the same semantics as realloc().
- *
- * Returns: a pointer to the reallocated memory
- */
-typedef gpointer (* GReallocFunc) (gpointer data,
-                                   gsize    size);
-
-GType          g_memory_output_stream_get_type      (void) G_GNUC_CONST;
-
-GOutputStream *g_memory_output_stream_new           (gpointer             data,
-                                                     gsize                size,
-                                                     GReallocFunc         realloc_function,
-                                                     GDestroyNotify       destroy_function);
-gpointer       g_memory_output_stream_get_data      (GMemoryOutputStream *ostream);
-gsize          g_memory_output_stream_get_size      (GMemoryOutputStream *ostream);
-gsize          g_memory_output_stream_get_data_size (GMemoryOutputStream *ostream);
-gpointer       g_memory_output_stream_steal_data    (GMemoryOutputStream *ostream);
-
-GLIB_AVAILABLE_IN_2_34
-GBytes *       g_memory_output_stream_steal_as_bytes (GMemoryOutputStream *ostream);
-
-G_END_DECLS
-
-#endif /* __G_MEMORY_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gmenu.h b/GstreamerHelper/x86/include/glib-2.0/gio/gmenu.h
deleted file mode 100644
index 35001c87..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gmenu.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_H__
-#define __G_MENU_H__
-
-#include <gio/gmenumodel.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MENU          (g_menu_get_type ())
-#define G_MENU(inst)         (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                              G_TYPE_MENU, GMenu))
-#define G_IS_MENU(inst)      (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                              G_TYPE_MENU))
-
-#define G_TYPE_MENU_ITEM     (g_menu_item_get_type ())
-#define G_MENU_ITEM(inst)    (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                              G_TYPE_MENU_ITEM, GMenuItem))
-#define G_IS_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                              G_TYPE_MENU_ITEM))
-
-typedef struct _GMenuItem GMenuItem;
-typedef struct _GMenu     GMenu;
-
-GLIB_AVAILABLE_IN_2_32
-GType       g_menu_get_type                         (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GMenu *     g_menu_new                              (void);
-
-void        g_menu_freeze                           (GMenu       *menu);
-
-void        g_menu_insert_item                      (GMenu       *menu,
-                                                     gint         position,
-                                                     GMenuItem   *item);
-void        g_menu_prepend_item                     (GMenu       *menu,
-                                                     GMenuItem   *item);
-void        g_menu_append_item                      (GMenu       *menu,
-                                                     GMenuItem   *item);
-void        g_menu_remove                           (GMenu       *menu,
-                                                     gint         position);
-
-void        g_menu_insert                           (GMenu       *menu,
-                                                     gint         position,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-void        g_menu_prepend                          (GMenu       *menu,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-void        g_menu_append                           (GMenu       *menu,
-                                                     const gchar *label,
-                                                     const gchar *detailed_action);
-
-void        g_menu_insert_section                   (GMenu       *menu,
-                                                     gint         position,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-void        g_menu_prepend_section                  (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-void        g_menu_append_section                   (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *section);
-
-void        g_menu_insert_submenu                   (GMenu       *menu,
-                                                     gint        position,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-void        g_menu_prepend_submenu                  (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-void        g_menu_append_submenu                   (GMenu       *menu,
-                                                     const gchar *label,
-                                                     GMenuModel  *submenu);
-
-
-GType       g_menu_item_get_type                    (void) G_GNUC_CONST;
-GMenuItem * g_menu_item_new                         (const gchar *label,
-                                                     const gchar *detailed_action);
-
-GLIB_AVAILABLE_IN_2_34
-GMenuItem * g_menu_item_new_from_model              (GMenuModel  *model,
-                                                     gint         item_index);
-
-GMenuItem * g_menu_item_new_submenu                 (const gchar *label,
-                                                     GMenuModel  *submenu);
-
-GMenuItem * g_menu_item_new_section                 (const gchar *label,
-                                                     GMenuModel  *section);
-
-GLIB_AVAILABLE_IN_2_34
-GVariant *  g_menu_item_get_attribute_value         (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const GVariantType *expected_type);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_menu_item_get_attribute               (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const gchar *format_string,
-                                                     ...);
-GLIB_AVAILABLE_IN_2_34
-GMenuModel *g_menu_item_get_link                    (GMenuItem   *menu_item,
-                                                     const gchar *link);
-
-void        g_menu_item_set_attribute_value         (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     GVariant    *value);
-void        g_menu_item_set_attribute               (GMenuItem   *menu_item,
-                                                     const gchar *attribute,
-                                                     const gchar *format_string,
-                                                     ...);
-void        g_menu_item_set_link                    (GMenuItem   *menu_item,
-                                                     const gchar *link,
-                                                     GMenuModel  *model);
-void        g_menu_item_set_label                   (GMenuItem   *menu_item,
-                                                     const gchar *label);
-void        g_menu_item_set_submenu                 (GMenuItem   *menu_item,
-                                                     GMenuModel  *submenu);
-void        g_menu_item_set_section                 (GMenuItem   *menu_item,
-                                                     GMenuModel  *section);
-void        g_menu_item_set_action_and_target_value (GMenuItem   *menu_item,
-                                                     const gchar *action,
-                                                     GVariant    *target_value);
-void        g_menu_item_set_action_and_target       (GMenuItem   *menu_item,
-                                                     const gchar *action,
-                                                     const gchar *format_string,
-                                                     ...);
-void        g_menu_item_set_detailed_action         (GMenuItem   *menu_item,
-                                                     const gchar *detailed_action);
-
-G_END_DECLS
-
-#endif /* __G_MENU_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gmenuexporter.h b/GstreamerHelper/x86/include/glib-2.0/gio/gmenuexporter.h
deleted file mode 100644
index 1673b227..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gmenuexporter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- *  This library is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as
- *  published by the Free Software Foundation; either version 2 of the
- *  licence, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- *  USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_EXPORTER_H__
-#define __G_MENU_EXPORTER_H__
-
-#include <gio/gdbusconnection.h>
-#include <gio/gmenumodel.h>
-
-G_BEGIN_DECLS
-
-GLIB_AVAILABLE_IN_2_32
-guint                   g_dbus_connection_export_menu_model             (GDBusConnection  *connection,
-                                                                         const gchar      *object_path,
-                                                                         GMenuModel       *menu,
-                                                                         GError          **error);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_dbus_connection_unexport_menu_model           (GDBusConnection  *connection,
-                                                                         guint             export_id);
-
-G_END_DECLS
-
-#endif /* __G_MENU_EXPORTER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gmenumodel.h b/GstreamerHelper/x86/include/glib-2.0/gio/gmenumodel.h
deleted file mode 100644
index 689c2ced..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gmenumodel.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_MENU_MODEL_H__
-#define __G_MENU_MODEL_H__
-
-#include <glib-object.h>
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_MENU_ATTRIBUTE_ACTION "action"
-#define G_MENU_ATTRIBUTE_TARGET "target"
-#define G_MENU_ATTRIBUTE_LABEL "label"
-
-#define G_MENU_LINK_SUBMENU "submenu"
-#define G_MENU_LINK_SECTION "section"
-
-#define G_TYPE_MENU_MODEL                                   (g_menu_model_get_type ())
-#define G_MENU_MODEL(inst)                                  (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_MODEL, GMenuModel))
-#define G_MENU_MODEL_CLASS(class)                           (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_MODEL, GMenuModelClass))
-#define G_IS_MENU_MODEL(inst)                               (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_MODEL))
-#define G_IS_MENU_MODEL_CLASS(class)                        (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_MODEL))
-#define G_MENU_MODEL_GET_CLASS(inst)                        (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_MODEL, GMenuModelClass))
-
-typedef struct _GMenuModelPrivate                           GMenuModelPrivate;
-typedef struct _GMenuModelClass                             GMenuModelClass;
-
-typedef struct _GMenuAttributeIterPrivate                   GMenuAttributeIterPrivate;
-typedef struct _GMenuAttributeIterClass                     GMenuAttributeIterClass;
-typedef struct _GMenuAttributeIter                          GMenuAttributeIter;
-
-typedef struct _GMenuLinkIterPrivate                        GMenuLinkIterPrivate;
-typedef struct _GMenuLinkIterClass                          GMenuLinkIterClass;
-typedef struct _GMenuLinkIter                               GMenuLinkIter;
-
-struct _GMenuModel
-{
-  GObject            parent_instance;
-  GMenuModelPrivate *priv;
-};
-
-struct _GMenuModelClass
-{
-  GObjectClass parent_class;
-
-  gboolean              (*is_mutable)                       (GMenuModel          *model);
-  gint                  (*get_n_items)                      (GMenuModel          *model);
-  void                  (*get_item_attributes)              (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             GHashTable         **attributes);
-  GMenuAttributeIter *  (*iterate_item_attributes)          (GMenuModel          *model,
-                                                             gint                 item_index);
-  GVariant *            (*get_item_attribute_value)         (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             const gchar         *attribute,
-                                                             const GVariantType  *expected_type);
-  void                  (*get_item_links)                   (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             GHashTable         **links);
-  GMenuLinkIter *       (*iterate_item_links)               (GMenuModel          *model,
-                                                             gint                 item_index);
-  GMenuModel *          (*get_item_link)                    (GMenuModel          *model,
-                                                             gint                 item_index,
-                                                             const gchar         *link);
-};
-
-GType                   g_menu_model_get_type                           (void) G_GNUC_CONST;
-
-gboolean                g_menu_model_is_mutable                         (GMenuModel         *model);
-gint                    g_menu_model_get_n_items                        (GMenuModel         *model);
-
-GMenuAttributeIter *    g_menu_model_iterate_item_attributes            (GMenuModel         *model,
-                                                                         gint                item_index);
-GVariant *              g_menu_model_get_item_attribute_value           (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *attribute,
-                                                                         const GVariantType *expected_type);
-gboolean                g_menu_model_get_item_attribute                 (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *attribute,
-                                                                         const gchar        *format_string,
-                                                                         ...);
-GMenuLinkIter *         g_menu_model_iterate_item_links                 (GMenuModel         *model,
-                                                                         gint                item_index);
-GMenuModel *            g_menu_model_get_item_link                      (GMenuModel         *model,
-                                                                         gint                item_index,
-                                                                         const gchar        *link);
-
-void                    g_menu_model_items_changed                      (GMenuModel         *model,
-                                                                         gint                position,
-                                                                         gint                removed,
-                                                                         gint                added);
-
-
-#define G_TYPE_MENU_ATTRIBUTE_ITER                          (g_menu_attribute_iter_get_type ())
-#define G_MENU_ATTRIBUTE_ITER(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIter))
-#define G_MENU_ATTRIBUTE_ITER_CLASS(class)                  (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIterClass))
-#define G_IS_MENU_ATTRIBUTE_ITER(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER))
-#define G_IS_MENU_ATTRIBUTE_ITER_CLASS(class)               (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER))
-#define G_MENU_ATTRIBUTE_ITER_GET_CLASS(inst)               (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_ATTRIBUTE_ITER, GMenuAttributeIterClass))
-
-struct _GMenuAttributeIter
-{
-  GObject parent_instance;
-  GMenuAttributeIterPrivate *priv;
-};
-
-struct _GMenuAttributeIterClass
-{
-  GObjectClass parent_class;
-
-  gboolean      (*get_next) (GMenuAttributeIter  *iter,
-                             const gchar        **out_type,
-                             GVariant           **value);
-};
-
-GType                   g_menu_attribute_iter_get_type                  (void) G_GNUC_CONST;
-
-gboolean                g_menu_attribute_iter_get_next                  (GMenuAttributeIter  *iter,
-                                                                         const gchar        **out_name,
-                                                                         GVariant           **value);
-gboolean                g_menu_attribute_iter_next                      (GMenuAttributeIter  *iter);
-const gchar *           g_menu_attribute_iter_get_name                  (GMenuAttributeIter  *iter);
-GVariant *              g_menu_attribute_iter_get_value                 (GMenuAttributeIter  *iter);
-
-
-#define G_TYPE_MENU_LINK_ITER                               (g_menu_link_iter_get_type ())
-#define G_MENU_LINK_ITER(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIter))
-#define G_MENU_LINK_ITER_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIterClass))
-#define G_IS_MENU_LINK_ITER(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_MENU_LINK_ITER))
-#define G_IS_MENU_LINK_ITER_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_MENU_LINK_ITER))
-#define G_MENU_LINK_ITER_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_MENU_LINK_ITER, GMenuLinkIterClass))
-
-struct _GMenuLinkIter
-{
-  GObject parent_instance;
-  GMenuLinkIterPrivate *priv;
-};
-
-struct _GMenuLinkIterClass
-{
-  GObjectClass parent_class;
-
-  gboolean      (*get_next) (GMenuLinkIter  *iter,
-                             const gchar   **out_name,
-                             GMenuModel    **value);
-};
-
-GType                   g_menu_link_iter_get_type                       (void) G_GNUC_CONST;
-
-gboolean                g_menu_link_iter_get_next                       (GMenuLinkIter  *iter,
-                                                                         const gchar   **out_link,
-                                                                         GMenuModel    **value);
-gboolean                g_menu_link_iter_next                           (GMenuLinkIter  *iter);
-const gchar *           g_menu_link_iter_get_name                       (GMenuLinkIter  *iter);
-GMenuModel *            g_menu_link_iter_get_value                      (GMenuLinkIter  *iter);
-
-G_END_DECLS
-
-#endif /* __G_MENU_MODEL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gmount.h b/GstreamerHelper/x86/include/glib-2.0/gio/gmount.h
deleted file mode 100644
index 33728920..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gmount.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MOUNT_H__
-#define __G_MOUNT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MOUNT            (g_mount_get_type ())
-#define G_MOUNT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_MOUNT, GMount))
-#define G_IS_MOUNT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_MOUNT))
-#define G_MOUNT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_MOUNT, GMountIface))
-
-typedef struct _GMountIface    GMountIface;
-
-/**
- * GMountIface:
- * @g_iface: The parent interface.
- * @changed: Changed signal that is emitted when the mount's state has changed.
- * @unmounted: The unmounted signal that is emitted when the #GMount have been unmounted. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @pre_unmount: The ::pre-unmount signal that is emitted when the #GMount will soon be emitted. If the recipient is somehow holding the mount open by keeping an open file on it it should close the file.
- * @get_root: Gets a #GFile to the root directory of the #GMount.
- * @get_name: Gets a string containing the name of the #GMount.
- * @get_icon: Gets a #GIcon for the #GMount.
- * @get_uuid: Gets the UUID for the #GMount. The reference is typically based on the file system UUID for the mount in question and should be considered an opaque string. Returns %NULL if there is no UUID available.
- * @get_volume: Gets a #GVolume the mount is located on. Returns %NULL if the #GMount is not associated with a #GVolume.
- * @get_drive: Gets a #GDrive the volume of the mount is located on. Returns %NULL if the #GMount is not associated with a #GDrive or a #GVolume. This is convenience method for getting the #GVolume and using that to get the #GDrive.
- * @can_unmount: Checks if a #GMount can be unmounted.
- * @can_eject: Checks if a #GMount can be ejected.
- * @unmount: Starts unmounting a #GMount.
- * @unmount_finish: Finishes an unmounting operation.
- * @eject: Starts ejecting a #GMount.
- * @eject_finish: Finishes an eject operation.
- * @remount: Starts remounting a #GMount.
- * @remount_finish: Finishes a remounting operation.
- * @guess_content_type: Starts guessing the type of the content of a #GMount.
- *     See g_mount_guess_content_type() for more information on content
- *     type guessing. This operation was added in 2.18.
- * @guess_content_type_finish: Finishes a content type guessing operation. Added in 2.18.
- * @guess_content_type_sync: Synchronous variant of @guess_content_type. Added in 2.18
- * @unmount_with_operation: Starts unmounting a #GMount using a #GMountOperation. Since 2.22.
- * @unmount_with_operation_finish: Finishes an unmounting operation using a #GMountOperation. Since 2.22.
- * @eject_with_operation: Starts ejecting a #GMount using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_default_location: Gets a #GFile indication a start location that can be use as the entry point for this mount. Since 2.24.
- * @get_sort_key: Gets a key used for sorting #GMount instance or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Gets a symbolic #GIcon for the #GMount. Since 2.34.
- *
- * Interface for implementing operations for mounts.
- **/
-struct _GMountIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  void        (* changed)                   (GMount              *mount);
-  void        (* unmounted)                 (GMount              *mount);
-
-  /* Virtual Table */
-
-  GFile     * (* get_root)                  (GMount              *mount);
-  char      * (* get_name)                  (GMount              *mount);
-  GIcon     * (* get_icon)                  (GMount              *mount);
-  char      * (* get_uuid)                  (GMount              *mount);
-  GVolume   * (* get_volume)                (GMount              *mount);
-  GDrive    * (* get_drive)                 (GMount              *mount);
-  gboolean    (* can_unmount)               (GMount              *mount);
-  gboolean    (* can_eject)                 (GMount              *mount);
-
-  void        (* unmount)                   (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* unmount_finish)            (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* eject)                     (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_finish)              (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* remount)                   (GMount              *mount,
-                                             GMountMountFlags     flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* remount_finish)            (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* guess_content_type)        (GMount              *mount,
-                                             gboolean             force_rescan,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gchar    ** (* guess_content_type_finish) (GMount              *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-  gchar    ** (* guess_content_type_sync)   (GMount              *mount,
-                                             gboolean             force_rescan,
-                                             GCancellable        *cancellable,
-                                             GError             **error);
-
-  /* Signal, not VFunc */
-  void        (* pre_unmount)               (GMount              *mount);
-
-  void        (* unmount_with_operation)    (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* unmount_with_operation_finish) (GMount          *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  void        (* eject_with_operation)      (GMount              *mount,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GMount            *mount,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-  GFile     * (* get_default_location)      (GMount              *mount);
-
-  const gchar * (* get_sort_key)            (GMount              *mount);
-  GIcon       * (* get_symbolic_icon)       (GMount              *mount);
-};
-
-GType       g_mount_get_type                  (void) G_GNUC_CONST;
-
-GFile     * g_mount_get_root                  (GMount              *mount);
-GFile     * g_mount_get_default_location      (GMount              *mount);
-char      * g_mount_get_name                  (GMount              *mount);
-GIcon     * g_mount_get_icon                  (GMount              *mount);
-GIcon     * g_mount_get_symbolic_icon         (GMount              *mount);
-char      * g_mount_get_uuid                  (GMount              *mount);
-GVolume   * g_mount_get_volume                (GMount              *mount);
-GDrive    * g_mount_get_drive                 (GMount              *mount);
-gboolean    g_mount_can_unmount               (GMount              *mount);
-gboolean    g_mount_can_eject                 (GMount              *mount);
-
-GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation)
-void        g_mount_unmount                   (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-
-GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation_finish)
-gboolean    g_mount_unmount_finish            (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_DEPRECATED_FOR(g_mount_eject_with_operation)
-void        g_mount_eject                     (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-
-GLIB_DEPRECATED_FOR(g_mount_eject_with_operation_finish)
-gboolean    g_mount_eject_finish              (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-void        g_mount_remount                   (GMount              *mount,
-                                               GMountMountFlags     flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_mount_remount_finish            (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-void        g_mount_guess_content_type        (GMount              *mount,
-                                               gboolean             force_rescan,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gchar    ** g_mount_guess_content_type_finish (GMount              *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-gchar    ** g_mount_guess_content_type_sync   (GMount              *mount,
-                                               gboolean             force_rescan,
-                                               GCancellable        *cancellable,
-                                               GError             **error);
-
-gboolean    g_mount_is_shadowed               (GMount              *mount);
-void        g_mount_shadow                    (GMount              *mount);
-void        g_mount_unshadow                  (GMount              *mount);
-
-void        g_mount_unmount_with_operation    (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_mount_unmount_with_operation_finish (GMount          *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-void        g_mount_eject_with_operation      (GMount              *mount,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_mount_eject_with_operation_finish (GMount            *mount,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-const gchar *g_mount_get_sort_key             (GMount              *mount);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gmountoperation.h b/GstreamerHelper/x86/include/glib-2.0/gio/gmountoperation.h
deleted file mode 100644
index 0c112658..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gmountoperation.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_MOUNT_OPERATION_H__
-#define __G_MOUNT_OPERATION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_MOUNT_OPERATION         (g_mount_operation_get_type ())
-#define G_MOUNT_OPERATION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MOUNT_OPERATION, GMountOperation))
-#define G_MOUNT_OPERATION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_MOUNT_OPERATION, GMountOperationClass))
-#define G_IS_MOUNT_OPERATION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_MOUNT_OPERATION))
-#define G_IS_MOUNT_OPERATION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_MOUNT_OPERATION))
-#define G_MOUNT_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_MOUNT_OPERATION, GMountOperationClass))
-
-/**
- * GMountOperation:
- *
- * Class for providing authentication methods for mounting operations,
- * such as mounting a file locally, or authenticating with a server.
- **/
-typedef struct _GMountOperationClass   GMountOperationClass;
-typedef struct _GMountOperationPrivate GMountOperationPrivate;
-
-struct _GMountOperation
-{
-  GObject parent_instance;
-
-  GMountOperationPrivate *priv;
-};
-
-struct _GMountOperationClass
-{
-  GObjectClass parent_class;
-
-  /* signals: */
-
-  void (* ask_password) (GMountOperation       *op,
-			 const char            *message,
-			 const char            *default_user,
-			 const char            *default_domain,
-			 GAskPasswordFlags      flags);
-
-  void (* ask_question) (GMountOperation       *op,
-			 const char            *message,
-			 const char            *choices[]);
-
-  void (* reply)        (GMountOperation       *op,
-			 GMountOperationResult  result);
-
-  void (* aborted)      (GMountOperation       *op);
-
-  void (* show_processes) (GMountOperation      *op,
-                           const gchar          *message,
-                           GArray               *processes,
-                           const gchar          *choices[]);
-
-  void (* show_unmount_progress) (GMountOperation *op,
-                                  const gchar     *message,
-                                  gint64           time_left,
-                                  gint64           bytes_left);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-};
-
-GType             g_mount_operation_get_type      (void) G_GNUC_CONST;
-GMountOperation * g_mount_operation_new           (void);
-
-const char *  g_mount_operation_get_username      (GMountOperation *op);
-void          g_mount_operation_set_username      (GMountOperation *op,
-						   const char      *username);
-const char *  g_mount_operation_get_password      (GMountOperation *op);
-void          g_mount_operation_set_password      (GMountOperation *op,
-						   const char      *password);
-gboolean      g_mount_operation_get_anonymous     (GMountOperation *op);
-void          g_mount_operation_set_anonymous     (GMountOperation *op,
-						   gboolean         anonymous);
-const char *  g_mount_operation_get_domain        (GMountOperation *op);
-void          g_mount_operation_set_domain        (GMountOperation *op,
-						   const char      *domain);
-GPasswordSave g_mount_operation_get_password_save (GMountOperation *op);
-void          g_mount_operation_set_password_save (GMountOperation *op,
-						   GPasswordSave    save);
-int           g_mount_operation_get_choice        (GMountOperation *op);
-void          g_mount_operation_set_choice        (GMountOperation *op,
-						   int              choice);
-void          g_mount_operation_reply             (GMountOperation *op,
-						   GMountOperationResult result);
-
-G_END_DECLS
-
-#endif /* __G_MOUNT_OPERATION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gnativevolumemonitor.h b/GstreamerHelper/x86/include/glib-2.0/gio/gnativevolumemonitor.h
deleted file mode 100644
index e072576f..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gnativevolumemonitor.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_NATIVE_VOLUME_MONITOR_H__
-#define __G_NATIVE_VOLUME_MONITOR_H__
-
-#include <gio/gvolumemonitor.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NATIVE_VOLUME_MONITOR        (g_native_volume_monitor_get_type ())
-#define G_NATIVE_VOLUME_MONITOR(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NATIVE_VOLUME_MONITOR, GNativeVolumeMonitor))
-#define G_NATIVE_VOLUME_MONITOR_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NATIVE_VOLUME_MONITOR, GNativeVolumeMonitorClass))
-#define G_IS_NATIVE_VOLUME_MONITOR(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NATIVE_VOLUME_MONITOR))
-#define G_IS_NATIVE_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NATIVE_VOLUME_MONITOR))
-
-#define G_NATIVE_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-native-volume-monitor"
-
-typedef struct _GNativeVolumeMonitor      GNativeVolumeMonitor;
-typedef struct _GNativeVolumeMonitorClass GNativeVolumeMonitorClass;
-
-struct _GNativeVolumeMonitor
-{
-  GVolumeMonitor parent_instance;
-};
-
-struct _GNativeVolumeMonitorClass
-{
-  GVolumeMonitorClass parent_class;
-
-  GMount * (* get_mount_for_mount_path) (const char   *mount_path,
-                                         GCancellable *cancellable);
-};
-
-GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_NATIVE_VOLUME_MONITOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkaddress.h b/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkaddress.h
deleted file mode 100644
index af163211..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkaddress.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_NETWORK_ADDRESS_H__
-#define __G_NETWORK_ADDRESS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NETWORK_ADDRESS         (g_network_address_get_type ())
-#define G_NETWORK_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_ADDRESS, GNetworkAddress))
-#define G_NETWORK_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NETWORK_ADDRESS, GNetworkAddressClass))
-#define G_IS_NETWORK_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_ADDRESS))
-#define G_IS_NETWORK_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NETWORK_ADDRESS))
-#define G_NETWORK_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_NETWORK_ADDRESS, GNetworkAddressClass))
-
-typedef struct _GNetworkAddressClass   GNetworkAddressClass;
-typedef struct _GNetworkAddressPrivate GNetworkAddressPrivate;
-
-struct _GNetworkAddress
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GNetworkAddressPrivate *priv;
-};
-
-struct _GNetworkAddressClass
-{
-  GObjectClass parent_class;
-
-};
-
-GType               g_network_address_get_type     (void) G_GNUC_CONST;
-
-GSocketConnectable *g_network_address_new          (const gchar      *hostname,
-						    guint16           port);
-GSocketConnectable *g_network_address_parse        (const gchar      *host_and_port,
-						    guint16           default_port,
-						    GError          **error);
-GSocketConnectable *g_network_address_parse_uri    (const gchar      *uri,
-    						    guint16           default_port,
-						    GError          **error);
-const gchar        *g_network_address_get_hostname (GNetworkAddress  *addr);
-guint16             g_network_address_get_port     (GNetworkAddress  *addr);
-const gchar        *g_network_address_get_scheme   (GNetworkAddress  *addr);
-
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_ADDRESS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkmonitor.h b/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkmonitor.h
deleted file mode 100644
index 995ff545..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkmonitor.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_NETWORK_MONITOR_H__
-#define __G_NETWORK_MONITOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_NETWORK_MONITOR_EXTENSION_POINT_NAME:
- *
- * Extension point for network status monitoring functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- *
- * Since: 2.30
- */
-#define G_NETWORK_MONITOR_EXTENSION_POINT_NAME "gio-network-monitor"
-
-#define G_TYPE_NETWORK_MONITOR         (g_network_monitor_get_type ())
-#define G_NETWORK_MONITOR(o)               (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_MONITOR, GNetworkMonitor))
-#define G_IS_NETWORK_MONITOR(o)            (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_MONITOR))
-#define G_NETWORK_MONITOR_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_NETWORK_MONITOR, GNetworkMonitorInterface))
-
-typedef struct _GNetworkMonitorInterface GNetworkMonitorInterface;
-
-struct _GNetworkMonitorInterface {
-  GTypeInterface g_iface;
-
-  void     (*network_changed)  (GNetworkMonitor      *monitor,
-				gboolean              available);
-
-  gboolean (*can_reach)        (GNetworkMonitor      *monitor,
-				GSocketConnectable   *connectable,
-				GCancellable         *cancellable,
-				GError              **error);
-  void     (*can_reach_async)  (GNetworkMonitor      *monitor,
-				GSocketConnectable   *connectable,
-				GCancellable         *cancellable,
-				GAsyncReadyCallback   callback,
-				gpointer              user_data);
-  gboolean (*can_reach_finish) (GNetworkMonitor      *monitor,
-				GAsyncResult         *result,
-				GError              **error);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType            g_network_monitor_get_type              (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GNetworkMonitor *g_network_monitor_get_default           (void);
-
-gboolean         g_network_monitor_get_network_available (GNetworkMonitor     *monitor);
-
-gboolean         g_network_monitor_can_reach             (GNetworkMonitor     *monitor,
-							  GSocketConnectable  *connectable,
-							  GCancellable        *cancellable,
-							  GError             **error);
-void             g_network_monitor_can_reach_async       (GNetworkMonitor     *monitor,
-							  GSocketConnectable  *connectable,
-							  GCancellable        *cancellable,
-							  GAsyncReadyCallback  callback,
-							  gpointer             user_data);
-gboolean         g_network_monitor_can_reach_finish      (GNetworkMonitor     *monitor,
-							  GAsyncResult        *result,
-							  GError             **error);
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_MONITOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkservice.h b/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkservice.h
deleted file mode 100644
index 1f6dbea8..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gnetworkservice.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_NETWORK_SERVICE_H__
-#define __G_NETWORK_SERVICE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_NETWORK_SERVICE         (g_network_service_get_type ())
-#define G_NETWORK_SERVICE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NETWORK_SERVICE, GNetworkService))
-#define G_NETWORK_SERVICE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_NETWORK_SERVICE, GNetworkServiceClass))
-#define G_IS_NETWORK_SERVICE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NETWORK_SERVICE))
-#define G_IS_NETWORK_SERVICE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_NETWORK_SERVICE))
-#define G_NETWORK_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_NETWORK_SERVICE, GNetworkServiceClass))
-
-typedef struct _GNetworkServiceClass   GNetworkServiceClass;
-typedef struct _GNetworkServicePrivate GNetworkServicePrivate;
-
-struct _GNetworkService
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GNetworkServicePrivate *priv;
-};
-
-struct _GNetworkServiceClass
-{
-  GObjectClass parent_class;
-
-};
-
-GType                g_network_service_get_type      (void) G_GNUC_CONST;
-
-GSocketConnectable  *g_network_service_new           (const gchar     *service,
-						      const gchar     *protocol,
-						      const gchar     *domain);
-
-const gchar         *g_network_service_get_service   (GNetworkService *srv);
-const gchar         *g_network_service_get_protocol  (GNetworkService *srv);
-const gchar         *g_network_service_get_domain    (GNetworkService *srv);
-const gchar         *g_network_service_get_scheme    (GNetworkService *srv);
-void                 g_network_service_set_scheme    (GNetworkService *srv, const gchar *scheme);
-
-G_END_DECLS
-
-#endif /* __G_NETWORK_SERVICE_H__ */
-
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/goutputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/goutputstream.h
deleted file mode 100644
index 5e9850c8..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/goutputstream.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_OUTPUT_STREAM_H__
-#define __G_OUTPUT_STREAM_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_OUTPUT_STREAM         (g_output_stream_get_type ())
-#define G_OUTPUT_STREAM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_OUTPUT_STREAM, GOutputStream))
-#define G_OUTPUT_STREAM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_OUTPUT_STREAM, GOutputStreamClass))
-#define G_IS_OUTPUT_STREAM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_OUTPUT_STREAM))
-#define G_IS_OUTPUT_STREAM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_OUTPUT_STREAM))
-#define G_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_OUTPUT_STREAM, GOutputStreamClass))
-
-/**
- * GOutputStream:
- *
- * Base class for writing output.
- *
- * All classes derived from GOutputStream should implement synchronous
- * writing, splicing, flushing and closing streams, but may implement
- * asynchronous versions.
- **/
-typedef struct _GOutputStreamClass    GOutputStreamClass;
-typedef struct _GOutputStreamPrivate  GOutputStreamPrivate;
-
-struct _GOutputStream
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GOutputStreamPrivate *priv;
-};
-
-
-struct _GOutputStreamClass
-{
-  GObjectClass parent_class;
-
-  /* Sync ops: */
-
-  gssize      (* write_fn)      (GOutputStream            *stream,
-                                 const void               *buffer,
-                                 gsize                     count,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gssize      (* splice)        (GOutputStream            *stream,
-                                 GInputStream             *source,
-                                 GOutputStreamSpliceFlags  flags,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gboolean    (* flush)	        (GOutputStream            *stream,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-  gboolean    (* close_fn)      (GOutputStream            *stream,
-                                 GCancellable             *cancellable,
-                                 GError                  **error);
-
-  /* Async ops: (optional in derived classes) */
-
-  void        (* write_async)   (GOutputStream            *stream,
-                                 const void               *buffer,
-                                 gsize                     count,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gssize      (* write_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* splice_async)  (GOutputStream            *stream,
-                                 GInputStream             *source,
-                                 GOutputStreamSpliceFlags  flags,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gssize      (* splice_finish) (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* flush_async)   (GOutputStream            *stream,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gboolean    (* flush_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-  void        (* close_async)   (GOutputStream            *stream,
-                                 int                       io_priority,
-                                 GCancellable             *cancellable,
-                                 GAsyncReadyCallback       callback,
-                                 gpointer                  user_data);
-  gboolean    (* close_finish)  (GOutputStream            *stream,
-                                 GAsyncResult             *result,
-                                 GError                  **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-};
-
-GType    g_output_stream_get_type      (void) G_GNUC_CONST;
-
-gssize   g_output_stream_write         (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_write_all     (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					gsize                     *bytes_written,
-					GCancellable              *cancellable,
-					GError                   **error);
-GLIB_AVAILABLE_IN_2_34
-gssize   g_output_stream_write_bytes   (GOutputStream             *stream,
-					GBytes                    *bytes,
-					GCancellable              *cancellable,
-					GError                   **error);
-gssize   g_output_stream_splice        (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_flush         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-gboolean g_output_stream_close         (GOutputStream             *stream,
-					GCancellable              *cancellable,
-					GError                   **error);
-void     g_output_stream_write_async   (GOutputStream             *stream,
-					const void                *buffer,
-					gsize                      count,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gssize   g_output_stream_write_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-GLIB_AVAILABLE_IN_2_34
-void     g_output_stream_write_bytes_async  (GOutputStream             *stream,
-					     GBytes                    *bytes,
-					     int                        io_priority,
-					     GCancellable              *cancellable,
-					     GAsyncReadyCallback        callback,
-					     gpointer                   user_data);
-GLIB_AVAILABLE_IN_2_34
-gssize   g_output_stream_write_bytes_finish (GOutputStream             *stream,
-					     GAsyncResult              *result,
-					     GError                   **error);
-void     g_output_stream_splice_async  (GOutputStream             *stream,
-					GInputStream              *source,
-					GOutputStreamSpliceFlags   flags,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gssize   g_output_stream_splice_finish (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_flush_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gboolean g_output_stream_flush_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-void     g_output_stream_close_async   (GOutputStream             *stream,
-					int                        io_priority,
-					GCancellable              *cancellable,
-					GAsyncReadyCallback        callback,
-					gpointer                   user_data);
-gboolean g_output_stream_close_finish  (GOutputStream             *stream,
-					GAsyncResult              *result,
-					GError                   **error);
-
-gboolean g_output_stream_is_closed     (GOutputStream             *stream);
-gboolean g_output_stream_is_closing    (GOutputStream             *stream);
-gboolean g_output_stream_has_pending   (GOutputStream             *stream);
-gboolean g_output_stream_set_pending   (GOutputStream             *stream,
-					GError                   **error);
-void     g_output_stream_clear_pending (GOutputStream             *stream);
-
-
-G_END_DECLS
-
-#endif /* __G_OUTPUT_STREAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gpermission.h b/GstreamerHelper/x86/include/glib-2.0/gio/gpermission.h
deleted file mode 100644
index 3f742578..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gpermission.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PERMISSION_H__
-#define __G_PERMISSION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PERMISSION             (g_permission_get_type ())
-#define G_PERMISSION(inst)            (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                       G_TYPE_PERMISSION, GPermission))
-#define G_PERMISSION_CLASS(class)     (G_TYPE_CHECK_CLASS_CAST ((class),     \
-                                       G_TYPE_PERMISSION, GPermissionClass))
-#define G_IS_PERMISSION(inst)         (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                       G_TYPE_PERMISSION))
-#define G_IS_PERMISSION_CLASS(class)  (G_TYPE_CHECK_CLASS_TYPE ((class),     \
-                                       G_TYPE_PERMISSION))
-#define G_PERMISSION_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst),    \
-                                       G_TYPE_PERMISSION, GPermissionClass))
-
-typedef struct _GPermissionPrivate    GPermissionPrivate;
-typedef struct _GPermissionClass      GPermissionClass;
-
-struct _GPermission
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GPermissionPrivate *priv;
-};
-
-struct _GPermissionClass {
-  GObjectClass parent_class;
-
-  gboolean (*acquire)        (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GError              **error);
-  void     (*acquire_async)  (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GAsyncReadyCallback   callback,
-                              gpointer              user_data);
-  gboolean (*acquire_finish) (GPermission          *permission,
-                              GAsyncResult         *result,
-                              GError              **error);
-
-  gboolean (*release)        (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GError              **error);
-  void     (*release_async)  (GPermission          *permission,
-                              GCancellable         *cancellable,
-                              GAsyncReadyCallback   callback,
-                              gpointer              user_data);
-  gboolean (*release_finish) (GPermission          *permission,
-                              GAsyncResult         *result,
-                              GError              **error);
-
-  gpointer reserved[16];
-};
-
-GType           g_permission_get_type           (void);
-gboolean        g_permission_acquire            (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-void            g_permission_acquire_async      (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-gboolean        g_permission_acquire_finish     (GPermission          *permission,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-gboolean        g_permission_release            (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-void            g_permission_release_async      (GPermission          *permission,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-gboolean        g_permission_release_finish     (GPermission          *permission,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-gboolean        g_permission_get_allowed        (GPermission   *permission);
-gboolean        g_permission_get_can_acquire    (GPermission   *permission);
-gboolean        g_permission_get_can_release    (GPermission   *permission);
-
-void            g_permission_impl_update        (GPermission  *permission,
-                                                 gboolean      allowed,
-                                                 gboolean      can_acquire,
-                                                 gboolean      can_release);
-
-G_END_DECLS
-
-#endif /* __G_PERMISSION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gpollableinputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gpollableinputstream.h
deleted file mode 100644
index 49af7ee2..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gpollableinputstream.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_POLLABLE_INPUT_STREAM_H__
-#define __G_POLLABLE_INPUT_STREAM_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_POLLABLE_INPUT_STREAM               (g_pollable_input_stream_get_type ())
-#define G_POLLABLE_INPUT_STREAM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_POLLABLE_INPUT_STREAM, GPollableInputStream))
-#define G_IS_POLLABLE_INPUT_STREAM(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_POLLABLE_INPUT_STREAM))
-#define G_POLLABLE_INPUT_STREAM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_POLLABLE_INPUT_STREAM, GPollableInputStreamInterface))
-
-/**
- * GPollableInputStream:
- *
- * An interface for a #GInputStream that can be polled for readability.
- *
- * Since: 2.28
- */
-typedef struct _GPollableInputStreamInterface GPollableInputStreamInterface;
-
-/**
- * GPollableInputStreamInterface:
- * @g_iface: The parent interface.
- * @can_poll: Checks if the #GPollableInputStream instance is actually pollable
- * @is_readable: Checks if the stream is readable
- * @create_source: Creates a #GSource to poll the stream
- * @read_nonblocking: Does a non-blocking read or returns
- *   %G_IO_ERROR_WOULD_BLOCK
- *
- * The interface for pollable input streams.
- *
- * The default implementation of @can_poll always returns %TRUE.
- *
- * The default implementation of @read_nonblocking calls
- * g_pollable_input_stream_is_readable(), and then calls
- * g_input_stream_read() if it returns %TRUE. This means you only need
- * to override it if it is possible that your @is_readable
- * implementation may return %TRUE when the stream is not actually
- * readable.
- *
- * Since: 2.28
- */
-struct _GPollableInputStreamInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean     (*can_poll)         (GPollableInputStream  *stream);
-
-  gboolean     (*is_readable)      (GPollableInputStream  *stream);
-  GSource *    (*create_source)    (GPollableInputStream  *stream,
-				    GCancellable          *cancellable);
-  gssize       (*read_nonblocking) (GPollableInputStream  *stream,
-				    void                  *buffer,
-				    gsize                  count,
-				    GError               **error);
-};
-
-GType    g_pollable_input_stream_get_type         (void) G_GNUC_CONST;
-
-gboolean g_pollable_input_stream_can_poll         (GPollableInputStream  *stream);
-
-gboolean g_pollable_input_stream_is_readable      (GPollableInputStream  *stream);
-GSource *g_pollable_input_stream_create_source    (GPollableInputStream  *stream,
-						   GCancellable          *cancellable);
-
-gssize   g_pollable_input_stream_read_nonblocking (GPollableInputStream  *stream,
-						   void                  *buffer,
-						   gsize                  count,
-						   GCancellable          *cancellable,
-						   GError               **error);
-
-G_END_DECLS
-
-
-#endif /* __G_POLLABLE_INPUT_STREAM_H__ */
-
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gpollableoutputstream.h b/GstreamerHelper/x86/include/glib-2.0/gio/gpollableoutputstream.h
deleted file mode 100644
index c5945ce3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gpollableoutputstream.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_POLLABLE_OUTPUT_STREAM_H__
-#define __G_POLLABLE_OUTPUT_STREAM_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_POLLABLE_OUTPUT_STREAM               (g_pollable_output_stream_get_type ())
-#define G_POLLABLE_OUTPUT_STREAM(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM, GPollableOutputStream))
-#define G_IS_POLLABLE_OUTPUT_STREAM(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM))
-#define G_POLLABLE_OUTPUT_STREAM_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_POLLABLE_OUTPUT_STREAM, GPollableOutputStreamInterface))
-
-/**
- * GPollableOutputStream:
- *
- * An interface for a #GOutputStream that can be polled for readability.
- *
- * Since: 2.28
- */
-typedef struct _GPollableOutputStreamInterface GPollableOutputStreamInterface;
-
-/**
- * GPollableOutputStreamInterface:
- * @g_iface: The parent interface.
- * @can_poll: Checks if the #GPollableOutputStream instance is actually pollable
- * @is_writable: Checks if the stream is writable
- * @create_source: Creates a #GSource to poll the stream
- * @write_nonblocking: Does a non-blocking write or returns
- *   %G_IO_ERROR_WOULD_BLOCK
- *
- * The interface for pollable output streams.
- *
- * The default implementation of @can_poll always returns %TRUE.
- *
- * The default implementation of @write_nonblocking calls
- * g_pollable_output_stream_is_writable(), and then calls
- * g_output_stream_write() if it returns %TRUE. This means you only
- * need to override it if it is possible that your @is_writable
- * implementation may return %TRUE when the stream is not actually
- * writable.
- *
- * Since: 2.28
- */
-struct _GPollableOutputStreamInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean     (*can_poll)          (GPollableOutputStream  *stream);
-
-  gboolean     (*is_writable)       (GPollableOutputStream  *stream);
-  GSource *    (*create_source)     (GPollableOutputStream  *stream,
-				     GCancellable           *cancellable);
-  gssize       (*write_nonblocking) (GPollableOutputStream  *stream,
-				     const void             *buffer,
-				     gsize                   count,
-				     GError                **error);
-};
-
-GType    g_pollable_output_stream_get_type          (void) G_GNUC_CONST;
-
-gboolean g_pollable_output_stream_can_poll          (GPollableOutputStream  *stream);
-
-gboolean g_pollable_output_stream_is_writable       (GPollableOutputStream  *stream);
-GSource *g_pollable_output_stream_create_source     (GPollableOutputStream  *stream,
-						     GCancellable           *cancellable);
-
-gssize   g_pollable_output_stream_write_nonblocking (GPollableOutputStream  *stream,
-						     const void             *buffer,
-						     gsize                   count,
-						     GCancellable           *cancellable,
-						     GError                **error);
-
-G_END_DECLS
-
-
-#endif /* __G_POLLABLE_OUTPUT_STREAM_H__ */
-
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gpollableutils.h b/GstreamerHelper/x86/include/glib-2.0/gio/gpollableutils.h
deleted file mode 100644
index 782f3ca4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gpollableutils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_POLLABLE_UTILS_H__
-#define __G_POLLABLE_UTILS_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-GSource *g_pollable_source_new       (GObject        *pollable_stream);
-
-GLIB_AVAILABLE_IN_2_34
-GSource *g_pollable_source_new_full  (gpointer        pollable_stream,
-				      GSource        *child_source,
-				      GCancellable   *cancellable);
-
-GLIB_AVAILABLE_IN_2_34
-gssize   g_pollable_stream_read      (GInputStream   *stream,
-				      void           *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      GCancellable   *cancellable,
-				      GError        **error);
-
-GLIB_AVAILABLE_IN_2_34
-gssize   g_pollable_stream_write     (GOutputStream  *stream,
-				      const void     *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      GCancellable   *cancellable,
-				      GError        **error);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_pollable_stream_write_all (GOutputStream  *stream,
-				      const void     *buffer,
-				      gsize           count,
-				      gboolean        blocking,
-				      gsize          *bytes_written,
-				      GCancellable   *cancellable,
-				      GError        **error);
-
-G_END_DECLS
-
-#endif /* _G_POLLABLE_UTILS_H_ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gproxy.h b/GstreamerHelper/x86/include/glib-2.0/gio/gproxy.h
deleted file mode 100644
index d7d11a7f..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gproxy.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PROXY_H__
-#define __G_PROXY_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY		(g_proxy_get_type ())
-#define G_PROXY(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY, GProxy))
-#define G_IS_PROXY(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY))
-#define G_PROXY_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_PROXY, GProxyInterface))
-
-/**
- * G_PROXY_EXTENSION_POINT_NAME:
- *
- * Extension point for proxy functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- *
- * Since: 2.26
- */
-#define G_PROXY_EXTENSION_POINT_NAME "gio-proxy"
-
-/**
- * GProxy:
- *
- * Interface that handles proxy connection and payload.
- *
- * Since: 2.26
- */
-typedef struct _GProxyInterface GProxyInterface;
-
-/**
- * GProxyInterface:
- * @g_iface: The parent interface.
- * @connect: Connect to proxy server and wrap (if required) the #connection
- *           to handle payload.
- * @connect_async: Same as connect() but asynchronous.
- * @connect_finish: Returns the result of connect_async()
- * @supports_hostname: Returns whether the proxy supports hostname lookups.
- *
- * Provides an interface for handling proxy connection and payload.
- *
- * Since: 2.26
- */
-struct _GProxyInterface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GIOStream * (* connect)           (GProxy               *proxy,
-				     GIOStream            *connection,
-				     GProxyAddress        *proxy_address,
-				     GCancellable         *cancellable,
-				     GError              **error);
-
-  void        (* connect_async)     (GProxy               *proxy,
-				     GIOStream            *connection,
-				     GProxyAddress	  *proxy_address,
-				     GCancellable         *cancellable,
-				     GAsyncReadyCallback   callback,
-				     gpointer              user_data);
-
-  GIOStream * (* connect_finish)    (GProxy               *proxy,
-				     GAsyncResult         *result,
-				     GError              **error);
-
-  gboolean    (* supports_hostname) (GProxy             *proxy);
-};
-
-GType      g_proxy_get_type                 (void) G_GNUC_CONST;
-
-GProxy    *g_proxy_get_default_for_protocol (const gchar *protocol);
-
-GIOStream *g_proxy_connect           (GProxy               *proxy,
-				      GIOStream            *connection,
-				      GProxyAddress        *proxy_address,
-				      GCancellable         *cancellable,
-				      GError              **error);
-
-void       g_proxy_connect_async     (GProxy               *proxy,
-				      GIOStream            *connection,
-				      GProxyAddress        *proxy_address,
-				      GCancellable         *cancellable,
-				      GAsyncReadyCallback   callback,
-				      gpointer              user_data);
-
-GIOStream *g_proxy_connect_finish    (GProxy               *proxy,
-				      GAsyncResult         *result,
-				      GError              **error);
-
-gboolean   g_proxy_supports_hostname (GProxy               *proxy);
-
-G_END_DECLS
-
-#endif /* __G_PROXY_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gproxyaddress.h b/GstreamerHelper/x86/include/glib-2.0/gio/gproxyaddress.h
deleted file mode 100644
index 8d51f11d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gproxyaddress.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PROXY_ADDRESS_H__
-#define __G_PROXY_ADDRESS_H__
-
-#include <gio/ginetsocketaddress.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_ADDRESS         (g_proxy_address_get_type ())
-#define G_PROXY_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_ADDRESS, GProxyAddress))
-#define G_PROXY_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_PROXY_ADDRESS, GProxyAddressClass))
-#define G_IS_PROXY_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_ADDRESS))
-#define G_IS_PROXY_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_PROXY_ADDRESS))
-#define G_PROXY_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_PROXY_ADDRESS, GProxyAddressClass))
-
-typedef struct _GProxyAddressClass   GProxyAddressClass;
-typedef struct _GProxyAddressPrivate GProxyAddressPrivate;
-
-struct _GProxyAddress
-{
-  GInetSocketAddress parent_instance;
-
-  /*< private >*/
-  GProxyAddressPrivate *priv;
-};
-
-struct _GProxyAddressClass
-{
-  GInetSocketAddressClass parent_class;
-};
-
-
-GType           g_proxy_address_get_type    (void) G_GNUC_CONST;
-
-GSocketAddress *g_proxy_address_new         (GInetAddress *inetaddr,
-					     guint16       port,
-					     const gchar  *protocol,
-					     const gchar  *dest_hostname,
-		                             guint16       dest_port,
-					     const gchar  *username,
-					     const gchar  *password);
-
-const gchar    *g_proxy_address_get_protocol                (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_2_34
-const gchar    *g_proxy_address_get_destination_protocol    (GProxyAddress *proxy);
-const gchar    *g_proxy_address_get_destination_hostname    (GProxyAddress *proxy);
-guint16         g_proxy_address_get_destination_port        (GProxyAddress *proxy);
-const gchar    *g_proxy_address_get_username                (GProxyAddress *proxy);
-const gchar    *g_proxy_address_get_password                (GProxyAddress *proxy);
-
-GLIB_AVAILABLE_IN_2_34
-const gchar    *g_proxy_address_get_uri                     (GProxyAddress *proxy);
-
-G_END_DECLS
-
-#endif /* __G_PROXY_ADDRESS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gproxyaddressenumerator.h b/GstreamerHelper/x86/include/glib-2.0/gio/gproxyaddressenumerator.h
deleted file mode 100644
index b38045f6..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gproxyaddressenumerator.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PROXY_ADDRESS_ENUMERATOR_H__
-#define __G_PROXY_ADDRESS_ENUMERATOR_H__
-
-#include <gio/gsocketaddressenumerator.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_ADDRESS_ENUMERATOR         (g_proxy_address_enumerator_get_type ())
-#define G_PROXY_ADDRESS_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumerator))
-#define G_PROXY_ADDRESS_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumeratorClass))
-#define G_IS_PROXY_ADDRESS_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR))
-#define G_IS_PROXY_ADDRESS_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_PROXY_ADDRESS_ENUMERATOR))
-#define G_PROXY_ADDRESS_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_PROXY_ADDRESS_ENUMERATOR, GProxyAddressEnumeratorClass))
-
-/**
- * GProxyAddressEnumerator:
- *
- * A subclass of #GSocketAddressEnumerator that takes another address
- * enumerator and wraps its results in #GProxyAddress<!-- -->es as
- * directed by the default #GProxyResolver.
- */
-
-typedef struct _GProxyAddressEnumeratorClass GProxyAddressEnumeratorClass;
-typedef struct _GProxyAddressEnumeratorPrivate GProxyAddressEnumeratorPrivate;
-
-struct _GProxyAddressEnumerator
-{
-  GSocketAddressEnumerator parent_instance;
-  GProxyAddressEnumeratorPrivate *priv;
-};
-
-struct _GProxyAddressEnumeratorClass
-{
-  GSocketAddressEnumeratorClass parent_class;
-
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-};
-
-GType           g_proxy_address_enumerator_get_type    (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PROXY_ADDRESS_ENUMERATOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gproxyresolver.h b/GstreamerHelper/x86/include/glib-2.0/gio/gproxyresolver.h
deleted file mode 100644
index 7d8d27de..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gproxyresolver.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_PROXY_RESOLVER_H__
-#define __G_PROXY_RESOLVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_PROXY_RESOLVER         (g_proxy_resolver_get_type ())
-#define G_PROXY_RESOLVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_PROXY_RESOLVER, GProxyResolver))
-#define G_IS_PROXY_RESOLVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_PROXY_RESOLVER))
-#define G_PROXY_RESOLVER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), G_TYPE_PROXY_RESOLVER, GProxyResolverInterface))
-
-/**
- * G_PROXY_RESOLVER_EXTENSION_POINT_NAME:
- *
- * Extension point for proxy resolving functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_PROXY_RESOLVER_EXTENSION_POINT_NAME "gio-proxy-resolver"
-
-typedef struct _GProxyResolverInterface GProxyResolverInterface;
-
-struct _GProxyResolverInterface {
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  gboolean (* is_supported)  (GProxyResolver       *resolver);
-
-  gchar	** (* lookup)        (GProxyResolver       *resolver,
-			      const gchar          *uri,
-			      GCancellable         *cancellable,
-			      GError              **error);
-
-  void     (* lookup_async)  (GProxyResolver       *resolver,
-			      const gchar          *uri,
-			      GCancellable         *cancellable,
-			      GAsyncReadyCallback   callback,
-			      gpointer              user_data);
-
-  gchar	** (* lookup_finish) (GProxyResolver       *resolver,
-			      GAsyncResult         *result,
-			      GError              **error);
-};
-
-GType		g_proxy_resolver_get_type       (void) G_GNUC_CONST;
-GProxyResolver *g_proxy_resolver_get_default    (void);
-
-gboolean        g_proxy_resolver_is_supported   (GProxyResolver       *resolver);
-gchar	      **g_proxy_resolver_lookup		(GProxyResolver       *resolver,
-						 const gchar          *uri,
-						 GCancellable         *cancellable,
-						 GError              **error);
-void		g_proxy_resolver_lookup_async   (GProxyResolver       *resolver,
-						 const gchar          *uri,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-gchar	      **g_proxy_resolver_lookup_finish  (GProxyResolver       *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-
-G_END_DECLS
-
-#endif /* __G_PROXY_RESOLVER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gremoteactiongroup.h b/GstreamerHelper/x86/include/glib-2.0/gio/gremoteactiongroup.h
deleted file mode 100644
index d2849e63..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gremoteactiongroup.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_REMOTE_ACTION_GROUP_H__
-#define __G_REMOTE_ACTION_GROUP_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-
-#define G_TYPE_REMOTE_ACTION_GROUP                          (g_remote_action_group_get_type ())
-#define G_REMOTE_ACTION_GROUP(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                             G_TYPE_REMOTE_ACTION_GROUP, GRemoteActionGroup))
-#define G_IS_REMOTE_ACTION_GROUP(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                             G_TYPE_REMOTE_ACTION_GROUP))
-#define G_REMOTE_ACTION_GROUP_GET_IFACE(inst)               (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                   \
-                                                             G_TYPE_REMOTE_ACTION_GROUP,                              \
-                                                             GRemoteActionGroupInterface))
-
-typedef struct _GRemoteActionGroupInterface                 GRemoteActionGroupInterface;
-
-struct _GRemoteActionGroupInterface
-{
-  GTypeInterface g_iface;
-
-  void (* activate_action_full)     (GRemoteActionGroup *remote,
-                                     const gchar        *action_name,
-                                     GVariant           *parameter,
-                                     GVariant           *platform_data);
-
-  void (* change_action_state_full) (GRemoteActionGroup *remote,
-                                     const gchar        *action_name,
-                                     GVariant           *value,
-                                     GVariant           *platform_data);
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType                   g_remote_action_group_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_remote_action_group_activate_action_full      (GRemoteActionGroup *remote,
-                                                                         const gchar        *action_name,
-                                                                         GVariant           *parameter,
-                                                                         GVariant           *platform_data);
-
-GLIB_AVAILABLE_IN_2_32
-void                    g_remote_action_group_change_action_state_full  (GRemoteActionGroup *remote,
-                                                                         const gchar        *action_name,
-                                                                         GVariant           *value,
-                                                                         GVariant           *platform_data);
-
-G_END_DECLS
-
-#endif /* __G_REMOTE_ACTION_GROUP_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gresolver.h b/GstreamerHelper/x86/include/glib-2.0/gio/gresolver.h
deleted file mode 100644
index ecd8e51d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gresolver.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_RESOLVER_H__
-#define __G_RESOLVER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_RESOLVER         (g_resolver_get_type ())
-#define G_RESOLVER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_RESOLVER, GResolver))
-#define G_RESOLVER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_RESOLVER, GResolverClass))
-#define G_IS_RESOLVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_RESOLVER))
-#define G_IS_RESOLVER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_RESOLVER))
-#define G_RESOLVER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_RESOLVER, GResolverClass))
-
-typedef struct _GResolverPrivate GResolverPrivate;
-typedef struct _GResolverClass   GResolverClass;
-
-struct _GResolver {
-  GObject parent_instance;
-
-  GResolverPrivate *priv;
-};
-
-struct _GResolverClass {
-  GObjectClass parent_class;
-
-  /* Signals */
-  void    ( *reload)                   (GResolver            *resolver);
-
-  /* Virtual methods */
-  GList * ( *lookup_by_name)           (GResolver            *resolver,
-					const gchar          *hostname,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_by_name_async)     (GResolver            *resolver,
-					const gchar          *hostname,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  GList * ( *lookup_by_name_finish)    (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  gchar * ( *lookup_by_address)        (GResolver            *resolver,
-					GInetAddress         *address,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_by_address_async)  (GResolver            *resolver,
-					GInetAddress         *address,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  gchar * ( *lookup_by_address_finish) (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  GList * ( *lookup_service)           (GResolver            *resolver,
-					const gchar          *rrname,
-					GCancellable         *cancellable,
-					GError              **error);
-  void    ( *lookup_service_async)     (GResolver            *resolver,
-					const gchar          *rrname,
-					GCancellable         *cancellable,
-					GAsyncReadyCallback   callback,
-					gpointer              user_data);
-  GList * ( *lookup_service_finish)    (GResolver            *resolver,
-					GAsyncResult         *result,
-					GError              **error);
-
-  GList * ( *lookup_records)           (GResolver            *resolver,
-                                        const gchar          *rrname,
-                                        GResolverRecordType   record_type,
-                                        GCancellable         *cancellable,
-                                        GError              **error);
-
-  void    ( *lookup_records_async)     (GResolver            *resolver,
-                                        const gchar          *rrname,
-                                        GResolverRecordType   record_type,
-                                        GCancellable         *cancellable,
-                                        GAsyncReadyCallback   callback,
-                                        gpointer              user_data);
-
-  GList * ( *lookup_records_finish)    (GResolver            *resolver,
-                                        GAsyncResult         *result,
-                                        GError              **error);
-
-  /* Padding for future expansion */
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-
-};
-
-GType      g_resolver_get_type                  (void) G_GNUC_CONST;
-GResolver *g_resolver_get_default               (void);
-void       g_resolver_set_default               (GResolver            *resolver);
-
-GList     *g_resolver_lookup_by_name            (GResolver            *resolver,
-						 const gchar          *hostname,
-						 GCancellable         *cancellable,
-						 GError              **error);
-void       g_resolver_lookup_by_name_async      (GResolver            *resolver,
-						 const gchar          *hostname,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-GList     *g_resolver_lookup_by_name_finish     (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-void       g_resolver_free_addresses            (GList                *addresses);
-
-gchar     *g_resolver_lookup_by_address         (GResolver            *resolver,
-						 GInetAddress         *address,
-						 GCancellable         *cancellable,
-						 GError              **error);
-void       g_resolver_lookup_by_address_async   (GResolver            *resolver,
-						 GInetAddress         *address,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-gchar     *g_resolver_lookup_by_address_finish  (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-GList     *g_resolver_lookup_service            (GResolver            *resolver,
-						 const gchar          *service,
-						 const gchar          *protocol,
-						 const gchar          *domain,
-						 GCancellable         *cancellable,
-						 GError              **error);
-void       g_resolver_lookup_service_async      (GResolver            *resolver,
-						 const gchar          *service,
-						 const gchar          *protocol,
-						 const gchar          *domain,
-						 GCancellable         *cancellable,
-						 GAsyncReadyCallback   callback,
-						 gpointer              user_data);
-GList     *g_resolver_lookup_service_finish     (GResolver            *resolver,
-						 GAsyncResult         *result,
-						 GError              **error);
-
-GLIB_AVAILABLE_IN_2_34
-GList     *g_resolver_lookup_records            (GResolver            *resolver,
-                                                 const gchar          *rrname,
-                                                 GResolverRecordType   record_type,
-                                                 GCancellable         *cancellable,
-                                                 GError              **error);
-GLIB_AVAILABLE_IN_2_34
-void       g_resolver_lookup_records_async      (GResolver            *resolver,
-                                                 const gchar          *rrname,
-                                                 GResolverRecordType   record_type,
-                                                 GCancellable         *cancellable,
-                                                 GAsyncReadyCallback   callback,
-                                                 gpointer              user_data);
-GLIB_AVAILABLE_IN_2_34
-GList     *g_resolver_lookup_records_finish     (GResolver            *resolver,
-                                                 GAsyncResult         *result,
-                                                 GError              **error);
-
-void       g_resolver_free_targets              (GList                *targets);
-
-/**
- * G_RESOLVER_ERROR:
- *
- * Error domain for #GResolver. Errors in this domain will be from the
- * #GResolverError enumeration. See #GError for more information on
- * error domains.
- */
-#define G_RESOLVER_ERROR (g_resolver_error_quark ())
-GQuark g_resolver_error_quark (void);
-
-G_END_DECLS
-
-#endif /* __G_RESOLVER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gresource.h b/GstreamerHelper/x86/include/glib-2.0/gio/gresource.h
deleted file mode 100644
index 15bfc8a4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gresource.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_RESOURCE_H__
-#define __G_RESOURCE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TYPE_RESOURCE:
- *
- * The #GType for #GResource.
- */
-#define G_TYPE_RESOURCE (g_resource_get_type ())
-
-
-/**
- * G_RESOURCE_ERROR:
- *
- * Error domain for #GResource. Errors in this domain will be from the
- * #GResourceError enumeration. See #GError for more information on
- * error domains.
- */
-#define G_RESOURCE_ERROR (g_resource_error_quark ())
-GQuark g_resource_error_quark (void);
-
-typedef struct _GStaticResource GStaticResource;
-
-struct _GStaticResource {
-  const guint8 *data;
-  gsize data_len;
-  GResource *resource;
-  GStaticResource *next;
-  gpointer padding;
-};
-
-GLIB_AVAILABLE_IN_2_32
-GType         g_resource_get_type            (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
-GResource *   g_resource_new_from_data       (GBytes                *data,
-					      GError               **error);
-GResource *   g_resource_ref                 (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_resource_unref               (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-GResource *   g_resource_load                (const gchar           *filename,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GInputStream *g_resource_open_stream         (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GBytes *      g_resource_lookup_data         (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-char **       g_resource_enumerate_children  (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean      g_resource_get_info            (GResource             *resource,
-					      const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      gsize                 *size,
-					      guint32               *flags,
-					      GError               **error);
-
-GLIB_AVAILABLE_IN_2_32
-void          g_resources_register           (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_resources_unregister         (GResource             *resource);
-GLIB_AVAILABLE_IN_2_32
-GInputStream *g_resources_open_stream        (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-GBytes *      g_resources_lookup_data        (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-char **       g_resources_enumerate_children (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      GError               **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean      g_resources_get_info           (const char            *path,
-					      GResourceLookupFlags   lookup_flags,
-					      gsize                 *size,
-					      guint32               *flags,
-					      GError               **error);
-
-
-GLIB_AVAILABLE_IN_2_32
-void          g_static_resource_init          (GStaticResource *static_resource);
-GLIB_AVAILABLE_IN_2_32
-void          g_static_resource_fini          (GStaticResource *static_resource);
-GLIB_AVAILABLE_IN_2_32
-GResource    *g_static_resource_get_resource  (GStaticResource *static_resource);
-
-G_END_DECLS
-
-#endif /* __G_RESOURCE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gseekable.h b/GstreamerHelper/x86/include/glib-2.0/gio/gseekable.h
deleted file mode 100644
index ba51eea5..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gseekable.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SEEKABLE_H__
-#define __G_SEEKABLE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SEEKABLE            (g_seekable_get_type ())
-#define G_SEEKABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_SEEKABLE, GSeekable))
-#define G_IS_SEEKABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_SEEKABLE))
-#define G_SEEKABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_SEEKABLE, GSeekableIface))
-
-/**
- * GSeekable:
- *
- * Seek object for streaming operations.
- **/
-typedef struct _GSeekableIface   GSeekableIface;
-
-/**
- * GSeekableIface:
- * @g_iface: The parent interface.
- * @tell: Tells the current location within a stream.
- * @can_seek: Checks if seeking is supported by the stream.
- * @seek: Seeks to a location within a stream.
- * @can_truncate: Checks if truncation is supported by the stream.
- * @truncate_fn: Truncates a stream.
- *
- * Provides an interface for implementing seekable functionality on I/O Streams.
- **/
-struct _GSeekableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  goffset     (* tell)	         (GSeekable    *seekable);
-
-  gboolean    (* can_seek)       (GSeekable    *seekable);
-  gboolean    (* seek)	         (GSeekable    *seekable,
-				  goffset       offset,
-				  GSeekType     type,
-				  GCancellable *cancellable,
-				  GError      **error);
-
-  gboolean    (* can_truncate)   (GSeekable    *seekable);
-  gboolean    (* truncate_fn)    (GSeekable    *seekable,
-				  goffset       offset,
-				  GCancellable *cancellable,
-				  GError       **error);
-
-  /* TODO: Async seek/truncate */
-};
-
-GType    g_seekable_get_type     (void) G_GNUC_CONST;
-
-goffset  g_seekable_tell         (GSeekable     *seekable);
-gboolean g_seekable_can_seek     (GSeekable     *seekable);
-gboolean g_seekable_seek         (GSeekable     *seekable,
-				  goffset        offset,
-				  GSeekType      type,
-				  GCancellable  *cancellable,
-				  GError       **error);
-gboolean g_seekable_can_truncate (GSeekable     *seekable);
-gboolean g_seekable_truncate     (GSeekable     *seekable,
-				  goffset        offset,
-				  GCancellable  *cancellable,
-				  GError       **error);
-
-G_END_DECLS
-
-
-#endif /* __G_SEEKABLE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsettings.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsettings.h
deleted file mode 100644
index 01f3e9e1..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsettings.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SETTINGS_H__
-#define __G_SETTINGS_H__
-
-#include <gio/gsettingsschema.h>
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SETTINGS                                     (g_settings_get_type ())
-#define G_SETTINGS(inst)                                    (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SETTINGS, GSettings))
-#define G_SETTINGS_CLASS(class)                             (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SETTINGS, GSettingsClass))
-#define G_IS_SETTINGS(inst)                                 (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_SETTINGS))
-#define G_IS_SETTINGS_CLASS(class)                          (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_SETTINGS))
-#define G_SETTINGS_GET_CLASS(inst)                          (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SETTINGS, GSettingsClass))
-
-typedef struct _GSettingsPrivate                            GSettingsPrivate;
-typedef struct _GSettingsClass                              GSettingsClass;
-
-struct _GSettingsClass
-{
-  GObjectClass parent_class;
-
-  /* Signals */
-  void        (*writable_changed)      (GSettings    *settings,
-                                        const gchar  *key);
-  void        (*changed)               (GSettings    *settings,
-                                        const gchar  *key);
-  gboolean    (*writable_change_event) (GSettings    *settings,
-                                        GQuark        key);
-  gboolean    (*change_event)          (GSettings    *settings,
-                                        const GQuark *keys,
-                                        gint          n_keys);
-
-  gpointer padding[20];
-};
-
-struct _GSettings
-{
-  GObject parent_instance;
-  GSettingsPrivate *priv;
-};
-
-
-GType                   g_settings_get_type                             (void);
-
-const gchar * const *   g_settings_list_schemas                         (void);
-const gchar * const *   g_settings_list_relocatable_schemas             (void);
-GSettings *             g_settings_new                                  (const gchar        *schema_id);
-GSettings *             g_settings_new_with_path                        (const gchar        *schema_id,
-                                                                         const gchar        *path);
-GSettings *             g_settings_new_with_backend                     (const gchar        *schema_id,
-                                                                         GSettingsBackend   *backend);
-GSettings *             g_settings_new_with_backend_and_path            (const gchar        *schema_id,
-                                                                         GSettingsBackend   *backend,
-                                                                         const gchar        *path);
-GLIB_AVAILABLE_IN_2_32
-GSettings *             g_settings_new_full                             (GSettingsSchema    *schema,
-                                                                         GSettingsBackend   *backend,
-                                                                         const gchar        *path);
-gchar **                g_settings_list_children                        (GSettings          *settings);
-gchar **                g_settings_list_keys                            (GSettings          *settings);
-GVariant *              g_settings_get_range                            (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_range_check                          (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         GVariant           *value);
-
-gboolean                g_settings_set_value                            (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         GVariant           *value);
-GVariant *              g_settings_get_value                            (GSettings          *settings,
-                                                                         const gchar        *key);
-
-gboolean                g_settings_set                                  (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *format,
-                                                                         ...);
-void                    g_settings_get                                  (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *format,
-                                                                         ...);
-void                    g_settings_reset                                (GSettings          *settings,
-                                                                         const gchar        *key);
-
-gint                    g_settings_get_int                              (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_int                              (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gint                value);
-guint                   g_settings_get_uint                             (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_uint                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         guint               value);
-gchar *                 g_settings_get_string                           (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_string                           (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar        *value);
-gboolean                g_settings_get_boolean                          (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_boolean                          (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gboolean            value);
-gdouble                 g_settings_get_double                           (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_double                           (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gdouble             value);
-gchar **                g_settings_get_strv                             (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_strv                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         const gchar *const *value);
-gint                    g_settings_get_enum                             (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_enum                             (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         gint                value);
-guint                   g_settings_get_flags                            (GSettings          *settings,
-                                                                         const gchar        *key);
-gboolean                g_settings_set_flags                            (GSettings          *settings,
-                                                                         const gchar        *key,
-                                                                         guint               value);
-GSettings *             g_settings_get_child                            (GSettings          *settings,
-                                                                         const gchar        *name);
-
-gboolean                g_settings_is_writable                          (GSettings          *settings,
-                                                                         const gchar        *name);
-
-void                    g_settings_delay                                (GSettings          *settings);
-void                    g_settings_apply                                (GSettings          *settings);
-void                    g_settings_revert                               (GSettings          *settings);
-gboolean                g_settings_get_has_unapplied                    (GSettings          *settings);
-void                    g_settings_sync                                 (void);
-
-/**
- * GSettingsBindSetMapping:
- * @value: a #GValue containing the property value to map
- * @expected_type: the #GVariantType to create
- * @user_data: user data that was specified when the binding was created
- *
- * The type for the function that is used to convert an object property
- * value to a #GVariant for storing it in #GSettings.
- *
- * Returns: a new #GVariant holding the data from @value,
- *     or %NULL in case of an error
- */
-typedef GVariant *    (*GSettingsBindSetMapping)                        (const GValue       *value,
-                                                                         const GVariantType *expected_type,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsBindGetMapping:
- * @value: return location for the property value
- * @variant: the #GVariant
- * @user_data: user data that was specified when the binding was created
- *
- * The type for the function that is used to convert from #GSettings to
- * an object property. The @value is already initialized to hold values
- * of the appropriate type.
- *
- * Returns: %TRUE if the conversion succeeded, %FALSE in case of an error
- */
-typedef gboolean      (*GSettingsBindGetMapping)                        (GValue             *value,
-                                                                         GVariant           *variant,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsGetMapping:
- * @value: the #GVariant to map, or %NULL
- * @result: (out): the result of the mapping
- * @user_data: (closure): the user data that was passed to
- * g_settings_get_mapped()
- *
- * The type of the function that is used to convert from a value stored
- * in a #GSettings to a value that is useful to the application.
- *
- * If the value is successfully mapped, the result should be stored at
- * @result and %TRUE returned.  If mapping fails (for example, if @value
- * is not in the right format) then %FALSE should be returned.
- *
- * If @value is %NULL then it means that the mapping function is being
- * given a "last chance" to successfully return a valid value.  %TRUE
- * must be returned in this case.
- *
- * Returns: %TRUE if the conversion succeeded, %FALSE in case of an error
- **/
-typedef gboolean      (*GSettingsGetMapping)                            (GVariant           *value,
-                                                                         gpointer           *result,
-                                                                         gpointer            user_data);
-
-/**
- * GSettingsBindFlags:
- * @G_SETTINGS_BIND_DEFAULT: Equivalent to <literal>G_SETTINGS_BIND_GET|G_SETTINGS_BIND_SET</literal>
- * @G_SETTINGS_BIND_GET: Update the #GObject property when the setting changes.
- *     It is an error to use this flag if the property is not writable.
- * @G_SETTINGS_BIND_SET: Update the setting when the #GObject property changes.
- *     It is an error to use this flag if the property is not readable.
- * @G_SETTINGS_BIND_NO_SENSITIVITY: Do not try to bind a "sensitivity" property to the writability of the setting
- * @G_SETTINGS_BIND_GET_NO_CHANGES: When set in addition to #G_SETTINGS_BIND_GET, set the #GObject property
- *     value initially from the setting, but do not listen for changes of the setting
- * @G_SETTINGS_BIND_INVERT_BOOLEAN: When passed to g_settings_bind(), uses a pair of mapping functions that invert
- *     the boolean value when mapping between the setting and the property.  The setting and property must both
- *     be booleans.  You cannot pass this flag to g_settings_bind_with_mapping().
- *
- * Flags used when creating a binding. These flags determine in which
- * direction the binding works. The default is to synchronize in both
- * directions.
- */
-typedef enum
-{
-  G_SETTINGS_BIND_DEFAULT,
-  G_SETTINGS_BIND_GET            = (1<<0),
-  G_SETTINGS_BIND_SET            = (1<<1),
-  G_SETTINGS_BIND_NO_SENSITIVITY = (1<<2),
-  G_SETTINGS_BIND_GET_NO_CHANGES = (1<<3),
-  G_SETTINGS_BIND_INVERT_BOOLEAN = (1<<4)
-} GSettingsBindFlags;
-
-void                    g_settings_bind                                 (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         GSettingsBindFlags       flags);
-void                    g_settings_bind_with_mapping                    (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         GSettingsBindFlags       flags,
-                                                                         GSettingsBindGetMapping  get_mapping,
-                                                                         GSettingsBindSetMapping  set_mapping,
-                                                                         gpointer                 user_data,
-                                                                         GDestroyNotify           destroy);
-void                    g_settings_bind_writable                        (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         gpointer                 object,
-                                                                         const gchar             *property,
-                                                                         gboolean                 inverted);
-void                    g_settings_unbind                               (gpointer                 object,
-                                                                         const gchar             *property);
-
-GLIB_AVAILABLE_IN_2_32
-GAction *               g_settings_create_action                        (GSettings               *settings,
-                                                                         const gchar             *key);
-
-gpointer                g_settings_get_mapped                           (GSettings               *settings,
-                                                                         const gchar             *key,
-                                                                         GSettingsGetMapping      mapping,
-                                                                         gpointer                 user_data);
-
-G_END_DECLS
-
-#endif  /* __G_SETTINGS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsettingsbackend.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsettingsbackend.h
deleted file mode 100644
index e6741873..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsettingsbackend.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- * Copyright © 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Matthias Clasen <mclasen@redhat.com>
- */
-
-#ifndef __G_SETTINGS_BACKEND_H__
-#define __G_SETTINGS_BACKEND_H__
-
-#if !defined (G_SETTINGS_ENABLE_BACKEND) && !defined (GIO_COMPILATION)
-#error "You must define G_SETTINGS_ENABLE_BACKEND before including <gio/gsettingsbackend.h>."
-#endif
-
-#define __GIO_GIO_H_INSIDE__
-#include <gio/giotypes.h>
-#undef __GIO_GIO_H_INSIDE__
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SETTINGS_BACKEND                             (g_settings_backend_get_type ())
-#define G_SETTINGS_BACKEND(inst)                            (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackend))
-#define G_SETTINGS_BACKEND_CLASS(class)                     (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackendClass))
-#define G_IS_SETTINGS_BACKEND(inst)                         (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SETTINGS_BACKEND))
-#define G_IS_SETTINGS_BACKEND_CLASS(class)                  (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SETTINGS_BACKEND))
-#define G_SETTINGS_BACKEND_GET_CLASS(inst)                  (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SETTINGS_BACKEND, GSettingsBackendClass))
-
-/**
- * G_SETTINGS_BACKEND_EXTENSION_POINT_NAME:
- *
- * Extension point for #GSettingsBackend functionality.
- **/
-#define G_SETTINGS_BACKEND_EXTENSION_POINT_NAME "gsettings-backend"
-
-/**
- * GSettingsBackend:
- *
- * An implementation of a settings storage repository.
- **/
-typedef struct _GSettingsBackendPrivate                     GSettingsBackendPrivate;
-typedef struct _GSettingsBackendClass                       GSettingsBackendClass;
-
-struct _GSettingsBackendClass
-{
-  GObjectClass parent_class;
-
-  GVariant *    (*read)             (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     const GVariantType  *expected_type,
-                                     gboolean             default_value);
-
-  gboolean      (*get_writable)     (GSettingsBackend    *backend,
-                                     const gchar         *key);
-
-  gboolean      (*write)            (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     GVariant            *value,
-                                     gpointer             origin_tag);
-  gboolean      (*write_tree)       (GSettingsBackend    *backend,
-                                     GTree               *tree,
-                                     gpointer             origin_tag);
-  void          (*reset)            (GSettingsBackend    *backend,
-                                     const gchar         *key,
-                                     gpointer             origin_tag);
-
-  void          (*subscribe)        (GSettingsBackend    *backend,
-                                     const gchar         *name);
-  void          (*unsubscribe)      (GSettingsBackend    *backend,
-                                     const gchar         *name);
-  void          (*sync)             (GSettingsBackend    *backend);
-
-  GPermission * (*get_permission)   (GSettingsBackend    *backend,
-                                     const gchar         *path);
-
-  gpointer padding[24];
-};
-
-struct _GSettingsBackend
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GSettingsBackendPrivate *priv;
-};
-
-GType                   g_settings_backend_get_type                     (void);
-
-void                    g_settings_backend_changed                      (GSettingsBackend    *backend,
-                                                                         const gchar         *key,
-                                                                         gpointer             origin_tag);
-void                    g_settings_backend_path_changed                 (GSettingsBackend    *backend,
-                                                                         const gchar         *path,
-                                                                         gpointer             origin_tag);
-void                    g_settings_backend_flatten_tree                 (GTree               *tree,
-                                                                         gchar              **path,
-                                                                         const gchar       ***keys,
-                                                                         GVariant          ***values);
-void                    g_settings_backend_keys_changed                 (GSettingsBackend    *backend,
-                                                                         const gchar         *path,
-                                                                         gchar const * const *items,
-                                                                         gpointer             origin_tag);
-
-void                    g_settings_backend_path_writable_changed        (GSettingsBackend    *backend,
-                                                                         const gchar         *path);
-void                    g_settings_backend_writable_changed             (GSettingsBackend    *backend,
-                                                                         const gchar         *key);
-void                    g_settings_backend_changed_tree                 (GSettingsBackend    *backend,
-                                                                         GTree               *tree,
-                                                                         gpointer             origin_tag);
-
-GSettingsBackend *      g_settings_backend_get_default                  (void);
-
-GSettingsBackend *      g_keyfile_settings_backend_new                  (const gchar         *filename,
-                                                                         const gchar         *root_path,
-                                                                         const gchar         *root_group);
-
-GSettingsBackend *      g_null_settings_backend_new                     (void);
-
-GSettingsBackend *      g_memory_settings_backend_new                   (void);
-
-G_END_DECLS
-
-#endif /* __G_SETTINGS_BACKEND_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsettingsschema.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsettingsschema.h
deleted file mode 100644
index 277907da..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsettingsschema.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_SETTINGS_SCHEMA_H__
-#define __G_SETTINGS_SCHEMA_H__
-
-#include <glib-object.h>
-
-typedef struct _GSettingsSchemaSource                       GSettingsSchemaSource;
-typedef struct _GSettingsSchema                             GSettingsSchema;
-
-#define                 G_TYPE_SETTINGS_SCHEMA_SOURCE                   (g_settings_schema_source_get_type ())
-GLIB_AVAILABLE_IN_2_32
-GType                   g_settings_schema_source_get_type               (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchemaSource * g_settings_schema_source_get_default            (void);
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchemaSource * g_settings_schema_source_ref                    (GSettingsSchemaSource  *source);
-GLIB_AVAILABLE_IN_2_32
-void                    g_settings_schema_source_unref                  (GSettingsSchemaSource  *source);
-
-GSettingsSchemaSource * g_settings_schema_source_new_from_directory     (const gchar            *directory,
-                                                                         GSettingsSchemaSource  *parent,
-                                                                         gboolean                trusted,
-                                                                         GError                **error);
-
-GSettingsSchema *       g_settings_schema_source_lookup                 (GSettingsSchemaSource  *source,
-                                                                         const gchar            *schema_id,
-                                                                         gboolean                recursive);
-
-#define                 G_TYPE_SETTINGS_SCHEMA                          (g_settings_schema_get_type ())
-GLIB_AVAILABLE_IN_2_32
-GType                   g_settings_schema_get_type                      (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-GSettingsSchema *       g_settings_schema_ref                           (GSettingsSchema        *schema);
-GLIB_AVAILABLE_IN_2_32
-void                    g_settings_schema_unref                         (GSettingsSchema        *schema);
-
-const gchar *           g_settings_schema_get_id                        (GSettingsSchema        *schema);
-const gchar *           g_settings_schema_get_path                      (GSettingsSchema        *schema);
-
-#endif /* __G_SETTINGS_SCHEMA_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleaction.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleaction.h
deleted file mode 100644
index 7570fb4e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleaction.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_ACTION_H__
-#define __G_SIMPLE_ACTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ACTION                                (g_simple_action_get_type ())
-#define G_SIMPLE_ACTION(inst)                               (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION, GSimpleAction))
-#define G_IS_SIMPLE_ACTION(inst)                            (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION))
-
-GType                   g_simple_action_get_type                        (void) G_GNUC_CONST;
-
-GSimpleAction *         g_simple_action_new                             (const gchar        *name,
-                                                                         const GVariantType *parameter_type);
-
-GSimpleAction *         g_simple_action_new_stateful                    (const gchar        *name,
-                                                                         const GVariantType *parameter_type,
-                                                                         GVariant           *state);
-
-void                    g_simple_action_set_enabled                     (GSimpleAction      *simple,
-                                                                         gboolean            enabled);
-
-void                    g_simple_action_set_state                       (GSimpleAction      *simple,
-                                                                         GVariant           *value);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_ACTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleactiongroup.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleactiongroup.h
deleted file mode 100644
index 7de37bc0..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleactiongroup.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_ACTION_GROUP_H__
-#define __G_SIMPLE_ACTION_GROUP_H__
-
-#include "gactiongroup.h"
-#include "gactionmap.h"
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ACTION_GROUP                          (g_simple_action_group_get_type ())
-#define G_SIMPLE_ACTION_GROUP(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroup))
-#define G_SIMPLE_ACTION_GROUP_CLASS(class)                  (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroupClass))
-#define G_IS_SIMPLE_ACTION_GROUP(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP))
-#define G_IS_SIMPLE_ACTION_GROUP_CLASS(class)               (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP))
-#define G_SIMPLE_ACTION_GROUP_GET_CLASS(inst)               (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SIMPLE_ACTION_GROUP, GSimpleActionGroupClass))
-
-typedef struct _GSimpleActionGroupPrivate                   GSimpleActionGroupPrivate;
-typedef struct _GSimpleActionGroupClass                     GSimpleActionGroupClass;
-
-/**
- * GSimpleActionGroup:
- *
- * The #GSimpleActionGroup structure contains private data and should only be accessed using the provided API.
- *
- * Since: 2.28
- */
-struct _GSimpleActionGroup
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  GSimpleActionGroupPrivate *priv;
-};
-
-struct _GSimpleActionGroupClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< private >*/
-  gpointer padding[12];
-};
-
-GType                   g_simple_action_group_get_type                  (void) G_GNUC_CONST;
-
-GSimpleActionGroup *    g_simple_action_group_new                       (void);
-
-GAction *               g_simple_action_group_lookup                    (GSimpleActionGroup *simple,
-                                                                         const gchar        *action_name);
-
-void                    g_simple_action_group_insert                    (GSimpleActionGroup *simple,
-                                                                         GAction            *action);
-
-void                    g_simple_action_group_remove                    (GSimpleActionGroup *simple,
-                                                                         const gchar        *action_name);
-
-void                    g_simple_action_group_add_entries               (GSimpleActionGroup *simple,
-                                                                         const GActionEntry *entries,
-                                                                         gint                n_entries,
-                                                                         gpointer            user_data);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_ACTION_GROUP_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleasyncresult.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleasyncresult.h
deleted file mode 100644
index 74976301..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsimpleasyncresult.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_ASYNC_RESULT_H__
-#define __G_SIMPLE_ASYNC_RESULT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_ASYNC_RESULT         (g_simple_async_result_get_type ())
-#define G_SIMPLE_ASYNC_RESULT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResult))
-#define G_SIMPLE_ASYNC_RESULT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResultClass))
-#define G_IS_SIMPLE_ASYNC_RESULT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SIMPLE_ASYNC_RESULT))
-#define G_IS_SIMPLE_ASYNC_RESULT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SIMPLE_ASYNC_RESULT))
-#define G_SIMPLE_ASYNC_RESULT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SIMPLE_ASYNC_RESULT, GSimpleAsyncResultClass))
-
-/**
- * GSimpleAsyncResult:
- *
- * A simple implementation of #GAsyncResult.
- **/
-typedef struct _GSimpleAsyncResultClass   GSimpleAsyncResultClass;
-
-
-GType               g_simple_async_result_get_type         (void) G_GNUC_CONST;
-
-GSimpleAsyncResult *g_simple_async_result_new              (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    gpointer                 source_tag);
-GSimpleAsyncResult *g_simple_async_result_new_error        (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    ...) G_GNUC_PRINTF (6, 7);
-GSimpleAsyncResult *g_simple_async_result_new_from_error   (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    const GError            *error);
-GSimpleAsyncResult *g_simple_async_result_new_take_error   (GObject                 *source_object,
-							    GAsyncReadyCallback      callback,
-							    gpointer                 user_data,
-							    GError                  *error);
-
-void                g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult      *simple,
-                                                               gpointer                 op_res,
-                                                               GDestroyNotify           destroy_op_res);
-gpointer            g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult      *simple);
-
-void                g_simple_async_result_set_op_res_gssize   (GSimpleAsyncResult      *simple,
-                                                               gssize                   op_res);
-gssize              g_simple_async_result_get_op_res_gssize   (GSimpleAsyncResult      *simple);
-
-void                g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult      *simple,
-                                                               gboolean                 op_res);
-gboolean            g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult      *simple);
-
-
-
-GLIB_AVAILABLE_IN_2_32
-void                g_simple_async_result_set_check_cancellable (GSimpleAsyncResult *simple,
-                                                                 GCancellable       *check_cancellable);
-gpointer            g_simple_async_result_get_source_tag   (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult      *simple,
-								   gboolean          handle_cancellation);
-void                g_simple_async_result_complete         (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_complete_in_idle (GSimpleAsyncResult      *simple);
-void                g_simple_async_result_run_in_thread    (GSimpleAsyncResult      *simple,
-							    GSimpleAsyncThreadFunc   func,
-							    int                      io_priority,
-							    GCancellable            *cancellable);
-void                g_simple_async_result_set_from_error   (GSimpleAsyncResult      *simple,
-							    const GError            *error);
-void                g_simple_async_result_take_error       (GSimpleAsyncResult      *simple,
-							    GError            *error);
-gboolean            g_simple_async_result_propagate_error  (GSimpleAsyncResult      *simple,
-							    GError                 **dest);
-void                g_simple_async_result_set_error        (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    ...) G_GNUC_PRINTF (4, 5);
-void                g_simple_async_result_set_error_va     (GSimpleAsyncResult      *simple,
-							    GQuark                   domain,
-							    gint                     code,
-							    const char              *format,
-							    va_list                  args);
-gboolean            g_simple_async_result_is_valid         (GAsyncResult            *result,
-                                                            GObject                 *source,
-                                                            gpointer                 source_tag);
-
-void g_simple_async_report_error_in_idle  (GObject            *object,
-					   GAsyncReadyCallback callback,
-					   gpointer            user_data,
-					   GQuark              domain,
-					   gint                code,
-					   const char         *format,
-					   ...);
-void g_simple_async_report_gerror_in_idle (GObject            *object,
-					   GAsyncReadyCallback callback,
-					   gpointer            user_data,
-					   const GError       *error);
-void g_simple_async_report_take_gerror_in_idle (GObject            *object,
-                                                GAsyncReadyCallback callback,
-                                                gpointer            user_data,
-                                                GError             *error);
-
-G_END_DECLS
-
-
-
-#endif /* __G_SIMPLE_ASYNC_RESULT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsimplepermission.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsimplepermission.h
deleted file mode 100644
index 367fe895..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsimplepermission.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SIMPLE_PERMISSION_H__
-#define __G_SIMPLE_PERMISSION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SIMPLE_PERMISSION      (g_simple_permission_get_type ())
-#define G_SIMPLE_PERMISSION(inst)     (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
-                                       G_TYPE_SIMPLE_PERMISSION,             \
-                                       GSimplePermission))
-#define G_IS_SIMPLE_PERMISSION(inst)  (G_TYPE_CHECK_INSTANCE_TYPE ((inst),   \
-                                       G_TYPE_SIMPLE_PERMISSION))
-
-GType                   g_simple_permission_get_type            (void);
-GPermission *           g_simple_permission_new                 (gboolean allowed);
-
-G_END_DECLS
-
-#endif /* __G_SIMPLE_PERMISSION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocket.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocket.h
deleted file mode 100644
index 29ba44f3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocket.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_H__
-#define __G_SOCKET_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET                                       (g_socket_get_type ())
-#define G_SOCKET(inst)                                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET, GSocket))
-#define G_SOCKET_CLASS(class)                               (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET, GSocketClass))
-#define G_IS_SOCKET(inst)                                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET))
-#define G_IS_SOCKET_CLASS(class)                            (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET))
-#define G_SOCKET_GET_CLASS(inst)                            (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET, GSocketClass))
-
-typedef struct _GSocketPrivate                              GSocketPrivate;
-typedef struct _GSocketClass                                GSocketClass;
-
-struct _GSocketClass
-{
-  GObjectClass parent_class;
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-  void (*_g_reserved8) (void);
-  void (*_g_reserved9) (void);
-  void (*_g_reserved10) (void);
-};
-
-struct _GSocket
-{
-  GObject parent_instance;
-  GSocketPrivate *priv;
-};
-
-GType                  g_socket_get_type                (void) G_GNUC_CONST;
-GSocket *              g_socket_new                     (GSocketFamily            family,
-							 GSocketType              type,
-							 GSocketProtocol          protocol,
-							 GError                 **error);
-GSocket *              g_socket_new_from_fd             (gint                     fd,
-							 GError                 **error);
-int                    g_socket_get_fd                  (GSocket                 *socket);
-GSocketFamily          g_socket_get_family              (GSocket                 *socket);
-GSocketType            g_socket_get_socket_type         (GSocket                 *socket);
-GSocketProtocol        g_socket_get_protocol            (GSocket                 *socket);
-GSocketAddress *       g_socket_get_local_address       (GSocket                 *socket,
-							 GError                 **error);
-GSocketAddress *       g_socket_get_remote_address      (GSocket                 *socket,
-							 GError                 **error);
-void                   g_socket_set_blocking            (GSocket                 *socket,
-							 gboolean                 blocking);
-gboolean               g_socket_get_blocking            (GSocket                 *socket);
-void                   g_socket_set_keepalive           (GSocket                 *socket,
-							 gboolean                 keepalive);
-gboolean               g_socket_get_keepalive           (GSocket                 *socket);
-gint                   g_socket_get_listen_backlog      (GSocket                 *socket);
-void                   g_socket_set_listen_backlog      (GSocket                 *socket,
-							 gint                     backlog);
-guint                  g_socket_get_timeout             (GSocket                 *socket);
-void                   g_socket_set_timeout             (GSocket                 *socket,
-							 guint                    timeout);
-
-GLIB_AVAILABLE_IN_2_32
-guint                  g_socket_get_ttl                 (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_ttl                 (GSocket                 *socket,
-                                                         guint                    ttl);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_get_broadcast           (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_broadcast           (GSocket                 *socket,
-                                                         gboolean		  broadcast);
-
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_get_multicast_loopback  (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_multicast_loopback  (GSocket                 *socket,
-                                                         gboolean		  loopback);
-GLIB_AVAILABLE_IN_2_32
-guint                  g_socket_get_multicast_ttl       (GSocket                 *socket);
-GLIB_AVAILABLE_IN_2_32
-void                   g_socket_set_multicast_ttl       (GSocket                 *socket,
-                                                         guint                    ttl);
-gboolean               g_socket_is_connected            (GSocket                 *socket);
-gboolean               g_socket_bind                    (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 gboolean                 allow_reuse,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_join_multicast_group    (GSocket                 *socket,
-                                                         GInetAddress            *group,
-                                                         gboolean                 source_specific,
-                                                         const gchar             *iface,
-                                                         GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_leave_multicast_group   (GSocket                 *socket,
-                                                         GInetAddress            *group,
-                                                         gboolean                 source_specific,
-                                                         const gchar             *iface,
-                                                         GError                 **error);
-gboolean               g_socket_connect                 (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gboolean               g_socket_check_connect_result    (GSocket                 *socket,
-							 GError                 **error);
-
-gssize                 g_socket_get_available_bytes     (GSocket                 *socket);
-
-GIOCondition           g_socket_condition_check         (GSocket                 *socket,
-							 GIOCondition             condition);
-gboolean               g_socket_condition_wait          (GSocket                 *socket,
-							 GIOCondition             condition,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GLIB_AVAILABLE_IN_2_32
-gboolean               g_socket_condition_timed_wait    (GSocket                 *socket,
-							 GIOCondition             condition,
-							 gint64                   timeout,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-GSocket *              g_socket_accept                  (GSocket                 *socket,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gboolean               g_socket_listen                  (GSocket                 *socket,
-							 GError                 **error);
-gssize                 g_socket_receive                 (GSocket                 *socket,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_receive_from            (GSocket                 *socket,
-							 GSocketAddress         **address,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_send                    (GSocket                 *socket,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_send_to                 (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_receive_message         (GSocket                 *socket,
-							 GSocketAddress         **address,
-							 GInputVector            *vectors,
-							 gint                     num_vectors,
-							 GSocketControlMessage ***messages,
-							 gint                    *num_messages,
-							 gint                    *flags,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_send_message            (GSocket                 *socket,
-							 GSocketAddress          *address,
-							 GOutputVector           *vectors,
-							 gint                     num_vectors,
-							 GSocketControlMessage  **messages,
-							 gint                     num_messages,
-							 gint                     flags,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gboolean               g_socket_close                   (GSocket                 *socket,
-							 GError                 **error);
-gboolean               g_socket_shutdown                (GSocket                 *socket,
-							 gboolean                 shutdown_read,
-							 gboolean                 shutdown_write,
-							 GError                 **error);
-gboolean               g_socket_is_closed               (GSocket                 *socket);
-GSource *              g_socket_create_source           (GSocket                 *socket,
-							 GIOCondition             condition,
-							 GCancellable            *cancellable);
-gboolean               g_socket_speaks_ipv4             (GSocket                 *socket);
-GCredentials          *g_socket_get_credentials         (GSocket                 *socket,
-                                                         GError                 **error);
-
-gssize                 g_socket_receive_with_blocking   (GSocket                 *socket,
-							 gchar                   *buffer,
-							 gsize                    size,
-							 gboolean                 blocking,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-gssize                 g_socket_send_with_blocking      (GSocket                 *socket,
-							 const gchar             *buffer,
-							 gsize                    size,
-							 gboolean                 blocking,
-							 GCancellable            *cancellable,
-							 GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketaddress.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocketaddress.h
deleted file mode 100644
index 356e2b05..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketaddress.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_ADDRESS_H__
-#define __G_SOCKET_ADDRESS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_ADDRESS         (g_socket_address_get_type ())
-#define G_SOCKET_ADDRESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SOCKET_ADDRESS, GSocketAddress))
-#define G_SOCKET_ADDRESS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SOCKET_ADDRESS, GSocketAddressClass))
-#define G_IS_SOCKET_ADDRESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SOCKET_ADDRESS))
-#define G_IS_SOCKET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SOCKET_ADDRESS))
-#define G_SOCKET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SOCKET_ADDRESS, GSocketAddressClass))
-
-typedef struct _GSocketAddressClass   GSocketAddressClass;
-
-struct _GSocketAddress
-{
-  GObject parent_instance;
-};
-
-struct _GSocketAddressClass
-{
-  GObjectClass parent_class;
-
-  GSocketFamily  (*get_family)      (GSocketAddress *address);
-
-  gssize         (*get_native_size) (GSocketAddress *address);
-
-  gboolean       (*to_native)       (GSocketAddress *address,
-                                     gpointer        dest,
-                                     gsize           destlen,
-				     GError        **error);
-};
-
-GType                 g_socket_address_get_type        (void) G_GNUC_CONST;
-
-GSocketFamily         g_socket_address_get_family      (GSocketAddress *address);
-
-GSocketAddress *      g_socket_address_new_from_native (gpointer        native,
-                                                        gsize           len);
-
-gboolean              g_socket_address_to_native       (GSocketAddress *address,
-                                                        gpointer        dest,
-                                                        gsize           destlen,
-							GError        **error);
-
-gssize                g_socket_address_get_native_size (GSocketAddress *address);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_ADDRESS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketaddressenumerator.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocketaddressenumerator.h
deleted file mode 100644
index c69be2f3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketaddressenumerator.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_ADDRESS_ENUMERATOR_H__
-#define __G_SOCKET_ADDRESS_ENUMERATOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_ADDRESS_ENUMERATOR         (g_socket_address_enumerator_get_type ())
-#define G_SOCKET_ADDRESS_ENUMERATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumerator))
-#define G_SOCKET_ADDRESS_ENUMERATOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumeratorClass))
-#define G_IS_SOCKET_ADDRESS_ENUMERATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR))
-#define G_IS_SOCKET_ADDRESS_ENUMERATOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_SOCKET_ADDRESS_ENUMERATOR))
-#define G_SOCKET_ADDRESS_ENUMERATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_SOCKET_ADDRESS_ENUMERATOR, GSocketAddressEnumeratorClass))
-
-/**
- * GSocketAddressEnumerator:
- *
- * Enumerator type for objects that contain or generate
- * #GSocketAddress<!-- -->es.
- */
-typedef struct _GSocketAddressEnumeratorClass GSocketAddressEnumeratorClass;
-
-struct _GSocketAddressEnumerator
-{
-  GObject parent_instance;
-
-};
-
-struct _GSocketAddressEnumeratorClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  GSocketAddress * (* next)        (GSocketAddressEnumerator  *enumerator,
-				    GCancellable              *cancellable,
-				    GError                   **error);
-
-  void             (* next_async)  (GSocketAddressEnumerator  *enumerator,
-				    GCancellable              *cancellable,
-				    GAsyncReadyCallback        callback,
-				    gpointer                   user_data);
-  GSocketAddress * (* next_finish) (GSocketAddressEnumerator  *enumerator,
-				    GAsyncResult              *result,
-				    GError                   **error);
-};
-
-GType           g_socket_address_enumerator_get_type        (void) G_GNUC_CONST;
-
-GSocketAddress *g_socket_address_enumerator_next        (GSocketAddressEnumerator  *enumerator,
-							 GCancellable              *cancellable,
-							 GError                   **error);
-
-void            g_socket_address_enumerator_next_async  (GSocketAddressEnumerator  *enumerator,
-							 GCancellable              *cancellable,
-							 GAsyncReadyCallback        callback,
-							 gpointer                   user_data);
-GSocketAddress *g_socket_address_enumerator_next_finish (GSocketAddressEnumerator  *enumerator,
-							 GAsyncResult              *result,
-							 GError                   **error);
-
-G_END_DECLS
-
-
-#endif /* __G_SOCKET_ADDRESS_ENUMERATOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketclient.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocketclient.h
deleted file mode 100644
index 216310b4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketclient.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_CLIENT_H__
-#define __G_SOCKET_CLIENT_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CLIENT                                (g_socket_client_get_type ())
-#define G_SOCKET_CLIENT(inst)                               (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClient))
-#define G_SOCKET_CLIENT_CLASS(class)                        (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClientClass))
-#define G_IS_SOCKET_CLIENT(inst)                            (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CLIENT))
-#define G_IS_SOCKET_CLIENT_CLASS(class)                     (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CLIENT))
-#define G_SOCKET_CLIENT_GET_CLASS(inst)                     (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CLIENT, GSocketClientClass))
-
-typedef struct _GSocketClientPrivate                        GSocketClientPrivate;
-typedef struct _GSocketClientClass                          GSocketClientClass;
-
-struct _GSocketClientClass
-{
-  GObjectClass parent_class;
-
-  void (* event) (GSocketClient       *client,
-		  GSocketClientEvent  event,
-		  GSocketConnectable  *connectable,
-		  GIOStream           *connection);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-};
-
-struct _GSocketClient
-{
-  GObject parent_instance;
-  GSocketClientPrivate *priv;
-};
-
-GType                   g_socket_client_get_type                        (void) G_GNUC_CONST;
-
-GSocketClient          *g_socket_client_new                             (void);
-
-GSocketFamily           g_socket_client_get_family                      (GSocketClient        *client);
-void                    g_socket_client_set_family                      (GSocketClient        *client,
-									 GSocketFamily         family);
-GSocketType             g_socket_client_get_socket_type                 (GSocketClient        *client);
-void                    g_socket_client_set_socket_type                 (GSocketClient        *client,
-									 GSocketType           type);
-GSocketProtocol         g_socket_client_get_protocol                    (GSocketClient        *client);
-void                    g_socket_client_set_protocol                    (GSocketClient        *client,
-									 GSocketProtocol       protocol);
-GSocketAddress         *g_socket_client_get_local_address               (GSocketClient        *client);
-void                    g_socket_client_set_local_address               (GSocketClient        *client,
-									 GSocketAddress       *address);
-guint                   g_socket_client_get_timeout                     (GSocketClient        *client);
-void                    g_socket_client_set_timeout                     (GSocketClient        *client,
-									 guint                 timeout);
-gboolean                g_socket_client_get_enable_proxy                (GSocketClient        *client);
-void                    g_socket_client_set_enable_proxy                (GSocketClient        *client,
-    									 gboolean	      enable);
-
-gboolean                g_socket_client_get_tls                         (GSocketClient        *client);
-void                    g_socket_client_set_tls                         (GSocketClient        *client,
-									 gboolean              tls);
-GTlsCertificateFlags    g_socket_client_get_tls_validation_flags        (GSocketClient        *client);
-void                    g_socket_client_set_tls_validation_flags        (GSocketClient        *client,
-									 GTlsCertificateFlags  flags);
-
-GSocketConnection *     g_socket_client_connect                         (GSocketClient        *client,
-                                                                         GSocketConnectable   *connectable,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GSocketConnection *     g_socket_client_connect_to_host                 (GSocketClient        *client,
-									 const gchar          *host_and_port,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GSocketConnection *     g_socket_client_connect_to_service              (GSocketClient        *client,
-									 const gchar          *domain,
-									 const gchar          *service,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-GSocketConnection *     g_socket_client_connect_to_uri                  (GSocketClient        *client,
-									 const gchar          *uri,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-void                    g_socket_client_connect_async                   (GSocketClient        *client,
-                                                                         GSocketConnectable   *connectable,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocketConnection *     g_socket_client_connect_finish                  (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-void                    g_socket_client_connect_to_host_async           (GSocketClient        *client,
-									 const gchar          *host_and_port,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocketConnection *     g_socket_client_connect_to_host_finish          (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-
-void                    g_socket_client_connect_to_service_async        (GSocketClient        *client,
-									 const gchar          *domain,
-									 const gchar          *service,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocketConnection *     g_socket_client_connect_to_service_finish       (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-void                    g_socket_client_connect_to_uri_async            (GSocketClient        *client,
-									 const gchar          *uri,
-									 guint16               default_port,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocketConnection *     g_socket_client_connect_to_uri_finish           (GSocketClient        *client,
-                                                                         GAsyncResult         *result,
-                                                                         GError              **error);
-void			g_socket_client_add_application_proxy		(GSocketClient        *client,
-									 const gchar          *protocol);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CLIENT_H___ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketconnectable.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocketconnectable.h
deleted file mode 100644
index 0f84a4ae..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketconnectable.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_CONNECTABLE_H__
-#define __G_SOCKET_CONNECTABLE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONNECTABLE            (g_socket_connectable_get_type ())
-#define G_SOCKET_CONNECTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_SOCKET_CONNECTABLE, GSocketConnectable))
-#define G_IS_SOCKET_CONNECTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_SOCKET_CONNECTABLE))
-#define G_SOCKET_CONNECTABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_SOCKET_CONNECTABLE, GSocketConnectableIface))
-
-/**
- * GSocketConnectable:
- *
- * Interface for objects that contain or generate #GSocketAddress<!-- -->es.
- */
-typedef struct _GSocketConnectableIface GSocketConnectableIface;
-
-/**
- * GSocketConnectableIface:
- * @g_iface: The parent interface.
- * @enumerate: Creates a #GSocketAddressEnumerator
- * @proxy_enumerate: Creates a #GProxyAddressEnumerator
- *
- * Provides an interface for returning a #GSocketAddressEnumerator
- * and #GProxyAddressEnumerator
- */
-struct _GSocketConnectableIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-
-  GSocketAddressEnumerator * (* enumerate)       (GSocketConnectable *connectable);
-
-  GSocketAddressEnumerator * (* proxy_enumerate) (GSocketConnectable *connectable);
-
-};
-
-GType                     g_socket_connectable_get_type  (void) G_GNUC_CONST;
-
-GSocketAddressEnumerator *g_socket_connectable_enumerate (GSocketConnectable *connectable);
-
-GSocketAddressEnumerator *g_socket_connectable_proxy_enumerate (GSocketConnectable *connectable);
-
-G_END_DECLS
-
-
-#endif /* __G_SOCKET_CONNECTABLE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketconnection.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocketconnection.h
deleted file mode 100644
index 0daa5f35..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketconnection.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_CONNECTION_H__
-#define __G_SOCKET_CONNECTION_H__
-
-#include <glib-object.h>
-#include <gio/gsocket.h>
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONNECTION                            (g_socket_connection_get_type ())
-#define G_SOCKET_CONNECTION(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnection))
-#define G_SOCKET_CONNECTION_CLASS(class)                    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnectionClass))
-#define G_IS_SOCKET_CONNECTION(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CONNECTION))
-#define G_IS_SOCKET_CONNECTION_CLASS(class)                 (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CONNECTION))
-#define G_SOCKET_CONNECTION_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CONNECTION, GSocketConnectionClass))
-
-typedef struct _GSocketConnectionPrivate                    GSocketConnectionPrivate;
-typedef struct _GSocketConnectionClass                      GSocketConnectionClass;
-
-struct _GSocketConnectionClass
-{
-  GIOStreamClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketConnection
-{
-  GIOStream parent_instance;
-  GSocketConnectionPrivate *priv;
-};
-
-GType              g_socket_connection_get_type                  (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_is_connected              (GSocketConnection  *connection);
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_connect                   (GSocketConnection  *connection,
-								  GSocketAddress     *address,
-								  GCancellable       *cancellable,
-								  GError            **error);
-GLIB_AVAILABLE_IN_2_32
-void               g_socket_connection_connect_async             (GSocketConnection  *connection,
-								  GSocketAddress     *address,
-								  GCancellable       *cancellable,
-								  GAsyncReadyCallback callback,
-								  gpointer            user_data);
-GLIB_AVAILABLE_IN_2_32
-gboolean           g_socket_connection_connect_finish            (GSocketConnection  *connection,
-								  GAsyncResult       *result,
-								  GError            **error);
-
-GSocket           *g_socket_connection_get_socket                (GSocketConnection  *connection);
-GSocketAddress    *g_socket_connection_get_local_address         (GSocketConnection  *connection,
-								  GError            **error);
-GSocketAddress    *g_socket_connection_get_remote_address        (GSocketConnection  *connection,
-								  GError            **error);
-
-void               g_socket_connection_factory_register_type     (GType               g_type,
-								  GSocketFamily       family,
-								  GSocketType         type,
-								  gint                protocol);
-GType              g_socket_connection_factory_lookup_type       (GSocketFamily       family,
-								  GSocketType         type,
-								  gint                protocol_id);
-GSocketConnection *g_socket_connection_factory_create_connection (GSocket            *socket);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CONNECTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketcontrolmessage.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocketcontrolmessage.h
deleted file mode 100644
index 6af300c1..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketcontrolmessage.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_CONTROL_MESSAGE_H__
-#define __G_SOCKET_CONTROL_MESSAGE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_CONTROL_MESSAGE                       (g_socket_control_message_get_type ())
-#define G_SOCKET_CONTROL_MESSAGE(inst)                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessage))
-#define G_SOCKET_CONTROL_MESSAGE_CLASS(class)               (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessageClass))
-#define G_IS_SOCKET_CONTROL_MESSAGE(inst)                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE))
-#define G_IS_SOCKET_CONTROL_MESSAGE_CLASS(class)            (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE))
-#define G_SOCKET_CONTROL_MESSAGE_GET_CLASS(inst)            (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_CONTROL_MESSAGE,                          \
-                                                             GSocketControlMessageClass))
-
-typedef struct _GSocketControlMessagePrivate                GSocketControlMessagePrivate;
-typedef struct _GSocketControlMessageClass                  GSocketControlMessageClass;
-
-/**
- * GSocketControlMessageClass:
- * @get_size: gets the size of the message.
- * @get_level: gets the protocol of the message.
- * @get_type: gets the protocol specific type of the message.
- * @serialize: Writes out the message data.
- * @deserialize: Tries to deserialize a message.
- **/
-
-struct _GSocketControlMessageClass
-{
-  GObjectClass parent_class;
-
-  gsize                  (* get_size)  (GSocketControlMessage  *message);
-  int                    (* get_level) (GSocketControlMessage  *message);
-  int                    (* get_type)  (GSocketControlMessage  *message);
-  void                   (* serialize) (GSocketControlMessage  *message,
-					gpointer                data);
-  GSocketControlMessage *(* deserialize) (int                   level,
-					  int                   type,
-					  gsize                 size,
-					  gpointer              data);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-struct _GSocketControlMessage
-{
-  GObject parent_instance;
-  GSocketControlMessagePrivate *priv;
-};
-
-GType                  g_socket_control_message_get_type     (void) G_GNUC_CONST;
-gsize                  g_socket_control_message_get_size     (GSocketControlMessage *message);
-int                    g_socket_control_message_get_level    (GSocketControlMessage *message);
-int                    g_socket_control_message_get_msg_type (GSocketControlMessage *message);
-void                   g_socket_control_message_serialize    (GSocketControlMessage *message,
-							      gpointer               data);
-GSocketControlMessage *g_socket_control_message_deserialize  (int                    level,
-							      int                    type,
-							      gsize                  size,
-							      gpointer               data);
-
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_CONTROL_MESSAGE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketlistener.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocketlistener.h
deleted file mode 100644
index da09a784..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketlistener.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008 Christian Kellner, Samuel Cormier-Iijima
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Kellner <gicmo@gnome.org>
- *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
- *          Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_LISTENER_H__
-#define __G_SOCKET_LISTENER_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_LISTENER                              (g_socket_listener_get_type ())
-#define G_SOCKET_LISTENER(inst)                             (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListener))
-#define G_SOCKET_LISTENER_CLASS(class)                      (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListenerClass))
-#define G_IS_SOCKET_LISTENER(inst)                          (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_LISTENER))
-#define G_IS_SOCKET_LISTENER_CLASS(class)                   (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_LISTENER))
-#define G_SOCKET_LISTENER_GET_CLASS(inst)                   (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_LISTENER, GSocketListenerClass))
-
-typedef struct _GSocketListenerPrivate                      GSocketListenerPrivate;
-typedef struct _GSocketListenerClass                        GSocketListenerClass;
-
-/**
- * GSocketListenerClass:
- * @changed: virtual method called when the set of socket listened to changes
- **/
-struct _GSocketListenerClass
-{
-  GObjectClass parent_class;
-
-  void (* changed) (GSocketListener *listener);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketListener
-{
-  GObject parent_instance;
-  GSocketListenerPrivate *priv;
-};
-
-GType                   g_socket_listener_get_type                      (void) G_GNUC_CONST;
-
-GSocketListener *       g_socket_listener_new                           (void);
-
-void                    g_socket_listener_set_backlog                   (GSocketListener     *listener,
-									 int                  listen_backlog);
-
-gboolean                g_socket_listener_add_socket                    (GSocketListener     *listener,
-                                                                         GSocket             *socket,
-									 GObject             *source_object,
-									 GError             **error);
-gboolean                g_socket_listener_add_address                   (GSocketListener     *listener,
-                                                                         GSocketAddress      *address,
-									 GSocketType          type,
-									 GSocketProtocol      protocol,
-									 GObject             *source_object,
-                                                                         GSocketAddress     **effective_address,
-									 GError             **error);
-gboolean                g_socket_listener_add_inet_port                 (GSocketListener     *listener,
-                                                                         guint16              port,
-									 GObject             *source_object,
-									 GError             **error);
-guint16                 g_socket_listener_add_any_inet_port             (GSocketListener     *listener,
-									 GObject             *source_object,
-									 GError             **error);
-
-GSocket *               g_socket_listener_accept_socket                 (GSocketListener      *listener,
-									 GObject             **source_object,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-void                    g_socket_listener_accept_socket_async           (GSocketListener      *listener,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-GSocket *               g_socket_listener_accept_socket_finish          (GSocketListener      *listener,
-                                                                         GAsyncResult         *result,
-									 GObject             **source_object,
-                                                                         GError              **error);
-
-
-GSocketConnection *     g_socket_listener_accept                        (GSocketListener      *listener,
-									 GObject             **source_object,
-                                                                         GCancellable         *cancellable,
-                                                                         GError              **error);
-
-void                    g_socket_listener_accept_async                  (GSocketListener      *listener,
-                                                                         GCancellable         *cancellable,
-                                                                         GAsyncReadyCallback   callback,
-                                                                         gpointer              user_data);
-
-GSocketConnection *     g_socket_listener_accept_finish                 (GSocketListener      *listener,
-                                                                         GAsyncResult         *result,
-									 GObject             **source_object,
-                                                                         GError              **error);
-
-void                    g_socket_listener_close                         (GSocketListener      *listener);
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_LISTENER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketservice.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsocketservice.h
deleted file mode 100644
index 27cc0a26..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsocketservice.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SOCKET_SERVICE_H__
-#define __G_SOCKET_SERVICE_H__
-
-#include <gio/gsocketlistener.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_SOCKET_SERVICE                               (g_socket_service_get_type ())
-#define G_SOCKET_SERVICE(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketService))
-#define G_SOCKET_SERVICE_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketServiceClass))
-#define G_IS_SOCKET_SERVICE(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_SOCKET_SERVICE))
-#define G_IS_SOCKET_SERVICE_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_SOCKET_SERVICE))
-#define G_SOCKET_SERVICE_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_SOCKET_SERVICE, GSocketServiceClass))
-
-typedef struct _GSocketServicePrivate                       GSocketServicePrivate;
-typedef struct _GSocketServiceClass                         GSocketServiceClass;
-
-/**
- * GSocketServiceClass:
- * @incomming: signal emitted when new connections are accepted
- */
-struct _GSocketServiceClass
-{
-  GSocketListenerClass parent_class;
-
-  gboolean (* incoming) (GSocketService    *service,
-                         GSocketConnection *connection,
-			 GObject           *source_object);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-struct _GSocketService
-{
-  GSocketListener parent_instance;
-  GSocketServicePrivate *priv;
-};
-
-GType           g_socket_service_get_type  (void);
-
-GSocketService *g_socket_service_new       (void);
-void            g_socket_service_start     (GSocketService *service);
-void            g_socket_service_stop      (GSocketService *service);
-gboolean        g_socket_service_is_active (GSocketService *service);
-
-
-G_END_DECLS
-
-#endif /* __G_SOCKET_SERVICE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gsrvtarget.h b/GstreamerHelper/x86/include/glib-2.0/gio/gsrvtarget.h
deleted file mode 100644
index 67ce2a9e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gsrvtarget.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_SRV_TARGET_H__
-#define __G_SRV_TARGET_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-GType g_srv_target_get_type (void) G_GNUC_CONST;
-#define G_TYPE_SRV_TARGET (g_srv_target_get_type ())
-
-GSrvTarget  *g_srv_target_new          (const gchar *hostname,
-				        guint16      port,
-				        guint16      priority,
-				        guint16      weight);
-GSrvTarget  *g_srv_target_copy         (GSrvTarget  *target);
-void         g_srv_target_free         (GSrvTarget  *target);
-
-const gchar *g_srv_target_get_hostname (GSrvTarget  *target);
-guint16      g_srv_target_get_port     (GSrvTarget  *target);
-guint16      g_srv_target_get_priority (GSrvTarget  *target);
-guint16      g_srv_target_get_weight   (GSrvTarget  *target);
-
-GList       *g_srv_target_list_sort    (GList       *targets);
-
-G_END_DECLS
-
-#endif /* __G_SRV_TARGET_H__ */
-
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtcpconnection.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtcpconnection.h
deleted file mode 100644
index 3928825a..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtcpconnection.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2008, 2009 Codethink Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TCP_CONNECTION_H__
-#define __G_TCP_CONNECTION_H__
-
-#include <gio/gsocketconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TCP_CONNECTION                               (g_tcp_connection_get_type ())
-#define G_TCP_CONNECTION(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnection))
-#define G_TCP_CONNECTION_CLASS(class)                       (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnectionClass))
-#define G_IS_TCP_CONNECTION(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_TCP_CONNECTION))
-#define G_IS_TCP_CONNECTION_CLASS(class)                    (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_TCP_CONNECTION))
-#define G_TCP_CONNECTION_GET_CLASS(inst)                    (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_TCP_CONNECTION, GTcpConnectionClass))
-
-typedef struct _GTcpConnectionPrivate                       GTcpConnectionPrivate;
-typedef struct _GTcpConnectionClass                         GTcpConnectionClass;
-
-struct _GTcpConnectionClass
-{
-  GSocketConnectionClass parent_class;
-};
-
-struct _GTcpConnection
-{
-  GSocketConnection parent_instance;
-  GTcpConnectionPrivate *priv;
-};
-
-GType    g_tcp_connection_get_type                (void) G_GNUC_CONST;
-
-void     g_tcp_connection_set_graceful_disconnect (GTcpConnection *connection,
-						   gboolean        graceful_disconnect);
-gboolean g_tcp_connection_get_graceful_disconnect (GTcpConnection *connection);
-
-G_END_DECLS
-
-#endif /* __G_TCP_CONNECTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtcpwrapperconnection.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtcpwrapperconnection.h
deleted file mode 100644
index 01d3a03a..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtcpwrapperconnection.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- * Copyright © 2010 Collabora Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- *
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TCP_WRAPPER_CONNECTION_H__
-#define __G_TCP_WRAPPER_CONNECTION_H__
-
-#include <gio/gtcpconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TCP_WRAPPER_CONNECTION            (g_tcp_wrapper_connection_get_type ())
-#define G_TCP_WRAPPER_CONNECTION(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnection))
-#define G_TCP_WRAPPER_CONNECTION_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnectionClass))
-#define G_IS_TCP_WRAPPER_CONNECTION(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION))
-#define G_IS_TCP_WRAPPER_CONNECTION_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION))
-#define G_TCP_WRAPPER_CONNECTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                  G_TYPE_TCP_WRAPPER_CONNECTION, GTcpWrapperConnectionClass))
-
-typedef struct _GTcpWrapperConnectionPrivate GTcpWrapperConnectionPrivate;
-typedef struct _GTcpWrapperConnectionClass   GTcpWrapperConnectionClass;
-
-struct _GTcpWrapperConnectionClass
-{
-  GTcpConnectionClass parent_class;
-};
-
-struct _GTcpWrapperConnection
-{
-  GTcpConnection parent_instance;
-  GTcpWrapperConnectionPrivate *priv;
-};
-
-GType              g_tcp_wrapper_connection_get_type (void) G_GNUC_CONST;
-
-GSocketConnection *g_tcp_wrapper_connection_new                (GIOStream             *base_io_stream,
-								GSocket               *socket);
-GIOStream         *g_tcp_wrapper_connection_get_base_io_stream (GTcpWrapperConnection *conn);
-
-G_END_DECLS
-
-#endif /* __G_TCP_WRAPPER_CONNECTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtestdbus.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtestdbus.h
deleted file mode 100644
index 0fd281b4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtestdbus.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GIO testing utilities
- *
- * Copyright (C) 2008-2010 Red Hat, Inc.
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: David Zeuthen <davidz@redhat.com>
- *          Xavier Claessens <xavier.claessens@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TEST_DBUS_H__
-#define __G_TEST_DBUS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TEST_DBUS \
-    (g_test_dbus_get_type ())
-#define G_TEST_DBUS(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_TEST_DBUS, \
-        GTestDBus))
-#define G_IS_TEST_DBUS(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_TEST_DBUS))
-
-GLIB_AVAILABLE_IN_2_34
-GType          g_test_dbus_get_type        (void) G_GNUC_CONST;
-
-GLIB_AVAILABLE_IN_2_34
-GTestDBus *    g_test_dbus_new             (GTestDBusFlags flags);
-
-GLIB_AVAILABLE_IN_2_34
-GTestDBusFlags g_test_dbus_get_flags       (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-const gchar *  g_test_dbus_get_bus_address (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_add_service_dir (GTestDBus     *self,
-                                            const gchar   *path);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_up              (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_stop            (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_down            (GTestDBus     *self);
-
-GLIB_AVAILABLE_IN_2_34
-void           g_test_dbus_unset           (void);
-
-G_END_DECLS
-
-#endif /* __G_TEST_DBUS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gthemedicon.h b/GstreamerHelper/x86/include/glib-2.0/gio/gthemedicon.h
deleted file mode 100644
index b0085e68..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gthemedicon.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_THEMED_ICON_H__
-#define __G_THEMED_ICON_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_THEMED_ICON         (g_themed_icon_get_type ())
-#define G_THEMED_ICON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_THEMED_ICON, GThemedIcon))
-#define G_THEMED_ICON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_THEMED_ICON, GThemedIconClass))
-#define G_IS_THEMED_ICON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_THEMED_ICON))
-#define G_IS_THEMED_ICON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_THEMED_ICON))
-#define G_THEMED_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_THEMED_ICON, GThemedIconClass))
-
-/**
- * GThemedIcon:
- *
- * An implementation of #GIcon for themed icons.
- **/
-typedef struct _GThemedIconClass   GThemedIconClass;
-
-GType  g_themed_icon_get_type                   (void) G_GNUC_CONST;
-
-GIcon *g_themed_icon_new                        (const char  *iconname);
-GIcon *g_themed_icon_new_with_default_fallbacks (const char  *iconname);
-GIcon *g_themed_icon_new_from_names             (char       **iconnames,
-                                                 int          len);
-void   g_themed_icon_prepend_name               (GThemedIcon *icon,
-                                                 const char  *iconname);
-void   g_themed_icon_append_name                (GThemedIcon *icon,
-                                                 const char  *iconname);
-
-const gchar* const * g_themed_icon_get_names     (GThemedIcon *icon);
-
-G_END_DECLS
-
-#endif /* __G_THEMED_ICON_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gthreadedsocketservice.h b/GstreamerHelper/x86/include/glib-2.0/gio/gthreadedsocketservice.h
deleted file mode 100644
index f9470907..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gthreadedsocketservice.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2009 Codethink Limited
- * Copyright © 2009 Red Hat, Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- *          Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_THREADED_SOCKET_SERVICE_H__
-#define __G_THREADED_SOCKET_SERVICE_H__
-
-#include <gio/gsocketservice.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_THREADED_SOCKET_SERVICE                      (g_threaded_socket_service_get_type ())
-#define G_THREADED_SOCKET_SERVICE(inst)                     (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketService))
-#define G_THREADED_SOCKET_SERVICE_CLASS(class)              (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketServiceClass))
-#define G_IS_THREADED_SOCKET_SERVICE(inst)                  (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE))
-#define G_IS_THREADED_SOCKET_SERVICE_CLASS(class)           (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE))
-#define G_THREADED_SOCKET_SERVICE_GET_CLASS(inst)           (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_THREADED_SOCKET_SERVICE,                         \
-                                                             GThreadedSocketServiceClass))
-
-typedef struct _GThreadedSocketServicePrivate               GThreadedSocketServicePrivate;
-typedef struct _GThreadedSocketServiceClass                 GThreadedSocketServiceClass;
-
-struct _GThreadedSocketServiceClass
-{
-  GSocketServiceClass parent_class;
-
-  gboolean (* run) (GThreadedSocketService *service,
-                    GSocketConnection      *connection,
-                    GObject                *source_object);
-
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-};
-
-struct _GThreadedSocketService
-{
-  GSocketService parent_instance;
-  GThreadedSocketServicePrivate *priv;
-};
-
-GType                   g_threaded_socket_service_get_type              (void);
-GSocketService *        g_threaded_socket_service_new                   (int max_threads);
-
-G_END_DECLS
-
-#endif /* __G_THREADED_SOCKET_SERVICE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsbackend.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlsbackend.h
deleted file mode 100644
index 389b5d77..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsbackend.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_BACKEND_H__
-#define __G_TLS_BACKEND_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TLS_BACKEND_EXTENSION_POINT_NAME:
- *
- * Extension point for TLS functionality via #GTlsBackend.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_TLS_BACKEND_EXTENSION_POINT_NAME "gio-tls-backend"
-
-#define G_TYPE_TLS_BACKEND               (g_tls_backend_get_type ())
-#define G_TLS_BACKEND(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_TLS_BACKEND, GTlsBackend))
-#define G_IS_TLS_BACKEND(obj)	         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_TLS_BACKEND))
-#define G_TLS_BACKEND_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_TLS_BACKEND, GTlsBackendInterface))
-
-typedef struct _GTlsBackend          GTlsBackend;
-typedef struct _GTlsBackendInterface GTlsBackendInterface;
-
-/**
- * GTlsBackendInterface:
- * @g_iface: The parent interface.
- * @supports_tls: returns whether the backend supports TLS.
- * @get_default_database: returns a default #GTlsDatabase instance.
- * @get_certificate_type: returns the #GTlsCertificate implementation type
- * @get_client_connection_type: returns the #GTlsClientConnection implementation type
- * @get_server_connection_type: returns the #GTlsServerConnection implementation type
- * @get_file_database_type: returns the #GTlsFileDatabase implementation type.
- *
- * Provides an interface for describing TLS-related types.
- *
- * Since: 2.28
- */
-struct _GTlsBackendInterface
-{
-  GTypeInterface g_iface;
-
-  /* methods */
-  gboolean       ( *supports_tls)               (GTlsBackend *backend);
-  GType          ( *get_certificate_type)       (void);
-  GType          ( *get_client_connection_type) (void);
-  GType          ( *get_server_connection_type) (void);
-  GType          ( *get_file_database_type)     (void);
-  GTlsDatabase * ( *get_default_database)       (GTlsBackend *backend);
-};
-
-GType          g_tls_backend_get_type                   (void) G_GNUC_CONST;
-
-GTlsBackend *  g_tls_backend_get_default                (void);
-
-GTlsDatabase * g_tls_backend_get_default_database       (GTlsBackend *backend);
-
-gboolean       g_tls_backend_supports_tls               (GTlsBackend *backend);
-
-GType          g_tls_backend_get_certificate_type       (GTlsBackend *backend);
-GType          g_tls_backend_get_client_connection_type (GTlsBackend *backend);
-GType          g_tls_backend_get_server_connection_type (GTlsBackend *backend);
-GType          g_tls_backend_get_file_database_type     (GTlsBackend *backend);
-
-G_END_DECLS
-
-#endif /* __G_TLS_BACKEND_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlscertificate.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlscertificate.h
deleted file mode 100644
index 991eb1d4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlscertificate.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_CERTIFICATE_H__
-#define __G_TLS_CERTIFICATE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CERTIFICATE            (g_tls_certificate_get_type ())
-#define G_TLS_CERTIFICATE(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CERTIFICATE, GTlsCertificate))
-#define G_TLS_CERTIFICATE_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_CERTIFICATE, GTlsCertificateClass))
-#define G_IS_TLS_CERTIFICATE(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CERTIFICATE))
-#define G_IS_TLS_CERTIFICATE_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_CERTIFICATE))
-#define G_TLS_CERTIFICATE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_CERTIFICATE, GTlsCertificateClass))
-
-typedef struct _GTlsCertificateClass   GTlsCertificateClass;
-typedef struct _GTlsCertificatePrivate GTlsCertificatePrivate;
-
-struct _GTlsCertificate {
-  GObject parent_instance;
-
-  GTlsCertificatePrivate *priv;
-};
-
-struct _GTlsCertificateClass
-{
-  GObjectClass parent_class;
-
-  GTlsCertificateFlags  (* verify) (GTlsCertificate     *cert,
-				    GSocketConnectable  *identity,
-				    GTlsCertificate     *trusted_ca);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GType                 g_tls_certificate_get_type           (void) G_GNUC_CONST;
-
-GTlsCertificate      *g_tls_certificate_new_from_pem       (const gchar         *data,
-							    gssize               length,
-							    GError             **error);
-
-GTlsCertificate      *g_tls_certificate_new_from_file      (const gchar         *file,
-							    GError             **error);
-GTlsCertificate      *g_tls_certificate_new_from_files     (const gchar         *cert_file,
-							    const gchar         *key_file,
-							    GError             **error);
-GList                *g_tls_certificate_list_new_from_file (const gchar         *file,
-							    GError             **error);
-
-GTlsCertificate      *g_tls_certificate_get_issuer         (GTlsCertificate     *cert);
-
-GTlsCertificateFlags  g_tls_certificate_verify             (GTlsCertificate     *cert,
-							    GSocketConnectable  *identity,
-							    GTlsCertificate     *trusted_ca);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean              g_tls_certificate_is_same            (GTlsCertificate     *cert_one,
-                                                            GTlsCertificate     *cert_two);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CERTIFICATE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsclientconnection.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlsclientconnection.h
deleted file mode 100644
index eaf62f0b..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsclientconnection.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_CLIENT_CONNECTION_H__
-#define __G_TLS_CLIENT_CONNECTION_H__
-
-#include <gio/gtlsconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CLIENT_CONNECTION                (g_tls_client_connection_get_type ())
-#define G_TLS_CLIENT_CONNECTION(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CLIENT_CONNECTION, GTlsClientConnection))
-#define G_IS_TLS_CLIENT_CONNECTION(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CLIENT_CONNECTION))
-#define G_TLS_CLIENT_CONNECTION_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_CLIENT_CONNECTION, GTlsClientConnectionInterface))
-
-typedef struct _GTlsClientConnectionInterface GTlsClientConnectionInterface;
-
-struct _GTlsClientConnectionInterface
-{
-  GTypeInterface g_iface;
-
-};
-
-GType                 g_tls_client_connection_get_type             (void) G_GNUC_CONST;
-
-GIOStream *           g_tls_client_connection_new                  (GIOStream               *base_io_stream,
-								    GSocketConnectable      *server_identity,
-								    GError                 **error);
-
-GTlsCertificateFlags  g_tls_client_connection_get_validation_flags (GTlsClientConnection    *conn);
-void                  g_tls_client_connection_set_validation_flags (GTlsClientConnection    *conn,
-								    GTlsCertificateFlags     flags);
-GSocketConnectable   *g_tls_client_connection_get_server_identity  (GTlsClientConnection    *conn);
-void                  g_tls_client_connection_set_server_identity  (GTlsClientConnection    *conn,
-								    GSocketConnectable      *identity);
-gboolean              g_tls_client_connection_get_use_ssl3         (GTlsClientConnection    *conn);
-void                  g_tls_client_connection_set_use_ssl3         (GTlsClientConnection    *conn,
-								    gboolean                 use_ssl3);
-GList *               g_tls_client_connection_get_accepted_cas     (GTlsClientConnection    *conn);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CLIENT_CONNECTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsconnection.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlsconnection.h
deleted file mode 100644
index 37132cc8..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsconnection.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_CONNECTION_H__
-#define __G_TLS_CONNECTION_H__
-
-#include <gio/giostream.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_CONNECTION            (g_tls_connection_get_type ())
-#define G_TLS_CONNECTION(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_CONNECTION, GTlsConnection))
-#define G_TLS_CONNECTION_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_CONNECTION, GTlsConnectionClass))
-#define G_IS_TLS_CONNECTION(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_CONNECTION))
-#define G_IS_TLS_CONNECTION_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_CONNECTION))
-#define G_TLS_CONNECTION_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_CONNECTION, GTlsConnectionClass))
-
-typedef struct _GTlsConnectionClass   GTlsConnectionClass;
-typedef struct _GTlsConnectionPrivate GTlsConnectionPrivate;
-
-struct _GTlsConnection {
-  GIOStream parent_instance;
-
-  GTlsConnectionPrivate *priv;
-};
-
-struct _GTlsConnectionClass
-{
-  GIOStreamClass parent_class;
-
-  /* signals */
-  gboolean          ( *accept_certificate) (GTlsConnection       *connection,
-					    GTlsCertificate      *peer_cert,
-					    GTlsCertificateFlags  errors);
-
-  /* methods */
-  gboolean ( *handshake )        (GTlsConnection       *conn,
-				  GCancellable         *cancellable,
-				  GError              **error);
-
-  void     ( *handshake_async )  (GTlsConnection       *conn,
-				  int                   io_priority,
-				  GCancellable         *cancellable,
-				  GAsyncReadyCallback   callback,
-				  gpointer              user_data);
-  gboolean ( *handshake_finish ) (GTlsConnection       *conn,
-				  GAsyncResult         *result,
-				  GError              **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GType                 g_tls_connection_get_type                    (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED
-void                  g_tls_connection_set_use_system_certdb       (GTlsConnection       *conn,
-                                                                    gboolean              use_system_certdb);
-GLIB_DEPRECATED
-gboolean              g_tls_connection_get_use_system_certdb       (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_database                (GTlsConnection       *conn,
-								    GTlsDatabase         *database);
-GTlsDatabase *        g_tls_connection_get_database                (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_certificate             (GTlsConnection       *conn,
-                                                                    GTlsCertificate      *certificate);
-GTlsCertificate      *g_tls_connection_get_certificate             (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_interaction             (GTlsConnection       *conn,
-                                                                    GTlsInteraction      *interaction);
-GTlsInteraction *     g_tls_connection_get_interaction             (GTlsConnection       *conn);
-
-GTlsCertificate      *g_tls_connection_get_peer_certificate        (GTlsConnection       *conn);
-GTlsCertificateFlags  g_tls_connection_get_peer_certificate_errors (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_require_close_notify    (GTlsConnection       *conn,
-								    gboolean              require_close_notify);
-gboolean              g_tls_connection_get_require_close_notify    (GTlsConnection       *conn);
-
-void                  g_tls_connection_set_rehandshake_mode        (GTlsConnection       *conn,
-								    GTlsRehandshakeMode   mode);
-GTlsRehandshakeMode   g_tls_connection_get_rehandshake_mode        (GTlsConnection       *conn);
-
-gboolean              g_tls_connection_handshake                   (GTlsConnection       *conn,
-								    GCancellable         *cancellable,
-								    GError              **error);
-
-void                  g_tls_connection_handshake_async             (GTlsConnection       *conn,
-								    int                   io_priority,
-								    GCancellable         *cancellable,
-								    GAsyncReadyCallback   callback,
-								    gpointer              user_data);
-gboolean              g_tls_connection_handshake_finish            (GTlsConnection       *conn,
-								    GAsyncResult         *result,
-								    GError              **error);
-
-/**
- * G_TLS_ERROR:
- *
- * Error domain for TLS. Errors in this domain will be from the
- * #GTlsError enumeration. See #GError for more information on error
- * domains.
- */
-#define G_TLS_ERROR (g_tls_error_quark ())
-GQuark g_tls_error_quark (void);
-
-
-/*< protected >*/
-gboolean              g_tls_connection_emit_accept_certificate     (GTlsConnection       *conn,
-								    GTlsCertificate      *peer_cert,
-								    GTlsCertificateFlags  errors);
-
-G_END_DECLS
-
-#endif /* __G_TLS_CONNECTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsdatabase.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlsdatabase.h
deleted file mode 100644
index 9f93cc91..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsdatabase.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_DATABASE_H__
-#define __G_TLS_DATABASE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TLS_DATABASE_PURPOSE_AUTHENTICATE_SERVER "1.3.6.1.5.5.7.3.1"
-#define G_TLS_DATABASE_PURPOSE_AUTHENTICATE_CLIENT "1.3.6.1.5.5.7.3.2"
-
-#define G_TYPE_TLS_DATABASE            (g_tls_database_get_type ())
-#define G_TLS_DATABASE(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_DATABASE, GTlsDatabase))
-#define G_TLS_DATABASE_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TLS_DATABASE, GTlsDatabaseClass))
-#define G_IS_TLS_DATABASE(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_DATABASE))
-#define G_IS_TLS_DATABASE_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TLS_DATABASE))
-#define G_TLS_DATABASE_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), G_TYPE_TLS_DATABASE, GTlsDatabaseClass))
-
-typedef struct _GTlsDatabaseClass   GTlsDatabaseClass;
-typedef struct _GTlsDatabasePrivate GTlsDatabasePrivate;
-
-struct _GTlsDatabase
-{
-  GObject parent_instance;
-
-  GTlsDatabasePrivate *priv;
-};
-
-struct _GTlsDatabaseClass
-{
-  GObjectClass parent_class;
-
-  /* virtual methods */
-
-  GTlsCertificateFlags  (*verify_chain)                         (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *chain,
-                                                                 const gchar             *purpose,
-                                                                 GSocketConnectable      *identity,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseVerifyFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*verify_chain_async)                   (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *chain,
-                                                                 const gchar             *purpose,
-                                                                 GSocketConnectable      *identity,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseVerifyFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificateFlags  (*verify_chain_finish)                  (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  gchar*                (*create_certificate_handle)            (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate);
-
-  GTlsCertificate*      (*lookup_certificate_for_handle)        (GTlsDatabase            *self,
-                                                                 const gchar             *handle,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificate_for_handle_async)  (GTlsDatabase            *self,
-                                                                 const gchar             *handle,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificate*      (*lookup_certificate_for_handle_finish) (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  GTlsCertificate*      (*lookup_certificate_issuer)            (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificate_issuer_async)      (GTlsDatabase            *self,
-                                                                 GTlsCertificate         *certificate,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GTlsCertificate*      (*lookup_certificate_issuer_finish)     (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  GList*                (*lookup_certificates_issued_by)        (GTlsDatabase            *self,
-                                                                 GByteArray              *issuer_raw_dn,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GError                 **error);
-
-  void                  (*lookup_certificates_issued_by_async)  (GTlsDatabase            *self,
-                                                                 GByteArray              *issuer_raw_dn,
-                                                                 GTlsInteraction         *interaction,
-                                                                 GTlsDatabaseLookupFlags  flags,
-                                                                 GCancellable            *cancellable,
-                                                                 GAsyncReadyCallback      callback,
-                                                                 gpointer                 user_data);
-
-  GList*                (*lookup_certificates_issued_by_finish) (GTlsDatabase            *self,
-                                                                 GAsyncResult            *result,
-                                                                 GError                 **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[16];
-};
-
-GType                g_tls_database_get_type                              (void) G_GNUC_CONST;
-
-GTlsCertificateFlags g_tls_database_verify_chain                          (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *chain,
-                                                                           const gchar             *purpose,
-                                                                           GSocketConnectable      *identity,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseVerifyFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-void                 g_tls_database_verify_chain_async                    (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *chain,
-                                                                           const gchar             *purpose,
-                                                                           GSocketConnectable      *identity,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseVerifyFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GTlsCertificateFlags g_tls_database_verify_chain_finish                   (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-gchar*               g_tls_database_create_certificate_handle             (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate);
-
-GTlsCertificate*     g_tls_database_lookup_certificate_for_handle         (GTlsDatabase            *self,
-                                                                           const gchar             *handle,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-void                 g_tls_database_lookup_certificate_for_handle_async   (GTlsDatabase            *self,
-                                                                           const gchar             *handle,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GTlsCertificate*     g_tls_database_lookup_certificate_for_handle_finish  (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-GTlsCertificate*     g_tls_database_lookup_certificate_issuer             (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-void                 g_tls_database_lookup_certificate_issuer_async       (GTlsDatabase            *self,
-                                                                           GTlsCertificate         *certificate,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GAsyncReadyCallback      callback,
-                                                                           gpointer                 user_data);
-
-GTlsCertificate*     g_tls_database_lookup_certificate_issuer_finish      (GTlsDatabase            *self,
-                                                                           GAsyncResult            *result,
-                                                                           GError                 **error);
-
-GList*               g_tls_database_lookup_certificates_issued_by         (GTlsDatabase            *self,
-                                                                           GByteArray              *issuer_raw_dn,
-                                                                           GTlsInteraction         *interaction,
-                                                                           GTlsDatabaseLookupFlags  flags,
-                                                                           GCancellable            *cancellable,
-                                                                           GError                 **error);
-
-void                 g_tls_database_lookup_certificates_issued_by_async    (GTlsDatabase            *self,
-                                                                            GByteArray              *issuer_raw_dn,
-                                                                            GTlsInteraction         *interaction,
-                                                                            GTlsDatabaseLookupFlags  flags,
-                                                                            GCancellable            *cancellable,
-                                                                            GAsyncReadyCallback      callback,
-                                                                            gpointer                 user_data);
-
-GList*               g_tls_database_lookup_certificates_issued_by_finish   (GTlsDatabase            *self,
-                                                                            GAsyncResult            *result,
-                                                                            GError                 **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_DATABASE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsfiledatabase.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlsfiledatabase.h
deleted file mode 100644
index bc6a17ff..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsfiledatabase.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2010 Collabora, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * See the included COPYING file for more information.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_FILE_DATABASE_H__
-#define __G_TLS_FILE_DATABASE_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_FILE_DATABASE                (g_tls_file_database_get_type ())
-#define G_TLS_FILE_DATABASE(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_FILE_DATABASE, GTlsFileDatabase))
-#define G_IS_TLS_FILE_DATABASE(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_FILE_DATABASE))
-#define G_TLS_FILE_DATABASE_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_FILE_DATABASE, GTlsFileDatabaseInterface))
-
-typedef struct _GTlsFileDatabaseInterface GTlsFileDatabaseInterface;
-
-/**
- * GTlsFileDatabaseInterface:
- * @g_iface: The parent interface.
- *
- * Provides an interface for #GTlsFileDatabase implementations.
- *
- */
-struct _GTlsFileDatabaseInterface
-{
-  GTypeInterface g_iface;
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[8];
-};
-
-GType                        g_tls_file_database_get_type              (void) G_GNUC_CONST;
-
-GTlsDatabase*                g_tls_file_database_new                   (const gchar  *anchors,
-                                                                        GError      **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_FILE_DATABASE_H___ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsinteraction.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlsinteraction.h
deleted file mode 100644
index fc76fe2d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsinteraction.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2011 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_INTERACTION_H__
-#define __G_TLS_INTERACTION_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_INTERACTION         (g_tls_interaction_get_type ())
-#define G_TLS_INTERACTION(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_TLS_INTERACTION, GTlsInteraction))
-#define G_TLS_INTERACTION_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_TLS_INTERACTION, GTlsInteractionClass))
-#define G_IS_TLS_INTERACTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_TLS_INTERACTION))
-#define G_IS_TLS_INTERACTION_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_TLS_INTERACTION))
-#define G_TLS_INTERACTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_TLS_INTERACTION, GTlsInteractionClass))
-
-typedef struct _GTlsInteractionClass   GTlsInteractionClass;
-typedef struct _GTlsInteractionPrivate GTlsInteractionPrivate;
-
-struct _GTlsInteraction
-{
-  /*< private >*/
-  GObject parent_instance;
-  GTlsInteractionPrivate *priv;
-};
-
-struct _GTlsInteractionClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /*< public >*/
-  GTlsInteractionResult  (* ask_password)        (GTlsInteraction    *interaction,
-                                                  GTlsPassword       *password,
-                                                  GCancellable       *cancellable,
-                                                  GError            **error);
-
-  void                   (* ask_password_async)  (GTlsInteraction    *interaction,
-                                                  GTlsPassword       *password,
-                                                  GCancellable       *cancellable,
-                                                  GAsyncReadyCallback callback,
-                                                  gpointer            user_data);
-
-  GTlsInteractionResult  (* ask_password_finish) (GTlsInteraction    *interaction,
-                                                  GAsyncResult       *result,
-                                                  GError            **error);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[24];
-};
-
-GType                  g_tls_interaction_get_type            (void) G_GNUC_CONST;
-
-GTlsInteractionResult  g_tls_interaction_invoke_ask_password (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GError            **error);
-
-
-GTlsInteractionResult  g_tls_interaction_ask_password        (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GError            **error);
-
-void                   g_tls_interaction_ask_password_async  (GTlsInteraction    *interaction,
-                                                              GTlsPassword       *password,
-                                                              GCancellable       *cancellable,
-                                                              GAsyncReadyCallback callback,
-                                                              gpointer            user_data);
-
-GTlsInteractionResult  g_tls_interaction_ask_password_finish (GTlsInteraction    *interaction,
-                                                              GAsyncResult       *result,
-                                                              GError            **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_INTERACTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlspassword.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlspassword.h
deleted file mode 100644
index ef581b61..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlspassword.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2011 Collabora, Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_PASSWORD_H__
-#define __G_TLS_PASSWORD_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_PASSWORD         (g_tls_password_get_type ())
-#define G_TLS_PASSWORD(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_TLS_PASSWORD, GTlsPassword))
-#define G_TLS_PASSWORD_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_TLS_PASSWORD, GTlsPasswordClass))
-#define G_IS_TLS_PASSWORD(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_TLS_PASSWORD))
-#define G_IS_TLS_PASSWORD_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_TLS_PASSWORD))
-#define G_TLS_PASSWORD_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_TLS_PASSWORD, GTlsPasswordClass))
-
-typedef struct _GTlsPasswordClass   GTlsPasswordClass;
-typedef struct _GTlsPasswordPrivate GTlsPasswordPrivate;
-
-struct _GTlsPassword
-{
-  GObject parent_instance;
-
-  GTlsPasswordPrivate *priv;
-};
-
-struct _GTlsPasswordClass
-{
-  GObjectClass parent_class;
-
-  /* methods */
-
-  const guchar *    ( *get_value)            (GTlsPassword  *password,
-                                              gsize         *length);
-
-  void              ( *set_value)            (GTlsPassword  *password,
-                                              guchar        *value,
-                                              gssize         length,
-                                              GDestroyNotify destroy);
-
-  const gchar*      ( *get_default_warning)  (GTlsPassword  *password);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  gpointer padding[4];
-};
-
-GType             g_tls_password_get_type            (void) G_GNUC_CONST;
-
-GTlsPassword *    g_tls_password_new                 (GTlsPasswordFlags  flags,
-                                                      const gchar       *description);
-
-const guchar *    g_tls_password_get_value           (GTlsPassword      *password,
-                                                      gsize             *length);
-void              g_tls_password_set_value           (GTlsPassword      *password,
-                                                      const guchar      *value,
-                                                      gssize             length);
-void              g_tls_password_set_value_full      (GTlsPassword      *password,
-                                                      guchar            *value,
-                                                      gssize             length,
-                                                      GDestroyNotify     destroy);
-
-GTlsPasswordFlags g_tls_password_get_flags           (GTlsPassword      *password);
-void              g_tls_password_set_flags           (GTlsPassword      *password,
-                                                      GTlsPasswordFlags  flags);
-
-const gchar*      g_tls_password_get_description     (GTlsPassword      *password);
-void              g_tls_password_set_description     (GTlsPassword      *password,
-                                                      const gchar       *description);
-
-const gchar *     g_tls_password_get_warning         (GTlsPassword      *password);
-void              g_tls_password_set_warning         (GTlsPassword      *password,
-                                                      const gchar       *warning);
-
-G_END_DECLS
-
-#endif /* __G_TLS_PASSWORD_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsserverconnection.h b/GstreamerHelper/x86/include/glib-2.0/gio/gtlsserverconnection.h
deleted file mode 100644
index c909d550..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gtlsserverconnection.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_TLS_SERVER_CONNECTION_H__
-#define __G_TLS_SERVER_CONNECTION_H__
-
-#include <gio/gtlsconnection.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_TLS_SERVER_CONNECTION                (g_tls_server_connection_get_type ())
-#define G_TLS_SERVER_CONNECTION(inst)               (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TLS_SERVER_CONNECTION, GTlsServerConnection))
-#define G_IS_TLS_SERVER_CONNECTION(inst)            (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TLS_SERVER_CONNECTION))
-#define G_TLS_SERVER_CONNECTION_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TLS_SERVER_CONNECTION, GTlsServerConnectionInterface))
-
-/**
- * GTlsServerConnection:
- *
- * TLS server-side connection. This is the server-side implementation
- * of a #GTlsConnection.
- *
- * Since: 2.28
- */
-typedef struct _GTlsServerConnectionInterface GTlsServerConnectionInterface;
-
-struct _GTlsServerConnectionInterface
-{
-  GTypeInterface g_iface;
-
-};
-
-GType                 g_tls_server_connection_get_type                 (void) G_GNUC_CONST;
-
-GIOStream *           g_tls_server_connection_new                      (GIOStream        *base_io_stream,
-									GTlsCertificate  *certificate,
-									GError          **error);
-
-G_END_DECLS
-
-#endif /* __G_TLS_SERVER_CONNECTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gvfs.h b/GstreamerHelper/x86/include/glib-2.0/gio/gvfs.h
deleted file mode 100644
index bacbe8b6..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gvfs.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VFS_H__
-#define __G_VFS_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_VFS         (g_vfs_get_type ())
-#define G_VFS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VFS, GVfs))
-#define G_VFS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VFS, GVfsClass))
-#define G_VFS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VFS, GVfsClass))
-#define G_IS_VFS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VFS))
-#define G_IS_VFS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VFS))
-
-/**
- * G_VFS_EXTENSION_POINT_NAME:
- *
- * Extension point for #GVfs functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_VFS_EXTENSION_POINT_NAME "gio-vfs"
-
-/**
- * GVfs:
- *
- * Virtual File System object.
- **/
-typedef struct _GVfsClass    GVfsClass;
-
-struct _GVfs
-{
-  GObject parent_instance;
-};
-
-struct _GVfsClass
-{
-  GObjectClass parent_class;
-
-  /* Virtual Table */
-
-  gboolean              (* is_active)                 (GVfs       *vfs);
-  GFile               * (* get_file_for_path)         (GVfs       *vfs,
-                                                       const char *path);
-  GFile               * (* get_file_for_uri)          (GVfs       *vfs,
-                                                       const char *uri);
-  const gchar * const * (* get_supported_uri_schemes) (GVfs       *vfs);
-  GFile               * (* parse_name)                (GVfs       *vfs,
-                                                       const char *parse_name);
-
-  /*< private >*/
-  void                  (* local_file_add_info)       (GVfs       *vfs,
-						       const char *filename,
-						       guint64     device,
-						       GFileAttributeMatcher *attribute_matcher,
-						       GFileInfo  *info,
-						       GCancellable *cancellable,
-						       gpointer   *extra_data,
-						       GDestroyNotify *free_extra_data);
-  void                  (* add_writable_namespaces)   (GVfs       *vfs,
-						       GFileAttributeInfoList *list);
-  gboolean              (* local_file_set_attributes) (GVfs       *vfs,
-						       const char *filename,
-						       GFileInfo  *info,
-                                                       GFileQueryInfoFlags flags,
-                                                       GCancellable *cancellable,
-						       GError    **error);
-  void                  (* local_file_removed)        (GVfs       *vfs,
-						       const char *filename);
-  void                  (* local_file_moved)          (GVfs       *vfs,
-						       const char *source,
-						       const char *dest);
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-  void (*_g_reserved7) (void);
-};
-
-GType                 g_vfs_get_type                  (void) G_GNUC_CONST;
-
-gboolean              g_vfs_is_active                 (GVfs       *vfs);
-GFile *               g_vfs_get_file_for_path         (GVfs       *vfs,
-                                                       const char *path);
-GFile *               g_vfs_get_file_for_uri          (GVfs       *vfs,
-                                                       const char *uri);
-const gchar* const * g_vfs_get_supported_uri_schemes  (GVfs       *vfs);
-
-GFile *               g_vfs_parse_name                (GVfs       *vfs,
-                                                       const char *parse_name);
-
-GVfs *                g_vfs_get_default               (void);
-GVfs *                g_vfs_get_local                 (void);
-
-G_END_DECLS
-
-#endif /* __G_VFS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gvolume.h b/GstreamerHelper/x86/include/glib-2.0/gio/gvolume.h
deleted file mode 100644
index b0d862e7..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gvolume.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VOLUME_H__
-#define __G_VOLUME_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_HAL_UDI:
- *
- * The string used to obtain a Hal UDI with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_HAL_UDI "hal-udi"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE:
- *
- * The string used to obtain a Unix device path with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE "unix-device"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_LABEL:
- *
- * The string used to obtain a filesystem label with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_LABEL "label"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_UUID:
- *
- * The string used to obtain a UUID with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_UUID "uuid"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_NFS_MOUNT:
- *
- * The string used to obtain a NFS mount with g_volume_get_identifier().
- */
-#define G_VOLUME_IDENTIFIER_KIND_NFS_MOUNT "nfs-mount"
-
-/**
- * G_VOLUME_IDENTIFIER_KIND_CLASS:
- *
- * The string used to obtain the volume <emphasis>class</emphasis>
- * with g_volume_get_identifier().
- *
- * Known volume classes include <literal>device</literal> and
- * <literal>network</literal>. Other classes may be added in the
- * future.
- *
- * This is intended to be used by applications to classify #GVolume
- * instances into different sections - for example a file manager or
- * file chooser can use this information to show
- * <literal>network</literal> volumes under a "Network" heading and
- * <literal>device</literal> volumes under a "Devices" heading.
- */
-#define G_VOLUME_IDENTIFIER_KIND_CLASS "class"
-
-
-#define G_TYPE_VOLUME            (g_volume_get_type ())
-#define G_VOLUME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_VOLUME, GVolume))
-#define G_IS_VOLUME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_VOLUME))
-#define G_VOLUME_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_VOLUME, GVolumeIface))
-
-/**
- * GVolumeIface:
- * @g_iface: The parent interface.
- * @changed: Changed signal that is emitted when the volume's state has changed.
- * @removed: The removed signal that is emitted when the #GVolume have been removed. If the recipient is holding references to the object they should release them so the object can be finalized.
- * @get_name: Gets a string containing the name of the #GVolume.
- * @get_icon: Gets a #GIcon for the #GVolume.
- * @get_uuid: Gets the UUID for the #GVolume. The reference is typically based on the file system UUID for the mount in question and should be considered an opaque string. Returns %NULL if there is no UUID available.
- * @get_drive: Gets a #GDrive the volume is located on. Returns %NULL if the #GVolume is not associated with a #GDrive.
- * @get_mount: Gets a #GMount representing the mounted volume. Returns %NULL if the #GVolume is not mounted.
- * @can_mount: Returns %TRUE if the #GVolume can be mounted.
- * @can_eject: Checks if a #GVolume can be ejected.
- * @mount_fn: Mounts a given #GVolume. 
- *     #GVolume implementations must emit the #GMountOperation::aborted 
- *     signal before completing a mount operation that is aborted while 
- *     awaiting input from the user through a #GMountOperation instance.
- * @mount_finish: Finishes a mount operation.
- * @eject: Ejects a given #GVolume.
- * @eject_finish: Finishes an eject operation.
- * @get_identifier: Returns the <link linkend="volume-identifier">identifier</link> of the given kind, or %NULL if
- *    the #GVolume doesn't have one.
- * @enumerate_identifiers: Returns an array strings listing the kinds
- *    of <link linkend="volume-identifier">identifiers</link> which the #GVolume has.
- * @should_automount: Returns %TRUE if the #GVolume should be automatically mounted.
- * @get_activation_root: Returns the activation root for the #GVolume if it is known in advance or %NULL if
- *   it is not known.
- * @eject_with_operation: Starts ejecting a #GVolume using a #GMountOperation. Since 2.22.
- * @eject_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
- * @get_sort_key: Gets a key used for sorting #GVolume instance or %NULL if no such key exists. Since 2.32.
- * @get_symbolic_icon: Gets a symbolic #GIcon for the #GVolume. Since 2.34.
- *
- * Interface for implementing operations for mountable volumes.
- **/
-typedef struct _GVolumeIface    GVolumeIface;
-
-struct _GVolumeIface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  void        (* changed)               (GVolume             *volume);
-  void        (* removed)               (GVolume             *volume);
-
-  /* Virtual Table */
-
-  char      * (* get_name)              (GVolume             *volume);
-  GIcon     * (* get_icon)              (GVolume             *volume);
-  char      * (* get_uuid)              (GVolume             *volume);
-  GDrive    * (* get_drive)             (GVolume             *volume);
-  GMount    * (* get_mount)             (GVolume             *volume);
-  gboolean    (* can_mount)             (GVolume             *volume);
-  gboolean    (* can_eject)             (GVolume             *volume);
-  void        (* mount_fn)              (GVolume             *volume,
-                                         GMountMountFlags     flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean    (* mount_finish)          (GVolume             *volume,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-  void        (* eject)                 (GVolume             *volume,
-                                         GMountUnmountFlags   flags,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data);
-  gboolean    (* eject_finish)          (GVolume             *volume,
-                                         GAsyncResult        *result,
-                                         GError             **error);
-
-  char      * (* get_identifier)        (GVolume             *volume,
-                                         const char          *kind);
-  char     ** (* enumerate_identifiers) (GVolume             *volume);
-
-  gboolean    (* should_automount)      (GVolume             *volume);
-
-  GFile     * (* get_activation_root)   (GVolume             *volume);
-
-  void        (* eject_with_operation)      (GVolume             *volume,
-                                             GMountUnmountFlags   flags,
-                                             GMountOperation     *mount_operation,
-                                             GCancellable        *cancellable,
-                                             GAsyncReadyCallback  callback,
-                                             gpointer             user_data);
-  gboolean    (* eject_with_operation_finish) (GVolume           *volume,
-                                             GAsyncResult        *result,
-                                             GError             **error);
-
-  const gchar * (* get_sort_key)        (GVolume             *volume);
-  GIcon       * (* get_symbolic_icon)   (GVolume             *volume);
-};
-
-GType    g_volume_get_type              (void) G_GNUC_CONST;
-
-char *   g_volume_get_name              (GVolume              *volume);
-GIcon *  g_volume_get_icon              (GVolume              *volume);
-GIcon *  g_volume_get_symbolic_icon     (GVolume              *volume);
-char *   g_volume_get_uuid              (GVolume              *volume);
-GDrive * g_volume_get_drive             (GVolume              *volume);
-GMount * g_volume_get_mount             (GVolume              *volume);
-gboolean g_volume_can_mount             (GVolume              *volume);
-gboolean g_volume_can_eject             (GVolume              *volume);
-gboolean g_volume_should_automount      (GVolume              *volume);
-void     g_volume_mount                 (GVolume              *volume,
-					 GMountMountFlags      flags,
-					 GMountOperation      *mount_operation,
-					 GCancellable         *cancellable,
-					 GAsyncReadyCallback   callback,
-					 gpointer              user_data);
-gboolean g_volume_mount_finish          (GVolume              *volume,
-					 GAsyncResult         *result,
-					 GError              **error);
-GLIB_DEPRECATED_FOR(g_volume_eject_with_operation)
-void     g_volume_eject                 (GVolume              *volume,
-                                         GMountUnmountFlags    flags,
-                                         GCancellable         *cancellable,
-                                         GAsyncReadyCallback   callback,
-                                         gpointer              user_data);
-
-GLIB_DEPRECATED_FOR(g_volume_eject_with_operation_finish)
-gboolean g_volume_eject_finish          (GVolume              *volume,
-                                         GAsyncResult         *result,
-                                         GError              **error);
-char *   g_volume_get_identifier        (GVolume              *volume,
-					 const char           *kind);
-char **  g_volume_enumerate_identifiers (GVolume              *volume);
-
-GFile *  g_volume_get_activation_root   (GVolume              *volume);
-
-void        g_volume_eject_with_operation     (GVolume             *volume,
-                                               GMountUnmountFlags   flags,
-                                               GMountOperation     *mount_operation,
-                                               GCancellable        *cancellable,
-                                               GAsyncReadyCallback  callback,
-                                               gpointer             user_data);
-gboolean    g_volume_eject_with_operation_finish (GVolume          *volume,
-                                               GAsyncResult        *result,
-                                               GError             **error);
-
-GLIB_AVAILABLE_IN_2_32
-const gchar *g_volume_get_sort_key            (GVolume              *volume);
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gvolumemonitor.h b/GstreamerHelper/x86/include/glib-2.0/gio/gvolumemonitor.h
deleted file mode 100644
index 2bff07ed..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gvolumemonitor.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *         David Zeuthen <davidz@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_VOLUME_MONITOR_H__
-#define __G_VOLUME_MONITOR_H__
-
-#include <gio/giotypes.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_VOLUME_MONITOR         (g_volume_monitor_get_type ())
-#define G_VOLUME_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_VOLUME_MONITOR, GVolumeMonitor))
-#define G_VOLUME_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_VOLUME_MONITOR, GVolumeMonitorClass))
-#define G_VOLUME_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_VOLUME_MONITOR, GVolumeMonitorClass))
-#define G_IS_VOLUME_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_VOLUME_MONITOR))
-#define G_IS_VOLUME_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_VOLUME_MONITOR))
-
-/**
- * G_VOLUME_MONITOR_EXTENSION_POINT_NAME:
- *
- * Extension point for volume monitor functionality.
- * See <link linkend="extending-gio">Extending GIO</link>.
- */
-#define G_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-volume-monitor"
-
-/**
- * GVolumeMonitor:
- *
- * A Volume Monitor that watches for volume events.
- **/
-typedef struct _GVolumeMonitorClass GVolumeMonitorClass;
-
-struct _GVolumeMonitor
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  gpointer priv;
-};
-
-struct _GVolumeMonitorClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  /* signals */
-  void      (* volume_added)         (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-  void      (* volume_removed)       (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-  void      (* volume_changed)       (GVolumeMonitor *volume_monitor,
-                                      GVolume        *volume);
-
-  void      (* mount_added)          (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_removed)        (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_pre_unmount)    (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-  void      (* mount_changed)        (GVolumeMonitor *volume_monitor,
-                                      GMount         *mount);
-
-  void      (* drive_connected)      (GVolumeMonitor *volume_monitor,
-                                      GDrive	     *drive);
-  void      (* drive_disconnected)   (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-  void      (* drive_changed)        (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-
-  /* Vtable */
-
-  gboolean  (* is_supported)         (void);
-
-  GList   * (* get_connected_drives) (GVolumeMonitor *volume_monitor);
-  GList   * (* get_volumes)          (GVolumeMonitor *volume_monitor);
-  GList   * (* get_mounts)           (GVolumeMonitor *volume_monitor);
-
-  GVolume * (* get_volume_for_uuid)  (GVolumeMonitor *volume_monitor,
-                                      const char     *uuid);
-
-  GMount  * (* get_mount_for_uuid)   (GVolumeMonitor *volume_monitor,
-                                      const char     *uuid);
-
-
-  /* These arguments are unfortunately backwards by mistake (bug #520169). Deprecated in 2.20. */
-  GVolume * (* adopt_orphan_mount)   (GMount         *mount,
-                                      GVolumeMonitor *volume_monitor);
-
-  /* signal added in 2.17 */
-  void      (* drive_eject_button)   (GVolumeMonitor *volume_monitor,
-                                      GDrive         *drive);
-
-  /* signal added in 2.21 */
-  void      (* drive_stop_button)   (GVolumeMonitor *volume_monitor,
-                                     GDrive         *drive);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_g_reserved1) (void);
-  void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
-  void (*_g_reserved6) (void);
-};
-
-GType           g_volume_monitor_get_type             (void) G_GNUC_CONST;
-
-GVolumeMonitor *g_volume_monitor_get                  (void);
-GList *         g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor);
-GList *         g_volume_monitor_get_volumes          (GVolumeMonitor *volume_monitor);
-GList *         g_volume_monitor_get_mounts           (GVolumeMonitor *volume_monitor);
-GVolume *       g_volume_monitor_get_volume_for_uuid  (GVolumeMonitor *volume_monitor,
-                                                       const char     *uuid);
-GMount *        g_volume_monitor_get_mount_for_uuid   (GVolumeMonitor *volume_monitor,
-                                                       const char     *uuid);
-
-GLIB_DEPRECATED
-GVolume *       g_volume_monitor_adopt_orphan_mount   (GMount         *mount);
-
-G_END_DECLS
-
-#endif /* __G_VOLUME_MONITOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gzlibcompressor.h b/GstreamerHelper/x86/include/glib-2.0/gio/gzlibcompressor.h
deleted file mode 100644
index 58247815..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gzlibcompressor.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ZLIB_COMPRESSOR_H__
-#define __G_ZLIB_COMPRESSOR_H__
-
-#include <gio/gconverter.h>
-#include <gio/gfileinfo.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ZLIB_COMPRESSOR         (g_zlib_compressor_get_type ())
-#define G_ZLIB_COMPRESSOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressor))
-#define G_ZLIB_COMPRESSOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressorClass))
-#define G_IS_ZLIB_COMPRESSOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_ZLIB_COMPRESSOR))
-#define G_IS_ZLIB_COMPRESSOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_ZLIB_COMPRESSOR))
-#define G_ZLIB_COMPRESSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_ZLIB_COMPRESSOR, GZlibCompressorClass))
-
-typedef struct _GZlibCompressorClass   GZlibCompressorClass;
-
-struct _GZlibCompressorClass
-{
-  GObjectClass parent_class;
-};
-
-GType            g_zlib_compressor_get_type (void) G_GNUC_CONST;
-
-GZlibCompressor *g_zlib_compressor_new (GZlibCompressorFormat format,
-					int level);
-
-GFileInfo       *g_zlib_compressor_get_file_info (GZlibCompressor *compressor);
-void             g_zlib_compressor_set_file_info (GZlibCompressor *compressor,
-                                                  GFileInfo       *file_info);
-
-G_END_DECLS
-
-#endif /* __G_ZLIB_COMPRESSOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gio/gzlibdecompressor.h b/GstreamerHelper/x86/include/glib-2.0/gio/gzlibdecompressor.h
deleted file mode 100644
index f7bb57dd..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gio/gzlibdecompressor.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
-#error "Only <gio/gio.h> can be included directly."
-#endif
-
-#ifndef __G_ZLIB_DECOMPRESSOR_H__
-#define __G_ZLIB_DECOMPRESSOR_H__
-
-#include <gio/gconverter.h>
-#include <gio/gfileinfo.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_ZLIB_DECOMPRESSOR         (g_zlib_decompressor_get_type ())
-#define G_ZLIB_DECOMPRESSOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressor))
-#define G_ZLIB_DECOMPRESSOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressorClass))
-#define G_IS_ZLIB_DECOMPRESSOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_ZLIB_DECOMPRESSOR))
-#define G_IS_ZLIB_DECOMPRESSOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_ZLIB_DECOMPRESSOR))
-#define G_ZLIB_DECOMPRESSOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_ZLIB_DECOMPRESSOR, GZlibDecompressorClass))
-
-typedef struct _GZlibDecompressorClass   GZlibDecompressorClass;
-
-struct _GZlibDecompressorClass
-{
-  GObjectClass parent_class;
-};
-
-GType              g_zlib_decompressor_get_type (void) G_GNUC_CONST;
-
-GZlibDecompressor *g_zlib_decompressor_new (GZlibCompressorFormat format);
-
-GFileInfo         *g_zlib_decompressor_get_file_info (GZlibDecompressor *decompressor);
-
-G_END_DECLS
-
-#endif /* __G_ZLIB_DECOMPRESSOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib-object.h b/GstreamerHelper/x86/include/glib-2.0/glib-object.h
deleted file mode 100644
index 336ba931..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib-object.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GLIB_GOBJECT_H__
-#define __GLIB_GOBJECT_H__
-
-#define __GLIB_GOBJECT_H_INSIDE__
-
-/* topmost include file for GObject header files */
-#include <gobject/gbinding.h>
-#include <gobject/gboxed.h>
-#include <gobject/genums.h>
-#include <gobject/gobject.h>
-#include <gobject/gparam.h>
-#include <gobject/gparamspecs.h>
-#include <gobject/gsignal.h>
-#include <gobject/gsourceclosure.h>
-#include <gobject/gtype.h>
-#include <gobject/gtypemodule.h>
-#include <gobject/gtypeplugin.h>
-#include <gobject/gvalue.h>
-#include <gobject/gvaluearray.h>
-#include <gobject/gvaluetypes.h>
-
-#undef __GLIB_GOBJECT_H_INSIDE__
-
-#endif /* __GLIB_GOBJECT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib-unix.h b/GstreamerHelper/x86/include/glib-2.0/glib-unix.h
deleted file mode 100644
index c04f66f3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib-unix.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* glib-unix.h - Unix specific integration
- * Copyright (C) 2011 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_UNIX_H__
-#define __G_UNIX_H__
-
-/* We need to include the UNIX headers needed to use the APIs below,
- * but we also take this opportunity to include a wide selection of
- * other UNIX headers.  If one of the headers below is broken on some
- * system, work around it here (or better, fix the system or tell
- * people to use a better one).
- */
-#include <unistd.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include <glib.h>
-
-#ifndef G_OS_UNIX
-#error "This header may only be used on UNIX"
-#endif
-
-G_BEGIN_DECLS
-
-/**
- * G_UNIX_ERROR:
- *
- * Error domain for API in the "g_unix_" namespace.  Note that there is
- * no exported enumeration mapping %errno.  Instead, all functions
- * ensure that %errno is relevant.  The code for all #G_UNIX_ERROR is
- * always <literal>0</literal>, and the error message is always
- * generated via g_strerror().
- *
- * It is expected that most code will not look at %errno from these
- * APIs. Important cases where one would want to differentiate between
- * errors are already covered by existing cross-platform GLib API,
- * such as e.g. #GFile wrapping <literal>ENOENT</literal>.  However, it is
- * provided for completeness, at least.
- */
-#define G_UNIX_ERROR (g_unix_error_quark())
-
-GLIB_AVAILABLE_IN_2_30
-GQuark g_unix_error_quark (void);
-
-GLIB_AVAILABLE_IN_2_30
-gboolean g_unix_open_pipe (gint    *fds,
-                           gint     flags,
-                           GError **error);
-
-GLIB_AVAILABLE_IN_2_30
-gboolean g_unix_set_fd_nonblocking (gint       fd,
-                                    gboolean   nonblock,
-                                    GError   **error);
-
-GLIB_AVAILABLE_IN_2_30
-GSource *g_unix_signal_source_new  (gint signum);
-
-GLIB_AVAILABLE_IN_2_30
-guint    g_unix_signal_add_full    (gint           priority,
-                                    gint           signum,
-                                    GSourceFunc    handler,
-                                    gpointer       user_data,
-                                    GDestroyNotify notify);
-
-GLIB_AVAILABLE_IN_2_30
-guint    g_unix_signal_add         (gint        signum,
-                                    GSourceFunc handler,
-                                    gpointer    user_data);
-
-G_END_DECLS
-
-#endif  /* __G_UNIX_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib.h b/GstreamerHelper/x86/include/glib-2.0/glib.h
deleted file mode 100644
index 77abf232..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __G_LIB_H__
-#define __G_LIB_H__
-
-#define __GLIB_H_INSIDE__
-
-#include <glib/galloca.h>
-#include <glib/garray.h>
-#include <glib/gasyncqueue.h>
-#include <glib/gatomic.h>
-#include <glib/gbacktrace.h>
-#include <glib/gbase64.h>
-#include <glib/gbitlock.h>
-#include <glib/gbookmarkfile.h>
-#include <glib/gbytes.h>
-#include <glib/gcharset.h>
-#include <glib/gchecksum.h>
-#include <glib/gconvert.h>
-#include <glib/gdataset.h>
-#include <glib/gdate.h>
-#include <glib/gdatetime.h>
-#include <glib/gdir.h>
-#include <glib/genviron.h>
-#include <glib/gerror.h>
-#include <glib/gfileutils.h>
-#include <glib/ggettext.h>
-#include <glib/ghash.h>
-#include <glib/ghmac.h>
-#include <glib/ghook.h>
-#include <glib/ghostutils.h>
-#include <glib/giochannel.h>
-#include <glib/gkeyfile.h>
-#include <glib/glist.h>
-#include <glib/gmacros.h>
-#include <glib/gmain.h>
-#include <glib/gmappedfile.h>
-#include <glib/gmarkup.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gnode.h>
-#include <glib/goption.h>
-#include <glib/gpattern.h>
-#include <glib/gpoll.h>
-#include <glib/gprimes.h>
-#include <glib/gqsort.h>
-#include <glib/gquark.h>
-#include <glib/gqueue.h>
-#include <glib/grand.h>
-#include <glib/gregex.h>
-#include <glib/gscanner.h>
-#include <glib/gsequence.h>
-#include <glib/gshell.h>
-#include <glib/gslice.h>
-#include <glib/gslist.h>
-#include <glib/gspawn.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
-#include <glib/gstringchunk.h>
-#include <glib/gtestutils.h>
-#include <glib/gthread.h>
-#include <glib/gthreadpool.h>
-#include <glib/gtimer.h>
-#include <glib/gtimezone.h>
-#include <glib/gtrashstack.h>
-#include <glib/gtree.h>
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gurifuncs.h>
-#include <glib/gutils.h>
-#include <glib/gvarianttype.h>
-#include <glib/gvariant.h>
-#include <glib/gversion.h>
-#include <glib/gversionmacros.h>
-#ifdef G_PLATFORM_WIN32
-#include <glib/gwin32.h>
-#endif
-
-#include <glib/deprecated/gallocator.h>
-#include <glib/deprecated/gcache.h>
-#include <glib/deprecated/gcompletion.h>
-#include <glib/deprecated/gmain.h>
-#include <glib/deprecated/grel.h>
-#include <glib/deprecated/gthread.h>
-
-#undef __GLIB_H_INSIDE__
-
-#endif /* __G_LIB_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gallocator.h b/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gallocator.h
deleted file mode 100644
index e4990e90..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gallocator.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ALLOCATOR_H__
-#define __G_ALLOCATOR_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAllocator GAllocator;
-typedef struct _GMemChunk  GMemChunk;
-
-#define G_ALLOC_ONLY                    1
-#define G_ALLOC_AND_FREE                2
-#define G_ALLOCATOR_LIST                1
-#define G_ALLOCATOR_SLIST               2
-#define G_ALLOCATOR_NODE                3
-
-#define g_chunk_new(type, chunk)        ((type *) g_mem_chunk_alloc (chunk))
-#define g_chunk_new0(type, chunk)       ((type *) g_mem_chunk_alloc0 (chunk))
-#define g_chunk_free(mem, mem_chunk)    (g_mem_chunk_free (mem_chunk, mem))
-#define g_mem_chunk_create(type, x, y)  (g_mem_chunk_new (NULL, sizeof (type), 0, 0))
-
-
-GLIB_DEPRECATED
-GMemChunk *     g_mem_chunk_new         (const gchar  *name,
-                                         gint          atom_size,
-                                         gsize         area_size,
-                                         gint          type);
-GLIB_DEPRECATED
-void            g_mem_chunk_destroy     (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-gpointer        g_mem_chunk_alloc       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-gpointer        g_mem_chunk_alloc0      (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_free        (GMemChunk    *mem_chunk,
-                                         gpointer      mem);
-GLIB_DEPRECATED
-void            g_mem_chunk_clean       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_reset       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_print       (GMemChunk    *mem_chunk);
-GLIB_DEPRECATED
-void            g_mem_chunk_info        (void);
-GLIB_DEPRECATED
-void            g_blow_chunks           (void);
-
-
-GLIB_DEPRECATED
-GAllocator *    g_allocator_new         (const gchar  *name,
-                                         guint         n_preallocs);
-GLIB_DEPRECATED
-void            g_allocator_free        (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_list_push_allocator   (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_list_pop_allocator    (void);
-GLIB_DEPRECATED
-void            g_slist_push_allocator  (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_slist_pop_allocator   (void);
-GLIB_DEPRECATED
-void            g_node_push_allocator   (GAllocator   *allocator);
-GLIB_DEPRECATED
-void            g_node_pop_allocator    (void);
-
-G_END_DECLS
-
-#endif /* __G_ALLOCATOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gcache.h b/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gcache.h
deleted file mode 100644
index 2e5119b2..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gcache.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CACHE_H__
-#define __G_CACHE_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GCache          GCache;
-
-typedef gpointer        (*GCacheNewFunc)        (gpointer       key);
-typedef gpointer        (*GCacheDupFunc)        (gpointer       value);
-typedef void            (*GCacheDestroyFunc)    (gpointer       value);
-
-/* Caches
- */
-GLIB_DEPRECATED
-GCache*  g_cache_new           (GCacheNewFunc      value_new_func,
-                                GCacheDestroyFunc  value_destroy_func,
-                                GCacheDupFunc      key_dup_func,
-                                GCacheDestroyFunc  key_destroy_func,
-                                GHashFunc          hash_key_func,
-                                GHashFunc          hash_value_func,
-                                GEqualFunc         key_equal_func);
-GLIB_DEPRECATED
-void     g_cache_destroy       (GCache            *cache);
-GLIB_DEPRECATED
-gpointer g_cache_insert        (GCache            *cache,
-                                gpointer           key);
-GLIB_DEPRECATED
-void     g_cache_remove        (GCache            *cache,
-                                gconstpointer      value);
-GLIB_DEPRECATED
-void     g_cache_key_foreach   (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-GLIB_DEPRECATED
-void     g_cache_value_foreach (GCache            *cache,
-                                GHFunc             func,
-                                gpointer           user_data);
-
-G_END_DECLS
-
-#endif /* __G_CACHE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gcompletion.h b/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gcompletion.h
deleted file mode 100644
index 88a0479d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gcompletion.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_COMPLETION_H__
-#define __G_COMPLETION_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GCompletion     GCompletion;
-
-typedef gchar*          (*GCompletionFunc)      (gpointer);
-
-/* GCompletion
- */
-
-typedef gint (*GCompletionStrncmpFunc) (const gchar *s1,
-                                        const gchar *s2,
-                                        gsize        n);
-
-struct _GCompletion
-{
-  GList* items;
-  GCompletionFunc func;
- 
-  gchar* prefix;
-  GList* cache;
-  GCompletionStrncmpFunc strncmp_func;
-};
-
-GLIB_DEPRECATED_IN_2_26
-GCompletion* g_completion_new           (GCompletionFunc func);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_add_items     (GCompletion*    cmp,
-                                         GList*          items);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_remove_items  (GCompletion*    cmp,
-                                         GList*          items);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_clear_items   (GCompletion*    cmp);
-GLIB_DEPRECATED_IN_2_26
-GList*       g_completion_complete      (GCompletion*    cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GLIB_DEPRECATED_IN_2_26
-GList*       g_completion_complete_utf8 (GCompletion  *cmp,
-                                         const gchar*    prefix,
-                                         gchar**         new_prefix);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_set_compare   (GCompletion *cmp,
-                                         GCompletionStrncmpFunc strncmp_func);
-GLIB_DEPRECATED_IN_2_26
-void         g_completion_free          (GCompletion*    cmp);
-
-G_END_DECLS
-
-#endif /* __G_COMPLETION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gmain.h b/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gmain.h
deleted file mode 100644
index d1ddf197..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gmain.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DEPRECATED_MAIN_H__
-#define __G_DEPRECATED_MAIN_H__
-
-#include <glib/gmain.h>
-
-G_BEGIN_DECLS
-
-/* ============== Compat main loop stuff ================== */
-
-/**
- * g_main_new:
- * @is_running: set to %TRUE to indicate that the loop is running. This
- *     is not very important since calling g_main_run() will set this
- *     to %TRUE anyway.
- *
- * Creates a new #GMainLoop for th default main context.
- *
- * Returns: a new #GMainLoop
- *
- * Deprecated: 2.2: Use g_main_loop_new() instead
- */
-#define         g_main_new(is_running)  g_main_loop_new (NULL, is_running)
-
-/**
- * g_main_run:
- * @loop: a #GMainLoop
- *
- * Runs a main loop until it stops running.
- *
- * Deprecated: 2.2: Use g_main_loop_run() instead
- */
-#define         g_main_run(loop)        g_main_loop_run(loop)
-
-/**
- * g_main_quit:
- * @loop: a #GMainLoop
- *
- * Stops the #GMainLoop.
- * If g_main_run() was called to run the #GMainLoop, it will now return.
- *
- * Deprecated: 2.2: Use g_main_loop_quit() instead
- */
-#define g_main_quit(loop)       g_main_loop_quit(loop)
-
-/**
- * g_main_destroy:
- * @loop: a #GMainLoop
- *
- * Frees the memory allocated for the #GMainLoop.
- *
- * Deprecated: 2.2: Use g_main_loop_unref() instead
- */
-#define g_main_destroy(loop)    g_main_loop_unref(loop)
-
-/**
- * g_main_is_running:
- * @loop: a #GMainLoop
- *
- * Checks if the main loop is running.
- *
- * Returns: %TRUE if the main loop is running
- *
- * Deprecated: 2.2: Use g_main_loop_is_running() instead
- */
-#define g_main_is_running(loop) g_main_loop_is_running(loop)
-
-/**
- * g_main_iteration:
- * @may_block: set to %TRUE if it should block (i.e. wait) until an event
- *     source becomes ready. It will return after an event source has been
- *     processed. If set to %FALSE it will return immediately if no event
- *     source is ready to be processed.
- *
- * Runs a single iteration for the default #GMainContext.
- *
- * Returns: %TRUE if more events are pending.
- *
- * Deprecated: 2.2: Use g_main_context_iteration() instead.
- */
-#define g_main_iteration(may_block) g_main_context_iteration (NULL, may_block)
-
-/**
- * g_main_pending:
- *
- * Checks if any events are pending for the default #GMainContext
- * (i.e. ready to be processed).
- *
- * Returns: %TRUE if any events are pending.
- *
- * Deprected: 2.2: Use g_main_context_pending() instead.
- */
-#define g_main_pending()            g_main_context_pending (NULL)
-
-/**
- * g_main_set_poll_func:
- * @func: the function to call to poll all file descriptors
- *
- * Sets the function to use for the handle polling of file descriptors
- * for the default main context.
- *
- * Deprecated: 2.2: Use g_main_context_set_poll_func() again
- */
-#define g_main_set_poll_func(func)  g_main_context_set_poll_func (NULL, func)
-
-
-G_END_DECLS
-
-#endif /* __G_DEPRECATED_MAIN_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/grel.h b/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/grel.h
deleted file mode 100644
index c9e09962..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/grel.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_REL_H__
-#define __G_REL_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GRelation       GRelation;
-typedef struct _GTuples         GTuples;
-
-struct _GTuples
-{
-  guint len;
-};
-
-/* GRelation
- *
- * Indexed Relations.  Imagine a really simple table in a
- * database.  Relations are not ordered.  This data type is meant for
- * maintaining a N-way mapping.
- *
- * g_relation_new() creates a relation with FIELDS fields
- *
- * g_relation_destroy() frees all resources
- * g_tuples_destroy() frees the result of g_relation_select()
- *
- * g_relation_index() indexes relation FIELD with the provided
- *   equality and hash functions.  this must be done before any
- *   calls to insert are made.
- *
- * g_relation_insert() inserts a new tuple.  you are expected to
- *   provide the right number of fields.
- *
- * g_relation_delete() deletes all relations with KEY in FIELD
- * g_relation_select() returns ...
- * g_relation_count() counts ...
- */
-
-GLIB_DEPRECATED_IN_2_26
-GRelation* g_relation_new     (gint         fields);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_destroy (GRelation   *relation);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_index   (GRelation   *relation,
-                               gint         field,
-                               GHashFunc    hash_func,
-                               GEqualFunc   key_equal_func);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_insert  (GRelation   *relation,
-                               ...);
-GLIB_DEPRECATED_IN_2_26
-gint       g_relation_delete  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-GTuples*   g_relation_select  (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-gint       g_relation_count   (GRelation   *relation,
-                               gconstpointer  key,
-                               gint         field);
-GLIB_DEPRECATED_IN_2_26
-gboolean   g_relation_exists  (GRelation   *relation,
-                               ...);
-GLIB_DEPRECATED_IN_2_26
-void       g_relation_print   (GRelation   *relation);
-GLIB_DEPRECATED_IN_2_26
-void       g_tuples_destroy   (GTuples     *tuples);
-GLIB_DEPRECATED_IN_2_26
-gpointer   g_tuples_index     (GTuples     *tuples,
-                               gint         index_,
-                               gint         field);
-
-G_END_DECLS
-
-#endif /* __G_REL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gthread.h b/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gthread.h
deleted file mode 100644
index 1866540e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/deprecated/gthread.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DEPRECATED_THREAD_H__
-#define __G_DEPRECATED_THREAD_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  G_THREAD_PRIORITY_LOW,
-  G_THREAD_PRIORITY_NORMAL,
-  G_THREAD_PRIORITY_HIGH,
-  G_THREAD_PRIORITY_URGENT
-} GThreadPriority;
-
-struct  _GThread
-{
-  /*< private >*/
-  GThreadFunc func;
-  gpointer data;
-  gboolean joinable;
-  GThreadPriority priority;
-};
-
-typedef struct _GThreadFunctions GThreadFunctions;
-struct _GThreadFunctions
-{
-  GMutex*  (*mutex_new)           (void);
-  void     (*mutex_lock)          (GMutex               *mutex);
-  gboolean (*mutex_trylock)       (GMutex               *mutex);
-  void     (*mutex_unlock)        (GMutex               *mutex);
-  void     (*mutex_free)          (GMutex               *mutex);
-  GCond*   (*cond_new)            (void);
-  void     (*cond_signal)         (GCond                *cond);
-  void     (*cond_broadcast)      (GCond                *cond);
-  void     (*cond_wait)           (GCond                *cond,
-                                   GMutex               *mutex);
-  gboolean (*cond_timed_wait)     (GCond                *cond,
-                                   GMutex               *mutex,
-                                   GTimeVal             *end_time);
-  void      (*cond_free)          (GCond                *cond);
-  GPrivate* (*private_new)        (GDestroyNotify        destructor);
-  gpointer  (*private_get)        (GPrivate             *private_key);
-  void      (*private_set)        (GPrivate             *private_key,
-                                   gpointer              data);
-  void      (*thread_create)      (GThreadFunc           func,
-                                   gpointer              data,
-                                   gulong                stack_size,
-                                   gboolean              joinable,
-                                   gboolean              bound,
-                                   GThreadPriority       priority,
-                                   gpointer              thread,
-                                   GError              **error);
-  void      (*thread_yield)       (void);
-  void      (*thread_join)        (gpointer              thread);
-  void      (*thread_exit)        (void);
-  void      (*thread_set_priority)(gpointer              thread,
-                                   GThreadPriority       priority);
-  void      (*thread_self)        (gpointer              thread);
-  gboolean  (*thread_equal)       (gpointer              thread1,
-                                   gpointer              thread2);
-};
-
-GLIB_VAR GThreadFunctions       g_thread_functions_for_glib_use;
-GLIB_VAR gboolean               g_thread_use_default_impl;
-
-GLIB_VAR guint64   (*g_thread_gettime) (void);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_thread_new)
-GThread *g_thread_create       (GThreadFunc       func,
-                                gpointer          data,
-                                gboolean          joinable,
-                                GError          **error);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_thread_new)
-GThread *g_thread_create_full  (GThreadFunc       func,
-                                gpointer          data,
-                                gulong            stack_size,
-                                gboolean          joinable,
-                                gboolean          bound,
-                                GThreadPriority   priority,
-                                GError          **error);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_set_priority (GThread          *thread,
-                                GThreadPriority   priority);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_foreach      (GFunc             thread_func,
-                                gpointer          user_data);
-
-#ifndef G_OS_WIN32
-#include <pthread.h>
-#endif
-
-#define g_static_mutex_get_mutex g_static_mutex_get_mutex_impl
-#define G_STATIC_MUTEX_INIT { NULL }
-typedef struct
-{
-  GMutex *mutex;
-#ifndef G_OS_WIN32
-  /* only for ABI compatibility reasons */
-  pthread_mutex_t unused;
-#endif
-} GStaticMutex;
-
-#define g_static_mutex_lock(mutex) \
-    g_mutex_lock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_trylock(mutex) \
-    g_mutex_trylock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_unlock(mutex) \
-    g_mutex_unlock (g_static_mutex_get_mutex (mutex))
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_mutex_init)
-void    g_static_mutex_init           (GStaticMutex *mutex);
-GLIB_DEPRECATED_IN_2_32_FOR(g_mutex_free)
-void    g_static_mutex_free           (GStaticMutex *mutex);
-GMutex *g_static_mutex_get_mutex_impl (GStaticMutex *mutex);
-
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  guint depth;
-
-  /* ABI compat only */
-  union {
-#ifdef G_OS_WIN32
-    void *owner;
-#else
-    pthread_t owner;
-#endif
-    gdouble dummy;
-  } unused;
-};
-
-#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_init)
-void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_lock)
-void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_try_lock)
-gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_unlock)
-void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
-                                         guint            depth);
-
-GLIB_DEPRECATED_IN_2_32
-guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_free)
-void     g_static_rec_mutex_free        (GStaticRecMutex *mutex);
-
-typedef struct _GStaticRWLock GStaticRWLock;
-struct _GStaticRWLock
-{
-  /*< private >*/
-  GStaticMutex mutex;
-  GCond *read_cond;
-  GCond *write_cond;
-  guint read_counter;
-  gboolean have_writer;
-  guint want_to_read;
-  guint want_to_write;
-};
-
-#define G_STATIC_RW_LOCK_INIT { G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, 0, 0 }
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_init)
-void      g_static_rw_lock_init           (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_lock)
-void      g_static_rw_lock_reader_lock    (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_trylock)
-gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_unlock)
-void      g_static_rw_lock_reader_unlock  (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_lock)
-void      g_static_rw_lock_writer_lock    (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_trylock)
-gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_unlock)
-void      g_static_rw_lock_writer_unlock  (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_free)
-void      g_static_rw_lock_free           (GStaticRWLock *lock);
-
-GLIB_DEPRECATED_IN_2_32
-GPrivate *      g_private_new             (GDestroyNotify notify);
-
-typedef struct _GStaticPrivate  GStaticPrivate;
-struct _GStaticPrivate
-{
-  /*< private >*/
-  guint index;
-};
-
-#define G_STATIC_PRIVATE_INIT { 0 }
-GLIB_DEPRECATED_IN_2_32
-void     g_static_private_init           (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_private_get)
-gpointer g_static_private_get            (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_private_set)
-void     g_static_private_set            (GStaticPrivate *private_key,
-                                          gpointer        data,
-                                          GDestroyNotify  notify);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_static_private_free           (GStaticPrivate *private_key);
-
-GLIB_DEPRECATED_IN_2_32
-gboolean g_once_init_enter_impl          (volatile gsize *location);
-
-GLIB_DEPRECATED_IN_2_32
-void     g_thread_init                   (gpointer vtable);
-GLIB_DEPRECATED_IN_2_32
-void    g_thread_init_with_errorcheck_mutexes (gpointer vtable);
-
-GLIB_DEPRECATED_IN_2_32
-gboolean g_thread_get_initialized        (void);
-
-GLIB_VAR gboolean g_threads_got_initialized;
-
-#define g_thread_supported()     (1)
-
-GLIB_DEPRECATED_IN_2_32
-GMutex *        g_mutex_new             (void);
-GLIB_DEPRECATED_IN_2_32
-void            g_mutex_free            (GMutex *mutex);
-GLIB_DEPRECATED_IN_2_32
-GCond *         g_cond_new              (void);
-GLIB_DEPRECATED_IN_2_32
-void            g_cond_free             (GCond  *cond);
-GLIB_DEPRECATED_IN_2_32
-gboolean        g_cond_timed_wait       (GCond          *cond,
-                                         GMutex         *mutex,
-                                         GTimeVal       *timeval);
-
-G_END_DECLS
-
-#endif /* __G_DEPRECATED_THREAD_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/galloca.h b/GstreamerHelper/x86/include/glib-2.0/glib/galloca.h
deleted file mode 100644
index a18a75cd..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/galloca.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ALLOCA_H__
-#define __G_ALLOCA_H__
-
-#include <glib/gtypes.h>
-
-#if defined(__BIONIC__) && defined (GLIB_HAVE_ALLOCA_H)
-# include <alloca.h>
-#elif defined(__GNUC__)
-/* GCC does the right thing */
-# undef alloca
-# define alloca(size)   __builtin_alloca (size)
-#elif defined (GLIB_HAVE_ALLOCA_H)
-/* a native and working alloca.h is there */ 
-# include <alloca.h>
-#else /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-# if defined(_MSC_VER) || defined(__DMC__)
-#  include <malloc.h>
-#  define alloca _alloca
-# else /* !_MSC_VER && !__DMC__ */
-#  ifdef _AIX
-#   pragma alloca
-#  else /* !_AIX */
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-G_BEGIN_DECLS
-char *alloca ();
-G_END_DECLS
-#   endif /* !alloca */
-#  endif /* !_AIX */
-# endif /* !_MSC_VER && !__DMC__ */
-#endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
-
-/**
- * g_alloca:
- * @size: number of bytes to allocate.
- * 
- * Allocates @size bytes on the stack; these bytes will be freed when the current
- * stack frame is cleaned up. This macro essentially just wraps the alloca()
- * function present on most UNIX variants.
- * Thus it provides the same advantages and pitfalls as alloca():
- * <variablelist>
- *   <varlistentry><term></term><listitem><para>
- *     + alloca() is very fast, as on most systems it's implemented by just adjusting
- *     the stack pointer register.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     + It doesn't cause any memory fragmentation, within its scope, separate alloca()
- *     blocks just build up and are released together at function end.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Allocation sizes have to fit into the current stack frame. For instance in a
- *       threaded environment on Linux, the per-thread stack size is limited to 2 Megabytes,
- *       so be sparse with alloca() uses.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Allocation failure due to insufficient stack space is not indicated with a %NULL
- *       return like e.g. with malloc(). Instead, most systems probably handle it the same
- *       way as out of stack space situations from infinite function recursion, i.e.
- *       with a segmentation fault.
- *   </para></listitem></varlistentry>
- *   <varlistentry><term></term><listitem><para>
- *     - Special care has to be taken when mixing alloca() with GNU C variable sized arrays.
- *       Stack space allocated with alloca() in the same scope as a variable sized array
- *       will be freed together with the variable sized array upon exit of that scope, and
- *       not upon exit of the enclosing function scope.
- *   </para></listitem></varlistentry>
- * </variablelist>
- * 
- * Returns: space for @size bytes, allocated on the stack
- */
-#define g_alloca(size)		 alloca (size)
-/**
- * g_newa:
- * @struct_type: Type of memory chunks to be allocated
- * @n_structs: Number of chunks to be allocated
- * 
- * Wraps g_alloca() in a more typesafe manner.
- * 
- * Returns: Pointer to stack space for @n_structs chunks of type @struct_type
- */
-#define g_newa(struct_type, n_structs)	((struct_type*) g_alloca (sizeof (struct_type) * (gsize) (n_structs)))
-
-#endif /* __G_ALLOCA_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/garray.h b/GstreamerHelper/x86/include/glib-2.0/glib/garray.h
deleted file mode 100644
index eb37b92e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/garray.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ARRAY_H__
-#define __G_ARRAY_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GBytes          GBytes;
-typedef struct _GArray		GArray;
-typedef struct _GByteArray	GByteArray;
-typedef struct _GPtrArray	GPtrArray;
-
-struct _GArray
-{
-  gchar *data;
-  guint len;
-};
-
-struct _GByteArray
-{
-  guint8 *data;
-  guint	  len;
-};
-
-struct _GPtrArray
-{
-  gpointer *pdata;
-  guint	    len;
-};
-
-/* Resizable arrays. remove fills any cleared spot and shortens the
- * array, while preserving the order. remove_fast will distort the
- * order by moving the last element to the position of the removed.
- */
-
-#define g_array_append_val(a,v)	  g_array_append_vals (a, &(v), 1)
-#define g_array_prepend_val(a,v)  g_array_prepend_vals (a, &(v), 1)
-#define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1)
-#define g_array_index(a,t,i)      (((t*) (void *) (a)->data) [(i)])
-
-GArray* g_array_new               (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size);
-GArray* g_array_sized_new         (gboolean          zero_terminated,
-				   gboolean          clear_,
-				   guint             element_size,
-				   guint             reserved_size);
-gchar*  g_array_free              (GArray           *array,
-				   gboolean          free_segment);
-GArray *g_array_ref               (GArray           *array);
-void    g_array_unref             (GArray           *array);
-guint   g_array_get_element_size  (GArray           *array);
-GArray* g_array_append_vals       (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_prepend_vals      (GArray           *array,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_insert_vals       (GArray           *array,
-				   guint             index_,
-				   gconstpointer     data,
-				   guint             len);
-GArray* g_array_set_size          (GArray           *array,
-				   guint             length);
-GArray* g_array_remove_index      (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_index_fast (GArray           *array,
-				   guint             index_);
-GArray* g_array_remove_range      (GArray           *array,
-				   guint             index_,
-				   guint             length);
-void    g_array_sort              (GArray           *array,
-				   GCompareFunc      compare_func);
-void    g_array_sort_with_data    (GArray           *array,
-				   GCompareDataFunc  compare_func,
-				   gpointer          user_data);
-void    g_array_set_clear_func    (GArray           *array,
-                                   GDestroyNotify    clear_func);
-
-/* Resizable pointer array.  This interface is much less complicated
- * than the above.  Add appends a pointer.  Remove fills any cleared 
- * spot and shortens the array. remove_fast will again distort order.  
- */
-#define    g_ptr_array_index(array,index_) ((array)->pdata)[index_]
-GPtrArray* g_ptr_array_new                (void);
-GPtrArray* g_ptr_array_new_with_free_func (GDestroyNotify    element_free_func);
-GPtrArray* g_ptr_array_sized_new          (guint             reserved_size);
-GPtrArray* g_ptr_array_new_full           (guint             reserved_size,
-					   GDestroyNotify    element_free_func);
-gpointer*  g_ptr_array_free               (GPtrArray        *array,
-					   gboolean          free_seg);
-GPtrArray* g_ptr_array_ref                (GPtrArray        *array);
-void       g_ptr_array_unref              (GPtrArray        *array);
-void       g_ptr_array_set_free_func      (GPtrArray        *array,
-                                           GDestroyNotify    element_free_func);
-void       g_ptr_array_set_size           (GPtrArray        *array,
-					   gint              length);
-gpointer   g_ptr_array_remove_index       (GPtrArray        *array,
-					   guint             index_);
-gpointer   g_ptr_array_remove_index_fast  (GPtrArray        *array,
-					   guint             index_);
-gboolean   g_ptr_array_remove             (GPtrArray        *array,
-					   gpointer          data);
-gboolean   g_ptr_array_remove_fast        (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_remove_range       (GPtrArray        *array,
-					   guint             index_,
-					   guint             length);
-void       g_ptr_array_add                (GPtrArray        *array,
-					   gpointer          data);
-void       g_ptr_array_sort               (GPtrArray        *array,
-					   GCompareFunc      compare_func);
-void       g_ptr_array_sort_with_data     (GPtrArray        *array,
-					   GCompareDataFunc  compare_func,
-					   gpointer          user_data);
-void       g_ptr_array_foreach            (GPtrArray        *array,
-					   GFunc             func,
-					   gpointer          user_data);
-
-
-/* Byte arrays, an array of guint8.  Implemented as a GArray,
- * but type-safe.
- */
-
-GByteArray* g_byte_array_new               (void);
-GByteArray* g_byte_array_new_take          (guint8           *data,
-                                            gsize             len);
-GByteArray* g_byte_array_sized_new         (guint             reserved_size);
-guint8*     g_byte_array_free              (GByteArray       *array,
-					    gboolean          free_segment);
-GBytes*     g_byte_array_free_to_bytes     (GByteArray       *array);
-GByteArray *g_byte_array_ref               (GByteArray       *array);
-void        g_byte_array_unref             (GByteArray       *array);
-GByteArray* g_byte_array_append            (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_prepend           (GByteArray       *array,
-					    const guint8     *data,
-					    guint             len);
-GByteArray* g_byte_array_set_size          (GByteArray       *array,
-					    guint             length);
-GByteArray* g_byte_array_remove_index      (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_index_fast (GByteArray       *array,
-					    guint             index_);
-GByteArray* g_byte_array_remove_range      (GByteArray       *array,
-					    guint             index_,
-					    guint             length);
-void        g_byte_array_sort              (GByteArray       *array,
-					    GCompareFunc      compare_func);
-void        g_byte_array_sort_with_data    (GByteArray       *array,
-					    GCompareDataFunc  compare_func,
-					    gpointer          user_data);
-
-G_END_DECLS
-
-#endif /* __G_ARRAY_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gasyncqueue.h b/GstreamerHelper/x86/include/glib-2.0/glib/gasyncqueue.h
deleted file mode 100644
index f0d6d959..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gasyncqueue.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ASYNCQUEUE_H__
-#define __G_ASYNCQUEUE_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GAsyncQueue GAsyncQueue;
-
-GAsyncQueue *g_async_queue_new                  (void);
-GAsyncQueue *g_async_queue_new_full             (GDestroyNotify item_free_func);
-void         g_async_queue_lock                 (GAsyncQueue      *queue);
-void         g_async_queue_unlock               (GAsyncQueue      *queue);
-GAsyncQueue *g_async_queue_ref                  (GAsyncQueue      *queue);
-void         g_async_queue_unref                (GAsyncQueue      *queue);
-
-GLIB_DEPRECATED_FOR(g_async_queue_ref)
-void         g_async_queue_ref_unlocked         (GAsyncQueue      *queue);
-
-GLIB_DEPRECATED_FOR(g_async_queue_unref)
-void         g_async_queue_unref_and_unlock     (GAsyncQueue      *queue);
-
-void         g_async_queue_push                 (GAsyncQueue      *queue,
-                                                 gpointer          data);
-void         g_async_queue_push_unlocked        (GAsyncQueue      *queue,
-                                                 gpointer          data);
-void         g_async_queue_push_sorted          (GAsyncQueue      *queue,
-                                                 gpointer          data,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-void         g_async_queue_push_sorted_unlocked (GAsyncQueue      *queue,
-                                                 gpointer          data,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-gpointer     g_async_queue_pop                  (GAsyncQueue      *queue);
-gpointer     g_async_queue_pop_unlocked         (GAsyncQueue      *queue);
-gpointer     g_async_queue_try_pop              (GAsyncQueue      *queue);
-gpointer     g_async_queue_try_pop_unlocked     (GAsyncQueue      *queue);
-gpointer     g_async_queue_timeout_pop          (GAsyncQueue      *queue,
-                                                 guint64           timeout);
-gpointer     g_async_queue_timeout_pop_unlocked (GAsyncQueue      *queue,
-                                                 guint64           timeout);
-gint         g_async_queue_length               (GAsyncQueue      *queue);
-gint         g_async_queue_length_unlocked      (GAsyncQueue      *queue);
-void         g_async_queue_sort                 (GAsyncQueue      *queue,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-void         g_async_queue_sort_unlocked        (GAsyncQueue      *queue,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-
-GLIB_DEPRECATED_FOR(g_async_queue_timeout_pop)
-gpointer     g_async_queue_timed_pop            (GAsyncQueue      *queue,
-                                                 GTimeVal         *end_time);
-GLIB_DEPRECATED_FOR(g_async_queue_timeout_pop_unlocked)
-gpointer     g_async_queue_timed_pop_unlocked   (GAsyncQueue      *queue,
-                                                 GTimeVal         *end_time);
-
-G_END_DECLS
-
-#endif /* __G_ASYNCQUEUE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gatomic.h b/GstreamerHelper/x86/include/glib-2.0/glib/gatomic.h
deleted file mode 100644
index 8b52e0b3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gatomic.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright © 2011 Ryan Lortie
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ATOMIC_H__
-#define __G_ATOMIC_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gint                    g_atomic_int_get                      (volatile gint  *atomic);
-void                    g_atomic_int_set                      (volatile gint  *atomic,
-                                                               gint            newval);
-void                    g_atomic_int_inc                      (volatile gint  *atomic);
-gboolean                g_atomic_int_dec_and_test             (volatile gint  *atomic);
-gboolean                g_atomic_int_compare_and_exchange     (volatile gint  *atomic,
-                                                               gint            oldval,
-                                                               gint            newval);
-gint                    g_atomic_int_add                      (volatile gint  *atomic,
-                                                               gint            val);
-GLIB_AVAILABLE_IN_2_30
-guint                   g_atomic_int_and                      (volatile guint *atomic,
-                                                               guint           val);
-GLIB_AVAILABLE_IN_2_30
-guint                   g_atomic_int_or                       (volatile guint *atomic,
-                                                               guint           val);
-guint                   g_atomic_int_xor                      (volatile guint *atomic,
-                                                               guint           val);
-
-gpointer                g_atomic_pointer_get                  (volatile void  *atomic);
-void                    g_atomic_pointer_set                  (volatile void  *atomic,
-                                                               gpointer        newval);
-gboolean                g_atomic_pointer_compare_and_exchange (volatile void  *atomic,
-                                                               gpointer        oldval,
-                                                               gpointer        newval);
-gssize                  g_atomic_pointer_add                  (volatile void  *atomic,
-                                                               gssize          val);
-GLIB_AVAILABLE_IN_2_30
-gsize                   g_atomic_pointer_and                  (volatile void  *atomic,
-                                                               gsize           val);
-GLIB_AVAILABLE_IN_2_30
-gsize                   g_atomic_pointer_or                   (volatile void  *atomic,
-                                                               gsize           val);
-gsize                   g_atomic_pointer_xor                  (volatile void  *atomic,
-                                                               gsize           val);
-
-GLIB_DEPRECATED_IN_2_30_FOR(g_atomic_add)
-gint                    g_atomic_int_exchange_and_add         (volatile gint  *atomic,
-                                                               gint            val);
-
-G_END_DECLS
-
-#if defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
-
-#define g_atomic_int_get(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    __sync_synchronize ();                                                   \
-    (gint) *(atomic);                                                        \
-  }))
-#define g_atomic_int_set(atomic, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (newval) : 0);                                   \
-    *(atomic) = (newval);                                                    \
-    __sync_synchronize ();                                                   \
-  }))
-#define g_atomic_int_inc(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    (void) __sync_fetch_and_add ((atomic), 1);                               \
-  }))
-#define g_atomic_int_dec_and_test(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ *(atomic) : 0);                                  \
-    __sync_fetch_and_sub ((atomic), 1) == 1;                                 \
-  }))
-#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 0);                        \
-    (gboolean) __sync_bool_compare_and_swap ((atomic), (oldval), (newval));  \
-  }))
-#define g_atomic_int_add(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (gint) __sync_fetch_and_add ((atomic), (val));                           \
-  }))
-#define g_atomic_int_and(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_and ((atomic), (val));                          \
-  }))
-#define g_atomic_int_or(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_or ((atomic), (val));                           \
-  }))
-#define g_atomic_int_xor(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint));                     \
-    (void) (0 ? *(atomic) ^ (val) : 0);                                      \
-    (guint) __sync_fetch_and_xor ((atomic), (val));                          \
-  }))
-
-#define g_atomic_pointer_get(atomic) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    __sync_synchronize ();                                                   \
-    (gpointer) *(atomic);                                                    \
-  }))
-#define g_atomic_pointer_set(atomic, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    *(atomic) = (__typeof__ (*(atomic))) (gsize) (newval);                   \
-    __sync_synchronize ();                                                   \
-  }))
-#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (gboolean) __sync_bool_compare_and_swap ((atomic), (oldval), (newval));  \
-  }))
-#define g_atomic_pointer_add(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gssize) __sync_fetch_and_add ((atomic), (val));                         \
-  }))
-#define g_atomic_pointer_and(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_and ((atomic), (val));                          \
-  }))
-#define g_atomic_pointer_or(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_or ((atomic), (val));                           \
-  }))
-#define g_atomic_pointer_xor(atomic, val) \
-  (G_GNUC_EXTENSION ({                                                          \
-    G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer));                 \
-    (void) (0 ? (gpointer) *(atomic) : 0);                                   \
-    (void) (0 ? (val) ^ (val) : 0);                                          \
-    (gsize) __sync_fetch_and_xor ((atomic), (val));                          \
-  }))
-
-#else /* defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */
-
-#define g_atomic_int_get(atomic) \
-  (g_atomic_int_get ((gint *) (atomic)))
-#define g_atomic_int_set(atomic, newval) \
-  (g_atomic_int_set ((gint *) (atomic), (gint) (newval)))
-#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \
-  (g_atomic_int_compare_and_exchange ((gint *) (atomic), (oldval), (newval)))
-#define g_atomic_int_add(atomic, val) \
-  (g_atomic_int_add ((gint *) (atomic), (val)))
-#define g_atomic_int_and(atomic, val) \
-  (g_atomic_int_and ((guint *) (atomic), (val)))
-#define g_atomic_int_or(atomic, val) \
-  (g_atomic_int_or ((guint *) (atomic), (val)))
-#define g_atomic_int_xor(atomic, val) \
-  (g_atomic_int_xor ((guint *) (atomic), (val)))
-#define g_atomic_int_inc(atomic) \
-  (g_atomic_int_inc ((gint *) (atomic)))
-#define g_atomic_int_dec_and_test(atomic) \
-  (g_atomic_int_dec_and_test ((gint *) (atomic)))
-
-#define g_atomic_pointer_get(atomic) \
-  (g_atomic_pointer_get (atomic))
-#define g_atomic_pointer_set(atomic, newval) \
-  (g_atomic_pointer_set ((atomic), (gpointer) (newval)))
-#define g_atomic_pointer_compare_and_exchange(atomic, oldval, newval) \
-  (g_atomic_pointer_compare_and_exchange ((atomic), (gpointer) (oldval), (gpointer) (newval)))
-#define g_atomic_pointer_add(atomic, val) \
-  (g_atomic_pointer_add ((atomic), (gssize) (val)))
-#define g_atomic_pointer_and(atomic, val) \
-  (g_atomic_pointer_and ((atomic), (gsize) (val)))
-#define g_atomic_pointer_or(atomic, val) \
-  (g_atomic_pointer_or ((atomic), (gsize) (val)))
-#define g_atomic_pointer_xor(atomic, val) \
-  (g_atomic_pointer_xor ((atomic), (gsize) (val)))
-
-#endif /* defined(__GNUC__) && defined(G_ATOMIC_OP_USE_GCC_BUILTINS) */
-
-#endif /* __G_ATOMIC_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gbacktrace.h b/GstreamerHelper/x86/include/glib-2.0/glib/gbacktrace.h
deleted file mode 100644
index f0a6eab9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gbacktrace.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BACKTRACE_H__
-#define __G_BACKTRACE_H__
-
-#include <glib/gtypes.h>
-#include <signal.h>
-
-G_BEGIN_DECLS
-
-void g_on_error_query (const gchar *prg_name);
-void g_on_error_stack_trace (const gchar *prg_name);
-
-/**
- * G_BREAKPOINT:
- *
- * Inserts a breakpoint instruction into the code.
- *
- * On x86 and alpha systems this is implemented as a soft interrupt
- * and on other architectures it raises a <literal>SIGTRAP</literal> signal.
- */
-#if (defined (__i386__) || defined (__x86_64__)) && defined (__GNUC__) && __GNUC__ >= 2
-#  define G_BREAKPOINT()        G_STMT_START{ __asm__ __volatile__ ("int $03"); }G_STMT_END
-#elif (defined (_MSC_VER) || defined (__DMC__)) && defined (_M_IX86)
-#  define G_BREAKPOINT()        G_STMT_START{ __asm int 3h }G_STMT_END
-#elif defined (_MSC_VER)
-#  define G_BREAKPOINT()        G_STMT_START{ __debugbreak(); }G_STMT_END
-#elif defined (__alpha__) && !defined(__osf__) && defined (__GNUC__) && __GNUC__ >= 2
-#  define G_BREAKPOINT()        G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END
-#else   /* !__i386__ && !__alpha__ */
-#  define G_BREAKPOINT()        G_STMT_START{ raise (SIGTRAP); }G_STMT_END
-#endif  /* __i386__ */
-
-G_END_DECLS
-
-#endif /* __G_BACKTRACE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gbase64.h b/GstreamerHelper/x86/include/glib-2.0/glib/gbase64.h
deleted file mode 100644
index 88ce6d8a..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gbase64.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* gbase64.h - Base64 coding functions
- *
- *  Copyright (C) 2005  Alexander Larsson <alexl@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BASE64_H__
-#define __G_BASE64_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gsize   g_base64_encode_step    (const guchar *in,
-                                 gsize         len,
-                                 gboolean      break_lines,
-                                 gchar        *out,
-                                 gint         *state,
-                                 gint         *save);
-gsize   g_base64_encode_close   (gboolean      break_lines,
-                                 gchar        *out,
-                                 gint         *state,
-                                 gint         *save);
-gchar*  g_base64_encode         (const guchar *data,
-                                 gsize         len) G_GNUC_MALLOC;
-gsize   g_base64_decode_step    (const gchar  *in,
-                                 gsize         len,
-                                 guchar       *out,
-                                 gint         *state,
-                                 guint        *save);
-guchar *g_base64_decode         (const gchar  *text,
-                                 gsize        *out_len) G_GNUC_MALLOC;
-guchar *g_base64_decode_inplace (gchar        *text,
-                                 gsize        *out_len);
-
-
-G_END_DECLS
-
-#endif /* __G_BASE64_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gbitlock.h b/GstreamerHelper/x86/include/glib-2.0/glib/gbitlock.h
deleted file mode 100644
index 641ee696..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gbitlock.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright © 2008 Ryan Lortie
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __G_BITLOCK_H__
-#define __G_BITLOCK_H__
-
-#include <glib/gtypes.h>
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-G_BEGIN_DECLS
-
-void      g_bit_lock                      (volatile gint *address,
-                                           gint           lock_bit);
-gboolean  g_bit_trylock                   (volatile gint *address,
-                                           gint           lock_bit);
-void      g_bit_unlock                    (volatile gint *address,
-                                           gint           lock_bit);
-
-void      g_pointer_bit_lock              (volatile void *address,
-                                           gint           lock_bit);
-gboolean  g_pointer_bit_trylock           (volatile void *address,
-                                           gint           lock_bit);
-void      g_pointer_bit_unlock            (volatile void *address,
-                                           gint           lock_bit);
-
-#ifdef __GNUC__
-
-#define g_pointer_bit_lock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_lock ((address), (lock_bit));                              \
-  }))
-
-#define g_pointer_bit_trylock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_trylock ((address), (lock_bit));                           \
-  }))
-
-#define g_pointer_bit_unlock(address, lock_bit) \
-  (G_GNUC_EXTENSION ({                                                       \
-    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
-    g_pointer_bit_unlock ((address), (lock_bit));                            \
-  }))
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_BITLOCK_H_ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gbookmarkfile.h b/GstreamerHelper/x86/include/glib-2.0/glib/gbookmarkfile.h
deleted file mode 100644
index 6b2ee6f4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gbookmarkfile.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* gbookmarkfile.h: parsing and building desktop bookmarks
- *
- * Copyright (C) 2005-2006 Emmanuele Bassi
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BOOKMARK_FILE_H__
-#define __G_BOOKMARK_FILE_H__
-
-#include <glib/gerror.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_BOOKMARK_FILE_ERROR:
- *
- * Error domain for bookmark file parsing.
- * Errors in this domain will be from the #GBookmarkFileError
- * enumeration. See #GError for information on error domains.
- */
-#define G_BOOKMARK_FILE_ERROR	(g_bookmark_file_error_quark ())
-
-
-/**
- * GBookmarkFileError:
- * @G_BOOKMARK_FILE_ERROR_INVALID_URI: URI was ill-formed
- * @G_BOOKMARK_FILE_ERROR_INVALID_VALUE: a requested field was not found
- * @G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED: a requested application did
- *     not register a bookmark
- * @G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND: a requested URI was not found
- * @G_BOOKMARK_FILE_ERROR_READ: document was ill formed
- * @G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING: the text being parsed was
- *     in an unknown encoding
- * @G_BOOKMARK_FILE_ERROR_WRITE: an error occurred while writing
- * @G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND: requested file was not found
- *
- * Error codes returned by bookmark file parsing.
- */
-typedef enum
-{
-  G_BOOKMARK_FILE_ERROR_INVALID_URI,
-  G_BOOKMARK_FILE_ERROR_INVALID_VALUE,
-  G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED,
-  G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-  G_BOOKMARK_FILE_ERROR_READ,
-  G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING,
-  G_BOOKMARK_FILE_ERROR_WRITE,
-  G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND
-} GBookmarkFileError;
-
-GQuark g_bookmark_file_error_quark (void);
-
-/**
- * GBookmarkFile:
- *
- * The <structname>GBookmarkFile</structname> struct contains only
- * private data and should not be directly accessed.
- */
-typedef struct _GBookmarkFile GBookmarkFile;
-
-GBookmarkFile *g_bookmark_file_new                 (void);
-void           g_bookmark_file_free                (GBookmarkFile  *bookmark);
-
-gboolean       g_bookmark_file_load_from_file      (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data      (GBookmarkFile  *bookmark,
-						    const gchar    *data,
-						    gsize           length,
-						    GError        **error);
-gboolean       g_bookmark_file_load_from_data_dirs (GBookmarkFile  *bookmark,
-						    const gchar    *file,
-						    gchar         **full_path,
-						    GError        **error);
-gchar *        g_bookmark_file_to_data             (GBookmarkFile  *bookmark,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_to_file             (GBookmarkFile  *bookmark,
-						    const gchar    *filename,
-						    GError        **error);
-
-void           g_bookmark_file_set_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *title);
-gchar *        g_bookmark_file_get_title           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *description);
-gchar *        g_bookmark_file_get_description     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *mime_type);
-gchar *        g_bookmark_file_get_mime_type       (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_set_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar   **groups,
-						    gsize           length);
-void           g_bookmark_file_add_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group);
-gboolean       g_bookmark_file_has_group           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gchar **       g_bookmark_file_get_groups          (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-void           g_bookmark_file_add_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec);
-gboolean       g_bookmark_file_has_application     (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gchar **       g_bookmark_file_get_applications    (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gsize          *length,
-						    GError        **error) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_set_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    const gchar    *exec,
-						    gint            count,
-						    time_t          stamp,
-						    GError        **error);
-gboolean       g_bookmark_file_get_app_info        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    gchar         **exec,
-						    guint          *count,
-						    time_t         *stamp,
-						    GError        **error);
-void           g_bookmark_file_set_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gboolean        is_private);
-gboolean       g_bookmark_file_get_is_private      (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *href,
-						    const gchar    *mime_type);
-gboolean       g_bookmark_file_get_icon            (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    gchar         **href,
-						    gchar         **mime_type,
-						    GError        **error);
-void           g_bookmark_file_set_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          added);
-time_t         g_bookmark_file_get_added           (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          modified);
-time_t         g_bookmark_file_get_modified        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-void           g_bookmark_file_set_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    time_t          visited);
-time_t         g_bookmark_file_get_visited         (GBookmarkFile  *bookmark,
-						    const gchar    *uri, 
-						    GError        **error);
-gboolean       g_bookmark_file_has_item            (GBookmarkFile  *bookmark,
-						    const gchar    *uri);
-gint           g_bookmark_file_get_size            (GBookmarkFile  *bookmark);
-gchar **       g_bookmark_file_get_uris            (GBookmarkFile  *bookmark,
-						    gsize          *length) G_GNUC_MALLOC;
-gboolean       g_bookmark_file_remove_group        (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *group,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_application  (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    const gchar    *name,
-						    GError        **error);
-gboolean       g_bookmark_file_remove_item         (GBookmarkFile  *bookmark,
-						    const gchar    *uri,
-						    GError        **error);
-gboolean       g_bookmark_file_move_item           (GBookmarkFile  *bookmark,
-						    const gchar    *old_uri,
-						    const gchar    *new_uri,
-						    GError        **error);
-
-G_END_DECLS
-
-#endif /* __G_BOOKMARK_FILE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gbytes.h b/GstreamerHelper/x86/include/glib-2.0/glib/gbytes.h
deleted file mode 100644
index de3c8f80..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gbytes.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2009, 2010 Codethink Limited
- * Copyright © 2011 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- *         Stef Walter <stefw@collabora.co.uk>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_BYTES_H__
-#define __G_BYTES_H__
-
-#include <glib/gtypes.h>
-#include <glib/garray.h>
-
-G_BEGIN_DECLS
-
-GBytes *        g_bytes_new                     (gconstpointer   data,
-                                                 gsize           size);
-
-GBytes *        g_bytes_new_take                (gpointer        data,
-                                                 gsize           size);
-
-GBytes *        g_bytes_new_static              (gconstpointer   data,
-                                                 gsize           size);
-
-GBytes *        g_bytes_new_with_free_func      (gconstpointer   data,
-                                                 gsize           size,
-                                                 GDestroyNotify  free_func,
-                                                 gpointer        user_data);
-
-GBytes *        g_bytes_new_from_bytes          (GBytes         *bytes,
-                                                 gsize           offset,
-                                                 gsize           length);
-
-gconstpointer   g_bytes_get_data                (GBytes         *bytes,
-                                                 gsize          *size);
-
-gsize           g_bytes_get_size                (GBytes         *bytes);
-
-GBytes *        g_bytes_ref                     (GBytes         *bytes);
-
-void            g_bytes_unref                   (GBytes         *bytes);
-
-gpointer        g_bytes_unref_to_data           (GBytes         *bytes,
-                                                 gsize          *size);
-
-GByteArray *    g_bytes_unref_to_array          (GBytes         *bytes);
-
-guint           g_bytes_hash                    (gconstpointer   bytes);
-
-gboolean        g_bytes_equal                   (gconstpointer   bytes1,
-                                                 gconstpointer   bytes2);
-
-gint            g_bytes_compare                 (gconstpointer   bytes1,
-                                                 gconstpointer   bytes2);
-
-G_END_DECLS
-
-#endif /* __G_BYTES_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gcharset.h b/GstreamerHelper/x86/include/glib-2.0/glib/gcharset.h
deleted file mode 100644
index 9b56524c..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gcharset.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* gcharset.h - Charset functions
- *
- *  Copyright (C) 2011 Red Hat, Inc.
- *
- * The GLib Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The GLib Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CHARSET_H__
-#define __G_CHARSET_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gboolean              g_get_charset         (const char **charset);
-gchar *               g_get_codeset         (void);
-
-const gchar * const * g_get_language_names  (void);
-gchar **              g_get_locale_variants (const gchar *locale);
-
-G_END_DECLS
-
-#endif  /* __G_CHARSET_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gchecksum.h b/GstreamerHelper/x86/include/glib-2.0/glib/gchecksum.h
deleted file mode 100644
index b0621f24..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gchecksum.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* gchecksum.h - data hashing functions
- *
- * Copyright (C) 2007  Emmanuele Bassi  <ebassi@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CHECKSUM_H__
-#define __G_CHECKSUM_H__
-
-#include <glib/gtypes.h>
-#include <glib/gbytes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GChecksumType:
- * @G_CHECKSUM_MD5: Use the MD5 hashing algorithm
- * @G_CHECKSUM_SHA1: Use the SHA-1 hashing algorithm
- * @G_CHECKSUM_SHA256: Use the SHA-256 hashing algorithm
- *
- * The hashing algorithm to be used by #GChecksum when performing the
- * digest of some data.
- *
- * Note that the #GChecksumType enumeration may be extended at a later
- * date to include new hashing algorithm types.
- *
- * Since: 2.16
- */
-typedef enum {
-  G_CHECKSUM_MD5,
-  G_CHECKSUM_SHA1,
-  G_CHECKSUM_SHA256
-} GChecksumType;
-
-/**
- * GChecksum:
- *
- * An opaque structure representing a checksumming operation.
- * To create a new GChecksum, use g_checksum_new(). To free
- * a GChecksum, use g_checksum_free().
- *
- * Since: 2.16
- */
-typedef struct _GChecksum       GChecksum;
-
-gssize                g_checksum_type_get_length    (GChecksumType    checksum_type);
-
-GChecksum *           g_checksum_new                (GChecksumType    checksum_type);
-void                  g_checksum_reset              (GChecksum       *checksum);
-GChecksum *           g_checksum_copy               (const GChecksum *checksum);
-void                  g_checksum_free               (GChecksum       *checksum);
-void                  g_checksum_update             (GChecksum       *checksum,
-                                                     const guchar    *data,
-                                                     gssize           length);
-const gchar *         g_checksum_get_string         (GChecksum       *checksum);
-void                  g_checksum_get_digest         (GChecksum       *checksum,
-                                                     guint8          *buffer,
-                                                     gsize           *digest_len);
-
-gchar                *g_compute_checksum_for_data   (GChecksumType    checksum_type,
-                                                     const guchar    *data,
-                                                     gsize            length);
-gchar                *g_compute_checksum_for_string (GChecksumType    checksum_type,
-                                                     const gchar     *str,
-                                                     gssize           length);
-
-GLIB_AVAILABLE_IN_2_34
-gchar                *g_compute_checksum_for_bytes  (GChecksumType    checksum_type,
-                                                     GBytes          *data);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gconvert.h b/GstreamerHelper/x86/include/glib-2.0/glib/gconvert.h
deleted file mode 100644
index 7fd16c84..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gconvert.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_CONVERT_H__
-#define __G_CONVERT_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-/**
- * GConvertError:
- * @G_CONVERT_ERROR_NO_CONVERSION: Conversion between the requested character
- *     sets is not supported.
- * @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion input.
- * @G_CONVERT_ERROR_FAILED: Conversion failed for some reason.
- * @G_CONVERT_ERROR_PARTIAL_INPUT: Partial character sequence at end of input.
- * @G_CONVERT_ERROR_BAD_URI: URI is invalid.
- * @G_CONVERT_ERROR_NOT_ABSOLUTE_PATH: Pathname is not an absolute path.
- *
- * Error codes returned by character set conversion routines.
- */
-typedef enum
-{
-  G_CONVERT_ERROR_NO_CONVERSION,
-  G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-  G_CONVERT_ERROR_FAILED,
-  G_CONVERT_ERROR_PARTIAL_INPUT,
-  G_CONVERT_ERROR_BAD_URI,
-  G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
-} GConvertError;
-
-/**
- * G_CONVERT_ERROR:
- *
- * Error domain for character set conversions. Errors in this domain will
- * be from the #GConvertError enumeration. See #GError for information on
- * error domains.
- */
-#define G_CONVERT_ERROR g_convert_error_quark()
-GQuark g_convert_error_quark (void);
-
-/**
- * GIconv:
- *
- * The <structname>GIConv</structname> struct wraps an
- * iconv() conversion descriptor. It contains private data
- * and should only be accessed using the following functions.
- */
-typedef struct _GIConv *GIConv;
-
-GIConv g_iconv_open   (const gchar  *to_codeset,
-		       const gchar  *from_codeset);
-gsize  g_iconv        (GIConv        converter,
-		       gchar       **inbuf,
-		       gsize        *inbytes_left,
-		       gchar       **outbuf,
-		       gsize        *outbytes_left);
-gint   g_iconv_close  (GIConv        converter);
-
-
-gchar* g_convert               (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-gchar* g_convert_with_iconv    (const gchar  *str,
-				gssize        len,
-				GIConv        converter,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-gchar* g_convert_with_fallback (const gchar  *str,
-				gssize        len,            
-				const gchar  *to_codeset,
-				const gchar  *from_codeset,
-				const gchar  *fallback,
-				gsize        *bytes_read,     
-				gsize        *bytes_written,  
-				GError      **error) G_GNUC_MALLOC;
-
-
-/* Convert between libc's idea of strings and UTF-8.
- */
-gchar* g_locale_to_utf8   (const gchar  *opsysstring,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-gchar* g_locale_from_utf8 (const gchar  *utf8string,
-			   gssize        len,            
-			   gsize        *bytes_read,     
-			   gsize        *bytes_written,  
-			   GError      **error) G_GNUC_MALLOC;
-
-/* Convert between the operating system (or C runtime)
- * representation of file names and UTF-8.
- */
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_filename_to_utf8 g_filename_to_utf8_utf8
-#define g_filename_from_utf8 g_filename_from_utf8_utf8
-#define g_filename_from_uri g_filename_from_uri_utf8
-#define g_filename_to_uri g_filename_to_uri_utf8 
-#endif
-#endif
-
-gchar* g_filename_to_utf8   (const gchar  *opsysstring,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-gchar* g_filename_from_utf8 (const gchar  *utf8string,
-			     gssize        len,            
-			     gsize        *bytes_read,     
-			     gsize        *bytes_written,  
-			     GError      **error) G_GNUC_MALLOC;
-
-gchar *g_filename_from_uri (const gchar *uri,
-			    gchar      **hostname,
-			    GError     **error) G_GNUC_MALLOC;
-  
-gchar *g_filename_to_uri   (const gchar *filename,
-			    const gchar *hostname,
-			    GError     **error) G_GNUC_MALLOC;
-gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
-gboolean g_get_filename_charsets (const gchar ***charsets);
-
-gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;
-
-gchar **g_uri_list_extract_uris (const gchar *uri_list) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_CONVERT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gdataset.h b/GstreamerHelper/x86/include/glib-2.0/glib/gdataset.h
deleted file mode 100644
index a93f6ae9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gdataset.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATASET_H__
-#define __G_DATASET_H__
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GData           GData;
-
-typedef void            (*GDataForeachFunc)     (GQuark         key_id,
-                                                 gpointer       data,
-                                                 gpointer       user_data);
-
-/* Keyed Data List
- */
-void     g_datalist_init                (GData            **datalist);
-void     g_datalist_clear               (GData            **datalist);
-gpointer g_datalist_id_get_data         (GData            **datalist,
-					 GQuark             key_id);
-void     g_datalist_id_set_data_full    (GData            **datalist,
-					 GQuark             key_id,
-					 gpointer           data,
-					 GDestroyNotify     destroy_func);
-
-typedef gpointer (*GDuplicateFunc) (gpointer data, gpointer user_data);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer g_datalist_id_dup_data         (GData            **datalist,
-                                         GQuark             key_id,
-                                         GDuplicateFunc     dup_func,
-					 gpointer           user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean g_datalist_id_replace_data     (GData            **datalist,
-                                         GQuark             key_id,
-                                         gpointer           oldval,
-                                         gpointer           newval,
-                                         GDestroyNotify     destroy,
-					 GDestroyNotify    *old_destroy);
-
-gpointer g_datalist_id_remove_no_notify (GData            **datalist,
-					 GQuark             key_id);
-void     g_datalist_foreach             (GData            **datalist,
-					 GDataForeachFunc   func,
-					 gpointer           user_data);
-
-/**
- * G_DATALIST_FLAGS_MASK:
- *
- * A bitmask that restricts the possible flags passed to
- * g_datalist_set_flags(). Passing a flags value where
- * flags & ~G_DATALIST_FLAGS_MASK != 0 is an error.
- */
-#define G_DATALIST_FLAGS_MASK 0x3
-
-void     g_datalist_set_flags           (GData            **datalist,
-					 guint              flags);
-void     g_datalist_unset_flags         (GData            **datalist,
-					 guint              flags);
-guint    g_datalist_get_flags           (GData            **datalist);
-
-#define   g_datalist_id_set_data(dl, q, d)      \
-     g_datalist_id_set_data_full ((dl), (q), (d), NULL)
-#define   g_datalist_id_remove_data(dl, q)      \
-     g_datalist_id_set_data ((dl), (q), NULL)
-#define   g_datalist_set_data_full(dl, k, d, f) \
-     g_datalist_id_set_data_full ((dl), g_quark_from_string (k), (d), (f))
-#define   g_datalist_remove_no_notify(dl, k)    \
-     g_datalist_id_remove_no_notify ((dl), g_quark_try_string (k))
-#define   g_datalist_set_data(dl, k, d)         \
-     g_datalist_set_data_full ((dl), (k), (d), NULL)
-#define   g_datalist_remove_data(dl, k)         \
-     g_datalist_id_set_data ((dl), g_quark_try_string (k), NULL)
-
-/* Location Associated Keyed Data
- */
-void      g_dataset_destroy             (gconstpointer    dataset_location);
-gpointer  g_dataset_id_get_data         (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-gpointer  g_datalist_get_data            (GData	 **datalist,
-					  const gchar *key);
-void      g_dataset_id_set_data_full    (gconstpointer    dataset_location,
-                                         GQuark           key_id,
-                                         gpointer         data,
-                                         GDestroyNotify   destroy_func);
-gpointer  g_dataset_id_remove_no_notify (gconstpointer    dataset_location,
-                                         GQuark           key_id);
-void      g_dataset_foreach             (gconstpointer    dataset_location,
-                                         GDataForeachFunc func,
-                                         gpointer         user_data);
-#define   g_dataset_id_set_data(l, k, d)        \
-     g_dataset_id_set_data_full ((l), (k), (d), NULL)
-#define   g_dataset_id_remove_data(l, k)        \
-     g_dataset_id_set_data ((l), (k), NULL)
-#define   g_dataset_get_data(l, k)              \
-     (g_dataset_id_get_data ((l), g_quark_try_string (k)))
-#define   g_dataset_set_data_full(l, k, d, f)   \
-     g_dataset_id_set_data_full ((l), g_quark_from_string (k), (d), (f))
-#define   g_dataset_remove_no_notify(l, k)      \
-     g_dataset_id_remove_no_notify ((l), g_quark_try_string (k))
-#define   g_dataset_set_data(l, k, d)           \
-     g_dataset_set_data_full ((l), (k), (d), NULL)
-#define   g_dataset_remove_data(l, k)           \
-     g_dataset_id_set_data ((l), g_quark_try_string (k), NULL)
-
-G_END_DECLS
-
-#endif /* __G_DATASET_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gdate.h b/GstreamerHelper/x86/include/glib-2.0/glib/gdate.h
deleted file mode 100644
index 5ef1850b..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gdate.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATE_H__
-#define __G_DATE_H__
-
-#include <time.h>
-
-#include <glib/gtypes.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/* GDate
- *
- * Date calculations (not time for now, to be resolved). These are a
- * mutant combination of Steffen Beyer's DateCalc routines
- * (http://www.perl.com/CPAN/authors/id/STBEY/) and Jon Trowbridge's
- * date routines (written for in-house software).  Written by Havoc
- * Pennington <hp@pobox.com>
- */
-
-typedef gint32  GTime;
-typedef guint16 GDateYear;
-typedef guint8  GDateDay;   /* day of the month */
-typedef struct _GDate GDate;
-
-/* enum used to specify order of appearance in parsed date strings */
-typedef enum
-{
-  G_DATE_DAY   = 0,
-  G_DATE_MONTH = 1,
-  G_DATE_YEAR  = 2
-} GDateDMY;
-
-/* actual week and month values */
-typedef enum
-{
-  G_DATE_BAD_WEEKDAY  = 0,
-  G_DATE_MONDAY       = 1,
-  G_DATE_TUESDAY      = 2,
-  G_DATE_WEDNESDAY    = 3,
-  G_DATE_THURSDAY     = 4,
-  G_DATE_FRIDAY       = 5,
-  G_DATE_SATURDAY     = 6,
-  G_DATE_SUNDAY       = 7
-} GDateWeekday;
-typedef enum
-{
-  G_DATE_BAD_MONTH = 0,
-  G_DATE_JANUARY   = 1,
-  G_DATE_FEBRUARY  = 2,
-  G_DATE_MARCH     = 3,
-  G_DATE_APRIL     = 4,
-  G_DATE_MAY       = 5,
-  G_DATE_JUNE      = 6,
-  G_DATE_JULY      = 7,
-  G_DATE_AUGUST    = 8,
-  G_DATE_SEPTEMBER = 9,
-  G_DATE_OCTOBER   = 10,
-  G_DATE_NOVEMBER  = 11,
-  G_DATE_DECEMBER  = 12
-} GDateMonth;
-
-#define G_DATE_BAD_JULIAN 0U
-#define G_DATE_BAD_DAY    0U
-#define G_DATE_BAD_YEAR   0U
-
-/* Note: directly manipulating structs is generally a bad idea, but
- * in this case it's an *incredibly* bad idea, because all or part
- * of this struct can be invalid at any given time. Use the functions,
- * or you will get hosed, I promise.
- */
-struct _GDate
-{
-  guint julian_days : 32; /* julian days representation - we use a
-                           *  bitfield hoping that 64 bit platforms
-                           *  will pack this whole struct in one big
-                           *  int
-                           */
-
-  guint julian : 1;    /* julian is valid */
-  guint dmy    : 1;    /* dmy is valid */
-
-  /* DMY representation */
-  guint day    : 6;
-  guint month  : 4;
-  guint year   : 16;
-};
-
-/* g_date_new() returns an invalid date, you then have to _set() stuff
- * to get a usable object. You can also allocate a GDate statically,
- * then call g_date_clear() to initialize.
- */
-GDate*       g_date_new                   (void);
-GDate*       g_date_new_dmy               (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year);
-GDate*       g_date_new_julian            (guint32      julian_day);
-void         g_date_free                  (GDate       *date);
-
-/* check g_date_valid() after doing an operation that might fail, like
- * _parse.  Almost all g_date operations are undefined on invalid
- * dates (the exceptions are the mutators, since you need those to
- * return to validity).
- */
-gboolean     g_date_valid                 (const GDate *date);
-gboolean     g_date_valid_day             (GDateDay     day) G_GNUC_CONST;
-gboolean     g_date_valid_month           (GDateMonth month) G_GNUC_CONST;
-gboolean     g_date_valid_year            (GDateYear  year) G_GNUC_CONST;
-gboolean     g_date_valid_weekday         (GDateWeekday weekday) G_GNUC_CONST;
-gboolean     g_date_valid_julian          (guint32 julian_date) G_GNUC_CONST;
-gboolean     g_date_valid_dmy             (GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-
-GDateWeekday g_date_get_weekday           (const GDate *date);
-GDateMonth   g_date_get_month             (const GDate *date);
-GDateYear    g_date_get_year              (const GDate *date);
-GDateDay     g_date_get_day               (const GDate *date);
-guint32      g_date_get_julian            (const GDate *date);
-guint        g_date_get_day_of_year       (const GDate *date);
-/* First monday/sunday is the start of week 1; if we haven't reached
- * that day, return 0. These are not ISO weeks of the year; that
- * routine needs to be added.
- * these functions return the number of weeks, starting on the
- * corrsponding day
- */
-guint        g_date_get_monday_week_of_year (const GDate *date);
-guint        g_date_get_sunday_week_of_year (const GDate *date);
-guint        g_date_get_iso8601_week_of_year (const GDate *date);
-
-/* If you create a static date struct you need to clear it to get it
- * in a sane state before use. You can clear a whole array at
- * once with the ndates argument.
- */
-void         g_date_clear                 (GDate       *date,
-                                           guint        n_dates);
-
-/* The parse routine is meant for dates typed in by a user, so it
- * permits many formats but tries to catch common typos. If your data
- * needs to be strictly validated, it is not an appropriate function.
- */
-void         g_date_set_parse             (GDate       *date,
-                                           const gchar *str);
-void         g_date_set_time_t            (GDate       *date,
-					   time_t       timet);
-void         g_date_set_time_val          (GDate       *date,
-					   GTimeVal    *timeval);
-#ifndef G_DISABLE_DEPRECATED
-GLIB_DEPRECATED_FOR(g_date_set_time_t)
-void         g_date_set_time              (GDate       *date,
-                                           GTime        time_);
-#endif
-void         g_date_set_month             (GDate       *date,
-                                           GDateMonth   month);
-void         g_date_set_day               (GDate       *date,
-                                           GDateDay     day);
-void         g_date_set_year              (GDate       *date,
-                                           GDateYear    year);
-void         g_date_set_dmy               (GDate       *date,
-                                           GDateDay     day,
-                                           GDateMonth   month,
-                                           GDateYear    y);
-void         g_date_set_julian            (GDate       *date,
-                                           guint32      julian_date);
-gboolean     g_date_is_first_of_month     (const GDate *date);
-gboolean     g_date_is_last_of_month      (const GDate *date);
-
-/* To go forward by some number of weeks just go forward weeks*7 days */
-void         g_date_add_days              (GDate       *date,
-                                           guint        n_days);
-void         g_date_subtract_days         (GDate       *date,
-                                           guint        n_days);
-
-/* If you add/sub months while day > 28, the day might change */
-void         g_date_add_months            (GDate       *date,
-                                           guint        n_months);
-void         g_date_subtract_months       (GDate       *date,
-                                           guint        n_months);
-
-/* If it's feb 29, changing years can move you to the 28th */
-void         g_date_add_years             (GDate       *date,
-                                           guint        n_years);
-void         g_date_subtract_years        (GDate       *date,
-                                           guint        n_years);
-gboolean     g_date_is_leap_year          (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_days_in_month     (GDateMonth   month,
-                                           GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_monday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-guint8       g_date_get_sunday_weeks_in_year  (GDateYear    year) G_GNUC_CONST;
-
-/* Returns the number of days between the two dates.  If date2 comes
-   before date1, a negative value is return. */
-gint         g_date_days_between          (const GDate *date1,
-					   const GDate *date2);
-
-/* qsort-friendly (with a cast...) */
-gint         g_date_compare               (const GDate *lhs,
-                                           const GDate *rhs);
-void         g_date_to_struct_tm          (const GDate *date,
-                                           struct tm   *tm);
-
-void         g_date_clamp                 (GDate *date,
-					   const GDate *min_date,
-					   const GDate *max_date);
-
-/* Swap date1 and date2's values if date1 > date2. */
-void         g_date_order                 (GDate *date1, GDate *date2);
-
-/* Just like strftime() except you can only use date-related formats.
- *   Using a time format is undefined.
- */
-gsize        g_date_strftime              (gchar       *s,
-                                           gsize        slen,
-                                           const gchar *format,
-                                           const GDate *date);
-
-#ifndef G_DISABLE_DEPRECATED
-
-#define g_date_weekday 			g_date_get_weekday
-#define g_date_month 			g_date_get_month
-#define g_date_year 			g_date_get_year
-#define g_date_day 			g_date_get_day
-#define g_date_julian 			g_date_get_julian
-#define g_date_day_of_year 		g_date_get_day_of_year
-#define g_date_monday_week_of_year 	g_date_get_monday_week_of_year
-#define g_date_sunday_week_of_year 	g_date_get_sunday_week_of_year
-#define g_date_days_in_month 		g_date_get_days_in_month
-#define g_date_monday_weeks_in_year 	g_date_get_monday_weeks_in_year
-#define g_date_sunday_weeks_in_year	g_date_get_sunday_weeks_in_year
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_DATE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gdatetime.h b/GstreamerHelper/x86/include/glib-2.0/glib/gdatetime.h
deleted file mode 100644
index 6643e3ff..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gdatetime.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2009-2010 Christian Hergert <chris@dronelabs.com>
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * licence, or (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA.
- *
- * Authors: Christian Hergert <chris@dronelabs.com>
- *          Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *          Emmanuele Bassi <ebassi@linux.intel.com>
- *          Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DATE_TIME_H__
-#define __G_DATE_TIME_H__
-
-#include <glib/gtimezone.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TIME_SPAN_DAY:
- *
- * Evaluates to a time span of one day.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_DAY                 (G_GINT64_CONSTANT (86400000000))
-
-/**
- * G_TIME_SPAN_HOUR:
- *
- * Evaluates to a time span of one hour.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_HOUR                (G_GINT64_CONSTANT (3600000000))
-
-/**
- * G_TIME_SPAN_MINUTE:
- *
- * Evaluates to a time span of one minute.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_MINUTE              (G_GINT64_CONSTANT (60000000))
-
-/**
- * G_TIME_SPAN_SECOND:
- *
- * Evaluates to a time span of one second.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT (1000000))
-
-/**
- * G_TIME_SPAN_MILLISECOND:
- *
- * Evaluates to a time span of one millisecond.
- *
- * Since: 2.26
- */
-#define G_TIME_SPAN_MILLISECOND         (G_GINT64_CONSTANT (1000))
-
-/**
- * GTimeSpan:
- *
- * A value representing an interval of time, in microseconds.
- *
- * Since: 2.26
- */
-typedef gint64 GTimeSpan;
-
-/**
- * GDateTime:
- *
- * <structname>GDateTime</structname> is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
-typedef struct _GDateTime GDateTime;
-
-void                    g_date_time_unref                               (GDateTime      *datetime);
-GDateTime *             g_date_time_ref                                 (GDateTime      *datetime);
-
-GDateTime *             g_date_time_new_now                             (GTimeZone      *tz);
-GDateTime *             g_date_time_new_now_local                       (void);
-GDateTime *             g_date_time_new_now_utc                         (void);
-
-GDateTime *             g_date_time_new_from_unix_local                 (gint64          t);
-GDateTime *             g_date_time_new_from_unix_utc                   (gint64          t);
-
-GDateTime *             g_date_time_new_from_timeval_local              (const GTimeVal *tv);
-GDateTime *             g_date_time_new_from_timeval_utc                (const GTimeVal *tv);
-
-GDateTime *             g_date_time_new                                 (GTimeZone      *tz,
-                                                                         gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-GDateTime *             g_date_time_new_local                           (gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-GDateTime *             g_date_time_new_utc                             (gint            year,
-                                                                         gint            month,
-                                                                         gint            day,
-                                                                         gint            hour,
-                                                                         gint            minute,
-                                                                         gdouble         seconds);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add                                 (GDateTime      *datetime,
-                                                                         GTimeSpan       timespan);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_years                           (GDateTime      *datetime,
-                                                                         gint            years);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_months                          (GDateTime      *datetime,
-                                                                         gint            months);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_weeks                           (GDateTime      *datetime,
-                                                                         gint            weeks);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_days                            (GDateTime      *datetime,
-                                                                         gint            days);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_hours                           (GDateTime      *datetime,
-                                                                         gint            hours);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_minutes                         (GDateTime      *datetime,
-                                                                         gint            minutes);
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_seconds                         (GDateTime      *datetime,
-                                                                         gdouble         seconds);
-
-G_GNUC_WARN_UNUSED_RESULT
-GDateTime *             g_date_time_add_full                            (GDateTime      *datetime,
-                                                                         gint            years,
-                                                                         gint            months,
-                                                                         gint            days,
-                                                                         gint            hours,
-                                                                         gint            minutes,
-                                                                         gdouble         seconds);
-
-gint                    g_date_time_compare                             (gconstpointer   dt1,
-                                                                         gconstpointer   dt2);
-GTimeSpan               g_date_time_difference                          (GDateTime      *end,
-                                                                         GDateTime      *begin);
-guint                   g_date_time_hash                                (gconstpointer   datetime);
-gboolean                g_date_time_equal                               (gconstpointer   dt1,
-                                                                         gconstpointer   dt2);
-
-void                    g_date_time_get_ymd                             (GDateTime      *datetime,
-                                                                         gint           *year,
-                                                                         gint           *month,
-                                                                         gint           *day);
-
-gint                    g_date_time_get_year                            (GDateTime      *datetime);
-gint                    g_date_time_get_month                           (GDateTime      *datetime);
-gint                    g_date_time_get_day_of_month                    (GDateTime      *datetime);
-
-gint                    g_date_time_get_week_numbering_year             (GDateTime      *datetime);
-gint                    g_date_time_get_week_of_year                    (GDateTime      *datetime);
-gint                    g_date_time_get_day_of_week                     (GDateTime      *datetime);
-
-gint                    g_date_time_get_day_of_year                     (GDateTime      *datetime);
-
-gint                    g_date_time_get_hour                            (GDateTime      *datetime);
-gint                    g_date_time_get_minute                          (GDateTime      *datetime);
-gint                    g_date_time_get_second                          (GDateTime      *datetime);
-gint                    g_date_time_get_microsecond                     (GDateTime      *datetime);
-gdouble                 g_date_time_get_seconds                         (GDateTime      *datetime);
-
-gint64                  g_date_time_to_unix                             (GDateTime      *datetime);
-gboolean                g_date_time_to_timeval                          (GDateTime      *datetime,
-                                                                         GTimeVal       *tv);
-
-GTimeSpan               g_date_time_get_utc_offset                      (GDateTime      *datetime);
-const gchar *           g_date_time_get_timezone_abbreviation           (GDateTime      *datetime);
-gboolean                g_date_time_is_daylight_savings                 (GDateTime      *datetime);
-
-GDateTime *             g_date_time_to_timezone                         (GDateTime      *datetime,
-                                                                         GTimeZone      *tz);
-GDateTime *             g_date_time_to_local                            (GDateTime      *datetime);
-GDateTime *             g_date_time_to_utc                              (GDateTime      *datetime);
-
-gchar *                 g_date_time_format                              (GDateTime      *datetime,
-                                                                         const gchar    *format) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_DATE_TIME_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gdir.h b/GstreamerHelper/x86/include/glib-2.0/glib/gdir.h
deleted file mode 100644
index 79b3038d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gdir.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * gdir.c: Simplified wrapper around the DIRENT functions.
- *
- * Copyright 2001 Hans Breuer
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_DIR_H__
-#define __G_DIR_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GDir GDir;
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-/* For DLL ABI stability, keep old names for old (non-UTF-8) functionality. */
-#define g_dir_open g_dir_open_utf8
-#define g_dir_read_name g_dir_read_name_utf8
-#endif
-#endif
-
-GDir    *                g_dir_open           (const gchar  *path,
-					       guint         flags,
-					       GError      **error);
-const gchar *            g_dir_read_name      (GDir         *dir);
-void                     g_dir_rewind         (GDir         *dir);
-void                     g_dir_close          (GDir         *dir);
-
-G_END_DECLS
-
-#endif /* __G_DIR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/genviron.h b/GstreamerHelper/x86/include/glib-2.0/glib/genviron.h
deleted file mode 100644
index c75c5482..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/genviron.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ENVIRON_H__
-#define __G_ENVIRON_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_getenv g_getenv_utf8
-#define g_setenv g_setenv_utf8
-#define g_unsetenv g_unsetenv_utf8
-#endif
-#endif
-
-const gchar * g_getenv           (const gchar  *variable);
-gboolean      g_setenv           (const gchar  *variable,
-                                  const gchar  *value,
-                                  gboolean      overwrite);
-void          g_unsetenv         (const gchar  *variable);
-gchar **      g_listenv          (void);
-
-gchar **      g_get_environ      (void);
-const gchar * g_environ_getenv   (gchar       **envp,
-                                  const gchar  *variable);
-gchar **      g_environ_setenv   (gchar       **envp,
-                                  const gchar  *variable,
-                                  const gchar  *value,
-                                  gboolean      overwrite) G_GNUC_WARN_UNUSED_RESULT;
-gchar **      g_environ_unsetenv (gchar       **envp,
-                                  const gchar  *variable) G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS
-
-#endif /* __G_ENVIRON_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gerror.h b/GstreamerHelper/x86/include/glib-2.0/glib/gerror.h
deleted file mode 100644
index 6eb65fee..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gerror.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* gerror.h - Error reporting system
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_ERROR_H__
-#define __G_ERROR_H__
-
-#include <stdarg.h>
-
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/**
- * GError:
- * @domain: error domain, e.g. #G_FILE_ERROR
- * @code: error code, e.g. %G_FILE_ERROR_NOENT
- * @message: human-readable informative error message
- *
- * The <structname>GError</structname> structure contains
- * information about an error that has occurred.
- */
-typedef struct _GError GError;
-
-struct _GError
-{
-  GQuark       domain;
-  gint         code;
-  gchar       *message;
-};
-
-GError*  g_error_new           (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (3, 4);
-
-GError*  g_error_new_literal   (GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-GError*  g_error_new_valist    (GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                va_list        args);
-
-void     g_error_free          (GError        *error);
-GError*  g_error_copy          (const GError  *error);
-
-gboolean g_error_matches       (const GError  *error,
-                                GQuark         domain,
-                                gint           code);
-
-/* if (err) *err = g_error_new(domain, code, format, ...), also has
- * some sanity checks.
- */
-void     g_set_error           (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *format,
-                                ...) G_GNUC_PRINTF (4, 5);
-
-void     g_set_error_literal   (GError       **err,
-                                GQuark         domain,
-                                gint           code,
-                                const gchar   *message);
-
-/* if (dest) *dest = src; also has some sanity checks.
- */
-void     g_propagate_error     (GError       **dest,
-				GError        *src);
-
-/* if (err && *err) { g_error_free(*err); *err = NULL; } */
-void     g_clear_error         (GError       **err);
-
-/* if (err) prefix the formatted string to the ->message */
-void     g_prefix_error               (GError       **err,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (2, 3);
-
-/* g_propagate_error then g_error_prefix on dest */
-void     g_propagate_prefixed_error   (GError       **dest,
-                                       GError        *src,
-                                       const gchar   *format,
-                                       ...) G_GNUC_PRINTF (3, 4);
-
-G_END_DECLS
-
-#endif /* __G_ERROR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gfileutils.h b/GstreamerHelper/x86/include/glib-2.0/glib/gfileutils.h
deleted file mode 100644
index 7c2eb1dd..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gfileutils.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* gfileutils.h - File utility functions
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_FILEUTILS_H__
-#define __G_FILEUTILS_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_FILE_ERROR g_file_error_quark ()
-
-typedef enum
-{
-  G_FILE_ERROR_EXIST,
-  G_FILE_ERROR_ISDIR,
-  G_FILE_ERROR_ACCES,
-  G_FILE_ERROR_NAMETOOLONG,
-  G_FILE_ERROR_NOENT,
-  G_FILE_ERROR_NOTDIR,
-  G_FILE_ERROR_NXIO,
-  G_FILE_ERROR_NODEV,
-  G_FILE_ERROR_ROFS,
-  G_FILE_ERROR_TXTBSY,
-  G_FILE_ERROR_FAULT,
-  G_FILE_ERROR_LOOP,
-  G_FILE_ERROR_NOSPC,
-  G_FILE_ERROR_NOMEM,
-  G_FILE_ERROR_MFILE,
-  G_FILE_ERROR_NFILE,
-  G_FILE_ERROR_BADF,
-  G_FILE_ERROR_INVAL,
-  G_FILE_ERROR_PIPE,
-  G_FILE_ERROR_AGAIN,
-  G_FILE_ERROR_INTR,
-  G_FILE_ERROR_IO,
-  G_FILE_ERROR_PERM,
-  G_FILE_ERROR_NOSYS,
-  G_FILE_ERROR_FAILED
-} GFileError;
-
-/* For backward-compat reasons, these are synced to an old
- * anonymous enum in libgnome. But don't use that enum
- * in new code.
- */
-typedef enum
-{
-  G_FILE_TEST_IS_REGULAR    = 1 << 0,
-  G_FILE_TEST_IS_SYMLINK    = 1 << 1,
-  G_FILE_TEST_IS_DIR        = 1 << 2,
-  G_FILE_TEST_IS_EXECUTABLE = 1 << 3,
-  G_FILE_TEST_EXISTS        = 1 << 4
-} GFileTest;
-
-GQuark     g_file_error_quark      (void);
-/* So other code can generate a GFileError */
-GFileError g_file_error_from_errno (gint err_no);
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_file_test g_file_test_utf8
-#define g_file_get_contents g_file_get_contents_utf8
-#define g_mkstemp g_mkstemp_utf8
-#define g_file_open_tmp g_file_open_tmp_utf8
-#endif
-#endif
-
-gboolean g_file_test         (const gchar  *filename,
-                              GFileTest     test);
-gboolean g_file_get_contents (const gchar  *filename,
-                              gchar       **contents,
-                              gsize        *length,
-                              GError      **error);
-gboolean g_file_set_contents (const gchar *filename,
-                              const gchar *contents,
-                              gssize         length,
-                              GError       **error);
-gchar   *g_file_read_link    (const gchar  *filename,
-                              GError      **error);
-
-/* Wrapper / workalike for mkdtemp() */
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_mkdtemp            (gchar        *tmpl);
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_mkdtemp_full       (gchar        *tmpl,
-                               gint          mode);
-
-/* Wrapper / workalike for mkstemp() */
-gint     g_mkstemp            (gchar        *tmpl);
-gint     g_mkstemp_full       (gchar        *tmpl,
-                               gint          flags,
-                               gint          mode);
-
-/* Wrappers for g_mkstemp and g_mkdtemp() */
-gint     g_file_open_tmp      (const gchar  *tmpl,
-                               gchar       **name_used,
-                               GError      **error);
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_dir_make_tmp       (const gchar  *tmpl,
-                               GError      **error);
-
-gchar   *g_build_path         (const gchar *separator,
-                               const gchar *first_element,
-                               ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar   *g_build_pathv        (const gchar  *separator,
-                               gchar       **args) G_GNUC_MALLOC;
-
-gchar   *g_build_filename     (const gchar *first_element,
-                               ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar   *g_build_filenamev    (gchar      **args) G_GNUC_MALLOC;
-
-gint     g_mkdir_with_parents (const gchar *pathname,
-                               gint         mode);
-
-#ifdef G_OS_WIN32
-
-/* On Win32, the canonical directory separator is the backslash, and
- * the search path separator is the semicolon. Note that also the
- * (forward) slash works as directory separator.
- */
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-#else  /* !G_OS_WIN32 */
-
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-
-#endif /* !G_OS_WIN32 */
-
-gboolean     g_path_is_absolute (const gchar *file_name);
-const gchar *g_path_skip_root   (const gchar *file_name);
-
-GLIB_DEPRECATED_FOR(g_path_get_basename)
-const gchar *g_basename         (const gchar *file_name);
-#ifndef G_DISABLE_DEPRECATED
-#define g_dirname g_path_get_dirname
-#endif
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_get_current_dir g_get_current_dir_utf8
-#endif
-#endif
-
-gchar *g_get_current_dir   (void);
-gchar *g_path_get_basename (const gchar *file_name) G_GNUC_MALLOC;
-gchar *g_path_get_dirname  (const gchar *file_name) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_FILEUTILS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/ggettext.h b/GstreamerHelper/x86/include/glib-2.0/glib/ggettext.h
deleted file mode 100644
index 54bbaa8e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/ggettext.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_GETTEXT_H__
-#define __G_GETTEXT_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-const gchar *g_strip_context (const gchar *msgid,
-                              const gchar *msgval) G_GNUC_FORMAT(1);
-
-const gchar *g_dgettext      (const gchar *domain,
-                              const gchar *msgid) G_GNUC_FORMAT(2);
-const gchar *g_dcgettext     (const gchar *domain,
-                              const gchar *msgid,
-                              gint         category) G_GNUC_FORMAT(2);
-const gchar *g_dngettext     (const gchar *domain,
-                              const gchar *msgid,
-                              const gchar *msgid_plural,
-                              gulong       n) G_GNUC_FORMAT(3);
-const gchar *g_dpgettext     (const gchar *domain,
-                              const gchar *msgctxtid,
-                              gsize        msgidoffset) G_GNUC_FORMAT(2);
-const gchar *g_dpgettext2    (const gchar *domain,
-                              const gchar *context,
-                              const gchar *msgid) G_GNUC_FORMAT(3);
-
-G_END_DECLS
-
-#endif /* __G_GETTEXT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/ghash.h b/GstreamerHelper/x86/include/glib-2.0/glib/ghash.h
deleted file mode 100644
index 3eb89127..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/ghash.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HASH_H__
-#define __G_HASH_H__
-
-#include <glib/gtypes.h>
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GHashTable  GHashTable;
-
-typedef gboolean  (*GHRFunc)  (gpointer  key,
-                               gpointer  value,
-                               gpointer  user_data);
-
-typedef struct _GHashTableIter GHashTableIter;
-
-struct _GHashTableIter
-{
-  /*< private >*/
-  gpointer      dummy1;
-  gpointer      dummy2;
-  gpointer      dummy3;
-  int           dummy4;
-  gboolean      dummy5;
-  gpointer      dummy6;
-};
-
-GHashTable* g_hash_table_new               (GHashFunc       hash_func,
-                                            GEqualFunc      key_equal_func);
-GHashTable* g_hash_table_new_full          (GHashFunc       hash_func,
-                                            GEqualFunc      key_equal_func,
-                                            GDestroyNotify  key_destroy_func,
-                                            GDestroyNotify  value_destroy_func);
-void        g_hash_table_destroy           (GHashTable     *hash_table);
-void        g_hash_table_insert            (GHashTable     *hash_table,
-                                            gpointer        key,
-                                            gpointer        value);
-void        g_hash_table_replace           (GHashTable     *hash_table,
-                                            gpointer        key,
-                                            gpointer        value);
-void        g_hash_table_add               (GHashTable     *hash_table,
-                                            gpointer        key);
-gboolean    g_hash_table_remove            (GHashTable     *hash_table,
-                                            gconstpointer   key);
-void        g_hash_table_remove_all        (GHashTable     *hash_table);
-gboolean    g_hash_table_steal             (GHashTable     *hash_table,
-                                            gconstpointer   key);
-void        g_hash_table_steal_all         (GHashTable     *hash_table);
-gpointer    g_hash_table_lookup            (GHashTable     *hash_table,
-                                            gconstpointer   key);
-gboolean    g_hash_table_contains          (GHashTable     *hash_table,
-                                            gconstpointer   key);
-gboolean    g_hash_table_lookup_extended   (GHashTable     *hash_table,
-                                            gconstpointer   lookup_key,
-                                            gpointer       *orig_key,
-                                            gpointer       *value);
-void        g_hash_table_foreach           (GHashTable     *hash_table,
-                                            GHFunc          func,
-                                            gpointer        user_data);
-gpointer    g_hash_table_find              (GHashTable     *hash_table,
-                                            GHRFunc         predicate,
-                                            gpointer        user_data);
-guint       g_hash_table_foreach_remove    (GHashTable     *hash_table,
-                                            GHRFunc         func,
-                                            gpointer        user_data);
-guint       g_hash_table_foreach_steal     (GHashTable     *hash_table,
-                                            GHRFunc         func,
-                                            gpointer        user_data);
-guint       g_hash_table_size              (GHashTable     *hash_table);
-GList *     g_hash_table_get_keys          (GHashTable     *hash_table);
-GList *     g_hash_table_get_values        (GHashTable     *hash_table);
-
-void        g_hash_table_iter_init         (GHashTableIter *iter,
-                                            GHashTable     *hash_table);
-gboolean    g_hash_table_iter_next         (GHashTableIter *iter,
-                                            gpointer       *key,
-                                            gpointer       *value);
-GHashTable* g_hash_table_iter_get_hash_table (GHashTableIter *iter);
-void        g_hash_table_iter_remove       (GHashTableIter *iter);
-GLIB_AVAILABLE_IN_2_30
-void        g_hash_table_iter_replace      (GHashTableIter *iter,
-                                            gpointer        value);
-void        g_hash_table_iter_steal        (GHashTableIter *iter);
-
-GHashTable* g_hash_table_ref               (GHashTable     *hash_table);
-void        g_hash_table_unref             (GHashTable     *hash_table);
-
-#ifndef G_DISABLE_DEPRECATED
-#define g_hash_table_freeze(hash_table) ((void)0)
-#define g_hash_table_thaw(hash_table) ((void)0)
-#endif
-
-/* Hash Functions
- */
-gboolean g_str_equal    (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_str_hash     (gconstpointer  v);
-
-gboolean g_int_equal    (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_int_hash     (gconstpointer  v);
-
-gboolean g_int64_equal  (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_int64_hash   (gconstpointer  v);
-
-gboolean g_double_equal (gconstpointer  v1,
-                         gconstpointer  v2);
-guint    g_double_hash  (gconstpointer  v);
-
-guint    g_direct_hash  (gconstpointer  v) G_GNUC_CONST;
-gboolean g_direct_equal (gconstpointer  v1,
-                         gconstpointer  v2) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_HASH_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/ghmac.h b/GstreamerHelper/x86/include/glib-2.0/glib/ghmac.h
deleted file mode 100644
index d03d71f3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/ghmac.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ghmac.h - secure data hashing
- *
- * Copyright (C) 2011  Stef Walter  <stefw@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HMAC_H__
-#define __G_HMAC_H__
-
-#include <glib/gtypes.h>
-#include "gchecksum.h"
-
-G_BEGIN_DECLS
-
-/**
- * GHmac:
- *
- * An opaque structure representing a HMAC operation.
- * To create a new GHmac, use g_hmac_new(). To free
- * a GHmac, use g_hmac_unref().
- *
- * Since: 2.30
- */
-typedef struct _GHmac       GHmac;
-
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_new                    (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len);
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_copy                   (const GHmac   *hmac);
-GLIB_AVAILABLE_IN_2_30
-GHmac *               g_hmac_ref                    (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_unref                  (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_update                 (GHmac         *hmac,
-                                                     const guchar  *data,
-                                                     gssize         length);
-GLIB_AVAILABLE_IN_2_30
-const gchar *         g_hmac_get_string             (GHmac         *hmac);
-GLIB_AVAILABLE_IN_2_30
-void                  g_hmac_get_digest             (GHmac         *hmac,
-                                                     guint8        *buffer,
-                                                     gsize         *digest_len);
-
-GLIB_AVAILABLE_IN_2_30
-gchar                *g_compute_hmac_for_data       (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len,
-                                                     const guchar  *data,
-                                                     gsize          length);
-GLIB_AVAILABLE_IN_2_30
-gchar                *g_compute_hmac_for_string     (GChecksumType  digest_type,
-                                                     const guchar  *key,
-                                                     gsize          key_len,
-                                                     const gchar   *str,
-                                                     gssize         length);
-
-G_END_DECLS
-
-#endif /* __G_CHECKSUM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/ghook.h b/GstreamerHelper/x86/include/glib-2.0/glib/ghook.h
deleted file mode 100644
index e7292ead..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/ghook.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HOOK_H__
-#define __G_HOOK_H__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GHook		GHook;
-typedef struct _GHookList	GHookList;
-
-typedef gint		(*GHookCompareFunc)	(GHook		*new_hook,
-						 GHook		*sibling);
-typedef gboolean	(*GHookFindFunc)	(GHook		*hook,
-						 gpointer	 data);
-typedef void		(*GHookMarshaller)	(GHook		*hook,
-						 gpointer	 marshal_data);
-typedef gboolean	(*GHookCheckMarshaller)	(GHook		*hook,
-						 gpointer	 marshal_data);
-typedef void		(*GHookFunc)		(gpointer	 data);
-typedef gboolean	(*GHookCheckFunc)	(gpointer	 data);
-typedef void		(*GHookFinalizeFunc)	(GHookList      *hook_list,
-						 GHook          *hook);
-typedef enum
-{
-  G_HOOK_FLAG_ACTIVE	    = 1 << 0,
-  G_HOOK_FLAG_IN_CALL	    = 1 << 1,
-  G_HOOK_FLAG_MASK	    = 0x0f
-} GHookFlagMask;
-#define G_HOOK_FLAG_USER_SHIFT	(4)
-
-
-/* --- structures --- */
-struct _GHookList
-{
-  gulong	    seq_id;
-  guint		    hook_size : 16;
-  guint		    is_setup : 1;
-  GHook		   *hooks;
-  gpointer	    dummy3;
-  GHookFinalizeFunc finalize_hook;
-  gpointer	    dummy[2];
-};
-struct _GHook
-{
-  gpointer	 data;
-  GHook		*next;
-  GHook		*prev;
-  guint		 ref_count;
-  gulong	 hook_id;
-  guint		 flags;
-  gpointer	 func;
-  GDestroyNotify destroy;
-};
-
-
-/* --- macros --- */
-#define	G_HOOK(hook)			((GHook*) (hook))
-#define	G_HOOK_FLAGS(hook)		(G_HOOK (hook)->flags)
-#define	G_HOOK_ACTIVE(hook)		((G_HOOK_FLAGS (hook) & \
-					  G_HOOK_FLAG_ACTIVE) != 0)
-#define	G_HOOK_IN_CALL(hook)		((G_HOOK_FLAGS (hook) & \
-					  G_HOOK_FLAG_IN_CALL) != 0)
-#define G_HOOK_IS_VALID(hook)		(G_HOOK (hook)->hook_id != 0 && \
-					 (G_HOOK_FLAGS (hook) & \
-                                          G_HOOK_FLAG_ACTIVE))
-#define G_HOOK_IS_UNLINKED(hook)	(G_HOOK (hook)->next == NULL && \
-					 G_HOOK (hook)->prev == NULL && \
-					 G_HOOK (hook)->hook_id == 0 && \
-					 G_HOOK (hook)->ref_count == 0)
-
-
-/* --- prototypes --- */
-/* callback maintenance functions */
-void	 g_hook_list_init		(GHookList		*hook_list,
-					 guint			 hook_size);
-void	 g_hook_list_clear		(GHookList		*hook_list);
-GHook*	 g_hook_alloc			(GHookList		*hook_list);
-void	 g_hook_free			(GHookList		*hook_list,
-					 GHook			*hook);
-GHook *	 g_hook_ref			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_unref			(GHookList		*hook_list,
-					 GHook			*hook);
-gboolean g_hook_destroy			(GHookList		*hook_list,
-					 gulong			 hook_id);
-void	 g_hook_destroy_link		(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_prepend			(GHookList		*hook_list,
-					 GHook			*hook);
-void	 g_hook_insert_before		(GHookList		*hook_list,
-					 GHook			*sibling,
-					 GHook			*hook);
-void	 g_hook_insert_sorted		(GHookList		*hook_list,
-					 GHook			*hook,
-					 GHookCompareFunc	 func);
-GHook*	 g_hook_get			(GHookList		*hook_list,
-					 gulong			 hook_id);
-GHook*	 g_hook_find			(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 GHookFindFunc		 func,
-					 gpointer		 data);
-GHook*	 g_hook_find_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 data);
-GHook*	 g_hook_find_func		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func);
-GHook*	 g_hook_find_func_data		(GHookList		*hook_list,
-					 gboolean		 need_valids,
-					 gpointer		 func,
-					 gpointer		 data);
-/* return the first valid hook, and increment its reference count */
-GHook*	 g_hook_first_valid		(GHookList		*hook_list,
-					 gboolean		 may_be_in_call);
-/* return the next valid hook with incremented reference count, and
- * decrement the reference count of the original hook
- */
-GHook*	 g_hook_next_valid		(GHookList		*hook_list,
-					 GHook			*hook,
-					 gboolean		 may_be_in_call);
-/* GHookCompareFunc implementation to insert hooks sorted by their id */
-gint	 g_hook_compare_ids		(GHook			*new_hook,
-					 GHook			*sibling);
-/* convenience macros */
-#define	 g_hook_append( hook_list, hook )  \
-     g_hook_insert_before ((hook_list), NULL, (hook))
-/* invoke all valid hooks with the (*GHookFunc) signature.
- */
-void	 g_hook_list_invoke		(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke all valid hooks with the (*GHookCheckFunc) signature,
- * and destroy the hook if FALSE is returned.
- */
-void	 g_hook_list_invoke_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse);
-/* invoke a marshaller on all valid hooks.
- */
-void	 g_hook_list_marshal		(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-void	 g_hook_list_marshal_check	(GHookList		*hook_list,
-					 gboolean		 may_recurse,
-					 GHookCheckMarshaller	 marshaller,
-					 gpointer		 marshal_data);
-
-G_END_DECLS
-
-#endif /* __G_HOOK_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/ghostutils.h b/GstreamerHelper/x86/include/glib-2.0/glib/ghostutils.h
deleted file mode 100644
index 0349da36..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/ghostutils.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_HOST_UTILS_H__
-#define __G_HOST_UTILS_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-gboolean  g_hostname_is_non_ascii     (const gchar *hostname);
-gboolean  g_hostname_is_ascii_encoded (const gchar *hostname);
-gboolean  g_hostname_is_ip_address    (const gchar *hostname);
-
-gchar    *g_hostname_to_ascii         (const gchar *hostname);
-gchar    *g_hostname_to_unicode       (const gchar *hostname);
-
-G_END_DECLS
-
-#endif /* __G_HOST_UTILS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gi18n-lib.h b/GstreamerHelper/x86/include/glib-2.0/glib/gi18n-lib.h
deleted file mode 100644
index ca002a72..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gi18n-lib.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_I18N_LIB_H__
-#define __G_I18N_LIB_H__
-
-#include <glib.h>
-
-#include <libintl.h>
-#include <string.h>
-
-#ifndef GETTEXT_PACKAGE
-#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.  Did you forget to include config.h?
-#endif
-
-#define  _(String) ((char *) g_dgettext (GETTEXT_PACKAGE, String))
-#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, 0)
-#define N_(String) (String)
-#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1)
-#define NC_(Context, String) (String)
-
-#endif  /* __G_I18N_LIB_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gi18n.h b/GstreamerHelper/x86/include/glib-2.0/glib/gi18n.h
deleted file mode 100644
index c710046e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gi18n.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_I18N_H__
-#define __G_I18N_H__
-
-#include <glib.h>
-
-#include <libintl.h>
-#include <string.h>
-
-#define  _(String) gettext (String)
-#define Q_(String) g_dpgettext (NULL, String, 0)
-#define N_(String) (String)
-#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
-#define NC_(Context, String) (String)
-
-#endif  /* __G_I18N_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/giochannel.h b/GstreamerHelper/x86/include/glib-2.0/glib/giochannel.h
deleted file mode 100644
index 8d3f2d7e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/giochannel.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_IOCHANNEL_H__
-#define __G_IOCHANNEL_H__
-
-#include <glib/gconvert.h>
-#include <glib/gmain.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-/* GIOChannel
- */
-
-typedef struct _GIOChannel	GIOChannel;
-typedef struct _GIOFuncs        GIOFuncs;
-
-typedef enum
-{
-  G_IO_ERROR_NONE,
-  G_IO_ERROR_AGAIN,
-  G_IO_ERROR_INVAL,
-  G_IO_ERROR_UNKNOWN
-} GIOError;
-
-#define G_IO_CHANNEL_ERROR g_io_channel_error_quark()
-
-typedef enum
-{
-  /* Derived from errno */
-  G_IO_CHANNEL_ERROR_FBIG,
-  G_IO_CHANNEL_ERROR_INVAL,
-  G_IO_CHANNEL_ERROR_IO,
-  G_IO_CHANNEL_ERROR_ISDIR,
-  G_IO_CHANNEL_ERROR_NOSPC,
-  G_IO_CHANNEL_ERROR_NXIO,
-  G_IO_CHANNEL_ERROR_OVERFLOW,
-  G_IO_CHANNEL_ERROR_PIPE,
-  /* Other */
-  G_IO_CHANNEL_ERROR_FAILED
-} GIOChannelError;
-
-typedef enum
-{
-  G_IO_STATUS_ERROR,
-  G_IO_STATUS_NORMAL,
-  G_IO_STATUS_EOF,
-  G_IO_STATUS_AGAIN
-} GIOStatus;
-
-typedef enum
-{
-  G_SEEK_CUR,
-  G_SEEK_SET,
-  G_SEEK_END
-} GSeekType;
-
-typedef enum /*< flags >*/
-{
-  G_IO_IN	GLIB_SYSDEF_POLLIN,
-  G_IO_OUT	GLIB_SYSDEF_POLLOUT,
-  G_IO_PRI	GLIB_SYSDEF_POLLPRI,
-  G_IO_ERR	GLIB_SYSDEF_POLLERR,
-  G_IO_HUP	GLIB_SYSDEF_POLLHUP,
-  G_IO_NVAL	GLIB_SYSDEF_POLLNVAL
-} GIOCondition;
-
-typedef enum
-{
-  G_IO_FLAG_APPEND = 1 << 0,
-  G_IO_FLAG_NONBLOCK = 1 << 1,
-  G_IO_FLAG_IS_READABLE = 1 << 2,	/* Read only flag */
-  G_IO_FLAG_IS_WRITABLE = 1 << 3,	/* Read only flag */
-  G_IO_FLAG_IS_SEEKABLE = 1 << 4,	/* Read only flag */
-  G_IO_FLAG_MASK = (1 << 5) - 1,
-  G_IO_FLAG_GET_MASK = G_IO_FLAG_MASK,
-  G_IO_FLAG_SET_MASK = G_IO_FLAG_APPEND | G_IO_FLAG_NONBLOCK
-} GIOFlags;
-
-/* Misspelling in enum in 2.29.10 and earlier */
-#define G_IO_FLAG_IS_WRITEABLE (G_IO_FLAG_IS_WRITABLE)
-
-struct _GIOChannel
-{
-  /*< private >*/
-  gint ref_count;
-  GIOFuncs *funcs;
-
-  gchar *encoding;
-  GIConv read_cd;
-  GIConv write_cd;
-  gchar *line_term;		/* String which indicates the end of a line of text */
-  guint line_term_len;		/* So we can have null in the line term */
-
-  gsize buf_size;
-  GString *read_buf;		/* Raw data from the channel */
-  GString *encoded_read_buf;    /* Channel data converted to UTF-8 */
-  GString *write_buf;		/* Data ready to be written to the file */
-  gchar partial_write_buf[6];	/* UTF-8 partial characters, null terminated */
-
-  /* Group the flags together, immediately after partial_write_buf, to save memory */
-
-  guint use_buffer     : 1;	/* The encoding uses the buffers */
-  guint do_encode      : 1;	/* The encoding uses the GIConv coverters */
-  guint close_on_unref : 1;	/* Close the channel on final unref */
-  guint is_readable    : 1;	/* Cached GIOFlag */
-  guint is_writeable   : 1;	/* ditto */
-  guint is_seekable    : 1;	/* ditto */
-
-  gpointer reserved1;	
-  gpointer reserved2;	
-};
-
-typedef gboolean (*GIOFunc) (GIOChannel   *source,
-			     GIOCondition  condition,
-			     gpointer      data);
-struct _GIOFuncs
-{
-  GIOStatus (*io_read)           (GIOChannel   *channel, 
-			          gchar        *buf, 
-				  gsize         count,
-				  gsize        *bytes_read,
-				  GError      **err);
-  GIOStatus (*io_write)          (GIOChannel   *channel, 
-				  const gchar  *buf, 
-				  gsize         count,
-				  gsize        *bytes_written,
-				  GError      **err);
-  GIOStatus (*io_seek)           (GIOChannel   *channel, 
-				  gint64        offset, 
-				  GSeekType     type,
-				  GError      **err);
-  GIOStatus  (*io_close)         (GIOChannel   *channel,
-				  GError      **err);
-  GSource*   (*io_create_watch)  (GIOChannel   *channel,
-				  GIOCondition  condition);
-  void       (*io_free)          (GIOChannel   *channel);
-  GIOStatus  (*io_set_flags)     (GIOChannel   *channel,
-                                  GIOFlags      flags,
-				  GError      **err);
-  GIOFlags   (*io_get_flags)     (GIOChannel   *channel);
-};
-
-void        g_io_channel_init   (GIOChannel    *channel);
-GIOChannel *g_io_channel_ref    (GIOChannel    *channel);
-void        g_io_channel_unref  (GIOChannel    *channel);
-
-GLIB_DEPRECATED_FOR(g_io_channel_read_for)
-GIOError    g_io_channel_read   (GIOChannel    *channel,
-                                 gchar         *buf,
-                                 gsize          count,
-                                 gsize         *bytes_read);
-
-GLIB_DEPRECATED_FOR(g_io_channel_write_chars)
-GIOError  g_io_channel_write    (GIOChannel    *channel,
-                                 const gchar   *buf,
-                                 gsize          count,
-                                 gsize         *bytes_written);
-
-GLIB_DEPRECATED_FOR(g_io_channel_seek_position)
-GIOError  g_io_channel_seek     (GIOChannel    *channel,
-                                 gint64         offset,
-                                 GSeekType      type);
-
-GLIB_DEPRECATED_FOR(g_io_channel_shutdown)
-void      g_io_channel_close    (GIOChannel    *channel);
-
-GIOStatus g_io_channel_shutdown (GIOChannel      *channel,
-				 gboolean         flush,
-				 GError         **err);
-guint     g_io_add_watch_full   (GIOChannel      *channel,
-				 gint             priority,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data,
-				 GDestroyNotify   notify);
-GSource * g_io_create_watch     (GIOChannel      *channel,
-				 GIOCondition     condition);
-guint     g_io_add_watch        (GIOChannel      *channel,
-				 GIOCondition     condition,
-				 GIOFunc          func,
-				 gpointer         user_data);
-
-/* character encoding conversion involved functions.
- */
-
-void                  g_io_channel_set_buffer_size      (GIOChannel   *channel,
-							 gsize         size);
-gsize                 g_io_channel_get_buffer_size      (GIOChannel   *channel);
-GIOCondition          g_io_channel_get_buffer_condition (GIOChannel   *channel);
-GIOStatus             g_io_channel_set_flags            (GIOChannel   *channel,
-							 GIOFlags      flags,
-							 GError      **error);
-GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
-void                  g_io_channel_set_line_term        (GIOChannel   *channel,
-							 const gchar  *line_term,
-							 gint          length);
-const gchar *         g_io_channel_get_line_term        (GIOChannel   *channel,
-							 gint         *length);
-void		      g_io_channel_set_buffered		(GIOChannel   *channel,
-							 gboolean      buffered);
-gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
-GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
-							 const gchar  *encoding,
-							 GError      **error);
-const gchar *         g_io_channel_get_encoding         (GIOChannel   *channel);
-void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
-							 gboolean      do_close);
-gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
-
-
-GIOStatus   g_io_channel_flush            (GIOChannel   *channel,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line        (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_line_string (GIOChannel   *channel,
-					   GString      *buffer,
-					   gsize        *terminator_pos,
-					   GError      **error);
-GIOStatus   g_io_channel_read_to_end      (GIOChannel   *channel,
-					   gchar       **str_return,
-					   gsize        *length,
-					   GError      **error);
-GIOStatus   g_io_channel_read_chars       (GIOChannel   *channel,
-					   gchar        *buf,
-					   gsize         count,
-					   gsize        *bytes_read,
-					   GError      **error);
-GIOStatus   g_io_channel_read_unichar     (GIOChannel   *channel,
-					   gunichar     *thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_write_chars      (GIOChannel   *channel,
-					   const gchar  *buf,
-					   gssize        count,
-					   gsize        *bytes_written,
-					   GError      **error);
-GIOStatus   g_io_channel_write_unichar    (GIOChannel   *channel,
-					   gunichar      thechar,
-					   GError      **error);
-GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
-					   gint64        offset,
-					   GSeekType     type,
-					   GError      **error);
-#ifdef G_OS_WIN32
-#define g_io_channel_new_file g_io_channel_new_file_utf8
-#endif
-
-GIOChannel* g_io_channel_new_file         (const gchar  *filename,
-					   const gchar  *mode,
-					   GError      **error);
-
-/* Error handling */
-
-GQuark          g_io_channel_error_quark      (void);
-GIOChannelError g_io_channel_error_from_errno (gint en);
-
-/* On Unix, IO channels created with this function for any file
- * descriptor or socket.
- *
- * On Win32, this can be used either for files opened with the MSVCRT
- * (the Microsoft run-time C library) _open() or _pipe, including file
- * descriptors 0, 1 and 2 (corresponding to stdin, stdout and stderr),
- * or for Winsock SOCKETs. If the parameter is a legal file
- * descriptor, it is assumed to be such, otherwise it should be a
- * SOCKET. This relies on SOCKETs and file descriptors not
- * overlapping. If you want to be certain, call either
- * g_io_channel_win32_new_fd() or g_io_channel_win32_new_socket()
- * instead as appropriate.
- *
- * The term file descriptor as used in the context of Win32 refers to
- * the emulated Unix-like file descriptors MSVCRT provides. The native
- * corresponding concept is file HANDLE. There isn't as of yet a way to
- * get GIOChannels for Win32 file HANDLEs.
- */
-GIOChannel* g_io_channel_unix_new    (int         fd);
-gint        g_io_channel_unix_get_fd (GIOChannel *channel);
-
-
-/* Hook for GClosure / GSource integration. Don't touch */
-GLIB_VAR GSourceFuncs g_io_watch_funcs;
-
-#ifdef G_OS_WIN32
-
-/* You can use this "pseudo file descriptor" in a GPollFD to add
- * polling for Windows messages. GTK applications should not do that.
- */
-
-#define G_WIN32_MSG_HANDLE 19981206
-
-/* Use this to get a GPollFD from a GIOChannel, so that you can call
- * g_io_channel_win32_poll(). After calling this you should only use
- * g_io_channel_read() to read from the GIOChannel, i.e. never read()
- * from the underlying file descriptor. For SOCKETs, it is possible to call
- * recv().
- */
-void        g_io_channel_win32_make_pollfd (GIOChannel   *channel,
-					    GIOCondition  condition,
-					    GPollFD      *fd);
-
-/* This can be used to wait a until at least one of the channels is readable.
- * On Unix you would do a select() on the file descriptors of the channels.
- */
-gint        g_io_channel_win32_poll   (GPollFD    *fds,
-				       gint        n_fds,
-				       gint        timeout_);
-
-/* Create an IO channel for Windows messages for window handle hwnd. */
-#if GLIB_SIZEOF_VOID_P == 8
-/* We use gsize here so that it is still an integer type and not a
- * pointer, like the guint in the traditional prototype. We can't use
- * intptr_t as that is not portable enough.
- */
-GIOChannel *g_io_channel_win32_new_messages (gsize hwnd);
-#else
-GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
-#endif
-
-/* Create an IO channel for C runtime (emulated Unix-like) file
- * descriptors. After calling g_io_add_watch() on a IO channel
- * returned by this function, you shouldn't call read() on the file
- * descriptor. This is because adding polling for a file descriptor is
- * implemented on Win32 by starting a thread that sits blocked in a
- * read() from the file descriptor most of the time. All reads from
- * the file descriptor should be done by this internal GLib
- * thread. Your code should call only g_io_channel_read_chars().
- */
-GIOChannel* g_io_channel_win32_new_fd (gint         fd);
-
-/* Get the C runtime file descriptor of a channel. */
-gint        g_io_channel_win32_get_fd (GIOChannel *channel);
-
-/* Create an IO channel for a winsock socket. The parameter should be
- * a SOCKET. Contrary to IO channels for file descriptors (on *Win32),
- * you can use normal recv() or recvfrom() on sockets even if GLib
- * is polling them.
- */
-GIOChannel *g_io_channel_win32_new_socket (gint socket);
-
-#endif
-
-G_END_DECLS
-
-#endif /* __G_IOCHANNEL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gkeyfile.h b/GstreamerHelper/x86/include/glib-2.0/glib/gkeyfile.h
deleted file mode 100644
index 998bb7a7..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gkeyfile.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/* gkeyfile.h - desktop entry file parser
- *
- *  Copyright 2004 Red Hat, Inc.
- *
- *  Ray Strode <halfline@hawaii.rr.com>
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_KEY_FILE_H__
-#define __G_KEY_FILE_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  G_KEY_FILE_ERROR_UNKNOWN_ENCODING,
-  G_KEY_FILE_ERROR_PARSE,
-  G_KEY_FILE_ERROR_NOT_FOUND,
-  G_KEY_FILE_ERROR_KEY_NOT_FOUND,
-  G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-  G_KEY_FILE_ERROR_INVALID_VALUE
-} GKeyFileError;
-
-#define G_KEY_FILE_ERROR g_key_file_error_quark()
-
-GQuark g_key_file_error_quark (void);
-
-typedef struct _GKeyFile GKeyFile;
-
-typedef enum
-{
-  G_KEY_FILE_NONE              = 0,
-  G_KEY_FILE_KEEP_COMMENTS     = 1 << 0,
-  G_KEY_FILE_KEEP_TRANSLATIONS = 1 << 1
-} GKeyFileFlags;
-
-GKeyFile *g_key_file_new                    (void);
-GKeyFile *g_key_file_ref                    (GKeyFile             *key_file);
-void      g_key_file_unref                  (GKeyFile             *key_file);
-void      g_key_file_free                   (GKeyFile             *key_file);
-void      g_key_file_set_list_separator     (GKeyFile             *key_file,
-					     gchar                 separator);
-gboolean  g_key_file_load_from_file         (GKeyFile             *key_file,
-					     const gchar          *file,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean  g_key_file_load_from_data         (GKeyFile             *key_file,
-					     const gchar          *data,
-					     gsize                 length,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_dirs          (GKeyFile             *key_file,
-					     const gchar	  *file,
-					     const gchar	 **search_dirs,
-					     gchar		 **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gboolean g_key_file_load_from_data_dirs     (GKeyFile             *key_file,
-					     const gchar          *file,
-					     gchar               **full_path,
-					     GKeyFileFlags         flags,
-					     GError              **error);
-gchar    *g_key_file_to_data                (GKeyFile             *key_file,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gchar    *g_key_file_get_start_group        (GKeyFile             *key_file) G_GNUC_MALLOC;
-gchar   **g_key_file_get_groups             (GKeyFile             *key_file,
-					     gsize                *length) G_GNUC_MALLOC;
-gchar   **g_key_file_get_keys               (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-gboolean  g_key_file_has_group              (GKeyFile             *key_file,
-					     const gchar          *group_name);
-gboolean  g_key_file_has_key                (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-gchar    *g_key_file_get_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_value              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *value);
-gchar    *g_key_file_get_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *string);
-gchar    *g_key_file_get_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_locale_string      (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar          *string);
-gboolean  g_key_file_get_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_boolean            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              value);
-gint      g_key_file_get_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_integer            (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  value);
-gint64    g_key_file_get_int64              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_int64              (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint64                value);
-guint64   g_key_file_get_uint64             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-void      g_key_file_set_uint64             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     guint64               value);
-gdouble   g_key_file_get_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error);
-void      g_key_file_set_double             (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               value);
-gchar   **g_key_file_get_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_string_list        (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar * const   list[],
-					     gsize                 length);
-gchar   **g_key_file_get_locale_string_list (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_locale_string_list (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     const gchar          *locale,
-					     const gchar * const   list[],
-					     gsize                 length);
-gboolean *g_key_file_get_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_boolean_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gboolean              list[],
-					     gsize                 length);
-gint     *g_key_file_get_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gsize                *length,
-					     GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gdouble               list[],
-                                             gsize                 length);
-gdouble  *g_key_file_get_double_list        (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             gsize                *length,
-                                             GError              **error) G_GNUC_MALLOC;
-void      g_key_file_set_integer_list       (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     gint                  list[],
-					     gsize                 length);
-gboolean  g_key_file_set_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             const gchar          *comment,
-                                             GError              **error);
-gchar    *g_key_file_get_comment            (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-                                             GError              **error) G_GNUC_MALLOC;
-
-gboolean  g_key_file_remove_comment         (GKeyFile             *key_file,
-                                             const gchar          *group_name,
-                                             const gchar          *key,
-					     GError              **error);
-gboolean  g_key_file_remove_key             (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     const gchar          *key,
-					     GError              **error);
-gboolean  g_key_file_remove_group           (GKeyFile             *key_file,
-					     const gchar          *group_name,
-					     GError              **error);
-
-/* Defines for handling freedesktop.org Desktop files */
-#define G_KEY_FILE_DESKTOP_GROUP                "Desktop Entry"
-
-#define G_KEY_FILE_DESKTOP_KEY_TYPE             "Type"
-#define G_KEY_FILE_DESKTOP_KEY_VERSION          "Version"
-#define G_KEY_FILE_DESKTOP_KEY_NAME             "Name"
-#define G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME     "GenericName"
-#define G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY       "NoDisplay"
-#define G_KEY_FILE_DESKTOP_KEY_COMMENT          "Comment"
-#define G_KEY_FILE_DESKTOP_KEY_ICON             "Icon"
-#define G_KEY_FILE_DESKTOP_KEY_HIDDEN           "Hidden"
-#define G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN     "OnlyShowIn"
-#define G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN      "NotShowIn"
-#define G_KEY_FILE_DESKTOP_KEY_TRY_EXEC         "TryExec"
-#define G_KEY_FILE_DESKTOP_KEY_EXEC             "Exec"
-#define G_KEY_FILE_DESKTOP_KEY_PATH             "Path"
-#define G_KEY_FILE_DESKTOP_KEY_TERMINAL         "Terminal"
-#define G_KEY_FILE_DESKTOP_KEY_MIME_TYPE        "MimeType"
-#define G_KEY_FILE_DESKTOP_KEY_CATEGORIES       "Categories"
-#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY   "StartupNotify"
-#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
-#define G_KEY_FILE_DESKTOP_KEY_URL              "URL"
-
-#define G_KEY_FILE_DESKTOP_TYPE_APPLICATION     "Application"
-#define G_KEY_FILE_DESKTOP_TYPE_LINK            "Link"
-#define G_KEY_FILE_DESKTOP_TYPE_DIRECTORY       "Directory"
-
-G_END_DECLS
-
-#endif /* __G_KEY_FILE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/glist.h b/GstreamerHelper/x86/include/glib-2.0/glib/glist.h
deleted file mode 100644
index 44cfcc01..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/glist.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_LIST_H__
-#define __G_LIST_H__
-
-#include <glib/gmem.h>
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GList GList;
-
-struct _GList
-{
-  gpointer data;
-  GList *next;
-  GList *prev;
-};
-
-/* Doubly linked lists
- */
-GList*   g_list_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_list_free                    (GList            *list);
-void     g_list_free_1                  (GList            *list);
-#define  g_list_free1                   g_list_free_1
-void     g_list_free_full               (GList            *list,
-					 GDestroyNotify    free_func);
-GList*   g_list_append                  (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_prepend                 (GList            *list,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert                  (GList            *list,
-					 gpointer          data,
-					 gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted           (GList            *list,
-					 gpointer          data,
-					 GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_sorted_with_data (GList            *list,
-					 gpointer          data,
-					 GCompareDataFunc  func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_insert_before           (GList            *list,
-					 GList            *sibling,
-					 gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_concat                  (GList            *list1,
-					 GList            *list2) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove                  (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_all              (GList            *list,
-					 gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_remove_link             (GList            *list,
-					 GList            *llink) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_delete_link             (GList            *list,
-					 GList            *link_) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_reverse                 (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_copy                    (GList            *list) G_GNUC_WARN_UNUSED_RESULT;
-
-GLIB_AVAILABLE_IN_2_34
-GList*   g_list_copy_deep               (GList            *list,
-					 GCopyFunc         func,
-					 gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-
-GList*   g_list_nth                     (GList            *list,
-					 guint             n);
-GList*   g_list_nth_prev                (GList            *list,
-					 guint             n);
-GList*   g_list_find                    (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_find_custom             (GList            *list,
-					 gconstpointer     data,
-					 GCompareFunc      func);
-gint     g_list_position                (GList            *list,
-					 GList            *llink);
-gint     g_list_index                   (GList            *list,
-					 gconstpointer     data);
-GList*   g_list_last                    (GList            *list);
-GList*   g_list_first                   (GList            *list);
-guint    g_list_length                  (GList            *list);
-void     g_list_foreach                 (GList            *list,
-					 GFunc             func,
-					 gpointer          user_data);
-GList*   g_list_sort                    (GList            *list,
-					 GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GList*   g_list_sort_with_data          (GList            *list,
-					 GCompareDataFunc  compare_func,
-					 gpointer          user_data)  G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_list_nth_data                (GList            *list,
-					 guint             n);
-
-
-#define g_list_previous(list)	        ((list) ? (((GList *)(list))->prev) : NULL)
-#define g_list_next(list)	        ((list) ? (((GList *)(list))->next) : NULL)
-
-G_END_DECLS
-
-#endif /* __G_LIST_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gmacros.h b/GstreamerHelper/x86/include/glib-2.0/glib/gmacros.h
deleted file mode 100644
index 4ad57da3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gmacros.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/* This file must not include any other glib header file and must thus
- * not refer to variables from glibconfig.h
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MACROS_H__
-#define __G_MACROS_H__
-
-/* We include stddef.h to get the system's definition of NULL
- */
-#include <stddef.h>
-
-/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
- * where this is valid. This allows for warningless compilation of
- * "long long" types even in the presence of '-ansi -pedantic'. 
- */
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-#  define G_GNUC_EXTENSION __extension__
-#else
-#  define G_GNUC_EXTENSION
-#endif
-
-/* Provide macros to feature the GCC function attribute.
- */
-#if    __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#define G_GNUC_PURE                            \
-  __attribute__((__pure__))
-#define G_GNUC_MALLOC    			\
-  __attribute__((__malloc__))
-#else
-#define G_GNUC_PURE
-#define G_GNUC_MALLOC
-#endif
-
-#if     __GNUC__ >= 4
-#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-#else
-#define G_GNUC_NULL_TERMINATED
-#endif
-
-#if     (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
-#define G_GNUC_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
-#define G_GNUC_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y)))
-#else
-#define G_GNUC_ALLOC_SIZE(x)
-#define G_GNUC_ALLOC_SIZE2(x,y)
-#endif
-
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_PRINTF( format_idx, arg_idx )    \
-  __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#define G_GNUC_SCANF( format_idx, arg_idx )     \
-  __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
-#define G_GNUC_FORMAT( arg_idx )                \
-  __attribute__((__format_arg__ (arg_idx)))
-#define G_GNUC_NORETURN                         \
-  __attribute__((__noreturn__))
-#define G_GNUC_CONST                            \
-  __attribute__((__const__))
-#define G_GNUC_UNUSED                           \
-  __attribute__((__unused__))
-#define G_GNUC_NO_INSTRUMENT			\
-  __attribute__((__no_instrument_function__))
-#else   /* !__GNUC__ */
-#define G_GNUC_PRINTF( format_idx, arg_idx )
-#define G_GNUC_SCANF( format_idx, arg_idx )
-#define G_GNUC_FORMAT( arg_idx )
-#define G_GNUC_NORETURN
-#define G_GNUC_CONST
-#define G_GNUC_UNUSED
-#define G_GNUC_NO_INSTRUMENT
-#endif  /* !__GNUC__ */
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define G_GNUC_DEPRECATED                            \
-  __attribute__((__deprecated__))
-#else
-#define G_GNUC_DEPRECATED
-#endif /* __GNUC__ */
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_GNUC_DEPRECATED_FOR(f)                        \
-  __attribute__((deprecated("Use " #f " instead")))
-#else
-#define G_GNUC_DEPRECATED_FOR(f)        G_GNUC_DEPRECATED
-#endif /* __GNUC__ */
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS		\
-  _Pragma ("GCC diagnostic push")			\
-  _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#define G_GNUC_END_IGNORE_DEPRECATIONS			\
-  _Pragma ("GCC diagnostic pop")
-#else
-#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-#define G_GNUC_END_IGNORE_DEPRECATIONS
-#endif
-
-#if     __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#  define G_GNUC_MAY_ALIAS __attribute__((may_alias))
-#else
-#  define G_GNUC_MAY_ALIAS
-#endif
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#define G_GNUC_WARN_UNUSED_RESULT 		\
-  __attribute__((warn_unused_result))
-#else
-#define G_GNUC_WARN_UNUSED_RESULT
-#endif /* __GNUC__ */
-
-#ifndef G_DISABLE_DEPRECATED
-/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
- * macros, so we can refer to them as strings unconditionally.
- * usage not-recommended since gcc-3.0
- */
-#if defined (__GNUC__) && (__GNUC__ < 3)
-#define G_GNUC_FUNCTION         __FUNCTION__
-#define G_GNUC_PRETTY_FUNCTION  __PRETTY_FUNCTION__
-#else   /* !__GNUC__ */
-#define G_GNUC_FUNCTION         ""
-#define G_GNUC_PRETTY_FUNCTION  ""
-#endif  /* !__GNUC__ */
-#endif  /* !G_DISABLE_DEPRECATED */
-
-#define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
-#define	G_STRINGIFY_ARG(contents)	#contents
-
-#ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */
-#define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2
-#define G_PASTE(identifier1,identifier2)      G_PASTE_ARGS (identifier1, identifier2)
-#ifdef __COUNTER__
-#define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __COUNTER__)[(expr) ? 1 : -1]
-#else
-#define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __LINE__)[(expr) ? 1 : -1]
-#endif
-#define G_STATIC_ASSERT_EXPR(expr) ((void) sizeof (char[(expr) ? 1 : -1]))
-#endif
-
-/* Provide a string identifying the current code position */
-#if defined(__GNUC__) && (__GNUC__ < 3) && !defined(__cplusplus)
-#  define G_STRLOC	__FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()"
-#else
-#  define G_STRLOC	__FILE__ ":" G_STRINGIFY (__LINE__)
-#endif
-
-/* Provide a string identifying the current function, non-concatenatable */
-#if defined (__GNUC__)
-#  define G_STRFUNC     ((const char*) (__PRETTY_FUNCTION__))
-#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 19901L
-#  define G_STRFUNC     ((const char*) (__func__))
-#elif defined(_MSC_VER) && (_MSC_VER > 1300)
-#  define G_STRFUNC     ((const char*) (__FUNCTION__))
-#else
-#  define G_STRFUNC     ((const char*) ("???"))
-#endif
-
-/* Guard C code in headers, while including them from C++ */
-#ifdef  __cplusplus
-# define G_BEGIN_DECLS  extern "C" {
-# define G_END_DECLS    }
-#else
-# define G_BEGIN_DECLS
-# define G_END_DECLS
-#endif
-
-/* Provide definitions for some commonly used macros.
- *  Some of them are only provided if they haven't already
- *  been defined. It is assumed that if they are already
- *  defined then the current definition is correct.
- */
-#ifndef NULL
-#  ifdef __cplusplus
-#    define NULL        (0L)
-#  else /* !__cplusplus */
-#    define NULL        ((void*) 0)
-#  endif /* !__cplusplus */
-#endif
-
-#ifndef	FALSE
-#define	FALSE	(0)
-#endif
-
-#ifndef	TRUE
-#define	TRUE	(!FALSE)
-#endif
-
-#undef	MAX
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
-#undef	MIN
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-
-#undef	ABS
-#define ABS(a)	   (((a) < 0) ? -(a) : (a))
-
-#undef	CLAMP
-#define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-
-/* Count the number of elements in an array. The array must be defined
- * as such; using this with a dynamically allocated array will give
- * incorrect results.
- */
-#define G_N_ELEMENTS(arr)		(sizeof (arr) / sizeof ((arr)[0]))
-
-/* Macros by analogy to GINT_TO_POINTER, GPOINTER_TO_INT
- */
-#define GPOINTER_TO_SIZE(p)	((gsize) (p))
-#define GSIZE_TO_POINTER(s)	((gpointer) (gsize) (s))
-
-/* Provide convenience macros for handling structure
- * fields through their offsets.
- */
-
-#if defined(__GNUC__)  && __GNUC__ >= 4
-#  define G_STRUCT_OFFSET(struct_type, member) \
-      ((glong) offsetof (struct_type, member))
-#else
-#  define G_STRUCT_OFFSET(struct_type, member)	\
-      ((glong) ((guint8*) &((struct_type*) 0)->member))
-#endif
-
-#define G_STRUCT_MEMBER_P(struct_p, struct_offset)   \
-    ((gpointer) ((guint8*) (struct_p) + (glong) (struct_offset)))
-#define G_STRUCT_MEMBER(member_type, struct_p, struct_offset)   \
-    (*(member_type*) G_STRUCT_MEMBER_P ((struct_p), (struct_offset)))
-
-/* Provide simple macro statement wrappers:
- *   G_STMT_START { statements; } G_STMT_END;
- * This can be used as a single statement, like:
- *   if (x) G_STMT_START { ... } G_STMT_END; else ...
- * This intentionally does not use compiler extensions like GCC's '({...})' to
- * avoid portability issue or side effects when compiled with different compilers.
- */
-#if !(defined (G_STMT_START) && defined (G_STMT_END))
-#  define G_STMT_START  do
-#  define G_STMT_END    while (0)
-#endif
-
-/* Deprecated -- do not use. */
-#ifndef G_DISABLE_DEPRECATED
-#ifdef G_DISABLE_CONST_RETURNS
-#define G_CONST_RETURN
-#else
-#define G_CONST_RETURN const
-#endif
-#endif
-
-/*
- * The G_LIKELY and G_UNLIKELY macros let the programmer give hints to 
- * the compiler about the expected result of an expression. Some compilers
- * can use this information for optimizations.
- *
- * The _G_BOOLEAN_EXPR macro is intended to trigger a gcc warning when
- * putting assignments in g_return_if_fail ().  
- */
-#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define _G_BOOLEAN_EXPR(expr)                   \
- G_GNUC_EXTENSION ({                            \
-   int _g_boolean_var_;                         \
-   if (expr)                                    \
-      _g_boolean_var_ = 1;                      \
-   else                                         \
-      _g_boolean_var_ = 0;                      \
-   _g_boolean_var_;                             \
-})
-#define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1))
-#define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 0))
-#else
-#define G_LIKELY(expr) (expr)
-#define G_UNLIKELY(expr) (expr)
-#endif
-
-#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define G_DEPRECATED __attribute__((__deprecated__))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
-#define G_DEPRECATED __declspec(deprecated)
-#else
-#define G_DEPRECATED
-#endif
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead")))
-#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
-#define G_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead"))
-#else
-#define G_DEPRECATED_FOR(f) G_DEPRECATED
-#endif
-
-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#define G_UNAVAILABLE(maj,min) __attribute__((deprecated("Not available before " #maj "." #min)))
-#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
-#define G_UNAVAILABLE(maj,min) __declspec(deprecated("is not available before " #maj "." #min))
-#else
-#define G_UNAVAILABLE(maj,min)
-#endif
-
-/* These macros are used to mark deprecated functions in GLib headers,
- * and thus have to be exposed in installed headers. But please
- * do *not* use them in other projects. Instead, use G_DEPRECATED
- * or define your own wrappers around it.
- */
-
-#ifdef GLIB_DISABLE_DEPRECATION_WARNINGS
-#define GLIB_DEPRECATED
-#define GLIB_DEPRECATED_FOR(f)
-#define GLIB_UNAVAILABLE(maj,min)
-#else
-#define GLIB_DEPRECATED G_DEPRECATED
-#define GLIB_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
-#define GLIB_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min)
-#endif
-
-#endif /* __G_MACROS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gmain.h b/GstreamerHelper/x86/include/glib-2.0/glib/gmain.h
deleted file mode 100644
index 4d4d5043..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gmain.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/* gmain.h - the GLib Main loop
- * Copyright (C) 1998-2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MAIN_H__
-#define __G_MAIN_H__
-
-#include <glib/gpoll.h>
-#include <glib/gslist.h>
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMainContext:
- *
- * The <structname>GMainContext</structname> struct is an opaque data
- * type representing a set of sources to be handled in a main loop.
- */
-typedef struct _GMainContext            GMainContext;
-
-/**
- * GMainLoop:
- *
- * The <structname>GMainLoop</structname> struct is an opaque data type
- * representing the main event loop of a GLib or GTK+ application.
- */
-typedef struct _GMainLoop               GMainLoop;
-
-/**
- * GSource:
- *
- * The <structname>GSource</structname> struct is an opaque data type
- * representing an event source.
- */
-typedef struct _GSource                 GSource;
-typedef struct _GSourcePrivate          GSourcePrivate;
-
-/**
- * GSourceCallbackFuncs:
- * @ref: Called when a reference is added to the callback object
- * @unref: Called when a reference to the callback object is dropped
- * @get: Called to extract the callback function and data from the
- *     callback object.
-
- * The <structname>GSourceCallbackFuncs</structname> struct contains
- * functions for managing callback objects.
- */
-typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
-
-/**
- * GSourceFuncs:
- * @prepare: Called before all the file descriptors are polled. If the
- *     source can determine that it is ready here (without waiting for the
- *     results of the poll() call) it should return %TRUE. It can also return
- *     a @timeout_ value which should be the maximum timeout (in milliseconds)
- *     which should be passed to the poll() call. The actual timeout used will
- *     be -1 if all sources returned -1, or it will be the minimum of all the
- *     @timeout_ values returned which were >= 0.
- * @check: Called after all the file descriptors are polled. The source
- *     should return %TRUE if it is ready to be dispatched. Note that some
- *     time may have passed since the previous prepare function was called,
- *     so the source should be checked again here.
- * @dispatch: Called to dispatch the event source, after it has returned
- *     %TRUE in either its @prepare or its @check function. The @dispatch
- *     function is passed in a callback function and data. The callback
- *     function may be %NULL if the source was never connected to a callback
- *     using g_source_set_callback(). The @dispatch function should call the
- *     callback function with @user_data and whatever additional parameters
- *     are needed for this type of event source.
- * @finalize: Called when the source is finalized.
- *
- * The <structname>GSourceFuncs</structname> struct contains a table of
- * functions used to handle event sources in a generic manner.
- *
- * For idle sources, the prepare and check functions always return %TRUE
- * to indicate that the source is always ready to be processed. The prepare
- * function also returns a timeout value of 0 to ensure that the poll() call
- * doesn't block (since that would be time wasted which could have been spent
- * running the idle function).
- *
- * For timeout sources, the prepare and check functions both return %TRUE
- * if the timeout interval has expired. The prepare function also returns
- * a timeout value to ensure that the poll() call doesn't block too long
- * and miss the next timeout.
- *
- * For file descriptor sources, the prepare function typically returns %FALSE,
- * since it must wait until poll() has been called before it knows whether
- * any events need to be processed. It sets the returned timeout to -1 to
- * indicate that it doesn't mind how long the poll() call blocks. In the
- * check function, it tests the results of the poll() call to see if the
- * required condition has been met, and returns %TRUE if so.
- */
-typedef struct _GSourceFuncs            GSourceFuncs;
-
-/**
- * GPid:
- *
- * A type which is used to hold a process identification.
- *
- * On UNIX, processes are identified by a process id (an integer),
- * while Windows uses process handles (which are pointers).
- *
- * GPid is used in GLib only for descendant processes spawned with
- * the g_spawn functions.
- */
-
-/**
- * GSourceFunc:
- * @user_data: data passed to the function, set when the source was
- *     created with one of the above functions
- *
- * Specifies the type of function passed to g_timeout_add(),
- * g_timeout_add_full(), g_idle_add(), and g_idle_add_full().
- *
- * Returns: %FALSE if the source should be removed
- */
-typedef gboolean (*GSourceFunc)       (gpointer user_data);
-
-/**
- * GChildWatchFunc:
- * @pid: the process id of the child process
- * @status: Status information about the child process, encoded
- *     in a platform-specific manner
- * @user_data: user data passed to g_child_watch_add()
- *
- * Prototype of a #GChildWatchSource callback, called when a child
- * process has exited.  To interpret @status, see the documentation
- * for g_spawn_check_exit_status().
- */
-typedef void     (*GChildWatchFunc)   (GPid     pid,
-                                       gint     status,
-                                       gpointer user_data);
-struct _GSource
-{
-  /*< private >*/
-  gpointer callback_data;
-  GSourceCallbackFuncs *callback_funcs;
-
-  GSourceFuncs *source_funcs;
-  guint ref_count;
-
-  GMainContext *context;
-
-  gint priority;
-  guint flags;
-  guint source_id;
-
-  GSList *poll_fds;
-  
-  GSource *prev;
-  GSource *next;
-
-  char    *name;
-
-  GSourcePrivate *priv;
-};
-
-struct _GSourceCallbackFuncs
-{
-  void (*ref)   (gpointer     cb_data);
-  void (*unref) (gpointer     cb_data);
-  void (*get)   (gpointer     cb_data,
-                 GSource     *source, 
-                 GSourceFunc *func,
-                 gpointer    *data);
-};
-
-/**
- * GSourceDummyMarshal:
- *
- * This is just a placeholder for #GClosureMarshal,
- * which cannot be used here for dependency reasons.
- */
-typedef void (*GSourceDummyMarshal) (void);
-
-struct _GSourceFuncs
-{
-  gboolean (*prepare)  (GSource    *source,
-                        gint       *timeout_);
-  gboolean (*check)    (GSource    *source);
-  gboolean (*dispatch) (GSource    *source,
-                        GSourceFunc callback,
-                        gpointer    user_data);
-  void     (*finalize) (GSource    *source); /* Can be NULL */
-
-  /*< private >*/
-  /* For use by g_source_set_closure */
-  GSourceFunc     closure_callback;        
-  GSourceDummyMarshal closure_marshal; /* Really is of type GClosureMarshal */
-};
-
-/* Standard priorities */
-
-/**
- * G_PRIORITY_HIGH:
- *
- * Use this for high priority event sources.
- *
- * It is not used within GLib or GTK+.
- */
-#define G_PRIORITY_HIGH            -100
-
-/**
- * G_PRIORITY_DEFAULT:
- *
- * Use this for default priority event sources.
- *
- * In GLib this priority is used when adding timeout functions
- * with g_timeout_add(). In GDK this priority is used for events
- * from the X server.
- */
-#define G_PRIORITY_DEFAULT          0
-
-/**
- * G_PRIORITY_HIGH_IDLE:
- *
- * Use this for high priority idle functions.
- *
- * GTK+ uses #G_PRIORITY_HIGH_IDLE + 10 for resizing operations,
- * and #G_PRIORITY_HIGH_IDLE + 20 for redrawing operations. (This is
- * done to ensure that any pending resizes are processed before any
- * pending redraws, so that widgets are not redrawn twice unnecessarily.)
- */
-#define G_PRIORITY_HIGH_IDLE        100
-
-/**
- * G_PRIORITY_DEFAULT_IDLE:
- *
- * Use this for default priority idle functions.
- *
- * In GLib this priority is used when adding idle functions with
- * g_idle_add().
- */
-#define G_PRIORITY_DEFAULT_IDLE     200
-
-/**
- * G_PRIORITY_LOW:
- *
- * Use this for very low priority background tasks.
- *
- * It is not used within GLib or GTK+.
- */
-#define G_PRIORITY_LOW              300
-
-/**
- * G_SOURCE_REMOVE:
- *
- * Use this macro as the return value of a #GSourceFunc to remove
- * the #GSource from the main loop.
- *
- * Since: 2.32
- */
-#define G_SOURCE_REMOVE         FALSE
-
-/**
- * G_SOURCE_CONTINUE:
- *
- * Use this macro as the return value of a #GSourceFunc to leave
- * the #GSource in the main loop.
- *
- * Since: 2.32
- */
-#define G_SOURCE_CONTINUE       TRUE
-
-/* GMainContext: */
-
-GMainContext *g_main_context_new       (void);
-GMainContext *g_main_context_ref       (GMainContext *context);
-void          g_main_context_unref     (GMainContext *context);
-GMainContext *g_main_context_default   (void);
-
-gboolean      g_main_context_iteration (GMainContext *context,
-                                        gboolean      may_block);
-gboolean      g_main_context_pending   (GMainContext *context);
-
-/* For implementation of legacy interfaces
- */
-GSource      *g_main_context_find_source_by_id              (GMainContext *context,
-                                                             guint         source_id);
-GSource      *g_main_context_find_source_by_user_data       (GMainContext *context,
-                                                             gpointer      user_data);
-GSource      *g_main_context_find_source_by_funcs_user_data (GMainContext *context,
-                                                             GSourceFuncs *funcs,
-                                                             gpointer      user_data);
-
-/* Low level functions for implementing custom main loops.
- */
-void     g_main_context_wakeup  (GMainContext *context);
-gboolean g_main_context_acquire (GMainContext *context);
-void     g_main_context_release (GMainContext *context);
-gboolean g_main_context_is_owner (GMainContext *context);
-gboolean g_main_context_wait    (GMainContext *context,
-                                 GCond        *cond,
-                                 GMutex       *mutex);
-
-gboolean g_main_context_prepare  (GMainContext *context,
-                                  gint         *priority);
-gint     g_main_context_query    (GMainContext *context,
-                                  gint          max_priority,
-                                  gint         *timeout_,
-                                  GPollFD      *fds,
-                                  gint          n_fds);
-gint     g_main_context_check    (GMainContext *context,
-                                  gint          max_priority,
-                                  GPollFD      *fds,
-                                  gint          n_fds);
-void     g_main_context_dispatch (GMainContext *context);
-
-void     g_main_context_set_poll_func (GMainContext *context,
-                                       GPollFunc     func);
-GPollFunc g_main_context_get_poll_func (GMainContext *context);
-
-/* Low level functions for use by source implementations
- */
-void     g_main_context_add_poll    (GMainContext *context,
-                                     GPollFD      *fd,
-                                     gint          priority);
-void     g_main_context_remove_poll (GMainContext *context,
-                                     GPollFD      *fd);
-
-gint     g_main_depth               (void);
-GSource *g_main_current_source      (void);
-
-/* GMainContexts for other threads
- */
-void          g_main_context_push_thread_default (GMainContext *context);
-void          g_main_context_pop_thread_default  (GMainContext *context);
-GMainContext *g_main_context_get_thread_default  (void);
-GMainContext *g_main_context_ref_thread_default  (void);
-
-/* GMainLoop: */
-
-GMainLoop *g_main_loop_new        (GMainContext *context,
-                                   gboolean      is_running);
-void       g_main_loop_run        (GMainLoop    *loop);
-void       g_main_loop_quit       (GMainLoop    *loop);
-GMainLoop *g_main_loop_ref        (GMainLoop    *loop);
-void       g_main_loop_unref      (GMainLoop    *loop);
-gboolean   g_main_loop_is_running (GMainLoop    *loop);
-GMainContext *g_main_loop_get_context (GMainLoop    *loop);
-
-/* GSource: */
-
-GSource *g_source_new             (GSourceFuncs   *source_funcs,
-                                   guint           struct_size);
-GSource *g_source_ref             (GSource        *source);
-void     g_source_unref           (GSource        *source);
-
-guint    g_source_attach          (GSource        *source,
-                                   GMainContext   *context);
-void     g_source_destroy         (GSource        *source);
-
-void     g_source_set_priority    (GSource        *source,
-                                   gint            priority);
-gint     g_source_get_priority    (GSource        *source);
-void     g_source_set_can_recurse (GSource        *source,
-                                   gboolean        can_recurse);
-gboolean g_source_get_can_recurse (GSource        *source);
-guint    g_source_get_id          (GSource        *source);
-
-GMainContext *g_source_get_context (GSource       *source);
-
-void     g_source_set_callback    (GSource        *source,
-                                   GSourceFunc     func,
-                                   gpointer        data,
-                                   GDestroyNotify  notify);
-
-void     g_source_set_funcs       (GSource        *source,
-                                   GSourceFuncs   *funcs);
-gboolean g_source_is_destroyed    (GSource        *source);
-
-void                 g_source_set_name       (GSource        *source,
-                                              const char     *name);
-const char *         g_source_get_name       (GSource        *source);
-void                 g_source_set_name_by_id (guint           tag,
-                                              const char     *name);
-
-
-/* Used to implement g_source_connect_closure and internally*/
-void g_source_set_callback_indirect (GSource              *source,
-                                     gpointer              callback_data,
-                                     GSourceCallbackFuncs *callback_funcs);
-
-void     g_source_add_poll            (GSource        *source,
-				       GPollFD        *fd);
-void     g_source_remove_poll         (GSource        *source,
-				       GPollFD        *fd);
-
-void     g_source_add_child_source    (GSource        *source,
-				       GSource        *child_source);
-void     g_source_remove_child_source (GSource        *source,
-				       GSource        *child_source);
-
-GLIB_DEPRECATED_IN_2_28_FOR(g_source_get_time)
-void     g_source_get_current_time (GSource        *source,
-                                    GTimeVal       *timeval);
-
-gint64   g_source_get_time         (GSource        *source);
-
- /* void g_source_connect_closure (GSource        *source,
-                                  GClosure       *closure);
- */
-
-/* Specific source types
- */
-GSource *g_idle_source_new        (void);
-GSource *g_child_watch_source_new (GPid pid);
-GSource *g_timeout_source_new     (guint interval);
-GSource *g_timeout_source_new_seconds (guint interval);
-
-/* Miscellaneous functions
- */
-void   g_get_current_time                 (GTimeVal       *result);
-gint64 g_get_monotonic_time               (void);
-gint64 g_get_real_time                    (void);
-
-
-/* Source manipulation by ID */
-gboolean g_source_remove                     (guint          tag);
-gboolean g_source_remove_by_user_data        (gpointer       user_data);
-gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
-                                              gpointer       user_data);
-
-/* Idles, child watchers and timeouts */
-guint    g_timeout_add_full         (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_timeout_add              (guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-guint    g_timeout_add_seconds_full (gint            priority,
-                                     guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_timeout_add_seconds      (guint           interval,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-guint    g_child_watch_add_full     (gint            priority,
-                                     GPid            pid,
-                                     GChildWatchFunc function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-guint    g_child_watch_add          (GPid            pid,
-                                     GChildWatchFunc function,
-                                     gpointer        data);
-guint    g_idle_add                 (GSourceFunc     function,
-                                     gpointer        data);
-guint    g_idle_add_full            (gint            priority,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-gboolean g_idle_remove_by_data      (gpointer        data);
-
-void     g_main_context_invoke_full (GMainContext   *context,
-                                     gint            priority,
-                                     GSourceFunc     function,
-                                     gpointer        data,
-                                     GDestroyNotify  notify);
-void     g_main_context_invoke      (GMainContext   *context,
-                                     GSourceFunc     function,
-                                     gpointer        data);
-
-/* Hook for GClosure / GSource integration. Don't touch */
-GLIB_VAR GSourceFuncs g_timeout_funcs;
-GLIB_VAR GSourceFuncs g_child_watch_funcs;
-GLIB_VAR GSourceFuncs g_idle_funcs;
-
-G_END_DECLS
-
-#endif /* __G_MAIN_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gmappedfile.h b/GstreamerHelper/x86/include/glib-2.0/glib/gmappedfile.h
deleted file mode 100644
index cf122e41..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gmappedfile.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * gmappedfile.h: Simplified wrapper around the mmap function
- *
- * Copyright 2005 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MAPPED_FILE_H__
-#define __G_MAPPED_FILE_H__
-
-#include <glib/gbytes.h>
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GMappedFile GMappedFile;
-
-GMappedFile *g_mapped_file_new          (const gchar  *filename,
-				         gboolean      writable,
-				         GError      **error) G_GNUC_MALLOC;
-GMappedFile *g_mapped_file_new_from_fd  (gint          fd,
-					 gboolean      writable,
-					 GError      **error) G_GNUC_MALLOC;
-gsize        g_mapped_file_get_length   (GMappedFile  *file);
-gchar       *g_mapped_file_get_contents (GMappedFile  *file);
-GLIB_AVAILABLE_IN_2_34
-GBytes *     g_mapped_file_get_bytes    (GMappedFile  *file);
-GMappedFile *g_mapped_file_ref          (GMappedFile  *file);
-void         g_mapped_file_unref        (GMappedFile  *file);
-
-GLIB_DEPRECATED_FOR(g_mapped_file_unref)
-void         g_mapped_file_free         (GMappedFile  *file);
-
-G_END_DECLS
-
-#endif /* __G_MAPPED_FILE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gmarkup.h b/GstreamerHelper/x86/include/glib-2.0/glib/gmarkup.h
deleted file mode 100644
index a8865da9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gmarkup.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* gmarkup.h - Simple XML-like string parser/writer
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MARKUP_H__
-#define __G_MARKUP_H__
-
-#include <stdarg.h>
-
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMarkupError:
- * @G_MARKUP_ERROR_BAD_UTF8: text being parsed was not valid UTF-8
- * @G_MARKUP_ERROR_EMPTY: document contained nothing, or only whitespace
- * @G_MARKUP_ERROR_PARSE: document was ill-formed
- * @G_MARKUP_ERROR_UNKNOWN_ELEMENT: error should be set by #GMarkupParser
- *     functions; element wasn't known
- * @G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE: error should be set by #GMarkupParser
- *     functions; attribute wasn't known
- * @G_MARKUP_ERROR_INVALID_CONTENT: error should be set by #GMarkupParser
- *     functions; content was invalid
- * @G_MARKUP_ERROR_MISSING_ATTRIBUTE: error should be set by #GMarkupParser
- *     functions; a required attribute was missing
- *
- * Error codes returned by markup parsing.
- */
-typedef enum
-{
-  G_MARKUP_ERROR_BAD_UTF8,
-  G_MARKUP_ERROR_EMPTY,
-  G_MARKUP_ERROR_PARSE,
-  /* The following are primarily intended for specific GMarkupParser
-   * implementations to set.
-   */
-  G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-  G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
-  G_MARKUP_ERROR_INVALID_CONTENT,
-  G_MARKUP_ERROR_MISSING_ATTRIBUTE
-} GMarkupError;
-
-/**
- * G_MARKUP_ERROR:
- *
- * Error domain for markup parsing.
- * Errors in this domain will be from the #GMarkupError enumeration.
- * See #GError for information on error domains.
- */
-#define G_MARKUP_ERROR g_markup_error_quark ()
-
-GQuark g_markup_error_quark (void);
-
-/**
- * GMarkupParseFlags:
- * @G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG: flag you should not use
- * @G_MARKUP_TREAT_CDATA_AS_TEXT: When this flag is set, CDATA marked
- *     sections are not passed literally to the @passthrough function of
- *     the parser. Instead, the content of the section (without the
- *     <literal>&lt;![CDATA[</literal> and <literal>]]&gt;</literal>) is
- *     passed to the @text function. This flag was added in GLib 2.12
- * @G_MARKUP_PREFIX_ERROR_POSITION: Normally errors caught by GMarkup
- *     itself have line/column information prefixed to them to let the
- *     caller know the location of the error. When this flag is set the
- *     location information is also prefixed to errors generated by the
- *     #GMarkupParser implementation functions
- *
- * Flags that affect the behaviour of the parser.
- */
-typedef enum
-{
-  G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0,
-  G_MARKUP_TREAT_CDATA_AS_TEXT              = 1 << 1,
-  G_MARKUP_PREFIX_ERROR_POSITION            = 1 << 2
-} GMarkupParseFlags;
-
-/**
- * GMarkupParseContext:
- *
- * A parse context is used to parse a stream of bytes that
- * you expect to contain marked-up text.
- *
- * See g_markup_parse_context_new(), #GMarkupParser, and so
- * on for more details.
- */
-typedef struct _GMarkupParseContext GMarkupParseContext;
-typedef struct _GMarkupParser GMarkupParser;
-
-/**
- * GMarkupParser:
- * @start_element: Callback to invoke when the opening tag of an element
- *     is seen.
- * @end_element: Callback to invoke when the closing tag of an element
- *     is seen. Note that this is also called for empty tags like
- *     <literal>&lt;empty/&gt;</literal>.
- * @text: Callback to invoke when some text is seen (text is always
- *     inside an element). Note that the text of an element may be spread
- *     over multiple calls of this function. If the
- *     %G_MARKUP_TREAT_CDATA_AS_TEXT flag is set, this function is also
- *     called for the content of CDATA marked sections.
- * @passthrough: Callback to invoke for comments, processing instructions
- *     and doctype declarations; if you're re-writing the parsed document,
- *     write the passthrough text back out in the same position. If the
- *     %G_MARKUP_TREAT_CDATA_AS_TEXT flag is not set, this function is also
- *     called for CDATA marked sections.
- * @error: Callback to invoke when an error occurs.
- *
- * Any of the fields in #GMarkupParser can be %NULL, in which case they
- * will be ignored. Except for the @error function, any of these callbacks
- * can set an error; in particular the %G_MARKUP_ERROR_UNKNOWN_ELEMENT,
- * %G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, and %G_MARKUP_ERROR_INVALID_CONTENT
- * errors are intended to be set from these callbacks. If you set an error
- * from a callback, g_markup_parse_context_parse() will report that error
- * back to its caller.
- */
-struct _GMarkupParser
-{
-  /* Called for open tags <foo bar="baz"> */
-  void (*start_element)  (GMarkupParseContext *context,
-                          const gchar         *element_name,
-                          const gchar        **attribute_names,
-                          const gchar        **attribute_values,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for close tags </foo> */
-  void (*end_element)    (GMarkupParseContext *context,
-                          const gchar         *element_name,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for character data */
-  /* text is not nul-terminated */
-  void (*text)           (GMarkupParseContext *context,
-                          const gchar         *text,
-                          gsize                text_len,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called for strings that should be re-saved verbatim in this same
-   * position, but are not otherwise interpretable.  At the moment
-   * this includes comments and processing instructions.
-   */
-  /* text is not nul-terminated. */
-  void (*passthrough)    (GMarkupParseContext *context,
-                          const gchar         *passthrough_text,
-                          gsize                text_len,
-                          gpointer             user_data,
-                          GError             **error);
-
-  /* Called on error, including one set by other
-   * methods in the vtable. The GError should not be freed.
-   */
-  void (*error)          (GMarkupParseContext *context,
-                          GError              *error,
-                          gpointer             user_data);
-};
-
-GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
-                                                   GMarkupParseFlags    flags,
-                                                   gpointer             user_data,
-                                                   GDestroyNotify       user_data_dnotify);
-void                 g_markup_parse_context_free  (GMarkupParseContext *context);
-gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
-                                                   const gchar         *text,
-                                                   gssize               text_len,
-                                                   GError             **error);
-void                 g_markup_parse_context_push  (GMarkupParseContext *context,
-                                                   const GMarkupParser *parser,
-                                                   gpointer             user_data);
-gpointer             g_markup_parse_context_pop   (GMarkupParseContext *context);
-
-gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
-                                                       GError             **error);
-const gchar *        g_markup_parse_context_get_element (GMarkupParseContext *context);
-const GSList *       g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
-
-/* For user-constructed error messages, has no precise semantics */
-void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
-                                                          gint                *line_number,
-                                                          gint                *char_number);
-gpointer             g_markup_parse_context_get_user_data (GMarkupParseContext *context);
-
-/* useful when saving */
-gchar* g_markup_escape_text (const gchar *text,
-                             gssize       length);
-
-gchar *g_markup_printf_escaped (const char *format,
-				...) G_GNUC_PRINTF (1, 2);
-gchar *g_markup_vprintf_escaped (const char *format,
-				 va_list     args);
-
-typedef enum
-{
-  G_MARKUP_COLLECT_INVALID,
-  G_MARKUP_COLLECT_STRING,
-  G_MARKUP_COLLECT_STRDUP,
-  G_MARKUP_COLLECT_BOOLEAN,
-  G_MARKUP_COLLECT_TRISTATE,
-
-  G_MARKUP_COLLECT_OPTIONAL = (1 << 16)
-} GMarkupCollectType;
-
-
-/* useful from start_element */
-gboolean   g_markup_collect_attributes (const gchar         *element_name,
-                                        const gchar        **attribute_names,
-                                        const gchar        **attribute_values,
-                                        GError             **error,
-                                        GMarkupCollectType   first_type,
-                                        const gchar         *first_attr,
-                                        ...);
-
-G_END_DECLS
-
-#endif /* __G_MARKUP_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gmem.h b/GstreamerHelper/x86/include/glib-2.0/glib/gmem.h
deleted file mode 100644
index c50f46e7..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gmem.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MEM_H__
-#define __G_MEM_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GMemVTable:
- * @malloc: function to use for allocating memory.
- * @realloc: function to use for reallocating memory.
- * @free: function to use to free memory.
- * @calloc: function to use for allocating zero-filled memory.
- * @try_malloc: function to use for allocating memory without a default error handler.
- * @try_realloc: function to use for reallocating memory without a default error handler.
- * 
- * A set of functions used to perform memory allocation. The same #GMemVTable must
- * be used for all allocations in the same program; a call to g_mem_set_vtable(),
- * if it exists, should be prior to any use of GLib.
- */
-typedef struct _GMemVTable GMemVTable;
-
-
-#if GLIB_SIZEOF_VOID_P > GLIB_SIZEOF_LONG
-/**
- * G_MEM_ALIGN:
- *
- * Indicates the number of bytes to which memory will be aligned on the
- * current platform.
- */
-#  define G_MEM_ALIGN	GLIB_SIZEOF_VOID_P
-#else	/* GLIB_SIZEOF_VOID_P <= GLIB_SIZEOF_LONG */
-#  define G_MEM_ALIGN	GLIB_SIZEOF_LONG
-#endif	/* GLIB_SIZEOF_VOID_P <= GLIB_SIZEOF_LONG */
-
-
-/* Memory allocation functions
- */
-
-void	 g_free	          (gpointer	 mem);
-
-GLIB_AVAILABLE_IN_2_34
-void     g_clear_pointer  (gpointer      *pp,
-                           GDestroyNotify destroy);
-
-gpointer g_malloc         (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_malloc0        (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_realloc        (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_try_malloc     (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_try_malloc0    (gsize	 n_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_try_realloc    (gpointer	 mem,
-			   gsize	 n_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-gpointer g_malloc_n       (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_malloc0_n      (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_realloc_n      (gpointer	 mem,
-			   gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_try_malloc_n   (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_try_malloc0_n  (gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE2(1,2);
-gpointer g_try_realloc_n  (gpointer	 mem,
-			   gsize	 n_blocks,
-			   gsize	 n_block_bytes) G_GNUC_WARN_UNUSED_RESULT;
-
-#define g_clear_pointer(pp, destroy) \
-  G_STMT_START {                                                               \
-    G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer));                       \
-    /* Only one access, please */                                              \
-    gpointer *_pp = (gpointer *) (pp);                                         \
-    gpointer _p;                                                               \
-    /* This assignment is needed to avoid a gcc warning */                     \
-    GDestroyNotify _destroy = (GDestroyNotify) (destroy);                      \
-                                                                               \
-    (void) (0 ? (gpointer) *(pp) : 0);                                         \
-    do                                                                         \
-      _p = g_atomic_pointer_get (_pp);                                         \
-    while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
-                                                                               \
-    if (_p)                                                                    \
-      _destroy (_p);                                                           \
-  } G_STMT_END
-
-/* Optimise: avoid the call to the (slower) _n function if we can
- * determine at compile-time that no overflow happens.
- */
-#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
-#  define _G_NEW(struct_type, n_structs, func) \
-	(struct_type *) (G_GNUC_EXTENSION ({			\
-	  gsize __n = (gsize) (n_structs);			\
-	  gsize __s = sizeof (struct_type);			\
-	  gpointer __p;						\
-	  if (__s == 1)						\
-	    __p = g_##func (__n);				\
-	  else if (__builtin_constant_p (__n) &&		\
-	           (__s == 0 || __n <= G_MAXSIZE / __s))	\
-	    __p = g_##func (__n * __s);				\
-	  else							\
-	    __p = g_##func##_n (__n, __s);			\
-	  __p;							\
-	}))
-#  define _G_RENEW(struct_type, mem, n_structs, func) \
-	(struct_type *) (G_GNUC_EXTENSION ({			\
-	  gsize __n = (gsize) (n_structs);			\
-	  gsize __s = sizeof (struct_type);			\
-	  gpointer __p = (gpointer) (mem);			\
-	  if (__s == 1)						\
-	    __p = g_##func (__p, __n);				\
-	  else if (__builtin_constant_p (__n) &&		\
-	           (__s == 0 || __n <= G_MAXSIZE / __s))	\
-	    __p = g_##func (__p, __n * __s);			\
-	  else							\
-	    __p = g_##func##_n (__p, __n, __s);			\
-	  __p;							\
-	}))
-
-#else
-
-/* Unoptimised version: always call the _n() function. */
-
-#define _G_NEW(struct_type, n_structs, func) \
-        ((struct_type *) g_##func##_n ((n_structs), sizeof (struct_type)))
-#define _G_RENEW(struct_type, mem, n_structs, func) \
-        ((struct_type *) g_##func##_n (mem, (n_structs), sizeof (struct_type)))
-
-#endif
-
-/**
- * g_new:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Allocates @n_structs elements of type @struct_type.
- * The returned pointer is cast to a pointer to the given type.
- * If @n_structs is 0 it returns %NULL.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Since the returned pointer is already casted to the right type,
- * it is normally unnecessary to cast it explicitly, and doing
- * so might hide memory allocation errors.
- * 
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_new(struct_type, n_structs)			_G_NEW (struct_type, n_structs, malloc)
-/**
- * g_new0:
- * @struct_type: the type of the elements to allocate.
- * @n_structs: the number of elements to allocate.
- * 
- * Allocates @n_structs elements of type @struct_type, initialized to 0's.
- * The returned pointer is cast to a pointer to the given type.
- * If @n_structs is 0 it returns %NULL.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Since the returned pointer is already casted to the right type,
- * it is normally unnecessary to cast it explicitly, and doing
- * so might hide memory allocation errors.
- * 
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type.
- */
-#define g_new0(struct_type, n_structs)			_G_NEW (struct_type, n_structs, malloc0)
-/**
- * g_renew:
- * @struct_type: the type of the elements to allocate
- * @mem: the currently allocated memory
- * @n_structs: the number of elements to allocate
- * 
- * Reallocates the memory pointed to by @mem, so that it now has space for
- * @n_structs elements of type @struct_type. It returns the new address of
- * the memory, which may have been moved.
- * Care is taken to avoid overflow when calculating the size of the allocated block.
- * 
- * Returns: a pointer to the new allocated memory, cast to a pointer to @struct_type
- */
-#define g_renew(struct_type, mem, n_structs)		_G_RENEW (struct_type, mem, n_structs, realloc)
-/**
- * g_try_new:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to allocate @n_structs elements of type @struct_type, and returns
- * %NULL on failure. Contrast with g_new(), which aborts the program on failure.
- * The returned pointer is cast to a pointer to the given type.
- * The function returns %NULL when @n_structs is 0 of if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_new(struct_type, n_structs)		_G_NEW (struct_type, n_structs, try_malloc)
-/**
- * g_try_new0:
- * @struct_type: the type of the elements to allocate
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to allocate @n_structs elements of type @struct_type, initialized
- * to 0's, and returns %NULL on failure. Contrast with g_new0(), which aborts
- * the program on failure.
- * The returned pointer is cast to a pointer to the given type.
- * The function returns %NULL when @n_structs is 0 of if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_new0(struct_type, n_structs)		_G_NEW (struct_type, n_structs, try_malloc0)
-/**
- * g_try_renew:
- * @struct_type: the type of the elements to allocate
- * @mem: the currently allocated memory
- * @n_structs: the number of elements to allocate
- * 
- * Attempts to reallocate the memory pointed to by @mem, so that it now has
- * space for @n_structs elements of type @struct_type, and returns %NULL on
- * failure. Contrast with g_renew(), which aborts the program on failure.
- * It returns the new address of the memory, which may have been moved.
- * The function returns %NULL if an overflow occurs.
- * 
- * Since: 2.8
- * Returns: a pointer to the new allocated memory, cast to a pointer to @struct_type
- */
-#define g_try_renew(struct_type, mem, n_structs)	_G_RENEW (struct_type, mem, n_structs, try_realloc)
-
-
-/* Memory allocation virtualization for debugging purposes
- * g_mem_set_vtable() has to be the very first GLib function called
- * if being used
- */
-struct _GMemVTable {
-  gpointer (*malloc)      (gsize    n_bytes);
-  gpointer (*realloc)     (gpointer mem,
-			   gsize    n_bytes);
-  void     (*free)        (gpointer mem);
-  /* optional; set to NULL if not used ! */
-  gpointer (*calloc)      (gsize    n_blocks,
-			   gsize    n_block_bytes);
-  gpointer (*try_malloc)  (gsize    n_bytes);
-  gpointer (*try_realloc) (gpointer mem,
-			   gsize    n_bytes);
-};
-void	 g_mem_set_vtable (GMemVTable	*vtable);
-gboolean g_mem_is_system_malloc (void);
-
-GLIB_VAR gboolean g_mem_gc_friendly;
-
-/* Memory profiler and checker, has to be enabled via g_mem_set_vtable()
- */
-GLIB_VAR GMemVTable	*glib_mem_profiler_table;
-void	g_mem_profile	(void);
-
-G_END_DECLS
-
-#endif /* __G_MEM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gmessages.h b/GstreamerHelper/x86/include/glib-2.0/glib/gmessages.h
deleted file mode 100644
index 9cbcc838..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gmessages.h
+++ /dev/null
@@ -1,404 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_MESSAGES_H__
-#define __G_MESSAGES_H__
-
-#include <stdarg.h>
-#include <glib/gtypes.h>
-#include <glib/gmacros.h>
-
-/* Suppress warnings when GCC is in -pedantic mode and not -std=c99
- */
-#if (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
-#pragma GCC system_header
-#endif
-
-G_BEGIN_DECLS
-
-/* calculate a string size, guaranteed to fit format + args.
- */
-gsize	g_printf_string_upper_bound (const gchar* format,
-				     va_list	  args);
-
-/* Log level shift offset for user defined
- * log levels (0-7 are used by GLib).
- */
-#define G_LOG_LEVEL_USER_SHIFT  (8)
-
-/* Glib log levels and flags.
- */
-typedef enum
-{
-  /* log flags */
-  G_LOG_FLAG_RECURSION          = 1 << 0,
-  G_LOG_FLAG_FATAL              = 1 << 1,
-
-  /* GLib log levels */
-  G_LOG_LEVEL_ERROR             = 1 << 2,       /* always fatal */
-  G_LOG_LEVEL_CRITICAL          = 1 << 3,
-  G_LOG_LEVEL_WARNING           = 1 << 4,
-  G_LOG_LEVEL_MESSAGE           = 1 << 5,
-  G_LOG_LEVEL_INFO              = 1 << 6,
-  G_LOG_LEVEL_DEBUG             = 1 << 7,
-
-  G_LOG_LEVEL_MASK              = ~(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL)
-} GLogLevelFlags;
-
-/* GLib log levels that are considered fatal by default */
-#define G_LOG_FATAL_MASK        (G_LOG_FLAG_RECURSION | G_LOG_LEVEL_ERROR)
-
-typedef void            (*GLogFunc)             (const gchar   *log_domain,
-                                                 GLogLevelFlags log_level,
-                                                 const gchar   *message,
-                                                 gpointer       user_data);
-
-/* Logging mechanism
- */
-guint           g_log_set_handler       (const gchar    *log_domain,
-                                         GLogLevelFlags  log_levels,
-                                         GLogFunc        log_func,
-                                         gpointer        user_data);
-void            g_log_remove_handler    (const gchar    *log_domain,
-                                         guint           handler_id);
-void            g_log_default_handler   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *message,
-                                         gpointer        unused_data);
-GLogFunc        g_log_set_default_handler (GLogFunc      log_func,
-					   gpointer      user_data);
-void            g_log                   (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         ...) G_GNUC_PRINTF (3, 4);
-void            g_logv                  (const gchar    *log_domain,
-                                         GLogLevelFlags  log_level,
-                                         const gchar    *format,
-                                         va_list         args);
-GLogLevelFlags  g_log_set_fatal_mask    (const gchar    *log_domain,
-                                         GLogLevelFlags  fatal_mask);
-GLogLevelFlags  g_log_set_always_fatal  (GLogLevelFlags  fatal_mask);
-
-/* internal */
-G_GNUC_INTERNAL void	_g_log_fallback_handler	(const gchar   *log_domain,
-						 GLogLevelFlags log_level,
-						 const gchar   *message,
-						 gpointer       unused_data);
-
-/* Internal functions, used to implement the following macros */
-void g_return_if_fail_warning (const char *log_domain,
-			       const char *pretty_function,
-			       const char *expression);
-void g_warn_message           (const char     *domain,
-                               const char     *file,
-                               int             line,
-                               const char     *func,
-                               const char     *warnexpr);
-GLIB_DEPRECATED
-void g_assert_warning         (const char *log_domain,
-			       const char *file,
-			       const int   line,
-		               const char *pretty_function,
-		               const char *expression) G_GNUC_NORETURN;
-
-
-#ifndef G_LOG_DOMAIN
-#define G_LOG_DOMAIN    ((gchar*) 0)
-#endif  /* G_LOG_DOMAIN */
-#ifdef G_HAVE_ISO_VARARGS
-/* for(;;) ; so that GCC knows that control doesn't go past g_error().
- * Put space before ending semicolon to avoid C++ build warnings.
- */
-#define g_error(...)  G_STMT_START {                 \
-                        g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_ERROR,    \
-                               __VA_ARGS__);         \
-                        for (;;) ;                   \
-                      } G_STMT_END
-                        
-#define g_message(...)  g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_MESSAGE,  \
-                               __VA_ARGS__)
-#define g_critical(...) g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_CRITICAL, \
-                               __VA_ARGS__)
-#define g_warning(...)  g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_WARNING,  \
-                               __VA_ARGS__)
-#define g_debug(...)    g_log (G_LOG_DOMAIN,         \
-                               G_LOG_LEVEL_DEBUG,    \
-                               __VA_ARGS__)
-#elif defined(G_HAVE_GNUC_VARARGS)
-#define g_error(format...)    G_STMT_START {                 \
-                                g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_ERROR,    \
-                                       format);              \
-                                for (;;) ;                   \
-                              } G_STMT_END
-                              
-#define g_message(format...)    g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_MESSAGE,  \
-                                       format)
-#define g_critical(format...)   g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_CRITICAL, \
-                                       format)
-#define g_warning(format...)    g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_WARNING,  \
-                                       format)
-#define g_debug(format...)      g_log (G_LOG_DOMAIN,         \
-                                       G_LOG_LEVEL_DEBUG,    \
-                                       format)
-#else   /* no varargs macros */
-static void
-g_error (const gchar *format,
-         ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
-  va_end (args);
-
-  for(;;) ;
-}
-static void
-g_message (const gchar *format,
-           ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, format, args);
-  va_end (args);
-}
-static void
-g_critical (const gchar *format,
-            ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, format, args);
-  va_end (args);
-}
-static void
-g_warning (const gchar *format,
-           ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, format, args);
-  va_end (args);
-}
-static void
-g_debug (const gchar *format,
-         ...)
-{
-  va_list args;
-  va_start (args, format);
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
-  va_end (args);
-}
-#endif  /* !__GNUC__ */
-
-/**
- * GPrintFunc:
- * @string: the message to output
- *
- * Specifies the type of the print handler functions.
- * These are called with the complete formatted string to output.
- */
-typedef void    (*GPrintFunc)           (const gchar    *string);
-void            g_print                 (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_print_handler     (GPrintFunc      func);
-void            g_printerr              (const gchar    *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
-
-/**
- * g_warn_if_reached:
- *
- * Logs a critical warning.
- *
- * Since: 2.16
- */
-#define g_warn_if_reached() \
-  do { \
-    g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); \
-  } while (0)
-
-/**
- * g_warn_if_fail:
- * @expr: the expression to check
- *
- * Logs a warning if the expression is not true.
- *
- * Since: 2.16
- */
-#define g_warn_if_fail(expr) \
-  do { \
-    if G_LIKELY (expr) ; \
-    else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, #expr); \
-  } while (0)
-
-#ifdef G_DISABLE_CHECKS
-
-/**
- * g_return_if_fail:
- * @expr: the expression to check
- *
- * Verifies that the expression evaluates to %TRUE.  If the expression
- * evaluates to %FALSE, a critical message is logged and the current
- * function returns.  This can only be used in functions which do not
- * return a value.
- *
- * If G_DISABLE_CHECKS is defined then the check is not performed.  You
- * should therefore not depend on any side effects of @expr.
- */
-#define g_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
-
-/**
- * g_return_val_if_fail:
- * @expr: the expression to check
- * @val: the value to return from the current function
- *       if the expression is not true
- *
- * Verifies that the expression evaluates to %TRUE.  If the expression
- * evaluates to %FALSE, a critical message is logged and @val is
- * returned from the current function.
- *
- * If G_DISABLE_CHECKS is defined then the check is not performed.  You
- * should therefore not depend on any side effects of @expr.
- */
-#define g_return_val_if_fail(expr,val) G_STMT_START{ (void)0; }G_STMT_END
-
-/**
- * g_return_if_reached:
- *
- * Logs a critical message and returns from the current function.
- * This can only be used in functions which do not return a value.
- */
-#define g_return_if_reached() G_STMT_START{ return; }G_STMT_END
-
-/**
- * g_return_val_if_reached:
- * @val: the value to return from the current function
- *
- * Logs a critical message and returns @val.
- */
-#define g_return_val_if_reached(val) G_STMT_START{ return (val); }G_STMT_END
-
-#else /* !G_DISABLE_CHECKS */
-
-#ifdef __GNUC__
-
-#define g_return_if_fail(expr)		G_STMT_START{			\
-     if G_LIKELY(expr) { } else       					\
-       {								\
-	 g_return_if_fail_warning (G_LOG_DOMAIN,			\
-		                   __PRETTY_FUNCTION__,		        \
-		                   #expr);				\
-	 return;							\
-       };				}G_STMT_END
-
-#define g_return_val_if_fail(expr,val)	G_STMT_START{			\
-     if G_LIKELY(expr) { } else						\
-       {								\
-	 g_return_if_fail_warning (G_LOG_DOMAIN,			\
-		                   __PRETTY_FUNCTION__,		        \
-		                   #expr);				\
-	 return (val);							\
-       };				}G_STMT_END
-
-#define g_return_if_reached()		G_STMT_START{			\
-     g_log (G_LOG_DOMAIN,						\
-	    G_LOG_LEVEL_CRITICAL,					\
-	    "file %s: line %d (%s): should not be reached",		\
-	    __FILE__,							\
-	    __LINE__,							\
-	    __PRETTY_FUNCTION__);					\
-     return;				}G_STMT_END
-
-#define g_return_val_if_reached(val)	G_STMT_START{			\
-     g_log (G_LOG_DOMAIN,						\
-	    G_LOG_LEVEL_CRITICAL,					\
-	    "file %s: line %d (%s): should not be reached",		\
-	    __FILE__,							\
-	    __LINE__,							\
-	    __PRETTY_FUNCTION__);					\
-     return (val);			}G_STMT_END
-
-#else /* !__GNUC__ */
-
-#define g_return_if_fail(expr)		G_STMT_START{		\
-     if (expr) { } else						\
-       {							\
-	 g_log (G_LOG_DOMAIN,					\
-		G_LOG_LEVEL_CRITICAL,				\
-		"file %s: line %d: assertion `%s' failed",	\
-		__FILE__,					\
-		__LINE__,					\
-		#expr);						\
-	 return;						\
-       };				}G_STMT_END
-
-#define g_return_val_if_fail(expr, val)	G_STMT_START{		\
-     if (expr) { } else						\
-       {							\
-	 g_log (G_LOG_DOMAIN,					\
-		G_LOG_LEVEL_CRITICAL,				\
-		"file %s: line %d: assertion `%s' failed",	\
-		__FILE__,					\
-		__LINE__,					\
-		#expr);						\
-	 return (val);						\
-       };				}G_STMT_END
-
-#define g_return_if_reached()		G_STMT_START{		\
-     g_log (G_LOG_DOMAIN,					\
-	    G_LOG_LEVEL_CRITICAL,				\
-	    "file %s: line %d: should not be reached",		\
-	    __FILE__,						\
-	    __LINE__);						\
-     return;				}G_STMT_END
-
-#define g_return_val_if_reached(val)	G_STMT_START{		\
-     g_log (G_LOG_DOMAIN,					\
-	    G_LOG_LEVEL_CRITICAL,				\
-	    "file %s: line %d: should not be reached",		\
-	    __FILE__,						\
-	    __LINE__);						\
-     return (val);			}G_STMT_END
-
-#endif /* !__GNUC__ */
-
-#endif /* !G_DISABLE_CHECKS */
-
-G_END_DECLS
-
-#endif /* __G_MESSAGES_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gnode.h b/GstreamerHelper/x86/include/glib-2.0/glib/gnode.h
deleted file mode 100644
index 7ffdcbfc..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gnode.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_NODE_H__
-#define __G_NODE_H__
-
-#include <glib/gmem.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GNode		GNode;
-
-/* Tree traverse flags */
-typedef enum
-{
-  G_TRAVERSE_LEAVES     = 1 << 0,
-  G_TRAVERSE_NON_LEAVES = 1 << 1,
-  G_TRAVERSE_ALL        = G_TRAVERSE_LEAVES | G_TRAVERSE_NON_LEAVES,
-  G_TRAVERSE_MASK       = 0x03,
-  G_TRAVERSE_LEAFS      = G_TRAVERSE_LEAVES,
-  G_TRAVERSE_NON_LEAFS  = G_TRAVERSE_NON_LEAVES
-} GTraverseFlags;
-
-/* Tree traverse orders */
-typedef enum
-{
-  G_IN_ORDER,
-  G_PRE_ORDER,
-  G_POST_ORDER,
-  G_LEVEL_ORDER
-} GTraverseType;
-
-typedef gboolean	(*GNodeTraverseFunc)	(GNode	       *node,
-						 gpointer	data);
-typedef void		(*GNodeForeachFunc)	(GNode	       *node,
-						 gpointer	data);
-
-/**
- * GCopyFunc:
- * @src: A pointer to the data which should be copied
- * @data: Additional data
- *
- * A function of this signature is used to copy the node data 
- * when doing a deep-copy of a tree.
- *
- * Returns: A pointer to the copy
- *
- * Since: 2.4
- */
-typedef gpointer	(*GCopyFunc)            (gconstpointer  src,
-                                                 gpointer       data);
-
-/* N-way tree implementation
- */
-struct _GNode
-{
-  gpointer data;
-  GNode	  *next;
-  GNode	  *prev;
-  GNode	  *parent;
-  GNode	  *children;
-};
-
-/**
- * G_NODE_IS_ROOT:
- * @node: a #GNode
- *
- * Returns %TRUE if a #GNode is the root of a tree.
- *
- * Returns: %TRUE if the #GNode is the root of a tree 
- *     (i.e. it has no parent or siblings)
- */
-#define	 G_NODE_IS_ROOT(node)	(((GNode*) (node))->parent == NULL && \
-				 ((GNode*) (node))->prev == NULL && \
-				 ((GNode*) (node))->next == NULL)
-
-/**
- * G_NODE_IS_LEAF:
- * @node: a #GNode
- *
- * Returns %TRUE if a #GNode is a leaf node.
- *
- * Returns: %TRUE if the #GNode is a leaf node 
- *     (i.e. it has no children)
- */
-#define	 G_NODE_IS_LEAF(node)	(((GNode*) (node))->children == NULL)
-
-GNode*	 g_node_new		(gpointer	   data);
-void	 g_node_destroy		(GNode		  *root);
-void	 g_node_unlink		(GNode		  *node);
-GNode*   g_node_copy_deep       (GNode            *node,
-				 GCopyFunc         copy_func,
-				 gpointer          data);
-GNode*   g_node_copy            (GNode            *node);
-GNode*	 g_node_insert		(GNode		  *parent,
-				 gint		   position,
-				 GNode		  *node);
-GNode*	 g_node_insert_before	(GNode		  *parent,
-				 GNode		  *sibling,
-				 GNode		  *node);
-GNode*   g_node_insert_after    (GNode            *parent,
-				 GNode            *sibling,
-				 GNode            *node); 
-GNode*	 g_node_prepend		(GNode		  *parent,
-				 GNode		  *node);
-guint	 g_node_n_nodes		(GNode		  *root,
-				 GTraverseFlags	   flags);
-GNode*	 g_node_get_root	(GNode		  *node);
-gboolean g_node_is_ancestor	(GNode		  *node,
-				 GNode		  *descendant);
-guint	 g_node_depth		(GNode		  *node);
-GNode*	 g_node_find		(GNode		  *root,
-				 GTraverseType	   order,
-				 GTraverseFlags	   flags,
-				 gpointer	   data);
-
-/* convenience macros */
-/**
- * g_node_append:
- * @parent: the #GNode to place the new #GNode under
- * @node: the #GNode to insert
- *
- * Inserts a #GNode as the last child of the given parent.
- *
- * Returns: the inserted #GNode
- */
-#define g_node_append(parent, node)				\
-     g_node_insert_before ((parent), NULL, (node))
-
-/**
- * g_node_insert_data:
- * @parent: the #GNode to place the new #GNode under
- * @position: the position to place the new #GNode at. If position is -1, 
- *     the new #GNode is inserted as the last child of @parent
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode at the given position.
- *
- * Returns: the new #GNode
- */
-#define	g_node_insert_data(parent, position, data)		\
-     g_node_insert ((parent), (position), g_node_new (data))
-
-/**
- * g_node_insert_data_after:
- * @parent: the #GNode to place the new #GNode under
- * @sibling: the sibling #GNode to place the new #GNode after
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode after the given sibling.
- *
- * Returns: the new #GNode
- */
-
-#define	g_node_insert_data_after(parent, sibling, data)	\
-     g_node_insert_after ((parent), (sibling), g_node_new (data))
-/**
- * g_node_insert_data_before:
- * @parent: the #GNode to place the new #GNode under
- * @sibling: the sibling #GNode to place the new #GNode before
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode before the given sibling.
- *
- * Returns: the new #GNode
- */
-#define	g_node_insert_data_before(parent, sibling, data)	\
-     g_node_insert_before ((parent), (sibling), g_node_new (data))
-
-/**
- * g_node_prepend_data:
- * @parent: the #GNode to place the new #GNode under
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode as the first child of the given parent.
- *
- * Returns: the new #GNode
- */
-#define	g_node_prepend_data(parent, data)			\
-     g_node_prepend ((parent), g_node_new (data))
-
-/**
- * g_node_append_data:
- * @parent: the #GNode to place the new #GNode under
- * @data: the data for the new #GNode
- *
- * Inserts a new #GNode as the last child of the given parent.
- *
- * Returns: the new #GNode
- */
-#define	g_node_append_data(parent, data)			\
-     g_node_insert_before ((parent), NULL, g_node_new (data))
-
-/* traversal function, assumes that `node' is root
- * (only traverses `node' and its subtree).
- * this function is just a high level interface to
- * low level traversal functions, optimized for speed.
- */
-void	 g_node_traverse	(GNode		  *root,
-				 GTraverseType	   order,
-				 GTraverseFlags	   flags,
-				 gint		   max_depth,
-				 GNodeTraverseFunc func,
-				 gpointer	   data);
-
-/* return the maximum tree height starting with `node', this is an expensive
- * operation, since we need to visit all nodes. this could be shortened by
- * adding `guint height' to struct _GNode, but then again, this is not very
- * often needed, and would make g_node_insert() more time consuming.
- */
-guint	 g_node_max_height	 (GNode *root);
-
-void	 g_node_children_foreach (GNode		  *node,
-				  GTraverseFlags   flags,
-				  GNodeForeachFunc func,
-				  gpointer	   data);
-void	 g_node_reverse_children (GNode		  *node);
-guint	 g_node_n_children	 (GNode		  *node);
-GNode*	 g_node_nth_child	 (GNode		  *node,
-				  guint		   n);
-GNode*	 g_node_last_child	 (GNode		  *node);
-GNode*	 g_node_find_child	 (GNode		  *node,
-				  GTraverseFlags   flags,
-				  gpointer	   data);
-gint	 g_node_child_position	 (GNode		  *node,
-				  GNode		  *child);
-gint	 g_node_child_index	 (GNode		  *node,
-				  gpointer	   data);
-
-GNode*	 g_node_first_sibling	 (GNode		  *node);
-GNode*	 g_node_last_sibling	 (GNode		  *node);
-
-/**
- * g_node_prev_sibling:
- * @node: a #GNode
- *
- * Gets the previous sibling of a #GNode.
- *
- * Returns: the previous sibling of @node, or %NULL if @node is the first
- *     node or %NULL
- */
-#define	 g_node_prev_sibling(node)	((node) ? \
-					 ((GNode*) (node))->prev : NULL)
-
-/**
- * g_node_next_sibling:
- * @node: a #GNode
- *
- * Gets the next sibling of a #GNode.
- *
- * Returns: the next sibling of @node, or %NULL if @node is the last node
- *     or %NULL
- */
-#define	 g_node_next_sibling(node)	((node) ? \
-					 ((GNode*) (node))->next : NULL)
-
-/**
- * g_node_first_child:
- * @node: a #GNode
- *
- * Gets the first child of a #GNode.
- *
- * Returns: the first child of @node, or %NULL if @node is %NULL 
- *     or has no children
- */
-#define	 g_node_first_child(node)	((node) ? \
-					 ((GNode*) (node))->children : NULL)
-
-G_END_DECLS
-
-#endif /* __G_NODE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/goption.h b/GstreamerHelper/x86/include/glib-2.0/glib/goption.h
deleted file mode 100644
index 7d1f2a1d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/goption.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/* goption.h - Option parser
- *
- *  Copyright (C) 2004  Anders Carlsson <andersca@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_OPTION_H__
-#define __G_OPTION_H__
-
-#include <glib/gerror.h>
-#include <glib/gquark.h>
-
-G_BEGIN_DECLS
-
-/**
- * GOptionContext:
- * 
- * A <structname>GOptionContext</structname> struct defines which options
- * are accepted by the commandline option parser. The struct has only private 
- * fields and should not be directly accessed.
- */
-typedef struct _GOptionContext GOptionContext;
-
-/**
- * GOptionGroup:
- *
- * A <structname>GOptionGroup</structname> struct defines the options in a single
- * group. The struct has only private fields and should not be directly accessed.
- *
- * All options in a group share the same translation function. Libraries which
- * need to parse commandline options are expected to provide a function for
- * getting a <structname>GOptionGroup</structname> holding their options, which
- * the application can then add to its #GOptionContext.
- */
-typedef struct _GOptionGroup   GOptionGroup;
-typedef struct _GOptionEntry   GOptionEntry;
-
-/**
- * GOptionFlags:
- * @G_OPTION_FLAG_HIDDEN: The option doesn't appear in <option>--help</option>
- *  output.
- * @G_OPTION_FLAG_IN_MAIN: The option appears in the main section of the
- *  <option>--help</option> output, even if it is defined in a group.
- * @G_OPTION_FLAG_REVERSE: For options of the %G_OPTION_ARG_NONE kind, this flag
- *  indicates that the sense of the option is reversed.
- * @G_OPTION_FLAG_NO_ARG: For options of the %G_OPTION_ARG_CALLBACK kind,
- *  this flag indicates that the callback does not take any argument
- *  (like a %G_OPTION_ARG_NONE option). Since 2.8
- * @G_OPTION_FLAG_FILENAME: For options of the %G_OPTION_ARG_CALLBACK
- *  kind, this flag indicates that the argument should be passed to the
- *  callback in the GLib filename encoding rather than UTF-8. Since 2.8
- * @G_OPTION_FLAG_OPTIONAL_ARG: For options of the %G_OPTION_ARG_CALLBACK 
- *  kind, this flag indicates that the argument supply is optional. If no argument
- *  is given then data of %GOptionParseFunc will be set to NULL. Since 2.8
- * @G_OPTION_FLAG_NOALIAS: This flag turns off the automatic conflict resolution
- *  which prefixes long option names with <literal>groupname-</literal> if 
- *  there is a conflict. This option should only be used in situations where
- *  aliasing is necessary to model some legacy commandline interface. It is
- *  not safe to use this option, unless all option groups are under your 
- *  direct control. Since 2.8.
- * 
- * Flags which modify individual options.
- */
-typedef enum
-{
-  G_OPTION_FLAG_HIDDEN		= 1 << 0,
-  G_OPTION_FLAG_IN_MAIN		= 1 << 1,
-  G_OPTION_FLAG_REVERSE		= 1 << 2,
-  G_OPTION_FLAG_NO_ARG		= 1 << 3,
-  G_OPTION_FLAG_FILENAME	= 1 << 4,
-  G_OPTION_FLAG_OPTIONAL_ARG    = 1 << 5,
-  G_OPTION_FLAG_NOALIAS	        = 1 << 6
-} GOptionFlags;
-
-/**
- * GOptionArg:
- * @G_OPTION_ARG_NONE: No extra argument. This is useful for simple flags.
- * @G_OPTION_ARG_STRING: The option takes a string argument.
- * @G_OPTION_ARG_INT: The option takes an integer argument.
- * @G_OPTION_ARG_CALLBACK: The option provides a callback to parse the
- *  extra argument.
- * @G_OPTION_ARG_FILENAME: The option takes a filename as argument.
- * @G_OPTION_ARG_STRING_ARRAY: The option takes a string argument, multiple
- *  uses of the option are collected into an array of strings.
- * @G_OPTION_ARG_FILENAME_ARRAY: The option takes a filename as argument, 
- *  multiple uses of the option are collected into an array of strings.
- * @G_OPTION_ARG_DOUBLE: The option takes a double argument. The argument
- *  can be formatted either for the user's locale or for the "C" locale. Since 2.12
- * @G_OPTION_ARG_INT64: The option takes a 64-bit integer. Like %G_OPTION_ARG_INT
- *  but for larger numbers. The number can be in decimal base, or in hexadecimal
- *  (when prefixed with <literal>0x</literal>, for example, <literal>0xffffffff</literal>).
- *  Since 2.12
- * 
- * The #GOptionArg enum values determine which type of extra argument the
- * options expect to find. If an option expects an extra argument, it
- * can be specified in several ways; with a short option:
- * <option>-x arg</option>, with a long option: <option>--name arg</option>
- * or combined in a single argument: <option>--name=arg</option>.
- */
-typedef enum
-{
-  G_OPTION_ARG_NONE,
-  G_OPTION_ARG_STRING,
-  G_OPTION_ARG_INT,
-  G_OPTION_ARG_CALLBACK,
-  G_OPTION_ARG_FILENAME,
-  G_OPTION_ARG_STRING_ARRAY,
-  G_OPTION_ARG_FILENAME_ARRAY,
-  G_OPTION_ARG_DOUBLE,
-  G_OPTION_ARG_INT64
-} GOptionArg;
-
-/**
- * GOptionArgFunc:
- * @option_name: The name of the option being parsed. This will be either a 
- *  single dash followed by a single letter (for a short name) or two dashes
- *  followed by a long option name.
- * @value: The value to be parsed.
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: A return location for errors. The error code %G_OPTION_ERROR_FAILED
- *  is intended to be used for errors in #GOptionArgFunc callbacks.
- * 
- * The type of function to be passed as callback for %G_OPTION_ARG_CALLBACK
- * options.
- * 
- * Returns: %TRUE if the option was successfully parsed, %FALSE if an error 
- *  occurred, in which case @error should be set with g_set_error()
- */
-typedef gboolean (*GOptionArgFunc) (const gchar    *option_name,
-				    const gchar    *value,
-				    gpointer        data,
-				    GError        **error);
-
-/**
- * GOptionParseFunc:
- * @context: The active #GOptionContext
- * @group: The group to which the function belongs
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: A return location for error details
- * 
- * The type of function that can be called before and after parsing. 
- * 
- * Returns: %TRUE if the function completed successfully, %FALSE if an error 
- *  occurred, in which case @error should be set with g_set_error()
- */
-typedef gboolean (*GOptionParseFunc) (GOptionContext *context,
-				      GOptionGroup   *group,
-				      gpointer	      data,
-				      GError        **error);
-
-/**
- * GOptionErrorFunc:
- * @context: The active #GOptionContext
- * @group: The group to which the function belongs
- * @data: User data added to the #GOptionGroup containing the option when it
- *  was created with g_option_group_new()
- * @error: The #GError containing details about the parse error
- * 
- * The type of function to be used as callback when a parse error occurs.
- */
-typedef void (*GOptionErrorFunc) (GOptionContext *context,
-				  GOptionGroup   *group,
-				  gpointer        data,
-				  GError        **error);
-
-/**
- * G_OPTION_ERROR:
- * 
- * Error domain for option parsing. Errors in this domain will
- * be from the #GOptionError enumeration. See #GError for information on 
- * error domains.
- */
-#define G_OPTION_ERROR (g_option_error_quark ())
-
-/**
- * GOptionError:
- * @G_OPTION_ERROR_UNKNOWN_OPTION: An option was not known to the parser.
- *  This error will only be reported, if the parser hasn't been instructed
- *  to ignore unknown options, see g_option_context_set_ignore_unknown_options().
- * @G_OPTION_ERROR_BAD_VALUE: A value couldn't be parsed.
- * @G_OPTION_ERROR_FAILED: A #GOptionArgFunc callback failed.
- * 
- * Error codes returned by option parsing.
- */
-typedef enum
-{
-  G_OPTION_ERROR_UNKNOWN_OPTION,
-  G_OPTION_ERROR_BAD_VALUE,
-  G_OPTION_ERROR_FAILED
-} GOptionError;
-
-GQuark g_option_error_quark (void);
-
-/**
- * GOptionEntry:
- * @long_name: The long name of an option can be used to specify it
- *  in a commandline as --<replaceable>long_name</replaceable>. Every
- *  option must have a long name. To resolve conflicts if multiple
- *  option groups contain the same long name, it is also possible to
- *  specify the option as 
- *  --<replaceable>groupname</replaceable>-<replaceable>long_name</replaceable>.
- * @short_name: If an option has a short name, it can be specified
- *  -<replaceable>short_name</replaceable> in a commandline. @short_name must be 
- *  a printable ASCII character different from '-', or zero if the option has no
- *  short name.
- * @flags: Flags from #GOptionFlags.
- * @arg: The type of the option, as a #GOptionArg.
- * @arg_data: If the @arg type is %G_OPTION_ARG_CALLBACK, then @arg_data must 
- *  point to a #GOptionArgFunc callback function, which will be called to handle 
- *  the extra argument. Otherwise, @arg_data is a pointer to a location to store 
- *  the value, the required type of the location depends on the @arg type:
- *  <variablelist>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_NONE</term>
- *  <listitem><para>%gboolean</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_STRING</term>
- *  <listitem><para>%gchar*</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_INT</term>
- *  <listitem><para>%gint</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_FILENAME</term>
- *  <listitem><para>%gchar*</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_STRING_ARRAY</term>
- *  <listitem><para>%gchar**</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_FILENAME_ARRAY</term>
- *  <listitem><para>%gchar**</para></listitem>
- *  </varlistentry>
- *  <varlistentry>
- *  <term>%G_OPTION_ARG_DOUBLE</term>
- *  <listitem><para>%gdouble</para></listitem>
- *  </varlistentry>
- *  </variablelist>
- *  If @arg type is %G_OPTION_ARG_STRING or %G_OPTION_ARG_FILENAME the location
- *  will contain a newly allocated string if the option was given. That string
- *  needs to be freed by the callee using g_free(). Likewise if @arg type is
- *  %G_OPTION_ARG_STRING_ARRAY or %G_OPTION_ARG_FILENAME_ARRAY, the data should
- *  be freed using g_strfreev().
- * @description: the description for the option in <option>--help</option>
- *  output. The @description is translated using the @translate_func of the
- *  group, see g_option_group_set_translation_domain().
- * @arg_description: The placeholder to use for the extra argument parsed
- *  by the option in <option>--help</option>
- *  output. The @arg_description is translated using the @translate_func of the
- *  group, see g_option_group_set_translation_domain().
- * 
- * A <structname>GOptionEntry</structname> defines a single option.
- * To have an effect, they must be added to a #GOptionGroup with
- * g_option_context_add_main_entries() or g_option_group_add_entries().
- */
-struct _GOptionEntry
-{
-  const gchar *long_name;
-  gchar        short_name;
-  gint         flags;
-
-  GOptionArg   arg;
-  gpointer     arg_data;
-  
-  const gchar *description;
-  const gchar *arg_description;
-};
-
-/**
- * G_OPTION_REMAINING:
- * 
- * If a long option in the main group has this name, it is not treated as a 
- * regular option. Instead it collects all non-option arguments which would
- * otherwise be left in <literal>argv</literal>. The option must be of type
- * %G_OPTION_ARG_CALLBACK, %G_OPTION_ARG_STRING_ARRAY
- * or %G_OPTION_ARG_FILENAME_ARRAY.
- * 
- * 
- * Using #G_OPTION_REMAINING instead of simply scanning <literal>argv</literal>
- * for leftover arguments has the advantage that GOption takes care of 
- * necessary encoding conversions for strings or filenames.
- * 
- * Since: 2.6
- */
-#define G_OPTION_REMAINING ""
-
-GOptionContext *g_option_context_new              (const gchar         *parameter_string);
-void            g_option_context_set_summary      (GOptionContext      *context,
-                                                   const gchar         *summary);
-const gchar *   g_option_context_get_summary      (GOptionContext     *context);
-void            g_option_context_set_description  (GOptionContext      *context,
-                                                   const gchar         *description);
-const gchar *   g_option_context_get_description  (GOptionContext     *context);
-void            g_option_context_free             (GOptionContext      *context);
-void		g_option_context_set_help_enabled (GOptionContext      *context,
-						   gboolean		help_enabled);
-gboolean	g_option_context_get_help_enabled (GOptionContext      *context);
-void		g_option_context_set_ignore_unknown_options (GOptionContext *context,
-							     gboolean	     ignore_unknown);
-gboolean        g_option_context_get_ignore_unknown_options (GOptionContext *context);
-
-void            g_option_context_add_main_entries (GOptionContext      *context,
-						   const GOptionEntry  *entries,
-						   const gchar         *translation_domain);
-gboolean        g_option_context_parse            (GOptionContext      *context,
-						   gint                *argc,
-						   gchar             ***argv,
-						   GError             **error);
-void            g_option_context_set_translate_func (GOptionContext     *context,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void            g_option_context_set_translation_domain (GOptionContext  *context,
-							 const gchar     *domain);
-
-void            g_option_context_add_group      (GOptionContext *context,
-						 GOptionGroup   *group);
-void          g_option_context_set_main_group (GOptionContext *context,
-					       GOptionGroup   *group);
-GOptionGroup *g_option_context_get_main_group (GOptionContext *context);
-gchar        *g_option_context_get_help       (GOptionContext *context,
-                                               gboolean        main_help,
-                                               GOptionGroup   *group);
-
-GOptionGroup *g_option_group_new                    (const gchar        *name,
-						     const gchar        *description,
-						     const gchar        *help_description,
-						     gpointer            user_data,
-						     GDestroyNotify      destroy);
-void	      g_option_group_set_parse_hooks	    (GOptionGroup       *group,
-						     GOptionParseFunc    pre_parse_func,
-						     GOptionParseFunc	 post_parse_func);
-void	      g_option_group_set_error_hook	    (GOptionGroup       *group,
-						     GOptionErrorFunc	 error_func);
-void          g_option_group_free                   (GOptionGroup       *group);
-void          g_option_group_add_entries            (GOptionGroup       *group,
-						     const GOptionEntry *entries);
-void          g_option_group_set_translate_func     (GOptionGroup       *group,
-						     GTranslateFunc      func,
-						     gpointer            data,
-						     GDestroyNotify      destroy_notify);
-void          g_option_group_set_translation_domain (GOptionGroup       *group,
-						     const gchar        *domain);
-
-G_END_DECLS
-
-#endif /* __G_OPTION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gpattern.h b/GstreamerHelper/x86/include/glib-2.0/glib/gpattern.h
deleted file mode 100644
index e692d902..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gpattern.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 1999  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_PATTERN_H__
-#define __G_PATTERN_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-
-typedef struct _GPatternSpec    GPatternSpec;
-
-GPatternSpec* g_pattern_spec_new       (const gchar  *pattern);
-void          g_pattern_spec_free      (GPatternSpec *pspec);
-gboolean      g_pattern_spec_equal     (GPatternSpec *pspec1,
-					GPatternSpec *pspec2);
-gboolean      g_pattern_match          (GPatternSpec *pspec,
-					guint         string_length,
-					const gchar  *string,
-					const gchar  *string_reversed);
-gboolean      g_pattern_match_string   (GPatternSpec *pspec,
-					const gchar  *string);
-gboolean      g_pattern_match_simple   (const gchar  *pattern,
-					const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_PATTERN_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gpoll.h b/GstreamerHelper/x86/include/glib-2.0/glib/gpoll.h
deleted file mode 100644
index f28b758e..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gpoll.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* gpoll.h - poll(2) support
- * Copyright (C) 2008 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (__G_MAIN_H__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_POLL_H__
-#define __G_POLL_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Any definitions using GPollFD or GPollFunc are primarily
- * for Unix and not guaranteed to be the compatible on all
- * operating systems on which GLib runs. Right now, the
- * GLib does use these functions on Win32 as well, but interprets
- * them in a fairly different way than on Unix. If you use
- * these definitions, you are should be prepared to recode
- * for different operating systems.
- *
- * Note that on systems with a working poll(2), that function is used
- * in place of g_poll(). Thus g_poll() must have the same signature as
- * poll(), meaning GPollFD must have the same layout as struct pollfd.
- *
- *
- * On Win32, the fd in a GPollFD should be Win32 HANDLE (*not* a file
- * descriptor as provided by the C runtime) that can be used by
- * MsgWaitForMultipleObjects. This does *not* include file handles
- * from CreateFile, SOCKETs, nor pipe handles. (But you can use
- * WSAEventSelect to signal events when a SOCKET is readable).
- *
- * On Win32, fd can also be the special value G_WIN32_MSG_HANDLE to
- * indicate polling for messages.
- *
- * But note that G_WIN32_MSG_HANDLE GPollFDs should not be used by GDK
- * (GTK) programs, as GDK itself wants to read messages and convert them
- * to GDK events.
- *
- * So, unless you really know what you are doing, it's best not to try
- * to use the main loop polling stuff for your own needs on
- * Windows.
- */
-typedef struct _GPollFD GPollFD;
-
-/**
- * GPollFunc:
- * @ufds: an array of #GPollFD elements
- * @nfsd: the number of elements in @ufds
- * @timeout_: the maximum time to wait for an event of the file descriptors.
- *     A negative value indicates an infinite timeout.
- *
- * Specifies the type of function passed to g_main_context_set_poll_func().
- * The semantics of the function should match those of the poll() system call.
- *
- * Returns: the number of #GPollFD elements which have events or errors
- *     reported, or -1 if an error occurred.
- */
-typedef gint    (*GPollFunc)    (GPollFD *ufds,
-                                 guint    nfsd,
-                                 gint     timeout_);
-
-/**
- * GPollFD:
- * @fd: the file descriptor to poll (or a <type>HANDLE</type> on Win32)
- * @events: a bitwise combination from #GIOCondition, specifying which
- *     events should be polled for. Typically for reading from a file
- *     descriptor you would use %G_IO_IN | %G_IO_HUP | %G_IO_ERR, and
- *     for writing you would use %G_IO_OUT | %G_IO_ERR.
- * @revents: a bitwise combination of flags from #GIOCondition, returned
- *     from the poll() function to indicate which events occurred.
- *
- * Represents a file descriptor, which events to poll for, and which events
- * occurred.
- */
-struct _GPollFD
-{
-#if defined (G_OS_WIN32) && GLIB_SIZEOF_VOID_P == 8
-  gint64	fd;
-#else
-  gint		fd;
-#endif
-  gushort 	events;
-  gushort 	revents;
-};
-
-#ifdef G_OS_WIN32
-#if GLIB_SIZEOF_VOID_P == 8
-#define G_POLLFD_FORMAT "%#I64x"
-#else
-#define G_POLLFD_FORMAT "%#x"
-#endif
-#else
-#define G_POLLFD_FORMAT "%d"
-#endif
-
-gint g_poll (GPollFD *fds,
-	     guint    nfds,
-	     gint     timeout);
-
-G_END_DECLS
-
-#endif /* __G_POLL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gprimes.h b/GstreamerHelper/x86/include/glib-2.0/glib/gprimes.h
deleted file mode 100644
index 19f57021..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gprimes.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_PRIMES_H__
-#define __G_PRIMES_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Prime numbers.
- */
-
-/* This function returns prime numbers spaced by approximately 1.5-2.0
- * and is for use in resizing data structures which prefer
- * prime-valued sizes.	The closest spaced prime function returns the
- * next largest prime, or the highest it knows about which is about
- * MAXINT/4.
- */
-guint	   g_spaced_primes_closest (guint num) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __G_PRIMES_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gprintf.h b/GstreamerHelper/x86/include/glib-2.0/glib/gprintf.h
deleted file mode 100644
index d96870fb..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gprintf.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_PRINTF_H__
-#define __G_PRINTF_H__
-
-#include <glib.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-gint                  g_printf    (gchar const *format,
-                                   ...) G_GNUC_PRINTF (1, 2);
-gint                  g_fprintf   (FILE        *file,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-gint                  g_sprintf   (gchar       *string,
-				   gchar const *format,
-				   ...) G_GNUC_PRINTF (2, 3);
-
-gint                  g_vprintf   (gchar const *format,
-                                   va_list      args);
-gint                  g_vfprintf  (FILE        *file,
-				   gchar const *format,
-				   va_list      args);
-gint                  g_vsprintf  (gchar       *string,
-				   gchar const *format,
-				   va_list      args);
-gint                  g_vasprintf (gchar      **string,
-				   gchar const *format,
-				   va_list      args);
-
-G_END_DECLS
-
-#endif /* __G_PRINTF_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gqsort.h b/GstreamerHelper/x86/include/glib-2.0/glib/gqsort.h
deleted file mode 100644
index 05b4b66f..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gqsort.h
+++ /dev/null
@@ -1,46 +0,0 @@
- /* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QSORT_H__
-#define __G_QSORT_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-void g_qsort_with_data (gconstpointer    pbase,
-			gint             total_elems,
-			gsize            size,
-			GCompareDataFunc compare_func,
-			gpointer         user_data);
-
-G_END_DECLS
-
-#endif /* __G_QSORT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gquark.h b/GstreamerHelper/x86/include/glib-2.0/glib/gquark.h
deleted file mode 100644
index 39d22ab1..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gquark.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QUARK_H__
-#define __G_QUARK_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef guint32 GQuark;
-
-/* Quarks (string<->id association)
- */
-GQuark                g_quark_try_string         (const gchar *string);
-GQuark                g_quark_from_static_string (const gchar *string);
-GQuark                g_quark_from_string        (const gchar *string);
-const gchar *         g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
-
-#define G_DEFINE_QUARK(QN, q_n)                                         \
-GQuark                                                                  \
-q_n##_quark (void)                                                      \
-{                                                                       \
-  static GQuark q;                                                      \
-                                                                        \
-  if G_UNLIKELY (q == 0)                                                \
-    q = g_quark_from_static_string (#QN);                               \
-                                                                        \
-  return q;                                                             \
-}
-
-const gchar *         g_intern_string            (const gchar *string);
-const gchar *         g_intern_static_string     (const gchar *string);
-
-G_END_DECLS
-
-#endif /* __G_QUARK_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gqueue.h b/GstreamerHelper/x86/include/glib-2.0/glib/gqueue.h
deleted file mode 100644
index 1d13eef8..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gqueue.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_QUEUE_H__
-#define __G_QUEUE_H__
-
-#include <glib/glist.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GQueue GQueue;
-
-/**
- * GQueue:
- * @head: a pointer to the first element of the queue
- * @tail: a pointer to the last element of the queue
- * @length: the number of elements in the queue
- *
- * Contains the public fields of a
- * <link linkend="glib-Double-ended-Queues">Queue</link>.
- */
-struct _GQueue
-{
-  GList *head;
-  GList *tail;
-  guint  length;
-};
-
-/**
- * G_QUEUE_INIT:
- *
- * A statically-allocated #GQueue must be initialized with this
- * macro before it can be used. This macro can be used to initialize
- * a variable, but it cannot be assigned to a variable. In that case
- * you have to use g_queue_init().
- *
- * |[
- * GQueue my_queue = G_QUEUE_INIT;
- * ]|
- *
- * Since: 2.14
- */
-#define G_QUEUE_INIT { NULL, NULL, 0 }
-
-/* Queues
- */
-GQueue*  g_queue_new            (void);
-void     g_queue_free           (GQueue           *queue);
-void     g_queue_free_full      (GQueue           *queue,
-				GDestroyNotify    free_func);
-void     g_queue_init           (GQueue           *queue);
-void     g_queue_clear          (GQueue           *queue);
-gboolean g_queue_is_empty       (GQueue           *queue);
-guint    g_queue_get_length     (GQueue           *queue);
-void     g_queue_reverse        (GQueue           *queue);
-GQueue * g_queue_copy           (GQueue           *queue);
-void     g_queue_foreach        (GQueue           *queue,
-                                 GFunc             func,
-                                 gpointer          user_data);
-GList *  g_queue_find           (GQueue           *queue,
-                                 gconstpointer     data);
-GList *  g_queue_find_custom    (GQueue           *queue,
-                                 gconstpointer     data,
-                                 GCompareFunc      func);
-void     g_queue_sort           (GQueue           *queue,
-                                 GCompareDataFunc  compare_func,
-                                 gpointer          user_data);
-
-void     g_queue_push_head      (GQueue           *queue,
-                                 gpointer          data);
-void     g_queue_push_tail      (GQueue           *queue,
-                                 gpointer          data);
-void     g_queue_push_nth       (GQueue           *queue,
-                                 gpointer          data,
-                                 gint              n);
-gpointer g_queue_pop_head       (GQueue           *queue);
-gpointer g_queue_pop_tail       (GQueue           *queue);
-gpointer g_queue_pop_nth        (GQueue           *queue,
-                                 guint             n);
-gpointer g_queue_peek_head      (GQueue           *queue);
-gpointer g_queue_peek_tail      (GQueue           *queue);
-gpointer g_queue_peek_nth       (GQueue           *queue,
-                                 guint             n);
-gint     g_queue_index          (GQueue           *queue,
-                                 gconstpointer     data);
-gboolean g_queue_remove         (GQueue           *queue,
-                                 gconstpointer     data);
-guint    g_queue_remove_all     (GQueue           *queue,
-                                 gconstpointer     data);
-void     g_queue_insert_before  (GQueue           *queue,
-                                 GList            *sibling,
-                                 gpointer          data);
-void     g_queue_insert_after   (GQueue           *queue,
-                                 GList            *sibling,
-                                 gpointer          data);
-void     g_queue_insert_sorted  (GQueue           *queue,
-                                 gpointer          data,
-                                 GCompareDataFunc  func,
-                                 gpointer          user_data);
-
-void     g_queue_push_head_link (GQueue           *queue,
-                                 GList            *link_);
-void     g_queue_push_tail_link (GQueue           *queue,
-                                 GList            *link_);
-void     g_queue_push_nth_link  (GQueue           *queue,
-                                 gint              n,
-                                 GList            *link_);
-GList*   g_queue_pop_head_link  (GQueue           *queue);
-GList*   g_queue_pop_tail_link  (GQueue           *queue);
-GList*   g_queue_pop_nth_link   (GQueue           *queue,
-                                 guint             n);
-GList*   g_queue_peek_head_link (GQueue           *queue);
-GList*   g_queue_peek_tail_link (GQueue           *queue);
-GList*   g_queue_peek_nth_link  (GQueue           *queue,
-                                 guint             n);
-gint     g_queue_link_index     (GQueue           *queue,
-                                 GList            *link_);
-void     g_queue_unlink         (GQueue           *queue,
-                                 GList            *link_);
-void     g_queue_delete_link    (GQueue           *queue,
-                                 GList            *link_);
-
-G_END_DECLS
-
-#endif /* __G_QUEUE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/grand.h b/GstreamerHelper/x86/include/glib-2.0/glib/grand.h
deleted file mode 100644
index 182616b3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/grand.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_RAND_H__
-#define __G_RAND_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GRand           GRand;
-
-/* GRand - a good and fast random number generator: Mersenne Twister
- * see http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html for more info.
- * The range functions return a value in the intervall [begin, end).
- * int          -> [0..2^32-1]
- * int_range    -> [begin..end-1]
- * double       -> [0..1)
- * double_range -> [begin..end)
- */
-
-GRand*  g_rand_new_with_seed  (guint32  seed);
-GRand*  g_rand_new_with_seed_array (const guint32 *seed,
-				    guint seed_length);
-GRand*  g_rand_new            (void);
-void    g_rand_free           (GRand   *rand_);
-GRand*  g_rand_copy           (GRand   *rand_);
-void    g_rand_set_seed       (GRand   *rand_,
-			       guint32  seed);
-void	g_rand_set_seed_array (GRand   *rand_,
-			       const guint32 *seed,
-			       guint    seed_length);
-
-#define g_rand_boolean(rand_) ((g_rand_int (rand_) & (1 << 15)) != 0)
-
-guint32 g_rand_int            (GRand   *rand_);
-gint32  g_rand_int_range      (GRand   *rand_,
-			       gint32   begin,
-			       gint32   end);
-gdouble g_rand_double         (GRand   *rand_);
-gdouble g_rand_double_range   (GRand   *rand_,
-			       gdouble  begin,
-			       gdouble  end);
-void    g_random_set_seed     (guint32  seed);
-
-#define g_random_boolean() ((g_random_int () & (1 << 15)) != 0)
-
-guint32 g_random_int          (void);
-gint32  g_random_int_range    (gint32   begin,
-			       gint32   end);
-gdouble g_random_double       (void);
-gdouble g_random_double_range (gdouble  begin,
-			       gdouble  end);
-
-
-G_END_DECLS
-
-#endif /* __G_RAND_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gregex.h b/GstreamerHelper/x86/include/glib-2.0/glib/gregex.h
deleted file mode 100644
index 53a2aeef..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gregex.h
+++ /dev/null
@@ -1,561 +0,0 @@
-/* GRegex -- regular expression API wrapper around PCRE.
- *
- * Copyright (C) 1999, 2000 Scott Wimer
- * Copyright (C) 2004, Matthias Clasen <mclasen@redhat.com>
- * Copyright (C) 2005 - 2007, Marco Barisione <marco@barisione.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_REGEX_H__
-#define __G_REGEX_H__
-
-#include <glib/gerror.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-/**
- * GRegexError:
- * @G_REGEX_ERROR_COMPILE: Compilation of the regular expression failed.
- * @G_REGEX_ERROR_OPTIMIZE: Optimization of the regular expression failed.
- * @G_REGEX_ERROR_REPLACE: Replacement failed due to an ill-formed replacement
- *     string.
- * @G_REGEX_ERROR_MATCH: The match process failed.
- * @G_REGEX_ERROR_INTERNAL: Internal error of the regular expression engine.
- *     Since 2.16
- * @G_REGEX_ERROR_STRAY_BACKSLASH: "\\" at end of pattern. Since 2.16
- * @G_REGEX_ERROR_MISSING_CONTROL_CHAR: "\\c" at end of pattern. Since 2.16
- * @G_REGEX_ERROR_UNRECOGNIZED_ESCAPE: Unrecognized character follows "\\".
- *     Since 2.16
- * @G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER: Numbers out of order in "{}"
- *     quantifier. Since 2.16
- * @G_REGEX_ERROR_QUANTIFIER_TOO_BIG: Number too big in "{}" quantifier.
- *     Since 2.16
- * @G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS: Missing terminating "]" for
- *     character class. Since 2.16
- * @G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS: Invalid escape sequence
- *     in character class. Since 2.16
- * @G_REGEX_ERROR_RANGE_OUT_OF_ORDER: Range out of order in character class.
- *     Since 2.16
- * @G_REGEX_ERROR_NOTHING_TO_REPEAT: Nothing to repeat. Since 2.16
- * @G_REGEX_ERROR_UNRECOGNIZED_CHARACTER: Unrecognized character after "(?",
- *     "(?&lt;" or "(?P". Since 2.16
- * @G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS: POSIX named classes are
- *     supported only within a class. Since 2.16
- * @G_REGEX_ERROR_UNMATCHED_PARENTHESIS: Missing terminating ")" or ")"
- *     without opening "(". Since 2.16
- * @G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE: Reference to non-existent
- *     subpattern. Since 2.16
- * @G_REGEX_ERROR_UNTERMINATED_COMMENT: Missing terminating ")" after comment.
- *     Since 2.16
- * @G_REGEX_ERROR_EXPRESSION_TOO_LARGE: Regular expression too large.
- *     Since 2.16
- * @G_REGEX_ERROR_MEMORY_ERROR: Failed to get memory. Since 2.16
- * @G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND: Lookbehind assertion is not
- *     fixed length. Since 2.16
- * @G_REGEX_ERROR_MALFORMED_CONDITION: Malformed number or name after "(?(".
- *     Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES: Conditional group contains
- *     more than two branches. Since 2.16
- * @G_REGEX_ERROR_ASSERTION_EXPECTED: Assertion expected after "(?(".
- *     Since 2.16
- * @G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME: Unknown POSIX class name.
- *     Since 2.16
- * @G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED: POSIX collating
- *     elements are not supported. Since 2.16
- * @G_REGEX_ERROR_HEX_CODE_TOO_LARGE: Character value in "\\x{...}" sequence
- *     is too large. Since 2.16
- * @G_REGEX_ERROR_INVALID_CONDITION: Invalid condition "(?(0)". Since 2.16
- * @G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND: \\C not allowed in
- *     lookbehind assertion. Since 2.16
- * @G_REGEX_ERROR_INFINITE_LOOP: Recursive call could loop indefinitely.
- *     Since 2.16
- * @G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR: Missing terminator
- *     in subpattern name. Since 2.16
- * @G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME: Two named subpatterns have
- *     the same name. Since 2.16
- * @G_REGEX_ERROR_MALFORMED_PROPERTY: Malformed "\\P" or "\\p" sequence.
- *     Since 2.16
- * @G_REGEX_ERROR_UNKNOWN_PROPERTY: Unknown property name after "\\P" or
- *     "\\p". Since 2.16
- * @G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG: Subpattern name is too long
- *     (maximum 32 characters). Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_SUBPATTERNS: Too many named subpatterns (maximum
- *     10,000). Since 2.16
- * @G_REGEX_ERROR_INVALID_OCTAL_VALUE: Octal value is greater than "\\377".
- *     Since 2.16
- * @G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE: "DEFINE" group contains more
- *     than one branch. Since 2.16
- * @G_REGEX_ERROR_DEFINE_REPETION: Repeating a "DEFINE" group is not allowed.
- *     This error is never raised. Since: 2.16 Deprecated: 2.34
- * @G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS: Inconsistent newline options.
- *     Since 2.16
- * @G_REGEX_ERROR_MISSING_BACK_REFERENCE: "\\g" is not followed by a braced,
- *      angle-bracketed, or quoted name or number, or by a plain number. Since: 2.16
- * @G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE: relative reference must not be zero. Since: 2.34
- * @G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN: the backtracing
- *     control verb used does not allow an argument. Since: 2.34
- * @G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB: unknown backtracing 
- *     control verb. Since: 2.34
- * @G_REGEX_ERROR_NUMBER_TOO_BIG: number is too big in escape sequence. Since: 2.34
- * @G_REGEX_ERROR_MISSING_SUBPATTERN_NAME: Missing subpattern name. Since: 2.34
- * @G_REGEX_ERROR_MISSING_DIGIT: Missing digit. Since 2.34
- * @G_REGEX_ERROR_INVALID_DATA_CHARACTER: In JavaScript compatibility mode,
- *     "[" is an invalid data character. Since: 2.34
- * @G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME: different names for subpatterns of the 
- *     same number are not allowed. Since: 2.34
- * @G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED: the backtracing control
- *     verb requires an argument. Since: 2.34
- * @G_REGEX_ERROR_INVALID_CONTROL_CHAR: "\\c" must be followed by an ASCII 
- *     character. Since: 2.34
- * @G_REGEX_ERROR_MISSING_NAME: "\\k" is not followed by a braced, angle-bracketed, or 
- *     quoted name. Since: 2.34
- * @G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS: "\\N" is not supported in a class. Since: 2.34
- * @G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES: too many forward references. Since: 2.34
- * @G_REGEX_ERROR_NAME_TOO_LONG: the name is too long in "(*MARK)", "(*PRUNE)", 
- *     "(*SKIP)", or "(*THEN)". Since: 2.34
- * @G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE: the character value in the \\u sequence is
- *     too large. Since: 2.34
- *
- * Error codes returned by regular expressions functions.
- *
- * Since: 2.14
- */
-typedef enum
-{
-  G_REGEX_ERROR_COMPILE,
-  G_REGEX_ERROR_OPTIMIZE,
-  G_REGEX_ERROR_REPLACE,
-  G_REGEX_ERROR_MATCH,
-  G_REGEX_ERROR_INTERNAL,
-
-  /* These are the error codes from PCRE + 100 */
-  G_REGEX_ERROR_STRAY_BACKSLASH = 101,
-  G_REGEX_ERROR_MISSING_CONTROL_CHAR = 102,
-  G_REGEX_ERROR_UNRECOGNIZED_ESCAPE = 103,
-  G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER = 104,
-  G_REGEX_ERROR_QUANTIFIER_TOO_BIG = 105,
-  G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS = 106,
-  G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS = 107,
-  G_REGEX_ERROR_RANGE_OUT_OF_ORDER = 108,
-  G_REGEX_ERROR_NOTHING_TO_REPEAT = 109,
-  G_REGEX_ERROR_UNRECOGNIZED_CHARACTER = 112,
-  G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS = 113,
-  G_REGEX_ERROR_UNMATCHED_PARENTHESIS = 114,
-  G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE = 115,
-  G_REGEX_ERROR_UNTERMINATED_COMMENT = 118,
-  G_REGEX_ERROR_EXPRESSION_TOO_LARGE = 120,
-  G_REGEX_ERROR_MEMORY_ERROR = 121,
-  G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND = 125,
-  G_REGEX_ERROR_MALFORMED_CONDITION = 126,
-  G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES = 127,
-  G_REGEX_ERROR_ASSERTION_EXPECTED = 128,
-  G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME = 130,
-  G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED = 131,
-  G_REGEX_ERROR_HEX_CODE_TOO_LARGE = 134,
-  G_REGEX_ERROR_INVALID_CONDITION = 135,
-  G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND = 136,
-  G_REGEX_ERROR_INFINITE_LOOP = 140,
-  G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR = 142,
-  G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME = 143,
-  G_REGEX_ERROR_MALFORMED_PROPERTY = 146,
-  G_REGEX_ERROR_UNKNOWN_PROPERTY = 147,
-  G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG = 148,
-  G_REGEX_ERROR_TOO_MANY_SUBPATTERNS = 149,
-  G_REGEX_ERROR_INVALID_OCTAL_VALUE = 151,
-  G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE = 154,
-  G_REGEX_ERROR_DEFINE_REPETION = 155,
-  G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS = 156,
-  G_REGEX_ERROR_MISSING_BACK_REFERENCE = 157,
-  G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE = 158,
-  G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN = 159,
-  G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB  = 160,
-  G_REGEX_ERROR_NUMBER_TOO_BIG = 161,
-  G_REGEX_ERROR_MISSING_SUBPATTERN_NAME = 162,
-  G_REGEX_ERROR_MISSING_DIGIT = 163,
-  G_REGEX_ERROR_INVALID_DATA_CHARACTER = 164,
-  G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME = 165,
-  G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED = 166,
-  G_REGEX_ERROR_INVALID_CONTROL_CHAR = 168,
-  G_REGEX_ERROR_MISSING_NAME = 169,
-  G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS = 171,
-  G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES = 172,
-  G_REGEX_ERROR_NAME_TOO_LONG = 175,
-  G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE = 176
-} GRegexError;
-
-/**
- * G_REGEX_ERROR:
- *
- * Error domain for regular expressions. Errors in this domain will be
- * from the #GRegexError enumeration. See #GError for information on
- * error domains.
- *
- * Since: 2.14
- */
-#define G_REGEX_ERROR g_regex_error_quark ()
-
-GQuark g_regex_error_quark (void);
-
-/**
- * GRegexCompileFlags:
- * @G_REGEX_CASELESS: Letters in the pattern match both upper- and
- *     lowercase letters. This option can be changed within a pattern
- *     by a "(?i)" option setting.
- * @G_REGEX_MULTILINE: By default, GRegex treats the strings as consisting
- *     of a single line of characters (even if it actually contains
- *     newlines). The "start of line" metacharacter ("^") matches only
- *     at the start of the string, while the "end of line" metacharacter
- *     ("$") matches only at the end of the string, or before a terminating
- *     newline (unless #G_REGEX_DOLLAR_ENDONLY is set). When
- *     #G_REGEX_MULTILINE is set, the "start of line" and "end of line"
- *     constructs match immediately following or immediately before any
- *     newline in the string, respectively, as well as at the very start
- *     and end. This can be changed within a pattern by a "(?m)" option
- *     setting.
- * @G_REGEX_DOTALL: A dot metacharater (".") in the pattern matches all
- *     characters, including newlines. Without it, newlines are excluded.
- *     This option can be changed within a pattern by a ("?s") option setting.
- * @G_REGEX_EXTENDED: Whitespace data characters in the pattern are
- *     totally ignored except when escaped or inside a character class.
- *     Whitespace does not include the VT character (code 11). In addition,
- *     characters between an unescaped "#" outside a character class and
- *     the next newline character, inclusive, are also ignored. This can
- *     be changed within a pattern by a "(?x)" option setting.
- * @G_REGEX_ANCHORED: The pattern is forced to be "anchored", that is,
- *     it is constrained to match only at the first matching point in the
- *     string that is being searched. This effect can also be achieved by
- *     appropriate constructs in the pattern itself such as the "^"
- *     metacharater.
- * @G_REGEX_DOLLAR_ENDONLY: A dollar metacharacter ("$") in the pattern
- *     matches only at the end of the string. Without this option, a
- *     dollar also matches immediately before the final character if
- *     it is a newline (but not before any other newlines). This option
- *     is ignored if #G_REGEX_MULTILINE is set.
- * @G_REGEX_UNGREEDY: Inverts the "greediness" of the quantifiers so that
- *     they are not greedy by default, but become greedy if followed by "?".
- *     It can also be set by a "(?U)" option setting within the pattern.
- * @G_REGEX_RAW: Usually strings must be valid UTF-8 strings, using this
- *     flag they are considered as a raw sequence of bytes.
- * @G_REGEX_NO_AUTO_CAPTURE: Disables the use of numbered capturing
- *     parentheses in the pattern. Any opening parenthesis that is not
- *     followed by "?" behaves as if it were followed by "?:" but named
- *     parentheses can still be used for capturing (and they acquire numbers
- *     in the usual way).
- * @G_REGEX_OPTIMIZE: Optimize the regular expression. If the pattern will
- *     be used many times, then it may be worth the effort to optimize it
- *     to improve the speed of matches.
- * @G_REGEX_FIRSTLINE: Limits an unanchored pattern to match before (or at) the
- *     first newline. Since: 2.34
- * @G_REGEX_DUPNAMES: Names used to identify capturing subpatterns need not
- *     be unique. This can be helpful for certain types of pattern when it
- *     is known that only one instance of the named subpattern can ever be
- *     matched.
- * @G_REGEX_NEWLINE_CR: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     is '\r'.
- * @G_REGEX_NEWLINE_LF: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     is '\n'.
- * @G_REGEX_NEWLINE_CRLF: Usually any newline character or character sequence is
- *     recognized. If this option is set, the only recognized newline character
- *     sequence is '\r\n'.
- * @G_REGEX_NEWLINE_ANYCRLF: Usually any newline character or character sequence
- *     is recognized. If this option is set, the only recognized newline character
- *     sequences are '\r', '\n', and '\r\n'. Since: 2.34
- * @G_REGEX_BSR_ANYCRLF: Usually any newline character or character sequence
- *     is recognised. If this option is set, then "\R" only recognizes the newline
- *    characters '\r', '\n' and '\r\n'. Since: 2.34
- * @G_REGEX_JAVASCRIPT_COMPAT: Changes behaviour so that it is compatible with
- *     JavaScript rather than PCRE. Since: 2.34
- *
- * Flags specifying compile-time options.
- *
- * Since: 2.14
- */
-/* Remember to update G_REGEX_COMPILE_MASK in gregex.c after
- * adding a new flag. */
-typedef enum
-{
-  G_REGEX_CASELESS          = 1 << 0,
-  G_REGEX_MULTILINE         = 1 << 1,
-  G_REGEX_DOTALL            = 1 << 2,
-  G_REGEX_EXTENDED          = 1 << 3,
-  G_REGEX_ANCHORED          = 1 << 4,
-  G_REGEX_DOLLAR_ENDONLY    = 1 << 5,
-  G_REGEX_UNGREEDY          = 1 << 9,
-  G_REGEX_RAW               = 1 << 11,
-  G_REGEX_NO_AUTO_CAPTURE   = 1 << 12,
-  G_REGEX_OPTIMIZE          = 1 << 13,
-  G_REGEX_FIRSTLINE         = 1 << 18,
-  G_REGEX_DUPNAMES          = 1 << 19,
-  G_REGEX_NEWLINE_CR        = 1 << 20,
-  G_REGEX_NEWLINE_LF        = 1 << 21,
-  G_REGEX_NEWLINE_CRLF      = G_REGEX_NEWLINE_CR | G_REGEX_NEWLINE_LF,
-  G_REGEX_NEWLINE_ANYCRLF   = G_REGEX_NEWLINE_CR | 1 << 22,
-  G_REGEX_BSR_ANYCRLF       = 1 << 23,
-  G_REGEX_JAVASCRIPT_COMPAT = 1 << 25
-} GRegexCompileFlags;
-
-/**
- * GRegexMatchFlags:
- * @G_REGEX_MATCH_ANCHORED: The pattern is forced to be "anchored", that is,
- *     it is constrained to match only at the first matching point in the
- *     string that is being searched. This effect can also be achieved by
- *     appropriate constructs in the pattern itself such as the "^"
- *     metacharater.
- * @G_REGEX_MATCH_NOTBOL: Specifies that first character of the string is
- *     not the beginning of a line, so the circumflex metacharacter should
- *     not match before it. Setting this without #G_REGEX_MULTILINE (at
- *     compile time) causes circumflex never to match. This option affects
- *     only the behaviour of the circumflex metacharacter, it does not
- *     affect "\A".
- * @G_REGEX_MATCH_NOTEOL: Specifies that the end of the subject string is
- *     not the end of a line, so the dollar metacharacter should not match
- *     it nor (except in multiline mode) a newline immediately before it.
- *     Setting this without #G_REGEX_MULTILINE (at compile time) causes
- *     dollar never to match. This option affects only the behaviour of
- *     the dollar metacharacter, it does not affect "\Z" or "\z".
- * @G_REGEX_MATCH_NOTEMPTY: An empty string is not considered to be a valid
- *     match if this option is set. If there are alternatives in the pattern,
- *     they are tried. If all the alternatives match the empty string, the
- *     entire match fails. For example, if the pattern "a?b?" is applied to
- *     a string not beginning with "a" or "b", it matches the empty string
- *     at the start of the string. With this flag set, this match is not
- *     valid, so GRegex searches further into the string for occurrences
- *     of "a" or "b".
- * @G_REGEX_MATCH_PARTIAL: Turns on the partial matching feature, for more
- *     documentation on partial matching see g_match_info_is_partial_match().
- * @G_REGEX_MATCH_NEWLINE_CR: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\r' character as line terminator.
- * @G_REGEX_MATCH_NEWLINE_LF: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\n' character as line terminator.
- * @G_REGEX_MATCH_NEWLINE_CRLF: Overrides the newline definition set when
- *     creating a new #GRegex, setting the '\r\n' characters sequence as line terminator.
- * @G_REGEX_MATCH_NEWLINE_ANY: Overrides the newline definition set when
- *     creating a new #GRegex, any Unicode newline sequence
- *     is recognised as a newline. These are '\r', '\n' and '\rn', and the
- *     single characters U+000B LINE TABULATION, U+000C FORM FEED (FF),
- *     U+0085 NEXT LINE (NEL), U+2028 LINE SEPARATOR and
- *     U+2029 PARAGRAPH SEPARATOR.
- * @G_REGEX_MATCH_NEWLINE_ANYCRLF: Overrides the newline definition set when
- *     creating a new #GRegex; any '\r', '\n', or '\r\n' character sequence
- *     is recognized as a newline. Since: 2.34
- * @G_REGEX_MATCH_BSR_ANYCRLF: Overrides the newline definition for "\R" set when
- *     creating a new #GRegex; only '\r', '\n', or '\r\n' character sequences
- *     are recognized as a newline by "\R". Since: 2.34
- * @G_REGEX_MATCH_BSR_ANY: Overrides the newline definition for "\R" set when
- *     creating a new #GRegex; any Unicode newline character or character sequence
- *     are recognized as a newline by "\R". These are '\r', '\n' and '\rn', and the
- *     single characters U+000B LINE TABULATION, U+000C FORM FEED (FF),
- *     U+0085 NEXT LINE (NEL), U+2028 LINE SEPARATOR and
- *     U+2029 PARAGRAPH SEPARATOR. Since: 2.34
- * @G_REGEX_MATCH_PARTIAL_SOFT: An alias for #G_REGEX_MATCH_PARTIAL. Since: 2.34
- * @G_REGEX_MATCH_PARTIAL_HARD: Turns on the partial matching feature. In contrast to
- *     to #G_REGEX_MATCH_PARTIAL_SOFT, this stops matching as soon as a partial match
- *     is found, without continuing to search for a possible complete match. See
- *     see g_match_info_is_partial_match() for more information. Since: 2.34
- * @G_REGEX_MATCH_NOTEMPTY_ATSTART: Like #G_REGEX_MATCH_NOTEMPTY, but only applied to
- *     the start of the matched string. For anchored
- *     patterns this can only happen for pattern containing "\K". Since: 2.34
- *
- * Flags specifying match-time options.
- *
- * Since: 2.14
- */
-/* Remember to update G_REGEX_MATCH_MASK in gregex.c after
- * adding a new flag. */
-typedef enum
-{
-  G_REGEX_MATCH_ANCHORED         = 1 << 4,
-  G_REGEX_MATCH_NOTBOL           = 1 << 7,
-  G_REGEX_MATCH_NOTEOL           = 1 << 8,
-  G_REGEX_MATCH_NOTEMPTY         = 1 << 10,
-  G_REGEX_MATCH_PARTIAL          = 1 << 15,
-  G_REGEX_MATCH_NEWLINE_CR       = 1 << 20,
-  G_REGEX_MATCH_NEWLINE_LF       = 1 << 21,
-  G_REGEX_MATCH_NEWLINE_CRLF     = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_LF,
-  G_REGEX_MATCH_NEWLINE_ANY      = 1 << 22,
-  G_REGEX_MATCH_NEWLINE_ANYCRLF  = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_ANY,
-  G_REGEX_MATCH_BSR_ANYCRLF      = 1 << 23,
-  G_REGEX_MATCH_BSR_ANY          = 1 << 24,
-  G_REGEX_MATCH_PARTIAL_SOFT     = G_REGEX_MATCH_PARTIAL,
-  G_REGEX_MATCH_PARTIAL_HARD     = 1 << 27,
-  G_REGEX_MATCH_NOTEMPTY_ATSTART = 1 << 28
-} GRegexMatchFlags;
-
-/**
- * GRegex:
- *
- * A GRegex is the "compiled" form of a regular expression pattern. This
- * structure is opaque and its fields cannot be accessed directly.
- *
- * Since: 2.14
- */
-typedef struct _GRegex		GRegex;
-
-
-typedef struct _GMatchInfo	GMatchInfo;
-
-/**
- * GRegexEvalCallback:
- * @match_info: the #GMatchInfo generated by the match.
- *     Use g_match_info_get_regex() and g_match_info_get_string() if you
- *     need the #GRegex or the matched string.
- * @result: a #GString containing the new string
- * @user_data: user data passed to g_regex_replace_eval()
- *
- * Specifies the type of the function passed to g_regex_replace_eval().
- * It is called for each occurrence of the pattern in the string passed
- * to g_regex_replace_eval(), and it should append the replacement to
- * @result.
- *
- * Returns: %FALSE to continue the replacement process, %TRUE to stop it
- *
- * Since: 2.14
- */
-typedef gboolean (*GRegexEvalCallback)		(const GMatchInfo *match_info,
-						 GString          *result,
-						 gpointer          user_data);
-
-
-GRegex		 *g_regex_new			(const gchar         *pattern,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-GRegex           *g_regex_ref			(GRegex              *regex);
-void		  g_regex_unref			(GRegex              *regex);
-const gchar	 *g_regex_get_pattern		(const GRegex        *regex);
-gint		  g_regex_get_max_backref	(const GRegex        *regex);
-gint		  g_regex_get_capture_count	(const GRegex        *regex);
-gboolean          g_regex_get_has_cr_or_lf      (const GRegex        *regex);
-gint		  g_regex_get_string_number	(const GRegex        *regex, 
-						 const gchar         *name);
-gchar		 *g_regex_escape_string		(const gchar         *string,
-						 gint                 length);
-gchar		 *g_regex_escape_nul		(const gchar         *string,
-						 gint                 length);
-
-GRegexCompileFlags g_regex_get_compile_flags    (const GRegex        *regex);
-GRegexMatchFlags   g_regex_get_match_flags      (const GRegex        *regex);
-
-/* Matching. */
-gboolean	  g_regex_match_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gboolean	  g_regex_match			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-gboolean	  g_regex_match_full		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info,
-						 GError             **error);
-gboolean	  g_regex_match_all		(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info);
-gboolean	  g_regex_match_all_full	(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GMatchInfo         **match_info,
-						 GError             **error);
-
-/* String splitting. */
-gchar		**g_regex_split_simple		(const gchar         *pattern,
-						 const gchar         *string,
-						 GRegexCompileFlags   compile_options,
-						 GRegexMatchFlags     match_options);
-gchar		**g_regex_split			(const GRegex        *regex,
-						 const gchar         *string,
-						 GRegexMatchFlags     match_options);
-gchar		**g_regex_split_full		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 gint                 max_tokens,
-						 GError             **error);
-
-/* String replacement. */
-gchar		 *g_regex_replace		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-gchar		 *g_regex_replace_literal	(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 const gchar         *replacement,
-						 GRegexMatchFlags     match_options,
-						 GError             **error);
-gchar		 *g_regex_replace_eval		(const GRegex        *regex,
-						 const gchar         *string,
-						 gssize               string_len,
-						 gint                 start_position,
-						 GRegexMatchFlags     match_options,
-						 GRegexEvalCallback   eval,
-						 gpointer             user_data,
-						 GError             **error);
-gboolean	  g_regex_check_replacement	(const gchar         *replacement,
-						 gboolean            *has_references,
-						 GError             **error);
-
-/* Match info */
-GRegex		 *g_match_info_get_regex	(const GMatchInfo    *match_info);
-const gchar      *g_match_info_get_string       (const GMatchInfo    *match_info);
-
-GMatchInfo       *g_match_info_ref              (GMatchInfo          *match_info);
-void              g_match_info_unref            (GMatchInfo          *match_info);
-void		  g_match_info_free		(GMatchInfo          *match_info);
-gboolean	  g_match_info_next		(GMatchInfo          *match_info,
-						 GError             **error);
-gboolean	  g_match_info_matches		(const GMatchInfo    *match_info);
-gint		  g_match_info_get_match_count	(const GMatchInfo    *match_info);
-gboolean	  g_match_info_is_partial_match	(const GMatchInfo    *match_info);
-gchar		 *g_match_info_expand_references(const GMatchInfo    *match_info,
-						 const gchar         *string_to_expand,
-						 GError             **error);
-gchar		 *g_match_info_fetch		(const GMatchInfo    *match_info,
-						 gint                 match_num);
-gboolean	  g_match_info_fetch_pos	(const GMatchInfo    *match_info,
-						 gint                 match_num,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		 *g_match_info_fetch_named	(const GMatchInfo    *match_info,
-						 const gchar         *name);
-gboolean	  g_match_info_fetch_named_pos	(const GMatchInfo    *match_info,
-						 const gchar         *name,
-						 gint                *start_pos,
-						 gint                *end_pos);
-gchar		**g_match_info_fetch_all	(const GMatchInfo    *match_info);
-
-G_END_DECLS
-
-#endif  /*  __G_REGEX_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gscanner.h b/GstreamerHelper/x86/include/glib-2.0/glib/gscanner.h
deleted file mode 100644
index dd932f42..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gscanner.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SCANNER_H__
-#define __G_SCANNER_H__
-
-#include <glib/gdataset.h>
-#include <glib/ghash.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GScanner	GScanner;
-typedef struct _GScannerConfig	GScannerConfig;
-typedef union  _GTokenValue     GTokenValue;
-
-typedef void		(*GScannerMsgFunc)	(GScanner      *scanner,
-						 gchar	       *message,
-						 gboolean	error);
-
-/* GScanner: Flexible lexical scanner for general purpose.
- */
-
-/* Character sets */
-#define G_CSET_A_2_Z	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-#define G_CSET_a_2_z	"abcdefghijklmnopqrstuvwxyz"
-#define G_CSET_DIGITS	"0123456789"
-#define G_CSET_LATINC	"\300\301\302\303\304\305\306"\
-			"\307\310\311\312\313\314\315\316\317\320"\
-			"\321\322\323\324\325\326"\
-			"\330\331\332\333\334\335\336"
-#define G_CSET_LATINS	"\337\340\341\342\343\344\345\346"\
-			"\347\350\351\352\353\354\355\356\357\360"\
-			"\361\362\363\364\365\366"\
-			"\370\371\372\373\374\375\376\377"
-
-/* Error types */
-typedef enum
-{
-  G_ERR_UNKNOWN,
-  G_ERR_UNEXP_EOF,
-  G_ERR_UNEXP_EOF_IN_STRING,
-  G_ERR_UNEXP_EOF_IN_COMMENT,
-  G_ERR_NON_DIGIT_IN_CONST,
-  G_ERR_DIGIT_RADIX,
-  G_ERR_FLOAT_RADIX,
-  G_ERR_FLOAT_MALFORMED
-} GErrorType;
-
-/* Token types */
-typedef enum
-{
-  G_TOKEN_EOF			=   0,
-  
-  G_TOKEN_LEFT_PAREN		= '(',
-  G_TOKEN_RIGHT_PAREN		= ')',
-  G_TOKEN_LEFT_CURLY		= '{',
-  G_TOKEN_RIGHT_CURLY		= '}',
-  G_TOKEN_LEFT_BRACE		= '[',
-  G_TOKEN_RIGHT_BRACE		= ']',
-  G_TOKEN_EQUAL_SIGN		= '=',
-  G_TOKEN_COMMA			= ',',
-  
-  G_TOKEN_NONE			= 256,
-  
-  G_TOKEN_ERROR,
-  
-  G_TOKEN_CHAR,
-  G_TOKEN_BINARY,
-  G_TOKEN_OCTAL,
-  G_TOKEN_INT,
-  G_TOKEN_HEX,
-  G_TOKEN_FLOAT,
-  G_TOKEN_STRING,
-  
-  G_TOKEN_SYMBOL,
-  G_TOKEN_IDENTIFIER,
-  G_TOKEN_IDENTIFIER_NULL,
-  
-  G_TOKEN_COMMENT_SINGLE,
-  G_TOKEN_COMMENT_MULTI,
-
-  /*< private >*/
-  G_TOKEN_LAST
-} GTokenType;
-
-union	_GTokenValue
-{
-  gpointer	v_symbol;
-  gchar		*v_identifier;
-  gulong	v_binary;
-  gulong	v_octal;
-  gulong	v_int;
-  guint64       v_int64;
-  gdouble	v_float;
-  gulong	v_hex;
-  gchar		*v_string;
-  gchar		*v_comment;
-  guchar	v_char;
-  guint		v_error;
-};
-
-struct	_GScannerConfig
-{
-  /* Character sets
-   */
-  gchar		*cset_skip_characters;		/* default: " \t\n" */
-  gchar		*cset_identifier_first;
-  gchar		*cset_identifier_nth;
-  gchar		*cpair_comment_single;		/* default: "#\n" */
-  
-  /* Should symbol lookup work case sensitive?
-   */
-  guint		case_sensitive : 1;
-  
-  /* Boolean values to be adjusted "on the fly"
-   * to configure scanning behaviour.
-   */
-  guint		skip_comment_multi : 1;		/* C like comment */
-  guint		skip_comment_single : 1;	/* single line comment */
-  guint		scan_comment_multi : 1;		/* scan multi line comments? */
-  guint		scan_identifier : 1;
-  guint		scan_identifier_1char : 1;
-  guint		scan_identifier_NULL : 1;
-  guint		scan_symbols : 1;
-  guint		scan_binary : 1;
-  guint		scan_octal : 1;
-  guint		scan_float : 1;
-  guint		scan_hex : 1;			/* `0x0ff0' */
-  guint		scan_hex_dollar : 1;		/* `$0ff0' */
-  guint		scan_string_sq : 1;		/* string: 'anything' */
-  guint		scan_string_dq : 1;		/* string: "\\-escapes!\n" */
-  guint		numbers_2_int : 1;		/* bin, octal, hex => int */
-  guint		int_2_float : 1;		/* int => G_TOKEN_FLOAT? */
-  guint		identifier_2_string : 1;
-  guint		char_2_token : 1;		/* return G_TOKEN_CHAR? */
-  guint		symbol_2_token : 1;
-  guint		scope_0_fallback : 1;		/* try scope 0 on lookups? */
-  guint		store_int64 : 1; 		/* use value.v_int64 rather than v_int */
-
-  /*< private >*/
-  guint		padding_dummy;
-};
-
-struct	_GScanner
-{
-  /* unused fields */
-  gpointer		user_data;
-  guint			max_parse_errors;
-  
-  /* g_scanner_error() increments this field */
-  guint			parse_errors;
-  
-  /* name of input stream, featured by the default message handler */
-  const gchar		*input_name;
-  
-  /* quarked data */
-  GData			*qdata;
-  
-  /* link into the scanner configuration */
-  GScannerConfig	*config;
-  
-  /* fields filled in after g_scanner_get_next_token() */
-  GTokenType		token;
-  GTokenValue		value;
-  guint			line;
-  guint			position;
-  
-  /* fields filled in after g_scanner_peek_next_token() */
-  GTokenType		next_token;
-  GTokenValue		next_value;
-  guint			next_line;
-  guint			next_position;
-
-  /*< private >*/
-  /* to be considered private */
-  GHashTable		*symbol_table;
-  gint			input_fd;
-  const gchar		*text;
-  const gchar		*text_end;
-  gchar			*buffer;
-  guint			scope_id;
-
-  /*< public >*/
-  /* handler function for _warn and _error */
-  GScannerMsgFunc	msg_handler;
-};
-
-GScanner*	g_scanner_new			(const GScannerConfig *config_templ);
-void		g_scanner_destroy		(GScanner	*scanner);
-void		g_scanner_input_file		(GScanner	*scanner,
-						 gint		input_fd);
-void		g_scanner_sync_file_offset	(GScanner	*scanner);
-void		g_scanner_input_text		(GScanner	*scanner,
-						 const	gchar	*text,
-						 guint		text_len);
-GTokenType	g_scanner_get_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_peek_next_token	(GScanner	*scanner);
-GTokenType	g_scanner_cur_token		(GScanner	*scanner);
-GTokenValue	g_scanner_cur_value		(GScanner	*scanner);
-guint		g_scanner_cur_line		(GScanner	*scanner);
-guint		g_scanner_cur_position		(GScanner	*scanner);
-gboolean	g_scanner_eof			(GScanner	*scanner);
-guint		g_scanner_set_scope		(GScanner	*scanner,
-						 guint		 scope_id);
-void		g_scanner_scope_add_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol,
-						 gpointer	value);
-void		g_scanner_scope_remove_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-gpointer	g_scanner_scope_lookup_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 const gchar	*symbol);
-void		g_scanner_scope_foreach_symbol	(GScanner	*scanner,
-						 guint		 scope_id,
-						 GHFunc		 func,
-						 gpointer	 user_data);
-gpointer	g_scanner_lookup_symbol		(GScanner	*scanner,
-						 const gchar	*symbol);
-void		g_scanner_unexp_token		(GScanner	*scanner,
-						 GTokenType	expected_token,
-						 const gchar	*identifier_spec,
-						 const gchar	*symbol_spec,
-						 const gchar	*symbol_name,
-						 const gchar	*message,
-						 gint		 is_error);
-void		g_scanner_error			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-void		g_scanner_warn			(GScanner	*scanner,
-						 const gchar	*format,
-						 ...) G_GNUC_PRINTF (2,3);
-
-#ifndef G_DISABLE_DEPRECATED
-
-/* keep downward source compatibility */
-#define		g_scanner_add_symbol( scanner, symbol, value )	G_STMT_START { \
-  g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \
-} G_STMT_END
-#define		g_scanner_remove_symbol( scanner, symbol )	G_STMT_START { \
-  g_scanner_scope_remove_symbol ((scanner), 0, (symbol)); \
-} G_STMT_END
-#define		g_scanner_foreach_symbol( scanner, func, data )	G_STMT_START { \
-  g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
-} G_STMT_END
-
-/* The following two functions are deprecated and will be removed in
- * the next major release. They do no good. */
-#define g_scanner_freeze_symbol_table(scanner) ((void)0)
-#define g_scanner_thaw_symbol_table(scanner) ((void)0)
-
-#endif /* G_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __G_SCANNER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gsequence.h b/GstreamerHelper/x86/include/glib-2.0/glib/gsequence.h
deleted file mode 100644
index 3e5a03de..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gsequence.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
- * Soeren Sandmann (sandmann@daimi.au.dk)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SEQUENCE_H__
-#define __G_SEQUENCE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSequence      GSequence;
-typedef struct _GSequenceNode  GSequenceIter;
-
-typedef gint (* GSequenceIterCompareFunc) (GSequenceIter *a,
-                                           GSequenceIter *b,
-                                           gpointer       data);
-
-
-/* GSequence */
-GSequence *    g_sequence_new                (GDestroyNotify            data_destroy);
-void           g_sequence_free               (GSequence                *seq);
-gint           g_sequence_get_length         (GSequence                *seq);
-void           g_sequence_foreach            (GSequence                *seq,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_foreach_range      (GSequenceIter            *begin,
-                                              GSequenceIter            *end,
-                                              GFunc                     func,
-                                              gpointer                  user_data);
-void           g_sequence_sort               (GSequence                *seq,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_iter          (GSequence                *seq,
-                                              GSequenceIterCompareFunc  cmp_func,
-                                              gpointer                  cmp_data);
-
-
-/* Getting iters */
-GSequenceIter *g_sequence_get_begin_iter     (GSequence                *seq);
-GSequenceIter *g_sequence_get_end_iter       (GSequence                *seq);
-GSequenceIter *g_sequence_get_iter_at_pos    (GSequence                *seq,
-                                              gint                      pos);
-GSequenceIter *g_sequence_append             (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_prepend            (GSequence                *seq,
-                                              gpointer                  data);
-GSequenceIter *g_sequence_insert_before      (GSequenceIter            *iter,
-                                              gpointer                  data);
-void           g_sequence_move               (GSequenceIter            *src,
-                                              GSequenceIter            *dest);
-void           g_sequence_swap               (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_insert_sorted      (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_insert_sorted_iter (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed       (GSequenceIter            *iter,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-void           g_sequence_sort_changed_iter  (GSequenceIter            *iter,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-void           g_sequence_remove             (GSequenceIter            *iter);
-void           g_sequence_remove_range       (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-void           g_sequence_move_range         (GSequenceIter            *dest,
-                                              GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-GSequenceIter *g_sequence_search             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_search_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_lookup             (GSequence                *seq,
-                                              gpointer                  data,
-                                              GCompareDataFunc          cmp_func,
-                                              gpointer                  cmp_data);
-GSequenceIter *g_sequence_lookup_iter        (GSequence                *seq,
-                                              gpointer                  data,
-                                              GSequenceIterCompareFunc  iter_cmp,
-                                              gpointer                  cmp_data);
-
-
-/* Dereferencing */
-gpointer       g_sequence_get                (GSequenceIter            *iter);
-void           g_sequence_set                (GSequenceIter            *iter,
-                                              gpointer                  data);
-
-/* Operations on GSequenceIter * */
-gboolean       g_sequence_iter_is_begin      (GSequenceIter            *iter);
-gboolean       g_sequence_iter_is_end        (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_next          (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_prev          (GSequenceIter            *iter);
-gint           g_sequence_iter_get_position  (GSequenceIter            *iter);
-GSequenceIter *g_sequence_iter_move          (GSequenceIter            *iter,
-                                              gint                      delta);
-GSequence *    g_sequence_iter_get_sequence  (GSequenceIter            *iter);
-
-
-/* Search */
-gint           g_sequence_iter_compare       (GSequenceIter            *a,
-                                              GSequenceIter            *b);
-GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter            *begin,
-                                              GSequenceIter            *end);
-
-G_END_DECLS
-
-#endif /* __G_SEQUENCE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gshell.h b/GstreamerHelper/x86/include/glib-2.0/glib/gshell.h
deleted file mode 100644
index ddb4ec56..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gshell.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* gshell.h - Shell-related utilities
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not, write
- * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SHELL_H__
-#define __G_SHELL_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_SHELL_ERROR g_shell_error_quark ()
-
-typedef enum
-{
-  /* mismatched or otherwise mangled quoting */
-  G_SHELL_ERROR_BAD_QUOTING,
-  /* string to be parsed was empty */
-  G_SHELL_ERROR_EMPTY_STRING,
-  G_SHELL_ERROR_FAILED
-} GShellError;
-
-GQuark g_shell_error_quark (void);
-
-gchar*   g_shell_quote      (const gchar   *unquoted_string);
-gchar*   g_shell_unquote    (const gchar   *quoted_string,
-                             GError       **error);
-gboolean g_shell_parse_argv (const gchar   *command_line,
-                             gint          *argcp,
-                             gchar       ***argvp,
-                             GError       **error);
-
-G_END_DECLS
-
-#endif /* __G_SHELL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gslice.h b/GstreamerHelper/x86/include/glib-2.0/glib/gslice.h
deleted file mode 100644
index 3efd645d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gslice.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GLIB sliced memory - fast threaded memory chunk allocator
- * Copyright (C) 2005 Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SLICE_H__
-#define __G_SLICE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* slices - fast allocation/release of small memory blocks
- */
-gpointer g_slice_alloc          	(gsize	       block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_slice_alloc0         	(gsize         block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-gpointer g_slice_copy                   (gsize         block_size,
-                                         gconstpointer mem_block) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
-void     g_slice_free1          	(gsize         block_size,
-					 gpointer      mem_block);
-void     g_slice_free_chain_with_offset (gsize         block_size,
-					 gpointer      mem_chain,
-					 gsize         next_offset);
-#define  g_slice_new(type)      ((type*) g_slice_alloc (sizeof (type)))
-#define  g_slice_new0(type)     ((type*) g_slice_alloc0 (sizeof (type)))
-/* MemoryBlockType *
- *       g_slice_dup                    (MemoryBlockType,
- *	                                 MemoryBlockType *mem_block);
- *       g_slice_free                   (MemoryBlockType,
- *	                                 MemoryBlockType *mem_block);
- *       g_slice_free_chain             (MemoryBlockType,
- *                                       MemoryBlockType *first_chain_block,
- *                                       memory_block_next_field);
- * pseudo prototypes for the macro
- * definitions following below.
- */
-
-/* we go through extra hoops to ensure type safety */
-#define g_slice_dup(type, mem)                                  \
-  (1 ? (type*) g_slice_copy (sizeof (type), (mem))              \
-     : ((void) ((type*) 0 == (mem)), (type*) 0))
-#define g_slice_free(type, mem)				do {	\
-  if (1) g_slice_free1 (sizeof (type), (mem));			\
-  else   (void) ((type*) 0 == (mem)); 				\
-} while (0)
-#define g_slice_free_chain(type, mem_chain, next)	do {	\
-  if (1) g_slice_free_chain_with_offset (sizeof (type),		\
-                 (mem_chain), G_STRUCT_OFFSET (type, next)); 	\
-  else   (void) ((type*) 0 == (mem_chain));			\
-} while (0)
-
-
-/* --- internal debugging API --- */
-typedef enum {
-  G_SLICE_CONFIG_ALWAYS_MALLOC = 1,
-  G_SLICE_CONFIG_BYPASS_MAGAZINES,
-  G_SLICE_CONFIG_WORKING_SET_MSECS,
-  G_SLICE_CONFIG_COLOR_INCREMENT,
-  G_SLICE_CONFIG_CHUNK_SIZES,
-  G_SLICE_CONFIG_CONTENTION_COUNTER
-} GSliceConfig;
-
-GLIB_DEPRECATED_IN_2_34
-void     g_slice_set_config	   (GSliceConfig ckey, gint64 value);
-GLIB_DEPRECATED_IN_2_34
-gint64   g_slice_get_config	   (GSliceConfig ckey);
-GLIB_DEPRECATED_IN_2_34
-gint64*  g_slice_get_config_state  (GSliceConfig ckey, gint64 address, guint *n_values);
-
-G_END_DECLS
-
-#endif /* __G_SLICE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gslist.h b/GstreamerHelper/x86/include/glib-2.0/glib/gslist.h
deleted file mode 100644
index c61fd2ff..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gslist.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SLIST_H__
-#define __G_SLIST_H__
-
-#include <glib/gmem.h>
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GSList GSList;
-
-struct _GSList
-{
-  gpointer data;
-  GSList *next;
-};
-
-/* Singly linked lists
- */
-GSList*  g_slist_alloc                   (void) G_GNUC_WARN_UNUSED_RESULT;
-void     g_slist_free                    (GSList           *list);
-void     g_slist_free_1                  (GSList           *list);
-#define	 g_slist_free1		         g_slist_free_1
-void     g_slist_free_full               (GSList           *list,
-					  GDestroyNotify    free_func);
-GSList*  g_slist_append                  (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_prepend                 (GSList           *list,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert                  (GSList           *list,
-					  gpointer          data,
-					  gint              position) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted           (GSList           *list,
-					  gpointer          data,
-					  GCompareFunc      func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_sorted_with_data (GSList           *list,
-					  gpointer          data,
-					  GCompareDataFunc  func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_insert_before           (GSList           *slist,
-					  GSList           *sibling,
-					  gpointer          data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_concat                  (GSList           *list1,
-					  GSList           *list2) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove                  (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_all              (GSList           *list,
-					  gconstpointer     data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_remove_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_delete_link             (GSList           *list,
-					  GSList           *link_) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_reverse                 (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_copy                    (GSList           *list) G_GNUC_WARN_UNUSED_RESULT;
-
-GLIB_AVAILABLE_IN_2_34
-GSList*  g_slist_copy_deep               (GSList            *list,
-					  GCopyFunc         func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_nth                     (GSList           *list,
-					  guint             n);
-GSList*  g_slist_find                    (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_find_custom             (GSList           *list,
-					  gconstpointer     data,
-					  GCompareFunc      func);
-gint     g_slist_position                (GSList           *list,
-					  GSList           *llink);
-gint     g_slist_index                   (GSList           *list,
-					  gconstpointer     data);
-GSList*  g_slist_last                    (GSList           *list);
-guint    g_slist_length                  (GSList           *list);
-void     g_slist_foreach                 (GSList           *list,
-					  GFunc             func,
-					  gpointer          user_data);
-GSList*  g_slist_sort                    (GSList           *list,
-					  GCompareFunc      compare_func) G_GNUC_WARN_UNUSED_RESULT;
-GSList*  g_slist_sort_with_data          (GSList           *list,
-					  GCompareDataFunc  compare_func,
-					  gpointer          user_data) G_GNUC_WARN_UNUSED_RESULT;
-gpointer g_slist_nth_data                (GSList           *list,
-					  guint             n);
-
-#define  g_slist_next(slist)	         ((slist) ? (((GSList *)(slist))->next) : NULL)
-
-G_END_DECLS
-
-#endif /* __G_SLIST_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gspawn.h b/GstreamerHelper/x86/include/glib-2.0/glib/gspawn.h
deleted file mode 100644
index 1120d81d..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gspawn.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* gspawn.h - Process launching
- *
- *  Copyright 2000 Red Hat, Inc.
- *
- * GLib is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not, write
- * to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_SPAWN_H__
-#define __G_SPAWN_H__
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-
-/* I'm not sure I remember our proposed naming convention here. */
-/**
- * G_SPAWN_ERROR:
- *
- * Error domain for spawning processes. Errors in this domain will
- * be from the #GSpawnError enumeration. See #GError for information on
- * error domains.
- */
-#define G_SPAWN_ERROR g_spawn_error_quark ()
-
-/**
- * GSpawnError:
- * @G_SPAWN_ERROR_FORK: Fork failed due to lack of memory.
- * @G_SPAWN_ERROR_READ: Read or select on pipes failed.
- * @G_SPAWN_ERROR_CHDIR: Changing to working directory failed.
- * @G_SPAWN_ERROR_ACCES: execv() returned <literal>EACCES</literal>
- * @G_SPAWN_ERROR_PERM: execv() returned <literal>EPERM</literal>
- * @G_SPAWN_ERROR_TOO_BIG: execv() returned <literal>E2BIG</literal>
- * @G_SPAWN_ERROR_2BIG: deprecated alias for %G_SPAWN_ERROR_TOO_BIG
- * @G_SPAWN_ERROR_NOEXEC: execv() returned <literal>ENOEXEC</literal>
- * @G_SPAWN_ERROR_NAMETOOLONG: execv() returned <literal>ENAMETOOLONG</literal>
- * @G_SPAWN_ERROR_NOENT: execv() returned <literal>ENOENT</literal>
- * @G_SPAWN_ERROR_NOMEM: execv() returned <literal>ENOMEM</literal>
- * @G_SPAWN_ERROR_NOTDIR: execv() returned <literal>ENOTDIR</literal>
- * @G_SPAWN_ERROR_LOOP: execv() returned <literal>ELOOP</literal>
- * @G_SPAWN_ERROR_TXTBUSY: execv() returned <literal>ETXTBUSY</literal>
- * @G_SPAWN_ERROR_IO: execv() returned <literal>EIO</literal>
- * @G_SPAWN_ERROR_NFILE: execv() returned <literal>ENFILE</literal>
- * @G_SPAWN_ERROR_MFILE: execv() returned <literal>EMFILE</literal>
- * @G_SPAWN_ERROR_INVAL: execv() returned <literal>EINVAL</literal>
- * @G_SPAWN_ERROR_ISDIR: execv() returned <literal>EISDIR</literal>
- * @G_SPAWN_ERROR_LIBBAD: execv() returned <literal>ELIBBAD</literal>
- * @G_SPAWN_ERROR_FAILED: Some other fatal failure,
- *   <literal>error-&gt;message</literal> should explain.
- *
- * Error codes returned by spawning processes.
- */
-typedef enum
-{
-  G_SPAWN_ERROR_FORK,   /* fork failed due to lack of memory */
-  G_SPAWN_ERROR_READ,   /* read or select on pipes failed */
-  G_SPAWN_ERROR_CHDIR,  /* changing to working dir failed */
-  G_SPAWN_ERROR_ACCES,  /* execv() returned EACCES */
-  G_SPAWN_ERROR_PERM,   /* execv() returned EPERM */
-  G_SPAWN_ERROR_TOO_BIG,/* execv() returned E2BIG */
-#ifndef G_DISABLE_DEPRECATED
-  G_SPAWN_ERROR_2BIG = G_SPAWN_ERROR_TOO_BIG,
-#endif
-  G_SPAWN_ERROR_NOEXEC, /* execv() returned ENOEXEC */
-  G_SPAWN_ERROR_NAMETOOLONG, /* ""  "" ENAMETOOLONG */
-  G_SPAWN_ERROR_NOENT,       /* ""  "" ENOENT */
-  G_SPAWN_ERROR_NOMEM,       /* ""  "" ENOMEM */
-  G_SPAWN_ERROR_NOTDIR,      /* ""  "" ENOTDIR */
-  G_SPAWN_ERROR_LOOP,        /* ""  "" ELOOP   */
-  G_SPAWN_ERROR_TXTBUSY,     /* ""  "" ETXTBUSY */
-  G_SPAWN_ERROR_IO,          /* ""  "" EIO */
-  G_SPAWN_ERROR_NFILE,       /* ""  "" ENFILE */
-  G_SPAWN_ERROR_MFILE,       /* ""  "" EMFLE */
-  G_SPAWN_ERROR_INVAL,       /* ""  "" EINVAL */
-  G_SPAWN_ERROR_ISDIR,       /* ""  "" EISDIR */
-  G_SPAWN_ERROR_LIBBAD,      /* ""  "" ELIBBAD */
-  G_SPAWN_ERROR_FAILED       /* other fatal failure, error->message
-                              * should explain
-                              */
-} GSpawnError;
-
-/**
- * G_SPAWN_EXIT_ERROR:
- *
- * Error domain used by g_spawn_check_exit_status().  The code
- * will be the program exit code.
- */
-#define G_SPAWN_EXIT_ERROR g_spawn_exit_error_quark ()
-
-/**
- * GSpawnChildSetupFunc:
- * @user_data: user data to pass to the function.
- *
- * Specifies the type of the setup function passed to g_spawn_async(),
- * g_spawn_sync() and g_spawn_async_with_pipes(), which can, in very
- * limited ways, be used to affect the child's execution.
- *
- * On POSIX platforms, the function is called in the child after GLib
- * has performed all the setup it plans to perform, but before calling
- * exec(). Actions taken in this function will only affect the child,
- * not the parent.
- *
- * On Windows, the function is called in the parent. Its usefulness on
- * Windows is thus questionable. In many cases executing the child setup
- * function in the parent can have ill effects, and you should be very
- * careful when porting software to Windows that uses child setup
- * functions.
- *
- * However, even on POSIX, you are extremely limited in what you can
- * safely do from a #GSpawnChildSetupFunc, because any mutexes that
- * were held by other threads in the parent process at the time of the
- * fork() will still be locked in the child process, and they will
- * never be unlocked (since the threads that held them don't exist in
- * the child). POSIX allows only async-signal-safe functions (see
- * <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>)
- * to be called in the child between fork() and exec(), which
- * drastically limits the usefulness of child setup functions.
- *
- * In particular, it is not safe to call any function which may
- * call malloc(), which includes POSIX functions such as setenv().
- * If you need to set up the child environment differently from
- * the parent, you should use g_get_environ(), g_environ_setenv(),
- * and g_environ_unsetenv(), and then pass the complete environment
- * list to the <literal>g_spawn...</literal> function.
- */
-typedef void (* GSpawnChildSetupFunc) (gpointer user_data);
-
-/**
- * GSpawnFlags:
- * @G_SPAWN_LEAVE_DESCRIPTORS_OPEN: the parent's open file descriptors will be
- *   inherited by the child; otherwise all descriptors except stdin/stdout/stderr
- *   will be closed before calling exec() in the child.
- * @G_SPAWN_DO_NOT_REAP_CHILD: the child will not be automatically reaped; you
- *   must use g_child_watch_add() yourself (or call waitpid()
- *   or handle <literal>SIGCHLD</literal> yourself), or the child will become a zombie.
- * @G_SPAWN_SEARCH_PATH: <literal>argv[0]</literal> need not be an absolute path,
- *   it will be looked for in the user's <envar>PATH</envar>.
- * @G_SPAWN_STDOUT_TO_DEV_NULL: the child's standard output will be discarded,
- *   instead of going to the same location as the parent's standard output.
- * @G_SPAWN_STDERR_TO_DEV_NULL: the child's standard error will be discarded.
- * @G_SPAWN_CHILD_INHERITS_STDIN: the child will inherit the parent's standard
- *   input (by default, the child's standard input is attached to
- *   <filename>/dev/null</filename>).
- * @G_SPAWN_FILE_AND_ARGV_ZERO: the first element of <literal>argv</literal> is
- *   the file to execute, while the remaining elements are the actual argument
- *   vector to pass to the file. Normally g_spawn_async_with_pipes() uses
- *   <literal>argv[0]</literal> as the file to execute, and passes all of
- *   <literal>argv</literal> to the child.
- * @G_SPAWN_SEARCH_PATH_FROM_ENVP: if <literal>argv[0]</literal> is not an abolute path,
- *   it will be looked for in the <envar>PATH</envar> from the passed child 
- *   environment. Since: 2.34
- *
- * Flags passed to g_spawn_sync(), g_spawn_async() and g_spawn_async_with_pipes().
- */
-typedef enum
-{
-  G_SPAWN_LEAVE_DESCRIPTORS_OPEN = 1 << 0,
-  G_SPAWN_DO_NOT_REAP_CHILD      = 1 << 1,
-  /* look for argv[0] in the path i.e. use execvp() */
-  G_SPAWN_SEARCH_PATH            = 1 << 2,
-  /* Dump output to /dev/null */
-  G_SPAWN_STDOUT_TO_DEV_NULL     = 1 << 3,
-  G_SPAWN_STDERR_TO_DEV_NULL     = 1 << 4,
-  G_SPAWN_CHILD_INHERITS_STDIN   = 1 << 5,
-  G_SPAWN_FILE_AND_ARGV_ZERO     = 1 << 6,
-  G_SPAWN_SEARCH_PATH_FROM_ENVP  = 1 << 7
-} GSpawnFlags;
-
-GQuark g_spawn_error_quark (void);
-GQuark g_spawn_exit_error_quark (void);
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_spawn_async g_spawn_async_utf8
-#define g_spawn_async_with_pipes g_spawn_async_with_pipes_utf8
-#define g_spawn_sync g_spawn_sync_utf8
-#define g_spawn_command_line_sync g_spawn_command_line_sync_utf8
-#define g_spawn_command_line_async g_spawn_command_line_async_utf8
-#endif
-#endif
-
-gboolean g_spawn_async (const gchar           *working_directory,
-                        gchar                **argv,
-                        gchar                **envp,
-                        GSpawnFlags            flags,
-                        GSpawnChildSetupFunc   child_setup,
-                        gpointer               user_data,
-                        GPid                  *child_pid,
-                        GError               **error);
-
-
-/* Opens pipes for non-NULL standard_output, standard_input, standard_error,
- * and returns the parent's end of the pipes.
- */
-gboolean g_spawn_async_with_pipes (const gchar          *working_directory,
-                                   gchar               **argv,
-                                   gchar               **envp,
-                                   GSpawnFlags           flags,
-                                   GSpawnChildSetupFunc  child_setup,
-                                   gpointer              user_data,
-                                   GPid                 *child_pid,
-                                   gint                 *standard_input,
-                                   gint                 *standard_output,
-                                   gint                 *standard_error,
-                                   GError              **error);
-
-
-/* If standard_output or standard_error are non-NULL, the full
- * standard output or error of the command will be placed there.
- */
-
-gboolean g_spawn_sync         (const gchar          *working_directory,
-                               gchar               **argv,
-                               gchar               **envp,
-                               GSpawnFlags           flags,
-                               GSpawnChildSetupFunc  child_setup,
-                               gpointer              user_data,
-                               gchar               **standard_output,
-                               gchar               **standard_error,
-                               gint                 *exit_status,
-                               GError              **error);
-
-gboolean g_spawn_command_line_sync  (const gchar          *command_line,
-                                     gchar               **standard_output,
-                                     gchar               **standard_error,
-                                     gint                 *exit_status,
-                                     GError              **error);
-gboolean g_spawn_command_line_async (const gchar          *command_line,
-                                     GError              **error);
-
-GLIB_AVAILABLE_IN_2_34
-gboolean g_spawn_check_exit_status (gint      exit_status,
-				    GError  **error);
-
-void g_spawn_close_pid (GPid pid);
-
-G_END_DECLS
-
-#endif /* __G_SPAWN_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gstdio.h b/GstreamerHelper/x86/include/glib-2.0/glib/gstdio.h
deleted file mode 100644
index 08aea7d3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gstdio.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* gstdio.h - GFilename wrappers for C library functions
- *
- * Copyright 2004 Tor Lillqvist
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_STDIO_H__
-#define __G_STDIO_H__
-
-#include <glib/gprintf.h>
-
-#include <sys/stat.h>
-
-G_BEGIN_DECLS
-
-#if defined (_MSC_VER) && !defined(_WIN64)
-
-/* Make it clear that we mean the struct with 32-bit st_size and
- * 32-bit st_*time fields as that is how the 32-bit GLib DLL normally
- * has been compiled. If you get a compiler warning when calling
- * g_stat(), do take it seriously and make sure that the type of
- * struct stat the code in GLib fills in matches the struct the type
- * of struct stat you pass to g_stat(). To avoid hassle, to get file
- * attributes just use the GIO API instead which doesn't use struct
- * stat.
- *
- * Sure, it would be nicer to use a struct with 64-bit st_size and
- * 64-bit st_*time fields, but changing that now would break ABI. And
- * in MinGW, a plain "struct stat" is the one with 32-bit st_size and
- * st_*time fields.
- */
-
-typedef struct _stat32 GStatBuf;
-
-#else
-
-typedef struct stat GStatBuf;
-
-#endif
-
-#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX)
-
-/* Just pass on to the system functions, so there's no potential for data
- * format mismatches, especially with large file interfaces. 
- * A few functions can't be handled in this way, since they are not defined
- * in a portable system header that we could include here.
- */
-
-#ifndef __GTK_DOC_IGNORE__
-#define g_chmod   chmod
-#define g_open    open
-#define g_creat   creat
-#define g_rename  rename
-#define g_mkdir   mkdir
-#define g_stat    stat
-#define g_lstat   lstat
-#define g_remove  remove
-#define g_fopen   fopen
-#define g_freopen freopen
-#define g_utime   utime
-#endif
-
-int g_access (const gchar *filename,
-	      int          mode);
-
-int g_chdir  (const gchar *path);
-
-int g_unlink (const gchar *filename);
-
-int g_rmdir  (const gchar *filename);
-
-#else /* ! G_OS_UNIX */
-
-/* Wrappers for C library functions that take pathname arguments. On
- * Unix, the pathname is a file name as it literally is in the file
- * system. On well-maintained systems with consistent users who know
- * what they are doing and no exchange of files with others this would
- * be a well-defined encoding, preferably UTF-8. On Windows, the
- * pathname is always in UTF-8, even if that is not the on-disk
- * encoding, and not the encoding accepted by the C library or Win32
- * API.
- */
-
-int g_access    (const gchar *filename,
-		 int          mode);
-
-int g_chmod     (const gchar *filename,
-		 int          mode);
-
-int g_open      (const gchar *filename,
-                 int          flags,
-                 int          mode);
-
-int g_creat     (const gchar *filename,
-                 int          mode);
-
-int g_rename    (const gchar *oldfilename,
-                 const gchar *newfilename);
-
-int g_mkdir     (const gchar *filename,
-                 int          mode);
-
-int g_chdir     (const gchar *path);
-
-int g_stat      (const gchar *filename,
-                 GStatBuf    *buf);
-
-int g_lstat     (const gchar *filename,
-                 GStatBuf    *buf);
-
-int g_unlink    (const gchar *filename);
-
-int g_remove    (const gchar *filename);
-
-int g_rmdir     (const gchar *filename);
-
-FILE *g_fopen   (const gchar *filename,
-                 const gchar *mode);
-
-FILE *g_freopen (const gchar *filename,
-                 const gchar *mode,
-                 FILE        *stream);
-
-struct utimbuf;			/* Don't need the real definition of struct utimbuf when just
-				 * including this header.
-				 */
-
-int g_utime     (const gchar    *filename,
-		 struct utimbuf *utb);
-
-#endif /* G_OS_UNIX */
-
-G_END_DECLS
-
-#endif /* __G_STDIO_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gstrfuncs.h b/GstreamerHelper/x86/include/glib-2.0/glib/gstrfuncs.h
deleted file mode 100644
index 68c89fdb..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gstrfuncs.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_STRFUNCS_H__
-#define __G_STRFUNCS_H__
-
-#include <stdarg.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Functions like the ones in <ctype.h> that are not affected by locale. */
-typedef enum {
-  G_ASCII_ALNUM  = 1 << 0,
-  G_ASCII_ALPHA  = 1 << 1,
-  G_ASCII_CNTRL  = 1 << 2,
-  G_ASCII_DIGIT  = 1 << 3,
-  G_ASCII_GRAPH  = 1 << 4,
-  G_ASCII_LOWER  = 1 << 5,
-  G_ASCII_PRINT  = 1 << 6,
-  G_ASCII_PUNCT  = 1 << 7,
-  G_ASCII_SPACE  = 1 << 8,
-  G_ASCII_UPPER  = 1 << 9,
-  G_ASCII_XDIGIT = 1 << 10
-} GAsciiType;
-
-GLIB_VAR const guint16 * const g_ascii_table;
-
-#define g_ascii_isalnum(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_ALNUM) != 0)
-
-#define g_ascii_isalpha(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_ALPHA) != 0)
-
-#define g_ascii_iscntrl(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_CNTRL) != 0)
-
-#define g_ascii_isdigit(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_DIGIT) != 0)
-
-#define g_ascii_isgraph(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_GRAPH) != 0)
-
-#define g_ascii_islower(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_LOWER) != 0)
-
-#define g_ascii_isprint(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_PRINT) != 0)
-
-#define g_ascii_ispunct(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_PUNCT) != 0)
-
-#define g_ascii_isspace(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_SPACE) != 0)
-
-#define g_ascii_isupper(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_UPPER) != 0)
-
-#define g_ascii_isxdigit(c) \
-  ((g_ascii_table[(guchar) (c)] & G_ASCII_XDIGIT) != 0)
-
-gchar                 g_ascii_tolower  (gchar        c) G_GNUC_CONST;
-gchar                 g_ascii_toupper  (gchar        c) G_GNUC_CONST;
-
-gint                  g_ascii_digit_value  (gchar    c) G_GNUC_CONST;
-gint                  g_ascii_xdigit_value (gchar    c) G_GNUC_CONST;
-
-/* String utility functions that modify a string argument or
- * return a constant string that must not be freed.
- */
-#define	 G_STR_DELIMITERS	"_-|> <."
-gchar*	              g_strdelimit     (gchar	     *string,
-					const gchar  *delimiters,
-					gchar	      new_delimiter);
-gchar*	              g_strcanon       (gchar        *string,
-					const gchar  *valid_chars,
-					gchar         substitutor);
-const gchar *         g_strerror       (gint	      errnum) G_GNUC_CONST;
-const gchar *         g_strsignal      (gint	      signum) G_GNUC_CONST;
-gchar *	              g_strreverse     (gchar	     *string);
-gsize	              g_strlcpy	       (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gsize	              g_strlcat        (gchar	     *dest,
-					const gchar  *src,
-					gsize         dest_size);
-gchar *               g_strstr_len     (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-gchar *               g_strrstr        (const gchar  *haystack,
-					const gchar  *needle);
-gchar *               g_strrstr_len    (const gchar  *haystack,
-					gssize        haystack_len,
-					const gchar  *needle);
-
-gboolean              g_str_has_suffix (const gchar  *str,
-					const gchar  *suffix);
-gboolean              g_str_has_prefix (const gchar  *str,
-					const gchar  *prefix);
-
-/* String to/from double conversion functions */
-
-gdouble	              g_strtod         (const gchar  *nptr,
-					gchar	    **endptr);
-gdouble	              g_ascii_strtod   (const gchar  *nptr,
-					gchar	    **endptr);
-guint64		      g_ascii_strtoull (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-gint64		      g_ascii_strtoll  (const gchar *nptr,
-					gchar      **endptr,
-					guint        base);
-/* 29 bytes should enough for all possible values that
- * g_ascii_dtostr can produce.
- * Then add 10 for good measure */
-#define G_ASCII_DTOSTR_BUF_SIZE (29 + 10)
-gchar *               g_ascii_dtostr   (gchar        *buffer,
-					gint          buf_len,
-					gdouble       d);
-gchar *               g_ascii_formatd  (gchar        *buffer,
-					gint          buf_len,
-					const gchar  *format,
-					gdouble       d);
-
-/* removes leading spaces */
-gchar*                g_strchug        (gchar        *string);
-/* removes trailing spaces */
-gchar*                g_strchomp       (gchar        *string);
-/* removes leading & trailing spaces */
-#define g_strstrip( string )	g_strchomp (g_strchug (string))
-
-gint                  g_ascii_strcasecmp  (const gchar *s1,
-					   const gchar *s2);
-gint                  g_ascii_strncasecmp (const gchar *s1,
-					   const gchar *s2,
-					   gsize        n);
-gchar*                g_ascii_strdown     (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-gchar*                g_ascii_strup       (const gchar *str,
-					   gssize       len) G_GNUC_MALLOC;
-
-
-GLIB_DEPRECATED
-gint                  g_strcasecmp     (const gchar *s1,
-                                        const gchar *s2);
-GLIB_DEPRECATED
-gint                  g_strncasecmp    (const gchar *s1,
-                                        const gchar *s2,
-                                        guint        n);
-GLIB_DEPRECATED
-gchar*                g_strdown        (gchar       *string);
-GLIB_DEPRECATED
-gchar*                g_strup          (gchar       *string);
-
-
-/* String utility functions that return a newly allocated string which
- * ought to be freed with g_free from the caller at some point.
- */
-gchar*	              g_strdup	       (const gchar *str) G_GNUC_MALLOC;
-gchar*	              g_strdup_printf  (const gchar *format,
-					...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC;
-gchar*	              g_strdup_vprintf (const gchar *format,
-					va_list      args) G_GNUC_MALLOC;
-gchar*	              g_strndup	       (const gchar *str,
-					gsize        n) G_GNUC_MALLOC;  
-gchar*	              g_strnfill       (gsize        length,  
-					gchar        fill_char) G_GNUC_MALLOC;
-gchar*	              g_strconcat      (const gchar *string1,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-gchar*                g_strjoin	       (const gchar  *separator,
-					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
-
-/* Make a copy of a string interpreting C string -style escape
- * sequences. Inverse of g_strescape. The recognized sequences are \b
- * \f \n \r \t \\ \" and the octal format.
- */
-gchar*                g_strcompress    (const gchar *source) G_GNUC_MALLOC;
-
-/* Copy a string escaping nonprintable characters like in C strings.
- * Inverse of g_strcompress. The exceptions parameter, if non-NULL, points
- * to a string containing characters that are not to be escaped.
- *
- * Deprecated API: gchar* g_strescape (const gchar *source);
- * Luckily this function wasn't used much, using NULL as second parameter
- * provides mostly identical semantics.
- */
-gchar*                g_strescape      (const gchar *source,
-					const gchar *exceptions) G_GNUC_MALLOC;
-
-gpointer              g_memdup	       (gconstpointer mem,
-					guint	       byte_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(2);
-
-/* NULL terminated string arrays.
- * g_strsplit(), g_strsplit_set() split up string into max_tokens tokens
- * at delim and return a newly allocated string array.
- * g_strjoinv() concatenates all of str_array's strings, sliding in an
- * optional separator, the returned string is newly allocated.
- * g_strfreev() frees the array itself and all of its strings.
- * g_strdupv() copies a NULL-terminated array of strings
- * g_strv_length() returns the length of a NULL-terminated array of strings
- */
-gchar**	              g_strsplit       (const gchar  *string,
-					const gchar  *delimiter,
-					gint          max_tokens) G_GNUC_MALLOC;
-gchar **	      g_strsplit_set   (const gchar *string,
-					const gchar *delimiters,
-					gint         max_tokens) G_GNUC_MALLOC;
-gchar*                g_strjoinv       (const gchar  *separator,
-					gchar       **str_array) G_GNUC_MALLOC;
-void                  g_strfreev       (gchar       **str_array);
-gchar**               g_strdupv        (gchar       **str_array) G_GNUC_MALLOC;
-guint                 g_strv_length    (gchar       **str_array);
-
-gchar*                g_stpcpy         (gchar        *dest,
-                                        const char   *src);
-
-G_END_DECLS
-
-#endif /* __G_STRFUNCS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gstring.h b/GstreamerHelper/x86/include/glib-2.0/glib/gstring.h
deleted file mode 100644
index 75434908..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gstring.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_STRING_H__
-#define __G_STRING_H__
-
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
-#include <glib/gbytes.h>
-#include <glib/gutils.h>  /* for G_CAN_INLINE */
-
-G_BEGIN_DECLS
-
-typedef struct _GString         GString;
-
-struct _GString
-{
-  gchar  *str;
-  gsize len;
-  gsize allocated_len;
-};
-
-GString*     g_string_new               (const gchar     *init);
-GString*     g_string_new_len           (const gchar     *init,
-                                         gssize           len);
-GString*     g_string_sized_new         (gsize            dfl_size);
-gchar*       g_string_free              (GString         *string,
-                                         gboolean         free_segment);
-GLIB_AVAILABLE_IN_2_34
-GBytes*      g_string_free_to_bytes     (GString         *string);
-gboolean     g_string_equal             (const GString   *v,
-                                         const GString   *v2);
-guint        g_string_hash              (const GString   *str);
-GString*     g_string_assign            (GString         *string,
-                                         const gchar     *rval);
-GString*     g_string_truncate          (GString         *string,
-                                         gsize            len);
-GString*     g_string_set_size          (GString         *string,
-                                         gsize            len);
-GString*     g_string_insert_len        (GString         *string,
-                                         gssize           pos,
-                                         const gchar     *val,
-                                         gssize           len);
-GString*     g_string_append            (GString         *string,
-                                         const gchar     *val);
-GString*     g_string_append_len        (GString         *string,
-                                         const gchar     *val,
-                                         gssize           len);
-GString*     g_string_append_c          (GString         *string,
-                                         gchar            c);
-GString*     g_string_append_unichar    (GString         *string,
-                                         gunichar         wc);
-GString*     g_string_prepend           (GString         *string,
-                                         const gchar     *val);
-GString*     g_string_prepend_c         (GString         *string,
-                                         gchar            c);
-GString*     g_string_prepend_unichar   (GString         *string,
-                                         gunichar         wc);
-GString*     g_string_prepend_len       (GString         *string,
-                                         const gchar     *val,
-                                         gssize           len);
-GString*     g_string_insert            (GString         *string,
-                                         gssize           pos,
-                                         const gchar     *val);
-GString*     g_string_insert_c          (GString         *string,
-                                         gssize           pos,
-                                         gchar            c);
-GString*     g_string_insert_unichar    (GString         *string,
-                                         gssize           pos,
-                                         gunichar         wc);
-GString*     g_string_overwrite         (GString         *string,
-                                         gsize            pos,
-                                         const gchar     *val);
-GString*     g_string_overwrite_len     (GString         *string,
-                                         gsize            pos,
-                                         const gchar     *val,
-                                         gssize           len);
-GString*     g_string_erase             (GString         *string,
-                                         gssize           pos,
-                                         gssize           len);
-GString*     g_string_ascii_down        (GString         *string);
-GString*     g_string_ascii_up          (GString         *string);
-void         g_string_vprintf           (GString         *string,
-                                         const gchar     *format,
-                                         va_list          args);
-void         g_string_printf            (GString         *string,
-                                         const gchar     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-void         g_string_append_vprintf    (GString         *string,
-                                         const gchar     *format,
-                                         va_list          args);
-void         g_string_append_printf     (GString         *string,
-                                         const gchar     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-GString*     g_string_append_uri_escaped (GString         *string,
-                                          const gchar     *unescaped,
-                                          const gchar     *reserved_chars_allowed,
-                                          gboolean         allow_utf8);
-
-/* -- optimize g_strig_append_c --- */
-#ifdef G_CAN_INLINE
-static inline GString*
-g_string_append_c_inline (GString *gstring,
-                          gchar    c)
-{
-  if (gstring->len + 1 < gstring->allocated_len)
-    {
-      gstring->str[gstring->len++] = c;
-      gstring->str[gstring->len] = 0;
-    }
-  else
-    g_string_insert_c (gstring, -1, c);
-  return gstring;
-}
-#define g_string_append_c(gstr,c)       g_string_append_c_inline (gstr, c)
-#endif /* G_CAN_INLINE */
-
-
-GLIB_DEPRECATED
-GString *g_string_down (GString *string);
-GLIB_DEPRECATED
-GString *g_string_up   (GString *string);
-
-#ifndef G_DISABLE_DEPRECATED
-#define  g_string_sprintf  g_string_printf
-#define  g_string_sprintfa g_string_append_printf
-#endif
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gstringchunk.h b/GstreamerHelper/x86/include/glib-2.0/glib/gstringchunk.h
deleted file mode 100644
index 5ab2e8ad..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gstringchunk.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_STRINGCHUNK_H__
-#define __G_STRINGCHUNK_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GStringChunk GStringChunk;
-
-GStringChunk* g_string_chunk_new          (gsize size);
-void          g_string_chunk_free         (GStringChunk *chunk);
-void          g_string_chunk_clear        (GStringChunk *chunk);
-gchar*        g_string_chunk_insert       (GStringChunk *chunk,
-                                           const gchar  *string);
-gchar*        g_string_chunk_insert_len   (GStringChunk *chunk,
-                                           const gchar  *string,
-                                           gssize        len);
-gchar*        g_string_chunk_insert_const (GStringChunk *chunk,
-                                           const gchar  *string);
-
-G_END_DECLS
-
-#endif /* __G_STRING_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gtestutils.h b/GstreamerHelper/x86/include/glib-2.0/glib/gtestutils.h
deleted file mode 100644
index 967fa63b..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gtestutils.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/* GLib testing utilities
- * Copyright (C) 2007 Imendio AB
- * Authors: Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TEST_UTILS_H__
-#define __G_TEST_UTILS_H__
-
-#include <glib/gmessages.h>
-#include <glib/gstring.h>
-#include <glib/gerror.h>
-#include <glib/gslist.h>
-
-G_BEGIN_DECLS
-
-typedef struct GTestCase  GTestCase;
-typedef struct GTestSuite GTestSuite;
-typedef void (*GTestFunc)        (void);
-typedef void (*GTestDataFunc)    (gconstpointer user_data);
-typedef void (*GTestFixtureFunc) (gpointer      fixture,
-                                  gconstpointer user_data);
-
-/* assertion API */
-#define g_assert_cmpstr(s1, cmp, s2)    do { const char *__s1 = (s1), *__s2 = (s2); \
-                                             if (g_strcmp0 (__s1, __s2) cmp 0) ; else \
-                                               g_assertion_message_cmpstr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #s1 " " #cmp " " #s2, __s1, #cmp, __s2); } while (0)
-#define g_assert_cmpint(n1, cmp, n2)    do { gint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'i'); } while (0)
-#define g_assert_cmpuint(n1, cmp, n2)   do { guint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'i'); } while (0)
-#define g_assert_cmphex(n1, cmp, n2)    do { guint64 __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'x'); } while (0)
-#define g_assert_cmpfloat(n1,cmp,n2)    do { long double __n1 = (n1), __n2 = (n2); \
-                                             if (__n1 cmp __n2) ; else \
-                                               g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'f'); } while (0)
-#define g_assert_no_error(err)          do { if (err) \
-                                               g_assertion_message_error (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #err, err, 0, 0); } while (0)
-#define g_assert_error(err, dom, c)	do { if (!err || (err)->domain != dom || (err)->code != c) \
-                                               g_assertion_message_error (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #err, err, dom, c); } while (0)
-#ifdef G_DISABLE_ASSERT
-#define g_assert_not_reached()          do { (void) 0; } while (0)
-#define g_assert(expr)                  do { (void) 0; } while (0)
-#else /* !G_DISABLE_ASSERT */
-#define g_assert_not_reached()          do { g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, NULL); } while (0)
-#define g_assert(expr)                  do { if G_LIKELY (expr) ; else \
-                                               g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                                                 #expr); } while (0)
-#endif /* !G_DISABLE_ASSERT */
-
-int     g_strcmp0                       (const char     *str1,
-                                         const char     *str2);
-
-/* report performance results */
-void    g_test_minimized_result         (double          minimized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-void    g_test_maximized_result         (double          maximized_quantity,
-                                         const char     *format,
-                                         ...) G_GNUC_PRINTF (2, 3);
-
-/* initialize testing framework */
-void    g_test_init                     (int            *argc,
-                                         char         ***argv,
-                                         ...);
-/* query testing framework config */
-#define g_test_quick()                  (g_test_config_vars->test_quick)
-#define g_test_slow()                   (!g_test_config_vars->test_quick)
-#define g_test_thorough()               (!g_test_config_vars->test_quick)
-#define g_test_perf()                   (g_test_config_vars->test_perf)
-#define g_test_verbose()                (g_test_config_vars->test_verbose)
-#define g_test_quiet()                  (g_test_config_vars->test_quiet)
-#define g_test_undefined()              (g_test_config_vars->test_undefined)
-/* run all tests under toplevel suite (path: /) */
-int     g_test_run                      (void);
-/* hook up a test functions under test path */
-void    g_test_add_func                 (const char     *testpath,
-                                         GTestFunc       test_func);
-
-void    g_test_add_data_func            (const char     *testpath,
-                                         gconstpointer   test_data,
-                                         GTestDataFunc   test_func);
-
-GLIB_AVAILABLE_IN_2_34
-void    g_test_add_data_func_full       (const char     *testpath,
-                                         gpointer        test_data,
-                                         GTestDataFunc   test_func,
-                                         GDestroyNotify  data_free_func);
-
-/* tell about failure */
-void    g_test_fail                     (void);
-
-/* hook up a test with fixture under test path */
-#define g_test_add(testpath, Fixture, tdata, fsetup, ftest, fteardown) \
-					G_STMT_START {			\
-                                         void (*add_vtable) (const char*,       \
-                                                    gsize,             \
-                                                    gconstpointer,     \
-                                                    void (*) (Fixture*, gconstpointer),   \
-                                                    void (*) (Fixture*, gconstpointer),   \
-                                                    void (*) (Fixture*, gconstpointer)) =  (void (*) (const gchar *, gsize, gconstpointer, void (*) (Fixture*, gconstpointer), void (*) (Fixture*, gconstpointer), void (*) (Fixture*, gconstpointer))) g_test_add_vtable; \
-                                         add_vtable \
-                                          (testpath, sizeof (Fixture), tdata, fsetup, ftest, fteardown); \
-					} G_STMT_END
-
-/* add test messages to the test report */
-void    g_test_message                  (const char *format,
-                                         ...) G_GNUC_PRINTF (1, 2);
-void    g_test_bug_base                 (const char *uri_pattern);
-void    g_test_bug                      (const char *bug_uri_snippet);
-/* measure test timings */
-void    g_test_timer_start              (void);
-double  g_test_timer_elapsed            (void); /* elapsed seconds */
-double  g_test_timer_last               (void); /* repeat last elapsed() result */
-
-/* automatically g_free or g_object_unref upon teardown */
-void    g_test_queue_free               (gpointer gfree_pointer);
-void    g_test_queue_destroy            (GDestroyNotify destroy_func,
-                                         gpointer       destroy_data);
-#define g_test_queue_unref(gobject)     g_test_queue_destroy (g_object_unref, gobject)
-
-/* test traps are guards used around forked tests */
-typedef enum {
-  G_TEST_TRAP_SILENCE_STDOUT    = 1 << 7,
-  G_TEST_TRAP_SILENCE_STDERR    = 1 << 8,
-  G_TEST_TRAP_INHERIT_STDIN     = 1 << 9
-} GTestTrapFlags;
-gboolean g_test_trap_fork               (guint64              usec_timeout,
-                                         GTestTrapFlags       test_trap_flags);
-gboolean g_test_trap_has_passed         (void);
-gboolean g_test_trap_reached_timeout    (void);
-#define  g_test_trap_assert_passed()                      g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 0, 0)
-#define  g_test_trap_assert_failed()                      g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 1, 0)
-#define  g_test_trap_assert_stdout(soutpattern)           g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 2, soutpattern)
-#define  g_test_trap_assert_stdout_unmatched(soutpattern) g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 3, soutpattern)
-#define  g_test_trap_assert_stderr(serrpattern)           g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 4, serrpattern)
-#define  g_test_trap_assert_stderr_unmatched(serrpattern) g_test_trap_assertions (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, 5, serrpattern)
-
-/* provide seed-able random numbers for tests */
-#define  g_test_rand_bit()              (0 != (g_test_rand_int() & (1 << 15)))
-gint32   g_test_rand_int                (void);
-gint32   g_test_rand_int_range          (gint32          begin,
-                                         gint32          end);
-double   g_test_rand_double             (void);
-double   g_test_rand_double_range       (double          range_start,
-                                         double          range_end);
-
-/* semi-internal API */
-GTestCase*    g_test_create_case        (const char       *test_name,
-                                         gsize             data_size,
-                                         gconstpointer     test_data,
-                                         GTestFixtureFunc  data_setup,
-                                         GTestFixtureFunc  data_test,
-                                         GTestFixtureFunc  data_teardown);
-GTestSuite*   g_test_create_suite       (const char       *suite_name);
-GTestSuite*   g_test_get_root           (void);
-void          g_test_suite_add          (GTestSuite     *suite,
-                                         GTestCase      *test_case);
-void          g_test_suite_add_suite    (GTestSuite     *suite,
-                                         GTestSuite     *nestedsuite);
-int           g_test_run_suite          (GTestSuite     *suite);
-
-/* internal ABI */
-void    g_test_trap_assertions          (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         guint64         assertion_flags, /* 0-pass, 1-fail, 2-outpattern, 4-errpattern */
-                                         const char     *pattern);
-void    g_assertion_message             (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *message) G_GNUC_NORETURN;
-void    g_assertion_message_expr        (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr) G_GNUC_NORETURN;
-void    g_assertion_message_cmpstr      (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         const char     *arg1,
-                                         const char     *cmp,
-                                         const char     *arg2) G_GNUC_NORETURN;
-void    g_assertion_message_cmpnum      (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         long double     arg1,
-                                         const char     *cmp,
-                                         long double     arg2,
-                                         char            numtype) G_GNUC_NORETURN;
-void    g_assertion_message_error       (const char     *domain,
-                                         const char     *file,
-                                         int             line,
-                                         const char     *func,
-                                         const char     *expr,
-                                         const GError   *error,
-                                         GQuark          error_domain,
-                                         int             error_code) G_GNUC_NORETURN;
-void    g_test_add_vtable               (const char     *testpath,
-                                         gsize           data_size,
-                                         gconstpointer   test_data,
-                                         GTestFixtureFunc  data_setup,
-                                         GTestFixtureFunc  data_test,
-                                         GTestFixtureFunc  data_teardown);
-typedef struct {
-  gboolean      test_initialized;
-  gboolean      test_quick;     /* disable thorough tests */
-  gboolean      test_perf;      /* run performance tests */
-  gboolean      test_verbose;   /* extra info */
-  gboolean      test_quiet;     /* reduce output */
-  gboolean      test_undefined; /* run tests that are meant to assert */
-} GTestConfig;
-GLIB_VAR const GTestConfig * const g_test_config_vars;
-
-/* internal logging API */
-typedef enum {
-  G_TEST_LOG_NONE,
-  G_TEST_LOG_ERROR,             /* s:msg */
-  G_TEST_LOG_START_BINARY,      /* s:binaryname s:seed */
-  G_TEST_LOG_LIST_CASE,         /* s:testpath */
-  G_TEST_LOG_SKIP_CASE,         /* s:testpath */
-  G_TEST_LOG_START_CASE,        /* s:testpath */
-  G_TEST_LOG_STOP_CASE,         /* d:status d:nforks d:elapsed */
-  G_TEST_LOG_MIN_RESULT,        /* s:blurb d:result */
-  G_TEST_LOG_MAX_RESULT,        /* s:blurb d:result */
-  G_TEST_LOG_MESSAGE            /* s:blurb */
-} GTestLogType;
-
-typedef struct {
-  GTestLogType  log_type;
-  guint         n_strings;
-  gchar       **strings; /* NULL terminated */
-  guint         n_nums;
-  long double  *nums;
-} GTestLogMsg;
-typedef struct {
-  /*< private >*/
-  GString     *data;
-  GSList      *msgs;
-} GTestLogBuffer;
-
-const char*     g_test_log_type_name    (GTestLogType    log_type);
-GTestLogBuffer* g_test_log_buffer_new   (void);
-void            g_test_log_buffer_free  (GTestLogBuffer *tbuffer);
-void            g_test_log_buffer_push  (GTestLogBuffer *tbuffer,
-                                         guint           n_bytes,
-                                         const guint8   *bytes);
-GTestLogMsg*    g_test_log_buffer_pop   (GTestLogBuffer *tbuffer);
-void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
-
-/**
- * GTestLogFatalFunc:
- * @log_domain: the log domain of the message
- * @log_level: the log level of the message (including the fatal and recursion flags)
- * @message: the message to process
- * @user_data: user data, set in g_test_log_set_fatal_handler()
- *
- * Specifies the prototype of fatal log handler functions.
- *
- * Return value: %TRUE if the program should abort, %FALSE otherwise
- *
- * Since: 2.22
- */
-typedef gboolean        (*GTestLogFatalFunc)    (const gchar    *log_domain,
-                                                 GLogLevelFlags  log_level,
-                                                 const gchar    *message,
-                                                 gpointer        user_data);
-void
-g_test_log_set_fatal_handler            (GTestLogFatalFunc log_func,
-                                         gpointer          user_data);
-
-void    g_test_expect_message                    (const gchar    *log_domain,
-                                                  GLogLevelFlags  log_level,
-                                                  const gchar    *pattern);
-void    g_test_assert_expected_messages_internal (const char     *domain,
-                                                  const char     *file,
-                                                  int             line,
-                                                  const char     *func);
-
-#define g_test_assert_expected_messages() g_test_assert_expected_messages_internal (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC)
-
-G_END_DECLS
-
-#endif /* __G_TEST_UTILS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gthread.h b/GstreamerHelper/x86/include/glib-2.0/glib/gthread.h
deleted file mode 100644
index fc927da6..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gthread.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_THREAD_H__
-#define __G_THREAD_H__
-
-#include <glib/gatomic.h>
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define G_THREAD_ERROR g_thread_error_quark ()
-GQuark g_thread_error_quark (void);
-
-typedef enum
-{
-  G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
-} GThreadError;
-
-typedef gpointer (*GThreadFunc) (gpointer data);
-
-typedef struct _GThread         GThread;
-
-typedef union  _GMutex          GMutex;
-typedef struct _GRecMutex       GRecMutex;
-typedef struct _GRWLock         GRWLock;
-typedef struct _GCond           GCond;
-typedef struct _GPrivate        GPrivate;
-typedef struct _GOnce           GOnce;
-
-union _GMutex
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GRWLock
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GCond
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-struct _GRecMutex
-{
-  /*< private >*/
-  gpointer p;
-  guint i[2];
-};
-
-#define G_PRIVATE_INIT(notify) { NULL, (notify), { NULL, NULL } }
-struct _GPrivate
-{
-  /*< private >*/
-  gpointer       p;
-  GDestroyNotify notify;
-  gpointer future[2];
-};
-
-typedef enum
-{
-  G_ONCE_STATUS_NOTCALLED,
-  G_ONCE_STATUS_PROGRESS,
-  G_ONCE_STATUS_READY
-} GOnceStatus;
-
-#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
-struct _GOnce
-{
-  volatile GOnceStatus status;
-  volatile gpointer retval;
-};
-
-#define G_LOCK_NAME(name)             g__ ## name ## _lock
-#define G_LOCK_DEFINE_STATIC(name)    static G_LOCK_DEFINE (name)
-#define G_LOCK_DEFINE(name)           GMutex G_LOCK_NAME (name)
-#define G_LOCK_EXTERN(name)           extern GMutex G_LOCK_NAME (name)
-
-#ifdef G_DEBUG_LOCKS
-#  define G_LOCK(name)                G_STMT_START{             \
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                   \
-             "file %s: line %d (%s): locking: %s ",             \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name);                                            \
-      g_mutex_lock (&G_LOCK_NAME (name));                       \
-   }G_STMT_END
-#  define G_UNLOCK(name)              G_STMT_START{             \
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                   \
-             "file %s: line %d (%s): unlocking: %s ",           \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name);                                            \
-     g_mutex_unlock (&G_LOCK_NAME (name));                      \
-   }G_STMT_END
-#  define G_TRYLOCK(name)                                       \
-      (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,                  \
-             "file %s: line %d (%s): try locking: %s ",         \
-             __FILE__,        __LINE__, G_STRFUNC,              \
-             #name), g_mutex_trylock (&G_LOCK_NAME (name)))
-#else  /* !G_DEBUG_LOCKS */
-#  define G_LOCK(name) g_mutex_lock       (&G_LOCK_NAME (name))
-#  define G_UNLOCK(name) g_mutex_unlock   (&G_LOCK_NAME (name))
-#  define G_TRYLOCK(name) g_mutex_trylock (&G_LOCK_NAME (name))
-#endif /* !G_DEBUG_LOCKS */
-
-GThread *       g_thread_ref                    (GThread        *thread);
-void            g_thread_unref                  (GThread        *thread);
-GThread *       g_thread_new                    (const gchar    *name,
-                                                 GThreadFunc     func,
-                                                 gpointer        data);
-GThread *       g_thread_try_new                (const gchar    *name,
-                                                 GThreadFunc     func,
-                                                 gpointer        data,
-                                                 GError        **error);
-GThread *       g_thread_self                   (void);
-void            g_thread_exit                   (gpointer        retval);
-gpointer        g_thread_join                   (GThread        *thread);
-void            g_thread_yield                  (void);
-
-
-void            g_mutex_init                    (GMutex         *mutex);
-void            g_mutex_clear                   (GMutex         *mutex);
-void            g_mutex_lock                    (GMutex         *mutex);
-gboolean        g_mutex_trylock                 (GMutex         *mutex);
-void            g_mutex_unlock                  (GMutex         *mutex);
-
-void            g_rw_lock_init                  (GRWLock        *rw_lock);
-void            g_rw_lock_clear                 (GRWLock        *rw_lock);
-void            g_rw_lock_writer_lock           (GRWLock        *rw_lock);
-gboolean        g_rw_lock_writer_trylock        (GRWLock        *rw_lock);
-void            g_rw_lock_writer_unlock         (GRWLock        *rw_lock);
-void            g_rw_lock_reader_lock           (GRWLock        *rw_lock);
-gboolean        g_rw_lock_reader_trylock        (GRWLock        *rw_lock);
-void            g_rw_lock_reader_unlock         (GRWLock        *rw_lock);
-
-void            g_rec_mutex_init                (GRecMutex      *rec_mutex);
-void            g_rec_mutex_clear               (GRecMutex      *rec_mutex);
-void            g_rec_mutex_lock                (GRecMutex      *rec_mutex);
-gboolean        g_rec_mutex_trylock             (GRecMutex      *rec_mutex);
-void            g_rec_mutex_unlock              (GRecMutex      *rec_mutex);
-
-void            g_cond_init                     (GCond          *cond);
-void            g_cond_clear                    (GCond          *cond);
-void            g_cond_wait                     (GCond          *cond,
-                                                 GMutex         *mutex);
-void            g_cond_signal                   (GCond          *cond);
-void            g_cond_broadcast                (GCond          *cond);
-gboolean        g_cond_wait_until               (GCond          *cond,
-                                                 GMutex         *mutex,
-                                                 gint64          end_time);
-
-gpointer        g_private_get                   (GPrivate       *key);
-void            g_private_set                   (GPrivate       *key,
-                                                 gpointer        value);
-void            g_private_replace               (GPrivate       *key,
-                                                 gpointer        value);
-
-gpointer        g_once_impl                     (GOnce          *once,
-                                                 GThreadFunc     func,
-                                                 gpointer        arg);
-gboolean        g_once_init_enter               (volatile void  *location);
-void            g_once_init_leave               (volatile void  *location,
-                                                 gsize           result);
-
-#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-# define g_once(once, func, arg) g_once_impl ((once), (func), (arg))
-#else /* !G_ATOMIC_OP_MEMORY_BARRIER_NEEDED*/
-# define g_once(once, func, arg) \
-  (((once)->status == G_ONCE_STATUS_READY) ? \
-   (once)->retval : \
-   g_once_impl ((once), (func), (arg)))
-#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-#ifdef __GNUC__
-# define g_once_init_enter(location) \
-  (G_GNUC_EXTENSION ({                                               \
-    G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer));       \
-    (void) (0 ? (gpointer) *(location) : 0);                         \
-    (!g_atomic_pointer_get (location) &&                             \
-     g_once_init_enter (location));                                  \
-  }))
-# define g_once_init_leave(location, result) \
-  (G_GNUC_EXTENSION ({                                               \
-    G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer));       \
-    (void) (0 ? *(location) = (result) : 0);                         \
-    g_once_init_leave ((location), (gsize) (result));                \
-  }))
-#else
-# define g_once_init_enter(location) \
-  (g_once_init_enter((location)))
-# define g_once_init_leave(location, result) \
-  (g_once_init_leave((location), (gsize) (result)))
-#endif
-
-G_END_DECLS
-
-#endif /* __G_THREAD_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gthreadpool.h b/GstreamerHelper/x86/include/glib-2.0/glib/gthreadpool.h
deleted file mode 100644
index 3a1f2980..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gthreadpool.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_THREADPOOL_H__
-#define __G_THREADPOOL_H__
-
-#include <glib/gthread.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GThreadPool GThreadPool;
-
-/* Thread Pools
- */
-
-struct _GThreadPool
-{
-  GFunc func;
-  gpointer user_data;
-  gboolean exclusive;
-};
-
-GThreadPool *   g_thread_pool_new               (GFunc            func,
-                                                 gpointer         user_data,
-                                                 gint             max_threads,
-                                                 gboolean         exclusive,
-                                                 GError         **error);
-void            g_thread_pool_free              (GThreadPool     *pool,
-                                                 gboolean         immediate,
-                                                 gboolean         wait_);
-gboolean        g_thread_pool_push              (GThreadPool     *pool,
-                                                 gpointer         data,
-                                                 GError         **error);
-guint           g_thread_pool_unprocessed       (GThreadPool     *pool);
-void            g_thread_pool_set_sort_function (GThreadPool      *pool,
-                                                 GCompareDataFunc  func,
-                                                 gpointer          user_data);
-gboolean        g_thread_pool_set_max_threads   (GThreadPool     *pool,
-                                                 gint             max_threads,
-                                                 GError         **error);
-gint            g_thread_pool_get_max_threads   (GThreadPool     *pool);
-guint           g_thread_pool_get_num_threads   (GThreadPool     *pool);
-
-void            g_thread_pool_set_max_unused_threads (gint  max_threads);
-gint            g_thread_pool_get_max_unused_threads (void);
-guint           g_thread_pool_get_num_unused_threads (void);
-void            g_thread_pool_stop_unused_threads    (void);
-void            g_thread_pool_set_max_idle_time      (guint interval);
-guint           g_thread_pool_get_max_idle_time      (void);
-
-G_END_DECLS
-
-#endif /* __G_THREADPOOL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gtimer.h b/GstreamerHelper/x86/include/glib-2.0/glib/gtimer.h
deleted file mode 100644
index b927fc37..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gtimer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TIMER_H__
-#define __G_TIMER_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/* Timer
- */
-
-/* microseconds per second */
-typedef struct _GTimer		GTimer;
-
-#define G_USEC_PER_SEC 1000000
-
-GTimer*  g_timer_new	         (void);
-void	 g_timer_destroy         (GTimer      *timer);
-void	 g_timer_start	         (GTimer      *timer);
-void	 g_timer_stop	         (GTimer      *timer);
-void	 g_timer_reset	         (GTimer      *timer);
-void	 g_timer_continue        (GTimer      *timer);
-gdouble  g_timer_elapsed         (GTimer      *timer,
-				  gulong      *microseconds);
-
-void     g_usleep                (gulong       microseconds);
-
-void     g_time_val_add          (GTimeVal    *time_, 
-                                  glong        microseconds);
-gboolean g_time_val_from_iso8601 (const gchar *iso_date,
-				  GTimeVal    *time_);
-gchar*   g_time_val_to_iso8601   (GTimeVal    *time_) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __G_TIMER_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gtimezone.h b/GstreamerHelper/x86/include/glib-2.0/glib/gtimezone.h
deleted file mode 100644
index c877e8f4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gtimezone.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TIME_ZONE_H__
-#define __G_TIME_ZONE_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTimeZone GTimeZone;
-
-/**
- * GTimeType:
- * @G_TIME_TYPE_STANDARD: the time is in local standard time
- * @G_TIME_TYPE_DAYLIGHT: the time is in local daylight time
- * @G_TIME_TYPE_UNIVERSAL: the time is in UTC
- *
- * Disambiguates a given time in two ways.
- *
- * First, specifies if the given time is in universal or local time.
- *
- * Second, if the time is in local time, specifies if it is local
- * standard time or local daylight time.  This is important for the case
- * where the same local time occurs twice (during daylight savings time
- * transitions, for example).
- */
-typedef enum
-{
-  G_TIME_TYPE_STANDARD,
-  G_TIME_TYPE_DAYLIGHT,
-  G_TIME_TYPE_UNIVERSAL
-} GTimeType;
-
-GTimeZone *             g_time_zone_new                                 (const gchar *identifier);
-GTimeZone *             g_time_zone_new_utc                             (void);
-GTimeZone *             g_time_zone_new_local                           (void);
-
-GTimeZone *             g_time_zone_ref                                 (GTimeZone   *tz);
-void                    g_time_zone_unref                               (GTimeZone   *tz);
-
-gint                    g_time_zone_find_interval                       (GTimeZone   *tz,
-                                                                         GTimeType    type,
-                                                                         gint64       time_);
-
-gint                    g_time_zone_adjust_time                         (GTimeZone   *tz,
-                                                                         GTimeType    type,
-                                                                         gint64      *time_);
-
-const gchar *           g_time_zone_get_abbreviation                    (GTimeZone   *tz,
-                                                                         gint         interval);
-gint32                  g_time_zone_get_offset                          (GTimeZone   *tz,
-                                                                         gint         interval);
-gboolean                g_time_zone_is_dst                              (GTimeZone   *tz,
-                                                                         gint         interval);
-
-G_END_DECLS
-
-#endif /* __G_TIME_ZONE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gtrashstack.h b/GstreamerHelper/x86/include/glib-2.0/glib/gtrashstack.h
deleted file mode 100644
index 3f226fe4..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gtrashstack.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TRASH_STACK_H__
-#define __G_TRASH_STACK_H__
-
-#include <glib/gutils.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTrashStack GTrashStack;
-struct _GTrashStack
-{
-  GTrashStack *next;
-};
-
-G_INLINE_FUNC void      g_trash_stack_push   (GTrashStack **stack_p,
-                                              gpointer      data_p);
-G_INLINE_FUNC gpointer  g_trash_stack_pop    (GTrashStack **stack_p);
-G_INLINE_FUNC gpointer  g_trash_stack_peek   (GTrashStack **stack_p);
-G_INLINE_FUNC guint     g_trash_stack_height (GTrashStack **stack_p);
-
-#if defined (G_CAN_INLINE) || defined (__G_TRASH_STACK_C__)
-
-G_INLINE_FUNC void
-g_trash_stack_push (GTrashStack **stack_p,
-                    gpointer      data_p)
-{
-  GTrashStack *data = (GTrashStack *) data_p;
-
-  data->next = *stack_p;
-  *stack_p = data;
-}
-G_INLINE_FUNC gpointer
-g_trash_stack_pop (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-
-  data = *stack_p;
-  if (data)
-    {
-      *stack_p = data->next;
-      /* NULLify private pointer here, most platforms store NULL as
-       * subsequent 0 bytes
-       */
-      data->next = NULL;
-    }
-
-  return data;
-}
-G_INLINE_FUNC gpointer
-g_trash_stack_peek (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-
-  data = *stack_p;
-
-  return data;
-}
-G_INLINE_FUNC guint
-g_trash_stack_height (GTrashStack **stack_p)
-{
-  GTrashStack *data;
-  guint i = 0;
-
-  for (data = *stack_p; data; data = data->next)
-    i++;
-
-  return i;
-}
-
-#endif  /* G_CAN_INLINE || __G_TRASH_STACK_C__ */
-
-G_END_DECLS
-
-#endif /* __G_UTILS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gtree.h b/GstreamerHelper/x86/include/glib-2.0/glib/gtree.h
deleted file mode 100644
index e17a5182..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gtree.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TREE_H__
-#define __G_TREE_H__
-
-#include <glib/gnode.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTree  GTree;
-
-typedef gboolean (*GTraverseFunc) (gpointer  key,
-                                   gpointer  value,
-                                   gpointer  data);
-
-/* Balanced binary trees
- */
-GTree*   g_tree_new             (GCompareFunc      key_compare_func);
-GTree*   g_tree_new_with_data   (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data);
-GTree*   g_tree_new_full        (GCompareDataFunc  key_compare_func,
-                                 gpointer          key_compare_data,
-                                 GDestroyNotify    key_destroy_func,
-                                 GDestroyNotify    value_destroy_func);
-GTree*   g_tree_ref             (GTree            *tree);
-void     g_tree_unref           (GTree            *tree);
-void     g_tree_destroy         (GTree            *tree);
-void     g_tree_insert          (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-void     g_tree_replace         (GTree            *tree,
-                                 gpointer          key,
-                                 gpointer          value);
-gboolean g_tree_remove          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_steal           (GTree            *tree,
-                                 gconstpointer     key);
-gpointer g_tree_lookup          (GTree            *tree,
-                                 gconstpointer     key);
-gboolean g_tree_lookup_extended (GTree            *tree,
-                                 gconstpointer     lookup_key,
-                                 gpointer         *orig_key,
-                                 gpointer         *value);
-void     g_tree_foreach         (GTree            *tree,
-                                 GTraverseFunc	   func,
-                                 gpointer	   user_data);
-
-GLIB_DEPRECATED
-void     g_tree_traverse        (GTree            *tree,
-                                 GTraverseFunc     traverse_func,
-                                 GTraverseType     traverse_type,
-                                 gpointer          user_data);
-
-gpointer g_tree_search          (GTree            *tree,
-                                 GCompareFunc      search_func,
-                                 gconstpointer     user_data);
-gint     g_tree_height          (GTree            *tree);
-gint     g_tree_nnodes          (GTree            *tree);
-
-G_END_DECLS
-
-#endif /* __G_TREE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gtypes.h b/GstreamerHelper/x86/include/glib-2.0/glib/gtypes.h
deleted file mode 100644
index 7e4c8eab..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gtypes.h
+++ /dev/null
@@ -1,484 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_TYPES_H__
-#define __G_TYPES_H__
-
-#include <glibconfig.h>
-#include <glib/gmacros.h>
-#include <glib/gversionmacros.h>
-#include <time.h>
-
-G_BEGIN_DECLS
-
-/* Provide type definitions for commonly used types.
- *  These are useful because a "gint8" can be adjusted
- *  to be 1 byte (8 bits) on all platforms. Similarly and
- *  more importantly, "gint32" can be adjusted to be
- *  4 bytes (32 bits) on all platforms.
- */
-
-typedef char   gchar;
-typedef short  gshort;
-typedef long   glong;
-typedef int    gint;
-typedef gint   gboolean;
-
-typedef unsigned char   guchar;
-typedef unsigned short  gushort;
-typedef unsigned long   gulong;
-typedef unsigned int    guint;
-
-typedef float   gfloat;
-typedef double  gdouble;
-
-/* Define min and max constants for the fixed size numerical types */
-#define G_MININT8	((gint8)  0x80)
-#define G_MAXINT8	((gint8)  0x7f)
-#define G_MAXUINT8	((guint8) 0xff)
-
-#define G_MININT16	((gint16)  0x8000)
-#define G_MAXINT16	((gint16)  0x7fff)
-#define G_MAXUINT16	((guint16) 0xffff)
-
-#define G_MININT32	((gint32)  0x80000000)
-#define G_MAXINT32	((gint32)  0x7fffffff)
-#define G_MAXUINT32	((guint32) 0xffffffff)
-
-#define G_MININT64	((gint64) G_GINT64_CONSTANT(0x8000000000000000))
-#define G_MAXINT64	G_GINT64_CONSTANT(0x7fffffffffffffff)
-#define G_MAXUINT64	G_GINT64_CONSTANT(0xffffffffffffffffU)
-
-typedef void* gpointer;
-typedef const void *gconstpointer;
-
-typedef gint            (*GCompareFunc)         (gconstpointer  a,
-                                                 gconstpointer  b);
-typedef gint            (*GCompareDataFunc)     (gconstpointer  a,
-                                                 gconstpointer  b,
-						 gpointer       user_data);
-typedef gboolean        (*GEqualFunc)           (gconstpointer  a,
-                                                 gconstpointer  b);
-typedef void            (*GDestroyNotify)       (gpointer       data);
-typedef void            (*GFunc)                (gpointer       data,
-                                                 gpointer       user_data);
-typedef guint           (*GHashFunc)            (gconstpointer  key);
-typedef void            (*GHFunc)               (gpointer       key,
-                                                 gpointer       value,
-                                                 gpointer       user_data);
-
-/**
- * GFreeFunc:
- * @data: a data pointer
- *
- * Declares a type of function which takes an arbitrary
- * data pointer argument and has no return value. It is
- * not currently used in GLib or GTK+.
- */
-typedef void            (*GFreeFunc)            (gpointer       data);
-
-/**
- * GTranslateFunc:
- * @str: the untranslated string
- * @data: user data specified when installing the function, e.g.
- *  in g_option_group_set_translate_func()
- * 
- * The type of functions which are used to translate user-visible
- * strings, for <option>--help</option> output.
- * 
- * Returns: a translation of the string for the current locale.
- *  The returned string is owned by GLib and must not be freed.
- */
-typedef const gchar *   (*GTranslateFunc)       (const gchar   *str,
-						 gpointer       data);
-
-
-/* Define some mathematical constants that aren't available
- * symbolically in some strict ISO C implementations.
- *
- * Note that the large number of digits used in these definitions
- * doesn't imply that GLib or current computers in general would be
- * able to handle floating point numbers with an accuracy like this.
- * It's mostly an exercise in futility and future proofing. For
- * extended precision floating point support, look somewhere else
- * than GLib.
- */
-#define G_E     2.7182818284590452353602874713526624977572470937000
-#define G_LN2   0.69314718055994530941723212145817656807550013436026
-#define G_LN10  2.3025850929940456840179914546843642076011014886288
-#define G_PI    3.1415926535897932384626433832795028841971693993751
-#define G_PI_2  1.5707963267948966192313216916397514420985846996876
-#define G_PI_4  0.78539816339744830961566084581987572104929234984378
-#define G_SQRT2 1.4142135623730950488016887242096980785696718753769
-
-/* Portable endian checks and conversions
- *
- * glibconfig.h defines G_BYTE_ORDER which expands to one of
- * the below macros.
- */
-#define G_LITTLE_ENDIAN 1234
-#define G_BIG_ENDIAN    4321
-#define G_PDP_ENDIAN    3412		/* unused, need specific PDP check */	
-
-
-/* Basic bit swapping functions
- */
-#define GUINT16_SWAP_LE_BE_CONSTANT(val)	((guint16) ( \
-    (guint16) ((guint16) (val) >> 8) |	\
-    (guint16) ((guint16) (val) << 8)))
-
-#define GUINT32_SWAP_LE_BE_CONSTANT(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x000000ffU) << 24) | \
-    (((guint32) (val) & (guint32) 0x0000ff00U) <<  8) | \
-    (((guint32) (val) & (guint32) 0x00ff0000U) >>  8) | \
-    (((guint32) (val) & (guint32) 0xff000000U) >> 24)))
-
-#define GUINT64_SWAP_LE_BE_CONSTANT(val)	((guint64) ( \
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00000000000000ffU)) << 56) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x000000000000ff00U)) << 40) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x0000000000ff0000U)) << 24) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00000000ff000000U)) <<  8) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x000000ff00000000U)) >>  8) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x0000ff0000000000U)) >> 24) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0x00ff000000000000U)) >> 40) |	\
-      (((guint64) (val) &						\
-	(guint64) G_GINT64_CONSTANT (0xff00000000000000U)) >> 56)))
-
-/* Arch specific stuff for speed
- */
-#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
-
-#  if __GNUC__ >= 4 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 3
-#    define GUINT32_SWAP_LE_BE(val) ((guint32) __builtin_bswap32 ((gint32) val))
-#    define GUINT64_SWAP_LE_BE(val) ((guint64) __builtin_bswap64 ((gint64) val))
-#  endif
-
-#  if defined (__i386__)
-#    define GUINT16_SWAP_LE_BE_IA32(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint16 __v, __x = ((guint16) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT16_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ ("rorw $8, %w0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x)				\
-		      : "cc");					\
-	    __v; }))
-#    if !defined (__i486__) && !defined (__i586__) \
-	&& !defined (__pentium__) && !defined (__i686__) \
-	&& !defined (__pentiumpro__) && !defined (__pentium4__)
-#       define GUINT32_SWAP_LE_BE_IA32(val) \
-	  (G_GNUC_EXTENSION					\
-	   ({ register guint32 __v, __x = ((guint32) (val));	\
-	      if (__builtin_constant_p (__x))			\
-		__v = GUINT32_SWAP_LE_BE_CONSTANT (__x);	\
-	      else						\
-		__asm__ ("rorw $8, %w0\n\t"			\
-			 "rorl $16, %0\n\t"			\
-			 "rorw $8, %w0"				\
-			 : "=r" (__v)				\
-			 : "0" (__x)				\
-			 : "cc");				\
-	      __v; }))
-#    else /* 486 and higher has bswap */
-#       define GUINT32_SWAP_LE_BE_IA32(val) \
-	  (G_GNUC_EXTENSION					\
-	   ({ register guint32 __v, __x = ((guint32) (val));	\
-	      if (__builtin_constant_p (__x))			\
-		__v = GUINT32_SWAP_LE_BE_CONSTANT (__x);	\
-	      else						\
-		__asm__ ("bswap %0"				\
-			 : "=r" (__v)				\
-			 : "0" (__x));				\
-	      __v; }))
-#    endif /* processor specific 32-bit stuff */
-#    define GUINT64_SWAP_LE_BE_IA32(val) \
-       (G_GNUC_EXTENSION						\
-	({ union { guint64 __ll;					\
-		   guint32 __l[2]; } __w, __r;				\
-	   __w.__ll = ((guint64) (val));				\
-	   if (__builtin_constant_p (__w.__ll))				\
-	     __r.__ll = GUINT64_SWAP_LE_BE_CONSTANT (__w.__ll);		\
-	   else								\
-	     {								\
-	       __r.__l[0] = GUINT32_SWAP_LE_BE (__w.__l[1]);		\
-	       __r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]);		\
-	     }								\
-	   __r.__ll; }))
-     /* Possibly just use the constant version and let gcc figure it out? */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA32 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA32 (val))
-#    endif
-#  elif defined (__ia64__)
-#    define GUINT16_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint16 __v, __x = ((guint16) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT16_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ __volatile__ ("shl %0 = %1, 48 ;;"		\
-				   "mux1 %0 = %0, @rev ;;"	\
-				    : "=r" (__v)		\
-				    : "r" (__x));		\
-	    __v; }))
-#    define GUINT32_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	 ({ register guint32 __v, __x = ((guint32) (val));	\
-	    if (__builtin_constant_p (__x))			\
-	      __v = GUINT32_SWAP_LE_BE_CONSTANT (__x);		\
-	    else						\
-	     __asm__ __volatile__ ("shl %0 = %1, 32 ;;"		\
-				   "mux1 %0 = %0, @rev ;;"	\
-				    : "=r" (__v)		\
-				    : "r" (__x));		\
-	    __v; }))
-#    define GUINT64_SWAP_LE_BE_IA64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint64 __v, __x = ((guint64) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT64_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ __volatile__ ("mux1 %0 = %1, @rev ;;"	\
-				   : "=r" (__v)			\
-				   : "r" (__x));		\
-	   __v; }))
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA64 (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA64 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA64 (val))
-#    endif
-#  elif defined (__x86_64__)
-#    define GUINT32_SWAP_LE_BE_X86_64(val) \
-       (G_GNUC_EXTENSION					\
-	 ({ register guint32 __v, __x = ((guint32) (val));	\
-	    if (__builtin_constant_p (__x))			\
-	      __v = GUINT32_SWAP_LE_BE_CONSTANT (__x);		\
-	    else						\
-	     __asm__ ("bswapl %0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x));				\
-	    __v; }))
-#    define GUINT64_SWAP_LE_BE_X86_64(val) \
-       (G_GNUC_EXTENSION					\
-	({ register guint64 __v, __x = ((guint64) (val));	\
-	   if (__builtin_constant_p (__x))			\
-	     __v = GUINT64_SWAP_LE_BE_CONSTANT (__x);		\
-	   else							\
-	     __asm__ ("bswapq %0"				\
-		      : "=r" (__v)				\
-		      : "0" (__x));				\
-	   __v; }))
-     /* gcc seems to figure out optimal code for this on its own */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86_64 (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86_64 (val))
-#    endif
-#  else /* generic gcc */
-#    define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#    ifndef GUINT32_SWAP_LE_BE
-#      define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
-#    endif
-#    ifndef GUINT64_SWAP_LE_BE
-#      define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
-#    endif
-#  endif
-#else /* generic */
-#  define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
-#  define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
-#  define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
-#endif /* generic */
-
-#define GUINT16_SWAP_LE_PDP(val)	((guint16) (val))
-#define GUINT16_SWAP_BE_PDP(val)	(GUINT16_SWAP_LE_BE (val))
-#define GUINT32_SWAP_LE_PDP(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x0000ffffU) << 16) | \
-    (((guint32) (val) & (guint32) 0xffff0000U) >> 16)))
-#define GUINT32_SWAP_BE_PDP(val)	((guint32) ( \
-    (((guint32) (val) & (guint32) 0x00ff00ffU) << 8) | \
-    (((guint32) (val) & (guint32) 0xff00ff00U) >> 8)))
-
-/* The G*_TO_?E() macros are defined in glibconfig.h.
- * The transformation is symmetric, so the FROM just maps to the TO.
- */
-#define GINT16_FROM_LE(val)	(GINT16_TO_LE (val))
-#define GUINT16_FROM_LE(val)	(GUINT16_TO_LE (val))
-#define GINT16_FROM_BE(val)	(GINT16_TO_BE (val))
-#define GUINT16_FROM_BE(val)	(GUINT16_TO_BE (val))
-#define GINT32_FROM_LE(val)	(GINT32_TO_LE (val))
-#define GUINT32_FROM_LE(val)	(GUINT32_TO_LE (val))
-#define GINT32_FROM_BE(val)	(GINT32_TO_BE (val))
-#define GUINT32_FROM_BE(val)	(GUINT32_TO_BE (val))
-
-#define GINT64_FROM_LE(val)	(GINT64_TO_LE (val))
-#define GUINT64_FROM_LE(val)	(GUINT64_TO_LE (val))
-#define GINT64_FROM_BE(val)	(GINT64_TO_BE (val))
-#define GUINT64_FROM_BE(val)	(GUINT64_TO_BE (val))
-
-#define GLONG_FROM_LE(val)	(GLONG_TO_LE (val))
-#define GULONG_FROM_LE(val)	(GULONG_TO_LE (val))
-#define GLONG_FROM_BE(val)	(GLONG_TO_BE (val))
-#define GULONG_FROM_BE(val)	(GULONG_TO_BE (val))
-
-#define GINT_FROM_LE(val)	(GINT_TO_LE (val))
-#define GUINT_FROM_LE(val)	(GUINT_TO_LE (val))
-#define GINT_FROM_BE(val)	(GINT_TO_BE (val))
-#define GUINT_FROM_BE(val)	(GUINT_TO_BE (val))
-
-#define GSIZE_FROM_LE(val)	(GSIZE_TO_LE (val))
-#define GSSIZE_FROM_LE(val)	(GSSIZE_TO_LE (val))
-#define GSIZE_FROM_BE(val)	(GSIZE_TO_BE (val))
-#define GSSIZE_FROM_BE(val)	(GSSIZE_TO_BE (val))
-
-
-/* Portable versions of host-network order stuff
- */
-#define g_ntohl(val) (GUINT32_FROM_BE (val))
-#define g_ntohs(val) (GUINT16_FROM_BE (val))
-#define g_htonl(val) (GUINT32_TO_BE (val))
-#define g_htons(val) (GUINT16_TO_BE (val))
-
-/* IEEE Standard 754 Single Precision Storage Format (gfloat):
- *
- *        31 30           23 22            0
- * +--------+---------------+---------------+
- * | s 1bit | e[30:23] 8bit | f[22:0] 23bit |
- * +--------+---------------+---------------+
- * B0------------------->B1------->B2-->B3-->
- *
- * IEEE Standard 754 Double Precision Storage Format (gdouble):
- *
- *        63 62            52 51            32   31            0
- * +--------+----------------+----------------+ +---------------+
- * | s 1bit | e[62:52] 11bit | f[51:32] 20bit | | f[31:0] 32bit |
- * +--------+----------------+----------------+ +---------------+
- * B0--------------->B1---------->B2--->B3---->  B4->B5->B6->B7->
- */
-/* subtract from biased_exponent to form base2 exponent (normal numbers) */
-typedef union  _GDoubleIEEE754	GDoubleIEEE754;
-typedef union  _GFloatIEEE754	GFloatIEEE754;
-#define G_IEEE754_FLOAT_BIAS	(127)
-#define G_IEEE754_DOUBLE_BIAS	(1023)
-/* multiply with base2 exponent to get base10 exponent (normal numbers) */
-#define G_LOG_2_BASE_10		(0.30102999566398119521)
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-union _GFloatIEEE754
-{
-  gfloat v_float;
-  struct {
-    guint mantissa : 23;
-    guint biased_exponent : 8;
-    guint sign : 1;
-  } mpn;
-};
-union _GDoubleIEEE754
-{
-  gdouble v_double;
-  struct {
-    guint mantissa_low : 32;
-    guint mantissa_high : 20;
-    guint biased_exponent : 11;
-    guint sign : 1;
-  } mpn;
-};
-#elif G_BYTE_ORDER == G_BIG_ENDIAN
-union _GFloatIEEE754
-{
-  gfloat v_float;
-  struct {
-    guint sign : 1;
-    guint biased_exponent : 8;
-    guint mantissa : 23;
-  } mpn;
-};
-union _GDoubleIEEE754
-{
-  gdouble v_double;
-  struct {
-    guint sign : 1;
-    guint biased_exponent : 11;
-    guint mantissa_high : 20;
-    guint mantissa_low : 32;
-  } mpn;
-};
-#else /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-#error unknown ENDIAN type
-#endif /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-
-typedef struct _GTimeVal                GTimeVal;
-
-struct _GTimeVal
-{
-  glong tv_sec;
-  glong tv_usec;
-};
-
-G_END_DECLS
-
-/* We prefix variable declarations so they can
- * properly get exported in Windows DLLs.
- */
-#ifndef GLIB_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GLIB_STATIC_COMPILATION
-#      define GLIB_VAR extern
-#    else /* !GLIB_STATIC_COMPILATION */
-#      ifdef GLIB_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GLIB_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GLIB_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GLIB_COMPILATION */
-#        define GLIB_VAR extern __declspec(dllimport)
-#      endif /* !GLIB_COMPILATION */
-#    endif /* !GLIB_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    define GLIB_VAR extern
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GLIB_VAR */
-
-#endif /* __G_TYPES_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gunicode.h b/GstreamerHelper/x86/include/glib-2.0/glib/gunicode.h
deleted file mode 100644
index f9c2fd56..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gunicode.h
+++ /dev/null
@@ -1,752 +0,0 @@
-/* gunicode.h - Unicode manipulation functions
- *
- *  Copyright (C) 1999, 2000 Tom Tromey
- *  Copyright 2000, 2005 Red Hat, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_UNICODE_H__
-#define __G_UNICODE_H__
-
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * gunichar:
- *
- * A type which can hold any UTF-32 or UCS-4 character code,
- * also known as a Unicode code point.
- *
- * If you want to produce the UTF-8 representation of a #gunichar,
- * use g_ucs4_to_utf8(). See also g_utf8_to_ucs4() for the reverse
- * process.
- *
- * To print/scan values of this type as integer, use
- * %G_GINT32_MODIFIER and/or %G_GUINT32_FORMAT.
- *
- * The notation to express a Unicode code point in running text is
- * as a hexadecimal number with four to six digits and uppercase
- * letters, prefixed by the string "U+". Leading zeros are omitted,
- * unless the code point would have fewer than four hexadecimal digits.
- * For example, "U+0041 LATIN CAPITAL LETTER A". To print a code point
- * in the U+-notation, use the format string "U+\%04"G_GINT32_FORMAT"X".
- * To scan, use the format string "U+\%06"G_GINT32_FORMAT"X".
- *
- * |[
- * gunichar c;
- * sscanf ("U+0041", "U+%06"G_GINT32_FORMAT"X", &amp;c)
- * g_print ("Read U+%04"G_GINT32_FORMAT"X", c);
- * ]|
- */
-typedef guint32 gunichar;
-
-/**
- * gunichar2:
- *
- * A type which can hold any UTF-16 code
- * point<footnote id="utf16_surrogate_pairs">UTF-16 also has so called
- * <firstterm>surrogate pairs</firstterm> to encode characters beyond
- * the BMP as pairs of 16bit numbers. Surrogate pairs cannot be stored
- * in a single gunichar2 field, but all GLib functions accepting gunichar2
- * arrays will correctly interpret surrogate pairs.</footnote>.
- *
- * To print/scan values of this type to/from text you need to convert
- * to/from UTF-8, using g_utf16_to_utf8()/g_utf8_to_utf16().
- *
- * To print/scan values of this type as integer, use
- * %G_GINT16_MODIFIER and/or %G_GUINT16_FORMAT.
- */
-typedef guint16 gunichar2;
-
-/**
- * GUnicodeType:
- * @G_UNICODE_CONTROL: General category "Other, Control" (Cc)
- * @G_UNICODE_FORMAT: General category "Other, Format" (Cf)
- * @G_UNICODE_UNASSIGNED: General category "Other, Not Assigned" (Cn)
- * @G_UNICODE_PRIVATE_USE: General category "Other, Private Use" (Co)
- * @G_UNICODE_SURROGATE: General category "Other, Surrogate" (Cs)
- * @G_UNICODE_LOWERCASE_LETTER: General category "Letter, Lowercase" (Ll)
- * @G_UNICODE_MODIFIER_LETTER: General category "Letter, Modifier" (Lm)
- * @G_UNICODE_OTHER_LETTER: General category "Letter, Other" (Lo)
- * @G_UNICODE_TITLECASE_LETTER: General category "Letter, Titlecase" (Lt)
- * @G_UNICODE_UPPERCASE_LETTER: General category "Letter, Uppercase" (Lu)
- * @G_UNICODE_SPACING_MARK: General category "Mark, Spacing" (Mc)
- * @G_UNICODE_ENCLOSING_MARK: General category "Mark, Enclosing" (Me)
- * @G_UNICODE_NON_SPACING_MARK: General category "Mark, Nonspacing" (Mn)
- * @G_UNICODE_DECIMAL_NUMBER: General category "Number, Decimal Digit" (Nd)
- * @G_UNICODE_LETTER_NUMBER: General category "Number, Letter" (Nl)
- * @G_UNICODE_OTHER_NUMBER: General category "Number, Other" (No)
- * @G_UNICODE_CONNECT_PUNCTUATION: General category "Punctuation, Connector" (Pc)
- * @G_UNICODE_DASH_PUNCTUATION: General category "Punctuation, Dash" (Pd)
- * @G_UNICODE_CLOSE_PUNCTUATION: General category "Punctuation, Close" (Pe)
- * @G_UNICODE_FINAL_PUNCTUATION: General category "Punctuation, Final quote" (Pf)
- * @G_UNICODE_INITIAL_PUNCTUATION: General category "Punctuation, Initial quote" (Pi)
- * @G_UNICODE_OTHER_PUNCTUATION: General category "Punctuation, Other" (Po)
- * @G_UNICODE_OPEN_PUNCTUATION: General category "Punctuation, Open" (Ps)
- * @G_UNICODE_CURRENCY_SYMBOL: General category "Symbol, Currency" (Sc)
- * @G_UNICODE_MODIFIER_SYMBOL: General category "Symbol, Modifier" (Sk)
- * @G_UNICODE_MATH_SYMBOL: General category "Symbol, Math" (Sm)
- * @G_UNICODE_OTHER_SYMBOL: General category "Symbol, Other" (So)
- * @G_UNICODE_LINE_SEPARATOR: General category "Separator, Line" (Zl)
- * @G_UNICODE_PARAGRAPH_SEPARATOR: General category "Separator, Paragraph" (Zp)
- * @G_UNICODE_SPACE_SEPARATOR: General category "Separator, Space" (Zs)
- *
- * These are the possible character classifications from the
- * Unicode specification.
- * See <ulink url="http://www.unicode.org/Public/UNIDATA/UnicodeData.html">http://www.unicode.org/Public/UNIDATA/UnicodeData.html</ulink>.
- */
-typedef enum
-{
-  G_UNICODE_CONTROL,
-  G_UNICODE_FORMAT,
-  G_UNICODE_UNASSIGNED,
-  G_UNICODE_PRIVATE_USE,
-  G_UNICODE_SURROGATE,
-  G_UNICODE_LOWERCASE_LETTER,
-  G_UNICODE_MODIFIER_LETTER,
-  G_UNICODE_OTHER_LETTER,
-  G_UNICODE_TITLECASE_LETTER,
-  G_UNICODE_UPPERCASE_LETTER,
-  G_UNICODE_SPACING_MARK,
-  G_UNICODE_ENCLOSING_MARK,
-  G_UNICODE_NON_SPACING_MARK,
-  G_UNICODE_DECIMAL_NUMBER,
-  G_UNICODE_LETTER_NUMBER,
-  G_UNICODE_OTHER_NUMBER,
-  G_UNICODE_CONNECT_PUNCTUATION,
-  G_UNICODE_DASH_PUNCTUATION,
-  G_UNICODE_CLOSE_PUNCTUATION,
-  G_UNICODE_FINAL_PUNCTUATION,
-  G_UNICODE_INITIAL_PUNCTUATION,
-  G_UNICODE_OTHER_PUNCTUATION,
-  G_UNICODE_OPEN_PUNCTUATION,
-  G_UNICODE_CURRENCY_SYMBOL,
-  G_UNICODE_MODIFIER_SYMBOL,
-  G_UNICODE_MATH_SYMBOL,
-  G_UNICODE_OTHER_SYMBOL,
-  G_UNICODE_LINE_SEPARATOR,
-  G_UNICODE_PARAGRAPH_SEPARATOR,
-  G_UNICODE_SPACE_SEPARATOR
-} GUnicodeType;
-
-/**
- * G_UNICODE_COMBINING_MARK:
- *
- * Older name for %G_UNICODE_SPACING_MARK.
- *
- * Deprecated: 2.30: Use %G_UNICODE_SPACING_MARK.
- */
-#ifndef G_DISABLE_DEPRECATED
-#define G_UNICODE_COMBINING_MARK G_UNICODE_SPACING_MARK
-#endif
-
-/**
- * GUnicodeBreakType:
- * @G_UNICODE_BREAK_MANDATORY: Mandatory Break (BK)
- * @G_UNICODE_BREAK_CARRIAGE_RETURN: Carriage Return (CR)
- * @G_UNICODE_BREAK_LINE_FEED: Line Feed (LF)
- * @G_UNICODE_BREAK_COMBINING_MARK: Attached Characters and Combining Marks (CM)
- * @G_UNICODE_BREAK_SURROGATE: Surrogates (SG)
- * @G_UNICODE_BREAK_ZERO_WIDTH_SPACE: Zero Width Space (ZW)
- * @G_UNICODE_BREAK_INSEPARABLE: Inseparable (IN)
- * @G_UNICODE_BREAK_NON_BREAKING_GLUE: Non-breaking ("Glue") (GL)
- * @G_UNICODE_BREAK_CONTINGENT: Contingent Break Opportunity (CB)
- * @G_UNICODE_BREAK_SPACE: Space (SP)
- * @G_UNICODE_BREAK_AFTER: Break Opportunity After (BA)
- * @G_UNICODE_BREAK_BEFORE: Break Opportunity Before (BB)
- * @G_UNICODE_BREAK_BEFORE_AND_AFTER: Break Opportunity Before and After (B2)
- * @G_UNICODE_BREAK_HYPHEN: Hyphen (HY)
- * @G_UNICODE_BREAK_NON_STARTER: Nonstarter (NS)
- * @G_UNICODE_BREAK_OPEN_PUNCTUATION: Opening Punctuation (OP)
- * @G_UNICODE_BREAK_CLOSE_PUNCTUATION: Closing Punctuation (CL)
- * @G_UNICODE_BREAK_QUOTATION: Ambiguous Quotation (QU)
- * @G_UNICODE_BREAK_EXCLAMATION: Exclamation/Interrogation (EX)
- * @G_UNICODE_BREAK_IDEOGRAPHIC: Ideographic (ID)
- * @G_UNICODE_BREAK_NUMERIC: Numeric (NU)
- * @G_UNICODE_BREAK_INFIX_SEPARATOR: Infix Separator (Numeric) (IS)
- * @G_UNICODE_BREAK_SYMBOL: Symbols Allowing Break After (SY)
- * @G_UNICODE_BREAK_ALPHABETIC: Ordinary Alphabetic and Symbol Characters (AL)
- * @G_UNICODE_BREAK_PREFIX: Prefix (Numeric) (PR)
- * @G_UNICODE_BREAK_POSTFIX: Postfix (Numeric) (PO)
- * @G_UNICODE_BREAK_COMPLEX_CONTEXT: Complex Content Dependent (South East Asian) (SA)
- * @G_UNICODE_BREAK_AMBIGUOUS: Ambiguous (Alphabetic or Ideographic) (AI)
- * @G_UNICODE_BREAK_UNKNOWN: Unknown (XX)
- * @G_UNICODE_BREAK_NEXT_LINE: Next Line (NL)
- * @G_UNICODE_BREAK_WORD_JOINER: Word Joiner (WJ)
- * @G_UNICODE_BREAK_HANGUL_L_JAMO: Hangul L Jamo (JL)
- * @G_UNICODE_BREAK_HANGUL_V_JAMO: Hangul V Jamo (JV)
- * @G_UNICODE_BREAK_HANGUL_T_JAMO: Hangul T Jamo (JT)
- * @G_UNICODE_BREAK_HANGUL_LV_SYLLABLE: Hangul LV Syllable (H2)
- * @G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE: Hangul LVT Syllable (H3)
- * @G_UNICODE_BREAK_CLOSE_PARANTHESIS: Closing Parenthesis (CP). Since 2.28
- * @G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER: Conditional Japanese Starter (CJ). Since: 2.32
- * @G_UNICODE_BREAK_HEBREW_LETTER: Hebrew Letter (HL). Since: 2.32
- *
- * These are the possible line break classifications.
- *
- * The five Hangul types were added in Unicode 4.1, so, has been
- * introduced in GLib 2.10. Note that new types may be added in the future.
- * Applications should be ready to handle unknown values.
- * They may be regarded as %G_UNICODE_BREAK_UNKNOWN.
- *
- * See <ulink url="http://www.unicode.org/unicode/reports/tr14/">http://www.unicode.org/unicode/reports/tr14/</ulink>.
- */
-typedef enum
-{
-  G_UNICODE_BREAK_MANDATORY,
-  G_UNICODE_BREAK_CARRIAGE_RETURN,
-  G_UNICODE_BREAK_LINE_FEED,
-  G_UNICODE_BREAK_COMBINING_MARK,
-  G_UNICODE_BREAK_SURROGATE,
-  G_UNICODE_BREAK_ZERO_WIDTH_SPACE,
-  G_UNICODE_BREAK_INSEPARABLE,
-  G_UNICODE_BREAK_NON_BREAKING_GLUE,
-  G_UNICODE_BREAK_CONTINGENT,
-  G_UNICODE_BREAK_SPACE,
-  G_UNICODE_BREAK_AFTER,
-  G_UNICODE_BREAK_BEFORE,
-  G_UNICODE_BREAK_BEFORE_AND_AFTER,
-  G_UNICODE_BREAK_HYPHEN,
-  G_UNICODE_BREAK_NON_STARTER,
-  G_UNICODE_BREAK_OPEN_PUNCTUATION,
-  G_UNICODE_BREAK_CLOSE_PUNCTUATION,
-  G_UNICODE_BREAK_QUOTATION,
-  G_UNICODE_BREAK_EXCLAMATION,
-  G_UNICODE_BREAK_IDEOGRAPHIC,
-  G_UNICODE_BREAK_NUMERIC,
-  G_UNICODE_BREAK_INFIX_SEPARATOR,
-  G_UNICODE_BREAK_SYMBOL,
-  G_UNICODE_BREAK_ALPHABETIC,
-  G_UNICODE_BREAK_PREFIX,
-  G_UNICODE_BREAK_POSTFIX,
-  G_UNICODE_BREAK_COMPLEX_CONTEXT,
-  G_UNICODE_BREAK_AMBIGUOUS,
-  G_UNICODE_BREAK_UNKNOWN,
-  G_UNICODE_BREAK_NEXT_LINE,
-  G_UNICODE_BREAK_WORD_JOINER,
-  G_UNICODE_BREAK_HANGUL_L_JAMO,
-  G_UNICODE_BREAK_HANGUL_V_JAMO,
-  G_UNICODE_BREAK_HANGUL_T_JAMO,
-  G_UNICODE_BREAK_HANGUL_LV_SYLLABLE,
-  G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
-  G_UNICODE_BREAK_CLOSE_PARANTHESIS,
-  G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
-  G_UNICODE_BREAK_HEBREW_LETTER
-} GUnicodeBreakType;
-
-/**
- * GUnicodeScript:
- * @G_UNICODE_SCRIPT_INVALID_CODE:
- *                               a value never returned from g_unichar_get_script()
- * @G_UNICODE_SCRIPT_COMMON:     a character used by multiple different scripts
- * @G_UNICODE_SCRIPT_INHERITED:  a mark glyph that takes its script from the
- * i                             base glyph to which it is attached
- * @G_UNICODE_SCRIPT_ARABIC:     Arabic
- * @G_UNICODE_SCRIPT_ARMENIAN:   Armenian
- * @G_UNICODE_SCRIPT_BENGALI:    Bengali
- * @G_UNICODE_SCRIPT_BOPOMOFO:   Bopomofo
- * @G_UNICODE_SCRIPT_CHEROKEE:   Cherokee
- * @G_UNICODE_SCRIPT_COPTIC:     Coptic
- * @G_UNICODE_SCRIPT_CYRILLIC:   Cyrillic
- * @G_UNICODE_SCRIPT_DESERET:    Deseret
- * @G_UNICODE_SCRIPT_DEVANAGARI: Devanagari
- * @G_UNICODE_SCRIPT_ETHIOPIC:   Ethiopic
- * @G_UNICODE_SCRIPT_GEORGIAN:   Georgian
- * @G_UNICODE_SCRIPT_GOTHIC:     Gothic
- * @G_UNICODE_SCRIPT_GREEK:      Greek
- * @G_UNICODE_SCRIPT_GUJARATI:   Gujarati
- * @G_UNICODE_SCRIPT_GURMUKHI:   Gurmukhi
- * @G_UNICODE_SCRIPT_HAN:        Han
- * @G_UNICODE_SCRIPT_HANGUL:     Hangul
- * @G_UNICODE_SCRIPT_HEBREW:     Hebrew
- * @G_UNICODE_SCRIPT_HIRAGANA:   Hiragana
- * @G_UNICODE_SCRIPT_KANNADA:    Kannada
- * @G_UNICODE_SCRIPT_KATAKANA:   Katakana
- * @G_UNICODE_SCRIPT_KHMER:      Khmer
- * @G_UNICODE_SCRIPT_LAO:        Lao
- * @G_UNICODE_SCRIPT_LATIN:      Latin
- * @G_UNICODE_SCRIPT_MALAYALAM:  Malayalam
- * @G_UNICODE_SCRIPT_MONGOLIAN:  Mongolian
- * @G_UNICODE_SCRIPT_MYANMAR:    Myanmar
- * @G_UNICODE_SCRIPT_OGHAM:      Ogham
- * @G_UNICODE_SCRIPT_OLD_ITALIC: Old Italic
- * @G_UNICODE_SCRIPT_ORIYA:      Oriya
- * @G_UNICODE_SCRIPT_RUNIC:      Runic
- * @G_UNICODE_SCRIPT_SINHALA:    Sinhala
- * @G_UNICODE_SCRIPT_SYRIAC:     Syriac
- * @G_UNICODE_SCRIPT_TAMIL:      Tamil
- * @G_UNICODE_SCRIPT_TELUGU:     Telugu
- * @G_UNICODE_SCRIPT_THAANA:     Thaana
- * @G_UNICODE_SCRIPT_THAI:       Thai
- * @G_UNICODE_SCRIPT_TIBETAN:    Tibetan
- * @G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL:
- *                               Canadian Aboriginal
- * @G_UNICODE_SCRIPT_YI:         Yi
- * @G_UNICODE_SCRIPT_TAGALOG:    Tagalog
- * @G_UNICODE_SCRIPT_HANUNOO:    Hanunoo
- * @G_UNICODE_SCRIPT_BUHID:      Buhid
- * @G_UNICODE_SCRIPT_TAGBANWA:   Tagbanwa
- * @G_UNICODE_SCRIPT_BRAILLE:    Braille
- * @G_UNICODE_SCRIPT_CYPRIOT:    Cypriot
- * @G_UNICODE_SCRIPT_LIMBU:      Limbu
- * @G_UNICODE_SCRIPT_OSMANYA:    Osmanya
- * @G_UNICODE_SCRIPT_SHAVIAN:    Shavian
- * @G_UNICODE_SCRIPT_LINEAR_B:   Linear B
- * @G_UNICODE_SCRIPT_TAI_LE:     Tai Le
- * @G_UNICODE_SCRIPT_UGARITIC:   Ugaritic
- * @G_UNICODE_SCRIPT_NEW_TAI_LUE:
- *                               New Tai Lue
- * @G_UNICODE_SCRIPT_BUGINESE:   Buginese
- * @G_UNICODE_SCRIPT_GLAGOLITIC: Glagolitic
- * @G_UNICODE_SCRIPT_TIFINAGH:   Tifinagh
- * @G_UNICODE_SCRIPT_SYLOTI_NAGRI:
- *                               Syloti Nagri
- * @G_UNICODE_SCRIPT_OLD_PERSIAN:
- *                               Old Persian
- * @G_UNICODE_SCRIPT_KHAROSHTHI: Kharoshthi
- * @G_UNICODE_SCRIPT_UNKNOWN:    an unassigned code point
- * @G_UNICODE_SCRIPT_BALINESE:   Balinese
- * @G_UNICODE_SCRIPT_CUNEIFORM:  Cuneiform
- * @G_UNICODE_SCRIPT_PHOENICIAN: Phoenician
- * @G_UNICODE_SCRIPT_PHAGS_PA:   Phags-pa
- * @G_UNICODE_SCRIPT_NKO:        N'Ko
- * @G_UNICODE_SCRIPT_KAYAH_LI:   Kayah Li. Since 2.16.3
- * @G_UNICODE_SCRIPT_LEPCHA:     Lepcha. Since 2.16.3
- * @G_UNICODE_SCRIPT_REJANG:     Rejang. Since 2.16.3
- * @G_UNICODE_SCRIPT_SUNDANESE:  Sundanese. Since 2.16.3
- * @G_UNICODE_SCRIPT_SAURASHTRA: Saurashtra. Since 2.16.3
- * @G_UNICODE_SCRIPT_CHAM:       Cham. Since 2.16.3
- * @G_UNICODE_SCRIPT_OL_CHIKI:   Ol Chiki. Since 2.16.3
- * @G_UNICODE_SCRIPT_VAI:        Vai. Since 2.16.3
- * @G_UNICODE_SCRIPT_CARIAN:     Carian. Since 2.16.3
- * @G_UNICODE_SCRIPT_LYCIAN:     Lycian. Since 2.16.3
- * @G_UNICODE_SCRIPT_LYDIAN:     Lydian. Since 2.16.3
- * @G_UNICODE_SCRIPT_AVESTAN:    Avestan. Since 2.26
- * @G_UNICODE_SCRIPT_BAMUM:      Bamum. Since 2.26
- * @G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS:
- *                               Egyptian Hieroglpyhs. Since 2.26
- * @G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC:
- *                               Imperial Aramaic. Since 2.26
- * @G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI:
- *                               Inscriptional Pahlavi. Since 2.26
- * @G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN:
- *                               Inscriptional Parthian. Since 2.26
- * @G_UNICODE_SCRIPT_JAVANESE:   Javanese. Since 2.26
- * @G_UNICODE_SCRIPT_KAITHI:     Kaithi. Since 2.26
- * @G_UNICODE_SCRIPT_LISU:       Lisu. Since 2.26
- * @G_UNICODE_SCRIPT_MEETEI_MAYEK:
- *                               Meetei Mayek. Since 2.26
- * @G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN:
- *                               Old South Arabian. Since 2.26
- * @G_UNICODE_SCRIPT_OLD_TURKIC: Old Turkic. Since 2.28
- * @G_UNICODE_SCRIPT_SAMARITAN:  Samaritan. Since 2.26
- * @G_UNICODE_SCRIPT_TAI_THAM:   Tai Tham. Since 2.26
- * @G_UNICODE_SCRIPT_TAI_VIET:   Tai Viet. Since 2.26
- * @G_UNICODE_SCRIPT_BATAK:      Batak. Since 2.28
- * @G_UNICODE_SCRIPT_BRAHMI:     Brahmi. Since 2.28
- * @G_UNICODE_SCRIPT_MANDAIC:    Mandaic. Since 2.28
- * @G_UNICODE_SCRIPT_CHAKMA:               Chakma. Since: 2.32
- * @G_UNICODE_SCRIPT_MEROITIC_CURSIVE:     Meroitic Cursive. Since: 2.32
- * @G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS: Meroitic Hieroglyphs. Since: 2.32
- * @G_UNICODE_SCRIPT_MIAO:                 Miao. Since: 2.32
- * @G_UNICODE_SCRIPT_SHARADA:              Sharada. Since: 2.32
- * @G_UNICODE_SCRIPT_SORA_SOMPENG:         Sora Sompeng. Since: 2.32
- * @G_UNICODE_SCRIPT_TAKRI:                Takri. Since: 2.32
- *
- * The #GUnicodeScript enumeration identifies different writing
- * systems. The values correspond to the names as defined in the
- * Unicode standard. The enumeration has been added in GLib 2.14,
- * and is interchangeable with #PangoScript.
- *
- * Note that new types may be added in the future. Applications
- * should be ready to handle unknown values.
- * See <ulink
- * url="http://www.unicode.org/reports/tr24/">Unicode Standard Annex
- * #24: Script names</ulink>.
- */
-typedef enum
-{                         /* ISO 15924 code */
-  G_UNICODE_SCRIPT_INVALID_CODE = -1,
-  G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
-  G_UNICODE_SCRIPT_INHERITED,          /* Zinh (Qaai) */
-  G_UNICODE_SCRIPT_ARABIC,             /* Arab */
-  G_UNICODE_SCRIPT_ARMENIAN,           /* Armn */
-  G_UNICODE_SCRIPT_BENGALI,            /* Beng */
-  G_UNICODE_SCRIPT_BOPOMOFO,           /* Bopo */
-  G_UNICODE_SCRIPT_CHEROKEE,           /* Cher */
-  G_UNICODE_SCRIPT_COPTIC,             /* Copt (Qaac) */
-  G_UNICODE_SCRIPT_CYRILLIC,           /* Cyrl (Cyrs) */
-  G_UNICODE_SCRIPT_DESERET,            /* Dsrt */
-  G_UNICODE_SCRIPT_DEVANAGARI,         /* Deva */
-  G_UNICODE_SCRIPT_ETHIOPIC,           /* Ethi */
-  G_UNICODE_SCRIPT_GEORGIAN,           /* Geor (Geon, Geoa) */
-  G_UNICODE_SCRIPT_GOTHIC,             /* Goth */
-  G_UNICODE_SCRIPT_GREEK,              /* Grek */
-  G_UNICODE_SCRIPT_GUJARATI,           /* Gujr */
-  G_UNICODE_SCRIPT_GURMUKHI,           /* Guru */
-  G_UNICODE_SCRIPT_HAN,                /* Hani */
-  G_UNICODE_SCRIPT_HANGUL,             /* Hang */
-  G_UNICODE_SCRIPT_HEBREW,             /* Hebr */
-  G_UNICODE_SCRIPT_HIRAGANA,           /* Hira */
-  G_UNICODE_SCRIPT_KANNADA,            /* Knda */
-  G_UNICODE_SCRIPT_KATAKANA,           /* Kana */
-  G_UNICODE_SCRIPT_KHMER,              /* Khmr */
-  G_UNICODE_SCRIPT_LAO,                /* Laoo */
-  G_UNICODE_SCRIPT_LATIN,              /* Latn (Latf, Latg) */
-  G_UNICODE_SCRIPT_MALAYALAM,          /* Mlym */
-  G_UNICODE_SCRIPT_MONGOLIAN,          /* Mong */
-  G_UNICODE_SCRIPT_MYANMAR,            /* Mymr */
-  G_UNICODE_SCRIPT_OGHAM,              /* Ogam */
-  G_UNICODE_SCRIPT_OLD_ITALIC,         /* Ital */
-  G_UNICODE_SCRIPT_ORIYA,              /* Orya */
-  G_UNICODE_SCRIPT_RUNIC,              /* Runr */
-  G_UNICODE_SCRIPT_SINHALA,            /* Sinh */
-  G_UNICODE_SCRIPT_SYRIAC,             /* Syrc (Syrj, Syrn, Syre) */
-  G_UNICODE_SCRIPT_TAMIL,              /* Taml */
-  G_UNICODE_SCRIPT_TELUGU,             /* Telu */
-  G_UNICODE_SCRIPT_THAANA,             /* Thaa */
-  G_UNICODE_SCRIPT_THAI,               /* Thai */
-  G_UNICODE_SCRIPT_TIBETAN,            /* Tibt */
-  G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL, /* Cans */
-  G_UNICODE_SCRIPT_YI,                 /* Yiii */
-  G_UNICODE_SCRIPT_TAGALOG,            /* Tglg */
-  G_UNICODE_SCRIPT_HANUNOO,            /* Hano */
-  G_UNICODE_SCRIPT_BUHID,              /* Buhd */
-  G_UNICODE_SCRIPT_TAGBANWA,           /* Tagb */
-
-  /* Unicode-4.0 additions */
-  G_UNICODE_SCRIPT_BRAILLE,            /* Brai */
-  G_UNICODE_SCRIPT_CYPRIOT,            /* Cprt */
-  G_UNICODE_SCRIPT_LIMBU,              /* Limb */
-  G_UNICODE_SCRIPT_OSMANYA,            /* Osma */
-  G_UNICODE_SCRIPT_SHAVIAN,            /* Shaw */
-  G_UNICODE_SCRIPT_LINEAR_B,           /* Linb */
-  G_UNICODE_SCRIPT_TAI_LE,             /* Tale */
-  G_UNICODE_SCRIPT_UGARITIC,           /* Ugar */
-
-  /* Unicode-4.1 additions */
-  G_UNICODE_SCRIPT_NEW_TAI_LUE,        /* Talu */
-  G_UNICODE_SCRIPT_BUGINESE,           /* Bugi */
-  G_UNICODE_SCRIPT_GLAGOLITIC,         /* Glag */
-  G_UNICODE_SCRIPT_TIFINAGH,           /* Tfng */
-  G_UNICODE_SCRIPT_SYLOTI_NAGRI,       /* Sylo */
-  G_UNICODE_SCRIPT_OLD_PERSIAN,        /* Xpeo */
-  G_UNICODE_SCRIPT_KHAROSHTHI,         /* Khar */
-
-  /* Unicode-5.0 additions */
-  G_UNICODE_SCRIPT_UNKNOWN,            /* Zzzz */
-  G_UNICODE_SCRIPT_BALINESE,           /* Bali */
-  G_UNICODE_SCRIPT_CUNEIFORM,          /* Xsux */
-  G_UNICODE_SCRIPT_PHOENICIAN,         /* Phnx */
-  G_UNICODE_SCRIPT_PHAGS_PA,           /* Phag */
-  G_UNICODE_SCRIPT_NKO,                /* Nkoo */
-
-  /* Unicode-5.1 additions */
-  G_UNICODE_SCRIPT_KAYAH_LI,           /* Kali */
-  G_UNICODE_SCRIPT_LEPCHA,             /* Lepc */
-  G_UNICODE_SCRIPT_REJANG,             /* Rjng */
-  G_UNICODE_SCRIPT_SUNDANESE,          /* Sund */
-  G_UNICODE_SCRIPT_SAURASHTRA,         /* Saur */
-  G_UNICODE_SCRIPT_CHAM,               /* Cham */
-  G_UNICODE_SCRIPT_OL_CHIKI,           /* Olck */
-  G_UNICODE_SCRIPT_VAI,                /* Vaii */
-  G_UNICODE_SCRIPT_CARIAN,             /* Cari */
-  G_UNICODE_SCRIPT_LYCIAN,             /* Lyci */
-  G_UNICODE_SCRIPT_LYDIAN,             /* Lydi */
-
-  /* Unicode-5.2 additions */
-  G_UNICODE_SCRIPT_AVESTAN,                /* Avst */
-  G_UNICODE_SCRIPT_BAMUM,                  /* Bamu */
-  G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS,   /* Egyp */
-  G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC,       /* Armi */
-  G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI,  /* Phli */
-  G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN, /* Prti */
-  G_UNICODE_SCRIPT_JAVANESE,               /* Java */
-  G_UNICODE_SCRIPT_KAITHI,                 /* Kthi */
-  G_UNICODE_SCRIPT_LISU,                   /* Lisu */
-  G_UNICODE_SCRIPT_MEETEI_MAYEK,           /* Mtei */
-  G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN,      /* Sarb */
-  G_UNICODE_SCRIPT_OLD_TURKIC,             /* Orkh */
-  G_UNICODE_SCRIPT_SAMARITAN,              /* Samr */
-  G_UNICODE_SCRIPT_TAI_THAM,               /* Lana */
-  G_UNICODE_SCRIPT_TAI_VIET,               /* Tavt */
-
-  /* Unicode-6.0 additions */
-  G_UNICODE_SCRIPT_BATAK,                  /* Batk */
-  G_UNICODE_SCRIPT_BRAHMI,                 /* Brah */
-  G_UNICODE_SCRIPT_MANDAIC,                /* Mand */
-
-  /* Unicode-6.1 additions */
-  G_UNICODE_SCRIPT_CHAKMA,                 /* Cakm */
-  G_UNICODE_SCRIPT_MEROITIC_CURSIVE,       /* Merc */
-  G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS,   /* Mero */
-  G_UNICODE_SCRIPT_MIAO,                   /* Plrd */
-  G_UNICODE_SCRIPT_SHARADA,                /* Shrd */
-  G_UNICODE_SCRIPT_SORA_SOMPENG,           /* Sora */
-  G_UNICODE_SCRIPT_TAKRI                   /* Takr */
-} GUnicodeScript;
-
-guint32        g_unicode_script_to_iso15924   (GUnicodeScript script);
-GUnicodeScript g_unicode_script_from_iso15924 (guint32        iso15924);
-
-/* These are all analogs of the <ctype.h> functions.
- */
-gboolean g_unichar_isalnum   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isalpha   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iscntrl   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdigit   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isgraph   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_islower   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isprint   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ispunct   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isspace   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isupper   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isxdigit  (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_istitle   (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_isdefined (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide    (gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iswide_cjk(gunichar c) G_GNUC_CONST;
-gboolean g_unichar_iszerowidth(gunichar c) G_GNUC_CONST;
-gboolean g_unichar_ismark    (gunichar c) G_GNUC_CONST;
-
-/* More <ctype.h> functions.  These convert between the three cases.
- * See the Unicode book to understand title case.  */
-gunichar g_unichar_toupper (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_tolower (gunichar c) G_GNUC_CONST;
-gunichar g_unichar_totitle (gunichar c) G_GNUC_CONST;
-
-/* If C is a digit (according to `g_unichar_isdigit'), then return its
-   numeric value.  Otherwise return -1.  */
-gint g_unichar_digit_value (gunichar c) G_GNUC_CONST;
-
-gint g_unichar_xdigit_value (gunichar c) G_GNUC_CONST;
-
-/* Return the Unicode character type of a given character.  */
-GUnicodeType g_unichar_type (gunichar c) G_GNUC_CONST;
-
-/* Return the line break property for a given character */
-GUnicodeBreakType g_unichar_break_type (gunichar c) G_GNUC_CONST;
-
-/* Returns the combining class for a given character */
-gint g_unichar_combining_class (gunichar uc) G_GNUC_CONST;
-
-gboolean g_unichar_get_mirror_char (gunichar ch,
-                                    gunichar *mirrored_ch);
-
-GUnicodeScript g_unichar_get_script (gunichar ch) G_GNUC_CONST;
-
-/* Validate a Unicode character */
-gboolean g_unichar_validate (gunichar ch) G_GNUC_CONST;
-
-/* Pairwise canonical compose/decompose */
-gboolean g_unichar_compose (gunichar  a,
-                            gunichar  b,
-                            gunichar *ch);
-gboolean g_unichar_decompose (gunichar  ch,
-                              gunichar *a,
-                              gunichar *b);
-
-gsize g_unichar_fully_decompose (gunichar  ch,
-                                 gboolean  compat,
-                                 gunichar *result,
-                                 gsize     result_len);
-
-/**
- * G_UNICHAR_MAX_DECOMPOSITION_LENGTH:
- *
- * The maximum length (in codepoints) of a compatibility or canonical
- * decomposition of a single Unicode character.
- *
- * This is as defined by Unicode 6.1.
- *
- * Since: 2.32
- */
-#define G_UNICHAR_MAX_DECOMPOSITION_LENGTH 18 /* codepoints */
-
-/* Compute canonical ordering of a string in-place.  This rearranges
-   decomposed characters in the string according to their combining
-   classes.  See the Unicode manual for more information.  */
-void g_unicode_canonical_ordering (gunichar *string,
-                                   gsize     len);
-
-
-GLIB_DEPRECATED_IN_2_30
-gunichar *g_unicode_canonical_decomposition (gunichar  ch,
-                                             gsize    *result_len) G_GNUC_MALLOC;
-
-/* Array of skip-bytes-per-initial character.
- */
-GLIB_VAR const gchar * const g_utf8_skip;
-
-/**
- * g_utf8_next_char:
- * @p: Pointer to the start of a valid UTF-8 character
- *
- * Skips to the next character in a UTF-8 string. The string must be
- * valid; this macro is as fast as possible, and has no error-checking.
- * You would use this macro to iterate over a string character by
- * character. The macro returns the start of the next UTF-8 character.
- * Before using this macro, use g_utf8_validate() to validate strings
- * that may contain invalid UTF-8.
- */
-#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(const guchar *)(p)])
-
-gunichar g_utf8_get_char           (const gchar  *p) G_GNUC_PURE;
-gunichar g_utf8_get_char_validated (const  gchar *p,
-                                    gssize        max_len) G_GNUC_PURE;
-
-gchar*   g_utf8_offset_to_pointer (const gchar *str,
-                                   glong        offset) G_GNUC_PURE;
-glong    g_utf8_pointer_to_offset (const gchar *str,
-                                   const gchar *pos) G_GNUC_PURE;
-gchar*   g_utf8_prev_char         (const gchar *p) G_GNUC_PURE;
-gchar*   g_utf8_find_next_char    (const gchar *p,
-                                   const gchar *end) G_GNUC_PURE;
-gchar*   g_utf8_find_prev_char    (const gchar *str,
-                                   const gchar *p) G_GNUC_PURE;
-
-glong    g_utf8_strlen            (const gchar *p,
-                                   gssize       max) G_GNUC_PURE;
-
-GLIB_AVAILABLE_IN_2_30
-gchar   *g_utf8_substring         (const gchar *str,
-                                   glong        start_pos,
-                                   glong        end_pos) G_GNUC_MALLOC;
-
-gchar   *g_utf8_strncpy           (gchar       *dest,
-                                   const gchar *src,
-                                   gsize        n);
-
-/* Find the UTF-8 character corresponding to ch, in string p. These
-   functions are equivalants to strchr and strrchr */
-gchar* g_utf8_strchr  (const gchar *p,
-                       gssize       len,
-                       gunichar     c);
-gchar* g_utf8_strrchr (const gchar *p,
-                       gssize       len,
-                       gunichar     c);
-gchar* g_utf8_strreverse (const gchar *str,
-                          gssize len);
-
-gunichar2 *g_utf8_to_utf16     (const gchar      *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4      (const gchar      *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gunichar * g_utf8_to_ucs4_fast (const gchar      *str,
-                                glong             len,
-                                glong            *items_written) G_GNUC_MALLOC;
-gunichar * g_utf16_to_ucs4     (const gunichar2  *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gchar*     g_utf16_to_utf8     (const gunichar2  *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gunichar2 *g_ucs4_to_utf16     (const gunichar   *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-gchar*     g_ucs4_to_utf8      (const gunichar   *str,
-                                glong             len,
-                                glong            *items_read,
-                                glong            *items_written,
-                                GError          **error) G_GNUC_MALLOC;
-
-gint      g_unichar_to_utf8 (gunichar    c,
-                             gchar      *outbuf);
-
-gboolean g_utf8_validate (const gchar  *str,
-                          gssize        max_len,
-                          const gchar **end);
-
-gchar *g_utf8_strup   (const gchar *str,
-                       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_strdown (const gchar *str,
-                       gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_casefold (const gchar *str,
-                        gssize       len) G_GNUC_MALLOC;
-
-/**
- * GNormalizeMode:
- * @G_NORMALIZE_DEFAULT: standardize differences that do not affect the
- *     text content, such as the above-mentioned accent representation
- * @G_NORMALIZE_NFD: another name for %G_NORMALIZE_DEFAULT
- * @G_NORMALIZE_DEFAULT_COMPOSE: like %G_NORMALIZE_DEFAULT, but with
- *     composed forms rather than a maximally decomposed form
- * @G_NORMALIZE_NFC: another name for %G_NORMALIZE_DEFAULT_COMPOSE
- * @G_NORMALIZE_ALL: beyond %G_NORMALIZE_DEFAULT also standardize the
- *     "compatibility" characters in Unicode, such as SUPERSCRIPT THREE
- *     to the standard forms (in this case DIGIT THREE). Formatting
- *     information may be lost but for most text operations such
- *     characters should be considered the same
- * @G_NORMALIZE_NFKD: another name for %G_NORMALIZE_ALL
- * @G_NORMALIZE_ALL_COMPOSE: like %G_NORMALIZE_ALL, but with composed
- *     forms rather than a maximally decomposed form
- * @G_NORMALIZE_NFKC: another name for %G_NORMALIZE_ALL_COMPOSE
- *
- * Defines how a Unicode string is transformed in a canonical
- * form, standardizing such issues as whether a character with
- * an accent is represented as a base character and combining
- * accent or as a single precomposed character. Unicode strings
- * should generally be normalized before comparing them.
- */
-typedef enum {
-  G_NORMALIZE_DEFAULT,
-  G_NORMALIZE_NFD = G_NORMALIZE_DEFAULT,
-  G_NORMALIZE_DEFAULT_COMPOSE,
-  G_NORMALIZE_NFC = G_NORMALIZE_DEFAULT_COMPOSE,
-  G_NORMALIZE_ALL,
-  G_NORMALIZE_NFKD = G_NORMALIZE_ALL,
-  G_NORMALIZE_ALL_COMPOSE,
-  G_NORMALIZE_NFKC = G_NORMALIZE_ALL_COMPOSE
-} GNormalizeMode;
-
-gchar *g_utf8_normalize (const gchar   *str,
-                         gssize         len,
-                         GNormalizeMode mode) G_GNUC_MALLOC;
-
-gint   g_utf8_collate     (const gchar *str1,
-                           const gchar *str2) G_GNUC_PURE;
-gchar *g_utf8_collate_key (const gchar *str,
-                           gssize       len) G_GNUC_MALLOC;
-gchar *g_utf8_collate_key_for_filename (const gchar *str,
-                                        gssize       len) G_GNUC_MALLOC;
-
-
-/* private */
-
-gchar *_g_utf8_make_valid (const gchar *name);
-
-G_END_DECLS
-
-#endif /* __G_UNICODE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gurifuncs.h b/GstreamerHelper/x86/include/glib-2.0/glib/gurifuncs.h
deleted file mode 100644
index 6e6b7391..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gurifuncs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_URI_FUNCS_H__
-#define __G_URI_FUNCS_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_URI_RESERVED_CHARS_GENERIC_DELIMITERS:
- * 
- * Generic delimiters characters as defined in RFC 3986. Includes ":/?#[]@".
- **/
-#define G_URI_RESERVED_CHARS_GENERIC_DELIMITERS ":/?#[]@"
-
-/**
- * G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS:
- * 
- * Subcomponent delimiter characters as defined in RFC 3986. Includes "!$&'()*+,;=".
- **/
-#define G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS "!$&'()*+,;="
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT:
- * 
- * Allowed characters in path elements. Includes "!$&'()*+,;=:@".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":@"
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_PATH:
- * 
- * Allowed characters in a path. Includes "!$&'()*+,;=:@/".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_PATH G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT "/"
-
-/**
- * G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO:
- * 
- * Allowed characters in userinfo as defined in RFC 3986. Includes "!$&'()*+,;=:".
- **/
-#define G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS ":"
-
-char *   g_uri_unescape_string       (const char *escaped_string,
-				      const char *illegal_characters);
-char *   g_uri_unescape_segment      (const char *escaped_string,
-				      const char *escaped_string_end,
-				      const char *illegal_characters);
-char *   g_uri_parse_scheme          (const char *uri);
-char *   g_uri_escape_string         (const char *unescaped,
-				      const char *reserved_chars_allowed,
-				      gboolean    allow_utf8);
-
-G_END_DECLS
-
-#endif /* __G_URI_FUNCS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gutils.h b/GstreamerHelper/x86/include/glib-2.0/glib/gutils.h
deleted file mode 100644
index 213a39fb..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gutils.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_UTILS_H__
-#define __G_UTILS_H__
-
-#include <glib/gtypes.h>
-#include <stdarg.h>
-
-G_BEGIN_DECLS
-
-/* Define G_VA_COPY() to do the right thing for copying va_list variables.
- * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
- */
-#if !defined (G_VA_COPY)
-#  if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32))
-#    define G_VA_COPY(ap1, ap2)	  (*(ap1) = *(ap2))
-#  elif defined (G_VA_COPY_AS_ARRAY)
-#    define G_VA_COPY(ap1, ap2)	  g_memmove ((ap1), (ap2), sizeof (va_list))
-#  else /* va_list is a pointer */
-#    define G_VA_COPY(ap1, ap2)	  ((ap1) = (ap2))
-#  endif /* va_list is a pointer */
-#endif /* !G_VA_COPY */
-
-/* inlining hassle. for compilers that don't allow the `inline' keyword,
- * mostly because of strict ANSI C compliance or dumbness, we try to fall
- * back to either `__inline__' or `__inline'.
- * G_CAN_INLINE is defined in glibconfig.h if the compiler seems to be 
- * actually *capable* to do function inlining, in which case inline 
- * function bodies do make sense. we also define G_INLINE_FUNC to properly 
- * export the function prototypes if no inlining can be performed.
- * inline function bodies have to be special cased with G_CAN_INLINE and a
- * .c file specific macro to allow one compiled instance with extern linkage
- * of the functions by defining G_IMPLEMENT_INLINES and the .c file macro.
- */
-#if defined (G_HAVE_INLINE) && defined (__GNUC__) && defined (__STRICT_ANSI__)
-#  undef inline
-#  define inline __inline__
-#elif !defined (G_HAVE_INLINE)
-#  undef inline
-#  if defined (G_HAVE___INLINE__)
-#    define inline __inline__
-#  elif defined (G_HAVE___INLINE)
-#    define inline __inline
-#  else /* !inline && !__inline__ && !__inline */
-#    define inline  /* don't inline, then */
-#  endif
-#endif
-#ifdef G_IMPLEMENT_INLINES
-#  define G_INLINE_FUNC
-#  undef  G_CAN_INLINE
-#elif defined (__GNUC__) 
-#  define G_INLINE_FUNC static __inline __attribute__ ((unused))
-#elif defined (G_CAN_INLINE) 
-#  define G_INLINE_FUNC static inline
-#else /* can't inline */
-#  define G_INLINE_FUNC
-#endif /* !G_INLINE_FUNC */
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_get_user_name g_get_user_name_utf8
-#define g_get_real_name g_get_real_name_utf8
-#define g_get_home_dir g_get_home_dir_utf8
-#define g_get_tmp_dir g_get_tmp_dir_utf8
-#endif
-#endif
-
-const gchar *         g_get_user_name        (void);
-const gchar *         g_get_real_name        (void);
-const gchar *         g_get_home_dir         (void);
-const gchar *         g_get_tmp_dir          (void);
-const gchar *         g_get_host_name	     (void);
-gchar *               g_get_prgname          (void);
-void                  g_set_prgname          (const gchar *prgname);
-const gchar *         g_get_application_name (void);
-void                  g_set_application_name (const gchar *application_name);
-
-void      g_reload_user_special_dirs_cache     (void);
-const gchar *         g_get_user_data_dir      (void);
-const gchar *         g_get_user_config_dir    (void);
-const gchar *         g_get_user_cache_dir     (void);
-const gchar * const * g_get_system_data_dirs   (void);
-
-#ifdef G_OS_WIN32
-/* This functions is not part of the public GLib API */
-const gchar * const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
-#endif
-
-#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
-/* This function is not part of the public GLib API either. Just call
- * g_get_system_data_dirs() in your code, never mind that that is
- * actually a macro and you will in fact call this inline function.
- */
-static inline const gchar * const *
-_g_win32_get_system_data_dirs (void)
-{
-  return g_win32_get_system_data_dirs_for_module ((void (*)(void)) &_g_win32_get_system_data_dirs);
-}
-#define g_get_system_data_dirs _g_win32_get_system_data_dirs
-#endif
-
-const gchar * const * g_get_system_config_dirs (void);
-
-const gchar * g_get_user_runtime_dir (void);
-
-/**
- * GUserDirectory:
- * @G_USER_DIRECTORY_DESKTOP: the user's Desktop directory
- * @G_USER_DIRECTORY_DOCUMENTS: the user's Documents directory
- * @G_USER_DIRECTORY_DOWNLOAD: the user's Downloads directory
- * @G_USER_DIRECTORY_MUSIC: the user's Music directory
- * @G_USER_DIRECTORY_PICTURES: the user's Pictures directory
- * @G_USER_DIRECTORY_PUBLIC_SHARE: the user's shared directory
- * @G_USER_DIRECTORY_TEMPLATES: the user's Templates directory
- * @G_USER_DIRECTORY_VIDEOS: the user's Movies directory
- * @G_USER_N_DIRECTORIES: the number of enum values
- *
- * These are logical ids for special directories which are defined
- * depending on the platform used. You should use g_get_user_special_dir()
- * to retrieve the full path associated to the logical id.
- *
- * The #GUserDirectory enumeration can be extended at later date. Not
- * every platform has a directory for every logical id in this
- * enumeration.
- *
- * Since: 2.14
- */
-typedef enum {
-  G_USER_DIRECTORY_DESKTOP,
-  G_USER_DIRECTORY_DOCUMENTS,
-  G_USER_DIRECTORY_DOWNLOAD,
-  G_USER_DIRECTORY_MUSIC,
-  G_USER_DIRECTORY_PICTURES,
-  G_USER_DIRECTORY_PUBLIC_SHARE,
-  G_USER_DIRECTORY_TEMPLATES,
-  G_USER_DIRECTORY_VIDEOS,
-
-  G_USER_N_DIRECTORIES
-} GUserDirectory;
-
-const gchar * g_get_user_special_dir (GUserDirectory directory);
-
-/**
- * GDebugKey:
- * @key: the string
- * @value: the flag
- *
- * Associates a string with a bit flag.
- * Used in g_parse_debug_string().
- */
-typedef struct _GDebugKey GDebugKey;
-struct _GDebugKey
-{
-  const gchar *key;
-  guint	       value;
-};
-
-/* Miscellaneous utility functions
- */
-guint                 g_parse_debug_string (const gchar     *string,
-					    const GDebugKey *keys,
-					    guint            nkeys);
-
-gint                  g_snprintf           (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    ...) G_GNUC_PRINTF (3, 4);
-gint                  g_vsnprintf          (gchar       *string,
-					    gulong       n,
-					    gchar const *format,
-					    va_list      args);
-
-void                  g_nullify_pointer    (gpointer    *nullify_location);
-
-typedef enum
-{
-  G_FORMAT_SIZE_DEFAULT     = 0,
-  G_FORMAT_SIZE_LONG_FORMAT = 1 << 0,
-  G_FORMAT_SIZE_IEC_UNITS   = 1 << 1
-} GFormatSizeFlags;
-
-GLIB_AVAILABLE_IN_2_30
-gchar *g_format_size_full   (guint64          size,
-                             GFormatSizeFlags flags);
-GLIB_AVAILABLE_IN_2_30
-gchar *g_format_size        (guint64          size);
-
-GLIB_DEPRECATED_FOR(g_format_size)
-gchar *g_format_size_for_display (goffset size);
-
-#ifndef G_DISABLE_DEPRECATED
-/**
- * GVoidFunc:
- *
- * Declares a type of function which takes no arguments
- * and has no return value. It is used to specify the type
- * function passed to g_atexit().
- */
-typedef void (*GVoidFunc) (void);
-#ifndef ATEXIT
-# define ATEXIT(proc) g_ATEXIT(proc)
-#else
-# define G_NATIVE_ATEXIT
-#endif /* ATEXIT */
-/* we use a GLib function as a replacement for ATEXIT, so
- * the programmer is not required to check the return value
- * (if there is any in the implementation) and doesn't encounter
- * missing include files.
- */
-GLIB_DEPRECATED
-void	g_atexit		(GVoidFunc    func);
-
-#ifdef G_OS_WIN32
-/* It's a bad idea to wrap atexit() on Windows. If the GLib DLL calls
- * atexit(), the function will be called when the GLib DLL is detached
- * from the program, which is not what the caller wants. The caller
- * wants the function to be called when it *itself* exits (or is
- * detached, in case the caller, too, is a DLL).
- */
-#if (defined(__MINGW_H) && !defined(_STDLIB_H_)) || (defined(_MSC_VER) && !defined(_INC_STDLIB))
-int atexit (void (*)(void));
-#endif
-#define g_atexit(func) atexit(func)
-#endif
-
-#endif  /* G_DISABLE_DEPRECATED */
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_find_program_in_path g_find_program_in_path_utf8
-#endif
-#endif
-
-/* Look for an executable in PATH, following execvp() rules */
-gchar*  g_find_program_in_path  (const gchar *program);
-
-/* Bit tests
- */
-G_INLINE_FUNC gint	g_bit_nth_lsf (gulong  mask,
-				       gint    nth_bit) G_GNUC_CONST;
-G_INLINE_FUNC gint	g_bit_nth_msf (gulong  mask,
-				       gint    nth_bit) G_GNUC_CONST;
-G_INLINE_FUNC guint	g_bit_storage (gulong  number) G_GNUC_CONST;
-
-/* inline function implementations
- */
-#if defined (G_CAN_INLINE) || defined (__G_UTILS_C__)
-G_INLINE_FUNC gint
-g_bit_nth_lsf (gulong mask,
-	       gint   nth_bit)
-{
-  if (G_UNLIKELY (nth_bit < -1))
-    nth_bit = -1;
-  while (nth_bit < ((GLIB_SIZEOF_LONG * 8) - 1))
-    {
-      nth_bit++;
-      if (mask & (1UL << nth_bit))
-	return nth_bit;
-    }
-  return -1;
-}
-G_INLINE_FUNC gint
-g_bit_nth_msf (gulong mask,
-	       gint   nth_bit)
-{
-  if (nth_bit < 0 || G_UNLIKELY (nth_bit > GLIB_SIZEOF_LONG * 8))
-    nth_bit = GLIB_SIZEOF_LONG * 8;
-  while (nth_bit > 0)
-    {
-      nth_bit--;
-      if (mask & (1UL << nth_bit))
-	return nth_bit;
-    }
-  return -1;
-}
-G_INLINE_FUNC guint
-g_bit_storage (gulong number)
-{
-#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
-  return G_LIKELY (number) ?
-	   ((GLIB_SIZEOF_LONG * 8U - 1) ^ (guint) __builtin_clzl(number)) + 1 : 1;
-#else
-  register guint n_bits = 0;
-  
-  do
-    {
-      n_bits++;
-      number >>= 1;
-    }
-  while (number);
-  return n_bits;
-#endif
-}
-#endif  /* G_CAN_INLINE || __G_UTILS_C__ */
-
-G_END_DECLS
-
-#ifndef G_DISABLE_DEPRECATED
-
-/*
- * This macro is deprecated. This DllMain() is too complex. It is
- * recommended to write an explicit minimal DLlMain() that just saves
- * the handle to the DLL and then use that handle instead, for
- * instance passing it to
- * g_win32_get_package_installation_directory_of_module().
- *
- * On Windows, this macro defines a DllMain function that stores the
- * actual DLL name that the code being compiled will be included in.
- * STATIC should be empty or 'static'. DLL_NAME is the name of the
- * (pointer to the) char array where the DLL name will be stored. If
- * this is used, you must also include <windows.h>. If you need a more complex
- * DLL entry point function, you cannot use this.
- *
- * On non-Windows platforms, expands to nothing.
- */
-
-#ifndef G_PLATFORM_WIN32
-# define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
-#else
-# define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)			\
-static char *dll_name;							\
-									\
-BOOL WINAPI								\
-DllMain (HINSTANCE hinstDLL,						\
-	 DWORD     fdwReason,						\
-	 LPVOID    lpvReserved)						\
-{									\
-  wchar_t wcbfr[1000];							\
-  char *tem;								\
-  switch (fdwReason)							\
-    {									\
-    case DLL_PROCESS_ATTACH:						\
-      GetModuleFileNameW ((HMODULE) hinstDLL, wcbfr, G_N_ELEMENTS (wcbfr)); \
-      tem = g_utf16_to_utf8 (wcbfr, -1, NULL, NULL, NULL);		\
-      dll_name = g_path_get_basename (tem);				\
-      g_free (tem);							\
-      break;								\
-    }									\
-									\
-  return TRUE;								\
-}
-
-#endif	/* !G_DISABLE_DEPRECATED */
-
-#endif /* G_PLATFORM_WIN32 */
-
-#endif /* __G_UTILS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gvariant.h b/GstreamerHelper/x86/include/glib-2.0/glib/gvariant.h
deleted file mode 100644
index 3c92d21a..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gvariant.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright © 2007, 2008 Ryan Lortie
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VARIANT_H__
-#define __G_VARIANT_H__
-
-#include <glib/gvarianttype.h>
-#include <glib/gstring.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GVariant        GVariant;
-
-typedef enum
-{
-  G_VARIANT_CLASS_BOOLEAN       = 'b',
-  G_VARIANT_CLASS_BYTE          = 'y',
-  G_VARIANT_CLASS_INT16         = 'n',
-  G_VARIANT_CLASS_UINT16        = 'q',
-  G_VARIANT_CLASS_INT32         = 'i',
-  G_VARIANT_CLASS_UINT32        = 'u',
-  G_VARIANT_CLASS_INT64         = 'x',
-  G_VARIANT_CLASS_UINT64        = 't',
-  G_VARIANT_CLASS_HANDLE        = 'h',
-  G_VARIANT_CLASS_DOUBLE        = 'd',
-  G_VARIANT_CLASS_STRING        = 's',
-  G_VARIANT_CLASS_OBJECT_PATH   = 'o',
-  G_VARIANT_CLASS_SIGNATURE     = 'g',
-  G_VARIANT_CLASS_VARIANT       = 'v',
-  G_VARIANT_CLASS_MAYBE         = 'm',
-  G_VARIANT_CLASS_ARRAY         = 'a',
-  G_VARIANT_CLASS_TUPLE         = '(',
-  G_VARIANT_CLASS_DICT_ENTRY    = '{'
-} GVariantClass;
-
-void                            g_variant_unref                         (GVariant             *value);
-GVariant *                      g_variant_ref                           (GVariant             *value);
-GVariant *                      g_variant_ref_sink                      (GVariant             *value);
-gboolean                        g_variant_is_floating                   (GVariant             *value);
-GVariant *                      g_variant_take_ref                      (GVariant             *value);
-
-const GVariantType *            g_variant_get_type                      (GVariant             *value);
-const gchar *                   g_variant_get_type_string               (GVariant             *value);
-gboolean                        g_variant_is_of_type                    (GVariant             *value,
-                                                                         const GVariantType   *type);
-gboolean                        g_variant_is_container                  (GVariant             *value);
-GVariantClass                   g_variant_classify                      (GVariant             *value);
-GVariant *                      g_variant_new_boolean                   (gboolean              value);
-GVariant *                      g_variant_new_byte                      (guchar                value);
-GVariant *                      g_variant_new_int16                     (gint16                value);
-GVariant *                      g_variant_new_uint16                    (guint16               value);
-GVariant *                      g_variant_new_int32                     (gint32                value);
-GVariant *                      g_variant_new_uint32                    (guint32               value);
-GVariant *                      g_variant_new_int64                     (gint64                value);
-GVariant *                      g_variant_new_uint64                    (guint64               value);
-GVariant *                      g_variant_new_handle                    (gint32                value);
-GVariant *                      g_variant_new_double                    (gdouble               value);
-GVariant *                      g_variant_new_string                    (const gchar          *string);
-GVariant *                      g_variant_new_object_path               (const gchar          *object_path);
-gboolean                        g_variant_is_object_path                (const gchar          *string);
-GVariant *                      g_variant_new_signature                 (const gchar          *signature);
-gboolean                        g_variant_is_signature                  (const gchar          *string);
-GVariant *                      g_variant_new_variant                   (GVariant             *value);
-GVariant *                      g_variant_new_strv                      (const gchar * const  *strv,
-                                                                         gssize                length);
-GLIB_AVAILABLE_IN_2_30
-GVariant *                      g_variant_new_objv                      (const gchar * const  *strv,
-                                                                         gssize                length);
-GVariant *                      g_variant_new_bytestring                (const gchar          *string);
-GVariant *                      g_variant_new_bytestring_array          (const gchar * const  *strv,
-                                                                         gssize                length);
-GVariant *                      g_variant_new_fixed_array               (const GVariantType   *element_type,
-                                                                         gconstpointer         elements,
-                                                                         gsize                 n_elements,
-                                                                         gsize                 element_size);
-gboolean                        g_variant_get_boolean                   (GVariant             *value);
-guchar                          g_variant_get_byte                      (GVariant             *value);
-gint16                          g_variant_get_int16                     (GVariant             *value);
-guint16                         g_variant_get_uint16                    (GVariant             *value);
-gint32                          g_variant_get_int32                     (GVariant             *value);
-guint32                         g_variant_get_uint32                    (GVariant             *value);
-gint64                          g_variant_get_int64                     (GVariant             *value);
-guint64                         g_variant_get_uint64                    (GVariant             *value);
-gint32                          g_variant_get_handle                    (GVariant             *value);
-gdouble                         g_variant_get_double                    (GVariant             *value);
-GVariant *                      g_variant_get_variant                   (GVariant             *value);
-const gchar *                   g_variant_get_string                    (GVariant             *value,
-                                                                         gsize                *length);
-gchar *                         g_variant_dup_string                    (GVariant             *value,
-                                                                         gsize                *length);
-const gchar **                  g_variant_get_strv                      (GVariant             *value,
-                                                                         gsize                *length);
-gchar **                        g_variant_dup_strv                      (GVariant             *value,
-                                                                         gsize                *length);
-GLIB_AVAILABLE_IN_2_30
-const gchar **                  g_variant_get_objv                      (GVariant             *value,
-                                                                         gsize                *length);
-gchar **                        g_variant_dup_objv                      (GVariant             *value,
-                                                                         gsize                *length);
-const gchar *                   g_variant_get_bytestring                (GVariant             *value);
-gchar *                         g_variant_dup_bytestring                (GVariant             *value,
-                                                                         gsize                *length);
-const gchar **                  g_variant_get_bytestring_array          (GVariant             *value,
-                                                                         gsize                *length);
-gchar **                        g_variant_dup_bytestring_array          (GVariant             *value,
-                                                                         gsize                *length);
-
-GVariant *                      g_variant_new_maybe                     (const GVariantType   *child_type,
-                                                                         GVariant             *child);
-GVariant *                      g_variant_new_array                     (const GVariantType   *child_type,
-                                                                         GVariant * const     *children,
-                                                                         gsize                 n_children);
-GVariant *                      g_variant_new_tuple                     (GVariant * const     *children,
-                                                                         gsize                 n_children);
-GVariant *                      g_variant_new_dict_entry                (GVariant             *key,
-                                                                         GVariant             *value);
-
-GVariant *                      g_variant_get_maybe                     (GVariant             *value);
-gsize                           g_variant_n_children                    (GVariant             *value);
-void                            g_variant_get_child                     (GVariant             *value,
-                                                                         gsize                 index_,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GVariant *                      g_variant_get_child_value               (GVariant             *value,
-                                                                         gsize                 index_);
-gboolean                        g_variant_lookup                        (GVariant             *dictionary,
-                                                                         const gchar          *key,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GVariant *                      g_variant_lookup_value                  (GVariant             *dictionary,
-                                                                         const gchar          *key,
-                                                                         const GVariantType   *expected_type);
-gconstpointer                   g_variant_get_fixed_array               (GVariant             *value,
-                                                                         gsize                *n_elements,
-                                                                         gsize                 element_size);
-
-gsize                           g_variant_get_size                      (GVariant             *value);
-gconstpointer                   g_variant_get_data                      (GVariant             *value);
-void                            g_variant_store                         (GVariant             *value,
-                                                                         gpointer              data);
-
-gchar *                         g_variant_print                         (GVariant             *value,
-                                                                         gboolean              type_annotate);
-GString *                       g_variant_print_string                  (GVariant             *value,
-                                                                         GString              *string,
-                                                                         gboolean              type_annotate);
-
-guint                           g_variant_hash                          (gconstpointer         value);
-gboolean                        g_variant_equal                         (gconstpointer         one,
-                                                                         gconstpointer         two);
-
-GVariant *                      g_variant_get_normal_form               (GVariant             *value);
-gboolean                        g_variant_is_normal_form                (GVariant             *value);
-GVariant *                      g_variant_byteswap                      (GVariant             *value);
-GVariant *                      g_variant_new_from_data                 (const GVariantType   *type,
-                                                                         gconstpointer         data,
-                                                                         gsize                 size,
-                                                                         gboolean              trusted,
-                                                                         GDestroyNotify        notify,
-                                                                         gpointer              user_data);
-
-typedef struct _GVariantIter GVariantIter;
-struct _GVariantIter {
-  /*< private >*/
-  gsize x[16];
-};
-
-GVariantIter *                  g_variant_iter_new                      (GVariant             *value);
-gsize                           g_variant_iter_init                     (GVariantIter         *iter,
-                                                                         GVariant             *value);
-GVariantIter *                  g_variant_iter_copy                     (GVariantIter         *iter);
-gsize                           g_variant_iter_n_children               (GVariantIter         *iter);
-void                            g_variant_iter_free                     (GVariantIter         *iter);
-GVariant *                      g_variant_iter_next_value               (GVariantIter         *iter);
-gboolean                        g_variant_iter_next                     (GVariantIter         *iter,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-gboolean                        g_variant_iter_loop                     (GVariantIter         *iter,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-
-
-typedef struct _GVariantBuilder GVariantBuilder;
-struct _GVariantBuilder {
-  /*< private >*/
-  gsize x[16];
-};
-
-typedef enum
-{
-  G_VARIANT_PARSE_ERROR_FAILED,
-  G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED,
-  G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE,
-  G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED,
-  G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END,
-  G_VARIANT_PARSE_ERROR_INVALID_CHARACTER,
-  G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING,
-  G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH,
-  G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE,
-  G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING,
-  G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE,
-  G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE,
-  G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG,
-  G_VARIANT_PARSE_ERROR_TYPE_ERROR,
-  G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN,
-  G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD,
-  G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT,
-  G_VARIANT_PARSE_ERROR_VALUE_EXPECTED
-} GVariantParseError;
-#define G_VARIANT_PARSE_ERROR (g_variant_parser_get_error_quark ())
-
-GQuark                          g_variant_parser_get_error_quark        (void);
-
-GVariantBuilder *               g_variant_builder_new                   (const GVariantType   *type);
-void                            g_variant_builder_unref                 (GVariantBuilder      *builder);
-GVariantBuilder *               g_variant_builder_ref                   (GVariantBuilder      *builder);
-void                            g_variant_builder_init                  (GVariantBuilder      *builder,
-                                                                         const GVariantType   *type);
-GVariant *                      g_variant_builder_end                   (GVariantBuilder      *builder);
-void                            g_variant_builder_clear                 (GVariantBuilder      *builder);
-void                            g_variant_builder_open                  (GVariantBuilder      *builder,
-                                                                         const GVariantType   *type);
-void                            g_variant_builder_close                 (GVariantBuilder      *builder);
-void                            g_variant_builder_add_value             (GVariantBuilder      *builder,
-                                                                         GVariant             *value);
-void                            g_variant_builder_add                   (GVariantBuilder      *builder,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-void                            g_variant_builder_add_parsed            (GVariantBuilder      *builder,
-                                                                         const gchar          *format,
-                                                                         ...);
-
-GVariant *                      g_variant_new                           (const gchar          *format_string,
-                                                                         ...);
-void                            g_variant_get                           (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         ...);
-GVariant *                      g_variant_new_va                        (const gchar          *format_string,
-                                                                         const gchar         **endptr,
-                                                                         va_list              *app);
-void                            g_variant_get_va                        (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         const gchar         **endptr,
-                                                                         va_list              *app);
-gboolean                        g_variant_check_format_string           (GVariant             *value,
-                                                                         const gchar          *format_string,
-                                                                         gboolean              copy_only);
-
-GVariant *                      g_variant_parse                         (const GVariantType   *type,
-                                                                         const gchar          *text,
-                                                                         const gchar          *limit,
-                                                                         const gchar         **endptr,
-                                                                         GError              **error);
-GVariant *                      g_variant_new_parsed                    (const gchar          *format,
-                                                                         ...);
-GVariant *                      g_variant_new_parsed_va                 (const gchar          *format,
-                                                                         va_list              *app);
-
-gint                            g_variant_compare                       (gconstpointer one,
-                                                                         gconstpointer two);
-G_END_DECLS
-
-#endif /* __G_VARIANT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gvarianttype.h b/GstreamerHelper/x86/include/glib-2.0/glib/gvarianttype.h
deleted file mode 100644
index fe1ba844..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gvarianttype.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright © 2007, 2008 Ryan Lortie
- * Copyright © 2009, 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VARIANT_TYPE_H__
-#define __G_VARIANT_TYPE_H__
-
-#include <glib/gmessages.h>
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GVariantType:
- *
- * A type in the GVariant type system.
- *
- * Two types may not be compared by value; use g_variant_type_equal() or
- * g_variant_type_is_subtype_of().  May be copied using
- * g_variant_type_copy() and freed using g_variant_type_free().
- **/
-typedef struct _GVariantType GVariantType;
-
-/**
- * G_VARIANT_TYPE_BOOLEAN:
- *
- * The type of a value that can be either %TRUE or %FALSE.
- **/
-#define G_VARIANT_TYPE_BOOLEAN              ((const GVariantType *) "b")
-
-/**
- * G_VARIANT_TYPE_BYTE:
- *
- * The type of an integer value that can range from 0 to 255.
- **/
-#define G_VARIANT_TYPE_BYTE                 ((const GVariantType *) "y")
-
-/**
- * G_VARIANT_TYPE_INT16:
- *
- * The type of an integer value that can range from -32768 to 32767.
- **/
-#define G_VARIANT_TYPE_INT16                ((const GVariantType *) "n")
-
-/**
- * G_VARIANT_TYPE_UINT16:
- *
- * The type of an integer value that can range from 0 to 65535.
- * There were about this many people living in Toronto in the 1870s.
- **/
-#define G_VARIANT_TYPE_UINT16               ((const GVariantType *) "q")
-
-/**
- * G_VARIANT_TYPE_INT32:
- *
- * The type of an integer value that can range from -2147483648 to
- * 2147483647.
- **/
-#define G_VARIANT_TYPE_INT32                ((const GVariantType *) "i")
-
-/**
- * G_VARIANT_TYPE_UINT32:
- *
- * The type of an integer value that can range from 0 to 4294967295.
- * That's one number for everyone who was around in the late 1970s.
- **/
-#define G_VARIANT_TYPE_UINT32               ((const GVariantType *) "u")
-
-/**
- * G_VARIANT_TYPE_INT64:
- *
- * The type of an integer value that can range from
- * -9223372036854775808 to 9223372036854775807.
- **/
-#define G_VARIANT_TYPE_INT64                ((const GVariantType *) "x")
-
-/**
- * G_VARIANT_TYPE_UINT64:
- *
- * The type of an integer value that can range from 0 to
- * 18446744073709551616.  That's a really big number, but a Rubik's
- * cube can have a bit more than twice as many possible positions.
- **/
-#define G_VARIANT_TYPE_UINT64               ((const GVariantType *) "t")
-
-/**
- * G_VARIANT_TYPE_DOUBLE:
- *
- * The type of a double precision IEEE754 floating point number.
- * These guys go up to about 1.80e308 (plus and minus) but miss out on
- * some numbers in between.  In any case, that's far greater than the
- * estimated number of fundamental particles in the observable
- * universe.
- **/
-#define G_VARIANT_TYPE_DOUBLE               ((const GVariantType *) "d")
-
-/**
- * G_VARIANT_TYPE_STRING:
- *
- * The type of a string.  "" is a string.  %NULL is not a string.
- **/
-#define G_VARIANT_TYPE_STRING               ((const GVariantType *) "s")
-
-/**
- * G_VARIANT_TYPE_OBJECT_PATH:
- *
- * The type of a D-Bus object reference.  These are strings of a
- * specific format used to identify objects at a given destination on
- * the bus.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.  If you are, then the D-Bus specification contains a
- * precise description of valid object paths.
- **/
-#define G_VARIANT_TYPE_OBJECT_PATH          ((const GVariantType *) "o")
-
-/**
- * G_VARIANT_TYPE_SIGNATURE:
- *
- * The type of a D-Bus type signature.  These are strings of a specific
- * format used as type signatures for D-Bus methods and messages.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.  If you are, then the D-Bus specification contains a
- * precise description of valid signature strings.
- **/
-#define G_VARIANT_TYPE_SIGNATURE            ((const GVariantType *) "g")
-
-/**
- * G_VARIANT_TYPE_VARIANT:
- *
- * The type of a box that contains any other value (including another
- * variant).
- **/
-#define G_VARIANT_TYPE_VARIANT              ((const GVariantType *) "v")
-
-/**
- * G_VARIANT_TYPE_HANDLE:
- *
- * The type of a 32bit signed integer value, that by convention, is used
- * as an index into an array of file descriptors that are sent alongside
- * a D-Bus message.
- *
- * If you are not interacting with D-Bus, then there is no reason to make
- * use of this type.
- **/
-#define G_VARIANT_TYPE_HANDLE               ((const GVariantType *) "h")
-
-/**
- * G_VARIANT_TYPE_UNIT:
- *
- * The empty tuple type.  Has only one instance.  Known also as "triv"
- * or "void".
- **/
-#define G_VARIANT_TYPE_UNIT                 ((const GVariantType *) "()")
-
-/**
- * G_VARIANT_TYPE_ANY:
- *
- * An indefinite type that is a supertype of every type (including
- * itself).
- **/
-#define G_VARIANT_TYPE_ANY                  ((const GVariantType *) "*")
-
-/**
- * G_VARIANT_TYPE_BASIC:
- *
- * An indefinite type that is a supertype of every basic (ie:
- * non-container) type.
- **/
-#define G_VARIANT_TYPE_BASIC                ((const GVariantType *) "?")
-
-/**
- * G_VARIANT_TYPE_MAYBE:
- *
- * An indefinite type that is a supertype of every maybe type.
- **/
-#define G_VARIANT_TYPE_MAYBE                ((const GVariantType *) "m*")
-
-/**
- * G_VARIANT_TYPE_ARRAY:
- *
- * An indefinite type that is a supertype of every array type.
- **/
-#define G_VARIANT_TYPE_ARRAY                ((const GVariantType *) "a*")
-
-/**
- * G_VARIANT_TYPE_TUPLE:
- *
- * An indefinite type that is a supertype of every tuple type,
- * regardless of the number of items in the tuple.
- **/
-#define G_VARIANT_TYPE_TUPLE                ((const GVariantType *) "r")
-
-/**
- * G_VARIANT_TYPE_DICT_ENTRY:
- *
- * An indefinite type that is a supertype of every dictionary entry
- * type.
- **/
-#define G_VARIANT_TYPE_DICT_ENTRY           ((const GVariantType *) "{?*}")
-
-/**
- * G_VARIANT_TYPE_DICTIONARY:
- *
- * An indefinite type that is a supertype of every dictionary type --
- * that is, any array type that has an element type equal to any
- * dictionary entry type.
- **/
-#define G_VARIANT_TYPE_DICTIONARY           ((const GVariantType *) "a{?*}")
-
-/**
- * G_VARIANT_TYPE_STRING_ARRAY:
- *
- * The type of an array of strings.
- **/
-#define G_VARIANT_TYPE_STRING_ARRAY         ((const GVariantType *) "as")
-
-/**
- * G_VARIANT_TYPE_OBJECT_PATH_ARRAY:
- *
- * The type of an array of object paths.
- **/
-#define G_VARIANT_TYPE_OBJECT_PATH_ARRAY    ((const GVariantType *) "ao")
-
-/**
- * G_VARIANT_TYPE_BYTESTRING:
- *
- * The type of an array of bytes.  This type is commonly used to pass
- * around strings that may not be valid utf8.  In that case, the
- * convention is that the nul terminator character should be included as
- * the last character in the array.
- **/
-#define G_VARIANT_TYPE_BYTESTRING           ((const GVariantType *) "ay")
-
-/**
- * G_VARIANT_TYPE_BYTESTRING_ARRAY:
- *
- * The type of an array of byte strings (an array of arrays of bytes).
- **/
-#define G_VARIANT_TYPE_BYTESTRING_ARRAY     ((const GVariantType *) "aay")
-
-/**
- * G_VARIANT_TYPE_VARDICT:
- *
- * The type of a dictionary mapping strings to variants (the ubiquitous
- * "a{sv}" type).
- *
- * Since: 2.30
- **/
-#define G_VARIANT_TYPE_VARDICT              ((const GVariantType *) "a{sv}")
-
-
-/**
- * G_VARIANT_TYPE:
- * @type_string: a well-formed #GVariantType type string
- *
- * Converts a string to a const #GVariantType.  Depending on the
- * current debugging level, this function may perform a runtime check
- * to ensure that @string is a valid GVariant type string.
- *
- * It is always a programmer error to use this macro with an invalid
- * type string. If in doubt, use g_variant_type_string_is_valid() to
- * check if the string is valid.
- *
- * Since 2.24
- **/
-#ifndef G_DISABLE_CHECKS
-# define G_VARIANT_TYPE(type_string)            (g_variant_type_checked_ ((type_string)))
-#else
-# define G_VARIANT_TYPE(type_string)            ((const GVariantType *) (type_string))
-#endif
-
-/* type string checking */
-gboolean                        g_variant_type_string_is_valid          (const gchar         *type_string);
-gboolean                        g_variant_type_string_scan              (const gchar         *string,
-                                                                         const gchar         *limit,
-                                                                         const gchar        **endptr);
-
-/* create/destroy */
-void                            g_variant_type_free                     (GVariantType        *type);
-GVariantType *                  g_variant_type_copy                     (const GVariantType  *type);
-GVariantType *                  g_variant_type_new                      (const gchar         *type_string);
-
-/* getters */
-gsize                           g_variant_type_get_string_length        (const GVariantType  *type);
-const gchar *                   g_variant_type_peek_string              (const GVariantType  *type);
-gchar *                         g_variant_type_dup_string               (const GVariantType  *type);
-
-/* classification */
-gboolean                        g_variant_type_is_definite              (const GVariantType  *type);
-gboolean                        g_variant_type_is_container             (const GVariantType  *type);
-gboolean                        g_variant_type_is_basic                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_maybe                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_array                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_tuple                 (const GVariantType  *type);
-gboolean                        g_variant_type_is_dict_entry            (const GVariantType  *type);
-gboolean                        g_variant_type_is_variant               (const GVariantType  *type);
-
-/* for hash tables */
-guint                           g_variant_type_hash                     (gconstpointer        type);
-gboolean                        g_variant_type_equal                    (gconstpointer        type1,
-                                                                         gconstpointer        type2);
-
-/* subtypes */
-gboolean                        g_variant_type_is_subtype_of            (const GVariantType  *type,
-                                                                         const GVariantType  *supertype);
-
-/* type iterator interface */
-const GVariantType *            g_variant_type_element                  (const GVariantType  *type);
-const GVariantType *            g_variant_type_first                    (const GVariantType  *type);
-const GVariantType *            g_variant_type_next                     (const GVariantType  *type);
-gsize                           g_variant_type_n_items                  (const GVariantType  *type);
-const GVariantType *            g_variant_type_key                      (const GVariantType  *type);
-const GVariantType *            g_variant_type_value                    (const GVariantType  *type);
-
-/* constructors */
-GVariantType *                  g_variant_type_new_array                (const GVariantType  *element);
-GVariantType *                  g_variant_type_new_maybe                (const GVariantType  *element);
-GVariantType *                  g_variant_type_new_tuple                (const GVariantType * const *items,
-                                                                         gint                 length);
-GVariantType *                  g_variant_type_new_dict_entry           (const GVariantType  *key,
-                                                                         const GVariantType  *value);
-
-/*< private >*/
-const GVariantType *            g_variant_type_checked_                 (const gchar *);
-
-G_END_DECLS
-
-#endif /* __G_VARIANT_TYPE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gversion.h b/GstreamerHelper/x86/include/glib-2.0/glib/gversion.h
deleted file mode 100644
index d0581c24..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gversion.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VERSION_H__
-#define __G_VERSION_H__
-
-#include <glib/gtypes.h>
-
-G_BEGIN_DECLS
-
-GLIB_VAR const guint glib_major_version;
-GLIB_VAR const guint glib_minor_version;
-GLIB_VAR const guint glib_micro_version;
-GLIB_VAR const guint glib_interface_age;
-GLIB_VAR const guint glib_binary_age;
-
-const gchar * glib_check_version (guint required_major,
-                                  guint required_minor,
-                                  guint required_micro);
-
-#define GLIB_CHECK_VERSION(major,minor,micro)    \
-    (GLIB_MAJOR_VERSION > (major) || \
-     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION > (minor)) || \
-     (GLIB_MAJOR_VERSION == (major) && GLIB_MINOR_VERSION == (minor) && \
-      GLIB_MICRO_VERSION >= (micro)))
-
-G_END_DECLS
-
-#endif /*  __G_VERSION_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gversionmacros.h b/GstreamerHelper/x86/include/glib-2.0/glib/gversionmacros.h
deleted file mode 100644
index ed8a5ce9..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gversionmacros.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_VERSION_MACROS_H__
-#define __G_VERSION_MACROS_H__
-
-/* Version boundaries checks */
-
-#define G_ENCODE_VERSION(major,minor)   ((major) << 16 | (minor) << 8)
-
-/* XXX: Every new stable minor release bump should add a macro here */
-
-/**
- * GLIB_VERSION_2_26:
- *
- * A macro that evaluates to the 2.26 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_26       (G_ENCODE_VERSION (2, 26))
-
-/**
- * GLIB_VERSION_2_28:
- *
- * A macro that evaluates to the 2.28 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_28       (G_ENCODE_VERSION (2, 28))
-
-/**
- * GLIB_VERSION_2_30:
- *
- * A macro that evaluates to the 2.30 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_30       (G_ENCODE_VERSION (2, 30))
-
-/**
- * GLIB_VERSION_2_32:
- *
- * A macro that evaluates to the 2.32 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.32
- */
-#define GLIB_VERSION_2_32       (G_ENCODE_VERSION (2, 32))
-
-/**
- * GLIB_VERSION_2_34:
- *
- * A macro that evaluates to the 2.34 version of GLib, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 2.34
- */
-#define GLIB_VERSION_2_34       (G_ENCODE_VERSION (2, 34))
-
-/* evaluates to the current stable version; for development cycles,
- * this means the next stable target
- */
-#if (GLIB_MINOR_VERSION % 2)
-#define GLIB_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION + 1))
-#else
-#define GLIB_VERSION_CUR_STABLE         (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION))
-#endif
-
-/* evaluates to the previous stable version */
-#if (GLIB_MINOR_VERSION % 2)
-#define GLIB_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 1))
-#else
-#define GLIB_VERSION_PREV_STABLE        (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 2))
-#endif
-
-/**
- * GLIB_VERSION_MIN_REQUIRED:
- *
- * A macro that should be defined by the user prior to including
- * the glib.h header.
- * The definition should be one of the predefined GLib version
- * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,...
- *
- * This macro defines the earliest version of GLib that the package is
- * required to be able to compile against.
- *
- * If the compiler is configured to warn about the use of deprecated
- * functions, then using functions that were deprecated in version
- * %GLIB_VERSION_MIN_REQUIRED or earlier will cause warnings (but
- * using functions deprecated in later releases will not).
- *
- * Since: 2.32
- */
-/* If the package sets GLIB_VERSION_MIN_REQUIRED to some future
- * GLIB_VERSION_X_Y value that we don't know about, it will compare as
- * 0 in preprocessor tests.
- */
-#ifndef GLIB_VERSION_MIN_REQUIRED
-# define GLIB_VERSION_MIN_REQUIRED      (GLIB_VERSION_CUR_STABLE)
-#elif GLIB_VERSION_MIN_REQUIRED == 0
-# undef  GLIB_VERSION_MIN_REQUIRED
-# define GLIB_VERSION_MIN_REQUIRED      (GLIB_VERSION_CUR_STABLE + 2)
-#endif
-
-/**
- * GLIB_VERSION_MAX_ALLOWED:
- *
- * A macro that should be defined by the user prior to including
- * the glib.h header.
- * The definition should be one of the predefined GLib version
- * macros: %GLIB_VERSION_2_26, %GLIB_VERSION_2_28,...
- *
- * This macro defines the latest version of the GLib API that the
- * package is allowed to make use of.
- *
- * If the compiler is configured to warn about the use of deprecated
- * functions, then using functions added after version
- * %GLIB_VERSION_MAX_ALLOWED will cause warnings.
- *
- * Unless you are using GLIB_CHECK_VERSION() or the like to compile
- * different code depending on the GLib version, then this should be
- * set to the same value as %GLIB_VERSION_MIN_REQUIRED.
- *
- * Since: 2.32
- */
-#if !defined (GLIB_VERSION_MAX_ALLOWED) || (GLIB_VERSION_MAX_ALLOWED == 0)
-# undef GLIB_VERSION_MAX_ALLOWED
-# define GLIB_VERSION_MAX_ALLOWED      (GLIB_VERSION_CUR_STABLE)
-#endif
-
-/* sanity checks */
-#if GLIB_VERSION_MIN_REQUIRED > GLIB_VERSION_CUR_STABLE
-#error "GLIB_VERSION_MIN_REQUIRED must be <= GLIB_VERSION_CUR_STABLE"
-#endif
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_MIN_REQUIRED
-#error "GLIB_VERSION_MAX_ALLOWED must be >= GLIB_VERSION_MIN_REQUIRED"
-#endif
-#if GLIB_VERSION_MIN_REQUIRED < GLIB_VERSION_2_26
-#error "GLIB_VERSION_MIN_REQUIRED must be >= GLIB_VERSION_2_26"
-#endif
-
-/* These macros are used to mark deprecated functions in GLib headers,
- * and thus have to be exposed in installed headers. But please
- * do *not* use them in other projects. Instead, use G_DEPRECATED
- * or define your own wrappers around it.
- */
-
-/* XXX: Every new stable minor release should add a set of macros here */
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_26
-# define GLIB_DEPRECATED_IN_2_26                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_26_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_26
-# define GLIB_DEPRECATED_IN_2_26_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_26
-# define GLIB_AVAILABLE_IN_2_26                 GLIB_UNAVAILABLE(2, 26)
-#else
-# define GLIB_AVAILABLE_IN_2_26
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_28
-# define GLIB_DEPRECATED_IN_2_28                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_28_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_28
-# define GLIB_DEPRECATED_IN_2_28_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_28
-# define GLIB_AVAILABLE_IN_2_28                 GLIB_UNAVAILABLE(2, 28)
-#else
-# define GLIB_AVAILABLE_IN_2_28
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_30
-# define GLIB_DEPRECATED_IN_2_30                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_30_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_30
-# define GLIB_DEPRECATED_IN_2_30_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_30
-# define GLIB_AVAILABLE_IN_2_30                 GLIB_UNAVAILABLE(2, 30)
-#else
-# define GLIB_AVAILABLE_IN_2_30
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_32
-# define GLIB_DEPRECATED_IN_2_32                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_32_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_32
-# define GLIB_DEPRECATED_IN_2_32_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_32
-# define GLIB_AVAILABLE_IN_2_32                 GLIB_UNAVAILABLE(2, 32)
-#else
-# define GLIB_AVAILABLE_IN_2_32
-#endif
-
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_34
-# define GLIB_DEPRECATED_IN_2_34                GLIB_DEPRECATED
-# define GLIB_DEPRECATED_IN_2_34_FOR(f)         GLIB_DEPRECATED_FOR(f)
-#else
-# define GLIB_DEPRECATED_IN_2_34
-# define GLIB_DEPRECATED_IN_2_34_FOR(f)
-#endif
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_34
-# define GLIB_AVAILABLE_IN_2_34                 GLIB_UNAVAILABLE(2, 34)
-#else
-# define GLIB_AVAILABLE_IN_2_34
-#endif
-
-#endif /*  __G_VERSION_MACROS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/glib/gwin32.h b/GstreamerHelper/x86/include/glib-2.0/glib/gwin32.h
deleted file mode 100644
index b0fb7c04..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/glib/gwin32.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
-#ifndef __G_WIN32_H__
-#define __G_WIN32_H__
-
-#include <glib/gtypes.h>
-
-#ifdef G_PLATFORM_WIN32
-
-G_BEGIN_DECLS
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-#ifdef G_OS_WIN32
-
-/*
- * To get prototypes for the following POSIXish functions, you have to
- * include the indicated non-POSIX headers. The functions are defined
- * in OLDNAMES.LIB (MSVC) or -lmoldname-msvc (mingw32). But note that
- * for POSIX functions that take or return file names in the system
- * codepage, in many cases you would want to use the GLib wrappers in
- * gstdio.h and UTF-8 instead.
- *
- * getcwd: <direct.h> (MSVC), <io.h> (mingw32)
- * getpid: <process.h>
- * access: <io.h>
- * unlink: <stdio.h> or <io.h>
- * open, read, write, lseek, close: <io.h>
- * rmdir: <io.h>
- * pipe: <io.h> (actually, _pipe())
- */
-
-/* For some POSIX functions that are not provided by the MS runtime,
- * we provide emulation functions in glib, which are prefixed with
- * g_win32_. Or that was the idea at some time, but there is just one
- * of those:
- */
-gint		g_win32_ftruncate	(gint		 f,
-					 guint		 size);
-#endif /* G_OS_WIN32 */
-
-/* The MS setlocale uses locale names of the form "English_United
- * States.1252" etc. We want the Unixish standard form "en", "zh_TW"
- * etc. This function gets the current thread locale from Windows and
- * returns it as a string of the above form for use in forming file
- * names etc. The returned string should be deallocated with g_free().
- */
-gchar* 		g_win32_getlocale  (void);
-
-/* Translate a Win32 error code (as returned by GetLastError()) into
- * the corresponding message. The returned string should be deallocated
- * with g_free().
- */
-gchar*          g_win32_error_message (gint error);
-
-#ifndef G_DISABLE_DEPRECATED
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef _WIN64
-#define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8
-#define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8
-#endif
-#endif
-
-gchar*          g_win32_get_package_installation_directory (const gchar *package,
-							    const gchar *dll_name);
-
-gchar*          g_win32_get_package_installation_subdirectory (const gchar *package,
-							       const gchar *dll_name,
-							       const gchar *subdir);
-
-#endif
-
-gchar*          g_win32_get_package_installation_directory_of_module (gpointer hmodule);
-
-guint		g_win32_get_windows_version (void);
-
-gchar*          g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
-
-/* As of GLib 2.14 we only support NT-based Windows */
-#define G_WIN32_IS_NT_BASED() TRUE
-#define G_WIN32_HAVE_WIDECHAR_API() TRUE
-
-G_END_DECLS
-
-#endif	 /* G_PLATFORM_WIN32 */
-
-#endif /* __G_WIN32_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gmodule.h b/GstreamerHelper/x86/include/glib-2.0/gmodule.h
deleted file mode 100644
index 837e5359..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gmodule.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GMODULE - GLIB wrapper code for dynamic module loading
- * Copyright (C) 1998 Tim Janik
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GLib Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GMODULE_H__
-#define __GMODULE_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* exporting and importing functions, this is special cased
- * to feature Windows dll stubs.
- */
-#define	G_MODULE_IMPORT		extern
-#ifdef G_PLATFORM_WIN32
-#  define	G_MODULE_EXPORT		__declspec(dllexport)
-#else /* !G_PLATFORM_WIN32 */
-#  define	G_MODULE_EXPORT
-#endif /* !G_PLATFORM_WIN32 */
-
-typedef enum
-{
-  G_MODULE_BIND_LAZY	= 1 << 0,
-  G_MODULE_BIND_LOCAL	= 1 << 1,
-  G_MODULE_BIND_MASK	= 0x03
-} GModuleFlags;
-
-typedef	struct _GModule			 GModule;
-typedef const gchar* (*GModuleCheckInit) (GModule	*module);
-typedef void	     (*GModuleUnload)	 (GModule	*module);
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_module_open g_module_open_utf8
-#define g_module_name g_module_name_utf8
-#endif
-#endif
-
-/* return TRUE if dynamic module loading is supported */
-gboolean	g_module_supported	   (void) G_GNUC_CONST;
-
-/* open a module `file_name' and return handle, which is NULL on error */
-GModule*              g_module_open          (const gchar  *file_name,
-					      GModuleFlags  flags);
-
-/* close a previously opened module, returns TRUE on success */
-gboolean              g_module_close         (GModule      *module);
-
-/* make a module resident so g_module_close on it will be ignored */
-void                  g_module_make_resident (GModule      *module);
-
-/* query the last module error as a string */
-const gchar *         g_module_error         (void);
-
-/* retrieve a symbol pointer from `module', returns TRUE on success */
-gboolean              g_module_symbol        (GModule      *module,
-					      const gchar  *symbol_name,
-					      gpointer     *symbol);
-
-/* retrieve the file name from an existing module */
-const gchar *         g_module_name          (GModule      *module);
-
-/* Build the actual file name containing a module. `directory' is the
- * directory where the module file is supposed to be, or NULL or empty
- * in which case it should either be in the current directory or, on
- * some operating systems, in some standard place, for instance on the
- * PATH. Hence, to be absoultely sure to get the correct module,
- * always pass in a directory. The file name consists of the directory,
- * if supplied, and `module_name' suitably decorated according to
- * the operating system's conventions (for instance lib*.so or *.dll).
- *
- * No checks are made that the file exists, or is of correct type.
- */
-gchar*                g_module_build_path    (const gchar  *directory,
-					      const gchar  *module_name);
-
-
-G_END_DECLS
-
-#endif /* __GMODULE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gbinding.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gbinding.h
deleted file mode 100644
index 1b715402..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gbinding.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* gbinding.h: Binding for object properties
- *
- * Copyright (C) 2010  Intel Corp.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Emmanuele Bassi <ebassi@linux.intel.com>
- */
-
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_BINDING_H__
-#define __G_BINDING_H__
-
-#include <glib.h>
-#include <gobject/gobject.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_BINDING_FLAGS    (g_binding_flags_get_type ())
-
-#define G_TYPE_BINDING          (g_binding_get_type ())
-#define G_BINDING(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_BINDING, GBinding))
-#define G_IS_BINDING(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_BINDING))
-
-/**
- * GBinding:
- *
- * <structname>GBinding</structname> is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
-typedef struct _GBinding        GBinding;
-
-/**
- * GBindingTransformFunc:
- * @binding: a #GBinding
- * @source_value: the value of the source property
- * @target_value: the value of the target property
- * @user_data: data passed to the transform function
- *
- * A function to be called to transform the source property of @source
- * from @source_value into the target property of @target
- * using @target_value.
- *
- * Return value: %TRUE if the transformation was successful, and %FALSE
- *   otherwise
- *
- * Since: 2.26
- */
-typedef gboolean (* GBindingTransformFunc) (GBinding     *binding,
-                                            const GValue *source_value,
-                                            GValue       *target_value,
-                                            gpointer      user_data);
-
-/**
- * GBindingFlags:
- * @G_BINDING_DEFAULT: The default binding; if the source property
- *   changes, the target property is updated with its value.
- * @G_BINDING_BIDIRECTIONAL: Bidirectional binding; if either the
- *   property of the source or the property of the target changes,
- *   the other is updated.
- * @G_BINDING_SYNC_CREATE: Synchronize the values of the source and
- *   target properties when creating the binding; the direction of
- *   the synchronization is always from the source to the target.
- * @G_BINDING_INVERT_BOOLEAN: If the two properties being bound are
- *   booleans, setting one to %TRUE will result in the other being
- *   set to %FALSE and vice versa. This flag will only work for
- *   boolean properties, and cannot be used when passing custom
- *   transformation functions to g_object_bind_property_full().
- *
- * Flags to be passed to g_object_bind_property() or
- * g_object_bind_property_full().
- *
- * This enumeration can be extended at later date.
- *
- * Since: 2.26
- */
-typedef enum { /*< prefix=G_BINDING >*/
-  G_BINDING_DEFAULT        = 0,
-
-  G_BINDING_BIDIRECTIONAL  = 1 << 0,
-  G_BINDING_SYNC_CREATE    = 1 << 1,
-  G_BINDING_INVERT_BOOLEAN = 1 << 2
-} GBindingFlags;
-
-GType                 g_binding_flags_get_type      (void) G_GNUC_CONST;
-GType                 g_binding_get_type            (void) G_GNUC_CONST;
-
-GBindingFlags         g_binding_get_flags           (GBinding *binding);
-GObject *             g_binding_get_source          (GBinding *binding);
-GObject *             g_binding_get_target          (GBinding *binding);
-const gchar *         g_binding_get_source_property (GBinding *binding);
-const gchar *         g_binding_get_target_property (GBinding *binding);
-
-GBinding *g_object_bind_property               (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags);
-GBinding *g_object_bind_property_full          (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags,
-                                                GBindingTransformFunc  transform_to,
-                                                GBindingTransformFunc  transform_from,
-                                                gpointer               user_data,
-                                                GDestroyNotify         notify);
-GBinding *g_object_bind_property_with_closures (gpointer               source,
-                                                const gchar           *source_property,
-                                                gpointer               target,
-                                                const gchar           *target_property,
-                                                GBindingFlags          flags,
-                                                GClosure              *transform_to,
-                                                GClosure              *transform_from);
-
-G_END_DECLS
-
-#endif /* __G_BINDING_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gboxed.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gboxed.h
deleted file mode 100644
index 2b840878..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gboxed.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_BOXED_H__
-#define __G_BOXED_H__
-
-#include        <gobject/gtype.h>
-
-#ifndef __GI_SCANNER__
-#include        <gobject/glib-types.h>
-#endif
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_IS_BOXED(type)      (G_TYPE_FUNDAMENTAL (type) == G_TYPE_BOXED)
-/**
- * G_VALUE_HOLDS_BOXED:
- * @value: a valid #GValue structure
- *
- * Checks whether the given #GValue can hold values derived
- * from type %G_TYPE_BOXED.
- *
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_BOXED(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOXED))
-
-
-/* --- typedefs --- */
-/**
- * GBoxedCopyFunc:
- * @boxed: The boxed structure to be copied.
- *
- * This function is provided by the user and should produce a copy
- * of the passed in boxed structure.
- *
- * Returns: The newly created copy of the boxed structure.
- */
-typedef gpointer (*GBoxedCopyFunc) (gpointer boxed);
-
-/**
- * GBoxedFreeFunc:
- * @boxed: The boxed structure to be freed.
- *
- * This function is provided by the user and should free the boxed
- * structure passed.
- */
-typedef void (*GBoxedFreeFunc) (gpointer boxed);
-
-
-/* --- prototypes --- */
-gpointer g_boxed_copy                     (GType boxed_type,
-                                           gconstpointer  src_boxed);
-void     g_boxed_free                     (GType          boxed_type,
-                                           gpointer       boxed);
-void     g_value_set_boxed                (GValue        *value,
-                                           gconstpointer  v_boxed);
-void     g_value_set_static_boxed         (GValue        *value,
-                                           gconstpointer  v_boxed);
-void     g_value_take_boxed               (GValue        *value,
-                                           gconstpointer  v_boxed);
-GLIB_DEPRECATED_FOR(g_value_take_boxed)
-void     g_value_set_boxed_take_ownership (GValue        *value,
-                                           gconstpointer  v_boxed);
-gpointer g_value_get_boxed                (const GValue  *value);
-gpointer g_value_dup_boxed                (const GValue  *value);
-
-
-/* --- convenience --- */
-GType    g_boxed_type_register_static     (const gchar   *name,
-                                           GBoxedCopyFunc boxed_copy,
-                                           GBoxedFreeFunc boxed_free);
-
-/* --- GObject boxed types --- */
-/**
- * G_TYPE_CLOSURE:
- *
- * The #GType for #GClosure.
- */
-#define G_TYPE_CLOSURE (g_closure_get_type ())
-
-/**
- * G_TYPE_VALUE:
- *
- * The type ID of the "GValue" type which is a boxed type,
- * used to pass around pointers to GValues.
- */
-#define G_TYPE_VALUE (g_value_get_type ())
-
-GType   g_closure_get_type         (void) G_GNUC_CONST;
-GType   g_value_get_type           (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif  /* __G_BOXED_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gclosure.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gclosure.h
deleted file mode 100644
index fffac582..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gclosure.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- * Copyright (C) 2005 Imendio AB
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_CLOSURE_H__
-#define __G_CLOSURE_H__
-
-#include        <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- defines --- */
-/**
- * G_CLOSURE_NEEDS_MARSHAL:
- * @closure: a #GClosure
- * 
- * Check if the closure still needs a marshaller. See g_closure_set_marshal().
- *
- * Returns: %TRUE if a #GClosureMarshal marshaller has not yet been set on 
- * @closure.
- */
-#define	G_CLOSURE_NEEDS_MARSHAL(closure) (((GClosure*) (closure))->marshal == NULL)
-/**
- * G_CLOSURE_N_NOTIFIERS:
- * @cl: a #GClosure
- * 
- * Get the total number of notifiers connected with the closure @cl. 
- * The count includes the meta marshaller, the finalize and invalidate notifiers 
- * and the marshal guards. Note that each guard counts as two notifiers. 
- * See g_closure_set_meta_marshal(), g_closure_add_finalize_notifier(),
- * g_closure_add_invalidate_notifier() and g_closure_add_marshal_guards().
- *
- * Returns: number of notifiers
- */
-#define	G_CLOSURE_N_NOTIFIERS(cl)	 (((cl)->n_guards << 1L) + \
-                                          (cl)->n_fnotifiers + (cl)->n_inotifiers)
-/**
- * G_CCLOSURE_SWAP_DATA:
- * @cclosure: a #GCClosure
- * 
- * Checks whether the user data of the #GCClosure should be passed as the
- * first parameter to the callback. See g_cclosure_new_swap().
- *
- * Returns: %TRUE if data has to be swapped.
- */
-#define	G_CCLOSURE_SWAP_DATA(cclosure)	 (((GClosure*) (cclosure))->derivative_flag)
-/**
- * G_CALLBACK:
- * @f: a function pointer.
- * 
- * Cast a function pointer to a #GCallback.
- */
-#define	G_CALLBACK(f)			 ((GCallback) (f))
-
-
-/* -- typedefs --- */
-typedef struct _GClosure		 GClosure;
-typedef struct _GClosureNotifyData	 GClosureNotifyData;
-
-/**
- * GCallback:
- * 
- * The type used for callback functions in structure definitions and function 
- * signatures. This doesn't mean that all callback functions must take no 
- * parameters and return void. The required signature of a callback function 
- * is determined by the context in which is used (e.g. the signal to which it 
- * is connected). Use G_CALLBACK() to cast the callback function to a #GCallback. 
- */
-typedef void  (*GCallback)              (void);
-/**
- * GClosureNotify:
- * @data: data specified when registering the notification callback
- * @closure: the #GClosure on which the notification is emitted
- * 
- * The type used for the various notification callbacks which can be registered
- * on closures.
- */
-typedef void  (*GClosureNotify)		(gpointer	 data,
-					 GClosure	*closure);
-/**
- * GClosureMarshal:
- * @closure: the #GClosure to which the marshaller belongs
- * @return_value: (allow-none): a #GValue to store the return
- *  value. May be %NULL if the callback of @closure doesn't return a
- *  value.
- * @n_param_values: the length of the @param_values array
- * @param_values: (array length=n_param_values): an array of
- *  #GValue<!-- -->s holding the arguments on which to invoke the
- *  callback of @closure
- * @invocation_hint: (allow-none): the invocation hint given as the
- *  last argument to g_closure_invoke()
- * @marshal_data: (allow-none): additional data specified when
- *  registering the marshaller, see g_closure_set_marshal() and
- *  g_closure_set_meta_marshal()
- * 
- * The type used for marshaller functions.
- */
-typedef void  (*GClosureMarshal)	(GClosure	*closure,
-					 GValue         *return_value,
-					 guint           n_param_values,
-					 const GValue   *param_values,
-					 gpointer        invocation_hint,
-					 gpointer	 marshal_data);
-
-typedef void (* GVaClosureMarshal) (GClosure *closure,
-				    GValue   *return_value,
-				    gpointer  instance,
-				    va_list   args,
-				    gpointer  marshal_data,
-				    int       n_params,
-				    GType    *param_types);
-
-/**
- * GCClosure:
- * @closure: the #GClosure
- * @callback: the callback function
- * 
- * A #GCClosure is a specialization of #GClosure for C function callbacks.
- */
-typedef struct _GCClosure		 GCClosure;
-
-
-/* --- structures --- */
-struct _GClosureNotifyData
-{
-  gpointer       data;
-  GClosureNotify notify;
-};
-/**
- * GClosure:
- * @in_marshal: Indicates whether the closure is currently being invoked with 
- *  g_closure_invoke()
- * @is_invalid: Indicates whether the closure has been invalidated by 
- *  g_closure_invalidate()
- * 
- * A #GClosure represents a callback supplied by the programmer.
- */
-struct _GClosure
-{
-  /*< private >*/
-  volatile      	guint	 ref_count : 15;
-  /* meta_marshal is not used anymore but must be zero for historical reasons
-     as it was exposed in the G_CLOSURE_N_NOTIFIERS macro */
-  volatile       	guint	 meta_marshal_nouse : 1;
-  volatile       	guint	 n_guards : 1;
-  volatile       	guint	 n_fnotifiers : 2;	/* finalization notifiers */
-  volatile       	guint	 n_inotifiers : 8;	/* invalidation notifiers */
-  volatile       	guint	 in_inotify : 1;
-  volatile       	guint	 floating : 1;
-  /*< protected >*/
-  volatile         	guint	 derivative_flag : 1;
-  /*< public >*/
-  volatile       	guint	 in_marshal : 1;
-  volatile       	guint	 is_invalid : 1;
-
-  /*< private >*/	void   (*marshal)  (GClosure       *closure,
-					    GValue /*out*/ *return_value,
-					    guint           n_param_values,
-					    const GValue   *param_values,
-					    gpointer        invocation_hint,
-					    gpointer	    marshal_data);
-  /*< protected >*/	gpointer data;
-
-  /*< private >*/	GClosureNotifyData *notifiers;
-
-  /* invariants/constrains:
-   * - ->marshal and ->data are _invalid_ as soon as ->is_invalid==TRUE
-   * - invocation of all inotifiers occours prior to fnotifiers
-   * - order of inotifiers is random
-   *   inotifiers may _not_ free/invalidate parameter values (e.g. ->data)
-   * - order of fnotifiers is random
-   * - each notifier may only be removed before or during its invocation
-   * - reference counting may only happen prior to fnotify invocation
-   *   (in that sense, fnotifiers are really finalization handlers)
-   */
-};
-/* closure for C function calls, callback() is the user function
- */
-struct _GCClosure
-{
-  GClosure	closure;
-  gpointer	callback;
-};
-
-
-/* --- prototypes --- */
-GClosure* g_cclosure_new			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_cclosure_new_swap			(GCallback	callback_func,
-						 gpointer	user_data,
-						 GClosureNotify destroy_data);
-GClosure* g_signal_type_cclosure_new		(GType          itype,
-						 guint          struct_offset);
-
-
-/* --- prototypes --- */
-GClosure* g_closure_ref				(GClosure	*closure);
-void	  g_closure_sink			(GClosure	*closure);
-void	  g_closure_unref			(GClosure	*closure);
-/* intimidating */
-GClosure* g_closure_new_simple			(guint		 sizeof_closure,
-						 gpointer	 data);
-void	  g_closure_add_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_finalize_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_remove_invalidate_notifier	(GClosure       *closure,
-						 gpointer	 notify_data,
-						 GClosureNotify	 notify_func);
-void	  g_closure_add_marshal_guards		(GClosure	*closure,
-						 gpointer        pre_marshal_data,
-						 GClosureNotify	 pre_marshal_notify,
-						 gpointer        post_marshal_data,
-						 GClosureNotify	 post_marshal_notify);
-void	  g_closure_set_marshal			(GClosure	*closure,
-						 GClosureMarshal marshal);
-void	  g_closure_set_meta_marshal		(GClosure       *closure,
-						 gpointer	 marshal_data,
-						 GClosureMarshal meta_marshal);
-void	  g_closure_invalidate			(GClosure	*closure);
-void	  g_closure_invoke			(GClosure 	*closure,
-						 GValue	/*out*/	*return_value,
-						 guint		 n_param_values,
-						 const GValue	*param_values,
-						 gpointer	 invocation_hint);
-
-/* FIXME:
-   OK:  data_object::destroy		-> closure_invalidate();
-   MIS:	closure_invalidate()		-> disconnect(closure);
-   MIS:	disconnect(closure)		-> (unlink) closure_unref();
-   OK:	closure_finalize()		-> g_free (data_string);
-
-   random remarks:
-   - need marshaller repo with decent aliasing to base types
-   - provide marshaller collection, virtually covering anything out there
-*/
-
-void g_cclosure_marshal_generic (GClosure     *closure,
-                                 GValue       *return_gvalue,
-                                 guint         n_param_values,
-                                 const GValue *param_values,
-                                 gpointer      invocation_hint,
-                                 gpointer      marshal_data);
-
-void g_cclosure_marshal_generic_va (GClosure *closure,
-				    GValue   *return_value,
-				    gpointer  instance,
-				    va_list   args_list,
-				    gpointer  marshal_data,
-				    int       n_params,
-				    GType    *param_types);
-
-
-G_END_DECLS
-
-#endif /* __G_CLOSURE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/genums.h b/GstreamerHelper/x86/include/glib-2.0/gobject/genums.h
deleted file mode 100644
index bf8a4191..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/genums.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_ENUMS_H__
-#define __G_ENUMS_H__
-
-#include <gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_ENUM:
- * @type: a #GType ID.
- * 
- * Checks whether @type "is a" %G_TYPE_ENUM.
- *
- * Returns: %TRUE if @type "is a" %G_TYPE_ENUM.
- */
-#define G_TYPE_IS_ENUM(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_ENUM)
-/**
- * G_ENUM_CLASS:
- * @class: a valid #GEnumClass
- * 
- * Casts a derived #GEnumClass structure into a #GEnumClass structure.
- */
-#define G_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_ENUM, GEnumClass))
-/**
- * G_IS_ENUM_CLASS:
- * @class: a #GEnumClass
- * 
- * Checks whether @class "is a" valid #GEnumClass structure of type %G_TYPE_ENUM
- * or derived.
- */
-#define G_IS_ENUM_CLASS(class)	       (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_ENUM))
-/**
- * G_ENUM_CLASS_TYPE:
- * @class: a #GEnumClass
- * 
- * Get the type identifier from a given #GEnumClass structure.
- *
- * Returns: the #GType
- */
-#define G_ENUM_CLASS_TYPE(class)       (G_TYPE_FROM_CLASS (class))
-/**
- * G_ENUM_CLASS_TYPE_NAME:
- * @class: a #GEnumClass
- * 
- * Get the static type name from a given #GEnumClass structure.
- *
- * Returns: the type name.
- */
-#define G_ENUM_CLASS_TYPE_NAME(class)  (g_type_name (G_ENUM_CLASS_TYPE (class)))
-
-
-/**
- * G_TYPE_IS_FLAGS:
- * @type: a #GType ID.
- *
- * Checks whether @type "is a" %G_TYPE_FLAGS. 
- *
- * Returns: %TRUE if @type "is a" %G_TYPE_FLAGS.
- */
-#define G_TYPE_IS_FLAGS(type)	       (G_TYPE_FUNDAMENTAL (type) == G_TYPE_FLAGS)
-/**
- * G_FLAGS_CLASS:
- * @class: a valid #GFlagsClass
- * 
- * Casts a derived #GFlagsClass structure into a #GFlagsClass structure.
- */
-#define G_FLAGS_CLASS(class)	       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_FLAGS, GFlagsClass))
-/**
- * G_IS_FLAGS_CLASS:
- * @class: a #GFlagsClass
- * 
- * Checks whether @class "is a" valid #GFlagsClass structure of type %G_TYPE_FLAGS
- * or derived.
- */
-#define G_IS_FLAGS_CLASS(class)        (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_FLAGS))
-/**
- * G_FLAGS_CLASS_TYPE:
- * @class: a #GFlagsClass
- * 
- * Get the type identifier from a given #GFlagsClass structure.
- *
- * Returns: the #GType
- */
-#define G_FLAGS_CLASS_TYPE(class)      (G_TYPE_FROM_CLASS (class))
-/**
- * G_FLAGS_CLASS_TYPE_NAME:
- * @class: a #GFlagsClass
- * 
- * Get the static type name from a given #GFlagsClass structure.
- *
- * Returns: the type name.
- */
-#define G_FLAGS_CLASS_TYPE_NAME(class) (g_type_name (G_FLAGS_CLASS_TYPE (class)))
-
-
-/**
- * G_VALUE_HOLDS_ENUM:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_ENUM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_ENUM(value)      (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ENUM))
-/**
- * G_VALUE_HOLDS_FLAGS:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_FLAGS.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_FLAGS(value)     (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLAGS))
-
-
-/* --- enum/flag values & classes --- */
-typedef struct _GEnumClass  GEnumClass;
-typedef struct _GFlagsClass GFlagsClass;
-typedef struct _GEnumValue  GEnumValue;
-typedef struct _GFlagsValue GFlagsValue;
-
-/**
- * GEnumClass:
- * @g_type_class: the parent class
- * @minimum: the smallest possible value.
- * @maximum: the largest possible value.
- * @n_values: the number of possible values.
- * @values: an array of #GEnumValue structs describing the 
- *  individual values.
- * 
- * The class of an enumeration type holds information about its 
- * possible values.
- */
-struct	_GEnumClass
-{
-  GTypeClass  g_type_class;
-
-  /*< public >*/  
-  gint	      minimum;
-  gint	      maximum;
-  guint	      n_values;
-  GEnumValue *values;
-};
-/**
- * GFlagsClass:
- * @g_type_class: the parent class
- * @mask: a mask covering all possible values.
- * @n_values: the number of possible values.
- * @values: an array of #GFlagsValue structs describing the 
- *  individual values.
- * 
- * The class of a flags type holds information about its 
- * possible values.
- */
-struct	_GFlagsClass
-{
-  GTypeClass   g_type_class;
-  
-  /*< public >*/  
-  guint	       mask;
-  guint	       n_values;
-  GFlagsValue *values;
-};
-/**
- * GEnumValue:
- * @value: the enum value
- * @value_name: the name of the value
- * @value_nick: the nickname of the value
- * 
- * A structure which contains a single enum value, its name, and its
- * nickname.
- */
-struct _GEnumValue
-{
-  gint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-/**
- * GFlagsValue:
- * @value: the flags value
- * @value_name: the name of the value
- * @value_nick: the nickname of the value
- * 
- * A structure which contains a single flags value, its name, and its
- * nickname.
- */
-struct _GFlagsValue
-{
-  guint	 value;
-  const gchar *value_name;
-  const gchar *value_nick;
-};
-
-
-/* --- prototypes --- */
-GEnumValue*	g_enum_get_value		(GEnumClass	*enum_class,
-						 gint		 value);
-GEnumValue*	g_enum_get_value_by_name	(GEnumClass	*enum_class,
-						 const gchar	*name);
-GEnumValue*	g_enum_get_value_by_nick	(GEnumClass	*enum_class,
-						 const gchar	*nick);
-GFlagsValue*	g_flags_get_first_value		(GFlagsClass	*flags_class,
-						 guint		 value);
-GFlagsValue*	g_flags_get_value_by_name	(GFlagsClass	*flags_class,
-						 const gchar	*name);
-GFlagsValue*	g_flags_get_value_by_nick	(GFlagsClass	*flags_class,
-						 const gchar	*nick);
-void            g_value_set_enum        	(GValue         *value,
-						 gint            v_enum);
-gint            g_value_get_enum        	(const GValue   *value);
-void            g_value_set_flags       	(GValue         *value,
-						 guint           v_flags);
-guint           g_value_get_flags       	(const GValue   *value);
-
-
-
-/* --- registration functions --- */
-/* const_static_values is a NULL terminated array of enum/flags
- * values that is taken over!
- */
-GType	g_enum_register_static	   (const gchar	      *name,
-				    const GEnumValue  *const_static_values);
-GType	g_flags_register_static	   (const gchar	      *name,
-				    const GFlagsValue *const_static_values);
-/* functions to complete the type information
- * for enums/flags implemented by plugins
- */
-void	g_enum_complete_type_info  (GType	       g_enum_type,
-				    GTypeInfo	      *info,
-				    const GEnumValue  *const_values);
-void	g_flags_complete_type_info (GType	       g_flags_type,
-				    GTypeInfo	      *info,
-				    const GFlagsValue *const_values);
-
-G_END_DECLS
-
-#endif /* __G_ENUMS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/glib-types.h b/GstreamerHelper/x86/include/glib-2.0/gobject/glib-types.h
deleted file mode 100644
index 50bc0339..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/glib-types.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) && !defined(GLIB_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __GLIB_TYPES_H__
-#define __GLIB_TYPES_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* A hack necesssary to preprocess this file with g-ir-scanner */
-#ifdef __GI_SCANNER__
-typedef gsize GType;
-#endif
-
-/* --- GLib boxed types --- */
-/**
- * G_TYPE_DATE:
- *
- * The #GType for #GDate.
- */
-#define G_TYPE_DATE (g_date_get_type ())
-
-/**
- * G_TYPE_STRV:
- *
- * The #GType for a boxed type holding a %NULL-terminated array of strings.
- *
- * The code fragments in the following example show the use of a property of
- * type #G_TYPE_STRV with g_object_class_install_property(), g_object_set()
- * and g_object_get().
- *
- * |[
- * g_object_class_install_property (object_class,
- *                                  PROP_AUTHORS,
- *                                  g_param_spec_boxed ("authors",
- *                                                      _("Authors"),
- *                                                      _("List of authors"),
- *                                                      G_TYPE_STRV,
- *                                                      G_PARAM_READWRITE));
- *
- * gchar *authors[] = { "Owen", "Tim", NULL };
- * g_object_set (obj, "authors", authors, NULL);
- *
- * gchar *writers[];
- * g_object_get (obj, "authors", &writers, NULL);
- * /&ast; do something with writers &ast;/
- * g_strfreev (writers);
- * ]|
- *
- * Since: 2.4
- */
-#define G_TYPE_STRV (g_strv_get_type ())
-
-/**
- * G_TYPE_GSTRING:
- *
- * The #GType for #GString.
- */
-#define G_TYPE_GSTRING (g_gstring_get_type ())
-
-/**
- * G_TYPE_HASH_TABLE:
- *
- * The #GType for a boxed type holding a #GHashTable reference.
- *
- * Since: 2.10
- */
-#define G_TYPE_HASH_TABLE (g_hash_table_get_type ())
-
-/**
- * G_TYPE_REGEX:
- *
- * The #GType for a boxed type holding a #GRegex reference.
- *
- * Since: 2.14
- */
-#define G_TYPE_REGEX (g_regex_get_type ())
-
-/**
- * G_TYPE_MATCH_INFO:
- *
- * The #GType for a boxed type holding a #GMatchInfo reference.
- *
- * Since: 2.30
- */
-#define G_TYPE_MATCH_INFO (g_match_info_get_type ())
-
-/**
- * G_TYPE_ARRAY:
- *
- * The #GType for a boxed type holding a #GArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_ARRAY (g_array_get_type ())
-
-/**
- * G_TYPE_BYTE_ARRAY:
- *
- * The #GType for a boxed type holding a #GByteArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_BYTE_ARRAY (g_byte_array_get_type ())
-
-/**
- * G_TYPE_PTR_ARRAY:
- *
- * The #GType for a boxed type holding a #GPtrArray reference.
- *
- * Since: 2.22
- */
-#define G_TYPE_PTR_ARRAY (g_ptr_array_get_type ())
-
-/**
- * G_TYPE_BYTES:
- *
- * The #GType for #GBytes.
- *
- * Since: 2.32
- */
-#define G_TYPE_BYTES (g_bytes_get_type ())
-
-/**
- * G_TYPE_VARIANT_TYPE:
- *
- * The #GType for a boxed type holding a #GVariantType.
- *
- * Since: 2.24
- */
-#define G_TYPE_VARIANT_TYPE (g_variant_type_get_gtype ())
-
-/**
- * G_TYPE_ERROR:
- *
- * The #GType for a boxed type holding a #GError.
- *
- * Since: 2.26
- */
-#define G_TYPE_ERROR (g_error_get_type ())
-
-/**
- * G_TYPE_DATE_TIME:
- *
- * The #GType for a boxed type holding a #GDateTime.
- *
- * Since: 2.26
- */
-#define G_TYPE_DATE_TIME (g_date_time_get_type ())
-
-/**
- * G_TYPE_TIME_ZONE:
- *
- * The #GType for a boxed type holding a #GTimeZone.
- *
- * Since: 2.34
- */
-#define G_TYPE_TIME_ZONE (g_time_zone_get_type ())
-
-/**
- * G_TYPE_IO_CHANNEL:
- *
- * The #GType for #GIOChannel.
- */
-#define G_TYPE_IO_CHANNEL (g_io_channel_get_type ())
-
-/**
- * G_TYPE_IO_CONDITION:
- *
- * The #GType for #GIOCondition.
- */
-#define G_TYPE_IO_CONDITION (g_io_condition_get_type ())
-
-/**
- * G_TYPE_VARIANT_BUILDER:
- *
- * The #GType for a boxed type holding a #GVariantBuilder.
- *
- * Since: 2.30
- */
-#define G_TYPE_VARIANT_BUILDER (g_variant_builder_get_type ())
-
-/**
- * G_TYPE_MAIN_LOOP:
- *
- * The #GType for a boxed type holding a #GMainLoop.
- *
- * Since: 2.30
- */
-#define G_TYPE_MAIN_LOOP (g_main_loop_get_type ())
-
-/**
- * G_TYPE_MAIN_CONTEXT:
- *
- * The #GType for a boxed type holding a #GMainContext.
- *
- * Since: 2.30
- */
-#define G_TYPE_MAIN_CONTEXT (g_main_context_get_type ())
-
-/**
- * G_TYPE_SOURCE:
- *
- * The #GType for a boxed type holding a #GSource.
- *
- * Since: 2.30
- */
-#define G_TYPE_SOURCE (g_source_get_type ())
-
-/**
- * G_TYPE_KEY_FILE:
- *
- * The #GType for a boxed type holding a #GKeyFile.
- *
- * Since: 2.32
- */
-#define G_TYPE_KEY_FILE (g_key_file_get_type ())
-
-GType   g_date_get_type            (void) G_GNUC_CONST;
-GType   g_strv_get_type            (void) G_GNUC_CONST;
-GType   g_gstring_get_type         (void) G_GNUC_CONST;
-GType   g_hash_table_get_type      (void) G_GNUC_CONST;
-GType   g_array_get_type           (void) G_GNUC_CONST;
-GType   g_byte_array_get_type      (void) G_GNUC_CONST;
-GType   g_ptr_array_get_type       (void) G_GNUC_CONST;
-GType   g_bytes_get_type           (void) G_GNUC_CONST;
-GType   g_variant_type_get_gtype   (void) G_GNUC_CONST;
-GType   g_regex_get_type           (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_match_info_get_type      (void) G_GNUC_CONST;
-GType   g_error_get_type           (void) G_GNUC_CONST;
-GType   g_date_time_get_type       (void) G_GNUC_CONST;
-GType   g_time_zone_get_type       (void) G_GNUC_CONST;
-GType   g_io_channel_get_type      (void) G_GNUC_CONST;
-GType   g_io_condition_get_type    (void) G_GNUC_CONST;
-GType   g_variant_builder_get_type (void) G_GNUC_CONST;
-GType   g_key_file_get_type        (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_main_loop_get_type       (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_main_context_get_type    (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
-GType   g_source_get_type          (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED_FOR('G_TYPE_VARIANT')
-GType   g_variant_get_gtype        (void) G_GNUC_CONST;
-
-/**
- * GStrv:
- *
- * A C representable type name for #G_TYPE_STRV.
- */
-typedef gchar** GStrv;
-
-G_END_DECLS
-
-#endif  /* __GLIB_TYPES_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gmarshal.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gmarshal.h
deleted file mode 100644
index 0c21be68..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gmarshal.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/* Note: This file is no longer generated.  See the comment in gmarshal.list */
-#ifndef __G_MARSHAL_H__
-#define __G_MARSHAL_H__
-
-G_BEGIN_DECLS
-
-/* VOID:VOID (./gmarshal.list:6) */
-extern void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__VOIDv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:BOOLEAN (./gmarshal.list:7) */
-extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__BOOLEANv (GClosure     *closure,
-                                               GValue       *return_value,
-                                               gpointer      instance,
-                                               va_list       args,
-                                               gpointer      marshal_data,
-                                               int           n_params,
-                                               GType        *param_types);
-
-/* VOID:CHAR (./gmarshal.list:8) */
-extern void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__CHARv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:UCHAR (./gmarshal.list:9) */
-extern void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__UCHARv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:INT (./gmarshal.list:10) */
-extern void g_cclosure_marshal_VOID__INT (GClosure     *closure,
-                                          GValue       *return_value,
-                                          guint         n_param_values,
-                                          const GValue *param_values,
-                                          gpointer      invocation_hint,
-                                          gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__INTv (GClosure     *closure,
-                                           GValue       *return_value,
-                                           gpointer      instance,
-                                           va_list       args,
-                                           gpointer      marshal_data,
-                                           int           n_params,
-                                           GType        *param_types);
-
-/* VOID:UINT (./gmarshal.list:11) */
-extern void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__UINTv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:LONG (./gmarshal.list:12) */
-extern void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__LONGv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:ULONG (./gmarshal.list:13) */
-extern void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__ULONGv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:ENUM (./gmarshal.list:14) */
-extern void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
-                                           GValue       *return_value,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint,
-                                           gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__ENUMv (GClosure     *closure,
-                                            GValue       *return_value,
-                                            gpointer      instance,
-                                            va_list       args,
-                                            gpointer      marshal_data,
-                                            int           n_params,
-                                            GType        *param_types);
-
-/* VOID:FLAGS (./gmarshal.list:15) */
-extern void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__FLAGSv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:FLOAT (./gmarshal.list:16) */
-extern void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__FLOATv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:DOUBLE (./gmarshal.list:17) */
-extern void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__DOUBLEv (GClosure     *closure,
-                                              GValue       *return_value,
-                                              gpointer      instance,
-                                              va_list       args,
-                                              gpointer      marshal_data,
-                                              int           n_params,
-                                              GType        *param_types);
-
-/* VOID:STRING (./gmarshal.list:18) */
-extern void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__STRINGv (GClosure     *closure,
-                                              GValue       *return_value,
-                                              gpointer      instance,
-                                              va_list       args,
-                                              gpointer      marshal_data,
-                                              int           n_params,
-                                              GType        *param_types);
-
-/* VOID:PARAM (./gmarshal.list:19) */
-extern void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__PARAMv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:BOXED (./gmarshal.list:20) */
-extern void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
-                                            GValue       *return_value,
-                                            guint         n_param_values,
-                                            const GValue *param_values,
-                                            gpointer      invocation_hint,
-                                            gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__BOXEDv (GClosure     *closure,
-                                             GValue       *return_value,
-                                             gpointer      instance,
-                                             va_list       args,
-                                             gpointer      marshal_data,
-                                             int           n_params,
-                                             GType        *param_types);
-
-/* VOID:POINTER (./gmarshal.list:21) */
-extern void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__POINTERv (GClosure     *closure,
-                                               GValue       *return_value,
-                                               gpointer      instance,
-                                               va_list       args,
-                                               gpointer      marshal_data,
-                                               int           n_params,
-                                               GType        *param_types);
-
-/* VOID:OBJECT (./gmarshal.list:22) */
-extern void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__OBJECTv (GClosure     *closure,
-                                              GValue       *return_value,
-                                              gpointer      instance,
-                                              va_list       args,
-                                              gpointer      marshal_data,
-                                              int           n_params,
-                                              GType        *param_types);
-
-/* VOID:VARIANT (./gmarshal.list:23) */
-extern void g_cclosure_marshal_VOID__VARIANT (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__VARIANTv (GClosure     *closure,
-                                               GValue       *return_value,
-                                               gpointer      instance,
-                                               va_list       args,
-                                               gpointer      marshal_data,
-                                               int           n_params,
-                                               GType        *param_types);
-
-/* VOID:UINT,POINTER (./gmarshal.list:26) */
-extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
-                                                   GValue       *return_value,
-                                                   guint         n_param_values,
-                                                   const GValue *param_values,
-                                                   gpointer      invocation_hint,
-                                                   gpointer      marshal_data);
-extern void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure     *closure,
-                                                    GValue       *return_value,
-                                                    gpointer      instance,
-                                                    va_list       args,
-                                                    gpointer      marshal_data,
-                                                    int           n_params,
-                                                    GType        *param_types);
-
-/* BOOL:FLAGS (./gmarshal.list:27) */
-extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
-                                               GValue       *return_value,
-                                               guint         n_param_values,
-                                               const GValue *param_values,
-                                               gpointer      invocation_hint,
-                                               gpointer      marshal_data);
-extern void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure     *closure,
-                                                GValue       *return_value,
-                                                gpointer      instance,
-                                                va_list       args,
-                                                gpointer      marshal_data,
-                                                int           n_params,
-                                                GType        *param_types);
-#define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
-
-/* STRING:OBJECT,POINTER (./gmarshal.list:28) */
-extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-extern void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure     *closure,
-                                                        GValue       *return_value,
-                                                        gpointer      instance,
-                                                        va_list       args,
-                                                        gpointer      marshal_data,
-                                                        int           n_params,
-                                                        GType        *param_types);
-
-/* BOOL:BOXED,BOXED (./gmarshal.list:29) */
-extern void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure     *closure,
-                                                     GValue       *return_value,
-                                                     guint         n_param_values,
-                                                     const GValue *param_values,
-                                                     gpointer      invocation_hint,
-                                                     gpointer      marshal_data);
-extern void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure     *closure,
-                                                      GValue       *return_value,
-                                                      gpointer      instance,
-                                                      va_list       args,
-                                                      gpointer      marshal_data,
-                                                      int           n_params,
-                                                      GType        *param_types);
-#define g_cclosure_marshal_BOOL__BOXED_BOXED	g_cclosure_marshal_BOOLEAN__BOXED_BOXED
-
-G_END_DECLS
-
-#endif /* __G_MARSHAL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gobject.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gobject.h
deleted file mode 100644
index f63e4d16..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gobject.h
+++ /dev/null
@@ -1,610 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_OBJECT_H__
-#define __G_OBJECT_H__
-
-#include        <gobject/gtype.h>
-#include        <gobject/gvalue.h>
-#include        <gobject/gparam.h>
-#include        <gobject/gclosure.h>
-#include        <gobject/gsignal.h>
-#include        <gobject/gboxed.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_OBJECT:
- * @type: Type id to check
- * 
- * Check if the passed in type id is a %G_TYPE_OBJECT or derived from it.
- * 
- * Returns: %FALSE or %TRUE, indicating whether @type is a %G_TYPE_OBJECT.
- */
-#define G_TYPE_IS_OBJECT(type)      (G_TYPE_FUNDAMENTAL (type) == G_TYPE_OBJECT)
-/**
- * G_OBJECT:
- * @object: Object which is subject to casting.
- * 
- * Casts a #GObject or derived pointer into a (GObject*) pointer.
- * Depending on the current debugging level, this function may invoke
- * certain runtime checks to identify invalid casts.
- */
-#define G_OBJECT(object)            (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_OBJECT, GObject))
-/**
- * G_OBJECT_CLASS:
- * @class: a valid #GObjectClass
- * 
- * Casts a derived #GObjectClass structure into a #GObjectClass structure.
- */
-#define G_OBJECT_CLASS(class)       (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_OBJECT, GObjectClass))
-/**
- * G_IS_OBJECT:
- * @object: Instance to check for being a %G_TYPE_OBJECT.
- * 
- * Checks whether a valid #GTypeInstance pointer is of type %G_TYPE_OBJECT.
- */
-#define G_IS_OBJECT(object)         (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_OBJECT))
-/**
- * G_IS_OBJECT_CLASS:
- * @class: a #GObjectClass
- * 
- * Checks whether @class "is a" valid #GObjectClass structure of type
- * %G_TYPE_OBJECT or derived.
- */
-#define G_IS_OBJECT_CLASS(class)    (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_OBJECT))
-/**
- * G_OBJECT_GET_CLASS:
- * @object: a #GObject instance.
- * 
- * Get the class structure associated to a #GObject instance.
- *
- * Returns: pointer to object class structure.
- */
-#define G_OBJECT_GET_CLASS(object)  (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_OBJECT, GObjectClass))
-/**
- * G_OBJECT_TYPE:
- * @object: Object to return the type id for.
- * 
- * Get the type id of an object.
- * 
- * Returns: Type id of @object.
- */
-#define G_OBJECT_TYPE(object)       (G_TYPE_FROM_INSTANCE (object))
-/**
- * G_OBJECT_TYPE_NAME:
- * @object: Object to return the type name for.
- * 
- * Get the name of an object's type.
- * 
- * Returns: Type name of @object. The string is owned by the type system and 
- *  should not be freed.
- */
-#define G_OBJECT_TYPE_NAME(object)  (g_type_name (G_OBJECT_TYPE (object)))
-/**
- * G_OBJECT_CLASS_TYPE:
- * @class: a valid #GObjectClass
- * 
- * Get the type id of a class structure.
- * 
- * Returns: Type id of @class.
- */
-#define G_OBJECT_CLASS_TYPE(class)  (G_TYPE_FROM_CLASS (class))
-/**
- * G_OBJECT_CLASS_NAME:
- * @class: a valid #GObjectClass
- * 
- * Return the name of a class structure's type.
- * 
- * Returns: Type name of @class. The string is owned by the type system and 
- *  should not be freed.
- */
-#define G_OBJECT_CLASS_NAME(class)  (g_type_name (G_OBJECT_CLASS_TYPE (class)))
-/**
- * G_VALUE_HOLDS_OBJECT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_OBJECT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_OBJECT(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_OBJECT))
-
-/* --- type macros --- */
-/**
- * G_TYPE_INITIALLY_UNOWNED:
- * 
- * The type for #GInitiallyUnowned.
- */
-#define G_TYPE_INITIALLY_UNOWNED	      (g_initially_unowned_get_type())
-/**
- * G_INITIALLY_UNOWNED:
- * @object: Object which is subject to casting.
- * 
- * Casts a #GInitiallyUnowned or derived pointer into a (GInitiallyUnowned*) 
- * pointer. Depending on the current debugging level, this function may invoke
- * certain runtime checks to identify invalid casts.
- */
-#define G_INITIALLY_UNOWNED(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnowned))
-/**
- * G_INITIALLY_UNOWNED_CLASS:
- * @class: a valid #GInitiallyUnownedClass
- * 
- * Casts a derived #GInitiallyUnownedClass structure into a
- * #GInitiallyUnownedClass structure.
- */
-#define G_INITIALLY_UNOWNED_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
-/**
- * G_IS_INITIALLY_UNOWNED:
- * @object: Instance to check for being a %G_TYPE_INITIALLY_UNOWNED.
- * 
- * Checks whether a valid #GTypeInstance pointer is of type %G_TYPE_INITIALLY_UNOWNED.
- */
-#define G_IS_INITIALLY_UNOWNED(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_INITIALLY_UNOWNED))
-/**
- * G_IS_INITIALLY_UNOWNED_CLASS:
- * @class: a #GInitiallyUnownedClass
- * 
- * Checks whether @class "is a" valid #GInitiallyUnownedClass structure of type
- * %G_TYPE_INITIALLY_UNOWNED or derived.
- */
-#define G_IS_INITIALLY_UNOWNED_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_INITIALLY_UNOWNED))
-/**
- * G_INITIALLY_UNOWNED_GET_CLASS:
- * @object: a #GInitiallyUnowned instance.
- * 
- * Get the class structure associated to a #GInitiallyUnowned instance.
- *
- * Returns: pointer to object class structure.
- */
-#define G_INITIALLY_UNOWNED_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), G_TYPE_INITIALLY_UNOWNED, GInitiallyUnownedClass))
-/* GInitiallyUnowned ia a GObject with initially floating reference count */
-
-
-/* --- typedefs & structures --- */
-typedef struct _GObject                  GObject;
-typedef struct _GObjectClass             GObjectClass;
-typedef struct _GObject                  GInitiallyUnowned;
-typedef struct _GObjectClass             GInitiallyUnownedClass;
-typedef struct _GObjectConstructParam    GObjectConstructParam;
-/**
- * GObjectGetPropertyFunc:
- * @object: a #GObject
- * @property_id: the numeric id under which the property was registered with
- *  g_object_class_install_property().
- * @value: a #GValue to return the property value in
- * @pspec: the #GParamSpec describing the property
- * 
- * The type of the @get_property function of #GObjectClass. 
- */
-typedef void (*GObjectGetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         GValue       *value,
-                                         GParamSpec   *pspec);
-/**
- * GObjectSetPropertyFunc:
- * @object: a #GObject
- * @property_id: the numeric id under which the property was registered with
- *  g_object_class_install_property().
- * @value: the new value for the property
- * @pspec: the #GParamSpec describing the property
- * 
- * The type of the @set_property function of #GObjectClass. 
- */
-typedef void (*GObjectSetPropertyFunc)  (GObject      *object,
-                                         guint         property_id,
-                                         const GValue *value,
-                                         GParamSpec   *pspec);
-/**
- * GObjectFinalizeFunc:
- * @object: the #GObject being finalized
- * 
- * The type of the @finalize function of #GObjectClass.
- */
-typedef void (*GObjectFinalizeFunc)     (GObject      *object);
-/**
- * GWeakNotify:
- * @data: data that was provided when the weak reference was established
- * @where_the_object_was: the object being finalized
- * 
- * A #GWeakNotify function can be added to an object as a callback that gets
- * triggered when the object is finalized. Since the object is already being
- * finalized when the #GWeakNotify is called, there's not much you could do 
- * with the object, apart from e.g. using its address as hash-index or the like. 
- */
-typedef void (*GWeakNotify)		(gpointer      data,
-					 GObject      *where_the_object_was);
-/**
- * GObject:
- * 
- * All the fields in the <structname>GObject</structname> structure are private 
- * to the #GObject implementation and should never be accessed directly.
- */
-struct  _GObject
-{
-  GTypeInstance  g_type_instance;
-  
-  /*< private >*/
-  volatile guint ref_count;
-  GData         *qdata;
-};
-/**
- * GObjectClass:
- * @g_type_class: the parent class
- * @constructor: the @constructor function is called by g_object_new () to 
- *  complete the object initialization after all the construction properties are
- *  set. The first thing a @constructor implementation must do is chain up to the
- *  @constructor of the parent class. Overriding @constructor should be rarely 
- *  needed, e.g. to handle construct properties, or to implement singletons.
- * @set_property: the generic setter for all properties of this type. Should be
- *  overridden for every type with properties. Implementations of @set_property
- *  don't need to emit property change notification explicitly, this is handled
- *  by the type system.
- * @get_property: the generic getter for all properties of this type. Should be
- *  overridden for every type with properties.
- * @dispose: the @dispose function is supposed to drop all references to other 
- *  objects, but keep the instance otherwise intact, so that client method 
- *  invocations still work. It may be run multiple times (due to reference 
- *  loops). Before returning, @dispose should chain up to the @dispose method 
- *  of the parent class.
- * @finalize: instance finalization function, should finish the finalization of 
- *  the instance begun in @dispose and chain up to the @finalize method of the 
- *  parent class.
- * @dispatch_properties_changed: emits property change notification for a bunch
- *  of properties. Overriding @dispatch_properties_changed should be rarely 
- *  needed.
- * @notify: the class closure for the notify signal
- * @constructed: the @constructed function is called by g_object_new() as the
- *  final step of the object creation process.  At the point of the call, all
- *  construction properties have been set on the object.  The purpose of this
- *  call is to allow for object initialisation steps that can only be performed
- *  after construction properties have been set.  @constructed implementors
- *  should chain up to the @constructed call of their parent class to allow it
- *  to complete its initialisation.
- * 
- * The class structure for the <structname>GObject</structname> type.
- * 
- * <example>
- * <title>Implementing singletons using a constructor</title>
- * <programlisting>
- * static MySingleton *the_singleton = NULL;
- * 
- * static GObject*
- * my_singleton_constructor (GType                  type,
- *                           guint                  n_construct_params,
- *                           GObjectConstructParam *construct_params)
- * {
- *   GObject *object;
- *   
- *   if (!the_singleton)
- *     {
- *       object = G_OBJECT_CLASS (parent_class)->constructor (type,
- *                                                            n_construct_params,
- *                                                            construct_params);
- *       the_singleton = MY_SINGLETON (object);
- *     }
- *   else
- *     object = g_object_ref (G_OBJECT (the_singleton));
- * 
- *   return object;
- * }
- * </programlisting></example>
- */
-struct  _GObjectClass
-{
-  GTypeClass   g_type_class;
-
-  /*< private >*/
-  GSList      *construct_properties;
-
-  /*< public >*/
-  /* seldom overidden */
-  GObject*   (*constructor)     (GType                  type,
-                                 guint                  n_construct_properties,
-                                 GObjectConstructParam *construct_properties);
-  /* overridable methods */
-  void       (*set_property)		(GObject        *object,
-                                         guint           property_id,
-                                         const GValue   *value,
-                                         GParamSpec     *pspec);
-  void       (*get_property)		(GObject        *object,
-                                         guint           property_id,
-                                         GValue         *value,
-                                         GParamSpec     *pspec);
-  void       (*dispose)			(GObject        *object);
-  void       (*finalize)		(GObject        *object);
-  /* seldom overidden */
-  void       (*dispatch_properties_changed) (GObject      *object,
-					     guint	   n_pspecs,
-					     GParamSpec  **pspecs);
-  /* signals */
-  void	     (*notify)			(GObject	*object,
-					 GParamSpec	*pspec);
-
-  /* called when done constructing */
-  void	     (*constructed)		(GObject	*object);
-
-  /*< private >*/
-  gsize		flags;
-
-  /* padding */
-  gpointer	pdummy[6];
-};
-/**
- * GObjectConstructParam:
- * @pspec: the #GParamSpec of the construct parameter
- * @value: the value to set the parameter to
- * 
- * The <structname>GObjectConstructParam</structname> struct is an auxiliary 
- * structure used to hand #GParamSpec/#GValue pairs to the @constructor of
- * a #GObjectClass.
- */
-struct _GObjectConstructParam
-{
-  GParamSpec *pspec;
-  GValue     *value;
-};
-
-/**
- * GInitiallyUnowned:
- * 
- * All the fields in the <structname>GInitiallyUnowned</structname> structure 
- * are private to the #GInitiallyUnowned implementation and should never be 
- * accessed directly.
- */
-/**
- * GInitiallyUnownedClass:
- * 
- * The class structure for the <structname>GInitiallyUnowned</structname> type.
- */
-
-
-/* --- prototypes --- */
-GType       g_initially_unowned_get_type      (void);
-void        g_object_class_install_property   (GObjectClass   *oclass,
-					       guint           property_id,
-					       GParamSpec     *pspec);
-GParamSpec* g_object_class_find_property      (GObjectClass   *oclass,
-					       const gchar    *property_name);
-GParamSpec**g_object_class_list_properties    (GObjectClass   *oclass,
-					       guint	      *n_properties);
-void        g_object_class_override_property  (GObjectClass   *oclass,
-					       guint           property_id,
-					       const gchar    *name);
-void        g_object_class_install_properties (GObjectClass   *oclass,
-                                               guint           n_pspecs,
-                                               GParamSpec    **pspecs);
-
-void        g_object_interface_install_property (gpointer     g_iface,
-						 GParamSpec  *pspec);
-GParamSpec* g_object_interface_find_property    (gpointer     g_iface,
-						 const gchar *property_name);
-GParamSpec**g_object_interface_list_properties  (gpointer     g_iface,
-						 guint       *n_properties_p);
-
-GType       g_object_get_type                 (void) G_GNUC_CONST;
-gpointer    g_object_new                      (GType           object_type,
-					       const gchar    *first_property_name,
-					       ...);
-gpointer    g_object_newv		      (GType           object_type,
-					       guint	       n_parameters,
-					       GParameter     *parameters);
-GObject*    g_object_new_valist               (GType           object_type,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void	    g_object_set                      (gpointer	       object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-void        g_object_get                      (gpointer        object,
-					       const gchar    *first_property_name,
-					       ...) G_GNUC_NULL_TERMINATED;
-gpointer    g_object_connect                  (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-void	    g_object_disconnect               (gpointer	       object,
-					       const gchar    *signal_spec,
-					       ...) G_GNUC_NULL_TERMINATED;
-void        g_object_set_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_get_valist               (GObject        *object,
-					       const gchar    *first_property_name,
-					       va_list         var_args);
-void        g_object_set_property             (GObject        *object,
-					       const gchar    *property_name,
-					       const GValue   *value);
-void        g_object_get_property             (GObject        *object,
-					       const gchar    *property_name,
-					       GValue         *value);
-void        g_object_freeze_notify            (GObject        *object);
-void        g_object_notify                   (GObject        *object,
-					       const gchar    *property_name);
-void        g_object_notify_by_pspec          (GObject        *object,
-					       GParamSpec     *pspec);
-void        g_object_thaw_notify              (GObject        *object);
-gboolean    g_object_is_floating    	      (gpointer        object);
-gpointer    g_object_ref_sink       	      (gpointer	       object);
-gpointer    g_object_ref                      (gpointer        object);
-void        g_object_unref                    (gpointer        object);
-void	    g_object_weak_ref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-void	    g_object_weak_unref		      (GObject	      *object,
-					       GWeakNotify     notify,
-					       gpointer	       data);
-void        g_object_add_weak_pointer         (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-void        g_object_remove_weak_pointer      (GObject        *object, 
-                                               gpointer       *weak_pointer_location);
-
-/**
- * GToggleNotify:
- * @data: Callback data passed to g_object_add_toggle_ref()
- * @object: The object on which g_object_add_toggle_ref() was called.
- * @is_last_ref: %TRUE if the toggle reference is now the
- *  last reference to the object. %FALSE if the toggle
- *  reference was the last reference and there are now other
- *  references.
- * 
- * A callback function used for notification when the state
- * of a toggle reference changes. See g_object_add_toggle_ref().
- */
-typedef void (*GToggleNotify) (gpointer      data,
-			       GObject      *object,
-			       gboolean      is_last_ref);
-
-void g_object_add_toggle_ref    (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-void g_object_remove_toggle_ref (GObject       *object,
-				 GToggleNotify  notify,
-				 gpointer       data);
-
-gpointer    g_object_get_qdata                (GObject        *object,
-					       GQuark          quark);
-void        g_object_set_qdata                (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data);
-void        g_object_set_qdata_full           (GObject        *object,
-					       GQuark          quark,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_qdata              (GObject        *object,
-					       GQuark          quark);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer    g_object_dup_qdata                (GObject        *object,
-                                               GQuark          quark,
-                                               GDuplicateFunc  dup_func,
-					       gpointer         user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_object_replace_qdata            (GObject        *object,
-                                               GQuark          quark,
-                                               gpointer        oldval,
-                                               gpointer        newval,
-                                               GDestroyNotify  destroy,
-					       GDestroyNotify *old_destroy);
-
-gpointer    g_object_get_data                 (GObject        *object,
-					       const gchar    *key);
-void        g_object_set_data                 (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data);
-void        g_object_set_data_full            (GObject        *object,
-					       const gchar    *key,
-					       gpointer        data,
-					       GDestroyNotify  destroy);
-gpointer    g_object_steal_data               (GObject        *object,
-					       const gchar    *key);
-
-GLIB_AVAILABLE_IN_2_34
-gpointer    g_object_dup_data                 (GObject        *object,
-                                               const gchar    *key,
-                                               GDuplicateFunc  dup_func,
-					       gpointer         user_data);
-GLIB_AVAILABLE_IN_2_34
-gboolean    g_object_replace_data             (GObject        *object,
-                                               const gchar    *key,
-                                               gpointer        oldval,
-                                               gpointer        newval,
-                                               GDestroyNotify  destroy,
-					       GDestroyNotify *old_destroy);
-
-
-void        g_object_watch_closure            (GObject        *object,
-					       GClosure       *closure);
-GClosure*   g_cclosure_new_object             (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_cclosure_new_object_swap        (GCallback       callback_func,
-					       GObject	      *object);
-GClosure*   g_closure_new_object              (guint           sizeof_closure,
-					       GObject        *object);
-void        g_value_set_object                (GValue         *value,
-					       gpointer        v_object);
-gpointer    g_value_get_object                (const GValue   *value);
-gpointer    g_value_dup_object                (const GValue   *value);
-gulong	    g_signal_connect_object           (gpointer	       instance,
-					       const gchar    *detailed_signal,
-					       GCallback       c_handler,
-					       gpointer	       gobject,
-					       GConnectFlags   connect_flags);
-
-/*< protected >*/
-void        g_object_force_floating           (GObject        *object);
-void        g_object_run_dispose	      (GObject	      *object);
-
-
-void        g_value_take_object               (GValue         *value,
-					       gpointer        v_object);
-GLIB_DEPRECATED_FOR(g_value_take_object)
-void        g_value_set_object_take_ownership (GValue         *value,
-                                               gpointer        v_object);
-
-GLIB_DEPRECATED
-gsize	    g_object_compat_control	      (gsize	       what,
-					       gpointer	       data);
-
-/* --- implementation macros --- */
-#define G_OBJECT_WARN_INVALID_PSPEC(object, pname, property_id, pspec) \
-G_STMT_START { \
-  GObject *_object = (GObject*) (object); \
-  GParamSpec *_pspec = (GParamSpec*) (pspec); \
-  guint _property_id = (property_id); \
-  g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
-             G_STRLOC, \
-             (pname), \
-             _property_id, \
-             _pspec->name, \
-             g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
-             G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
-/**
- * G_OBJECT_WARN_INVALID_PROPERTY_ID:
- * @object: the #GObject on which set_property() or get_property() was called
- * @property_id: the numeric id of the property
- * @pspec: the #GParamSpec of the property
- * 
- * This macro should be used to emit a standard warning about unexpected 
- * properties in set_property() and get_property() implementations.
- */
-#define G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec) \
-    G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
-
-void    g_clear_object (volatile GObject **object_ptr);
-#define g_clear_object(object_ptr) g_clear_pointer ((object_ptr), g_object_unref)
-
-typedef struct {
-    /*<private>*/
-    union { gpointer p; } priv;
-} GWeakRef;
-
-void     g_weak_ref_init       (GWeakRef *weak_ref,
-                                gpointer  object);
-void     g_weak_ref_clear      (GWeakRef *weak_ref);
-gpointer g_weak_ref_get        (GWeakRef *weak_ref);
-void     g_weak_ref_set        (GWeakRef *weak_ref,
-                                gpointer  object);
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gobjectnotifyqueue.c b/GstreamerHelper/x86/include/glib-2.0/gobject/gobjectnotifyqueue.c
deleted file mode 100644
index cfe01ba0..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gobjectnotifyqueue.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* WARNING:
- *
- *    This file is INSTALLED and other projects (outside of glib)
- *    #include its contents.
- */
-
-#ifndef __G_OBJECT_NOTIFY_QUEUE_H__
-#define __G_OBJECT_NOTIFY_QUEUE_H__
-
-#include <string.h> /* memset */
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GObjectNotifyContext          GObjectNotifyContext;
-typedef struct _GObjectNotifyQueue            GObjectNotifyQueue;
-typedef void (*GObjectNotifyQueueDispatcher) (GObject     *object,
-					      guint        n_pspecs,
-					      GParamSpec **pspecs);
-
-
-/* --- structures --- */
-struct _GObjectNotifyContext
-{
-  GQuark                       quark_notify_queue;
-  GObjectNotifyQueueDispatcher dispatcher;
-  GTrashStack                 *_nqueue_trash; /* unused */
-};
-struct _GObjectNotifyQueue
-{
-  GObjectNotifyContext *context;
-  GSList               *pspecs;
-  guint16               n_pspecs;
-  guint16               freeze_count;
-};
-
-G_LOCK_DEFINE_STATIC(notify_lock);
-
-/* --- functions --- */
-static void
-g_object_notify_queue_free (gpointer data)
-{
-  GObjectNotifyQueue *nqueue = data;
-
-  g_slist_free (nqueue->pspecs);
-  g_slice_free (GObjectNotifyQueue, nqueue);
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_freeze (GObject		   *object,
-			      GObjectNotifyContext *context)
-{
-  GObjectNotifyQueue *nqueue;
-
-  G_LOCK(notify_lock);
-  nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-  if (!nqueue)
-    {
-      nqueue = g_slice_new0 (GObjectNotifyQueue);
-      nqueue->context = context;
-      g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
-				   nqueue, g_object_notify_queue_free);
-    }
-
-  if (nqueue->freeze_count >= 65535)
-    g_critical("Free queue for %s (%p) is larger than 65535,"
-               " called g_object_freeze_notify() too often."
-               " Forgot to call g_object_thaw_notify() or infinite loop",
-               G_OBJECT_TYPE_NAME (object), object);
-  else
-    nqueue->freeze_count++;
-  G_UNLOCK(notify_lock);
-
-  return nqueue;
-}
-
-static inline void
-g_object_notify_queue_thaw (GObject            *object,
-			    GObjectNotifyQueue *nqueue)
-{
-  GObjectNotifyContext *context = nqueue->context;
-  GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL;
-  GSList *slist;
-  guint n_pspecs = 0;
-
-  g_return_if_fail (nqueue->freeze_count > 0);
-  g_return_if_fail (g_atomic_int_get(&object->ref_count) > 0);
-
-  G_LOCK(notify_lock);
-
-  /* Just make sure we never get into some nasty race condition */
-  if (G_UNLIKELY(nqueue->freeze_count == 0)) {
-    G_UNLOCK(notify_lock);
-    g_warning ("%s: property-changed notification for %s(%p) is not frozen",
-	       G_STRFUNC, G_OBJECT_TYPE_NAME (object), object);
-    return;
-  }
-
-  nqueue->freeze_count--;
-  if (nqueue->freeze_count) {
-    G_UNLOCK(notify_lock);
-    return;
-  }
-
-  pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem;
-
-  for (slist = nqueue->pspecs; slist; slist = slist->next)
-    {
-      pspecs[n_pspecs++] = slist->data;
-    }
-  g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
-
-  G_UNLOCK(notify_lock);
-
-  if (n_pspecs)
-    context->dispatcher (object, n_pspecs, pspecs);
-  g_free (free_me);
-}
-
-static inline void
-g_object_notify_queue_clear (GObject            *object,
-			     GObjectNotifyQueue *nqueue)
-{
-  g_return_if_fail (nqueue->freeze_count > 0);
-
-  G_LOCK(notify_lock);
-
-  g_slist_free (nqueue->pspecs);
-  nqueue->pspecs = NULL;
-  nqueue->n_pspecs = 0;
-
-  G_UNLOCK(notify_lock);
-}
-
-static inline void
-g_object_notify_queue_add (GObject            *object,
-			   GObjectNotifyQueue *nqueue,
-			   GParamSpec	      *pspec)
-{
-  if (pspec->flags & G_PARAM_READABLE)
-    {
-      GParamSpec *redirect;
-
-      G_LOCK(notify_lock);
-
-      g_return_if_fail (nqueue->n_pspecs < 65535);
-
-      redirect = g_param_spec_get_redirect_target (pspec);
-      if (redirect)
-	pspec = redirect;
-	    
-      /* we do the deduping in _thaw */
-      if (g_slist_find (nqueue->pspecs, pspec) == NULL)
-        {
-          nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
-          nqueue->n_pspecs++;
-        }
-
-      G_UNLOCK(notify_lock);
-    }
-}
-
-/* NB: This function is not threadsafe, do not ever use it if
- * you need a threadsafe notify queue.
- * Use g_object_notify_queue_freeze() to acquire the queue and
- * g_object_notify_queue_thaw() after you are done instead.
- */
-static inline GObjectNotifyQueue*
-g_object_notify_queue_from_object (GObject              *object,
-                                   GObjectNotifyContext *context)
-{
-  return g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-}
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_NOTIFY_QUEUE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gparam.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gparam.h
deleted file mode 100644
index 84b3c445..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gparam.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gparam.h: GParamSpec base class implementation
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_PARAM_H__
-#define __G_PARAM_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-/**
- * G_TYPE_IS_PARAM:
- * @type: a #GType ID
- * 
- * Checks whether @type "is a" %G_TYPE_PARAM.
- */
-#define G_TYPE_IS_PARAM(type)		(G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM)
-/**
- * G_PARAM_SPEC:
- * @pspec: a valid #GParamSpec
- * 
- * Casts a derived #GParamSpec object (e.g. of type #GParamSpecInt) into
- * a #GParamSpec object.
- */
-#define G_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec))
-/**
- * G_IS_PARAM_SPEC:
- * @pspec: a #GParamSpec
- * 
- * Checks whether @pspec "is a" valid #GParamSpec structure of type %G_TYPE_PARAM
- * or derived.
- */
-#define G_IS_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM))
-/**
- * G_PARAM_SPEC_CLASS:
- * @pclass: a valid #GParamSpecClass
- * 
- * Casts a derived #GParamSpecClass structure into a #GParamSpecClass structure.
- */
-#define G_PARAM_SPEC_CLASS(pclass)      (G_TYPE_CHECK_CLASS_CAST ((pclass), G_TYPE_PARAM, GParamSpecClass))
-/**
- * G_IS_PARAM_SPEC_CLASS:
- * @pclass: a #GParamSpecClass
- * 
- * Checks whether @pclass "is a" valid #GParamSpecClass structure of type 
- * %G_TYPE_PARAM or derived.
- */
-#define G_IS_PARAM_SPEC_CLASS(pclass)   (G_TYPE_CHECK_CLASS_TYPE ((pclass), G_TYPE_PARAM))
-/**
- * G_PARAM_SPEC_GET_CLASS:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GParamSpecClass of a #GParamSpec.
- */
-#define G_PARAM_SPEC_GET_CLASS(pspec)	(G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass))
-
-
-/* --- convenience macros --- */
-/**
- * G_PARAM_SPEC_TYPE:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType of this @pspec.
- */
-#define G_PARAM_SPEC_TYPE(pspec)	(G_TYPE_FROM_INSTANCE (pspec))
-/**
- * G_PARAM_SPEC_TYPE_NAME:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType name of this @pspec.
- */
-#define G_PARAM_SPEC_TYPE_NAME(pspec)	(g_type_name (G_PARAM_SPEC_TYPE (pspec)))
-/**
- * G_PARAM_SPEC_VALUE_TYPE:
- * @pspec: a valid #GParamSpec
- * 
- * Retrieves the #GType to initialize a #GValue for this parameter.
- */
-#define	G_PARAM_SPEC_VALUE_TYPE(pspec)	(G_PARAM_SPEC (pspec)->value_type)
-/**
- * G_VALUE_HOLDS_PARAM:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values derived from type %G_TYPE_PARAM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_PARAM(value)	(G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_PARAM))
-       
-
-/* --- flags --- */
-/**
- * GParamFlags:
- * @G_PARAM_READABLE: the parameter is readable
- * @G_PARAM_WRITABLE: the parameter is writable
- * @G_PARAM_CONSTRUCT: the parameter will be set upon object construction
- * @G_PARAM_CONSTRUCT_ONLY: the parameter will only be set upon object construction
- * @G_PARAM_LAX_VALIDATION: upon parameter conversion (see g_param_value_convert())
- *  strict validation is not required
- * @G_PARAM_STATIC_NAME: the string used as name when constructing the 
- *  parameter is guaranteed to remain valid and
- *  unmodified for the lifetime of the parameter. 
- *  Since 2.8
- * @G_PARAM_STATIC_NICK: the string used as nick when constructing the
- *  parameter is guaranteed to remain valid and
- *  unmmodified for the lifetime of the parameter.
- *  Since 2.8
- * @G_PARAM_STATIC_BLURB: the string used as blurb when constructing the 
- *  parameter is guaranteed to remain valid and 
- *  unmodified for the lifetime of the parameter. 
- *  Since 2.8
- * @G_PARAM_PRIVATE: internal
- * @G_PARAM_DEPRECATED: the parameter is deprecated and will be removed
- *  in a future version. A warning will be generated if it is used
- *  while running with G_ENABLE_DIAGNOSTIC=1.
- *  Since 2.26
- * 
- * Through the #GParamFlags flag values, certain aspects of parameters
- * can be configured.
- */
-typedef enum
-{
-  G_PARAM_READABLE            = 1 << 0,
-  G_PARAM_WRITABLE            = 1 << 1,
-  G_PARAM_CONSTRUCT	      = 1 << 2,
-  G_PARAM_CONSTRUCT_ONLY      = 1 << 3,
-  G_PARAM_LAX_VALIDATION      = 1 << 4,
-  G_PARAM_STATIC_NAME	      = 1 << 5,
-#ifndef G_DISABLE_DEPRECATED
-  G_PARAM_PRIVATE	      = G_PARAM_STATIC_NAME,
-#endif
-  G_PARAM_STATIC_NICK	      = 1 << 6,
-  G_PARAM_STATIC_BLURB	      = 1 << 7,
-  /* User defined flags go up to 30 */
-  G_PARAM_DEPRECATED          = 1 << 31
-} GParamFlags;
-/**
- * G_PARAM_READWRITE:
- * 
- * #GParamFlags value alias for %G_PARAM_READABLE | %G_PARAM_WRITABLE.
- */
-#define	G_PARAM_READWRITE	(G_PARAM_READABLE | G_PARAM_WRITABLE)
-/**
- * G_PARAM_STATIC_STRINGS:
- * 
- * #GParamFlags value alias for %G_PARAM_STATIC_NAME | %G_PARAM_STATIC_NICK | %G_PARAM_STATIC_BLURB.
- * 
- * Since 2.13.0
- */
-#define	G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
-/* bits in the range 0xffffff00 are reserved for 3rd party usage */
-/**
- * G_PARAM_MASK:
- * 
- * Mask containing the bits of #GParamSpec.flags which are reserved for GLib.
- */
-#define	G_PARAM_MASK		(0x000000ff)
-/**
- * G_PARAM_USER_SHIFT:
- * 
- * Minimum shift count to be used for user defined flags, to be stored in
- * #GParamSpec.flags. The maximum allowed is 30 + G_PARAM_USER_SHIFT.
- */
-#define	G_PARAM_USER_SHIFT	(8)
-
-/* --- typedefs & structures --- */
-typedef struct _GParamSpec      GParamSpec;
-typedef struct _GParamSpecClass GParamSpecClass;
-typedef struct _GParameter	GParameter;
-typedef struct _GParamSpecPool  GParamSpecPool;
-/**
- * GParamSpec:
- * @g_type_instance: private #GTypeInstance portion
- * @name: name of this parameter: always an interned string
- * @flags: #GParamFlags flags for this parameter
- * @value_type: the #GValue type for this parameter
- * @owner_type: #GType type that uses (introduces) this parameter
- * 
- * All other fields of the <structname>GParamSpec</structname> struct are private and
- * should not be used directly.
- */
-struct _GParamSpec
-{
-  GTypeInstance  g_type_instance;
-
-  const gchar   *name;          /* interned string */
-  GParamFlags    flags;
-  GType		 value_type;
-  GType		 owner_type;	/* class or interface using this property */
-
-  /*< private >*/
-  gchar         *_nick;
-  gchar         *_blurb;
-  GData		*qdata;
-  guint          ref_count;
-  guint		 param_id;	/* sort-criteria */
-};
-/**
- * GParamSpecClass:
- * @g_type_class: the parent class
- * @value_type: the #GValue type for this parameter
- * @finalize: The instance finalization function (optional), should chain 
- *  up to the finalize method of the parent class.
- * @value_set_default: Resets a @value to the default value for this type
- *  (recommended, the default is g_value_reset()), see 
- *  g_param_value_set_default().
- * @value_validate: Ensures that the contents of @value comply with the 
- *  specifications set out by this type (optional), see 
- *  g_param_value_validate().
- * @values_cmp: Compares @value1 with @value2 according to this type
- *  (recommended, the default is memcmp()), see g_param_values_cmp().
- * 
- * The class structure for the <structname>GParamSpec</structname> type.
- * Normally, <structname>GParamSpec</structname> classes are filled by
- * g_param_type_register_static().
- */
-struct _GParamSpecClass
-{
-  GTypeClass      g_type_class;
-
-  GType		  value_type;
-
-  void	        (*finalize)		(GParamSpec   *pspec);
-
-  /* GParam methods */
-  void          (*value_set_default)    (GParamSpec   *pspec,
-					 GValue       *value);
-  gboolean      (*value_validate)       (GParamSpec   *pspec,
-					 GValue       *value);
-  gint          (*values_cmp)           (GParamSpec   *pspec,
-					 const GValue *value1,
-					 const GValue *value2);
-  /*< private >*/
-  gpointer	  dummy[4];
-};
-/**
- * GParameter:
- * @name: the parameter name
- * @value: the parameter value
- * 
- * The <structname>GParameter</structname> struct is an auxiliary structure used
- * to hand parameter name/value pairs to g_object_newv().
- */
-struct _GParameter /* auxiliary structure for _setv() variants */
-{
-  const gchar *name;
-  GValue       value;
-};
-
-
-/* --- prototypes --- */
-GParamSpec*	g_param_spec_ref		(GParamSpec    *pspec);
-void		g_param_spec_unref		(GParamSpec    *pspec);
-void		g_param_spec_sink		(GParamSpec    *pspec);
-GParamSpec*	g_param_spec_ref_sink   	(GParamSpec    *pspec);
-gpointer        g_param_spec_get_qdata		(GParamSpec    *pspec,
-						 GQuark         quark);
-void            g_param_spec_set_qdata		(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data);
-void            g_param_spec_set_qdata_full	(GParamSpec    *pspec,
-						 GQuark         quark,
-						 gpointer       data,
-						 GDestroyNotify destroy);
-gpointer        g_param_spec_steal_qdata	(GParamSpec    *pspec,
-						 GQuark         quark);
-GParamSpec*     g_param_spec_get_redirect_target (GParamSpec   *pspec);
-
-void		g_param_value_set_default	(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_defaults		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_validate		(GParamSpec    *pspec,
-						 GValue	       *value);
-gboolean	g_param_value_convert		(GParamSpec    *pspec,
-						 const GValue  *src_value,
-						 GValue	       *dest_value,
-						 gboolean	strict_validation);
-gint		g_param_values_cmp		(GParamSpec    *pspec,
-						 const GValue  *value1,
-						 const GValue  *value2);
-const gchar *   g_param_spec_get_name           (GParamSpec    *pspec);
-const gchar *   g_param_spec_get_nick           (GParamSpec    *pspec);
-const gchar *   g_param_spec_get_blurb          (GParamSpec    *pspec);
-void            g_value_set_param               (GValue	       *value,
-						 GParamSpec    *param);
-GParamSpec*     g_value_get_param               (const GValue  *value);
-GParamSpec*     g_value_dup_param               (const GValue  *value);
-
-
-void           g_value_take_param               (GValue        *value,
-					         GParamSpec    *param);
-GLIB_DEPRECATED_FOR(g_value_take_param)
-void           g_value_set_param_take_ownership (GValue        *value,
-                                                 GParamSpec    *param);
-
-/* --- convenience functions --- */
-typedef struct _GParamSpecTypeInfo GParamSpecTypeInfo;
-/**
- * GParamSpecTypeInfo:
- * @instance_size: Size of the instance (object) structure.
- * @n_preallocs: Prior to GLib 2.10, it specified the number of pre-allocated (cached) instances to reserve memory for (0 indicates no caching). Since GLib 2.10, it is ignored, since instances are allocated with the <link linkend="glib-Memory-Slices">slice allocator</link> now.
- * @instance_init: Location of the instance initialization function (optional).
- * @value_type: The #GType of values conforming to this #GParamSpec
- * @finalize: The instance finalization function (optional).
- * @value_set_default: Resets a @value to the default value for @pspec 
- *  (recommended, the default is g_value_reset()), see 
- *  g_param_value_set_default().
- * @value_validate: Ensures that the contents of @value comply with the 
- *  specifications set out by @pspec (optional), see 
- *  g_param_value_validate().
- * @values_cmp: Compares @value1 with @value2 according to @pspec 
- *  (recommended, the default is memcmp()), see g_param_values_cmp().
- * 
- * This structure is used to provide the type system with the information
- * required to initialize and destruct (finalize) a parameter's class and
- * instances thereof.
- * The initialized structure is passed to the g_param_type_register_static() 
- * The type system will perform a deep copy of this structure, so its memory 
- * does not need to be persistent across invocation of 
- * g_param_type_register_static().
- */
-struct _GParamSpecTypeInfo
-{
-  /* type system portion */
-  guint16         instance_size;                               /* obligatory */
-  guint16         n_preallocs;                                 /* optional */
-  void		(*instance_init)	(GParamSpec   *pspec); /* optional */
-
-  /* class portion */
-  GType           value_type;				       /* obligatory */
-  void          (*finalize)             (GParamSpec   *pspec); /* optional */
-  void          (*value_set_default)    (GParamSpec   *pspec,  /* recommended */
-					 GValue       *value);
-  gboolean      (*value_validate)       (GParamSpec   *pspec,  /* optional */
-					 GValue       *value);
-  gint          (*values_cmp)           (GParamSpec   *pspec,  /* recommended */
-					 const GValue *value1,
-					 const GValue *value2);
-};
-GType	g_param_type_register_static	(const gchar		  *name,
-					 const GParamSpecTypeInfo *pspec_info);
-
-/* For registering builting types */
-GType  _g_param_type_register_static_constant (const gchar              *name,
-					       const GParamSpecTypeInfo *pspec_info,
-					       GType                     opt_type);
-
-
-/* --- protected --- */
-gpointer	g_param_spec_internal		(GType	        param_type,
-						 const gchar   *name,
-						 const gchar   *nick,
-						 const gchar   *blurb,
-						 GParamFlags    flags);
-GParamSpecPool* g_param_spec_pool_new		(gboolean	type_prefixing);
-void		g_param_spec_pool_insert	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec,
-						 GType		 owner_type);
-void		g_param_spec_pool_remove	(GParamSpecPool	*pool,
-						 GParamSpec	*pspec);
-GParamSpec*	g_param_spec_pool_lookup	(GParamSpecPool	*pool,
-						 const gchar	*param_name,
-						 GType		 owner_type,
-						 gboolean	 walk_ancestors);
-GList*		g_param_spec_pool_list_owned	(GParamSpecPool	*pool,
-						 GType		 owner_type);
-GParamSpec**	g_param_spec_pool_list		(GParamSpecPool	*pool,
-						 GType		 owner_type,
-						 guint		*n_pspecs_p);
-
-
-
-/* contracts:
- *
- * gboolean value_validate (GParamSpec *pspec,
- *                          GValue     *value):
- *	modify value contents in the least destructive way, so
- *	that it complies with pspec's requirements (i.e.
- *	according to minimum/maximum ranges etc...). return
- *	whether modification was necessary.
- *
- * gint values_cmp (GParamSpec   *pspec,
- *                  const GValue *value1,
- *                  const GValue *value2):
- *	return value1 - value2, i.e. (-1) if value1 < value2,
- *	(+1) if value1 > value2, and (0) otherwise (equality)
- */
-
-G_END_DECLS
-
-#endif /* __G_PARAM_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gparamspecs.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gparamspecs.h
deleted file mode 100644
index 3e0ff6e3..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gparamspecs.h
+++ /dev/null
@@ -1,1143 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gparamspecs.h: GLib default param specs
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_PARAMSPECS_H__
-#define __G_PARAMSPECS_H__
-
-#include        <gobject/gvalue.h>
-#include        <gobject/genums.h>
-#include        <gobject/gboxed.h>
-#include        <gobject/gobject.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_PARAM_CHAR:
- * 
- * The #GType of #GParamSpecChar.
- */
-#define	G_TYPE_PARAM_CHAR		   (g_param_spec_types[0])
-/**
- * G_IS_PARAM_SPEC_CHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_CHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_CHAR(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_CHAR))
-/**
- * G_PARAM_SPEC_CHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecChar.
- */
-#define G_PARAM_SPEC_CHAR(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_CHAR, GParamSpecChar))
-
-/**
- * G_TYPE_PARAM_UCHAR:
- * 
- * The #GType of #GParamSpecUChar.
- */
-#define	G_TYPE_PARAM_UCHAR		   (g_param_spec_types[1])
-/**
- * G_IS_PARAM_SPEC_UCHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UCHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UCHAR(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UCHAR))
-/**
- * G_PARAM_SPEC_UCHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUChar.
- */
-#define G_PARAM_SPEC_UCHAR(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UCHAR, GParamSpecUChar))
-
-/**
- * G_TYPE_PARAM_BOOLEAN:
- * 
- * The #GType of #GParamSpecBoolean.
- */
-#define	G_TYPE_PARAM_BOOLEAN		   (g_param_spec_types[2])
-/**
- * G_IS_PARAM_SPEC_BOOLEAN:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_BOOLEAN.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_BOOLEAN(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOOLEAN))
-/**
- * G_PARAM_SPEC_BOOLEAN:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecBoolean.
- */
-#define G_PARAM_SPEC_BOOLEAN(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOOLEAN, GParamSpecBoolean))
-
-/**
- * G_TYPE_PARAM_INT:
- * 
- * The #GType of #GParamSpecInt.
- */
-#define	G_TYPE_PARAM_INT		   (g_param_spec_types[3])
-/**
- * G_IS_PARAM_SPEC_INT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_INT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_INT(pspec)         (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT))
-/**
- * G_PARAM_SPEC_INT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecInt.
- */
-#define G_PARAM_SPEC_INT(pspec)            (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT, GParamSpecInt))
-
-/**
- * G_TYPE_PARAM_UINT:
- * 
- * The #GType of #GParamSpecUInt.
- */
-#define	G_TYPE_PARAM_UINT		   (g_param_spec_types[4])
-/**
- * G_IS_PARAM_SPEC_UINT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UINT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UINT(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT))
-/**
- * G_PARAM_SPEC_UINT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUInt.
- */
-#define G_PARAM_SPEC_UINT(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT, GParamSpecUInt))
-
-/**
- * G_TYPE_PARAM_LONG:
- * 
- * The #GType of #GParamSpecLong.
- */
-#define	G_TYPE_PARAM_LONG		   (g_param_spec_types[5])
-/**
- * G_IS_PARAM_SPEC_LONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_LONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_LONG(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_LONG))
-/**
- * G_PARAM_SPEC_LONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecLong.
- */
-#define G_PARAM_SPEC_LONG(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_LONG, GParamSpecLong))
-
-/**
- * G_TYPE_PARAM_ULONG:
- * 
- * The #GType of #GParamSpecULong.
- */
-#define	G_TYPE_PARAM_ULONG		   (g_param_spec_types[6])
-/**
- * G_IS_PARAM_SPEC_ULONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_ULONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_ULONG(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ULONG))
-/**
- * G_PARAM_SPEC_ULONG:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecULong.
- */
-#define G_PARAM_SPEC_ULONG(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ULONG, GParamSpecULong))
-
-/**
- * G_TYPE_PARAM_INT64:
- * 
- * The #GType of #GParamSpecInt64.
- */
-#define	G_TYPE_PARAM_INT64		   (g_param_spec_types[7])
-/**
- * G_IS_PARAM_SPEC_INT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_INT64.
- *
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_INT64(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_INT64))
-/**
- * G_PARAM_SPEC_INT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecInt64.
- */
-#define G_PARAM_SPEC_INT64(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_INT64, GParamSpecInt64))
-
-/**
- * G_TYPE_PARAM_UINT64:
- * 
- * The #GType of #GParamSpecUInt64.
- */
-#define	G_TYPE_PARAM_UINT64		   (g_param_spec_types[8])
-/**
- * G_IS_PARAM_SPEC_UINT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UINT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UINT64(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UINT64))
-/**
- * G_PARAM_SPEC_UINT64:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUInt64.
- */
-#define G_PARAM_SPEC_UINT64(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UINT64, GParamSpecUInt64))
-
-/**
- * G_TYPE_PARAM_UNICHAR:
- * 
- * The #GType of #GParamSpecUnichar.
- */
-#define	G_TYPE_PARAM_UNICHAR		   (g_param_spec_types[9])
-/**
- * G_PARAM_SPEC_UNICHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecUnichar.
- */
-#define G_PARAM_SPEC_UNICHAR(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_UNICHAR, GParamSpecUnichar))
-/**
- * G_IS_PARAM_SPEC_UNICHAR:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_UNICHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_UNICHAR(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_UNICHAR))
-
-/**
- * G_TYPE_PARAM_ENUM:
- * 
- * The #GType of #GParamSpecEnum.
- */
-#define	G_TYPE_PARAM_ENUM		   (g_param_spec_types[10])
-/**
- * G_IS_PARAM_SPEC_ENUM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_ENUM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_ENUM(pspec)        (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_ENUM))
-/**
- * G_PARAM_SPEC_ENUM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecEnum.
- */
-#define G_PARAM_SPEC_ENUM(pspec)           (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_ENUM, GParamSpecEnum))
-
-/**
- * G_TYPE_PARAM_FLAGS:
- * 
- * The #GType of #GParamSpecFlags.
- */
-#define	G_TYPE_PARAM_FLAGS		   (g_param_spec_types[11])
-/**
- * G_IS_PARAM_SPEC_FLAGS:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_FLAGS.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_FLAGS(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLAGS))
-/**
- * G_PARAM_SPEC_FLAGS:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecFlags.
- */
-#define G_PARAM_SPEC_FLAGS(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLAGS, GParamSpecFlags))
-
-/**
- * G_TYPE_PARAM_FLOAT:
- * 
- * The #GType of #GParamSpecFloat.
- */
-#define	G_TYPE_PARAM_FLOAT		   (g_param_spec_types[12])
-/**
- * G_IS_PARAM_SPEC_FLOAT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_FLOAT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_FLOAT(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_FLOAT))
-/**
- * G_PARAM_SPEC_FLOAT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecFloat.
- */
-#define G_PARAM_SPEC_FLOAT(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_FLOAT, GParamSpecFloat))
-
-/**
- * G_TYPE_PARAM_DOUBLE:
- * 
- * The #GType of #GParamSpecDouble.
- */
-#define	G_TYPE_PARAM_DOUBLE		   (g_param_spec_types[13])
-/**
- * G_IS_PARAM_SPEC_DOUBLE:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_DOUBLE.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_DOUBLE(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_DOUBLE))
-/**
- * G_PARAM_SPEC_DOUBLE:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecDouble.
- */
-#define G_PARAM_SPEC_DOUBLE(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_DOUBLE, GParamSpecDouble))
-
-/**
- * G_TYPE_PARAM_STRING:
- * 
- * The #GType of #GParamSpecString.
- */
-#define	G_TYPE_PARAM_STRING		   (g_param_spec_types[14])
-/**
- * G_IS_PARAM_SPEC_STRING:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_STRING.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_STRING(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_STRING))
-/**
- * G_PARAM_SPEC_STRING:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecString.
- */
-#define G_PARAM_SPEC_STRING(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_STRING, GParamSpecString))
-
-/**
- * G_TYPE_PARAM_PARAM:
- * 
- * The #GType of #GParamSpecParam.
- */
-#define	G_TYPE_PARAM_PARAM		   (g_param_spec_types[15])
-/**
- * G_IS_PARAM_SPEC_PARAM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_PARAM.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_PARAM(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_PARAM))
-/**
- * G_PARAM_SPEC_PARAM:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecParam.
- */
-#define G_PARAM_SPEC_PARAM(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_PARAM, GParamSpecParam))
-
-/**
- * G_TYPE_PARAM_BOXED:
- * 
- * The #GType of #GParamSpecBoxed.
- */
-#define	G_TYPE_PARAM_BOXED		   (g_param_spec_types[16])
-/**
- * G_IS_PARAM_SPEC_BOXED:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_BOXED.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_BOXED(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_BOXED))
-/**
- * G_PARAM_SPEC_BOXED:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecBoxed.
- */
-#define G_PARAM_SPEC_BOXED(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_BOXED, GParamSpecBoxed))
-
-/**
- * G_TYPE_PARAM_POINTER:
- * 
- * The #GType of #GParamSpecPointer.
- */
-#define	G_TYPE_PARAM_POINTER		   (g_param_spec_types[17])
-/**
- * G_IS_PARAM_SPEC_POINTER:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_POINTER.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_POINTER(pspec)     (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_POINTER))
-/**
- * G_PARAM_SPEC_POINTER:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecPointer.
- */
-#define G_PARAM_SPEC_POINTER(pspec)        (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_POINTER, GParamSpecPointer))
-
-/**
- * G_TYPE_PARAM_VALUE_ARRAY:
- * 
- * The #GType of #GParamSpecValueArray.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define	G_TYPE_PARAM_VALUE_ARRAY	   (g_param_spec_types[18])
-/**
- * G_IS_PARAM_SPEC_VALUE_ARRAY:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_VALUE_ARRAY.
- * 
- * Returns: %TRUE on success.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY))
-/**
- * G_PARAM_SPEC_VALUE_ARRAY:
- * @pspec: a valid #GParamSpec instance
- * 
- * Cast a #GParamSpec instance into a #GParamSpecValueArray.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_PARAM_SPEC_VALUE_ARRAY(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY, GParamSpecValueArray))
-
-/**
- * G_TYPE_PARAM_OBJECT:
- * 
- * The #GType of #GParamSpecObject.
- */
-#define	G_TYPE_PARAM_OBJECT		   (g_param_spec_types[19])
-/**
- * G_IS_PARAM_SPEC_OBJECT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_OBJECT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_OBJECT(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OBJECT))
-/**
- * G_PARAM_SPEC_OBJECT:
- * @pspec: a valid #GParamSpec instance
- * 
- * Casts a #GParamSpec instance into a #GParamSpecObject.
- */
-#define G_PARAM_SPEC_OBJECT(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OBJECT, GParamSpecObject))
-
-/**
- * G_TYPE_PARAM_OVERRIDE:
- * 
- * The #GType of #GParamSpecOverride.
- * 
- * Since: 2.4
- */
-#define	G_TYPE_PARAM_OVERRIDE		   (g_param_spec_types[20])
-/**
- * G_IS_PARAM_SPEC_OVERRIDE:
- * @pspec: a #GParamSpec
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_OVERRIDE.
- * 
- * Since: 2.4
- * Returns: %TRUE on success.
- */
-#define G_IS_PARAM_SPEC_OVERRIDE(pspec)    (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_OVERRIDE))
-/**
- * G_PARAM_SPEC_OVERRIDE:
- * @pspec: a #GParamSpec
- * 
- * Casts a #GParamSpec into a #GParamSpecOverride.
- * 
- * Since: 2.4
- */
-#define G_PARAM_SPEC_OVERRIDE(pspec)       (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_OVERRIDE, GParamSpecOverride))
-
-/**
- * G_TYPE_PARAM_GTYPE:
- * 
- * The #GType of #GParamSpecGType.
- * 
- * Since: 2.10
- */
-#define	G_TYPE_PARAM_GTYPE		   (g_param_spec_types[21])
-/**
- * G_IS_PARAM_SPEC_GTYPE:
- * @pspec: a #GParamSpec
- * 
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_GTYPE.
- * 
- * Since: 2.10
- * Returns: %TRUE on success. 
- */
-#define G_IS_PARAM_SPEC_GTYPE(pspec)       (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_GTYPE))
-/**
- * G_PARAM_SPEC_GTYPE:
- * @pspec: a #GParamSpec
- * 
- * Casts a #GParamSpec into a #GParamSpecGType.
- * 
- * Since: 2.10
- */
-#define G_PARAM_SPEC_GTYPE(pspec)          (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_GTYPE, GParamSpecGType))
-
-/**
- * G_TYPE_PARAM_VARIANT:
- *
- * The #GType of #GParamSpecVariant.
- *
- * Since: 2.26
- */
-#define G_TYPE_PARAM_VARIANT                (g_param_spec_types[22])
-/**
- * G_IS_PARAM_SPEC_VARIANT:
- * @pspec: a #GParamSpec
- *
- * Checks whether the given #GParamSpec is of type %G_TYPE_PARAM_VARIANT.
- *
- * Returns: %TRUE on success
- *
- * Since: 2.26
- */
-#define G_IS_PARAM_SPEC_VARIANT(pspec)      (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VARIANT))
-/**
- * G_PARAM_SPEC_VARIANT:
- * @pspec: a #GParamSpec
- *
- * Casts a #GParamSpec into a #GParamSpecVariant.
- *
- * Since: 2.26
- */
-#define G_PARAM_SPEC_VARIANT(pspec)         (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VARIANT, GParamSpecVariant))
-
-/* --- typedefs & structures --- */
-typedef struct _GParamSpecChar       GParamSpecChar;
-typedef struct _GParamSpecUChar      GParamSpecUChar;
-typedef struct _GParamSpecBoolean    GParamSpecBoolean;
-typedef struct _GParamSpecInt        GParamSpecInt;
-typedef struct _GParamSpecUInt       GParamSpecUInt;
-typedef struct _GParamSpecLong       GParamSpecLong;
-typedef struct _GParamSpecULong      GParamSpecULong;
-typedef struct _GParamSpecInt64      GParamSpecInt64;
-typedef struct _GParamSpecUInt64     GParamSpecUInt64;
-typedef struct _GParamSpecUnichar    GParamSpecUnichar;
-typedef struct _GParamSpecEnum       GParamSpecEnum;
-typedef struct _GParamSpecFlags      GParamSpecFlags;
-typedef struct _GParamSpecFloat      GParamSpecFloat;
-typedef struct _GParamSpecDouble     GParamSpecDouble;
-typedef struct _GParamSpecString     GParamSpecString;
-typedef struct _GParamSpecParam      GParamSpecParam;
-typedef struct _GParamSpecBoxed      GParamSpecBoxed;
-typedef struct _GParamSpecPointer    GParamSpecPointer;
-typedef struct _GParamSpecValueArray GParamSpecValueArray;
-typedef struct _GParamSpecObject     GParamSpecObject;
-typedef struct _GParamSpecOverride   GParamSpecOverride;
-typedef struct _GParamSpecGType      GParamSpecGType;
-typedef struct _GParamSpecVariant    GParamSpecVariant;
-
-/**
- * GParamSpecChar:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for character properties.
- */
-struct _GParamSpecChar
-{
-  GParamSpec    parent_instance;
-  
-  gint8         minimum;
-  gint8         maximum;
-  gint8         default_value;
-};
-/**
- * GParamSpecUChar:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned character properties.
- */
-struct _GParamSpecUChar
-{
-  GParamSpec    parent_instance;
-  
-  guint8        minimum;
-  guint8        maximum;
-  guint8        default_value;
-};
-/**
- * GParamSpecBoolean:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for boolean properties.
- */
-struct _GParamSpecBoolean
-{
-  GParamSpec    parent_instance;
-  
-  gboolean      default_value;
-};
-/**
- * GParamSpecInt:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for integer properties.
- */
-struct _GParamSpecInt
-{
-  GParamSpec    parent_instance;
-  
-  gint          minimum;
-  gint          maximum;
-  gint          default_value;
-};
-/**
- * GParamSpecUInt:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned integer properties.
- */
-struct _GParamSpecUInt
-{
-  GParamSpec    parent_instance;
-  
-  guint         minimum;
-  guint         maximum;
-  guint         default_value;
-};
-/**
- * GParamSpecLong:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for long integer properties.
- */
-struct _GParamSpecLong
-{
-  GParamSpec    parent_instance;
-  
-  glong         minimum;
-  glong         maximum;
-  glong         default_value;
-};
-/**
- * GParamSpecULong:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned long integer properties.
- */
-struct _GParamSpecULong
-{
-  GParamSpec    parent_instance;
-  
-  gulong        minimum;
-  gulong        maximum;
-  gulong        default_value;
-};
-/**
- * GParamSpecInt64:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for 64bit integer properties.
- */
-struct _GParamSpecInt64
-{
-  GParamSpec    parent_instance;
-  
-  gint64        minimum;
-  gint64        maximum;
-  gint64        default_value;
-};
-/**
- * GParamSpecUInt64:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unsigned 64bit integer properties.
- */
-struct _GParamSpecUInt64
-{
-  GParamSpec    parent_instance;
-  
-  guint64       minimum;
-  guint64       maximum;
-  guint64       default_value;
-};
-/**
- * GParamSpecUnichar:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for unichar (unsigned integer) properties.
- */
-struct _GParamSpecUnichar
-{
-  GParamSpec    parent_instance;
-  
-  gunichar      default_value;
-};
-/**
- * GParamSpecEnum:
- * @parent_instance: private #GParamSpec portion
- * @enum_class: the #GEnumClass for the enum
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for enum 
- * properties.
- */
-struct _GParamSpecEnum
-{
-  GParamSpec    parent_instance;
-  
-  GEnumClass   *enum_class;
-  gint          default_value;
-};
-/**
- * GParamSpecFlags:
- * @parent_instance: private #GParamSpec portion
- * @flags_class: the #GFlagsClass for the flags
- * @default_value: default value for the property specified
- * 
- * A #GParamSpec derived structure that contains the meta data for flags
- * properties.
- */
-struct _GParamSpecFlags
-{
-  GParamSpec    parent_instance;
-  
-  GFlagsClass  *flags_class;
-  guint         default_value;
-};
-/**
- * GParamSpecFloat:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * @epsilon: values closer than @epsilon will be considered identical
- *  by g_param_values_cmp(); the default value is 1e-30.
- * 
- * A #GParamSpec derived structure that contains the meta data for float properties.
- */
-struct _GParamSpecFloat
-{
-  GParamSpec    parent_instance;
-  
-  gfloat        minimum;
-  gfloat        maximum;
-  gfloat        default_value;
-  gfloat        epsilon;
-};
-/**
- * GParamSpecDouble:
- * @parent_instance: private #GParamSpec portion
- * @minimum: minimum value for the property specified
- * @maximum: maximum value for the property specified
- * @default_value: default value for the property specified
- * @epsilon: values closer than @epsilon will be considered identical
- *  by g_param_values_cmp(); the default value is 1e-90.
- * 
- * A #GParamSpec derived structure that contains the meta data for double properties.
- */
-struct _GParamSpecDouble
-{
-  GParamSpec    parent_instance;
-  
-  gdouble       minimum;
-  gdouble       maximum;
-  gdouble       default_value;
-  gdouble       epsilon;
-};
-/**
- * GParamSpecString:
- * @parent_instance: private #GParamSpec portion
- * @default_value: default value for the property specified
- * @cset_first: a string containing the allowed values for the first byte
- * @cset_nth: a string containing the allowed values for the subsequent bytes
- * @substitutor: the replacement byte for bytes which don't match @cset_first or @cset_nth.
- * @null_fold_if_empty: replace empty string by %NULL
- * @ensure_non_null: replace %NULL strings by an empty string
- * 
- * A #GParamSpec derived structure that contains the meta data for string
- * properties.
- */
-struct _GParamSpecString
-{
-  GParamSpec    parent_instance;
-  
-  gchar        *default_value;
-  gchar        *cset_first;
-  gchar        *cset_nth;
-  gchar         substitutor;
-  guint         null_fold_if_empty : 1;
-  guint         ensure_non_null : 1;
-};
-/**
- * GParamSpecParam:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for %G_TYPE_PARAM
- * properties.
- */
-struct _GParamSpecParam
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecBoxed:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for boxed properties.
- */
-struct _GParamSpecBoxed
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecPointer:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for pointer properties.
- */
-struct _GParamSpecPointer
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecValueArray:
- * @parent_instance: private #GParamSpec portion
- * @element_spec: a #GParamSpec describing the elements contained in arrays of this property, may be %NULL
- * @fixed_n_elements: if greater than 0, arrays of this property will always have this many elements
- * 
- * A #GParamSpec derived structure that contains the meta data for #GValueArray properties.
- */
-struct _GParamSpecValueArray
-{
-  GParamSpec    parent_instance;
-  GParamSpec   *element_spec;
-  guint		fixed_n_elements;
-};
-/**
- * GParamSpecObject:
- * @parent_instance: private #GParamSpec portion
- * 
- * A #GParamSpec derived structure that contains the meta data for object properties.
- */
-struct _GParamSpecObject
-{
-  GParamSpec    parent_instance;
-};
-/**
- * GParamSpecOverride:
- * 
- * This is a type of #GParamSpec type that simply redirects operations to
- * another paramspec.  All operations other than getting or
- * setting the value are redirected, including accessing the nick and
- * blurb, validating a value, and so forth. See
- * g_param_spec_get_redirect_target() for retrieving the overidden
- * property. #GParamSpecOverride is used in implementing
- * g_object_class_override_property(), and will not be directly useful
- * unless you are implementing a new base type similar to GObject.
- * 
- * Since: 2.4
- */
-struct _GParamSpecOverride
-{
-  /*< private >*/
-  GParamSpec    parent_instance;
-  GParamSpec   *overridden;
-};
-/**
- * GParamSpecGType:
- * @parent_instance: private #GParamSpec portion
- * @is_a_type: a #GType whose subtypes can occur as values
- * 
- * A #GParamSpec derived structure that contains the meta data for #GType properties.
- * 
- * Since: 2.10
- */
-struct _GParamSpecGType
-{
-  GParamSpec    parent_instance;
-  GType         is_a_type;
-};
-/**
- * GParamSpecVariant:
- * @parent_instance: private #GParamSpec portion
- * @type: a #GVariantType, or %NULL
- * @default_value: a #GVariant, or %NULL
- *
- * A #GParamSpec derived structure that contains the meta data for #GVariant properties.
- *
- * Since: 2.26
- */
-struct _GParamSpecVariant
-{
-  GParamSpec    parent_instance;
-  GVariantType *type;
-  GVariant     *default_value;
-
-  /*< private >*/
-  gpointer      padding[4];
-};
-
-/* --- GParamSpec prototypes --- */
-GParamSpec*	g_param_spec_char	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint8		  minimum,
-					  gint8		  maximum,
-					  gint8		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uchar	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint8	  minimum,
-					  guint8	  maximum,
-					  guint8	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boolean	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gboolean	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint		  minimum,
-					  gint		  maximum,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint		  minimum,
-					  guint		  maximum,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_long	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  glong		  minimum,
-					  glong		  maximum,
-					  glong		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_ulong	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gulong	  minimum,
-					  gulong	  maximum,
-					  gulong	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_int64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gint64       	  minimum,
-					  gint64       	  maximum,
-					  gint64       	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_uint64	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  guint64	  minimum,
-					  guint64	  maximum,
-					  guint64	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_unichar      (const gchar    *name,
-				          const gchar    *nick,
-				          const gchar    *blurb,
-				          gunichar	  default_value,
-				          GParamFlags     flags);
-GParamSpec*	g_param_spec_enum	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  enum_type,
-					  gint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_flags	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  flags_type,
-					  guint		  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_float	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gfloat	  minimum,
-					  gfloat	  maximum,
-					  gfloat	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_double	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  gdouble	  minimum,
-					  gdouble	  maximum,
-					  gdouble	  default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_string	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  const gchar	 *default_value,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_param	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  param_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_boxed	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  boxed_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_pointer	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_value_array (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GParamSpec	 *element_spec,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_object	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType		  object_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_override    (const gchar    *name,
-					  GParamSpec     *overridden);
-GParamSpec*	g_param_spec_gtype	 (const gchar	 *name,
-					  const gchar	 *nick,
-					  const gchar	 *blurb,
-					  GType           is_a_type,
-					  GParamFlags	  flags);
-GParamSpec*	g_param_spec_variant	 (const gchar        *name,
-					  const gchar        *nick,
-					  const gchar	     *blurb,
-					  const GVariantType *type,
-					  GVariant           *default_value,
-					  GParamFlags         flags);
-
-/* --- internal --- */
-/* We prefix variable declarations so they can
- * properly get exported in windows dlls.
- */
-#ifndef GOBJECT_VAR
-#  ifdef G_PLATFORM_WIN32
-#    ifdef GOBJECT_STATIC_COMPILATION
-#      define GOBJECT_VAR extern
-#    else /* !GOBJECT_STATIC_COMPILATION */
-#      ifdef GOBJECT_COMPILATION
-#        ifdef DLL_EXPORT
-#          define GOBJECT_VAR __declspec(dllexport)
-#        else /* !DLL_EXPORT */
-#          define GOBJECT_VAR extern
-#        endif /* !DLL_EXPORT */
-#      else /* !GOBJECT_COMPILATION */
-#        define GOBJECT_VAR extern __declspec(dllimport)
-#      endif /* !GOBJECT_COMPILATION */
-#    endif /* !GOBJECT_STATIC_COMPILATION */
-#  else /* !G_PLATFORM_WIN32 */
-#    define GOBJECT_VAR extern
-#  endif /* !G_PLATFORM_WIN32 */
-#endif /* GOBJECT_VAR */
-
-GOBJECT_VAR GType *g_param_spec_types;
-
-G_END_DECLS
-
-#endif /* __G_PARAMSPECS_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gsignal.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gsignal.h
deleted file mode 100644
index fbf1c19f..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gsignal.h
+++ /dev/null
@@ -1,547 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000-2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_SIGNAL_H__
-#define __G_SIGNAL_H__
-
-#include	<gobject/gclosure.h>
-#include	<gobject/gvalue.h>
-#include	<gobject/gparam.h>
-#include	<gobject/gmarshal.h>
-
-G_BEGIN_DECLS
-
-/* --- typedefs --- */
-typedef struct _GSignalQuery		 GSignalQuery;
-typedef struct _GSignalInvocationHint	 GSignalInvocationHint;
-/**
- * GSignalCMarshaller:
- * 
- * This is the signature of marshaller functions, required to marshall
- * arrays of parameter values to signal emissions into C language callback
- * invocations. It is merely an alias to #GClosureMarshal since the #GClosure
- * mechanism takes over responsibility of actual function invocation for the
- * signal system.
- */
-typedef GClosureMarshal			 GSignalCMarshaller;
-/**
- * GSignalCVaMarshaller:
- * 
- * This is the signature of va_list marshaller functions, an optional
- * marshaller that can be used in some situations to avoid
- * marshalling the signal argument into GValues.
- */
-typedef GVaClosureMarshal		 GSignalCVaMarshaller;
-/**
- * GSignalEmissionHook:
- * @ihint: Signal invocation hint, see #GSignalInvocationHint.
- * @n_param_values: the number of parameters to the function, including
- *  the instance on which the signal was emitted.
- * @param_values: (array length=n_param_values): the instance on which
- *  the signal was emitted, followed by the parameters of the emission.
- * @data: user data associated with the hook.
- * 
- * A simple function pointer to get invoked when the signal is emitted. This 
- * allows you to tie a hook to the signal type, so that it will trap all 
- * emissions of that signal, from any object.
- * 
- * You may not attach these to signals created with the #G_SIGNAL_NO_HOOKS flag.
- * 
- * Returns: whether it wants to stay connected. If it returns %FALSE, the signal 
- *  hook is disconnected (and destroyed).
- */
-typedef gboolean (*GSignalEmissionHook) (GSignalInvocationHint *ihint,
-					 guint			n_param_values,
-					 const GValue	       *param_values,
-					 gpointer		data);
-/**
- * GSignalAccumulator:
- * @ihint: Signal invocation hint, see #GSignalInvocationHint.
- * @return_accu: Accumulator to collect callback return values in, this
- *  is the return value of the current signal emission.
- * @handler_return: A #GValue holding the return value of the signal handler.
- * @data: Callback data that was specified when creating the signal.
- * 
- * The signal accumulator is a special callback function that can be used
- * to collect return values of the various callbacks that are called
- * during a signal emission. The signal accumulator is specified at signal
- * creation time, if it is left %NULL, no accumulation of callback return
- * values is performed. The return value of signal emissions is then the
- * value returned by the last callback.
- * 
- * Returns: The accumulator function returns whether the signal emission
- *  should be aborted. Returning %FALSE means to abort the
- *  current emission and %TRUE is returned for continuation.
- */
-typedef gboolean (*GSignalAccumulator)	(GSignalInvocationHint *ihint,
-					 GValue		       *return_accu,
-					 const GValue	       *handler_return,
-					 gpointer               data);
-
-
-/* --- run, match and connect types --- */
-/**
- * GSignalFlags:
- * @G_SIGNAL_RUN_FIRST: Invoke the object method handler in the first emission stage.
- * @G_SIGNAL_RUN_LAST: Invoke the object method handler in the third emission stage.
- * @G_SIGNAL_RUN_CLEANUP: Invoke the object method handler in the last emission stage.
- * @G_SIGNAL_NO_RECURSE: Signals being emitted for an object while currently being in
- *  emission for this very object will not be emitted recursively,
- *  but instead cause the first emission to be restarted.
- * @G_SIGNAL_DETAILED: This signal supports "::detail" appendices to the signal name
- *  upon handler connections and emissions.
- * @G_SIGNAL_ACTION: Action signals are signals that may freely be emitted on alive
- *  objects from user code via g_signal_emit() and friends, without
- *  the need of being embedded into extra code that performs pre or
- *  post emission adjustments on the object. They can also be thought
- *  of as object methods which can be called generically by 
- *  third-party code.
- * @G_SIGNAL_NO_HOOKS: No emissions hooks are supported for this signal.
- * @G_SIGNAL_MUST_COLLECT: Varargs signal emission will always collect the
- *   arguments, even if there are no signal handlers connected.  Since 2.30.
- * @G_SIGNAL_DEPRECATED: The signal is deprecated and will be removed
- *   in a future version. A warning will be generated if it is connected while
- *   running with G_ENABLE_DIAGNOSTIC=1.  Since 2.32.
- * 
- * The signal flags are used to specify a signal's behaviour, the overall
- * signal description outlines how especially the RUN flags control the
- * stages of a signal emission.
- */
-typedef enum
-{
-  G_SIGNAL_RUN_FIRST	= 1 << 0,
-  G_SIGNAL_RUN_LAST	= 1 << 1,
-  G_SIGNAL_RUN_CLEANUP	= 1 << 2,
-  G_SIGNAL_NO_RECURSE	= 1 << 3,
-  G_SIGNAL_DETAILED	= 1 << 4,
-  G_SIGNAL_ACTION	= 1 << 5,
-  G_SIGNAL_NO_HOOKS	= 1 << 6,
-  G_SIGNAL_MUST_COLLECT = 1 << 7,
-  G_SIGNAL_DEPRECATED   = 1 << 8
-} GSignalFlags;
-/**
- * G_SIGNAL_FLAGS_MASK:
- * 
- * A mask for all #GSignalFlags bits.
- */
-#define G_SIGNAL_FLAGS_MASK  0x1ff
-/**
- * GConnectFlags:
- * @G_CONNECT_AFTER: whether the handler should be called before or after the 
- *  default handler of the signal.
- * @G_CONNECT_SWAPPED: whether the instance and data should be swapped when
- *  calling the handler.
- * 
- * The connection flags are used to specify the behaviour of a signal's 
- * connection.
- */
-typedef enum
-{
-  G_CONNECT_AFTER	= 1 << 0,
-  G_CONNECT_SWAPPED	= 1 << 1
-} GConnectFlags;
-/**
- * GSignalMatchType:
- * @G_SIGNAL_MATCH_ID: The signal id must be equal.
- * @G_SIGNAL_MATCH_DETAIL: The signal detail be equal.
- * @G_SIGNAL_MATCH_CLOSURE: The closure must be the same.
- * @G_SIGNAL_MATCH_FUNC: The C closure callback must be the same.
- * @G_SIGNAL_MATCH_DATA: The closure data must be the same.
- * @G_SIGNAL_MATCH_UNBLOCKED: Only unblocked signals may matched.
- * 
- * The match types specify what g_signal_handlers_block_matched(),
- * g_signal_handlers_unblock_matched() and g_signal_handlers_disconnect_matched()
- * match signals by.
- */
-typedef enum
-{
-  G_SIGNAL_MATCH_ID	   = 1 << 0,
-  G_SIGNAL_MATCH_DETAIL	   = 1 << 1,
-  G_SIGNAL_MATCH_CLOSURE   = 1 << 2,
-  G_SIGNAL_MATCH_FUNC	   = 1 << 3,
-  G_SIGNAL_MATCH_DATA	   = 1 << 4,
-  G_SIGNAL_MATCH_UNBLOCKED = 1 << 5
-} GSignalMatchType;
-/**
- * G_SIGNAL_MATCH_MASK:
- * 
- * A mask for all #GSignalMatchType bits.
- */
-#define G_SIGNAL_MATCH_MASK  0x3f
-/**
- * G_SIGNAL_TYPE_STATIC_SCOPE:
- * 
- * This macro flags signal argument types for which the signal system may 
- * assume that instances thereof remain persistent across all signal emissions
- * they are used in. This is only useful for non ref-counted, value-copy types.
- * 
- * To flag a signal argument in this way, add 
- * <literal>| G_SIGNAL_TYPE_STATIC_SCOPE</literal> to the corresponding argument
- * of g_signal_new().
- * |[
- * g_signal_new ("size_request",
- *   G_TYPE_FROM_CLASS (gobject_class),
- * 	 G_SIGNAL_RUN_FIRST,
- * 	 G_STRUCT_OFFSET (GtkWidgetClass, size_request),
- * 	 NULL, NULL,
- * 	 _gtk_marshal_VOID__BOXED,
- * 	 G_TYPE_NONE, 1,
- * 	 GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
- * ]|
- */
-#define	G_SIGNAL_TYPE_STATIC_SCOPE (G_TYPE_FLAG_RESERVED_ID_BIT)
-
-
-/* --- signal information --- */
-/**
- * GSignalInvocationHint:
- * @signal_id: The signal id of the signal invoking the callback
- * @detail: The detail passed on for this emission
- * @run_type: The stage the signal emission is currently in, this
- *  field will contain one of %G_SIGNAL_RUN_FIRST,
- *  %G_SIGNAL_RUN_LAST or %G_SIGNAL_RUN_CLEANUP.
- * 
- * The #GSignalInvocationHint structure is used to pass on additional information
- * to callbacks during a signal emission.
- */
-struct _GSignalInvocationHint
-{
-  guint		signal_id;
-  GQuark	detail;
-  GSignalFlags	run_type;
-};
-/**
- * GSignalQuery:
- * @signal_id: The signal id of the signal being queried, or 0 if the
- *  signal to be queried was unknown.
- * @signal_name: The signal name.
- * @itype: The interface/instance type that this signal can be emitted for.
- * @signal_flags: The signal flags as passed in to g_signal_new().
- * @return_type: The return type for user callbacks.
- * @n_params: The number of parameters that user callbacks take.
- * @param_types: (array length=n_params): The individual parameter types for
- *  user callbacks, note that the effective callback signature is:
- *  <programlisting>
- *  @return_type callback (#gpointer     data1,
- *  [param_types param_names,]
- *  gpointer     data2);
- *  </programlisting>
- * 
- * A structure holding in-depth information for a specific signal. It is
- * filled in by the g_signal_query() function.
- */
-struct _GSignalQuery
-{
-  guint		signal_id;
-  const gchar  *signal_name;
-  GType		itype;
-  GSignalFlags	signal_flags;
-  GType		return_type; /* mangled with G_SIGNAL_TYPE_STATIC_SCOPE flag */
-  guint		n_params;
-  const GType  *param_types; /* mangled with G_SIGNAL_TYPE_STATIC_SCOPE flag */
-};
-
-
-/* --- signals --- */
-guint                 g_signal_newv         (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     GClosure           *class_closure,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     GType              *param_types);
-guint                 g_signal_new_valist   (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     GClosure           *class_closure,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     va_list             args);
-guint                 g_signal_new          (const gchar        *signal_name,
-					     GType               itype,
-					     GSignalFlags        signal_flags,
-					     guint               class_offset,
-					     GSignalAccumulator	 accumulator,
-					     gpointer		 accu_data,
-					     GSignalCMarshaller  c_marshaller,
-					     GType               return_type,
-					     guint               n_params,
-					     ...);
-guint            g_signal_new_class_handler (const gchar        *signal_name,
-                                             GType               itype,
-                                             GSignalFlags        signal_flags,
-                                             GCallback           class_handler,
-                                             GSignalAccumulator  accumulator,
-                                             gpointer            accu_data,
-                                             GSignalCMarshaller  c_marshaller,
-                                             GType               return_type,
-                                             guint               n_params,
-                                             ...);
-void             g_signal_set_va_marshaller (guint              signal_id,
-					     GType              instance_type,
-					     GSignalCVaMarshaller va_marshaller);
-
-void                  g_signal_emitv        (const GValue       *instance_and_params,
-					     guint               signal_id,
-					     GQuark              detail,
-					     GValue             *return_value);
-void                  g_signal_emit_valist  (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     va_list             var_args);
-void                  g_signal_emit         (gpointer            instance,
-					     guint               signal_id,
-					     GQuark              detail,
-					     ...);
-void                  g_signal_emit_by_name (gpointer            instance,
-					     const gchar        *detailed_signal,
-					     ...);
-guint                 g_signal_lookup       (const gchar        *name,
-					     GType               itype);
-const gchar *         g_signal_name         (guint               signal_id);
-void                  g_signal_query        (guint               signal_id,
-					     GSignalQuery       *query);
-guint*                g_signal_list_ids     (GType               itype,
-					     guint              *n_ids);
-gboolean	      g_signal_parse_name   (const gchar	*detailed_signal,
-					     GType		 itype,
-					     guint		*signal_id_p,
-					     GQuark		*detail_p,
-					     gboolean		 force_detail_quark);
-GSignalInvocationHint* g_signal_get_invocation_hint (gpointer    instance);
-
-
-/* --- signal emissions --- */
-void	g_signal_stop_emission		    (gpointer		  instance,
-					     guint		  signal_id,
-					     GQuark		  detail);
-void	g_signal_stop_emission_by_name	    (gpointer		  instance,
-					     const gchar	 *detailed_signal);
-gulong	g_signal_add_emission_hook	    (guint		  signal_id,
-					     GQuark		  detail,
-					     GSignalEmissionHook  hook_func,
-					     gpointer	       	  hook_data,
-					     GDestroyNotify	  data_destroy);
-void	g_signal_remove_emission_hook	    (guint		  signal_id,
-					     gulong		  hook_id);
-
-
-/* --- signal handlers --- */
-gboolean g_signal_has_handler_pending	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       gboolean		  may_be_blocked);
-gulong	 g_signal_connect_closure_by_id	      (gpointer		  instance,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_closure	      (gpointer		  instance,
-					       const gchar       *detailed_signal,
-					       GClosure		 *closure,
-					       gboolean		  after);
-gulong	 g_signal_connect_data		      (gpointer		  instance,
-					       const gchar	 *detailed_signal,
-					       GCallback	  c_handler,
-					       gpointer		  data,
-					       GClosureNotify	  destroy_data,
-					       GConnectFlags	  connect_flags);
-void	 g_signal_handler_block		      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_unblock	      (gpointer		  instance,
-					       gulong		  handler_id);
-void	 g_signal_handler_disconnect	      (gpointer		  instance,
-					       gulong		  handler_id);
-gboolean g_signal_handler_is_connected	      (gpointer		  instance,
-					       gulong		  handler_id);
-gulong	 g_signal_handler_find		      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_block_matched      (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_unblock_matched    (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-guint	 g_signal_handlers_disconnect_matched (gpointer		  instance,
-					       GSignalMatchType	  mask,
-					       guint		  signal_id,
-					       GQuark		  detail,
-					       GClosure		 *closure,
-					       gpointer		  func,
-					       gpointer		  data);
-
-
-/* --- overriding and chaining --- */
-void    g_signal_override_class_closure       (guint              signal_id,
-                                               GType              instance_type,
-                                               GClosure          *class_closure);
-void    g_signal_override_class_handler       (const gchar       *signal_name,
-                                               GType              instance_type,
-                                               GCallback          class_handler);
-void    g_signal_chain_from_overridden        (const GValue      *instance_and_params,
-                                               GValue            *return_value);
-void   g_signal_chain_from_overridden_handler (gpointer           instance,
-                                               ...);
-
-
-/* --- convenience --- */
-/**
- * g_signal_connect:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The handler will be called before the default handler of the signal.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)
-/**
- * g_signal_connect_after:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The handler will be called after the default handler of the signal.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect_after(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER)
-/**
- * g_signal_connect_swapped:
- * @instance: the instance to connect to.
- * @detailed_signal: a string of the form "signal-name::detail".
- * @c_handler: the #GCallback to connect.
- * @data: data to pass to @c_handler calls.
- * 
- * Connects a #GCallback function to a signal for a particular object.
- * 
- * The instance on which the signal is emitted and @data will be swapped when 
- * calling the handler.
- * 
- * Returns: the handler id
- */
-#define g_signal_connect_swapped(instance, detailed_signal, c_handler, data) \
-    g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED)
-/**
- * g_signal_handlers_disconnect_by_func:
- * @instance: The instance to remove handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Disconnects all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_disconnect_by_func(instance, func, data)						\
-    g_signal_handlers_disconnect_matched ((instance),								\
-					  (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-					  0, 0, NULL, (func), (data))
-
-/**
- * g_signal_handlers_disconnect_by_data:
- * @instance: The instance to remove handlers from
- * @data: the closure data of the handlers' closures
- *
- * Disconnects all handlers on an instance that match @data.
- *
- * Returns: The number of handlers that matched.
- *
- * Since: 2.32
- */
-#define g_signal_handlers_disconnect_by_data(instance, data) \
-  g_signal_handlers_disconnect_matched ((instance), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, (data))
-
-/**
- * g_signal_handlers_block_by_func:
- * @instance: The instance to block handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Blocks all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_block_by_func(instance, func, data)							\
-    g_signal_handlers_block_matched      ((instance),								\
-				          (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-				          0, 0, NULL, (func), (data))
-/**
- * g_signal_handlers_unblock_by_func:
- * @instance: The instance to unblock handlers from.
- * @func: The C closure callback of the handlers (useless for non-C closures).
- * @data: The closure data of the handlers' closures.
- * 
- * Unblocks all handlers on an instance that match @func and @data.
- * 
- * Returns: The number of handlers that matched.
- */
-#define	g_signal_handlers_unblock_by_func(instance, func, data)							\
-    g_signal_handlers_unblock_matched    ((instance),								\
-				          (GSignalMatchType) (G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),	\
-				          0, 0, NULL, (func), (data))
-
-
-gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
-					    GValue                *return_accu,
-					    const GValue          *handler_return,
-					    gpointer               dummy);
-
-gboolean g_signal_accumulator_first_wins   (GSignalInvocationHint *ihint,
-                                            GValue                *return_accu,
-                                            const GValue          *handler_return,
-                                            gpointer               dummy);
-
-/*< private >*/
-void	 g_signal_handlers_destroy	      (gpointer		  instance);
-void	 _g_signals_destroy		      (GType		  itype);
-
-G_END_DECLS
-
-#endif /* __G_SIGNAL_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gsourceclosure.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gsourceclosure.h
deleted file mode 100644
index 3cfdacd5..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gsourceclosure.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_SOURCECLOSURE_H__
-#define __G_SOURCECLOSURE_H__
-
-#include <gobject/gclosure.h>
-#include <gobject/glib-types.h>
-
-G_BEGIN_DECLS
-
-void g_source_set_closure        (GSource  *source,
-				  GClosure *closure);
-
-void g_source_set_dummy_callback (GSource  *source);
-
-G_END_DECLS
-
-#endif /* __G_SOURCECLOSURE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gtype.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gtype.h
deleted file mode 100644
index 14206edf..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gtype.h
+++ /dev/null
@@ -1,1727 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_H__
-#define __G_TYPE_H__
-
-#include        <glib.h>
-
-G_BEGIN_DECLS
-
-/* Basic Type Macros
- */
-/**
- * G_TYPE_FUNDAMENTAL:
- * @type: A #GType value.
- * 
- * The fundamental type which is the ancestor of @type.
- * Fundamental types are types that serve as ultimate bases for the derived types, 
- * thus they are the roots of distinct inheritance hierarchies.
- */
-#define G_TYPE_FUNDAMENTAL(type)	(g_type_fundamental (type))
-/**
- * G_TYPE_FUNDAMENTAL_MAX:
- * 
- * An integer constant that represents the number of identifiers reserved
- * for types that are assigned at compile-time.
- */
-#define	G_TYPE_FUNDAMENTAL_MAX		(255 << G_TYPE_FUNDAMENTAL_SHIFT)
-
-/* Constant fundamental types,
- * introduced by g_type_init().
- */
-/**
- * G_TYPE_INVALID:
- * 
- * An invalid #GType used as error return value in some functions which return
- * a #GType. 
- */
-#define G_TYPE_INVALID			G_TYPE_MAKE_FUNDAMENTAL (0)
-/**
- * G_TYPE_NONE:
- * 
- * A fundamental type which is used as a replacement for the C
- * <literal>void</literal> return type.
- */
-#define G_TYPE_NONE			G_TYPE_MAKE_FUNDAMENTAL (1)
-/**
- * G_TYPE_INTERFACE:
- * 
- * The fundamental type from which all interfaces are derived.
- */
-#define G_TYPE_INTERFACE		G_TYPE_MAKE_FUNDAMENTAL (2)
-/**
- * G_TYPE_CHAR:
- * 
- * The fundamental type corresponding to #gchar.
- * The type designated by G_TYPE_CHAR is unconditionally an 8-bit signed integer.
- * This may or may not be the same type a the C type "gchar".
- */
-#define G_TYPE_CHAR			G_TYPE_MAKE_FUNDAMENTAL (3)
-/**
- * G_TYPE_UCHAR:
- * 
- * The fundamental type corresponding to #guchar.
- */
-#define G_TYPE_UCHAR			G_TYPE_MAKE_FUNDAMENTAL (4)
-/**
- * G_TYPE_BOOLEAN:
- * 
- * The fundamental type corresponding to #gboolean.
- */
-#define G_TYPE_BOOLEAN			G_TYPE_MAKE_FUNDAMENTAL (5)
-/**
- * G_TYPE_INT:
- * 
- * The fundamental type corresponding to #gint.
- */
-#define G_TYPE_INT			G_TYPE_MAKE_FUNDAMENTAL (6)
-/**
- * G_TYPE_UINT:
- * 
- * The fundamental type corresponding to #guint.
- */
-#define G_TYPE_UINT			G_TYPE_MAKE_FUNDAMENTAL (7)
-/**
- * G_TYPE_LONG:
- * 
- * The fundamental type corresponding to #glong.
- */
-#define G_TYPE_LONG			G_TYPE_MAKE_FUNDAMENTAL (8)
-/**
- * G_TYPE_ULONG:
- * 
- * The fundamental type corresponding to #gulong.
- */
-#define G_TYPE_ULONG			G_TYPE_MAKE_FUNDAMENTAL (9)
-/**
- * G_TYPE_INT64:
- * 
- * The fundamental type corresponding to #gint64.
- */
-#define G_TYPE_INT64			G_TYPE_MAKE_FUNDAMENTAL (10)
-/**
- * G_TYPE_UINT64:
- * 
- * The fundamental type corresponding to #guint64.
- */
-#define G_TYPE_UINT64			G_TYPE_MAKE_FUNDAMENTAL (11)
-/**
- * G_TYPE_ENUM:
- * 
- * The fundamental type from which all enumeration types are derived.
- */
-#define G_TYPE_ENUM			G_TYPE_MAKE_FUNDAMENTAL (12)
-/**
- * G_TYPE_FLAGS:
- * 
- * The fundamental type from which all flags types are derived.
- */
-#define G_TYPE_FLAGS			G_TYPE_MAKE_FUNDAMENTAL (13)
-/**
- * G_TYPE_FLOAT:
- * 
- * The fundamental type corresponding to #gfloat.
- */
-#define G_TYPE_FLOAT			G_TYPE_MAKE_FUNDAMENTAL (14)
-/**
- * G_TYPE_DOUBLE:
- * 
- * The fundamental type corresponding to #gdouble.
- */
-#define G_TYPE_DOUBLE			G_TYPE_MAKE_FUNDAMENTAL (15)
-/**
- * G_TYPE_STRING:
- * 
- * The fundamental type corresponding to nul-terminated C strings.
- */
-#define G_TYPE_STRING			G_TYPE_MAKE_FUNDAMENTAL (16)
-/**
- * G_TYPE_POINTER:
- * 
- * The fundamental type corresponding to #gpointer.
- */
-#define G_TYPE_POINTER			G_TYPE_MAKE_FUNDAMENTAL (17)
-/**
- * G_TYPE_BOXED:
- * 
- * The fundamental type from which all boxed types are derived.
- */
-#define G_TYPE_BOXED			G_TYPE_MAKE_FUNDAMENTAL (18)
-/**
- * G_TYPE_PARAM:
- * 
- * The fundamental type from which all #GParamSpec types are derived.
- */
-#define G_TYPE_PARAM			G_TYPE_MAKE_FUNDAMENTAL (19)
-/**
- * G_TYPE_OBJECT:
- * 
- * The fundamental type for #GObject.
- */
-#define G_TYPE_OBJECT			G_TYPE_MAKE_FUNDAMENTAL (20)
-/**
- * G_TYPE_VARIANT:
- *
- * The fundamental type corresponding to #GVariant.
- *
- * All floating #GVariant instances passed through the #GType system are
- * consumed.
- * 
- * Note that callbacks in closures, and signal handlers
- * for signals of return type %G_TYPE_VARIANT, must never return floating
- * variants.
- *
- * Note: GLib 2.24 did include a boxed type with this name. It was replaced
- * with this fundamental type in 2.26.
- *
- * Since: 2.26
- */
-#define	G_TYPE_VARIANT                  G_TYPE_MAKE_FUNDAMENTAL (21)
-
-
-/* Reserved fundamental type numbers to create new fundamental
- * type IDs with G_TYPE_MAKE_FUNDAMENTAL().
- * Send email to gtk-devel-list@gnome.org for reservations.
- */
-/**
- * G_TYPE_FUNDAMENTAL_SHIFT:
- *
- * Shift value used in converting numbers to type IDs.
- */
-#define	G_TYPE_FUNDAMENTAL_SHIFT	(2)
-/**
- * G_TYPE_MAKE_FUNDAMENTAL:
- * @x: the fundamental type number.
- * 
- * Get the type ID for the fundamental type number @x.
- * Use g_type_fundamental_next() instead of this macro to create new fundamental 
- * types.
- *
- * Returns: the GType
- */
-#define	G_TYPE_MAKE_FUNDAMENTAL(x)	((GType) ((x) << G_TYPE_FUNDAMENTAL_SHIFT))
-/**
- * G_TYPE_RESERVED_GLIB_FIRST:
- * 
- * First fundamental type number to create a new fundamental type id with
- * G_TYPE_MAKE_FUNDAMENTAL() reserved for GLib.
- */
-#define G_TYPE_RESERVED_GLIB_FIRST	(22)
-/**
- * G_TYPE_RESERVED_GLIB_LAST:
- * 
- * Last fundamental type number reserved for GLib.
- */
-#define G_TYPE_RESERVED_GLIB_LAST	(31)
-/**
- * G_TYPE_RESERVED_BSE_FIRST:
- * 
- * First fundamental type number to create a new fundamental type id with
- * G_TYPE_MAKE_FUNDAMENTAL() reserved for BSE.
- */
-#define G_TYPE_RESERVED_BSE_FIRST	(32)
-/**
- * G_TYPE_RESERVED_BSE_LAST:
- * 
- * Last fundamental type number reserved for BSE.
- */
-#define G_TYPE_RESERVED_BSE_LAST	(48)
-/**
- * G_TYPE_RESERVED_USER_FIRST:
- * 
- * First available fundamental type number to create new fundamental 
- * type id with G_TYPE_MAKE_FUNDAMENTAL().
- */
-#define G_TYPE_RESERVED_USER_FIRST	(49)
-
-
-/* Type Checking Macros
- */
-/**
- * G_TYPE_IS_FUNDAMENTAL:
- * @type: A #GType value.
- * 
- * Checks if @type is a fundamental type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_FUNDAMENTAL(type)             ((type) <= G_TYPE_FUNDAMENTAL_MAX)
-/**
- * G_TYPE_IS_DERIVED:
- * @type: A #GType value.
- * 
- * Checks if @type is derived (or in object-oriented terminology:
- * inherited) from another type (this holds true for all non-fundamental
- * types).
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DERIVED(type)                 ((type) > G_TYPE_FUNDAMENTAL_MAX)
-/**
- * G_TYPE_IS_INTERFACE:
- * @type: A #GType value.
- * 
- * Checks if @type is an interface type.
- * An interface type provides a pure API, the implementation
- * of which is provided by another type (which is then said to conform
- * to the interface).  GLib interfaces are somewhat analogous to Java
- * interfaces and C++ classes containing only pure virtual functions, 
- * with the difference that GType interfaces are not derivable (but see
- * g_type_interface_add_prerequisite() for an alternative).
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_INTERFACE(type)               (G_TYPE_FUNDAMENTAL (type) == G_TYPE_INTERFACE)
-/**
- * G_TYPE_IS_CLASSED:
- * @type: A #GType value.
- * 
- * Checks if @type is a classed type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_CLASSED(type)                 (g_type_test_flags ((type), G_TYPE_FLAG_CLASSED))
-/**
- * G_TYPE_IS_INSTANTIATABLE:
- * @type: A #GType value.
- * 
- * Checks if @type can be instantiated.  Instantiation is the
- * process of creating an instance (object) of this type.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_INSTANTIATABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_INSTANTIATABLE))
-/**
- * G_TYPE_IS_DERIVABLE:
- * @type: A #GType value.
- * 
- * Checks if @type is a derivable type.  A derivable type can
- * be used as the base class of a flat (single-level) class hierarchy.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DERIVABLE(type)               (g_type_test_flags ((type), G_TYPE_FLAG_DERIVABLE))
-/**
- * G_TYPE_IS_DEEP_DERIVABLE:
- * @type: A #GType value.
- * 
- * Checks if @type is a deep derivable type.  A deep derivable type
- * can be used as the base class of a deep (multi-level) class hierarchy.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_DEEP_DERIVABLE(type)          (g_type_test_flags ((type), G_TYPE_FLAG_DEEP_DERIVABLE))
-/**
- * G_TYPE_IS_ABSTRACT:
- * @type: A #GType value.
- * 
- * Checks if @type is an abstract type.  An abstract type cannot be
- * instantiated and is normally used as an abstract base class for
- * derived classes.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_ABSTRACT(type)                (g_type_test_flags ((type), G_TYPE_FLAG_ABSTRACT))
-/**
- * G_TYPE_IS_VALUE_ABSTRACT:
- * @type: A #GType value.
- * 
- * Checks if @type is an abstract value type.  An abstract value type introduces
- * a value table, but can't be used for g_value_init() and is normally used as
- * an abstract base type for derived value types.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_VALUE_ABSTRACT(type)          (g_type_test_flags ((type), G_TYPE_FLAG_VALUE_ABSTRACT))
-/**
- * G_TYPE_IS_VALUE_TYPE:
- * @type: A #GType value.
- * 
- * Checks if @type is a value type and can be used with g_value_init(). 
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_IS_VALUE_TYPE(type)              (g_type_check_is_value_type (type))
-/**
- * G_TYPE_HAS_VALUE_TABLE:
- * @type: A #GType value.
- * 
- * Checks if @type has a #GTypeValueTable.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_HAS_VALUE_TABLE(type)            (g_type_value_table_peek (type) != NULL)
-
-
-/* Typedefs
- */
-/**
- * GType:
- * 
- * A numerical value which represents the unique identifier of a registered
- * type.
- */
-#if     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined __cplusplus
-typedef gsize                           GType;
-#else   /* for historic reasons, C++ links against gulong GTypes */
-typedef gulong                          GType;
-#endif
-typedef struct _GValue                  GValue;
-typedef union  _GTypeCValue             GTypeCValue;
-typedef struct _GTypePlugin             GTypePlugin;
-typedef struct _GTypeClass              GTypeClass;
-typedef struct _GTypeInterface          GTypeInterface;
-typedef struct _GTypeInstance           GTypeInstance;
-typedef struct _GTypeInfo               GTypeInfo;
-typedef struct _GTypeFundamentalInfo    GTypeFundamentalInfo;
-typedef struct _GInterfaceInfo          GInterfaceInfo;
-typedef struct _GTypeValueTable         GTypeValueTable;
-typedef struct _GTypeQuery		GTypeQuery;
-
-
-/* Basic Type Structures
- */
-/**
- * GTypeClass:
- * 
- * An opaque structure used as the base of all classes.
- */
-struct _GTypeClass
-{
-  /*< private >*/
-  GType g_type;
-};
-/**
- * GTypeInstance:
- * 
- * An opaque structure used as the base of all type instances.
- */
-struct _GTypeInstance
-{
-  /*< private >*/
-  GTypeClass *g_class;
-};
-/**
- * GTypeInterface:
- * 
- * An opaque structure used as the base of all interface types.
- */
-struct _GTypeInterface
-{
-  /*< private >*/
-  GType g_type;         /* iface type */
-  GType g_instance_type;
-};
-/**
- * GTypeQuery:
- * @type: the #GType value of the type.
- * @type_name: the name of the type.
- * @class_size: the size of the class structure.
- * @instance_size: the size of the instance structure.
- * 
- * A structure holding information for a specific type. It is
- * filled in by the g_type_query() function.
- */
-struct _GTypeQuery
-{
-  GType		type;
-  const gchar  *type_name;
-  guint		class_size;
-  guint		instance_size;
-};
-
-
-/* Casts, checks and accessors for structured types
- * usage of these macros is reserved to type implementations only
- */
-/*< protected >*/
-/**
- * G_TYPE_CHECK_INSTANCE:
- * @instance: Location of a #GTypeInstance structure.
- * 
- * Checks if @instance is a valid #GTypeInstance structure,
- * otherwise issues a warning and returns %FALSE.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_INSTANCE(instance)				(_G_TYPE_CHI ((GTypeInstance*) (instance)))
-/**
- * G_TYPE_CHECK_INSTANCE_CAST:
- * @instance: Location of a #GTypeInstance structure.
- * @g_type: The type to be returned.
- * @c_type: The corresponding C type of @g_type.
- * 
- * Checks that @instance is an instance of the type identified by @g_type
- * and issues a warning if this is not the case. Returns @instance casted 
- * to a pointer to @c_type.
- * 
- * This macro should only be used in type implementations.
- */
-#define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type)    (_G_TYPE_CIC ((instance), (g_type), c_type))
-/**
- * G_TYPE_CHECK_INSTANCE_TYPE:
- * @instance: Location of a #GTypeInstance structure.
- * @g_type: The type to be checked
- * 
- * Checks if @instance is an instance of the type identified by @g_type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_INSTANCE_TYPE(instance, g_type)            (_G_TYPE_CIT ((instance), (g_type)))
-/**
- * G_TYPE_INSTANCE_GET_CLASS:
- * @instance: Location of the #GTypeInstance structure.
- * @g_type: The #GType of the class to be returned.
- * @c_type: The C type of the class structure.
- * 
- * Get the class structure of a given @instance, casted
- * to a specified ancestor type @g_type of the instance.
- * 
- * Note that while calling a GInstanceInitFunc(), the class pointer gets
- * modified, so it might not always return the expected pointer.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: a pointer to the class structure
- */
-#define G_TYPE_INSTANCE_GET_CLASS(instance, g_type, c_type)     (_G_TYPE_IGC ((instance), (g_type), c_type))
-/**
- * G_TYPE_INSTANCE_GET_INTERFACE:
- * @instance: Location of the #GTypeInstance structure.
- * @g_type: The #GType of the interface to be returned.
- * @c_type: The C type of the interface structure.
- * 
- * Get the interface structure for interface @g_type of a given @instance.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: a pointer to the interface structure
- */
-#define G_TYPE_INSTANCE_GET_INTERFACE(instance, g_type, c_type) (_G_TYPE_IGI ((instance), (g_type), c_type))
-/**
- * G_TYPE_CHECK_CLASS_CAST:
- * @g_class: Location of a #GTypeClass structure.
- * @g_type: The type to be returned.
- * @c_type: The corresponding C type of class structure of @g_type.
- * 
- * Checks that @g_class is a class structure of the type identified by @g_type
- * and issues a warning if this is not the case. Returns @g_class casted 
- * to a pointer to @c_type.
- * 
- * This macro should only be used in type implementations.
- */
-#define G_TYPE_CHECK_CLASS_CAST(g_class, g_type, c_type)        (_G_TYPE_CCC ((g_class), (g_type), c_type))
-/**
- * G_TYPE_CHECK_CLASS_TYPE:
- * @g_class: Location of a #GTypeClass structure.
- * @g_type: The type to be checked.
- * 
- * Checks if @g_class is a class structure of the type identified by 
- * @g_type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_CLASS_TYPE(g_class, g_type)                (_G_TYPE_CCT ((g_class), (g_type)))
-/**
- * G_TYPE_CHECK_VALUE:
- * @value: a #GValue
- * 
- * Checks if @value has been initialized to hold values
- * of a value type.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_VALUE(value)				(_G_TYPE_CHV ((value)))
-/**
- * G_TYPE_CHECK_VALUE_TYPE:
- * @value: a #GValue
- * @g_type: The type to be checked.
- * 
- * Checks if @value has been initialized to hold values
- * of type @g_type. 
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: %TRUE on success.
- */
-#define G_TYPE_CHECK_VALUE_TYPE(value, g_type)			(_G_TYPE_CVH ((value), (g_type)))
-/**
- * G_TYPE_FROM_INSTANCE:
- * @instance: Location of a valid #GTypeInstance structure.
- * 
- * Get the type identifier from a given @instance structure. 
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_INSTANCE(instance)                          (G_TYPE_FROM_CLASS (((GTypeInstance*) (instance))->g_class))
-/**
- * G_TYPE_FROM_CLASS:
- * @g_class: Location of a valid #GTypeClass structure.
- * 
- * Get the type identifier from a given @class structure.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_CLASS(g_class)                              (((GTypeClass*) (g_class))->g_type)
-/**
- * G_TYPE_FROM_INTERFACE:
- * @g_iface: Location of a valid #GTypeInterface structure.
- * 
- * Get the type identifier from a given @interface structure.
- * 
- * This macro should only be used in type implementations.
- *
- * Returns: the #GType
- */
-#define G_TYPE_FROM_INTERFACE(g_iface)                          (((GTypeInterface*) (g_iface))->g_type)
-
-/**
- * G_TYPE_INSTANCE_GET_PRIVATE:
- * @instance: the instance of a type deriving from @private_type.
- * @g_type: the type identifying which private data to retrieve.
- * @c_type: The C type for the private structure.
- * 
- * Gets the private structure for a particular type.
- * The private structure must have been registered in the
- * class_init function with g_type_class_add_private().
- * 
- * This macro should only be used in type implementations.
- * 
- * Since: 2.4
- * Returns: a pointer to the private data structure.
- */
-#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type)   ((c_type*) g_type_instance_get_private ((GTypeInstance*) (instance), (g_type)))
-
-/**
- * G_TYPE_CLASS_GET_PRIVATE:
- * @klass: the class of a type deriving from @private_type.
- * @g_type: the type identifying which private data to retrieve.
- * @c_type: The C type for the private structure.
- * 
- * Gets the private class structure for a particular type.
- * The private structure must have been registered in the
- * get_type() function with g_type_add_class_private().
- * 
- * This macro should only be used in type implementations.
- * 
- * Since: 2.24
- * Returns: a pointer to the private data structure.
- */
-#define G_TYPE_CLASS_GET_PRIVATE(klass, g_type, c_type)   ((c_type*) g_type_class_get_private ((GTypeClass*) (klass), (g_type)))
-
-/**
- * GTypeDebugFlags:
- * @G_TYPE_DEBUG_NONE: Print no messages.
- * @G_TYPE_DEBUG_OBJECTS: Print messages about object bookkeeping.
- * @G_TYPE_DEBUG_SIGNALS: Print messages about signal emissions.
- * @G_TYPE_DEBUG_MASK: Mask covering all debug flags.
- * 
- * The <type>GTypeDebugFlags</type> enumeration values can be passed to
- * g_type_init_with_debug_flags() to trigger debugging messages during runtime.
- * Note that the messages can also be triggered by setting the
- * <envar>GOBJECT_DEBUG</envar> environment variable to a ':'-separated list of 
- * "objects" and "signals".
- */
-typedef enum	/*< skip >*/
-{
-  G_TYPE_DEBUG_NONE	= 0,
-  G_TYPE_DEBUG_OBJECTS	= 1 << 0,
-  G_TYPE_DEBUG_SIGNALS	= 1 << 1,
-  G_TYPE_DEBUG_MASK	= 0x03
-} GTypeDebugFlags;
-
-
-/* --- prototypes --- */
-void                  g_type_init                    (void);
-void                  g_type_init_with_debug_flags   (GTypeDebugFlags  debug_flags);
-const gchar *         g_type_name                    (GType            type);
-GQuark                g_type_qname                   (GType            type);
-GType                 g_type_from_name               (const gchar     *name);
-GType                 g_type_parent                  (GType            type);
-guint                 g_type_depth                   (GType            type);
-GType                 g_type_next_base               (GType            leaf_type,
-						      GType            root_type);
-gboolean              g_type_is_a                    (GType            type,
-						      GType            is_a_type);
-gpointer              g_type_class_ref               (GType            type);
-gpointer              g_type_class_peek              (GType            type);
-gpointer              g_type_class_peek_static       (GType            type);
-void                  g_type_class_unref             (gpointer         g_class);
-gpointer              g_type_class_peek_parent       (gpointer         g_class);
-gpointer              g_type_interface_peek          (gpointer         instance_class,
-						      GType            iface_type);
-gpointer              g_type_interface_peek_parent   (gpointer         g_iface);
-
-gpointer              g_type_default_interface_ref   (GType            g_type);
-gpointer              g_type_default_interface_peek  (GType            g_type);
-void                  g_type_default_interface_unref (gpointer         g_iface);
-
-/* g_free() the returned arrays */
-GType*                g_type_children                (GType            type,
-						      guint           *n_children);
-GType*                g_type_interfaces              (GType            type,
-						      guint           *n_interfaces);
-
-/* per-type _static_ data */
-void                  g_type_set_qdata               (GType            type,
-						      GQuark           quark,
-						      gpointer         data);
-gpointer              g_type_get_qdata               (GType            type,
-						      GQuark           quark);
-void		      g_type_query		     (GType	       type,
-						      GTypeQuery      *query);
-
-
-/* --- type registration --- */
-/**
- * GBaseInitFunc:
- * @g_class: The #GTypeClass structure to initialize.
- * 
- * A callback function used by the type system to do base initialization
- * of the class structures of derived types. It is called as part of the
- * initialization process of all derived classes and should reallocate
- * or reset all dynamic class members copied over from the parent class.
- * For example, class members (such as strings) that are not sufficiently
- * handled by a plain memory copy of the parent class into the derived class
- * have to be altered. See GClassInitFunc() for a discussion of the class
- * intialization process.
- */
-typedef void   (*GBaseInitFunc)              (gpointer         g_class);
-/**
- * GBaseFinalizeFunc:
- * @g_class: The #GTypeClass structure to finalize.
- * 
- * A callback function used by the type system to finalize those portions
- * of a derived types class structure that were setup from the corresponding
- * GBaseInitFunc() function. Class finalization basically works the inverse
- * way in which class intialization is performed.
- * See GClassInitFunc() for a discussion of the class intialization process.
- */
-typedef void   (*GBaseFinalizeFunc)          (gpointer         g_class);
-/**
- * GClassInitFunc:
- * @g_class: The #GTypeClass structure to initialize.
- * @class_data: The @class_data member supplied via the #GTypeInfo structure.
- * 
- * A callback function used by the type system to initialize the class
- * of a specific type. This function should initialize all static class
- * members.
- * The initialization process of a class involves:
- * <itemizedlist>
- * <listitem><para>
- * 	1 - Copying common members from the parent class over to the
- * 	derived class structure.
- * </para></listitem>
- * <listitem><para>
- * 	2 -  Zero initialization of the remaining members not copied
- * 	over from the parent class.
- * </para></listitem>
- * <listitem><para>
- * 	3 - Invocation of the GBaseInitFunc() initializers of all parent
- * 	types and the class' type.
- * </para></listitem>
- * <listitem><para>
- * 	4 - Invocation of the class' GClassInitFunc() initializer.
- * </para></listitem>
- * </itemizedlist>
- * Since derived classes are partially initialized through a memory copy
- * of the parent class, the general rule is that GBaseInitFunc() and
- * GBaseFinalizeFunc() should take care of necessary reinitialization
- * and release of those class members that were introduced by the type
- * that specified these GBaseInitFunc()/GBaseFinalizeFunc().
- * GClassInitFunc() should only care about initializing static
- * class members, while dynamic class members (such as allocated strings
- * or reference counted resources) are better handled by a GBaseInitFunc()
- * for this type, so proper initialization of the dynamic class members
- * is performed for class initialization of derived types as well.
- * An example may help to correspond the intend of the different class
- * initializers:
- * 
- * |[
- * typedef struct {
- *   GObjectClass parent_class;
- *   gint         static_integer;
- *   gchar       *dynamic_string;
- * } TypeAClass;
- * static void
- * type_a_base_class_init (TypeAClass *class)
- * {
- *   class->dynamic_string = g_strdup ("some string");
- * }
- * static void
- * type_a_base_class_finalize (TypeAClass *class)
- * {
- *   g_free (class->dynamic_string);
- * }
- * static void
- * type_a_class_init (TypeAClass *class)
- * {
- *   class->static_integer = 42;
- * }
- * 
- * typedef struct {
- *   TypeAClass   parent_class;
- *   gfloat       static_float;
- *   GString     *dynamic_gstring;
- * } TypeBClass;
- * static void
- * type_b_base_class_init (TypeBClass *class)
- * {
- *   class->dynamic_gstring = g_string_new ("some other string");
- * }
- * static void
- * type_b_base_class_finalize (TypeBClass *class)
- * {
- *   g_string_free (class->dynamic_gstring);
- * }
- * static void
- * type_b_class_init (TypeBClass *class)
- * {
- *   class->static_float = 3.14159265358979323846;
- * }
- * ]|
- * Initialization of TypeBClass will first cause initialization of
- * TypeAClass (derived classes reference their parent classes, see
- * g_type_class_ref() on this).
- * Initialization of TypeAClass roughly involves zero-initializing its fields,
- * then calling its GBaseInitFunc() type_a_base_class_init() to allocate
- * its dynamic members (dynamic_string), and finally calling its GClassInitFunc()
- * type_a_class_init() to initialize its static members (static_integer).
- * The first step in the initialization process of TypeBClass is then
- * a plain memory copy of the contents of TypeAClass into TypeBClass and 
- * zero-initialization of the remaining fields in TypeBClass.
- * The dynamic members of TypeAClass within TypeBClass now need
- * reinitialization which is performed by calling type_a_base_class_init()
- * with an argument of TypeBClass.
- * After that, the GBaseInitFunc() of TypeBClass, type_b_base_class_init()
- * is called to allocate the dynamic members of TypeBClass (dynamic_gstring),
- * and finally the GClassInitFunc() of TypeBClass, type_b_class_init(),
- * is called to complete the initialization process with the static members
- * (static_float).
- * Corresponding finalization counter parts to the GBaseInitFunc() functions
- * have to be provided to release allocated resources at class finalization
- * time.
- */
-typedef void   (*GClassInitFunc)             (gpointer         g_class,
-					      gpointer         class_data);
-/**
- * GClassFinalizeFunc:
- * @g_class: The #GTypeClass structure to finalize.
- * @class_data: The @class_data member supplied via the #GTypeInfo structure.
- * 
- * A callback function used by the type system to finalize a class.
- * This function is rarely needed, as dynamically allocated class resources
- * should be handled by GBaseInitFunc() and GBaseFinalizeFunc().
- * Also, specification of a GClassFinalizeFunc() in the #GTypeInfo
- * structure of a static type is invalid, because classes of static types
- * will never be finalized (they are artificially kept alive when their
- * reference count drops to zero).
- */
-typedef void   (*GClassFinalizeFunc)         (gpointer         g_class,
-					      gpointer         class_data);
-/**
- * GInstanceInitFunc:
- * @instance: The instance to initialize.
- * @g_class: The class of the type the instance is created for.
- * 
- * A callback function used by the type system to initialize a new
- * instance of a type. This function initializes all instance members and
- * allocates any resources required by it.
- * Initialization of a derived instance involves calling all its parent
- * types instance initializers, so the class member of the instance
- * is altered during its initialization to always point to the class that
- * belongs to the type the current initializer was introduced for.
- */
-typedef void   (*GInstanceInitFunc)          (GTypeInstance   *instance,
-					      gpointer         g_class);
-/**
- * GInterfaceInitFunc:
- * @g_iface: The interface structure to initialize.
- * @iface_data: The @interface_data supplied via the #GInterfaceInfo structure.
- * 
- * A callback function used by the type system to initialize a new
- * interface.  This function should initialize all internal data and
- * allocate any resources required by the interface.
- */
-typedef void   (*GInterfaceInitFunc)         (gpointer         g_iface,
-					      gpointer         iface_data);
-/**
- * GInterfaceFinalizeFunc:
- * @g_iface: The interface structure to finalize.
- * @iface_data: The @interface_data supplied via the #GInterfaceInfo structure.
- * 
- * A callback function used by the type system to finalize an interface.
- * This function should destroy any internal data and release any resources
- * allocated by the corresponding GInterfaceInitFunc() function.
- */
-typedef void   (*GInterfaceFinalizeFunc)     (gpointer         g_iface,
-					      gpointer         iface_data);
-/**
- * GTypeClassCacheFunc:
- * @cache_data: data that was given to the g_type_add_class_cache_func() call
- * @g_class: The #GTypeClass structure which is unreferenced
- * 
- * A callback function which is called when the reference count of a class 
- * drops to zero. It may use g_type_class_ref() to prevent the class from
- * being freed. You should not call g_type_class_unref() from a 
- * #GTypeClassCacheFunc function to prevent infinite recursion, use 
- * g_type_class_unref_uncached() instead.
- * 
- * The functions have to check the class id passed in to figure 
- * whether they actually want to cache the class of this type, since all
- * classes are routed through the same #GTypeClassCacheFunc chain.
- * 
- * Returns: %TRUE to stop further #GTypeClassCacheFunc<!-- -->s from being 
- *  called, %FALSE to continue.
- */
-typedef gboolean (*GTypeClassCacheFunc)	     (gpointer	       cache_data,
-					      GTypeClass      *g_class);
-/**
- * GTypeInterfaceCheckFunc:
- * @check_data: data passed to g_type_add_interface_check().
- * @g_iface: the interface that has been initialized
- * 
- * A callback called after an interface vtable is initialized.
- * See g_type_add_interface_check().
- * 
- * Since: 2.4
- */
-typedef void     (*GTypeInterfaceCheckFunc)  (gpointer	       check_data,
-					      gpointer         g_iface);
-/**
- * GTypeFundamentalFlags:
- * @G_TYPE_FLAG_CLASSED: Indicates a classed type.
- * @G_TYPE_FLAG_INSTANTIATABLE: Indicates an instantiable type (implies classed).
- * @G_TYPE_FLAG_DERIVABLE: Indicates a flat derivable type.
- * @G_TYPE_FLAG_DEEP_DERIVABLE: Indicates a deep derivable type (implies derivable).
- * 
- * Bit masks used to check or determine specific characteristics of a
- * fundamental type.
- */
-typedef enum    /*< skip >*/
-{
-  G_TYPE_FLAG_CLASSED           = (1 << 0),
-  G_TYPE_FLAG_INSTANTIATABLE    = (1 << 1),
-  G_TYPE_FLAG_DERIVABLE         = (1 << 2),
-  G_TYPE_FLAG_DEEP_DERIVABLE    = (1 << 3)
-} GTypeFundamentalFlags;
-/**
- * GTypeFlags:
- * @G_TYPE_FLAG_ABSTRACT: Indicates an abstract type. No instances can be
- *  created for an abstract type.
- * @G_TYPE_FLAG_VALUE_ABSTRACT: Indicates an abstract value type, i.e. a type
- *  that introduces a value table, but can't be used for
- *  g_value_init().
- * 
- * Bit masks used to check or determine characteristics of a type.
- */
-typedef enum    /*< skip >*/
-{
-  G_TYPE_FLAG_ABSTRACT		= (1 << 4),
-  G_TYPE_FLAG_VALUE_ABSTRACT	= (1 << 5)
-} GTypeFlags;
-/**
- * GTypeInfo:
- * @class_size: Size of the class structure (required for interface, classed and instantiatable types).
- * @base_init: Location of the base initialization function (optional).
- * @base_finalize: Location of the base finalization function (optional).
- * @class_init: Location of the class initialization function for
- *  classed and instantiatable types. Location of the default vtable 
- *  inititalization function for interface types. (optional) This function 
- *  is used both to fill in virtual functions in the class or default vtable, 
- *  and to do type-specific setup such as registering signals and object
- *  properties.
- * @class_finalize: Location of the class finalization function for
- *  classed and instantiatable types. Location fo the default vtable 
- *  finalization function for interface types. (optional)
- * @class_data: User-supplied data passed to the class init/finalize functions.
- * @instance_size: Size of the instance (object) structure (required for instantiatable types only).
- * @n_preallocs: Prior to GLib 2.10, it specified the number of pre-allocated (cached) instances to reserve memory for (0 indicates no caching). Since GLib 2.10, it is ignored, since instances are allocated with the <link linkend="glib-Memory-Slices">slice allocator</link> now.
- * @instance_init: Location of the instance initialization function (optional, for instantiatable types only).
- * @value_table: A #GTypeValueTable function table for generic handling of GValues of this type (usually only
- *  useful for fundamental types).
- * 
- * This structure is used to provide the type system with the information
- * required to initialize and destruct (finalize) a type's class and
- * its instances.
- * The initialized structure is passed to the g_type_register_static() function
- * (or is copied into the provided #GTypeInfo structure in the
- * g_type_plugin_complete_type_info()). The type system will perform a deep
- * copy of this structure, so its memory does not need to be persistent
- * across invocation of g_type_register_static().
- */
-struct _GTypeInfo
-{
-  /* interface types, classed types, instantiated types */
-  guint16                class_size;
-  
-  GBaseInitFunc          base_init;
-  GBaseFinalizeFunc      base_finalize;
-  
-  /* interface types, classed types, instantiated types */
-  GClassInitFunc         class_init;
-  GClassFinalizeFunc     class_finalize;
-  gconstpointer          class_data;
-  
-  /* instantiated types */
-  guint16                instance_size;
-  guint16                n_preallocs;
-  GInstanceInitFunc      instance_init;
-  
-  /* value handling */
-  const GTypeValueTable	*value_table;
-};
-/**
- * GTypeFundamentalInfo:
- * @type_flags: #GTypeFundamentalFlags describing the characteristics of the fundamental type
- * 
- * A structure that provides information to the type system which is
- * used specifically for managing fundamental types.  
- */
-struct _GTypeFundamentalInfo
-{
-  GTypeFundamentalFlags  type_flags;
-};
-/**
- * GInterfaceInfo:
- * @interface_init: location of the interface initialization function
- * @interface_finalize: location of the interface finalization function
- * @interface_data: user-supplied data passed to the interface init/finalize functions
- * 
- * A structure that provides information to the type system which is
- * used specifically for managing interface types.
- */
-struct _GInterfaceInfo
-{
-  GInterfaceInitFunc     interface_init;
-  GInterfaceFinalizeFunc interface_finalize;
-  gpointer               interface_data;
-};
-/**
- * GTypeValueTable:
- * @value_init: Default initialize @values contents by poking values
- *  directly into the value->data array. The data array of
- *  the #GValue passed into this function was zero-filled
- *  with <function>memset()</function>, so no care has to
- *  be taken to free any
- *  old contents. E.g. for the implementation of a string
- *  value that may never be %NULL, the implementation might
- *  look like:
- *  |[
- *  value->data[0].v_pointer = g_strdup ("");
- *  ]|
- * @value_free: Free any old contents that might be left in the
- *  data array of the passed in @value. No resources may
- *  remain allocated through the #GValue contents after
- *  this function returns. E.g. for our above string type:
- *  |[
- *  // only free strings without a specific flag for static storage
- *  if (!(value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS))
- *    g_free (value->data[0].v_pointer);
- *  ]|
- * @value_copy: @dest_value is a #GValue with zero-filled data section
- *  and @src_value is a properly setup #GValue of same or
- *  derived type.
- *  The purpose of this function is to copy the contents of
- *  @src_value into @dest_value in a way, that even after
- *  @src_value has been freed, the contents of @dest_value
- *  remain valid. String type example:
- *  |[
- *  dest_value->data[0].v_pointer = g_strdup (src_value->data[0].v_pointer);
- *  ]|
- * @value_peek_pointer: If the value contents fit into a pointer, such as objects
- *  or strings, return this pointer, so the caller can peek at
- *  the current contents. To extend on our above string example:
- *  |[
- *  return value->data[0].v_pointer;
- *  ]|
- * @collect_format: A string format describing how to collect the contents of
- *  this value bit-by-bit. Each character in the format represents
- *  an argument to be collected, and the characters themselves indicate
- *  the type of the argument. Currently supported arguments are:
- *  <variablelist>
- *  <varlistentry><term /><listitem><para>
- *  'i' - Integers. passed as collect_values[].v_int.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'l' - Longs. passed as collect_values[].v_long.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'd' - Doubles. passed as collect_values[].v_double.
- *  </para></listitem></varlistentry>
- *  <varlistentry><term /><listitem><para>
- *  'p' - Pointers. passed as collect_values[].v_pointer.
- *  </para></listitem></varlistentry>
- *  </variablelist>
- *  It should be noted that for variable argument list construction,
- *  ANSI C promotes every type smaller than an integer to an int, and
- *  floats to doubles. So for collection of short int or char, 'i'
- *  needs to be used, and for collection of floats 'd'.
- * @collect_value: The collect_value() function is responsible for converting the
- *  values collected from a variable argument list into contents
- *  suitable for storage in a GValue. This function should setup
- *  @value similar to value_init(); e.g. for a string value that
- *  does not allow %NULL pointers, it needs to either spew an error,
- *  or do an implicit conversion by storing an empty string.
- *  The @value passed in to this function has a zero-filled data
- *  array, so just like for value_init() it is guaranteed to not
- *  contain any old contents that might need freeing.
- *  @n_collect_values is exactly the string length of @collect_format,
- *  and @collect_values is an array of unions #GTypeCValue with
- *  length @n_collect_values, containing the collected values
- *  according to @collect_format.
- *  @collect_flags is an argument provided as a hint by the caller.
- *  It may contain the flag %G_VALUE_NOCOPY_CONTENTS indicating,
- *  that the collected value contents may be considered "static"
- *  for the duration of the @value lifetime.
- *  Thus an extra copy of the contents stored in @collect_values is
- *  not required for assignment to @value.
- *  For our above string example, we continue with:
- *  |[
- *  if (!collect_values[0].v_pointer)
- *    value->data[0].v_pointer = g_strdup ("");
- *  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
- *  {
- *    value->data[0].v_pointer = collect_values[0].v_pointer;
- *    // keep a flag for the value_free() implementation to not free this string
- *    value->data[1].v_uint = G_VALUE_NOCOPY_CONTENTS;
- *  }
- *  else
- *    value->data[0].v_pointer = g_strdup (collect_values[0].v_pointer);
- *  return NULL;
- *  ]|
- *  It should be noted, that it is generally a bad idea to follow the
- *  #G_VALUE_NOCOPY_CONTENTS hint for reference counted types. Due to
- *  reentrancy requirements and reference count assertions performed
- *  by the signal emission code, reference counts should always be
- *  incremented for reference counted contents stored in the value->data
- *  array.  To deviate from our string example for a moment, and taking
- *  a look at an exemplary implementation for collect_value() of
- *  #GObject:
- *  |[
- *  if (collect_values[0].v_pointer)
- *  {
- *    GObject *object = G_OBJECT (collect_values[0].v_pointer);
- *    // never honour G_VALUE_NOCOPY_CONTENTS for ref-counted types
- *    value->data[0].v_pointer = g_object_ref (object);
- *    return NULL;
- *  }
- *  else
- *    return g_strdup_printf ("Object passed as invalid NULL pointer");
- *  }
- *  ]|
- *  The reference count for valid objects is always incremented,
- *  regardless of @collect_flags. For invalid objects, the example
- *  returns a newly allocated string without altering @value.
- *  Upon success, collect_value() needs to return %NULL. If, however,
- *  an error condition occurred, collect_value() may spew an
- *  error by returning a newly allocated non-%NULL string, giving
- *  a suitable description of the error condition.
- *  The calling code makes no assumptions about the @value
- *  contents being valid upon error returns, @value
- *  is simply thrown away without further freeing. As such, it is
- *  a good idea to not allocate #GValue contents, prior to returning
- *  an error, however, collect_values() is not obliged to return
- *  a correctly setup @value for error returns, simply because
- *  any non-%NULL return is considered a fatal condition so further
- *  program behaviour is undefined.
- * @lcopy_format: Format description of the arguments to collect for @lcopy_value,
- *  analogous to @collect_format. Usually, @lcopy_format string consists
- *  only of 'p's to provide lcopy_value() with pointers to storage locations.
- * @lcopy_value: This function is responsible for storing the @value contents into
- *  arguments passed through a variable argument list which got
- *  collected into @collect_values according to @lcopy_format.
- *  @n_collect_values equals the string length of @lcopy_format,
- *  and @collect_flags may contain %G_VALUE_NOCOPY_CONTENTS.
- *  In contrast to collect_value(), lcopy_value() is obliged to
- *  always properly support %G_VALUE_NOCOPY_CONTENTS.
- *  Similar to collect_value() the function may prematurely abort
- *  by returning a newly allocated string describing an error condition.
- *  To complete the string example:
- *  |[
- *  gchar **string_p = collect_values[0].v_pointer;
- *  if (!string_p)
- *    return g_strdup_printf ("string location passed as NULL");
- *  if (collect_flags & G_VALUE_NOCOPY_CONTENTS)
- *    *string_p = value->data[0].v_pointer;
- *  else
- *    *string_p = g_strdup (value->data[0].v_pointer);
- *  ]|
- *  And an illustrative version of lcopy_value() for
- *  reference-counted types:
- *  |[
- *  GObject **object_p = collect_values[0].v_pointer;
- *  if (!object_p)
- *    return g_strdup_printf ("object location passed as NULL");
- *  if (!value->data[0].v_pointer)
- *    *object_p = NULL;
- *  else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) /&ast; always honour &ast;/
- *    *object_p = value->data[0].v_pointer;
- *  else
- *    *object_p = g_object_ref (value->data[0].v_pointer);
- *  return NULL;
- *  ]|
- * 
- * The #GTypeValueTable provides the functions required by the #GValue implementation,
- * to serve as a container for values of a type.
- */
-
-struct _GTypeValueTable
-{
-  void     (*value_init)         (GValue       *value);
-  void     (*value_free)         (GValue       *value);
-  void     (*value_copy)         (const GValue *src_value,
-				  GValue       *dest_value);
-  /* varargs functionality (optional) */
-  gpointer (*value_peek_pointer) (const GValue *value);
-  const gchar *collect_format;
-  gchar*   (*collect_value)      (GValue       *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-  const gchar *lcopy_format;
-  gchar*   (*lcopy_value)        (const GValue *value,
-				  guint         n_collect_values,
-				  GTypeCValue  *collect_values,
-				  guint		collect_flags);
-};
-GType g_type_register_static		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 GTypeFlags		     flags);
-GType g_type_register_static_simple     (GType                       parent_type,
-					 const gchar                *type_name,
-					 guint                       class_size,
-					 GClassInitFunc              class_init,
-					 guint                       instance_size,
-					 GInstanceInitFunc           instance_init,
-					 GTypeFlags	             flags);
-  
-GType g_type_register_dynamic		(GType			     parent_type,
-					 const gchar		    *type_name,
-					 GTypePlugin		    *plugin,
-					 GTypeFlags		     flags);
-GType g_type_register_fundamental	(GType			     type_id,
-					 const gchar		    *type_name,
-					 const GTypeInfo	    *info,
-					 const GTypeFundamentalInfo *finfo,
-					 GTypeFlags		     flags);
-void  g_type_add_interface_static	(GType			     instance_type,
-					 GType			     interface_type,
-					 const GInterfaceInfo	    *info);
-void  g_type_add_interface_dynamic	(GType			     instance_type,
-					 GType			     interface_type,
-					 GTypePlugin		    *plugin);
-void  g_type_interface_add_prerequisite (GType			     interface_type,
-					 GType			     prerequisite_type);
-GType*g_type_interface_prerequisites    (GType                       interface_type,
-					 guint                      *n_prerequisites);
-void     g_type_class_add_private       (gpointer                    g_class,
-                                         gsize                       private_size);
-gpointer g_type_instance_get_private    (GTypeInstance              *instance,
-                                         GType                       private_type);
-
-void      g_type_add_class_private      (GType    		     class_type,
-					 gsize    		     private_size);
-gpointer  g_type_class_get_private      (GTypeClass 		    *klass,
-					 GType			     private_type);
-
-GLIB_AVAILABLE_IN_2_34
-void      g_type_ensure                 (GType                       type);
-
-/* --- GType boilerplate --- */
-/**
- * G_DEFINE_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for type implementations, which declares a 
- * class initialization function, an instance initialization function (see #GTypeInfo for information about 
- * these) and a static variable named @t_n<!-- -->_parent_class pointing to the parent class. Furthermore, it defines 
- * a *_get_type() function. See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_TYPE(TN, t_n, T_P)			    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-/**
- * G_DEFINE_TYPE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type in lowercase, with words separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- * 
- * A convenience macro for type implementations.  
- * Similar to G_DEFINE_TYPE(), but allows you to insert custom code into the 
- * *_get_type() function, e.g. interface implementations via G_IMPLEMENT_INTERFACE().
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)	    _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-/**
- * G_DEFINE_ABSTRACT_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for type implementations. 
- * Similar to G_DEFINE_TYPE(), but defines an abstract type. 
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_ABSTRACT_TYPE(TN, t_n, T_P)		    G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT, {})
-/**
- * G_DEFINE_ABSTRACT_TYPE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words 
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_C_: Custom code that gets inserted in the @type_name_get_type() function.
- * 
- * A convenience macro for type implementations.
- * Similar to G_DEFINE_TYPE_WITH_CODE(), but defines an abstract type and allows you to 
- * insert custom code into the *_get_type() function, e.g. interface implementations 
- * via G_IMPLEMENT_INTERFACE(). See G_DEFINE_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.4
- */
-#define G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, G_TYPE_FLAG_ABSTRACT) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-/**
- * G_DEFINE_TYPE_EXTENDED:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words
- *    separated by '_'.
- * @T_P: The #GType of the parent type.
- * @_f_: #GTypeFlags to pass to g_type_register_static()
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * The most general convenience macro for type implementations, on which
- * G_DEFINE_TYPE(), etc are based.
- *
- * |[
- * G_DEFINE_TYPE_EXTENDED (GtkGadget,
- *                         gtk_gadget,
- *                         GTK_TYPE_WIDGET,
- *                         0,
- *                         G_IMPLEMENT_INTERFACE (TYPE_GIZMO,
- *                                                gtk_gadget_gizmo_init));
- * ]|
- * expands to
- * |[
- * static void     gtk_gadget_init       (GtkGadget      *self);
- * static void     gtk_gadget_class_init (GtkGadgetClass *klass);
- * static gpointer gtk_gadget_parent_class = NULL;
- * static void     gtk_gadget_class_intern_init (gpointer klass)
- * {
- *   gtk_gadget_parent_class = g_type_class_peek_parent (klass);
- *   gtk_gadget_class_init ((GtkGadgetClass*) klass);
- * }
- *
- * GType
- * gtk_gadget_get_type (void)
- * {
- *   static volatile gsize g_define_type_id__volatile = 0;
- *   if (g_once_init_enter (&g_define_type_id__volatile))
- *     {
- *       GType g_define_type_id =
- *         g_type_register_static_simple (GTK_TYPE_WIDGET,
- *                                        g_intern_static_string ("GtkGadget"),
- *                                        sizeof (GtkGadgetClass),
- *                                        (GClassInitFunc) gtk_gadget_class_intern_init,
- *                                        sizeof (GtkGadget),
- *                                        (GInstanceInitFunc) gtk_gadget_init,
- *                                        (GTypeFlags) flags);
- *       {
- *         const GInterfaceInfo g_implement_interface_info = {
- *           (GInterfaceInitFunc) gtk_gadget_gizmo_init
- *         };
- *         g_type_add_interface_static (g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
- *       }
- *       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
- *     }
- *   return g_define_type_id__volatile;
- * }
- * ]|
- * The only pieces which have to be manually provided are the definitions of
- * the instance and class structure and the definitions of the instance and
- * class init functions.
- *
- * Since: 2.4
- */
-#define G_DEFINE_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)	    _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, _f_) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-/**
- * G_DEFINE_INTERFACE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words separated by '_'.
- * @T_P: The #GType of the prerequisite type for the interface, or 0
- * (%G_TYPE_INVALID) for no prerequisite type.
- *
- * A convenience macro for #GTypeInterface definitions, which declares
- * a default vtable initialization function and defines a *_get_type()
- * function.
- *
- * The macro expects the interface initialization function to have the
- * name <literal>t_n ## _default_init</literal>, and the interface
- * structure to have the name <literal>TN ## Interface</literal>.
- *
- * Since: 2.24
- */
-#define G_DEFINE_INTERFACE(TN, t_n, T_P)		    G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, ;)
-
-/**
- * G_DEFINE_INTERFACE_WITH_CODE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words separated by '_'.
- * @T_P: The #GType of the prerequisite type for the interface, or 0
- * (%G_TYPE_INVALID) for no prerequisite type.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for #GTypeInterface definitions. Similar to
- * G_DEFINE_INTERFACE(), but allows you to insert custom code into the
- * *_get_type() function, e.g. additional interface implementations
- * via G_IMPLEMENT_INTERFACE(), or additional prerequisite types. See
- * G_DEFINE_TYPE_EXTENDED() for a similar example using
- * G_DEFINE_TYPE_WITH_CODE().
- *
- * Since: 2.24
- */
-#define G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, _C_)     _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TN, t_n, T_P) {_C_;} _G_DEFINE_INTERFACE_EXTENDED_END()
-
-/**
- * G_IMPLEMENT_INTERFACE:
- * @TYPE_IFACE: The #GType of the interface to add
- * @iface_init: The interface init function
- *
- * A convenience macro to ease interface addition in the @_C_ section
- * of G_DEFINE_TYPE_WITH_CODE() or G_DEFINE_ABSTRACT_TYPE_WITH_CODE().
- * See G_DEFINE_TYPE_EXTENDED() for an example.
- *
- * Note that this macro can only be used together with the G_DEFINE_TYPE_*
- * macros, since it depends on variable names from those macros.
- *
- * Since: 2.4
- */
-#define G_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init)       { \
-  const GInterfaceInfo g_implement_interface_info = { \
-    (GInterfaceInitFunc) iface_init, NULL, NULL \
-  }; \
-  g_type_add_interface_static (g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-#define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
-\
-static void     type_name##_init              (TypeName        *self); \
-static void     type_name##_class_init        (TypeName##Class *klass); \
-static gpointer type_name##_parent_class = NULL; \
-static void     type_name##_class_intern_init (gpointer klass) \
-{ \
-  type_name##_parent_class = g_type_class_peek_parent (klass); \
-  type_name##_class_init ((TypeName##Class*) klass); \
-} \
-\
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_type_register_static_simple (TYPE_PARENT, \
-                                       g_intern_static_string (#TypeName), \
-                                       sizeof (TypeName##Class), \
-                                       (GClassInitFunc) type_name##_class_intern_init, \
-                                       sizeof (TypeName), \
-                                       (GInstanceInitFunc) type_name##_init, \
-                                       (GTypeFlags) flags); \
-      { /* custom code follows */
-#define _G_DEFINE_TYPE_EXTENDED_END()	\
-        /* following custom code */	\
-      }					\
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
-    }					\
-  return g_define_type_id__volatile;	\
-} /* closes type_name##_get_type() */
-
-#define _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PREREQ) \
-\
-static void     type_name##_default_init        (TypeName##Interface *klass); \
-\
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_type_register_static_simple (G_TYPE_INTERFACE, \
-                                       g_intern_static_string (#TypeName), \
-                                       sizeof (TypeName##Interface), \
-                                       (GClassInitFunc)type_name##_default_init, \
-                                       0, \
-                                       (GInstanceInitFunc)NULL, \
-                                       (GTypeFlags) 0); \
-      if (TYPE_PREREQ) \
-        g_type_interface_add_prerequisite (g_define_type_id, TYPE_PREREQ); \
-      { /* custom code follows */
-#define _G_DEFINE_INTERFACE_EXTENDED_END()	\
-        /* following custom code */		\
-      }						\
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
-    }						\
-  return g_define_type_id__volatile;			\
-} /* closes type_name##_get_type() */
-
-/**
- * G_DEFINE_BOXED_TYPE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @copy_func: the #GBoxedCopyFunc for the new type
- * @free_func: the #GBoxedFreeFunc for the new type
- *
- * A convenience macro for boxed type implementations, which defines a
- * type_name_get_type() function registering the boxed type.
- *
- * Since: 2.26
- */
-#define G_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) G_DEFINE_BOXED_TYPE_WITH_CODE (TypeName, type_name, copy_func, free_func, {})
-/**
- * G_DEFINE_BOXED_TYPE_WITH_CODE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @copy_func: the #GBoxedCopyFunc for the new type
- * @free_func: the #GBoxedFreeFunc for the new type
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for boxed type implementations.
- * Similar to G_DEFINE_BOXED_TYPE(), but allows to insert custom code into the
- * type_name_get_type() function, e.g. to register value transformations with
- * g_value_register_transform_func().
- *
- * Since: 2.26
- */
-#define G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName, type_name, copy_func, free_func, _C_) _G_DEFINE_BOXED_TYPE_BEGIN (TypeName, type_name, copy_func, free_func) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-#if !defined (__cplusplus) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
-#define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType (* _g_register_boxed) \
-        (const gchar *, \
-         union \
-           { \
-             TypeName * (*do_copy_type) (TypeName *); \
-             TypeName * (*do_const_copy_type) (const TypeName *); \
-             GBoxedCopyFunc do_copy_boxed; \
-           } __attribute__((__transparent_union__)), \
-         union \
-           { \
-             void (* do_free_type) (TypeName *); \
-             GBoxedFreeFunc do_free_boxed; \
-           } __attribute__((__transparent_union__)) \
-        ) = g_boxed_type_register_static; \
-      GType g_define_type_id = \
-        _g_register_boxed (g_intern_static_string (#TypeName), copy_func, free_func); \
-      { /* custom code follows */
-#else
-#define _G_DEFINE_BOXED_TYPE_BEGIN(TypeName, type_name, copy_func, free_func) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_boxed_type_register_static (g_intern_static_string (#TypeName), \
-                                      (GBoxedCopyFunc) copy_func, \
-                                      (GBoxedFreeFunc) free_func); \
-      { /* custom code follows */
-#endif /* __GNUC__ */
-
-/**
- * G_DEFINE_POINTER_TYPE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- *
- * A convenience macro for pointer type implementations, which defines a
- * type_name_get_type() function registering the pointer type.
- *
- * Since: 2.26
- */
-#define G_DEFINE_POINTER_TYPE(TypeName, type_name) G_DEFINE_POINTER_TYPE_WITH_CODE (TypeName, type_name, {})
-/**
- * G_DEFINE_POINTER_TYPE_WITH_CODE:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @_C_: Custom code that gets inserted in the *_get_type() function.
- *
- * A convenience macro for pointer type implementations.
- * Similar to G_DEFINE_POINTER_TYPE(), but allows to insert custom code into the
- * type_name_get_type() function.
- *
- * Since: 2.26
- */
-#define G_DEFINE_POINTER_TYPE_WITH_CODE(TypeName, type_name, _C_) _G_DEFINE_POINTER_TYPE_BEGIN (TypeName, type_name) {_C_;} _G_DEFINE_TYPE_EXTENDED_END()
-
-#define _G_DEFINE_POINTER_TYPE_BEGIN(TypeName, type_name) \
-GType \
-type_name##_get_type (void) \
-{ \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile))  \
-    { \
-      GType g_define_type_id = \
-        g_pointer_type_register_static (g_intern_static_string (#TypeName)); \
-      { /* custom code follows */
-
-/* --- protected (for fundamental type implementations) --- */
-GTypePlugin*	 g_type_get_plugin		(GType		     type);
-GTypePlugin*	 g_type_interface_get_plugin	(GType		     instance_type,
-						 GType               interface_type);
-GType		 g_type_fundamental_next	(void);
-GType		 g_type_fundamental		(GType		     type_id);
-GTypeInstance*   g_type_create_instance         (GType               type);
-void             g_type_free_instance           (GTypeInstance      *instance);
-
-void		 g_type_add_class_cache_func    (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void		 g_type_remove_class_cache_func (gpointer	     cache_data,
-						 GTypeClassCacheFunc cache_func);
-void             g_type_class_unref_uncached    (gpointer            g_class);
-
-void             g_type_add_interface_check     (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-void             g_type_remove_interface_check  (gpointer	         check_data,
-						 GTypeInterfaceCheckFunc check_func);
-
-GTypeValueTable* g_type_value_table_peek        (GType		     type);
-
-
-/*< private >*/
-gboolean	 g_type_check_instance          (GTypeInstance      *instance) G_GNUC_PURE;
-GTypeInstance*   g_type_check_instance_cast     (GTypeInstance      *instance,
-						 GType               iface_type);
-gboolean         g_type_check_instance_is_a	(GTypeInstance      *instance,
-						 GType               iface_type) G_GNUC_PURE;
-GTypeClass*      g_type_check_class_cast        (GTypeClass         *g_class,
-						 GType               is_a_type);
-gboolean         g_type_check_class_is_a        (GTypeClass         *g_class,
-						 GType               is_a_type) G_GNUC_PURE;
-gboolean	 g_type_check_is_value_type     (GType		     type) G_GNUC_CONST;
-gboolean	 g_type_check_value             (GValue		    *value) G_GNUC_PURE;
-gboolean	 g_type_check_value_holds	(GValue		    *value,
-						 GType		     type) G_GNUC_PURE;
-gboolean         g_type_test_flags              (GType               type,
-						 guint               flags) G_GNUC_CONST;
-
-
-/* --- debugging functions --- */
-const gchar *    g_type_name_from_instance      (GTypeInstance	*instance);
-const gchar *    g_type_name_from_class         (GTypeClass	*g_class);
-
-
-/* --- implementation bits --- */
-#ifndef G_DISABLE_CAST_CHECKS
-#  define _G_TYPE_CIC(ip, gt, ct) \
-    ((ct*) g_type_check_instance_cast ((GTypeInstance*) ip, gt))
-#  define _G_TYPE_CCC(cp, gt, ct) \
-    ((ct*) g_type_check_class_cast ((GTypeClass*) cp, gt))
-#else /* G_DISABLE_CAST_CHECKS */
-#  define _G_TYPE_CIC(ip, gt, ct)       ((ct*) ip)
-#  define _G_TYPE_CCC(cp, gt, ct)       ((ct*) cp)
-#endif /* G_DISABLE_CAST_CHECKS */
-#define _G_TYPE_CHI(ip)			(g_type_check_instance ((GTypeInstance*) ip))
-#define _G_TYPE_CHV(vl)			(g_type_check_value ((GValue*) vl))
-#define _G_TYPE_IGC(ip, gt, ct)         ((ct*) (((GTypeInstance*) ip)->g_class))
-#define _G_TYPE_IGI(ip, gt, ct)         ((ct*) g_type_interface_peek (((GTypeInstance*) ip)->g_class, gt))
-#ifdef	__GNUC__
-#  define _G_TYPE_CIT(ip, gt)             (G_GNUC_EXTENSION ({ \
-  GTypeInstance *__inst = (GTypeInstance*) ip; GType __t = gt; gboolean __r; \
-  if (!__inst) \
-    __r = FALSE; \
-  else if (__inst->g_class && __inst->g_class->g_type == __t) \
-    __r = TRUE; \
-  else \
-    __r = g_type_check_instance_is_a (__inst, __t); \
-  __r; \
-}))
-#  define _G_TYPE_CCT(cp, gt)             (G_GNUC_EXTENSION ({ \
-  GTypeClass *__class = (GTypeClass*) cp; GType __t = gt; gboolean __r; \
-  if (!__class) \
-    __r = FALSE; \
-  else if (__class->g_type == __t) \
-    __r = TRUE; \
-  else \
-    __r = g_type_check_class_is_a (__class, __t); \
-  __r; \
-}))
-#  define _G_TYPE_CVH(vl, gt)             (G_GNUC_EXTENSION ({ \
-  GValue *__val = (GValue*) vl; GType __t = gt; gboolean __r; \
-  if (!__val) \
-    __r = FALSE; \
-  else if (__val->g_type == __t)		\
-    __r = TRUE; \
-  else \
-    __r = g_type_check_value_holds (__val, __t); \
-  __r; \
-}))
-#else  /* !__GNUC__ */
-#  define _G_TYPE_CIT(ip, gt)             (g_type_check_instance_is_a ((GTypeInstance*) ip, gt))
-#  define _G_TYPE_CCT(cp, gt)             (g_type_check_class_is_a ((GTypeClass*) cp, gt))
-#  define _G_TYPE_CVH(vl, gt)             (g_type_check_value_holds ((GValue*) vl, gt))
-#endif /* !__GNUC__ */
-/**
- * G_TYPE_FLAG_RESERVED_ID_BIT:
- * 
- * A bit in the type number that's supposed to be left untouched.
- */
-#define	G_TYPE_FLAG_RESERVED_ID_BIT	((GType) (1 << 0))
-extern GTypeDebugFlags			_g_type_debug_flags;
-
-G_END_DECLS
-
-#endif /* __G_TYPE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gtypemodule.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gtypemodule.h
deleted file mode 100644
index f2d524bd..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gtypemodule.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_MODULE_H__
-#define __G_TYPE_MODULE_H__
-
-#include <gobject/gobject.h>
-#include <gobject/genums.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GTypeModule      GTypeModule;
-typedef struct _GTypeModuleClass GTypeModuleClass;
-
-#define G_TYPE_TYPE_MODULE              (g_type_module_get_type ())
-#define G_TYPE_MODULE(module)           (G_TYPE_CHECK_INSTANCE_CAST ((module), G_TYPE_TYPE_MODULE, GTypeModule))
-#define G_TYPE_MODULE_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_TYPE_MODULE, GTypeModuleClass))
-#define G_IS_TYPE_MODULE(module)        (G_TYPE_CHECK_INSTANCE_TYPE ((module), G_TYPE_TYPE_MODULE))
-#define G_IS_TYPE_MODULE_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_TYPE_MODULE))
-#define G_TYPE_MODULE_GET_CLASS(module) (G_TYPE_INSTANCE_GET_CLASS ((module), G_TYPE_TYPE_MODULE, GTypeModuleClass))
-
-/**
- * GTypeModule:
- * @name: the name of the module
- * 
- * The members of the <structname>GTypeModule</structname> structure should not 
- * be accessed directly, except for the @name field.
- */
-struct _GTypeModule 
-{
-  GObject parent_instance;
-
-  guint use_count;
-  GSList *type_infos;
-  GSList *interface_infos;
-
-  /*< public >*/
-  gchar *name;
-};
-
-/**
- * GTypeModuleClass:
- * @parent_class: the parent class
- * @load: loads the module and registers one or more types using
- *  g_type_module_register_type().
- * @unload: unloads the module
- * 
- * In order to implement dynamic loading of types based on #GTypeModule, 
- * the @load and @unload functions in #GTypeModuleClass must be implemented.
- */
-struct _GTypeModuleClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-  gboolean (* load)   (GTypeModule *module);
-  void     (* unload) (GTypeModule *module);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*reserved1) (void);
-  void (*reserved2) (void);
-  void (*reserved3) (void);
-  void (*reserved4) (void);
-};
-
-/**
- * G_DEFINE_DYNAMIC_TYPE:
- * @TN: The name of the new type, in Camel case.
- * @t_n: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @T_P: The #GType of the parent type.
- * 
- * A convenience macro for dynamic type implementations, which declares a
- * class initialization function, an instance initialization function (see 
- * #GTypeInfo for information about these) and a static variable named 
- * @t_n<!-- -->_parent_class pointing to the parent class. Furthermore, 
- * it defines a <function>*_get_type()</function> and a static 
- * <function>*_register_type()</function> function for use in your
- * <function>module_init()</function>.
- * See G_DEFINE_DYNAMIC_TYPE_EXTENDED() for an example.
- * 
- * Since: 2.14
- */
-#define G_DEFINE_DYNAMIC_TYPE(TN, t_n, T_P)          G_DEFINE_DYNAMIC_TYPE_EXTENDED (TN, t_n, T_P, 0, {})
-/**
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED:
- * @TypeName: The name of the new type, in Camel case.
- * @type_name: The name of the new type, in lowercase, with words
- *  separated by '_'.
- * @TYPE_PARENT: The #GType of the parent type.
- * @flags: #GTypeFlags to pass to g_type_module_register_type()
- * @CODE: Custom code that gets inserted in the *_get_type() function.
- * 
- * A more general version of G_DEFINE_DYNAMIC_TYPE() which
- * allows to specify #GTypeFlags and custom code.
- * 
- * |[
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED (GtkGadget,
- *                                 gtk_gadget,
- *                                 GTK_TYPE_THING,
- *                                 0,
- *                                 G_IMPLEMENT_INTERFACE_DYNAMIC (TYPE_GIZMO,
- *                                                                gtk_gadget_gizmo_init));
- * ]|
- * expands to
- * |[
- * static void     gtk_gadget_init              (GtkGadget      *self);
- * static void     gtk_gadget_class_init        (GtkGadgetClass *klass);
- * static void     gtk_gadget_class_finalize    (GtkGadgetClass *klass);
- * 
- * static gpointer gtk_gadget_parent_class = NULL;
- * static GType    gtk_gadget_type_id = 0;
- * 
- * static void     gtk_gadget_class_intern_init (gpointer klass)
- * {
- *   gtk_gadget_parent_class = g_type_class_peek_parent (klass); 
- *   gtk_gadget_class_init ((GtkGadgetClass*) klass); 
- * }
- * 
- * GType
- * gtk_gadget_get_type (void)
- * {
- *   return gtk_gadget_type_id;
- * }
- * 
- * static void
- * gtk_gadget_register_type (GTypeModule *type_module)
- * {
- *   const GTypeInfo g_define_type_info = {
- *     sizeof (GtkGadgetClass),
- *     (GBaseInitFunc) NULL,
- *     (GBaseFinalizeFunc) NULL,
- *     (GClassInitFunc) gtk_gadget_class_intern_init,
- *     (GClassFinalizeFunc) gtk_gadget_class_finalize,
- *     NULL,   // class_data
- *     sizeof (GtkGadget),
- *     0,      // n_preallocs
- *     (GInstanceInitFunc) gtk_gadget_init, 
- *     NULL    // value_table
- *   };
- *   gtk_gadget_type_id = g_type_module_register_type (type_module,
- *                                                     GTK_TYPE_THING,
- *                                                     "GtkGadget",
- *                                                     &g_define_type_info,
- *                                                     (GTypeFlags) flags);
- *   {
- *     const GInterfaceInfo g_implement_interface_info = {
- *       (GInterfaceInitFunc) gtk_gadget_gizmo_init
- *     };
- *     g_type_module_add_interface (type_module, g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
- *   }
- * }
- * ]|
- * 
- * Since: 2.14
- */
-#define G_DEFINE_DYNAMIC_TYPE_EXTENDED(TypeName, type_name, TYPE_PARENT, flags, CODE) \
-static void     type_name##_init              (TypeName        *self); \
-static void     type_name##_class_init        (TypeName##Class *klass); \
-static void     type_name##_class_finalize    (TypeName##Class *klass); \
-static gpointer type_name##_parent_class = NULL; \
-static GType    type_name##_type_id = 0; \
-static void     type_name##_class_intern_init (gpointer klass) \
-{ \
-  type_name##_parent_class = g_type_class_peek_parent (klass); \
-  type_name##_class_init ((TypeName##Class*) klass); \
-} \
-GType \
-type_name##_get_type (void) \
-{ \
-  return type_name##_type_id; \
-} \
-static void \
-type_name##_register_type (GTypeModule *type_module) \
-{ \
-  GType g_define_type_id G_GNUC_UNUSED; \
-  const GTypeInfo g_define_type_info = { \
-    sizeof (TypeName##Class), \
-    (GBaseInitFunc) NULL, \
-    (GBaseFinalizeFunc) NULL, \
-    (GClassInitFunc) type_name##_class_intern_init, \
-    (GClassFinalizeFunc) type_name##_class_finalize, \
-    NULL,   /* class_data */ \
-    sizeof (TypeName), \
-    0,      /* n_preallocs */ \
-    (GInstanceInitFunc) type_name##_init, \
-    NULL    /* value_table */ \
-  }; \
-  type_name##_type_id = g_type_module_register_type (type_module, \
-						     TYPE_PARENT, \
-						     #TypeName, \
-						     &g_define_type_info, \
-						     (GTypeFlags) flags); \
-  g_define_type_id = type_name##_type_id; \
-  { CODE ; } \
-}
-
-/**
- * G_IMPLEMENT_INTERFACE_DYNAMIC:
- * @TYPE_IFACE: The #GType of the interface to add
- * @iface_init: The interface init function
- *
- * A convenience macro to ease interface addition in the @_C_ section
- * of G_DEFINE_DYNAMIC_TYPE_EXTENDED(). See G_DEFINE_DYNAMIC_TYPE_EXTENDED()
- * for an example.
- *
- * Note that this macro can only be used together with the
- * G_DEFINE_DYNAMIC_TYPE_EXTENDED macros, since it depends on variable
- * names from that macro.
- *
- * Since: 2.24
- */
-#define G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init)       { \
-  const GInterfaceInfo g_implement_interface_info = { \
-    (GInterfaceInitFunc) iface_init, NULL, NULL      \
-  }; \
-  g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
-}
-
-GType    g_type_module_get_type       (void) G_GNUC_CONST;
-gboolean g_type_module_use            (GTypeModule          *module);
-void     g_type_module_unuse          (GTypeModule          *module);
-void     g_type_module_set_name       (GTypeModule          *module,
-                                       const gchar          *name);
-GType    g_type_module_register_type  (GTypeModule          *module,
-                                       GType                 parent_type,
-                                       const gchar          *type_name,
-                                       const GTypeInfo      *type_info,
-                                       GTypeFlags            flags);
-void     g_type_module_add_interface  (GTypeModule          *module,
-                                       GType                 instance_type,
-                                       GType                 interface_type,
-                                       const GInterfaceInfo *interface_info);
-GType    g_type_module_register_enum  (GTypeModule          *module,
-                                       const gchar          *name,
-                                       const GEnumValue     *const_static_values);
-GType    g_type_module_register_flags (GTypeModule          *module,
-                                       const gchar          *name,
-                                       const GFlagsValue    *const_static_values);
-
-G_END_DECLS
-
-#endif /* __G_TYPE_MODULE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gtypeplugin.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gtypeplugin.h
deleted file mode 100644
index ff87a701..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gtypeplugin.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_TYPE_PLUGIN_H__
-#define __G_TYPE_PLUGIN_H__
-
-#include	<gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-#define G_TYPE_TYPE_PLUGIN		(g_type_plugin_get_type ())
-#define G_TYPE_PLUGIN(inst)		(G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_TYPE_PLUGIN, GTypePlugin))
-#define G_TYPE_PLUGIN_CLASS(vtable)	(G_TYPE_CHECK_CLASS_CAST ((vtable), G_TYPE_TYPE_PLUGIN, GTypePluginClass))
-#define G_IS_TYPE_PLUGIN(inst)		(G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_TYPE_PLUGIN))
-#define G_IS_TYPE_PLUGIN_CLASS(vtable)	(G_TYPE_CHECK_CLASS_TYPE ((vtable), G_TYPE_TYPE_PLUGIN))
-#define G_TYPE_PLUGIN_GET_CLASS(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_TYPE_PLUGIN, GTypePluginClass))
-
-
-/* --- typedefs & structures --- */
-typedef struct _GTypePluginClass		   GTypePluginClass;
-/**
- * GTypePluginUse:
- * @plugin: the #GTypePlugin whose use count should be increased
- * 
- * The type of the @use_plugin function of #GTypePluginClass, which gets called
- * to increase the use count of @plugin.
- */
-typedef void  (*GTypePluginUse)			  (GTypePlugin     *plugin);
-/**
- * GTypePluginUnuse:
- * @plugin: the #GTypePlugin whose use count should be decreased
- * 
- * The type of the @unuse_plugin function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginUnuse)		  (GTypePlugin     *plugin);
-/**
- * GTypePluginCompleteTypeInfo:
- * @plugin: the #GTypePlugin
- * @g_type: the #GType whose info is completed
- * @info: the #GTypeInfo struct to fill in
- * @value_table: the #GTypeValueTable to fill in
- * 
- * The type of the @complete_type_info function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginCompleteTypeInfo)	  (GTypePlugin     *plugin,
-						   GType            g_type,
-						   GTypeInfo       *info,
-						   GTypeValueTable *value_table);
-/**
- * GTypePluginCompleteInterfaceInfo:
- * @plugin: the #GTypePlugin
- * @instance_type: the #GType of an instantiable type to which the interface
- *  is added
- * @interface_type: the #GType of the interface whose info is completed
- * @info: the #GInterfaceInfo to fill in
- * 
- * The type of the @complete_interface_info function of #GTypePluginClass.
- */
-typedef void  (*GTypePluginCompleteInterfaceInfo) (GTypePlugin     *plugin,
-						   GType            instance_type,
-						   GType            interface_type,
-						   GInterfaceInfo  *info);
-/**
- * GTypePlugin:
- * 
- * The <structname>GTypePlugin</structname> typedef is used as a placeholder 
- * for objects that implement the <structname>GTypePlugin</structname> 
- * interface.
- */
-/**
- * GTypePluginClass:
- * @use_plugin: Increases the use count of the plugin.
- * @unuse_plugin: Decreases the use count of the plugin.
- * @complete_type_info: Fills in the #GTypeInfo and 
- *  #GTypeValueTable structs for the type. The structs are initialized
- *  with <literal>memset(s, 0, sizeof (s))</literal> before calling 
- *  this function.
- * @complete_interface_info: Fills in missing parts of the #GInterfaceInfo 
- *  for the interface. The structs is initialized with 
- *  <literal>memset(s, 0, sizeof (s))</literal> before calling
- *  this function.
- * 
- * The #GTypePlugin interface is used by the type system in order to handle
- * the lifecycle of dynamically loaded types.
- */
-struct _GTypePluginClass
-{
-  /*< private >*/
-  GTypeInterface		   base_iface;
-  
-  /*< public >*/
-  GTypePluginUse		   use_plugin;
-  GTypePluginUnuse		   unuse_plugin;
-  GTypePluginCompleteTypeInfo	   complete_type_info;
-  GTypePluginCompleteInterfaceInfo complete_interface_info;
-};
-
-
-/* --- prototypes --- */
-GType	g_type_plugin_get_type			(void)	G_GNUC_CONST;
-void	g_type_plugin_use			(GTypePlugin	 *plugin);
-void	g_type_plugin_unuse			(GTypePlugin	 *plugin);
-void	g_type_plugin_complete_type_info	(GTypePlugin     *plugin,
-						 GType            g_type,
-						 GTypeInfo       *info,
-						 GTypeValueTable *value_table);
-void	g_type_plugin_complete_interface_info	(GTypePlugin     *plugin,
-						 GType            instance_type,
-						 GType            interface_type,
-						 GInterfaceInfo  *info);
-
-G_END_DECLS
-
-#endif /* __G_TYPE_PLUGIN_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gvalue.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gvalue.h
deleted file mode 100644
index 7bebfb14..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gvalue.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvalue.h: generic GValue functions
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUE_H__
-#define __G_VALUE_H__
-
-#include	<gobject/gtype.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_TYPE_IS_VALUE:
- * @type: A #GType value.
- * 
- * Checks whether the passed in type ID can be used for g_value_init().
- * That is, this macro checks whether this type provides an implementation
- * of the #GTypeValueTable functions required for a type to create a #GValue of.
- * 
- * Returns: Whether @type is suitable as a #GValue type.
- */
-#define	G_TYPE_IS_VALUE(type)		(g_type_check_is_value_type (type))
-/**
- * G_IS_VALUE:
- * @value: A #GValue structure.
- * 
- * Checks if @value is a valid and initialized #GValue structure.
- *
- * Returns: %TRUE on success.
- */
-#define	G_IS_VALUE(value)		(G_TYPE_CHECK_VALUE (value))
-/**
- * G_VALUE_TYPE:
- * @value: A #GValue structure.
- *
- * Get the type identifier of @value.
- *
- * Returns: the #GType.
- */
-#define	G_VALUE_TYPE(value)		(((GValue*) (value))->g_type)
-/**
- * G_VALUE_TYPE_NAME:
- * @value: A #GValue structure.
- *
- * Gets the type name of @value.
- *
- * Returns: the type name.
- */
-#define	G_VALUE_TYPE_NAME(value)	(g_type_name (G_VALUE_TYPE (value)))
-/**
- * G_VALUE_HOLDS:
- * @value: A #GValue structure.
- * @type: A #GType value.
- *
- * Checks if @value holds (or contains) a value of @type.
- * This macro will also check for @value != %NULL and issue a
- * warning if the check fails.
- *
- * Returns: %TRUE if @value holds the @type.
- */
-#define G_VALUE_HOLDS(value,type)	(G_TYPE_CHECK_VALUE_TYPE ((value), (type)))
-
-
-/* --- typedefs & structures --- */
-/**
- * GValueTransform:
- * @src_value: Source value.
- * @dest_value: Target value.
- * 
- * The type of value transformation functions which can be registered with
- * g_value_register_transform_func().
- */
-typedef void (*GValueTransform) (const GValue *src_value,
-				 GValue       *dest_value);
-/**
- * GValue:
- * 
- * An opaque structure used to hold different types of values.
- * The data within the structure has protected scope: it is accessible only
- * to functions within a #GTypeValueTable structure, or implementations of
- * the g_value_*() API. That is, code portions which implement new fundamental
- * types.
- * #GValue users cannot make any assumptions about how data is stored
- * within the 2 element @data union, and the @g_type member should
- * only be accessed through the G_VALUE_TYPE() macro.
- */
-struct _GValue
-{
-  /*< private >*/
-  GType		g_type;
-
-  /* public for GTypeValueTable methods */
-  union {
-    gint	v_int;
-    guint	v_uint;
-    glong	v_long;
-    gulong	v_ulong;
-    gint64      v_int64;
-    guint64     v_uint64;
-    gfloat	v_float;
-    gdouble	v_double;
-    gpointer	v_pointer;
-  } data[2];
-};
-
-
-/* --- prototypes --- */
-GValue*         g_value_init	   	(GValue       *value,
-					 GType         g_type);
-void            g_value_copy    	(const GValue *src_value,
-					 GValue       *dest_value);
-GValue*         g_value_reset   	(GValue       *value);
-void            g_value_unset   	(GValue       *value);
-void		g_value_set_instance	(GValue	      *value,
-					 gpointer      instance);
-
-
-/* --- private --- */
-gboolean	g_value_fits_pointer	(const GValue *value);
-gpointer	g_value_peek_pointer	(const GValue *value);
-
-
-/* --- implementation details --- */
-gboolean g_value_type_compatible	(GType		 src_type,
-					 GType		 dest_type);
-gboolean g_value_type_transformable	(GType           src_type,
-					 GType           dest_type);
-gboolean g_value_transform		(const GValue   *src_value,
-					 GValue         *dest_value);
-void	g_value_register_transform_func	(GType		 src_type,
-					 GType		 dest_type,
-					 GValueTransform transform_func);
-
-/**
- * G_VALUE_NOCOPY_CONTENTS:
- *
- * If passed to G_VALUE_COLLECT(), allocated data won't be copied
- * but used verbatim. This does not affect ref-counted types like
- * objects.
- */
-#define G_VALUE_NOCOPY_CONTENTS (1 << 27)
-
-/**
- * G_VALUE_INIT:
- *
- * A #GValue must be initialized before it can be used.
- * This macro can be used as initializer instead of an explicit
- * <literal>{ 0 }</literal> when declaring a variable,
- * but it cannot be assigned to a variable.
- *
- * |[
- *   GValue value = G_VALUE_INIT;
- * ]|
- *
- * Since: 2.30
- */
-#define G_VALUE_INIT  { 0, { { 0 } } }
-
-
-G_END_DECLS
-
-#endif /* __G_VALUE_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluearray.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluearray.h
deleted file mode 100644
index de14934b..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluearray.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 2001 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluearray.h: GLib array type holding GValues
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUE_ARRAY_H__
-#define __G_VALUE_ARRAY_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/**
- * G_TYPE_VALUE_ARRAY:
- *
- * The type ID of the "GValueArray" type which is a boxed type,
- * used to pass around pointers to GValueArrays.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ())
-
-/* --- typedefs & structs --- */
-typedef struct _GValueArray GValueArray;
-/**
- * GValueArray:
- * @n_values: number of values contained in the array
- * @values: array of values
- * 
- * A #GValueArray contains an array of #GValue elements.
- */
-struct _GValueArray
-{
-  guint   n_values;
-  GValue *values;
-
-  /*< private >*/
-  guint   n_prealloced;
-};
-
-/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_get_type)
-GType           g_value_array_get_type       (void) G_GNUC_CONST;
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_index)
-GValue*		g_value_array_get_nth	     (GValueArray	*value_array,
-					      guint		 index_);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_new)
-GValueArray*	g_value_array_new	     (guint		 n_prealloced);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_unref)
-void		g_value_array_free	     (GValueArray	*value_array);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_ref)
-GValueArray*	g_value_array_copy	     (const GValueArray *value_array);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_prepend_vals)
-GValueArray*	g_value_array_prepend	     (GValueArray	*value_array,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_append_vals)
-GValueArray*	g_value_array_append	     (GValueArray	*value_array,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_insert_vals)
-GValueArray*	g_value_array_insert	     (GValueArray	*value_array,
-					      guint		 index_,
-					      const GValue	*value);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_remove_index)
-GValueArray*	g_value_array_remove	     (GValueArray	*value_array,
-					      guint		 index_);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_sort)
-GValueArray*	g_value_array_sort	     (GValueArray	*value_array,
-					      GCompareFunc	 compare_func);
-
-GLIB_DEPRECATED_IN_2_32_FOR(g_array_sort_with_data)
-GValueArray*	g_value_array_sort_with_data (GValueArray	*value_array,
-					      GCompareDataFunc	 compare_func,
-					      gpointer		 user_data);
-
-
-G_END_DECLS
-
-#endif /* __G_VALUE_ARRAY_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluecollector.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluecollector.h
deleted file mode 100644
index 05a436aa..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluecollector.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluecollector.h: GValue varargs stubs
- */
-/**
- * SECTION:value_collection
- * @Short_description: Converting varargs to generic values
- * @Title: Varargs Value Collection
- * 
- * The macros in this section provide the varargs parsing support needed
- * in variadic GObject functions such as g_object_new() or g_object_set().
- * They currently support the collection of integral types, floating point 
- * types and pointers.
- */
-#ifndef __G_VALUE_COLLECTOR_H__
-#define __G_VALUE_COLLECTOR_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* we may want to add aggregate types here some day, if requested
- * by users. the basic C types are covered already, everything
- * smaller than an int is promoted to an integer and floats are
- * always promoted to doubles for varargs call constructions.
- */
-enum	/*< skip >*/
-{
-  G_VALUE_COLLECT_INT		= 'i',
-  G_VALUE_COLLECT_LONG		= 'l',
-  G_VALUE_COLLECT_INT64         = 'q',
-  G_VALUE_COLLECT_DOUBLE	= 'd',
-  G_VALUE_COLLECT_POINTER	= 'p'
-};
-
-
-/* vararg union holding actual values collected
- */
-/**
- * GTypeCValue:
- * @v_int: the field for holding integer values
- * @v_long: the field for holding long integer values
- * @v_int64: the field for holding 64 bit integer values
- * @v_double: the field for holding floating point values
- * @v_pointer: the field for holding pointers
- * 
- * A union holding one collected value.
- */
-union _GTypeCValue
-{
-  gint     v_int;
-  glong    v_long;
-  gint64   v_int64;
-  gdouble  v_double;
-  gpointer v_pointer;
-};
-
-/**
- * G_VALUE_COLLECT_INIT:
- * @value: a #GValue return location. @value must contain only 0 bytes.
- * @_value_type: the #GType to use for @value.
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the collect_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- * 
- * Collects a variable argument value from a va_list. We have to
- * implement the varargs collection as a macro, because on some systems
- * va_list variables cannot be passed by reference.
- *
- * Since: 2.24
- */
-#define G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error)		\
-G_STMT_START {										\
-  GValue *_val = (value);								\
-  guint _flags = (flags);								\
-  GTypeValueTable *_vtab = g_type_value_table_peek (_value_type);			\
-  const gchar *_collect_format = _vtab->collect_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
-                                                                                        \
-  _val->g_type = _value_type;		/* value_meminit() from gvalue.c */		\
-  while (*_collect_format)								\
-    {											\
-      GTypeCValue *_cvalue = _cvalues + _n_values++;					\
-                                                                                        \
-      switch (*_collect_format++)							\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  _cvalue->v_int = va_arg ((var_args), gint);					\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  _cvalue->v_long = va_arg ((var_args), glong);					\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  _cvalue->v_int64 = va_arg ((var_args), gint64);				\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  _cvalue->v_double = va_arg ((var_args), gdouble);				\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  _cvalue->v_pointer = va_arg ((var_args), gpointer);				\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-  *(__error) = _vtab->collect_value (_val,						\
-				       _n_values,					\
-				       _cvalues,					\
-				       _flags);						\
-} G_STMT_END
-
-/**
- * G_VALUE_COLLECT:
- * @value: a #GValue return location. @value is supposed to be initialized
- *  according to the value type to be collected
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the collect_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- *
- * Collects a variable argument value from a va_list. We have to
- * implement the varargs collection as a macro, because on some systems
- * va_list variables cannot be passed by reference.
- *
- * Note: If you are creating the @value argument just before calling this macro,
- * you should use the #G_VALUE_COLLECT_INIT variant and pass the unitialized
- * #GValue. That variant is faster than #G_VALUE_COLLECT.
- */
-#define G_VALUE_COLLECT(value, var_args, flags, __error) G_STMT_START {			\
-  GValue *_value = (value);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-											\
-  if (_vtable->value_free)								\
-    _vtable->value_free (_value);							\
-  memset (_value->data, 0, sizeof (_value->data));					\
-											\
-  G_VALUE_COLLECT_INIT(value, _value_type, var_args, flags, __error);			\
-} G_STMT_END
-
-#define G_VALUE_COLLECT_SKIP(_value_type, var_args)					\
-G_STMT_START {										\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  const gchar *_collect_format = _vtable->collect_format;				\
-                                                                                        \
-  while (*_collect_format)								\
-    {											\
-      switch (*_collect_format++)							\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  va_arg ((var_args), gint);							\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  va_arg ((var_args), glong);							\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  va_arg ((var_args), gint64);							\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  va_arg ((var_args), gdouble);							\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  va_arg ((var_args), gpointer);						\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-} G_STMT_END
-
-/**
- * G_VALUE_LCOPY:
- * @value: a #GValue return location. @value is supposed to be initialized 
- *  according to the value type to be collected
- * @var_args: the va_list variable; it may be evaluated multiple times
- * @flags: flags which are passed on to the lcopy_value() function of
- *  the #GTypeValueTable of @value.
- * @__error: a #gchar** variable that will be modified to hold a g_new()
- *  allocated error messages if something fails
- * 
- * Collects a value's variable argument locations from a va_list. Usage is
- * analogous to G_VALUE_COLLECT().
- */
-#define G_VALUE_LCOPY(value, var_args, flags, __error)					\
-G_STMT_START {										\
-  const GValue *_value = (value);							\
-  guint _flags = (flags);								\
-  GType _value_type = G_VALUE_TYPE (_value);						\
-  GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);			\
-  const gchar *_lcopy_format = _vtable->lcopy_format;					\
-  GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };		\
-  guint _n_values = 0;									\
-                                                                                        \
-  while (*_lcopy_format)								\
-    {											\
-      GTypeCValue *_cvalue = _cvalues + _n_values++;					\
-                                                                                        \
-      switch (*_lcopy_format++)								\
-	{										\
-	case G_VALUE_COLLECT_INT:							\
-	  _cvalue->v_int = va_arg ((var_args), gint);					\
-	  break;									\
-	case G_VALUE_COLLECT_LONG:							\
-	  _cvalue->v_long = va_arg ((var_args), glong);					\
-	  break;									\
-	case G_VALUE_COLLECT_INT64:							\
-	  _cvalue->v_int64 = va_arg ((var_args), gint64);				\
-	  break;									\
-	case G_VALUE_COLLECT_DOUBLE:							\
-	  _cvalue->v_double = va_arg ((var_args), gdouble);				\
-	  break;									\
-	case G_VALUE_COLLECT_POINTER:							\
-	  _cvalue->v_pointer = va_arg ((var_args), gpointer);				\
-	  break;									\
-	default:									\
-	  g_assert_not_reached ();							\
-	}										\
-    }											\
-  *(__error) = _vtable->lcopy_value (_value,						\
-				     _n_values,						\
-				     _cvalues,						\
-				     _flags);						\
-} G_STMT_END
-
-
-/**
- * G_VALUE_COLLECT_FORMAT_MAX_LENGTH:
- * 
- * The maximal number of #GTypeCValue<!-- -->s which can be collected for a 
- * single #GValue.
- */
-#define	G_VALUE_COLLECT_FORMAT_MAX_LENGTH	(8)
-
-G_END_DECLS
-
-#endif /* __G_VALUE_COLLECTOR_H__ */
diff --git a/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluetypes.h b/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluetypes.h
deleted file mode 100644
index 584162eb..00000000
--- a/GstreamerHelper/x86/include/glib-2.0/gobject/gvaluetypes.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * gvaluetypes.h: GLib default values
- */
-#if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
-#error "Only <glib-object.h> can be included directly."
-#endif
-
-#ifndef __G_VALUETYPES_H__
-#define __G_VALUETYPES_H__
-
-#include	<gobject/gvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- type macros --- */
-/**
- * G_VALUE_HOLDS_CHAR:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_CHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_CHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_CHAR))
-/**
- * G_VALUE_HOLDS_UCHAR:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UCHAR.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UCHAR(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UCHAR))
-/**
- * G_VALUE_HOLDS_BOOLEAN:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_BOOLEAN.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_BOOLEAN(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_BOOLEAN))
-/**
- * G_VALUE_HOLDS_INT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_INT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_INT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT))
-/**
- * G_VALUE_HOLDS_UINT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UINT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UINT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT))
-/**
- * G_VALUE_HOLDS_LONG:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_LONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_LONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_LONG))
-/**
- * G_VALUE_HOLDS_ULONG:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_ULONG.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_ULONG(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_ULONG))
-/**
- * G_VALUE_HOLDS_INT64:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_INT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_INT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_INT64))
-/**
- * G_VALUE_HOLDS_UINT64:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_UINT64.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_UINT64(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_UINT64))
-/**
- * G_VALUE_HOLDS_FLOAT:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_FLOAT.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_FLOAT(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLOAT))
-/**
- * G_VALUE_HOLDS_DOUBLE:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_DOUBLE.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_DOUBLE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_DOUBLE))
-/**
- * G_VALUE_HOLDS_STRING:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_STRING.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_STRING(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_STRING))
-/**
- * G_VALUE_HOLDS_POINTER:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_POINTER.
- * 
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_POINTER(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_POINTER))
-/**
- * G_TYPE_GTYPE:
- * 
- * The type for #GType.
- */
-#define	G_TYPE_GTYPE			 (g_gtype_get_type())
-/**
- * G_VALUE_HOLDS_GTYPE:
- * @value: a valid #GValue structure
- * 
- * Checks whether the given #GValue can hold values of type %G_TYPE_GTYPE.
- * 
- * Since: 2.12
- * Returns: %TRUE on success.
- */
-#define G_VALUE_HOLDS_GTYPE(value)	 (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_GTYPE))
-/**
- * G_VALUE_HOLDS_VARIANT:
- * @value: a valid #GValue structure
- *
- * Checks whether the given #GValue can hold values of type %G_TYPE_VARIANT.
- *
- * Returns: %TRUE on success.
- *
- * Since: 2.26
- */
-#define G_VALUE_HOLDS_VARIANT(value)     (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_VARIANT))
-
-
-/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_32_FOR(g_value_set_schar)
-void                  g_value_set_char          (GValue       *value,
-                                                 gchar         v_char);
-GLIB_DEPRECATED_IN_2_32_FOR(g_value_get_schar)
-gchar                 g_value_get_char          (const GValue *value);
-void		      g_value_set_schar		(GValue	      *value,
-						 gint8	       v_char);
-gint8		      g_value_get_schar		(const GValue *value);
-void		      g_value_set_uchar		(GValue	      *value,
-						 guchar	       v_uchar);
-guchar		      g_value_get_uchar		(const GValue *value);
-void		      g_value_set_boolean	(GValue	      *value,
-						 gboolean      v_boolean);
-gboolean	      g_value_get_boolean	(const GValue *value);
-void		      g_value_set_int		(GValue	      *value,
-						 gint	       v_int);
-gint		      g_value_get_int		(const GValue *value);
-void		      g_value_set_uint		(GValue	      *value,
-						 guint	       v_uint);
-guint		      g_value_get_uint		(const GValue *value);
-void		      g_value_set_long		(GValue	      *value,
-						 glong	       v_long);
-glong		      g_value_get_long		(const GValue *value);
-void		      g_value_set_ulong		(GValue	      *value,
-						 gulong	       v_ulong);
-gulong		      g_value_get_ulong		(const GValue *value);
-void		      g_value_set_int64		(GValue	      *value,
-						 gint64	       v_int64);
-gint64		      g_value_get_int64		(const GValue *value);
-void		      g_value_set_uint64	(GValue	      *value,
-						 guint64      v_uint64);
-guint64		      g_value_get_uint64	(const GValue *value);
-void		      g_value_set_float		(GValue	      *value,
-						 gfloat	       v_float);
-gfloat		      g_value_get_float		(const GValue *value);
-void		      g_value_set_double	(GValue	      *value,
-						 gdouble       v_double);
-gdouble		      g_value_get_double	(const GValue *value);
-void		      g_value_set_string	(GValue	      *value,
-						 const gchar  *v_string);
-void		      g_value_set_static_string (GValue	      *value,
-						 const gchar  *v_string);
-const gchar *         g_value_get_string	(const GValue *value);
-gchar*		      g_value_dup_string	(const GValue *value);
-void		      g_value_set_pointer	(GValue	      *value,
-						 gpointer      v_pointer);
-gpointer	      g_value_get_pointer	(const GValue *value);
-GType		      g_gtype_get_type		(void);
-void		      g_value_set_gtype	        (GValue	      *value,
-						 GType         v_gtype);
-GType	              g_value_get_gtype	        (const GValue *value);
-void		      g_value_set_variant	(GValue	      *value,
-						 GVariant     *variant);
-void		      g_value_take_variant	(GValue	      *value,
-						 GVariant     *variant);
-GVariant*	      g_value_get_variant	(const GValue *value);
-GVariant*	      g_value_dup_variant	(const GValue *value);
-
-
-/* Convenience for registering new pointer types */
-GType                 g_pointer_type_register_static (const gchar *name);
-
-/* debugging aid, describe value contents as string */
-gchar*                g_strdup_value_contents   (const GValue *value);
-
-
-void g_value_take_string		        (GValue		   *value,
-						 gchar		   *v_string);
-GLIB_DEPRECATED_FOR(g_value_take_string)
-void g_value_set_string_take_ownership          (GValue            *value,
-                                                 gchar             *v_string);
-
-
-/* humpf, need a C representable type name for G_TYPE_STRING */
-/**
- * gchararray:
- * 
- * A C representable type name for #G_TYPE_STRING.
- */
-typedef gchar* gchararray;
-
-
-G_END_DECLS
-
-#endif /* __G_VALUETYPES_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/app/gstappsink.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/app/gstappsink.h
deleted file mode 100644
index c1161f01..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/app/gstappsink.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GStreamer
- * Copyright (C) 2007 David Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_APP_SINK_H_
-#define _GST_APP_SINK_H_
-
-#include <gst/gst.h>
-#include <gst/base/gstbasesink.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_APP_SINK \
-  (gst_app_sink_get_type())
-#define GST_APP_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_APP_SINK,GstAppSink))
-#define GST_APP_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_APP_SINK,GstAppSinkClass))
-#define GST_IS_APP_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_APP_SINK))
-#define GST_IS_APP_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_APP_SINK))
-#define GST_APP_SINK_CAST(obj) \
-  ((GstAppSink*)(obj))
-
-typedef struct _GstAppSink GstAppSink;
-typedef struct _GstAppSinkClass GstAppSinkClass;
-typedef struct _GstAppSinkPrivate GstAppSinkPrivate;
-
-/**
- * GstAppSinkCallbacks: (skip)
- * @eos: Called when the end-of-stream has been reached. This callback
- *       is called from the steaming thread.
- * @new_preroll: Called when a new preroll sample is available.
- *       This callback is called from the steaming thread.
- *       The new preroll sample can be retrieved with
- *       gst_app_sink_pull_preroll() either from this callback
- *       or from any other thread.
- * @new_sample: Called when a new sample is available.
- *       This callback is called from the steaming thread.
- *       The new sample can be retrieved with
- *       gst_app_sink_pull_sample() either from this callback
- *       or from any other thread.
- *
- * A set of callbacks that can be installed on the appsink with
- * gst_app_sink_set_callbacks().
- */
-typedef struct {
-  void          (*eos)              (GstAppSink *appsink, gpointer user_data);
-  GstFlowReturn (*new_preroll)      (GstAppSink *appsink, gpointer user_data);
-  GstFlowReturn (*new_sample)       (GstAppSink *appsink, gpointer user_data);
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-} GstAppSinkCallbacks;
-
-struct _GstAppSink
-{
-  GstBaseSink basesink;
-
-  /*< private >*/
-  GstAppSinkPrivate *priv;
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-};
-
-struct _GstAppSinkClass
-{
-  GstBaseSinkClass basesink_class;
-
-  /* signals */
-  void          (*eos)              (GstAppSink *appsink);
-  GstFlowReturn (*new_preroll)      (GstAppSink *appsink);
-  GstFlowReturn (*new_sample)       (GstAppSink *appsink);
-
-  /* actions */
-  GstSample *   (*pull_preroll)      (GstAppSink *appsink);
-  GstSample *   (*pull_sample)       (GstAppSink *appsink);
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-};
-
-GType gst_app_sink_get_type(void);
-
-void            gst_app_sink_set_caps         (GstAppSink *appsink, const GstCaps *caps);
-GstCaps *       gst_app_sink_get_caps         (GstAppSink *appsink);
-
-gboolean        gst_app_sink_is_eos           (GstAppSink *appsink);
-
-void            gst_app_sink_set_emit_signals (GstAppSink *appsink, gboolean emit);
-gboolean        gst_app_sink_get_emit_signals (GstAppSink *appsink);
-
-void            gst_app_sink_set_max_buffers  (GstAppSink *appsink, guint max);
-guint           gst_app_sink_get_max_buffers  (GstAppSink *appsink);
-
-void            gst_app_sink_set_drop         (GstAppSink *appsink, gboolean drop);
-gboolean        gst_app_sink_get_drop         (GstAppSink *appsink);
-
-GstSample *     gst_app_sink_pull_preroll     (GstAppSink *appsink);
-GstSample *     gst_app_sink_pull_sample      (GstAppSink *appsink);
-
-void            gst_app_sink_set_callbacks    (GstAppSink * appsink,
-                                               GstAppSinkCallbacks *callbacks,
-                                               gpointer user_data,
-                                               GDestroyNotify notify);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/app/gstappsrc.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/app/gstappsrc.h
deleted file mode 100644
index 417a56d9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/app/gstappsrc.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* GStreamer
- * Copyright (C) 2007 David Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_APP_SRC_H_
-#define _GST_APP_SRC_H_
-
-#include <gst/gst.h>
-#include <gst/base/gstpushsrc.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_APP_SRC \
-  (gst_app_src_get_type())
-#define GST_APP_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_APP_SRC,GstAppSrc))
-#define GST_APP_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_APP_SRC,GstAppSrcClass))
-#define GST_IS_APP_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_APP_SRC))
-#define GST_IS_APP_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_APP_SRC))
-#define GST_APP_SRC_CAST(obj) \
-  ((GstAppSrc*)(obj))
-
-typedef struct _GstAppSrc GstAppSrc;
-typedef struct _GstAppSrcClass GstAppSrcClass;
-typedef struct _GstAppSrcPrivate GstAppSrcPrivate;
-
-/**
- * GstAppSrcCallbacks: (skip)
- * @need_data: Called when the appsrc needs more data. A buffer or EOS should be
- *    pushed to appsrc from this thread or another thread. @length is just a hint
- *    and when it is set to -1, any number of bytes can be pushed into @appsrc.
- * @enough_data: Called when appsrc has enough data. It is recommended that the
- *    application stops calling push-buffer until the need_data callback is
- *    emitted again to avoid excessive buffer queueing.
- * @seek_data: Called when a seek should be performed to the offset.
- *    The next push-buffer should produce buffers from the new @offset.
- *    This callback is only called for seekable stream types.
- *
- * A set of callbacks that can be installed on the appsrc with
- * gst_app_src_set_callbacks().
- */
-typedef struct {
-  void      (*need_data)    (GstAppSrc *src, guint length, gpointer user_data);
-  void      (*enough_data)  (GstAppSrc *src, gpointer user_data);
-  gboolean  (*seek_data)    (GstAppSrc *src, guint64 offset, gpointer user_data);
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-} GstAppSrcCallbacks;
-
-/**
- * GstAppStreamType:
- * @GST_APP_STREAM_TYPE_STREAM: No seeking is supported in the stream, such as a
- * live stream.
- * @GST_APP_STREAM_TYPE_SEEKABLE: The stream is seekable but seeking might not
- * be very fast, such as data from a webserver.
- * @GST_APP_STREAM_TYPE_RANDOM_ACCESS: The stream is seekable and seeking is fast,
- * such as in a local file.
- *
- * The stream type.
- */
-typedef enum
-{
-  GST_APP_STREAM_TYPE_STREAM,
-  GST_APP_STREAM_TYPE_SEEKABLE,
-  GST_APP_STREAM_TYPE_RANDOM_ACCESS
-} GstAppStreamType;
-
-struct _GstAppSrc
-{
-  GstBaseSrc basesrc;
-
-  /*< private >*/
-  GstAppSrcPrivate *priv;
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-};
-
-struct _GstAppSrcClass
-{
-  GstBaseSrcClass basesrc_class;
-
-  /* signals */
-  void          (*need_data)       (GstAppSrc *appsrc, guint length);
-  void          (*enough_data)     (GstAppSrc *appsrc);
-  gboolean      (*seek_data)       (GstAppSrc *appsrc, guint64 offset);
-
-  /* actions */
-  GstFlowReturn (*push_buffer)     (GstAppSrc *appsrc, GstBuffer *buffer);
-  GstFlowReturn (*end_of_stream)   (GstAppSrc *appsrc);
-
-  /*< private >*/
-  gpointer     _gst_reserved[GST_PADDING];
-};
-
-GType gst_app_src_get_type(void);
-
-/* GType getter for GstAppStreamType */
-#define GST_TYPE_APP_STREAM_TYPE (gst_app_stream_type_get_type ())
-GType gst_app_stream_type_get_type (void);
-
-void             gst_app_src_set_caps         (GstAppSrc *appsrc, const GstCaps *caps);
-GstCaps*         gst_app_src_get_caps         (GstAppSrc *appsrc);
-
-void             gst_app_src_set_size         (GstAppSrc *appsrc, gint64 size);
-gint64           gst_app_src_get_size         (GstAppSrc *appsrc);
-
-void             gst_app_src_set_stream_type  (GstAppSrc *appsrc, GstAppStreamType type);
-GstAppStreamType gst_app_src_get_stream_type  (GstAppSrc *appsrc);
-
-void             gst_app_src_set_max_bytes    (GstAppSrc *appsrc, guint64 max);
-guint64          gst_app_src_get_max_bytes    (GstAppSrc *appsrc);
-
-void             gst_app_src_set_latency      (GstAppSrc *appsrc, guint64 min, guint64 max);
-void             gst_app_src_get_latency      (GstAppSrc *appsrc, guint64 *min, guint64 *max);
-
-void             gst_app_src_set_emit_signals (GstAppSrc *appsrc, gboolean emit);
-gboolean         gst_app_src_get_emit_signals (GstAppSrc *appsrc);
-
-GstFlowReturn    gst_app_src_push_buffer      (GstAppSrc *appsrc, GstBuffer *buffer);
-GstFlowReturn    gst_app_src_end_of_stream    (GstAppSrc *appsrc);
-
-void             gst_app_src_set_callbacks    (GstAppSrc * appsrc,
-                                               GstAppSrcCallbacks *callbacks,
-                                               gpointer user_data,
-                                               GDestroyNotify notify);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-channels.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-channels.h
deleted file mode 100644
index 7885140d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-channels.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2001> Thomas Vander Stichele <thomas@apestaart.org>
- *               <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_CHANNELS_H__
-#define __GST_AUDIO_CHANNELS_H__
-
-#include <gst/gst.h>
-
-#include <gst/audio/audio-format.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstAudioChannelPosition:
- * @GST_AUDIO_CHANNEL_POSITION_MONO: Mono without direction;
- *     can only be used with 1 channel
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT: Front left
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT: Front right
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER: Front center
- * @GST_AUDIO_CHANNEL_POSITION_LFE1: Low-frequency effects 1 (subwoofer)
- * @GST_AUDIO_CHANNEL_POSITION_REAR_LEFT: Rear left
- * @GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT: Rear right
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER: Front left of center
- * @GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER: Front right of center
- * @GST_AUDIO_CHANNEL_POSITION_REAR_CENTER: Rear center
- * @GST_AUDIO_CHANNEL_POSITION_LFE2: Low-frequency effects 2 (subwoofer)
- * @GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT: Side left
- * @GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT: Side right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT: Top front left
- * @GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT: Top front right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER: Top front center
- * @GST_AUDIO_CHANNEL_POSITION_TOP_CENTER: Top center
- * @GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT: Top rear left
- * @GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT: Top rear right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_LEFT: Top side right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_RIGHT: Top rear right
- * @GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER: Top rear center
- * @GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_CENTER: Bottom front center
- * @GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_LEFT: Bottom front left
- * @GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_RIGHT: Bottom front right
- * @GST_AUDIO_CHANNEL_POSITION_WIDE_LEFT: Wide left (between front left and side left)
- * @GST_AUDIO_CHANNEL_POSITION_WIDE_RIGHT: Wide right (between front right and side right)
- * @GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT: Surround left (between rear left and side left)
- * @GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT: Surround right (between rear right and side right)
- * @GST_AUDIO_CHANNEL_POSITION_NONE: used for position-less channels, e.g.
- *     from a sound card that records 1024 channels; mutually exclusive with
- *     any other channel position
- * @GST_AUDIO_CHANNEL_POSITION_INVALID: invalid position
- *
- * Audio channel positions.
- *
- * These are the channels defined in SMPTE 2036-2-2008
- * Table 1 for 22.2 audio systems with the Surround and Wide channels from
- * DTS Coherent Acoustics (v.1.3.1) and 10.2 and 7.1 layouts. In the caps the
- * actual channel layout is expressed with a channel count and a channel mask,
- * which describes the existing channels. The positions in the bit mask correspond
- * to the enum values.
- * For negotiation it is allowed to have more bits set in the channel mask than
- * the number of channels to specify the allowed channel positions but this is
- * not allowed in negotiated caps. It is not allowed in any situation other
- * than the one mentioned below to have less bits set in the channel mask than
- * the number of channels.
- *
- * @GST_AUDIO_CHANNEL_POSITION_MONO can only be used with a single mono channel that
- * has no direction information and would be mixed into all directional channels.
- * This is expressed in caps by having a single channel and no channel mask.
- *
- * @GST_AUDIO_CHANNEL_POSITION_NONE can only be used if all channels have this position.
- * This is expressed in caps by having a channel mask with no bits set.
- *
- * As another special case it is allowed to have two channels without a channel mask.
- * This implicitely means that this is a stereo stream with a front left and front right
- * channel.
- */
-typedef enum {
-  /* These get negative indices to allow to use
-   * the enum values of the normal cases for the
-   * bit-mask position */
-  GST_AUDIO_CHANNEL_POSITION_NONE = -3,
-  GST_AUDIO_CHANNEL_POSITION_MONO = -2,
-  GST_AUDIO_CHANNEL_POSITION_INVALID = -1,
-
-  /* Normal cases */
-  GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT = 0,
-  GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_LFE1,
-  GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_LFE2,
-  GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_TOP_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_SIDE_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_CENTER,
-  GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_BOTTOM_FRONT_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_WIDE_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_WIDE_RIGHT,
-  GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT
-} GstAudioChannelPosition;
-
-#define GST_AUDIO_CHANNEL_POSITION_MASK(pos) (G_GUINT64_CONSTANT(1)<< GST_AUDIO_CHANNEL_POSITION_ ## pos)
-
-gboolean       gst_audio_buffer_reorder_channels (GstBuffer * buffer,
-                                                  GstAudioFormat format,
-                                                  gint channels,
-                                                  const GstAudioChannelPosition * from,
-                                                  const GstAudioChannelPosition * to);
-
-gboolean       gst_audio_reorder_channels        (gpointer data, gsize size,
-                                                  GstAudioFormat format,
-                                                  gint channels,
-                                                  const GstAudioChannelPosition * from,
-                                                  const GstAudioChannelPosition * to);
-
-gboolean       gst_audio_channel_positions_to_valid_order (GstAudioChannelPosition *position,
-                                                           gint channels);
-
-gboolean       gst_audio_check_valid_channel_positions (const GstAudioChannelPosition *position,
-                                                        gint channels, gboolean force_order);
-
-gboolean       gst_audio_channel_positions_to_mask  (const GstAudioChannelPosition *position,
-                                                     gint channels, gboolean force_order,
-                                                     guint64 *channel_mask);
-
-gboolean       gst_audio_channel_positions_from_mask (gint channels, guint64 channel_mask,
-                                                      GstAudioChannelPosition * position);
-
-gboolean       gst_audio_get_channel_reorder_map (gint channels,
-                                                  const GstAudioChannelPosition * from,
-                                                  const GstAudioChannelPosition * to,
-                                                  gint *reorder_map);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_CHANNELS_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-enumtypes.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-enumtypes.h
deleted file mode 100644
index a323a87d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-enumtypes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-#ifndef __GST_AUDIO_ENUM_TYPES_H__
-#define __GST_AUDIO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "audio-format.h" */
-GType gst_audio_format_get_type (void);
-#define GST_TYPE_AUDIO_FORMAT (gst_audio_format_get_type())
-GType gst_audio_format_flags_get_type (void);
-#define GST_TYPE_AUDIO_FORMAT_FLAGS (gst_audio_format_flags_get_type())
-GType gst_audio_pack_flags_get_type (void);
-#define GST_TYPE_AUDIO_PACK_FLAGS (gst_audio_pack_flags_get_type())
-
-/* enumerations from "audio-channels.h" */
-GType gst_audio_channel_position_get_type (void);
-#define GST_TYPE_AUDIO_CHANNEL_POSITION (gst_audio_channel_position_get_type())
-
-/* enumerations from "audio-info.h" */
-GType gst_audio_flags_get_type (void);
-#define GST_TYPE_AUDIO_FLAGS (gst_audio_flags_get_type())
-GType gst_audio_layout_get_type (void);
-#define GST_TYPE_AUDIO_LAYOUT (gst_audio_layout_get_type())
-
-/* enumerations from "gstaudioringbuffer.h" */
-GType gst_audio_ring_buffer_state_get_type (void);
-#define GST_TYPE_AUDIO_RING_BUFFER_STATE (gst_audio_ring_buffer_state_get_type())
-GType gst_audio_ring_buffer_format_type_get_type (void);
-#define GST_TYPE_AUDIO_RING_BUFFER_FORMAT_TYPE (gst_audio_ring_buffer_format_type_get_type())
-G_END_DECLS
-
-#endif /* __GST_AUDIO_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-format.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-format.h
deleted file mode 100644
index e515d111..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-format.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2001> Thomas Vander Stichele <thomas@apestaart.org>
- *               <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gst/gst.h>
-
-#ifndef __GST_AUDIO_FORMAT_H__
-#define __GST_AUDIO_FORMAT_H__
-
-G_BEGIN_DECLS
-
-#include <gst/audio/audio-enumtypes.h>
-
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-#define _GST_AUDIO_FORMAT_NE(fmt) GST_AUDIO_FORMAT_ ## fmt ## BE
-#define _GST_AUDIO_FORMAT_OE(fmt) GST_AUDIO_FORMAT_ ## fmt ## LE
-#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define _GST_AUDIO_FORMAT_NE(fmt) GST_AUDIO_FORMAT_ ## fmt ## LE
-#define _GST_AUDIO_FORMAT_OE(fmt) GST_AUDIO_FORMAT_ ## fmt ## BE
-#endif
-
-/**
- * GstAudioFormat:
- * @GST_AUDIO_FORMAT_UNKNOWN: unknown or unset audio format
- * @GST_AUDIO_FORMAT_ENCODED: encoded audio format
- * @GST_AUDIO_FORMAT_S8: 8 bits in 8 bits, signed
- * @GST_AUDIO_FORMAT_U8: 8 bits in 8 bits, unsigned
- * @GST_AUDIO_FORMAT_S16LE: 16 bits in 16 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S16BE: 16 bits in 16 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U16LE: 16 bits in 16 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U16BE: 16 bits in 16 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S24_32LE: 24 bits in 32 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S24_32BE: 24 bits in 32 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U24_32LE: 24 bits in 32 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U24_32BE: 24 bits in 32 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S32LE: 32 bits in 32 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S32BE: 32 bits in 32 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U32LE: 32 bits in 32 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U32BE: 32 bits in 32 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S24LE: 24 bits in 24 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S24BE: 24 bits in 24 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U24LE: 24 bits in 24 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U24BE: 24 bits in 24 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S20LE: 20 bits in 24 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S20BE: 20 bits in 24 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U20LE: 20 bits in 24 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U20BE: 20 bits in 24 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_S18LE: 18 bits in 24 bits, signed, little endian
- * @GST_AUDIO_FORMAT_S18BE: 18 bits in 24 bits, signed, big endian
- * @GST_AUDIO_FORMAT_U18LE: 18 bits in 24 bits, unsigned, little endian
- * @GST_AUDIO_FORMAT_U18BE: 18 bits in 24 bits, unsigned, big endian
- * @GST_AUDIO_FORMAT_F32LE: 32-bit floating point samples, little endian
- * @GST_AUDIO_FORMAT_F32BE: 32-bit floating point samples, big endian
- * @GST_AUDIO_FORMAT_F64LE: 64-bit floating point samples, little endian
- * @GST_AUDIO_FORMAT_F64BE: 64-bit floating point samples, big endian
- * @GST_AUDIO_FORMAT_S16: 16 bits in 16 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U16: 16 bits in 16 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S24_32: 24 bits in 32 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U24_32: 24 bits in 32 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S32: 32 bits in 32 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U32: 32 bits in 32 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S24: 24 bits in 24 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U24: 24 bits in 24 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S20: 20 bits in 24 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U20: 20 bits in 24 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_S18: 18 bits in 24 bits, signed, native endianness
- * @GST_AUDIO_FORMAT_U18: 18 bits in 24 bits, unsigned, native endianness
- * @GST_AUDIO_FORMAT_F32: 32-bit floating point samples, native endianness
- * @GST_AUDIO_FORMAT_F64: 64-bit floating point samples, native endianness
- *
- * Enum value describing the most common audio formats.
- */
-typedef enum {
-  GST_AUDIO_FORMAT_UNKNOWN,
-  GST_AUDIO_FORMAT_ENCODED,
-  /* 8 bit */
-  GST_AUDIO_FORMAT_S8,
-  GST_AUDIO_FORMAT_U8,
-  /* 16 bit */
-  GST_AUDIO_FORMAT_S16LE,
-  GST_AUDIO_FORMAT_S16BE,
-  GST_AUDIO_FORMAT_U16LE,
-  GST_AUDIO_FORMAT_U16BE,
-  /* 24 bit in low 3 bytes of 32 bits*/
-  GST_AUDIO_FORMAT_S24_32LE,
-  GST_AUDIO_FORMAT_S24_32BE,
-  GST_AUDIO_FORMAT_U24_32LE,
-  GST_AUDIO_FORMAT_U24_32BE,
-  /* 32 bit */
-  GST_AUDIO_FORMAT_S32LE,
-  GST_AUDIO_FORMAT_S32BE,
-  GST_AUDIO_FORMAT_U32LE,
-  GST_AUDIO_FORMAT_U32BE,
-  /* 24 bit in 3 bytes*/
-  GST_AUDIO_FORMAT_S24LE,
-  GST_AUDIO_FORMAT_S24BE,
-  GST_AUDIO_FORMAT_U24LE,
-  GST_AUDIO_FORMAT_U24BE,
-  /* 20 bit in 3 bytes*/
-  GST_AUDIO_FORMAT_S20LE,
-  GST_AUDIO_FORMAT_S20BE,
-  GST_AUDIO_FORMAT_U20LE,
-  GST_AUDIO_FORMAT_U20BE,
-  /* 18 bit in 3 bytes*/
-  GST_AUDIO_FORMAT_S18LE,
-  GST_AUDIO_FORMAT_S18BE,
-  GST_AUDIO_FORMAT_U18LE,
-  GST_AUDIO_FORMAT_U18BE,
-  /* float */
-  GST_AUDIO_FORMAT_F32LE,
-  GST_AUDIO_FORMAT_F32BE,
-  GST_AUDIO_FORMAT_F64LE,
-  GST_AUDIO_FORMAT_F64BE,
-  /* native endianness equivalents */
-  GST_AUDIO_FORMAT_S16 = _GST_AUDIO_FORMAT_NE(S16),
-  GST_AUDIO_FORMAT_U16 = _GST_AUDIO_FORMAT_NE(U16),
-  GST_AUDIO_FORMAT_S24_32 = _GST_AUDIO_FORMAT_NE(S24_32),
-  GST_AUDIO_FORMAT_U24_32 = _GST_AUDIO_FORMAT_NE(U24_32),
-  GST_AUDIO_FORMAT_S32 = _GST_AUDIO_FORMAT_NE(S32),
-  GST_AUDIO_FORMAT_U32 = _GST_AUDIO_FORMAT_NE(U32),
-  GST_AUDIO_FORMAT_S24 = _GST_AUDIO_FORMAT_NE(S24),
-  GST_AUDIO_FORMAT_U24 = _GST_AUDIO_FORMAT_NE(U24),
-  GST_AUDIO_FORMAT_S20 = _GST_AUDIO_FORMAT_NE(S20),
-  GST_AUDIO_FORMAT_U20 = _GST_AUDIO_FORMAT_NE(U20),
-  GST_AUDIO_FORMAT_S18 = _GST_AUDIO_FORMAT_NE(S18),
-  GST_AUDIO_FORMAT_U18 = _GST_AUDIO_FORMAT_NE(U18),
-  GST_AUDIO_FORMAT_F32 = _GST_AUDIO_FORMAT_NE(F32),
-  GST_AUDIO_FORMAT_F64 = _GST_AUDIO_FORMAT_NE(F64)
-} GstAudioFormat;
-
-
-typedef struct _GstAudioFormatInfo GstAudioFormatInfo;
-
-/**
- * GstAudioFormatFlags:
- * @GST_AUDIO_FORMAT_FLAG_INTEGER: integer samples
- * @GST_AUDIO_FORMAT_FLAG_FLOAT: float samples
- * @GST_AUDIO_FORMAT_FLAG_SIGNED: signed samples
- * @GST_AUDIO_FORMAT_FLAG_COMPLEX: complex layout
- * @GST_AUDIO_FORMAT_FLAG_UNPACK: the format can be used in
- * #GstAudioFormatUnpack and #GstAudioFormatPack functions
- *
- * The different audio flags that a format info can have.
- */
-typedef enum
-{
-  GST_AUDIO_FORMAT_FLAG_INTEGER  = (1 << 0),
-  GST_AUDIO_FORMAT_FLAG_FLOAT    = (1 << 1),
-  GST_AUDIO_FORMAT_FLAG_SIGNED   = (1 << 2),
-  GST_AUDIO_FORMAT_FLAG_COMPLEX  = (1 << 4),
-  GST_AUDIO_FORMAT_FLAG_UNPACK   = (1 << 5)
-} GstAudioFormatFlags;
-
-/**
- * GstAudioPackFlags:
- * @GST_AUDIO_PACK_FLAG_NONE: No flag
- *
- * The different flags that can be used when packing and unpacking.
- */
-typedef enum
-{
-  GST_AUDIO_PACK_FLAG_NONE       = 0
-} GstAudioPackFlags;
-
-/**
- * GstAudioFormatUnpack:
- * @info: a #GstAudioFormatInfo
- * @dest: (array) (element-type guint8): a destination array
- * @data: (array) (element-type guint8): pointer to the audio data
- * @length: the amount of samples to unpack.
- *
- * Unpacks @length samples from the given data of format @info.
- * The samples will be unpacked into @dest which each channel
- * interleaved. @dest should at least be big enough to hold @length *
- * channels * size(unpack_format) bytes.
- */
-typedef void (*GstAudioFormatUnpack)         (const GstAudioFormatInfo *info,
-                                              GstAudioPackFlags flags, gpointer dest,
-                                              const gpointer data, gint length);
-/**
- * GstAudioFormatPack:
- * @info: a #GstAudioFormatInfo
- * @src: (array) (element-type guint8): a source array
- * @data: (array) (element-type guint8): pointer to the destination
- *   data
- * @length: the amount of samples to pack.
- *
- * Packs @length samples from @src to the data array in format @info.
- * The samples from source have each channel interleaved
- * and will be packed into @data.
- */
-typedef void (*GstAudioFormatPack)           (const GstAudioFormatInfo *info,
-                                              GstAudioPackFlags flags, const gpointer src,
-                                              gpointer data, gint length);
-
-/**
- * GstAudioFormatInfo:
- * @format: #GstAudioFormat
- * @name: string representation of the format
- * @description: user readable description of the format
- * @flags: #GstAudioFormatFlags
- * @endianness: the endianness
- * @width: amount of bits used for one sample
- * @depth: amount of valid bits in @width
- * @silence: @width/8 bytes with 1 silent sample
- * @unpack_format: the format of the unpacked samples
- * @unpack_func: function to unpack samples
- * @pack_func: function to pack samples
- *
- * Information for an audio format.
- */
-struct _GstAudioFormatInfo {
-  GstAudioFormat format;
-  const gchar *name;
-  const gchar *description;
-  GstAudioFormatFlags flags;
-  gint endianness;
-  gint width;
-  gint depth;
-  guint8 silence[8];
-
-  GstAudioFormat unpack_format;
-  GstAudioFormatUnpack unpack_func;
-  GstAudioFormatPack pack_func;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_format_info_get_type (void);
-
-#define GST_AUDIO_FORMAT_INFO_FORMAT(info)           ((info)->format)
-#define GST_AUDIO_FORMAT_INFO_NAME(info)             ((info)->name)
-#define GST_AUDIO_FORMAT_INFO_FLAGS(info)            ((info)->flags)
-
-#define GST_AUDIO_FORMAT_INFO_IS_INTEGER(info)       !!((info)->flags & GST_AUDIO_FORMAT_FLAG_INTEGER)
-#define GST_AUDIO_FORMAT_INFO_IS_FLOAT(info)         !!((info)->flags & GST_AUDIO_FORMAT_FLAG_FLOAT)
-#define GST_AUDIO_FORMAT_INFO_IS_SIGNED(info)        !!((info)->flags & GST_AUDIO_FORMAT_FLAG_SIGNED)
-
-#define GST_AUDIO_FORMAT_INFO_ENDIANNESS(info)       ((info)->endianness)
-#define GST_AUDIO_FORMAT_INFO_IS_LITTLE_ENDIAN(info) ((info)->endianness == G_LITTLE_ENDIAN)
-#define GST_AUDIO_FORMAT_INFO_IS_BIG_ENDIAN(info)    ((info)->endianness == G_BIG_ENDIAN)
-#define GST_AUDIO_FORMAT_INFO_WIDTH(info)            ((info)->width)
-#define GST_AUDIO_FORMAT_INFO_DEPTH(info)            ((info)->depth)
-
-
-GstAudioFormat gst_audio_format_build_integer    (gboolean sign, gint endianness,
-                                                  gint width, gint depth) G_GNUC_CONST;
-
-GstAudioFormat gst_audio_format_from_string      (const gchar *format) G_GNUC_CONST;
-const gchar *  gst_audio_format_to_string        (GstAudioFormat format) G_GNUC_CONST;
-
-const GstAudioFormatInfo *
-               gst_audio_format_get_info         (GstAudioFormat format) G_GNUC_CONST;
-
-void           gst_audio_format_fill_silence     (const GstAudioFormatInfo *info,
-                                                  gpointer dest, gsize length);
-
-#define GST_AUDIO_RATE_RANGE "(int) [ 1, max ]"
-#define GST_AUDIO_CHANNELS_RANGE "(int) [ 1, max ]"
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-# define GST_AUDIO_NE(s) G_STRINGIFY(s)"LE"
-# define GST_AUDIO_OE(s) G_STRINGIFY(s)"BE"
-#else
-# define GST_AUDIO_NE(s) G_STRINGIFY(s)"BE"
-# define GST_AUDIO_OE(s) G_STRINGIFY(s)"LE"
-#endif
-
-#define GST_AUDIO_FORMATS_ALL " { S8, U8, " \
-    "S16LE, S16BE, U16LE, U16BE, " \
-    "S24_32LE, S24_32BE, U24_32LE, U24_32BE, " \
-    "S32LE, S32BE, U32LE, U32BE, " \
-    "S24LE, S24BE, U24LE, U24BE, " \
-    "S20LE, S20BE, U20LE, U20BE, " \
-    "S18LE, S18BE, U18LE, U18BE, " \
-    "F32LE, F32BE, F64LE, F64BE }"
-
-/**
- * GST_AUDIO_CAPS_MAKE:
- * @format: string format that describes the sample layout, as string
- *     (e.g. "S16LE", "S8", etc.)
- *
- * Generic caps string for audio, for use in pad templates.
- */
-#define GST_AUDIO_CAPS_MAKE(format)                                    \
-    "audio/x-raw, "                                                    \
-    "format = (string) " format ", "                                   \
-    "rate = " GST_AUDIO_RATE_RANGE ", "                                \
-    "channels = " GST_AUDIO_CHANNELS_RANGE
-
-/**
- * GST_AUDIO_DEF_RATE:
- *
- * Standard sampling rate used in consumer audio.
- */
-#define GST_AUDIO_DEF_RATE 44100
-/**
- * GST_AUDIO_DEF_CHANNELS:
- *
- * Standard number of channels used in consumer audio.
- */
-#define GST_AUDIO_DEF_CHANNELS 2
-/**
- * GST_AUDIO_DEF_FORMAT:
- *
- * Standard format used in consumer audio.
- */
-#define GST_AUDIO_DEF_FORMAT "S16LE"
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_FORMAT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-info.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-info.h
deleted file mode 100644
index fb6ab260..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio-info.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2001> Thomas Vander Stichele <thomas@apestaart.org>
- *               <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_INFO_H__
-#define __GST_AUDIO_INFO_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio-enumtypes.h>
-#include <gst/audio/audio-format.h>
-#include <gst/audio/audio-channels.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstAudioInfo GstAudioInfo;
-
-/**
- * GstAudioFlags:
- * @GST_AUDIO_FLAG_NONE: no valid flag
- * @GST_AUDIO_FLAG_UNPOSITIONED: the position array explicitly
- *     contains unpositioned channels.
- *
- * Extra audio flags
- */
-typedef enum {
-  GST_AUDIO_FLAG_NONE              = 0,
-  GST_AUDIO_FLAG_UNPOSITIONED      = (1 << 0)
-} GstAudioFlags;
-
-/**
- * GstAudioLayout:
- * @GST_AUDIO_LAYOUT_INTERLEAVED: interleaved audio
- * @GST_AUDIO_LAYOUT_NON_INTERLEAVED: non-interleaved audio
- *
- * Layout of the audio samples for the different channels.
- */
-typedef enum {
-  GST_AUDIO_LAYOUT_INTERLEAVED = 0,
-  GST_AUDIO_LAYOUT_NON_INTERLEAVED
-} GstAudioLayout;
-
-/**
- * GstAudioInfo:
- * @finfo: the format info of the audio
- * @flags: additional audio flags
- * @layout: audio layout
- * @rate: the audio sample rate
- * @channels: the number of channels
- * @bpf: the number of bytes for one frame, this is the size of one
- *         sample * @channels
- * @position: the positions for each channel
- *
- * Information describing audio properties. This information can be filled
- * in from GstCaps with gst_audio_info_from_caps().
- *
- * Use the provided macros to access the info in this structure.
- */
-struct _GstAudioInfo {
-  const GstAudioFormatInfo *finfo;
-  GstAudioFlags             flags;
-  GstAudioLayout            layout;
-  gint                      rate;
-  gint                      channels;
-  gint                      bpf;
-  GstAudioChannelPosition   position[64];
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_info_get_type        (void);
-
-#define GST_AUDIO_INFO_IS_VALID(i)           ((i)->finfo != NULL && (i)->rate > 0 && (i)->channels > 0 && (i)->bpf > 0)
-
-#define GST_AUDIO_INFO_FORMAT(i)             (GST_AUDIO_FORMAT_INFO_FORMAT((i)->finfo))
-#define GST_AUDIO_INFO_NAME(i)               (GST_AUDIO_FORMAT_INFO_NAME((i)->finfo))
-#define GST_AUDIO_INFO_WIDTH(i)              (GST_AUDIO_FORMAT_INFO_WIDTH((i)->finfo))
-#define GST_AUDIO_INFO_DEPTH(i)              (GST_AUDIO_FORMAT_INFO_DEPTH((i)->finfo))
-#define GST_AUDIO_INFO_BPS(info)             (GST_AUDIO_INFO_DEPTH(info) >> 3)
-
-#define GST_AUDIO_INFO_IS_INTEGER(i)         (GST_AUDIO_FORMAT_INFO_IS_INTEGER((i)->finfo))
-#define GST_AUDIO_INFO_IS_FLOAT(i)           (GST_AUDIO_FORMAT_INFO_IS_FLOAT((i)->finfo))
-#define GST_AUDIO_INFO_IS_SIGNED(i)          (GST_AUDIO_FORMAT_INFO_IS_SIGNED((i)->finfo))
-
-#define GST_AUDIO_INFO_ENDIANNESS(i)         (GST_AUDIO_FORMAT_INFO_ENDIANNES((i)->finfo))
-#define GST_AUDIO_INFO_IS_LITTLE_ENDIAN(i)   (GST_AUDIO_FORMAT_INFO_IS_LITTLE_ENDIAN((i)->finfo))
-#define GST_AUDIO_INFO_IS_BIG_ENDIAN(i)      (GST_AUDIO_FORMAT_INFO_IS_BIG_ENDIAN((i)->finfo))
-
-#define GST_AUDIO_INFO_FLAGS(info)           ((info)->flags)
-#define GST_AUDIO_INFO_IS_UNPOSITIONED(info) ((info)->flags & GST_AUDIO_FLAG_UNPOSITIONED)
-#define GST_AUDIO_INFO_LAYOUT(info)          ((info)->layout)
-
-#define GST_AUDIO_INFO_RATE(info)            ((info)->rate)
-#define GST_AUDIO_INFO_CHANNELS(info)        ((info)->channels)
-#define GST_AUDIO_INFO_BPF(info)             ((info)->bpf)
-#define GST_AUDIO_INFO_POSITION(info,c)      ((info)->position[c])
-
-GstAudioInfo * gst_audio_info_new         (void);
-void           gst_audio_info_init        (GstAudioInfo *info);
-GstAudioInfo * gst_audio_info_copy        (const GstAudioInfo *info);
-void           gst_audio_info_free        (GstAudioInfo *info);
-
-void           gst_audio_info_set_format  (GstAudioInfo *info, GstAudioFormat format,
-                                           gint rate, gint channels,
-                                           const GstAudioChannelPosition *position);
-
-gboolean       gst_audio_info_from_caps   (GstAudioInfo *info, const GstCaps *caps);
-GstCaps *      gst_audio_info_to_caps     (const GstAudioInfo *info);
-
-gboolean       gst_audio_info_convert     (const GstAudioInfo * info,
-                                           GstFormat src_fmt, gint64 src_val,
-                                           GstFormat dest_fmt, gint64 * dest_val);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_INFO_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio.h
deleted file mode 100644
index e97fc1ab..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/audio.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Library       <2001> Thomas Vander Stichele <thomas@apestaart.org>
- *               <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_AUDIO_H__
-#define __GST_AUDIO_AUDIO_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio-enumtypes.h>
-#include <gst/audio/audio-format.h>
-#include <gst/audio/audio-channels.h>
-#include <gst/audio/audio-info.h>
-
-G_BEGIN_DECLS
-
-/* conversion macros */
-/**
- * GST_FRAMES_TO_CLOCK_TIME:
- * @frames: sample frames
- * @rate: sampling rate
- *
- * Calculate clocktime from sample @frames and @rate.
- */
-#define GST_FRAMES_TO_CLOCK_TIME(frames, rate) \
-  ((GstClockTime) gst_util_uint64_scale_round (frames, GST_SECOND, rate))
-
-/**
- * GST_CLOCK_TIME_TO_FRAMES:
- * @clocktime: clock time
- * @rate: sampling rate
- *
- * Calculate frames from @clocktime and sample @rate.
- */
-#define GST_CLOCK_TIME_TO_FRAMES(clocktime, rate) \
-  gst_util_uint64_scale_round (clocktime, rate, GST_SECOND)
-
-/*
- * this library defines and implements some helper functions for audio
- * handling
- */
-
-GstBuffer *    gst_audio_buffer_clip     (GstBuffer *buffer, GstSegment *segment,
-                                          gint rate, gint bpf);
-
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_AUDIO_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiobasesink.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiobasesink.h
deleted file mode 100644
index d3e65e37..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiobasesink.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudiobasesink.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* a base class for audio sinks.
- *
- * It uses a ringbuffer to schedule playback of samples. This makes
- * it very easy to drop or insert samples to align incoming
- * buffers to the exact playback timestamp.
- *
- * Subclasses must provide a ringbuffer pointing to either DMA
- * memory or regular memory. A subclass should also call a callback
- * function when it has played N segments in the buffer. The subclass
- * is free to use a thread to signal this callback, use EIO or any
- * other mechanism.
- *
- * The base class is able to operate in push or pull mode. The chain
- * mode will queue the samples in the ringbuffer as much as possible.
- * The available space is calculated in the callback function.
- *
- * The pull mode will pull_range() a new buffer of N samples with a
- * configurable latency. This allows for high-end real time
- * audio processing pipelines driven by the audiosink. The callback
- * function will be used to perform a pull_range() on the sinkpad.
- * The thread scheduling the callback can be a real-time thread.
- *
- * Subclasses must implement a GstAudioRingBuffer in addition to overriding
- * the methods in GstBaseSink and this class.
- */
-
-#ifndef __GST_AUDIO_BASE_SINK_H__
-#define __GST_AUDIO_BASE_SINK_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasesink.h>
-#include "gstaudioringbuffer.h"
-#include "gstaudioclock.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_BASE_SINK                (gst_audio_base_sink_get_type())
-#define GST_AUDIO_BASE_SINK(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_BASE_SINK,GstAudioBaseSink))
-#define GST_AUDIO_BASE_SINK_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_BASE_SINK,GstAudioBaseSinkClass))
-#define GST_AUDIO_BASE_SINK_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUDIO_BASE_SINK, GstAudioBaseSinkClass))
-#define GST_IS_AUDIO_BASE_SINK(obj)             (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_BASE_SINK))
-#define GST_IS_AUDIO_BASE_SINK_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_BASE_SINK))
-
-/**
- * GST_AUDIO_BASE_SINK_CLOCK:
- * @obj: a #GstAudioBaseSink
- *
- * Get the #GstClock of @obj.
- */
-#define GST_AUDIO_BASE_SINK_CLOCK(obj)   (GST_AUDIO_BASE_SINK (obj)->clock)
-/**
- * GST_AUDIO_BASE_SINK_PAD:
- * @obj: a #GstAudioBaseSink
- *
- * Get the sink #GstPad of @obj.
- */
-#define GST_AUDIO_BASE_SINK_PAD(obj)     (GST_BASE_SINK (obj)->sinkpad)
-
-/**
- * GstAudioBaseSinkSlaveMethod:
- * @GST_AUDIO_BASE_SINK_SLAVE_RESAMPLE: Resample to match the master clock
- * @GST_AUDIO_BASE_SINK_SLAVE_SKEW: Adjust playout pointer when master clock
- * drifts too much.
- * @GST_AUDIO_BASE_SINK_SLAVE_NONE: No adjustment is done.
- *
- * Different possible clock slaving algorithms used when the internal audio
- * clock is not selected as the pipeline master clock.
- */
-typedef enum
-{
-  GST_AUDIO_BASE_SINK_SLAVE_RESAMPLE,
-  GST_AUDIO_BASE_SINK_SLAVE_SKEW,
-  GST_AUDIO_BASE_SINK_SLAVE_NONE
-} GstAudioBaseSinkSlaveMethod;
-
-#define GST_TYPE_AUDIO_BASE_SINK_SLAVE_METHOD (gst_audio_base_sink_slave_method_get_type ())
-
-typedef struct _GstAudioBaseSink GstAudioBaseSink;
-typedef struct _GstAudioBaseSinkClass GstAudioBaseSinkClass;
-typedef struct _GstAudioBaseSinkPrivate GstAudioBaseSinkPrivate;
-
-/**
- * GstAudioBaseSink:
- *
- * Opaque #GstAudioBaseSink.
- */
-struct _GstAudioBaseSink {
-  GstBaseSink         element;
-
-  /*< protected >*/ /* with LOCK */
-  /* our ringbuffer */
-  GstAudioRingBuffer *ringbuffer;
-
-  /* required buffer and latency in microseconds */
-  guint64             buffer_time;
-  guint64             latency_time;
-
-  /* the next sample to write */
-  guint64             next_sample;
-
-  /* clock */
-  GstClock           *provided_clock;
-
-  /* with g_atomic_; currently rendering eos */
-  gboolean            eos_rendering;
-
-  /*< private >*/
-  GstAudioBaseSinkPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioBaseSinkClass:
- * @parent_class: the parent class.
- * @create_ringbuffer: create and return a #GstAudioRingBuffer to write to.
- * @payload: payload data in a format suitable to write to the sink. If no
- *           payloading is required, returns a reffed copy of the original
- *           buffer, else returns the payloaded buffer with all other metadata
- *           copied.
- *
- * #GstAudioBaseSink class. Override the vmethod to implement
- * functionality.
- */
-struct _GstAudioBaseSinkClass {
-  GstBaseSinkClass     parent_class;
-
-  /* subclass ringbuffer allocation */
-  GstAudioRingBuffer* (*create_ringbuffer)  (GstAudioBaseSink *sink);
-
-  /* subclass payloader */
-  GstBuffer*          (*payload)            (GstAudioBaseSink *sink,
-                                             GstBuffer        *buffer);
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_base_sink_get_type(void);
-GType gst_audio_base_sink_slave_method_get_type (void);
-
-GstAudioRingBuffer *
-           gst_audio_base_sink_create_ringbuffer       (GstAudioBaseSink *sink);
-
-void       gst_audio_base_sink_set_provide_clock       (GstAudioBaseSink *sink, gboolean provide);
-gboolean   gst_audio_base_sink_get_provide_clock       (GstAudioBaseSink *sink);
-
-void       gst_audio_base_sink_set_slave_method        (GstAudioBaseSink *sink,
-                                                        GstAudioBaseSinkSlaveMethod method);
-GstAudioBaseSinkSlaveMethod
-           gst_audio_base_sink_get_slave_method        (GstAudioBaseSink *sink);
-
-void       gst_audio_base_sink_set_drift_tolerance     (GstAudioBaseSink *sink,
-                                                        gint64 drift_tolerance);
-gint64     gst_audio_base_sink_get_drift_tolerance     (GstAudioBaseSink *sink);
-
-void       gst_audio_base_sink_set_alignment_threshold (GstAudioBaseSink * sink,
-                                                        GstClockTime alignment_threshold);
-GstClockTime
-           gst_audio_base_sink_get_alignment_threshold (GstAudioBaseSink * sink);
-
-void       gst_audio_base_sink_set_discont_wait        (GstAudioBaseSink * sink,
-                                                        GstClockTime discont_wait);
-GstClockTime
-           gst_audio_base_sink_get_discont_wait        (GstAudioBaseSink * sink);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_BASE_SINK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiobasesrc.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiobasesrc.h
deleted file mode 100644
index 37be70e8..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiobasesrc.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudiobasesrc.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* a base class for audio sources.
- */
-
-#ifndef __GST_AUDIO_BASE_SRC_H__
-#define __GST_AUDIO_BASE_SRC_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstpushsrc.h>
-#include "gstaudioringbuffer.h"
-#include "gstaudioclock.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_BASE_SRC                 (gst_audio_base_src_get_type())
-#define GST_AUDIO_BASE_SRC(obj)                 (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_BASE_SRC,GstAudioBaseSrc))
-#define GST_AUDIO_BASE_SRC_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_BASE_SRC,GstAudioBaseSrcClass))
-#define GST_AUDIO_BASE_SRC_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUDIO_BASE_SRC, GstAudioBaseSrcClass))
-#define GST_IS_AUDIO_BASE_SRC(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_BASE_SRC))
-#define GST_IS_AUDIO_BASE_SRC_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_BASE_SRC))
-
-/**
- * GST_AUDIO_BASE_SRC_CLOCK:
- * @obj: a #GstAudioBaseSrc
- *
- * Get the #GstClock of @obj.
- */
-#define GST_AUDIO_BASE_SRC_CLOCK(obj)    (GST_AUDIO_BASE_SRC (obj)->clock)
-/**
- * GST_AUDIO_BASE_SRC_PAD:
- * @obj: a #GstAudioBaseSrc
- *
- * Get the source #GstPad of @obj.
- */
-#define GST_AUDIO_BASE_SRC_PAD(obj)      (GST_BASE_SRC (obj)->srcpad)
-
-typedef struct _GstAudioBaseSrc GstAudioBaseSrc;
-typedef struct _GstAudioBaseSrcClass GstAudioBaseSrcClass;
-typedef struct _GstAudioBaseSrcPrivate GstAudioBaseSrcPrivate;
-
-/**
- * GstAudioBaseSrcSlaveMethod:
- * @GST_AUDIO_BASE_SRC_SLAVE_RESAMPLE: Resample to match the master clock.
- * @GST_AUDIO_BASE_SRC_SLAVE_RETIMESTAMP: Retimestamp output buffers with master
- * clock time.
- * @GST_AUDIO_BASE_SRC_SLAVE_SKEW: Adjust capture pointer when master clock
- * drifts too much.
- * @GST_AUDIO_BASE_SRC_SLAVE_NONE: No adjustment is done.
- *
- * Different possible clock slaving algorithms when the internal audio clock was
- * not selected as the pipeline clock.
- */
-typedef enum
-{
-  GST_AUDIO_BASE_SRC_SLAVE_RESAMPLE,
-  GST_AUDIO_BASE_SRC_SLAVE_RETIMESTAMP,
-  GST_AUDIO_BASE_SRC_SLAVE_SKEW,
-  GST_AUDIO_BASE_SRC_SLAVE_NONE
-} GstAudioBaseSrcSlaveMethod;
-
-#define GST_TYPE_AUDIO_BASE_SRC_SLAVE_METHOD (gst_audio_base_src_slave_method_get_type ())
-
-/**
- * GstAudioBaseSrc:
- *
- * Opaque #GstAudioBaseSrc.
- */
-struct _GstAudioBaseSrc {
-  GstPushSrc          element;
-
-  /*< protected >*/ /* with LOCK */
-  /* our ringbuffer */
-  GstAudioRingBuffer *ringbuffer;
-
-  /* required buffer and latency */
-  GstClockTime        buffer_time;
-  GstClockTime        latency_time;
-
-  /* the next sample to write */
-  guint64             next_sample;
-
-  /* clock */
-  GstClock           *clock;
-
-  /*< private >*/
-  GstAudioBaseSrcPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioBaseSrcClass:
- * @parent_class: the parent class.
- * @create_ringbuffer: create and return a #GstAudioRingBuffer to read from.
- *
- * #GstAudioBaseSrc class. Override the vmethod to implement
- * functionality.
- */
-struct _GstAudioBaseSrcClass {
-  GstPushSrcClass      parent_class;
-
-  /* subclass ringbuffer allocation */
-  GstAudioRingBuffer* (*create_ringbuffer)  (GstAudioBaseSrc *src);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_base_src_get_type(void);
-GType gst_audio_base_src_slave_method_get_type (void);
-
-GstAudioRingBuffer *
-           gst_audio_base_src_create_ringbuffer        (GstAudioBaseSrc *src);
-
-void       gst_audio_base_src_set_provide_clock        (GstAudioBaseSrc *src, gboolean provide);
-gboolean   gst_audio_base_src_get_provide_clock        (GstAudioBaseSrc *src);
-
-void       gst_audio_base_src_set_slave_method         (GstAudioBaseSrc *src,
-                                                        GstAudioBaseSrcSlaveMethod method);
-GstAudioBaseSrcSlaveMethod
-           gst_audio_base_src_get_slave_method         (GstAudioBaseSrc *src);
-
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_BASE_SRC_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiocdsrc.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiocdsrc.h
deleted file mode 100644
index 88c96287..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiocdsrc.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* GStreamer Audio CD Source Base Class
- * Copyright (C) 2005 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_CD_SRC_H__
-#define __GST_AUDIO_CD_SRC_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstpushsrc.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_CD_SRC            (gst_audio_cd_src_get_type())
-#define GST_AUDIO_CD_SRC(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AUDIO_CD_SRC, GstAudioCdSrc))
-#define GST_AUDIO_CD_SRC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AUDIO_CD_SRC, GstAudioCdSrcClass))
-#define GST_IS_AUDIO_CD_SRC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AUDIO_CD_SRC))
-#define GST_IS_AUDIO_CD_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AUDIO_CD_SRC))
-#define GST_AUDIO_CD_SRC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUDIO_CD_SRC, GstAudioCdSrcClass))
-
-typedef struct _GstAudioCdSrc GstAudioCdSrc;
-typedef struct _GstAudioCdSrcClass GstAudioCdSrcClass;
-typedef struct _GstAudioCdSrcTrack GstAudioCdSrcTrack;
-typedef struct _GstAudioCdSrcPrivate GstAudioCdSrcPrivate;
-
-/**
- * GstAudioCdSrcMode:
- * @GST_AUDIO_CD_SRC_MODE_NORMAL     : each single track is a stream
- * @GST_AUDIO_CD_SRC_MODE_CONTINUOUS : the entire disc is a single stream
- *
- * Mode in which the CD audio source operates. Influences timestamping,
- * EOS handling and seeking.
- */
-typedef enum {
-  GST_AUDIO_CD_SRC_MODE_NORMAL,          /* stream = one track  */
-  GST_AUDIO_CD_SRC_MODE_CONTINUOUS       /* stream = whole disc */
-} GstAudioCdSrcMode;
-
-#define GST_TYPE_AUDIO_CD_SRC_MODE          (gst_audio_cd_src_mode_get_type ())
-
-/**
- * GstAudioCdSrcTrack:
- * @is_audio: Whether this is an audio track
- * @num: Track number in TOC (usually starts from 1, but not always)
- * @start: The first sector of this track (LBA)
- * @end: The last sector of this track (LBA)
- * @tags: Track-specific tags (e.g. from cd-text information), or NULL
- *
- * CD track abstraction to communicate TOC entries to the base class.
- *
- * This structure is only for use by sub-classed in connection with
- * gst_audio_cd_src_add_track().
- *
- * Applications will be informed of the available tracks via a TOC message
- * on the pipeline's #GstBus instead.
- */
-/* FIXME 2.0: remove this struct and pass values directly to _add_track() */
-struct _GstAudioCdSrcTrack {
-  gboolean     is_audio;      /* TRUE if this is an audio track             */
-  guint        num;           /* real track number (usually starts from 1)  */
-  guint        start;         /* first sector of track (LBA, not LSN!)      */
-  guint        end;           /* last sector of track  (LBA, not LSN!)      */
-  GstTagList  *tags;          /* NULL or tags for track (e.g. from cd-text) */
-
-  /*< private >*/
-  guint        _gst_reserved1[GST_PADDING/2];
-  gpointer     _gst_reserved2[GST_PADDING/2];
-};
-
-struct _GstAudioCdSrc {
-  GstPushSrc            pushsrc;
-
-  /*< protected >*/ /* for use by sub-classes only */
-  GstTagList           *tags;            /* tags that apply to all tracks   */
-
-  /*< private >*/
-  GstAudioCdSrcPrivate *priv;
-
-  /*< private >*/
-  guint                 _gst_reserved1[GST_PADDING/2];
-  gpointer              _gst_reserved2[GST_PADDING/2];
-};
-
-/**
- * GstAudioCdSrcClass:
- * @pushsrc_class: the parent class
- * @open: opening the device
- * @close: closing the device
- * @read_sector: reading a sector
- * @get_default_device: getting the default device
- * @probe_devices: probing possible devices
- *
- * Audio CD source base class.
- */
-struct _GstAudioCdSrcClass {
-  GstPushSrcClass pushsrc_class;
-
-  /* open/close the CD device */
-  gboolean    (*open)               (GstAudioCdSrc *src, const gchar *device);
-  void        (*close)              (GstAudioCdSrc *src);
-
-  /* read one sector (LBA) */
-  GstBuffer * (*read_sector)        (GstAudioCdSrc *src, gint sector);
-
-#if 0
-  /* return default device or NULL (optional) */
-  gchar *     (*get_default_device) (GstAudioCdSrc *src);
-
-  /* return NULL-terminated string array of CD devices, or NULL (optional) */
-  /* FIXME 0.11: reconsider for new probing/device discovery API, remove if in doubt */
-  gchar **    (*probe_devices)      (GstAudioCdSrc *src);
-#endif
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType    gst_audio_cd_src_get_type (void);
-GType    gst_audio_cd_src_mode_get_type (void);
-
-gboolean gst_audio_cd_src_add_track (GstAudioCdSrc      * src,
-                                     GstAudioCdSrcTrack * track);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_CD_SRC_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioclock.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioclock.h
deleted file mode 100644
index 57091874..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioclock.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudioclock.h: Clock for use by audio plugins
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_CLOCK_H__
-#define __GST_AUDIO_CLOCK_H__
-
-#include <gst/gst.h>
-#include <gst/gstsystemclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_CLOCK \
-  (gst_audio_clock_get_type())
-#define GST_AUDIO_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_CLOCK,GstAudioClock))
-#define GST_AUDIO_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_CLOCK,GstAudioClockClass))
-#define GST_IS_AUDIO_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_CLOCK))
-#define GST_IS_AUDIO_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_CLOCK))
-#define GST_AUDIO_CLOCK_CAST(obj) \
-  ((GstAudioClock*)(obj))
-
-typedef struct _GstAudioClock GstAudioClock;
-typedef struct _GstAudioClockClass GstAudioClockClass;
-
-/**
- * GstAudioClockGetTimeFunc:
- * @clock: the #GstAudioClock
- * @user_data: user data
- *
- * This function will be called whenever the current clock time needs to be
- * calculated. If this function returns #GST_CLOCK_TIME_NONE, the last reported
- * time will be returned by the clock.
- *
- * Returns: the current time or #GST_CLOCK_TIME_NONE if the previous time should
- * be used.
- */
-typedef GstClockTime (*GstAudioClockGetTimeFunc) (GstClock *clock, gpointer user_data);
-
-/**
- * GstAudioClock:
- *
- * Opaque #GstAudioClock.
- */
-struct _GstAudioClock {
-  GstSystemClock clock;
-
-  /*< protected >*/
-  GstAudioClockGetTimeFunc func;
-  gpointer                 user_data;
-  GDestroyNotify           destroy_notify;
-
-  /*< private >*/
-  GstClockTime             last_time;
-  GstClockTimeDiff         time_offset;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstAudioClockClass {
-  GstSystemClockClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_audio_clock_get_type        (void);
-GstClock*       gst_audio_clock_new             (const gchar *name, GstAudioClockGetTimeFunc func,
-                                                 gpointer user_data, GDestroyNotify destroy_notify);
-void            gst_audio_clock_reset           (GstAudioClock *clock, GstClockTime time);
-
-GstClockTime    gst_audio_clock_get_time        (GstClock * clock);
-GstClockTime    gst_audio_clock_adjust          (GstClock * clock, GstClockTime time);
-
-void            gst_audio_clock_invalidate      (GstClock * clock);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_CLOCK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiodecoder.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiodecoder.h
deleted file mode 100644
index 27e1fab6..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiodecoder.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Igalia S.L.
- * Author: Iago Toral Quiroga <itoral@igalia.com>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef _GST_AUDIO_DECODER_H_
-#define _GST_AUDIO_DECODER_H_
-
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-#include <gst/base/gstadapter.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_DECODER \
-  (gst_audio_decoder_get_type())
-#define GST_AUDIO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_DECODER,GstAudioDecoder))
-#define GST_AUDIO_DECODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_DECODER,GstAudioDecoderClass))
-#define GST_AUDIO_DECODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_DECODER,GstAudioDecoderClass))
-#define GST_IS_AUDIO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_DECODER))
-#define GST_IS_AUDIO_DECODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_DECODER))
-#define GST_AUDIO_DECODER_CAST(obj) \
-  ((GstAudioDecoder *)(obj))
-
-/**
- * GST_AUDIO_DECODER_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- */
-#define GST_AUDIO_DECODER_SINK_NAME    "sink"
-/**
- * GST_AUDIO_DECODER_SRC_NAME:
- *
- * The name of the templates for the source pad.
- */
-#define GST_AUDIO_DECODER_SRC_NAME     "src"
-
-/**
- * GST_AUDIO_DECODER_SRC_PAD:
- * @obj: base audio codec instance
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_AUDIO_DECODER_SRC_PAD(obj)         (((GstAudioDecoder *) (obj))->srcpad)
-
-/**
- * GST_AUDIO_DECODER_SINK_PAD:
- * @obj: base audio codec instance
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_AUDIO_DECODER_SINK_PAD(obj)        (((GstAudioDecoder *) (obj))->sinkpad)
-
-#define GST_AUDIO_DECODER_STREAM_LOCK(dec)   g_rec_mutex_lock (&GST_AUDIO_DECODER (dec)->stream_lock)
-#define GST_AUDIO_DECODER_STREAM_UNLOCK(dec) g_rec_mutex_unlock (&GST_AUDIO_DECODER (dec)->stream_lock)
-
-/**
- * GST_AUDIO_DECODER_INPUT_SEGMENT:
- * @obj: audio decoder instance
- *
- * Gives the input segment of the element.
- */
-#define GST_AUDIO_DECODER_INPUT_SEGMENT(obj)   (GST_AUDIO_DECODER_CAST (obj)->input_segment)
-
-/**
- * GST_AUDIO_DECODER_OUTPUT_SEGMENT:
- * @obj: audio decoder instance
- *
- * Gives the output segment of the element.
- */
-#define GST_AUDIO_DECODER_OUTPUT_SEGMENT(obj)   (GST_AUDIO_DECODER_CAST (obj)->output_segment)
-
-typedef struct _GstAudioDecoder GstAudioDecoder;
-typedef struct _GstAudioDecoderClass GstAudioDecoderClass;
-
-typedef struct _GstAudioDecoderPrivate GstAudioDecoderPrivate;
-
-/* do not use this one, use macro below */
-GstFlowReturn _gst_audio_decoder_error (GstAudioDecoder *dec, gint weight,
-                                        GQuark domain, gint code,
-                                        gchar *txt, gchar *debug,
-                                        const gchar *file, const gchar *function,
-                                        gint line);
-
-/**
- * GST_AUDIO_DECODER_ERROR:
- * @el:     the base audio decoder element that generates the error
- * @weight: element defined weight of the error, added to error count
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
- *          parentheses)
- * @debug:  debugging information for the message (format string and args
- *          enclosed in parentheses)
- * @ret:    variable to receive return value
- *
- * Utility function that audio decoder elements can use in case they encountered
- * a data processing error that may be fatal for the current "data unit" but
- * need not prevent subsequent decoding.  Such errors are counted and if there
- * are too many, as configured in the context's max_errors, the pipeline will
- * post an error message and the application will be requested to stop further
- * media processing.  Otherwise, it is considered a "glitch" and only a warning
- * is logged. In either case, @ret is set to the proper value to
- * return to upstream/caller (indicating either GST_FLOW_ERROR or GST_FLOW_OK).
- */
-#define GST_AUDIO_DECODER_ERROR(el, weight, domain, code, text, debug, ret) \
-G_STMT_START {                                                              \
-  gchar *__txt = _gst_element_error_printf text;                            \
-  gchar *__dbg = _gst_element_error_printf debug;                           \
-  GstAudioDecoder *dec = GST_AUDIO_DECODER (el);                   \
-  ret = _gst_audio_decoder_error (dec, weight, GST_ ## domain ## _ERROR,    \
-      GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__,            \
-      GST_FUNCTION, __LINE__);                                              \
-} G_STMT_END
-
-
-/**
- * GST_AUDIO_DECODER_MAX_ERRORS:
- *
- * Default maximum number of errors tolerated before signaling error.
- */
-#define GST_AUDIO_DECODER_MAX_ERRORS     10
-
-/**
- * GstAudioDecoder:
- *
- * The opaque #GstAudioDecoder data structure.
- */
-struct _GstAudioDecoder
-{
-  GstElement element;
-
-  /*< protected >*/
-  /* source and sink pads */
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GRecMutex       stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  /*< private >*/
-  GstAudioDecoderPrivate *priv;
-
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstAudioDecoderClass:
- * @element_class:  The parent class structure
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Notifies subclass of incoming data format (caps).
- * @parse:          Optional.
- *                  Allows chopping incoming data into manageable units (frames)
- *                  for subsequent decoding.  This division is at subclass
- *                  discretion and may or may not correspond to 1 (or more)
- *                  frames as defined by audio format.
- * @handle_frame:   Provides input data (or NULL to clear any remaining data)
- *                  to subclass.  Input data ref management is performed by
- *                  base class, subclass should not care or intervene,
- *                  and input data is only valid until next call to base class,
- *                  most notably a call to gst_audio_decoder_finish_frame().
- * @flush:          Optional.
- *                  Instructs subclass to clear any codec caches and discard
- *                  any pending samples and not yet returned decoded data.
- *                  @hard indicates whether a FLUSH is being processed,
- *                  or otherwise a DISCONT (or conceptually similar).
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. Subclasses should chain up to
- *                  the parent implementation to invoke the default handler.
- * @src_event:      Optional.
- *                  Event handler on the src pad. Subclasses should chain up to
- *                  the parent implementation to invoke the default handler.
- * @pre_push:       Optional.
- *                  Called just prior to pushing (encoded data) buffer downstream.
- *                  Subclass has full discretionary access to buffer,
- *                  and a not OK flow return will abort downstream pushing.
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @negotiate:      Optional.
- *                  Negotiate with downstream and configure buffer pools, etc.
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @decide_allocation: Optional.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *                     Subclasses should chain up to the parent implementation to
- *                     invoke the default handler.
- * @propose_allocation: Optional.
- *                      Propose buffer allocation parameters for upstream elements.
- *                      Subclasses should chain up to the parent implementation to
- *                      invoke the default handler.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @handle_frame (and likely @set_format) needs to be
- * overridden.
- */
-struct _GstAudioDecoderClass
-{
-  GstElementClass element_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  gboolean      (*start)              (GstAudioDecoder *dec);
-
-  gboolean      (*stop)               (GstAudioDecoder *dec);
-
-  gboolean      (*set_format)         (GstAudioDecoder *dec,
-                                       GstCaps *caps);
-
-  GstFlowReturn (*parse)              (GstAudioDecoder *dec,
-                                       GstAdapter *adapter,
-                                       gint *offset, gint *length);
-
-  GstFlowReturn (*handle_frame)       (GstAudioDecoder *dec,
-                                       GstBuffer *buffer);
-
-  void          (*flush)              (GstAudioDecoder *dec, gboolean hard);
-
-  GstFlowReturn (*pre_push)           (GstAudioDecoder *dec,
-                                       GstBuffer **buffer);
-
-  gboolean      (*sink_event)         (GstAudioDecoder *dec,
-                                       GstEvent *event);
-  gboolean      (*src_event)          (GstAudioDecoder *dec,
-                                       GstEvent *event);
-
-  gboolean      (*open)               (GstAudioDecoder *dec);
-  
-  gboolean      (*close)              (GstAudioDecoder *dec);
-
-  gboolean      (*negotiate)          (GstAudioDecoder *dec);
-
-  gboolean      (*decide_allocation)  (GstAudioDecoder *dec, GstQuery *query);
-
-  gboolean      (*propose_allocation) (GstAudioDecoder *dec,
-                                       GstQuery * query);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType             gst_audio_decoder_get_type (void);
-
-gboolean          gst_audio_decoder_set_output_format  (GstAudioDecoder    * dec,
-                                                        const GstAudioInfo * info);
-
-gboolean          gst_audio_decoder_negotiate (GstAudioDecoder * dec);
-
-GstFlowReturn     gst_audio_decoder_finish_frame (GstAudioDecoder * dec,
-                                                  GstBuffer * buf, gint frames);
-
-GstBuffer *       gst_audio_decoder_allocate_output_buffer (GstAudioDecoder * dec,
-                                                            gsize              size);
-
-/* context parameters */
-GstAudioInfo    * gst_audio_decoder_get_audio_info (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_plc_aware  (GstAudioDecoder * dec,
-                                                    gboolean          plc);
-
-gint              gst_audio_decoder_get_plc_aware  (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_estimate_rate  (GstAudioDecoder * dec,
-                                                    gboolean          enabled);
-
-gint              gst_audio_decoder_get_estimate_rate  (GstAudioDecoder * dec);
-
-gint              gst_audio_decoder_get_delay      (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_max_errors (GstAudioDecoder * dec,
-                                                   gint               num);
-
-gint              gst_audio_decoder_get_max_errors (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_latency (GstAudioDecoder * dec,
-                                                 GstClockTime      min,
-                                                 GstClockTime      max);
-
-void              gst_audio_decoder_get_latency (GstAudioDecoder * dec,
-                                                 GstClockTime    * min,
-                                                 GstClockTime    * max);
-
-void              gst_audio_decoder_get_parse_state (GstAudioDecoder * dec,
-                                                     gboolean        * sync,
-                                                     gboolean        * eos);
-
-
-/* object properties */
-void              gst_audio_decoder_set_plc (GstAudioDecoder * dec,
-                                             gboolean          enabled);
-
-gboolean          gst_audio_decoder_get_plc (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_min_latency (GstAudioDecoder * dec,
-                                                     GstClockTime      num);
-
-GstClockTime      gst_audio_decoder_get_min_latency (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_tolerance   (GstAudioDecoder * dec,
-                                                     GstClockTime      tolerance);
-
-GstClockTime      gst_audio_decoder_get_tolerance   (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_drainable (GstAudioDecoder * dec,
-                                                   gboolean enabled);
-
-gboolean          gst_audio_decoder_get_drainable (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_set_needs_format (GstAudioDecoder * dec,
-                                                      gboolean enabled);
-
-gboolean          gst_audio_decoder_get_needs_format (GstAudioDecoder * dec);
-
-void              gst_audio_decoder_get_allocator (GstAudioDecoder * dec,
-                                                   GstAllocator ** allocator,
-                                                   GstAllocationParams * params);
-
-void              gst_audio_decoder_merge_tags (GstAudioDecoder * dec,
-                                                const GstTagList * tags, GstTagMergeMode mode);
-
-G_END_DECLS
-
-#endif /* _GST_AUDIO_DECODER_H_ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioencoder.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioencoder.h
deleted file mode 100644
index e4973aff..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioencoder.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_ENCODER_H__
-#define __GST_AUDIO_ENCODER_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_ENCODER		   (gst_audio_encoder_get_type())
-#define GST_AUDIO_ENCODER(obj)		   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_ENCODER,GstAudioEncoder))
-#define GST_AUDIO_ENCODER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_ENCODER,GstAudioEncoderClass))
-#define GST_AUDIO_ENCODER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_ENCODER,GstAudioEncoderClass))
-#define GST_IS_AUDIO_ENCODER(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_ENCODER))
-#define GST_IS_AUDIO_ENCODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_ENCODER))
-#define GST_AUDIO_ENCODER_CAST(obj)	((GstAudioEncoder *)(obj))
-
-/**
- * GST_AUDIO_ENCODER_SINK_NAME:
- *
- * the name of the templates for the sink pad
- */
-#define GST_AUDIO_ENCODER_SINK_NAME	"sink"
-/**
- * GST_AUDIO_ENCODER_SRC_NAME:
- *
- * the name of the templates for the source pad
- */
-#define GST_AUDIO_ENCODER_SRC_NAME	        "src"
-
-/**
- * GST_AUDIO_ENCODER_SRC_PAD:
- * @obj: audio encoder instance
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_AUDIO_ENCODER_SRC_PAD(obj)	(GST_AUDIO_ENCODER_CAST (obj)->srcpad)
-
-/**
- * GST_AUDIO_ENCODER_SINK_PAD:
- * @obj: audio encoder instance
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_AUDIO_ENCODER_SINK_PAD(obj)	(GST_AUDIO_ENCODER_CAST (obj)->sinkpad)
-
-/**
- * GST_AUDIO_ENCODER_INPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the input segment of the element.
- */
-#define GST_AUDIO_ENCODER_INPUT_SEGMENT(obj)     (GST_AUDIO_ENCODER_CAST (obj)->input_segment)
-
-/**
- * GST_AUDIO_ENCODER_OUTPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the output segment of the element.
- */
-#define GST_AUDIO_ENCODER_OUTPUT_SEGMENT(obj)     (GST_AUDIO_ENCODER_CAST (obj)->output_segment)
-
-#define GST_AUDIO_ENCODER_STREAM_LOCK(enc)   g_rec_mutex_lock (&GST_AUDIO_ENCODER (enc)->stream_lock)
-#define GST_AUDIO_ENCODER_STREAM_UNLOCK(enc) g_rec_mutex_unlock (&GST_AUDIO_ENCODER (enc)->stream_lock)
-
-typedef struct _GstAudioEncoder GstAudioEncoder;
-typedef struct _GstAudioEncoderClass GstAudioEncoderClass;
-
-typedef struct _GstAudioEncoderPrivate GstAudioEncoderPrivate;
-
-/**
- * GstAudioEncoder:
- *
- * The opaque #GstAudioEncoder data structure.
- */
-struct _GstAudioEncoder {
-  GstElement     element;
-
-  /*< protected >*/
-  /* source and sink pads */
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GRecMutex       stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  /*< private >*/
-  GstAudioEncoderPrivate *priv;
-
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstAudioEncoderClass:
- * @element_class:  The parent class structure
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Notifies subclass of incoming data format.
- *                  GstAudioInfo contains the format according to provided caps.
- * @handle_frame:   Provides input samples (or NULL to clear any remaining data)
- *                  according to directions as configured by the subclass
- *                  using the API.  Input data ref management is performed
- *                  by base class, subclass should not care or intervene,
- *                  and input data is only valid until next call to base class,
- *                  most notably a call to gst_audio_encoder_finish_frame().
- * @flush:          Optional.
- *                  Instructs subclass to clear any codec caches and discard
- *                  any pending samples and not yet returned encoded data.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. Subclasses should chain up to
- *                  the parent implementation to invoke the default handler.
- * @src_event:      Optional.
- *                  Event handler on the src pad. Subclasses should chain up to
- *                  the parent implementation to invoke the default handler.
- * @pre_push:       Optional.
- *                  Called just prior to pushing (encoded data) buffer downstream.
- *                  Subclass has full discretionary access to buffer,
- *                  and a not OK flow return will abort downstream pushing.
- * @getcaps:        Optional.
- *                  Allows for a custom sink getcaps implementation (e.g.
- *                  for multichannel input specification).  If not implemented,
- *                  default returns gst_audio_encoder_proxy_getcaps
- *                  applied to sink template caps.
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @negotiate:      Optional.
- *                  Negotiate with downstream and configure buffer pools, etc.
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @decide_allocation: Optional.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *                     Subclasses should chain up to the parent implementation to
- *                     invoke the default handler.
- * @propose_allocation: Optional.
- *                      Propose buffer allocation parameters for upstream elements.
- *                      Subclasses should chain up to the parent implementation to
- *                      invoke the default handler.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @set_format and @handle_frame needs to be overridden.
- */
-struct _GstAudioEncoderClass {
-  GstElementClass element_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  gboolean      (*start)              (GstAudioEncoder *enc);
-
-  gboolean      (*stop)               (GstAudioEncoder *enc);
-
-  gboolean      (*set_format)         (GstAudioEncoder *enc,
-                                       GstAudioInfo        *info);
-
-  GstFlowReturn (*handle_frame)       (GstAudioEncoder *enc,
-                                       GstBuffer *buffer);
-
-  void          (*flush)              (GstAudioEncoder *enc);
-
-  GstFlowReturn (*pre_push)           (GstAudioEncoder *enc,
-                                       GstBuffer **buffer);
-
-  gboolean      (*sink_event)         (GstAudioEncoder *enc,
-                                       GstEvent *event);
-
-  gboolean      (*src_event)          (GstAudioEncoder *enc,
-                                       GstEvent *event);
-
-  GstCaps *     (*getcaps)            (GstAudioEncoder *enc, GstCaps *filter);
-
-  gboolean      (*open)               (GstAudioEncoder *enc);
-
-  gboolean      (*close)              (GstAudioEncoder *enc);
-
-  gboolean      (*negotiate)          (GstAudioEncoder *enc);
-
-  gboolean      (*decide_allocation)  (GstAudioEncoder *enc, GstQuery *query);
-
-  gboolean      (*propose_allocation) (GstAudioEncoder * enc,
-                                       GstQuery * query);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType           gst_audio_encoder_get_type         (void);
-
-GstFlowReturn   gst_audio_encoder_finish_frame (GstAudioEncoder * enc,
-                                                GstBuffer       * buffer,
-                                                gint              samples);
-
-GstCaps *       gst_audio_encoder_proxy_getcaps (GstAudioEncoder * enc,
-                                                 GstCaps         * caps,
-                                                 GstCaps         * filter);
-
-gboolean        gst_audio_encoder_set_output_format  (GstAudioEncoder    * enc,
-                                                      GstCaps            * caps);
-
-gboolean        gst_audio_encoder_negotiate          (GstAudioEncoder * enc);
-
-GstBuffer *     gst_audio_encoder_allocate_output_buffer (GstAudioEncoder * enc,
-                                                          gsize             size);
-
-/* context parameters */
-GstAudioInfo  * gst_audio_encoder_get_audio_info (GstAudioEncoder * enc);
-
-gint            gst_audio_encoder_get_frame_samples_min (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_frame_samples_min (GstAudioEncoder * enc, gint num);
-
-gint            gst_audio_encoder_get_frame_samples_max (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_frame_samples_max (GstAudioEncoder * enc, gint num);
-
-gint            gst_audio_encoder_get_frame_max (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_frame_max (GstAudioEncoder * enc, gint num);
-
-gint            gst_audio_encoder_get_lookahead (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_lookahead (GstAudioEncoder * enc, gint num);
-
-void            gst_audio_encoder_get_latency (GstAudioEncoder * enc,
-                                               GstClockTime    * min,
-                                               GstClockTime    * max);
-
-void            gst_audio_encoder_set_latency (GstAudioEncoder * enc,
-                                               GstClockTime      min,
-                                               GstClockTime      max);
-
-void            gst_audio_encoder_set_headers (GstAudioEncoder * enc,
-                                               GList           * headers);
-
-/* object properties */
-
-void            gst_audio_encoder_set_mark_granule (GstAudioEncoder * enc,
-                                                    gboolean enabled);
-
-gboolean        gst_audio_encoder_get_mark_granule (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_perfect_timestamp (GstAudioEncoder * enc,
-                                                         gboolean          enabled);
-
-gboolean        gst_audio_encoder_get_perfect_timestamp (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_hard_resync (GstAudioEncoder * enc,
-                                                   gboolean          enabled);
-
-gboolean        gst_audio_encoder_get_hard_resync (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_tolerance (GstAudioEncoder * enc,
-                                                 GstClockTime      tolerance);
-
-GstClockTime    gst_audio_encoder_get_tolerance (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_hard_min (GstAudioEncoder * enc,
-                                                gboolean enabled);
-
-gboolean        gst_audio_encoder_get_hard_min (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_set_drainable (GstAudioEncoder * enc,
-                                                 gboolean enabled);
-
-gboolean        gst_audio_encoder_get_drainable (GstAudioEncoder * enc);
-
-void            gst_audio_encoder_get_allocator (GstAudioEncoder * enc,
-                                                 GstAllocator ** allocator,
-                                                 GstAllocationParams * params);
-
-void            gst_audio_encoder_merge_tags (GstAudioEncoder * enc,
-                                              const GstTagList * tags, GstTagMergeMode mode);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_ENCODER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiofilter.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiofilter.h
deleted file mode 100644
index 0e5f925a..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiofilter.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_AUDIO_FILTER_H__
-#define __GST_AUDIO_FILTER_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasetransform.h>
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstAudioFilter GstAudioFilter;
-typedef struct _GstAudioFilterClass GstAudioFilterClass;
-
-#define GST_TYPE_AUDIO_FILTER \
-  (gst_audio_filter_get_type())
-#define GST_AUDIO_FILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_FILTER,GstAudioFilter))
-#define GST_AUDIO_FILTER_CAST(obj) \
-  ((GstAudioFilter *) (obj))
-#define GST_AUDIO_FILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_FILTER,GstAudioFilterClass))
-#define GST_AUDIO_FILTER_CLASS_CAST(klass) \
-  ((GstAudioFilterClass *) (klass))
-#define GST_AUDIO_FILTER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_FILTER,GstAudioFilterClass))
-#define GST_IS_AUDIO_FILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_FILTER))
-#define GST_IS_AUDIO_FILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_FILTER))
-
-/**
- * GstAudioFilter:
- *
- * Base class for audio filters with the same format for input and output.
- */
-struct _GstAudioFilter {
-  GstBaseTransform basetransform;
-
-  /*< protected >*/
-  GstAudioInfo info;   /* currently configured format */
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_AUDIO_FILTER_INFO(filter)     (&GST_AUDIO_FILTER_CAST(filter)->info)
-
-#define GST_AUDIO_FILTER_FORMAT(filter)   (GST_AUDIO_INFO_FORMAT(GST_AUDIO_FILTER_INFO(filter)))
-#define GST_AUDIO_FILTER_RATE(filter)     (GST_AUDIO_INFO_RATE(GST_AUDIO_FILTER_INFO(filter)))
-#define GST_AUDIO_FILTER_CHANNELS(filter) (GST_AUDIO_INFO_CHANNELS(GST_AUDIO_FILTER_INFO(filter)))
-#define GST_AUDIO_FILTER_BPF(filter)      (GST_AUDIO_INFO_BPF(GST_AUDIO_FILTER_INFO(filter)))
-#define GST_AUDIO_FILTER_BPS(filter)      (GST_AUDIO_INFO_BPS(GST_AUDIO_FILTER_INFO(filter)))
-
-/**
- * GstAudioFilterClass:
- * @basetransformclass: parent class
- * @setup: virtual function called whenever the format changes
- *
- * In addition to the @setup virtual function, you should also override the
- * GstBaseTransform::transform and/or GstBaseTransform::transform_ip virtual
- * function.
- */
-
-struct _GstAudioFilterClass {
-  GstBaseTransformClass basetransformclass;
-
-  /* virtual function, called whenever the format changes */
-  gboolean  (*setup) (GstAudioFilter * filter, const GstAudioInfo * info);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType   gst_audio_filter_get_type (void);
-
-void    gst_audio_filter_class_add_pad_templates (GstAudioFilterClass * klass,
-                                                  GstCaps             * allowed_caps);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_FILTER_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioiec61937.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioiec61937.h
deleted file mode 100644
index 1cdc6461..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioiec61937.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* GStreamer audio helper functions for IEC 61937 payloading
- * (c) 2011 Intel Corporation
- *     2011 Collabora Multimedia
- *     2011 Arun Raghavan <arun.raghavan@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_IEC61937_H__
-#define __GST_AUDIO_IEC61937_H__
-
-#include <gst/audio/gstaudioringbuffer.h>
-
-guint       gst_audio_iec61937_frame_size  (const GstAudioRingBufferSpec * spec);
-gboolean    gst_audio_iec61937_payload     (const guint8 * src, guint src_n,
-                                            guint8 * dst, guint dst_n,
-                                            const GstAudioRingBufferSpec * spec,
-                                            gint endianness);
-
-#endif /* __GST_AUDIO_IEC61937_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiometa.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiometa.h
deleted file mode 100644
index 822972ba..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiometa.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_META_H__
-#define __GST_AUDIO_META_H__
-
-#include <gst/gst.h>
-
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-#define GST_AUDIO_DOWNMIX_META_API_TYPE (gst_audio_downmix_meta_api_get_type())
-#define GST_AUDIO_DOWNMIX_META_INFO  (gst_audio_downmix_meta_get_info())
-
-typedef struct _GstAudioDownmixMeta GstAudioDownmixMeta;
-
-/**
- * GstAudioDownmixMeta:
- * @meta: parent #GstMeta
- * @from_position: the channel positions of the source
- * @to_position: the channel positions of the destination
- * @from_channels: the number of channels of the source
- * @to_channels: the number of channels of the destination
- * @matrix: the matrix coefficients.
- *
- * Extra buffer metadata describing audio downmixing matrix. This metadata is
- * attached to audio buffers and contains a matrix to downmix the buffer number
- * of channels to @channels.
- *
- * @matrix is an two-dimensional array of @to_channels times @from_channels
- * coefficients, i.e. the i-th output channels is constructed by multiplicating
- * the input channels with the coefficients in @matrix[i] and taking the sum
- * of the results.
- */
-struct _GstAudioDownmixMeta {
-  GstMeta      meta;
-
-  GstAudioChannelPosition *from_position;
-  GstAudioChannelPosition *to_position;
-  gint        from_channels, to_channels;
-  gfloat       **matrix;
-};
-
-GType gst_audio_downmix_meta_api_get_type (void);
-const GstMetaInfo * gst_audio_downmix_meta_get_info (void);
-
-#define gst_buffer_get_audio_downmix_meta(b) ((GstAudioDownmixMeta*)gst_buffer_get_meta((b),GST_AUDIO_DOWNMIX_META_INFO))
-GstAudioDownmixMeta * gst_buffer_get_audio_downmix_meta_for_channels    (GstBuffer *buffer,
-                                                                         const GstAudioChannelPosition *to_position,
-                                                                         gint                           to_channels);
-
-GstAudioDownmixMeta * gst_buffer_add_audio_downmix_meta (GstBuffer    *buffer,
-                                                         const GstAudioChannelPosition *from_position,
-                                                         gint                           from_channels,
-                                                         const GstAudioChannelPosition *to_position,
-                                                         gint                           to_channels,
-                                                         const gfloat                 **matrix);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_META_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioringbuffer.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioringbuffer.h
deleted file mode 100644
index e578aea8..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudioringbuffer.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudioringbuffer.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_RING_BUFFER_H__
-#define __GST_AUDIO_RING_BUFFER_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_RING_BUFFER             (gst_audio_ring_buffer_get_type())
-#define GST_AUDIO_RING_BUFFER(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_RING_BUFFER,GstAudioRingBuffer))
-#define GST_AUDIO_RING_BUFFER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_RING_BUFFER,GstAudioRingBufferClass))
-#define GST_AUDIO_RING_BUFFER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_AUDIO_RING_BUFFER, GstAudioRingBufferClass))
-#define GST_AUDIO_RING_BUFFER_CAST(obj)        ((GstAudioRingBuffer *)obj)
-#define GST_IS_AUDIO_RING_BUFFER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_RING_BUFFER))
-#define GST_IS_AUDIO_RING_BUFFER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_RING_BUFFER))
-
-typedef struct _GstAudioRingBuffer GstAudioRingBuffer;
-typedef struct _GstAudioRingBufferClass GstAudioRingBufferClass;
-typedef struct _GstAudioRingBufferSpec GstAudioRingBufferSpec;
-
-/**
- * GstAudioRingBufferCallback:
- * @rbuf: a #GstAudioRingBuffer
- * @data: (array length=len): target to fill
- * @len: amount to fill
- * @user_data: user data
- *
- * This function is set with gst_audio_ring_buffer_set_callback() and is
- * called to fill the memory at @data with @len bytes of samples.
- */
-typedef void (*GstAudioRingBufferCallback) (GstAudioRingBuffer *rbuf, guint8* data, guint len, gpointer user_data);
-
-/**
- * GstAudioRingBufferState:
- * @GST_AUDIO_RING_BUFFER_STATE_STOPPED: The ringbuffer is stopped
- * @GST_AUDIO_RING_BUFFER_STATE_PAUSED: The ringbuffer is paused
- * @GST_AUDIO_RING_BUFFER_STATE_STARTED: The ringbuffer is started
- *
- * The state of the ringbuffer.
- */
-typedef enum {
-  GST_AUDIO_RING_BUFFER_STATE_STOPPED,
-  GST_AUDIO_RING_BUFFER_STATE_PAUSED,
-  GST_AUDIO_RING_BUFFER_STATE_STARTED
-} GstAudioRingBufferState;
-
-/**
- * GstAudioRingBufferFormatType:
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW: samples in linear or float
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW: samples in mulaw
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW: samples in alaw
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IMA_ADPCM: samples in ima adpcm
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG: samples in mpeg audio (but not AAC) format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_GSM: samples in gsm format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IEC958: samples in IEC958 frames (e.g. AC3)
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_AC3: samples in AC3 format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3: samples in EAC3 format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS: samples in DTS format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC: samples in MPEG-2 AAC format
- * @GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC: samples in MPEG-4 AAC format
- *
- * The format of the samples in the ringbuffer.
- */
-typedef enum
-{
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IMA_ADPCM,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_GSM,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_IEC958,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_AC3,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_EAC3,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_DTS,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG2_AAC,
-  GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MPEG4_AAC
-} GstAudioRingBufferFormatType;
-
-/**
- * GstAudioRingBufferSpec:
- * @caps: The caps that generated the Spec.
- * @type: the sample type
- * @info: the #GstAudioInfo
- * @latency_time: the latency in microseconds
- * @buffer_time: the total buffer size in microseconds
- * @segsize: the size of one segment in bytes
- * @segtotal: the total number of segments
- * @seglatency: number of segments queued in the lower level device,
- *  defaults to segtotal
- *
- * The structure containing the format specification of the ringbuffer.
- */
-struct _GstAudioRingBufferSpec
-{
-  /*< public >*/
-  /* in */
-  GstCaps  *caps;               /* the caps of the buffer */
-
-  /* in/out */
-  GstAudioRingBufferFormatType  type;
-  GstAudioInfo                  info;
-
-
-  guint64  latency_time;        /* the required/actual latency time, this is the
-				 * actual the size of one segment and the
-				 * minimum possible latency we can achieve. */
-  guint64  buffer_time;         /* the required/actual time of the buffer, this is
-				 * the total size of the buffer and maximum
-				 * latency we can compensate for. */
-  gint     segsize;             /* size of one buffer segment in bytes, this value
-				 * should be chosen to match latency_time as
-				 * well as possible. */
-  gint     segtotal;            /* total number of segments, this value is the
-				 * number of segments of @segsize and should be
-				 * chosen so that it matches buffer_time as
-				 * close as possible. */
-  /* ABI added 0.10.20 */
-  gint     seglatency;          /* number of segments queued in the lower
-				 * level device, defaults to segtotal. */
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_AUDIO_RING_BUFFER_GET_COND(buf) (&(((GstAudioRingBuffer *)buf)->cond))
-#define GST_AUDIO_RING_BUFFER_WAIT(buf)     (g_cond_wait (GST_AUDIO_RING_BUFFER_GET_COND (buf), GST_OBJECT_GET_LOCK (buf)))
-#define GST_AUDIO_RING_BUFFER_SIGNAL(buf)   (g_cond_signal (GST_AUDIO_RING_BUFFER_GET_COND (buf)))
-#define GST_AUDIO_RING_BUFFER_BROADCAST(buf)(g_cond_broadcast (GST_AUDIO_RING_BUFFER_GET_COND (buf)))
-
-/**
- * GstAudioRingBuffer:
- * @cond: used to signal start/stop/pause/resume actions
- * @open: boolean indicating that the ringbuffer is open
- * @acquired: boolean indicating that the ringbuffer is acquired
- * @memory: data in the ringbuffer
- * @size: size of data in the ringbuffer
- * @spec: format and layout of the ringbuffer data
- * @samples_per_seg: number of samples in one segment
- * @empty_seg: pointer to memory holding one segment of silence samples
- * @state: state of the buffer
- * @segdone: readpointer in the ringbuffer
- * @segbase: segment corresponding to segment 0 (unused)
- * @waiting: is a reader or writer waiting for a free segment
- *
- * The ringbuffer base class structure.
- */
-struct _GstAudioRingBuffer {
-  GstObject                   object;
-
-  /*< public >*/ /* with LOCK */
-  GCond                      cond;
-  gboolean                    open;
-  gboolean                    acquired;
-  guint8                     *memory;
-  gsize                       size;
-  GstClockTime               *timestamps;
-  GstAudioRingBufferSpec      spec;
-  gint                        samples_per_seg;
-  guint8                     *empty_seg;
-
-  /*< public >*/ /* ATOMIC */
-  gint                        state;
-  gint                        segdone;
-  gint                        segbase;
-  gint                        waiting;
-
-  /*< private >*/
-  GstAudioRingBufferCallback  callback;
-  gpointer                    cb_data;
-
-  gboolean                    need_reorder;
-  /* gst[channel_reorder_map[i]] = device[i] */
-  gint                        channel_reorder_map[64];
-
-  gboolean                    flushing;
-  /* ATOMIC */
-  gint                        may_start;
-  gboolean                    active;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioRingBufferClass:
- * @parent_class: parent class
- * @open_device:  open the device, don't set any params or allocate anything
- * @acquire: allocate the resources for the ringbuffer using the given spec
- * @release: free resources of the ringbuffer
- * @close_device: close the device
- * @start: start processing of samples
- * @pause: pause processing of samples
- * @resume: resume processing of samples after pause
- * @stop: stop processing of samples
- * @delay: get number of samples queued in device
- * @activate: activate the thread that starts pulling and monitoring the
- * consumed segments in the device.
- * @commit: write samples into the ringbuffer
- * @clear_all: clear the entire ringbuffer.
- *
- * The vmethods that subclasses can override to implement the ringbuffer.
- */
-struct _GstAudioRingBufferClass {
-  GstObjectClass parent_class;
-
-  /*< public >*/
-  gboolean     (*open_device)  (GstAudioRingBuffer *buf);
-  gboolean     (*acquire)      (GstAudioRingBuffer *buf, GstAudioRingBufferSpec *spec);
-  gboolean     (*release)      (GstAudioRingBuffer *buf);
-  gboolean     (*close_device) (GstAudioRingBuffer *buf);
-
-  gboolean     (*start)        (GstAudioRingBuffer *buf);
-  gboolean     (*pause)        (GstAudioRingBuffer *buf);
-  gboolean     (*resume)       (GstAudioRingBuffer *buf);
-  gboolean     (*stop)         (GstAudioRingBuffer *buf);
-
-  guint        (*delay)        (GstAudioRingBuffer *buf);
-
-  /* ABI added */
-  gboolean     (*activate)     (GstAudioRingBuffer *buf, gboolean active);
-
-  guint        (*commit)       (GstAudioRingBuffer * buf, guint64 *sample,
-                                guint8 * data, gint in_samples,
-                                gint out_samples, gint * accum);
-
-  void         (*clear_all)    (GstAudioRingBuffer * buf);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_ring_buffer_get_type(void);
-
-/* callback stuff */
-void            gst_audio_ring_buffer_set_callback    (GstAudioRingBuffer *buf,
-                                                       GstAudioRingBufferCallback cb,
-                                                       gpointer user_data);
-
-gboolean        gst_audio_ring_buffer_parse_caps      (GstAudioRingBufferSpec *spec, GstCaps *caps);
-void            gst_audio_ring_buffer_debug_spec_caps (GstAudioRingBufferSpec *spec);
-void            gst_audio_ring_buffer_debug_spec_buff (GstAudioRingBufferSpec *spec);
-
-gboolean        gst_audio_ring_buffer_convert         (GstAudioRingBuffer * buf, GstFormat src_fmt,
-                                                       gint64 src_val, GstFormat dest_fmt,
-                                                       gint64 * dest_val);
-
-/* device state */
-gboolean        gst_audio_ring_buffer_open_device     (GstAudioRingBuffer *buf);
-gboolean        gst_audio_ring_buffer_close_device    (GstAudioRingBuffer *buf);
-
-gboolean        gst_audio_ring_buffer_device_is_open  (GstAudioRingBuffer *buf);
-
-/* allocate resources */
-gboolean        gst_audio_ring_buffer_acquire         (GstAudioRingBuffer *buf, GstAudioRingBufferSpec *spec);
-gboolean        gst_audio_ring_buffer_release         (GstAudioRingBuffer *buf);
-
-gboolean        gst_audio_ring_buffer_is_acquired     (GstAudioRingBuffer *buf);
-
-/* set the device channel positions */
-void            gst_audio_ring_buffer_set_channel_positions (GstAudioRingBuffer *buf, const GstAudioChannelPosition *position);
-
-/* activating */
-gboolean        gst_audio_ring_buffer_activate        (GstAudioRingBuffer *buf, gboolean active);
-gboolean        gst_audio_ring_buffer_is_active       (GstAudioRingBuffer *buf);
-
-/* flushing */
-void            gst_audio_ring_buffer_set_flushing    (GstAudioRingBuffer *buf, gboolean flushing);
-gboolean        gst_audio_ring_buffer_is_flushing     (GstAudioRingBuffer *buf);
-
-/* playback/pause */
-gboolean        gst_audio_ring_buffer_start           (GstAudioRingBuffer *buf);
-gboolean        gst_audio_ring_buffer_pause           (GstAudioRingBuffer *buf);
-gboolean        gst_audio_ring_buffer_stop            (GstAudioRingBuffer *buf);
-
-/* get status */
-guint           gst_audio_ring_buffer_delay           (GstAudioRingBuffer *buf);
-guint64         gst_audio_ring_buffer_samples_done    (GstAudioRingBuffer *buf);
-
-void            gst_audio_ring_buffer_set_sample      (GstAudioRingBuffer *buf, guint64 sample);
-
-/* clear all segments */
-void            gst_audio_ring_buffer_clear_all       (GstAudioRingBuffer *buf);
-
-/* commit samples */
-guint           gst_audio_ring_buffer_commit          (GstAudioRingBuffer * buf, guint64 *sample,
-                                                       guint8 * data, gint in_samples,
-                                                       gint out_samples, gint * accum);
-
-/* read samples */
-guint           gst_audio_ring_buffer_read            (GstAudioRingBuffer *buf, guint64 sample,
-                                                       guint8 *data, guint len, GstClockTime *timestamp);
-
-/* Set timestamp on buffer */
-void            gst_audio_ring_buffer_set_timestamp   (GstAudioRingBuffer * buf, gint readseg, GstClockTime 
-                                                       timestamp);
-
-/* mostly protected */
-/* not yet implemented
-gboolean        gst_audio_ring_buffer_prepare_write   (GstAudioRingBuffer *buf, gint *segment, guint8 **writeptr, gint *len);
-*/
-gboolean        gst_audio_ring_buffer_prepare_read    (GstAudioRingBuffer *buf, gint *segment,
-                                                       guint8 **readptr, gint *len);
-void            gst_audio_ring_buffer_clear           (GstAudioRingBuffer *buf, gint segment);
-void            gst_audio_ring_buffer_advance         (GstAudioRingBuffer *buf, guint advance);
-
-void            gst_audio_ring_buffer_may_start       (GstAudioRingBuffer *buf, gboolean allowed);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_RING_BUFFER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiosink.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiosink.h
deleted file mode 100644
index f6fac610..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiosink.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudiosink.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_SINK_H__
-#define __GST_AUDIO_SINK_H__
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudiobasesink.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_SINK             (gst_audio_sink_get_type())
-#define GST_AUDIO_SINK(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_SINK,GstAudioSink))
-#define GST_AUDIO_SINK_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_SINK,GstAudioSinkClass))
-#define GST_AUDIO_SINK_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AUDIO_SINK,GstAudioSinkClass))
-#define GST_IS_AUDIO_SINK(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_SINK))
-#define GST_IS_AUDIO_SINK_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_SINK))
-
-typedef struct _GstAudioSink GstAudioSink;
-typedef struct _GstAudioSinkClass GstAudioSinkClass;
-
-/**
- * GstAudioSink:
- *
- * Opaque #GstAudioSink.
- */
-struct _GstAudioSink {
-  GstAudioBaseSink       element;
-
-  /*< private >*/ /* with LOCK */
-  GThread   *thread;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioSinkClass:
- * @parent_class: the parent class structure.
- * @open: Open the device. No configuration needs to be done at this point.
- *        This function is also used to check if the device is available.
- * @prepare: Prepare the device to operate with the specified parameters.
- * @unprepare: Undo operations done in prepare.
- * @close: Close the device.
- * @write: Write data to the device.
- * @delay: Return how many samples are still in the device. This is used to
- *         drive the synchronisation.
- * @reset: Returns as quickly as possible from a write and flush any pending
- *         samples from the device.
- *
- * #GstAudioSink class. Override the vmethods to implement functionality.
- */
-struct _GstAudioSinkClass {
-  GstAudioBaseSinkClass parent_class;
-
-  /* vtable */
-
-  /* open the device with given specs */
-  gboolean (*open)      (GstAudioSink *sink);
-  /* prepare resources and state to operate with the given specs */
-  gboolean (*prepare)   (GstAudioSink *sink, GstAudioRingBufferSpec *spec);
-  /* undo anything that was done in prepare() */
-  gboolean (*unprepare) (GstAudioSink *sink);
-  /* close the device */
-  gboolean (*close)     (GstAudioSink *sink);
-  /* write samples to the device */
-  gint     (*write)     (GstAudioSink *sink, gpointer data, guint length);
-  /* get number of samples queued in the device */
-  guint    (*delay)     (GstAudioSink *sink);
-  /* reset the audio device, unblock from a write */
-  void     (*reset)     (GstAudioSink *sink);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_sink_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_SINK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiosrc.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiosrc.h
deleted file mode 100644
index 47e68274..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/gstaudiosrc.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstaudiosrc.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_AUDIO_SRC_H__
-#define __GST_AUDIO_SRC_H__
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudiobasesrc.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_AUDIO_SRC              (gst_audio_src_get_type())
-#define GST_AUDIO_SRC(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_SRC,GstAudioSrc))
-#define GST_AUDIO_SRC_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_SRC,GstAudioSrcClass))
-#define GST_AUDIO_SRC_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AUDIO_SRC,GstAudioSrcClass))
-#define GST_IS_AUDIO_SRC(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_SRC))
-#define GST_IS_AUDIO_SRC_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_SRC))
-
-typedef struct _GstAudioSrc GstAudioSrc;
-typedef struct _GstAudioSrcClass GstAudioSrcClass;
-
-/**
- * GstAudioSrc:
- *
- * Base class for simple audio sources.
- */
-struct _GstAudioSrc {
-  GstAudioBaseSrc        element;
-
-  /*< private >*/ /* with LOCK */
-  GThread   *thread;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAudioSrcClass:
- * @parent_class: the parent class.
- * @open: open the device with the specified caps
- * @prepare: configure device with format
- * @unprepare: undo the configuration
- * @close: close the device
- * @read: read samples to the audio device
- * @delay: the number of samples queued in the device
- * @reset: unblock a read to the device and reset.
- *
- * #GstAudioSrc class. Override the vmethod to implement
- * functionality.
- */
-struct _GstAudioSrcClass {
-  GstAudioBaseSrcClass parent_class;
-
-  /* vtable */
-
-  /* open the device with given specs */
-  gboolean (*open)      (GstAudioSrc *src);
-  /* prepare resources and state to operate with the given specs */
-  gboolean (*prepare)   (GstAudioSrc *src, GstAudioRingBufferSpec *spec);
-  /* undo anything that was done in prepare() */
-  gboolean (*unprepare) (GstAudioSrc *src);
-  /* close the device */
-  gboolean (*close)     (GstAudioSrc *src);
-  /* read samples from the device */
-  guint    (*read)      (GstAudioSrc *src, gpointer data, guint length,
-      GstClockTime *timestamp);
-  /* get number of samples queued in the device */
-  guint    (*delay)     (GstAudioSrc *src);
-  /* reset the audio device, unblock from a write */
-  void     (*reset)     (GstAudioSrc *src);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_audio_src_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_AUDIO_SRC_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/streamvolume.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/streamvolume.h
deleted file mode 100644
index 8dfdc16d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/audio/streamvolume.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GStreamer StreamVolume
- * Copyright (C) 2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_STREAM_VOLUME_H__
-#define __GST_STREAM_VOLUME_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_STREAM_VOLUME \
-  (gst_stream_volume_get_type ())
-#define GST_STREAM_VOLUME(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_STREAM_VOLUME, GstStreamVolume))
-#define GST_STREAM_VOLUME_INTERFACE(iface) \
-  (G_TYPE_CHECK_INTERFACE_CAST ((iface), GST_TYPE_STREAM_VOLUME, GstStreamVolumeInterface))
-#define GST_IS_STREAM_VOLUME(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_STREAM_VOLUME))
-#define GST_IS_STREAM_VOLUME_INTERFACE(iface) \
-  (G_TYPE_CHECK_INTERFACE_TYPE ((iface), GST_TYPE_STREAM_VOLUME))
-#define GST_STREAM_VOLUME_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_STREAM_VOLUME, GstStreamVolumeInterface))
-
-typedef struct _GstStreamVolume GstStreamVolume;
-typedef struct _GstStreamVolumeInterface GstStreamVolumeInterface;
-
-struct _GstStreamVolumeInterface {
-  GTypeInterface iface;
-};
-
-/**
- * GstStreamVolumeFormat:
- * @GST_STREAM_VOLUME_FORMAT_LINEAR: Linear scale factor, 1.0 = 100%
- * @GST_STREAM_VOLUME_FORMAT_CUBIC: Cubic volume scale
- * @GST_STREAM_VOLUME_FORMAT_DB: Logarithmic volume scale (dB, amplitude not power)
- *
- * Different representations of a stream volume. gst_stream_volume_convert_volume()
- * allows to convert between the different representations.
- *
- * Formulas to convert from a linear to a cubic or dB volume are
- * cbrt(val) and 20 * log10 (val).
- */
-typedef enum {
-  GST_STREAM_VOLUME_FORMAT_LINEAR = 0,
-  GST_STREAM_VOLUME_FORMAT_CUBIC,
-  GST_STREAM_VOLUME_FORMAT_DB
-} GstStreamVolumeFormat;
-
-GType           gst_stream_volume_get_type        (void);
-void            gst_stream_volume_set_volume      (GstStreamVolume *volume,
-                                                   GstStreamVolumeFormat format,
-                                                   gdouble val);
-gdouble         gst_stream_volume_get_volume      (GstStreamVolume *volume,
-                                                   GstStreamVolumeFormat format);
-
-void            gst_stream_volume_set_mute        (GstStreamVolume *volume,
-                                                   gboolean mute);
-gboolean        gst_stream_volume_get_mute        (GstStreamVolume *volume);
-
-gdouble         gst_stream_volume_convert_volume  (GstStreamVolumeFormat from,
-                                                   GstStreamVolumeFormat to,
-                                                   gdouble val) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GST_STREAM_VOLUME_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstadapter.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstadapter.h
deleted file mode 100644
index 5b897443..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstadapter.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Benjamin Otte <otte@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gst/gst.h>
-
-#ifndef __GST_ADAPTER_H__
-#define __GST_ADAPTER_H__
-
-G_BEGIN_DECLS
-
-
-#define GST_TYPE_ADAPTER \
-  (gst_adapter_get_type())
-#define GST_ADAPTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_ADAPTER, GstAdapter))
-#define GST_ADAPTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_ADAPTER, GstAdapterClass))
-#define GST_ADAPTER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ADAPTER, GstAdapterClass))
-#define GST_IS_ADAPTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_ADAPTER))
-#define GST_IS_ADAPTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_ADAPTER))
-
-/**
- * GstAdapter:
- *
- * The opaque #GstAdapter data structure.
- */
-typedef struct _GstAdapter GstAdapter;
-typedef struct _GstAdapterClass GstAdapterClass;
-
-GType                   gst_adapter_get_type            (void);
-
-GstAdapter *            gst_adapter_new                 (void) G_GNUC_MALLOC;
-
-void                    gst_adapter_clear               (GstAdapter *adapter);
-void                    gst_adapter_push                (GstAdapter *adapter, GstBuffer* buf);
-gconstpointer           gst_adapter_map                 (GstAdapter *adapter, gsize size);
-void                    gst_adapter_unmap               (GstAdapter *adapter);
-void                    gst_adapter_copy                (GstAdapter *adapter, gpointer dest,
-                                                         gsize offset, gsize size);
-void                    gst_adapter_flush               (GstAdapter *adapter, gsize flush);
-gpointer                gst_adapter_take                (GstAdapter *adapter, gsize nbytes);
-GstBuffer*              gst_adapter_take_buffer         (GstAdapter *adapter, gsize nbytes);
-GList*                  gst_adapter_take_list           (GstAdapter *adapter, gsize nbytes);
-gsize                   gst_adapter_available           (GstAdapter *adapter);
-gsize                   gst_adapter_available_fast      (GstAdapter *adapter);
-
-GstClockTime            gst_adapter_prev_pts            (GstAdapter *adapter, guint64 *distance);
-GstClockTime            gst_adapter_prev_dts            (GstAdapter *adapter, guint64 *distance);
-
-gsize                   gst_adapter_masked_scan_uint32  (GstAdapter * adapter, guint32 mask,
-                                                         guint32 pattern, gsize offset, gsize size);
-
-gsize                   gst_adapter_masked_scan_uint32_peek  (GstAdapter * adapter, guint32 mask,
-                                                         guint32 pattern, gsize offset, gsize size, guint32 * value);
-
-G_END_DECLS
-
-#endif /* __GST_ADAPTER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbaseparse.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbaseparse.h
deleted file mode 100644
index d0a1be46..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbaseparse.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 Nokia Corporation. All rights reserved.
- *
- * Contact: Stefan Kost <stefan.kost@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BASE_PARSE_H__
-#define __GST_BASE_PARSE_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BASE_PARSE            (gst_base_parse_get_type())
-#define GST_BASE_PARSE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_PARSE,GstBaseParse))
-#define GST_BASE_PARSE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_PARSE,GstBaseParseClass))
-#define GST_BASE_PARSE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_BASE_PARSE,GstBaseParseClass))
-#define GST_IS_BASE_PARSE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_PARSE))
-#define GST_IS_BASE_PARSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_PARSE))
-#define GST_BASE_PARSE_CAST(obj)       ((GstBaseParse *)(obj))
-
-/**
- * GST_BASE_PARSE_SRC_PAD:
- * @obj: base parse instance
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_BASE_PARSE_SRC_PAD(obj)    (GST_BASE_PARSE_CAST (obj)->srcpad)
-
-/**
- * GST_BASE_PARSE_SINK_PAD:
- * @obj: base parse instance
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_BASE_PARSE_SINK_PAD(obj)    (GST_BASE_PARSE_CAST (obj)->sinkpad)
-
-/**
- * GST_BASE_PARSE_FLOW_DROPPED:
- *
- * A #GstFlowReturn that can be returned from parse_frame to
- * indicate that no output buffer was generated, or from pre_push_frame to
- * to forego pushing buffer.
- */
-#define GST_BASE_PARSE_FLOW_DROPPED     GST_FLOW_CUSTOM_SUCCESS
-
-/* not public API, use accessor macros below */
-#define GST_BASE_PARSE_FLAG_LOST_SYNC (1 << 0)
-#define GST_BASE_PARSE_FLAG_DRAINING  (1 << 1)
-
-/**
- * GST_BASE_PARSE_LOST_SYNC:
- * @parse: base parse instance
- *
- * Obtains current sync status.
- */
-#define GST_BASE_PARSE_LOST_SYNC(parse) (!!(GST_BASE_PARSE_CAST(parse)->flags & GST_BASE_PARSE_FLAG_LOST_SYNC))
-
-/**
- * GST_BASE_PARSE_DRAINING:
- * @parse: base parse instance
- *
- * Obtains current drain status (ie. whether EOS has been received and
- * the parser is now processing the frames at the end of the stream)
- */
-#define GST_BASE_PARSE_DRAINING(parse)  (!!(GST_BASE_PARSE_CAST(parse)->flags & GST_BASE_PARSE_FLAG_DRAINING))
-
-/**
- * GstBaseParseFrameFlags:
- * @GST_BASE_PARSE_FRAME_FLAG_NONE: no flag
- * @GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME: set by baseclass if current frame
- *   is passed for processing to the subclass for the first time
- *   (and not set on subsequent calls with same data).
- * @GST_BASE_PARSE_FRAME_FLAG_NO_FRAME: set to indicate this buffer should not be
- *   counted as frame, e.g. if this frame is dependent on a previous one.
- *   As it is not counted as a frame, bitrate increases but frame to time
- *   conversions are maintained.
- * @GST_BASE_PARSE_FRAME_FLAG_CLIP: @pre_push_frame can set this to indicate
- *    that regular segment clipping can still be performed (as opposed to
- *    any custom one having been done).
- * @GST_BASE_PARSE_FRAME_FLAG_DROP: indicates to @finish_frame that the
- *    the frame should be dropped (and might be handled internall by subclass)
- * @GST_BASE_PARSE_FRAME_FLAG_QUEUE: indicates to @finish_frame that the
- *    the frame should be queued for now and processed fully later
- *    when the first non-queued frame is finished
- *
- * Flags to be used in a #GstBaseParseFrame.
- */
-typedef enum {
-  GST_BASE_PARSE_FRAME_FLAG_NONE         = 0,
-  GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME    = (1 << 0),
-  GST_BASE_PARSE_FRAME_FLAG_NO_FRAME     = (1 << 1),
-  GST_BASE_PARSE_FRAME_FLAG_CLIP         = (1 << 2),
-  GST_BASE_PARSE_FRAME_FLAG_DROP         = (1 << 3),
-  GST_BASE_PARSE_FRAME_FLAG_QUEUE        = (1 << 4)
-} GstBaseParseFrameFlags;
-
-/**
- * GstBaseParseFrame:
- * @buffer: input data to be parsed for frames.
- * @out_buffer: (optional) (replacement) output data.
- * @offset: media specific offset of input frame
- *   Note that a converter may have a different one on the frame's buffer.
- * @overhead: subclass can set this to indicates the metadata overhead
- *   for the given frame, which is then used to enable more accurate bitrate
- *   computations. If this is -1, it is assumed that this frame should be
- *   skipped in bitrate calculation.
- * @flags: a combination of input and output #GstBaseParseFrameFlags that
- *  convey additional context to subclass or allow subclass to tune
- *  subsequent #GstBaseParse actions.
- *
- * Frame (context) data passed to each frame parsing virtual methods.  In
- * addition to providing the data to be checked for a valid frame or an already
- * identified frame, it conveys additional metadata or control information
- * from and to the subclass w.r.t. the particular frame in question (rather
- * than global parameters).  Some of these may apply to each parsing stage, others
- * only to some a particular one.  These parameters are effectively zeroed at start
- * of each frame's processing, i.e. parsing virtual method invocation sequence.
- */
-typedef struct {
-  GstBuffer * buffer;
-  GstBuffer * out_buffer;
-  guint       flags;
-  guint64     offset;
-  gint        overhead;
-  /*< private >*/
-  gint        size;
-  guint       _gst_reserved_i[2];
-  gpointer    _gst_reserved_p[2];
-  guint       _private_flags;
-} GstBaseParseFrame;
-
-typedef struct _GstBaseParse GstBaseParse;
-typedef struct _GstBaseParseClass GstBaseParseClass;
-typedef struct _GstBaseParsePrivate GstBaseParsePrivate;
-
-/**
- * GstBaseParse:
- * @element: the parent element.
- *
- * The opaque #GstBaseParse data structure.
- */
-struct _GstBaseParse {
-  GstElement     element;
-
-  /*< protected >*/
-  /* source and sink pads */
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  guint           flags;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      segment;
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-  GstBaseParsePrivate *priv;
-};
-
-/**
- * GstBaseParseClass:
- * @parent_class: the parent class
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_sink_caps:  allows the subclass to be notified of the actual caps set.
- * @get_sink_caps:  allows the subclass to do its own sink get caps if needed.
- * @handle_frame:   Parses the input data into valid frames as defined by subclass
- *                  which should be passed to gst_base_parse_finish_frame().
- *                  The frame's input buffer is guaranteed writable,
- *                  whereas the input frame ownership is held by caller
- *                  (so subclass should make a copy if it needs to hang on).
- *                  Input buffer (data) is provided by baseclass with as much
- *                  metadata set as possible by baseclass according to upstream
- *                  information and/or subclass settings,
- *                  though subclass may still set buffer timestamp and duration
- *                  if desired.
- * @convert:        Optional.
- *                  Convert between formats.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. This function should chain
- *                  up to the parent implementation to let the default handler
- *                  run.
- * @src_event:      Optional.
- *                  Event handler on the source pad. Should chain up to the
- *                  parent to let the default handler run.
- * @pre_push_frame: Optional.
- *                   Called just prior to pushing a frame (after any pending
- *                   events have been sent) to give subclass a chance to perform
- *                   additional actions at this time (e.g. tag sending) or to
- *                   decide whether this buffer should be dropped or not
- *                   (e.g. custom segment clipping).
- * @detect:         Optional.
- *                   Called until it doesn't return GST_FLOW_OK anymore for
- *                   the first buffers. Can be used by the subclass to detect
- *                   the stream format.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @check_valid_frame and @parse_frame needs to be
- * overridden.
- */
-struct _GstBaseParseClass {
-  GstElementClass parent_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  gboolean      (*start)              (GstBaseParse * parse);
-
-  gboolean      (*stop)               (GstBaseParse * parse);
-
-  gboolean      (*set_sink_caps)      (GstBaseParse * parse,
-                                       GstCaps      * caps);
-
-  GstFlowReturn (*handle_frame)       (GstBaseParse      * parse,
-                                       GstBaseParseFrame * frame,
-                                       gint              * skipsize);
-
-  GstFlowReturn (*pre_push_frame)     (GstBaseParse      * parse,
-                                       GstBaseParseFrame * frame);
-
-  gboolean      (*convert)            (GstBaseParse * parse,
-                                       GstFormat      src_format,
-                                       gint64         src_value,
-                                       GstFormat      dest_format,
-                                       gint64       * dest_value);
-
-  gboolean      (*sink_event)         (GstBaseParse * parse,
-                                       GstEvent     * event);
-
-  gboolean      (*src_event)          (GstBaseParse * parse,
-                                       GstEvent     * event);
-
-  GstCaps *     (*get_sink_caps)      (GstBaseParse * parse,
-                                       GstCaps      * filter);
-
-  GstFlowReturn (*detect)             (GstBaseParse * parse,
-                                       GstBuffer    * buffer);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType           gst_base_parse_get_type (void);
-
-GType           gst_base_parse_frame_get_type (void);
-
-GstBaseParseFrame * gst_base_parse_frame_new  (GstBuffer              * buffer,
-                                               GstBaseParseFrameFlags   flags,
-                                               gint                     overhead);
-
-void            gst_base_parse_frame_init      (GstBaseParseFrame * frame);
-
-void            gst_base_parse_frame_free      (GstBaseParseFrame * frame);
-
-GstFlowReturn   gst_base_parse_push_frame      (GstBaseParse      * parse,
-                                                GstBaseParseFrame * frame);
-
-GstFlowReturn   gst_base_parse_finish_frame    (GstBaseParse * parse,
-                                                GstBaseParseFrame * frame,
-                                                gint size);
-
-void            gst_base_parse_set_duration    (GstBaseParse      * parse,
-                                                GstFormat           fmt,
-                                                gint64              duration,
-                                                gint                interval);
-
-void            gst_base_parse_set_average_bitrate (GstBaseParse   * parse,
-                                                    guint            bitrate);
-
-void            gst_base_parse_set_min_frame_size (GstBaseParse    * parse,
-                                                   guint             min_size);
-
-void            gst_base_parse_set_has_timing_info (GstBaseParse   * parse,
-                                                    gboolean         has_timing);
-
-void            gst_base_parse_set_syncable    (GstBaseParse * parse,
-                                                gboolean       syncable);
-
-void            gst_base_parse_set_passthrough (GstBaseParse * parse,
-                                                gboolean       passthrough);
-
-void            gst_base_parse_set_pts_interpolation (GstBaseParse * parse,
-                                                      gboolean pts_interpolate);
-
-void            gst_base_parse_set_frame_rate  (GstBaseParse * parse,
-                                                guint          fps_num,
-                                                guint          fps_den,
-                                                guint          lead_in,
-                                                guint          lead_out);
-
-void            gst_base_parse_set_latency     (GstBaseParse * parse,
-                                                GstClockTime min_latency,
-                                                GstClockTime max_latency);
-
-gboolean        gst_base_parse_convert_default (GstBaseParse * parse,
-                                                GstFormat      src_format,
-                                                gint64         src_value,
-                                                GstFormat      dest_format,
-                                                gint64       * dest_value);
-
-gboolean        gst_base_parse_add_index_entry (GstBaseParse * parse,
-                                                guint64        offset,
-                                                GstClockTime   ts,
-                                                gboolean       key,
-                                                gboolean       force);
-
-G_END_DECLS
-
-#endif /* __GST_BASE_PARSE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasesink.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasesink.h
deleted file mode 100644
index e4bb7350..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasesink.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstbasesink.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BASE_SINK_H__
-#define __GST_BASE_SINK_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-
-#define GST_TYPE_BASE_SINK              (gst_base_sink_get_type())
-#define GST_BASE_SINK(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_SINK,GstBaseSink))
-#define GST_BASE_SINK_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_SINK,GstBaseSinkClass))
-#define GST_BASE_SINK_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_SINK, GstBaseSinkClass))
-#define GST_IS_BASE_SINK(obj)           (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_SINK))
-#define GST_IS_BASE_SINK_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_SINK))
-#define GST_BASE_SINK_CAST(obj)         ((GstBaseSink *) (obj))
-
-/**
- * GST_BASE_SINK_PAD:
- * @obj: base sink instance
- *
- * Gives the pointer to the #GstPad object of the element.
- */
-#define GST_BASE_SINK_PAD(obj)          (GST_BASE_SINK_CAST (obj)->sinkpad)
-
-#define GST_BASE_SINK_GET_PREROLL_LOCK(pad)   (&GST_BASE_SINK_CAST(pad)->preroll_lock)
-#define GST_BASE_SINK_PREROLL_LOCK(pad)       (g_mutex_lock(GST_BASE_SINK_GET_PREROLL_LOCK(pad)))
-#define GST_BASE_SINK_PREROLL_TRYLOCK(pad)    (g_mutex_trylock(GST_BASE_SINK_GET_PREROLL_LOCK(pad)))
-#define GST_BASE_SINK_PREROLL_UNLOCK(pad)     (g_mutex_unlock(GST_BASE_SINK_GET_PREROLL_LOCK(pad)))
-
-#define GST_BASE_SINK_GET_PREROLL_COND(pad)   (&GST_BASE_SINK_CAST(pad)->preroll_cond)
-#define GST_BASE_SINK_PREROLL_WAIT(pad)       \
-      g_cond_wait (GST_BASE_SINK_GET_PREROLL_COND (pad), GST_BASE_SINK_GET_PREROLL_LOCK (pad))
-#define GST_BASE_SINK_PREROLL_WAIT_UNTIL(pad, end_time) \
-      g_cond_wait_until (GST_BASE_SINK_GET_PREROLL_COND (pad), GST_BASE_SINK_GET_PREROLL_LOCK (pad), end_time)
-#define GST_BASE_SINK_PREROLL_SIGNAL(pad)     g_cond_signal (GST_BASE_SINK_GET_PREROLL_COND (pad));
-#define GST_BASE_SINK_PREROLL_BROADCAST(pad)  g_cond_broadcast (GST_BASE_SINK_GET_PREROLL_COND (pad));
-
-typedef struct _GstBaseSink GstBaseSink;
-typedef struct _GstBaseSinkClass GstBaseSinkClass;
-typedef struct _GstBaseSinkPrivate GstBaseSinkPrivate;
-
-/**
- * GstBaseSink:
- *
- * The opaque #GstBaseSink data structure.
- */
-struct _GstBaseSink {
-  GstElement     element;
-
-  /*< protected >*/
-  GstPad        *sinkpad;
-  GstPadMode     pad_mode;
-
-  /*< protected >*/ /* with LOCK */
-  guint64        offset;
-  gboolean       can_activate_pull;
-  gboolean       can_activate_push;
-
-  /*< protected >*/ /* with PREROLL_LOCK */
-  GMutex         preroll_lock;
-  GCond          preroll_cond;
-  gboolean       eos;
-  gboolean       need_preroll;
-  gboolean       have_preroll;
-  gboolean       playing_async;
-
-  /*< protected >*/ /* with STREAM_LOCK */
-  gboolean       have_newsegment;
-  GstSegment     segment;
-
-  /*< private >*/ /* with LOCK */
-  GstClockID     clock_id;
-  gboolean       sync;
-  gboolean       flushing;
-  gboolean       running;
-
-  gint64         max_lateness;
-
-  /*< private >*/
-  GstBaseSinkPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstBaseSinkClass:
- * @parent_class: Element parent class
- * @get_caps: Called to get sink pad caps from the subclass
- * @set_caps: Notify subclass of changed caps
- * @fixate: Only useful in pull mode. Implement if you have
- *     ideas about what should be the default values for the caps you support.
- * @activate_pull: Subclasses should override this when they can provide an
- *     alternate method of spawning a thread to drive the pipeline in pull mode.
- *     Should start or stop the pulling thread, depending on the value of the
- *     "active" argument. Called after actually activating the sink pad in pull
- *     mode. The default implementation starts a task on the sink pad.
- * @get_times: Called to get the start and end times for synchronising
- *     the passed buffer to the clock
- * @propose_allocation: configure the allocation query
- * @start: Start processing. Ideal for opening resources in the subclass
- * @stop: Stop processing. Subclasses should use this to close resources.
- * @unlock: Unlock any pending access to the resource. Subclasses should
- *     unblock any blocked function ASAP
- * @unlock_stop: Clear the previous unlock request. Subclasses should clear
- *     any state they set during unlock(), such as clearing command queues.
- * @query: perform a #GstQuery on the element.
- * @event: Override this to handle events arriving on the sink pad
- * @wait_event: Override this to implement custom logic to wait for the event
- *     time (for events like EOS and GAP). Subclasses should always first
- *     chain up to the default implementation.
- * @prepare: Called to prepare the buffer for @render and @preroll. This
- *     function is called before synchronisation is performed.
- * @prepare_list: Called to prepare the buffer list for @render_list. This
- *     function is called before synchronisation is performed.
- * @preroll: Called to present the preroll buffer if desired.
- * @render: Called when a buffer should be presented or output, at the
- *     correct moment if the #GstBaseSink has been set to sync to the clock.
- * @render_list: Same as @render but used whith buffer lists instead of
- *     buffers.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At the minimum, the @render method should be overridden to
- * output/present buffers.
- */
-struct _GstBaseSinkClass {
-  GstElementClass parent_class;
-
-  /* get caps from subclass */
-  GstCaps*      (*get_caps)     (GstBaseSink *sink, GstCaps *filter);
-  /* notify subclass of new caps */
-  gboolean      (*set_caps)     (GstBaseSink *sink, GstCaps *caps);
-
-  /* fixate sink caps during pull-mode negotiation */
-  GstCaps *     (*fixate)       (GstBaseSink *sink, GstCaps *caps);
-  /* start or stop a pulling thread */
-  gboolean      (*activate_pull)(GstBaseSink *sink, gboolean active);
-
-  /* get the start and end times for syncing on this buffer */
-  void          (*get_times)    (GstBaseSink *sink, GstBuffer *buffer,
-                                 GstClockTime *start, GstClockTime *end);
-
-  /* propose allocation parameters for upstream */
-  gboolean      (*propose_allocation)   (GstBaseSink *sink, GstQuery *query);
-
-  /* start and stop processing, ideal for opening/closing the resource */
-  gboolean      (*start)        (GstBaseSink *sink);
-  gboolean      (*stop)         (GstBaseSink *sink);
-
-  /* unlock any pending access to the resource. subclasses should unlock
-   * any function ASAP. */
-  gboolean      (*unlock)       (GstBaseSink *sink);
-  /* Clear a previously indicated unlock request not that unlocking is
-   * complete. Sub-classes should clear any command queue or indicator they
-   * set during unlock */
-  gboolean      (*unlock_stop)  (GstBaseSink *sink);
-
-  /* notify subclass of query */
-  gboolean      (*query)        (GstBaseSink *sink, GstQuery *query);
-
-  /* notify subclass of event */
-  gboolean      (*event)        (GstBaseSink *sink, GstEvent *event);
-  /* wait for eos or gap, subclasses should chain up to parent first */
-  GstFlowReturn (*wait_event)   (GstBaseSink *sink, GstEvent *event);
-
-  /* notify subclass of buffer or list before doing sync */
-  GstFlowReturn (*prepare)      (GstBaseSink *sink, GstBuffer *buffer);
-  GstFlowReturn (*prepare_list) (GstBaseSink *sink, GstBufferList *buffer_list);
-
-  /* notify subclass of preroll buffer or real buffer */
-  GstFlowReturn (*preroll)      (GstBaseSink *sink, GstBuffer *buffer);
-  GstFlowReturn (*render)       (GstBaseSink *sink, GstBuffer *buffer);
-  /* Render a BufferList */
-  GstFlowReturn (*render_list)  (GstBaseSink *sink, GstBufferList *buffer_list);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType gst_base_sink_get_type(void);
-
-GstFlowReturn   gst_base_sink_do_preroll        (GstBaseSink *sink, GstMiniObject *obj);
-GstFlowReturn   gst_base_sink_wait_preroll      (GstBaseSink *sink);
-
-/* synchronizing against the clock */
-void            gst_base_sink_set_sync          (GstBaseSink *sink, gboolean sync);
-gboolean        gst_base_sink_get_sync          (GstBaseSink *sink);
-
-/* dropping late buffers */
-void            gst_base_sink_set_max_lateness  (GstBaseSink *sink, gint64 max_lateness);
-gint64          gst_base_sink_get_max_lateness  (GstBaseSink *sink);
-
-/* performing QoS */
-void            gst_base_sink_set_qos_enabled   (GstBaseSink *sink, gboolean enabled);
-gboolean        gst_base_sink_is_qos_enabled    (GstBaseSink *sink);
-
-/* doing async state changes */
-void            gst_base_sink_set_async_enabled (GstBaseSink *sink, gboolean enabled);
-gboolean        gst_base_sink_is_async_enabled  (GstBaseSink *sink);
-
-/* tuning synchronisation */
-void            gst_base_sink_set_ts_offset     (GstBaseSink *sink, GstClockTimeDiff offset);
-GstClockTimeDiff gst_base_sink_get_ts_offset    (GstBaseSink *sink);
-
-/* last sample */
-GstSample *     gst_base_sink_get_last_sample   (GstBaseSink *sink);
-void            gst_base_sink_set_last_sample_enabled (GstBaseSink *sink, gboolean enabled);
-gboolean        gst_base_sink_is_last_sample_enabled (GstBaseSink *sink);
-
-/* latency */
-gboolean        gst_base_sink_query_latency     (GstBaseSink *sink, gboolean *live, gboolean *upstream_live,
-                                                 GstClockTime *min_latency, GstClockTime *max_latency);
-GstClockTime    gst_base_sink_get_latency       (GstBaseSink *sink);
-
-/* render delay */
-void            gst_base_sink_set_render_delay  (GstBaseSink *sink, GstClockTime delay);
-GstClockTime    gst_base_sink_get_render_delay  (GstBaseSink *sink);
-
-/* blocksize */
-void            gst_base_sink_set_blocksize     (GstBaseSink *sink, guint blocksize);
-guint           gst_base_sink_get_blocksize     (GstBaseSink *sink);
-
-/* throttle-time */
-void            gst_base_sink_set_throttle_time (GstBaseSink *sink, guint64 throttle);
-guint64         gst_base_sink_get_throttle_time (GstBaseSink *sink);
-
-GstClockReturn  gst_base_sink_wait_clock        (GstBaseSink *sink, GstClockTime time,
-                                                 GstClockTimeDiff * jitter);
-GstFlowReturn   gst_base_sink_wait              (GstBaseSink *sink, GstClockTime time,
-                                                 GstClockTimeDiff *jitter);
-
-G_END_DECLS
-
-#endif /* __GST_BASE_SINK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasesrc.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasesrc.h
deleted file mode 100644
index 466f0fc7..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasesrc.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstbasesrc.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BASE_SRC_H__
-#define __GST_BASE_SRC_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BASE_SRC               (gst_base_src_get_type())
-#define GST_BASE_SRC(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_SRC,GstBaseSrc))
-#define GST_BASE_SRC_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_SRC,GstBaseSrcClass))
-#define GST_BASE_SRC_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_SRC, GstBaseSrcClass))
-#define GST_IS_BASE_SRC(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_SRC))
-#define GST_IS_BASE_SRC_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_SRC))
-#define GST_BASE_SRC_CAST(obj)          ((GstBaseSrc *)(obj))
-
-/**
- * GstBaseSrcFlags:
- * @GST_BASE_SRC_FLAG_STARTING: has source is starting
- * @GST_BASE_SRC_FLAG_STARTED: has source been started
- * @GST_BASE_SRC_FLAG_LAST: offset to define more flags
- *
- * The #GstElement flags that a basesrc element may have.
- */
-typedef enum {
-  GST_BASE_SRC_FLAG_STARTING     = (GST_ELEMENT_FLAG_LAST << 0),
-  GST_BASE_SRC_FLAG_STARTED      = (GST_ELEMENT_FLAG_LAST << 1),
-  /* padding */
-  GST_BASE_SRC_FLAG_LAST         = (GST_ELEMENT_FLAG_LAST << 6)
-} GstBaseSrcFlags;
-
-#define GST_BASE_SRC_IS_STARTING(obj) GST_OBJECT_FLAG_IS_SET ((obj), GST_BASE_SRC_FLAG_STARTING)
-#define GST_BASE_SRC_IS_STARTED(obj)  GST_OBJECT_FLAG_IS_SET ((obj), GST_BASE_SRC_FLAG_STARTED)
-
-typedef struct _GstBaseSrc GstBaseSrc;
-typedef struct _GstBaseSrcClass GstBaseSrcClass;
-typedef struct _GstBaseSrcPrivate GstBaseSrcPrivate;
-
-/**
- * GST_BASE_SRC_PAD:
- * @obj: base source instance
- *
- * Gives the pointer to the #GstPad object of the element.
- */
-#define GST_BASE_SRC_PAD(obj)                 (GST_BASE_SRC_CAST (obj)->srcpad)
-
-
-/**
- * GstBaseSrc:
- *
- * The opaque #GstBaseSrc data structure.
- */
-struct _GstBaseSrc {
-  GstElement     element;
-
-  /*< protected >*/
-  GstPad        *srcpad;
-
-  /* available to subclass implementations */
-  /* MT-protected (with LIVE_LOCK) */
-  GMutex         live_lock;
-  GCond          live_cond;
-  gboolean       is_live;
-  gboolean       live_running;
-
-  /* MT-protected (with LOCK) */
-  guint          blocksize;     /* size of buffers when operating push based */
-  gboolean       can_activate_push;     /* some scheduling properties */
-  gboolean       random_access;
-
-  GstClockID     clock_id;      /* for syncing */
-
-  /* MT-protected (with STREAM_LOCK *and* OBJECT_LOCK) */
-  GstSegment     segment;
-  /* MT-protected (with STREAM_LOCK) */
-  gboolean       need_newsegment;
-
-  gint           num_buffers;
-  gint           num_buffers_left;
-
-  gboolean       typefind;
-  gboolean       running;
-  GstEvent      *pending_seek;
-
-  GstBaseSrcPrivate *priv;
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstBaseSrcClass:
- * @parent_class: Element parent class
- * @get_caps: Called to get the caps to report
- * @negotiate: Negotiated the caps with the peer.
- * @fixate: Called during negotiation if caps need fixating. Implement instead of
- *   setting a fixate function on the source pad.
- * @set_caps: Notify subclass of changed output caps
- * @decide_allocation: configure the allocation query
- * @start: Start processing. Subclasses should open resources and prepare
- *    to produce data. Implementation should call gst_base_src_start_complete()
- *    when the operation completes, either from the current thread or any other
- *    thread that finishes the start operation asynchronously.
- * @stop: Stop processing. Subclasses should use this to close resources.
- * @get_times: Given a buffer, return the start and stop time when it
- *    should be pushed out. The base class will sync on the clock using
- *    these times.
- * @get_size: Return the total size of the resource, in the configured format.
- * @is_seekable: Check if the source can seek
- * @prepare_seek_segment: Prepare the GstSegment that will be passed to the
- *   do_seek vmethod for executing a seek request. Sub-classes should override
- *   this if they support seeking in formats other than the configured native
- *   format. By default, it tries to convert the seek arguments to the
- *   configured native format and prepare a segment in that format.
- * @do_seek: Perform seeking on the resource to the indicated segment.
- * @unlock: Unlock any pending access to the resource. Subclasses should
- *    unblock any blocked function ASAP. In particular, any create() function in
- *    progress should be unblocked and should return GST_FLOW_FLUSHING. Any
- *    future @create<!-- -->() function call should also return GST_FLOW_FLUSHING
- *    until the @unlock_stop<!-- -->() function has been called.
- * @unlock_stop: Clear the previous unlock request. Subclasses should clear
- *    any state they set during unlock(), such as clearing command queues.
- * @query: Handle a requested query.
- * @event: Override this to implement custom event handling.
- * @create: Ask the subclass to create a buffer with offset and size.
- *   When the subclass returns GST_FLOW_OK, it MUST return a buffer of the
- *   requested size unless fewer bytes are available because an EOS condition
- *   is near. No buffer should be returned when the return value is different
- *   from GST_FLOW_OK. A return value of GST_FLOW_EOS signifies that the
- *   end of stream is reached. The default implementation will call @alloc and
- *   then call @fill.
- * @alloc: Ask the subclass to allocate a buffer with for offset and size. The
- *   default implementation will create a new buffer from the negotiated allocator.
- * @fill: Ask the subclass to fill the buffer with data for offset and size. The
- *   passed buffer is guaranteed to hold the requested amount of bytes.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At the minimum, the @create method should be overridden to produce
- * buffers.
- */
-struct _GstBaseSrcClass {
-  GstElementClass parent_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  /* get caps from subclass */
-  GstCaps*      (*get_caps)     (GstBaseSrc *src, GstCaps *filter);
-  /* decide on caps */
-  gboolean      (*negotiate)    (GstBaseSrc *src);
-  /* called if, in negotiation, caps need fixating */
-  GstCaps *     (*fixate)       (GstBaseSrc *src, GstCaps *caps);
-  /* notify the subclass of new caps */
-  gboolean      (*set_caps)     (GstBaseSrc *src, GstCaps *caps);
-
-  /* setup allocation query */
-  gboolean      (*decide_allocation)   (GstBaseSrc *src, GstQuery *query);
-
-  /* start and stop processing, ideal for opening/closing the resource */
-  gboolean      (*start)        (GstBaseSrc *src);
-  gboolean      (*stop)         (GstBaseSrc *src);
-
-  /* given a buffer, return start and stop time when it should be pushed
-   * out. The base class will sync on the clock using these times. */
-  void          (*get_times)    (GstBaseSrc *src, GstBuffer *buffer,
-                                 GstClockTime *start, GstClockTime *end);
-
-  /* get the total size of the resource in bytes */
-  gboolean      (*get_size)     (GstBaseSrc *src, guint64 *size);
-
-  /* check if the resource is seekable */
-  gboolean      (*is_seekable)  (GstBaseSrc *src);
-
-  /* Prepare the segment on which to perform do_seek(), converting to the
-   * current basesrc format. */
-  gboolean      (*prepare_seek_segment) (GstBaseSrc *src, GstEvent *seek,
-                                         GstSegment *segment);
-  /* notify subclasses of a seek */
-  gboolean      (*do_seek)      (GstBaseSrc *src, GstSegment *segment);
-
-  /* unlock any pending access to the resource. subclasses should unlock
-   * any function ASAP. */
-  gboolean      (*unlock)       (GstBaseSrc *src);
-  /* Clear any pending unlock request, as we succeeded in unlocking */
-  gboolean      (*unlock_stop)  (GstBaseSrc *src);
-
-  /* notify subclasses of a query */
-  gboolean      (*query)        (GstBaseSrc *src, GstQuery *query);
-
-  /* notify subclasses of an event */
-  gboolean      (*event)        (GstBaseSrc *src, GstEvent *event);
-
-  /* ask the subclass to create a buffer with offset and size, the default
-   * implementation will call alloc and fill. */
-  GstFlowReturn (*create)       (GstBaseSrc *src, guint64 offset, guint size,
-                                 GstBuffer **buf);
-  /* ask the subclass to allocate an output buffer. The default implementation
-   * will use the negotiated allocator. */
-  GstFlowReturn (*alloc)        (GstBaseSrc *src, guint64 offset, guint size,
-                                 GstBuffer **buf);
-  /* ask the subclass to fill the buffer with data from offset and size */
-  GstFlowReturn (*fill)         (GstBaseSrc *src, guint64 offset, guint size,
-                                 GstBuffer *buf);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType gst_base_src_get_type (void);
-
-GstFlowReturn   gst_base_src_wait_playing     (GstBaseSrc *src);
-
-void            gst_base_src_set_live         (GstBaseSrc *src, gboolean live);
-gboolean        gst_base_src_is_live          (GstBaseSrc *src);
-
-void            gst_base_src_set_format       (GstBaseSrc *src, GstFormat format);
-
-void            gst_base_src_set_dynamic_size (GstBaseSrc * src, gboolean dynamic);
-
-void            gst_base_src_set_async        (GstBaseSrc *src, gboolean async);
-gboolean        gst_base_src_is_async         (GstBaseSrc *src);
-
-void            gst_base_src_start_complete   (GstBaseSrc * basesrc, GstFlowReturn ret);
-GstFlowReturn   gst_base_src_start_wait       (GstBaseSrc * basesrc);
-
-gboolean        gst_base_src_query_latency    (GstBaseSrc *src, gboolean * live,
-                                               GstClockTime * min_latency,
-                                               GstClockTime * max_latency);
-
-void            gst_base_src_set_blocksize    (GstBaseSrc *src, guint blocksize);
-guint           gst_base_src_get_blocksize    (GstBaseSrc *src);
-
-void            gst_base_src_set_do_timestamp (GstBaseSrc *src, gboolean timestamp);
-gboolean        gst_base_src_get_do_timestamp (GstBaseSrc *src);
-
-gboolean        gst_base_src_new_seamless_segment (GstBaseSrc *src, gint64 start, gint64 stop, gint64 time);
-
-gboolean        gst_base_src_set_caps         (GstBaseSrc *src, GstCaps *caps);
-
-GstBufferPool * gst_base_src_get_buffer_pool  (GstBaseSrc *src);
-void            gst_base_src_get_allocator    (GstBaseSrc *src,
-                                               GstAllocator **allocator,
-                                               GstAllocationParams *params);
-
-
-G_END_DECLS
-
-#endif /* __GST_BASE_SRC_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasetransform.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasetransform.h
deleted file mode 100644
index 666fbb19..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbasetransform.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BASE_TRANSFORM_H__
-#define __GST_BASE_TRANSFORM_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BASE_TRANSFORM		   (gst_base_transform_get_type())
-#define GST_BASE_TRANSFORM(obj)		   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_TRANSFORM,GstBaseTransform))
-#define GST_BASE_TRANSFORM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_TRANSFORM,GstBaseTransformClass))
-#define GST_BASE_TRANSFORM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_BASE_TRANSFORM,GstBaseTransformClass))
-#define GST_IS_BASE_TRANSFORM(obj)	   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_TRANSFORM))
-#define GST_IS_BASE_TRANSFORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_TRANSFORM))
-#define GST_BASE_TRANSFORM_CAST(obj)	((GstBaseTransform *)(obj))
-
-/**
- * GST_BASE_TRANSFORM_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- */
-#define GST_BASE_TRANSFORM_SINK_NAME	"sink"
-/**
- * GST_BASE_TRANSFORM_SRC_NAME:
- *
- * The name of the templates for the source pad.
- */
-#define GST_BASE_TRANSFORM_SRC_NAME	"src"
-
-/**
- * GST_BASE_TRANSFORM_SRC_PAD:
- * @obj: base transform instance
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_BASE_TRANSFORM_SRC_PAD(obj)		(GST_BASE_TRANSFORM_CAST (obj)->srcpad)
-
-/**
- * GST_BASE_TRANSFORM_SINK_PAD:
- * @obj: base transform instance
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_BASE_TRANSFORM_SINK_PAD(obj)	(GST_BASE_TRANSFORM_CAST (obj)->sinkpad)
-
-/**
- * GST_BASE_TRANSFORM_FLOW_DROPPED:
- *
- * A #GstFlowReturn that can be returned from transform and transform_ip to
- * indicate that no output buffer was generated.
- */
-#define GST_BASE_TRANSFORM_FLOW_DROPPED   GST_FLOW_CUSTOM_SUCCESS
-
-typedef struct _GstBaseTransform GstBaseTransform;
-typedef struct _GstBaseTransformClass GstBaseTransformClass;
-typedef struct _GstBaseTransformPrivate GstBaseTransformPrivate;
-
-/**
- * GstBaseTransform:
- *
- * The opaque #GstBaseTransform data structure.
- */
-struct _GstBaseTransform {
-  GstElement	 element;
-
-  /*< protected >*/
-  /* source and sink pads */
-  GstPad	*sinkpad;
-  GstPad	*srcpad;
-
-  /* MT-protected (with STREAM_LOCK) */
-  gboolean       have_segment;
-  GstSegment     segment;
-
-  /*< private >*/
-  GstBaseTransformPrivate *priv;
-
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-/**
- * GstBaseTransformClass:
- * @parent_class:   Element parent class
- * @passthrough_on_same_caps: If set to %TRUE, passthrough mode will be
- *                            automatically enabled if the caps are the same.
- *                            Set to %FALSE by default.
- * @transform_ip_on_passthrough: If set to %TRUE, @transform_ip will be called in
- *                           passthrough mode. The passed buffer might not be
- *                           writable. When %FALSE, neither @transform nor
- *                           @transform_ip will be called in passthrough mode.
- *                           Set to %TRUE by default.
- * @transform_caps: Optional.  Given the pad in this direction and the given
- *                  caps, what caps are allowed on the other pad in this
- *                  element ?
- * @fixate_caps:    Optional. Given the pad in this direction and the given
- *                  caps, fixate the caps on the other pad. The function takes
- *                  ownership of @othercaps and returns a fixated version of
- *                  @othercaps. @othercaps is not guaranteed to be writable.
- * @accept_caps:    Optional.
- *                  Subclasses can override this method to check if @caps can be
- *                  handled by the element. The default implementation might not be
- *                  the most optimal way to check this in all cases.
- * @set_caps:       allows the subclass to be notified of the actual caps set.
- * @query:          Optional.
- *                  Handle a requested query. Subclasses that implement this
- *                  should must chain up to the parent if they didn't handle the
- *                  query
- * @decide_allocation: Setup the allocation parameters for allocating output
- *                    buffers. The passed in query contains the result of the
- *                    downstream allocation query. This function is only called
- *                    when not operating in passthrough mode. The default
- *                    implementation will remove all memory dependent metadata.
- *                    If there is ia @filter_meta method implementation, it will
- *                    be called for all metadata API in the downstream query,
- *                    otherwise the metadata API is removed.
- * @filter_meta: Return TRUE if the metadata API should be proposed in the
- *               upstream allocation query. The default implementation is NULL
- *               and will cause all metadata to be removed.
- * @propose_allocation: Propose buffer allocation parameters for upstream elements.
- *                      This function must be implemented if the element reads or
- *                      writes the buffer content. The query that was passed to
- *                      the decide_allocation is passed in this method (or NULL
- *                      when the element is in passthrough mode). The default
- *                      implementation will pass the query downstream when in
- *                      passthrough mode and will copy all the filtered metadata
- *                      API in non-passthrough mode.
- * @transform_size: Optional. Given the size of a buffer in the given direction
- *                  with the given caps, calculate the size in bytes of a buffer
- *                  on the other pad with the given other caps.
- *                  The default implementation uses get_unit_size and keeps
- *                  the number of units the same.
- * @get_unit_size:  Required if the transform is not in-place.
- *                  get the size in bytes of one unit for the given caps.
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. The default implementation
- *                  handles the event and forwards it downstream.
- * @src_event:      Optional.
- *                  Event handler on the source pad. The default implementation
- *                  handles the event and forwards it upstream.
- * @prepare_output_buffer: Optional.
- *                         Subclasses can override this to do their own
- *                         allocation of output buffers.  Elements that only do
- *                         analysis can return a subbuffer or even just
- *                         return a reference to the input buffer (if in
- *                         passthrough mode). The default implementation will
- *                         use the negotiated allocator or bufferpool and
- *                         transform_size to allocate an output buffer or it
- *                         will return the input buffer in passthrough mode.
- * @copy_metadata: Optional.
- *                 Copy the metadata from the input buffer to the output buffer.
- *                 The default implementation will copy the flags, timestamps and
- *                 offsets of the buffer.
- * @transform_meta: Optional. Transform the metadata on the input buffer to the
- *                  output buffer. By default this method is NULL and no
- *                  metadata is copied. subclasses can implement this method and
- *                  return TRUE if the metadata is to be copied.
- * @before_transform: Optional.
- *                    This method is called right before the base class will
- *                    start processing. Dynamic properties or other delayed
- *                    configuration could be performed in this method.
- * @transform:      Required if the element does not operate in-place.
- *                  Transforms one incoming buffer to one outgoing buffer.
- *                  The function is allowed to change size/timestamp/duration
- *                  of the outgoing buffer.
- * @transform_ip:   Required if the element operates in-place.
- *                  Transform the incoming buffer in-place.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum either @transform or @transform_ip need to be overridden.
- * If the element can overwrite the input data with the results (data is of the
- * same type and quantity) it should provide @transform_ip.
- */
-struct _GstBaseTransformClass {
-  GstElementClass parent_class;
-
-  /*< public >*/
-  gboolean       passthrough_on_same_caps;
-  gboolean       transform_ip_on_passthrough;
-
-  /* virtual methods for subclasses */
-  GstCaps*	(*transform_caps) (GstBaseTransform *trans,
-                                   GstPadDirection direction,
-                                   GstCaps *caps, GstCaps *filter);
-  GstCaps*	(*fixate_caps)	  (GstBaseTransform *trans,
-                                   GstPadDirection direction, GstCaps *caps,
-                                   GstCaps *othercaps);
-  gboolean      (*accept_caps)    (GstBaseTransform *trans, GstPadDirection direction,
-                                   GstCaps *caps);
-  gboolean      (*set_caps)       (GstBaseTransform *trans, GstCaps *incaps,
-                                   GstCaps *outcaps);
-  gboolean      (*query)          (GstBaseTransform *trans, GstPadDirection direction,
-                                   GstQuery *query);
-
-  /* decide allocation query for output buffers */
-  gboolean      (*decide_allocation)  (GstBaseTransform *trans, GstQuery *query);
-  gboolean      (*filter_meta)        (GstBaseTransform *trans, GstQuery *query,
-                                       GType api, const GstStructure *params);
-
-  /* propose allocation query parameters for input buffers */
-  gboolean      (*propose_allocation) (GstBaseTransform *trans, GstQuery *decide_query,
-                                       GstQuery *query);
-
-  /* transform size */
-  gboolean      (*transform_size) (GstBaseTransform *trans,
-                                   GstPadDirection direction,
-                                   GstCaps *caps, gsize size,
-                                   GstCaps *othercaps, gsize *othersize);
-
-  gboolean      (*get_unit_size)  (GstBaseTransform *trans, GstCaps *caps,
-                                   gsize *size);
-
-  /* states */
-  gboolean      (*start)        (GstBaseTransform *trans);
-  gboolean      (*stop)         (GstBaseTransform *trans);
-
-  /* sink and src pad event handlers */
-  gboolean      (*sink_event)   (GstBaseTransform *trans, GstEvent *event);
-  gboolean      (*src_event)    (GstBaseTransform *trans, GstEvent *event);
-
-  GstFlowReturn (*prepare_output_buffer) (GstBaseTransform * trans,
-                                          GstBuffer *input, GstBuffer **outbuf);
-
-  /* metadata */
-  gboolean      (*copy_metadata)     (GstBaseTransform *trans, GstBuffer *input,
-                                      GstBuffer *outbuf);
-  gboolean      (*transform_meta)    (GstBaseTransform *trans, GstBuffer *outbuf,
-                                      GstMeta *meta, GstBuffer *inbuf);
-
-  void          (*before_transform)  (GstBaseTransform *trans, GstBuffer *buffer);
-
-  /* transform */
-  GstFlowReturn (*transform)    (GstBaseTransform *trans, GstBuffer *inbuf,
-                                 GstBuffer *outbuf);
-  GstFlowReturn (*transform_ip) (GstBaseTransform *trans, GstBuffer *buf);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType           gst_base_transform_get_type         (void);
-
-void		gst_base_transform_set_passthrough  (GstBaseTransform *trans,
-	                                             gboolean passthrough);
-gboolean	gst_base_transform_is_passthrough   (GstBaseTransform *trans);
-
-void		gst_base_transform_set_in_place     (GstBaseTransform *trans,
-	                                             gboolean in_place);
-gboolean	gst_base_transform_is_in_place      (GstBaseTransform *trans);
-
-void		gst_base_transform_update_qos       (GstBaseTransform *trans,
-						     gdouble proportion,
-						     GstClockTimeDiff diff,
-						     GstClockTime timestamp);
-void		gst_base_transform_set_qos_enabled  (GstBaseTransform *trans,
-		                                     gboolean enabled);
-gboolean	gst_base_transform_is_qos_enabled   (GstBaseTransform *trans);
-
-void            gst_base_transform_set_gap_aware    (GstBaseTransform *trans,
-                                                     gboolean gap_aware);
-
-void            gst_base_transform_set_prefer_passthrough (GstBaseTransform *trans,
-                                                           gboolean prefer_passthrough);
-
-GstBufferPool * gst_base_transform_get_buffer_pool  (GstBaseTransform *trans);
-void            gst_base_transform_get_allocator    (GstBaseTransform *trans,
-                                                     GstAllocator **allocator,
-                                                     GstAllocationParams *params);
-
-void		gst_base_transform_reconfigure_sink (GstBaseTransform *trans);
-void		gst_base_transform_reconfigure_src  (GstBaseTransform *trans);
-G_END_DECLS
-
-#endif /* __GST_BASE_TRANSFORM_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbitreader.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbitreader.h
deleted file mode 100644
index 4a2b4a0d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbitreader.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BIT_READER_H__
-#define __GST_BIT_READER_H__
-
-#include <gst/gst.h>
-
-/* FIXME: inline functions */
-
-G_BEGIN_DECLS
-
-#define GST_BIT_READER(reader) ((GstBitReader *) (reader))
-
-/**
- * GstBitReader:
- * @data: (array length=size): Data from which the bit reader will
- *   read
- * @size: Size of @data in bytes
- * @byte: Current byte position
- * @bit: Bit position in the current byte
- *
- * A bit reader instance.
- */
-typedef struct {
-  const guint8 *data;
-  guint size;
-
-  guint byte;  /* Byte position */
-  guint bit;   /* Bit position in the current byte */
-
-  /* < private > */
-  gpointer _gst_reserved[GST_PADDING];
-} GstBitReader;
-
-GstBitReader *  gst_bit_reader_new              (const guint8 *data, guint size) G_GNUC_MALLOC;
-void            gst_bit_reader_free             (GstBitReader *reader);
-
-void            gst_bit_reader_init             (GstBitReader *reader, const guint8 *data, guint size);
-
-gboolean        gst_bit_reader_set_pos          (GstBitReader *reader, guint pos);
-guint           gst_bit_reader_get_pos          (const GstBitReader *reader);
-
-guint           gst_bit_reader_get_remaining    (const GstBitReader *reader);
-
-guint           gst_bit_reader_get_size         (const GstBitReader *reader);
-
-gboolean        gst_bit_reader_skip             (GstBitReader *reader, guint nbits);
-gboolean        gst_bit_reader_skip_to_byte     (GstBitReader *reader);
-
-gboolean        gst_bit_reader_get_bits_uint8   (GstBitReader *reader, guint8 *val, guint nbits);
-gboolean        gst_bit_reader_get_bits_uint16  (GstBitReader *reader, guint16 *val, guint nbits);
-gboolean        gst_bit_reader_get_bits_uint32  (GstBitReader *reader, guint32 *val, guint nbits);
-gboolean        gst_bit_reader_get_bits_uint64  (GstBitReader *reader, guint64 *val, guint nbits);
-
-gboolean        gst_bit_reader_peek_bits_uint8  (const GstBitReader *reader, guint8 *val, guint nbits);
-gboolean        gst_bit_reader_peek_bits_uint16 (const GstBitReader *reader, guint16 *val, guint nbits);
-gboolean        gst_bit_reader_peek_bits_uint32 (const GstBitReader *reader, guint32 *val, guint nbits);
-gboolean        gst_bit_reader_peek_bits_uint64 (const GstBitReader *reader, guint64 *val, guint nbits);
-
-/**
- * GST_BIT_READER_INIT:
- * @data: Data from which the #GstBitReader should read
- * @size: Size of @data in bytes
- *
- * A #GstBitReader must be initialized with this macro, before it can be
- * used. This macro can used be to initialize a variable, but it cannot
- * be assigned to a variable. In that case you have to use
- * gst_bit_reader_init().
- */
-#define GST_BIT_READER_INIT(data, size) {data, size, 0, 0}
-
-/* Unchecked variants */
-
-static inline void
-gst_bit_reader_skip_unchecked (GstBitReader * reader, guint nbits)
-{
-  reader->bit += nbits;
-  reader->byte += reader->bit / 8;
-  reader->bit = reader->bit % 8;
-}
-
-static inline void
-gst_bit_reader_skip_to_byte_unchecked (GstBitReader * reader)
-{
-  if (reader->bit) {
-    reader->bit = 0;
-    reader->byte++;
-  }
-}
-
-#define __GST_BIT_READER_READ_BITS_UNCHECKED(bits) \
-static inline guint##bits \
-gst_bit_reader_peek_bits_uint##bits##_unchecked (const GstBitReader *reader, guint nbits) \
-{ \
-  guint##bits ret = 0; \
-  const guint8 *data; \
-  guint byte, bit; \
-  \
-  data = reader->data; \
-  byte = reader->byte; \
-  bit = reader->bit; \
-  \
-  while (nbits > 0) { \
-    guint toread = MIN (nbits, 8 - bit); \
-    \
-    ret <<= toread; \
-    ret |= (data[byte] & (0xff >> bit)) >> (8 - toread - bit); \
-    \
-    bit += toread; \
-    if (bit >= 8) { \
-      byte++; \
-      bit = 0; \
-    } \
-    nbits -= toread; \
-  } \
-  \
-  return ret; \
-} \
-\
-static inline guint##bits \
-gst_bit_reader_get_bits_uint##bits##_unchecked (GstBitReader *reader, guint nbits) \
-{ \
-  guint##bits ret; \
-  \
-  ret = gst_bit_reader_peek_bits_uint##bits##_unchecked (reader, nbits); \
-  \
-  gst_bit_reader_skip_unchecked (reader, nbits); \
-  \
-  return ret; \
-}
-
-__GST_BIT_READER_READ_BITS_UNCHECKED (8)
-__GST_BIT_READER_READ_BITS_UNCHECKED (16)
-__GST_BIT_READER_READ_BITS_UNCHECKED (32)
-__GST_BIT_READER_READ_BITS_UNCHECKED (64)
-
-#undef __GST_BIT_READER_READ_BITS_UNCHECKED
-
-/* unchecked variants -- do not use */
-
-static inline guint
-_gst_bit_reader_get_size_unchecked (const GstBitReader * reader)
-{
-  return reader->size * 8;
-}
-
-static inline guint
-_gst_bit_reader_get_pos_unchecked (const GstBitReader * reader)
-{
-  return reader->byte * 8 + reader->bit;
-}
-
-static inline guint
-_gst_bit_reader_get_remaining_unchecked (const GstBitReader * reader)
-{
-  return reader->size * 8 - (reader->byte * 8 + reader->bit);
-}
-
-/* inlined variants -- do not use directly */
-static inline guint
-_gst_bit_reader_get_size_inline (const GstBitReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_bit_reader_get_size_unchecked (reader);
-}
-
-static inline guint
-_gst_bit_reader_get_pos_inline (const GstBitReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_bit_reader_get_pos_unchecked (reader);
-}
-
-static inline guint
-_gst_bit_reader_get_remaining_inline (const GstBitReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_bit_reader_get_remaining_unchecked (reader);
-}
-
-static inline gboolean
-_gst_bit_reader_skip_inline (GstBitReader * reader, guint nbits)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-
-  if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits)
-    return FALSE;
-
-  gst_bit_reader_skip_unchecked (reader, nbits);
-
-  return TRUE;
-}
-
-static inline gboolean
-_gst_bit_reader_skip_to_byte_inline (GstBitReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-
-  if (reader->byte > reader->size)
-    return FALSE;
-
-  gst_bit_reader_skip_to_byte_unchecked (reader);
-
-  return TRUE;
-}
-
-#define __GST_BIT_READER_READ_BITS_INLINE(bits) \
-static inline gboolean \
-_gst_bit_reader_get_bits_uint##bits##_inline (GstBitReader *reader, guint##bits *val, guint nbits) \
-{ \
-  g_return_val_if_fail (reader != NULL, FALSE); \
-  g_return_val_if_fail (val != NULL, FALSE); \
-  g_return_val_if_fail (nbits <= bits, FALSE); \
-  \
-  if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits) \
-    return FALSE; \
-\
-  *val = gst_bit_reader_get_bits_uint##bits##_unchecked (reader, nbits); \
-  return TRUE; \
-} \
-\
-static inline gboolean \
-_gst_bit_reader_peek_bits_uint##bits##_inline (const GstBitReader *reader, guint##bits *val, guint nbits) \
-{ \
-  g_return_val_if_fail (reader != NULL, FALSE); \
-  g_return_val_if_fail (val != NULL, FALSE); \
-  g_return_val_if_fail (nbits <= bits, FALSE); \
-  \
-  if (_gst_bit_reader_get_remaining_unchecked (reader) < nbits) \
-    return FALSE; \
-\
-  *val = gst_bit_reader_peek_bits_uint##bits##_unchecked (reader, nbits); \
-  return TRUE; \
-}
-
-__GST_BIT_READER_READ_BITS_INLINE (8)
-__GST_BIT_READER_READ_BITS_INLINE (16)
-__GST_BIT_READER_READ_BITS_INLINE (32)
-__GST_BIT_READER_READ_BITS_INLINE (64)
-
-#undef __GST_BIT_READER_READ_BITS_INLINE
-
-#ifndef GST_BIT_READER_DISABLE_INLINES
-
-#define gst_bit_reader_get_size(reader) \
-    _gst_bit_reader_get_size_inline (reader)
-#define gst_bit_reader_get_pos(reader) \
-    _gst_bit_reader_get_pos_inline (reader)
-#define gst_bit_reader_get_remaining(reader) \
-    _gst_bit_reader_get_remaining_inline (reader)
-
-/* we use defines here so we can add the G_LIKELY() */
-
-#define gst_bit_reader_skip(reader, nbits)\
-    G_LIKELY (_gst_bit_reader_skip_inline(reader, nbits))
-#define gst_bit_reader_skip_to_byte(reader)\
-    G_LIKELY (_gst_bit_reader_skip_to_byte_inline(reader))
-
-#define gst_bit_reader_get_bits_uint8(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_get_bits_uint8_inline (reader, val, nbits))
-#define gst_bit_reader_get_bits_uint16(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_get_bits_uint16_inline (reader, val, nbits))
-#define gst_bit_reader_get_bits_uint32(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_get_bits_uint32_inline (reader, val, nbits))
-#define gst_bit_reader_get_bits_uint64(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_get_bits_uint64_inline (reader, val, nbits))
-
-#define gst_bit_reader_peek_bits_uint8(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_peek_bits_uint8_inline (reader, val, nbits))
-#define gst_bit_reader_peek_bits_uint16(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_peek_bits_uint16_inline (reader, val, nbits))
-#define gst_bit_reader_peek_bits_uint32(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_peek_bits_uint32_inline (reader, val, nbits))
-#define gst_bit_reader_peek_bits_uint64(reader, val, nbits) \
-    G_LIKELY (_gst_bit_reader_peek_bits_uint64_inline (reader, val, nbits))
-#endif
-
-G_END_DECLS
-
-#endif /* __GST_BIT_READER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbytereader.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbytereader.h
deleted file mode 100644
index 15ac2ed0..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbytereader.h
+++ /dev/null
@@ -1,513 +0,0 @@
-/* GStreamer byte reader
- *
- * Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>.
- * Copyright (C) 2009 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BYTE_READER_H__
-#define __GST_BYTE_READER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_BYTE_READER(reader) ((GstByteReader *) (reader))
-
-/**
- * GstByteReader:
- * @data: (array length=size): Data from which the bit reader will
- *   read
- * @size: Size of @data in bytes
- * @byte: Current byte position
- *
- * A byte reader instance.
- */
-typedef struct {
-  const guint8 *data;
-  guint size;
-
-  guint byte;  /* Byte position */
-
-  /* < private > */
-  gpointer _gst_reserved[GST_PADDING];
-} GstByteReader;
-
-GstByteReader * gst_byte_reader_new             (const guint8 *data, guint size) G_GNUC_MALLOC;
-void            gst_byte_reader_free            (GstByteReader *reader);
-
-void            gst_byte_reader_init            (GstByteReader *reader, const guint8 *data, guint size);
-
-gboolean        gst_byte_reader_set_pos         (GstByteReader *reader, guint pos);
-guint           gst_byte_reader_get_pos         (const GstByteReader *reader);
-
-guint           gst_byte_reader_get_remaining   (const GstByteReader *reader);
-
-guint           gst_byte_reader_get_size        (const GstByteReader *reader);
-
-gboolean        gst_byte_reader_skip            (GstByteReader *reader, guint nbytes);
-
-gboolean        gst_byte_reader_get_uint8       (GstByteReader *reader, guint8 *val);
-gboolean        gst_byte_reader_get_int8        (GstByteReader *reader, gint8 *val);
-gboolean        gst_byte_reader_get_uint16_le   (GstByteReader *reader, guint16 *val);
-gboolean        gst_byte_reader_get_int16_le    (GstByteReader *reader, gint16 *val);
-gboolean        gst_byte_reader_get_uint16_be   (GstByteReader *reader, guint16 *val);
-gboolean        gst_byte_reader_get_int16_be    (GstByteReader *reader, gint16 *val);
-gboolean        gst_byte_reader_get_uint24_le   (GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_get_int24_le    (GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_get_uint24_be   (GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_get_int24_be    (GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_get_uint32_le   (GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_get_int32_le    (GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_get_uint32_be   (GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_get_int32_be    (GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_get_uint64_le   (GstByteReader *reader, guint64 *val);
-gboolean        gst_byte_reader_get_int64_le    (GstByteReader *reader, gint64 *val);
-gboolean        gst_byte_reader_get_uint64_be   (GstByteReader *reader, guint64 *val);
-gboolean        gst_byte_reader_get_int64_be    (GstByteReader *reader, gint64 *val);
-
-gboolean        gst_byte_reader_peek_uint8      (const GstByteReader *reader, guint8 *val);
-gboolean        gst_byte_reader_peek_int8       (const GstByteReader *reader, gint8 *val);
-gboolean        gst_byte_reader_peek_uint16_le  (const GstByteReader *reader, guint16 *val);
-gboolean        gst_byte_reader_peek_int16_le   (const GstByteReader *reader, gint16 *val);
-gboolean        gst_byte_reader_peek_uint16_be  (const GstByteReader *reader, guint16 *val);
-gboolean        gst_byte_reader_peek_int16_be   (const GstByteReader *reader, gint16 *val);
-gboolean        gst_byte_reader_peek_uint24_le  (const GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_peek_int24_le   (const GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_peek_uint24_be  (const GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_peek_int24_be   (const GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_peek_uint32_le  (const GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_peek_int32_le   (const GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_peek_uint32_be  (const GstByteReader *reader, guint32 *val);
-gboolean        gst_byte_reader_peek_int32_be   (const GstByteReader *reader, gint32 *val);
-gboolean        gst_byte_reader_peek_uint64_le  (const GstByteReader *reader, guint64 *val);
-gboolean        gst_byte_reader_peek_int64_le   (const GstByteReader *reader, gint64 *val);
-gboolean        gst_byte_reader_peek_uint64_be  (const GstByteReader *reader, guint64 *val);
-gboolean        gst_byte_reader_peek_int64_be   (const GstByteReader *reader, gint64 *val);
-
-gboolean        gst_byte_reader_get_float32_le  (GstByteReader *reader, gfloat *val);
-gboolean        gst_byte_reader_get_float32_be  (GstByteReader *reader, gfloat *val);
-gboolean        gst_byte_reader_get_float64_le  (GstByteReader *reader, gdouble *val);
-gboolean        gst_byte_reader_get_float64_be  (GstByteReader *reader, gdouble *val);
-
-gboolean        gst_byte_reader_peek_float32_le (const GstByteReader *reader, gfloat *val);
-gboolean        gst_byte_reader_peek_float32_be (const GstByteReader *reader, gfloat *val);
-gboolean        gst_byte_reader_peek_float64_le (const GstByteReader *reader, gdouble *val);
-gboolean        gst_byte_reader_peek_float64_be (const GstByteReader *reader, gdouble *val);
-
-gboolean        gst_byte_reader_dup_data        (GstByteReader * reader, guint size, guint8       ** val);
-gboolean        gst_byte_reader_get_data        (GstByteReader * reader, guint size, const guint8 ** val);
-gboolean        gst_byte_reader_peek_data       (const GstByteReader * reader, guint size, const guint8 ** val);
-
-#define gst_byte_reader_dup_string(reader,str) \
-    gst_byte_reader_dup_string_utf8(reader,str)
-
-gboolean        gst_byte_reader_dup_string_utf8  (GstByteReader * reader, gchar   ** str);
-gboolean        gst_byte_reader_dup_string_utf16 (GstByteReader * reader, guint16 ** str);
-gboolean        gst_byte_reader_dup_string_utf32 (GstByteReader * reader, guint32 ** str);
-
-#define gst_byte_reader_skip_string(reader) \
-    gst_byte_reader_skip_string_utf8(reader)
-
-gboolean        gst_byte_reader_skip_string_utf8  (GstByteReader * reader);
-gboolean        gst_byte_reader_skip_string_utf16 (GstByteReader * reader);
-gboolean        gst_byte_reader_skip_string_utf32 (GstByteReader * reader);
-
-#define gst_byte_reader_get_string(reader,str) \
-    gst_byte_reader_get_string_utf8(reader,str)
-
-#define gst_byte_reader_peek_string(reader,str) \
-    gst_byte_reader_peek_string_utf8(reader,str)
-
-gboolean        gst_byte_reader_get_string_utf8    (GstByteReader * reader, const gchar ** str);
-gboolean        gst_byte_reader_peek_string_utf8   (const GstByteReader * reader, const gchar ** str);
-
-guint           gst_byte_reader_masked_scan_uint32 (const GstByteReader * reader,
-                                                    guint32               mask,
-                                                    guint32               pattern,
-                                                    guint                 offset,
-                                                    guint                 size);
-
-/**
- * GST_BYTE_READER_INIT:
- * @data: Data from which the #GstByteReader should read
- * @size: Size of @data in bytes
- *
- * A #GstByteReader must be initialized with this macro, before it can be
- * used. This macro can used be to initialize a variable, but it cannot
- * be assigned to a variable. In that case you have to use
- * gst_byte_reader_init().
- */
-#define GST_BYTE_READER_INIT(data, size) {data, size, 0}
-
-/* unchecked variants */
-static inline void
-gst_byte_reader_skip_unchecked (GstByteReader * reader, guint nbytes)
-{
-  reader->byte += nbytes;
-}
-
-#define __GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(bits,type,lower,upper,adj) \
-\
-static inline type \
-gst_byte_reader_peek_##lower##_unchecked (const GstByteReader * reader) \
-{ \
-  type val = (type) GST_READ_##upper (reader->data + reader->byte); \
-  adj \
-  return val; \
-} \
-\
-static inline type \
-gst_byte_reader_get_##lower##_unchecked (GstByteReader * reader) \
-{ \
-  type val = gst_byte_reader_peek_##lower##_unchecked (reader); \
-  reader->byte += bits / 8; \
-  return val; \
-}
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(8,guint8,uint8,UINT8,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(8,gint8,int8,UINT8,/* */)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,guint16,uint16_le,UINT16_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,guint16,uint16_be,UINT16_BE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,gint16,int16_le,UINT16_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,gint16,int16_be,UINT16_BE,/* */)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,guint32,uint32_le,UINT32_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,guint32,uint32_be,UINT32_BE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gint32,int32_le,UINT32_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gint32,int32_be,UINT32_BE,/* */)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,guint32,uint24_le,UINT24_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,guint32,uint24_be,UINT24_BE,/* */)
-
-/* fix up the sign for 24-bit signed ints stored in 32-bit signed ints */
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,gint32,int24_le,UINT24_LE,
-    if (val & 0x00800000) val |= 0xff000000;)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,gint32,int24_be,UINT24_BE,
-    if (val & 0x00800000) val |= 0xff000000;)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,guint64,uint64_le,UINT64_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,guint64,uint64_be,UINT64_BE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gint64,int64_le,UINT64_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gint64,int64_be,UINT64_BE,/* */)
-
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gfloat,float32_le,FLOAT_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gfloat,float32_be,FLOAT_BE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gdouble,float64_le,DOUBLE_LE,/* */)
-__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gdouble,float64_be,DOUBLE_BE,/* */)
-
-#undef __GET_PEEK_BITS_UNCHECKED
-
-static inline const guint8 *
-gst_byte_reader_peek_data_unchecked (const GstByteReader * reader)
-{
-  return (const guint8 *) (reader->data + reader->byte);
-}
-
-static inline const guint8 *
-gst_byte_reader_get_data_unchecked (GstByteReader * reader, guint size)
-{
-  const guint8 *data;
-
-  data = gst_byte_reader_peek_data_unchecked (reader);
-  gst_byte_reader_skip_unchecked (reader, size);
-  return data;
-}
-
-static inline guint8 *
-gst_byte_reader_dup_data_unchecked (GstByteReader * reader, guint size)
-{
-  gconstpointer data = gst_byte_reader_get_data_unchecked (reader, size);
-  return (guint8 *) g_memdup (data, size);
-}
-
-/* Unchecked variants that should not be used */
-static inline guint
-_gst_byte_reader_get_pos_unchecked (const GstByteReader * reader)
-{
-  return reader->byte;
-}
-
-static inline guint
-_gst_byte_reader_get_remaining_unchecked (const GstByteReader * reader)
-{
-  return reader->size - reader->byte;
-}
-
-static inline guint
-_gst_byte_reader_get_size_unchecked (const GstByteReader * reader)
-{
-  return reader->size;
-}
-
-/* inlined variants (do not use directly) */
-
-static inline guint
-_gst_byte_reader_get_remaining_inline (const GstByteReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_byte_reader_get_remaining_unchecked (reader);
-}
-
-static inline guint
-_gst_byte_reader_get_size_inline (const GstByteReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_byte_reader_get_size_unchecked (reader);
-}
-
-#define __GST_BYTE_READER_GET_PEEK_BITS_INLINE(bits,type,name) \
-\
-static inline gboolean \
-_gst_byte_reader_peek_##name##_inline (const GstByteReader * reader, type * val) \
-{ \
-  g_return_val_if_fail (reader != NULL, FALSE); \
-  g_return_val_if_fail (val != NULL, FALSE); \
-  \
-  if (_gst_byte_reader_get_remaining_unchecked (reader) < (bits / 8)) \
-    return FALSE; \
-\
-  *val = gst_byte_reader_peek_##name##_unchecked (reader); \
-  return TRUE; \
-} \
-\
-static inline gboolean \
-_gst_byte_reader_get_##name##_inline (GstByteReader * reader, type * val) \
-{ \
-  g_return_val_if_fail (reader != NULL, FALSE); \
-  g_return_val_if_fail (val != NULL, FALSE); \
-  \
-  if (_gst_byte_reader_get_remaining_unchecked (reader) < (bits / 8)) \
-    return FALSE; \
-\
-  *val = gst_byte_reader_get_##name##_unchecked (reader); \
-  return TRUE; \
-}
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(8,guint8,uint8)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(8,gint8,int8)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,guint16,uint16_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,guint16,uint16_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,gint16,int16_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,gint16,int16_be)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,guint32,uint32_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,guint32,uint32_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gint32,int32_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gint32,int32_be)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,guint32,uint24_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,guint32,uint24_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,gint32,int24_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,gint32,int24_be)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,guint64,uint64_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,guint64,uint64_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gint64,int64_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gint64,int64_be)
-
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gfloat,float32_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gfloat,float32_be)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gdouble,float64_le)
-__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gdouble,float64_be)
-
-#undef __GST_BYTE_READER_GET_PEEK_BITS_INLINE
-
-#ifndef GST_BYTE_READER_DISABLE_INLINES
-
-#define gst_byte_reader_get_remaining(reader) \
-    _gst_byte_reader_get_remaining_inline(reader)
-
-#define gst_byte_reader_get_size(reader) \
-    _gst_byte_reader_get_size_inline(reader)
-
-#define gst_byte_reader_get_pos(reader) \
-    _gst_byte_reader_get_pos_inline(reader)
-
-/* we use defines here so we can add the G_LIKELY() */
-#define gst_byte_reader_get_uint8(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint8_inline(reader,val))
-#define gst_byte_reader_get_int8(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int8_inline(reader,val))
-#define gst_byte_reader_get_uint16_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint16_le_inline(reader,val))
-#define gst_byte_reader_get_int16_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int16_le_inline(reader,val))
-#define gst_byte_reader_get_uint16_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint16_be_inline(reader,val))
-#define gst_byte_reader_get_int16_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int16_be_inline(reader,val))
-#define gst_byte_reader_get_uint24_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint24_le_inline(reader,val))
-#define gst_byte_reader_get_int24_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int24_le_inline(reader,val))
-#define gst_byte_reader_get_uint24_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint24_be_inline(reader,val))
-#define gst_byte_reader_get_int24_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int24_be_inline(reader,val))
-#define gst_byte_reader_get_uint32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint32_le_inline(reader,val))
-#define gst_byte_reader_get_int32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int32_le_inline(reader,val))
-#define gst_byte_reader_get_uint32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint32_be_inline(reader,val))
-#define gst_byte_reader_get_int32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int32_be_inline(reader,val))
-#define gst_byte_reader_get_uint64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint64_le_inline(reader,val))
-#define gst_byte_reader_get_int64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int64_le_inline(reader,val))
-#define gst_byte_reader_get_uint64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_uint64_be_inline(reader,val))
-#define gst_byte_reader_get_int64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_int64_be_inline(reader,val))
-
-#define gst_byte_reader_peek_uint8(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint8_inline(reader,val))
-#define gst_byte_reader_peek_int8(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int8_inline(reader,val))
-#define gst_byte_reader_peek_uint16_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint16_le_inline(reader,val))
-#define gst_byte_reader_peek_int16_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int16_le_inline(reader,val))
-#define gst_byte_reader_peek_uint16_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint16_be_inline(reader,val))
-#define gst_byte_reader_peek_int16_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int16_be_inline(reader,val))
-#define gst_byte_reader_peek_uint24_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint24_le_inline(reader,val))
-#define gst_byte_reader_peek_int24_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int24_le_inline(reader,val))
-#define gst_byte_reader_peek_uint24_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint24_be_inline(reader,val))
-#define gst_byte_reader_peek_int24_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int24_be_inline(reader,val))
-#define gst_byte_reader_peek_uint32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint32_le_inline(reader,val))
-#define gst_byte_reader_peek_int32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int32_le_inline(reader,val))
-#define gst_byte_reader_peek_uint32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint32_be_inline(reader,val))
-#define gst_byte_reader_peek_int32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int32_be_inline(reader,val))
-#define gst_byte_reader_peek_uint64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint64_le_inline(reader,val))
-#define gst_byte_reader_peek_int64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int64_le_inline(reader,val))
-#define gst_byte_reader_peek_uint64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_uint64_be_inline(reader,val))
-#define gst_byte_reader_peek_int64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_int64_be_inline(reader,val))
-
-#define gst_byte_reader_get_float32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_float32_le_inline(reader,val))
-#define gst_byte_reader_get_float32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_float32_be_inline(reader,val))
-#define gst_byte_reader_get_float64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_float64_le_inline(reader,val))
-#define gst_byte_reader_get_float64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_get_float64_be_inline(reader,val))
-#define gst_byte_reader_peek_float32_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_float32_le_inline(reader,val))
-#define gst_byte_reader_peek_float32_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_float32_be_inline(reader,val))
-#define gst_byte_reader_peek_float64_le(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_float64_le_inline(reader,val))
-#define gst_byte_reader_peek_float64_be(reader,val) \
-    G_LIKELY(_gst_byte_reader_peek_float64_be_inline(reader,val))
-
-#endif /* GST_BYTE_READER_DISABLE_INLINES */
-
-static inline gboolean
-_gst_byte_reader_dup_data_inline (GstByteReader * reader, guint size, guint8 ** val)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-  g_return_val_if_fail (val != NULL, FALSE);
-
-  if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size))
-    return FALSE;
-
-  *val = gst_byte_reader_dup_data_unchecked (reader, size);
-  return TRUE;
-}
-
-static inline gboolean
-_gst_byte_reader_get_data_inline (GstByteReader * reader, guint size, const guint8 ** val)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-  g_return_val_if_fail (val != NULL, FALSE);
-
-  if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size))
-    return FALSE;
-
-  *val = gst_byte_reader_get_data_unchecked (reader, size);
-  return TRUE;
-}
-
-static inline gboolean
-_gst_byte_reader_peek_data_inline (const GstByteReader * reader, guint size, const guint8 ** val)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-  g_return_val_if_fail (val != NULL, FALSE);
-
-  if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size))
-    return FALSE;
-
-  *val = gst_byte_reader_peek_data_unchecked (reader);
-  return TRUE;
-}
-
-static inline guint
-_gst_byte_reader_get_pos_inline (const GstByteReader * reader)
-{
-  g_return_val_if_fail (reader != NULL, 0);
-
-  return _gst_byte_reader_get_pos_unchecked (reader);
-}
-
-static inline gboolean
-_gst_byte_reader_skip_inline (GstByteReader * reader, guint nbytes)
-{
-  g_return_val_if_fail (reader != NULL, FALSE);
-
-  if (G_UNLIKELY (_gst_byte_reader_get_remaining_unchecked (reader) < nbytes))
-    return FALSE;
-
-  reader->byte += nbytes;
-  return TRUE;
-}
-
-#ifndef GST_BYTE_READER_DISABLE_INLINES
-
-#define gst_byte_reader_dup_data(reader,size,val) \
-    G_LIKELY(_gst_byte_reader_dup_data_inline(reader,size,val))
-#define gst_byte_reader_get_data(reader,size,val) \
-    G_LIKELY(_gst_byte_reader_get_data_inline(reader,size,val))
-#define gst_byte_reader_peek_data(reader,size,val) \
-    G_LIKELY(_gst_byte_reader_peek_data_inline(reader,size,val))
-#define gst_byte_reader_skip(reader,nbytes) \
-    G_LIKELY(_gst_byte_reader_skip_inline(reader,nbytes))
-
-#endif /* GST_BYTE_READER_DISABLE_INLINES */
-
-G_END_DECLS
-
-#endif /* __GST_BYTE_READER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbytewriter.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbytewriter.h
deleted file mode 100644
index 079e16fc..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstbytewriter.h
+++ /dev/null
@@ -1,401 +0,0 @@
-/* GStreamer byte writer
- *
- * Copyright (C) 2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BYTE_WRITER_H__
-#define __GST_BYTE_WRITER_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbytereader.h>
-
-#include <string.h>
-
-G_BEGIN_DECLS
-
-#define GST_BYTE_WRITER(writer) ((GstByteWriter *) (writer))
-
-/**
- * GstByteWriter:
- * @parent: #GstByteReader parent
- * @alloc_size: Allocation size of the data
- * @fixed: If %TRUE no reallocations are allowed
- * @owned: If %FALSE no reallocations are allowed and copies of data are returned
- *
- * A byte writer instance.
- */
-typedef struct {
-  GstByteReader parent;
-
-  guint alloc_size;
-
-  gboolean fixed;
-  gboolean owned;
-
-  /* < private > */
-  gpointer _gst_reserved[GST_PADDING];
-} GstByteWriter;
-
-GstByteWriter * gst_byte_writer_new             (void) G_GNUC_MALLOC;
-GstByteWriter * gst_byte_writer_new_with_size   (guint size, gboolean fixed) G_GNUC_MALLOC;
-GstByteWriter * gst_byte_writer_new_with_data   (guint8 *data, guint size, gboolean initialized) G_GNUC_MALLOC;
-
-void            gst_byte_writer_init            (GstByteWriter *writer);
-void            gst_byte_writer_init_with_size  (GstByteWriter *writer, guint size, gboolean fixed);
-void            gst_byte_writer_init_with_data  (GstByteWriter *writer, guint8 *data,
-                                                 guint size, gboolean initialized);
-
-void            gst_byte_writer_free                    (GstByteWriter *writer);
-guint8 *        gst_byte_writer_free_and_get_data       (GstByteWriter *writer);
-GstBuffer *     gst_byte_writer_free_and_get_buffer     (GstByteWriter *writer) G_GNUC_MALLOC;
-
-void            gst_byte_writer_reset                   (GstByteWriter *writer);
-guint8 *        gst_byte_writer_reset_and_get_data      (GstByteWriter *writer);
-GstBuffer *     gst_byte_writer_reset_and_get_buffer    (GstByteWriter *writer) G_GNUC_MALLOC;
-
-/**
- * gst_byte_writer_get_pos:
- * @writer: #GstByteWriter instance
- *
- * Returns: The current position of the read/write cursor
- */
-/**
- * gst_byte_writer_set_pos:
- * @writer: #GstByteWriter instance
- * @pos: new position
- *
- * Sets the current read/write cursor of @writer. The new position
- * can only be between 0 and the current size.
- *
- * Returns: %TRUE if the new position could be set
- */
-/**
- * gst_byte_writer_get_size:
- * @writer: #GstByteWriter instance
- *
- * Returns: The current, initialized size of the data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC guint     gst_byte_writer_get_pos  (const GstByteWriter *writer);
-G_INLINE_FUNC gboolean  gst_byte_writer_set_pos  (GstByteWriter *writer, guint pos);
-G_INLINE_FUNC guint     gst_byte_writer_get_size (const GstByteWriter *writer);
-#else
-static inline guint
-gst_byte_writer_get_pos (const GstByteWriter *writer)
-{
-  return gst_byte_reader_get_pos ((const GstByteReader *) writer);
-}
-
-static inline gboolean
-gst_byte_writer_set_pos (GstByteWriter *writer, guint pos)
-{
-  return gst_byte_reader_set_pos (GST_BYTE_READER (writer), pos);
-}
-
-static inline guint
-gst_byte_writer_get_size (const GstByteWriter *writer)
-{
-  return gst_byte_reader_get_size ((const GstByteReader *) writer);
-}
-#endif
-
-guint           gst_byte_writer_get_remaining     (const GstByteWriter *writer);
-gboolean        gst_byte_writer_ensure_free_space (GstByteWriter *writer, guint size);
-
-gboolean        gst_byte_writer_put_uint8         (GstByteWriter *writer, guint8 val);
-gboolean        gst_byte_writer_put_int8          (GstByteWriter *writer, gint8 val);
-gboolean        gst_byte_writer_put_uint16_be     (GstByteWriter *writer, guint16 val);
-gboolean        gst_byte_writer_put_uint16_le     (GstByteWriter *writer, guint16 val);
-gboolean        gst_byte_writer_put_int16_be      (GstByteWriter *writer, gint16 val);
-gboolean        gst_byte_writer_put_int16_le      (GstByteWriter *writer, gint16 val);
-gboolean        gst_byte_writer_put_uint24_be     (GstByteWriter *writer, guint32 val);
-gboolean        gst_byte_writer_put_uint24_le     (GstByteWriter *writer, guint32 val);
-gboolean        gst_byte_writer_put_int24_be      (GstByteWriter *writer, gint32 val);
-gboolean        gst_byte_writer_put_int24_le      (GstByteWriter *writer, gint32 val);
-gboolean        gst_byte_writer_put_uint32_be     (GstByteWriter *writer, guint32 val);
-gboolean        gst_byte_writer_put_uint32_le     (GstByteWriter *writer, guint32 val);
-gboolean        gst_byte_writer_put_int32_be      (GstByteWriter *writer, gint32 val);
-gboolean        gst_byte_writer_put_int32_le      (GstByteWriter *writer, gint32 val);
-gboolean        gst_byte_writer_put_uint64_be     (GstByteWriter *writer, guint64 val);
-gboolean        gst_byte_writer_put_uint64_le     (GstByteWriter *writer, guint64 val);
-gboolean        gst_byte_writer_put_int64_be      (GstByteWriter *writer, gint64 val);
-gboolean        gst_byte_writer_put_int64_le      (GstByteWriter *writer, gint64 val);
-
-gboolean        gst_byte_writer_put_float32_be    (GstByteWriter *writer, gfloat val);
-gboolean        gst_byte_writer_put_float32_le    (GstByteWriter *writer, gfloat val);
-gboolean        gst_byte_writer_put_float64_be    (GstByteWriter *writer, gdouble val);
-gboolean        gst_byte_writer_put_float64_le    (GstByteWriter *writer, gdouble val);
-
-gboolean        gst_byte_writer_put_data          (GstByteWriter *writer, const guint8 *data, guint size);
-gboolean        gst_byte_writer_fill              (GstByteWriter *writer, guint8 value, guint size);
-gboolean        gst_byte_writer_put_string_utf8   (GstByteWriter *writer, const gchar *data);
-gboolean        gst_byte_writer_put_string_utf16  (GstByteWriter *writer, const guint16 *data);
-gboolean        gst_byte_writer_put_string_utf32  (GstByteWriter *writer, const guint32 *data);
-gboolean        gst_byte_writer_put_buffer        (GstByteWriter *writer, GstBuffer * buffer, gsize offset, gssize size);
-
-/**
- * gst_byte_writer_put_string:
- * @writer: #GstByteWriter instance
- * @data: (in) (array zero-terminated=1): Null terminated string
- *
- * Write a NUL-terminated string to @writer (including the terminator). The
- * string is assumed to be in an 8-bit encoding (e.g. ASCII,UTF-8 or
- * ISO-8859-1).
- *
- * Returns: %TRUE if the string could be written
- */
-#define gst_byte_writer_put_string(writer, data) \
-  gst_byte_writer_put_string_utf8(writer, data)
-
-static inline guint
-_gst_byte_writer_next_pow2 (guint n)
-{
-  guint ret = 16;
-
-  /* We start with 16, smaller allocations make no sense */
-
-  while (ret < n && ret > 0)
-    ret <<= 1;
-
-  return ret ? ret : n;
-}
-
-static inline gboolean
-_gst_byte_writer_ensure_free_space_inline (GstByteWriter * writer, guint size)
-{
-  gpointer data;
-
-  if (G_LIKELY (size <= writer->alloc_size - writer->parent.byte))
-    return TRUE;
-  if (G_UNLIKELY (writer->fixed || !writer->owned))
-    return FALSE;
-  if (G_UNLIKELY (writer->parent.byte > G_MAXUINT - size))
-    return FALSE;
-
-  writer->alloc_size = _gst_byte_writer_next_pow2 (writer->parent.byte + size);
-  data = g_try_realloc ((guint8 *) writer->parent.data, writer->alloc_size);
-  if (G_UNLIKELY (data == NULL))
-    return FALSE;
-
-  writer->parent.data = (guint8 *) data;
-
-  return TRUE;
-}
-
-#define __GST_BYTE_WRITER_CREATE_WRITE_FUNC(bits,type,name,write_func) \
-static inline void \
-gst_byte_writer_put_##name##_unchecked (GstByteWriter *writer, type val) \
-{ \
-  guint8 *write_data; \
-  \
-  write_data = (guint8 *) writer->parent.data + writer->parent.byte; \
-  write_func (write_data, val); \
-  writer->parent.byte += bits/8; \
-  writer->parent.size = MAX (writer->parent.size, writer->parent.byte); \
-} \
-\
-static inline gboolean \
-_gst_byte_writer_put_##name##_inline (GstByteWriter *writer, type val) \
-{ \
-  g_return_val_if_fail (writer != NULL, FALSE); \
-  \
-  if (G_UNLIKELY (!_gst_byte_writer_ensure_free_space_inline(writer, bits/8))) \
-    return FALSE; \
-  \
-  gst_byte_writer_put_##name##_unchecked (writer, val); \
-  \
-  return TRUE; \
-}
-
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (8, guint8, uint8, GST_WRITE_UINT8)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (8, gint8, int8, GST_WRITE_UINT8)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (16, guint16, uint16_le, GST_WRITE_UINT16_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (16, guint16, uint16_be, GST_WRITE_UINT16_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (16, gint16, int16_le, GST_WRITE_UINT16_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (16, gint16, int16_be, GST_WRITE_UINT16_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (24, guint32, uint24_le, GST_WRITE_UINT24_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (24, guint32, uint24_be, GST_WRITE_UINT24_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (24, gint32, int24_le, GST_WRITE_UINT24_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (24, gint32, int24_be, GST_WRITE_UINT24_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, guint32, uint32_le, GST_WRITE_UINT32_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, guint32, uint32_be, GST_WRITE_UINT32_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, gint32, int32_le, GST_WRITE_UINT32_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, gint32, int32_be, GST_WRITE_UINT32_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, guint64, uint64_le, GST_WRITE_UINT64_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, guint64, uint64_be, GST_WRITE_UINT64_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, gint64, int64_le, GST_WRITE_UINT64_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, gint64, int64_be, GST_WRITE_UINT64_BE)
-
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, gfloat, float32_be, GST_WRITE_FLOAT_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (32, gfloat, float32_le, GST_WRITE_FLOAT_LE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, gdouble, float64_be, GST_WRITE_DOUBLE_BE)
-__GST_BYTE_WRITER_CREATE_WRITE_FUNC (64, gdouble, float64_le, GST_WRITE_DOUBLE_LE)
-
-#undef __GST_BYTE_WRITER_CREATE_WRITE_FUNC
-
-static inline void
-gst_byte_writer_put_data_unchecked (GstByteWriter * writer, const guint8 * data,
-    guint size)
-{
-  memcpy ((guint8 *) & writer->parent.data[writer->parent.byte], data, size);
-  writer->parent.byte += size;
-  writer->parent.size = MAX (writer->parent.size, writer->parent.byte);
-}
-
-static inline gboolean
-_gst_byte_writer_put_data_inline (GstByteWriter * writer, const guint8 * data,
-    guint size)
-{
-  g_return_val_if_fail (writer != NULL, FALSE);
-
-  if (G_UNLIKELY (!_gst_byte_writer_ensure_free_space_inline (writer, size)))
-    return FALSE;
-
-  gst_byte_writer_put_data_unchecked (writer, data, size);
-
-  return TRUE;
-}
-
-static inline void
-gst_byte_writer_fill_unchecked (GstByteWriter * writer, guint8 value, guint size)
-{
-  memset ((guint8 *) & writer->parent.data[writer->parent.byte], value, size);
-  writer->parent.byte += size;
-  writer->parent.size = MAX (writer->parent.size, writer->parent.byte);
-}
-
-static inline gboolean
-_gst_byte_writer_fill_inline (GstByteWriter * writer, guint8 value, guint size)
-{
-  g_return_val_if_fail (writer != NULL, FALSE);
-
-  if (G_UNLIKELY (!_gst_byte_writer_ensure_free_space_inline (writer, size)))
-    return FALSE;
-
-  gst_byte_writer_fill_unchecked (writer, value, size);
-
-  return TRUE;
-}
-
-static inline void
-gst_byte_writer_put_buffer_unchecked (GstByteWriter * writer, GstBuffer * buffer,
-    gsize offset, gssize size)
-{
-  if (size == -1) {
-    size = gst_buffer_get_size (buffer);
-
-    if (offset >= (gsize) size)
-      return;
-
-    size -= offset;
-  }
-
-  gst_buffer_extract (buffer, offset,
-      (guint8 *) & writer->parent.data[writer->parent.byte], size);
-  writer->parent.byte += size;
-  writer->parent.size = MAX (writer->parent.size, writer->parent.byte);
-}
-
-static inline gboolean
-_gst_byte_writer_put_buffer_inline (GstByteWriter * writer, GstBuffer * buffer,
-    gsize offset, gssize size)
-{
-  g_return_val_if_fail (writer != NULL, FALSE);
-  g_return_val_if_fail (size >= -1, FALSE);
-
-  if (size == -1) {
-    size = gst_buffer_get_size (buffer);
-
-    if (offset >= (gsize) size)
-      return TRUE;
-
-    size -= offset;
-  }
-
-  if (G_UNLIKELY (!_gst_byte_writer_ensure_free_space_inline (writer, size)))
-    return FALSE;
-
-  gst_byte_writer_put_buffer_unchecked (writer, buffer, offset, size);
-
-  return TRUE;
-}
-
-#ifndef GST_BYTE_WRITER_DISABLE_INLINES
-
-/* we use defines here so we can add the G_LIKELY() */
-
-#define gst_byte_writer_ensure_free_space(writer, size) \
-    G_LIKELY (_gst_byte_writer_ensure_free_space_inline (writer, size))
-#define gst_byte_writer_put_uint8(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint8_inline (writer, val))
-#define gst_byte_writer_put_int8(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int8_inline (writer, val))
-#define gst_byte_writer_put_uint16_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint16_be_inline (writer, val))
-#define gst_byte_writer_put_uint16_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint16_le_inline (writer, val))
-#define gst_byte_writer_put_int16_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int16_be_inline (writer, val))
-#define gst_byte_writer_put_int16_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int16_le_inline (writer, val))
-#define gst_byte_writer_put_uint24_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint24_be_inline (writer, val))
-#define gst_byte_writer_put_uint24_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint24_le_inline (writer, val))
-#define gst_byte_writer_put_int24_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int24_be_inline (writer, val))
-#define gst_byte_writer_put_int24_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int24_le_inline (writer, val))
-#define gst_byte_writer_put_uint32_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint32_be_inline (writer, val))
-#define gst_byte_writer_put_uint32_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint32_le_inline (writer, val))
-#define gst_byte_writer_put_int32_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int32_be_inline (writer, val))
-#define gst_byte_writer_put_int32_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int32_le_inline (writer, val))
-#define gst_byte_writer_put_uint64_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint64_be_inline (writer, val))
-#define gst_byte_writer_put_uint64_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_uint64_le_inline (writer, val))
-#define gst_byte_writer_put_int64_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int64_be_inline (writer, val))
-#define gst_byte_writer_put_int64_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_int64_le_inline (writer, val))
-
-#define gst_byte_writer_put_float32_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_float32_be_inline (writer, val))
-#define gst_byte_writer_put_float32_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_float32_le_inline (writer, val))
-#define gst_byte_writer_put_float64_be(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_float64_be_inline (writer, val))
-#define gst_byte_writer_put_float64_le(writer, val) \
-    G_LIKELY (_gst_byte_writer_put_float64_le_inline (writer, val))
-
-#define gst_byte_writer_put_data(writer, data, size) \
-    G_LIKELY (_gst_byte_writer_put_data_inline (writer, data, size))
-#define gst_byte_writer_fill(writer, val, size) \
-    G_LIKELY (_gst_byte_writer_fill_inline (writer, val, size))
-#define gst_byte_writer_put_buffer(writer, buffer, offset, size) \
-    G_LIKELY (_gst_byte_writer_put_buffer_inline (writer, buffer, offset, size))
-
-#endif
-
-G_END_DECLS
-
-#endif /* __GST_BYTE_WRITER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstcollectpads.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstcollectpads.h
deleted file mode 100644
index c33ca4f5..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstcollectpads.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Wim Taymans <wim@fluendo.com>
- * Copyright (C) 2008 Mark Nauwelaerts <mnauw@users.sourceforge.net>
- *
- * gstcollectpads.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_COLLECT_PADS_H__
-#define __GST_COLLECT_PADS_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_COLLECT_PADS            (gst_collect_pads_get_type())
-#define GST_COLLECT_PADS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_COLLECT_PADS,GstCollectPads))
-#define GST_COLLECT_PADS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COLLECT_PADS,GstCollectPadsClass))
-#define GST_COLLECT_PADS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_COLLECT_PADS,GstCollectPadsClass))
-#define GST_IS_COLLECT_PADS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COLLECT_PADS))
-#define GST_IS_COLLECT_PADS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COLLECT_PADS))
-
-typedef struct _GstCollectData GstCollectData;
-typedef struct _GstCollectDataPrivate GstCollectDataPrivate;
-typedef struct _GstCollectPads GstCollectPads;
-typedef struct _GstCollectPadsPrivate GstCollectPadsPrivate;
-typedef struct _GstCollectPadsClass GstCollectPadsClass;
-
-/**
- * GstCollectDataDestroyNotify:
- * @data: the #GstCollectData that will be freed
- *
- * A function that will be called when the #GstCollectData will be freed.
- * It is passed the pointer to the structure and should free any custom
- * memory and resources allocated for it.
- */
-typedef void (*GstCollectDataDestroyNotify) (GstCollectData *data);
-
-/**
- * GstCollectPadsStateFlags:
- * @GST_COLLECT_PADS_STATE_EOS:         Set if collectdata's pad is EOS.
- * @GST_COLLECT_PADS_STATE_FLUSHING:    Set if collectdata's pad is flushing.
- * @GST_COLLECT_PADS_STATE_NEW_SEGMENT: Set if collectdata's pad received a
- *                                      new_segment event.
- * @GST_COLLECT_PADS_STATE_WAITING:     Set if collectdata's pad must be waited
- *                                      for when collecting.
- * @GST_COLLECT_PADS_STATE_LOCKED:      Set collectdata's pad WAITING state must
- *                                      not be changed.
- * #GstCollectPadsStateFlags indicate private state of a collectdata('s pad).
- */
-typedef enum {
-  GST_COLLECT_PADS_STATE_EOS = 1 << 0,
-  GST_COLLECT_PADS_STATE_FLUSHING = 1 << 1,
-  GST_COLLECT_PADS_STATE_NEW_SEGMENT = 1 << 2,
-  GST_COLLECT_PADS_STATE_WAITING = 1 << 3,
-  GST_COLLECT_PADS_STATE_LOCKED = 1 << 4
-} GstCollectPadsStateFlags;
-
-/**
- * GST_COLLECT_PADS_STATE:
- * @data: a #GstCollectData.
- *
- * A flags word containing #GstCollectPadsStateFlags flags set
- * on this collected pad.
- */
-#define GST_COLLECT_PADS_STATE(data)                 (((GstCollectData *) data)->state)
-/**
- * GST_COLLECT_PADS_STATE_IS_SET:
- * @data: a #GstCollectData.
- * @flag: the #GstCollectPadsStateFlags to check.
- *
- * Gives the status of a specific flag on a collected pad.
- */
-#define GST_COLLECT_PADS_STATE_IS_SET(data,flag)     !!(GST_COLLECT_PADS_STATE (data) & flag)
-/**
- * GST_COLLECT_PADS_STATE_SET:
- * @data: a #GstCollectData.
- * @flag: the #GstCollectPadsStateFlags to set.
- *
- * Sets a state flag on a collected pad.
- */
-#define GST_COLLECT_PADS_STATE_SET(data,flag)        (GST_COLLECT_PADS_STATE (data) |= flag)
-/**
- * GST_COLLECT_PADS_STATE_UNSET:
- * @data: a #GstCollectData.
- * @flag: the #GstCollectPadsStateFlags to clear.
- *
- * Clears a state flag on a collected pad.
- */
-#define GST_COLLECT_PADS_STATE_UNSET(data,flag)      (GST_COLLECT_PADS_STATE (data) &= ~(flag))
-
-/**
- * GstCollectData:
- * @collect: owner #GstCollectPads
- * @pad: #GstPad managed by this data
- * @buffer: currently queued buffer.
- * @pos: position in the buffer
- * @segment: last segment received.
- *
- * Structure used by the collect_pads.
- */
-struct _GstCollectData
-{
-  /* with STREAM_LOCK of @collect */
-  GstCollectPads        *collect;
-  GstPad                *pad;
-  GstBuffer             *buffer;
-  guint                  pos;
-  GstSegment             segment;
-
-  /*< private >*/
-  /* state: bitfield for easier extension;
-   * eos, flushing, new_segment, waiting */
-  GstCollectPadsStateFlags    state;
-
-  GstCollectDataPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstCollectPadsFunction:
- * @pads: the #GstCollectPads that trigered the callback
- * @user_data: user data passed to gst_collect_pads_set_function()
- *
- * A function that will be called when all pads have received data.
- *
- * Returns: #GST_FLOW_OK for success
- */
-typedef GstFlowReturn (*GstCollectPadsFunction) (GstCollectPads *pads, gpointer user_data);
-
-/**
- * GstCollectPadsBufferFunction:
- * @pads: the #GstCollectPads that trigered the callback
- * @data: the #GstCollectData of pad that has received the buffer
- * @buffer: (transfer full): the #GstBuffer
- * @user_data: user data passed to gst_collect_pads_set_buffer_function()
- *
- * A function that will be called when a (considered oldest) buffer can be muxed.
- * If all pads have reached EOS, this function is called with NULL @buffer
- * and NULL @data.
- *
- * Returns: #GST_FLOW_OK for success
- */
-typedef GstFlowReturn (*GstCollectPadsBufferFunction) (GstCollectPads *pads, GstCollectData *data,
-                                                       GstBuffer *buffer, gpointer user_data);
-
-/**
- * GstCollectPadsCompareFunction:
- * @pads: the #GstCollectPads that is comparing the timestamps
- * @data1: the first #GstCollectData
- * @timestamp1: the first timestamp
- * @data2: the second #GstCollectData
- * @timestamp2: the second timestamp
- * @user_data: user data passed to gst_collect_pads_set_compare_function()
- *
- * A function for comparing two timestamps of buffers or newsegments collected on one pad.
- *
- * Returns: Integer less than zero when first timestamp is deemed older than the second one.
- *          Zero if the timestamps are deemed equally old.
- *          Integer greate than zero when second timestamp is deemed older than the first one.
- */
-typedef gint (*GstCollectPadsCompareFunction) (GstCollectPads *pads,
-                                               GstCollectData * data1, GstClockTime timestamp1,
-                                               GstCollectData * data2, GstClockTime timestamp2,
-                                               gpointer user_data);
-
-/**
- * GstCollectPadsEventFunction:
- * @pads: the #GstCollectPads that trigered the callback
- * @pad: the #GstPad that received an event
- * @event: the #GstEvent received
- * @user_data: user data passed to gst_collect_pads_set_event_function()
- *
- * A function that will be called while processing an event. It takes
- * ownership of the event and is responsible for chaining up (to
- * gst_collect_pads_event_default()) or dropping events (such typical cases
- * being handled by the default handler).
- *
- * Returns: %TRUE if the pad could handle the event
- */
-typedef gboolean (*GstCollectPadsEventFunction)        (GstCollectPads *pads, GstCollectData * pad,
-                                                        GstEvent * event, gpointer user_data);
-
-
-/**
- * GstCollectPadsQueryFunction:
- * @pads: the #GstCollectPads that trigered the callback
- * @pad: the #GstPad that received an event
- * @query: the #GstEvent received
- * @user_data: user data passed to gst_collect_pads_set_query_function()
- *
- * A function that will be called while processing a query. It takes
- * ownership of the query and is responsible for chaining up (to
- * events downstream (with gst_pad_event_default()).
- *
- * Returns: %TRUE if the pad could handle the event
- */
-typedef gboolean (*GstCollectPadsQueryFunction)        (GstCollectPads *pads, GstCollectData * pad,
-                                                        GstQuery * query, gpointer user_data);
-
-/**
- * GstCollectPadsClipFunction:
- * @pads: a #GstCollectPads
- * @data: a #GstCollectData
- * @inbuffer: (transfer full): the input #GstBuffer
- * @outbuffer: the output #GstBuffer
- * @user_data: user data
- *
- * A function that will be called when @inbuffer is received on the pad managed
- * by @data in the collecpad object @pads.
- *
- * The function should use the segment of @data and the negotiated media type on
- * the pad to perform clipping of @inbuffer.
- *
- * This function takes ownership of @inbuffer and should output a buffer in
- * @outbuffer or return %NULL in @outbuffer if the buffer should be dropped.
- *
- * Returns: a #GstFlowReturn that corresponds to the result of clipping.
- */
-typedef GstFlowReturn (*GstCollectPadsClipFunction) (GstCollectPads *pads, GstCollectData *data,
-                                                     GstBuffer *inbuffer, GstBuffer **outbuffer,
-                                                     gpointer user_data);
-
-/**
- * GST_COLLECT_PADS_GET_STREAM_LOCK:
- * @pads: a #GstCollectPads
- *
- * Get the stream lock of @pads. The stream lock is used to coordinate and
- * serialize execution among the various streams being collected, and in
- * protecting the resources used to accomplish this.
- */
-#define GST_COLLECT_PADS_GET_STREAM_LOCK(pads) (&((GstCollectPads *)pads)->stream_lock)
-/**
- * GST_COLLECT_PADS_STREAM_LOCK:
- * @pads: a #GstCollectPads
- *
- * Lock the stream lock of @pads.
- */
-#define GST_COLLECT_PADS_STREAM_LOCK(pads)     g_rec_mutex_lock(GST_COLLECT_PADS_GET_STREAM_LOCK (pads))
-/**
- * GST_COLLECT_PADS_STREAM_UNLOCK:
- * @pads: a #GstCollectPads
- *
- * Unlock the stream lock of @pads.
- */
-#define GST_COLLECT_PADS_STREAM_UNLOCK(pads)   g_rec_mutex_unlock(GST_COLLECT_PADS_GET_STREAM_LOCK (pads))
-
-/**
- * GstCollectPads:
- * @data: #GList of #GstCollectData managed by this #GstCollectPads.
- *
- * Collectpads object.
- */
-struct _GstCollectPads {
-  GstObject      object;
-
-  /*< public >*/ /* with LOCK and/or STREAM_LOCK */
-  GSList        *data;                  /* list of CollectData items */
-
-  /*< private >*/
-  GRecMutex      stream_lock;          /* used to serialize collection among several streams */
-
-  GstCollectPadsPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstCollectPadsClass {
-  GstObjectClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_collect_pads_get_type(void);
-
-/* creating the object */
-GstCollectPads*        gst_collect_pads_new           (void);
-
-/* set the callbacks */
-void            gst_collect_pads_set_function         (GstCollectPads *pads,
-                                                       GstCollectPadsFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_buffer_function  (GstCollectPads *pads,
-                                                       GstCollectPadsBufferFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_event_function   (GstCollectPads *pads,
-                                                       GstCollectPadsEventFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_query_function   (GstCollectPads *pads,
-                                                       GstCollectPadsQueryFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_compare_function (GstCollectPads *pads,
-                                                       GstCollectPadsCompareFunction func,
-                                                       gpointer user_data);
-void            gst_collect_pads_set_clip_function    (GstCollectPads *pads,
-                                                       GstCollectPadsClipFunction clipfunc,
-                                                       gpointer user_data);
-
-/* pad management */
-GstCollectData* gst_collect_pads_add_pad       (GstCollectPads *pads, GstPad *pad, guint size,
-                                                GstCollectDataDestroyNotify destroy_notify,
-                                                gboolean lock);
-gboolean        gst_collect_pads_remove_pad    (GstCollectPads *pads, GstPad *pad);
-
-/* start/stop collection */
-void            gst_collect_pads_start         (GstCollectPads *pads);
-void            gst_collect_pads_stop          (GstCollectPads *pads);
-void            gst_collect_pads_set_flushing  (GstCollectPads *pads, gboolean flushing);
-
-/* get collected buffers */
-GstBuffer*      gst_collect_pads_peek          (GstCollectPads *pads, GstCollectData *data);
-GstBuffer*      gst_collect_pads_pop           (GstCollectPads *pads, GstCollectData *data);
-
-/* get collected bytes */
-guint           gst_collect_pads_available     (GstCollectPads *pads);
-guint           gst_collect_pads_flush         (GstCollectPads *pads, GstCollectData *data,
-                                                guint size);
-GstBuffer*      gst_collect_pads_read_buffer   (GstCollectPads * pads, GstCollectData * data,
-                                                guint size);
-GstBuffer*      gst_collect_pads_take_buffer   (GstCollectPads * pads, GstCollectData * data,
-                                                guint size);
-
-/* setting and unsetting waiting mode */
-void            gst_collect_pads_set_waiting   (GstCollectPads *pads, GstCollectData *data,
-                                                gboolean waiting);
-
-/* convenience helper */
-GstFlowReturn	gst_collect_pads_clip_running_time (GstCollectPads * pads,
-					            GstCollectData * cdata,
-                                                    GstBuffer * buf, GstBuffer ** outbuf,
-                                                    gpointer user_data);
-
-/* default handlers */
-gboolean        gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data,
-                                                GstEvent * event, gboolean discard);
-gboolean        gst_collect_pads_query_default (GstCollectPads * pads, GstCollectData * data,
-                                                GstQuery * query, gboolean discard);
-
-
-G_END_DECLS
-
-#endif /* __GST_COLLECT_PADS_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstpushsrc.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstpushsrc.h
deleted file mode 100644
index b936d83f..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gstpushsrc.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstpushsrc.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PUSH_SRC_H__
-#define __GST_PUSH_SRC_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasesrc.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PUSH_SRC               (gst_push_src_get_type())
-#define GST_PUSH_SRC(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PUSH_SRC,GstPushSrc))
-#define GST_PUSH_SRC_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PUSH_SRC,GstPushSrcClass))
-#define GST_PUSH_SRC_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PUSH_SRC, GstPushSrcClass))
-#define GST_IS_PUSH_SRC(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PUSH_SRC))
-#define GST_IS_PUSH_SRC_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PUSH_SRC))
-
-typedef struct _GstPushSrc GstPushSrc;
-typedef struct _GstPushSrcClass GstPushSrcClass;
-
-/**
- * GstPushSrc:
- *
- * The opaque #GstPushSrc data structure.
- */
-struct _GstPushSrc {
-  GstBaseSrc     parent;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstPushSrcClass {
-  GstBaseSrcClass parent_class;
-
-  /* ask the subclass to create a buffer, the default implementation
-   * uses alloc and fill */
-  GstFlowReturn (*create) (GstPushSrc *src, GstBuffer **buf);
-  /* allocate memory for a buffer */
-  GstFlowReturn (*alloc)  (GstPushSrc *src, GstBuffer **buf);
-  /* ask the subclass to fill a buffer */
-  GstFlowReturn (*fill)   (GstPushSrc *src, GstBuffer *buf);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_push_src_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_PUSH_SRC_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gsttypefindhelper.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gsttypefindhelper.h
deleted file mode 100644
index a61c0428..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/base/gsttypefindhelper.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) 2000,2005 Wim Taymans <wim@fluendo.com>
- * Copyright (C) 2006      Tim-Philipp Müller <tim centricular net>
- *
- * gsttypefindhelper.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TYPEFINDHELPER_H__
-#define __GST_TYPEFINDHELPER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-GstCaps * gst_type_find_helper (GstPad *src, guint64 size);
-
-GstCaps * gst_type_find_helper_for_data   (GstObject              *obj,
-                                           const guint8           *data,
-                                           gsize                   size,
-                                           GstTypeFindProbability *prob);
-GstCaps * gst_type_find_helper_for_buffer (GstObject              *obj,
-                                           GstBuffer              *buf,
-                                           GstTypeFindProbability *prob);
-
-GstCaps * gst_type_find_helper_for_extension (GstObject * obj,
-                                              const gchar * extension);
-
-/**
- * GstTypeFindHelperGetRangeFunction:
- * @obj: a #GstObject that will handle the getrange request
- * @parent: the parent of @obj or NULL
- * @offset: the offset of the range
- * @length: the length of the range
- * @buffer: a memory location to hold the result buffer
- *
- * This function will be called by gst_type_find_helper_get_range() when
- * typefinding functions request to peek at the data of a stream at certain
- * offsets. If this function returns GST_FLOW_OK, the result buffer will be
- * stored in @buffer. The  contents of @buffer is invalid for any other
- * return value.
- *
- * This function is supposed to behave exactly like a #GstPadGetRangeFunction.
- *
- * Returns: GST_FLOW_OK for success
- */
-typedef GstFlowReturn (*GstTypeFindHelperGetRangeFunction) (GstObject  *obj,
-                                                            GstObject  *parent,
-                                                            guint64     offset,
-                                                            guint       length,
-                                                            GstBuffer **buffer);
-
-GstCaps * gst_type_find_helper_get_range (GstObject                         *obj,
-                                          GstObject                         *parent,
-                                          GstTypeFindHelperGetRangeFunction  func,
-                                          guint64                            size,
-                                          const gchar                       *extension,
-                                          GstTypeFindProbability            *prob);
-
-G_END_DECLS
-
-#endif /* __GST_TYPEFINDHELPER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstbasecamerasrc.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstbasecamerasrc.h
deleted file mode 100644
index d4979f56..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstbasecamerasrc.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2010 Texas Instruments, Inc
- * Copyright (C) 2011 Thiago Santos <thiago.sousa.santos@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_BASE_CAMERA_SRC_H__
-#define __GST_BASE_CAMERA_SRC_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstBaseCameraSrc is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-#include <gst/gstbin.h>
-#include "gstcamerabin-enum.h"
-#include "gstcamerabinpreview.h"
-
-G_BEGIN_DECLS
-#define GST_TYPE_BASE_CAMERA_SRC \
-  (gst_base_camera_src_get_type())
-#define GST_BASE_CAMERA_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_CAMERA_SRC,GstBaseCameraSrc))
-#define GST_BASE_CAMERA_SRC_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_CAMERA_SRC, GstBaseCameraSrcClass))
-#define GST_BASE_CAMERA_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_CAMERA_SRC,GstBaseCameraSrcClass))
-#define GST_IS_BASE_CAMERA_SRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_CAMERA_SRC))
-#define GST_IS_BASE_CAMERA_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_CAMERA_SRC))
-#define GST_BASE_CAMERA_SRC_CAST(obj) \
-  ((GstBaseCameraSrc *) (obj))
-GType gst_base_camera_src_get_type (void);
-
-typedef struct _GstBaseCameraSrc GstBaseCameraSrc;
-typedef struct _GstBaseCameraSrcClass GstBaseCameraSrcClass;
-
-#define GST_BASE_CAMERA_SRC_VIEWFINDER_PAD_NAME "vfsrc"
-#define GST_BASE_CAMERA_SRC_IMAGE_PAD_NAME "imgsrc"
-#define GST_BASE_CAMERA_SRC_VIDEO_PAD_NAME "vidsrc"
-
-#define GST_BASE_CAMERA_SRC_PREVIEW_MESSAGE_NAME "preview-image"
-
-/**
- * GstBaseCameraSrc:
- */
-struct _GstBaseCameraSrc
-{
-  GstBin parent;
-
-  GstCameraBinMode mode;
-
-  gboolean capturing;
-  GMutex capturing_mutex;
-
-  /* Preview convert pipeline */
-  GstCaps *preview_caps;
-  gboolean post_preview;
-  GstElement *preview_filter;
-  GstCameraBinPreviewPipelineData *preview_pipeline;
-
-  /* Resolution of the buffers configured to camerabin */
-  gint width;
-  gint height;
-
-  gfloat zoom;
-  gfloat max_zoom;
-
-  gpointer _gst_reserved[GST_PADDING_LARGE];
-};
-
-
-/**
- * GstBaseCameraSrcClass:
- * @construct_pipeline: construct pipeline
- * @setup_pipeline: configure pipeline for the chosen settings
- * @set_zoom: set the zoom
- * @set_mode: set the mode
- */
-struct _GstBaseCameraSrcClass
-{
-  GstBinClass parent;
-
-  /* Construct pipeline. (called in GST_STATE_CHANGE_NULL_TO_READY) Optional. */
-  gboolean    (*construct_pipeline)  (GstBaseCameraSrc *self);
-
-  /* (called in GST_STATE_CHANGE_READY_TO_PAUSED). Optional. */
-  gboolean    (*setup_pipeline)      (GstBaseCameraSrc *self);
-
-  /* Set the zoom. If set, called when changing 'zoom' property. Optional. */
-  void        (*set_zoom)            (GstBaseCameraSrc *self, gfloat zoom);
-
-  /* Set the mode. If set, called when changing 'mode' property. Optional. */
-  gboolean    (*set_mode)            (GstBaseCameraSrc *self,
-                                      GstCameraBinMode mode);
-
-  /* Set preview caps. If set, called called when setting new 'preview-caps'. Optional. */
-  gboolean    (*set_preview)         (GstBaseCameraSrc *self,
-                                      GstCaps *preview_caps);
-
-  /* Called by the handler for 'start-capture'. Mandatory. */
-  gboolean (*start_capture) (GstBaseCameraSrc * src);
-
-  /* Called by the handler for 'stop-capture'. Mandatory. */
-  void (*stop_capture) (GstBaseCameraSrc * src);
-
-  gpointer _gst_reserved[GST_PADDING_LARGE];
-};
-
-
-#define MIN_ZOOM 1.0f
-#define MAX_ZOOM 10.0f
-#define ZOOM_1X MIN_ZOOM
-
-gboolean gst_base_camera_src_set_mode (GstBaseCameraSrc *self, GstCameraBinMode mode);
-void gst_base_camera_src_setup_zoom (GstBaseCameraSrc * self);
-void gst_base_camera_src_setup_preview (GstBaseCameraSrc * self, GstCaps * preview_caps);
-void gst_base_camera_src_finish_capture (GstBaseCameraSrc *self);
-
-
-void gst_base_camera_src_post_preview (GstBaseCameraSrc *self, GstSample * sample);
-// XXX add methods to get/set img capture and vid capture caps..
-
-#endif /* __GST_BASE_CAMERA_SRC_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabin-enum.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabin-enum.h
deleted file mode 100644
index c6dbf043..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabin-enum.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2009 Nokia Corporation <multimedia@maemo.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CAMERABIN_ENUM_H__
-#define __GST_CAMERABIN_ENUM_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "camerabin enums are unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define DEFAULT_WIDTH 640
-#define DEFAULT_HEIGHT 480
-#define DEFAULT_CAPTURE_WIDTH 800
-#define DEFAULT_CAPTURE_HEIGHT 600
-#define DEFAULT_FPS_N 0         /* makes it use the default */
-#define DEFAULT_FPS_D 1
-#define DEFAULT_ZOOM MIN_ZOOM
-
-
-/**
- * GstCameraBinMode:
- * @MODE_IMAGE: image capture
- * @MODE_VIDEO: video capture
- *
- * Capture mode to use.
- */
-typedef enum
-{
-  /* MODE_PREVIEW = 0, No use for this */
-  MODE_IMAGE = 1,
-  MODE_VIDEO = 2,
-} GstCameraBinMode;
-
-
-#define GST_TYPE_CAMERABIN_MODE (gst_camerabin_mode_get_type ())
-GType gst_camerabin_mode_get_type (void);
-
-G_END_DECLS
-
-#endif                          /* #ifndef __GST_CAMERABIN_ENUM_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabinpreview.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabinpreview.h
deleted file mode 100644
index 6627cf66..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/basecamerabinsrc/gstcamerabinpreview.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2008 Nokia Corporation <multimedia@maemo.org>
- * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CAMERABIN_PREVIEW_H_
-#define __CAMERABIN_PREVIEW_H_
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "camera bin preview is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-typedef struct
-{
-  GstElement *pipeline;
-
-  GstElement *appsrc;
-  GstElement *filter;
-  GstElement *appsink;
-  GstElement *vscale;
-
-  GstElement *element;
-
-  GstCaps *pending_preview_caps;
-  guint processing;
-  GMutex processing_lock;
-  GCond processing_cond;
-
-} GstCameraBinPreviewPipelineData;
-
-GstCameraBinPreviewPipelineData *gst_camerabin_create_preview_pipeline (GstElement * element, GstElement * filter);
-void gst_camerabin_destroy_preview_pipeline (GstCameraBinPreviewPipelineData * preview);
-gboolean gst_camerabin_preview_pipeline_post (GstCameraBinPreviewPipelineData * preview, GstSample * sample);
-void gst_camerabin_preview_set_caps (GstCameraBinPreviewPipelineData * preview, GstCaps * caps);
-gboolean gst_camerabin_preview_set_filter (GstCameraBinPreviewPipelineData * preview, GstElement * filter);
-
-#endif /* #ifndef __CAMERABIN_PREVIEW_H_ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gsth264parser.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gsth264parser.h
deleted file mode 100644
index 6698922e..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gsth264parser.h
+++ /dev/null
@@ -1,723 +0,0 @@
-/* Gstreamer
- * Copyright (C) <2011> Intel Corporation
- * Copyright (C) <2011> Collabora Ltd.
- * Copyright (C) <2011> Thibault Saunier <thibault.saunier@collabora.com>
- *
- * Some bits C-c,C-v'ed and s/4/3 from h264parse and videoparsers/h264parse.c:
- *    Copyright (C) <2010> Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
- *    Copyright (C) <2010> Collabora Multimedia
- *    Copyright (C) <2010> Nokia Corporation
- *
- *    (C) 2005 Michal Benes <michal.benes@itonis.tv>
- *    (C) 2008 Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_H264_PARSER_H__
-#define __GST_H264_PARSER_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The H.264 parsing library is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_H264_MAX_SPS_COUNT   32
-#define GST_H264_MAX_PPS_COUNT   256
-
-#define GST_H264_IS_P_SLICE(slice)  (((slice)->type % 5) == GST_H264_P_SLICE)
-#define GST_H264_IS_B_SLICE(slice)  (((slice)->type % 5) == GST_H264_B_SLICE)
-#define GST_H264_IS_I_SLICE(slice)  (((slice)->type % 5) == GST_H264_I_SLICE)
-#define GST_H264_IS_SP_SLICE(slice) (((slice)->type % 5) == GST_H264_SP_SLICE)
-#define GST_H264_IS_SI_SLICE(slice) (((slice)->type % 5) == GST_H264_SI_SLICE)
-
-/**
- * GstH264NalUnitType:
- * @GST_H264_NAL_UNKNOWN: Unknown nal type
- * @GST_H264_NAL_SLICE: Slice nal
- * @GST_H264_NAL_SLICE_DPA: DPA slice nal
- * @GST_H264_NAL_SLICE_DPB: DPB slice nal
- * @GST_H264_NAL_SLICE_DPC: DPC slice nal
- * @GST_H264_NAL_SLICE_IDR: DPR slice nal
- * @GST_H264_NAL_SEI: Supplemental enhancement information (SEI) nal unit
- * @GST_H264_NAL_SPS: Sequence parameter set (SPS) nal unit
- * @GST_H264_NAL_PPS: Picture parameter set (PPS) nal unit
- * @GST_H264_NAL_AU_DELIMITER: Access unit (AU) delimiter nal unit
- * @GST_H264_NAL_SEQ_END: End of sequence nal unit
- * @GST_H264_NAL_STREAM_END: End of stream nal unit
- * @GST_H264_NAL_FILLER_DATA: Filler data nal lunit
- *
- * Indicates the type of H264 Nal Units
- */
-typedef enum
-{
-  GST_H264_NAL_UNKNOWN      = 0,
-  GST_H264_NAL_SLICE        = 1,
-  GST_H264_NAL_SLICE_DPA    = 2,
-  GST_H264_NAL_SLICE_DPB    = 3,
-  GST_H264_NAL_SLICE_DPC    = 4,
-  GST_H264_NAL_SLICE_IDR    = 5,
-  GST_H264_NAL_SEI          = 6,
-  GST_H264_NAL_SPS          = 7,
-  GST_H264_NAL_PPS          = 8,
-  GST_H264_NAL_AU_DELIMITER = 9,
-  GST_H264_NAL_SEQ_END      = 10,
-  GST_H264_NAL_STREAM_END   = 11,
-  GST_H264_NAL_FILLER_DATA  = 12
-} GstH264NalUnitType;
-
-/**
- * GstH264ParserResult:
- * @GST_H264_PARSER_OK: The parsing succeded
- * @GST_H264_PARSER_BROKEN_DATA: The data to parse is broken
- * @GST_H264_PARSER_BROKEN_LINK: The link to structure needed for the parsing couldn't be found
- * @GST_H264_PARSER_ERROR: An error accured when parsing
- * @GST_H264_PARSER_NO_NAL: No nal found during the parsing
- * @GST_H264_PARSER_NO_NAL_END: Start of the nal found, but not the end.
- *
- * The result of parsing H264 data.
- */
-typedef enum
-{
-  GST_H264_PARSER_OK,
-  GST_H264_PARSER_BROKEN_DATA,
-  GST_H264_PARSER_BROKEN_LINK,
-  GST_H264_PARSER_ERROR,
-  GST_H264_PARSER_NO_NAL,
-  GST_H264_PARSER_NO_NAL_END
-} GstH264ParserResult;
-
-/**
- * GstH264SEIPayloadType:
- * @GST_H264_SEI_BUF_PERIOD: Buffering Period SEI Message
- * @GST_H264_SEI_PIC_TIMING: Picture Timing SEI Message
- * ...
- *
- * The type of SEI message.
- */
-typedef enum
-{
-  GST_H264_SEI_BUF_PERIOD = 0,
-  GST_H264_SEI_PIC_TIMING = 1
-      /* and more...  */
-} GstH264SEIPayloadType;
-
-/**
- * GstH264SEIPicStructType:
- * @GST_H264_SEI_PIC_STRUCT_FRAME: Picture is a frame
- * @GST_H264_SEI_PIC_STRUCT_TOP_FIELD: Top field of frame
- * @GST_H264_SEI_PIC_STRUCT_BOTTOM_FIELD: Botom field of frame
- * @GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM: Top bottom field of frame
- * @GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP: bottom top field of frame
- * @GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: top bottom top field of frame
- * @GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: bottom top bottom field of frame
- * @GST_H264_SEI_PIC_STRUCT_FRAME_DOUBLING: indicates that the frame should
- *  be displayed two times consecutively
- * @GST_H264_SEI_PIC_STRUCT_FRAME_TRIPLING: indicates that the frame should be
- *  displayed three times consecutively
- *
- * SEI pic_struct type
- */
-typedef enum
-{
-  GST_H264_SEI_PIC_STRUCT_FRAME             = 0,
-  GST_H264_SEI_PIC_STRUCT_TOP_FIELD         = 1,
-  GST_H264_SEI_PIC_STRUCT_BOTTOM_FIELD      = 2,
-  GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM        = 3,
-  GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP        = 4,
-  GST_H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP    = 5,
-  GST_H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM = 6,
-  GST_H264_SEI_PIC_STRUCT_FRAME_DOUBLING    = 7,
-  GST_H264_SEI_PIC_STRUCT_FRAME_TRIPLING    = 8
-} GstH264SEIPicStructType;
-
-/**
- * GstH264SliceType:
- *
- * Type of Picture slice
- */
-
-typedef enum
-{
-  GST_H264_P_SLICE    = 0,
-  GST_H264_B_SLICE    = 1,
-  GST_H264_I_SLICE    = 2,
-  GST_H264_SP_SLICE   = 3,
-  GST_H264_SI_SLICE   = 4,
-  GST_H264_S_P_SLICE  = 5,
-  GST_H264_S_B_SLICE  = 6,
-  GST_H264_S_I_SLICE  = 7,
-  GST_H264_S_SP_SLICE = 8,
-  GST_H264_S_SI_SLICE = 9
-} GstH264SliceType;
-
-typedef struct _GstH264NalParser              GstH264NalParser;
-
-typedef struct _GstH264NalUnit                GstH264NalUnit;
-
-typedef struct _GstH264SPS                    GstH264SPS;
-typedef struct _GstH264PPS                    GstH264PPS;
-typedef struct _GstH264HRDParams              GstH264HRDParams;
-typedef struct _GstH264VUIParams              GstH264VUIParams;
-
-typedef struct _GstH264RefPicListModification GstH264RefPicListModification;
-typedef struct _GstH264DecRefPicMarking       GstH264DecRefPicMarking;
-typedef struct _GstH264RefPicMarking          GstH264RefPicMarking;
-typedef struct _GstH264PredWeightTable        GstH264PredWeightTable;
-typedef struct _GstH264SliceHdr               GstH264SliceHdr;
-
-typedef struct _GstH264ClockTimestamp         GstH264ClockTimestamp;
-typedef struct _GstH264PicTiming              GstH264PicTiming;
-typedef struct _GstH264BufferingPeriod        GstH264BufferingPeriod;
-typedef struct _GstH264SEIMessage             GstH264SEIMessage;
-
-/**
- * GstH264NalUnit:
- * @ref_idc: not equal to 0 specifies that the content of the NAL unit contains a sequence
- *  parameter set, a sequence * parameter set extension, a subset sequence parameter set, a
- *  picture parameter set, a slice of a reference picture, a slice data partition of a
- *  reference picture, or a prefix NAL unit preceding a slice of a reference picture.
- * @type: A #GstH264NalUnitType
- * @idr_pic_flag: calculated idr_pic_flag
- * @size: The size of the nal unit starting from @offset
- * @offset: The offset of the actual start of the nal unit
- * @sc_offset:The offset of the start code of the nal unit
- * @valid: If the nal unit is valid, which mean it has
- * already been parsed
- * @data: The data from which the Nalu has been parsed
- *
- * Structure defining the Nal unit headers
- */
-struct _GstH264NalUnit
-{
-  guint16 ref_idc;
-  guint16 type;
-
-  /* calculated values */
-  guint8 idr_pic_flag;
-  guint size;
-  guint offset;
-  guint sc_offset;
-  gboolean valid;
-
-  guint8 *data;
-};
-
-/**
- * GstH264HRDParams:
- * @cpb_cnt_minus1: plus 1 specifies the number of alternative
- *    CPB specifications in the bitstream
- * @bit_rate_scale: specifies the maximum input bit rate of the
- * SchedSelIdx-th CPB
- * @cpb_size_scale: specifies the CPB size of the SchedSelIdx-th CPB
- * @guint32 bit_rate_value_minus1: specifies the maximum input bit rate for the
- * SchedSelIdx-th CPB
- * @cpb_size_value_minus1: is used together with cpb_size_scale to specify the
- * SchedSelIdx-th CPB size
- * @cbr_flag: Specifies if running in itermediate bitrate mode or constant
- * @initial_cpb_removal_delay_length_minus1: specifies the length in bits of
- * the cpb_removal_delay syntax element
- * @cpb_removal_delay_length_minus1: specifies the length in bits of the
- * dpb_output_delay syntax element
- * @dpb_output_delay_length_minus1: >0 specifies the length in bits of the time_offset syntax element.
- * =0 specifies that the time_offset syntax element is not present
- * @time_offset_length: Length of the time offset
- *
- * Defines the HRD parameters
- */
-struct _GstH264HRDParams
-{
-  guint8 cpb_cnt_minus1;
-  guint8 bit_rate_scale;
-  guint8 cpb_size_scale;
-
-  guint32 bit_rate_value_minus1[32];
-  guint32 cpb_size_value_minus1[32];
-  guint8 cbr_flag[32];
-
-  guint8 initial_cpb_removal_delay_length_minus1;
-  guint8 cpb_removal_delay_length_minus1;
-  guint8 dpb_output_delay_length_minus1;
-  guint8 time_offset_length;
-};
-
-/**
- * GstH264VUIParams:
- * @aspect_ratio_info_present_flag: %TRUE specifies that aspect_ratio_idc is present.
- *  %FALSE specifies that aspect_ratio_idc is not present
- * @aspect_ratio_idc specifies the value of the sample aspect ratio of the luma samples
- * @sar_width indicates the horizontal size of the sample aspect ratio
- * @sar_height indicates the vertical size of the sample aspect ratio
- * @overscan_info_present_flag: %TRUE overscan_appropriate_flag is present %FALSE otherwize
- * @overscan_appropriate_flag: %TRUE indicates that the cropped decoded pictures
- *  output are suitable for display using overscan. %FALSE the cropped decoded pictures
- *  output contain visually important information
- * @video_signal_type_present_flag: %TRUE specifies that video_format, video_full_range_flag and
- *  colour_description_present_flag are present.
- * @video_format: indicates the representation of the picture
- * @video_full_range_flag: indicates the black level and range of the luma and chroma signals
- * @colour_description_present_flag: %TRUE specifies that colour_primaries,
- *  transfer_characteristics and matrix_coefficients are present
- * @colour_primaries: indicates the chromaticity coordinates of the source primaries
- * @transfer_characteristics: indicates the opto-electronic transfer characteristic
- * @matrix_coefficients: describes the matrix coefficients used in deriving luma and chroma signals
- * @chroma_loc_info_present_flag: %TRUE specifies that chroma_sample_loc_type_top_field and
- *  chroma_sample_loc_type_bottom_field are present, %FALSE otherwize
- * @chroma_sample_loc_type_top_field: specify the location of chroma for top field
- * @chroma_sample_loc_type_bottom_field specify the location of chroma for bottom field
- * @timing_info_present_flag: %TRUE specifies that num_units_in_tick,
- *  time_scale and fixed_frame_rate_flag are present in the bitstream
- * @num_units_in_tick: is the number of time units of a clock operating at the frequency time_scale Hz
- * time_scale: is the number of time units that pass in one second
- * @fixed_frame_rate_flag: %TRUE indicates that the temporal distance between the HRD output times
- *  of any two consecutive pictures in output order is constrained as specified in the spec, %FALSE
- *  otherwize.
- * @nal_hrd_parameters_present_flag: %TRUE if nal hrd parameters present in the bitstream
- * @vcl_hrd_parameters_present_flag: %TRUE if nal vlc hrd parameters present in the bitstream
- * @low_delay_hrd_flag: specifies the HRD operational mode
- * @pic_struct_present_flag: %TRUE specifies that picture timing SEI messages are present or not
- * @bitstream_restriction_flag: %TRUE specifies that the following coded video sequence bitstream restriction
- * parameters are present
- * @motion_vectors_over_pic_boundaries_flag: %FALSE indicates that no sample outside the
- *  picture boundaries and no sample at a fractional sample position, %TRUE indicates that one or more
- *  samples outside picture boundaries may be used in inter prediction
- * @max_bytes_per_pic_denom: indicates a number of bytes not exceeded by the sum of the sizes of
- *  the VCL NAL units associated with any coded picture in the coded video sequence.
- * @max_bits_per_mb_denom: indicates the maximum number of coded bits of macroblock_layer
- * @log2_max_mv_length_horizontal: indicate the maximum absolute value of a decoded horizontal
- * motion vector component
- * @log2_max_mv_length_vertical: indicate the maximum absolute value of a decoded vertical
- *  motion vector component
- * @num_reorder_frames: indicates the maximum number of frames, complementary field pairs,
- *  or non-paired fields that precede any frame,
- * @max_dec_frame_buffering: specifies the required size of the HRD decoded picture buffer in
- *  units of frame buffers.
- *
- * The structure representing the VUI parameters.
- */
-struct _GstH264VUIParams
-{
-  guint8 aspect_ratio_info_present_flag;
-  guint8 aspect_ratio_idc;
-  /* if aspect_ratio_idc == 255 */
-  guint16 sar_width;
-  guint16 sar_height;
-
-  guint8 overscan_info_present_flag;
-  /* if overscan_info_present_flag */
-  guint8 overscan_appropriate_flag;
-
-  guint8 video_signal_type_present_flag;
-  guint8 video_format;
-  guint8 video_full_range_flag;
-  guint8 colour_description_present_flag;
-  guint8 colour_primaries;
-  guint8 transfer_characteristics;
-  guint8 matrix_coefficients;
-
-  guint8 chroma_loc_info_present_flag;
-  guint8 chroma_sample_loc_type_top_field;
-  guint8 chroma_sample_loc_type_bottom_field;
-
-  guint8 timing_info_present_flag;
-  /* if timing_info_present_flag */
-  guint32 num_units_in_tick;
-  guint32 time_scale;
-  guint8 fixed_frame_rate_flag;
-
-  guint8 nal_hrd_parameters_present_flag;
-  /* if nal_hrd_parameters_present_flag */
-  GstH264HRDParams nal_hrd_parameters;
-
-  guint8 vcl_hrd_parameters_present_flag;
-  /* if nal_hrd_parameters_present_flag */
-  GstH264HRDParams vcl_hrd_parameters;
-
-  guint8 low_delay_hrd_flag;
-  guint8 pic_struct_present_flag;
-
-  guint8 bitstream_restriction_flag;
-  /*  if bitstream_restriction_flag */
-  guint8 motion_vectors_over_pic_boundaries_flag;
-  guint32 max_bytes_per_pic_denom;
-  guint32 max_bits_per_mb_denom;
-  guint32 log2_max_mv_length_horizontal;
-  guint32 log2_max_mv_length_vertical;
-  guint32 num_reorder_frames;
-  guint32 max_dec_frame_buffering;
-
-  /* calculated values */
-  guint par_n;
-  guint par_d;
-};
-
-/**
- * GstH264SPS:
- * @id: The ID of the sequence parameter set
- * @profile_idc: indicate the profile to which the coded video sequence conforms
- *
- * H264 Sequence Parameter Set (SPS)
- */
-struct _GstH264SPS
-{
-  gint id;
-
-  guint8 profile_idc;
-  guint8 constraint_set0_flag;
-  guint8 constraint_set1_flag;
-  guint8 constraint_set2_flag;
-  guint8 constraint_set3_flag;
-  guint8 level_idc;
-
-  guint8 chroma_format_idc;
-  guint8 separate_colour_plane_flag;
-  guint8 bit_depth_luma_minus8;
-  guint8 bit_depth_chroma_minus8;
-  guint8 qpprime_y_zero_transform_bypass_flag;
-
-  guint8 scaling_matrix_present_flag;
-  guint8 scaling_lists_4x4[6][16];
-  guint8 scaling_lists_8x8[6][64];
-
-  guint8 log2_max_frame_num_minus4;
-  guint8 pic_order_cnt_type;
-
-  /* if pic_order_cnt_type == 0 */
-  guint8 log2_max_pic_order_cnt_lsb_minus4;
-
-  /* else if pic_order_cnt_type == 1 */
-  guint8 delta_pic_order_always_zero_flag;
-  gint32 offset_for_non_ref_pic;
-  gint32 offset_for_top_to_bottom_field;
-  guint8 num_ref_frames_in_pic_order_cnt_cycle;
-  gint32 offset_for_ref_frame[255];
-
-  guint32 num_ref_frames;
-  guint8 gaps_in_frame_num_value_allowed_flag;
-  guint32 pic_width_in_mbs_minus1;
-  guint32 pic_height_in_map_units_minus1;
-  guint8 frame_mbs_only_flag;
-
-  guint8 mb_adaptive_frame_field_flag;
-
-  guint8 direct_8x8_inference_flag;
-
-  guint8 frame_cropping_flag;
-
-  /* if frame_cropping_flag */
-  guint32 frame_crop_left_offset;
-  guint32 frame_crop_right_offset;
-  guint32 frame_crop_top_offset;
-  guint32 frame_crop_bottom_offset;
-
-  guint8 vui_parameters_present_flag;
-  /* if vui_parameters_present_flag */
- GstH264VUIParams vui_parameters;
-
-  /* calculated values */
-  guint8 chroma_array_type;
-  guint32 max_frame_num;
-  gint width, height;
-  gint fps_num, fps_den;
-  gboolean valid;
-};
-
-/**
- * GstH264PPS:
- *
- * H264 Picture Parameter Set
- */
-struct _GstH264PPS
-{
-  gint id;
-
-  GstH264SPS *sequence;
-
-  guint8 entropy_coding_mode_flag;
-  guint8 pic_order_present_flag;
-
-  guint32 num_slice_groups_minus1;
-
-  /* if num_slice_groups_minus1 > 0 */
-  guint8 slice_group_map_type;
-  /* and if slice_group_map_type == 0 */
-  guint32 run_length_minus1[8];
-  /* or if slice_group_map_type == 2 */
-  guint32 top_left[8];
-  guint32 bottom_right[8];
-  /* or if slice_group_map_type == (3, 4, 5) */
-  guint8 slice_group_change_direction_flag;
-  guint32 slice_group_change_rate_minus1;
-  /* or if slice_group_map_type == 6 */
-  guint32 pic_size_in_map_units_minus1;
-  guint8 *slice_group_id;
-
-  guint8 num_ref_idx_l0_active_minus1;
-  guint8 num_ref_idx_l1_active_minus1;
-  guint8 weighted_pred_flag;
-  guint8 weighted_bipred_idc;
-  gint8 pic_init_qp_minus26;
-  gint8 pic_init_qs_minus26;
-  gint8 chroma_qp_index_offset;
-  guint8 deblocking_filter_control_present_flag;
-  guint8 constrained_intra_pred_flag;
-  guint8 redundant_pic_cnt_present_flag;
-
-  guint8 transform_8x8_mode_flag;
-
-  guint8 scaling_lists_4x4[6][16];
-  guint8 scaling_lists_8x8[6][64];
-
-  guint8 second_chroma_qp_index_offset;
-
-  gboolean valid;
-};
-
-struct _GstH264RefPicListModification
-{
-  guint8 modification_of_pic_nums_idc;
-  union
-  {
-    /* if modification_of_pic_nums_idc == 0 || 1 */
-    guint32 abs_diff_pic_num_minus1;
-    /* if modification_of_pic_nums_idc == 2 */
-    guint32 long_term_pic_num;
-  } value;
-};
-
-struct _GstH264PredWeightTable
-{
-  guint8 luma_log2_weight_denom;
-  guint8 chroma_log2_weight_denom;
-
-  gint16 luma_weight_l0[32];
-  gint8 luma_offset_l0[32];
-
-  /* if seq->ChromaArrayType != 0 */
-  gint16 chroma_weight_l0[32][2];
-  gint8 chroma_offset_l0[32][2];
-
-  /* if slice->slice_type % 5 == 1 */
-  gint16 luma_weight_l1[32];
-  gint8 luma_offset_l1[32];
-
-  /* and if seq->ChromaArrayType != 0 */
-  gint16 chroma_weight_l1[32][2];
-  gint8 chroma_offset_l1[32][2];
-};
-
-struct _GstH264RefPicMarking
-{
-  guint8 memory_management_control_operation;
-
-  guint32 difference_of_pic_nums_minus1;
-  guint32 long_term_pic_num;
-  guint32 long_term_frame_idx;
-  guint32 max_long_term_frame_idx_plus1;
-};
-
-struct _GstH264DecRefPicMarking
-{
-  /* if slice->nal_unit.IdrPicFlag */
-  guint8 no_output_of_prior_pics_flag;
-  guint8 long_term_reference_flag;
-
-  guint8 adaptive_ref_pic_marking_mode_flag;
-  GstH264RefPicMarking ref_pic_marking[10];
-  guint8 n_ref_pic_marking;
-};
-
-
-struct _GstH264SliceHdr
-{
-  guint32 first_mb_in_slice;
-  guint32 type;
-  GstH264PPS *pps;
-
-  /* if seq->separate_colour_plane_flag */
-  guint8 colour_plane_id;
-
-  guint16 frame_num;
-
-  guint8 field_pic_flag;
-  guint8 bottom_field_flag;
-
-  /* if nal_unit.type == 5 */
-  guint16 idr_pic_id;
-
-  /* if seq->pic_order_cnt_type == 0 */
-  guint16 pic_order_cnt_lsb;
-  /* if seq->pic_order_present_flag && !field_pic_flag */
-  gint32 delta_pic_order_cnt_bottom;
-
-  gint32 delta_pic_order_cnt[2];
-  guint8 redundant_pic_cnt;
-
-  /* if slice_type == B_SLICE */
-  guint8 direct_spatial_mv_pred_flag;
-
-  guint8 num_ref_idx_l0_active_minus1;
-  guint8 num_ref_idx_l1_active_minus1;
-
-  guint8 ref_pic_list_modification_flag_l0;
-  guint8 n_ref_pic_list_modification_l0;
-  GstH264RefPicListModification ref_pic_list_modification_l0[32];
-  guint8 ref_pic_list_modification_flag_l1;
-  guint8 n_ref_pic_list_modification_l1;
-  GstH264RefPicListModification ref_pic_list_modification_l1[32];
-
-  GstH264PredWeightTable pred_weight_table;
-  /* if nal_unit.ref_idc != 0 */
-  GstH264DecRefPicMarking dec_ref_pic_marking;
-
-  guint8 cabac_init_idc;
-  gint8 slice_qp_delta;
-  gint8 slice_qs_delta;
-
-  guint8 disable_deblocking_filter_idc;
-  gint8 slice_alpha_c0_offset_div2;
-  gint8 slice_beta_offset_div2;
-
-  guint16 slice_group_change_cycle;
-
-  /* calculated values */
-  guint32 max_pic_num;
-  gboolean valid;
-
-  /* Size of the slice_header() in bits */
-  guint header_size;
-
-  /* Number of emulation prevention bytes (EPB) in this slice_header() */
-  guint n_emulation_prevention_bytes;
-};
-
-
-struct _GstH264ClockTimestamp
-{
-  guint8 ct_type;
-  guint8 nuit_field_based_flag;
-  guint8 counting_type;
-  guint8 discontinuity_flag;
-  guint8 cnt_dropped_flag;
-  guint8 n_frames;
-
-  guint8 seconds_flag;
-  guint8 seconds_value;
-
-  guint8 minutes_flag;
-  guint8 minutes_value;
-
-  guint8 hours_flag;
-  guint8 hours_value;
-
-  guint32 time_offset;
-};
-
-struct _GstH264PicTiming
-{
-  guint32 cpb_removal_delay;
-  guint32 dpb_output_delay;
-
-  guint8 pic_struct_present_flag;
-  /* if pic_struct_present_flag */
-  guint8 pic_struct;
-
-  guint8 clock_timestamp_flag[3];
-  GstH264ClockTimestamp clock_timestamp[3];
-};
-
-struct _GstH264BufferingPeriod
-{
-  GstH264SPS *sps;
-
-  /* seq->vui_parameters->nal_hrd_parameters_present_flag */
-  guint8 nal_initial_cpb_removal_delay[32];
-  guint8 nal_initial_cpb_removal_delay_offset[32];
-
-  /* seq->vui_parameters->vcl_hrd_parameters_present_flag */
-  guint8 vcl_initial_cpb_removal_delay[32];
-  guint8 vcl_initial_cpb_removal_delay_offset[32];
-};
-
-struct _GstH264SEIMessage
-{
-  GstH264SEIPayloadType payloadType;
-
-  union {
-    GstH264BufferingPeriod buffering_period;
-    GstH264PicTiming pic_timing;
-    /* ... could implement more */
-  } payload;
-};
-
-/**
- * GstH264NalParser:
- *
- * H264 NAL Parser (opaque structure).
- */
-struct _GstH264NalParser
-{
-  /*< private >*/
-  GstH264SPS sps[GST_H264_MAX_SPS_COUNT];
-  GstH264PPS pps[GST_H264_MAX_PPS_COUNT];
-  GstH264SPS *last_sps;
-  GstH264PPS *last_pps;
-};
-
-GstH264NalParser *gst_h264_nal_parser_new             (void);
-
-GstH264ParserResult gst_h264_parser_identify_nalu     (GstH264NalParser *nalparser,
-                                                       const guint8 *data, guint offset,
-                                                       gsize size, GstH264NalUnit *nalu);
-
-GstH264ParserResult gst_h264_parser_identify_nalu_unchecked (GstH264NalParser *nalparser,
-                                                       const guint8 *data, guint offset,
-                                                       gsize size, GstH264NalUnit *nalu);
-
-GstH264ParserResult gst_h264_parser_identify_nalu_avc (GstH264NalParser *nalparser, const guint8 *data,
-                                                       guint offset, gsize size, guint8 nal_length_size,
-                                                       GstH264NalUnit *nalu);
-
-GstH264ParserResult gst_h264_parser_parse_nal         (GstH264NalParser *nalparser,
-                                                       GstH264NalUnit *nalu);
-
-GstH264ParserResult gst_h264_parser_parse_slice_hdr   (GstH264NalParser *nalparser, GstH264NalUnit *nalu,
-                                                       GstH264SliceHdr *slice, gboolean parse_pred_weight_table,
-                                                       gboolean parse_dec_ref_pic_marking);
-
-GstH264ParserResult gst_h264_parser_parse_sps         (GstH264NalParser *nalparser, GstH264NalUnit *nalu,
-                                                       GstH264SPS *sps, gboolean parse_vui_params);
-
-GstH264ParserResult gst_h264_parser_parse_pps         (GstH264NalParser *nalparser,
-                                                       GstH264NalUnit *nalu, GstH264PPS *pps);
-
-GstH264ParserResult gst_h264_parser_parse_sei         (GstH264NalParser *nalparser,
-                                                       GstH264NalUnit *nalu, GstH264SEIMessage *sei);
-
-void gst_h264_nal_parser_free                         (GstH264NalParser *nalparser);
-
-GstH264ParserResult gst_h264_parse_sps                (GstH264NalUnit *nalu,
-                                                       GstH264SPS *sps, gboolean parse_vui_params);
-
-GstH264ParserResult gst_h264_parse_pps                (GstH264NalParser *nalparser,
-                                                       GstH264NalUnit *nalu, GstH264PPS *pps);
-
-G_END_DECLS
-#endif
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstmpeg4parser.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstmpeg4parser.h
deleted file mode 100644
index 457919a2..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstmpeg4parser.h
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2009 Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_MPEG4UTIL_H__
-#define __GST_MPEG4UTIL_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbitreader.h>
-
-typedef struct _GstMpeg4VisualObjectSequence    GstMpeg4VisualObjectSequence;
-typedef struct _GstMpeg4VisualObject            GstMpeg4VisualObject;
-typedef struct _GstMpeg4VideoObjectLayer        GstMpeg4VideoObjectLayer;
-typedef struct _GstMpeg4GroupOfVOP              GstMpeg4GroupOfVOP;
-typedef struct _GstMpeg4VideoObjectPlane        GstMpeg4VideoObjectPlane;
-typedef struct _GstMpeg4VideoSignalType         GstMpeg4VideoSignalType;
-typedef struct _GstMpeg4VideoPlaneShortHdr      GstMpeg4VideoPlaneShortHdr;
-typedef struct _GstMpeg4VideoPacketHdr          GstMpeg4VideoPacketHdr;
-
-typedef struct _GstMpeg4SpriteTrajectory        GstMpeg4SpriteTrajectory;
-
-typedef struct _GstMpeg4Packet                  GstMpeg4Packet;
-
-/**
- * GstMpeg4StartCode:
- *
- * Defines the different startcodes present in the bitstream as
- * defined in: Table 6-3 — Start code values
- */
-typedef enum
-{
-  GST_MPEG4_VIDEO_OBJ_FIRST      = 0x00,
-  GST_MPEG4_VIDEO_OBJ_LAST       = 0x1f,
-  GST_MPEG4_VIDEO_LAYER_FIRST    = 0x20,
-  GST_MPEG4_VIDEO_LAYER_LAST     = 0x2f,
-  GST_MPEG4_VISUAL_OBJ_SEQ_START = 0xb0,
-  GST_MPEG4_VISUAL_OBJ_SEQ_END   = 0xb1,
-  GST_MPEG4_USER_DATA            = 0xb2,
-  GST_MPEG4_GROUP_OF_VOP         = 0xb3,
-  GST_MPEG4_VIDEO_SESSION_ERR    = 0xb4,
-  GST_MPEG4_VISUAL_OBJ           = 0xb5,
-  GST_MPEG4_VIDEO_OBJ_PLANE      = 0xb6,
-  GST_MPEG4_FBA                  = 0xba,
-  GST_MPEG4_FBA_PLAN             = 0xbb,
-  GST_MPEG4_MESH                 = 0xbc,
-  GST_MPEG4_MESH_PLAN            = 0xbd,
-  GST_MPEG4_STILL_TEXTURE_OBJ    = 0xbe,
-  GST_MPEG4_TEXTURE_SPATIAL      = 0xbf,
-  GST_MPEG4_TEXTURE_SNR_LAYER    = 0xc0,
-  GST_MPEG4_TEXTURE_TILE         = 0xc1,
-  GST_MPEG4_SHAPE_LAYER          = 0xc2,
-  GST_MPEG4_STUFFING             = 0xc3,
-  GST_MPEG4_SYSTEM_FIRST         = 0xc6,
-  GST_MPEG4_SYSTEM_LAST          = 0xff,
-  GST_MPEG4_RESYNC               = 0xfff
-} GstMpeg4StartCode;
-
-/**
- * GstMpeg4VisualObjectType:
- *
- * Defines the different visual object types as
- * defined in: Table 6-5 -- Meaning of visual object type
- */
-typedef enum {
-  GST_MPEG4_VIDEO_ID         = 0x01,
-  GST_MPEG4_STILL_TEXTURE_ID = 0x02,
-  GST_MPEG4_STILL_MESH_ID    = 0x03,
-  GST_MPEG4_STILL_FBA_ID     = 0x04,
-  GST_MPEG4_STILL_3D_MESH_ID = 0x05,
-  /*... reserved */
-
-} GstMpeg4VisualObjectType;
-
-/**
- * GstMpeg4AspectRatioInfo:
- * @GST_MPEG4_SQUARE: 1:1 square
- * @GST_MPEG4_625_TYPE_4_3: 12:11 (625-type for 4:3 picture)
- * @GST_MPEG4_525_TYPE_4_3: 10:11 (525-type for 4:3 picture)
- * @GST_MPEG4_625_TYPE_16_9: 16:11 (625-type stretched for 16:9 picture)
- * @GST_MPEG4_525_TYPE_16_9: 40:33 (525-type stretched for 16:9 picture)
- * @GST_MPEG4_EXTENDED_PAR: Extended par
- *
- * Defines the different pixel aspect ratios as
- * defined in: Table 6-12 -- Meaning of pixel aspect ratio
- */
-typedef enum {
-  GST_MPEG4_SQUARE        = 0x01,
-  GST_MPEG4_625_TYPE_4_3  = 0x02,
-  GST_MPEG4_525_TYPE_4_3  = 0x03,
-  GST_MPEG4_625_TYPE_16_9 = 0x04,
-  GST_MPEG4_525_TYPE_16_9 = 0x05,
-  GST_MPEG4_EXTENDED_PAR  = 0x0f,
-} GstMpeg4AspectRatioInfo;
-
-/**
- * GstMpeg4ParseResult:
- * @GST_MPEG4_PARSER_OK: The parsing went well
- * @GST_MPEG4_PARSER_BROKEN_DATA: The bitstream was broken
- * @GST_MPEG4_PARSER_NO_PACKET: There was no packet in the buffer
- * @GST_MPEG4_PARSER_NO_PACKET_END: There was no packet end in the buffer
- * @GST_MPEG4_PARSER_NO_PACKET_ERROR: An error accured durint the parsing
- *
- * Result type of any parsing function.
- */
-typedef enum {
-  GST_MPEG4_PARSER_OK,
-  GST_MPEG4_PARSER_BROKEN_DATA,
-  GST_MPEG4_PARSER_NO_PACKET,
-  GST_MPEG4_PARSER_NO_PACKET_END,
-  GST_MPEG4_PARSER_ERROR,
-} GstMpeg4ParseResult;
-
-/**
- * GstMpeg4VideoObjectCodingType:
- * @GST_MPEG4_I_VOP: intra-coded (I)
- * @GST_MPEG4_P_VOP: predictive-coded (P)
- * @GST_MPEG4_B_VOP: bidirectionally-predictive-coded (B)
- * @GST_MPEG4_S_VOP: sprite (S)
- *
- * The vop coding types as defined in:
- * Table 6-20 -- Meaning of vop_coding_type
- */
-typedef enum {
-  GST_MPEG4_I_VOP = 0x0,
-  GST_MPEG4_P_VOP = 0x1,
-  GST_MPEG4_B_VOP = 0x2,
-  GST_MPEG4_S_VOP = 0x3
-} GstMpeg4VideoObjectCodingType;
-
-/**
- * GstMpeg4ChromaFormat
- *
- * The chroma format in use as
- * defined in: Table 6-13 -- Meaning of chroma_format
- */
-typedef enum {
-  /* Other value are reserved */
-  GST_MPEG4_CHROMA_4_2_0 = 0x01
-} GstMpeg4ChromaFormat;
-
-/**
- * GstMpeg4VideoObjectLayerShape:
- *
- * The different video object layer shapes as defined in:
- * Table 6-16 — Video Object Layer shape type
- */
-typedef enum {
-  GST_MPEG4_RECTANGULAR,
-  GST_MPEG4_BINARY,
-  GST_MPEG4_BINARY_ONLY,
-  GST_MPEG4_GRAYSCALE
-} GstMpeg4VideoObjectLayerShape;
-
-/**
- * GstMpeg4SpriteEnable:
- *
- * Indicates the usage of static sprite coding
- * or global motion compensation (GMC) as defined in:
- * Table V2 - 2 -- Meaning of sprite_enable codewords
- */
-typedef enum {
-  GST_MPEG4_SPRITE_UNUSED,
-  GST_MPEG4_SPRITE_STATIC,
-  GST_MPEG4_SPRITE_GMG
-} GstMpeg4SpriteEnable;
-
-/**
- * GstMpeg4Profile:
- *
- * Different defined profiles as defined in:
- * 9- Profiles and levels
- *
- * It is computed using:
- * Table G.1 — FLC table for profile_and_level_indication
- */
-typedef enum {
-  GST_MPEG4_PROFILE_CORE,
-  GST_MPEG4_PROFILE_MAIN,
-  GST_MPEG4_PROFILE_N_BIT,
-  GST_MPEG4_PROFILE_SIMPLE,
-  GST_MPEG4_PROFILE_HYBRID,
-  GST_MPEG4_PROFILE_RESERVED,
-  GST_MPEG4_PROFILE_SIMPLE_FBA,
-  GST_MPEG4_PROFILE_CORE_STUDIO,
-  GST_MPEG4_PROFILE_SIMPLE_STUDIO,
-  GST_MPEG4_PROFILE_CORE_SCALABLE,
-  GST_MPEG4_PROFILE_ADVANCED_CORE,
-  GST_MPEG4_PROFILE_ADVANCED_SIMPLE,
-  GST_MPEG4_PROFILE_SIMPLE_SCALABLE,
-  GST_MPEG4_PROFILE_SCALABLE_TEXTURE,
-  GST_MPEG4_PROFILE_SIMPLE_FACE_ANIMATION,
-  GST_MPEG4_PROFILE_BASIC_ANIMATED_TEXTURE,
-  GST_MPEG4_PROFILE_ADVANCED_REALTIME_SIMPLE,
-  GST_MPEG4_PROFILE_ADVANCED_SCALABLE_TEXTURE,
-  GST_MPEG4_PROFILE_FINE_GRANULARITY_SCALABLE,
-  GST_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY
-} GstMpeg4Profile;
-
-/**
- * GstMpeg4Level:
- *
- * Different levels as defined in:
- * 9- Profiles and levels
- *
- * It is computed using:
- * Table G.1 — FLC table for profile_and_level_indication
- */
-typedef enum {
-  GST_MPEG4_LEVEL0,
-  GST_MPEG4_LEVEL1,
-  GST_MPEG4_LEVEL2,
-  GST_MPEG4_LEVEL3,
-  GST_MPEG4_LEVEL3b,
-  GST_MPEG4_LEVEL4,
-  GST_MPEG4_LEVEL5,
-  GST_MPEG4_LEVEL_RESERVED
-} GstMpeg4Level;
-
-/**
- * GstMpeg4VisualObjectSequence:
- *
- * The visual object sequence structure as defined in:
- * 6.2.2 Visual Object Sequence and Visual Object
- */
-struct _GstMpeg4VisualObjectSequence {
-  guint8 profile_and_level_indication;
-
-  /* Computed according to:
-   * Table G.1 — FLC table for profile_and_level_indication */
-  GstMpeg4Level level;
-  GstMpeg4Profile profile;
-};
-
-/**
- * The visual object structure as defined in:
- * 6.2.2 Visual Object Sequence and Visual Object
- */
-struct _GstMpeg4VisualObject {
-  guint8 is_identifier;
-  /* If is_identifier */
-  guint8 verid;
-  guint8 priority;
-
-  GstMpeg4VisualObjectType type;
-};
-
-/**
- * GstMpeg4VideoSignalType:
- *
- * The video signal type structure as defined in:
- * 6.2.2 Visual Object Sequence and Visual Object.
- */
-struct _GstMpeg4VideoSignalType {
-  guint8 type;
-
-  guint8 format;
-  guint8 range;
-  guint8 color_description;
-  guint8 color_primaries;
-  guint8 transfer_characteristics;
-  guint8 matrix_coefficients;
-};
-
-/**
- * GstMpeg4VideoPlaneShortHdr:
- *
- * The video plane short header structure as defined in:
- * 6.2.5.2 Video Plane with Short Header
- */
-struct _GstMpeg4VideoPlaneShortHdr {
-  guint8 temporal_reference;
-  guint8 split_screen_indicator;
-  guint8 document_camera_indicator;
-  guint8 full_picture_freeze_release;
-  guint8 source_format;
-  guint8 picture_coding_type;
-  guint8 vop_quant;
-  guint8 pei;
-  guint8 psupp;
-
-  /*  Gob layer specific fields */
-  guint8 gob_header_empty;
-  guint8 gob_number;
-  guint8 gob_frame_id;
-  guint8 quant_scale;
-
-  /* Computed
-   * If all the values are set to 0, then it is reserved
-   * Table 6-25 -- Parameters Defined by source_format Field
-   */
-  guint16 vop_width;
-  guint16 vop_height;
-  guint16 num_macroblocks_in_gob;
-  guint8 num_gobs_in_vop;
-
-  /* The size in bits */
-  guint size;
-};
-
-/**
- * GstMpeg4VideoObjectLayer:
- *
- * The video object layer structure as defined in:
- * 6.2.3 Video Object Layer
- */
-struct _GstMpeg4VideoObjectLayer {
-  guint8 random_accessible_vol;
-  guint8 video_object_type_indication;
-
-  guint8 is_object_layer_identifier;
-  /* if is_object_layer_identifier */
-  guint8 verid;
-  guint8 priority;
-
-  GstMpeg4AspectRatioInfo aspect_ratio_info;
-  guint8 par_width;
-  guint8 par_height;
-
-  guint8 control_parameters;
-  /* if control_parameters */
-  GstMpeg4ChromaFormat chroma_format;
-  guint8 low_delay;
-  guint8 vbv_parameters;
-  /* if vbv_parameters */
-  guint16 first_half_bitrate;
-  guint16 latter_half_bitrate;
-  guint16 first_half_vbv_buffer_size;
-  guint16 latter_half_vbv_buffer_size;
-  guint16 first_half_vbv_occupancy;
-  guint16 latter_half_vbv_occupancy;
-
-  /* Computed values */
-  guint32 bit_rate;
-  guint32 vbv_buffer_size;
-
-  GstMpeg4VideoObjectLayerShape shape;
-  /* if shape == GST_MPEG4_GRAYSCALE && verid =! 1 */
-  guint8 shape_extension;
-
-  guint16 vop_time_increment_resolution;
-  guint8 vop_time_increment_bits;
-  guint8 fixed_vop_rate;
-  /* if fixed_vop_rate */
-  guint16 fixed_vop_time_increment;
-
-  guint16 width;
-  guint16 height;
-  guint8 interlaced;
-  guint8 obmc_disable;
-
-  GstMpeg4SpriteEnable sprite_enable;
-  /* if vol->sprite_enable == SPRITE_GMG or SPRITE_STATIC*/
-  /* if vol->sprite_enable != GST_MPEG4_SPRITE_GMG */
-  guint16 sprite_width;
-  guint16 sprite_height;
-  guint16 sprite_left_coordinate;
-  guint16 sprite_top_coordinate;
-
-  guint8 no_of_sprite_warping_points;
-  guint8 sprite_warping_accuracy;
-  guint8 sprite_brightness_change;
-  /* if vol->sprite_enable != GST_MPEG4_SPRITE_GMG */
-  guint8 low_latency_sprite_enable;
-
-  /* if shape != GST_MPEG4_RECTANGULAR */
-  guint8 sadct_disable;
-
-  guint8 not_8_bit;
-
-  /* if no_8_bit */
-  guint8 quant_precision;
-  guint8 bits_per_pixel;
-
-  /* if shape == GRAYSCALE */
-  guint8 no_gray_quant_update;
-  guint8 composition_method;
-  guint8 linear_composition;
-
-  guint8 quant_type;
-  /* if quant_type */
-  guint8 load_intra_quant_mat;
-  guint8 intra_quant_mat[64];
-  guint8 load_non_intra_quant_mat;
-  guint8 non_intra_quant_mat[64];
-
-  guint8 quarter_sample;
-  guint8 complexity_estimation_disable;
-  guint8 resync_marker_disable;
-  guint8 data_partitioned;
-  guint8 reversible_vlc;
-  guint8 newpred_enable;
-  guint8 reduced_resolution_vop_enable;
-  guint8 scalability;
-  guint8 enhancement_type;
-
-  GstMpeg4VideoPlaneShortHdr short_hdr;
-};
-
-/**
- * GstMpeg4SpriteTrajectory:
- *
- * The sprite trajectory structure as defined in:
- * 7.8.4 Sprite reference point decoding and
- * 6.2.5.4 Sprite coding
- */
-struct _GstMpeg4SpriteTrajectory {
-  guint16 vop_ref_points[63]; /* Defined as "du" in 6.2.5.4 */
-  guint16 sprite_ref_points[63]; /* Defined as "dv" in 6.2.5.4 */
-};
-
-/**
- * GstMpeg4GroupOfVOP:
- *
- * The group of video object plane structure as defined in:
- * 6.2.4 Group of Video Object Plane
- */
-struct _GstMpeg4GroupOfVOP {
-  guint8 hours;
-  guint8 minutes;
-  guint8 seconds;
-
-  guint8 closed;
-  guint8 broken_link;
-};
-
-/**
- * GstMpeg4VideoObjectPlane:
- *
- * The Video object plane structure as defined in:
- * 6.2.5 Video Object Plane and Video Plane with Short Header
- */
-struct _GstMpeg4VideoObjectPlane {
-  GstMpeg4VideoObjectCodingType coding_type;
-
-  guint8  modulo_time_base;
-  guint16 time_increment;
-
-  guint8  coded;
-  /* if newpred_enable */
-  guint16 id;
-  guint8  id_for_prediction_indication;
-  guint16 id_for_prediction;
-
-  guint16 width;
-  guint16 height;
-  guint16 horizontal_mc_spatial_ref;
-  guint16 vertical_mc_spatial_ref;
-
-  guint8  rounding_type;
-  /*if vol->shape != GST_MPEG4_RECTANGULAR */
-  guint8  background_composition;
-  guint8  change_conv_ratio_disable;
-  guint8  constant_alpha;
-  guint8  constant_alpha_value;
-  guint8  reduced_resolution;
-
-  guint8  intra_dc_vlc_thr;
-
-
-  guint8  top_field_first;
-  guint8  alternate_vertical_scan_flag;
-
-  guint16 quant;
-
-  guint8  fcode_forward;
-  guint8  fcode_backward;
-
-  guint8  shape_coding_type;
-  guint8  load_backward_shape;
-  guint8  ref_select_code;
-
-  /* Computed macroblock informations */
-  guint16 mb_height;
-  guint16 mb_width;
-  guint mb_num;
-
-  /* The size of the header */
-  guint    size;
-};
-
-/**
- * GstMpeg4VideoPacketHdr:
- * @size: Size of the header in bit.
- *
- * The video packet header structure as defined in:
- * 6.2.5.2 Video Plane with Short Header
- */
-struct _GstMpeg4VideoPacketHdr {
-  guint8  header_extension_code;
-  guint16 macroblock_number;
-  guint16 quant_scale;
-  guint   size;
-};
-
-/**
- * GstMpeg4Packet:
- * @type: the type of the packet that start at @offset
- * @data: the data containing packet starting at @offset
- * @offset: offset of the start of the packet (without the 3 bytes startcode), but
- * including the #GstMpeg4StartCode byte.
- * @size: The size in bytes of the packet or %G_MAXUINT if the end wasn't found.
- * @marker_size: The size in bit of the resync marker.
- *
- * A structure that contains the type of a packet, its offset and its size
- */
-struct _GstMpeg4Packet
-{
-  const guint8     *data;
-  guint             offset;
-  gsize             size;
-  guint             marker_size;
-
-  GstMpeg4StartCode type;
-};
-
-GstMpeg4ParseResult gst_h263_parse       (GstMpeg4Packet * packet,
-                                          const guint8 * data, guint offset,
-                                          gsize size);
-
-
-GstMpeg4ParseResult gst_mpeg4_parse      (GstMpeg4Packet * packet,
-                                          gboolean skip_user_data,
-                                          GstMpeg4VideoObjectPlane *vop,
-                                          const guint8 * data, guint offset,
-                                          gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_video_object_plane       (GstMpeg4VideoObjectPlane *vop,
-                                          GstMpeg4SpriteTrajectory *sprite_trajectory,
-                                          GstMpeg4VideoObjectLayer *vol,
-                                          const guint8 * data,
-                                          gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_group_of_vop             (GstMpeg4GroupOfVOP *gov,
-                                          const guint8 * data, gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_video_object_layer       (GstMpeg4VideoObjectLayer *vol,
-                                          GstMpeg4VisualObject *vo,
-                                          const guint8 * data, gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_visual_object            (GstMpeg4VisualObject *vo,
-                                          GstMpeg4VideoSignalType *signal_type,
-                                          const guint8 * data, gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_visual_object_sequence   (GstMpeg4VisualObjectSequence *vos,
-                                          const guint8 * data, gsize size);
-GstMpeg4ParseResult
-gst_mpeg4_parse_video_plane_short_header (GstMpeg4VideoPlaneShortHdr * shorthdr,
-                                          const guint8 * data, gsize size);
-
-GstMpeg4ParseResult
-gst_mpeg4_parse_video_packet_header      (GstMpeg4VideoPacketHdr * videopackethdr,
-                                          GstMpeg4VideoObjectLayer * vol,
-                                          GstMpeg4VideoObjectPlane * vop,
-                                          GstMpeg4SpriteTrajectory * sprite_trajectory,
-                                          const guint8 * data, gsize size);
-
-#endif /* __GST_MPEG4UTIL_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstmpegvideoparser.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstmpegvideoparser.h
deleted file mode 100644
index 2b13a064..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstmpegvideoparser.h
+++ /dev/null
@@ -1,431 +0,0 @@
-/* Gstreamer
- * Copyright (C) <2011> Intel Corporation
- * Copyright (C) <2011> Collabora Ltd.
- * Copyright (C) <2011> Thibault Saunier <thibault.saunier@collabora.com>
- *
- * From bad/sys/vdpau/mpeg/mpegutil.c:
- *   Copyright (C) <2007> Jan Schmidt <thaytan@mad.scientist.com>
- *   Copyright (C) <2009> Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_MPEG_VIDEO_UTILS_H__
-#define __GST_MPEG_VIDEO_UTILS_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The Mpeg video parsing library is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstMpegVideoPacketTypeCode:
- * @GST_MPEG_VIDEO_PACKET_PICTURE: Picture packet starting code
- * @GST_MPEG_VIDEO_PACKET_SLICE_MIN: Slice min packet starting code
- * @GST_MPEG_VIDEO_PACKET_SLICE_MAX: Slice max packet starting code
- * @GST_MPEG_VIDEO_PACKET_USER_DATA: User data packet starting code
- * @GST_MPEG_VIDEO_PACKET_SEQUENCE : Sequence packet starting code
- * @GST_MPEG_VIDEO_PACKET_EXTENSION: Extension packet starting code
- * @GST_MPEG_VIDEO_PACKET_SEQUENCE_END: Sequence end packet code
- * @GST_MPEG_VIDEO_PACKET_GOP: Group of Picture packet starting code
- * @GST_MPEG_VIDEO_PACKET_NONE: None packet code
- *
- * Indicates the type of MPEG packet
- */
-typedef enum {
-  GST_MPEG_VIDEO_PACKET_PICTURE      = 0x00,
-  GST_MPEG_VIDEO_PACKET_SLICE_MIN    = 0x01,
-  GST_MPEG_VIDEO_PACKET_SLICE_MAX    = 0xaf,
-  GST_MPEG_VIDEO_PACKET_USER_DATA    = 0xb2,
-  GST_MPEG_VIDEO_PACKET_SEQUENCE     = 0xb3,
-  GST_MPEG_VIDEO_PACKET_EXTENSION    = 0xb5,
-  GST_MPEG_VIDEO_PACKET_SEQUENCE_END = 0xb7,
-  GST_MPEG_VIDEO_PACKET_GOP          = 0xb8,
-  GST_MPEG_VIDEO_PACKET_NONE         = 0xff
-} GstMpegVideoPacketTypeCode;
-
-/**
- * GST_MPEG_VIDEO_PACKET_IS_SLICE:
- * @typecode: The MPEG video packet type code
- *
- * Checks whether a packet type code is a slice.
- *
- * Returns: %TRUE if the packet type code corresponds to a slice,
- * else %FALSE.
- */
-#define GST_MPEG_VIDEO_PACKET_IS_SLICE(typecode) ((typecode) >= GST_MPEG_VIDEO_PACKET_SLICE_MIN && \
-						  (typecode) <= GST_MPEG_VIDEO_PACKET_SLICE_MAX)
-
-/**
- * GstMpegVideoPacketExtensionCode:
- * @GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE: Sequence extension code
- * @GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE_DISPLAY: Sequence Display extension code
- * @GST_MPEG_VIDEO_PACKET_EXT_QUANT_MATRIX: Quantization Matrix extension code
- * @GST_MPEG_VIDEO_PACKET_EXT_PICTURE: Picture coding extension
- *
- * Indicates what type of packets are in this block, some are mutually
- * exclusive though - ie, sequence packs are accumulated separately. GOP &
- * Picture may occur together or separately.
- */
-typedef enum {
-  GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE         = 0x01,
-  GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE_DISPLAY = 0x02,
-  GST_MPEG_VIDEO_PACKET_EXT_QUANT_MATRIX     = 0x03,
-  GST_MPEG_VIDEO_PACKET_EXT_PICTURE          = 0x08
-} GstMpegVideoPacketExtensionCode;
-
-/**
- * GstMpegVideoLevel:
- * @GST_MPEG_VIDEO_LEVEL_LOW: Low level (LL)
- * @GST_MPEG_VIDEO_LEVEL_MAIN: Main level (ML)
- * @GST_MPEG_VIDEO_LEVEL_HIGH_1440: High 1440 level (H-14)
- * @GST_MPEG_VIDEO_LEVEL_HIGH: High level (HL)
- *
- * Mpeg-2 Levels.
- **/
-typedef enum {
- GST_MPEG_VIDEO_LEVEL_HIGH      = 0x04,
- GST_MPEG_VIDEO_LEVEL_HIGH_1440 = 0x06,
- GST_MPEG_VIDEO_LEVEL_MAIN      = 0x08,
- GST_MPEG_VIDEO_LEVEL_LOW       = 0x0a
-} GstMpegVideoLevel;
-
-/**
- * GstMpegVideoProfile:
- * @GST_MPEG_VIDEO_PROFILE_422: 4:2:2 profile (422)
- * @GST_MPEG_VIDEO_PROFILE_HIGH: High profile (HP)
- * @GST_MPEG_VIDEO_PROFILE_SPATIALLY_SCALABLE: Spatially Scalable profile (Spatial)
- * @GST_MPEG_VIDEO_PROFILE_SNR_SCALABLE: SNR Scalable profile (SNR)
- * @GST_MPEG_VIDEO_PROFILE_MAIN: Main profile (MP)
- * @GST_MPEG_VIDEO_PROFILE_SIMPLE: Simple profile (SP)
- *
- * Mpeg-2 Profiles.
- **/
-typedef enum {
-  GST_MPEG_VIDEO_PROFILE_422                 = 0x00,
-  GST_MPEG_VIDEO_PROFILE_HIGH                = 0x01,
-  GST_MPEG_VIDEO_PROFILE_SPATIALLY_SCALABLE  = 0x02,
-  GST_MPEG_VIDEO_PROFILE_SNR_SCALABLE        = 0x03,
-  GST_MPEG_VIDEO_PROFILE_MAIN                = 0x04,
-  GST_MPEG_VIDEO_PROFILE_SIMPLE              = 0x05
-} GstMpegVideoProfile;
-
-/**
- * GstMpegVideoChromaFormat:
- * @GST_MPEG_VIDEO_CHROMA_RES: Invalid (reserved for future use)
- * @GST_MPEG_VIDEO_CHROMA_420: 4:2:0 subsampling
- * @GST_MPEG_VIDEO_CHROMA_422: 4:2:2 subsampling
- * @GST_MPEG_VIDEO_CHROMA_444: 4:4:4 (non-subsampled)
- *
- * Chroma subsampling type.
- */
-typedef enum {
-  GST_MPEG_VIDEO_CHROMA_RES = 0x00,
-  GST_MPEG_VIDEO_CHROMA_420 = 0x01,
-  GST_MPEG_VIDEO_CHROMA_422 = 0x02,
-  GST_MPEG_VIDEO_CHROMA_444 = 0x03,
-} GstMpegVideoChromaFormat;
-
-/**
- * GstMpegVideoPictureType:
- * @GST_MPEG_VIDEO_PICTURE_TYPE_I: Intra-coded (I) frame
- * @GST_MPEG_VIDEO_PICTURE_TYPE_P: Predictive-codec (P) frame
- * @GST_MPEG_VIDEO_PICTURE_TYPE_B: Bidirectionally predictive-coded (B) frame
- * @GST_MPEG_VIDEO_PICTURE_TYPE_D: D frame
- *
- * Picture type.
- */
-typedef enum {
-  GST_MPEG_VIDEO_PICTURE_TYPE_I = 0x01,
-  GST_MPEG_VIDEO_PICTURE_TYPE_P = 0x02,
-  GST_MPEG_VIDEO_PICTURE_TYPE_B = 0x03,
-  GST_MPEG_VIDEO_PICTURE_TYPE_D = 0x04
-} GstMpegVideoPictureType;
-
-/**
- * GstMpegVideoPictureStructure:
- * @GST_MPEG_VIDEO_PICTURE_STRUCTURE_TOP_FIELD: Top field
- * @GST_MPEG_VIDEO_PICTURE_STRUCTURE_BOTTOM_FIELD: Bottom field
- * @GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME: Frame picture
- *
- * Picture structure type.
- */
-typedef enum {
-    GST_MPEG_VIDEO_PICTURE_STRUCTURE_TOP_FIELD    = 0x01,
-    GST_MPEG_VIDEO_PICTURE_STRUCTURE_BOTTOM_FIELD = 0x02,
-    GST_MPEG_VIDEO_PICTURE_STRUCTURE_FRAME        = 0x03
-} GstMpegVideoPictureStructure;
-
-typedef struct _GstMpegVideoSequenceHdr     GstMpegVideoSequenceHdr;
-typedef struct _GstMpegVideoSequenceExt     GstMpegVideoSequenceExt;
-typedef struct _GstMpegVideoSequenceDisplayExt GstMpegVideoSequenceDisplayExt;
-typedef struct _GstMpegVideoPictureHdr      GstMpegVideoPictureHdr;
-typedef struct _GstMpegVideoGop             GstMpegVideoGop;
-typedef struct _GstMpegVideoPictureExt      GstMpegVideoPictureExt;
-typedef struct _GstMpegVideoQuantMatrixExt  GstMpegVideoQuantMatrixExt;
-typedef struct _GstMpegVideoPacket          GstMpegVideoPacket;
-
-/**
- * GstMpegVideoSequenceHdr:
- * @width: Width of each frame
- * @height: Height of each frame
- * @par_w: Calculated Pixel Aspect Ratio width
- * @par_h: Calculated Pixel Aspect Ratio height
- * @fps_n: Calculated Framrate nominator
- * @fps_d: Calculated Framerate denominator
- * @bitrate_value: Value of the bitrate as is in the stream (400bps unit)
- * @bitrate: the real bitrate of the Mpeg video stream in bits per second, 0 if VBR stream
- * @constrained_parameters_flag: %TRUE if this stream uses contrained parameters.
- * @intra_quantizer_matrix: intra-quantization table
- * @non_intra_quantizer_matrix: non-intra quantization table
- *
- * The Mpeg2 Video Sequence Header structure.
- */
-struct _GstMpegVideoSequenceHdr
-{
-  guint16 width, height;
-  guint8  aspect_ratio_info;
-  guint8  frame_rate_code;
-  guint32 bitrate_value;
-  guint16 vbv_buffer_size_value;
-
-  guint8  constrained_parameters_flag;
-
-  guint8  intra_quantizer_matrix[64];
-  guint8  non_intra_quantizer_matrix[64];
-
-  /* Calculated values */
-  guint   par_w, par_h;
-  guint   fps_n, fps_d;
-  guint   bitrate;
-};
-
-/**
- * GstMpegVideoSequenceExt:
- * @profile: mpeg2 decoder profile
- * @level: mpeg2 decoder level
- * @progressive: %TRUE if the frames are progressive %FALSE otherwise
- * @chroma_format: indicates the chrominance format
- * @horiz_size_ext: Horizontal size
- * @vert_size_ext: Vertical size
- * @bitrate_ext: The bitrate
- * @vbv_buffer_size_extension: VBV vuffer size
- * @low_delay: %TRUE if the sequence doesn't contain any B-pictures, %FALSE
- * otherwise
- * @fps_n_ext: Framerate nominator code
- * @fps_d_ext: Framerate denominator code
- *
- * The Mpeg2 Video Sequence Extension structure.
- **/
-struct _GstMpegVideoSequenceExt
-{
-  /* mpeg2 decoder profile */
-  guint8 profile;
-  /* mpeg2 decoder level */
-  guint8 level;
-
-  guint8 progressive;
-  guint8 chroma_format;
-
-  guint8 horiz_size_ext, vert_size_ext;
-
-  guint16 bitrate_ext;
-  guint8 vbv_buffer_size_extension;
-  guint8 low_delay;
-  guint8 fps_n_ext, fps_d_ext;
-
-};
-
-/**
- * GstMpegVideoSequenceDisplayExt:
- * @profile: mpeg2 decoder profil
-
- */
-struct _GstMpegVideoSequenceDisplayExt
-{
-  guint8 video_format;
-  guint8 colour_description_flag;
-
-  /* if colour_description_flag: */
-    guint8 colour_primaries;
-    guint8 transfer_characteristics;
-    guint8 matrix_coefficients;
-
-  guint16 display_horizontal_size;
-  guint16 display_vertical_size;
-};
-
-/**
- * GstMpegVideoQuantMatrixExt:
- * @load_intra_quantiser_matrix:
- * @intra_quantiser_matrix:
- * @load_non_intra_quantiser_matrix:
- * @non_intra_quantiser_matrix:
- * @load_chroma_intra_quantiser_matrix:
- * @chroma_intra_quantiser_matrix:
- * @load_chroma_non_intra_quantiser_matrix:
- * @chroma_non_intra_quantiser_matrix:
- *
- * The Quant Matrix Extension structure
- */
-struct _GstMpegVideoQuantMatrixExt
-{
- guint8 load_intra_quantiser_matrix;
- guint8 intra_quantiser_matrix[64];
- guint8 load_non_intra_quantiser_matrix;
- guint8 non_intra_quantiser_matrix[64];
- guint8 load_chroma_intra_quantiser_matrix;
- guint8 chroma_intra_quantiser_matrix[64];
- guint8 load_chroma_non_intra_quantiser_matrix;
- guint8 chroma_non_intra_quantiser_matrix[64];
-};
-
-/**
- * GstMpegVideoPictureHdr:
- * @tsn: Temporal Sequence Number
- * @pic_type: Type of the frame
- * @full_pel_forward_vector: the full pel forward flag of
- *  the frame: 0 or 1.
- * @full_pel_backward_vector: the full pel backward flag
- *  of the frame: 0 or 1.
- * @f_code: F code
- *
- * The Mpeg2 Video Picture Header structure.
- */
-struct _GstMpegVideoPictureHdr
-{
-  guint16 tsn;
-  guint8 pic_type;
-
-  guint8 full_pel_forward_vector, full_pel_backward_vector;
-
-  guint8 f_code[2][2];
-};
-
-/**
- * GstMpegVideoPictureExt:
- * @intra_dc_precision: Intra DC precision
- * @picture_structure: Structure of the picture
- * @top_field_first: Top field first
- * @frame_pred_frame_dct: Frame
- * @concealment_motion_vectors: Concealment Motion Vectors
- * @q_scale_type: Q Scale Type
- * @intra_vlc_format: Intra Vlc Format
- * @alternate_scan: Alternate Scan
- * @repeat_first_field: Repeat First Field
- * @chroma_420_type: Chroma 420 Type
- * @progressive_frame: %TRUE if the frame is progressive %FALSE otherwize
- *
- * The Mpeg2 Video Picture Extension structure.
- */
-struct _GstMpegVideoPictureExt
-{
-  guint8 f_code[2][2];
-
-  guint8 intra_dc_precision;
-  guint8 picture_structure;
-  guint8 top_field_first;
-  guint8 frame_pred_frame_dct;
-  guint8 concealment_motion_vectors;
-  guint8 q_scale_type;
-  guint8 intra_vlc_format;
-  guint8 alternate_scan;
-  guint8 repeat_first_field;
-  guint8 chroma_420_type;
-  guint8 progressive_frame;
-  guint8 composite_display;
-  guint8 v_axis;
-  guint8 field_sequence;
-  guint8 sub_carrier;
-  guint8 burst_amplitude;
-  guint8 sub_carrier_phase;
-};
-
-/**
- * GstMpegVideoGop:
- * @drop_frame_flag: Drop Frame Flag
- * @hour: Hour (0-23)
- * @minute: Minute (O-59)
- * @second: Second (0-59)
- * @frame: Frame (0-59)
- * @closed_gop: Closed Gop
- * @broken_link: Broken link
- *
- * The Mpeg Video Group of Picture structure.
- */
-struct _GstMpegVideoGop
-{
-  guint8 drop_frame_flag;
-
-  guint8 hour, minute, second, frame;
-
-  guint8 closed_gop;
-  guint8 broken_link;
-};
-
-/**
- * GstMpegVideoTypeOffsetSize:
- *
- * @type: the type of the packet that start at @offset
- * @data: the data containing the packet starting at @offset
- * @offset: the offset of the packet start in bytes, it is the exact, start of the packet, no sync code included
- * @size: The size in bytes of the packet or -1 if the end wasn't found. It is the exact size of the packet, no sync code included
- *
- * A structure that contains the type of a packet, its offset and its size
- */
-struct _GstMpegVideoPacket
-{
-  const guint8 *data;
-  guint8 type;
-  guint  offset;
-  gint   size;
-};
-
-gboolean gst_mpeg_video_parse                         (GstMpegVideoPacket * packet,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_sequence_header         (GstMpegVideoSequenceHdr * params,
-                                                       const guint8 * data, gsize size, guint offset);
-
-/* seqext and displayext may be NULL if not received */
-gboolean gst_mpeg_video_finalise_mpeg2_sequence_header (GstMpegVideoSequenceHdr *hdr,
-   GstMpegVideoSequenceExt *seqext, GstMpegVideoSequenceDisplayExt *displayext);
-
-gboolean gst_mpeg_video_parse_picture_header          (GstMpegVideoPictureHdr* hdr,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_picture_extension       (GstMpegVideoPictureExt *ext,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_gop                     (GstMpegVideoGop * gop,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_sequence_extension      (GstMpegVideoSequenceExt * seqext,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_sequence_display_extension (GstMpegVideoSequenceDisplayExt * seqdisplayext,
-                                                       const guint8 * data, gsize size, guint offset);
-
-gboolean gst_mpeg_video_parse_quant_matrix_extension  (GstMpegVideoQuantMatrixExt * quant,
-                                                       const guint8 * data, gsize size, guint offset);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstvc1parser.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstvc1parser.h
deleted file mode 100644
index ce463d72..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/codecparsers/gstvc1parser.h
+++ /dev/null
@@ -1,622 +0,0 @@
-/* Gstreamer
- * Copyright (C) <2011> Intel
- * Copyright (C) <2011> Collabora Ltd.
- * Copyright (C) <2011> Thibault Saunier <thibault.saunier@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VC1_PARSER_H__
-#define __GST_VC1_PARSER_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The VC1 parsing library is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define MAX_HRD_NUM_LEAKY_BUCKETS 31
-
-/**
- * @GST_VC1_BFRACTION_BASIS: The @bfraction variable should be divided
- * by this constant to have the actual value.
- */
-#define GST_VC1_BFRACTION_BASIS 840
-
-#define GST_VC1_BFRACTION_RESERVED (GST_VC1_BFRACTION_BASIS + 1)
-#define GST_VC1_BFRACTION_PTYPE_BI (GST_VC1_BFRACTION_BASIS + 2)
-
-typedef enum {
-  GST_VC1_END_OF_SEQ       = 0x0A,
-  GST_VC1_SLICE            = 0x0B,
-  GST_VC1_FIELD            = 0x0C,
-  GST_VC1_FRAME            = 0x0D,
-  GST_VC1_ENTRYPOINT       = 0x0E,
-  GST_VC1_SEQUENCE         = 0x0F,
-  GST_VC1_SLICE_USER       = 0x1B,
-  GST_VC1_FIELD_USER       = 0x1C,
-  GST_VC1_FRAME_USER       = 0x1D,
-  GST_VC1_ENTRY_POINT_USER = 0x1E,
-  GST_VC1_SEQUENCE_USER    = 0x1F
-} GstVC1StartCode;
-
-typedef enum {
-  GST_VC1_PROFILE_SIMPLE,
-  GST_VC1_PROFILE_MAIN,
-  GST_VC1_PROFILE_RESERVED,
-  GST_VC1_PROFILE_ADVANCED
-} GstVC1Profile;
-
-typedef enum {
-  GST_VC1_PARSER_OK,
-  GST_VC1_PARSER_BROKEN_DATA,
-  GST_VC1_PARSER_NO_BDU,
-  GST_VC1_PARSER_NO_BDU_END,
-  GST_VC1_PARSER_ERROR,
-} GstVC1ParserResult;
-
-typedef enum
-{
-  GST_VC1_PICTURE_TYPE_P,
-  GST_VC1_PICTURE_TYPE_B,
-  GST_VC1_PICTURE_TYPE_I,
-  GST_VC1_PICTURE_TYPE_BI,
-  GST_VC1_PICTURE_TYPE_SKIPPED
-} GstVC1PictureType;
-
-typedef enum
-{
-    GST_VC1_LEVEL_LOW    = 0,    /* Simple/Main profile low level */
-    GST_VC1_LEVEL_MEDIUM = 1,    /* Simple/Main profile medium level */
-    GST_VC1_LEVEL_HIGH   = 2,   /* Main profile high level */
-
-    GST_VC1_LEVEL_L0    = 0,    /* Advanced profile level 0 */
-    GST_VC1_LEVEL_L1    = 1,    /* Advanced profile level 1 */
-    GST_VC1_LEVEL_L2    = 2,    /* Advanced profile level 2 */
-    GST_VC1_LEVEL_L3    = 3,    /* Advanced profile level 3 */
-    GST_VC1_LEVEL_L4    = 4,    /* Advanced profile level 4 */
-
-    /* 5 to 7 reserved */
-    GST_VC1_LEVEL_UNKNOWN = 255  /* Unknown profile */
-} GstVC1Level;
-
-typedef enum
-{
-  GST_VC1_QUANTIZER_IMPLICITLY,
-  GST_VC1_QUANTIZER_EXPLICITLY,
-  GST_VC1_QUANTIZER_NON_UNIFORM,
-  GST_VC1_QUANTIZER_UNIFORM
-} GstVC1QuantizerSpec;
-
-typedef enum {
-  GST_VC1_DQPROFILE_FOUR_EDGES,
-  GST_VC1_DQPROFILE_DOUBLE_EDGES,
-  GST_VC1_DQPROFILE_SINGLE_EDGE,
-  GST_VC1_DQPROFILE_ALL_MBS
-} GstVC1DQProfile;
-
-typedef enum {
-  GST_VC1_CONDOVER_NONE,
-  GST_VC1_CONDOVER_ALL,
-  GST_VC1_CONDOVER_SELECT
-} GstVC1Condover;
-
-/**
- * GstVC1MvMode:
- *
- */
-typedef enum
-{
-  GST_VC1_MVMODE_1MV_HPEL_BILINEAR,
-  GST_VC1_MVMODE_1MV,
-  GST_VC1_MVMODE_1MV_HPEL,
-  GST_VC1_MVMODE_MIXED_MV,
-  GST_VC1_MVMODE_INTENSITY_COMP
-} GstVC1MvMode;
-
-typedef enum
-{
-  GST_VC1_FRAME_PROGRESSIVE = 0x0,
-  GST_VC1_FRAME_INTERLACE   = 0x10,
-  GST_VC1_FIELD_INTERLACE   = 0x11
-} GstVC1FrameCodingMode;
-
-typedef struct _GstVC1SeqHdr            GstVC1SeqHdr;
-typedef struct _GstVC1AdvancedSeqHdr    GstVC1AdvancedSeqHdr;
-typedef struct _GstVC1HrdParam          GstVC1HrdParam;
-typedef struct _GstVC1EntryPointHdr     GstVC1EntryPointHdr;
-
-typedef struct _GstVC1SeqLayer     GstVC1SeqLayer;
-
-typedef struct _GstVC1SeqStructA   GstVC1SeqStructA;
-typedef struct _GstVC1SeqStructB   GstVC1SeqStructB;
-typedef struct _GstVC1SeqStructC   GstVC1SeqStructC;
-
-/* Pictures Structures */
-typedef struct _GstVC1FrameLayer        GstVC1FrameLayer;
-typedef struct _GstVC1FrameHdr          GstVC1FrameHdr;
-typedef struct _GstVC1PicAdvanced       GstVC1PicAdvanced;
-typedef struct _GstVC1PicSimpleMain     GstVC1PicSimpleMain;
-typedef struct _GstVC1Picture           GstVC1Picture;
-
-typedef struct _GstVC1VopDquant         GstVC1VopDquant;
-
-typedef struct _GstVC1BitPlanes         GstVC1BitPlanes;
-
-typedef struct _GstVC1BDU               GstVC1BDU;
-
-struct _GstVC1HrdParam
-{
-  guint8 hrd_num_leaky_buckets;
-  guint8 bit_rate_exponent;
-  guint8 buffer_size_exponent;
-  guint16 hrd_rate[MAX_HRD_NUM_LEAKY_BUCKETS];
-  guint16 hrd_buffer[MAX_HRD_NUM_LEAKY_BUCKETS];
-};
-
-/**
- * GstVC1EntryPointHdr:
- *
- * Structure for entrypoint header, this will be used only in advanced profiles
- */
-struct _GstVC1EntryPointHdr
-{
-  guint8 broken_link;
-  guint8 closed_entry;
-  guint8 panscan_flag;
-  guint8 refdist_flag;
-  guint8 loopfilter;
-  guint8 fastuvmc;
-  guint8 extended_mv;
-  guint8 dquant;
-  guint8 vstransform;
-  guint8 overlap;
-  guint8 quantizer;
-  guint8 coded_size_flag;
-  guint16 coded_width;
-  guint16 coded_height;
-  guint8 extended_dmv;
-  guint8 range_mapy_flag;
-  guint8 range_mapy;
-  guint8 range_mapuv_flag;
-  guint8 range_mapuv;
-
-  guint8 hrd_full[MAX_HRD_NUM_LEAKY_BUCKETS];
-};
-
-/**
- * GstVC1AdvancedSeqHdr:
- *
- * Structure for the advanced profile sequence headers specific parameters.
- */
-struct _GstVC1AdvancedSeqHdr
-{
-  GstVC1Level  level;
-
-  guint8  frmrtq_postproc;
-  guint8  bitrtq_postproc;
-  guint8  postprocflag;
-  guint16 max_coded_width;
-  guint16 max_coded_height;
-  guint8  pulldown;
-  guint8  interlace;
-  guint8  tfcntrflag;
-  guint8  finterpflag;
-  guint8  psf;
-  guint8  display_ext;
-  guint16 disp_horiz_size;
-  guint16 disp_vert_size;
-  guint8  aspect_ratio_flag;
-  guint8  aspect_ratio;
-  guint8  aspect_horiz_size;
-  guint8  aspect_vert_size;
-  guint8  framerate_flag;
-  guint8  framerateind;
-  guint8  frameratenr;
-  guint8  frameratedr;
-  guint16 framerateexp;
-  guint8  color_format_flag;
-  guint8  color_prim;
-  guint8  transfer_char;
-  guint8  matrix_coef;
-  guint8  hrd_param_flag;
-  guint8  colordiff_format;
-
-  GstVC1HrdParam hrd_param;
-
-  /* computed */
-  guint framerate; /* Around in fps, 0 if unknown*/
-  guint bitrate;   /* Around in kpbs, 0 if unknown*/
-  guint par_n;
-  guint par_d;
-  guint fps_n;
-  guint fps_d;
-
-  /* The last parsed entry point */
-  GstVC1EntryPointHdr entrypoint;
-};
-
-struct _GstVC1SeqStructA
-{
-  guint32 vert_size;
-  guint32 horiz_size;
-};
-
-struct _GstVC1SeqStructB
-{
-  GstVC1Level  level;
-
-  guint8 cbr;
-  guint32 framerate;
-
-  /* In simple and main profiles only */
-  guint32 hrd_buffer;
-  guint32 hrd_rate;
-};
-
-struct _GstVC1SeqStructC
-{
-  GstVC1Profile profile;
-
-  /* Only in simple and main profiles */
-  guint8 frmrtq_postproc;
-  guint8 bitrtq_postproc;
-  guint8 res_sprite;
-  guint8 loop_filter;
-  guint8 multires;
-  guint8 fastuvmc;
-  guint8 extended_mv;
-  guint8 dquant;
-  guint8 vstransform;
-  guint8 overlap;
-  guint8 syncmarker;
-  guint8 rangered;
-  guint8 maxbframes;
-  guint8 quantizer;
-  guint8 finterpflag;
-
-  /* Computed */
-  guint framerate; /* Around in fps, 0 if unknown*/
-  guint bitrate;   /* Around in kpbs, 0 if unknown*/
-
-  /* This should be filled by user if previously known */
-  guint16 coded_width;
-  /* This should be filled by user if previously known */
-  guint16 coded_height;
-
-  /* Wmvp specific */
-  guint8 wmvp;          /* Specify if the stream is wmp or not */
-  /* In the wmvp case, the framerate is not computed but in the bistream */
-  guint8 slice_code;
-};
-
-struct _GstVC1SeqLayer
-{
-  guint32 numframes;
-
-  GstVC1SeqStructA struct_a;
-  GstVC1SeqStructB struct_b;
-  GstVC1SeqStructC struct_c;
-};
-
-/**
- * GstVC1SeqHdr:
- *
- * Structure for sequence headers in any profile.
- */
-struct _GstVC1SeqHdr
-{
-  GstVC1Profile profile;
-
-  GstVC1SeqStructC struct_c;
-
-  /*  calculated */
-  guint mb_height;
-  guint mb_width;
-  guint mb_stride;
-
-  GstVC1AdvancedSeqHdr   advanced;
-
-};
-
-/**
- * GstVC1PicSimpleMain:
- * @bfaction: Should be divided by #GST_VC1_BFRACTION_BASIS
- * to get the real value.
- */
-struct _GstVC1PicSimpleMain
-{
-  guint8 frmcnt;
-  guint8 mvrange;
-  guint8 rangeredfrm;
-
-  /* I and P pic simple and main profiles only */
-  guint8 respic;
-
-  /* I and BI pic simple and main profiles only */
-  guint8 transacfrm2;
-  guint8 bf;
-
-  /* B and P pic simple and main profiles only */
-  guint8 mvmode;
-  guint8 mvtab;
-  guint8 ttmbf;
-
-  /* P pic simple and main profiles only */
-  guint8 mvmode2;
-  guint8 lumscale;
-  guint8 lumshift;
-
-  guint8 cbptab;
-  guint8 ttfrm;
-
-  /* B and BI picture only
-   * Should be divided by #GST_VC1_BFRACTION_BASIS
-   * to get the real value. */
-  guint16 bfraction;
-
-  /* Biplane value, those fields only mention the fact
-   * that the bitplane is in raw mode or not */
-  guint8 mvtypemb;
-  guint8 skipmb;
-  guint8 directmb; /* B pic main profile only */
-};
-
-/**
- * GstVC1PicAdvanced:
- * @bfaction: Should be divided by #GST_VC1_BFRACTION_BASIS
- * to get the real value.
- */
-struct _GstVC1PicAdvanced
-{
-  GstVC1FrameCodingMode fcm;
-  guint8  tfcntr;
-
-  guint8  rptfrm;
-  guint8  tff;
-  guint8  rff;
-  guint8  ps_present;
-  guint32 ps_hoffset;
-  guint32 ps_voffset;
-  guint16 ps_width;
-  guint16 ps_height;
-  guint8  rndctrl;
-  guint8  uvsamp;
-  guint8  postproc;
-
-  /*  B and P picture specific */
-  guint8  mvrange;
-  guint8  mvmode;
-  guint8  mvtab;
-  guint8  cbptab;
-  guint8  ttmbf;
-  guint8  ttfrm;
-
-  /* B and BI picture only
-   * Should be divided by #GST_VC1_BFRACTION_BASIS
-   * to get the real value. */
-  guint16 bfraction;
-
-  /* ppic */
-  guint8  mvmode2;
-  guint8  lumscale;
-  guint8  lumshift;
-
-  /* bipic */
-  guint8  bf;
-  guint8  condover;
-  guint8  transacfrm2;
-
-  /* Biplane value, those fields only mention the fact
-   * that the bitplane is in raw mode or not */
-  guint8  acpred;
-  guint8  overflags;
-  guint8  mvtypemb;
-  guint8  skipmb;
-  guint8  directmb;
-  guint8  forwardmb; /* B pic interlace field only */
-
-  /* For interlaced pictures only */
-  guint8  fieldtx;
-
-  /* P and B pictures */
-  guint8  intcomp;
-  guint8  dmvrange;
-  guint8  mbmodetab;
-  guint8  imvtab;
-  guint8  icbptab;
-  guint8  mvbptab2;
-  guint8  mvbptab4; /* If 4mvswitch in ppic */
-
-  /*  P picture */
-  guint8  mvswitch4;
-
-  /* For interlaced fields only */
-  guint16 refdist;
-  guint8 fptype; /* Raw value */
-
-  /* P pic */
-  guint8  numref;
-  guint8  reffield;
-  guint8  lumscale2;
-  guint8  lumshift2;
-  guint8  intcompfield;
-
-};
-
-struct _GstVC1BitPlanes
-{
-  guint8  *acpred;
-  guint8  *fieldtx;
-  guint8  *overflags;
-  guint8  *mvtypemb;
-  guint8  *skipmb;
-  guint8  *directmb;
-  guint8  *forwardmb;
-
-  guint size; /* Size of the arrays */
-};
-
-struct _GstVC1VopDquant
-{
-  guint8 pqdiff;
-  guint8 abspq;
-
-  /* Computed */
-  guint8 altpquant;
-
-  /*  if dqant != 2*/
-  guint8 dquantfrm;
-  guint8 dqprofile;
-
-  /* if dqprofile == GST_VC1_DQPROFILE_SINGLE_EDGE
-   * or GST_VC1_DQPROFILE_DOUBLE_EDGE:*/
-  guint8 dqsbedge;
-
-  /* if dqprofile == GST_VC1_DQPROFILE_SINGLE_EDGE
-   * or GST_VC1_DQPROFILE_DOUBLE_EDGE:*/
-  guint8 dqbedge;
-
-  /* if dqprofile == GST_VC1_DQPROFILE_ALL_MBS */
-  guint8 dqbilevel;
-
-};
-
-struct _GstVC1FrameLayer
-{
-  guint8 key;
-  guint32 framesize;
-
-  guint32 timestamp;
-
-  /* calculated */
-  guint32 next_framelayer_offset;
-  guint8 skiped_p_frame;
-};
-
-/**
- * GstVC1FrameHdr:
- *
- * Structure that represent picture in any profile or mode.
- * You should look at @ptype and @profile to know what is currently
- * in use.
- */
-struct _GstVC1FrameHdr
-{
-  /* common fields */
-  GstVC1PictureType ptype;
-  guint8 interpfrm;
-  guint8 halfqp;
-  guint8 transacfrm;
-  guint8 transdctab;
-  guint8 pqindex;
-  guint8 pquantizer;
-
-  /* Computed */
-  guint8 pquant;
-
-  /* Convenience fields */
-  guint8 profile;
-  guint8 dquant;
-
-  /*  If dquant */
-  GstVC1VopDquant vopdquant;
-
-  union {
-    GstVC1PicSimpleMain simple;
-    GstVC1PicAdvanced advanced;
-  } pic;
-
-  /* Size of the picture layer in bits */
-  guint header_size;
-};
-
-/**
- * GstVC1BDU:
- *
- * Structure that represents a Bitstream Data Unit.
- */
-struct _GstVC1BDU
-{
-  GstVC1StartCode type;
-  guint size;
-  guint sc_offset;
-  guint offset;
-  guint8 * data;
-};
-
-GstVC1ParserResult gst_vc1_identify_next_bdu           (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1BDU *bdu);
-
-
-GstVC1ParserResult gst_vc1_parse_sequence_header       (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqHdr * seqhdr);
-
-GstVC1ParserResult gst_vc1_parse_entry_point_header    (const  guint8 *data,
-                                                        gsize size,
-                                                        GstVC1EntryPointHdr * entrypoint,
-                                                        GstVC1SeqHdr *seqhdr);
-
-GstVC1ParserResult gst_vc1_parse_sequence_layer        (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqLayer * seqlayer);
-
-GstVC1ParserResult
-gst_vc1_parse_sequence_header_struct_a                 (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqStructA *structa);
-GstVC1ParserResult
-gst_vc1_parse_sequence_header_struct_b                 (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqStructB *structb);
-
-GstVC1ParserResult
-gst_vc1_parse_sequence_header_struct_c                 (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1SeqStructC *structc);
-
-GstVC1ParserResult gst_vc1_parse_frame_layer           (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1FrameLayer * framelayer);
-
-GstVC1ParserResult gst_vc1_parse_frame_header          (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1FrameHdr * framehdr,
-                                                        GstVC1SeqHdr *seqhdr,
-                                                        GstVC1BitPlanes *bitplanes);
-
-GstVC1ParserResult gst_vc1_parse_field_header          (const guint8 *data,
-                                                        gsize size,
-                                                        GstVC1FrameHdr * fieldhdr,
-                                                        GstVC1SeqHdr *seqhdr,
-                                                        GstVC1BitPlanes *bitplanes);
-
-GstVC1BitPlanes *  gst_vc1_bitplanes_new               (void);
-
-void               gst_vc1_bitplanes_free              (GstVC1BitPlanes *bitplanes);
-
-void               gst_vc1_bitplanes_free_1            (GstVC1BitPlanes *bitplanes);
-
-gboolean           gst_vc1_bitplanes_ensure_size       (GstVC1BitPlanes *bitplanes,
-                                                        GstVC1SeqHdr *seqhdr);
-
-G_END_DECLS
-#endif
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstargbcontrolbinding.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstargbcontrolbinding.h
deleted file mode 100644
index 26bfc6dc..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstargbcontrolbinding.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gstargbcontrolbinding.h: Attachment for multiple control sources to gargb
- *                            properties
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_ARGB_CONTROL_BINDING_H__
-#define __GST_ARGB_CONTROL_BINDING_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-#include <gst/gstcontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ARGB_CONTROL_BINDING \
-  (gst_argb_control_binding_get_type())
-#define GST_ARGB_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ARGB_CONTROL_BINDING,GstARGBControlBinding))
-#define GST_ARGB_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ARGB_CONTROL_BINDING,GstARGBControlBindingClass))
-#define GST_IS_ARGB_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ARGB_CONTROL_BINDING))
-#define GST_IS_ARGB_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARGB_CONTROL_BINDING))
-#define GST_ARGB_CONTROL_BINDING_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_CONTOL_SOURCE, GstARGBControlBindingClass))
-
-typedef struct _GstARGBControlBinding GstARGBControlBinding;
-typedef struct _GstARGBControlBindingClass GstARGBControlBindingClass;
-
-/**
- * GstARGBControlBinding:
- * @name: name of the property of this binding
- *
- * The instance structure of #GstARGBControlBinding.
- */
-struct _GstARGBControlBinding {
-  GstControlBinding parent;
-  
-  /*< private >*/
-  GstControlSource *cs_a;       /* GstControlSources for this property */
-  GstControlSource *cs_r;
-  GstControlSource *cs_g;
-  GstControlSource *cs_b;
-
-  GValue cur_value;
-  guint32 last_value;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstARGBControlBindingClass:
- * @parent_class: Parent class
- * @convert: Class method to convert control-values
- *
- * The class structure of #GstARGBControlBinding.
- */
-
-struct _GstARGBControlBindingClass
-{
-  GstControlBindingClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_argb_control_binding_get_type (void);
-
-/* Functions */
-
-GstControlBinding * gst_argb_control_binding_new   (GstObject * object, const gchar * property_name,
-                                                            GstControlSource * cs_a, GstControlSource * cs_r,
-                                                            GstControlSource * cs_g, GstControlSource * cs_b);
-
-G_END_DECLS
-
-#endif /* __GST_ARGB_CONTROL_BINDING_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstdirectcontrolbinding.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstdirectcontrolbinding.h
deleted file mode 100644
index 24ece6d2..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstdirectcontrolbinding.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gstdirectcontrolbinding.h: Direct attachment for control sources
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_DIRECT_CONTROL_BINDING_H__
-#define __GST_DIRECT_CONTROL_BINDING_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-#include <gst/gstcontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_DIRECT_CONTROL_BINDING \
-  (gst_direct_control_binding_get_type())
-#define GST_DIRECT_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DIRECT_CONTROL_BINDING,GstDirectControlBinding))
-#define GST_DIRECT_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DIRECT_CONTROL_BINDING,GstDirectControlBindingClass))
-#define GST_IS_DIRECT_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DIRECT_CONTROL_BINDING))
-#define GST_IS_DIRECT_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DIRECT_CONTROL_BINDING))
-#define GST_DIRECT_CONTROL_BINDING_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_CONTOL_SOURCE, GstDirectControlBindingClass))
-
-typedef struct _GstDirectControlBinding GstDirectControlBinding;
-typedef struct _GstDirectControlBindingClass GstDirectControlBindingClass;
-
-/**
- * GstDirectControlBindingConvertValue:
- * @self: the #GstDirectControlBinding instance
- * @src_value: the value returned by the cotnrol source
- * @dest_value: the target location
- *
- * Function to map a control-value to the target plain data type.
- */
-typedef void (* GstDirectControlBindingConvertValue) (GstDirectControlBinding *self, gdouble src_value, gpointer dest_value);
-
-/**
- * GstDirectControlBindingConvertGValue:
- * @self: the #GstDirectControlBinding instance
- * @src_value: the value returned by the cotnrol source
- * @dest_value: the target GValue
- *
- * Function to map a control-value to the target GValue.
- */
-typedef void (* GstDirectControlBindingConvertGValue) (GstDirectControlBinding *self, gdouble src_value, GValue *dest_value);
-
-/**
- * GstDirectControlBinding:
- * @name: name of the property of this binding
- *
- * The instance structure of #GstDirectControlBinding.
- */
-struct _GstDirectControlBinding {
-  GstControlBinding parent;
-  
-  /*< private >*/
-  GstControlSource *cs;    /* GstControlSource for this property */
-  GValue cur_value;
-  gdouble last_value;
-  gint byte_size;
-
-  GstDirectControlBindingConvertValue convert_value;
-  GstDirectControlBindingConvertGValue convert_g_value;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstDirectControlBindingClass:
- * @parent_class: Parent class
- * @convert: Class method to convert control-values
- *
- * The class structure of #GstDirectControlBinding.
- */
-
-struct _GstDirectControlBindingClass
-{
-  GstControlBindingClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_direct_control_binding_get_type (void);
-
-/* Functions */
-
-GstControlBinding * gst_direct_control_binding_new (GstObject * object, const gchar * property_name,
-                                                    GstControlSource * cs);
-G_END_DECLS
-
-#endif /* __GST_DIRECT_CONTROL_BINDING_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstinterpolationcontrolsource.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstinterpolationcontrolsource.h
deleted file mode 100644
index daf17bd8..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstinterpolationcontrolsource.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *
- * gstinterpolationcontrolsource.h: Control source that provides several
- *                                  interpolation methods
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_INTERPOLATION_CONTROL_SOURCE_H__
-#define __GST_INTERPOLATION_CONTROL_SOURCE_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-#include <gst/controller/gsttimedvaluecontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_INTERPOLATION_CONTROL_SOURCE \
-  (gst_interpolation_control_source_get_type ())
-#define GST_INTERPOLATION_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_INTERPOLATION_CONTROL_SOURCE, GstInterpolationControlSource))
-#define GST_INTERPOLATION_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), GST_TYPE_INTERPOLATION_CONTROL_SOURCE, GstInterpolationControlSourceClass))
-#define GST_IS_INTERPOLATION_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_INTERPOLATION_CONTROL_SOURCE))
-#define GST_IS_INTERPOLATION_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GST_TYPE_INTERPOLATION_CONTROL_SOURCE))
-#define GST_INTERPOLATION_CONTROL_SOURCE_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_INTERPOLATION_CONTROL_SOURCE, GstInterpolationControlSourceClass))
-
-#define GST_TYPE_INTERPOLATION_MODE (gst_interpolation_mode_get_type ())
-
-typedef struct _GstInterpolationControlSource GstInterpolationControlSource;
-typedef struct _GstInterpolationControlSourceClass GstInterpolationControlSourceClass;
-typedef struct _GstInterpolationControlSourcePrivate GstInterpolationControlSourcePrivate;
-
-/**
- * GstInterpolationMode:
- * @GST_INTERPOLATION_MODE_NONE: steps-like interpolation, default
- * @GST_INTERPOLATION_MODE_LINEAR: linear interpolation
- * @GST_INTERPOLATION_MODE_CUBIC: cubic interpolation
- *
- * The various interpolation modes available.
- */
-typedef enum
-{
-  GST_INTERPOLATION_MODE_NONE,
-  GST_INTERPOLATION_MODE_LINEAR,
-  GST_INTERPOLATION_MODE_CUBIC
-} GstInterpolationMode;
-
-/**
- * GstInterpolationControlSource:
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstInterpolationControlSource {
-  GstTimedValueControlSource parent;
-
-  /*< private >*/
-  GstInterpolationControlSourcePrivate *priv;
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstInterpolationControlSourceClass {
-  GstTimedValueControlSourceClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_interpolation_control_source_get_type (void);
-GType gst_interpolation_mode_get_type (void);
-
-/* Functions */
-
-GstControlSource * gst_interpolation_control_source_new (void);
-
-G_END_DECLS
-
-#endif /* __GST_INTERPOLATION_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstlfocontrolsource.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstlfocontrolsource.h
deleted file mode 100644
index 2ce6d842..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gstlfocontrolsource.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *
- * gstlfocontrolsource.h: Control source that provides some periodic waveforms
- *                        as control values.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_LFO_CONTROL_SOURCE_H__
-#define __GST_LFO_CONTROL_SOURCE_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_LFO_CONTROL_SOURCE \
-  (gst_lfo_control_source_get_type ())
-#define GST_LFO_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_LFO_CONTROL_SOURCE, GstLFOControlSource))
-#define GST_LFO_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), GST_TYPE_LFO_CONTROL_SOURCE, GstLFOControlSourceClass))
-#define GST_IS_LFO_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_LFO_CONTROL_SOURCE))
-#define GST_IS_LFO_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GST_TYPE_LFO_CONTROL_SOURCE))
-#define GST_LFO_CONTROL_SOURCE_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_LFO_CONTROL_SOURCE, GstLFOControlSourceClass))
-
-#define GST_TYPE_LFO_WAVEFORM (gst_lfo_waveform_get_type ())
-
-typedef struct _GstLFOControlSource GstLFOControlSource;
-typedef struct _GstLFOControlSourceClass GstLFOControlSourceClass;
-typedef struct _GstLFOControlSourcePrivate GstLFOControlSourcePrivate;
-
-/**
- * GstLFOWaveform:
- * @GST_LFO_WAVEFORM_SINE: sine waveform
- * @GST_LFO_WAVEFORM_SQUARE: square waveform
- * @GST_LFO_WAVEFORM_SAW: saw waveform
- * @GST_LFO_WAVEFORM_REVERSE_SAW: reverse saw waveform
- * @GST_LFO_WAVEFORM_TRIANGLE: triangle waveform
- *
- * The various waveform modes available.
- */
-typedef enum
-{
-  GST_LFO_WAVEFORM_SINE,
-  GST_LFO_WAVEFORM_SQUARE,
-  GST_LFO_WAVEFORM_SAW,
-  GST_LFO_WAVEFORM_REVERSE_SAW,
-  GST_LFO_WAVEFORM_TRIANGLE
-} GstLFOWaveform;
-
-/**
- * GstLFOControlSource:
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstLFOControlSource {
-  GstControlSource parent;
-
-  /* <private> */
-  GstLFOControlSourcePrivate *priv;
-  GMutex lock;
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstLFOControlSourceClass {
-  GstControlSourceClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_lfo_control_source_get_type (void);
-GType gst_lfo_waveform_get_type (void);
-
-/* Functions */
-
-GstControlSource *gst_lfo_control_source_new (void);
-
-G_END_DECLS
-
-#endif /* __GST_LFO_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gsttimedvaluecontrolsource.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gsttimedvaluecontrolsource.h
deleted file mode 100644
index 06577cb3..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gsttimedvaluecontrolsource.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *               2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gsttimedvaluecontrolsource.h: Base class for timeed value based control
- *                               sources
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TIMED_VALUE_CONTROL_SOURCE_H__
-#define __GST_TIMED_VALUE_CONTROL_SOURCE_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-#include <gst/gstcontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TIMED_VALUE_CONTROL_SOURCE \
-  (gst_timed_value_control_source_get_type ())
-#define GST_TIMED_VALUE_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE, GstTimedValueControlSource))
-#define GST_TIMED_VALUE_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE, GstTimedValueControlSourceClass))
-#define GST_IS_TIMED_VALUE_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE))
-#define GST_IS_TIMED_VALUE_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE))
-#define GST_TIMED_VALUE_CONTROL_SOURCE_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_TIMED_VALUE_CONTROL_SOURCE, GstTimedValueControlSourceClass))
-
-typedef struct _GstTimedValueControlSource GstTimedValueControlSource;
-typedef struct _GstTimedValueControlSourceClass GstTimedValueControlSourceClass;
-typedef struct _GstTimedValueControlSourcePrivate GstTimedValueControlSourcePrivate;
-typedef struct _GstControlPoint GstControlPoint;
-
-/**
- * GstControlPoint:
- *
- * a internal structure for value+time and various temporary
- * values used for interpolation. This "inherits" from
- * GstTimedValue.
- */
-struct _GstControlPoint
-{
-  /* fields from GstTimedValue. DO NOT CHANGE! */
-  GstClockTime timestamp;       /* timestamp of the value change */
-  gdouble value;                /* the new value */
-
-  /* internal fields */
-
-  /* Caches for the interpolators */
-  /* FIXME: we should not have this here already ... */
-  union {
-    struct {
-      gdouble h;
-      gdouble z;
-    } cubic;
-  } cache;
-
-};
-
-/**
- * GstTimedValueControlSource:
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstTimedValueControlSource {
-  GstControlSource parent;
-
-  /*< protected >*/
-  GMutex lock;
-
-  GSequence *values;            /* List of GstControlPoint */
-  gint nvalues;                 /* Number of control points */
-  gboolean valid_cache;
-
-  /*< private >*/
-  GstTimedValueControlSourcePrivate *priv;
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstTimedValueControlSourceClass {
-  GstControlSourceClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_TIMED_VALUE_CONTROL_SOURCE_LOCK(o) \
-  g_mutex_lock(&((GstTimedValueControlSource *)o)->lock)
-#define GST_TIMED_VALUE_CONTROL_SOURCE_UNLOCK(o) \
-  g_mutex_unlock(&((GstTimedValueControlSource *)o)->lock)
-
-GType gst_timed_value_control_source_get_type (void);
-
-/* Functions */
-
-GSequenceIter * gst_timed_value_control_source_find_control_point_iter (
-                                                               GstTimedValueControlSource * self, 
-                                                               GstClockTime timestamp);
-
-gboolean        gst_timed_value_control_source_set            (GstTimedValueControlSource * self,
-                                                               GstClockTime timestamp,
-                                                               const gdouble value);
-gboolean        gst_timed_value_control_source_set_from_list  (GstTimedValueControlSource * self,
-                                                               const GSList * timedvalues);
-gboolean        gst_timed_value_control_source_unset          (GstTimedValueControlSource * self,
-                                                               GstClockTime timestamp);
-void            gst_timed_value_control_source_unset_all      (GstTimedValueControlSource *self);
-GList *         gst_timed_value_control_source_get_all        (GstTimedValueControlSource * self);
-gint            gst_timed_value_control_source_get_count      (GstTimedValueControlSource * self);
-void            gst_timed_value_control_invalidate_cache      (GstTimedValueControlSource * self);
-
-G_END_DECLS
-
-#endif /* __GST_TIMED_VALUE_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gsttriggercontrolsource.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gsttriggercontrolsource.h
deleted file mode 100644
index 1f1f1326..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/controller/gsttriggercontrolsource.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *               2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gsttriggercontrolsource.h: Control source that provides some values at time-
- *                            stamps
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TRIGGER_CONTROL_SOURCE_H__
-#define __GST_TRIGGER_CONTROL_SOURCE_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-#include <gst/controller/gsttimedvaluecontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TRIGGER_CONTROL_SOURCE \
-  (gst_trigger_control_source_get_type ())
-#define GST_TRIGGER_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TRIGGER_CONTROL_SOURCE, GstTriggerControlSource))
-#define GST_TRIGGER_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_CAST ((vtable), GST_TYPE_TRIGGER_CONTROL_SOURCE, GstTriggerControlSourceClass))
-#define GST_IS_TRIGGER_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TRIGGER_CONTROL_SOURCE))
-#define GST_IS_TRIGGER_CONTROL_SOURCE_CLASS(vtable) \
-  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GST_TYPE_TRIGGER_CONTROL_SOURCE))
-#define GST_TRIGGER_CONTROL_SOURCE_GET_CLASS(inst) \
-  (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_TRIGGER_CONTROL_SOURCE, GstTriggerControlSourceClass))
-
-#define GST_TYPE_TRIGGER_WAVEFORM (gst_trigger_waveform_get_type ())
-
-typedef struct _GstTriggerControlSource GstTriggerControlSource;
-typedef struct _GstTriggerControlSourceClass GstTriggerControlSourceClass;
-typedef struct _GstTriggerControlSourcePrivate GstTriggerControlSourcePrivate;
-
-/**
- * GstTriggerControlSource:
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstTriggerControlSource {
-  GstTimedValueControlSource parent;
-
-  /*< private >*/
-  GstTriggerControlSourcePrivate *priv;
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstTriggerControlSourceClass {
-  GstTimedValueControlSourceClass parent_class;
-  
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_trigger_control_source_get_type (void);
-
-/* Functions */
-
-GstControlSource *gst_trigger_control_source_new (void);
-
-G_END_DECLS
-
-#endif /* __GST_TRIGGER_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfft.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfft.h
deleted file mode 100644
index 9071b1c8..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfft.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-#include <math.h>
-
-#ifndef __GST_FFT_H__
-#define __GST_FFT_H__
-
-G_BEGIN_DECLS
-
-/**
- * GstFFTWindow:
- * @GST_FFT_WINDOW_RECTANGULAR: Rectangular window
- * @GST_FFT_WINDOW_HAMMING: Hamming window
- * @GST_FFT_WINDOW_HANN: Hann (sometimes also called Hanning) window
- * @GST_FFT_WINDOW_BARTLETT: Bartlett window
- * @GST_FFT_WINDOW_BLACKMAN: Blackman window
- *
- * The various window functions available.
- */
-typedef enum
-{
-  GST_FFT_WINDOW_RECTANGULAR,
-  GST_FFT_WINDOW_HAMMING,
-  GST_FFT_WINDOW_HANN,
-  GST_FFT_WINDOW_BARTLETT,
-  GST_FFT_WINDOW_BLACKMAN
-} GstFFTWindow;
-
-/* Functions */
-
-gint gst_fft_next_fast_length (gint n) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GST_FFT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfftf32.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfftf32.h
deleted file mode 100644
index 60bf98c0..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfftf32.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_FFT_F32_H__
-#define __GST_FFT_F32_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfft.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstFFTF32 GstFFTF32;
-typedef struct _GstFFTF32Complex GstFFTF32Complex;
-
-/* Copy of kiss_fft_f32_cpx for documentation reasons,
- * do NOT change! */
-
-/**
- * GstFFTF32Complex:
- * @r: Real part
- * @i: Imaginary part
- *
- * Data type for complex numbers composed of
- * 32 bit float.
- */
-struct _GstFFTF32Complex
-{
-  gfloat r;
-  gfloat i;
-};
-
-/* Functions */
-GstFFTF32 *   gst_fft_f32_new           (gint len, gboolean inverse);
-void          gst_fft_f32_free          (GstFFTF32 *self);
-
-void          gst_fft_f32_fft           (GstFFTF32 *self, const gfloat *timedata,
-                                         GstFFTF32Complex *freqdata);
-void          gst_fft_f32_inverse_fft   (GstFFTF32 *self, const GstFFTF32Complex *freqdata,
-                                         gfloat *timedata);
-
-void          gst_fft_f32_window        (GstFFTF32 *self, gfloat *timedata, GstFFTWindow window);
-
-G_END_DECLS
-
-#endif /* __GST_FFT_F32_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfftf64.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfftf64.h
deleted file mode 100644
index 782bd8b7..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstfftf64.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_FFT_F64_H__
-#define __GST_FFT_F64_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfft.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstFFTF64 GstFFTF64;
-typedef struct _GstFFTF64Complex GstFFTF64Complex;
-
-/* Copy of kiss_fft_f64_cpx for documentation reasons,
- * do NOT change! */
-
-/**
- * GstFFTF64Complex:
- * @r: Real part
- * @i: Imaginary part
- *
- * Data type for complex numbers composed of
- * 64 bit float.
- */
-struct _GstFFTF64Complex
-{
-  gdouble r;
-  gdouble i;
-};
-
-/* Functions */
-GstFFTF64 *     gst_fft_f64_new         (gint len, gboolean inverse);
-void            gst_fft_f64_free        (GstFFTF64 *self);
-
-void            gst_fft_f64_fft         (GstFFTF64 *self, const gdouble *timedata,
-                                         GstFFTF64Complex *freqdata);
-void            gst_fft_f64_inverse_fft (GstFFTF64 *self, const GstFFTF64Complex *freqdata,
-                                         gdouble *timedata);
-
-void            gst_fft_f64_window      (GstFFTF64 *self, gdouble *timedata, GstFFTWindow window);
-
-G_END_DECLS
-
-#endif /* __GST_FFT_F64_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstffts16.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstffts16.h
deleted file mode 100644
index 4f94bb01..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstffts16.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_FFT_S16_H__
-#define __GST_FFT_S16_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfft.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstFFTS16 GstFFTS16;
-typedef struct _GstFFTS16Complex GstFFTS16Complex;
-
-/* Copy of kiss_fft_s16_cpx for documentation reasons,
- * do NOT change! */
-
-/**
- * GstFFTS16Complex:
- * @r: Real part
- * @i: Imaginary part
- *
- * Data type for complex numbers composed of
- * signed 16 bit integers.
- */
-struct _GstFFTS16Complex
-{
-  gint16 r;
-  gint16 i;
-};
-
-/* Functions */
-GstFFTS16 *     gst_fft_s16_new         (gint len, gboolean inverse);
-void            gst_fft_s16_free        (GstFFTS16 *self);
-
-void            gst_fft_s16_fft         (GstFFTS16 *self, const gint16 *timedata,
-                                         GstFFTS16Complex *freqdata);
-void            gst_fft_s16_inverse_fft (GstFFTS16 *self, const GstFFTS16Complex *freqdata,
-                                         gint16 *timedata);
-
-void            gst_fft_s16_window      (GstFFTS16 *self, gint16 *timedata, GstFFTWindow window);
-
-G_END_DECLS
-
-#endif /* __GST_FFT_S16_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstffts32.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstffts32.h
deleted file mode 100644
index 99d7815d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/fft/gstffts32.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Sebastian Dröge <slomo@circular-chaos.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_FFT_S32_H__
-#define __GST_FFT_S32_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gstfft.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GstFFTS32 GstFFTS32;
-typedef struct _GstFFTS32Complex GstFFTS32Complex;
-
-/* Copy of kiss_fft_s32_cpx for documentation reasons,
- * do NOT change! */
-
-/**
- * GstFFTS32Complex:
- * @r: Real part
- * @i: Imaginary part
- *
- * Data type for complex numbers composed of
- * signed 32 bit integers.
- */
-struct _GstFFTS32Complex
-{
-  gint32 r;
-  gint32 i;
-};
-
-/* Functions */
-GstFFTS32 *     gst_fft_s32_new         (gint len, gboolean inverse);
-void            gst_fft_s32_free        (GstFFTS32 *self);
-
-void            gst_fft_s32_fft         (GstFFTS32 *self, const gint32 *timedata,
-                                         GstFFTS32Complex *freqdata);
-void            gst_fft_s32_inverse_fft (GstFFTS32 *self, const GstFFTS32Complex *freqdata,
-                                         gint32 *timedata);
-
-void            gst_fft_s32_window      (GstFFTS32 *self, gint32 *timedata, GstFFTWindow window);
-
-G_END_DECLS
-
-#endif /* __GST_FFT_S32_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/glib-compat.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/glib-compat.h
deleted file mode 100644
index 77943068..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/glib-compat.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* GStreamer
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * glib-compat.h: Public GLib compatibility shims
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-/*
- * Modified by the GLib Team and others 1997-2000. See the AUTHORS file from
- * glib-2.8.0 for a list of people on the GLib Team. See the ChangeLog files
- * from glib-2.8.0 for a list of changes. These files are distributed with GLib
- * at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GST_GLIB_COMPAT_H__
-#define __GST_GLIB_COMPAT_H__
-
-G_BEGIN_DECLS
-
-G_END_DECLS
-
-#endif /* __GST_GLIB_COMPAT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gst.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gst.h
deleted file mode 100644
index 31887583..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gst.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gst.h: Main header for GStreamer, apps should include this
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_H__
-#define __GST_H__
-
-#include <glib.h>
-
-#include <gst/glib-compat.h>
-
-#include <gst/gstenumtypes.h>
-#include <gst/gstversion.h>
-
-#include <gst/gstbin.h>
-#include <gst/gstbuffer.h>
-#include <gst/gstbufferlist.h>
-#include <gst/gstbufferpool.h>
-#include <gst/gstcaps.h>
-#include <gst/gstchildproxy.h>
-#include <gst/gstclock.h>
-#include <gst/gstcontrolsource.h>
-#include <gst/gstdatetime.h>
-#include <gst/gstdebugutils.h>
-#include <gst/gstelement.h>
-#include <gst/gstelementmetadata.h>
-#include <gst/gsterror.h>
-#include <gst/gstevent.h>
-#include <gst/gstghostpad.h>
-#include <gst/gstinfo.h>
-#include <gst/gstiterator.h>
-#include <gst/gstmessage.h>
-#include <gst/gstmemory.h>
-#include <gst/gstmeta.h>
-#include <gst/gstminiobject.h>
-#include <gst/gstobject.h>
-#include <gst/gstpad.h>
-#include <gst/gstparamspecs.h>
-#include <gst/gstpipeline.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpoll.h>
-#include <gst/gstpreset.h>
-#include <gst/gstquery.h>
-#include <gst/gstregistry.h>
-#include <gst/gstsample.h>
-#include <gst/gstsegment.h>
-#include <gst/gststructure.h>
-#include <gst/gstsystemclock.h>
-#include <gst/gsttaglist.h>
-#include <gst/gsttagsetter.h>
-#include <gst/gsttask.h>
-#include <gst/gsttaskpool.h>
-#include <gst/gsttoc.h>
-#include <gst/gsttocsetter.h>
-#include <gst/gsttypefind.h>
-#include <gst/gsttypefindfactory.h>
-#include <gst/gsturi.h>
-#include <gst/gstutils.h>
-#include <gst/gstvalue.h>
-
-#include <gst/gstparse.h>
-
-/* API compatibility stuff */
-#include <gst/gstcompat.h>
-
-G_BEGIN_DECLS
-
-void		gst_init			(int *argc, char **argv[]);
-gboolean	gst_init_check			(int *argc, char **argv[],
-						 GError ** err);
-gboolean        gst_is_initialized              (void);
-GOptionGroup *	gst_init_get_option_group	(void);
-void		gst_deinit			(void);
-
-void		gst_version			(guint *major, guint *minor,
-						 guint *micro, guint *nano);
-gchar *		gst_version_string		(void);
-
-gboolean        gst_segtrap_is_enabled          (void);
-void            gst_segtrap_set_enabled         (gboolean enabled);
-
-gboolean        gst_registry_fork_is_enabled    (void);
-void            gst_registry_fork_set_enabled   (gboolean enabled);
-
-gboolean        gst_update_registry             (void);
-
-G_END_DECLS
-
-#endif /* __GST_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstallocator.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstallocator.h
deleted file mode 100644
index f9edd50f..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstallocator.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Wim Taymans <wim.taymans@gmail.be>
- *
- * gstallocator.h: Header for memory allocation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_ALLOCATOR_H__
-#define __GST_ALLOCATOR_H__
-
-#include <gst/gstmemory.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstAllocatorPrivate GstAllocatorPrivate;
-typedef struct _GstAllocatorClass GstAllocatorClass;
-
-#define GST_TYPE_ALLOCATOR                 (gst_allocator_get_type())
-#define GST_IS_ALLOCATOR(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_ALLOCATOR))
-#define GST_IS_ALLOCATOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_ALLOCATOR))
-#define GST_ALLOCATOR_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ALLOCATOR, GstAllocatorClass))
-#define GST_ALLOCATOR(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_ALLOCATOR, GstAllocator))
-#define GST_ALLOCATOR_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_ALLOCATOR, GstAllocatorClass))
-#define GST_ALLOCATOR_CAST(obj)            ((GstAllocator *)(obj))
-
-#define GST_TYPE_ALLOCATION_PARAMS (gst_allocation_params_get_type())
-GType gst_allocation_params_get_type(void);
-
-typedef struct _GstAllocationParams GstAllocationParams;
-
-/**
- * gst_memory_alignment:
- *
- * The default memory alignment in bytes - 1
- * an alignment of 7 would be the same as what malloc() guarantees.
- */
-GST_EXPORT gsize gst_memory_alignment;
-
-/**
- * GST_ALLOCATOR_SYSMEM:
- *
- * The allocator name for the default system memory allocator
- */
-#define GST_ALLOCATOR_SYSMEM   "SystemMemory"
-
-/**
- * GstAllocationParams:
- * @flags: flags to control allocation
- * @align: the desired alignment of the memory
- * @prefix: the desired prefix
- * @padding: the desired padding
- *
- * Parameters to control the allocation of memory
- */
-struct _GstAllocationParams {
-  GstMemoryFlags flags;
-  gsize          align;
-  gsize          prefix;
-  gsize          padding;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstAllocatorFlags:
- * @GST_ALLOCATOR_FLAG_CUSTOM_ALLOC: The allocator has a custom alloc function.
- * @GST_ALLOCATOR_FLAG_LAST: first flag that can be used for custom purposes
- *
- * Flags for allocators.
- */
-typedef enum {
-  GST_ALLOCATOR_FLAG_CUSTOM_ALLOC  = (GST_OBJECT_FLAG_LAST << 0),
-
-  GST_ALLOCATOR_FLAG_LAST          = (GST_OBJECT_FLAG_LAST << 16)
-} GstAllocatorFlags;
-
-/**
- * GstAllocator:
- * @object: parent structure
- * @mem_type: the memory type this allocator provides
- * @mem_map: the implementation of the GstMemoryMapFunction
- * @mem_unmap: the implementation of the GstMemoryUnmapFunction
- * @mem_copy: the implementation of the GstMemoryCopyFunction
- * @mem_share: the implementation of the GstMemoryShareFunction
- * @mem_is_span: the implementation of the GstMemoryIsSpanFunction
- *
- * The #GstAllocator is used to create new memory.
- */
-struct _GstAllocator
-{
-  GstObject  object;
-
-  const gchar              *mem_type;
-
-  GstMemoryMapFunction      mem_map;
-  GstMemoryUnmapFunction    mem_unmap;
-
-  GstMemoryCopyFunction     mem_copy;
-  GstMemoryShareFunction    mem_share;
-  GstMemoryIsSpanFunction   mem_is_span;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-
-  GstAllocatorPrivate *priv;
-};
-
-struct _GstAllocatorClass {
-  GstObjectClass object_class;
-
-  GstMemory *  (*alloc)      (GstAllocator *allocator, gsize size,
-                              GstAllocationParams *params);
-  void         (*free)       (GstAllocator *allocator, GstMemory *memory);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_allocator_get_type(void);
-
-/* allocators */
-void           gst_allocator_register        (const gchar *name, GstAllocator *allocator);
-GstAllocator * gst_allocator_find            (const gchar *name);
-void           gst_allocator_set_default     (GstAllocator * allocator);
-
-/* allocation parameters */
-void           gst_allocation_params_init    (GstAllocationParams *params);
-GstAllocationParams *
-               gst_allocation_params_copy    (const GstAllocationParams *params) G_GNUC_MALLOC;
-void           gst_allocation_params_free    (GstAllocationParams *params);
-
-/* allocating memory blocks */
-GstMemory *    gst_allocator_alloc           (GstAllocator * allocator, gsize size,
-                                              GstAllocationParams *params);
-void           gst_allocator_free            (GstAllocator * allocator, GstMemory *memory);
-
-GstMemory *    gst_memory_new_wrapped  (GstMemoryFlags flags, gpointer data, gsize maxsize,
-                                        gsize offset, gsize size, gpointer user_data,
-                                        GDestroyNotify notify);
-
-G_END_DECLS
-
-#endif /* __GST_ALLOCATOR_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstatomicqueue.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstatomicqueue.h
deleted file mode 100644
index af6d693c..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstatomicqueue.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009-2010 Edward Hervey <bilboed@bilboed.com>
- *           (C) 2011 Wim Taymans <wim.taymans@gmail.com>
- *
- * gstatomicqueue.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-
-#ifndef __GST_ATOMIC_QUEUE_H__
-#define __GST_ATOMIC_QUEUE_H__
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ATOMIC_QUEUE (gst_atomic_queue_get_type())
-
-/**
- * GstAtomicQueue:
- *
- * Opaque atomic data queue.
- *
- * Use the acessor functions to get the stored values.
- */
-typedef struct _GstAtomicQueue GstAtomicQueue;
-
-
-GType              gst_atomic_queue_get_type    (void);
-
-GstAtomicQueue *   gst_atomic_queue_new         (guint initial_size) G_GNUC_MALLOC;
-
-void               gst_atomic_queue_ref         (GstAtomicQueue * queue);
-void               gst_atomic_queue_unref       (GstAtomicQueue * queue);
-
-void               gst_atomic_queue_push        (GstAtomicQueue* queue, gpointer data);
-gpointer           gst_atomic_queue_pop         (GstAtomicQueue* queue);
-gpointer           gst_atomic_queue_peek        (GstAtomicQueue* queue);
-
-guint              gst_atomic_queue_length      (GstAtomicQueue * queue);
-
-G_END_DECLS
-
-#endif /* __GST_ATOMIC_QUEUE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbin.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbin.h
deleted file mode 100644
index 06cbc743..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbin.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstbin.h: Header for GstBin container object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_BIN_H__
-#define __GST_BIN_H__
-
-#include <gst/gstelement.h>
-#include <gst/gstiterator.h>
-#include <gst/gstbus.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BIN             (gst_bin_get_type ())
-#define GST_IS_BIN(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_BIN))
-#define GST_IS_BIN_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_BIN))
-#define GST_BIN_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BIN, GstBinClass))
-#define GST_BIN(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_BIN, GstBin))
-#define GST_BIN_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_BIN, GstBinClass))
-#define GST_BIN_CAST(obj)        ((GstBin*)(obj))
-
-/**
- * GstBinFlags:
- * @GST_BIN_FLAG_NO_RESYNC: don't resync a state change when elements are
- *             added or linked in the bin (Since 1.0.5)
- * @GST_BIN_FLAG_LAST: the last enum in the series of flags for bins.
- * Derived classes can use this as first value in a list of flags.
- *
- * GstBinFlags are a set of flags specific to bins. Most are set/used
- * internally. They can be checked using the GST_OBJECT_FLAG_IS_SET () macro,
- * and (un)set using GST_OBJECT_FLAG_SET () and GST_OBJECT_FLAG_UNSET ().
- */
-typedef enum {
-  GST_BIN_FLAG_NO_RESYNC	= (GST_ELEMENT_FLAG_LAST << 0),
-  /* padding */
-  GST_BIN_FLAG_LAST		= (GST_ELEMENT_FLAG_LAST << 5)
-} GstBinFlags;
-
-/**
- * GST_BIN_IS_NO_RESYNC:
- * @bin: A #GstBin
- *
- * Check if @bin will resync its state change when elements are added and
- * removed.
- *
- * Since: 1.0.5
- */
-#define GST_BIN_IS_NO_RESYNC(bin)        (GST_OBJECT_FLAG_IS_SET(bin,GST_BIN_FLAG_NO_RESYNC))
-
-typedef struct _GstBin GstBin;
-typedef struct _GstBinClass GstBinClass;
-typedef struct _GstBinPrivate GstBinPrivate;
-
-/**
- * GST_BIN_NUMCHILDREN:
- * @bin: a #GstBin
- *
- * Gets the number of children in a bin.
- */
-#define GST_BIN_NUMCHILDREN(bin)	(GST_BIN_CAST(bin)->numchildren)
-/**
- * GST_BIN_CHILDREN:
- * @bin: a #GstBin
- *
- * Gets the list with children in a bin.
- */
-#define GST_BIN_CHILDREN(bin)		(GST_BIN_CAST(bin)->children)
-/**
- * GST_BIN_CHILDREN_COOKIE:
- * @bin: a #GstBin
- *
- * Gets the children cookie that watches the children list.
- */
-#define GST_BIN_CHILDREN_COOKIE(bin)	(GST_BIN_CAST(bin)->children_cookie)
-
-/**
- * GstBin:
- * @numchildren: the number of children in this bin
- * @children: (element-type Gst.Element): the list of children in this bin
- * @children_cookie: updated whenever @children changes
- * @child_bus: internal bus for handling child messages
- * @messages: (element-type Gst.Message): queued and cached messages
- * @polling: the bin is currently calculating its state
- * @state_dirty: the bin needs to recalculate its state (deprecated)
- * @clock_dirty: the bin needs to select a new clock
- * @provided_clock: the last clock selected
- * @clock_provider: the element that provided @provided_clock
- *
- * The GstBin base class. Subclasses can access these fields provided
- * the LOCK is taken.
- */
-struct _GstBin {
-  GstElement	 element;
-
-  /*< public >*/ /* with LOCK */
-  /* our children, subclass are supposed to update these
-   * fields to reflect their state with _iterate_*() */
-  gint		 numchildren;
-  GList		*children;
-  guint32	 children_cookie;
-
-  GstBus        *child_bus;
-  GList         *messages;
-
-  gboolean	 polling;
-  gboolean       state_dirty;
-
-  gboolean       clock_dirty;
-  GstClock	*provided_clock;
-  GstElement    *clock_provider;
-
-  /*< private >*/
-  GstBinPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstBinClass:
- * @parent_class: bin parent class
- * @add_element: method to add an element to a bin
- * @remove_element: method to remove an element from a bin
- * @handle_message: method to handle a message from the children
- *
- * Subclasses can override the @add_element and @remove_element to
- * update the list of children in the bin.
- *
- * The @handle_message method can be overridden to implement custom
- * message handling.  @handle_message takes ownership of the message, just like
- * #gst_element_post_message.
- */
-struct _GstBinClass {
-  GstElementClass parent_class;
-
-  /*< private >*/
-  GThreadPool  *pool;
-
-  /* signals */
-  void		(*element_added)	(GstBin *bin, GstElement *child);
-  void		(*element_removed)	(GstBin *bin, GstElement *child);
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-  gboolean	(*add_element)		(GstBin *bin, GstElement *element);
-  gboolean	(*remove_element)	(GstBin *bin, GstElement *element);
-
-  void		(*handle_message)	(GstBin *bin, GstMessage *message);
-
-  /*< private >*/
-  /* signal */
-  gboolean	(*do_latency)           (GstBin *bin);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType		gst_bin_get_type		(void);
-GstElement*	gst_bin_new			(const gchar *name);
-
-/* add and remove elements from the bin */
-gboolean	gst_bin_add			(GstBin *bin, GstElement *element);
-gboolean	gst_bin_remove			(GstBin *bin, GstElement *element);
-
-/* retrieve a single child */
-GstElement*	gst_bin_get_by_name		 (GstBin *bin, const gchar *name);
-GstElement*	gst_bin_get_by_name_recurse_up	 (GstBin *bin, const gchar *name);
-GstElement*	gst_bin_get_by_interface	 (GstBin *bin, GType iface);
-
-/* retrieve multiple children */
-GstIterator*    gst_bin_iterate_elements	 (GstBin *bin);
-GstIterator*    gst_bin_iterate_sorted		 (GstBin *bin);
-GstIterator*    gst_bin_iterate_recurse		 (GstBin *bin);
-
-GstIterator*	gst_bin_iterate_sinks		 (GstBin *bin);
-GstIterator*	gst_bin_iterate_sources		 (GstBin *bin);
-GstIterator*	gst_bin_iterate_all_by_interface (GstBin *bin, GType iface);
-
-/* latency */
-gboolean        gst_bin_recalculate_latency      (GstBin * bin);
-
-
-G_END_DECLS
-
-
-#endif /* __GST_BIN_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbuffer.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbuffer.h
deleted file mode 100644
index 49ad3d54..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbuffer.h
+++ /dev/null
@@ -1,543 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstbuffer.h: Header for GstBuffer object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_BUFFER_H__
-#define __GST_BUFFER_H__
-
-#include <gst/gstminiobject.h>
-#include <gst/gstclock.h>
-#include <gst/gstallocator.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_buffer_type;
-
-typedef struct _GstBuffer GstBuffer;
-typedef struct _GstBufferPool GstBufferPool;
-
-#define GST_TYPE_BUFFER                         (_gst_buffer_type)
-#define GST_IS_BUFFER(obj)                      (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_BUFFER))
-#define GST_BUFFER_CAST(obj)                    ((GstBuffer *)(obj))
-#define GST_BUFFER(obj)                         (GST_BUFFER_CAST(obj))
-
-/**
- * GST_BUFFER_FLAGS:
- * @buf: a #GstBuffer.
- *
- * A flags word containing #GstBufferFlag flags set on this buffer.
- */
-#define GST_BUFFER_FLAGS(buf)                   GST_MINI_OBJECT_FLAGS(buf)
-/**
- * GST_BUFFER_FLAG_IS_SET:
- * @buf: a #GstBuffer.
- * @flag: the #GstBufferFlag to check.
- *
- * Gives the status of a specific flag on a buffer.
- */
-#define GST_BUFFER_FLAG_IS_SET(buf,flag)        GST_MINI_OBJECT_FLAG_IS_SET (buf, flag)
-/**
- * GST_BUFFER_FLAG_SET:
- * @buf: a #GstBuffer.
- * @flag: the #GstBufferFlag to set.
- *
- * Sets a buffer flag on a buffer.
- */
-#define GST_BUFFER_FLAG_SET(buf,flag)           GST_MINI_OBJECT_FLAG_SET (buf, flag)
-/**
- * GST_BUFFER_FLAG_UNSET:
- * @buf: a #GstBuffer.
- * @flag: the #GstBufferFlag to clear.
- *
- * Clears a buffer flag.
- */
-#define GST_BUFFER_FLAG_UNSET(buf,flag)         GST_MINI_OBJECT_FLAG_UNSET (buf, flag)
-
-
-/**
- * GST_BUFFER_PTS:
- * @buf: a #GstBuffer.:
- *
- * The presentation timestamp (pts) in nanoseconds (as a #GstClockTime)
- * of the data in the buffer. This is the timestamp when the media should be
- * presented to the user.
- * Value will be %GST_CLOCK_TIME_NONE if the pts is unknown.
- */
-#define GST_BUFFER_PTS(buf)                     (GST_BUFFER_CAST(buf)->pts)
-/**
- * GST_BUFFER_DTS:
- * @buf: a #GstBuffer.:
- *
- * The decoding timestamp (dts) in nanoseconds (as a #GstClockTime)
- * of the data in the buffer. This is the timestamp when the media should be
- * decoded or processed otherwise.
- * Value will be %GST_CLOCK_TIME_NONE if the dts is unknown.
- */
-#define GST_BUFFER_DTS(buf)                     (GST_BUFFER_CAST(buf)->dts)
-/**
- * GST_BUFFER_DURATION:
- * @buf: a #GstBuffer.
- *
- * The duration in nanoseconds (as a #GstClockTime) of the data in the buffer.
- * Value will be %GST_CLOCK_TIME_NONE if the duration is unknown.
- */
-#define GST_BUFFER_DURATION(buf)                (GST_BUFFER_CAST(buf)->duration)
-/**
- * GST_BUFFER_OFFSET:
- * @buf: a #GstBuffer.
- *
- * The offset in the source file of the beginning of this buffer.
- */
-#define GST_BUFFER_OFFSET(buf)                  (GST_BUFFER_CAST(buf)->offset)
-/**
- * GST_BUFFER_OFFSET_END:
- * @buf: a #GstBuffer.
- *
- * The offset in the source file of the end of this buffer.
- */
-#define GST_BUFFER_OFFSET_END(buf)              (GST_BUFFER_CAST(buf)->offset_end)
-
-/**
- * GST_BUFFER_OFFSET_NONE:
- *
- * Constant for no-offset return results.
- */
-#define GST_BUFFER_OFFSET_NONE  ((guint64)-1)
-
-/**
- * GST_BUFFER_DURATION_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the duration is known.
- */
-#define GST_BUFFER_DURATION_IS_VALID(buffer)    (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DURATION (buffer)))
-/**
- * GST_BUFFER_PTS_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the pts is known.
- */
-#define GST_BUFFER_PTS_IS_VALID(buffer)   (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buffer)))
-/**
- * GST_BUFFER_DTS_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the dts is known.
- */
-#define GST_BUFFER_DTS_IS_VALID(buffer)   (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS (buffer)))
-/**
- * GST_BUFFER_OFFSET_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the start offset is known.
- */
-#define GST_BUFFER_OFFSET_IS_VALID(buffer)      (GST_BUFFER_OFFSET (buffer) != GST_BUFFER_OFFSET_NONE)
-/**
- * GST_BUFFER_OFFSET_END_IS_VALID:
- * @buffer: a #GstBuffer
- *
- * Tests if the end offset is known.
- */
-#define GST_BUFFER_OFFSET_END_IS_VALID(buffer)  (GST_BUFFER_OFFSET_END (buffer) != GST_BUFFER_OFFSET_NONE)
-/**
- * GST_BUFFER_IS_DISCONT:
- * @buffer: a #GstBuffer
- *
- * Tests if the buffer marks a discontinuity in the stream.
- */
-#define GST_BUFFER_IS_DISCONT(buffer)   (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT))
-
-/**
- * GstBufferFlags:
- * @GST_BUFFER_FLAG_LIVE:        the buffer is live data and should be discarded in
- *                               the PAUSED state.
- * @GST_BUFFER_FLAG_DECODE_ONLY: the buffer contains data that should be dropped
- *                               because it will be clipped against the segment
- *                               boundaries or because it does not contain data
- *                               that should be shown to the user.
- * @GST_BUFFER_FLAG_DISCONT:     the buffer marks a data discontinuity in the stream.
- *                               This typically occurs after a seek or a dropped buffer
- *                               from a live or network source.
- * @GST_BUFFER_FLAG_RESYNC:      the buffer timestamps might have a discontinuity
- *                               and this buffer is a good point to resynchronize.
- * @GST_BUFFER_FLAG_CORRUPTED:   the buffer data is corrupted.
- * @GST_BUFFER_FLAG_MARKER:      the buffer contains a media specific marker. for
- *                               video this is typically the end of a frame boundary, for audio
- *                               this is usually the start of a talkspurt.
- * @GST_BUFFER_FLAG_HEADER:      the buffer contains header information that is
- *                               needed to decode the following data.
- * @GST_BUFFER_FLAG_GAP:         the buffer has been created to fill a gap in the
- *                               stream and contains media neutral data (elements can
- *                               switch to optimized code path that ignores the buffer
- *                               content).
- * @GST_BUFFER_FLAG_DROPPABLE:   the buffer can be dropped without breaking the
- *                               stream, for example to reduce bandwidth.
- * @GST_BUFFER_FLAG_DELTA_UNIT:  this unit cannot be decoded independently.
- * @GST_BUFFER_FLAG_LAST:        additional media specific flags can be added starting from
- *                               this flag.
- *
- * A set of buffer flags used to describe properties of a #GstBuffer.
- */
-typedef enum {
-  GST_BUFFER_FLAG_LIVE        = (GST_MINI_OBJECT_FLAG_LAST << 0),
-  GST_BUFFER_FLAG_DECODE_ONLY = (GST_MINI_OBJECT_FLAG_LAST << 1),
-  GST_BUFFER_FLAG_DISCONT     = (GST_MINI_OBJECT_FLAG_LAST << 2),
-  GST_BUFFER_FLAG_RESYNC      = (GST_MINI_OBJECT_FLAG_LAST << 3),
-  GST_BUFFER_FLAG_CORRUPTED   = (GST_MINI_OBJECT_FLAG_LAST << 4),
-  GST_BUFFER_FLAG_MARKER      = (GST_MINI_OBJECT_FLAG_LAST << 5),
-  GST_BUFFER_FLAG_HEADER      = (GST_MINI_OBJECT_FLAG_LAST << 6),
-  GST_BUFFER_FLAG_GAP         = (GST_MINI_OBJECT_FLAG_LAST << 7),
-  GST_BUFFER_FLAG_DROPPABLE   = (GST_MINI_OBJECT_FLAG_LAST << 8),
-  GST_BUFFER_FLAG_DELTA_UNIT  = (GST_MINI_OBJECT_FLAG_LAST << 9),
-
-  GST_BUFFER_FLAG_LAST        = (GST_MINI_OBJECT_FLAG_LAST << 16)
-} GstBufferFlags;
-
-/**
- * GstBuffer:
- * @mini_object: the parent structure
- * @pool: pointer to the pool owner of the buffer
- * @pts: presentation timestamp of the buffer, can be #GST_CLOCK_TIME_NONE when the
- *     pts is not known or relevant. The pts contains the timestamp when the
- *     media should be presented to the user.
- * @dts: decoding timestamp of the buffer, can be #GST_CLOCK_TIME_NONE when the
- *     dts is not known or relevant. The dts contains the timestamp when the
- *     media should be processed.
- * @duration: duration in time of the buffer data, can be #GST_CLOCK_TIME_NONE
- *     when the duration is not known or relevant.
- * @offset: a media specific offset for the buffer data.
- *     For video frames, this is the frame number of this buffer.
- *     For audio samples, this is the offset of the first sample in this buffer.
- *     For file data or compressed data this is the byte offset of the first
- *       byte in this buffer.
- * @offset_end: the last offset contained in this buffer. It has the same
- *     format as @offset.
- *
- * The structure of a #GstBuffer. Use the associated macros to access the public
- * variables.
- */
-struct _GstBuffer {
-  GstMiniObject          mini_object;
-
-  /*< public >*/ /* with COW */
-  GstBufferPool         *pool;
-
-  /* timestamp */
-  GstClockTime           pts;
-  GstClockTime           dts;
-  GstClockTime           duration;
-
-  /* media specific offset */
-  guint64                offset;
-  guint64                offset_end;
-};
-
-GType       gst_buffer_get_type            (void);
-
-/* allocation */
-GstBuffer * gst_buffer_new                 (void);
-GstBuffer * gst_buffer_new_allocate        (GstAllocator * allocator, gsize size,
-                                            GstAllocationParams * params);
-GstBuffer * gst_buffer_new_wrapped_full    (GstMemoryFlags flags, gpointer data, gsize maxsize,
-                                            gsize offset, gsize size, gpointer user_data,
-                                            GDestroyNotify notify);
-GstBuffer * gst_buffer_new_wrapped         (gpointer data, gsize size);
-
-/* memory blocks */
-guint       gst_buffer_n_memory             (GstBuffer *buffer);
-void        gst_buffer_insert_memory        (GstBuffer *buffer, gint idx, GstMemory *mem);
-void        gst_buffer_replace_memory_range (GstBuffer *buffer, guint idx, gint length, GstMemory *mem);
-GstMemory * gst_buffer_peek_memory          (GstBuffer *buffer, guint idx);
-GstMemory * gst_buffer_get_memory_range     (GstBuffer *buffer, guint idx, gint length);
-void        gst_buffer_remove_memory_range  (GstBuffer *buffer, guint idx, gint length);
-
-void        gst_buffer_prepend_memory       (GstBuffer *buffer, GstMemory *mem);
-void        gst_buffer_append_memory        (GstBuffer *buffer, GstMemory *mem);
-void        gst_buffer_replace_memory       (GstBuffer *buffer, guint idx, GstMemory *mem);
-void        gst_buffer_replace_all_memory   (GstBuffer *buffer, GstMemory *mem);
-GstMemory * gst_buffer_get_memory           (GstBuffer *buffer, guint idx);
-GstMemory * gst_buffer_get_all_memory       (GstBuffer *buffer);
-void        gst_buffer_remove_memory        (GstBuffer *buffer, guint idx);
-void        gst_buffer_remove_all_memory    (GstBuffer *buffer);
-
-gboolean    gst_buffer_find_memory         (GstBuffer *buffer, gsize offset, gsize size,
-                                            guint *idx, guint *length, gsize *skip);
-
-gsize       gst_buffer_fill                (GstBuffer *buffer, gsize offset,
-                                            gconstpointer src, gsize size);
-gsize       gst_buffer_extract             (GstBuffer *buffer, gsize offset,
-                                            gpointer dest, gsize size);
-gint        gst_buffer_memcmp              (GstBuffer *buffer, gsize offset,
-                                            gconstpointer mem, gsize size);
-gsize       gst_buffer_memset              (GstBuffer *buffer, gsize offset,
-                                            guint8 val, gsize size);
-
-gsize       gst_buffer_get_sizes_range     (GstBuffer *buffer, guint idx, gint length,
-                                            gsize *offset, gsize *maxsize);
-void        gst_buffer_resize_range        (GstBuffer *buffer, guint idx, gint length,
-                                            gssize offset, gssize size);
-
-gsize       gst_buffer_get_sizes           (GstBuffer *buffer, gsize *offset, gsize *maxsize);
-gsize       gst_buffer_get_size            (GstBuffer *buffer);
-void        gst_buffer_resize              (GstBuffer *buffer, gssize offset, gssize size);
-void        gst_buffer_set_size            (GstBuffer *buffer, gssize size);
-
-gboolean    gst_buffer_map_range           (GstBuffer *buffer, guint idx, gint length,
-                                            GstMapInfo *info, GstMapFlags flags);
-gboolean    gst_buffer_map                 (GstBuffer *buffer, GstMapInfo *info, GstMapFlags flags);
-
-void        gst_buffer_unmap               (GstBuffer *buffer, GstMapInfo *info);
-
-
-/* refcounting */
-/**
- * gst_buffer_ref:
- * @buf: a #GstBuffer.
- *
- * Increases the refcount of the given buffer by one.
- *
- * Note that the refcount affects the writeability
- * of @buf and its metadata, see gst_buffer_is_writable().
- * It is important to note that keeping additional references to
- * GstBuffer instances can potentially increase the number
- * of memcpy operations in a pipeline.
- *
- * Returns: (transfer full): @buf
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBuffer * gst_buffer_ref (GstBuffer * buf);
-#endif
-
-static inline GstBuffer *
-gst_buffer_ref (GstBuffer * buf)
-{
-  return (GstBuffer *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (buf));
-}
-
-/**
- * gst_buffer_unref:
- * @buf: (transfer full): a #GstBuffer.
- *
- * Decreases the refcount of the buffer. If the refcount reaches 0, the buffer
- * with the associated metadata and memory will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_buffer_unref (GstBuffer * buf);
-#endif
-
-static inline void
-gst_buffer_unref (GstBuffer * buf)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (buf));
-}
-
-/* copy buffer */
-/**
- * gst_buffer_copy:
- * @buf: a #GstBuffer.
- *
- * Create a copy of the given buffer. This will also make a newly allocated
- * copy of the data the source buffer contains.
- *
- * Returns: (transfer full): a new copy of @buf.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBuffer * gst_buffer_copy (const GstBuffer * buf);
-#endif
-
-static inline GstBuffer *
-gst_buffer_copy (const GstBuffer * buf)
-{
-  return GST_BUFFER (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (buf)));
-}
-
-
-/**
- * GstBufferCopyFlags:
- * @GST_BUFFER_COPY_NONE: copy nothing
- * @GST_BUFFER_COPY_FLAGS: flag indicating that buffer flags should be copied
- * @GST_BUFFER_COPY_TIMESTAMPS: flag indicating that buffer pts, dts,
- * duration, offset and offset_end should be copied
- * @GST_BUFFER_COPY_MEMORY: flag indicating that buffer memory should be copied
- * and appended to already existing memory
- * @GST_BUFFER_COPY_MERGE: flag indicating that buffer memory should be
- * merged
- * @GST_BUFFER_COPY_META: flag indicating that buffer meta should be
- * copied
- *
- * A set of flags that can be provided to the gst_buffer_copy_into()
- * function to specify which items should be copied.
- */
-typedef enum {
-  GST_BUFFER_COPY_NONE           = 0,
-  GST_BUFFER_COPY_FLAGS          = (1 << 0),
-  GST_BUFFER_COPY_TIMESTAMPS     = (1 << 1),
-  GST_BUFFER_COPY_META           = (1 << 2),
-  GST_BUFFER_COPY_MEMORY         = (1 << 3),
-  GST_BUFFER_COPY_MERGE          = (1 << 4)
-} GstBufferCopyFlags;
-
-/**
- * GST_BUFFER_COPY_METADATA:
- *
- * Combination of all possible metadata fields that can be copied with
- * gst_buffer_copy_into().
- */
-#define GST_BUFFER_COPY_METADATA       (GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS |\
-                                        GST_BUFFER_COPY_META)
-
-/**
- * GST_BUFFER_COPY_ALL:
- *
- * Combination of all possible fields that can be copied with
- * gst_buffer_copy_into().
- */
-#define GST_BUFFER_COPY_ALL  ((GstBufferCopyFlags)(GST_BUFFER_COPY_METADATA | GST_BUFFER_COPY_MEMORY))
-
-/* copies memory or metadata into newly allocated buffer */
-void            gst_buffer_copy_into            (GstBuffer *dest, GstBuffer *src,
-                                                 GstBufferCopyFlags flags,
-                                                 gsize offset, gsize size);
-
-/**
- * gst_buffer_is_writable:
- * @buf: a #GstBuffer
- *
- * Tests if you can safely write to a buffer's metadata or its memory array.
- * It is only safe to change buffer metadata when the current reference is
- * writable, i.e. nobody can see the modifications you will make.
- */
-#define         gst_buffer_is_writable(buf)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (buf))
-/**
- * gst_buffer_make_writable:
- * @buf: (transfer full): a #GstBuffer
- *
- * Makes a writable buffer from the given buffer. If the source buffer is
- * already writable, this will simply return the same buffer. A copy will
- * otherwise be made using gst_buffer_copy().
- *
- * Returns: (transfer full): a writable buffer which may or may not be the
- *     same as @buf
- */
-#define         gst_buffer_make_writable(buf)   GST_BUFFER_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (buf)))
-
-/**
- * gst_buffer_replace:
- * @obuf: (inout) (transfer full): pointer to a pointer to a #GstBuffer to be
- *     replaced.
- * @nbuf: (transfer none) (allow-none): pointer to a #GstBuffer that will
- *     replace the buffer pointed to by @obuf.
- *
- * Modifies a pointer to a #GstBuffer to point to a different #GstBuffer. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * buffer is unreffed, the new is reffed).
- *
- * Either @nbuf or the #GstBuffer pointed to by @obuf may be NULL.
- *
- * Returns: TRUE when @obuf was different from @nbuf.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf);
-#endif
-
-static inline gboolean
-gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf)
-{
-  return gst_mini_object_replace ((GstMiniObject **) obuf, (GstMiniObject *) nbuf);
-}
-
-/* creating a region */
-GstBuffer*      gst_buffer_copy_region          (GstBuffer *parent, GstBufferCopyFlags flags,
-                                                 gsize offset, gsize size);
-
-/* append two buffers */
-GstBuffer*      gst_buffer_append_region        (GstBuffer *buf1, GstBuffer *buf2,
-                                                 gssize offset, gssize size);
-GstBuffer*      gst_buffer_append               (GstBuffer *buf1, GstBuffer *buf2);
-
-/* metadata */
-#include <gst/gstmeta.h>
-
-/**
- * GstBufferForeachMetaFunc:
- * @buffer: a #GstBuffer
- * @meta: a pointer to a #GstMeta
- * @user_data: user data passed to gst_buffer_foreach_meta()
- *
- * A function that will be called from gst_buffer_foreach_meta(). The @meta
- * field will point to a the reference of the meta.
- *
- * @buffer should not be modified from this callback.
- *
- * When this function returns %TRUE, the next meta will be
- * returned. When %FALSE is returned, gst_buffer_foreach_meta() will return.
- *
- * When @meta is set to NULL, the item will be removed from the buffer.
- *
- * Returns: %FALSE when gst_buffer_foreach_meta() should stop
- */
-typedef gboolean (*GstBufferForeachMetaFunc)    (GstBuffer *buffer, GstMeta **meta,
-                                                 gpointer user_data);
-
-GstMeta *       gst_buffer_get_meta             (GstBuffer *buffer, GType api);
-GstMeta *       gst_buffer_add_meta             (GstBuffer *buffer, const GstMetaInfo *info,
-                                                 gpointer params);
-gboolean        gst_buffer_remove_meta          (GstBuffer *buffer, GstMeta *meta);
-
-GstMeta *       gst_buffer_iterate_meta         (GstBuffer *buffer, gpointer *state);
-
-gboolean        gst_buffer_foreach_meta         (GstBuffer *buffer,
-                                                 GstBufferForeachMetaFunc func,
-                                                 gpointer user_data);
-
-/**
- * gst_value_set_buffer:
- * @v: a #GValue to receive the data
- * @b: (transfer none): a #GstBuffer to assign to the GstValue
- *
- * Sets @b as the value of @v.  Caller retains reference to buffer.
- */
-#define         gst_value_set_buffer(v,b)       g_value_set_boxed((v),(b))
-/**
- * gst_value_take_buffer:
- * @v: a #GValue to receive the data
- * @b: (transfer full): a #GstBuffer to assign to the GstValue
- *
- * Sets @b as the value of @v.  Caller gives away reference to buffer.
- */
-#define         gst_value_take_buffer(v,b)      g_value_take_boxed(v,(b))
-/**
- * gst_value_get_buffer:
- * @v: a #GValue to query
- *
- * Receives a #GstBuffer as the value of @v. Does not return a reference to
- * the buffer, so the pointer is only valid for as long as the caller owns
- * a reference to @v.
- *
- * Returns: (transfer none): buffer
- */
-#define         gst_value_get_buffer(v)         GST_BUFFER_CAST (g_value_get_boxed(v))
-
-G_END_DECLS
-
-#endif /* __GST_BUFFER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbufferlist.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbufferlist.h
deleted file mode 100644
index eff9d9ca..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbufferlist.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Axis Communications <dev-gstreamer at axis dot com>
- * @author Jonas Holmberg <jonas dot holmberg at axis dot com>
- *
- * gstbufferlist.h: Header for GstBufferList object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BUFFER_LIST_H__
-#define __GST_BUFFER_LIST_H__
-
-#include <gst/gstbuffer.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_buffer_list_type;
-
-#define GST_TYPE_BUFFER_LIST      (_gst_buffer_list_type)
-#define GST_IS_BUFFER_LIST(obj)   (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_BUFFER_LIST))
-#define GST_BUFFER_LIST_CAST(obj) ((GstBufferList *)obj)
-#define GST_BUFFER_LIST(obj)      (GST_BUFFER_LIST_CAST(obj))
-
-typedef struct _GstBufferList GstBufferList;
-
-/**
- * GstBufferListFunc:
- * @buffer: pointer the buffer
- * @idx: the index of @buffer
- * @user_data: user data passed to gst_buffer_list_foreach()
- *
- * A function that will be called from gst_buffer_list_foreach(). The @buffer
- * field will point to a the reference of the buffer at @idx.
- *
- * When this function returns %TRUE, the next buffer will be
- * returned. When %FALSE is returned, gst_buffer_list_foreach() will return.
- *
- * When @buffer is set to NULL, the item will be removed from the bufferlist.
- * When @buffer has been made writable, the new buffer reference can be assigned
- * to @buffer. This function is responsible for unreffing the old buffer when
- * removing or modifying.
- *
- * Returns: %FALSE when gst_buffer_list_foreach() should stop
- */
-typedef gboolean   (*GstBufferListFunc)   (GstBuffer **buffer, guint idx,
-                                           gpointer user_data);
-
-
-/* refcounting */
-/**
- * gst_buffer_list_ref:
- * @list: a #GstBufferList
- *
- * Increases the refcount of the given buffer list by one.
- *
- * Note that the refcount affects the writeability of @list and its data, see
- * gst_buffer_list_make_writable(). It is important to note that keeping
- * additional references to GstBufferList instances can potentially increase
- * the number of memcpy operations in a pipeline.
- *
- * Returns: (transfer full): @list
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBufferList * gst_buffer_list_ref (GstBufferList * list);
-#endif
-
-static inline GstBufferList *
-gst_buffer_list_ref (GstBufferList * list)
-{
-  return GST_BUFFER_LIST_CAST (gst_mini_object_ref (GST_MINI_OBJECT_CAST (
-      list)));
-}
-
-/**
- * gst_buffer_list_unref:
- * @list: (transfer full): a #GstBufferList
- *
- * Decreases the refcount of the buffer list. If the refcount reaches 0, the
- * buffer list will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_buffer_list_unref (GstBufferList * list);
-#endif
-
-static inline void
-gst_buffer_list_unref (GstBufferList * list)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (list));
-}
-
-/* copy */
-/**
- * gst_buffer_list_copy:
- * @list: a #GstBufferList
- *
- * Create a shallow copy of the given buffer list. This will make a newly
- * allocated copy of the source list with copies of buffer pointers. The
- * refcount of buffers pointed to will be increased by one.
- *
- * Returns: (transfer full): a new copy of @list.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstBufferList * gst_buffer_list_copy (const GstBufferList * list);
-#endif
-
-static inline GstBufferList *
-gst_buffer_list_copy (const GstBufferList * list)
-{
-  return GST_BUFFER_LIST_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (list)));
-}
-
-/**
- * gst_buffer_list_is_writable:
- * @list: a #GstBufferList
- *
- * Tests if you can safely add buffers and groups into a buffer list.
- */
-#define gst_buffer_list_is_writable(list) gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (list))
-
-/**
- * gst_buffer_list_make_writable:
- * @list: (transfer full): a #GstBufferList
- *
- * Makes a writable buffer list from the given buffer list. If the source buffer
- * list is already writable, this will simply return the same buffer list. A
- * copy will otherwise be made using gst_buffer_list_copy().
- *
- * Returns: (transfer full): a writable list, which may or may not be the
- *     same as @list
- */
-#define gst_buffer_list_make_writable(list) GST_BUFFER_LIST_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (list)))
-
-GType                    gst_buffer_list_get_type              (void);
-
-/* allocation */
-GstBufferList *          gst_buffer_list_new                   (void) G_GNUC_MALLOC;
-GstBufferList *          gst_buffer_list_new_sized             (guint size) G_GNUC_MALLOC;
-
-guint                    gst_buffer_list_length                (GstBufferList *list);
-
-GstBuffer *              gst_buffer_list_get                   (GstBufferList *list, guint idx);
-void                     gst_buffer_list_insert                (GstBufferList *list, gint idx, GstBuffer *buffer);
-void                     gst_buffer_list_remove                (GstBufferList *list, guint idx, guint length);
-
-gboolean                 gst_buffer_list_foreach               (GstBufferList *list,
-                                                                GstBufferListFunc func,
-								gpointer user_data);
-
-#define gst_buffer_list_add(l,b) gst_buffer_list_insert((l),-1,(b));
-
-G_END_DECLS
-
-#endif /* __GST_BUFFER_LIST_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbufferpool.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbufferpool.h
deleted file mode 100644
index b718f995..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbufferpool.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* GStreamer
- * Copyright (C) 2010 Wim Taymans <wim.taymans@gmail.com>
- *
- * gstbufferpool.h: Header for GstBufferPool object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_BUFFER_POOL_H__
-#define __GST_BUFFER_POOL_H__
-
-#include <gst/gstminiobject.h>
-#include <gst/gstpad.h>
-#include <gst/gstbuffer.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstBufferPoolPrivate GstBufferPoolPrivate;
-typedef struct _GstBufferPoolClass GstBufferPoolClass;
-
-#define GST_TYPE_BUFFER_POOL                 (gst_buffer_pool_get_type())
-#define GST_IS_BUFFER_POOL(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_BUFFER_POOL))
-#define GST_IS_BUFFER_POOL_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_BUFFER_POOL))
-#define GST_BUFFER_POOL_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BUFFER_POOL, GstBufferPoolClass))
-#define GST_BUFFER_POOL(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_BUFFER_POOL, GstBufferPool))
-#define GST_BUFFER_POOL_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_BUFFER_POOL, GstBufferPoolClass))
-#define GST_BUFFER_POOL_CAST(obj)            ((GstBufferPool *)(obj))
-
-/**
- * GstBufferPoolAcquireFlags:
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_NONE: no flags
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT: buffer is keyframe
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT: when the bufferpool is empty, acquire_buffer
- * will by default block until a buffer is released into the pool again. Setting
- * this flag makes acquire_buffer return #GST_FLOW_EOS instead of blocking.
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT: buffer is discont
- * @GST_BUFFER_POOL_ACQUIRE_FLAG_LAST: last flag, subclasses can use private flags
- *    starting from this value.
- *
- * Additional flags to control the allocation of a buffer
- */
-typedef enum {
-  GST_BUFFER_POOL_ACQUIRE_FLAG_NONE     = 0,
-  GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT = (1 << 0),
-  GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT = (1 << 1),
-  GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT  = (1 << 2),
-  GST_BUFFER_POOL_ACQUIRE_FLAG_LAST     = (1 << 16),
-} GstBufferPoolAcquireFlags;
-
-typedef struct _GstBufferPoolAcquireParams GstBufferPoolAcquireParams;
-
-/**
- * GstBufferPoolAcquireParams:
- * @format: the format of @start and @stop
- * @start: the start position
- * @stop: the stop position
- * @flags: additional flags
- *
- * Parameters passed to the gst_buffer_pool_acquire_buffer() function to control the
- * allocation of the buffer.
- *
- * The default implementation ignores the @start and @stop members but other
- * implementations can use this extra information to decide what buffer to
- * return.
- */
-struct _GstBufferPoolAcquireParams {
-  GstFormat                 format;
-  gint64                    start;
-  gint64                    stop;
-  GstBufferPoolAcquireFlags flags;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GST_BUFFER_POOL_IS_FLUSHING:
- * @pool: a GstBufferPool
- *
- * Check if the bufferpool is flushing. Subclasses might want to check the
- * state of the pool in the acquire function.
- */
-#define GST_BUFFER_POOL_IS_FLUSHING(pool)  (g_atomic_int_get (&pool->flushing))
-
-/**
- * GstBufferPool:
- * @object: the parent structure
- *
- * The structure of a #GstBufferPool. Use the associated macros to access the public
- * variables.
- */
-struct _GstBufferPool {
-  GstObject            object;
-
-  /*< protected >*/
-  gint                 flushing;
-
-  /*< private >*/
-  GstBufferPoolPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstBufferPoolClass:
- * @object_class:  Object parent class
- * @get_options: get a list of options supported by this pool
- * @set_config: apply the bufferpool configuration. The default configuration
- *              will parse the default config parameters
- * @start: start the bufferpool. The default implementation will preallocate
- *         min-buffers buffers and put them in the queue
- * @stop: stop the bufferpool. the default implementation will free the
- *        preallocated buffers. This function is called when all the buffers are
- *        returned to the pool.
- * @acquire_buffer: get a new buffer from the pool. The default implementation
- *        will take a buffer from the queue and optionally wait for a buffer to
- *        be released when there are no buffers available.
- * @alloc_buffer: allocate a buffer. the default implementation allocates
- *        buffers from the configured memory allocator and with the configured
- *        parameters. All metadata that is present on the allocated buffer will
- *        be marked as #GST_META_FLAG_POOLED and #GST_META_FLAG_LOCKED and will
- *        not be removed from the buffer in @reset_buffer.
- * @reset_buffer: reset the buffer to its state when it was freshly allocated.
- *        The default implementation will clear the flags, timestamps and
- *        will remove the metadata without the #GST_META_FLAG_POOLED flag (even
- *        the metadata with #GST_META_FLAG_LOCKED).
- * @release_buffer: release a buffer back in the pool. The default
- *        implementation will put the buffer back in the queue and notify any
- *        blocking acquire_buffer calls.
- * @free_buffer: free a buffer. The default implementation unrefs the buffer.
- *
- * The GstBufferPool class.
- */
-struct _GstBufferPoolClass {
-  GstObjectClass    object_class;
-
-  /* vmethods */
-  const gchar ** (*get_options)    (GstBufferPool *pool);
-  gboolean       (*set_config)     (GstBufferPool *pool, GstStructure *config);
-
-  gboolean       (*start)          (GstBufferPool *pool);
-  gboolean       (*stop)           (GstBufferPool *pool);
-
-  GstFlowReturn  (*acquire_buffer) (GstBufferPool *pool, GstBuffer **buffer,
-                                    GstBufferPoolAcquireParams *params);
-  GstFlowReturn  (*alloc_buffer)   (GstBufferPool *pool, GstBuffer **buffer,
-                                    GstBufferPoolAcquireParams *params);
-  void           (*reset_buffer)   (GstBufferPool *pool, GstBuffer *buffer);
-  void           (*release_buffer) (GstBufferPool *pool, GstBuffer *buffer);
-  void           (*free_buffer)    (GstBufferPool *pool, GstBuffer *buffer);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType       gst_buffer_pool_get_type (void);
-
-/* allocation */
-GstBufferPool *  gst_buffer_pool_new  (void);
-
-/* state management */
-gboolean         gst_buffer_pool_set_active      (GstBufferPool *pool, gboolean active);
-gboolean         gst_buffer_pool_is_active       (GstBufferPool *pool);
-
-gboolean         gst_buffer_pool_set_config      (GstBufferPool *pool, GstStructure *config);
-GstStructure *   gst_buffer_pool_get_config      (GstBufferPool *pool);
-
-const gchar **   gst_buffer_pool_get_options     (GstBufferPool *pool);
-gboolean         gst_buffer_pool_has_option      (GstBufferPool *pool, const gchar *option);
-
-/* helpers for configuring the config structure */
-void             gst_buffer_pool_config_set_params    (GstStructure *config, GstCaps *caps,
-                                                       guint size, guint min_buffers, guint max_buffers);
-gboolean         gst_buffer_pool_config_get_params    (GstStructure *config, GstCaps **caps,
-                                                       guint *size, guint *min_buffers, guint *max_buffers);
-void             gst_buffer_pool_config_set_allocator (GstStructure *config, GstAllocator *allocator,
-                                                       const GstAllocationParams *params);
-gboolean         gst_buffer_pool_config_get_allocator (GstStructure *config, GstAllocator **allocator,
-                                                       GstAllocationParams *params);
-
-/* options */
-guint            gst_buffer_pool_config_n_options   (GstStructure *config);
-void             gst_buffer_pool_config_add_option  (GstStructure *config, const gchar *option);
-const gchar *    gst_buffer_pool_config_get_option  (GstStructure *config, guint index);
-gboolean         gst_buffer_pool_config_has_option  (GstStructure *config, const gchar *option);
-
-/* buffer management */
-GstFlowReturn    gst_buffer_pool_acquire_buffer  (GstBufferPool *pool, GstBuffer **buffer,
-                                                  GstBufferPoolAcquireParams *params);
-void             gst_buffer_pool_release_buffer  (GstBufferPool *pool, GstBuffer *buffer);
-
-G_END_DECLS
-
-#endif /* __GST_BUFFER_POOL_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbus.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbus.h
deleted file mode 100644
index ed05ddba..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstbus.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
- *
- * gstbus.h: Header for GstBus subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_BUS_H__
-#define __GST_BUS_H__
-
-typedef struct _GstBus GstBus;
-typedef struct _GstBusPrivate GstBusPrivate;
-typedef struct _GstBusClass GstBusClass;
-
-#include <gst/gstmessage.h>
-#include <gst/gstclock.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-#define GST_TYPE_BUS              (gst_bus_get_type ())
-#define GST_BUS(bus)              (G_TYPE_CHECK_INSTANCE_CAST ((bus), GST_TYPE_BUS, GstBus))
-#define GST_IS_BUS(bus)           (G_TYPE_CHECK_INSTANCE_TYPE ((bus), GST_TYPE_BUS))
-#define GST_BUS_CLASS(bclass)     (G_TYPE_CHECK_CLASS_CAST ((bclass), GST_TYPE_BUS, GstBusClass))
-#define GST_IS_BUS_CLASS(bclass)  (G_TYPE_CHECK_CLASS_TYPE ((bclass), GST_TYPE_BUS))
-#define GST_BUS_GET_CLASS(bus)    (G_TYPE_INSTANCE_GET_CLASS ((bus), GST_TYPE_BUS, GstBusClass))
-#define GST_BUS_CAST(bus)         ((GstBus*)(bus))
-
-/**
- * GstBusFlags:
- * @GST_BUS_FLUSHING: The bus is currently dropping all messages
- * @GST_BUS_FLAG_LAST: offset to define more flags
- *
- * The standard flags that a bus may have.
- */
-typedef enum {
-  GST_BUS_FLUSHING      = (GST_OBJECT_FLAG_LAST << 0),
-  /* padding */
-  GST_BUS_FLAG_LAST     = (GST_OBJECT_FLAG_LAST << 1)
-} GstBusFlags;
-
-/**
- * GstBusSyncReply:
- * @GST_BUS_DROP: drop the message
- * @GST_BUS_PASS: pass the message to the async queue
- * @GST_BUS_ASYNC: pass message to async queue, continue if message is handled
- *
- * The result values for a GstBusSyncHandler.
- */
-typedef enum
-{
-  GST_BUS_DROP = 0,
-  GST_BUS_PASS = 1,
-  GST_BUS_ASYNC = 2
-} GstBusSyncReply;
-
-/**
- * GstBusSyncHandler:
- * @bus: the #GstBus that sent the message
- * @message: the #GstMessage
- * @user_data: user data that has been given, when registering the handler
- *
- * Handler will be invoked synchronously, when a new message has been injected
- * into the bus. This function is mostly used internally. Only one sync handler
- * can be attached to a given bus.
- *
- * If the handler returns GST_BUS_DROP, it should unref the message, else the
- * message should not be unreffed by the sync handler.
- *
- * Returns: #GstBusSyncReply stating what to do with the message
- */
-typedef GstBusSyncReply (*GstBusSyncHandler)    (GstBus * bus, GstMessage * message, gpointer user_data);
-
-/**
- * GstBusFunc:
- * @bus: the #GstBus that sent the message
- * @message: the #GstMessage
- * @user_data: user data that has been given, when registering the handler
- *
- * Specifies the type of function passed to gst_bus_add_watch() or
- * gst_bus_add_watch_full(), which is called from the mainloop when a message
- * is available on the bus.
- *
- * The message passed to the function will be unreffed after execution of this
- * function so it should not be freed in the function.
- *
- * Note that this function is used as a GSourceFunc which means that returning
- * FALSE will remove the GSource from the mainloop.
- *
- * Returns: %FALSE if the event source should be removed.
- */
-typedef gboolean        (*GstBusFunc)           (GstBus * bus, GstMessage * message, gpointer user_data);
-
-/**
- * GstBus:
- *
- * The opaque #GstBus data structure.
- */
-struct _GstBus
-{
-  GstObject         object;
-
-  /*< private >*/
-  GstBusPrivate    *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstBusClass
-{
-  GstObjectClass parent_class;
-
-  /* signals */
-  void (*message)       (GstBus *bus, GstMessage *message);
-  void (*sync_message)  (GstBus *bus, GstMessage *message);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_bus_get_type                (void);
-
-GstBus*                 gst_bus_new                     (void);
-
-gboolean                gst_bus_post                    (GstBus * bus, GstMessage * message);
-
-gboolean                gst_bus_have_pending            (GstBus * bus);
-GstMessage *            gst_bus_peek                    (GstBus * bus);
-GstMessage *            gst_bus_pop                     (GstBus * bus);
-GstMessage *            gst_bus_pop_filtered            (GstBus * bus, GstMessageType types);
-GstMessage *            gst_bus_timed_pop               (GstBus * bus, GstClockTime timeout);
-GstMessage *            gst_bus_timed_pop_filtered      (GstBus * bus, GstClockTime timeout, GstMessageType types);
-void                    gst_bus_set_flushing            (GstBus * bus, gboolean flushing);
-
-/* synchronous dispatching */
-void                    gst_bus_set_sync_handler        (GstBus * bus, GstBusSyncHandler func,
-                                                         gpointer user_data, GDestroyNotify notify);
-/* GSource based dispatching */
-GSource *               gst_bus_create_watch            (GstBus * bus);
-guint                   gst_bus_add_watch_full          (GstBus * bus,
-                                                         gint priority,
-                                                         GstBusFunc func,
-                                                         gpointer user_data,
-                                                         GDestroyNotify notify);
-guint                   gst_bus_add_watch               (GstBus * bus,
-                                                         GstBusFunc func,
-                                                         gpointer user_data);
-
-/* polling the bus */
-GstMessage*             gst_bus_poll                    (GstBus *bus, GstMessageType events,
-                                                         GstClockTime timeout);
-
-/* signal based dispatching helper functions. */
-gboolean                gst_bus_async_signal_func       (GstBus *bus, GstMessage *message,
-                                                         gpointer data);
-GstBusSyncReply         gst_bus_sync_signal_handler     (GstBus *bus, GstMessage *message,
-                                                         gpointer data);
-
-/* convenience api to add/remove a gsource that emits the async signals */
-void                    gst_bus_add_signal_watch        (GstBus * bus);
-void                    gst_bus_add_signal_watch_full   (GstBus * bus, gint priority);
-void                    gst_bus_remove_signal_watch     (GstBus * bus);
-
-void                    gst_bus_enable_sync_message_emission (GstBus * bus);
-void                    gst_bus_disable_sync_message_emission (GstBus * bus);
-
-G_END_DECLS
-
-#endif /* __GST_BUS_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcaps.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcaps.h
deleted file mode 100644
index 923199bd..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcaps.h
+++ /dev/null
@@ -1,447 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 David A. Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CAPS_H__
-#define __GST_CAPS_H__
-
-#include <gst/gstconfig.h>
-#include <gst/gstminiobject.h>
-#include <gst/gststructure.h>
-#include <gst/glib-compat.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_caps_type;
-
-#define GST_TYPE_CAPS             (_gst_caps_type)
-#define GST_IS_CAPS(obj)          (GST_IS_MINI_OBJECT_TYPE((obj), GST_TYPE_CAPS))
-#define GST_CAPS_CAST(obj)        ((GstCaps*)(obj))
-#define GST_CAPS(obj)             (GST_CAPS_CAST(obj))
-
-#define GST_TYPE_STATIC_CAPS      (gst_static_caps_get_type())
-
-/**
- * GstCapsFlags:
- * @GST_CAPS_FLAG_ANY: Caps has no specific content, but can contain
- *    anything.
- *
- * Extra flags for a caps.
- */
-typedef enum {
-  GST_CAPS_FLAG_ANY	= (GST_MINI_OBJECT_FLAG_LAST << 0)
-} GstCapsFlags;
-
-/**
- * GstCapsIntersectMode:
- * @GST_CAPS_INTERSECT_ZIG_ZAG  : Zig-zags over both caps.
- * @GST_CAPS_INTERSECT_FIRST    : Keeps the first caps order.
- *
- * Modes of caps intersection
- *
- * @GST_CAPS_INTERSECT_ZIG_ZAG tries to preserve overall order of both caps
- * by iterating on the caps' structures as the following matrix shows:
- * |[
- *          caps1
- *       +-------------
- *       | 1  2  4  7
- * caps2 | 3  5  8 10
- *       | 6  9 11 12
- * ]|
- * Used when there is no explicit precedence of one caps over the other. e.g.
- * tee's sink pad getcaps function, it will probe its src pad peers' for their
- * caps and intersect them with this mode.
- *
- * @GST_CAPS_INTERSECT_FIRST is useful when an element wants to preserve
- * another element's caps priority order when intersecting with its own caps.
- * Example: If caps1 is [A, B, C] and caps2 is [E, B, D, A], the result
- * would be [A, B], maintaining the first caps priority on the intersection.
- */
-typedef enum {
-  GST_CAPS_INTERSECT_ZIG_ZAG            =  0,
-  GST_CAPS_INTERSECT_FIRST              =  1
-} GstCapsIntersectMode;
-
-/**
- * GST_CAPS_ANY:
- *
- * Means that the element/pad can output 'anything'. Useful for elements
- * that output unknown media, such as filesrc. This macro returns a singleton and
- * should not be unreffed.
- */
-#define GST_CAPS_ANY              _gst_caps_any
-/**
- * GST_CAPS_NONE:
- *
- * The opposite of %GST_CAPS_ANY: it means that the pad/element outputs an
- * undefined media type that can not be detected. This macro returns a singleton
- * and should not be unreffed.
- */
-#define GST_CAPS_NONE             _gst_caps_none
-
-/**
- * GST_STATIC_CAPS_ANY:
- *
- * Creates a new #GstCaps static caps that matches anything.
- * This can be used in pad templates.
- */
-#define GST_STATIC_CAPS_ANY       GST_STATIC_CAPS("ANY")
-/**
- * GST_STATIC_CAPS_NONE:
- *
- * Creates a new #GstCaps static caps that matches nothing.
- * This can be used in pad templates.
- */
-#define GST_STATIC_CAPS_NONE      GST_STATIC_CAPS("NONE")
-
-/**
- * GST_CAPS_IS_SIMPLE:
- * @caps: the #GstCaps instance to check
- *
- * Convenience macro that checks if the number of structures in the given caps
- * is exactly one.
- */
-#define GST_CAPS_IS_SIMPLE(caps) (gst_caps_get_size(caps) == 1)
-
-/**
- * GST_STATIC_CAPS:
- * @string: the string describing the caps
- *
- * Creates a new #GstCaps static caps from an input string.
- * This can be used in pad templates.
- */
-#define GST_STATIC_CAPS(string) \
-{ \
-  /* caps */ NULL, \
-  /* string */ string, \
-  GST_PADDING_INIT \
-}
-
-typedef struct _GstCaps GstCaps;
-typedef struct _GstStaticCaps GstStaticCaps;
-
-GST_EXPORT GstCaps * _gst_caps_any;
-GST_EXPORT GstCaps * _gst_caps_none;
-/**
- * GST_CAPS_FLAGS:
- * @caps: a #GstCaps.
- *
- * A flags word containing #GstCapsFlags flags set on this caps.
- */
-#define GST_CAPS_FLAGS(caps)                    GST_MINI_OBJECT_FLAGS(caps)
-
-/* refcount */
-/**
- * GST_CAPS_REFCOUNT:
- * @caps: a #GstCaps
- *
- * Get access to the reference count field of the caps
- */
-#define GST_CAPS_REFCOUNT(caps)                 GST_MINI_OBJECT_REFCOUNT(caps)
-/**
- * GST_CAPS_REFCOUNT_VALUE:
- * @caps: a #GstCaps
- *
- * Get the reference count value of the caps.
- */
-#define GST_CAPS_REFCOUNT_VALUE(caps)           GST_MINI_OBJECT_REFCOUNT_VALUE(caps)
-
-/**
- * GST_CAPS_FLAG_IS_SET:
- * @caps: a #GstCaps.
- * @flag: the #GstCapsFlags to check.
- *
- * Gives the status of a specific flag on a caps.
- */
-#define GST_CAPS_FLAG_IS_SET(caps,flag)        GST_MINI_OBJECT_FLAG_IS_SET (caps, flag)
-/**
- * GST_CAPS_FLAG_SET:
- * @caps: a #GstCaps.
- * @flag: the #GstCapsFlags to set.
- *
- * Sets a caps flag on a caps.
- */
-#define GST_CAPS_FLAG_SET(caps,flag)           GST_MINI_OBJECT_FLAG_SET (caps, flag)
-/**
- * GST_CAPS_FLAG_UNSET:
- * @caps: a #GstCaps.
- * @flag: the #GstCapsFlags to clear.
- *
- * Clears a caps flag.
- */
-#define GST_CAPS_FLAG_UNSET(caps,flag)         GST_MINI_OBJECT_FLAG_UNSET (caps, flag)
-
-/* refcounting */
-/**
- * gst_caps_ref:
- * @caps: the #GstCaps to reference
- *
- * Add a reference to a #GstCaps object.
- *
- * From this point on, until the caller calls gst_caps_unref() or
- * gst_caps_make_writable(), it is guaranteed that the caps object will not
- * change. This means its structures won't change, etc. To use a #GstCaps
- * object, you must always have a refcount on it -- either the one made
- * implicitly by e.g. gst_caps_new_simple(), or via taking one explicitly with
- * this function.
- *
- * Returns: the same #GstCaps object.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstCaps * gst_caps_ref (GstCaps * caps);
-#endif
-
-static inline GstCaps *
-gst_caps_ref (GstCaps * caps)
-{
-  return (GstCaps *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (caps));
-}
-
-/**
- * gst_caps_unref:
- * @caps: a #GstCaps.
- *
- * Unref a #GstCaps and and free all its structures and the
- * structures' values when the refcount reaches 0.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_caps_unref (GstCaps * caps);
-#endif
-
-static inline void
-gst_caps_unref (GstCaps * caps)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (caps));
-}
-
-/* copy caps */
-/**
- * gst_caps_copy:
- * @caps: a #GstCaps.
- *
- * Creates a new #GstCaps as a copy of the old @caps. The new caps will have a
- * refcount of 1, owned by the caller. The structures are copied as well.
- *
- * Note that this function is the semantic equivalent of a gst_caps_ref()
- * followed by a gst_caps_make_writable(). If you only want to hold on to a
- * reference to the data, you should use gst_caps_ref().
- *
- * When you are finished with the caps, call gst_caps_unref() on it.
- *
- * Returns: the new #GstCaps
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstCaps * gst_caps_copy (const GstCaps * caps);
-#endif
-
-static inline GstCaps *
-gst_caps_copy (const GstCaps * caps)
-{
-  return GST_CAPS (gst_mini_object_copy (GST_MINI_OBJECT_CAST (caps)));
-}
-
-/**
- * gst_caps_is_writable:
- * @caps: a #GstCaps
- *
- * Tests if you can safely modify @caps. It is only safe to modify caps when
- * there is only one owner of the caps - ie, the object is writable.
- */
-#define         gst_caps_is_writable(caps)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (caps))
-
-/**
- * gst_caps_make_writable:
- * @caps: (transfer full): a #GstCaps
- *
- * Returns a writable copy of @caps.
- *
- * If there is only one reference count on @caps, the caller must be the owner,
- * and so this function will return the caps object unchanged. If on the other
- * hand there is more than one reference on the object, a new caps object will
- * be returned. The caller's reference on @caps will be removed, and instead the
- * caller will own a reference to the returned object.
- *
- * In short, this function unrefs the caps in the argument and refs the caps
- * that it returns. Don't access the argument after calling this function. See
- * also: gst_caps_ref().
- *
- * Returns: (transfer full): a writable caps which may or may not be the
- *     same as @caps
- */
-#define         gst_caps_make_writable(caps)   GST_CAPS_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (caps)))
-
-/**
- * gst_caps_replace:
- * @old_caps: (inout) (transfer full): pointer to a pointer to a #GstCaps to be
- *     replaced.
- * @new_caps: (transfer none) (allow-none): pointer to a #GstCaps that will
- *     replace the caps pointed to by @ocaps.
- *
- * Modifies a pointer to a #GstCaps to point to a different #GstCaps. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * caps is unreffed, the new is reffed).
- *
- * Either @ncaps or the #GstCaps pointed to by @ocaps may be NULL.
- *
- * Returns: TRUE if @new_caps was different from @old_caps
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_caps_replace (GstCaps **old_caps, GstCaps *new_caps);
-#endif
-
-static inline gboolean
-gst_caps_replace (GstCaps **old_caps, GstCaps *new_caps)
-{
-    return gst_mini_object_replace ((GstMiniObject **) old_caps, (GstMiniObject *) new_caps);
-}
-
-/**
- * gst_caps_take:
- * @old_caps: (inout) (transfer full): pointer to a pointer to a #GstCaps to be
- *     replaced.
- * @new_caps: (transfer full) (allow-none): pointer to a #GstCaps that will
- *     replace the caps pointed to by @ocaps.
- *
- * Modifies a pointer to a #GstCaps to point to a different #GstCaps. This
- * function is similar to gst_caps_replace() except that it takes ownership
- * of @new_caps.
- *
- * Returns: TRUE if @new_caps was different from @old_caps
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_caps_take (GstCaps **old_caps, GstCaps *new_caps);
-#endif
-
-static inline gboolean
-gst_caps_take (GstCaps **old_caps, GstCaps *new_caps)
-{
-    return gst_mini_object_take ((GstMiniObject **) old_caps, (GstMiniObject *) new_caps);
-}
-
-/**
- * GstCaps:
- * @mini_object: the parent type
- *
- * Object describing media types.
- */
-struct _GstCaps {
-  GstMiniObject mini_object;
-};
-
-/**
- * GstStaticCaps:
- * @caps: the cached #GstCaps
- * @string: a string describing a caps
- *
- * Datastructure to initialize #GstCaps from a string description usually
- * used in conjunction with GST_STATIC_CAPS() and gst_static_caps_get() to
- * instantiate a #GstCaps.
- */
-struct _GstStaticCaps {
-  /*< public >*/
-  GstCaps *caps;
-  const char *string;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType             gst_caps_get_type                (void);
-
-GstCaps *         gst_caps_new_empty               (void);
-GstCaps *         gst_caps_new_any                 (void);
-GstCaps *         gst_caps_new_empty_simple        (const char    *media_type) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_new_simple              (const char    *media_type,
-                                                    const char    *fieldname,
-                                                    ...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_new_full                (GstStructure  *struct1,
-                                                    ...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_new_full_valist         (GstStructure  *structure,
-                                                    va_list        var_args) G_GNUC_WARN_UNUSED_RESULT;
-
-GType             gst_static_caps_get_type         (void);
-GstCaps *         gst_static_caps_get              (GstStaticCaps *static_caps);
-void              gst_static_caps_cleanup          (GstStaticCaps *static_caps);
-
-/* manipulation */
-void              gst_caps_append                  (GstCaps       *caps1,
-                                                    GstCaps       *caps2);
-void              gst_caps_append_structure        (GstCaps       *caps,
-                                                    GstStructure  *structure);
-void              gst_caps_remove_structure        (GstCaps       *caps, guint idx);
-GstCaps *         gst_caps_merge                   (GstCaps       *caps1,
-                                                    GstCaps       *caps2) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_merge_structure         (GstCaps       *caps,
-                                                    GstStructure  *structure) G_GNUC_WARN_UNUSED_RESULT;
-guint             gst_caps_get_size                (const GstCaps *caps);
-GstStructure *    gst_caps_get_structure           (const GstCaps *caps,
-                                                    guint          index);
-GstStructure *    gst_caps_steal_structure         (GstCaps       *caps,
-                                                    guint          index) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_copy_nth                (const GstCaps *caps, guint nth) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_truncate                (GstCaps       *caps) G_GNUC_WARN_UNUSED_RESULT;
-void              gst_caps_set_value               (GstCaps       *caps,
-                                                    const char    *field,
-                                                    const GValue  *value);
-void              gst_caps_set_simple              (GstCaps       *caps,
-                                                    const char    *field, ...) G_GNUC_NULL_TERMINATED;
-void              gst_caps_set_simple_valist       (GstCaps       *caps,
-                                                    const char    *field,
-                                                    va_list        varargs);
-
-/* tests */
-gboolean          gst_caps_is_any                  (const GstCaps *caps);
-gboolean          gst_caps_is_empty                (const GstCaps *caps);
-gboolean          gst_caps_is_fixed                (const GstCaps *caps);
-gboolean          gst_caps_is_always_compatible    (const GstCaps *caps1,
-                                                    const GstCaps *caps2);
-gboolean          gst_caps_is_subset		   (const GstCaps *subset,
-						    const GstCaps *superset);
-gboolean          gst_caps_is_subset_structure     (const GstCaps *caps,
-                                                    const GstStructure *structure);
-gboolean          gst_caps_is_equal		   (const GstCaps *caps1,
-						    const GstCaps *caps2);
-gboolean          gst_caps_is_equal_fixed          (const GstCaps *caps1,
-						    const GstCaps *caps2);
-gboolean          gst_caps_can_intersect           (const GstCaps * caps1,
-						    const GstCaps * caps2);
-gboolean          gst_caps_is_strictly_equal	   (const GstCaps *caps1,
-						    const GstCaps *caps2);
-
-
-/* operations */
-GstCaps *         gst_caps_intersect               (GstCaps *caps1,
-						    GstCaps *caps2) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_intersect_full          (GstCaps *caps1,
-						    GstCaps *caps2,
-                                                    GstCapsIntersectMode mode) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_subtract		   (GstCaps *minuend,
-						    GstCaps *subtrahend) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_normalize               (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
-GstCaps *         gst_caps_simplify                (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
-
-GstCaps *         gst_caps_fixate                  (GstCaps *caps) G_GNUC_WARN_UNUSED_RESULT;
-
-/* utility */
-gchar *           gst_caps_to_string               (const GstCaps *caps) G_GNUC_MALLOC;
-GstCaps *         gst_caps_from_string             (const gchar   *string) G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS
-
-#endif /* __GST_CAPS_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstchildproxy.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstchildproxy.h
deleted file mode 100644
index 1614d4b1..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstchildproxy.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Stefan Kost <ensonic@users.sf.net>
- *
- * gstchildproxy.h: interface header for multi child elements
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CHILD_PROXY_H__
-#define __GST_CHILD_PROXY_H__
-
-#include <glib-object.h>
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-
-#define GST_TYPE_CHILD_PROXY               (gst_child_proxy_get_type ())
-#define GST_CHILD_PROXY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_CHILD_PROXY, GstChildProxy))
-#define GST_IS_CHILD_PROXY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_CHILD_PROXY))
-#define GST_CHILD_PROXY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_CHILD_PROXY, GstChildProxyInterface))
-
-/**
- * GstChildProxy:
- *
- * Opaque #GstChildProxy data structure.
- */
-typedef struct _GstChildProxy GstChildProxy;    /* dummy object */
-typedef struct _GstChildProxyInterface GstChildProxyInterface;
-
-/**
- * GstChildProxyInterface:
- * @parent: parent interface type.
- * @get_child_by_name:  virtual method to fetch the child by name
- * @get_child_by_index: virtual method to fetch the child by index
- * @get_children_count: virtual method to get the children count
- *
- * #GstChildProxy interface.
- */
-struct _GstChildProxyInterface
-{
-  GTypeInterface parent;
-
-  /* methods */
-  GObject * (*get_child_by_name)  (GstChildProxy * parent, const gchar * name);
-  GObject * (*get_child_by_index) (GstChildProxy * parent, guint index);
-  guint     (*get_children_count) (GstChildProxy * parent);
-  /*< private >*/
-  /* signals */
-  void      (*child_added)        (GstChildProxy * parent, GObject * child, const gchar * name);
-  void      (*child_removed)      (GstChildProxy * parent, GObject * child, const gchar * name);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType     gst_child_proxy_get_type (void);
-
-GObject * gst_child_proxy_get_child_by_name  (GstChildProxy * parent, const gchar * name);
-
-guint     gst_child_proxy_get_children_count (GstChildProxy * parent);
-GObject * gst_child_proxy_get_child_by_index (GstChildProxy * parent, guint index);
-
-gboolean  gst_child_proxy_lookup             (GstChildProxy *object, const gchar *name,
-                                              GObject **target, GParamSpec **pspec);
-
-void      gst_child_proxy_get_property       (GstChildProxy * object, const gchar *name,
-                                              GValue *value);
-void      gst_child_proxy_get_valist         (GstChildProxy * object,
-                                              const gchar * first_property_name,
-                                              va_list var_args);
-void      gst_child_proxy_get                (GstChildProxy * object,
-                                              const gchar * first_property_name,
-                                              ...) G_GNUC_NULL_TERMINATED;
-
-void      gst_child_proxy_set_property       (GstChildProxy * object, const gchar *name,
-                                              const GValue *value);
-void      gst_child_proxy_set_valist         (GstChildProxy* object,
-                                              const gchar * first_property_name,
-                                              va_list var_args);
-void      gst_child_proxy_set                (GstChildProxy * object,
-                                              const gchar * first_property_name,
-                                              ...) G_GNUC_NULL_TERMINATED;
-
-void      gst_child_proxy_child_added        (GstChildProxy * parent, GObject * child,
-                                              const gchar *name);
-void      gst_child_proxy_child_removed      (GstChildProxy * parent, GObject * child,
-                                              const gchar *name);
-
-G_END_DECLS
-
-#endif /* __GST_CHILD_PROXY_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstclock.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstclock.h
deleted file mode 100644
index 5d42ce60..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstclock.h
+++ /dev/null
@@ -1,521 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstclock.h: Header for clock subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CLOCK_H__
-#define __GST_CLOCK_H__
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-#define GST_TYPE_CLOCK                  (gst_clock_get_type ())
-#define GST_CLOCK(clock)                (G_TYPE_CHECK_INSTANCE_CAST ((clock), GST_TYPE_CLOCK, GstClock))
-#define GST_IS_CLOCK(clock)             (G_TYPE_CHECK_INSTANCE_TYPE ((clock), GST_TYPE_CLOCK))
-#define GST_CLOCK_CLASS(cclass)         (G_TYPE_CHECK_CLASS_CAST ((cclass), GST_TYPE_CLOCK, GstClockClass))
-#define GST_IS_CLOCK_CLASS(cclass)      (G_TYPE_CHECK_CLASS_TYPE ((cclass), GST_TYPE_CLOCK))
-#define GST_CLOCK_GET_CLASS(clock)      (G_TYPE_INSTANCE_GET_CLASS ((clock), GST_TYPE_CLOCK, GstClockClass))
-#define GST_CLOCK_CAST(clock)           ((GstClock*)(clock))
-
-/**
- * GstClockTime:
- *
- * A datatype to hold a time, measured in nanoseconds.
- */
-typedef guint64 GstClockTime;
-
-/**
- * GST_TYPE_CLOCK_TIME:
- *
- * The #GType of a #GstClockTime.
- */
-#define GST_TYPE_CLOCK_TIME G_TYPE_UINT64
-
-/**
- * GstClockTimeDiff:
- *
- * A datatype to hold a time difference, measured in nanoseconds.
- */
-typedef gint64 GstClockTimeDiff;
-/**
- * GstClockID:
- *
- * A datatype to hold the handle to an outstanding sync or async clock callback.
- */
-typedef gpointer GstClockID;
-
-/**
- * GST_CLOCK_TIME_NONE:
- *
- * Constant to define an undefined clock time.
- *
- * Value: 18446744073709551615
- * Type: GstClockTime
- */
-#define GST_CLOCK_TIME_NONE             ((GstClockTime) -1)
-/**
- * GST_CLOCK_TIME_IS_VALID:
- * @time: clock time to validate
- *
- * Tests if a given #GstClockTime represents a valid defined time.
- */
-#define GST_CLOCK_TIME_IS_VALID(time)   (((GstClockTime)(time)) != GST_CLOCK_TIME_NONE)
-
-/* FIXME: still need to explicitly force types on the defines below */
-/**
- * GST_SECOND:
- *
- * Constant that defines one GStreamer second.
- *
- * Value: 1000000000
- * Type: GstClockTime
- */
-#define GST_SECOND  (G_USEC_PER_SEC * G_GINT64_CONSTANT (1000))
-/**
- * GST_MSECOND:
- *
- * Constant that defines one GStreamer millisecond.
- *
- * Value: 1000000
- * Type: GstClockTime
- */
-#define GST_MSECOND (GST_SECOND / G_GINT64_CONSTANT (1000))
-/**
- * GST_USECOND:
- *
- * Constant that defines one GStreamer microsecond.
- *
- * Value: 1000
- * Type: GstClockTime
- */
-#define GST_USECOND (GST_SECOND / G_GINT64_CONSTANT (1000000))
-/**
- * GST_NSECOND:
- *
- * Constant that defines one GStreamer nanosecond
- *
- * Value: 1
- * Type: GstClockTime
- */
-#define GST_NSECOND (GST_SECOND / G_GINT64_CONSTANT (1000000000))
-
-
-/**
- * GST_TIME_AS_SECONDS:
- * @time: the time
- *
- * Convert a #GstClockTime to seconds.
- */
-#define GST_TIME_AS_SECONDS(time)  ((time) / GST_SECOND)
-/**
- * GST_TIME_AS_MSECONDS:
- * @time: the time
- *
- * Convert a #GstClockTime to milliseconds (1/1000 of a second).
- */
-#define GST_TIME_AS_MSECONDS(time) ((time) / G_GINT64_CONSTANT (1000000))
-/**
- * GST_TIME_AS_USECONDS:
- * @time: the time
- *
- * Convert a #GstClockTime to microseconds (1/1000000 of a second).
- */
-#define GST_TIME_AS_USECONDS(time) ((time) / G_GINT64_CONSTANT (1000))
-/**
- * GST_TIME_AS_NSECONDS:
- * @time: the time
- *
- * Convert a #GstClockTime to nanoseconds (1/1000000000 of a second).
- */
-#define GST_TIME_AS_NSECONDS(time) (time)
-
-/**
- * GST_CLOCK_DIFF:
- * @s: the first time
- * @e: the second time
- *
- * Calculate a difference between two clock times as a #GstClockTimeDiff.
- * The difference is calculated as @e - @s.
- */
-#define GST_CLOCK_DIFF(s, e)            (GstClockTimeDiff)((e) - (s))
-
-/**
- * GST_TIMEVAL_TO_TIME:
- * @tv: the timeval to convert
- *
- * Convert a #GTimeVal to a #GstClockTime.
- */
-#define GST_TIMEVAL_TO_TIME(tv)         (GstClockTime)((tv).tv_sec * GST_SECOND + (tv).tv_usec * GST_USECOND)
-
-/**
- * GST_TIME_TO_TIMEVAL:
- * @t: The #GstClockTime to convert
- * @tv: The target timeval
- *
- * Convert a #GstClockTime to a #GTimeVal
- *
- * <note>on 32-bit systems, a timeval has a range of only 2^32 - 1 seconds,
- * which is about 68 years.  Expect trouble if you want to schedule stuff
- * in your pipeline for 2038.</note>
- */
-#define GST_TIME_TO_TIMEVAL(t,tv)                               \
-G_STMT_START {                                                  \
-  g_assert ("Value of time " #t " is out of timeval's range" && \
-      ((t) / GST_SECOND) < G_MAXLONG);                          \
-  (tv).tv_sec  = (glong) (((GstClockTime) (t)) / GST_SECOND);   \
-  (tv).tv_usec = (glong) ((((GstClockTime) (t)) -               \
-                  ((GstClockTime) (tv).tv_sec) * GST_SECOND)    \
-                 / GST_USECOND);                                \
-} G_STMT_END
-
-/**
- * GST_TIMESPEC_TO_TIME:
- * @ts: the timespec to convert
- *
- * Convert a struct timespec (see man pselect) to a #GstClockTime.
- */
-#define GST_TIMESPEC_TO_TIME(ts)        (GstClockTime)((ts).tv_sec * GST_SECOND + (ts).tv_nsec * GST_NSECOND)
-/**
- * GST_TIME_TO_TIMESPEC:
- * @t: The #GstClockTime to convert
- * @ts: The target timespec
- *
- * Convert a #GstClockTime to a struct timespec (see man pselect)
- */
-#define GST_TIME_TO_TIMESPEC(t,ts)                                \
-G_STMT_START {                                                    \
-  g_assert ("Value of time " #t " is out of timespec's range" &&  \
-      ((t) / GST_SECOND) < G_MAXLONG);                            \
-  (ts).tv_sec  =  (glong) ((t) / GST_SECOND);                     \
-  (ts).tv_nsec = (glong) (((t) - (ts).tv_sec * GST_SECOND) / GST_NSECOND);        \
-} G_STMT_END
-
-/* timestamp debugging macros */
-/**
- * GST_TIME_FORMAT:
- *
- * A string that can be used in printf-like format strings to display a
- * #GstClockTime value in h:m:s format.  Use GST_TIME_ARGS() to construct
- * the matching arguments.
- *
- * Example:
- * |[
- * printf("%" GST_TIME_FORMAT "\n", GST_TIME_ARGS(ts));
- * ]|
- */
-#define GST_TIME_FORMAT "u:%02u:%02u.%09u"
-/**
- * GST_TIME_ARGS:
- * @t: a #GstClockTime
- *
- * Format @t for the #GST_TIME_FORMAT format string. Note: @t will be
- * evaluated more than once.
- */
-#define GST_TIME_ARGS(t) \
-        GST_CLOCK_TIME_IS_VALID (t) ? \
-        (guint) (((GstClockTime)(t)) / (GST_SECOND * 60 * 60)) : 99, \
-        GST_CLOCK_TIME_IS_VALID (t) ? \
-        (guint) ((((GstClockTime)(t)) / (GST_SECOND * 60)) % 60) : 99, \
-        GST_CLOCK_TIME_IS_VALID (t) ? \
-        (guint) ((((GstClockTime)(t)) / GST_SECOND) % 60) : 99, \
-        GST_CLOCK_TIME_IS_VALID (t) ? \
-        (guint) (((GstClockTime)(t)) % GST_SECOND) : 999999999
-
-typedef struct _GstClockEntry   GstClockEntry;
-typedef struct _GstClock        GstClock;
-typedef struct _GstClockClass   GstClockClass;
-typedef struct _GstClockPrivate GstClockPrivate;
-
-/* --- prototype for async callbacks --- */
-/**
- * GstClockCallback:
- * @clock: The clock that triggered the callback
- * @time: The time it was triggered
- * @id: The #GstClockID that expired
- * @user_data: user data passed in the gst_clock_id_wait_async() function
- *
- * The function prototype of the callback.
- *
- * Returns: %TRUE or %FALSE (currently unused)
- */
-typedef gboolean        (*GstClockCallback)     (GstClock *clock, GstClockTime time,
-                                                 GstClockID id, gpointer user_data);
-/**
- * GstClockReturn:
- * @GST_CLOCK_OK: The operation succeeded.
- * @GST_CLOCK_EARLY: The operation was scheduled too late.
- * @GST_CLOCK_UNSCHEDULED: The clockID was unscheduled
- * @GST_CLOCK_BUSY: The ClockID is busy
- * @GST_CLOCK_BADTIME: A bad time was provided to a function.
- * @GST_CLOCK_ERROR: An error occurred
- * @GST_CLOCK_UNSUPPORTED: Operation is not supported
- * @GST_CLOCK_DONE: The ClockID is done waiting
- *
- * The return value of a clock operation.
- */
-typedef enum
-{
-  GST_CLOCK_OK          =  0,
-  GST_CLOCK_EARLY       =  1,
-  GST_CLOCK_UNSCHEDULED =  2,
-  GST_CLOCK_BUSY        =  3,
-  GST_CLOCK_BADTIME     =  4,
-  GST_CLOCK_ERROR       =  5,
-  GST_CLOCK_UNSUPPORTED =  6,
-  GST_CLOCK_DONE        =  7
-} GstClockReturn;
-
-/**
- * GstClockEntryType:
- * @GST_CLOCK_ENTRY_SINGLE: a single shot timeout
- * @GST_CLOCK_ENTRY_PERIODIC: a periodic timeout request
- *
- * The type of the clock entry
- */
-typedef enum {
-  GST_CLOCK_ENTRY_SINGLE,
-  GST_CLOCK_ENTRY_PERIODIC
-} GstClockEntryType;
-
-/**
- * GST_CLOCK_ENTRY:
- * @entry: the entry to cast
- *
- * Cast to a clock entry
- */
-#define GST_CLOCK_ENTRY(entry)          ((GstClockEntry *)(entry))
-/**
- * GST_CLOCK_ENTRY_CLOCK:
- * @entry: the entry to query
- *
- * Get the owner clock of the entry
- */
-#define GST_CLOCK_ENTRY_CLOCK(entry)    ((entry)->clock)
-/**
- * GST_CLOCK_ENTRY_TYPE:
- * @entry: the entry to query
- *
- * Get the type of the clock entry
- */
-#define GST_CLOCK_ENTRY_TYPE(entry)     ((entry)->type)
-/**
- * GST_CLOCK_ENTRY_TIME:
- * @entry: the entry to query
- *
- * Get the requested time of this entry
- */
-#define GST_CLOCK_ENTRY_TIME(entry)     ((entry)->time)
-/**
- * GST_CLOCK_ENTRY_INTERVAL:
- * @entry: the entry to query
- *
- * Get the interval of this periodic entry
- */
-#define GST_CLOCK_ENTRY_INTERVAL(entry) ((entry)->interval)
-/**
- * GST_CLOCK_ENTRY_STATUS:
- * @entry: the entry to query
- *
- * The status of the entry
- */
-#define GST_CLOCK_ENTRY_STATUS(entry)   ((entry)->status)
-
-/**
- * GstClockEntry:
- * @refcount: reference counter (read-only)
- *
- * All pending timeouts or periodic notifies are converted into
- * an entry.
- * Note that GstClockEntry should be treated as an opaque structure. It must
- * not be extended or allocated using a custom allocator.
- */
-struct _GstClockEntry {
-  gint                  refcount;
-  /*< protected >*/
-  GstClock              *clock;
-  GstClockEntryType      type;
-  GstClockTime           time;
-  GstClockTime           interval;
-  GstClockReturn         status;
-  GstClockCallback       func;
-  gpointer               user_data;
-  GDestroyNotify         destroy_data;
-  gboolean               unscheduled;
-  gboolean               woken_up;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#include <gst/gstobject.h>
-
-/**
- * GstClockFlags:
- * @GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC: clock can do a single sync timeout request
- * @GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC: clock can do a single async timeout request
- * @GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC: clock can do sync periodic timeout requests
- * @GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC: clock can do async periodic timeout callbacks
- * @GST_CLOCK_FLAG_CAN_SET_RESOLUTION: clock's resolution can be changed
- * @GST_CLOCK_FLAG_CAN_SET_MASTER: clock can be slaved to a master clock
- * @GST_CLOCK_FLAG_LAST: subclasses can add additional flags starting from this flag
- *
- * The capabilities of this clock
- */
-typedef enum {
-  GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC     = (GST_OBJECT_FLAG_LAST << 0),
-  GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC    = (GST_OBJECT_FLAG_LAST << 1),
-  GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC   = (GST_OBJECT_FLAG_LAST << 2),
-  GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC  = (GST_OBJECT_FLAG_LAST << 3),
-  GST_CLOCK_FLAG_CAN_SET_RESOLUTION     = (GST_OBJECT_FLAG_LAST << 4),
-  GST_CLOCK_FLAG_CAN_SET_MASTER         = (GST_OBJECT_FLAG_LAST << 5),
-  /* padding */
-  GST_CLOCK_FLAG_LAST                   = (GST_OBJECT_FLAG_LAST << 8)
-} GstClockFlags;
-
-/**
- * GST_CLOCK_FLAGS:
- * @clock: the clock to query
- *
- * Gets the #GstClockFlags clock flags.
- */
-#define GST_CLOCK_FLAGS(clock)  GST_OBJECT_FLAGS(clock)
-
-/**
- * GstClock:
- *
- * #GstClock base structure. The values of this structure are
- * protected for subclasses, use the methods to use the #GstClock.
- */
-struct _GstClock {
-  GstObject      object;
-
-  /*< private >*/
-  GstClockPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstClockClass:
- * @parent_class: the parent class structure
- * @change_resolution: change the resolution of the clock. Not all values might
- *                     be acceptable. The new resolution should be returned.
- * @get_resolution: get the resolution of the clock.
- * @get_internal_time: get the internal unadjusted time of the clock.
- *        implement @wait_jitter instead.
- * @wait: perform a blocking wait on the given #GstClockEntry and return
- *               the jitter.
- * @wait_async: perform an asynchronous wait for the given #GstClockEntry.
- * @unschedule: unblock a blocking or async wait operation.
- *
- * GStreamer clock class. Override the vmethods to implement the clock
- * functionality.
- */
-struct _GstClockClass {
-  GstObjectClass        parent_class;
-
-  /*< public >*/
-  /* vtable */
-  GstClockTime          (*change_resolution)    (GstClock *clock,
-                                                 GstClockTime old_resolution,
-                                                 GstClockTime new_resolution);
-  GstClockTime          (*get_resolution)       (GstClock *clock);
-
-  GstClockTime          (*get_internal_time)    (GstClock *clock);
-
-  /* waiting on an ID */
-  GstClockReturn        (*wait)                 (GstClock *clock, GstClockEntry *entry,
-                                                 GstClockTimeDiff *jitter);
-  GstClockReturn        (*wait_async)           (GstClock *clock, GstClockEntry *entry);
-  void                  (*unschedule)           (GstClock *clock, GstClockEntry *entry);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_clock_get_type              (void);
-
-GstClockTime            gst_clock_set_resolution        (GstClock *clock,
-                                                         GstClockTime resolution);
-GstClockTime            gst_clock_get_resolution        (GstClock *clock);
-
-GstClockTime            gst_clock_get_time              (GstClock *clock);
-void                    gst_clock_set_calibration       (GstClock *clock, GstClockTime internal,
-                                                         GstClockTime external,
-                                                         GstClockTime rate_num,
-                                                         GstClockTime rate_denom);
-void                    gst_clock_get_calibration       (GstClock *clock, GstClockTime *internal,
-                                                         GstClockTime *external,
-                                                         GstClockTime *rate_num,
-                                                         GstClockTime *rate_denom);
-
-/* master/slave clocks */
-gboolean                gst_clock_set_master            (GstClock *clock, GstClock *master);
-GstClock*               gst_clock_get_master            (GstClock *clock);
-
-void                    gst_clock_set_timeout           (GstClock *clock,
-                                                         GstClockTime timeout);
-GstClockTime            gst_clock_get_timeout           (GstClock *clock);
-
-gboolean                gst_clock_add_observation       (GstClock *clock, GstClockTime slave,
-                                                         GstClockTime master, gdouble *r_squared);
-
-
-/* getting and adjusting internal/external time */
-GstClockTime            gst_clock_get_internal_time     (GstClock *clock);
-GstClockTime            gst_clock_adjust_unlocked       (GstClock *clock, GstClockTime internal);
-GstClockTime            gst_clock_unadjust_unlocked     (GstClock * clock, GstClockTime external);
-
-
-/* creating IDs that can be used to get notifications */
-GstClockID              gst_clock_new_single_shot_id    (GstClock *clock,
-                                                         GstClockTime time);
-GstClockID              gst_clock_new_periodic_id       (GstClock *clock,
-                                                         GstClockTime start_time,
-                                                         GstClockTime interval);
-
-/* reference counting */
-GstClockID              gst_clock_id_ref                (GstClockID id);
-void                    gst_clock_id_unref              (GstClockID id);
-
-/* operations on IDs */
-gint                    gst_clock_id_compare_func       (gconstpointer id1, gconstpointer id2);
-
-GstClockTime            gst_clock_id_get_time           (GstClockID id);
-GstClockReturn          gst_clock_id_wait               (GstClockID id,
-                                                         GstClockTimeDiff *jitter);
-GstClockReturn          gst_clock_id_wait_async         (GstClockID id,
-                                                         GstClockCallback func,
-                                                         gpointer user_data,
-                                                         GDestroyNotify destroy_data);
-void                    gst_clock_id_unschedule         (GstClockID id);
-
-gboolean                gst_clock_single_shot_id_reinit (GstClock * clock,
-                                                         GstClockID id,
-                                                         GstClockTime time);
-gboolean                gst_clock_periodic_id_reinit    (GstClock * clock,
-                                                         GstClockID id,
-                                                         GstClockTime start_time,
-                                                         GstClockTime interval);
-
-G_END_DECLS
-
-#endif /* __GST_CLOCK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcompat.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcompat.h
deleted file mode 100644
index cace2e1d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcompat.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2004 Wim Taymans <wim@fluendo.com>
- *
- * gstcompat.h: backwards compatibility stuff
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/**
- * SECTION:gstcompat
- * @short_description: Deprecated API entries
- *
- * Please do not use these in new code.
- * These symbols are only available by defining GST_DISABLE_DEPRECATED.
- * This can be done in CFLAGS for compiling old code.
- */
-
-/* API compatibility stuff */
-#ifndef __GSTCOMPAT_H__
-#define __GSTCOMPAT_H__
-
-G_BEGIN_DECLS
-
-/* added to ease the transition to 0.11 */
-#define gst_element_class_set_details_simple  gst_element_class_set_metadata
-
-#define gst_element_factory_get_longname(f)    gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_LONGNAME)
-#define gst_element_factory_get_klass(f)       gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_KLASS)
-#define gst_element_factory_get_description(f) gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_DESCRIPTION)
-#define gst_element_factory_get_author(f)      gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_AUTHOR)
-#define gst_element_factory_get_documentation_uri(f)  gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_DOC_URI)
-#define gst_element_factory_get_icon_name(f)   gst_element_factory_get_metadata(f, GST_ELEMENT_METADATA_ICON_NAME)
-
-#define gst_pad_get_caps_reffed(p)             gst_pad_get_caps(p)
-#define gst_pad_peer_get_caps_reffed(p)        gst_pad_peer_get_caps(p)
-
-#define gst_buffer_new_and_alloc(s)            gst_buffer_new_allocate(NULL, s, NULL)
-
-#define GST_BUFFER_TIMESTAMP          GST_BUFFER_PTS
-#define GST_BUFFER_TIMESTAMP_IS_VALID GST_BUFFER_PTS_IS_VALID
-
-#define gst_adapter_prev_timestamp    gst_adapter_prev_pts
-
-#define gst_tag_list_free(taglist)    gst_tag_list_unref(taglist)
-
-static inline gboolean
-gst_pad_set_caps (GstPad * pad, GstCaps * caps)
-{
-  GstEvent *event;
-  gboolean res = TRUE;
-
-  g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
-  g_return_val_if_fail (caps != NULL && gst_caps_is_fixed (caps), FALSE);
-
-  event = gst_event_new_caps (caps);
-
-  if (GST_PAD_IS_SRC (pad))
-    res = gst_pad_push_event (pad, event);
-  else
-    res = gst_pad_send_event (pad, event);
-
-  return res;
-}
-
-
-#ifndef GST_DISABLE_DEPRECATED
-
-#define GST_MESSAGE_DURATION GST_MESSAGE_DURATION_CHANGED
-#define gst_message_new_duration(src,fmt,dur) \
-    gst_message_new_duration_changed(src)
-#define gst_message_parse_duration(msg,fmt,dur) \
-G_STMT_START { \
-  GstFormat *p_fmt = fmt; \
-  gint64 *p_dur = dur; \
-  if (p_fmt) \
-    *p_fmt = GST_FORMAT_TIME; \
-  if (p_dur) \
-    *p_dur = GST_CLOCK_TIME_NONE; \
-} G_STMT_END
-
-#endif /* not GST_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GSTCOMPAT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstconfig.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstconfig.h
deleted file mode 100644
index b23beb3e..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstconfig.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2004,2005 Wim Taymans <wim@fluendo.com>
- *
- * gstconfig.h: GST_DISABLE_* macros for build configuration
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:gstconfig
- * @short_description: Build configuration options
- *
- * This describes the configuration options for GStreamer. When building
- * GStreamer there are a lot of parts (known internally as "subsystems" ) that
- * can be disabled for various reasons. The most common reasons are speed and
- * size, which is important because GStreamer is designed to run on embedded
- * systems.
- *
- * If a subsystem is disabled, most of this changes are done in an API
- * compatible way, so you don't need to adapt your code in most cases. It is
- * never done in an ABI compatible way though. So if you want to disable a
- * suybsystem, you have to rebuild all programs depending on GStreamer, too.
- *
- * If a subsystem is disabled in GStreamer, a value is defined in
- * &lt;gst/gst.h&gt;. You can check this if you do subsystem-specific stuff.
- * <example id="example-gstconfig">
- * <title>Doing subsystem specific things</title>
- * <programlisting>
- * &hash;ifndef GST_DISABLE_GST_DEBUG
- * // do stuff specific to the debugging subsystem
- * &hash;endif // GST_DISABLE_GST_DEBUG
- * </programlisting>
- * </example>
- */
-
-#ifndef __GST_CONFIG_H__
-#define __GST_CONFIG_H__
-
-/* trick gtk-doc into believing these symbols are defined (yes, it's ugly) */
-
-#if 0
-#define GST_DISABLE_GST_DEBUG 1
-#define GST_DISABLE_PARSE 1
-#define GST_DISABLE_TRACE 1
-#define GST_DISABLE_ALLOC_TRACE 1
-#define GST_DISABLE_REGISTRY 1
-#define GST_DISABLE_PLUGIN 1
-#define GST_HAVE_GLIB_2_8 1
-#endif
-
-/***** default padding of structures *****/
-#define GST_PADDING		4
-#define GST_PADDING_INIT	{ NULL }
-
-/***** padding for very extensible base classes *****/
-#define GST_PADDING_LARGE	20
-
-/***** disabling of subsystems *****/
-
-/**
- * GST_DISABLE_GST_DEBUG:
- *
- * Configures the inclusion of the debugging subsystem
- */
-/* #undef GST_DISABLE_GST_DEBUG */
-
-/**
- * GST_DISABLE_PARSE:
- *
- * Configures the inclusion of the gst-lauch parser
- */
-/* #undef GST_DISABLE_PARSE */
-
-/**
- * GST_DISABLE_TRACE:
- *
- * Configures the inclusion of a resource tracing facillity
- * (seems to be unused)
- */
-/* #undef GST_DISABLE_TRACE */
-
-/**
- * GST_DISABLE_ALLOC_TRACE:
- *
- * Configures the use of a memory tracer based on the resource tracer
- * if TRACE is disabled, ALLOC_TRACE is disabled as well
- */
-/* #undef GST_DISABLE_ALLOC_TRACE */
-
-/**
- * GST_DISABLE_REGISTRY:
- *
- * Configures the use of the plugin registry.
- * If one disables this, required plugins need to be loaded and registered
- * manually
- */
-/* #undef GST_DISABLE_REGISTRY */
-
-/* FIXME: test and document these! */
-/* Configures the use of external plugins */
-/* #undef GST_DISABLE_PLUGIN */
-
-/* printf extension format */
-/**
- * GST_PTR_FORMAT:
- *
- * printf format type used to debug GStreamer types.
- * This can only be used on types whose size is >= sizeof(gpointer).
- */
-#define GST_PTR_FORMAT "p"
-/**
- * GST_SEGMENT_FORMAT:
- *
- * printf format type used to debug GStreamer segments.
- * This can only be used on pointers to GstSegment structures.
- */
-#define GST_SEGMENT_FORMAT "p"
-
-/* whether or not GST_PTR_FORMAT or GST_SEGMENT_FORMAT are using
- * the printf extension mechanism. This is for internal use in our
- * header files so we know whether we can use G_GNUC_PRINTF or not */
-#undef GST_USING_PRINTF_EXTENSION
-
-/* GST_DISABLE_PRINTF_EXTENSION:
- *
- * Define this to debug your debug log messages and make gcc spew warnings
- * if printf format string and arguments don't match up (this is usually
- * not the case when libc and gcc are used because printf format warnings
- * have to be disabled when the printf extension mechanism is in use).
- *
- * Note that using this option disables 'pretty logging' of GStreamer objects
- * like caps, tags, structures, events, pads etc., so that only their address
- * will be printed in the log.
- *
- * This define only disables use of the special registered printf format
- * extensions in the code compiled with it defined. It does not stop
- * GStreamer from registering these extensions in the first place if it
- * was compiled against a libc that supports this.
- *
- * (not official API)
- */
-/* If GLib is not using the system printf, we can't use the registered
- * extensions because the GLib-internal printf won't know how to parse them */
-#if defined(GST_DISABLE_PRINTF_EXTENSION) || !defined(GLIB_USING_SYSTEM_PRINTF)
-  #undef GST_PTR_FORMAT
-  #define GST_PTR_FORMAT "p"
-  #undef GST_SEGMENT_FORMAT
-  #define GST_SEGMENT_FORMAT "p"
-  #undef GST_USING_PRINTF_EXTENSION
-#endif
-
-/* whether or not the CPU supports unaligned access */
-#define GST_HAVE_UNALIGNED_ACCESS 1
-
-/**
- * GST_EXPORT:
- *
- * Export the given variable from the built shared object.
- *
- * On Windows, this exports the variable from the DLL.
- * On other platforms, this gets defined to "extern".
- */
-/**
- * GST_PLUGIN_EXPORT:
- *
- * Export the plugin's definition.
- *
- * On Windows, this exports the plugin definition from the DLL.
- * On other platforms, this gets defined as a no-op.
- */
-#ifdef _MSC_VER
-#define GST_PLUGIN_EXPORT __declspec(dllexport) extern
-#ifdef GST_EXPORTS
-#define GST_EXPORT __declspec(dllexport) extern
-#else
-#define GST_EXPORT __declspec(dllimport) extern
-#endif
-#else /* not _MSC_VER */
-#define GST_PLUGIN_EXPORT
-#if (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#define GST_EXPORT extern __attribute__ ((visibility ("default")))
-#else
-#define GST_EXPORT extern
-#endif
-#endif
-
-#endif /* __GST_CONFIG_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcontrolbinding.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcontrolbinding.h
deleted file mode 100644
index a37be1d4..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcontrolbinding.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2011 Stefan Sauer <ensonic@users.sf.net>
- *
- * gstcontrolbinding.h: Attachment for control sources
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CONTROL_BINDING_H__
-#define __GST_CONTROL_BINDING_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-#include <gst/gstcontrolsource.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_CONTROL_BINDING \
-  (gst_control_binding_get_type())
-#define GST_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CONTROL_BINDING,GstControlBinding))
-#define GST_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CONTROL_BINDING,GstControlBindingClass))
-#define GST_IS_CONTROL_BINDING(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CONTROL_BINDING))
-#define GST_IS_CONTROL_BINDING_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CONTROL_BINDING))
-#define GST_CONTROL_BINDING_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_CONTOL_SOURCE, GstControlBindingClass))
-
-typedef struct _GstControlBinding GstControlBinding;
-typedef struct _GstControlBindingClass GstControlBindingClass;
-
-/**
- * GstControlBindingConvert:
- * @binding: the #GstControlBinding instance
- * @src_value: the value returned by the cotnrol source
- * @dest_value: the target GValue
- *
- * Function to map a control-value to the target GValue.
- */
-typedef void (* GstControlBindingConvert) (GstControlBinding *binding, gdouble src_value, GValue *dest_value);
-
-/**
- * GstControlBinding:
- * @name: name of the property of this binding
- * @pspec: #GParamSpec for this property
- *
- * The instance structure of #GstControlBinding.
- */
-struct _GstControlBinding {
-  GstObject parent;
-  
-  /*< public >*/
-  gchar *name;
-  GParamSpec *pspec;
-
-  /*< private >*/
-  GstObject *object;            /* GstObject owning the property
-                                 * (== parent when bound) */
-  gboolean disabled;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstControlBindingClass:
- * @parent_class: Parent class
- *
- * The class structure of #GstControlBinding.
- */
-
-struct _GstControlBindingClass
-{
-  GstObjectClass parent_class;
-
-  /* virtual methods */
-  gboolean (* sync_values) (GstControlBinding *binding, GstObject *object, GstClockTime timestamp, GstClockTime last_sync);
-  GValue * (* get_value) (GstControlBinding *binding, GstClockTime timestamp);
-  gboolean (* get_value_array) (GstControlBinding *binding, GstClockTime timestamp,GstClockTime interval, guint n_values, gpointer values);
-  gboolean (* get_g_value_array) (GstControlBinding *binding, GstClockTime timestamp,GstClockTime interval, guint n_values, GValue *values);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_CONTROL_BINDING_PSPEC(cb) (((GstControlBinding *) cb)->pspec)
-
-GType gst_control_binding_get_type (void);
-
-/* Functions */
-
-gboolean            gst_control_binding_sync_values        (GstControlBinding * binding, GstObject *object,
-                                                            GstClockTime timestamp, GstClockTime last_sync);
-GValue *            gst_control_binding_get_value          (GstControlBinding *binding,
-                                                            GstClockTime timestamp);
-gboolean            gst_control_binding_get_value_array    (GstControlBinding *binding, GstClockTime timestamp,
-                                                            GstClockTime interval, guint n_values, gpointer values);
-gboolean            gst_control_binding_get_g_value_array  (GstControlBinding *binding, GstClockTime timestamp,
-                                                            GstClockTime interval, guint n_values, GValue *values);
-
-void                gst_control_binding_set_disabled       (GstControlBinding * binding, gboolean disabled);
-gboolean            gst_control_binding_is_disabled        (GstControlBinding * binding);
-G_END_DECLS
-
-#endif /* __GST_CONTROL_BINDING_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcontrolsource.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcontrolsource.h
deleted file mode 100644
index e61c59a7..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstcontrolsource.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2007 Sebastian Dröge <slomo@circular-chaos.org>
- *
- * gstcontrolsource.h: Interface declaration for control sources
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_CONTROL_SOURCE_H__
-#define __GST_CONTROL_SOURCE_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-#include <gst/gstclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_CONTROL_SOURCE \
-  (gst_control_source_get_type())
-#define GST_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CONTROL_SOURCE,GstControlSource))
-#define GST_CONTROL_SOURCE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CONTROL_SOURCE,GstControlSourceClass))
-#define GST_IS_CONTROL_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CONTROL_SOURCE))
-#define GST_IS_CONTROL_SOURCE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CONTROL_SOURCE))
-#define GST_CONTROL_SOURCE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_CONTOL_SOURCE, GstControlSourceClass))
-
-typedef struct _GstControlSource GstControlSource;
-typedef struct _GstControlSourceClass GstControlSourceClass;
-typedef struct _GstTimedValue GstTimedValue;
-typedef struct _GstValueArray GstValueArray;
-
-/**
- * GstTimedValue:
- * @timestamp: timestamp of the value change
- * @value: the corresponding value
- *
- * Structure for saving a timestamp and a value.
- */
-struct _GstTimedValue
-{
-  GstClockTime timestamp;
-  gdouble      value;
-};
-
-/**
- * GstControlSourceGetValue:
- * @self: the #GstControlSource instance
- * @timestamp: timestamp for which a value should be calculated
- * @value: a #GValue which will be set to the result. It must be initialized to the correct type.
- *
- * Function for returning a value for a given timestamp.
- *
- * Returns: %TRUE if the value was successfully calculated.
- *
- */
-typedef gboolean (* GstControlSourceGetValue) (GstControlSource *self, 
-    GstClockTime timestamp, gdouble *value);
-
-/**
- * GstControlSourceGetValueArray:
- * @self: the #GstControlSource instance
- * @timestamp: timestamp for which a value should be calculated
- * @interval: the time spacing between subsequent values
- * @n_values: the number of values
- * @values: array to put control-values in
- *
- * Function for returning an array of values for starting at a given timestamp.
- *
- * Returns: %TRUE if the values were successfully calculated.
- *
- */
-typedef gboolean (* GstControlSourceGetValueArray) (GstControlSource *self, 
-    GstClockTime timestamp, GstClockTime interval, guint n_values, gdouble *values);
-
-/**
- * GstControlSource:
- * @get_value: Function for returning a value for a given timestamp
- * @get_value_array: Function for returning a #GstValueArray for a given timestamp
- *
- * The instance structure of #GstControlSource.
- */
-struct _GstControlSource {
-  GstObject parent;
-
-  /*< public >*/
-  GstControlSourceGetValue get_value;             /* Returns the value for a property at a given timestamp */
-  GstControlSourceGetValueArray get_value_array;  /* Returns values for a property in a given timespan */
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstControlSourceClass:
- * @parent_class: Parent class
- * @bind: Class method for binding the #GstControlSource to a specific GParamSpec
- *
- * The class structure of #GstControlSource.
- */
-
-struct _GstControlSourceClass
-{
-  GstObjectClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_control_source_get_type (void);
-
-/* Functions */
-gboolean       gst_control_source_get_value             (GstControlSource *self, GstClockTime timestamp,
-                                                         gdouble *value);
-gboolean       gst_control_source_get_value_array       (GstControlSource *self, GstClockTime timestamp,
-                                                         GstClockTime interval, guint n_values,
-                                                         gdouble *values);
-G_END_DECLS
-
-#endif /* __GST_CONTROL_SOURCE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstdatetime.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstdatetime.h
deleted file mode 100644
index 500b9cc2..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstdatetime.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GStreamer
- * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_DATE_TIME_H__
-#define __GST_DATE_TIME_H__
-
-#include <time.h>
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstDateTime:
- *
- * Opaque, immutable, refcounted struct that stores date, time and timezone
- * information. It currently supports ranges from 0001-01-01 to
- * 9999-12-31 in the Gregorian proleptic calendar.
- *
- * Use the acessor functions to get the stored values.
- */
-typedef struct _GstDateTime GstDateTime;
-
-/* query which fields are set */
-
-gboolean        gst_date_time_has_year                (const GstDateTime * datetime);
-gboolean        gst_date_time_has_month               (const GstDateTime * datetime);
-gboolean        gst_date_time_has_day                 (const GstDateTime * datetime);
-gboolean        gst_date_time_has_time                (const GstDateTime * datetime);
-gboolean        gst_date_time_has_second              (const GstDateTime * datetime);
-
-/* field getters */
-
-gint            gst_date_time_get_year                (const GstDateTime * datetime);
-gint            gst_date_time_get_month               (const GstDateTime * datetime);
-gint            gst_date_time_get_day                 (const GstDateTime * datetime);
-gint            gst_date_time_get_hour                (const GstDateTime * datetime);
-gint            gst_date_time_get_minute              (const GstDateTime * datetime);
-gint            gst_date_time_get_second              (const GstDateTime * datetime);
-gint            gst_date_time_get_microsecond         (const GstDateTime * datetime);
-gfloat          gst_date_time_get_time_zone_offset    (const GstDateTime * datetime);
-
-/* constructors */
-
-GstDateTime *   gst_date_time_new_from_unix_epoch_local_time (gint64 secs) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_from_unix_epoch_utc   (gint64 secs) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_local_time            (gint year,
-                                                         gint month,
-                                                         gint day,
-                                                         gint hour,
-                                                         gint minute,
-                                                         gdouble seconds) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_y                     (gint year) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_ym                    (gint year,
-                                                         gint month) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_ymd                   (gint year,
-                                                         gint month,
-                                                         gint day) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new                       (gfloat tzoffset,
-                                                         gint year, gint month,
-                                                         gint day, gint hour,
-                                                         gint minute,
-                                                         gdouble seconds) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_now_local_time (void) G_GNUC_MALLOC;
-
-GstDateTime *   gst_date_time_new_now_utc        (void) G_GNUC_MALLOC;
-
-
-gchar *         gst_date_time_to_iso8601_string  (GstDateTime * datetime) G_GNUC_MALLOC;
-GstDateTime *   gst_date_time_new_from_iso8601_string  (const gchar * string) G_GNUC_MALLOC;
-
-GDateTime *     gst_date_time_to_g_date_time       (GstDateTime * datetime);
-
-GstDateTime *   gst_date_time_new_from_g_date_time (GDateTime * dt);
-
-/* refcounting */
-
-GstDateTime *   gst_date_time_ref                (GstDateTime * datetime);
-
-void            gst_date_time_unref              (GstDateTime * datetime);
-
-G_END_DECLS
-
-#endif /* __GST_DATE_TIME_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstdebugutils.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstdebugutils.h
deleted file mode 100644
index 39decd85..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstdebugutils.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GStreamer
- * Copyright (C) 2007 Stefan Kost <ensonic@users.sf.net>
- *
- * gstdebugutils.h: debugging and analysis utillities
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSTDEBUGUTILS_H__
-#define __GSTDEBUGUTILS_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gst/gstconfig.h>
-#include <gst/gstbin.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstDebugGraphDetails:
- * @GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE: show caps-name on edges
- * @GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS: show caps-details on edges
- * @GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS: show modified parameters on elements
- * @GST_DEBUG_GRAPH_SHOW_STATES: show element states
- * @GST_DEBUG_GRAPH_SHOW_ALL: show all details
- *
- * Available details for pipeline graphs produced by GST_DEBUG_BIN_TO_DOT_FILE()
- * and GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS().
- */
-typedef enum {
-  GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE         = (1<<0),
-  GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS       = (1<<1),
-  GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS = (1<<2),
-  GST_DEBUG_GRAPH_SHOW_STATES             = (1<<3),
-  GST_DEBUG_GRAPH_SHOW_ALL                = ((1<<4)-1)
-} GstDebugGraphDetails;
-
-
-/********** pipeline graphs **********/
-
-void gst_debug_bin_to_dot_file (GstBin *bin, GstDebugGraphDetails details, const gchar *file_name);
-void gst_debug_bin_to_dot_file_with_ts (GstBin *bin, GstDebugGraphDetails details, const gchar *file_name);
-
-#ifndef GST_DISABLE_GST_DEBUG
-
-/**
- * GST_DEBUG_BIN_TO_DOT_FILE:
- * @bin: the top-level pipeline that should be analyzed
- * @details: details to show in the graph, e.g. #GST_DEBUG_GRAPH_SHOW_ALL or
- *    one or more other #GstDebugGraphDetails flags.
- * @file_name: output base filename (e.g. "myplayer")
- *
- * To aid debugging applications one can use this method to write out the whole
- * network of gstreamer elements that form the pipeline into an dot file.
- * This file can be processed with graphviz to get an image.
- * <informalexample><programlisting>
- *  dot -Tpng -oimage.png graph_lowlevel.dot
- * </programlisting></informalexample>
- *
- * The macro is only active if gstreamer is configured with
- * &quot;--gst-enable-gst-debug&quot; and the environment variable
- * GST_DEBUG_DUMP_DOT_DIR is set to a basepath (e.g. /tmp).
- */
-#define GST_DEBUG_BIN_TO_DOT_FILE(bin, details, file_name) gst_debug_bin_to_dot_file (bin, details, file_name)
-
-/**
- * GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS:
- * @bin: the top-level pipeline that should be analyzed
- * @details: details to show in the graph, e.g. #GST_DEBUG_GRAPH_SHOW_ALL or
- *    one or more other #GstDebugGraphDetails flags.
- * @file_name: output base filename (e.g. "myplayer")
- *
- * This works like GST_DEBUG_BIN_TO_DOT_FILE(), but adds the current timestamp
- * to the filename, so that it can be used to take multiple snapshots.
- */
-#define GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS(bin, details, file_name) gst_debug_bin_to_dot_file_with_ts (bin, details, file_name)
-
-
-#else /* GST_DISABLE_GST_DEBUG */
-
-
-#define GST_DEBUG_BIN_TO_DOT_FILE(bin, details, file_name)
-#define GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS(bin, details, file_name)
-
-#endif /* GST_DISABLE_GST_DEBUG */
-
-G_END_DECLS
-
-#endif /* __GSTDEBUGUTILS_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelement.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelement.h
deleted file mode 100644
index df71720c..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelement.h
+++ /dev/null
@@ -1,801 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2000,2004 Wim Taymans <wim@fluendo.com>
- *
- * gstelement.h: Header for GstElement
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_ELEMENT_H__
-#define __GST_ELEMENT_H__
-
-/* gstelement.h and gstelementfactory.h include eachother */
-typedef struct _GstElement GstElement;
-typedef struct _GstElementClass GstElementClass;
-
-/* gstmessage.h needs State */
-/**
- * GstState:
- * @GST_STATE_VOID_PENDING: no pending state.
- * @GST_STATE_NULL        : the NULL state or initial state of an element.
- * @GST_STATE_READY       : the element is ready to go to PAUSED.
- * @GST_STATE_PAUSED      : the element is PAUSED, it is ready to accept and
- *                          process data. Sink elements however only accept one
- *                          buffer and then block.
- * @GST_STATE_PLAYING     : the element is PLAYING, the #GstClock is running and
- *                          the data is flowing.
- *
- * The possible states an element can be in. States can be changed using
- * gst_element_set_state() and checked using gst_element_get_state().
- */
-typedef enum {
-  GST_STATE_VOID_PENDING        = 0,
-  GST_STATE_NULL                = 1,
-  GST_STATE_READY               = 2,
-  GST_STATE_PAUSED              = 3,
-  GST_STATE_PLAYING             = 4
-} GstState;
-
-
-#include <gst/gstconfig.h>
-#include <gst/gstobject.h>
-#include <gst/gstpad.h>
-#include <gst/gstbus.h>
-#include <gst/gstclock.h>
-#include <gst/gstelementfactory.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-#include <gst/gstiterator.h>
-#include <gst/gstmessage.h>
-#include <gst/gstquery.h>
-#include <gst/gsttaglist.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ELEMENT                (gst_element_get_type ())
-#define GST_IS_ELEMENT(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_ELEMENT))
-#define GST_IS_ELEMENT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_ELEMENT))
-#define GST_ELEMENT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ELEMENT, GstElementClass))
-#define GST_ELEMENT(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_ELEMENT, GstElement))
-#define GST_ELEMENT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_ELEMENT, GstElementClass))
-#define GST_ELEMENT_CAST(obj)           ((GstElement*)(obj))
-
-/**
- * GstStateChangeReturn:
- * @GST_STATE_CHANGE_FAILURE   : the state change failed
- * @GST_STATE_CHANGE_SUCCESS   : the state change succeeded
- * @GST_STATE_CHANGE_ASYNC     : the state change will happen asynchronously
- * @GST_STATE_CHANGE_NO_PREROLL: the state change succeeded but the element
- *                               cannot produce data in %GST_STATE_PAUSED.
- *                               This typically happens with live sources.
- *
- * The possible return values from a state change function such as 
- * gst_element_set_state(). Only @GST_STATE_CHANGE_FAILURE is a real failure.
- */
-typedef enum {
-  GST_STATE_CHANGE_FAILURE             = 0,
-  GST_STATE_CHANGE_SUCCESS             = 1,
-  GST_STATE_CHANGE_ASYNC               = 2,
-  GST_STATE_CHANGE_NO_PREROLL          = 3
-} GstStateChangeReturn;
-
-/* NOTE: this probably should be done with an #ifdef to decide
- * whether to safe-cast or to just do the non-checking cast.
- */
-
-/**
- * GST_STATE:
- * @elem: a #GstElement to return state for.
- *
- * This macro returns the current #GstState of the element.
- */
-#define GST_STATE(elem)                 (GST_ELEMENT_CAST(elem)->current_state)
-
-/**
- * GST_STATE_NEXT:
- * @elem: a #GstElement to return the next state for.
- *
- * This macro returns the next #GstState of the element.
- */
-#define GST_STATE_NEXT(elem)            (GST_ELEMENT_CAST(elem)->next_state)
-
-/**
- * GST_STATE_PENDING:
- * @elem: a #GstElement to return the pending state for.
- *
- * This macro returns the currently pending #GstState of the element.
- */
-#define GST_STATE_PENDING(elem)         (GST_ELEMENT_CAST(elem)->pending_state)
-
-/**
- * GST_STATE_TARGET:
- * @elem: a #GstElement to return the target state for.
- *
- * This macro returns the target #GstState of the element.
- */
-#define GST_STATE_TARGET(elem)          (GST_ELEMENT_CAST(elem)->target_state)
-
-/**
- * GST_STATE_RETURN:
- * @elem: a #GstElement to return the last state result for.
- *
- * This macro returns the last #GstStateChangeReturn value.
- */
-#define GST_STATE_RETURN(elem)          (GST_ELEMENT_CAST(elem)->last_return)
-
-#define __GST_SIGN(val)                 ((val) < 0 ? -1 : ((val) > 0 ? 1 : 0))
-/**
- * GST_STATE_GET_NEXT:
- * @cur: A starting #GstState
- * @pending: A target #GstState
- *
- * Given a current state @cur and a target state @pending, calculate the next (intermediate)
- * #GstState.
- */
-#define GST_STATE_GET_NEXT(cur,pending)         ((GstState)((cur) + __GST_SIGN ((gint)(pending) - (gint)(cur))))
-/**
- * GST_STATE_TRANSITION:
- * @cur: A current state
- * @next: A next state
- *
- * Given a current state @cur and a next state @next, calculate the associated
- * #GstStateChange transition.
- */
-#define GST_STATE_TRANSITION(cur,next)          ((GstStateChange)(((cur)<<3)|(next)))
-/**
- * GST_STATE_TRANSITION_CURRENT:
- * @trans: A #GstStateChange
- *
- * Given a state transition @trans, extract the current #GstState.
- */
-#define GST_STATE_TRANSITION_CURRENT(trans)     ((GstState)((trans)>>3))
-/**
- * GST_STATE_TRANSITION_NEXT:
- * @trans: A #GstStateChange
- *
- * Given a state transition @trans, extract the next #GstState.
- */
-#define GST_STATE_TRANSITION_NEXT(trans)        ((GstState)((trans)&0x7))
-
-/**
- * GstStateChange:
- * @GST_STATE_CHANGE_NULL_TO_READY    : state change from NULL to READY.
- * <itemizedlist>
- *   <listitem><para>
- *     The element must check if the resources it needs are available. Device
- *     sinks and -sources typically try to probe the device to constrain their
- *     caps.
- *   </para></listitem>
- *   <listitem><para>
- *     The element opens the device (in case feature need to be probed).
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_READY_TO_PAUSED  : state change from READY to PAUSED.
- * <itemizedlist>
- *   <listitem><para>
- *     The element pads are activated in order to receive data in PAUSED.
- *     Streaming threads are started.
- *   </para></listitem>
- *   <listitem><para>
- *     Some elements might need to return %GST_STATE_CHANGE_ASYNC and complete
- *     the state change when they have enough information. It is a requirement
- *     for sinks to return %GST_STATE_CHANGE_ASYNC and complete the state change
- *     when they receive the first buffer or %GST_EVENT_EOS (preroll).
- *     Sinks also block the dataflow when in PAUSED.
- *   </para></listitem>
- *   <listitem><para>
- *     A pipeline resets the running_time to 0.
- *   </para></listitem>
- *   <listitem><para>
- *     Live sources return %GST_STATE_CHANGE_NO_PREROLL and don't generate data.
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_PAUSED_TO_PLAYING: state change from PAUSED to PLAYING.
- * <itemizedlist>
- *   <listitem><para>
- *     Most elements ignore this state change.
- *   </para></listitem>
- *   <listitem><para>
- *     The pipeline selects a #GstClock and distributes this to all the children
- *     before setting them to PLAYING. This means that it is only alowed to
- *     synchronize on the #GstClock in the PLAYING state.
- *   </para></listitem>
- *   <listitem><para>
- *     The pipeline uses the #GstClock and the running_time to calculate the
- *     base_time. The base_time is distributed to all children when performing
- *     the state change.
- *   </para></listitem>
- *   <listitem><para>
- *     Sink elements stop blocking on the preroll buffer or event and start
- *     rendering the data.
- *   </para></listitem>
- *   <listitem><para>
- *     Sinks can post %GST_MESSAGE_EOS in the PLAYING state. It is not allowed
- *     to post %GST_MESSAGE_EOS when not in the PLAYING state.
- *   </para></listitem>
- *   <listitem><para>
- *     While streaming in PAUSED or PLAYING elements can create and remove
- *     sometimes pads.
- *   </para></listitem>
- *   <listitem><para>
- *     Live sources start generating data and return %GST_STATE_CHANGE_SUCCESS.
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_PLAYING_TO_PAUSED: state change from PLAYING to PAUSED.
- * <itemizedlist>
- *   <listitem><para>
- *     Most elements ignore this state change.
- *   </para></listitem>
- *   <listitem><para>
- *     The pipeline calculates the running_time based on the last selected
- *     #GstClock and the base_time. It stores this information to continue
- *     playback when going back to the PLAYING state.
- *   </para></listitem>
- *   <listitem><para>
- *     Sinks unblock any #GstClock wait calls.
- *   </para></listitem>
- *   <listitem><para>
- *     When a sink does not have a pending buffer to play, it returns
- *     %GST_STATE_CHANGE_ASYNC from this state change and completes the state
- *     change when it receives a new buffer or an %GST_EVENT_EOS.
- *   </para></listitem>
- *   <listitem><para>
- *     Any queued %GST_MESSAGE_EOS items are removed since they will be reposted
- *     when going back to the PLAYING state. The EOS messages are queued in
- *     #GstBin containers.
- *   </para></listitem>
- *   <listitem><para>
- *     Live sources stop generating data and return %GST_STATE_CHANGE_NO_PREROLL.
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_PAUSED_TO_READY  : state change from PAUSED to READY.
- * <itemizedlist>
- *   <listitem><para>
- *     Sinks unblock any waits in the preroll.
- *   </para></listitem>
- *   <listitem><para>
- *     Elements unblock any waits on devices
- *   </para></listitem>
- *   <listitem><para>
- *     Chain or get_range functions return %GST_FLOW_FLUSHING.
- *   </para></listitem>
- *   <listitem><para>
- *     The element pads are deactivated so that streaming becomes impossible and
- *     all streaming threads are stopped.
- *   </para></listitem>
- *   <listitem><para>
- *     The sink forgets all negotiated formats
- *   </para></listitem>
- *   <listitem><para>
- *     Elements remove all sometimes pads
- *   </para></listitem>
- * </itemizedlist>
- * @GST_STATE_CHANGE_READY_TO_NULL    : state change from READY to NULL.
- * <itemizedlist>
- *   <listitem><para>
- *     Elements close devices
- *   </para></listitem>
- *   <listitem><para>
- *     Elements reset any internal state.
- *   </para></listitem>
- * </itemizedlist>
- *
- * These are the different state changes an element goes through.
- * %GST_STATE_NULL &rArr; %GST_STATE_PLAYING is called an upwards state change
- * and %GST_STATE_PLAYING &rArr; %GST_STATE_NULL a downwards state change.
- */
-typedef enum /*< flags=0 >*/
-{
-  GST_STATE_CHANGE_NULL_TO_READY        = (GST_STATE_NULL<<3) | GST_STATE_READY,
-  GST_STATE_CHANGE_READY_TO_PAUSED      = (GST_STATE_READY<<3) | GST_STATE_PAUSED,
-  GST_STATE_CHANGE_PAUSED_TO_PLAYING    = (GST_STATE_PAUSED<<3) | GST_STATE_PLAYING,
-  GST_STATE_CHANGE_PLAYING_TO_PAUSED    = (GST_STATE_PLAYING<<3) | GST_STATE_PAUSED,
-  GST_STATE_CHANGE_PAUSED_TO_READY      = (GST_STATE_PAUSED<<3) | GST_STATE_READY,
-  GST_STATE_CHANGE_READY_TO_NULL        = (GST_STATE_READY<<3) | GST_STATE_NULL
-} GstStateChange;
-
-/**
- * GstElementFlags:
- * @GST_ELEMENT_FLAG_LOCKED_STATE: ignore state changes from parent
- * @GST_ELEMENT_FLAG_SINK: the element is a sink
- * @GST_ELEMENT_FLAG_SOURCE: the element is a source.
- * @GST_ELEMENT_FLAG_PROVIDE_CLOCK: the element can provide a clock
- * @GST_ELEMENT_FLAG_REQUIRE_CLOCK: the element requires a clock
- * @GST_ELEMENT_FLAG_INDEXABLE: the element can use an index
- * @GST_ELEMENT_FLAG_LAST: offset to define more flags
- *
- * The standard flags that an element may have.
- */
-typedef enum
-{
-  GST_ELEMENT_FLAG_LOCKED_STATE   = (GST_OBJECT_FLAG_LAST << 0),
-  GST_ELEMENT_FLAG_SINK           = (GST_OBJECT_FLAG_LAST << 1),
-  GST_ELEMENT_FLAG_SOURCE         = (GST_OBJECT_FLAG_LAST << 2),
-  GST_ELEMENT_FLAG_PROVIDE_CLOCK  = (GST_OBJECT_FLAG_LAST << 3),
-  GST_ELEMENT_FLAG_REQUIRE_CLOCK  = (GST_OBJECT_FLAG_LAST << 4),
-  GST_ELEMENT_FLAG_INDEXABLE      = (GST_OBJECT_FLAG_LAST << 5),
-  /* padding */
-  GST_ELEMENT_FLAG_LAST           = (GST_OBJECT_FLAG_LAST << 10)
-} GstElementFlags;
-
-/**
- * GST_ELEMENT_IS_LOCKED_STATE:
- * @elem: A #GstElement to query
- *
- * Check if the element is in the locked state and therefore will ignore state
- * changes from its parent object.
- */
-#define GST_ELEMENT_IS_LOCKED_STATE(elem)        (GST_OBJECT_FLAG_IS_SET(elem,GST_ELEMENT_FLAG_LOCKED_STATE))
-
-/**
- * GST_ELEMENT_NAME:
- * @elem: A #GstElement to query
- *
- * Gets the name of this element. Use only in core as this is not
- * ABI-compatible. Others use gst_element_get_name()
- */
-#define GST_ELEMENT_NAME(elem)                  (GST_OBJECT_NAME(elem))
-
-/**
- * GST_ELEMENT_PARENT:
- * @elem: A #GstElement to query
- *
- * Get the parent object of this element.
- */
-#define GST_ELEMENT_PARENT(elem)                (GST_ELEMENT_CAST(GST_OBJECT_PARENT(elem)))
-
-/**
- * GST_ELEMENT_BUS:
- * @elem: A #GstElement to query
- *
- * Get the message bus of this element.
- */
-#define GST_ELEMENT_BUS(elem)                   (GST_ELEMENT_CAST(elem)->bus)
-
-/**
- * GST_ELEMENT_CLOCK:
- * @elem: A #GstElement to query
- *
- * Get the clock of this element
- */
-#define GST_ELEMENT_CLOCK(elem)                 (GST_ELEMENT_CAST(elem)->clock)
-
-/**
- * GST_ELEMENT_PADS:
- * @elem: A #GstElement to query
- *
- * Get the pads of this elements.
- */
-#define GST_ELEMENT_PADS(elem)                  (GST_ELEMENT_CAST(elem)->pads)
-
-/**
- * GST_ELEMENT_START_TIME:
- * @elem: a #GstElement to return the start time for.
- *
- * This macro returns the start_time of the @elem. The start_time is the
- * running_time of the pipeline when the element went to PAUSED.
- */
-#define GST_ELEMENT_START_TIME(elem)            (GST_ELEMENT_CAST(elem)->start_time)
-
-/**
- * GST_ELEMENT_ERROR:
- * @el:     the element that generates the error
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
-            parentheses)
- * @debug:  debugging information for the message (format string and args
-            enclosed in parentheses)
- *
- * Utility function that elements can use in case they encountered a fatal
- * data processing error. The pipeline will post an error message and the
- * application will be requested to stop further media processing.
- */
-#define GST_ELEMENT_ERROR(el, domain, code, text, debug)                \
-G_STMT_START {                                                          \
-  gchar *__txt = _gst_element_error_printf text;                        \
-  gchar *__dbg = _gst_element_error_printf debug;                       \
-  if (__txt)                                                            \
-    GST_WARNING_OBJECT (el, "error: %s", __txt);                        \
-  if (__dbg)                                                            \
-    GST_WARNING_OBJECT (el, "error: %s", __dbg);                        \
-  gst_element_message_full (GST_ELEMENT(el), GST_MESSAGE_ERROR,         \
-    GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code,        \
-    __txt, __dbg, __FILE__, GST_FUNCTION, __LINE__);                    \
-} G_STMT_END
-
-/**
- * GST_ELEMENT_WARNING:
- * @el:     the element that generates the warning
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
-            parentheses)
- * @debug:  debugging information for the message (format string and args
-            enclosed in parentheses)
- *
- * Utility function that elements can use in case they encountered a non-fatal
- * data processing problem. The pipeline will post a warning message and the
- * application will be informed.
- */
-#define GST_ELEMENT_WARNING(el, domain, code, text, debug)              \
-G_STMT_START {                                                          \
-  gchar *__txt = _gst_element_error_printf text;                        \
-  gchar *__dbg = _gst_element_error_printf debug;                       \
-  if (__txt)                                                            \
-    GST_WARNING_OBJECT (el, "warning: %s", __txt);                      \
-  if (__dbg)                                                            \
-    GST_WARNING_OBJECT (el, "warning: %s", __dbg);                      \
-  gst_element_message_full (GST_ELEMENT(el), GST_MESSAGE_WARNING,       \
-    GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code,        \
-  __txt, __dbg, __FILE__, GST_FUNCTION, __LINE__);                      \
-} G_STMT_END
-
-/**
- * GST_ELEMENT_INFO:
- * @el:     the element that generates the information
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
-            parentheses)
- * @debug:  debugging information for the message (format string and args
-            enclosed in parentheses)
- *
- * Utility function that elements can use in case they want to inform
- * the application of something noteworthy that is not an error.
- * The pipeline will post a info message and the
- * application will be informed.
- */
-#define GST_ELEMENT_INFO(el, domain, code, text, debug)                 \
-G_STMT_START {                                                          \
-  gchar *__txt = _gst_element_error_printf text;                        \
-  gchar *__dbg = _gst_element_error_printf debug;                       \
-  if (__txt)                                                            \
-    GST_INFO_OBJECT (el, "info: %s", __txt);                            \
-  if (__dbg)                                                            \
-    GST_INFO_OBJECT (el, "info: %s", __dbg);                            \
-  gst_element_message_full (GST_ELEMENT(el), GST_MESSAGE_INFO,          \
-    GST_ ## domain ## _ERROR, GST_ ## domain ## _ERROR_ ## code,        \
-  __txt, __dbg, __FILE__, GST_FUNCTION, __LINE__);                      \
-} G_STMT_END
-
-/* the state change mutexes and conds */
-/**
- * GST_STATE_GET_LOCK:
- * @elem:   a #GstElement
- *
- * Get a reference to the state lock of @elem.
- * This lock is used by the core.  It is taken while getting or setting
- * the state, during state changes, and while finalizing.
- */
-#define GST_STATE_GET_LOCK(elem)               (&(GST_ELEMENT_CAST(elem)->state_lock))
-/**
- * GST_STATE_GET_COND:
- * @elem: a #GstElement
- *
- * Get the conditional used to signal the completion of a state change.
- */
-#define GST_STATE_GET_COND(elem)               (&GST_ELEMENT_CAST(elem)->state_cond)
-
-#define GST_STATE_LOCK(elem)                   g_rec_mutex_lock(GST_STATE_GET_LOCK(elem))
-#define GST_STATE_TRYLOCK(elem)                g_rec_mutex_trylock(GST_STATE_GET_LOCK(elem))
-#define GST_STATE_UNLOCK(elem)                 g_rec_mutex_unlock(GST_STATE_GET_LOCK(elem))
-#define GST_STATE_UNLOCK_FULL(elem)            g_rec_mutex_unlock_full(GST_STATE_GET_LOCK(elem))
-#define GST_STATE_LOCK_FULL(elem,t)            g_rec_mutex_lock_full(GST_STATE_GET_LOCK(elem), t)
-#define GST_STATE_WAIT(elem)                   g_cond_wait (GST_STATE_GET_COND (elem), \
-                                                        GST_OBJECT_GET_LOCK (elem))
-#define GST_STATE_WAIT_UNTIL(elem, end_time)   g_cond_wait_until (GST_STATE_GET_COND (elem), \
-                                                        GST_OBJECT_GET_LOCK (elem), end_time)
-#define GST_STATE_SIGNAL(elem)                 g_cond_signal (GST_STATE_GET_COND (elem));
-#define GST_STATE_BROADCAST(elem)              g_cond_broadcast (GST_STATE_GET_COND (elem));
-
-/**
- * GstElement:
- * @state_lock: Used to serialize execution of gst_element_set_state()
- * @state_cond: Used to signal completion of a state change
- * @state_cookie: Used to detect concurrent execution of
- * gst_element_set_state() and gst_element_get_state()
- * @target_state: the target state of an element as set by the application
- * @current_state: the current state of an element
- * @next_state: the next state of an element, can be #GST_STATE_VOID_PENDING if
- * the element is in the correct state.
- * @pending_state: the final state the element should go to, can be
- * #GST_STATE_VOID_PENDING if the element is in the correct state
- * @last_return: the last return value of an element state change
- * @bus: the bus of the element. This bus is provided to the element by the
- * parent element or the application. A #GstPipeline has a bus of its own.
- * @clock: the clock of the element. This clock is usually provided to the
- * element by the toplevel #GstPipeline.
- * @base_time: the time of the clock right before the element is set to
- * PLAYING. Subtracting @base_time from the current clock time in the PLAYING
- * state will yield the running_time against the clock.
- * @start_time: the running_time of the last PAUSED state
- * @numpads: number of pads of the element, includes both source and sink pads.
- * @pads: (element-type Gst.Pad): list of pads
- * @numsrcpads: number of source pads of the element.
- * @srcpads: (element-type Gst.Pad): list of source pads
- * @numsinkpads: number of sink pads of the element.
- * @sinkpads: (element-type Gst.Pad): list of sink pads
- * @pads_cookie: updated whenever the a pad is added or removed
- *
- * GStreamer element abstract base class.
- */
-struct _GstElement
-{
-  GstObject             object;
-
-  /*< public >*/ /* with LOCK */
-  GRecMutex             state_lock;
-
-  /* element state */
-  GCond                 state_cond;
-  guint32               state_cookie;
-  GstState              target_state;
-  GstState              current_state;
-  GstState              next_state;
-  GstState              pending_state;
-  GstStateChangeReturn  last_return;
-
-  GstBus               *bus;
-
-  /* allocated clock */
-  GstClock             *clock;
-  GstClockTimeDiff      base_time; /* NULL/READY: 0 - PAUSED: current time - PLAYING: difference to clock */
-  GstClockTime          start_time;
-
-  /* element pads, these lists can only be iterated while holding
-   * the LOCK or checking the cookie after each LOCK. */
-  guint16               numpads;
-  GList                *pads;
-  guint16               numsrcpads;
-  GList                *srcpads;
-  guint16               numsinkpads;
-  GList                *sinkpads;
-  guint32               pads_cookie;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstElementClass:
- * @parent_class: the parent class structure
- * @metadata: metadata for elements of this class
- * @elementfactory: the #GstElementFactory that creates these elements
- * @padtemplates: a #GList of #GstPadTemplate
- * @numpadtemplates: the number of padtemplates
- * @pad_templ_cookie: changed whenever the padtemplates change
- * @request_new_pad: called when a new pad is requested
- * @release_pad: called when a request pad is to be released
- * @get_state: get the state of the element
- * @set_state: set a new state on the element
- * @change_state: called by @set_state to perform an incremental state change
- * @set_bus: set a #GstBus on the element
- * @provide_clock: gets the #GstClock provided by the element
- * @set_clock: set the #GstClock on the element
- * @send_event: send a #GstEvent to the element
- * @query: perform a #GstQuery on the element
- * @state_changed: called immediately after a new state was set.
- * @post_message: called when a message is posted on the element. Chain up to
- *                the parent class' handler to have it posted on the bus.
- *
- * GStreamer element class. Override the vmethods to implement the element
- * functionality.
- */
-struct _GstElementClass
-{
-  GstObjectClass         parent_class;
-
-  /*< public >*/
-  /* the element metadata */
-  gpointer		 metadata;
-
-  /* factory that the element was created from */
-  GstElementFactory     *elementfactory;
-
-  /* templates for our pads */
-  GList                 *padtemplates;
-  gint                   numpadtemplates;
-  guint32                pad_templ_cookie;
-
-  /*< private >*/
-  /* signal callbacks */
-  void (*pad_added)     (GstElement *element, GstPad *pad);
-  void (*pad_removed)   (GstElement *element, GstPad *pad);
-  void (*no_more_pads)  (GstElement *element);
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  /* request/release pads */
-  GstPad*               (*request_new_pad)      (GstElement *element, GstPadTemplate *templ,
-                                                 const gchar* name, const GstCaps *caps);
-  void                  (*release_pad)          (GstElement *element, GstPad *pad);
-
-  /* state changes */
-  GstStateChangeReturn (*get_state)             (GstElement * element, GstState * state,
-                                                 GstState * pending, GstClockTime timeout);
-  GstStateChangeReturn (*set_state)             (GstElement *element, GstState state);
-  GstStateChangeReturn (*change_state)          (GstElement *element, GstStateChange transition);
-  void                 (*state_changed)         (GstElement *element, GstState oldstate,
-                                                 GstState newstate, GstState pending);
-
-  /* bus */
-  void                  (*set_bus)              (GstElement * element, GstBus * bus);
-
-  /* set/get clocks */
-  GstClock*             (*provide_clock)        (GstElement *element);
-  gboolean              (*set_clock)            (GstElement *element, GstClock *clock);
-
-  /* query functions */
-  gboolean              (*send_event)           (GstElement *element, GstEvent *event);
-
-  gboolean              (*query)                (GstElement *element, GstQuery *query);
-
-  gboolean              (*post_message)         (GstElement *element, GstMessage *message);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING_LARGE-1];
-};
-
-/* element class pad templates */
-void                    gst_element_class_add_pad_template      (GstElementClass *klass, GstPadTemplate *templ);
-GstPadTemplate*         gst_element_class_get_pad_template      (GstElementClass *element_class, const gchar *name);
-GList*                  gst_element_class_get_pad_template_list (GstElementClass *element_class);
-
-/* element class meta data */
-void                    gst_element_class_set_metadata          (GstElementClass *klass,
-                                                                 const gchar     *longname,
-                                                                 const gchar     *classification,
-                                                                 const gchar     *description,
-                                                                 const gchar     *author);
-void                    gst_element_class_set_static_metadata   (GstElementClass *klass,
-                                                                 const gchar     *longname,
-                                                                 const gchar     *classification,
-                                                                 const gchar     *description,
-                                                                 const gchar     *author);
-void                    gst_element_class_add_metadata          (GstElementClass * klass,
-                                                                 const gchar * key, const gchar * value);
-void                    gst_element_class_add_static_metadata   (GstElementClass * klass,
-                                                                 const gchar * key, const gchar * value);
-const gchar *           gst_element_class_get_metadata          (GstElementClass * klass,
-                                                                 const gchar * key);
-
-
-/* element instance */
-GType                   gst_element_get_type            (void);
-
-/* basic name and parentage stuff from GstObject */
-
-/**
- * gst_element_get_name:
- * @elem: a #GstElement to get the name of @elem.
- *
- * Returns a copy of the name of @elem.
- * Caller should g_free() the return value after usage.
- * For a nameless element, this returns NULL, which you can safely g_free()
- * as well.
- *
- * Returns: (transfer full): the name of @elem. g_free() after usage. MT safe.
- *
- */
-#define                 gst_element_get_name(elem)      gst_object_get_name(GST_OBJECT_CAST(elem))
-
-/**
- * gst_element_set_name:
- * @elem: a #GstElement to set the name of.
- * @name: the new name
- *
- * Sets the name of the element, getting rid of the old name if there was one.
- */
-#define                 gst_element_set_name(elem,name) gst_object_set_name(GST_OBJECT_CAST(elem),name)
-
-/**
- * gst_element_get_parent:
- * @elem: a #GstElement to get the parent of.
- *
- * Get the parent of an element.
- *
- * Returns: (transfer full): the parent of an element.
- */
-#define                 gst_element_get_parent(elem)    gst_object_get_parent(GST_OBJECT_CAST(elem))
-
-/**
- * gst_element_set_parent:
- * @elem: a #GstElement to set the parent of.
- * @parent: the new parent #GstObject of the element.
- *
- * Sets the parent of an element.
- */
-#define                 gst_element_set_parent(elem,parent)     gst_object_set_parent(GST_OBJECT_CAST(elem),parent)
-
-/* clocking */
-GstClock*               gst_element_provide_clock       (GstElement *element);
-GstClock*               gst_element_get_clock           (GstElement *element);
-gboolean                gst_element_set_clock           (GstElement *element, GstClock *clock);
-void                    gst_element_set_base_time       (GstElement *element, GstClockTime time);
-GstClockTime            gst_element_get_base_time       (GstElement *element);
-void                    gst_element_set_start_time      (GstElement *element, GstClockTime time);
-GstClockTime            gst_element_get_start_time      (GstElement *element);
-
-/* bus */
-void                    gst_element_set_bus             (GstElement * element, GstBus * bus);
-GstBus *                gst_element_get_bus             (GstElement * element);
-
-/* pad management */
-gboolean                gst_element_add_pad             (GstElement *element, GstPad *pad);
-gboolean                gst_element_remove_pad          (GstElement *element, GstPad *pad);
-void                    gst_element_no_more_pads        (GstElement *element);
-
-GstPad*                 gst_element_get_static_pad      (GstElement *element, const gchar *name);
-GstPad*                 gst_element_get_request_pad     (GstElement *element, const gchar *name);
-GstPad*                 gst_element_request_pad         (GstElement *element, GstPadTemplate *templ,
-							 const gchar * name, const GstCaps *caps);
-void                    gst_element_release_request_pad (GstElement *element, GstPad *pad);
-
-GstIterator *           gst_element_iterate_pads        (GstElement * element);
-GstIterator *           gst_element_iterate_src_pads    (GstElement * element);
-GstIterator *           gst_element_iterate_sink_pads   (GstElement * element);
-
-/* event/query/format stuff */
-gboolean                gst_element_send_event          (GstElement *element, GstEvent *event);
-gboolean                gst_element_seek                (GstElement *element, gdouble rate,
-                                                         GstFormat format, GstSeekFlags flags,
-                                                         GstSeekType start_type, gint64 start,
-                                                         GstSeekType stop_type, gint64 stop);
-gboolean                gst_element_query               (GstElement *element, GstQuery *query);
-
-/* messages */
-gboolean                gst_element_post_message        (GstElement * element, GstMessage * message);
-
-/* error handling */
-/* gcc versions < 3.3 warn about NULL being passed as format to printf */
-#if (defined(GST_USING_PRINTF_EXTENSION) || !defined(__GNUC__) || (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 3))
-gchar *                 _gst_element_error_printf       (const gchar *format, ...);
-#else
-gchar *                 _gst_element_error_printf       (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
-#endif
-void                    gst_element_message_full        (GstElement * element, GstMessageType type,
-                                                         GQuark domain, gint code, gchar * text,
-                                                         gchar * debug, const gchar * file,
-                                                         const gchar * function, gint line);
-
-/* state management */
-gboolean                gst_element_is_locked_state     (GstElement *element);
-gboolean                gst_element_set_locked_state    (GstElement *element, gboolean locked_state);
-gboolean                gst_element_sync_state_with_parent (GstElement *element);
-
-GstStateChangeReturn    gst_element_get_state           (GstElement * element,
-                                                         GstState * state,
-                                                         GstState * pending,
-                                                         GstClockTime timeout);
-GstStateChangeReturn    gst_element_set_state           (GstElement *element, GstState state);
-
-void                    gst_element_abort_state         (GstElement * element);
-GstStateChangeReturn    gst_element_change_state        (GstElement * element,
-                                                         GstStateChange transition);
-GstStateChangeReturn    gst_element_continue_state      (GstElement * element,
-                                                         GstStateChangeReturn ret);
-void                    gst_element_lost_state          (GstElement * element);
-
-/* factory management */
-GstElementFactory*      gst_element_get_factory         (GstElement *element);
-
-G_END_DECLS
-
-#endif /* __GST_ELEMENT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelementfactory.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelementfactory.h
deleted file mode 100644
index 337cc4c2..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelementfactory.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2000,2004 Wim Taymans <wim@fluendo.com>
- *
- * gstelement.h: Header for GstElement
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_ELEMENT_FACTORY_H__
-#define __GST_ELEMENT_FACTORY_H__
-
-/**
- * GstElementFactory:
- *
- * The opaque #GstElementFactory data structure.
- */
-typedef struct _GstElementFactory GstElementFactory;
-typedef struct _GstElementFactoryClass GstElementFactoryClass;
-
-#include <gst/gstconfig.h>
-#include <gst/gstelement.h>
-#include <gst/gstpad.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-#include <gst/gsturi.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ELEMENT_FACTORY                (gst_element_factory_get_type())
-#define GST_ELEMENT_FACTORY(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ELEMENT_FACTORY,\
-                                                 GstElementFactory))
-#define GST_ELEMENT_FACTORY_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ELEMENT_FACTORY,\
-                                                 GstElementFactoryClass))
-#define GST_IS_ELEMENT_FACTORY(obj)             (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ELEMENT_FACTORY))
-#define GST_IS_ELEMENT_FACTORY_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ELEMENT_FACTORY))
-#define GST_ELEMENT_FACTORY_CAST(obj)           ((GstElementFactory *)(obj))
-
-GType                   gst_element_factory_get_type            (void);
-
-GstElementFactory *     gst_element_factory_find                (const gchar *name);
-
-GType                   gst_element_factory_get_element_type    (GstElementFactory *factory);
-
-const gchar *           gst_element_factory_get_metadata        (GstElementFactory *factory, const gchar *key);
-gchar **                gst_element_factory_get_metadata_keys   (GstElementFactory *factory);
-
-guint                   gst_element_factory_get_num_pad_templates (GstElementFactory *factory);
-const GList *           gst_element_factory_get_static_pad_templates (GstElementFactory *factory);
-
-GstURIType              gst_element_factory_get_uri_type        (GstElementFactory *factory);
-const gchar * const *   gst_element_factory_get_uri_protocols   (GstElementFactory *factory);
-
-gboolean                gst_element_factory_has_interface       (GstElementFactory *factory,
-                                                                 const gchar *interfacename);
-
-GstElement*             gst_element_factory_create              (GstElementFactory *factory,
-                                                                 const gchar *name) G_GNUC_MALLOC;
-GstElement*             gst_element_factory_make                (const gchar *factoryname, const gchar *name) G_GNUC_MALLOC;
-
-gboolean                gst_element_register                    (GstPlugin *plugin, const gchar *name,
-                                                                 guint rank, GType type);
-
-/* Factory list functions */
-
-/**
- * GstFactoryListType:
- * @GST_ELEMENT_FACTORY_TYPE_DECODER: Decoder elements
- * @GST_ELEMENT_FACTORY_TYPE_ENCODER: Encoder elements
- * @GST_ELEMENT_FACTORY_TYPE_SINK: Sink elements
- * @GST_ELEMENT_FACTORY_TYPE_SRC: Source elements
- * @GST_ELEMENT_FACTORY_TYPE_MUXER: Muxer elements
- * @GST_ELEMENT_FACTORY_TYPE_DEMUXER: Demuxer elements
- * @GST_ELEMENT_FACTORY_TYPE_PARSER: Parser elements
- * @GST_ELEMENT_FACTORY_TYPE_PAYLOADER: Payloader elements
- * @GST_ELEMENT_FACTORY_TYPE_DEPAYLOADER: Depayloader elements
- * @GST_ELEMENT_FACTORY_TYPE_MAX_ELEMENTS: Private, do not use
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO: Elements handling video media types
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO: Elements handling audio media types
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE: Elements handling image media types
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_SUBTITLE: Elements handling subtitle media types
- * @GST_ELEMENT_FACTORY_TYPE_MEDIA_METADATA: Elements handling metadata media types
- *
- * The type of #GstElementFactory to filter.
- *
- * All @GstFactoryListType up to @GST_ELEMENT_FACTORY_TYPE_MAX_ELEMENTS are exclusive.
- *
- * If one or more of the MEDIA types are specified, then only elements
- * matching the specified media types will be selected.
- */
-
-typedef guint64 GstElementFactoryListType;
-
-#define  GST_ELEMENT_FACTORY_TYPE_DECODER        (G_GUINT64_CONSTANT (1) << 0)
-#define  GST_ELEMENT_FACTORY_TYPE_ENCODER        (G_GUINT64_CONSTANT (1) << 1)
-#define  GST_ELEMENT_FACTORY_TYPE_SINK           (G_GUINT64_CONSTANT (1) << 2)
-#define  GST_ELEMENT_FACTORY_TYPE_SRC            (G_GUINT64_CONSTANT (1) << 3)
-#define  GST_ELEMENT_FACTORY_TYPE_MUXER          (G_GUINT64_CONSTANT (1) << 4)
-#define  GST_ELEMENT_FACTORY_TYPE_DEMUXER        (G_GUINT64_CONSTANT (1) << 5)
-#define  GST_ELEMENT_FACTORY_TYPE_PARSER         (G_GUINT64_CONSTANT (1) << 6)
-#define  GST_ELEMENT_FACTORY_TYPE_PAYLOADER      (G_GUINT64_CONSTANT (1) << 7)
-#define  GST_ELEMENT_FACTORY_TYPE_DEPAYLOADER    (G_GUINT64_CONSTANT (1) << 8)
-#define  GST_ELEMENT_FACTORY_TYPE_FORMATTER      (G_GUINT64_CONSTANT (1) << 9)
-
-#define  GST_ELEMENT_FACTORY_TYPE_MAX_ELEMENTS   (G_GUINT64_CONSTANT (1) << 48)
-
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO    (G_GUINT64_CONSTANT (1) << 49)
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO    (G_GUINT64_CONSTANT (1) << 50)
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE    (G_GUINT64_CONSTANT (1) << 51)
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_SUBTITLE (G_GUINT64_CONSTANT (1) << 52)
-#define  GST_ELEMENT_FACTORY_TYPE_MEDIA_METADATA (G_GUINT64_CONSTANT (1) << 53)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_ANY:
- *
- * Elements of any of the defined GST_ELEMENT_FACTORY_LIST types
- *
- * Value: 562949953421311
- * Type: GstElementFactoryListType
- */
-#define  GST_ELEMENT_FACTORY_TYPE_ANY ((G_GUINT64_CONSTANT (1) << 49) - 1)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_MEDIA_ANY:
- *
- * Elements matching any of the defined GST_ELEMENT_FACTORY_TYPE_MEDIA types
- *
- * Note: Do not use this if you wish to not filter against any of the defined
- * media types. If you wish to do this, simply don't specify any
- * GST_ELEMENT_FACTORY_TYPE_MEDIA flag.
- *
- * Value: 18446462598732840960
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_MEDIA_ANY (~G_GUINT64_CONSTANT (0) << 48)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_VIDEO_ENCODER:
- *
- * All encoders handling video or image media types
- *
- * Value: 2814749767106562
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_VIDEO_ENCODER (GST_ELEMENT_FACTORY_TYPE_ENCODER | GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO | GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_AUDIO_ENCODER:
- *
- * All encoders handling audio media types
- *
- * Value: 1125899906842626
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_AUDIO_ENCODER (GST_ELEMENT_FACTORY_TYPE_ENCODER | GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_AUDIOVIDEO_SINKS:
- *
- * All sinks handling audio, video or image media types
- *
- * Value: 3940649673949188
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_AUDIOVIDEO_SINKS (GST_ELEMENT_FACTORY_TYPE_SINK | GST_ELEMENT_FACTORY_TYPE_MEDIA_AUDIO | GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO | GST_ELEMENT_FACTORY_TYPE_MEDIA_IMAGE)
-
-/**
- * GST_ELEMENT_FACTORY_TYPE_DECODABLE:
- *
- * All elements used to 'decode' streams (decoders, demuxers, parsers, depayloaders)
- *
- * Value: 353
- * Type: GstElementFactoryListType
- */
-#define GST_ELEMENT_FACTORY_TYPE_DECODABLE \
-  (GST_ELEMENT_FACTORY_TYPE_DECODER | GST_ELEMENT_FACTORY_TYPE_DEMUXER | GST_ELEMENT_FACTORY_TYPE_DEPAYLOADER | GST_ELEMENT_FACTORY_TYPE_PARSER)
-
-/* Element klass defines */
-#define GST_ELEMENT_FACTORY_KLASS_DECODER               "Decoder"
-#define GST_ELEMENT_FACTORY_KLASS_ENCODER               "Encoder"
-#define GST_ELEMENT_FACTORY_KLASS_SINK                  "Sink"
-#define GST_ELEMENT_FACTORY_KLASS_SRC                   "Source"
-#define GST_ELEMENT_FACTORY_KLASS_MUXER                 "Muxer"
-#define GST_ELEMENT_FACTORY_KLASS_DEMUXER               "Demuxer"
-#define GST_ELEMENT_FACTORY_KLASS_PARSER                "Parser"
-#define GST_ELEMENT_FACTORY_KLASS_PAYLOADER             "Payloader"
-#define GST_ELEMENT_FACTORY_KLASS_DEPAYLOADER           "Depayloader"
-#define GST_ELEMENT_FACTORY_KLASS_FORMATTER             "Formatter"
-
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_VIDEO           "Video"
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_AUDIO           "Audio"
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_IMAGE           "Image"
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_SUBTITLE        "Subtitle"
-#define GST_ELEMENT_FACTORY_KLASS_MEDIA_METADATA        "Metadata"
-
-gboolean      gst_element_factory_list_is_type      (GstElementFactory *factory,
-                                                     GstElementFactoryListType type);
-
-GList *       gst_element_factory_list_get_elements (GstElementFactoryListType type,
-                                                     GstRank minrank) G_GNUC_MALLOC;
-
-
-GList *       gst_element_factory_list_filter       (GList *list, const GstCaps *caps,
-                                                     GstPadDirection direction,
-                                                     gboolean subsetonly) G_GNUC_MALLOC;
-G_END_DECLS
-
-#endif /* __GST_ELEMENT_FACTORY_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelementmetadata.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelementmetadata.h
deleted file mode 100644
index 6c331d90..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstelementmetadata.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2000,2004 Wim Taymans <wim@fluendo.com>
- *
- * gstelementmetadata.h: Metadata for GstElement classes
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_ELEMENT_METADATA_H__
-#define __GST_ELEMENT_METADATA_H__
-
-G_BEGIN_DECLS
-
-/**
- * GST_ELEMENT_METADATA_LONGNAME:
- *
- * The long English name of the element. E.g. "File Sink"
- */
-#define GST_ELEMENT_METADATA_LONGNAME      "long-name"
-/**
- * GST_ELEMENT_METADATA_KLASS:
- *
- * String describing the type of element, as an unordered list
- * separated with slashes ('/'). See draft-klass.txt of the design docs
- * for more details and common types. E.g: "Sink/File"
- */
-#define GST_ELEMENT_METADATA_KLASS         "klass"
-
-/**
- * GST_ELEMENT_METADATA_DESCRIPTION:
- *
- * Sentence describing the purpose of the element.
- * E.g: "Write stream to a file"
- */
-#define GST_ELEMENT_METADATA_DESCRIPTION   "description"
-/**
- * GST_ELEMENT_METADATA_AUTHOR:
- *
- * Name and contact details of the author(s). Use \n to separate
- * multiple author details.
- * E.g: "Joe Bloggs &lt;joe.blogs at foo.com&gt;"
- */
-#define GST_ELEMENT_METADATA_AUTHOR        "author"
-
-/**
- * GST_ELEMENT_METADATA_DOC_URI:
- *
- * Set uri pointing to user documentation. Applications can use this to show
- * help for e.g. effects to users.
- */
-#define GST_ELEMENT_METADATA_DOC_URI       "doc-uri"
-/**
- * GST_ELEMENT_METADATA_ICON_NAME:
- *
- * Elements that bridge to certain other products can include an icon of that
- * used product. Application can show the icon in menus/selectors to help
- * identifying specific elements.
- */
-#define GST_ELEMENT_METADATA_ICON_NAME     "icon-name"
-
-G_END_DECLS
-
-#endif /* __GST_ELEMENT_METADATA_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstenumtypes.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstenumtypes.h
deleted file mode 100644
index c15314f4..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstenumtypes.h
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-
-#ifndef __GST_ENUM_TYPES_H__
-#define __GST_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "gstobject.h" */
-GType gst_object_flags_get_type (void);
-#define GST_TYPE_OBJECT_FLAGS (gst_object_flags_get_type())
-
-/* enumerations from "gstallocator.h" */
-GType gst_allocator_flags_get_type (void);
-#define GST_TYPE_ALLOCATOR_FLAGS (gst_allocator_flags_get_type())
-
-/* enumerations from "gstbin.h" */
-GType gst_bin_flags_get_type (void);
-#define GST_TYPE_BIN_FLAGS (gst_bin_flags_get_type())
-
-/* enumerations from "gstbuffer.h" */
-GType gst_buffer_flags_get_type (void);
-#define GST_TYPE_BUFFER_FLAGS (gst_buffer_flags_get_type())
-GType gst_buffer_copy_flags_get_type (void);
-#define GST_TYPE_BUFFER_COPY_FLAGS (gst_buffer_copy_flags_get_type())
-
-/* enumerations from "gstbufferpool.h" */
-GType gst_buffer_pool_acquire_flags_get_type (void);
-#define GST_TYPE_BUFFER_POOL_ACQUIRE_FLAGS (gst_buffer_pool_acquire_flags_get_type())
-
-/* enumerations from "gstbus.h" */
-GType gst_bus_flags_get_type (void);
-#define GST_TYPE_BUS_FLAGS (gst_bus_flags_get_type())
-GType gst_bus_sync_reply_get_type (void);
-#define GST_TYPE_BUS_SYNC_REPLY (gst_bus_sync_reply_get_type())
-
-/* enumerations from "gstcaps.h" */
-GType gst_caps_flags_get_type (void);
-#define GST_TYPE_CAPS_FLAGS (gst_caps_flags_get_type())
-GType gst_caps_intersect_mode_get_type (void);
-#define GST_TYPE_CAPS_INTERSECT_MODE (gst_caps_intersect_mode_get_type())
-
-/* enumerations from "gstclock.h" */
-GType gst_clock_return_get_type (void);
-#define GST_TYPE_CLOCK_RETURN (gst_clock_return_get_type())
-GType gst_clock_entry_type_get_type (void);
-#define GST_TYPE_CLOCK_ENTRY_TYPE (gst_clock_entry_type_get_type())
-GType gst_clock_flags_get_type (void);
-#define GST_TYPE_CLOCK_FLAGS (gst_clock_flags_get_type())
-
-/* enumerations from "gstdebugutils.h" */
-GType gst_debug_graph_details_get_type (void);
-#define GST_TYPE_DEBUG_GRAPH_DETAILS (gst_debug_graph_details_get_type())
-
-/* enumerations from "gstelement.h" */
-GType gst_state_get_type (void);
-#define GST_TYPE_STATE (gst_state_get_type())
-GType gst_state_change_return_get_type (void);
-#define GST_TYPE_STATE_CHANGE_RETURN (gst_state_change_return_get_type())
-GType gst_state_change_get_type (void);
-#define GST_TYPE_STATE_CHANGE (gst_state_change_get_type())
-GType gst_element_flags_get_type (void);
-#define GST_TYPE_ELEMENT_FLAGS (gst_element_flags_get_type())
-
-/* enumerations from "gsterror.h" */
-GType gst_core_error_get_type (void);
-#define GST_TYPE_CORE_ERROR (gst_core_error_get_type())
-GType gst_library_error_get_type (void);
-#define GST_TYPE_LIBRARY_ERROR (gst_library_error_get_type())
-GType gst_resource_error_get_type (void);
-#define GST_TYPE_RESOURCE_ERROR (gst_resource_error_get_type())
-GType gst_stream_error_get_type (void);
-#define GST_TYPE_STREAM_ERROR (gst_stream_error_get_type())
-
-/* enumerations from "gstevent.h" */
-GType gst_event_type_flags_get_type (void);
-#define GST_TYPE_EVENT_TYPE_FLAGS (gst_event_type_flags_get_type())
-GType gst_event_type_get_type (void);
-#define GST_TYPE_EVENT_TYPE (gst_event_type_get_type())
-GType gst_qos_type_get_type (void);
-#define GST_TYPE_QOS_TYPE (gst_qos_type_get_type())
-
-/* enumerations from "gstformat.h" */
-GType gst_format_get_type (void);
-#define GST_TYPE_FORMAT (gst_format_get_type())
-
-/* enumerations from "gstinfo.h" */
-GType gst_debug_level_get_type (void);
-#define GST_TYPE_DEBUG_LEVEL (gst_debug_level_get_type())
-GType gst_debug_color_flags_get_type (void);
-#define GST_TYPE_DEBUG_COLOR_FLAGS (gst_debug_color_flags_get_type())
-
-/* enumerations from "gstiterator.h" */
-GType gst_iterator_result_get_type (void);
-#define GST_TYPE_ITERATOR_RESULT (gst_iterator_result_get_type())
-GType gst_iterator_item_get_type (void);
-#define GST_TYPE_ITERATOR_ITEM (gst_iterator_item_get_type())
-
-/* enumerations from "gstmessage.h" */
-GType gst_message_type_get_type (void);
-#define GST_TYPE_MESSAGE_TYPE (gst_message_type_get_type())
-GType gst_structure_change_type_get_type (void);
-#define GST_TYPE_STRUCTURE_CHANGE_TYPE (gst_structure_change_type_get_type())
-GType gst_stream_status_type_get_type (void);
-#define GST_TYPE_STREAM_STATUS_TYPE (gst_stream_status_type_get_type())
-GType gst_progress_type_get_type (void);
-#define GST_TYPE_PROGRESS_TYPE (gst_progress_type_get_type())
-
-/* enumerations from "gstmeta.h" */
-GType gst_meta_flags_get_type (void);
-#define GST_TYPE_META_FLAGS (gst_meta_flags_get_type())
-
-/* enumerations from "gstmemory.h" */
-GType gst_memory_flags_get_type (void);
-#define GST_TYPE_MEMORY_FLAGS (gst_memory_flags_get_type())
-GType gst_map_flags_get_type (void);
-#define GST_TYPE_MAP_FLAGS (gst_map_flags_get_type())
-
-/* enumerations from "gstminiobject.h" */
-GType gst_mini_object_flags_get_type (void);
-#define GST_TYPE_MINI_OBJECT_FLAGS (gst_mini_object_flags_get_type())
-GType gst_lock_flags_get_type (void);
-#define GST_TYPE_LOCK_FLAGS (gst_lock_flags_get_type())
-
-/* enumerations from "gstpad.h" */
-GType gst_pad_direction_get_type (void);
-#define GST_TYPE_PAD_DIRECTION (gst_pad_direction_get_type())
-GType gst_pad_mode_get_type (void);
-#define GST_TYPE_PAD_MODE (gst_pad_mode_get_type())
-GType gst_pad_link_return_get_type (void);
-#define GST_TYPE_PAD_LINK_RETURN (gst_pad_link_return_get_type())
-GType gst_flow_return_get_type (void);
-#define GST_TYPE_FLOW_RETURN (gst_flow_return_get_type())
-GType gst_pad_link_check_get_type (void);
-#define GST_TYPE_PAD_LINK_CHECK (gst_pad_link_check_get_type())
-GType gst_pad_probe_type_get_type (void);
-#define GST_TYPE_PAD_PROBE_TYPE (gst_pad_probe_type_get_type())
-GType gst_pad_probe_return_get_type (void);
-#define GST_TYPE_PAD_PROBE_RETURN (gst_pad_probe_return_get_type())
-GType gst_pad_flags_get_type (void);
-#define GST_TYPE_PAD_FLAGS (gst_pad_flags_get_type())
-
-/* enumerations from "gstpadtemplate.h" */
-GType gst_pad_presence_get_type (void);
-#define GST_TYPE_PAD_PRESENCE (gst_pad_presence_get_type())
-GType gst_pad_template_flags_get_type (void);
-#define GST_TYPE_PAD_TEMPLATE_FLAGS (gst_pad_template_flags_get_type())
-
-/* enumerations from "gstpipeline.h" */
-GType gst_pipeline_flags_get_type (void);
-#define GST_TYPE_PIPELINE_FLAGS (gst_pipeline_flags_get_type())
-
-/* enumerations from "gstplugin.h" */
-GType gst_plugin_error_get_type (void);
-#define GST_TYPE_PLUGIN_ERROR (gst_plugin_error_get_type())
-GType gst_plugin_flags_get_type (void);
-#define GST_TYPE_PLUGIN_FLAGS (gst_plugin_flags_get_type())
-GType gst_plugin_dependency_flags_get_type (void);
-#define GST_TYPE_PLUGIN_DEPENDENCY_FLAGS (gst_plugin_dependency_flags_get_type())
-
-/* enumerations from "gstpluginfeature.h" */
-GType gst_rank_get_type (void);
-#define GST_TYPE_RANK (gst_rank_get_type())
-
-/* enumerations from "gstquery.h" */
-GType gst_query_type_flags_get_type (void);
-#define GST_TYPE_QUERY_TYPE_FLAGS (gst_query_type_flags_get_type())
-GType gst_query_type_get_type (void);
-#define GST_TYPE_QUERY_TYPE (gst_query_type_get_type())
-GType gst_buffering_mode_get_type (void);
-#define GST_TYPE_BUFFERING_MODE (gst_buffering_mode_get_type())
-GType gst_scheduling_flags_get_type (void);
-#define GST_TYPE_SCHEDULING_FLAGS (gst_scheduling_flags_get_type())
-
-/* enumerations from "gstsegment.h" */
-GType gst_seek_type_get_type (void);
-#define GST_TYPE_SEEK_TYPE (gst_seek_type_get_type())
-GType gst_seek_flags_get_type (void);
-#define GST_TYPE_SEEK_FLAGS (gst_seek_flags_get_type())
-GType gst_segment_flags_get_type (void);
-#define GST_TYPE_SEGMENT_FLAGS (gst_segment_flags_get_type())
-
-/* enumerations from "gstsystemclock.h" */
-GType gst_clock_type_get_type (void);
-#define GST_TYPE_CLOCK_TYPE (gst_clock_type_get_type())
-
-/* enumerations from "gsttaglist.h" */
-GType gst_tag_merge_mode_get_type (void);
-#define GST_TYPE_TAG_MERGE_MODE (gst_tag_merge_mode_get_type())
-GType gst_tag_flag_get_type (void);
-#define GST_TYPE_TAG_FLAG (gst_tag_flag_get_type())
-GType gst_tag_scope_get_type (void);
-#define GST_TYPE_TAG_SCOPE (gst_tag_scope_get_type())
-
-/* enumerations from "gsttask.h" */
-GType gst_task_state_get_type (void);
-#define GST_TYPE_TASK_STATE (gst_task_state_get_type())
-
-/* enumerations from "gsttoc.h" */
-GType gst_toc_scope_get_type (void);
-#define GST_TYPE_TOC_SCOPE (gst_toc_scope_get_type())
-GType gst_toc_entry_type_get_type (void);
-#define GST_TYPE_TOC_ENTRY_TYPE (gst_toc_entry_type_get_type())
-
-/* enumerations from "gsttypefind.h" */
-GType gst_type_find_probability_get_type (void);
-#define GST_TYPE_TYPE_FIND_PROBABILITY (gst_type_find_probability_get_type())
-
-/* enumerations from "gsturi.h" */
-GType gst_uri_error_get_type (void);
-#define GST_TYPE_URI_ERROR (gst_uri_error_get_type())
-GType gst_uri_type_get_type (void);
-#define GST_TYPE_URI_TYPE (gst_uri_type_get_type())
-
-/* enumerations from "gstutils.h" */
-GType gst_search_mode_get_type (void);
-#define GST_TYPE_SEARCH_MODE (gst_search_mode_get_type())
-
-/* enumerations from "gstparse.h" */
-GType gst_parse_error_get_type (void);
-#define GST_TYPE_PARSE_ERROR (gst_parse_error_get_type())
-GType gst_parse_flags_get_type (void);
-#define GST_TYPE_PARSE_FLAGS (gst_parse_flags_get_type())
-G_END_DECLS
-
-#endif /* __GST_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsterror.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsterror.h
deleted file mode 100644
index a066be92..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsterror.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_ERROR_H__
-#define __GST_ERROR_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <errno.h>
-
-G_BEGIN_DECLS
-/*
- * we define FIXME error domains:
- * GST_CORE_ERROR
- * GST_LIBRARY_ERROR
- * GST_RESOURCE_ERROR
- * GST_STREAM_ERROR
- *
- * Check GError API docs for rationale for naming.
- */
-/**
- * GstCoreError:
- * @GST_CORE_ERROR_FAILED: a general error which doesn't fit in any other
- * category.  Make sure you add a custom message to the error call.
- * @GST_CORE_ERROR_TOO_LAZY: do not use this except as a placeholder for
- * deciding where to go while developing code.
- * @GST_CORE_ERROR_NOT_IMPLEMENTED: use this when you do not want to implement
- * this functionality yet.
- * @GST_CORE_ERROR_STATE_CHANGE: used for state change errors.
- * @GST_CORE_ERROR_PAD: used for pad-related errors.
- * @GST_CORE_ERROR_THREAD: used for thread-related errors.
- * @GST_CORE_ERROR_NEGOTIATION: used for negotiation-related errors.
- * @GST_CORE_ERROR_EVENT: used for event-related errors.
- * @GST_CORE_ERROR_SEEK: used for seek-related errors.
- * @GST_CORE_ERROR_CAPS: used for caps-related errors.
- * @GST_CORE_ERROR_TAG: used for negotiation-related errors.
- * @GST_CORE_ERROR_MISSING_PLUGIN: used if a plugin is missing.
- * @GST_CORE_ERROR_CLOCK: used for clock related errors.
- * @GST_CORE_ERROR_DISABLED: used if functionality has been disabled at
- *                           compile time.
- * @GST_CORE_ERROR_NUM_ERRORS: the number of core error types.
- *
- * Core errors are errors inside the core GStreamer library.
- */
-/* FIXME: should we divide in numerical blocks so we can easily add
-          for example PAD errors later ? */
-typedef enum
-{
-  GST_CORE_ERROR_FAILED = 1,
-  GST_CORE_ERROR_TOO_LAZY,
-  GST_CORE_ERROR_NOT_IMPLEMENTED,
-  GST_CORE_ERROR_STATE_CHANGE,
-  GST_CORE_ERROR_PAD,
-  GST_CORE_ERROR_THREAD,
-  GST_CORE_ERROR_NEGOTIATION,
-  GST_CORE_ERROR_EVENT,
-  GST_CORE_ERROR_SEEK,
-  GST_CORE_ERROR_CAPS,
-  GST_CORE_ERROR_TAG,
-  GST_CORE_ERROR_MISSING_PLUGIN,
-  GST_CORE_ERROR_CLOCK,
-  GST_CORE_ERROR_DISABLED,
-  GST_CORE_ERROR_NUM_ERRORS
-} GstCoreError;
-
-/**
- * GstLibraryError:
- * @GST_LIBRARY_ERROR_FAILED: a general error which doesn't fit in any other
- * category.  Make sure you add a custom message to the error call.
- * @GST_LIBRARY_ERROR_TOO_LAZY: do not use this except as a placeholder for
- * deciding where to go while developing code.
- * @GST_LIBRARY_ERROR_INIT: used when the library could not be opened.
- * @GST_LIBRARY_ERROR_SHUTDOWN: used when the library could not be closed.
- * @GST_LIBRARY_ERROR_SETTINGS: used when the library doesn't accept settings.
- * @GST_LIBRARY_ERROR_ENCODE: used when the library generated an encoding error.
- * @GST_LIBRARY_ERROR_NUM_ERRORS: the number of library error types.
- *
- * Library errors are for errors from the library being used by elements
- * (initializing, finalizing, settings, ...)
- */
-typedef enum
-{
-  GST_LIBRARY_ERROR_FAILED = 1,
-  GST_LIBRARY_ERROR_TOO_LAZY,
-  GST_LIBRARY_ERROR_INIT,
-  GST_LIBRARY_ERROR_SHUTDOWN,
-  GST_LIBRARY_ERROR_SETTINGS,
-  GST_LIBRARY_ERROR_ENCODE,
-  GST_LIBRARY_ERROR_NUM_ERRORS
-} GstLibraryError;
-
-/**
- * GstResourceError:
- * @GST_RESOURCE_ERROR_FAILED: a general error which doesn't fit in any other
- * category.  Make sure you add a custom message to the error call.
- * @GST_RESOURCE_ERROR_TOO_LAZY: do not use this except as a placeholder for
- * deciding where to go while developing code.
- * @GST_RESOURCE_ERROR_NOT_FOUND: used when the resource could not be found.
- * @GST_RESOURCE_ERROR_BUSY: used when resource is busy.
- * @GST_RESOURCE_ERROR_OPEN_READ: used when resource fails to open for reading.
- * @GST_RESOURCE_ERROR_OPEN_WRITE: used when resource fails to open for writing.
- * @GST_RESOURCE_ERROR_OPEN_READ_WRITE: used when resource cannot be opened for
- * both reading and writing, or either (but unspecified which).
- * @GST_RESOURCE_ERROR_CLOSE: used when the resource can't be closed.
- * @GST_RESOURCE_ERROR_READ: used when the resource can't be read from.
- * @GST_RESOURCE_ERROR_WRITE: used when the resource can't be written to.
- * @GST_RESOURCE_ERROR_SEEK: used when a seek on the resource fails.
- * @GST_RESOURCE_ERROR_SYNC: used when a synchronize on the resource fails.
- * @GST_RESOURCE_ERROR_SETTINGS: used when settings can't be manipulated on.
- * @GST_RESOURCE_ERROR_NO_SPACE_LEFT: used when the resource has no space left.
- * @GST_RESOURCE_ERROR_NUM_ERRORS: the number of resource error types.
- *
- * Resource errors are for any resource used by an element:
- * memory, files, network connections, process space, ...
- * They're typically used by source and sink elements.
- */
-typedef enum
-{
-  GST_RESOURCE_ERROR_FAILED = 1,
-  GST_RESOURCE_ERROR_TOO_LAZY,
-  GST_RESOURCE_ERROR_NOT_FOUND,
-  GST_RESOURCE_ERROR_BUSY,
-  GST_RESOURCE_ERROR_OPEN_READ,
-  GST_RESOURCE_ERROR_OPEN_WRITE,
-  GST_RESOURCE_ERROR_OPEN_READ_WRITE,
-  GST_RESOURCE_ERROR_CLOSE,
-  GST_RESOURCE_ERROR_READ,
-  GST_RESOURCE_ERROR_WRITE,
-  GST_RESOURCE_ERROR_SEEK,
-  GST_RESOURCE_ERROR_SYNC,
-  GST_RESOURCE_ERROR_SETTINGS,
-  GST_RESOURCE_ERROR_NO_SPACE_LEFT,
-  GST_RESOURCE_ERROR_NUM_ERRORS
-} GstResourceError;
-
-/**
- * GstStreamError:
- * @GST_STREAM_ERROR_FAILED: a general error which doesn't fit in any other
- * category.  Make sure you add a custom message to the error call.
- * @GST_STREAM_ERROR_TOO_LAZY: do not use this except as a placeholder for
- * deciding where to go while developing code.
- * @GST_STREAM_ERROR_NOT_IMPLEMENTED: use this when you do not want to implement
- * this functionality yet.
- * @GST_STREAM_ERROR_TYPE_NOT_FOUND: used when the element doesn't know the
- * stream's type.
- * @GST_STREAM_ERROR_WRONG_TYPE: used when the element doesn't handle this type
- * of stream.
- * @GST_STREAM_ERROR_CODEC_NOT_FOUND: used when there's no codec to handle the
- * stream's type.
- * @GST_STREAM_ERROR_DECODE: used when decoding fails.
- * @GST_STREAM_ERROR_ENCODE: used when encoding fails.
- * @GST_STREAM_ERROR_DEMUX: used when demuxing fails.
- * @GST_STREAM_ERROR_MUX: used when muxing fails.
- * @GST_STREAM_ERROR_FORMAT: used when the stream is of the wrong format
- * (for example, wrong caps).
- * @GST_STREAM_ERROR_DECRYPT: used when the stream is encrypted and can't be
- * decrypted because this is not supported by the element.
- * @GST_STREAM_ERROR_DECRYPT_NOKEY: used when the stream is encrypted and
- * can't be decrypted because no suitable key is available.
- * @GST_STREAM_ERROR_NUM_ERRORS: the number of stream error types.
- *
- * Stream errors are for anything related to the stream being processed:
- * format errors, media type errors, ...
- * They're typically used by decoders, demuxers, converters, ...
- */
-typedef enum
-{
-  GST_STREAM_ERROR_FAILED = 1,
-  GST_STREAM_ERROR_TOO_LAZY,
-  GST_STREAM_ERROR_NOT_IMPLEMENTED,
-  GST_STREAM_ERROR_TYPE_NOT_FOUND,
-  GST_STREAM_ERROR_WRONG_TYPE,
-  GST_STREAM_ERROR_CODEC_NOT_FOUND,
-  GST_STREAM_ERROR_DECODE,
-  GST_STREAM_ERROR_ENCODE,
-  GST_STREAM_ERROR_DEMUX,
-  GST_STREAM_ERROR_MUX,
-  GST_STREAM_ERROR_FORMAT,
-  GST_STREAM_ERROR_DECRYPT,
-  GST_STREAM_ERROR_DECRYPT_NOKEY,
-  GST_STREAM_ERROR_NUM_ERRORS
-} GstStreamError;
-
-/**
- * GST_LIBRARY_ERROR:
- *
- * Error domain for library loading. Errors in this domain will
- * be from the #GstLibraryError enumeration.
- * See #GError for information on error domains.
- */
-#define GST_LIBRARY_ERROR   gst_library_error_quark ()
-/**
- * GST_RESOURCE_ERROR:
- *
- * Error domain for resource handling. Errors in this domain will
- * be from the #GstResourceError enumeration.
- * See #GError for information on error domains.
- */
-#define GST_RESOURCE_ERROR  gst_resource_error_quark ()
-/**
- * GST_CORE_ERROR:
- *
- * Error domain for core system. Errors in this domain will
- * be from the #GstCoreError enumeration.
- * See #GError for information on error domains.
- */
-#define GST_CORE_ERROR      gst_core_error_quark ()
-/**
- * GST_STREAM_ERROR:
- *
- * Error domain for media stream processing. Errors in this domain will
- * be from the #GstStreamError enumeration.
- * See #GError for information on error domains.
- */
-#define GST_STREAM_ERROR    gst_stream_error_quark ()
-
-/**
- * GST_ERROR_SYSTEM:
- *
- * Builds a string using errno describing the previously failed system
- * call.  To be used as the debug argument in #GST_ELEMENT_ERROR.
- */
-#define GST_ERROR_SYSTEM    ("system error: %s", g_strerror (errno))
-
-gchar *gst_error_get_message (GQuark domain, gint code);
-GQuark gst_stream_error_quark (void);
-GQuark gst_core_error_quark (void);
-GQuark gst_resource_error_quark (void);
-GQuark gst_library_error_quark (void);
-
-G_END_DECLS
-#endif /* __GST_ERROR_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstevent.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstevent.h
deleted file mode 100644
index 7907a69d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstevent.h
+++ /dev/null
@@ -1,550 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstevent.h: Header for GstEvent subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_EVENT_H__
-#define __GST_EVENT_H__
-
-typedef struct _GstEvent GstEvent;
-
-/**
- * GstEventTypeFlags:
- * @GST_EVENT_TYPE_UPSTREAM:     Set if the event can travel upstream.
- * @GST_EVENT_TYPE_DOWNSTREAM:   Set if the event can travel downstream.
- * @GST_EVENT_TYPE_SERIALIZED:   Set if the event should be serialized with data
- *                               flow.
- * @GST_EVENT_TYPE_STICKY:       Set if the event is sticky on the pads.
- * @GST_EVENT_TYPE_STICKY_MULTI: Multiple sticky events can be on a pad, each
- *                               identified by the event name.
- *
- * #GstEventTypeFlags indicate the aspects of the different #GstEventType
- * values. You can get the type flags of a #GstEventType with the
- * gst_event_type_get_flags() function.
- */
-typedef enum {
-  GST_EVENT_TYPE_UPSTREAM       = 1 << 0,
-  GST_EVENT_TYPE_DOWNSTREAM     = 1 << 1,
-  GST_EVENT_TYPE_SERIALIZED     = 1 << 2,
-  GST_EVENT_TYPE_STICKY         = 1 << 3,
-  GST_EVENT_TYPE_STICKY_MULTI   = 1 << 4
-} GstEventTypeFlags;
-
-/**
- * GST_EVENT_TYPE_BOTH:
- *
- * The same thing as #GST_EVENT_TYPE_UPSTREAM | #GST_EVENT_TYPE_DOWNSTREAM.
- */
-#define GST_EVENT_TYPE_BOTH \
-    (GST_EVENT_TYPE_UPSTREAM | GST_EVENT_TYPE_DOWNSTREAM)
-
-#define GST_EVENT_NUM_SHIFT     (8)
-
-/**
- * GST_EVENT_MAKE_TYPE:
- * @num: the event number to create
- * @flags: the event flags
- *
- * when making custom event types, use this macro with the num and
- * the given flags
- */
-#define GST_EVENT_MAKE_TYPE(num,flags) \
-    (((num) << GST_EVENT_NUM_SHIFT) | (flags))
-
-#define FLAG(name) GST_EVENT_TYPE_##name
-
-/**
- * GstEventType:
- * @GST_EVENT_UNKNOWN: unknown event.
- * @GST_EVENT_FLUSH_START: Start a flush operation. This event clears all data
- *                 from the pipeline and unblock all streaming threads.
- * @GST_EVENT_FLUSH_STOP: Stop a flush operation. This event resets the
- *                 running-time of the pipeline.
- * @GST_EVENT_STREAM_START: Event to mark the start of a new stream. Sent before any
- *                 other serialized event and only sent at the start of a new stream,
- *                 not after flushing seeks.
- * @GST_EVENT_CAPS: #GstCaps event. Notify the pad of a new media type.
- * @GST_EVENT_SEGMENT: A new media segment follows in the dataflow. The
- *                 segment events contains information for clipping buffers and
- *                 converting buffer timestamps to running-time and
- *                 stream-time.
- * @GST_EVENT_TAG: A new set of metadata tags has been found in the stream.
- * @GST_EVENT_BUFFERSIZE: Notification of buffering requirements. Currently not
- *                 used yet.
- * @GST_EVENT_SINK_MESSAGE: An event that sinks turn into a message. Used to
- *                          send messages that should be emitted in sync with
- *                          rendering.
- * @GST_EVENT_EOS: End-Of-Stream. No more data is to be expected to follow
- *                 without a SEGMENT event.
- * @GST_EVENT_SEGMENT_DONE: Marks the end of a segment playback.
- * @GST_EVENT_GAP: Marks a gap in the datastream.
- * @GST_EVENT_TOC: An event which indicates that a new table of contents (TOC)
- *                 was found or updated.
- * @GST_EVENT_QOS: A quality message. Used to indicate to upstream elements
- *                 that the downstream elements should adjust their processing
- *                 rate.
- * @GST_EVENT_SEEK: A request for a new playback position and rate.
- * @GST_EVENT_NAVIGATION: Navigation events are usually used for communicating
- *                        user requests, such as mouse or keyboard movements,
- *                        to upstream elements.
- * @GST_EVENT_LATENCY: Notification of new latency adjustment. Sinks will use
- *                     the latency information to adjust their synchronisation.
- * @GST_EVENT_STEP: A request for stepping through the media. Sinks will usually
- *                  execute the step operation.
- * @GST_EVENT_RECONFIGURE: A request for upstream renegotiating caps and reconfiguring.
- * @GST_EVENT_TOC_SELECT: A request for a new playback position based on TOC
- *                        entry's UID.
- * @GST_EVENT_CUSTOM_UPSTREAM: Upstream custom event
- * @GST_EVENT_CUSTOM_DOWNSTREAM: Downstream custom event that travels in the
- *                        data flow.
- * @GST_EVENT_CUSTOM_DOWNSTREAM_OOB: Custom out-of-band downstream event.
- * @GST_EVENT_CUSTOM_DOWNSTREAM_STICKY: Custom sticky downstream event.
- * @GST_EVENT_CUSTOM_BOTH: Custom upstream or downstream event.
- *                         In-band when travelling downstream.
- * @GST_EVENT_CUSTOM_BOTH_OOB: Custom upstream or downstream out-of-band event.
- *
- * #GstEventType lists the standard event types that can be sent in a pipeline.
- *
- * The custom event types can be used for private messages between elements
- * that can't be expressed using normal
- * GStreamer buffer passing semantics. Custom events carry an arbitrary
- * #GstStructure.
- * Specific custom events are distinguished by the name of the structure.
- */
-/* NOTE: keep in sync with quark registration in gstevent.c */
-typedef enum {
-  GST_EVENT_UNKNOWN               = GST_EVENT_MAKE_TYPE (0, 0),
-
-  /* bidirectional events */
-  GST_EVENT_FLUSH_START           = GST_EVENT_MAKE_TYPE (10, FLAG(BOTH)),
-  GST_EVENT_FLUSH_STOP            = GST_EVENT_MAKE_TYPE (20, FLAG(BOTH) | FLAG(SERIALIZED)),
-
-  /* downstream serialized events */
-  GST_EVENT_STREAM_START          = GST_EVENT_MAKE_TYPE (40, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_CAPS                  = GST_EVENT_MAKE_TYPE (50, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_SEGMENT               = GST_EVENT_MAKE_TYPE (70, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_TAG                   = GST_EVENT_MAKE_TYPE (80, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)),
-  GST_EVENT_BUFFERSIZE            = GST_EVENT_MAKE_TYPE (90, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_SINK_MESSAGE          = GST_EVENT_MAKE_TYPE (100, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)),
-  GST_EVENT_EOS                   = GST_EVENT_MAKE_TYPE (110, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)),
-  GST_EVENT_TOC                   = GST_EVENT_MAKE_TYPE (120, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)),
-
-  /* non-sticky downstream serialized */
-  GST_EVENT_SEGMENT_DONE          = GST_EVENT_MAKE_TYPE (150, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
-  GST_EVENT_GAP                   = GST_EVENT_MAKE_TYPE (160, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
-
-  /* upstream events */
-  GST_EVENT_QOS                   = GST_EVENT_MAKE_TYPE (190, FLAG(UPSTREAM)),
-  GST_EVENT_SEEK                  = GST_EVENT_MAKE_TYPE (200, FLAG(UPSTREAM)),
-  GST_EVENT_NAVIGATION            = GST_EVENT_MAKE_TYPE (210, FLAG(UPSTREAM)),
-  GST_EVENT_LATENCY               = GST_EVENT_MAKE_TYPE (220, FLAG(UPSTREAM)),
-  GST_EVENT_STEP                  = GST_EVENT_MAKE_TYPE (230, FLAG(UPSTREAM)),
-  GST_EVENT_RECONFIGURE           = GST_EVENT_MAKE_TYPE (240, FLAG(UPSTREAM)),
-  GST_EVENT_TOC_SELECT            = GST_EVENT_MAKE_TYPE (250, FLAG(UPSTREAM)),
-
-  /* custom events start here */
-  GST_EVENT_CUSTOM_UPSTREAM          = GST_EVENT_MAKE_TYPE (270, FLAG(UPSTREAM)),
-  GST_EVENT_CUSTOM_DOWNSTREAM        = GST_EVENT_MAKE_TYPE (280, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
-  GST_EVENT_CUSTOM_DOWNSTREAM_OOB    = GST_EVENT_MAKE_TYPE (290, FLAG(DOWNSTREAM)),
-  GST_EVENT_CUSTOM_DOWNSTREAM_STICKY = GST_EVENT_MAKE_TYPE (300, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)),
-  GST_EVENT_CUSTOM_BOTH              = GST_EVENT_MAKE_TYPE (310, FLAG(BOTH) | FLAG(SERIALIZED)),
-  GST_EVENT_CUSTOM_BOTH_OOB          = GST_EVENT_MAKE_TYPE (320, FLAG(BOTH))
-} GstEventType;
-#undef FLAG
-
-#include <gst/gstminiobject.h>
-#include <gst/gstformat.h>
-#include <gst/gstobject.h>
-#include <gst/gstclock.h>
-#include <gst/gststructure.h>
-#include <gst/gsttaglist.h>
-#include <gst/gstsegment.h>
-#include <gst/gstsegment.h>
-#include <gst/gstmessage.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_event_type;
-
-#define GST_TYPE_EVENT                  (_gst_event_type)
-#define GST_IS_EVENT(obj)               (GST_IS_MINI_OBJECT_TYPE (obj, GST_TYPE_EVENT))
-#define GST_EVENT_CAST(obj)             ((GstEvent *)(obj))
-#define GST_EVENT(obj)                  (GST_EVENT_CAST(obj))
-
-/**
- * GST_EVENT_TYPE:
- * @event: the event to query
- *
- * Get the #GstEventType of the event.
- */
-#define GST_EVENT_TYPE(event)           (GST_EVENT_CAST(event)->type)
-
-/**
- * GST_EVENT_TYPE_NAME:
- * @event: the event to query
- *
- * Get a constant string representation of the #GstEventType of the event.
- */
-#define GST_EVENT_TYPE_NAME(event)      (gst_event_type_get_name(GST_EVENT_TYPE(event)))
-
-/**
- * GST_EVENT_TIMESTAMP:
- * @event: the event to query
- *
- * Get the #GstClockTime timestamp of the event. This is the time when the event
- * was created.
- */
-#define GST_EVENT_TIMESTAMP(event)      (GST_EVENT_CAST(event)->timestamp)
-
-/**
- * GST_EVENT_SEQNUM:
- * @event: the event to query
- *
- * The sequence number of @event.
- */
-#define GST_EVENT_SEQNUM(event)         (GST_EVENT_CAST(event)->seqnum)
-
-/**
- * GST_EVENT_IS_UPSTREAM:
- * @ev: the event to query
- *
- * Check if an event can travel upstream.
- */
-#define GST_EVENT_IS_UPSTREAM(ev)       !!(GST_EVENT_TYPE (ev) & GST_EVENT_TYPE_UPSTREAM)
-/**
- * GST_EVENT_IS_DOWNSTREAM:
- * @ev: the event to query
- *
- * Check if an event can travel downstream.
- */
-#define GST_EVENT_IS_DOWNSTREAM(ev)     !!(GST_EVENT_TYPE (ev) & GST_EVENT_TYPE_DOWNSTREAM)
-/**
- * GST_EVENT_IS_SERIALIZED:
- * @ev: the event to query
- *
- * Check if an event is serialized with the data stream.
- */
-#define GST_EVENT_IS_SERIALIZED(ev)     !!(GST_EVENT_TYPE (ev) & GST_EVENT_TYPE_SERIALIZED)
-/**
- * GST_EVENT_IS_STICKY:
- * @ev: the event to query
- *
- * Check if an event is sticky on the pads.
- */
-#define GST_EVENT_IS_STICKY(ev)     !!(GST_EVENT_TYPE (ev) & GST_EVENT_TYPE_STICKY)
-
-/**
- * gst_event_is_writable:
- * @ev: a #GstEvent
- *
- * Tests if you can safely write data into a event's structure or validly
- * modify the seqnum and timestamp field.
- */
-#define         gst_event_is_writable(ev)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (ev))
-/**
- * gst_event_make_writable:
- * @ev: (transfer full): a #GstEvent
- *
- * Makes a writable event from the given event. If the source event is
- * already writable, this will simply return the same event. A copy will
- * otherwise be made using gst_event_copy().
- *
- * Returns: (transfer full): a writable event which may or may not be the
- *     same as @ev
- */
-#define         gst_event_make_writable(ev)   GST_EVENT_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (ev)))
-/**
- * gst_event_replace:
- * @old_event: (inout) (transfer full): pointer to a pointer to a #GstEvent
- *     to be replaced.
- * @new_event: (allow-none) (transfer none): pointer to a #GstEvent that will
- *     replace the event pointed to by @old_event.
- *
- * Modifies a pointer to a #GstEvent to point to a different #GstEvent. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * event is unreffed, the new one is reffed).
- *
- * Either @new_event or the #GstEvent pointed to by @old_event may be NULL.
- *
- * Returns: TRUE if @new_event was different from @old_event
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_event_replace (GstEvent **old_event, GstEvent *new_event);
-#endif
-
-static inline gboolean
-gst_event_replace (GstEvent **old_event, GstEvent *new_event)
-{
-  return gst_mini_object_replace ((GstMiniObject **) old_event, (GstMiniObject *) new_event);
-}
-
-/**
- * gst_event_steal:
- * @old_event: (inout) (transfer full): pointer to a pointer to a #GstEvent
- *     to be stolen.
- *
- * Atomically replace the #GstEvent pointed to by @old_event with NULL and
- * return the original event.
- *
- * Returns: the #GstEvent that was in @old_event
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstEvent * gst_event_steal (GstEvent **old_event);
-#endif
-
-static inline GstEvent *
-gst_event_steal (GstEvent **old_event)
-{
-  return GST_EVENT_CAST (gst_mini_object_steal ((GstMiniObject **) old_event));
-}
-
-/**
- * gst_event_take:
- * @old_event: (inout) (transfer full): pointer to a pointer to a #GstEvent
- *     to be stolen.
- * @new_event: (allow-none) (transfer full): pointer to a #GstEvent that will
- *     replace the event pointed to by @old_event.
- *
- * Modifies a pointer to a #GstEvent to point to a different #GstEvent. This
- * function is similar to gst_event_replace() except that it takes ownership of
- * @new_event.
- *
- * Either @new_event or the #GstEvent pointed to by @old_event may be NULL.
- *
- * Returns: TRUE if @new_event was different from @old_event
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_event_take (GstEvent **old_event, GstEvent *new_event);
-#endif
-
-static inline gboolean
-gst_event_take (GstEvent **old_event, GstEvent *new_event)
-{
-  return gst_mini_object_take ((GstMiniObject **) old_event, (GstMiniObject *) new_event);
-}
-
-/**
- * GstQOSType:
- * @GST_QOS_TYPE_OVERFLOW: The QoS event type that is produced when downstream
- *    elements are producing data too quickly and the element can't keep up
- *    processing the data. Upstream should reduce their processing rate. This
- *    type is also used when buffers arrive early or in time.
- * @GST_QOS_TYPE_UNDERFLOW: The QoS event type that is produced when downstream
- *    elements are producing data too slowly and need to speed up their processing
- *    rate.
- * @GST_QOS_TYPE_THROTTLE: The QoS event type that is produced when the
- *    application enabled throttling to limit the datarate.
- *
- * The different types of QoS events that can be given to the
- * gst_event_new_qos() method.
- */
-typedef enum {
-  GST_QOS_TYPE_OVERFLOW        = 0,
-  GST_QOS_TYPE_UNDERFLOW       = 1,
-  GST_QOS_TYPE_THROTTLE        = 2
-} GstQOSType;
-
-/**
- * GstEvent:
- * @mini_object: the parent structure
- * @type: the #GstEventType of the event
- * @timestamp: the timestamp of the event
- * @seqnum: the sequence number of the event
- *
- * A #GstEvent.
- */
-struct _GstEvent {
-  GstMiniObject mini_object;
-
-  /*< public >*/ /* with COW */
-  GstEventType  type;
-  guint64       timestamp;
-  guint32       seqnum;
-};
-
-const gchar*    gst_event_type_get_name         (GstEventType type);
-GQuark          gst_event_type_to_quark         (GstEventType type);
-GstEventTypeFlags
-                gst_event_type_get_flags        (GstEventType type);
-
-
-/* refcounting */
-/**
- * gst_event_ref:
- * @event: The event to refcount
- *
- * Increase the refcount of this event.
- *
- * Returns: (transfer full): @event (for convenience when doing assignments)
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstEvent * gst_event_ref (GstEvent * event);
-#endif
-
-static inline GstEvent *
-gst_event_ref (GstEvent * event)
-{
-  return (GstEvent *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (event));
-}
-
-/**
- * gst_event_unref:
- * @event: (transfer full): the event to refcount
- *
- * Decrease the refcount of an event, freeing it if the refcount reaches 0.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_event_unref (GstEvent * event);
-#endif
-
-static inline void
-gst_event_unref (GstEvent * event)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (event));
-}
-
-/* copy event */
-/**
- * gst_event_copy:
- * @event: The event to copy
- *
- * Copy the event using the event specific copy function.
- *
- * Returns: (transfer full): the new event
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstEvent * gst_event_copy (const GstEvent * event);
-#endif
-
-static inline GstEvent *
-gst_event_copy (const GstEvent * event)
-{
-  return GST_EVENT_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (event)));
-}
-
-GType           gst_event_get_type              (void);
-
-/* custom event */
-GstEvent*       gst_event_new_custom            (GstEventType type, GstStructure *structure) G_GNUC_MALLOC;
-
-const GstStructure *
-                gst_event_get_structure         (GstEvent *event);
-GstStructure *  gst_event_writable_structure    (GstEvent *event);
-
-gboolean        gst_event_has_name              (GstEvent *event, const gchar *name);
-
-/* identifiers for events and messages */
-guint32         gst_event_get_seqnum            (GstEvent *event);
-void            gst_event_set_seqnum            (GstEvent *event, guint32 seqnum);
-
-/* Stream start event */
-GstEvent *      gst_event_new_stream_start      (const gchar *stream_id) G_GNUC_MALLOC;
-void            gst_event_parse_stream_start    (GstEvent *event, const gchar **stream_id);
-
-/* flush events */
-GstEvent *      gst_event_new_flush_start       (void) G_GNUC_MALLOC;
-
-GstEvent *      gst_event_new_flush_stop        (gboolean reset_time) G_GNUC_MALLOC;
-void            gst_event_parse_flush_stop      (GstEvent *event, gboolean *reset_time);
-
-/* EOS event */
-GstEvent *      gst_event_new_eos               (void) G_GNUC_MALLOC;
-
-/* GAP event */
-GstEvent *      gst_event_new_gap               (GstClockTime   timestamp,
-                                                 GstClockTime   duration) G_GNUC_MALLOC;
-
-void            gst_event_parse_gap             (GstEvent     * event,
-                                                 GstClockTime * timestamp,
-                                                 GstClockTime * duration);
-
-/* Caps events */
-GstEvent *      gst_event_new_caps              (GstCaps *caps) G_GNUC_MALLOC;
-void            gst_event_parse_caps            (GstEvent *event, GstCaps **caps);
-
-/* segment event */
-GstEvent*       gst_event_new_segment           (const GstSegment *segment) G_GNUC_MALLOC;
-void            gst_event_parse_segment         (GstEvent *event, const GstSegment **segment);
-void            gst_event_copy_segment          (GstEvent *event, GstSegment *segment);
-
-/* tag event */
-GstEvent*       gst_event_new_tag               (GstTagList *taglist) G_GNUC_MALLOC;
-void            gst_event_parse_tag             (GstEvent *event, GstTagList **taglist);
-
-/* TOC event */
-GstEvent*      gst_event_new_toc                (GstToc *toc, gboolean updated);
-void           gst_event_parse_toc              (GstEvent *event, GstToc **toc, gboolean *updated);
-
-
-/* buffer */
-GstEvent *      gst_event_new_buffer_size       (GstFormat format, gint64 minsize, gint64 maxsize,
-                                                 gboolean async) G_GNUC_MALLOC;
-void            gst_event_parse_buffer_size     (GstEvent *event, GstFormat *format, gint64 *minsize,
-                                                 gint64 *maxsize, gboolean *async);
-
-/* sink message */
-GstEvent*       gst_event_new_sink_message      (const gchar *name, GstMessage *msg) G_GNUC_MALLOC;
-void            gst_event_parse_sink_message    (GstEvent *event, GstMessage **msg);
-
-/* QOS events */
-GstEvent*       gst_event_new_qos               (GstQOSType type, gdouble proportion,
-                                                 GstClockTimeDiff diff, GstClockTime timestamp) G_GNUC_MALLOC;
-void            gst_event_parse_qos             (GstEvent *event, GstQOSType *type,
-                                                 gdouble *proportion, GstClockTimeDiff *diff,
-                                                 GstClockTime *timestamp);
-/* seek event */
-GstEvent*       gst_event_new_seek              (gdouble rate, GstFormat format, GstSeekFlags flags,
-                                                 GstSeekType start_type, gint64 start,
-                                                 GstSeekType stop_type, gint64 stop) G_GNUC_MALLOC;
-void            gst_event_parse_seek            (GstEvent *event, gdouble *rate, GstFormat *format,
-                                                 GstSeekFlags *flags,
-                                                 GstSeekType *start_type, gint64 *start,
-                                                 GstSeekType *stop_type, gint64 *stop);
-
-/* navigation event */
-GstEvent*       gst_event_new_navigation        (GstStructure *structure) G_GNUC_MALLOC;
-
-/* latency event */
-GstEvent*       gst_event_new_latency           (GstClockTime latency) G_GNUC_MALLOC;
-void            gst_event_parse_latency         (GstEvent *event, GstClockTime *latency);
-
-/* step event */
-GstEvent*       gst_event_new_step              (GstFormat format, guint64 amount, gdouble rate,
-                                                 gboolean flush, gboolean intermediate) G_GNUC_MALLOC;
-void            gst_event_parse_step            (GstEvent *event, GstFormat *format, guint64 *amount,
-                                                 gdouble *rate, gboolean *flush, gboolean *intermediate);
-
-/* renegotiate event */
-GstEvent*       gst_event_new_reconfigure       (void) G_GNUC_MALLOC;
-
-/* TOC select event */
-GstEvent*       gst_event_new_toc_select        (const gchar *uid) G_GNUC_MALLOC;
-void            gst_event_parse_toc_select      (GstEvent *event, gchar **uid);
-
-/* segment-done event */
-GstEvent*       gst_event_new_segment_done      (GstFormat format, gint64 position) G_GNUC_MALLOC;
-void            gst_event_parse_segment_done    (GstEvent *event, GstFormat *format, gint64 *position);
-
-G_END_DECLS
-
-#endif /* __GST_EVENT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstformat.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstformat.h
deleted file mode 100644
index 13dad037..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstformat.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstformat.h: Header for GstFormat types used in queries and
- *              seeking.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_FORMAT_H__
-#define __GST_FORMAT_H__
-
-#include <glib.h>
-
-#include <gst/gstiterator.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstFormat:
- * @GST_FORMAT_UNDEFINED: undefined format
- * @GST_FORMAT_DEFAULT: the default format of the pad/element. This can be
- *    samples for raw audio, frames/fields for raw video (some, but not all,
- *    elements support this; use @GST_FORMAT_TIME if you don't have a good
- *    reason to query for samples/frames)
- * @GST_FORMAT_BYTES: bytes
- * @GST_FORMAT_TIME: time in nanoseconds
- * @GST_FORMAT_BUFFERS: buffers (few, if any, elements implement this as of
- *     May 2009)
- * @GST_FORMAT_PERCENT: percentage of stream (few, if any, elements implement
- *     this as of May 2009)
- *
- * Standard predefined formats
- */
-/* NOTE: don't forget to update the table in gstformat.c when changing
- * this enum */
-typedef enum {
-  GST_FORMAT_UNDEFINED  =  0, /* must be first in list */
-  GST_FORMAT_DEFAULT    =  1,
-  GST_FORMAT_BYTES      =  2,
-  GST_FORMAT_TIME       =  3,
-  GST_FORMAT_BUFFERS    =  4,
-  GST_FORMAT_PERCENT    =  5
-} GstFormat;
-
-/* a percentage is always relative to 1000000 */
-/**
- * GST_FORMAT_PERCENT_MAX:
- *
- * The PERCENT format is between 0 and this value
- */
-#define GST_FORMAT_PERCENT_MAX          G_GINT64_CONSTANT (1000000)
-/**
- * GST_FORMAT_PERCENT_SCALE:
- *
- * The value used to scale down the reported PERCENT format value to
- * its real value.
- */
-#define GST_FORMAT_PERCENT_SCALE        G_GINT64_CONSTANT (10000)
-
-typedef struct _GstFormatDefinition GstFormatDefinition;
-
-/**
- * GstFormatDefinition:
- * @value: The unique id of this format
- * @nick: A short nick of the format
- * @description: A longer description of the format
- * @quark: A quark for the nick
- *
- * A format definition
- */
-struct _GstFormatDefinition
-{
-  GstFormat    value;
-  const gchar *nick;
-  const gchar *description;
-  GQuark       quark;
-};
-
-const gchar*    gst_format_get_name             (GstFormat format);
-GQuark          gst_format_to_quark             (GstFormat format);
-
-/* register a new format */
-GstFormat       gst_format_register             (const gchar *nick,
-                                                 const gchar *description);
-GstFormat       gst_format_get_by_nick          (const gchar *nick);
-
-/* check if a format is in an array of formats */
-gboolean        gst_formats_contains            (const GstFormat *formats, GstFormat format);
-
-/* query for format details */
-const GstFormatDefinition*
-                gst_format_get_details          (GstFormat format);
-GstIterator*    gst_format_iterate_definitions  (void);
-
-G_END_DECLS
-
-#endif /* __GST_FORMAT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstghostpad.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstghostpad.h
deleted file mode 100644
index 77c79c4f..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstghostpad.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *                    2005 Andy Wingo <wingo@pobox.com>
- *
- * gstghostpad.h: Proxy pads
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_GHOST_PAD_H__
-#define __GST_GHOST_PAD_H__
-
-
-#include <gst/gstpad.h>
-
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PROXY_PAD              (gst_proxy_pad_get_type ())
-#define GST_IS_PROXY_PAD(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PROXY_PAD))
-#define GST_IS_PROXY_PAD_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PROXY_PAD))
-#define GST_PROXY_PAD(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PROXY_PAD, GstProxyPad))
-#define GST_PROXY_PAD_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PROXY_PAD, GstProxyPadClass))
-
-typedef struct _GstProxyPad GstProxyPad;
-typedef struct _GstProxyPadPrivate GstProxyPadPrivate;
-typedef struct _GstProxyPadClass GstProxyPadClass;
-
-struct _GstProxyPad
-{
-  GstPad pad;
-
-  /*< private >*/
-  GstProxyPadPrivate *priv;
-};
-
-struct _GstProxyPadClass
-{
-  GstPadClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[1];
-};
-
-GType gst_proxy_pad_get_type (void);
-
-GstProxyPad*     gst_proxy_pad_get_internal     (GstProxyPad *pad);
-
-
-GstIterator*        gst_proxy_pad_iterate_internal_links_default (GstPad *pad, GstObject *parent) G_GNUC_MALLOC;
-GstFlowReturn       gst_proxy_pad_chain_default                  (GstPad *pad, GstObject *parent,
-                                                                  GstBuffer *buffer);
-GstFlowReturn       gst_proxy_pad_chain_list_default             (GstPad *pad, GstObject *parent,
-                                                                  GstBufferList *list);
-GstFlowReturn       gst_proxy_pad_getrange_default               (GstPad *pad, GstObject *parent,
-                                                                  guint64 offset, guint size,
-                                                                  GstBuffer **buffer);
-
-#define GST_TYPE_GHOST_PAD              (gst_ghost_pad_get_type ())
-#define GST_IS_GHOST_PAD(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_GHOST_PAD))
-#define GST_IS_GHOST_PAD_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GHOST_PAD))
-#define GST_GHOST_PAD(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_GHOST_PAD, GstGhostPad))
-#define GST_GHOST_PAD_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_GHOST_PAD, GstGhostPadClass))
-#define GST_GHOST_PAD_CAST(obj)         ((GstGhostPad*)(obj))
-
-/**
- * GstGhostPad:
- *
- * Opaque #GstGhostPad structure.
- */
-typedef struct _GstGhostPad GstGhostPad;
-typedef struct _GstGhostPadPrivate GstGhostPadPrivate;
-typedef struct _GstGhostPadClass GstGhostPadClass;
-
-struct _GstGhostPad
-{
-  GstProxyPad pad;
-
-  /*< private >*/
-  GstGhostPadPrivate *priv;
-};
-
-struct _GstGhostPadClass
-{
-  GstProxyPadClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-
-GType            gst_ghost_pad_get_type          (void);
-
-GstPad*          gst_ghost_pad_new               (const gchar *name, GstPad *target) G_GNUC_MALLOC;
-GstPad*          gst_ghost_pad_new_no_target     (const gchar *name, GstPadDirection dir) G_GNUC_MALLOC;
-
-GstPad*          gst_ghost_pad_new_from_template (const gchar *name, GstPad * target, GstPadTemplate * templ) G_GNUC_MALLOC;
-GstPad*          gst_ghost_pad_new_no_target_from_template (const gchar *name, GstPadTemplate * templ) G_GNUC_MALLOC;
-
-GstPad*          gst_ghost_pad_get_target        (GstGhostPad *gpad);
-gboolean         gst_ghost_pad_set_target        (GstGhostPad *gpad, GstPad *newtarget);
-
-gboolean         gst_ghost_pad_construct         (GstGhostPad *gpad);
-
-gboolean         gst_ghost_pad_activate_mode_default  (GstPad * pad, GstObject * parent,
-                                                       GstPadMode mode, gboolean active);
-
-gboolean         gst_ghost_pad_internal_activate_mode_default   (GstPad * pad, GstObject * parent,
-                                                                 GstPadMode mode, gboolean active);
-
-G_END_DECLS
-
-#endif /* __GST_GHOST_PAD_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstinfo.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstinfo.h
deleted file mode 100644
index 155851cc..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstinfo.h
+++ /dev/null
@@ -1,1515 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gstinfo.h: debugging functions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSTINFO_H__
-#define __GSTINFO_H__
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gst/gstconfig.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstDebugLevel:
- * @GST_LEVEL_NONE: No debugging level specified or desired. Used to deactivate
- *  debugging output.
- * @GST_LEVEL_ERROR: Error messages are to be used only when an error occured
- *  that stops the application from keeping working correctly.
- *  An examples is gst_element_error, which outputs a message with this priority.
- *  It does not mean that the application is terminating as with g_errror.
- * @GST_LEVEL_WARNING: Warning messages are to inform about abnormal behaviour
- *  that could lead to problems or weird behaviour later on. An example of this
- *  would be clocking issues ("your computer is pretty slow") or broken input
- *  data ("Can't synchronize to stream.")
- * @GST_LEVEL_FIXME: Fixme messages are messages that indicate that something
- *  in the executed code path is not fully implemented or handled yet. Note
- *  that this does not replace proper error handling in any way, the purpose
- *  of this message is to make it easier to spot incomplete/unfinished pieces
- *  of code when reading the debug log.
- * @GST_LEVEL_INFO: Informational messages should be used to keep the developer
- *  updated about what is happening.
- *  Examples where this should be used are when a typefind function has
- *  successfully determined the type of the stream or when an mp3 plugin detects
- *  the format to be used. ("This file has mono sound.")
- * @GST_LEVEL_DEBUG: Debugging messages should be used when something common
- *  happens that is not the expected default behavior, or something that's
- *  useful to know but doesn't happen all the time (ie. per loop iteration or
- *  buffer processed or event handled).
- *  An example would be notifications about state changes or receiving/sending
- *  of events.
- * @GST_LEVEL_LOG: Log messages are messages that are very common but might be
- *  useful to know. As a rule of thumb a pipeline that is iterating as expected
- *  should never output anything else but LOG messages. Use this log level to
- *  log recurring information in chain functions and loop functions, for
- *  example.
- * @GST_LEVEL_TRACE: Tracing-related messages.
- *  Examples for this are referencing/dereferencing of objects.
- * @GST_LEVEL_MEMDUMP: memory dump messages are used to log (small) chunks of
- *  data as memory dumps in the log. They will be displayed as hexdump with
- *  ASCII characters.
- * @GST_LEVEL_COUNT: The number of defined debugging levels.
- *
- * The level defines the importance of a debugging message. The more important a
- * message is, the greater the probability that the debugging system outputs it.
- */
-typedef enum {
-  GST_LEVEL_NONE = 0,
-  GST_LEVEL_ERROR = 1,
-  GST_LEVEL_WARNING = 2,
-  GST_LEVEL_FIXME = 3,
-  GST_LEVEL_INFO = 4,
-  GST_LEVEL_DEBUG = 5,
-  GST_LEVEL_LOG = 6,
-  GST_LEVEL_TRACE = 7,
-  /* add more */
-  GST_LEVEL_MEMDUMP = 9,
-  /* add more */
-  GST_LEVEL_COUNT
-} GstDebugLevel;
-
-/**
- * GST_LEVEL_DEFAULT:
- *
- * Defines the default debugging level to be used with GStreamer. It is normally
- * set to #GST_LEVEL_NONE so nothing get printed.
- * As it can be configured at compile time, developer builds may chose to
- * override that though.
- * You can use this as an argument to gst_debug_set_default_threshold() to
- * reset the debugging output to default behaviour.
- */
-#ifndef GST_LEVEL_DEFAULT
-#define GST_LEVEL_DEFAULT GST_LEVEL_NONE
-#endif
-
-/* defines for format (colors etc)
- * don't change them around, it uses terminal layout
- * Terminal color strings:
- * 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
- * Text color codes:
- * 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
- * Background color codes:
- * 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
- */
-/**
- * GstDebugColorFlags:
- * @GST_DEBUG_FG_BLACK: Use black as foreground color.
- * @GST_DEBUG_FG_RED: Use red as foreground color.
- * @GST_DEBUG_FG_GREEN: Use green as foreground color.
- * @GST_DEBUG_FG_YELLOW: Use yellow as foreground color.
- * @GST_DEBUG_FG_BLUE: Use blue as foreground color.
- * @GST_DEBUG_FG_MAGENTA: Use magenta as foreground color.
- * @GST_DEBUG_FG_CYAN: Use cyan as foreground color.
- * @GST_DEBUG_FG_WHITE: Use white as foreground color.
- * @GST_DEBUG_BG_BLACK: Use black as background color.
- * @GST_DEBUG_BG_RED: Use red as background color.
- * @GST_DEBUG_BG_GREEN: Use green as background color.
- * @GST_DEBUG_BG_YELLOW: Use yellow as background color.
- * @GST_DEBUG_BG_BLUE: Use blue as background color.
- * @GST_DEBUG_BG_MAGENTA: Use magenta as background color.
- * @GST_DEBUG_BG_CYAN: Use cyan as background color.
- * @GST_DEBUG_BG_WHITE: Use white as background color.
- * @GST_DEBUG_BOLD: Make the output bold.
- * @GST_DEBUG_UNDERLINE: Underline the output.
- *
- * These are some terminal style flags you can use when creating your
- * debugging categories to make them stand out in debugging output.
- */
-typedef enum {
-  /* colors */
-  GST_DEBUG_FG_BLACK		= 0x0000,
-  GST_DEBUG_FG_RED		= 0x0001,
-  GST_DEBUG_FG_GREEN		= 0x0002,
-  GST_DEBUG_FG_YELLOW		= 0x0003,
-  GST_DEBUG_FG_BLUE		= 0x0004,
-  GST_DEBUG_FG_MAGENTA		= 0x0005,
-  GST_DEBUG_FG_CYAN		= 0x0006,
-  GST_DEBUG_FG_WHITE		= 0x0007,
-  /* background colors */
-  GST_DEBUG_BG_BLACK		= 0x0000,
-  GST_DEBUG_BG_RED		= 0x0010,
-  GST_DEBUG_BG_GREEN		= 0x0020,
-  GST_DEBUG_BG_YELLOW		= 0x0030,
-  GST_DEBUG_BG_BLUE		= 0x0040,
-  GST_DEBUG_BG_MAGENTA		= 0x0050,
-  GST_DEBUG_BG_CYAN		= 0x0060,
-  GST_DEBUG_BG_WHITE		= 0x0070,
-  /* other formats */
-  GST_DEBUG_BOLD		= 0x0100,
-  GST_DEBUG_UNDERLINE		= 0x0200
-} GstDebugColorFlags;
-
-#define GST_DEBUG_FG_MASK	(0x000F)
-#define GST_DEBUG_BG_MASK	(0x00F0)
-#define GST_DEBUG_FORMAT_MASK	(0xFF00)
-
-typedef struct _GstDebugCategory GstDebugCategory;
-/**
- * GstDebugCategory:
- *
- * This is the struct that describes the categories. Once initialized with
- * #GST_DEBUG_CATEGORY_INIT, its values can't be changed anymore.
- */
-struct _GstDebugCategory {
-  /*< private >*/
-  gint                  threshold;
-  guint			color;		/* see defines above */
-
-  const gchar *		name;
-  const gchar *		description;
-};
-
-/********** some convenience macros for debugging **********/
-
-/**
- * GST_STR_NULL:
- * @str: The string to check.
- *
- * Macro to use when a string must not be NULL, but may be NULL. If the string
- * is NULL, "(NULL)" is printed instead.
- * In GStreamer printf string arguments may not be NULL, because on some
- * platforms (ie Solaris) the libc crashes in that case. This includes debugging
- * strings.
- */
-#define GST_STR_NULL(str) ((str) ? (str) : "(NULL)")
-
-/* FIXME, not MT safe */
-/**
- * GST_DEBUG_PAD_NAME:
- * @pad: The pad to debug.
- *
- * Evaluates to 2 strings, that describe the pad. Often used in debugging
- * statements.
- */
-#define GST_DEBUG_PAD_NAME(pad) \
-  (pad != NULL) ?  \
-  ((GST_OBJECT_PARENT(pad) != NULL) ? \
-  GST_STR_NULL (GST_OBJECT_NAME (GST_OBJECT_PARENT(pad))) : \
-  "''" ) : "''", \
-  (pad != NULL) ? GST_STR_NULL (GST_OBJECT_NAME (pad)) : "''"
-
-/**
- * GST_FUNCTION:
- *
- * This macro should evaluate to the name of the current function and be should
- * be defined when configuring your project, as it is compiler dependant. If it
- * is not defined, some default value is used. It is used to provide debugging
- * output with the function name of the message.
- *
- * Note that this is different from G_STRFUNC as we do not want the full
- * function signature in C++ code.
- */
-#ifndef GST_FUNCTION
-#if defined (__GNUC__) || (defined (_MSC_VER) && _MSC_VER >= 1300)
-#  define GST_FUNCTION     ((const char*) (__FUNCTION__))
-#elif defined (__STDC__) && defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#  define GST_FUNCTION     ((const char*) (__func__))
-#else
-#  define GST_FUNCTION     ((const char*) ("???"))
-#endif
-#endif /* ifndef GST_FUNCTION */
-
-
-typedef struct _GstDebugMessage GstDebugMessage;
-
-/**
- * GstLogFunction:
- * @category: a #GstDebugCategory
- * @level: a #GstDebugLevel
- * @file: file name
- * @function: function name
- * @line: line number
- * @object: a #GObject
- * @message: the message
- * @user_data: user data for the log function
- *
- * Function prototype for a logging function that can be registered with
- * gst_debug_add_log_function().
- * Use G_GNUC_NO_INSTRUMENT on that function.
- */
-typedef void (*GstLogFunction)  (GstDebugCategory * category,
-                                 GstDebugLevel      level,
-                                 const gchar      * file,
-                                 const gchar      * function,
-                                 gint               line,
-                                 GObject          * object,
-                                 GstDebugMessage  * message,
-                                 gpointer           user_data);
-
-#ifdef GST_USING_PRINTF_EXTENSION
-
-/* not using G_GNUC_PRINTF, since gcc will choke on GST_PTR_FORMAT being %P */
-void		    gst_debug_log            (GstDebugCategory * category,
-                                          GstDebugLevel      level,
-                                          const gchar      * file,
-                                          const gchar      * function,
-                                          gint               line,
-                                          GObject          * object,
-                                          const gchar      * format,
-                                          ...) G_GNUC_NO_INSTRUMENT;
-
-#else /* GST_USING_PRINTF_EXTENSION */
-
-void		    gst_debug_log            (GstDebugCategory * category,
-                                          GstDebugLevel      level,
-                                          const gchar      * file,
-                                          const gchar      * function,
-                                          gint               line,
-                                          GObject          * object,
-                                          const gchar      * format,
-                                          ...) G_GNUC_PRINTF (7, 8) G_GNUC_NO_INSTRUMENT;
-
-#endif /* GST_USING_PRINTF_EXTENSION */
-
-void            gst_debug_log_valist     (GstDebugCategory * category,
-                                          GstDebugLevel      level,
-                                          const gchar      * file,
-                                          const gchar      * function,
-                                          gint	              line,
-                                          GObject          * object,
-                                          const gchar      * format,
-                                          va_list            args) G_GNUC_NO_INSTRUMENT;
-
-/* do not use this function, use the GST_DEBUG_CATEGORY_INIT macro */
-GstDebugCategory *_gst_debug_category_new (const gchar * name,
-                                           guint         color,
-                                           const gchar * description);
-/* do not use this function, use the GST_DEBUG_CATEGORY_GET macro */
-GstDebugCategory *_gst_debug_get_category (const gchar *name);
-
-
-/* do not use this function, use the GST_CAT_MEMDUMP_* macros */
-void _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file,
-    const gchar * func, gint line, GObject * obj, const gchar * msg,
-    const guint8 * data, guint length);
-
-/* we define this to avoid a compiler warning regarding a cast from a function
- * pointer to a void pointer
- * (see https://bugzilla.gnome.org/show_bug.cgi?id=309253)
- */
-typedef	void (* GstDebugFuncPtr)	(void);
-
-/* do no use these functions, use the GST_DEBUG*_FUNCPTR macros */
-void	_gst_debug_register_funcptr	(GstDebugFuncPtr	func,
-					 const gchar *		ptrname);
-const gchar *
-	_gst_debug_nameof_funcptr	(GstDebugFuncPtr	func) G_GNUC_NO_INSTRUMENT;
-
-
-const gchar   * gst_debug_message_get    (GstDebugMessage  * message);
-
-void            gst_debug_log_default    (GstDebugCategory * category,
-                                          GstDebugLevel      level,
-                                          const gchar      * file,
-                                          const gchar      * function,
-                                          gint               line,
-                                          GObject          * object,
-                                          GstDebugMessage  * message,
-                                          gpointer           unused) G_GNUC_NO_INSTRUMENT;
-
-const gchar *   gst_debug_level_get_name (GstDebugLevel level);
-
-void            gst_debug_add_log_function            (GstLogFunction func,
-                                                       gpointer       user_data,
-                                                       GDestroyNotify notify);
-
-guint           gst_debug_remove_log_function         (GstLogFunction func);
-guint           gst_debug_remove_log_function_by_data (gpointer       data);
-
-void            gst_debug_set_active  (gboolean active);
-gboolean        gst_debug_is_active   (void);
-
-void            gst_debug_set_colored (gboolean colored);
-gboolean        gst_debug_is_colored  (void);
-
-void            gst_debug_set_default_threshold      (GstDebugLevel level);
-GstDebugLevel   gst_debug_get_default_threshold      (void);
-void            gst_debug_set_threshold_for_name     (const gchar * name,
-                                                      GstDebugLevel level);
-void            gst_debug_unset_threshold_for_name   (const gchar * name);
-
-
-void            gst_debug_category_free              (GstDebugCategory *	category);
-void	            gst_debug_category_set_threshold     (GstDebugCategory *	category,
-                                                      GstDebugLevel		level);
-void            gst_debug_category_reset_threshold   (GstDebugCategory *	category);
-GstDebugLevel   gst_debug_category_get_threshold     (GstDebugCategory *	category);
-const gchar *   gst_debug_category_get_name          (GstDebugCategory *	category);
-guint           gst_debug_category_get_color         (GstDebugCategory *	category);
-const gchar *   gst_debug_category_get_description   (GstDebugCategory *	category);
-GSList *        gst_debug_get_all_categories	(void);
-
-
-gchar * gst_debug_construct_term_color (guint colorinfo);
-gint    gst_debug_construct_win_color  (guint colorinfo);
-
-
-#ifndef GST_DISABLE_GST_DEBUG
-
-#define gst_debug_add_log_function(func,data,notify) \
-G_STMT_START{                                        \
-  if (func == gst_debug_log_default) {               \
-    gst_debug_add_log_function(NULL,data,notify);    \
-  } else {                                           \
-    gst_debug_add_log_function(func,data,notify);    \
-  }                                                  \
-}G_STMT_END
-
-#define gst_debug_remove_log_function(func)   \
-    (func == gst_debug_log_default) ?         \
-        gst_debug_remove_log_function(NULL) : \
-        gst_debug_remove_log_function(func)
-
-/**
- * GST_DEBUG_CATEGORY:
- * @cat: the category
- *
- * Defines a GstDebugCategory variable.
- * This macro expands to nothing if debugging is disabled.
- */
-#define GST_DEBUG_CATEGORY(cat) GstDebugCategory *cat = NULL
-/**
- * GST_DEBUG_CATEGORY_EXTERN:
- * @cat: the category
- *
- * Declares a GstDebugCategory variable as extern. Use in header files.
- * This macro expands to nothing if debugging is disabled.
- */
-#define GST_DEBUG_CATEGORY_EXTERN(cat) extern GstDebugCategory *cat
-
-/**
- * GST_DEBUG_CATEGORY_STATIC:
- * @cat: the category
- *
- * Defines a static GstDebugCategory variable.
- * This macro expands to nothing if debugging is disabled.
- */
-#define GST_DEBUG_CATEGORY_STATIC(cat) static GstDebugCategory *cat = NULL
-
-/**
- * GST_DEBUG_CATEGORY_INIT:
- * @cat: the category to initialize.
- * @name: the name of the category.
- * @color: the colors to use for a color representation or 0 for no color.
- * @description: optional description of the category.
- *
- * Initializes a new #GstDebugCategory with the given properties and set to
- * the default threshold.
- *
- * <note>
- * <para>
- * This macro expands to nothing if debugging is disabled.
- * </para>
- * <para>
- * When naming your category, please follow the following conventions to ensure
- * that the pattern matching for categories works as expected. It is not
- * earth-shattering if you don't follow these conventions, but it would be nice
- * for everyone.
- * </para>
- * <para>
- * If you define a category for a plugin or a feature of it, name the category
- * like the feature. So if you wanted to write a "filesrc" element, you would
- * name the category "filesrc". Use lowercase letters only.
- * If you define more than one category for the same element, append an
- * underscore and an identifier to your categories, like this: "filesrc_cache"
- * </para>
- * <para>
- * If you create a library or an application using debugging categories, use a
- * common prefix followed by an underscore for all your categories. GStreamer
- * uses the GST prefix so GStreamer categories look like "GST_STATES". Be sure
- * to include uppercase letters.
- * </para>
- * </note>
- */
-#define GST_DEBUG_CATEGORY_INIT(cat,name,color,description) G_STMT_START{\
-  if (cat == NULL)							\
-    cat = _gst_debug_category_new (name,color,description);		\
-}G_STMT_END
-
-/**
- * GST_DEBUG_CATEGORY_GET:
- * @cat: the category to initialize.
- * @name: log category name
- *
- * Looks up an existing #GstDebugCategory by its @name and sets @cat. If the
- * category is not found, but GST_CAT_DEFAULT is defined, that is assigned to
- * @cat. Otherwise @cat will be NULL.
- *
- * |[
- * GST_DEBUG_CATEGORY_STATIC (gst_myplugin_debug);
- * #define GST_CAT_DEFAULT gst_myplugin_debug
- * GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
- * ...
- * GST_DEBUG_CATEGORY_INIT (gst_myplugin_debug, "myplugin", 0, "nice element");
- * GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
- * ]|
- */
-#ifdef GST_CAT_DEFAULT
-#define GST_DEBUG_CATEGORY_GET(cat,name)  G_STMT_START{\
-  cat = _gst_debug_get_category (name);			\
-  if (!cat) {						\
-    cat = GST_CAT_DEFAULT;				\
-  }							\
-}G_STMT_END
-#else
-#define GST_DEBUG_CATEGORY_GET(cat,name)  G_STMT_START{\
-  cat = _gst_debug_get_category (name);			\
-}G_STMT_END
-#endif
-
-/**
- * GST_CAT_DEFAULT:
- *
- * Default gstreamer core debug log category. Please define your own.
- */
-GST_EXPORT GstDebugCategory *	GST_CAT_DEFAULT;
-/* this symbol may not be used */
-GST_EXPORT gboolean			_gst_debug_enabled;
-
-/* the min debug level, used for quickly discarding debug
- * messages that fall under the threshold. */
-GST_EXPORT GstDebugLevel            _gst_debug_min;
-
-/**
- * GST_CAT_LEVEL_LOG:
- * @cat: category to use
- * @level: the severity of the message
- * @object: the #GObject the message belongs to or NULL if none
- * @...: A printf-style message to output
- *
- * Outputs a debugging message. This is the most general macro for outputting
- * debugging messages. You will probably want to use one of the ones described
- * below.
- */
-#ifdef G_HAVE_ISO_VARARGS
-#define GST_CAT_LEVEL_LOG(cat,level,object,...) G_STMT_START{		\
-  if (G_UNLIKELY (level <= _gst_debug_min)) {						\
-    gst_debug_log ((cat), (level), __FILE__, GST_FUNCTION, __LINE__,	\
-        (GObject *) (object), __VA_ARGS__);				\
-  }									\
-}G_STMT_END
-#else /* G_HAVE_GNUC_VARARGS */
-#ifdef G_HAVE_GNUC_VARARGS
-#define GST_CAT_LEVEL_LOG(cat,level,object,args...) G_STMT_START{	\
-  if (G_UNLIKELY (level <= _gst_debug_min)) {						\
-    gst_debug_log ((cat), (level), __FILE__, GST_FUNCTION, __LINE__,	\
-        (GObject *) (object), ##args );					\
-  }									\
-}G_STMT_END
-#else /* no variadic macros, use inline */
-static inline void
-GST_CAT_LEVEL_LOG_valist (GstDebugCategory * cat,
-    GstDebugLevel level, gpointer object, const char *format, va_list varargs)
-{
-  if (G_UNLIKELY (level <= _gst_debug_min)) {
-    gst_debug_log_valist (cat, level, "", "", 0, (GObject *) object, format,
-        varargs);
-  }
-}
-
-static inline void
-GST_CAT_LEVEL_LOG (GstDebugCategory * cat, GstDebugLevel level,
-    gpointer object, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, level, object, format, varargs);
-  va_end (varargs);
-}
-#endif
-#endif /* G_HAVE_ISO_VARARGS */
-
-/* This one doesn't have varargs in the macro, so it's different than all the
- * other macros and hence in a separate block right here. Docs chunks are
- * with the other doc chunks below though. */
-#define __GST_CAT_MEMDUMP_LOG(cat,object,msg,data,length) G_STMT_START{       \
-  if (G_UNLIKELY (GST_LEVEL_MEMDUMP <= _gst_debug_min)) {                    \
-    _gst_debug_dump_mem ((cat), __FILE__, GST_FUNCTION, __LINE__,             \
-        (GObject *) (object), (msg), (data), (length));                       \
-  }                                                                           \
-}G_STMT_END
-
-#define GST_CAT_MEMDUMP_OBJECT(cat,obj,msg,data,length)  \
-    __GST_CAT_MEMDUMP_LOG(cat,obj,msg,data,length)
-#define GST_CAT_MEMDUMP(cat,msg,data,length)             \
-    __GST_CAT_MEMDUMP_LOG(cat,NULL,msg,data,length)
-#define GST_MEMDUMP_OBJECT(obj,msg,data,length)          \
-    __GST_CAT_MEMDUMP_LOG(GST_CAT_DEFAULT,obj,msg,data,length)
-#define GST_MEMDUMP(msg,data,length)                     \
-    __GST_CAT_MEMDUMP_LOG(GST_CAT_DEFAULT,NULL,msg,data,length)
-
-/**
- * GST_CAT_ERROR_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an error message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_WARNING_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a warning message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_INFO_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an informational message belonging to the given object in the given
- * category.
- */
-/**
- * GST_CAT_DEBUG_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an debugging message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_LOG_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an logging message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_FIXME_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a fixme message belonging to the given object in the given category.
- */
-/**
- * GST_CAT_TRACE_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a tracing message belonging to the given object in the given
- * category.
- */
-/**
- * GST_CAT_MEMDUMP_OBJECT:
- * @cat: category to use
- * @obj: the #GObject the message belongs to
- * @msg: message string to log with the data
- * @data: pointer to the data to output
- * @length: length of the data to output
- *
- * Output a hexdump of @data relating to the given object in the given
- * category.
- */
-
-
-/**
- * GST_CAT_ERROR:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an error message in the given category.
- */
-/**
- * GST_CAT_WARNING:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an warning message in the given category.
- */
-/**
- * GST_CAT_INFO:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an informational message in the given category.
- */
-/**
- * GST_CAT_DEBUG:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an debugging message in the given category.
- */
-/**
- * GST_CAT_LOG:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an logging message in the given category.
- */
-/**
- * GST_CAT_FIXME:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output an fixme message in the given category.
- */
-/**
- * GST_CAT_TRACE:
- * @cat: category to use
- * @...: printf-style message to output
- *
- * Output a tracing message in the given category.
- */
-/**
- * GST_CAT_MEMDUMP:
- * @cat: category to use
- * @msg: message string to log with the data
- * @data: pointer to the data to output
- * @length: length of the data to output
- *
- * Output a hexdump of @data in the given category.
- */
-
-
-/**
- * GST_ERROR_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an error message belonging to the given object in the default category.
- */
-/**
- * GST_WARNING_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a warning message belonging to the given object in the default category.
- */
-/**
- * GST_INFO_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output an informational message belonging to the given object in the default
- * category.
- */
-/**
- * GST_DEBUG_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a debugging message belonging to the given object in the default
- * category.
- */
-/**
- * GST_LOG_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a logging message belonging to the given object in the default category.
- */
-/**
- * GST_FIXME_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a fixme message belonging to the given object in the default category.
- */
-/**
- * GST_TRACE_OBJECT:
- * @obj: the #GObject the message belongs to
- * @...: printf-style message to output
- *
- * Output a tracing message belonging to the given object in the default category.
- */
-/**
- * GST_MEMDUMP_OBJECT:
- * @obj: the #GObject the message belongs to
- * @msg: message string to log with the data
- * @data: pointer to the data to output
- * @length: length of the data to output
- *
- * Output a logging message belonging to the given object in the default category.
- */
-
-
-/**
- * GST_ERROR:
- * @...: printf-style message to output
- *
- * Output an error message in the default category.
- */
-/**
- * GST_WARNING:
- * @...: printf-style message to output
- *
- * Output a warning message in the default category.
- */
-/**
- * GST_INFO:
- * @...: printf-style message to output
- *
- * Output an informational message in the default category.
- */
-/**
- * GST_DEBUG:
- * @...: printf-style message to output
- *
- * Output a debugging message in the default category.
- */
-/**
- * GST_LOG:
- * @...: printf-style message to output
- *
- * Output a logging message in the default category.
- */
-/**
- * GST_FIXME:
- * @...: printf-style message to output
- *
- * Output a fixme message in the default category.
- */
-/**
- * GST_TRACE:
- * @...: printf-style message to output
- *
- * Output a tracing message in the default category.
- */
-/**
- * GST_MEMDUMP:
- * @msg: message string to log with the data
- * @data: pointer to the data to output
- * @length: length of the data to output
- *
- * Output a hexdump of @data.
- */
-
-#ifdef G_HAVE_ISO_VARARGS
-
-#define GST_CAT_ERROR_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_ERROR,   obj,  __VA_ARGS__)
-#define GST_CAT_WARNING_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_WARNING, obj,  __VA_ARGS__)
-#define GST_CAT_INFO_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_INFO,    obj,  __VA_ARGS__)
-#define GST_CAT_DEBUG_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_DEBUG,   obj,  __VA_ARGS__)
-#define GST_CAT_LOG_OBJECT(cat,obj,...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_LOG,     obj,  __VA_ARGS__)
-#define GST_CAT_FIXME_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_FIXME,   obj,  __VA_ARGS__)
-#define GST_CAT_TRACE_OBJECT(cat,obj,...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_TRACE,   obj,  __VA_ARGS__)
-
-#define GST_CAT_ERROR(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_ERROR,   NULL, __VA_ARGS__)
-#define GST_CAT_WARNING(cat,...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_WARNING, NULL, __VA_ARGS__)
-#define GST_CAT_INFO(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_INFO,    NULL, __VA_ARGS__)
-#define GST_CAT_DEBUG(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_DEBUG,   NULL, __VA_ARGS__)
-#define GST_CAT_LOG(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_LOG,     NULL, __VA_ARGS__)
-#define GST_CAT_FIXME(cat,...)			GST_CAT_LEVEL_LOG (cat, GST_LEVEL_FIXME,   NULL, __VA_ARGS__)
-#define GST_CAT_TRACE(cat,...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_TRACE,   NULL, __VA_ARGS__)
-
-#define GST_ERROR_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_ERROR,   obj,  __VA_ARGS__)
-#define GST_WARNING_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_WARNING, obj,  __VA_ARGS__)
-#define GST_INFO_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_INFO,    obj,  __VA_ARGS__)
-#define GST_DEBUG_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_DEBUG,   obj,  __VA_ARGS__)
-#define GST_LOG_OBJECT(obj,...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_LOG,     obj,  __VA_ARGS__)
-#define GST_FIXME_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_FIXME,   obj,  __VA_ARGS__)
-#define GST_TRACE_OBJECT(obj,...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_TRACE,   obj,  __VA_ARGS__)
-
-#define GST_ERROR(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_ERROR,   NULL, __VA_ARGS__)
-#define GST_WARNING(...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_WARNING, NULL, __VA_ARGS__)
-#define GST_INFO(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_INFO,    NULL, __VA_ARGS__)
-#define GST_DEBUG(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_DEBUG,   NULL, __VA_ARGS__)
-#define GST_LOG(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_LOG,     NULL, __VA_ARGS__)
-#define GST_FIXME(...)			GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_FIXME,   NULL, __VA_ARGS__)
-#define GST_TRACE(...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_TRACE,   NULL, __VA_ARGS__)
-
-#else
-#ifdef G_HAVE_GNUC_VARARGS
-
-#define GST_CAT_ERROR_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_ERROR,   obj,  ##args )
-#define GST_CAT_WARNING_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_WARNING, obj,  ##args )
-#define GST_CAT_INFO_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_INFO,    obj,  ##args )
-#define GST_CAT_DEBUG_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_DEBUG,   obj,  ##args )
-#define GST_CAT_LOG_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_LOG,     obj,  ##args )
-#define GST_CAT_FIXME_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_FIXME,   obj,  ##args )
-#define GST_CAT_TRACE_OBJECT(cat,obj,args...)	GST_CAT_LEVEL_LOG (cat, GST_LEVEL_TRACE,   obj,  ##args )
-
-#define GST_CAT_ERROR(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_ERROR,   NULL, ##args )
-#define GST_CAT_WARNING(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_WARNING, NULL, ##args )
-#define GST_CAT_INFO(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_INFO,    NULL, ##args )
-#define GST_CAT_DEBUG(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_DEBUG,   NULL, ##args )
-#define GST_CAT_LOG(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_LOG,     NULL, ##args )
-#define GST_CAT_FIXME(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_FIXME,   NULL, ##args )
-#define GST_CAT_TRACE(cat,args...)		GST_CAT_LEVEL_LOG (cat, GST_LEVEL_TRACE,   NULL, ##args )
-
-#define GST_ERROR_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_ERROR,   obj,  ##args )
-#define GST_WARNING_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_WARNING, obj,  ##args )
-#define GST_INFO_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_INFO,    obj,  ##args )
-#define GST_DEBUG_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_DEBUG,   obj,  ##args )
-#define GST_LOG_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_LOG,     obj,  ##args )
-#define GST_FIXME_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_FIXME,   obj,  ##args )
-#define GST_TRACE_OBJECT(obj,args...)	GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_TRACE,   obj,  ##args )
-
-#define GST_ERROR(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_ERROR,   NULL, ##args )
-#define GST_WARNING(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_WARNING, NULL, ##args )
-#define GST_INFO(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_INFO,    NULL, ##args )
-#define GST_DEBUG(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_DEBUG,   NULL, ##args )
-#define GST_LOG(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_LOG,     NULL, ##args )
-#define GST_FIXME(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_FIXME,   NULL, ##args )
-#define GST_TRACE(args...)		GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, GST_LEVEL_TRACE,   NULL, ##args )
-
-#else
-/* no variadic macros, use inline */
-static inline void
-GST_CAT_ERROR_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_ERROR, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_WARNING_OBJECT (GstDebugCategory * cat, gpointer obj,
-    const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_WARNING, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_INFO_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_INFO, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_DEBUG_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_DEBUG, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_LOG_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_LOG, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_FIXME_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_FIXME, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_TRACE_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_TRACE, obj, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_ERROR (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_ERROR, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_WARNING (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_WARNING, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_INFO (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_INFO, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_DEBUG (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_DEBUG, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_LOG (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_LOG, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_FIXME (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_FIXME, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_CAT_TRACE (GstDebugCategory * cat, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (cat, GST_LEVEL_TRACE, NULL, format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_ERROR_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_ERROR, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_WARNING_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_WARNING, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_INFO_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_INFO, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_DEBUG_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_DEBUG, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_LOG_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_LOG, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_FIXME_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_FIXME, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_TRACE_OBJECT (gpointer obj, const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_TRACE, obj, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_ERROR (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_ERROR, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_WARNING (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_WARNING, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_INFO (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_INFO, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_DEBUG (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_DEBUG, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_LOG (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_LOG, NULL,
-      format, varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_FIXME (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_FIXME, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-
-static inline void
-GST_TRACE (const char *format, ...)
-{
-  va_list varargs;
-
-  va_start (varargs, format);
-  GST_CAT_LEVEL_LOG_valist (GST_CAT_DEFAULT, GST_LEVEL_TRACE, NULL, format,
-      varargs);
-  va_end (varargs);
-}
-#endif
-#endif
-
-
-/********** function pointer stuff **********/
-
-/**
- * GST_DEBUG_REGISTER_FUNCPTR:
- * @ptr: pointer to the function to register
- *
- * Register a pointer to a function with its name, so it can later be used by
- * GST_DEBUG_FUNCPTR_NAME().
- *
- * Use this variant of #GST_DEBUG_FUNCPTR if you do not need to use @ptr.
- */
-#define GST_DEBUG_REGISTER_FUNCPTR(ptr) \
-  _gst_debug_register_funcptr((GstDebugFuncPtr)(ptr), #ptr)
-/**
- * GST_DEBUG_FUNCPTR:
- * @ptr: pointer to the function to register
- *
- * Register a pointer to a function with its name, so it can later be used by
- * GST_DEBUG_FUNCPTR_NAME().
- *
- * Returns: the value passed to @ptr.
- */
-#define GST_DEBUG_FUNCPTR(ptr) \
-  (_gst_debug_register_funcptr((GstDebugFuncPtr)(ptr), #ptr) , ptr)
-
-/**
- * GST_DEBUG_FUNCPTR_NAME:
- * @ptr: address of the function of which to look up the name
- *
- * Retrieves the name of the function, if it was previously registered with
- * GST_DEBUG_FUNCPTR(). If not, it returns a description of the pointer.
- *
- * This macro returns a constant string which must not be modified or
- * freed by the caller.
- */
-#define GST_DEBUG_FUNCPTR_NAME(ptr) \
-  _gst_debug_nameof_funcptr((GstDebugFuncPtr)ptr)
-
-
-#else /* GST_DISABLE_GST_DEBUG */
-
-
-#ifndef GST_INFO_C
-
-#if defined(__GNUC__) && __GNUC__ >= 3
-#  pragma GCC poison gst_debug_log
-#  pragma GCC poison gst_debug_log_valist
-#  pragma GCC poison _gst_debug_category_new
-#endif
-
-#define _gst_debug_min GST_LEVEL_NONE
-
-#define gst_debug_set_default_threshold(level)		G_STMT_START{ }G_STMT_END
-#define gst_debug_get_default_threshold()		(GST_LEVEL_NONE)
-
-#define gst_debug_level_get_name(level)				("NONE")
-#define gst_debug_message_get(message)  			("")
-#define gst_debug_add_log_function(func,data,notify)    G_STMT_START{ }G_STMT_END
-#define gst_debug_set_active(active)			G_STMT_START{ }G_STMT_END
-#define gst_debug_is_active()				(FALSE)
-#define gst_debug_set_colored(colored)			G_STMT_START{ }G_STMT_END
-#define gst_debug_is_colored()				(FALSE)
-#define gst_debug_set_default_threshold(level)		G_STMT_START{ }G_STMT_END
-#define gst_debug_get_default_threshold()		(GST_LEVEL_NONE)
-#define gst_debug_set_threshold_for_name(name,level)	G_STMT_START{ }G_STMT_END
-#define gst_debug_unset_threshold_for_name(name)	G_STMT_START{ }G_STMT_END
-
-/* we are using dummy function prototypes here to eat ';' as these macros are
- * used outside of functions */
-#define GST_DEBUG_CATEGORY(var)				void _gst_debug_dummy_##var (void)
-#define GST_DEBUG_CATEGORY_EXTERN(var)			void _gst_debug_dummy_extern_##var (void)
-#define GST_DEBUG_CATEGORY_STATIC(var)			void _gst_debug_dummy_static_##var (void)
-
-#define GST_DEBUG_CATEGORY_INIT(var,name,color,desc)	G_STMT_START{ }G_STMT_END
-#define GST_DEBUG_CATEGORY_GET(var,name)		G_STMT_START{ }G_STMT_END
-#define gst_debug_category_free(category)		G_STMT_START{ }G_STMT_END
-#define gst_debug_category_set_threshold(category,level) G_STMT_START{ }G_STMT_END
-#define gst_debug_category_reset_threshold(category)	G_STMT_START{ }G_STMT_END
-#define gst_debug_category_get_threshold(category)	(GST_LEVEL_NONE)
-#define gst_debug_category_get_name(cat)		("")
-#define gst_debug_category_get_color(cat)		(0)
-#define gst_debug_category_get_description(cat)		("")
-#define gst_debug_get_all_categories()			(NULL)
-#define gst_debug_construct_term_color(colorinfo)	(g_strdup ("00"))
-#define gst_debug_construct_win_color(colorinfo)	(0)
-
-#endif /* !GST_INFO_C */
-
-#ifdef G_HAVE_ISO_VARARGS
-
-#define GST_CAT_LEVEL_LOG(cat,level,...)		G_STMT_START{ }G_STMT_END
-
-#define GST_CAT_ERROR_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_WARNING_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_INFO_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_DEBUG_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_LOG_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_FIXME_OBJECT(...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_TRACE_OBJECT(...)			G_STMT_START{ }G_STMT_END
-
-#define GST_CAT_ERROR(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_WARNING(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_INFO(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_DEBUG(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_LOG(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_FIXME(...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_TRACE(...)				G_STMT_START{ }G_STMT_END
-
-#define GST_ERROR_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_WARNING_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_INFO_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_DEBUG_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_LOG_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_FIXME_OBJECT(...)				G_STMT_START{ }G_STMT_END
-#define GST_TRACE_OBJECT(...)				G_STMT_START{ }G_STMT_END
-
-#define GST_ERROR(...)					G_STMT_START{ }G_STMT_END
-#define GST_WARNING(...)				G_STMT_START{ }G_STMT_END
-#define GST_INFO(...)					G_STMT_START{ }G_STMT_END
-#define GST_DEBUG(...)					G_STMT_START{ }G_STMT_END
-#define GST_LOG(...)					G_STMT_START{ }G_STMT_END
-#define GST_FIXME(...)					G_STMT_START{ }G_STMT_END
-#define GST_TRACE(...)					G_STMT_START{ }G_STMT_END
-
-#else /* !G_HAVE_ISO_VARARGS */
-#ifdef G_HAVE_GNUC_VARARGS
-
-#define GST_CAT_LEVEL_LOG(cat,level,args...)		G_STMT_START{ }G_STMT_END
-
-#define GST_CAT_ERROR_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_WARNING_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_INFO_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_DEBUG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_LOG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_FIXME_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_TRACE_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-
-#define GST_CAT_ERROR(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_WARNING(args...)			G_STMT_START{ }G_STMT_END
-#define GST_CAT_INFO(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_DEBUG(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_LOG(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_FIXME(args...)				G_STMT_START{ }G_STMT_END
-#define GST_CAT_TRACE(args...)				G_STMT_START{ }G_STMT_END
-
-#define GST_ERROR_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_WARNING_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_INFO_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_DEBUG_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_LOG_OBJECT(args...)				G_STMT_START{ }G_STMT_END
-#define GST_FIXME_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-#define GST_TRACE_OBJECT(args...)			G_STMT_START{ }G_STMT_END
-
-#define GST_ERROR(args...)				G_STMT_START{ }G_STMT_END
-#define GST_WARNING(args...)				G_STMT_START{ }G_STMT_END
-#define GST_INFO(args...)				G_STMT_START{ }G_STMT_END
-#define GST_DEBUG(args...)				G_STMT_START{ }G_STMT_END
-#define GST_LOG(args...)				G_STMT_START{ }G_STMT_END
-#define GST_FIXME(args...)				G_STMT_START{ }G_STMT_END
-#define GST_TRACE(args...)				G_STMT_START{ }G_STMT_END
-
-#else /* !G_HAVE_GNUC_VARARGS */
-static inline void
-GST_CAT_LEVEL_LOG_valist (GstDebugCategory * cat,
-    GstDebugLevel level, gpointer object, const char *format, va_list varargs)
-{
-}
-
-static inline void
-GST_CAT_ERROR_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_WARNING_OBJECT (GstDebugCategory * cat, gpointer obj,
-    const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_INFO_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_DEBUG_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_LOG_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_FIXME_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_TRACE_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
-    ...)
-{
-}
-
-static inline void
-GST_CAT_ERROR (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_WARNING (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_INFO (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_DEBUG (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_LOG (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_FIXME (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_CAT_TRACE (GstDebugCategory * cat, const char *format, ...)
-{
-}
-
-static inline void
-GST_ERROR_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_WARNING_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_INFO_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_DEBUG_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_LOG_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_FIXME_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_TRACE_OBJECT (gpointer obj, const char *format, ...)
-{
-}
-
-static inline void
-GST_ERROR (const char *format, ...)
-{
-}
-
-static inline void
-GST_WARNING (const char *format, ...)
-{
-}
-
-static inline void
-GST_INFO (const char *format, ...)
-{
-}
-
-static inline void
-GST_DEBUG (const char *format, ...)
-{
-}
-
-static inline void
-GST_LOG (const char *format, ...)
-{
-}
-
-static inline void
-GST_FIXME (const char *format, ...)
-{
-}
-
-static inline void
-GST_TRACE (const char *format, ...)
-{
-}
-
-#endif /* G_HAVE_GNUC_VARARGS */
-#endif /* G_HAVE_ISO_VARARGS */
-
-#define GST_DEBUG_REGISTER_FUNCPTR(ptr) G_STMT_START{ }G_STMT_END
-#define GST_DEBUG_FUNCPTR(ptr) (ptr)
-#define GST_DEBUG_FUNCPTR_NAME(ptr) (g_strdup_printf ("%p", ptr))
-
-#define GST_CAT_MEMDUMP_OBJECT(cat,obj,msg,data,length) G_STMT_START{ }G_STMT_END
-#define GST_CAT_MEMDUMP(cat,msg,data,length)            G_STMT_START{ }G_STMT_END
-#define GST_MEMDUMP_OBJECT(obj,msg,data,length)         G_STMT_START{ }G_STMT_END
-#define GST_MEMDUMP(msg,data,length)                    G_STMT_START{ }G_STMT_END
-
-#endif /* GST_DISABLE_GST_DEBUG */
-
-
-void gst_debug_print_stack_trace (void);
-
-G_END_DECLS
-
-#endif /* __GSTINFO_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstiterator.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstiterator.h
deleted file mode 100644
index 2a21f8b3..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstiterator.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
- * Copyright (C) 2011 Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * gstiterator.h: Header for GstIterator
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_ITERATOR_H__
-#define __GST_ITERATOR_H__
-
-#include <glib-object.h> /* for GValue in the fold */
-#include <gst/gstconfig.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_ITERATOR (gst_iterator_get_type ())
-
-/**
- * GstIteratorResult:
- * @GST_ITERATOR_DONE:   No more items in the iterator
- * @GST_ITERATOR_OK:     An item was retrieved
- * @GST_ITERATOR_RESYNC: Datastructure changed while iterating
- * @GST_ITERATOR_ERROR:  An error happened
- *
- * The result of gst_iterator_next().
- */
-typedef enum {
-  GST_ITERATOR_DONE     = 0,
-  GST_ITERATOR_OK       = 1,
-  GST_ITERATOR_RESYNC   = 2,
-  GST_ITERATOR_ERROR    = 3
-} GstIteratorResult;
-
-typedef struct _GstIterator GstIterator;
-
-/**
- * GstIteratorItem:
- * @GST_ITERATOR_ITEM_SKIP:  Skip this item
- * @GST_ITERATOR_ITEM_PASS:  Return item
- * @GST_ITERATOR_ITEM_END:   Stop after this item.
- *
- * The result of a #GstIteratorItemFunction.
- */
-typedef enum {
-  GST_ITERATOR_ITEM_SKIP        = 0,
-  GST_ITERATOR_ITEM_PASS        = 1,
-  GST_ITERATOR_ITEM_END         = 2
-} GstIteratorItem;
-
-/**
- * GstIteratorCopyFunction:
- * @it: The original iterator
- * @copy: The copied iterator
- *
- * This function will be called when creating a copy of @it and should
- * create a copy of all custom iterator fields or increase their
- * reference counts.
- */
-typedef void              (*GstIteratorCopyFunction) (const GstIterator *it, GstIterator *copy);
-
-/**
- * GstIteratorItemFunction:
- * @it: the iterator
- * @item: the item being retrieved.
- *
- * The function that will be called after the next item of the iterator
- * has been retrieved. This function can be used to skip items or stop
- * the iterator.
- *
- * The function will be called with the iterator lock held.
- *
- * Returns: the result of the operation.
- */
-typedef GstIteratorItem   (*GstIteratorItemFunction)    (GstIterator *it, const GValue * item);
-
-/**
- * GstIteratorNextFunction:
- * @it: the iterator
- * @result: a pointer to hold the next item
- *
- * The function that will be called when the next element of the iterator
- * should be retrieved.
- *
- * Implementors of a #GstIterator should implement this
- * function and pass it to the constructor of the custom iterator.
- * The function will be called with the iterator lock held.
- *
- * Returns: the result of the operation.
- */
-typedef GstIteratorResult (*GstIteratorNextFunction)    (GstIterator *it, GValue *result);
-/**
- * GstIteratorResyncFunction:
- * @it: the iterator
- *
- * This function will be called whenever a concurrent update happened
- * to the iterated datastructure. The implementor of the iterator should
- * restart the iterator from the beginning and clean up any state it might
- * have.
- *
- * Implementors of a #GstIterator should implement this
- * function and pass it to the constructor of the custom iterator.
- * The function will be called with the iterator lock held.
- */
-typedef void              (*GstIteratorResyncFunction)  (GstIterator *it);
-/**
- * GstIteratorFreeFunction:
- * @it: the iterator
- *
- * This function will be called when the iterator is freed.
- *
- * Implementors of a #GstIterator should implement this
- * function and pass it to the constructor of the custom iterator.
- * The function will be called with the iterator lock held.
- */
-typedef void              (*GstIteratorFreeFunction)    (GstIterator *it);
-
-/**
- * GstIteratorForeachFunction:
- * @item: The item
- * @user_data: User data
- *
- * A function that is called by gst_iterator_foreach() for every element.
- */
-typedef void         (*GstIteratorForeachFunction)     (const GValue * item, gpointer user_data);
-
-/**
- * GstIteratorFoldFunction:
- * @item: the item to fold
- * @ret: a #GValue collecting the result
- * @user_data: data passed to gst_iterator_fold()
- *
- * A function to be passed to gst_iterator_fold().
- *
- * Returns: TRUE if the fold should continue, FALSE if it should stop.
- */
-typedef gboolean          (*GstIteratorFoldFunction)    (const GValue * item, GValue * ret, gpointer user_data);
-
-/**
- * GST_ITERATOR:
- * @it: the #GstIterator value
- *
- * Macro to cast to a #GstIterator
- */
-#define GST_ITERATOR(it)                ((GstIterator*)(it))
-/**
- * GST_ITERATOR_LOCK:
- * @it: the #GstIterator to get the lock of
- *
- * Macro to get the lock protecting the datastructure being iterated.
- */
-#define GST_ITERATOR_LOCK(it)           (GST_ITERATOR(it)->lock)
-/**
- * GST_ITERATOR_COOKIE:
- * @it: the #GstIterator to get the cookie of
- *
- * Macro to get the cookie of a #GstIterator. The cookie of the
- * iterator is the value of the master cookie when the iterator
- * was created.
- * Whenever the iterator is iterated, the value is compared to the
- * value of the master cookie. If they are different, a concurrent
- * modification happened to the iterator and a resync is needed.
- */
-#define GST_ITERATOR_COOKIE(it)         (GST_ITERATOR(it)->cookie)
-/**
- * GST_ITERATOR_ORIG_COOKIE:
- * @it: the #GstIterator to get the master cookie of
- *
- * Macro to get a pointer to where the master cookie is stored. The
- * master cookie protects the structure being iterated and gets updated
- * whenever the datastructure changes.
- */
-#define GST_ITERATOR_ORIG_COOKIE(it)    (GST_ITERATOR(it)->master_cookie)
-
-/**
- * GstIterator:
- * @copy: The function to copy the iterator
- * @next: The function to get the next item in the iterator
- * @item: The function to be called for each item retrieved
- * @resync: The function to call when a resync is needed.
- * @free: The function to call when the iterator is freed
- * @pushed: The iterator that is currently pushed with gst_iterator_push()
- * @type: The type of the object that this iterator will return
- * @lock: The lock protecting the data structure and the cookie.
- * @cookie: The cookie; the value of the master_cookie when this iterator was
- *          created.
- * @master_cookie: A pointer to the master cookie.
- * @size: the size of the iterator
- *
- * #GstIterator base structure. The values of this structure are
- * protected for subclasses, use the methods to use the #GstIterator.
- */
-struct _GstIterator {
-  /*< protected >*/
-  GstIteratorCopyFunction copy;
-  GstIteratorNextFunction next;
-  GstIteratorItemFunction item;
-  GstIteratorResyncFunction resync;
-  GstIteratorFreeFunction free;
-
-  GstIterator *pushed;          /* pushed iterator */
-
-  GType     type;
-  GMutex   *lock;
-  guint32   cookie;             /* cookie of the iterator */
-  guint32  *master_cookie;      /* pointer to guint32 holding the cookie when this
-                                   iterator was created */
-  guint     size;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_iterator_get_type           (void);
-
-/* creating iterators */
-GstIterator*            gst_iterator_new                (guint size,
-                                                         GType type,
-                                                         GMutex *lock,
-                                                         guint32 *master_cookie,
-                                                         GstIteratorCopyFunction copy,
-                                                         GstIteratorNextFunction next,
-                                                         GstIteratorItemFunction item,
-                                                         GstIteratorResyncFunction resync,
-                                                         GstIteratorFreeFunction free) G_GNUC_MALLOC;
-
-GstIterator*            gst_iterator_new_list           (GType type,
-                                                         GMutex *lock,
-                                                         guint32 *master_cookie,
-                                                         GList **list,
-                                                         GObject * owner,
-                                                         GstIteratorItemFunction item) G_GNUC_MALLOC;
-
-GstIterator*            gst_iterator_new_single         (GType type,
-                                                         const GValue * object) G_GNUC_MALLOC;
-
-GstIterator*            gst_iterator_copy               (const GstIterator *it) G_GNUC_MALLOC;
-
-/* using iterators */
-GstIteratorResult       gst_iterator_next               (GstIterator *it, GValue * elem);
-void                    gst_iterator_resync             (GstIterator *it);
-void                    gst_iterator_free               (GstIterator *it);
-
-void                    gst_iterator_push               (GstIterator *it, GstIterator *other);
-
-/* higher-order functions that operate on iterators */
-GstIterator*            gst_iterator_filter             (GstIterator *it, GCompareFunc func,
-                                                         const GValue * user_data) G_GNUC_MALLOC;
-GstIteratorResult       gst_iterator_fold               (GstIterator *it,
-                                                         GstIteratorFoldFunction func,
-                                                         GValue *ret, gpointer user_data);
-GstIteratorResult       gst_iterator_foreach            (GstIterator *it,
-                                                         GstIteratorForeachFunction func, gpointer user_data);
-gboolean                gst_iterator_find_custom        (GstIterator *it, GCompareFunc func,
-                                                         GValue *elem, gpointer user_data);
-
-G_END_DECLS
-
-#endif /* __GST_ITERATOR_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmacros.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmacros.h
deleted file mode 100644
index e38af539..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmacros.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __GST_MACROS_H__
-#define __GST_MACROS_H__
-
-G_BEGIN_DECLS
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-# define GST_GNUC_CONSTRUCTOR \
-  __attribute__ ((constructor))
-#else  /* !__GNUC__ */
-# define GST_GNUC_CONSTRUCTOR
-#endif /* !__GNUC__ */
-
-#if defined (__GNUC__) && !defined (GST_IMPLEMENT_INLINES)
-# define GST_INLINE_FUNC extern __inline__
-# define GST_CAN_INLINE 1
-#elif defined(_MSC_VER)
-# define GST_INLINE_FUNC extern __inline
-# define GST_CAN_INLINE 1
-#else
-# define GST_INLINE_FUNC extern
-# undef GST_CAN_INLINE
-#endif
-
-#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(restrict)
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#    define restrict __restrict__
-#  else
-#    define restrict
-#  endif
-#endif
-
-G_END_DECLS
-
-#endif /* __GST_MACROS_H__ */
-
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmemory.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmemory.h
deleted file mode 100644
index 08208186..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmemory.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Wim Taymans <wim.taymans@gmail.be>
- *
- * gstmemory.h: Header for memory blocks
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_MEMORY_H__
-#define __GST_MEMORY_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_MEMORY (gst_memory_get_type())
-GType gst_memory_get_type(void);
-
-typedef struct _GstMemory GstMemory;
-typedef struct _GstAllocator GstAllocator;
-
-#define GST_MEMORY_CAST(mem)   ((GstMemory *)(mem))
-
-/**
- * GstMemoryFlags:
- * @GST_MEMORY_FLAG_READONLY: memory is readonly. It is not allowed to map the
- * memory with #GST_MAP_WRITE.
- * @GST_MEMORY_FLAG_NO_SHARE: memory must not be shared. Copies will have to be
- * made when this memory needs to be shared between buffers.
- * @GST_MEMORY_FLAG_ZERO_PREFIXED: the memory prefix is filled with 0 bytes
- * @GST_MEMORY_FLAG_ZERO_PADDED: the memory padding is filled with 0 bytes
- * @GST_MEMORY_FLAG_LAST: first flag that can be used for custom purposes
- *
- * Flags for wrapped memory.
- */
-typedef enum {
-  GST_MEMORY_FLAG_READONLY      = GST_MINI_OBJECT_FLAG_LOCK_READONLY,
-  GST_MEMORY_FLAG_NO_SHARE      = (GST_MINI_OBJECT_FLAG_LAST << 0),
-  GST_MEMORY_FLAG_ZERO_PREFIXED = (GST_MINI_OBJECT_FLAG_LAST << 1),
-  GST_MEMORY_FLAG_ZERO_PADDED   = (GST_MINI_OBJECT_FLAG_LAST << 2),
-
-  GST_MEMORY_FLAG_LAST          = (GST_MINI_OBJECT_FLAG_LAST << 16)
-} GstMemoryFlags;
-
-/**
- * GST_MEMORY_FLAGS:
- * @mem: a #GstMemory.
- *
- * A flags word containing #GstMemoryFlags flags set on @mem
- */
-#define GST_MEMORY_FLAGS(mem)  GST_MINI_OBJECT_FLAGS (mem)
-/**
- * GST_MEMORY_FLAG_IS_SET:
- * @mem: a #GstMemory.
- * @flag: the #GstMemoryFlags to check.
- *
- * Gives the status of a specific flag on a @mem.
- */
-#define GST_MEMORY_FLAG_IS_SET(mem,flag)   GST_MINI_OBJECT_FLAG_IS_SET (mem,flag)
-/**
- * GST_MEMORY_FLAG_UNSET:
- * @mem: a #GstMemory.
- * @flag: the #GstMemoryFlags to clear.
- *
- * Clear a specific flag on a @mem.
- */
-#define GST_MEMORY_FLAG_UNSET(mem,flag)   GST_MINI_OBJECT_FLAG_UNSET (mem, flag)
-
-/**
- * GST_MEMORY_IS_READONLY:
- * @mem: a #GstMemory.
- *
- * Check if @mem is readonly.
- */
-#define GST_MEMORY_IS_READONLY(mem)        GST_MEMORY_FLAG_IS_SET(mem,GST_MEMORY_FLAG_READONLY)
-/**
- * GST_MEMORY_IS_NO_SHARE:
- * @mem: a #GstMemory.
- *
- * Check if @mem cannot be shared between buffers
- */
-#define GST_MEMORY_IS_NO_SHARE(mem)        GST_MEMORY_FLAG_IS_SET(mem,GST_MEMORY_FLAG_NO_SHARE)
-/**
- * GST_MEMORY_IS_ZERO_PREFIXED:
- * @mem: a #GstMemory.
- *
- * Check if the prefix in @mem is 0 filled.
- */
-#define GST_MEMORY_IS_ZERO_PREFIXED(mem)   GST_MEMORY_FLAG_IS_SET(mem,GST_MEMORY_FLAG_ZERO_PREFIXED)
-/**
- * GST_MEMORY_IS_ZERO_PADDED:
- * @mem: a #GstMemory.
- *
- * Check if the padding in @mem is 0 filled.
- */
-#define GST_MEMORY_IS_ZERO_PADDED(mem)     GST_MEMORY_FLAG_IS_SET(mem,GST_MEMORY_FLAG_ZERO_PADDED)
-
-
-/**
- * GstMemory:
- * @mini_object: parent structure
- * @allocator: pointer to the #GstAllocator
- * @parent: parent memory block
- * @maxsize: the maximum size allocated
- * @align: the alignment of the memory
- * @offset: the offset where valid data starts
- * @size: the size of valid data
- *
- * Base structure for memory implementations. Custom memory will put this structure
- * as the first member of their structure.
- */
-struct _GstMemory {
-  GstMiniObject   mini_object;
-
-  GstAllocator   *allocator;
-
-  GstMemory      *parent;
-  gsize           maxsize;
-  gsize           align;
-  gsize           offset;
-  gsize           size;
-};
-
-/**
- * GstMapFlags:
- * @GST_MAP_READ: map for read access
- * @GST_MAP_WRITE: map for write access
- * @GST_MAP_FLAG_LAST: first flag that can be used for custom purposes
- *
- * Flags used when mapping memory
- */
-typedef enum {
-  GST_MAP_READ      = GST_LOCK_FLAG_READ,
-  GST_MAP_WRITE     = GST_LOCK_FLAG_WRITE,
-
-  GST_MAP_FLAG_LAST = (1 << 16)
-} GstMapFlags;
-
-/**
- * GST_MAP_READWRITE:
- *
- * GstMapFlags value alias for GST_MAP_READ | GST_MAP_WRITE
- */
-#define GST_MAP_READWRITE      (GST_MAP_READ | GST_MAP_WRITE)
-
-
-/**
- * GstMapInfo:
- * @memory: a pointer to the mapped memory
- * @flags: flags used when mapping the memory
- * @data: (array length=size): a pointer to the mapped data
- * @size: the valid size in @data
- * @maxsize: the maximum bytes in @data
- * @user_data: extra private user_data that the implementation of the memory
- *             can use to store extra info.
- *
- * A structure containing the result of a map operation such as
- * gst_memory_map(). It contains the data and size.
- */
-typedef struct {
-  GstMemory *memory;
-  GstMapFlags flags;
-  guint8 *data;
-  gsize size;
-  gsize maxsize;
-  /*< protected >*/
-  gpointer user_data[4];
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-} GstMapInfo;
-
-/**
- * GST_MAP_INFO_INIT:
- *
- * Initializer for #GstMapInfo
- */
-#define GST_MAP_INFO_INIT { NULL, 0, NULL, 0, 0, }
-
-/**
- * GstMemoryMapFunction:
- * @mem: a #GstMemory
- * @maxsize: size to map
- * @flags: access mode for the memory
- *
- * Get the memory of @mem that can be accessed according to the mode specified
- * in @flags. The function should return a pointer that contains at least
- * @maxsize bytes.
- *
- * Returns: a pointer to memory of which at least @maxsize bytes can be
- * accessed according to the access pattern in @flags.
- */
-typedef gpointer    (*GstMemoryMapFunction)       (GstMemory *mem, gsize maxsize, GstMapFlags flags);
-
-/**
- * GstMemoryUnmapFunction:
- * @mem: a #GstMemory
- *
- * Return the pointer previously retrieved with gst_memory_map().
- *
- * Returns: %TRUE on success.
- */
-typedef void        (*GstMemoryUnmapFunction)     (GstMemory *mem);
-
-/**
- * GstMemoryCopyFunction:
- * @mem: a #GstMemory
- * @offset: an offset
- * @size: a size or -1
- *
- * Copy @size bytes from @mem starting at @offset and return them wrapped in a
- * new GstMemory object.
- * If @size is set to -1, all bytes starting at @offset are copied.
- *
- * Returns: a new #GstMemory object wrapping a copy of the requested region in
- * @mem.
- */
-typedef GstMemory * (*GstMemoryCopyFunction)      (GstMemory *mem, gssize offset, gssize size);
-
-/**
- * GstMemoryShareFunction:
- * @mem: a #GstMemory
- * @offset: an offset
- * @size: a size or -1
- *
- * Share @size bytes from @mem starting at @offset and return them wrapped in a
- * new GstMemory object. If @size is set to -1, all bytes starting at @offset are
- * shared. This function does not make a copy of the bytes in @mem.
- *
- * Returns: a new #GstMemory object sharing the requested region in @mem.
- */
-typedef GstMemory * (*GstMemoryShareFunction)     (GstMemory *mem, gssize offset, gssize size);
-
-/**
- * GstMemoryIsSpanFunction:
- * @mem1: a #GstMemory
- * @mem2: a #GstMemory
- * @offset: a result offset
- *
- * Check if @mem1 and @mem2 occupy contiguous memory and return the offset of
- * @mem1 in the parent buffer in @offset.
- *
- * Returns: %TRUE if @mem1 and @mem2 are in contiguous memory.
- */
-typedef gboolean    (*GstMemoryIsSpanFunction)    (GstMemory *mem1, GstMemory *mem2, gsize *offset);
-
-void           gst_memory_init         (GstMemory *mem, GstMemoryFlags flags,
-                                        GstAllocator *allocator, GstMemory *parent,
-                                        gsize maxsize, gsize align,
-                                        gsize offset, gsize size);
-/* refcounting */
-/**
- * gst_memory_ref:
- * @memory: The memory to refcount
- *
- * Increase the refcount of this memory.
- *
- * Returns: (transfer full): @memory (for convenience when doing assignments)
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstMemory * gst_memory_ref (GstMemory * memory);
-#endif
-
-static inline GstMemory *
-gst_memory_ref (GstMemory * memory)
-{
-  return (GstMemory *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (memory));
-}
-
-/**
- * gst_memory_unref:
- * @memory: (transfer full): the memory to refcount
- *
- * Decrease the refcount of an memory, freeing it if the refcount reaches 0.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_memory_unref (GstMemory * memory);
-#endif
-
-static inline void
-gst_memory_unref (GstMemory * memory)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (memory));
-}
-
-/* getting/setting memory properties */
-gsize          gst_memory_get_sizes    (GstMemory *mem, gsize *offset, gsize *maxsize);
-void           gst_memory_resize       (GstMemory *mem, gssize offset, gsize size);
-
-#define        gst_memory_lock(m,f)        gst_mini_object_lock (GST_MINI_OBJECT_CAST (m), (f))
-#define        gst_memory_unlock(m,f)      gst_mini_object_unlock (GST_MINI_OBJECT_CAST (m), (f))
-#define        gst_memory_is_writable(m)   gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (m))
-#define        gst_memory_make_writable(m) GST_MEMORY_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (m)))
-
-/* retrieving data */
-GstMemory *    gst_memory_make_mapped  (GstMemory *mem, GstMapInfo *info, GstMapFlags flags);
-gboolean       gst_memory_map          (GstMemory *mem, GstMapInfo *info, GstMapFlags flags);
-void           gst_memory_unmap        (GstMemory *mem, GstMapInfo *info);
-
-/* copy and subregions */
-GstMemory *    gst_memory_copy         (GstMemory *mem, gssize offset, gssize size);
-GstMemory *    gst_memory_share        (GstMemory *mem, gssize offset, gssize size);
-
-/* span memory */
-gboolean       gst_memory_is_span      (GstMemory *mem1, GstMemory *mem2, gsize *offset);
-
-G_END_DECLS
-
-#endif /* __GST_MEMORY_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmessage.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmessage.h
deleted file mode 100644
index 03286674..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmessage.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/* GStreamer
- * Copyright (C) 2004 Wim Taymans <wim@fluendo.com>
- *
- * gstmessage.h: Header for GstMessage subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_MESSAGE_H__
-#define __GST_MESSAGE_H__
-
-G_BEGIN_DECLS
-
-typedef struct _GstMessage GstMessage;
-
-/**
- * GstMessageType:
- * @GST_MESSAGE_UNKNOWN: an undefined message
- * @GST_MESSAGE_EOS: end-of-stream reached in a pipeline. The application will
- * only receive this message in the PLAYING state and every time it sets a
- * pipeline to PLAYING that is in the EOS state. The application can perform a
- * flushing seek in the pipeline, which will undo the EOS state again.
- * @GST_MESSAGE_ERROR: an error occured. When the application receives an error
- * message it should stop playback of the pipeline and not assume that more
- * data will be played.
- * @GST_MESSAGE_WARNING: a warning occured.
- * @GST_MESSAGE_INFO: an info message occured
- * @GST_MESSAGE_TAG: a tag was found.
- * @GST_MESSAGE_BUFFERING: the pipeline is buffering. When the application
- * receives a buffering message in the PLAYING state for a non-live pipeline it
- * must PAUSE the pipeline until the buffering completes, when the percentage
- * field in the message is 100%. For live pipelines, no action must be
- * performed and the buffering percentage can be used to inform the user about
- * the progress.
- * @GST_MESSAGE_STATE_CHANGED: a state change happened
- * @GST_MESSAGE_STATE_DIRTY: an element changed state in a streaming thread.
- * This message is deprecated.
- * @GST_MESSAGE_STEP_DONE: a stepping operation finished.
- * @GST_MESSAGE_CLOCK_PROVIDE: an element notifies its capability of providing
- *                             a clock. This message is used internally and
- *                             never forwarded to the application.
- * @GST_MESSAGE_CLOCK_LOST: The current clock as selected by the pipeline became
- *                          unusable. The pipeline will select a new clock on
- *                          the next PLAYING state change. The application
- *                          should set the pipeline to PAUSED and back to
- *                          PLAYING when this message is received.
- * @GST_MESSAGE_NEW_CLOCK: a new clock was selected in the pipeline.
- * @GST_MESSAGE_STRUCTURE_CHANGE: the structure of the pipeline changed. This
- * message is used internally and never forwarded to the application.
- * @GST_MESSAGE_STREAM_STATUS: status about a stream, emitted when it starts,
- *                             stops, errors, etc..
- * @GST_MESSAGE_APPLICATION: message posted by the application, possibly
- *                           via an application-specific element.
- * @GST_MESSAGE_ELEMENT: element-specific message, see the specific element's
- *                       documentation
- * @GST_MESSAGE_SEGMENT_START: pipeline started playback of a segment. This
- * message is used internally and never forwarded to the application.
- * @GST_MESSAGE_SEGMENT_DONE: pipeline completed playback of a segment. This
- * message is forwarded to the application after all elements that posted
- * @GST_MESSAGE_SEGMENT_START posted a GST_MESSAGE_SEGMENT_DONE message.
- * @GST_MESSAGE_DURATION_CHANGED: The duration of a pipeline changed. The
- * application can get the new duration with a duration query.
- * @GST_MESSAGE_ASYNC_START: Posted by elements when they start an ASYNC
- * #GstStateChange. This message is not forwarded to the application but is used
- * internally.
- * @GST_MESSAGE_ASYNC_DONE: Posted by elements when they complete an ASYNC
- * #GstStateChange. The application will only receive this message from the toplevel
- * pipeline.
- * @GST_MESSAGE_LATENCY: Posted by elements when their latency changes. The
- * application should recalculate and distribute a new latency.
- * @GST_MESSAGE_REQUEST_STATE: Posted by elements when they want the pipeline to
- * change state. This message is a suggestion to the application which can
- * decide to perform the state change on (part of) the pipeline.
- * @GST_MESSAGE_STEP_START: A stepping operation was started.
- * @GST_MESSAGE_QOS: A buffer was dropped or an element changed its processing
- * strategy for Quality of Service reasons.
- * @GST_MESSAGE_PROGRESS: A progress message.
- * @GST_MESSAGE_TOC: A new table of contents (TOC) was found or previously found TOC
- * was updated.
- * @GST_MESSAGE_RESET_TIME: Message to request resetting the pipeline's
- *     running time from the pipeline. This is an internal message which
- *     applications will likely never receive.
- * @GST_MESSAGE_STREAM_START: Message indicating start of a new stream. Useful
- *     e.g. when using playbin in gapless playback mode, to get notified when
- *     the next title actually starts playing (which will be some time after
- *     the URI for the next title has been set).
- * @GST_MESSAGE_ANY: mask for all of the above messages.
- *
- * The different message types that are available.
- */
-/* NOTE: keep in sync with quark registration in gstmessage.c
- * NOTE: keep GST_MESSAGE_ANY a valid gint to avoid compiler warnings.
- */
-typedef enum
-{
-  GST_MESSAGE_UNKNOWN           = 0,
-  GST_MESSAGE_EOS               = (1 << 0),
-  GST_MESSAGE_ERROR             = (1 << 1),
-  GST_MESSAGE_WARNING           = (1 << 2),
-  GST_MESSAGE_INFO              = (1 << 3),
-  GST_MESSAGE_TAG               = (1 << 4),
-  GST_MESSAGE_BUFFERING         = (1 << 5),
-  GST_MESSAGE_STATE_CHANGED     = (1 << 6),
-  GST_MESSAGE_STATE_DIRTY       = (1 << 7),
-  GST_MESSAGE_STEP_DONE         = (1 << 8),
-  GST_MESSAGE_CLOCK_PROVIDE     = (1 << 9),
-  GST_MESSAGE_CLOCK_LOST        = (1 << 10),
-  GST_MESSAGE_NEW_CLOCK         = (1 << 11),
-  GST_MESSAGE_STRUCTURE_CHANGE  = (1 << 12),
-  GST_MESSAGE_STREAM_STATUS     = (1 << 13),
-  GST_MESSAGE_APPLICATION       = (1 << 14),
-  GST_MESSAGE_ELEMENT           = (1 << 15),
-  GST_MESSAGE_SEGMENT_START     = (1 << 16),
-  GST_MESSAGE_SEGMENT_DONE      = (1 << 17),
-  GST_MESSAGE_DURATION_CHANGED  = (1 << 18),
-  GST_MESSAGE_LATENCY           = (1 << 19),
-  GST_MESSAGE_ASYNC_START       = (1 << 20),
-  GST_MESSAGE_ASYNC_DONE        = (1 << 21),
-  GST_MESSAGE_REQUEST_STATE     = (1 << 22),
-  GST_MESSAGE_STEP_START        = (1 << 23),
-  GST_MESSAGE_QOS               = (1 << 24),
-  GST_MESSAGE_PROGRESS          = (1 << 25),
-  GST_MESSAGE_TOC               = (1 << 26),
-  GST_MESSAGE_RESET_TIME        = (1 << 27),
-  GST_MESSAGE_STREAM_START      = (1 << 28),
-  GST_MESSAGE_ANY               = ~0
-} GstMessageType;
-
-#include <gst/gstminiobject.h>
-#include <gst/gstobject.h>
-#include <gst/gstelement.h>
-#include <gst/gsttaglist.h>
-#include <gst/gststructure.h>
-#include <gst/gstquery.h>
-#include <gst/gsttoc.h>
-
-#define GST_TYPE_MESSAGE                         (gst_message_get_type())
-#define GST_IS_MESSAGE(obj)                      (GST_IS_MINI_OBJECT_TYPE (obj, GST_TYPE_MESSAGE))
-#define GST_MESSAGE_CAST(obj)                    ((GstMessage*)(obj))
-#define GST_MESSAGE(obj)                         (GST_MESSAGE_CAST(obj))
-
-/* the lock is used to handle the synchronous handling of messages,
- * the emiting thread is block until the handling thread processed
- * the message using this mutex/cond pair */
-#define GST_MESSAGE_GET_LOCK(message)   (&GST_MESSAGE_CAST(message)->lock)
-#define GST_MESSAGE_LOCK(message)       g_mutex_lock(GST_MESSAGE_GET_LOCK(message))
-#define GST_MESSAGE_UNLOCK(message)     g_mutex_unlock(GST_MESSAGE_GET_LOCK(message))
-#define GST_MESSAGE_GET_COND(message)   (&GST_MESSAGE_CAST(message)->cond)
-#define GST_MESSAGE_WAIT(message)       g_cond_wait(GST_MESSAGE_GET_COND(message),GST_MESSAGE_GET_LOCK(message))
-#define GST_MESSAGE_SIGNAL(message)     g_cond_signal(GST_MESSAGE_GET_COND(message))
-
-/**
- * GST_MESSAGE_TYPE:
- * @message: a #GstMessage
- *
- * Get the #GstMessageType of @message.
- */
-#define GST_MESSAGE_TYPE(message)       (GST_MESSAGE_CAST(message)->type)
-/**
- * GST_MESSAGE_TYPE_NAME:
- * @message: a #GstMessage
- *
- * Get a constant string representation of the #GstMessageType of @message.
- */
-#define GST_MESSAGE_TYPE_NAME(message)  gst_message_type_get_name(GST_MESSAGE_TYPE(message))
-/**
- * GST_MESSAGE_TIMESTAMP:
- * @message: a #GstMessage
- *
- * Get the timestamp of @message. This is the timestamp when the message
- * was created.
- */
-#define GST_MESSAGE_TIMESTAMP(message)  (GST_MESSAGE_CAST(message)->timestamp)
-/**
- * GST_MESSAGE_SRC:
- * @message: a #GstMessage
- *
- * Get the object that posted @message.
- */
-#define GST_MESSAGE_SRC(message)        (GST_MESSAGE_CAST(message)->src)
-
-/**
- * GST_MESSAGE_SEQNUM:
- * @message: a #GstMessage
- *
- * Get the sequence number of @message.
- */
-#define GST_MESSAGE_SEQNUM(message)     (GST_MESSAGE_CAST(message)->seqnum)
-
-/**
- * GST_MESSAGE_SRC_NAME:
- * @message: a #GstMessage
- *
- * Get the name of the object that posted @message. Returns "(NULL)" if
- * the message has no source object set.
- */
-#define GST_MESSAGE_SRC_NAME(message)   (GST_MESSAGE_SRC(message) ? \
-    GST_OBJECT_NAME (GST_MESSAGE_SRC(message)) : "(NULL)")
-
-/**
- * GstStructureChangeType:
- * @GST_STRUCTURE_CHANGE_TYPE_PAD_LINK: Pad linking is starting or done.
- * @GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK: Pad unlinking is starting or done.
- *
- * The type of a %GST_MESSAGE_STRUCTURE_CHANGE.
- */
-typedef enum {
-  GST_STRUCTURE_CHANGE_TYPE_PAD_LINK   = 0,
-  GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK = 1
-} GstStructureChangeType;
-
-/**
- * GstStreamStatusType:
- * @GST_STREAM_STATUS_TYPE_CREATE: A new thread need to be created.
- * @GST_STREAM_STATUS_TYPE_ENTER: a thread entered its loop function
- * @GST_STREAM_STATUS_TYPE_LEAVE: a thread left its loop function
- * @GST_STREAM_STATUS_TYPE_DESTROY: a thread is destroyed
- * @GST_STREAM_STATUS_TYPE_START: a thread is started
- * @GST_STREAM_STATUS_TYPE_PAUSE: a thread is paused
- * @GST_STREAM_STATUS_TYPE_STOP: a thread is stopped
- *
- * The type of a %GST_MESSAGE_STREAM_STATUS. The stream status messages inform the
- * application of new streaming threads and their status.
- */
-typedef enum {
-  GST_STREAM_STATUS_TYPE_CREATE   = 0,
-  GST_STREAM_STATUS_TYPE_ENTER    = 1,
-  GST_STREAM_STATUS_TYPE_LEAVE    = 2,
-  GST_STREAM_STATUS_TYPE_DESTROY  = 3,
-
-  GST_STREAM_STATUS_TYPE_START    = 8,
-  GST_STREAM_STATUS_TYPE_PAUSE    = 9,
-  GST_STREAM_STATUS_TYPE_STOP     = 10
-} GstStreamStatusType;
-
-/**
- * GstProgressType:
- * @GST_PROGRESS_TYPE_START: A new task started.
- * @GST_PROGRESS_TYPE_CONTINUE: A task completed and a new one continues.
- * @GST_PROGRESS_TYPE_COMPLETE: A task completed.
- * @GST_PROGRESS_TYPE_CANCELED: A task was canceled.
- * @GST_PROGRESS_TYPE_ERROR: A task caused an error. An error message is also
- *          posted on the bus.
- *
- * The type of a %GST_MESSAGE_PROGRESS. The progress messages inform the
- * application of the status of assynchronous tasks.
- */
-typedef enum {
-  GST_PROGRESS_TYPE_START    = 0,
-  GST_PROGRESS_TYPE_CONTINUE = 1,
-  GST_PROGRESS_TYPE_COMPLETE = 2,
-  GST_PROGRESS_TYPE_CANCELED = 3,
-  GST_PROGRESS_TYPE_ERROR    = 4
-} GstProgressType;
-
-/**
- * GstMessage:
- * @mini_object: the parent structure
- * @type: the #GstMessageType of the message
- * @timestamp: the timestamp of the message
- * @src: the src of the message
- * @seqnum: the sequence number of the message
- *
- * A #GstMessage.
- */
-struct _GstMessage
-{
-  GstMiniObject   mini_object;
-
-  /*< public > *//* with COW */
-  GstMessageType  type;
-  guint64         timestamp;
-  GstObject      *src;
-  guint32         seqnum;
-
-  /*< private >*//* with MESSAGE_LOCK */
-  GMutex          lock;                 /* lock and cond for async delivery */
-  GCond           cond;
-};
-
-GType           gst_message_get_type            (void);
-
-const gchar*    gst_message_type_get_name       (GstMessageType type);
-GQuark          gst_message_type_to_quark       (GstMessageType type);
-
-/* refcounting */
-/**
- * gst_message_ref:
- * @msg: the message to ref
- *
- * Convenience macro to increase the reference count of the message.
- *
- * Returns: @msg (for convenience when doing assignments)
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstMessage * gst_message_ref (GstMessage * msg);
-#endif
-
-static inline GstMessage *
-gst_message_ref (GstMessage * msg)
-{
-  return (GstMessage *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (msg));
-}
-
-/**
- * gst_message_unref:
- * @msg: the message to unref
- *
- * Convenience macro to decrease the reference count of the message, possibly
- * freeing it.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_message_unref (GstMessage * msg);
-#endif
-
-static inline void
-gst_message_unref (GstMessage * msg)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (msg));
-}
-
-/* copy message */
-/**
- * gst_message_copy:
- * @msg: the message to copy
- *
- * Creates a copy of the message. Returns a copy of the message.
- *
- * Returns: (transfer full): a new copy of @msg.
- *
- * MT safe
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstMessage * gst_message_copy (const GstMessage * msg);
-#endif
-
-static inline GstMessage *
-gst_message_copy (const GstMessage * msg)
-{
-  return GST_MESSAGE_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (msg)));
-}
-
-/**
- * gst_message_is_writable:
- * @msg: a #GstMessage
- *
- * Tests if you can safely write into a message's structure or validly
- * modify the seqnum and timestamp fields.
- */
-#define         gst_message_is_writable(msg)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (msg))
-/**
- * gst_message_make_writable:
- * @msg: (transfer full): the message to make writable
- *
- * Checks if a message is writable. If not, a writable copy is made and
- * returned.
- *
- * Returns: (transfer full): a message (possibly a duplicate) that is writable.
- *
- * MT safe
- */
-#define         gst_message_make_writable(msg)  GST_MESSAGE_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (msg)))
-/**
- * gst_message_replace:
- * @old_message: (inout) (transfer full): pointer to a pointer to a #GstMessage
- *     to be replaced.
- * @new_message: (allow-none) (transfer none): pointer to a #GstMessage that will
- *     replace the message pointed to by @old_message.
- *
- * Modifies a pointer to a #GstMessage to point to a different #GstMessage. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * message is unreffed, the new one is reffed).
- *
- * Either @new_message or the #GstMessage pointed to by @old_message may be NULL.
- *
- * Returns: TRUE if @new_message was different from @old_message
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_message_replace (GstMessage **old_message, GstMessage *new_message);
-#endif
-
-static inline gboolean
-gst_message_replace (GstMessage **old_message, GstMessage *new_message)
-{
-  return gst_mini_object_replace ((GstMiniObject **) old_message, (GstMiniObject *) new_message);
-}
-
-
-/* custom messages */
-GstMessage *    gst_message_new_custom          (GstMessageType type,
-                                                 GstObject    * src,
-                                                 GstStructure * structure) G_GNUC_MALLOC;
-const GstStructure *
-                gst_message_get_structure       (GstMessage *message);
-
-gboolean        gst_message_has_name            (GstMessage *message, const gchar *name);
-
-/* identifiers for events and messages */
-guint32         gst_message_get_seqnum          (GstMessage *message);
-void            gst_message_set_seqnum          (GstMessage *message, guint32 seqnum);
-
-/* EOS */
-GstMessage *    gst_message_new_eos             (GstObject * src) G_GNUC_MALLOC;
-
-/* ERROR */
-
-GstMessage *    gst_message_new_error           (GstObject * src, GError * error, const gchar * debug) G_GNUC_MALLOC;
-void            gst_message_parse_error         (GstMessage *message, GError **gerror, gchar **debug);
-
-/* WARNING */
-GstMessage *    gst_message_new_warning         (GstObject * src, GError * error, const gchar * debug) G_GNUC_MALLOC;
-void            gst_message_parse_warning       (GstMessage *message, GError **gerror, gchar **debug);
-
-/* INFO */
-GstMessage *    gst_message_new_info            (GstObject * src, GError * error, const gchar * debug) G_GNUC_MALLOC;
-void            gst_message_parse_info          (GstMessage *message, GError **gerror, gchar **debug);
-
-/* TAG */
-GstMessage *    gst_message_new_tag             (GstObject * src, GstTagList * tag_list) G_GNUC_MALLOC;
-void            gst_message_parse_tag           (GstMessage *message, GstTagList **tag_list);
-
-/* BUFFERING */
-GstMessage *    gst_message_new_buffering         (GstObject * src, gint percent) G_GNUC_MALLOC;
-void            gst_message_parse_buffering       (GstMessage *message, gint *percent);
-void            gst_message_set_buffering_stats   (GstMessage *message, GstBufferingMode mode,
-                                                   gint avg_in, gint avg_out,
-                                                   gint64 buffering_left);
-void            gst_message_parse_buffering_stats (GstMessage *message, GstBufferingMode *mode,
-                                                   gint *avg_in, gint *avg_out,
-                                                   gint64 *buffering_left);
-
-/* STATE_CHANGED */
-GstMessage *    gst_message_new_state_changed   (GstObject * src, GstState oldstate,
-                                                 GstState newstate, GstState pending) G_GNUC_MALLOC;
-void            gst_message_parse_state_changed (GstMessage *message, GstState *oldstate,
-                                                 GstState *newstate, GstState *pending);
-
-/* STATE_DIRTY */
-GstMessage *    gst_message_new_state_dirty     (GstObject * src) G_GNUC_MALLOC;
-
-/* STEP_DONE */
-GstMessage *    gst_message_new_step_done       (GstObject * src, GstFormat format, guint64 amount,
-                                                 gdouble rate, gboolean flush, gboolean intermediate,
-                                                 guint64 duration, gboolean eos) G_GNUC_MALLOC;
-void            gst_message_parse_step_done     (GstMessage * message, GstFormat *format, guint64 *amount,
-                                                 gdouble *rate, gboolean *flush, gboolean *intermediate,
-                                                 guint64 *duration, gboolean *eos);
-/* CLOCK_PROVIDE */
-GstMessage *    gst_message_new_clock_provide   (GstObject * src, GstClock *clock, gboolean ready) G_GNUC_MALLOC;
-void            gst_message_parse_clock_provide (GstMessage *message, GstClock **clock,
-                                                 gboolean *ready);
-
-/* CLOCK_LOST */
-GstMessage *    gst_message_new_clock_lost      (GstObject * src, GstClock *clock) G_GNUC_MALLOC;
-void            gst_message_parse_clock_lost    (GstMessage *message, GstClock **clock);
-
-/* NEW_CLOCK */
-GstMessage *    gst_message_new_new_clock       (GstObject * src, GstClock *clock) G_GNUC_MALLOC;
-void            gst_message_parse_new_clock     (GstMessage *message, GstClock **clock);
-
-/* APPLICATION */
-GstMessage *    gst_message_new_application     (GstObject * src, GstStructure * structure) G_GNUC_MALLOC;
-
-/* ELEMENT */
-GstMessage *    gst_message_new_element         (GstObject * src, GstStructure * structure) G_GNUC_MALLOC;
-
-/* SEGMENT_START */
-GstMessage *    gst_message_new_segment_start   (GstObject * src, GstFormat format, gint64 position) G_GNUC_MALLOC;
-void            gst_message_parse_segment_start (GstMessage *message, GstFormat *format,
-                                                 gint64 *position);
-
-/* SEGMENT_DONE */
-GstMessage *    gst_message_new_segment_done    (GstObject * src, GstFormat format, gint64 position) G_GNUC_MALLOC;
-void            gst_message_parse_segment_done  (GstMessage *message, GstFormat *format,
-                                                 gint64 *position);
-
-/* DURATION_CHANGED */
-GstMessage *    gst_message_new_duration_changed (GstObject * src) G_GNUC_MALLOC;
-
-/* LATENCY */
-GstMessage *    gst_message_new_latency         (GstObject * src) G_GNUC_MALLOC;
-
-/* ASYNC_START */
-GstMessage *    gst_message_new_async_start     (GstObject * src) G_GNUC_MALLOC;
-
-/* ASYNC_DONE */
-GstMessage *    gst_message_new_async_done      (GstObject * src, GstClockTime running_time) G_GNUC_MALLOC;
-void            gst_message_parse_async_done    (GstMessage *message, GstClockTime *running_time);
-
-/* STRUCTURE CHANGE */
-GstMessage *    gst_message_new_structure_change   (GstObject * src, GstStructureChangeType type,
-                                                    GstElement *owner, gboolean busy) G_GNUC_MALLOC;
-void            gst_message_parse_structure_change (GstMessage *message, GstStructureChangeType *type,
-                                                    GstElement **owner, gboolean *busy);
-
-/* STREAM STATUS */
-GstMessage *    gst_message_new_stream_status        (GstObject * src, GstStreamStatusType type,
-                                                      GstElement *owner) G_GNUC_MALLOC;
-void            gst_message_parse_stream_status      (GstMessage *message, GstStreamStatusType *type,
-                                                      GstElement **owner);
-void            gst_message_set_stream_status_object (GstMessage *message, const GValue *object);
-const GValue *  gst_message_get_stream_status_object (GstMessage *message);
-
-/* REQUEST_STATE */
-GstMessage *    gst_message_new_request_state   (GstObject * src, GstState state) G_GNUC_MALLOC;
-void            gst_message_parse_request_state (GstMessage * message, GstState *state);
-
-/* STEP_START */
-GstMessage *    gst_message_new_step_start      (GstObject * src, gboolean active, GstFormat format,
-                                                 guint64 amount, gdouble rate, gboolean flush,
-                                                 gboolean intermediate) G_GNUC_MALLOC;
-void            gst_message_parse_step_start    (GstMessage * message, gboolean *active, GstFormat *format,
-                                                 guint64 *amount, gdouble *rate, gboolean *flush,
-                                                 gboolean *intermediate);
-
-/* QOS */
-GstMessage *    gst_message_new_qos             (GstObject * src, gboolean live, guint64 running_time,
-                                                 guint64 stream_time, guint64 timestamp, guint64 duration) G_GNUC_MALLOC;
-void            gst_message_set_qos_values      (GstMessage * message, gint64 jitter, gdouble proportion,
-                                                 gint quality);
-void            gst_message_set_qos_stats       (GstMessage * message, GstFormat format, guint64 processed,
-                                                 guint64 dropped);
-void            gst_message_parse_qos           (GstMessage * message, gboolean * live, guint64 * running_time,
-                                                 guint64 * stream_time, guint64 * timestamp, guint64 * duration);
-void            gst_message_parse_qos_values    (GstMessage * message, gint64 * jitter, gdouble * proportion,
-                                                 gint * quality);
-void            gst_message_parse_qos_stats     (GstMessage * message, GstFormat * format, guint64 * processed,
-                                                 guint64 * dropped);
-/* PROGRESS */
-GstMessage *    gst_message_new_progress           (GstObject * src, GstProgressType type, const gchar *code,
-                                                    const gchar *text) G_GNUC_MALLOC;
-void            gst_message_parse_progress         (GstMessage * message, GstProgressType * type, gchar ** code,
-                                                    gchar ** text);
-
-/* TOC */
-GstMessage *    gst_message_new_toc             (GstObject *src, GstToc *toc, gboolean updated);
-void            gst_message_parse_toc           (GstMessage *message, GstToc **toc, gboolean *updated);
-
-/* RESET_TIME */
-GstMessage *    gst_message_new_reset_time      (GstObject * src, GstClockTime running_time) G_GNUC_MALLOC;
-void            gst_message_parse_reset_time    (GstMessage *message, GstClockTime *running_time);
-
-/* STREAM_START */
-GstMessage *    gst_message_new_stream_start    (GstObject * src) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __GST_MESSAGE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmeta.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmeta.h
deleted file mode 100644
index e6d4f006..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstmeta.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Wim Taymans <wim.taymans@gmail.be>
- *
- * gstmeta.h: Header for Metadata structures
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_META_H__
-#define __GST_META_H__
-
-G_BEGIN_DECLS
-
-typedef struct _GstMeta GstMeta;
-typedef struct _GstMetaInfo GstMetaInfo;
-
-#define GST_META_CAST(meta)   ((GstMeta *)(meta))
-
-/**
- * GstMetaFlags:
- * @GST_META_FLAG_NONE: no flags
- * @GST_META_FLAG_READONLY: metadata should not be modified
- * @GST_META_FLAG_POOLED: metadata is managed by a bufferpool
- * @GST_META_FLAG_LOCKED: metadata should not be removed
- * @GST_META_FLAG_LAST: additional flags can be added starting from this flag.
- *
- * Extra metadata flags.
- */
-typedef enum {
-  GST_META_FLAG_NONE        = 0,
-  GST_META_FLAG_READONLY    = (1 << 0),
-  GST_META_FLAG_POOLED      = (1 << 1),
-  GST_META_FLAG_LOCKED      = (1 << 2),
-
-  GST_META_FLAG_LAST        = (1 << 16)
-} GstMetaFlags;
-
-/**
- * GST_META_FLAGS:
- * @meta: a #GstMeta.
- *
- * A flags word containing #GstMetaFlags flags set on @meta
- */
-#define GST_META_FLAGS(meta)  (GST_META_CAST (meta)->flags)
-/**
- * GST_META_FLAG_IS_SET:
- * @meta: a #GstMeta.
- * @flag: the #GstMetaFlags to check.
- *
- * Gives the status of a specific flag on a metadata.
- */
-#define GST_META_FLAG_IS_SET(meta,flag)        !!(GST_META_FLAGS (meta) & (flag))
-/**
- * GST_META_FLAG_SET:
- * @meta: a #GstMeta.
- * @flag: the #GstMetaFlags to set.
- *
- * Sets a metadata flag on a metadata.
- */
-#define GST_META_FLAG_SET(meta,flag)           (GST_META_FLAGS (meta) |= (flag))
-/**
- * GST_META_FLAG_UNSET:
- * @meta: a #GstMeta.
- * @flag: the #GstMetaFlags to clear.
- *
- * Clears a metadata flag.
- */
-#define GST_META_FLAG_UNSET(meta,flag)         (GST_META_FLAGS (meta) &= ~(flag))
-
-/**
- * GstMeta:
- * @flags: extra flags for the metadata
- * @info: pointer to the #GstMetaInfo
- *
- * Base structure for metadata. Custom metadata will put this structure
- * as the first member of their structure.
- */
-struct _GstMeta {
-  GstMetaFlags       flags;
-  const GstMetaInfo *info;
-};
-
-/**
- * GstMetaInitFunction:
- * @meta: a #GstMeta
- * @params: parameters passed to the init function
- * @buffer: a #GstBuffer
- *
- * Function called when @meta is initialized in @buffer.
- */
-typedef gboolean (*GstMetaInitFunction) (GstMeta *meta, gpointer params, GstBuffer *buffer);
-
-/**
- * GstMetaFreeFunction:
- * @meta: a #GstMeta
- * @buffer: a #GstBuffer
- *
- * Function called when @meta is freed in @buffer.
- */
-typedef void (*GstMetaFreeFunction)     (GstMeta *meta, GstBuffer *buffer);
-
-/**
- * gst_meta_transform_copy:
- *
- * GQuark for the "gst-copy" transform.
- */
-GST_EXPORT GQuark _gst_meta_transform_copy;
-
-/**
- * GST_META_TRANSFORM_IS_COPY:
- * @type: a transform type
- *
- * Check if the transform type is a copy transform
- */
-#define GST_META_TRANSFORM_IS_COPY(type) ((type) == _gst_meta_transform_copy)
-
-/**
- * GstMetaTransformCopy:
- * @region: %TRUE if only region is copied
- * @offset: the offset to copy, 0 if @region is %FALSE, otherwise > 0
- * @size: the size to copy, -1 or the buffer size when @region is %FALSE
- *
- * Extra data passed to a "gst-copy" transform #GstMetaTransformFunction.
- */
-typedef struct {
-  gboolean region;
-  gsize offset;
-  gsize size;
-} GstMetaTransformCopy;
-
-/**
- * GstMetaTransformFunction:
- * @transbuf: a #GstBuffer
- * @meta: a #GstMeta
- * @buffer: a #GstBuffer
- * @type: the transform type
- * @data: transform specific data.
- *
- * Function called for each @meta in @buffer as a result of performing a
- * transformation on @transbuf. Additional @type specific transform data
- * is passed to the function as @data.
- *
- * Implementations should check the @type of the transform and parse
- * additional type specific fields in @data that should be used to update
- * the metadata on @transbuf.
- *
- * Returns: %TRUE if the transform could be performed
- */
-typedef gboolean (*GstMetaTransformFunction) (GstBuffer *transbuf,
-                                              GstMeta *meta, GstBuffer *buffer,
-                                              GQuark type, gpointer data);
-
-/**
- * GstMetaInfo:
- * @api: tag indentifying the metadata structure and api
- * @type: type indentifying the implementor of the api
- * @size: size of the metadata
- * @init_func: function for initializing the metadata
- * @free_func: function for freeing the metadata
- * @transform_func: function for transforming the metadata
- *
- * The #GstMetaInfo provides information about a specific metadata
- * structure.
- */
-struct _GstMetaInfo {
-  GType                      api;
-  GType                      type;
-  gsize                      size;
-
-  GstMetaInitFunction        init_func;
-  GstMetaFreeFunction        free_func;
-  GstMetaTransformFunction   transform_func;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                gst_meta_api_type_register (const gchar *api,
-                                                 const gchar **tags);
-gboolean             gst_meta_api_type_has_tag  (GType api, GQuark tag);
-
-const GstMetaInfo *  gst_meta_register          (GType api, const gchar *impl,
-                                                 gsize size,
-                                                 GstMetaInitFunction      init_func,
-                                                 GstMetaFreeFunction      free_func,
-                                                 GstMetaTransformFunction transform_func);
-const GstMetaInfo *  gst_meta_get_info          (const gchar * impl);
-
-/* some default tags */
-GST_EXPORT GQuark _gst_meta_tag_memory;
-
-/**
- * GST_META_TAG_MEMORY:
- *
- * Metadata tagged with this tag depends on the particular memory
- * or buffer that it is on.
- */
-#define GST_META_TAG_MEMORY (_gst_meta_tag_memory)
-
-G_END_DECLS
-
-#endif /* __GST_META_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstminiobject.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstminiobject.h
deleted file mode 100644
index f873b7a8..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstminiobject.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 David Schleef <ds@schleef.org>
- *
- * gstminiobject.h: Header for GstMiniObject
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_MINI_OBJECT_H__
-#define __GST_MINI_OBJECT_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GST_IS_MINI_OBJECT_TYPE(obj,type)  ((obj) && GST_MINI_OBJECT_TYPE(obj) == (type))
-#define GST_MINI_OBJECT_CAST(obj)          ((GstMiniObject*)(obj))
-#define GST_MINI_OBJECT_CONST_CAST(obj)    ((const GstMiniObject*)(obj))
-#define GST_MINI_OBJECT(obj)               (GST_MINI_OBJECT_CAST(obj))
-
-typedef struct _GstMiniObject GstMiniObject;
-
-/**
- * GstMiniObjectCopyFunction:
- * @obj: MiniObject to copy
- *
- * Function prototype for methods to create copies of instances.
- *
- * Returns: reference to cloned instance.
- */
-typedef GstMiniObject * (*GstMiniObjectCopyFunction) (const GstMiniObject *obj);
-/**
- * GstMiniObjectDisposeFunction:
- * @obj: MiniObject to dispose
- *
- * Function prototype for when a miniobject has lost its last refcount.
- * Implementation of the mini object are allowed to revive the
- * passed object by doing a gst_mini_object_ref(). If the object is not
- * revived after the dispose function, the function should return %TRUE
- * and the memory associated with the object is freed.
- *
- * Returns: %TRUE if the object should be cleaned up.
- */
-typedef gboolean (*GstMiniObjectDisposeFunction) (GstMiniObject *obj);
-/**
- * GstMiniObjectFreeFunction:
- * @obj: MiniObject to free
- *
- * Virtual function prototype for methods to free ressources used by
- * mini-objects.
- */
-typedef void (*GstMiniObjectFreeFunction) (GstMiniObject *obj);
-
- /**
- * GstMiniObjectNotify:
- * @user_data: data that was provided when the notify was added
- * @obj: the mini object
- *
- * A #GstMiniObjectNotify function can be added to a mini object as a
- * callback that gets triggered when gst_mini_object_unref() drops the
- * last ref and @obj is about to be freed.
- */
-typedef void (*GstMiniObjectNotify) (gpointer user_data, GstMiniObject * obj);
-
-/**
- * GST_MINI_OBJECT_TYPE:
- * @obj: MiniObject to return type for.
- *
- * This macro returns the type of the mini-object.
- */
-#define GST_MINI_OBJECT_TYPE(obj)  (GST_MINI_OBJECT_CAST(obj)->type)
-
-/**
- * GST_MINI_OBJECT_FLAGS:
- * @obj: MiniObject to return flags for.
- *
- * This macro returns the entire set of flags for the mini-object.
- */
-#define GST_MINI_OBJECT_FLAGS(obj)  (GST_MINI_OBJECT_CAST(obj)->flags)
-/**
- * GST_MINI_OBJECT_FLAG_IS_SET:
- * @obj: MiniObject to check for flags.
- * @flag: Flag to check for
- *
- * This macro checks to see if the given flag is set.
- */
-#define GST_MINI_OBJECT_FLAG_IS_SET(obj,flag)        !!(GST_MINI_OBJECT_FLAGS (obj) & (flag))
-/**
- * GST_MINI_OBJECT_FLAG_SET:
- * @obj: MiniObject to set flag in.
- * @flag: Flag to set, can by any number of bits in guint32.
- *
- * This macro sets the given bits.
- */
-#define GST_MINI_OBJECT_FLAG_SET(obj,flag)           (GST_MINI_OBJECT_FLAGS (obj) |= (flag))
-/**
- * GST_MINI_OBJECT_FLAG_UNSET:
- * @obj: MiniObject to unset flag in.
- * @flag: Flag to set, must be a single bit in guint32.
- *
- * This macro usets the given bits.
- */
-#define GST_MINI_OBJECT_FLAG_UNSET(obj,flag)         (GST_MINI_OBJECT_FLAGS (obj) &= ~(flag))
-
-/**
- * GstMiniObjectFlags:
- * @GST_MINI_OBJECT_FLAG_LOCKABLE: the object can be locked and unlocked with
- * gst_mini_object_lock() and gst_mini_object_unlock().
- * @GST_MINI_OBJECT_FLAG_LOCK_READONLY: the object is permanently locked in
- * READONLY mode. Only read locks can be performed on the object.
- * @GST_MINI_OBJECT_FLAG_LAST: first flag that can be used by subclasses.
- *
- * Flags for the mini object
- */
-typedef enum
-{
-  GST_MINI_OBJECT_FLAG_LOCKABLE      = (1 << 0),
-  GST_MINI_OBJECT_FLAG_LOCK_READONLY = (1 << 1),
-  /* padding */
-  GST_MINI_OBJECT_FLAG_LAST          = (1 << 4)
-} GstMiniObjectFlags;
-
-/**
- * GST_MINI_OBJECT_IS_LOCKABLE:
- * @obj: a #GstMiniObject
- *
- * Check if @obj is lockable. A lockable object can be locked and unlocked with
- * gst_mini_object_lock() and gst_mini_object_unlock().
- */
-#define GST_MINI_OBJECT_IS_LOCKABLE(obj)  GST_MINI_OBJECT_FLAG_IS_SET(obj, GST_MINI_OBJECT_FLAG_LOCKABLE)
-
-/**
- * GstLockFlags:
- * @GST_LOCK_FLAG_READ: lock for read access
- * @GST_LOCK_FLAG_WRITE: lock for write access
- * @GST_LOCK_FLAG_EXCLUSIVE: lock for exclusive access
- * @GST_LOCK_FLAG_LAST: first flag that can be used for custom purposes
- *
- * Flags used when locking miniobjects
- */
-typedef enum {
-  GST_LOCK_FLAG_READ      = (1 << 0),
-  GST_LOCK_FLAG_WRITE     = (1 << 1),
-  GST_LOCK_FLAG_EXCLUSIVE = (1 << 2),
-
-  GST_LOCK_FLAG_LAST      = (1 << 8)
-} GstLockFlags;
-
-/**
- * GST_LOCK_FLAG_READWRITE:
- *
- * GstLockFlags value alias for GST_LOCK_FLAG_READ | GST_LOCK_FLAG_WRITE
- */
-#define GST_LOCK_FLAG_READWRITE  (GST_LOCK_FLAG_READ | GST_LOCK_FLAG_WRITE)
-
-/**
- * GST_MINI_OBJECT_REFCOUNT:
- * @obj: a #GstMiniObject
- *
- * Get access to the reference count field of the mini-object.
- */
-#define GST_MINI_OBJECT_REFCOUNT(obj)           ((GST_MINI_OBJECT_CAST(obj))->refcount)
-/**
- * GST_MINI_OBJECT_REFCOUNT_VALUE:
- * @obj: a #GstMiniObject
- *
- * Get the reference count value of the mini-object.
- */
-#define GST_MINI_OBJECT_REFCOUNT_VALUE(obj)     (g_atomic_int_get (&(GST_MINI_OBJECT_CAST(obj))->refcount))
-
-/**
- * GstMiniObject:
- * @type: the GType of the object
- * @refcount: atomic refcount
- * @lockstate: atomic state of the locks
- * @flags: extra flags.
- * @copy: a copy function
- * @dispose: a dispose function
- * @free: the free function
- *
- * Base class for refcounted lightweight objects.
- * Ref Func: gst_mini_object_ref
- * Unref Func: gst_mini_object_unref
- * Set Value Func: g_value_set_boxed
- * Get Value Func: g_value_get_boxed
- */
-struct _GstMiniObject {
-  GType   type;
-
-  /*< public >*/ /* with COW */
-  gint    refcount;
-  gint    lockstate;
-  guint   flags;
-
-  GstMiniObjectCopyFunction copy;
-  GstMiniObjectDisposeFunction dispose;
-  GstMiniObjectFreeFunction free;
-
-  /* < private > */
-  /* Used to keep track of weak ref notifies and qdata */
-  guint n_qdata;
-  gpointer qdata;
-};
-
-void            gst_mini_object_init (GstMiniObject *mini_object,
-                                      guint flags, GType type,
-                                      GstMiniObjectCopyFunction copy_func,
-                                      GstMiniObjectDisposeFunction dispose_func,
-                                      GstMiniObjectFreeFunction free_func);
-
-
-/* refcounting */
-GstMiniObject * gst_mini_object_ref		(GstMiniObject *mini_object);
-void            gst_mini_object_unref		(GstMiniObject *mini_object);
-
-void            gst_mini_object_weak_ref        (GstMiniObject *object,
-					         GstMiniObjectNotify notify,
-					         gpointer data);
-void            gst_mini_object_weak_unref	(GstMiniObject *object,
-					         GstMiniObjectNotify notify,
-					         gpointer data);
-
-/* locking */
-gboolean        gst_mini_object_lock            (GstMiniObject *object, GstLockFlags flags);
-void            gst_mini_object_unlock          (GstMiniObject *object, GstLockFlags flags);
-
-gboolean        gst_mini_object_is_writable     (const GstMiniObject *mini_object);
-GstMiniObject * gst_mini_object_make_writable	(GstMiniObject *mini_object);
-
-/* copy */
-GstMiniObject * gst_mini_object_copy		(const GstMiniObject *mini_object) G_GNUC_MALLOC;
-
-
-void            gst_mini_object_set_qdata       (GstMiniObject *object, GQuark quark,
-                                                 gpointer data, GDestroyNotify destroy);
-gpointer        gst_mini_object_get_qdata       (GstMiniObject *object, GQuark quark);
-gpointer        gst_mini_object_steal_qdata     (GstMiniObject *object, GQuark quark);
-
-
-gboolean        gst_mini_object_replace         (GstMiniObject **olddata, GstMiniObject *newdata);
-gboolean        gst_mini_object_take            (GstMiniObject **olddata, GstMiniObject *newdata);
-GstMiniObject * gst_mini_object_steal           (GstMiniObject **olddata);
-
-/**
- * GST_DEFINE_MINI_OBJECT_TYPE:
- * @TypeName: name of the new type in CamelCase
- * @type_name: name of the new type
- *
- * Define a new mini-object type with the given name
- */
-#define GST_DEFINE_MINI_OBJECT_TYPE(TypeName,type_name) \
-   G_DEFINE_BOXED_TYPE(TypeName,type_name,              \
-       (GBoxedCopyFunc) gst_mini_object_ref,            \
-       (GBoxedFreeFunc) gst_mini_object_unref)
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstobject.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstobject.h
deleted file mode 100644
index 6c9f9f5c..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstobject.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstobject.h: Header for base GstObject
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_OBJECT_H__
-#define __GST_OBJECT_H__
-
-#include <gst/gstconfig.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_OBJECT			(gst_object_get_type ())
-#define GST_IS_OBJECT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_OBJECT))
-#define GST_IS_OBJECT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_OBJECT))
-#define GST_OBJECT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_OBJECT, GstObjectClass))
-#define GST_OBJECT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_OBJECT, GstObject))
-#define GST_OBJECT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_OBJECT, GstObjectClass))
-#define GST_OBJECT_CAST(obj)            ((GstObject*)(obj))
-#define GST_OBJECT_CLASS_CAST(klass)    ((GstObjectClass*)(klass))
-
-/**
- * GstObjectFlags:
- * @GST_OBJECT_FLAG_LAST: subclasses can add additional flags starting from this flag
- *
- * The standard flags that an gstobject may have.
- */
-typedef enum
-{
-  /* padding */
-  GST_OBJECT_FLAG_LAST = (1<<4)
-} GstObjectFlags;
-
-/**
- * GST_OBJECT_REFCOUNT:
- * @obj: a #GstObject
- *
- * Get access to the reference count field of the object.
- */
-#define GST_OBJECT_REFCOUNT(obj)                (((GObject*)(obj))->ref_count)
-/**
- * GST_OBJECT_REFCOUNT_VALUE:
- * @obj: a #GstObject
- *
- * Get the reference count value of the object.
- */
-#define GST_OBJECT_REFCOUNT_VALUE(obj)          g_atomic_int_get ((gint *) &GST_OBJECT_REFCOUNT(obj))
-
-/* we do a GST_OBJECT_CAST to avoid type checking, better call these
- * function with a valid object! */
-
-/**
- * GST_OBJECT_GET_LOCK:
- * @obj: a #GstObject
- *
- * Acquire a reference to the mutex of this object.
- */
-#define GST_OBJECT_GET_LOCK(obj)               (&GST_OBJECT_CAST(obj)->lock)
-/**
- * GST_OBJECT_LOCK:
- * @obj: a #GstObject to lock
- *
- * This macro will obtain a lock on the object, making serialization possible.
- * It blocks until the lock can be obtained.
- */
-#define GST_OBJECT_LOCK(obj)                   g_mutex_lock(GST_OBJECT_GET_LOCK(obj))
-/**
- * GST_OBJECT_TRYLOCK:
- * @obj: a #GstObject.
- *
- * This macro will try to obtain a lock on the object, but will return with
- * FALSE if it can't get it immediately.
- */
-#define GST_OBJECT_TRYLOCK(obj)                g_mutex_trylock(GST_OBJECT_GET_LOCK(obj))
-/**
- * GST_OBJECT_UNLOCK:
- * @obj: a #GstObject to unlock.
- *
- * This macro releases a lock on the object.
- */
-#define GST_OBJECT_UNLOCK(obj)                 g_mutex_unlock(GST_OBJECT_GET_LOCK(obj))
-
-
-/**
- * GST_OBJECT_NAME:
- * @obj: a #GstObject
- *
- * Get the name of this object
- */
-#define GST_OBJECT_NAME(obj)            (GST_OBJECT_CAST(obj)->name)
-/**
- * GST_OBJECT_PARENT:
- * @obj: a #GstObject
- *
- * Get the parent of this object
- */
-#define GST_OBJECT_PARENT(obj)          (GST_OBJECT_CAST(obj)->parent)
-
-
-/**
- * GST_OBJECT_FLAGS:
- * @obj: a #GstObject
- *
- * This macro returns the entire set of flags for the object.
- */
-#define GST_OBJECT_FLAGS(obj)                  (GST_OBJECT_CAST (obj)->flags)
-/**
- * GST_OBJECT_FLAG_IS_SET:
- * @obj: a #GstObject
- * @flag: Flag to check for
- *
- * This macro checks to see if the given flag is set.
- */
-#define GST_OBJECT_FLAG_IS_SET(obj,flag)       ((GST_OBJECT_FLAGS (obj) & (flag)) == (flag))
-/**
- * GST_OBJECT_FLAG_SET:
- * @obj: a #GstObject
- * @flag: Flag to set
- *
- * This macro sets the given bits.
- */
-#define GST_OBJECT_FLAG_SET(obj,flag)          (GST_OBJECT_FLAGS (obj) |= (flag))
-/**
- * GST_OBJECT_FLAG_UNSET:
- * @obj: a #GstObject
- * @flag: Flag to set
- *
- * This macro usets the given bits.
- */
-#define GST_OBJECT_FLAG_UNSET(obj,flag)        (GST_OBJECT_FLAGS (obj) &= ~(flag))
-
-typedef struct _GstObject GstObject;
-typedef struct _GstObjectClass GstObjectClass;
-
-/**
- * GstObject:
- * @lock: object LOCK
- * @name: The name of the object
- * @parent: this object's parent, weak ref
- * @flags: flags for this object
- *
- * GStreamer base object class.
- */
-struct _GstObject {
-  GInitiallyUnowned object;
-
-  /*< public >*/ /* with LOCK */
-  GMutex         lock;        /* object LOCK */
-  gchar         *name;        /* object name */
-  GstObject     *parent;      /* this object's parent, weak ref */
-  guint32        flags;
-
-  /*< private >*/
-  GList         *control_bindings;  /* List of GstControlBinding */
-  guint64        control_rate;
-  guint64        last_sync;
-
-  gpointer _gst_reserved;
-};
-
-/**
- * GstObjectClass:
- * @parent_class: parent
- * @path_string_separator: separator used by gst_object_get_path_string()
- * @deep_notify: default signal handler
- *
- * GStreamer base object class.
- */
-struct _GstObjectClass {
-  GInitiallyUnownedClass parent_class;
-
-  const gchar	*path_string_separator;
-
-  /* signals */
-  void          (*deep_notify)      (GstObject * object, GstObject * orig, GParamSpec * pspec);
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/* normal GObject stuff */
-GType		gst_object_get_type		(void);
-
-/* name routines */
-gboolean	gst_object_set_name		(GstObject *object, const gchar *name);
-gchar*		gst_object_get_name		(GstObject *object);
-
-/* parentage routines */
-gboolean	gst_object_set_parent		(GstObject *object, GstObject *parent);
-GstObject*	gst_object_get_parent		(GstObject *object);
-void		gst_object_unparent		(GstObject *object);
-gboolean	gst_object_has_ancestor		(GstObject *object, GstObject *ancestor);
-
-void            gst_object_default_deep_notify  (GObject *object, GstObject *orig,
-                                                 GParamSpec *pspec, gchar **excluded_props);
-
-/* refcounting + life cycle */
-gpointer	gst_object_ref			(gpointer object);
-void		gst_object_unref		(gpointer object);
-gpointer        gst_object_ref_sink		(gpointer object);
-
-/* replace object pointer */
-gboolean        gst_object_replace		(GstObject **oldobj, GstObject *newobj);
-
-/* printing out the 'path' of the object */
-gchar *		gst_object_get_path_string	(GstObject *object);
-
-/* misc utils */
-gboolean	gst_object_check_uniqueness	(GList *list, const gchar *name);
-
-/* controller functions */
-#include <gst/gstcontrolbinding.h>
-#include <gst/gstcontrolsource.h>
-
-GstClockTime    gst_object_suggest_next_sync      (GstObject * object);
-gboolean        gst_object_sync_values            (GstObject * object, GstClockTime timestamp);
-
-gboolean        gst_object_has_active_control_bindings   (GstObject *object);
-void            gst_object_set_control_bindings_disabled (GstObject *object, gboolean disabled);
-void            gst_object_set_control_binding_disabled  (GstObject *object,
-                                                          const gchar * property_name,
-                                                          gboolean disabled);
-
-gboolean        gst_object_add_control_binding    (GstObject * object, GstControlBinding * binding);
-GstControlBinding *
-                gst_object_get_control_binding    (GstObject *object, const gchar * property_name);
-gboolean        gst_object_remove_control_binding (GstObject * object, GstControlBinding * binding);
-
-GValue *        gst_object_get_value              (GstObject * object, const gchar * property_name,
-                                                   GstClockTime timestamp);
-gboolean        gst_object_get_value_array        (GstObject * object, const gchar * property_name,
-                                                   GstClockTime timestamp, GstClockTime interval,
-                                                   guint n_values, gpointer values);
-gboolean        gst_object_get_g_value_array      (GstObject * object, const gchar * property_name,
-                                                   GstClockTime timestamp, GstClockTime interval,
-                                                   guint n_values, GValue *values);
-
-GstClockTime    gst_object_get_control_rate       (GstObject * object);
-void            gst_object_set_control_rate       (GstObject * object, GstClockTime control_rate);
-
-G_END_DECLS
-
-#endif /* __GST_OBJECT_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpad.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpad.h
deleted file mode 100644
index 0170ab42..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpad.h
+++ /dev/null
@@ -1,1006 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstpad.h: Header for GstPad object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PAD_H__
-#define __GST_PAD_H__
-
-#include <gst/gstconfig.h>
-
-typedef struct _GstPad GstPad;
-typedef struct _GstPadPrivate GstPadPrivate;
-typedef struct _GstPadClass GstPadClass;
-typedef struct _GstPadProbeInfo GstPadProbeInfo;
-
-/**
- * GstPadDirection:
- * @GST_PAD_UNKNOWN: direction is unknown.
- * @GST_PAD_SRC: the pad is a source pad.
- * @GST_PAD_SINK: the pad is a sink pad.
- *
- * The direction of a pad.
- */
-typedef enum {
-  GST_PAD_UNKNOWN,
-  GST_PAD_SRC,
-  GST_PAD_SINK
-} GstPadDirection;
-
-/**
- * GstPadMode:
- * @GST_PAD_MODE_NONE: Pad will not handle dataflow
- * @GST_PAD_MODE_PUSH: Pad handles dataflow in downstream push mode
- * @GST_PAD_MODE_PULL: Pad handles dataflow in upstream pull mode
- *
- * The status of a GstPad. After activating a pad, which usually happens when the
- * parent element goes from READY to PAUSED, the GstPadMode defines if the
- * pad operates in push or pull mode.
- */
-typedef enum {
-  GST_PAD_MODE_NONE,
-  GST_PAD_MODE_PUSH,
-  GST_PAD_MODE_PULL
-} GstPadMode;
-
-#include <gst/gstobject.h>
-#include <gst/gstbuffer.h>
-#include <gst/gstbufferlist.h>
-#include <gst/gstcaps.h>
-#include <gst/gstpadtemplate.h>
-#include <gst/gstevent.h>
-#include <gst/gstquery.h>
-#include <gst/gsttask.h>
-
-G_BEGIN_DECLS
-
-/*
- * Pad base class
- */
-#define GST_TYPE_PAD			(gst_pad_get_type ())
-#define GST_IS_PAD(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PAD))
-#define GST_IS_PAD_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PAD))
-#define GST_PAD(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PAD, GstPad))
-#define GST_PAD_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PAD, GstPadClass))
-#define GST_PAD_CAST(obj)		((GstPad*)(obj))
-
-
-
-/**
- * GstPadLinkReturn:
- * @GST_PAD_LINK_OK		: link succeeded
- * @GST_PAD_LINK_WRONG_HIERARCHY: pads have no common grandparent
- * @GST_PAD_LINK_WAS_LINKED	: pad was already linked
- * @GST_PAD_LINK_WRONG_DIRECTION: pads have wrong direction
- * @GST_PAD_LINK_NOFORMAT	: pads do not have common format
- * @GST_PAD_LINK_NOSCHED	: pads cannot cooperate in scheduling
- * @GST_PAD_LINK_REFUSED	: refused for some reason
- *
- * Result values from gst_pad_link and friends.
- */
-typedef enum {
-  GST_PAD_LINK_OK               =  0,
-  GST_PAD_LINK_WRONG_HIERARCHY  = -1,
-  GST_PAD_LINK_WAS_LINKED       = -2,
-  GST_PAD_LINK_WRONG_DIRECTION  = -3,
-  GST_PAD_LINK_NOFORMAT         = -4,
-  GST_PAD_LINK_NOSCHED          = -5,
-  GST_PAD_LINK_REFUSED          = -6
-} GstPadLinkReturn;
-
-/**
- * GST_PAD_LINK_FAILED:
- * @ret: the #GstPadLinkReturn value
- *
- * Macro to test if the given #GstPadLinkReturn value indicates a failed
- * link step.
- */
-#define GST_PAD_LINK_FAILED(ret) ((ret) < GST_PAD_LINK_OK)
-
-/**
- * GST_PAD_LINK_SUCCESSFUL:
- * @ret: the #GstPadLinkReturn value
- *
- * Macro to test if the given #GstPadLinkReturn value indicates a successful
- * link step.
- */
-#define GST_PAD_LINK_SUCCESSFUL(ret) ((ret) >= GST_PAD_LINK_OK)
-
-/**
- * GstFlowReturn:
- * @GST_FLOW_OK:		 Data passing was ok.
- * @GST_FLOW_NOT_LINKED:	 Pad is not linked.
- * @GST_FLOW_FLUSHING:	         Pad is flushing.
- * @GST_FLOW_EOS:                Pad is EOS.
- * @GST_FLOW_NOT_NEGOTIATED:	 Pad is not negotiated.
- * @GST_FLOW_ERROR:		 Some (fatal) error occured. Element generating
- *                               this error should post an error message with more
- *                               details.
- * @GST_FLOW_NOT_SUPPORTED:	 This operation is not supported.
- * @GST_FLOW_CUSTOM_SUCCESS:	 Elements can use values starting from
- *                               this (and higher) to define custom success
- *                               codes.
- * @GST_FLOW_CUSTOM_SUCCESS_1:	 Pre-defined custom success code (define your
- *                               custom success code to this to avoid compiler
- *                               warnings).
- * @GST_FLOW_CUSTOM_SUCCESS_2:	 Pre-defined custom success code.
- * @GST_FLOW_CUSTOM_ERROR:	 Elements can use values starting from
- *                               this (and lower) to define custom error codes.
- * @GST_FLOW_CUSTOM_ERROR_1:	 Pre-defined custom error code (define your
- *                               custom error code to this to avoid compiler
- *                               warnings).
- * @GST_FLOW_CUSTOM_ERROR_2:	 Pre-defined custom error code.
- *
- * The result of passing data to a pad.
- *
- * Note that the custom return values should not be exposed outside of the
- * element scope.
- */
-typedef enum {
-  /* custom success starts here */
-  GST_FLOW_CUSTOM_SUCCESS_2 = 102,
-  GST_FLOW_CUSTOM_SUCCESS_1 = 101,
-  GST_FLOW_CUSTOM_SUCCESS = 100,
-
-  /* core predefined */
-  GST_FLOW_OK		  =  0,
-  /* expected failures */
-  GST_FLOW_NOT_LINKED     = -1,
-  GST_FLOW_FLUSHING       = -2,
-  /* error cases */
-  GST_FLOW_EOS            = -3,
-  GST_FLOW_NOT_NEGOTIATED = -4,
-  GST_FLOW_ERROR	  = -5,
-  GST_FLOW_NOT_SUPPORTED  = -6,
-
-  /* custom error starts here */
-  GST_FLOW_CUSTOM_ERROR   = -100,
-  GST_FLOW_CUSTOM_ERROR_1 = -101,
-  GST_FLOW_CUSTOM_ERROR_2 = -102
-} GstFlowReturn;
-
-const gchar*	        gst_flow_get_name	(GstFlowReturn ret);
-GQuark			gst_flow_to_quark	(GstFlowReturn ret);
-
-/**
- * GstPadLinkCheck:
- * @GST_PAD_LINK_CHECK_NOTHING: Don't check hierarchy or caps compatibility.
- * @GST_PAD_LINK_CHECK_HIERARCHY: Check the pads have same parents/grandparents.
- *   Could be omitted if it is already known that the two elements that own the
- *   pads are in the same bin.
- * @GST_PAD_LINK_CHECK_TEMPLATE_CAPS: Check if the pads are compatible by using
- *   their template caps. This is much faster than @GST_PAD_LINK_CHECK_CAPS, but
- *   would be unsafe e.g. if one pad has %GST_CAPS_ANY.
- * @GST_PAD_LINK_CHECK_CAPS: Check if the pads are compatible by comparing the
- *   caps returned by gst_pad_query_caps().
- * @GST_PAD_LINK_CHECK_DEFAULT: The default checks done when linking
- *   pads (i.e. the ones used by gst_pad_link()).
- *
- * The amount of checking to be done when linking pads. @GST_PAD_LINK_CHECK_CAPS
- * and @GST_PAD_LINK_CHECK_TEMPLATE_CAPS are mutually exclusive. If both are
- * specified, expensive but safe @GST_PAD_LINK_CHECK_CAPS are performed.
- *
- * <warning><para>
- * Only disable some of the checks if you are 100% certain you know the link
- * will not fail because of hierarchy/caps compatibility failures. If uncertain,
- * use the default checks (%GST_PAD_LINK_CHECK_DEFAULT) or the regular methods
- * for linking the pads.
- * </para></warning>
- */
-
-typedef enum {
-  GST_PAD_LINK_CHECK_NOTHING       = 0,
-  GST_PAD_LINK_CHECK_HIERARCHY     = 1 << 0,
-  GST_PAD_LINK_CHECK_TEMPLATE_CAPS = 1 << 1,
-  GST_PAD_LINK_CHECK_CAPS          = 1 << 2,
-
-  GST_PAD_LINK_CHECK_DEFAULT       = GST_PAD_LINK_CHECK_HIERARCHY | GST_PAD_LINK_CHECK_CAPS
-} GstPadLinkCheck;
-
-/* pad states */
-/**
- * GstPadActivateFunction:
- * @pad: a #GstPad
- * @parent: the parent of @pad
- *
- * This function is called when the pad is activated during the element
- * READY to PAUSED state change. By default this function will call the
- * activate function that puts the pad in push mode but elements can
- * override this function to activate the pad in pull mode if they wish.
- *
- * Returns: TRUE if the pad could be activated.
- */
-typedef gboolean		(*GstPadActivateFunction)	(GstPad *pad, GstObject *parent);
-/**
- * GstPadActivateModeFunction:
- * @pad: a #GstPad
- * @parent: the parent of @pad
- * @mode: the requested activation mode of @pad
- * @active: activate or deactivate the pad.
- *
- * The prototype of the push and pull activate functions.
- *
- * Returns: TRUE if the pad could be activated or deactivated.
- */
-typedef gboolean		(*GstPadActivateModeFunction)	(GstPad *pad, GstObject *parent,
-                                                                 GstPadMode mode, gboolean active);
-
-
-/* data passing */
-/**
- * GstPadChainFunction:
- * @pad: the sink #GstPad that performed the chain.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @buffer: the #GstBuffer that is chained, not %NULL.
- *
- * A function that will be called on sinkpads when chaining buffers.
- * The function typically processes the data contained in the buffer and
- * either consumes the data or passes it on to the internally linked pad(s).
- *
- * The implementer of this function receives a refcount to @buffer and should
- * gst_buffer_unref() when the buffer is no longer needed.
- *
- * When a chain function detects an error in the data stream, it must post an
- * error on the bus and return an appropriate #GstFlowReturn value.
- *
- * Returns: #GST_FLOW_OK for success
- */
-typedef GstFlowReturn		(*GstPadChainFunction)		(GstPad *pad, GstObject *parent,
-                                                                 GstBuffer *buffer);
-
-/**
- * GstPadChainListFunction:
- * @pad: the sink #GstPad that performed the chain.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @list: the #GstBufferList that is chained, not %NULL.
- *
- * A function that will be called on sinkpads when chaining buffer lists.
- * The function typically processes the data contained in the buffer list and
- * either consumes the data or passes it on to the internally linked pad(s).
- *
- * The implementer of this function receives a refcount to @list and
- * should gst_buffer_list_unref() when the list is no longer needed.
- *
- * When a chainlist function detects an error in the data stream, it must
- * post an error on the bus and return an appropriate #GstFlowReturn value.
- *
- * Returns: #GST_FLOW_OK for success
- */
-typedef GstFlowReturn		(*GstPadChainListFunction)	(GstPad *pad, GstObject *parent,
-                                                                 GstBufferList *list);
-
-/**
- * GstPadGetRangeFunction:
- * @pad: the src #GstPad to perform the getrange on.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @offset: the offset of the range
- * @length: the length of the range
- * @buffer: a memory location to hold the result buffer, cannot be NULL.
- *
- * This function will be called on source pads when a peer element
- * request a buffer at the specified @offset and @length. If this function
- * returns #GST_FLOW_OK, the result buffer will be stored in @buffer. The
- * contents of @buffer is invalid for any other return value.
- *
- * This function is installed on a source pad with
- * gst_pad_set_getrange_function() and can only be called on source pads after
- * they are successfully activated with gst_pad_activate_mode() with the
- * #GST_PAD_MODE_PULL.
- *
- * @offset and @length are always given in byte units. @offset must normally be a value
- * between 0 and the length in bytes of the data available on @pad. The
- * length (duration in bytes) can be retrieved with a #GST_QUERY_DURATION or with a
- * #GST_QUERY_SEEKING.
- *
- * Any @offset larger or equal than the length will make the function return
- * #GST_FLOW_EOS, which corresponds to EOS. In this case @buffer does not
- * contain a valid buffer.
- *
- * The buffer size of @buffer will only be smaller than @length when @offset is
- * near the end of the stream. In all other cases, the size of @buffer must be
- * exactly the requested size.
- *
- * It is allowed to call this function with a 0 @length and valid @offset, in
- * which case @buffer will contain a 0-sized buffer and the function returns
- * #GST_FLOW_OK.
- *
- * When this function is called with a -1 @offset, the sequentially next buffer
- * of length @length in the stream is returned.
- *
- * When this function is called with a -1 @length, a buffer with a default
- * optimal length is returned in @buffer. The length might depend on the value
- * of @offset.
- *
- * Returns: #GST_FLOW_OK for success and a valid buffer in @buffer. Any other
- * return value leaves @buffer undefined.
- */
-typedef GstFlowReturn		(*GstPadGetRangeFunction)	(GstPad *pad, GstObject *parent,
-                                                                 guint64 offset, guint length,
-                                                                 GstBuffer **buffer);
-
-/**
- * GstPadEventFunction:
- * @pad: the #GstPad to handle the event.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @event: the #GstEvent to handle.
- *
- * Function signature to handle an event for the pad.
- *
- * Returns: TRUE if the pad could handle the event.
- */
-typedef gboolean		(*GstPadEventFunction)		(GstPad *pad, GstObject *parent,
-                                                                 GstEvent *event);
-
-
-/* internal links */
-/**
- * GstPadIterIntLinkFunction:
- * @pad: The #GstPad to query.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- *
- * The signature of the internal pad link iterator function.
- *
- * Returns: a new #GstIterator that will iterate over all pads that are
- * linked to the given pad on the inside of the parent element.
- *
- * the caller must call gst_iterator_free() after usage.
- */
-typedef GstIterator*           (*GstPadIterIntLinkFunction)    (GstPad *pad, GstObject *parent);
-
-/* generic query function */
-/**
- * GstPadQueryFunction:
- * @pad: the #GstPad to query.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @query: the #GstQuery object to execute
- *
- * The signature of the query function.
- *
- * Returns: TRUE if the query could be performed.
- */
-typedef gboolean		(*GstPadQueryFunction)		(GstPad *pad, GstObject *parent,
-                                                                 GstQuery *query);
-
-
-/* linking */
-/**
- * GstPadLinkFunction:
- * @pad: the #GstPad that is linked.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- * @peer: the peer #GstPad of the link
- *
- * Function signature to handle a new link on the pad.
- *
- * Returns: the result of the link with the specified peer.
- */
-typedef GstPadLinkReturn	(*GstPadLinkFunction)		(GstPad *pad, GstObject *parent, GstPad *peer);
-/**
- * GstPadUnlinkFunction:
- * @pad: the #GstPad that is linked.
- * @parent: the parent of @pad. If the #GST_PAD_FLAG_NEED_PARENT flag is set,
- *          @parent is guaranteed to be not-NULL and remain valid during the
- *          execution of this function.
- *
- * Function signature to handle a unlinking the pad prom its peer.
- */
-typedef void			(*GstPadUnlinkFunction)		(GstPad *pad, GstObject *parent);
-
-
-/* misc */
-/**
- * GstPadForwardFunction:
- * @pad: the #GstPad that is forwarded.
- * @user_data: the gpointer to optional user data.
- *
- * A forward function is called for all internally linked pads, see
- * gst_pad_forward().
- *
- * Returns: TRUE if the dispatching procedure has to be stopped.
- */
-typedef gboolean		(*GstPadForwardFunction)	(GstPad *pad, gpointer user_data);
-
-/**
- * GstPadProbeType:
- * @GST_PAD_PROBE_TYPE_INVALID: invalid probe type
- * @GST_PAD_PROBE_TYPE_IDLE: probe idle pads and block
- * @GST_PAD_PROBE_TYPE_BLOCK: probe and block pads
- * @GST_PAD_PROBE_TYPE_BUFFER: probe buffers
- * @GST_PAD_PROBE_TYPE_BUFFER_LIST: probe buffer lists
- * @GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM: probe downstream events
- * @GST_PAD_PROBE_TYPE_EVENT_UPSTREAM: probe upstream events
- * @GST_PAD_PROBE_TYPE_EVENT_FLUSH: probe flush events. This probe has to be
- *     explicitly enabled and is not included in the
- *     @@GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM or
- *     @@GST_PAD_PROBE_TYPE_EVENT_UPSTREAM probe types.
- * @GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM: probe downstream queries
- * @GST_PAD_PROBE_TYPE_QUERY_UPSTREAM: probe upstream queries
- * @GST_PAD_PROBE_TYPE_PUSH: probe push
- * @GST_PAD_PROBE_TYPE_PULL: probe pull
- * @GST_PAD_PROBE_TYPE_BLOCKING: probe and block at the next opportunity, at data flow or when idle
- * @GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM: probe downstream data (buffers, buffer lists, and events)
- * @GST_PAD_PROBE_TYPE_DATA_UPSTREAM: probe upstream data (events)
- * @GST_PAD_PROBE_TYPE_DATA_BOTH: probe upstream and downstream data (buffers, buffer lists, and events)
- * @GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM: probe and block downstream data (buffers, buffer lists, and events)
- * @GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM: probe and block upstream data (events)
- * @GST_PAD_PROBE_TYPE_EVENT_BOTH: probe upstream and downstream events
- * @GST_PAD_PROBE_TYPE_QUERY_BOTH: probe upstream and downstream queries
- * @GST_PAD_PROBE_TYPE_ALL_BOTH: probe upstream events and queries and downstream buffers, buffer lists, events and queries
- * @GST_PAD_PROBE_TYPE_SCHEDULING: probe push and pull
- *
- * The different probing types that can occur. When either one of
- * @GST_PAD_PROBE_TYPE_IDLE or @GST_PAD_PROBE_TYPE_BLOCK is used, the probe will be a
- * blocking probe.
- */
-typedef enum
-{
-  GST_PAD_PROBE_TYPE_INVALID          = 0,
-  /* flags to control blocking */
-  GST_PAD_PROBE_TYPE_IDLE             = (1 << 0),
-  GST_PAD_PROBE_TYPE_BLOCK            = (1 << 1),
-  /* flags to select datatypes */
-  GST_PAD_PROBE_TYPE_BUFFER           = (1 << 4),
-  GST_PAD_PROBE_TYPE_BUFFER_LIST      = (1 << 5),
-  GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM = (1 << 6),
-  GST_PAD_PROBE_TYPE_EVENT_UPSTREAM   = (1 << 7),
-  GST_PAD_PROBE_TYPE_EVENT_FLUSH      = (1 << 8),
-  GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM = (1 << 9),
-  GST_PAD_PROBE_TYPE_QUERY_UPSTREAM   = (1 << 10),
-  /* flags to select scheduling mode */
-  GST_PAD_PROBE_TYPE_PUSH             = (1 << 12),
-  GST_PAD_PROBE_TYPE_PULL             = (1 << 13),
-
-  /* flag combinations */
-  GST_PAD_PROBE_TYPE_BLOCKING         = GST_PAD_PROBE_TYPE_IDLE | GST_PAD_PROBE_TYPE_BLOCK,
-  GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM  = GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST | GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
-  GST_PAD_PROBE_TYPE_DATA_UPSTREAM    = GST_PAD_PROBE_TYPE_EVENT_UPSTREAM,
-  GST_PAD_PROBE_TYPE_DATA_BOTH        = GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM | GST_PAD_PROBE_TYPE_DATA_UPSTREAM,
-  GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM = GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM,
-  GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM   = GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_DATA_UPSTREAM,
-  GST_PAD_PROBE_TYPE_EVENT_BOTH       = GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_UPSTREAM,
-  GST_PAD_PROBE_TYPE_QUERY_BOTH       = GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM | GST_PAD_PROBE_TYPE_QUERY_UPSTREAM,
-  GST_PAD_PROBE_TYPE_ALL_BOTH         = GST_PAD_PROBE_TYPE_DATA_BOTH | GST_PAD_PROBE_TYPE_QUERY_BOTH,
-  GST_PAD_PROBE_TYPE_SCHEDULING       = GST_PAD_PROBE_TYPE_PUSH | GST_PAD_PROBE_TYPE_PULL
-} GstPadProbeType;
-
-
-/**
- * GstPadProbeReturn:
- * @GST_PAD_PROBE_OK: normal probe return value
- * @GST_PAD_PROBE_DROP: drop data in data probes. For push mode this means that
- *        the data item is not sent downstream. For pull mode, it means that the
- *        data item is not passed upstream. In both cases, this result code
- *        returns #GST_FLOW_OK or %TRUE to the caller.
- * @GST_PAD_PROBE_REMOVE: remove probe
- * @GST_PAD_PROBE_PASS: pass the data item in the block probe and block on
- *                         the next item
- *
- * Different return values for the #GstPadProbeCallback.
- */
-typedef enum
-{
-  GST_PAD_PROBE_DROP,
-  GST_PAD_PROBE_OK,
-  GST_PAD_PROBE_REMOVE,
-  GST_PAD_PROBE_PASS,
-} GstPadProbeReturn;
-
-
-/**
- * GstPadProbeInfo:
- * @type: the current probe type
- * @id: the id of the probe
- * @data: type specific data, check the @type field to know the datatype.
- *    This field can be NULL.
- * @offset: offset of pull probe, this field is valid when @type contains
- *    #GST_PAD_PROBE_TYPE_PULL
- * @size: size of pull probe, this field is valid when @type contains
- *    #GST_PAD_PROBE_TYPE_PULL
- *
- * Info passed in the #GstPadProbeCallback.
- */
-struct _GstPadProbeInfo
-{
-  GstPadProbeType type;
-  gulong id;
-  gpointer data;
-  guint64 offset;
-  guint size;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_PAD_PROBE_INFO_TYPE(d)         ((d)->type)
-#define GST_PAD_PROBE_INFO_ID(d)           ((d)->id)
-#define GST_PAD_PROBE_INFO_DATA(d)         ((d)->data)
-
-#define GST_PAD_PROBE_INFO_BUFFER(d)       GST_BUFFER_CAST(GST_PAD_PROBE_INFO_DATA(d))
-#define GST_PAD_PROBE_INFO_BUFFER_LIST(d)  GST_BUFFER_LIST_CAST(GST_PAD_PROBE_INFO_DATA(d))
-#define GST_PAD_PROBE_INFO_EVENT(d)        GST_EVENT_CAST(GST_PAD_PROBE_INFO_DATA(d))
-#define GST_PAD_PROBE_INFO_QUERY(d)        GST_QUERY_CAST(GST_PAD_PROBE_INFO_DATA(d))
-
-#define GST_PAD_PROBE_INFO_OFFSET(d)       ((d)->offset)
-#define GST_PAD_PROBE_INFO_SIZE(d)         ((d)->size)
-
-GstEvent*      gst_pad_probe_info_get_event       (GstPadProbeInfo * info);
-GstQuery*      gst_pad_probe_info_get_query       (GstPadProbeInfo * info);
-GstBuffer*     gst_pad_probe_info_get_buffer      (GstPadProbeInfo * info);
-GstBufferList* gst_pad_probe_info_get_buffer_list (GstPadProbeInfo * info);
-
-/**
- * GstPadProbeCallback:
- * @pad: the #GstPad that is blocked
- * @info: #GstPadProbeInfo
- * @user_data: the gpointer to optional user data.
- *
- * Callback used by gst_pad_add_probe(). Gets called to notify about the current
- * blocking type.
- *
- * The callback is allowed to modify the data pointer in @info.
- *
- * Returns: a #GstPadProbeReturn
- */
-typedef GstPadProbeReturn   (*GstPadProbeCallback)   (GstPad *pad, GstPadProbeInfo *info,
-                                                      gpointer user_data);
-
-/**
- * GstPadStickyEventsForeachFunction:
- * @pad: the #GstPad.
- * @event: a sticky #GstEvent.
- * @user_data: the #gpointer to optional user data.
- *
- * Callback used by gst_pad_sticky_events_foreach().
- *
- * When this function returns %TRUE, the next event will be
- * returned. When %FALSE is returned, gst_pad_sticky_events_foreach() will return.
- *
- * When @event is set to NULL, the item will be removed from the list of sticky events.
- * When @event has been made writable, the new buffer reference can be assigned
- * to @event. This function is responsible for unreffing the old event when
- * removing or modifying.
- *
- * Returns: %TRUE if the iteration should continue
- */
-typedef gboolean  (*GstPadStickyEventsForeachFunction) (GstPad *pad, GstEvent **event,
-                                                        gpointer user_data);
-
-/**
- * GstPadFlags:
- * @GST_PAD_FLAG_BLOCKED: is dataflow on a pad blocked
- * @GST_PAD_FLAG_FLUSHING: is pad flushing
- * @GST_PAD_FLAG_EOS: is pad in EOS state
- * @GST_PAD_FLAG_BLOCKING: is pad currently blocking on a buffer or event
- * @GST_PAD_FLAG_NEED_PARENT: ensure that there is a parent object before calling
- *                       into the pad callbacks.
- * @GST_PAD_FLAG_NEED_RECONFIGURE: the pad should be reconfigured/renegotiated.
- *                            The flag has to be unset manually after
- *                            reconfiguration happened.
- * @GST_PAD_FLAG_PENDING_EVENTS: the pad has pending events
- * @GST_PAD_FLAG_FIXED_CAPS: the pad is using fixed caps this means that once the
- *                      caps are set on the pad, the caps query function only
- *                      returns those caps.
- * @GST_PAD_FLAG_PROXY_CAPS: the default event and query handler will forward
- *                      all events and queries to the internally linked pads
- *                      instead of discarding them.
- * @GST_PAD_FLAG_PROXY_ALLOCATION: the default query handler will forward
- *                      allocation queries to the internally linked pads
- *                      instead of discarding them.
- * @GST_PAD_FLAG_PROXY_SCHEDULING: the default query handler will forward
- *                      scheduling queries to the internally linked pads
- *                      instead of discarding them.
- * @GST_PAD_FLAG_LAST: offset to define more flags
- *
- * Pad state flags
- */
-typedef enum {
-  GST_PAD_FLAG_BLOCKED          = (GST_OBJECT_FLAG_LAST << 0),
-  GST_PAD_FLAG_FLUSHING         = (GST_OBJECT_FLAG_LAST << 1),
-  GST_PAD_FLAG_EOS              = (GST_OBJECT_FLAG_LAST << 2),
-  GST_PAD_FLAG_BLOCKING         = (GST_OBJECT_FLAG_LAST << 3),
-  GST_PAD_FLAG_NEED_PARENT      = (GST_OBJECT_FLAG_LAST << 4),
-  GST_PAD_FLAG_NEED_RECONFIGURE = (GST_OBJECT_FLAG_LAST << 5),
-  GST_PAD_FLAG_PENDING_EVENTS   = (GST_OBJECT_FLAG_LAST << 6),
-  GST_PAD_FLAG_FIXED_CAPS       = (GST_OBJECT_FLAG_LAST << 7),
-  GST_PAD_FLAG_PROXY_CAPS       = (GST_OBJECT_FLAG_LAST << 8),
-  GST_PAD_FLAG_PROXY_ALLOCATION = (GST_OBJECT_FLAG_LAST << 9),
-  GST_PAD_FLAG_PROXY_SCHEDULING = (GST_OBJECT_FLAG_LAST << 10),
-  /* padding */
-  GST_PAD_FLAG_LAST        = (GST_OBJECT_FLAG_LAST << 16)
-} GstPadFlags;
-
-/**
- * GstPad:
- * @element_private: private data owned by the parent element
- * @padtemplate: padtemplate for this pad
- * @direction: the direction of the pad, cannot change after creating
- *             the pad.
- *
- * The #GstPad structure. Use the functions to update the variables.
- */
-struct _GstPad {
-  GstObject                      object;
-
-  /*< public >*/
-  gpointer                       element_private;
-
-  GstPadTemplate                *padtemplate;
-
-  GstPadDirection                direction;
-
-  /*< private >*/
-  /* streaming rec_lock */
-  GRecMutex		         stream_rec_lock;
-  GstTask			*task;
-
-  /* block cond, mutex is from the object */
-  GCond				 block_cond;
-  GHookList                      probes;
-
-  GstPadMode		         mode;
-  GstPadActivateFunction	 activatefunc;
-  gpointer                       activatedata;
-  GDestroyNotify                 activatenotify;
-  GstPadActivateModeFunction	 activatemodefunc;
-  gpointer                       activatemodedata;
-  GDestroyNotify                 activatemodenotify;
-
-  /* pad link */
-  GstPad			*peer;
-  GstPadLinkFunction		 linkfunc;
-  gpointer                       linkdata;
-  GDestroyNotify                 linknotify;
-  GstPadUnlinkFunction		 unlinkfunc;
-  gpointer                       unlinkdata;
-  GDestroyNotify                 unlinknotify;
-
-  /* data transport functions */
-  GstPadChainFunction		 chainfunc;
-  gpointer                       chaindata;
-  GDestroyNotify                 chainnotify;
-  GstPadChainListFunction        chainlistfunc;
-  gpointer                       chainlistdata;
-  GDestroyNotify                 chainlistnotify;
-  GstPadGetRangeFunction	 getrangefunc;
-  gpointer                       getrangedata;
-  GDestroyNotify                 getrangenotify;
-  GstPadEventFunction		 eventfunc;
-  gpointer                       eventdata;
-  GDestroyNotify                 eventnotify;
-
-  /* pad offset */
-  gint64                         offset;
-
-  /* generic query method */
-  GstPadQueryFunction		 queryfunc;
-  gpointer                       querydata;
-  GDestroyNotify                 querynotify;
-
-  /* internal links */
-  GstPadIterIntLinkFunction      iterintlinkfunc;
-  gpointer                       iterintlinkdata;
-  GDestroyNotify                 iterintlinknotify;
-
-  /* counts number of probes attached. */
-  gint				 num_probes;
-  gint				 num_blocked;
-
-  GstPadPrivate                 *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstPadClass {
-  GstObjectClass	parent_class;
-
-  /* signal callbacks */
-  void		(*linked)		(GstPad *pad, GstPad *peer);
-  void		(*unlinked)		(GstPad *pad, GstPad *peer);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-
-/***** helper macros *****/
-/* GstPad */
-#define GST_PAD_NAME(pad)		(GST_OBJECT_NAME(pad))
-#define GST_PAD_PARENT(pad)		(GST_ELEMENT_CAST(GST_OBJECT_PARENT(pad)))
-#define GST_PAD_ELEMENT_PRIVATE(pad)    (GST_PAD_CAST(pad)->element_private)
-#define GST_PAD_PAD_TEMPLATE(pad)	(GST_PAD_CAST(pad)->padtemplate)
-#define GST_PAD_DIRECTION(pad)		(GST_PAD_CAST(pad)->direction)
-#define GST_PAD_TASK(pad)		(GST_PAD_CAST(pad)->task)
-#define GST_PAD_MODE(pad)	        (GST_PAD_CAST(pad)->mode)
-
-#define GST_PAD_ACTIVATEFUNC(pad)	(GST_PAD_CAST(pad)->activatefunc)
-#define GST_PAD_ACTIVATEMODEFUNC(pad)	(GST_PAD_CAST(pad)->activatemodefunc)
-#define GST_PAD_CHAINFUNC(pad)		(GST_PAD_CAST(pad)->chainfunc)
-#define GST_PAD_CHAINLISTFUNC(pad)      (GST_PAD_CAST(pad)->chainlistfunc)
-#define GST_PAD_GETRANGEFUNC(pad)	(GST_PAD_CAST(pad)->getrangefunc)
-#define GST_PAD_EVENTFUNC(pad)		(GST_PAD_CAST(pad)->eventfunc)
-#define GST_PAD_QUERYFUNC(pad)		(GST_PAD_CAST(pad)->queryfunc)
-#define GST_PAD_ITERINTLINKFUNC(pad)    (GST_PAD_CAST(pad)->iterintlinkfunc)
-
-#define GST_PAD_PEER(pad)		(GST_PAD_CAST(pad)->peer)
-#define GST_PAD_LINKFUNC(pad)		(GST_PAD_CAST(pad)->linkfunc)
-#define GST_PAD_UNLINKFUNC(pad)		(GST_PAD_CAST(pad)->unlinkfunc)
-
-#define GST_PAD_IS_SRC(pad)		(GST_PAD_DIRECTION(pad) == GST_PAD_SRC)
-#define GST_PAD_IS_SINK(pad)		(GST_PAD_DIRECTION(pad) == GST_PAD_SINK)
-
-#define GST_PAD_IS_LINKED(pad)		(GST_PAD_PEER(pad) != NULL)
-
-#define GST_PAD_IS_ACTIVE(pad)          (GST_PAD_MODE(pad) != GST_PAD_MODE_NONE)
-
-#define GST_PAD_IS_BLOCKED(pad)		(GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKED))
-#define GST_PAD_IS_BLOCKING(pad)	(GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_BLOCKING))
-
-#define GST_PAD_IS_FLUSHING(pad)	(GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_FLUSHING))
-#define GST_PAD_SET_FLUSHING(pad)	(GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_FLUSHING))
-#define GST_PAD_UNSET_FLUSHING(pad)	(GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_FLUSHING))
-
-#define GST_PAD_IS_EOS(pad)	        (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_EOS))
-
-#define GST_PAD_NEEDS_RECONFIGURE(pad)  (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_NEED_RECONFIGURE))
-#define GST_PAD_HAS_PENDING_EVENTS(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PENDING_EVENTS))
-#define GST_PAD_IS_FIXED_CAPS(pad)	(GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_FIXED_CAPS))
-#define GST_PAD_NEEDS_PARENT(pad)       (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_NEED_PARENT))
-
-#define GST_PAD_IS_PROXY_CAPS(pad)      (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PROXY_CAPS))
-#define GST_PAD_SET_PROXY_CAPS(pad)     (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PROXY_CAPS))
-#define GST_PAD_UNSET_PROXY_CAPS(pad)   (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PROXY_CAPS))
-
-#define GST_PAD_IS_PROXY_ALLOCATION(pad)    (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PROXY_ALLOCATION))
-#define GST_PAD_SET_PROXY_ALLOCATION(pad)   (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PROXY_ALLOCATION))
-#define GST_PAD_UNSET_PROXY_ALLOCATION(pad) (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PROXY_ALLOCATION))
-
-#define GST_PAD_IS_PROXY_SCHEDULING(pad)    (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLAG_PROXY_SCHEDULING))
-#define GST_PAD_SET_PROXY_SCHEDULING(pad)   (GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_PROXY_SCHEDULING))
-#define GST_PAD_UNSET_PROXY_SCHEDULING(pad) (GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_PROXY_SCHEDULING))
-
-/**
- * GST_PAD_GET_STREAM_LOCK:
- * @pad: a #GstPad
- *
- * Get the stream lock of @pad. The stream lock is protecting the
- * resources used in the data processing functions of @pad.
- */
-#define GST_PAD_GET_STREAM_LOCK(pad)    (&(GST_PAD_CAST(pad)->stream_rec_lock))
-/**
- * GST_PAD_STREAM_LOCK:
- * @pad: a #GstPad
- *
- * Lock the stream lock of @pad.
- */
-#define GST_PAD_STREAM_LOCK(pad)        g_rec_mutex_lock(GST_PAD_GET_STREAM_LOCK(pad))
-/**
- * GST_PAD_STREAM_TRYLOCK:
- * @pad: a #GstPad
- *
- * Try to Lock the stream lock of the pad, return TRUE if the lock could be
- * taken.
- */
-#define GST_PAD_STREAM_TRYLOCK(pad)     g_rec_mutex_trylock(GST_PAD_GET_STREAM_LOCK(pad))
-/**
- * GST_PAD_STREAM_UNLOCK:
- * @pad: a #GstPad
- *
- * Unlock the stream lock of @pad.
- */
-#define GST_PAD_STREAM_UNLOCK(pad)      g_rec_mutex_unlock(GST_PAD_GET_STREAM_LOCK(pad))
-
-#define GST_PAD_BLOCK_GET_COND(pad)     (&GST_PAD_CAST(pad)->block_cond)
-#define GST_PAD_BLOCK_WAIT(pad)         (g_cond_wait(GST_PAD_BLOCK_GET_COND (pad), GST_OBJECT_GET_LOCK (pad)))
-#define GST_PAD_BLOCK_SIGNAL(pad)       (g_cond_signal(GST_PAD_BLOCK_GET_COND (pad)))
-#define GST_PAD_BLOCK_BROADCAST(pad)    (g_cond_broadcast(GST_PAD_BLOCK_GET_COND (pad)))
-
-GType			gst_pad_get_type			(void);
-
-/* creating pads */
-GstPad*			gst_pad_new				(const gchar *name, GstPadDirection direction);
-GstPad*			gst_pad_new_from_template		(GstPadTemplate *templ, const gchar *name);
-GstPad*			gst_pad_new_from_static_template	(GstStaticPadTemplate *templ, const gchar *name);
-
-
-/**
- * gst_pad_get_name:
- * @pad: the pad to get the name from
- *
- * Get a copy of the name of the pad. g_free() after usage.
- *
- * MT safe.
- */
-#define gst_pad_get_name(pad) gst_object_get_name (GST_OBJECT_CAST (pad))
-/**
- * gst_pad_get_parent:
- * @pad: the pad to get the parent of
- *
- * Get the parent of @pad. This function increases the refcount
- * of the parent object so you should gst_object_unref() it after usage.
- * Can return NULL if the pad did not have a parent.
- *
- * MT safe.
- */
-#define gst_pad_get_parent(pad) gst_object_get_parent (GST_OBJECT_CAST (pad))
-
-GstPadDirection		gst_pad_get_direction			(GstPad *pad);
-
-gboolean		gst_pad_set_active			(GstPad *pad, gboolean active);
-gboolean		gst_pad_is_active			(GstPad *pad);
-gboolean		gst_pad_activate_mode			(GstPad *pad, GstPadMode mode,
-                                                                 gboolean active);
-
-gulong                  gst_pad_add_probe                       (GstPad *pad,
-								 GstPadProbeType mask,
-								 GstPadProbeCallback callback,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify destroy_data);
-void                    gst_pad_remove_probe                    (GstPad *pad, gulong id);
-
-gboolean		gst_pad_is_blocked			(GstPad *pad);
-gboolean		gst_pad_is_blocking			(GstPad *pad);
-
-void                    gst_pad_mark_reconfigure                (GstPad *pad);
-gboolean		gst_pad_needs_reconfigure               (GstPad *pad);
-gboolean		gst_pad_check_reconfigure               (GstPad *pad);
-
-void			gst_pad_set_element_private		(GstPad *pad, gpointer priv);
-gpointer		gst_pad_get_element_private		(GstPad *pad);
-
-GstPadTemplate*		gst_pad_get_pad_template		(GstPad *pad);
-
-GstEvent*               gst_pad_get_sticky_event                (GstPad *pad, GstEventType event_type,
-                                                                 guint idx);
-void                    gst_pad_sticky_events_foreach           (GstPad *pad, GstPadStickyEventsForeachFunction foreach_func, gpointer user_data);
-
-/* data passing setup functions */
-void			gst_pad_set_activate_function_full	(GstPad *pad,
-                                                                 GstPadActivateFunction activate,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_activatemode_function_full	(GstPad *pad,
-                                                                 GstPadActivateModeFunction activatemode,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-/* data passing functions */
-void			gst_pad_set_chain_function_full		(GstPad *pad,
-                                                                 GstPadChainFunction chain,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_chain_list_function_full	(GstPad *pad,
-                                                                 GstPadChainListFunction chainlist,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_getrange_function_full	(GstPad *pad,
-                                                                 GstPadGetRangeFunction get,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_event_function_full		(GstPad *pad,
-                                                                 GstPadEventFunction event,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-
-#define gst_pad_set_activate_function(p,f)      gst_pad_set_activate_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_activatemode_function(p,f)  gst_pad_set_activatemode_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_chain_function(p,f)         gst_pad_set_chain_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_chain_list_function(p,f)    gst_pad_set_chain_list_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_getrange_function(p,f)      gst_pad_set_getrange_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_event_function(p,f)         gst_pad_set_event_function_full((p),(f),NULL,NULL)
-
-/* pad links */
-void			gst_pad_set_link_function_full		(GstPad *pad,
-                                                                 GstPadLinkFunction link,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-void			gst_pad_set_unlink_function_full        (GstPad *pad,
-                                                                 GstPadUnlinkFunction unlink,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-
-#define gst_pad_set_link_function(p,f)          gst_pad_set_link_function_full((p),(f),NULL,NULL)
-#define gst_pad_set_unlink_function(p,f)        gst_pad_set_unlink_function_full((p),(f),NULL,NULL)
-
-gboolean                gst_pad_can_link                        (GstPad *srcpad, GstPad *sinkpad);
-GstPadLinkReturn        gst_pad_link				(GstPad *srcpad, GstPad *sinkpad);
-GstPadLinkReturn        gst_pad_link_full			(GstPad *srcpad, GstPad *sinkpad, GstPadLinkCheck flags);
-gboolean		gst_pad_unlink				(GstPad *srcpad, GstPad *sinkpad);
-gboolean		gst_pad_is_linked			(GstPad *pad);
-
-GstPad*			gst_pad_get_peer			(GstPad *pad);
-
-GstCaps*                gst_pad_get_pad_template_caps		(GstPad *pad);
-
-/* capsnego function for linked/unlinked pads */
-GstCaps *		gst_pad_get_current_caps                (GstPad * pad);
-gboolean		gst_pad_has_current_caps                (GstPad * pad);
-
-/* capsnego for linked pads */
-GstCaps *		gst_pad_get_allowed_caps		(GstPad * pad);
-
-/* pad offsets */
-gint64                  gst_pad_get_offset                      (GstPad *pad);
-void                    gst_pad_set_offset                      (GstPad *pad, gint64 offset);
-
-/* data passing functions to peer */
-GstFlowReturn		gst_pad_push				(GstPad *pad, GstBuffer *buffer);
-GstFlowReturn		gst_pad_push_list			(GstPad *pad, GstBufferList *list);
-GstFlowReturn		gst_pad_pull_range			(GstPad *pad, guint64 offset, guint size,
-								 GstBuffer **buffer);
-gboolean		gst_pad_push_event			(GstPad *pad, GstEvent *event);
-gboolean		gst_pad_event_default			(GstPad *pad, GstObject *parent,
-                                                                 GstEvent *event);
-
-/* data passing functions on pad */
-GstFlowReturn		gst_pad_chain				(GstPad *pad, GstBuffer *buffer);
-GstFlowReturn		gst_pad_chain_list                      (GstPad *pad, GstBufferList *list);
-GstFlowReturn		gst_pad_get_range			(GstPad *pad, guint64 offset, guint size,
-								 GstBuffer **buffer);
-gboolean		gst_pad_send_event			(GstPad *pad, GstEvent *event);
-
-/* pad tasks */
-gboolean		gst_pad_start_task			(GstPad *pad, GstTaskFunction func,
-								 gpointer user_data, GDestroyNotify notify);
-gboolean		gst_pad_pause_task			(GstPad *pad);
-gboolean		gst_pad_stop_task			(GstPad *pad);
-
-/* internal links */
-void                    gst_pad_set_iterate_internal_links_function_full (GstPad * pad,
-                                                                 GstPadIterIntLinkFunction iterintlink,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-GstIterator *           gst_pad_iterate_internal_links          (GstPad * pad);
-GstIterator *           gst_pad_iterate_internal_links_default  (GstPad * pad, GstObject *parent);
-
-#define gst_pad_set_iterate_internal_links_function(p,f) gst_pad_set_iterate_internal_links_function_full((p),(f),NULL,NULL)
-
-/* generic query function */
-gboolean		gst_pad_query				(GstPad *pad, GstQuery *query);
-gboolean		gst_pad_peer_query			(GstPad *pad, GstQuery *query);
-void			gst_pad_set_query_function_full		(GstPad *pad, GstPadQueryFunction query,
-                                                                 gpointer user_data,
-                                                                 GDestroyNotify notify);
-gboolean		gst_pad_query_default			(GstPad *pad, GstObject *parent,
-                                                                 GstQuery *query);
-
-#define gst_pad_set_query_function(p,f)   gst_pad_set_query_function_full((p),(f),NULL,NULL)
-
-/* misc helper functions */
-gboolean		gst_pad_forward                         (GstPad *pad, GstPadForwardFunction forward,
-								 gpointer user_data);
-
-const gchar   * gst_pad_mode_get_name (GstPadMode mode);
-
-G_END_DECLS
-
-#endif /* __GST_PAD_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpadtemplate.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpadtemplate.h
deleted file mode 100644
index 90f9b252..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpadtemplate.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstpadtemplate.h: Header for GstPadTemplate object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PAD_TEMPLATE_H__
-#define __GST_PAD_TEMPLATE_H__
-
-#include <gst/gstconfig.h>
-
-typedef struct _GstPadTemplate GstPadTemplate;
-typedef struct _GstPadTemplateClass GstPadTemplateClass;
-typedef struct _GstStaticPadTemplate GstStaticPadTemplate;
-
-#include <gst/gstobject.h>
-#include <gst/gstbuffer.h>
-#include <gst/gstcaps.h>
-#include <gst/gstevent.h>
-#include <gst/gstquery.h>
-#include <gst/gsttask.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_STATIC_PAD_TEMPLATE	(gst_static_pad_template_get_type ())
-
-#define GST_TYPE_PAD_TEMPLATE		(gst_pad_template_get_type ())
-#define GST_PAD_TEMPLATE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PAD_TEMPLATE,GstPadTemplate))
-#define GST_PAD_TEMPLATE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PAD_TEMPLATE,GstPadTemplateClass))
-#define GST_IS_PAD_TEMPLATE(obj)	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PAD_TEMPLATE))
-#define GST_IS_PAD_TEMPLATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PAD_TEMPLATE))
-
-/**
- * GstPadPresence:
- * @GST_PAD_ALWAYS: the pad is always available
- * @GST_PAD_SOMETIMES: the pad will become available depending on the media stream
- * @GST_PAD_REQUEST: the pad is only available on request with
- *  gst_element_get_request_pad().
- *
- * Indicates when this pad will become available.
- */
-typedef enum {
-  GST_PAD_ALWAYS,
-  GST_PAD_SOMETIMES,
-  GST_PAD_REQUEST
-} GstPadPresence;
-
-/**
- * GST_PAD_TEMPLATE_NAME_TEMPLATE:
- * @templ: the template to query
- *
- * Get the nametemplate of the padtemplate.
- */
-#define GST_PAD_TEMPLATE_NAME_TEMPLATE(templ)	(((GstPadTemplate *)(templ))->name_template)
-
-/**
- * GST_PAD_TEMPLATE_DIRECTION:
- * @templ: the template to query
- *
- * Get the #GstPadDirection of the padtemplate.
- */
-#define GST_PAD_TEMPLATE_DIRECTION(templ)	(((GstPadTemplate *)(templ))->direction)
-
-/**
- * GST_PAD_TEMPLATE_PRESENCE:
- * @templ: the template to query
- *
- * Get the #GstPadPresence of the padtemplate.
- */
-#define GST_PAD_TEMPLATE_PRESENCE(templ)	(((GstPadTemplate *)(templ))->presence)
-
-/**
- * GST_PAD_TEMPLATE_CAPS:
- * @templ: the template to query
- *
- * Get a handle to the padtemplate #GstCaps
- */
-#define GST_PAD_TEMPLATE_CAPS(templ)		(((GstPadTemplate *)(templ))->caps)
-
-/**
- * GstPadTemplateFlags:
- * @GST_PAD_TEMPLATE_FLAG_LAST: first flag that can be used by subclasses.
- *
- * Flags for the padtemplate
- */
-typedef enum {
-  /* padding */
-  GST_PAD_TEMPLATE_FLAG_LAST    = (GST_OBJECT_FLAG_LAST << 4)
-} GstPadTemplateFlags;
-
-/**
- * GST_PAD_TEMPLATE_IS_FIXED:
- * @templ: the template to query
- *
- * Check if the properties of the padtemplate are fixed
- */
-#define GST_PAD_TEMPLATE_IS_FIXED(templ)	(GST_OBJECT_FLAG_IS_SET(templ, GST_PAD_TEMPLATE_FIXED))
-
-/**
- * GstPadTemplate:
- *
- * The padtemplate object.
- */
-struct _GstPadTemplate {
-  GstObject	   object;
-
-  gchar           *name_template;
-  GstPadDirection  direction;
-  GstPadPresence   presence;
-  GstCaps	  *caps;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstPadTemplateClass {
-  GstObjectClass   parent_class;
-
-  /* signal callbacks */
-  void (*pad_created)	(GstPadTemplate *templ, GstPad *pad);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstStaticPadTemplate:
- * @name_template: the name of the template
- * @direction: the direction of the template
- * @presence: the presence of the template
- * @static_caps: the caps of the template.
- *
- * Structure describing the #GstStaticPadTemplate.
- */
-struct _GstStaticPadTemplate {
-  const gchar     *name_template;
-  GstPadDirection  direction;
-  GstPadPresence   presence;
-  GstStaticCaps    static_caps;
-};
-
-/**
- * GST_STATIC_PAD_TEMPLATE:
- * @padname: the name template of the pad
- * @dir: the GstPadDirection of the pad
- * @pres: the GstPadPresence of the pad
- * @caps: the GstStaticCaps of the pad
- *
- * Convenience macro to fill the values of a GstStaticPadTemplate
- * structure.
- */
-#define GST_STATIC_PAD_TEMPLATE(padname, dir, pres, caps) \
-{ \
-  /* name_template */    padname, \
-  /* direction */        dir, \
-  /* presence */         pres, \
-  /* caps */             caps \
-}
-
-/* templates and factories */
-GType			gst_pad_template_get_type		(void);
-GType			gst_static_pad_template_get_type	(void);
-
-GstPadTemplate*		gst_pad_template_new			(const gchar *name_template,
-								 GstPadDirection direction, GstPadPresence presence,
-								 GstCaps *caps) G_GNUC_MALLOC;
-
-GstPadTemplate *	gst_static_pad_template_get             (GstStaticPadTemplate *pad_template);
-GstCaps*		gst_static_pad_template_get_caps	(GstStaticPadTemplate *templ);
-GstCaps*		gst_pad_template_get_caps		(GstPadTemplate *templ);
-
-void                    gst_pad_template_pad_created            (GstPadTemplate * templ, GstPad * pad);
-
-G_END_DECLS
-
-#endif /* __GST_PAD_TEMPLATE_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstparamspecs.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstparamspecs.h
deleted file mode 100644
index e7e5fd57..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstparamspecs.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* GStreamer - GParamSpecs for some of our types
- * Copyright (C) 2007 Tim-Philipp Müller  <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PARAMSPECS_H__
-#define __GST_PARAMSPECS_H__
-
-#include <gst/gstvalue.h>
-
-G_BEGIN_DECLS
-
-/* --- paramspec flags */
-
-/**
- * GST_PARAM_CONTROLLABLE:
- *
- * Use this flag on GObject properties to signal they can make sense to be.
- * controlled over time. This hint is used by the GstController.
- */
-#define	GST_PARAM_CONTROLLABLE	(1 << (G_PARAM_USER_SHIFT + 1))
-
-/**
- * GST_PARAM_MUTABLE_READY:
- *
- * Use this flag on GObject properties of GstElements to indicate that
- * they can be changed when the element is in the READY or lower state.
- */
-#define GST_PARAM_MUTABLE_READY  (1 << (G_PARAM_USER_SHIFT + 2))
-
-/**
- * GST_PARAM_MUTABLE_PAUSED:
- *
- * Use this flag on GObject properties of GstElements to indicate that
- * they can be changed when the element is in the PAUSED or lower state.
- * This flag implies GST_PARAM_MUTABLE_READY.
- */
-#define GST_PARAM_MUTABLE_PAUSED  (1 << (G_PARAM_USER_SHIFT + 3))
-
-/**
- * GST_PARAM_MUTABLE_PLAYING:
- *
- * Use this flag on GObject properties of GstElements to indicate that
- * they can be changed when the element is in the PLAYING or lower state.
- * This flag implies GST_PARAM_MUTABLE_PAUSED.
- */
-#define GST_PARAM_MUTABLE_PLAYING  (1 << (G_PARAM_USER_SHIFT + 4))
-
-/**
- * GST_PARAM_USER_SHIFT:
- *
- * Bits based on GST_PARAM_USER_SHIFT can be used by 3rd party applications.
- */
-#define	GST_PARAM_USER_SHIFT	(1 << (G_PARAM_USER_SHIFT + 8))
-
-
-/* --- type macros --- */
-
-#define GST_TYPE_PARAM_FRACTION           (gst_param_spec_fraction_get_type ())
-#define GST_IS_PARAM_SPEC_FRACTION(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GST_TYPE_PARAM_FRACTION))
-#define GST_PARAM_SPEC_FRACTION(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GST_TYPE_PARAM_FRACTION, GstParamSpecFraction))
-
-
-/* --- get_type functions --- */
-
-GType  gst_param_spec_fraction_get_type (void);
-
-
-/* --- typedefs & structures --- */
-
-typedef struct _GstParamSpecFraction GstParamSpecFraction;
-
-/**
- * GstParamSpecFraction:
- * @parent_instance: super class
- * @min_num: minimal numerator
- * @min_den: minimal denominator
- * @max_num: maximal numerator
- * @max_den: maximal denominator
- * @def_num: default numerator
- * @def_den: default denominator
- *
- * A GParamSpec derived structure that contains the meta data for fractional
- * properties.
- */
-struct _GstParamSpecFraction {
-  GParamSpec    parent_instance;
-
-  gint          min_num, min_den;
-  gint          max_num, max_den;
-  gint          def_num, def_den;
-};
-
-
-/* --- GParamSpec prototypes --- */
-
-GParamSpec  * gst_param_spec_fraction (const gchar * name,
-                                       const gchar * nick,
-                                       const gchar * blurb,
-                                       gint min_num, gint min_denom,
-                                       gint max_num, gint max_denom,
-                                       gint default_num, gint default_denom,
-                                       GParamFlags flags) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __GST_PARAMSPECS_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstparse.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstparse.h
deleted file mode 100644
index 630c3cef..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstparse.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstparse.h: get a pipeline from a text pipeline description
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PARSE_H__
-#define __GST_PARSE_H__
-
-#include <gst/gstelement.h>
-
-G_BEGIN_DECLS
-
-GQuark gst_parse_error_quark (void);
-/**
- * GST_PARSE_ERROR:
- *
- * Get access to the error quark of the parse subsystem.
- */
-#define GST_PARSE_ERROR gst_parse_error_quark ()
-
-/**
- * GstParseError:
- * @GST_PARSE_ERROR_SYNTAX: A syntax error occured.
- * @GST_PARSE_ERROR_NO_SUCH_ELEMENT: The description contained an unknown element
- * @GST_PARSE_ERROR_NO_SUCH_PROPERTY: An element did not have a specified property
- * @GST_PARSE_ERROR_LINK: There was an error linking two pads.
- * @GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY: There was an error setting a property
- * @GST_PARSE_ERROR_EMPTY_BIN: An empty bin was specified.
- * @GST_PARSE_ERROR_EMPTY: An empty description was specified
- *
- * The different parsing errors that can occur.
- */
-typedef enum
-{
-  GST_PARSE_ERROR_SYNTAX,
-  GST_PARSE_ERROR_NO_SUCH_ELEMENT,
-  GST_PARSE_ERROR_NO_SUCH_PROPERTY,
-  GST_PARSE_ERROR_LINK,
-  GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
-  GST_PARSE_ERROR_EMPTY_BIN,
-  GST_PARSE_ERROR_EMPTY
-} GstParseError;
-
-/**
- * GstParseFlags:
- * @GST_PARSE_FLAG_NONE: Do not use any special parsing options.
- * @GST_PARSE_FLAG_FATAL_ERRORS: Always return NULL when an error occurs
- *     (default behaviour is to return partially constructed bins or elements
- *      in some cases)
- *
- * Parsing options.
- */
-typedef enum
-{
-  GST_PARSE_FLAG_NONE = 0,
-  GST_PARSE_FLAG_FATAL_ERRORS = (1 << 0)
-} GstParseFlags;
-
-#define GST_TYPE_PARSE_CONTEXT (gst_parse_context_get_type())
-
-/**
- * GstParseContext:
- *
- * Opaque structure.
- */
-typedef struct _GstParseContext GstParseContext;
-
-/* create, process and free a parse context */
-
-GType             gst_parse_context_get_type (void);
-GstParseContext * gst_parse_context_new (void) G_GNUC_MALLOC;
-
-gchar          ** gst_parse_context_get_missing_elements (GstParseContext * context) G_GNUC_MALLOC;
-
-void              gst_parse_context_free (GstParseContext * context);
-
-
-/* parse functions */
-
-GstElement      * gst_parse_launch       (const gchar      * pipeline_description,
-                                          GError          ** error) G_GNUC_MALLOC;
-
-GstElement      * gst_parse_launchv      (const gchar     ** argv,
-                                          GError          ** error) G_GNUC_MALLOC;
-
-GstElement      * gst_parse_launch_full  (const gchar      * pipeline_description,
-                                          GstParseContext  * context,
-                                          GstParseFlags      flags,
-                                          GError          ** error) G_GNUC_MALLOC;
-
-GstElement      * gst_parse_launchv_full (const gchar     ** argv,
-                                          GstParseContext  * context,
-                                          GstParseFlags      flags,
-                                          GError          ** error) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __GST_PARSE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpipeline.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpipeline.h
deleted file mode 100644
index 43563cb8..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpipeline.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstpipeline.h: Header for GstPipeline element
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PIPELINE_H__
-#define __GST_PIPELINE_H__
-
-#include <gst/gstbin.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PIPELINE               (gst_pipeline_get_type ())
-#define GST_PIPELINE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PIPELINE, GstPipeline))
-#define GST_IS_PIPELINE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PIPELINE))
-#define GST_PIPELINE_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PIPELINE, GstPipelineClass))
-#define GST_IS_PIPELINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PIPELINE))
-#define GST_PIPELINE_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PIPELINE, GstPipelineClass))
-#define GST_PIPELINE_CAST(obj)          ((GstPipeline*)(obj))
-
-typedef struct _GstPipeline GstPipeline;
-typedef struct _GstPipelineClass GstPipelineClass;
-typedef struct _GstPipelinePrivate GstPipelinePrivate;
-
-/**
- * GstPipelineFlags:
- * @GST_PIPELINE_FLAG_FIXED_CLOCK: this pipeline works with a fixed clock
- * @GST_PIPELINE_FLAG_LAST: offset to define more flags
- *
- * Pipeline flags
- */
-typedef enum {
-  GST_PIPELINE_FLAG_FIXED_CLOCK        = (GST_BIN_FLAG_LAST << 0),
-  /* padding */
-  GST_PIPELINE_FLAG_LAST               = (GST_BIN_FLAG_LAST << 4)
-} GstPipelineFlags;
-
-/**
- * GstPipeline:
- * @fixed_clock: The fixed clock of the pipeline, used when
- *               GST_PIPELINE_FLAG_FIXED_CLOCK is set.
- * @stream_time: The stream time of the pipeline. A better name for this
- *         property would be the running_time, the total time spent in the
- *         PLAYING state without being flushed. (deprecated, use the start_time
- *         on GstElement).
- * @delay: Extra delay added to base_time to compensate for computing delays
- *         when setting elements to PLAYING.
- *
- * The #GstPipeline structure.
- */
-struct _GstPipeline {
-  GstBin         bin;
-
-  /*< public >*/ /* with LOCK */
-  GstClock      *fixed_clock;
-
-  GstClockTime   stream_time;
-  GstClockTime   delay;
-
-  /*< private >*/
-  GstPipelinePrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstPipelineClass {
-  GstBinClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_pipeline_get_type           (void);
-GstElement*     gst_pipeline_new                (const gchar *name) G_GNUC_MALLOC;
-
-GstBus*         gst_pipeline_get_bus            (GstPipeline *pipeline);
-
-void            gst_pipeline_use_clock          (GstPipeline *pipeline, GstClock *clock);
-gboolean        gst_pipeline_set_clock          (GstPipeline *pipeline, GstClock *clock);
-GstClock*       gst_pipeline_get_clock          (GstPipeline *pipeline);
-void            gst_pipeline_auto_clock         (GstPipeline *pipeline);
-
-void            gst_pipeline_set_delay          (GstPipeline *pipeline, GstClockTime delay);
-GstClockTime    gst_pipeline_get_delay          (GstPipeline *pipeline);
-
-void            gst_pipeline_set_auto_flush_bus (GstPipeline *pipeline, gboolean auto_flush);
-gboolean        gst_pipeline_get_auto_flush_bus (GstPipeline *pipeline);
-
-G_END_DECLS
-
-#endif /* __GST_PIPELINE_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstplugin.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstplugin.h
deleted file mode 100644
index 68071865..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstplugin.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstplugin.h: Header for plugin subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PLUGIN_H__
-#define __GST_PLUGIN_H__
-
-#include <gst/gstconfig.h>
-
-#include <gst/gstobject.h>
-#include <gst/gstmacros.h>
-#include <gst/gststructure.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstPlugin:
- *
- * The opaque plugin object
- */
-typedef struct _GstPlugin GstPlugin;
-typedef struct _GstPluginClass GstPluginClass;
-typedef struct _GstPluginDesc GstPluginDesc;
-
-/**
- * gst_plugin_error_quark:
- *
- * Get the error quark.
- *
- * Returns: The error quark used in GError messages
- */
-GQuark gst_plugin_error_quark (void);
-/**
- * GST_PLUGIN_ERROR:
- *
- * The error message category quark
- */
-#define GST_PLUGIN_ERROR gst_plugin_error_quark ()
-
-/**
- * GstPluginError:
- * @GST_PLUGIN_ERROR_MODULE: The plugin could not be loaded
- * @GST_PLUGIN_ERROR_DEPENDENCIES: The plugin has unresolved dependencies
- * @GST_PLUGIN_ERROR_NAME_MISMATCH: The plugin has already be loaded from a different file
- *
- * The plugin loading errors
- */
-typedef enum
-{
-  GST_PLUGIN_ERROR_MODULE,
-  GST_PLUGIN_ERROR_DEPENDENCIES,
-  GST_PLUGIN_ERROR_NAME_MISMATCH
-} GstPluginError;
-
-/**
- * GstPluginFlags:
- * @GST_PLUGIN_FLAG_CACHED: Temporarily loaded plugins
- * @GST_PLUGIN_FLAG_BLACKLISTED: The plugin won't be scanned (again)
- *
- * The plugin loading state
- */
-typedef enum
-{
-  GST_PLUGIN_FLAG_CACHED      = (GST_OBJECT_FLAG_LAST << 0),
-  GST_PLUGIN_FLAG_BLACKLISTED = (GST_OBJECT_FLAG_LAST << 1)
-} GstPluginFlags;
-
-/**
- * GstPluginDependencyFlags:
- * @GST_PLUGIN_DEPENDENCY_FLAG_NONE : no special flags
- * @GST_PLUGIN_DEPENDENCY_FLAG_RECURSE : recurse into subdirectories
- * @GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY : use paths
- *         argument only if none of the environment variables is set
- * @GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX : interpret
- *         filename argument as filter suffix and check all matching files in
- *         the directory
- *
- * Flags used in connection with gst_plugin_add_dependency().
- */
-typedef enum {
-  GST_PLUGIN_DEPENDENCY_FLAG_NONE = 0,
-  GST_PLUGIN_DEPENDENCY_FLAG_RECURSE = (1 << 0),
-  GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY = (1 << 1),
-  GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX = (1 << 2)
-} GstPluginDependencyFlags;
-
-/**
- * GstPluginInitFunc:
- * @plugin: The plugin object
- *
- * A plugin should provide a pointer to a function of this type in the
- * plugin_desc struct.
- * This function will be called by the loader at startup. One would then
- * register each #GstPluginFeature.
- *
- * Returns: %TRUE if plugin initialised successfully
- */
-/* FIXME 0.11: Make return void */
-typedef gboolean (*GstPluginInitFunc) (GstPlugin *plugin);
-
-/**
- * GstPluginInitFullFunc:
- * @plugin: The plugin object
- * @user_data: extra data
- *
- * A plugin should provide a pointer to a function of either #GstPluginInitFunc
- * or this type in the plugin_desc struct.
- * The function will be called by the loader at startup. One would then
- * register each #GstPluginFeature. This version allows
- * user data to be passed to init function (useful for bindings).
- *
- * Returns: %TRUE if plugin initialised successfully
- */
-/* FIXME 0.11: Merge with GstPluginInitFunc */
-typedef gboolean (*GstPluginInitFullFunc) (GstPlugin *plugin, gpointer user_data);
-
-/**
- * GstPluginDesc:
- * @major_version: the major version number of core that plugin was compiled for
- * @minor_version: the minor version number of core that plugin was compiled for
- * @name: a unique name of the plugin
- * @description: description of plugin
- * @plugin_init: pointer to the init function of this plugin.
- * @version: version of the plugin
- * @license: effective license of plugin
- * @source: source module plugin belongs to
- * @package: shipped package plugin belongs to
- * @origin: URL to provider of plugin
- * @release_datetime: date time string in ISO 8601 format (or rather, a
- *     subset thereof), or NULL. Allowed are the following formats:
- *     "YYYY-MM-DD" and "YYY-MM-DDTHH:MMZ" (with 'T' a separator and 'Z'
- *     indicating UTC/Zulu time). This field should be set via the
- *     GST_PACKAGE_RELEASE_DATETIME preprocessor macro.
- *
- * A plugin should export a variable of this type called plugin_desc. The plugin
- * loader will use the data provided there to initialize the plugin.
- *
- * The @licence parameter must be one of: LGPL, GPL, QPL, GPL/QPL, MPL,
- * BSD, MIT/X11, Proprietary, unknown.
- */
-struct _GstPluginDesc {
-  gint major_version;
-  gint minor_version;
-  const gchar *name;
-  const gchar *description;
-  GstPluginInitFunc plugin_init;
-  const gchar *version;
-  const gchar *license;
-  const gchar *source;
-  const gchar *package;
-  const gchar *origin;
-  const gchar *release_datetime;
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-
-#define GST_TYPE_PLUGIN   (gst_plugin_get_type())
-#define GST_IS_PLUGIN(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLUGIN))
-#define GST_IS_PLUGIN_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLUGIN))
-#define GST_PLUGIN_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLUGIN, GstPluginClass))
-#define GST_PLUGIN(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLUGIN, GstPlugin))
-#define GST_PLUGIN_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLUGIN, GstPluginClass))
-#define GST_PLUGIN_CAST(obj)           ((GstPlugin*)(obj))
-
-#ifdef GST_PACKAGE_RELEASE_DATETIME
-#define __GST_PACKAGE_RELEASE_DATETIME GST_PACKAGE_RELEASE_DATETIME
-#else
-#define __GST_PACKAGE_RELEASE_DATETIME NULL
-#endif
-
-/**
- * GST_PLUGIN_DEFINE:
- * @major: major version number of the gstreamer-core that plugin was compiled for
- * @minor: minor version number of the gstreamer-core that plugin was compiled for
- * @name: short, but unique name of the plugin
- * @description: information about the purpose of the plugin
- * @init: function pointer to the plugin_init method with the signature of <code>static gboolean plugin_init (GstPlugin * plugin)</code>.
- * @version: full version string (e.g. VERSION from config.h)
- * @license: under which licence the package has been released, e.g. GPL, LGPL.
- * @package: the package-name (e.g. PACKAGE_NAME from config.h)
- * @origin: a description from where the package comes from (e.g. the homepage URL)
- *
- * This macro needs to be used to define the entry point and meta data of a
- * plugin. One would use this macro to export a plugin, so that it can be used
- * by other applications.
- *
- * The macro uses a define named PACKAGE for the #GstPluginDesc,source field.
- * When using autoconf, this is usually set automatically via the AC_INIT
- * macro, and set in config.h. If you are not using autoconf, you will need to
- * define PACKAGE yourself and set it to a short mnemonic string identifying
- * your application/package, e.g. 'someapp' or 'my-plugins-foo.
- *
- * If defined, the GST_PACKAGE_RELEASE_DATETIME will also be used for the
- * #GstPluginDesc,release_datetime field.
- */
-#define GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,package,origin)	\
-G_BEGIN_DECLS \
-GST_PLUGIN_EXPORT GstPluginDesc gst_plugin_desc = {	\
-  major,						\
-  minor,						\
- #name,						        \
-  (gchar *) description,				\
-  init,							\
-  version,						\
-  license,						\
-  PACKAGE,						\
-  package,						\
-  origin,						\
-  __GST_PACKAGE_RELEASE_DATETIME,                       \
-  GST_PADDING_INIT				        \
-}; \
-G_END_DECLS
-
-/**
- * GST_LICENSE_UNKNOWN:
- *
- * To be used in GST_PLUGIN_DEFINE if usure about the licence.
- */
-#define GST_LICENSE_UNKNOWN "unknown"
-
-
-/* function for filters */
-/**
- * GstPluginFilter:
- * @plugin: the plugin to check
- * @user_data: the user_data that has been passed on e.g. gst_registry_plugin_filter()
- *
- * A function that can be used with e.g. gst_registry_plugin_filter()
- * to get a list of plugins that match certain criteria.
- *
- * Returns: TRUE for a positive match, FALSE otherwise
- */
-typedef gboolean        (*GstPluginFilter)              (GstPlugin *plugin,
-                                                         gpointer user_data);
-
-GType                   gst_plugin_get_type             (void);
-
-gboolean		gst_plugin_register_static	(gint major_version,
-                                                         gint minor_version,
-                                                         const gchar *name,
-                                                         const gchar *description,
-                                                         GstPluginInitFunc init_func,
-                                                         const gchar *version,
-                                                         const gchar *license,
-                                                         const gchar *source,
-                                                         const gchar *package,
-                                                         const gchar *origin);
-
-gboolean		gst_plugin_register_static_full	(gint major_version,
-                                                         gint minor_version,
-                                                         const gchar *name,
-                                                         const gchar *description,
-                                                         GstPluginInitFullFunc init_full_func,
-                                                         const gchar *version,
-                                                         const gchar *license,
-                                                         const gchar *source,
-                                                         const gchar *package,
-                                                         const gchar *origin,
-                                                         gpointer user_data);
-
-const gchar*		gst_plugin_get_name		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_description	(GstPlugin *plugin);
-const gchar*		gst_plugin_get_filename		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_version		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_license		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_source		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_package		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_origin		(GstPlugin *plugin);
-const gchar*		gst_plugin_get_release_date_string (GstPlugin *plugin);
-const GstStructure*	gst_plugin_get_cache_data	(GstPlugin * plugin);
-void			gst_plugin_set_cache_data	(GstPlugin * plugin, GstStructure *cache_data);
-
-gboolean		gst_plugin_is_loaded		(GstPlugin *plugin);
-
-GstPlugin *		gst_plugin_load_file		(const gchar *filename, GError** error);
-
-GstPlugin *             gst_plugin_load                 (GstPlugin *plugin);
-GstPlugin *             gst_plugin_load_by_name         (const gchar *name);
-
-void                    gst_plugin_add_dependency        (GstPlugin    * plugin,
-                                                          const gchar ** env_vars,
-                                                          const gchar ** paths,
-                                                          const gchar ** names,
-                                                          GstPluginDependencyFlags flags);
-void                    gst_plugin_add_dependency_simple (GstPlugin   * plugin,
-                                                          const gchar * env_vars,
-                                                          const gchar * paths,
-                                                          const gchar * names,
-                                                          GstPluginDependencyFlags flags);
-
-void gst_plugin_list_free (GList *list);
-
-G_END_DECLS
-
-#endif /* __GST_PLUGIN_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpluginfeature.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpluginfeature.h
deleted file mode 100644
index 69ba44d4..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpluginfeature.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstpluginfeature.h: Header for base GstPluginFeature
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_PLUGIN_FEATURE_H__
-#define __GST_PLUGIN_FEATURE_H__
-
-#include <glib-object.h>
-#include <gst/gstobject.h>
-#include <gst/gstplugin.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PLUGIN_FEATURE                 (gst_plugin_feature_get_type())
-#define GST_PLUGIN_FEATURE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLUGIN_FEATURE, GstPluginFeature))
-#define GST_IS_PLUGIN_FEATURE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLUGIN_FEATURE))
-#define GST_PLUGIN_FEATURE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLUGIN_FEATURE, GstPluginFeatureClass))
-#define GST_IS_PLUGIN_FEATURE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLUGIN_FEATURE))
-#define GST_PLUGIN_FEATURE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLUGIN_FEATURE, GstPluginFeatureClass))
-#define GST_PLUGIN_FEATURE_CAST(obj)            ((GstPluginFeature*)(obj))
-
-/**
- * GstPluginFeature:
- *
- * Opaque #GstPluginFeature structure.
- */
-typedef struct _GstPluginFeature GstPluginFeature;
-typedef struct _GstPluginFeatureClass GstPluginFeatureClass;
-
-/**
- * GstRank:
- * @GST_RANK_NONE: will be chosen last or not at all
- * @GST_RANK_MARGINAL: unlikely to be chosen
- * @GST_RANK_SECONDARY: likely to be chosen
- * @GST_RANK_PRIMARY: will be chosen first
- *
- * Element priority ranks. Defines the order in which the autoplugger (or
- * similar rank-picking mechanisms, such as e.g. gst_element_make_from_uri())
- * will choose this element over an alternative one with the same function.
- *
- * These constants serve as a rough guidance for defining the rank of a
- * #GstPluginFeature. Any value is valid, including values bigger than
- * @GST_RANK_PRIMARY.
- */
-typedef enum {
-  GST_RANK_NONE                 = 0,
-  GST_RANK_MARGINAL             = 64,
-  GST_RANK_SECONDARY            = 128,
-  GST_RANK_PRIMARY              = 256
-} GstRank;
-
-/**
- * gst_plugin_feature_get_name:
- * @feature: a #GstPluginFeature to get the name of @feature.
- *
- * Returns the name of @feature.
- * For a nameless plugin feature, this returns NULL.
- *
- * Returns: (transfer none): the name of @feature. MT safe.
- *
- */
-#define                 gst_plugin_feature_get_name(feature)      GST_OBJECT_NAME(feature)
-
-/**
- * gst_plugin_feature_set_name:
- * @feature: a #GstPluginFeature to set the name of.
- * @name: the new name
- *
- * Sets the name of the plugin feature, getting rid of the old name if there was one.
- */
-#define                 gst_plugin_feature_set_name(feature,name) gst_object_set_name(GST_OBJECT_CAST(feature),name)
-
-/**
- * GstPluginFeatureFilter:
- * @feature: the pluginfeature to check
- * @user_data: the user_data that has been passed on e.g.
- *  gst_registry_feature_filter()
- *
- * A function that can be used with e.g. gst_registry_feature_filter()
- * to get a list of pluginfeature that match certain criteria.
- *
- * Returns: %TRUE for a positive match, %FALSE otherwise
- */
-typedef gboolean        (*GstPluginFeatureFilter)       (GstPluginFeature *feature,
-                                                         gpointer user_data);
-
-/* normal GObject stuff */
-GType           gst_plugin_feature_get_type             (void);
-
-GstPluginFeature *
-                gst_plugin_feature_load                 (GstPluginFeature *feature);
-
-void            gst_plugin_feature_set_rank             (GstPluginFeature *feature, guint rank);
-guint           gst_plugin_feature_get_rank             (GstPluginFeature *feature);
-
-GstPlugin     * gst_plugin_feature_get_plugin           (GstPluginFeature *feature);
-
-void            gst_plugin_feature_list_free            (GList *list);
-GList          *gst_plugin_feature_list_copy            (GList *list) G_GNUC_MALLOC;
-void            gst_plugin_feature_list_debug           (GList *list);
-
-/**
- * GST_PLUGIN_FEATURE_LIST_DEBUG:
- * @list: (transfer none) (element-type Gst.PluginFeature): a #GList of
- *     plugin features
- *
- * Debug the plugin feature names in @list.
- */
-#ifndef GST_DISABLE_GST_DEBUG
-#define GST_PLUGIN_FEATURE_LIST_DEBUG(list) gst_plugin_feature_list_debug(list)
-#else
-#define GST_PLUGIN_FEATURE_LIST_DEBUG(list)
-#endif
-
-gboolean        gst_plugin_feature_check_version        (GstPluginFeature *feature,
-                                                         guint             min_major,
-                                                         guint             min_minor,
-                                                         guint             min_micro);
-gint            gst_plugin_feature_rank_compare_func    (gconstpointer p1,
-							 gconstpointer p2);
-
-G_END_DECLS
-
-
-#endif /* __GST_PLUGIN_FEATURE_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpoll.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpoll.h
deleted file mode 100644
index b0662769..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpoll.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999 Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) 2004 Wim Taymans <wim.taymans@gmail.com>
- * Copyright (C) 2007 Peter Kjellerstedt <pkj@axis.com>
- *
- * gstpoll.h: File descriptor set
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_POLL_H__
-#define __GST_POLL_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <gst/gstclock.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstPoll:
- *
- * A set of file/network descriptors.
- */
-typedef struct _GstPoll GstPoll;
-
-/**
- * GstPollFD:
- * @fd: a file descriptor
- *
- * A file descriptor object.
- */
-typedef struct {
-  int fd;
-
-  /*< private >*/
-  gint idx;
-} GstPollFD;
-
-/**
- * GST_POLL_FD_INIT:
- *
- * A #GstPollFD must be initialized with this macro, before it can be
- * used. This macro can used be to initialize a variable, but it cannot
- * be assigned to a variable. In that case you have to use
- * gst_poll_fd_init().
- */
-#define GST_POLL_FD_INIT  { -1, -1 }
-
-GstPoll*        gst_poll_new              (gboolean controllable) G_GNUC_MALLOC;
-GstPoll*        gst_poll_new_timer        (void) G_GNUC_MALLOC;
-void            gst_poll_free             (GstPoll *set);
-
-void            gst_poll_get_read_gpollfd (GstPoll *set, GPollFD *fd);
-
-void            gst_poll_fd_init          (GstPollFD *fd);
-
-gboolean        gst_poll_add_fd           (GstPoll *set, GstPollFD *fd);
-gboolean        gst_poll_remove_fd        (GstPoll *set, GstPollFD *fd);
-
-gboolean        gst_poll_fd_ctl_write     (GstPoll *set, GstPollFD *fd, gboolean active);
-gboolean        gst_poll_fd_ctl_read      (GstPoll *set, GstPollFD *fd, gboolean active);
-void            gst_poll_fd_ignored       (GstPoll *set, GstPollFD *fd);
-
-gboolean        gst_poll_fd_has_closed    (const GstPoll *set, GstPollFD *fd);
-gboolean        gst_poll_fd_has_error     (const GstPoll *set, GstPollFD *fd);
-gboolean        gst_poll_fd_can_read      (const GstPoll *set, GstPollFD *fd);
-gboolean        gst_poll_fd_can_write     (const GstPoll *set, GstPollFD *fd);
-
-gint            gst_poll_wait             (GstPoll *set, GstClockTime timeout);
-
-gboolean        gst_poll_set_controllable (GstPoll *set, gboolean controllable);
-void            gst_poll_restart          (GstPoll *set);
-void            gst_poll_set_flushing     (GstPoll *set, gboolean flushing);
-
-gboolean        gst_poll_write_control    (GstPoll *set);
-gboolean        gst_poll_read_control     (GstPoll *set);
-
-G_END_DECLS
-
-#endif /* __GST_POLL_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpreset.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpreset.h
deleted file mode 100644
index 30973f3a..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstpreset.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* GStreamer
- * Copyright (C) 2006 Stefan Kost <ensonic@users.sf.net>
- *
- * gstpreset.h: helper interface header for element presets
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PRESET_H__
-#define __GST_PRESET_H__
-
-#include <glib-object.h>
-#include <gst/gstconfig.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PRESET               (gst_preset_get_type())
-#define GST_PRESET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PRESET, GstPreset))
-#define GST_IS_PRESET(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PRESET))
-#define GST_PRESET_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_PRESET, GstPresetInterface))
-
-/**
- * GstPreset:
- *
- * Opaque #GstPreset data structure.
- */
-typedef struct _GstPreset GstPreset; /* dummy object */
-typedef struct _GstPresetInterface GstPresetInterface;
-
-/**
- * GstPresetInterface:
- * @parent: parent interface type.
- * @get_preset_names: virtual method to get list of presets
- * @get_property_names: virtual methods to get properties that are persistent
- * @load_preset: virtual methods to load a preset into properties
- * @save_preset: virtual methods to save properties into a preset
- * @rename_preset: virtual methods to rename a preset
- * @delete_preset: virtual methods to remove a preset
- * @set_meta: virtual methods to set textual meta data to a preset
- * @get_meta: virtual methods to get textual meta data from a preset
- *
- * #GstPreset interface.
- */
-struct _GstPresetInterface
-{
-  GTypeInterface parent;
-
-  /* methods */
-  gchar**      (*get_preset_names)    (GstPreset *preset);
-
-  gchar**      (*get_property_names)  (GstPreset *preset);
-
-  gboolean     (*load_preset)         (GstPreset *preset, const gchar *name);
-  gboolean     (*save_preset)         (GstPreset *preset, const gchar *name);
-  gboolean     (*rename_preset)       (GstPreset *preset, const gchar *old_name,
-                                       const gchar *new_name);
-  gboolean     (*delete_preset)       (GstPreset *preset, const gchar *name);
-
-  gboolean     (*set_meta)            (GstPreset *preset, const gchar *name,
-                                       const gchar *tag, const gchar *value);
-  gboolean     (*get_meta)            (GstPreset *preset, const gchar *name,
-                                       const gchar *tag, gchar **value);
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_preset_get_type(void);
-
-gchar**      gst_preset_get_preset_names   (GstPreset *preset) G_GNUC_MALLOC;
-
-gchar**      gst_preset_get_property_names (GstPreset *preset) G_GNUC_MALLOC;
-
-gboolean     gst_preset_load_preset        (GstPreset *preset, const gchar *name);
-gboolean     gst_preset_save_preset        (GstPreset *preset, const gchar *name);
-gboolean     gst_preset_rename_preset      (GstPreset *preset, const gchar *old_name,
-                                            const gchar *new_name);
-gboolean     gst_preset_delete_preset      (GstPreset *preset, const gchar *name);
-
-gboolean     gst_preset_set_meta           (GstPreset *preset, const gchar *name,
-                                            const gchar *tag, const gchar *value);
-gboolean     gst_preset_get_meta           (GstPreset *preset, const gchar *name,
-                                            const gchar *tag, gchar **value);
-
-gboolean     gst_preset_set_app_dir        (const gchar *app_dir);
-const gchar *gst_preset_get_app_dir        (void);
-
-G_END_DECLS
-
-#endif /* __GST_PRESET_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstquery.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstquery.h
deleted file mode 100644
index 47fec237..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstquery.h
+++ /dev/null
@@ -1,481 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *                    2011 Wim Taymans <wim.taymans@gmail.com>
- *
- * gstquery.h: GstQuery API declaration
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_QUERY_H__
-#define __GST_QUERY_H__
-
-#include <glib.h>
-
-#include <gst/gstiterator.h>
-#include <gst/gstminiobject.h>
-#include <gst/gststructure.h>
-#include <gst/gstformat.h>
-#include <gst/gstpad.h>
-#include <gst/gstallocator.h>
-#include <gst/gsttoc.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstQuery GstQuery;
-
-/**
- * GstQueryTypeFlags:
- * @GST_QUERY_TYPE_UPSTREAM:     Set if the query can travel upstream.
- * @GST_QUERY_TYPE_DOWNSTREAM:   Set if the query can travel downstream.
- * @GST_QUERY_TYPE_SERIALIZED:   Set if the query should be serialized with data
- *                               flow.
- *
- * #GstQueryTypeFlags indicate the aspects of the different #GstQueryType
- * values. You can get the type flags of a #GstQueryType with the
- * gst_query_type_get_flags() function.
- */
-typedef enum {
-  GST_QUERY_TYPE_UPSTREAM       = 1 << 0,
-  GST_QUERY_TYPE_DOWNSTREAM     = 1 << 1,
-  GST_QUERY_TYPE_SERIALIZED     = 1 << 2
-} GstQueryTypeFlags;
-
-/**
- * GST_QUERY_TYPE_BOTH:
- *
- * The same thing as #GST_QUERY_TYPE_UPSTREAM | #GST_QUERY_TYPE_DOWNSTREAM.
- */
-#define GST_QUERY_TYPE_BOTH \
-    (GST_QUERY_TYPE_UPSTREAM | GST_QUERY_TYPE_DOWNSTREAM)
-
-#define GST_QUERY_NUM_SHIFT     (8)
-
-/**
- * GST_QUERY_MAKE_TYPE:
- * @num: the query number to create
- * @flags: the query flags
- *
- * when making custom query types, use this macro with the num and
- * the given flags
- */
-#define GST_QUERY_MAKE_TYPE(num,flags) \
-    (((num) << GST_QUERY_NUM_SHIFT) | (flags))
-
-#define FLAG(name) GST_QUERY_TYPE_##name
-
-
-/**
- * GstQueryType:
- * @GST_QUERY_UNKNOWN: unknown query type
- * @GST_QUERY_POSITION: current position in stream
- * @GST_QUERY_DURATION: total duration of the stream
- * @GST_QUERY_LATENCY: latency of stream
- * @GST_QUERY_JITTER: current jitter of stream
- * @GST_QUERY_RATE: current rate of the stream
- * @GST_QUERY_SEEKING: seeking capabilities
- * @GST_QUERY_SEGMENT: segment start/stop positions
- * @GST_QUERY_CONVERT: convert values between formats
- * @GST_QUERY_FORMATS: query supported formats for convert
- * @GST_QUERY_BUFFERING: query available media for efficient seeking.
- * @GST_QUERY_CUSTOM: a custom application or element defined query.
- * @GST_QUERY_URI: query the URI of the source or sink.
- * @GST_QUERY_ALLOCATION: the buffer allocation properties
- * @GST_QUERY_SCHEDULING: the scheduling properties
- * @GST_QUERY_ACCEPT_CAPS: the accept caps query
- * @GST_QUERY_CAPS: the caps query
- * @GST_QUERY_DRAIN: wait till all serialized data is consumed downstream
- *
- * Standard predefined Query types
- */
-/* NOTE: don't forget to update the table in gstquery.c when changing
- * this enum */
-typedef enum {
-  GST_QUERY_UNKNOWN      = GST_QUERY_MAKE_TYPE (0, 0),
-  GST_QUERY_POSITION     = GST_QUERY_MAKE_TYPE (10, FLAG(BOTH)),
-  GST_QUERY_DURATION     = GST_QUERY_MAKE_TYPE (20, FLAG(BOTH)),
-  GST_QUERY_LATENCY      = GST_QUERY_MAKE_TYPE (30, FLAG(BOTH)),
-  GST_QUERY_JITTER       = GST_QUERY_MAKE_TYPE (40, FLAG(BOTH)),
-  GST_QUERY_RATE         = GST_QUERY_MAKE_TYPE (50, FLAG(BOTH)),
-  GST_QUERY_SEEKING      = GST_QUERY_MAKE_TYPE (60, FLAG(BOTH)),
-  GST_QUERY_SEGMENT      = GST_QUERY_MAKE_TYPE (70, FLAG(BOTH)),
-  GST_QUERY_CONVERT      = GST_QUERY_MAKE_TYPE (80, FLAG(BOTH)),
-  GST_QUERY_FORMATS      = GST_QUERY_MAKE_TYPE (90, FLAG(BOTH)),
-  GST_QUERY_BUFFERING    = GST_QUERY_MAKE_TYPE (110, FLAG(BOTH)),
-  GST_QUERY_CUSTOM       = GST_QUERY_MAKE_TYPE (120, FLAG(BOTH)),
-  GST_QUERY_URI          = GST_QUERY_MAKE_TYPE (130, FLAG(BOTH)),
-  GST_QUERY_ALLOCATION   = GST_QUERY_MAKE_TYPE (140, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
-  GST_QUERY_SCHEDULING   = GST_QUERY_MAKE_TYPE (150, FLAG(UPSTREAM)),
-  GST_QUERY_ACCEPT_CAPS  = GST_QUERY_MAKE_TYPE (160, FLAG(BOTH)),
-  GST_QUERY_CAPS         = GST_QUERY_MAKE_TYPE (170, FLAG(BOTH)),
-  GST_QUERY_DRAIN        = GST_QUERY_MAKE_TYPE (180, FLAG(DOWNSTREAM) | FLAG(SERIALIZED))
-} GstQueryType;
-#undef FLAG
-
-#define GST_TYPE_QUERY                         (gst_query_get_type())
-#define GST_IS_QUERY(obj)                      (GST_IS_MINI_OBJECT_TYPE (obj, GST_TYPE_QUERY))
-#define GST_QUERY_CAST(obj)                    ((GstQuery*)(obj))
-#define GST_QUERY(obj)                         (GST_QUERY_CAST(obj))
-
-/**
- * GST_QUERY_TYPE:
- * @query: the query to query
- *
- * Get the #GstQueryType of the query.
- */
-#define GST_QUERY_TYPE(query)  (((GstQuery*)(query))->type)
-
-/**
- * GST_QUERY_TYPE_NAME:
- * @query: the query to query
- *
- * Get a constant string representation of the #GstQueryType of the query.
- */
-#define GST_QUERY_TYPE_NAME(query) (gst_query_type_get_name(GST_QUERY_TYPE(query)))
-
-/**
- * GST_QUERY_IS_UPSTREAM:
- * @ev: the query to query
- *
- * Check if an query can travel upstream.
- */
-#define GST_QUERY_IS_UPSTREAM(ev)       !!(GST_QUERY_TYPE (ev) & GST_QUERY_TYPE_UPSTREAM)
-/**
- * GST_QUERY_IS_DOWNSTREAM:
- * @ev: the query to query
- *
- * Check if an query can travel downstream.
- */
-#define GST_QUERY_IS_DOWNSTREAM(ev)     !!(GST_QUERY_TYPE (ev) & GST_QUERY_TYPE_DOWNSTREAM)
-/**
- * GST_QUERY_IS_SERIALIZED:
- * @ev: the query to query
- *
- * Check if an query is serialized with the data stream.
- */
-#define GST_QUERY_IS_SERIALIZED(ev)     !!(GST_QUERY_TYPE (ev) & GST_QUERY_TYPE_SERIALIZED)
-
-
-/**
- * GstQuery:
- * @mini_object: The parent #GstMiniObject type
- * @type: the #GstQueryType
- *
- * The #GstQuery structure.
- */
-struct _GstQuery
-{
-  GstMiniObject mini_object;
-
-  /*< public > *//* with COW */
-  GstQueryType type;
-};
-
-const gchar*    gst_query_type_get_name        (GstQueryType type);
-GQuark          gst_query_type_to_quark        (GstQueryType type);
-GstQueryTypeFlags
-                gst_query_type_get_flags       (GstQueryType type);
-
-
-GType           gst_query_get_type             (void);
-
-/* refcounting */
-/**
- * gst_query_ref:
- * @q: a #GstQuery to increase the refcount of.
- *
- * Increases the refcount of the given query by one.
- *
- * Returns: @q
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstQuery * gst_query_ref (GstQuery * q);
-#endif
-
-static inline GstQuery *
-gst_query_ref (GstQuery * q)
-{
-  return GST_QUERY_CAST (gst_mini_object_ref (GST_MINI_OBJECT_CAST (q)));
-}
-
-/**
- * gst_query_unref:
- * @q: a #GstQuery to decrease the refcount of.
- *
- * Decreases the refcount of the query. If the refcount reaches 0, the query
- * will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_query_unref (GstQuery * q);
-#endif
-
-static inline void
-gst_query_unref (GstQuery * q)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (q));
-}
-
-/* copy query */
-/**
- * gst_query_copy:
- * @q: a #GstQuery to copy.
- *
- * Copies the given query using the copy function of the parent #GstStructure.
- *
- * Free-function: gst_query_unref
- *
- * Returns: (transfer full): a new copy of @q.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstQuery * gst_query_copy (const GstQuery * q);
-#endif
-
-static inline GstQuery *
-gst_query_copy (const GstQuery * q)
-{
-  return GST_QUERY_CAST (gst_mini_object_copy (GST_MINI_OBJECT_CONST_CAST (q)));
-}
-
-/**
- * gst_query_is_writable:
- * @q: a #GstQuery
- *
- * Tests if you can safely write data into a query's structure.
- */
-#define         gst_query_is_writable(q)     gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (q))
-/**
- * gst_query_make_writable:
- * @q: (transfer full): a #GstQuery to make writable
- *
- * Makes a writable query from the given query.
- *
- * Returns: (transfer full): a new writable query (possibly same as @q)
- */
-#define         gst_query_make_writable(q)      GST_QUERY_CAST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (q)))
-/**
- * gst_query_replace:
- * @old_query: (inout) (transfer full): pointer to a pointer to a #GstQuery
- *     to be replaced.
- * @new_query: (allow-none) (transfer none): pointer to a #GstQuery that will
- *     replace the query pointed to by @old_query.
- *
- * Modifies a pointer to a #GstQuery to point to a different #GstQuery. The
- * modification is done atomically (so this is useful for ensuring thread safety
- * in some cases), and the reference counts are updated appropriately (the old
- * query is unreffed, the new one is reffed).
- *
- * Either @new_query or the #GstQuery pointed to by @old_query may be NULL.
- *
- * Returns: TRUE if @new_query was different from @old_query
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gboolean gst_query_replace (GstQuery **old_query, GstQuery *new_query);
-#endif
-
-static inline gboolean
-gst_query_replace (GstQuery **old_query, GstQuery *new_query)
-{
-  return gst_mini_object_replace ((GstMiniObject **) old_query, (GstMiniObject *) new_query);
-}
-
-/* application specific query */
-GstQuery *      gst_query_new_custom            (GstQueryType type, GstStructure *structure) G_GNUC_MALLOC;
-const GstStructure *
-                gst_query_get_structure         (GstQuery *query);
-GstStructure *  gst_query_writable_structure    (GstQuery *query);
-
-/* position query */
-GstQuery*       gst_query_new_position          (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_position          (GstQuery *query, GstFormat format, gint64 cur);
-void            gst_query_parse_position        (GstQuery *query, GstFormat *format, gint64 *cur);
-
-/* duration query */
-GstQuery*       gst_query_new_duration          (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_duration          (GstQuery *query, GstFormat format, gint64 duration);
-void            gst_query_parse_duration        (GstQuery *query, GstFormat *format, gint64 *duration);
-
-/* latency query */
-GstQuery*       gst_query_new_latency           (void) G_GNUC_MALLOC;
-void            gst_query_set_latency           (GstQuery *query, gboolean live, GstClockTime min_latency,
-                                                 GstClockTime max_latency);
-void            gst_query_parse_latency         (GstQuery *query, gboolean *live, GstClockTime *min_latency,
-                                                 GstClockTime *max_latency);
-
-/* convert query */
-GstQuery*       gst_query_new_convert           (GstFormat src_format, gint64 value, GstFormat dest_format) G_GNUC_MALLOC;
-void            gst_query_set_convert           (GstQuery *query, GstFormat src_format, gint64 src_value,
-                                                 GstFormat dest_format, gint64 dest_value);
-void            gst_query_parse_convert         (GstQuery *query, GstFormat *src_format, gint64 *src_value,
-                                                 GstFormat *dest_format, gint64 *dest_value);
-/* segment query */
-GstQuery*       gst_query_new_segment           (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_segment           (GstQuery *query, gdouble rate, GstFormat format,
-                                                 gint64 start_value, gint64 stop_value);
-void            gst_query_parse_segment         (GstQuery *query, gdouble *rate, GstFormat *format,
-                                                 gint64 *start_value, gint64 *stop_value);
-
-/* seeking query */
-GstQuery*       gst_query_new_seeking           (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_seeking           (GstQuery *query, GstFormat format,
-                                                 gboolean seekable,
-                                                 gint64 segment_start,
-                                                 gint64 segment_end);
-void            gst_query_parse_seeking         (GstQuery *query, GstFormat *format,
-                                                 gboolean *seekable,
-                                                 gint64 *segment_start,
-                                                 gint64 *segment_end);
-/* formats query */
-GstQuery*       gst_query_new_formats           (void) G_GNUC_MALLOC;
-void            gst_query_set_formats           (GstQuery *query, gint n_formats, ...);
-void            gst_query_set_formatsv          (GstQuery *query, gint n_formats, const GstFormat *formats);
-void            gst_query_parse_n_formats       (GstQuery *query, guint *n_formats);
-void            gst_query_parse_nth_format      (GstQuery *query, guint nth, GstFormat *format);
-
-/* buffering query */
-/**
- * GstBufferingMode:
- * @GST_BUFFERING_STREAM: a small amount of data is buffered
- * @GST_BUFFERING_DOWNLOAD: the stream is being downloaded
- * @GST_BUFFERING_TIMESHIFT: the stream is being downloaded in a ringbuffer
- * @GST_BUFFERING_LIVE: the stream is a live stream
- *
- * The different types of buffering methods.
- */
-typedef enum {
-  GST_BUFFERING_STREAM,
-  GST_BUFFERING_DOWNLOAD,
-  GST_BUFFERING_TIMESHIFT,
-  GST_BUFFERING_LIVE
-} GstBufferingMode;
-
-GstQuery*       gst_query_new_buffering           (GstFormat format) G_GNUC_MALLOC;
-void            gst_query_set_buffering_percent   (GstQuery *query, gboolean busy, gint percent);
-void            gst_query_parse_buffering_percent (GstQuery *query, gboolean *busy, gint *percent);
-
-void            gst_query_set_buffering_stats     (GstQuery *query, GstBufferingMode mode,
-                                                   gint avg_in, gint avg_out,
-                                                   gint64 buffering_left);
-void            gst_query_parse_buffering_stats    (GstQuery *query, GstBufferingMode *mode,
-                                                   gint *avg_in, gint *avg_out,
-                                                   gint64 *buffering_left);
-
-void            gst_query_set_buffering_range     (GstQuery *query, GstFormat format,
-                                                   gint64 start, gint64 stop,
-                                                   gint64 estimated_total);
-void            gst_query_parse_buffering_range   (GstQuery *query, GstFormat *format,
-                                                   gint64 *start, gint64 *stop,
-                                                   gint64 *estimated_total);
-
-gboolean        gst_query_add_buffering_range       (GstQuery *query,
-                                                     gint64 start, gint64 stop);
-guint           gst_query_get_n_buffering_ranges    (GstQuery *query);
-gboolean        gst_query_parse_nth_buffering_range (GstQuery *query,
-                                                     guint index, gint64 *start,
-                                                     gint64 *stop);
-
-/* URI query */
-GstQuery *      gst_query_new_uri                    (void) G_GNUC_MALLOC;
-void            gst_query_parse_uri                  (GstQuery *query, gchar **uri);
-void            gst_query_set_uri                    (GstQuery *query, const gchar *uri);
-
-/* allocation query */
-GstQuery *      gst_query_new_allocation             (GstCaps *caps, gboolean need_pool) G_GNUC_MALLOC;
-void            gst_query_parse_allocation           (GstQuery *query, GstCaps **caps, gboolean *need_pool);
-
-/* pools */
-void            gst_query_add_allocation_pool        (GstQuery *query, GstBufferPool *pool,
-                                                      guint size, guint min_buffers,
-                                                      guint max_buffers);
-guint           gst_query_get_n_allocation_pools     (GstQuery *query);
-void            gst_query_parse_nth_allocation_pool  (GstQuery *query, guint index,
-                                                      GstBufferPool **pool,
-                                                      guint *size, guint *min_buffers,
-                                                      guint *max_buffers);
-void            gst_query_set_nth_allocation_pool    (GstQuery *query, guint index,
-                                                      GstBufferPool *pool,
-                                                      guint size, guint min_buffers,
-                                                      guint max_buffers);
-
-/* allocators */
-void            gst_query_add_allocation_param       (GstQuery *query, GstAllocator *allocator,
-                                                      const GstAllocationParams *params);
-guint           gst_query_get_n_allocation_params    (GstQuery *query);
-void            gst_query_parse_nth_allocation_param (GstQuery *query, guint index,
-                                                      GstAllocator **allocator,
-                                                      GstAllocationParams *params);
-void            gst_query_set_nth_allocation_param   (GstQuery *query, guint index,
-                                                      GstAllocator *allocator,
-                                                      const GstAllocationParams *params);
-
-/* metadata */
-void            gst_query_add_allocation_meta        (GstQuery *query, GType api, const GstStructure *params);
-guint           gst_query_get_n_allocation_metas     (GstQuery *query);
-GType           gst_query_parse_nth_allocation_meta  (GstQuery *query, guint index,
-                                                      const GstStructure **params);
-void            gst_query_remove_nth_allocation_meta (GstQuery *query, guint index);
-gboolean        gst_query_find_allocation_meta       (GstQuery *query, GType api, guint *index);
-
-
-/* scheduling query */
-/**
- * GstSchedulingFlags:
- * @GST_SCHEDULING_FLAG_SEEKABLE: if seeking is possible
- * @GST_SCHEDULING_FLAG_SEQUENTIAL: if sequential access is recommended
- *
- * The different scheduling flags.
- */
-typedef enum {
-  GST_SCHEDULING_FLAG_SEEKABLE      = (1 << 0),
-  GST_SCHEDULING_FLAG_SEQUENTIAL    = (1 << 1)
-} GstSchedulingFlags;
-
-GstQuery *      gst_query_new_scheduling          (void) G_GNUC_MALLOC;
-
-void            gst_query_set_scheduling          (GstQuery *query, GstSchedulingFlags flags,
-                                                   gint minsize, gint maxsize, gint align);
-void            gst_query_parse_scheduling        (GstQuery *query, GstSchedulingFlags *flags,
-                                                   gint *minsize, gint *maxsize, gint *align);
-
-void            gst_query_add_scheduling_mode       (GstQuery *query, GstPadMode mode);
-guint           gst_query_get_n_scheduling_modes    (GstQuery *query);
-GstPadMode      gst_query_parse_nth_scheduling_mode (GstQuery *query, guint index);
-gboolean        gst_query_has_scheduling_mode       (GstQuery *query, GstPadMode mode);
-gboolean        gst_query_has_scheduling_mode_with_flags (GstQuery * query, GstPadMode mode,
-                                                    GstSchedulingFlags flags);
-
-/* accept-caps query */
-GstQuery *      gst_query_new_accept_caps          (GstCaps *caps) G_GNUC_MALLOC;
-void            gst_query_parse_accept_caps        (GstQuery *query, GstCaps **caps);
-void            gst_query_set_accept_caps_result   (GstQuery *query, gboolean result);
-void            gst_query_parse_accept_caps_result (GstQuery *query, gboolean *result);
-
-/* caps query */
-GstQuery *      gst_query_new_caps                 (GstCaps *filter) G_GNUC_MALLOC;
-void            gst_query_parse_caps               (GstQuery *query, GstCaps **filter);
-
-void            gst_query_set_caps_result          (GstQuery *query, GstCaps *caps);
-void            gst_query_parse_caps_result        (GstQuery *query, GstCaps **caps);
-
-/* drain query */
-GstQuery *      gst_query_new_drain                (void) G_GNUC_MALLOC;
-
-G_END_DECLS
-
-#endif /* __GST_QUERY_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstregistry.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstregistry.h
deleted file mode 100644
index f17fe7f9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstregistry.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstregistry.h: Header for registry handling
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_REGISTRY_H__
-#define __GST_REGISTRY_H__
-
-#include <gst/gstconfig.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_REGISTRY               (gst_registry_get_type ())
-#define GST_REGISTRY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_REGISTRY, GstRegistry))
-#define GST_IS_REGISTRY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_REGISTRY))
-#define GST_REGISTRY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_REGISTRY, GstRegistryClass))
-#define GST_IS_REGISTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_REGISTRY))
-#define GST_REGISTRY_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_REGISTRY, GstRegistryClass))
-
-typedef struct _GstRegistry GstRegistry;
-typedef struct _GstRegistryClass GstRegistryClass;
-typedef struct _GstRegistryPrivate GstRegistryPrivate;
-
-/**
- * GstRegistry:
- *
- * Opaque #GstRegistry structure.
- */
-struct _GstRegistry {
-  GstObject      object;
-
-  /*< private >*/
-  GstRegistryPrivate *priv;
-};
-
-struct _GstRegistryClass {
-  GstObjectClass        parent_class;
-};
-
-GType                   gst_registry_get_type           (void);
-
-GstRegistry *           gst_registry_get                (void);
-
-gboolean                gst_registry_scan_path          (GstRegistry *registry, const gchar *path);
-
-#if 0
-void                    gst_registry_add_path           (GstRegistry * registry, const gchar * path);
-GList*                  gst_registry_get_path_list      (GstRegistry *registry);
-#endif
-
-gboolean                gst_registry_add_plugin         (GstRegistry *registry, GstPlugin *plugin);
-void                    gst_registry_remove_plugin      (GstRegistry *registry, GstPlugin *plugin);
-gboolean                gst_registry_add_feature        (GstRegistry * registry, GstPluginFeature * feature);
-void                    gst_registry_remove_feature     (GstRegistry * registry, GstPluginFeature * feature);
-
-GList*                  gst_registry_get_plugin_list    (GstRegistry *registry);
-GList*                  gst_registry_plugin_filter      (GstRegistry *registry,
-                                                         GstPluginFilter filter,
-                                                         gboolean first,
-                                                         gpointer user_data);
-GList*                  gst_registry_feature_filter     (GstRegistry *registry,
-                                                         GstPluginFeatureFilter filter,
-                                                         gboolean first,
-                                                         gpointer user_data);
-GList *                 gst_registry_get_feature_list   (GstRegistry *registry,
-                                                         GType type);
-GList *                 gst_registry_get_feature_list_by_plugin (GstRegistry *registry, const gchar *name);
-guint32                 gst_registry_get_feature_list_cookie (GstRegistry *registry);
-
-GstPlugin*              gst_registry_find_plugin        (GstRegistry *registry, const gchar *name);
-GstPluginFeature*       gst_registry_find_feature       (GstRegistry *registry, const gchar *name, GType type);
-
-GstPlugin *             gst_registry_lookup             (GstRegistry *registry, const char *filename);
-GstPluginFeature *      gst_registry_lookup_feature     (GstRegistry *registry, const char *name);
-
-gboolean                gst_registry_check_feature_version (GstRegistry *registry,
-                                                            const gchar *feature_name,
-                                                            guint        min_major,
-                                                            guint        min_minor,
-                                                            guint        min_micro);
-
-G_END_DECLS
-
-#endif /* __GST_REGISTRY_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsample.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsample.h
deleted file mode 100644
index 97a3843b..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsample.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstsample.h: Header for GstSample object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_SAMPLE_H__
-#define __GST_SAMPLE_H__
-
-#include <gst/gstbuffer.h>
-#include <gst/gstcaps.h>
-#include <gst/gstsegment.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_sample_type;
-
-#define GST_TYPE_SAMPLE      (_gst_sample_type)
-#define GST_IS_SAMPLE(obj)   (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_SAMPLE))
-#define GST_SAMPLE_CAST(obj) ((GstSample *)obj)
-#define GST_SAMPLE(obj)      (GST_SAMPLE_CAST(obj))
-
-/**
- * GstSample:
- *
- * The opaque structure of a #GstSample. A sample contains a typed memory
- * block and the associated timing information. It is mainly used to
- * exchange buffers with an application.
- */
-typedef struct _GstSample GstSample;
-
-GType gst_sample_get_type            (void);
-
-/* allocation */
-GstSample *          gst_sample_new           (GstBuffer          *buffer,
-                                               GstCaps            *caps,
-                                               const GstSegment   *segment,
-                                               GstStructure       *info);
-
-GstBuffer *          gst_sample_get_buffer    (GstSample *sample);
-GstCaps *            gst_sample_get_caps      (GstSample *sample);
-GstSegment *         gst_sample_get_segment   (GstSample *sample);
-const GstStructure * gst_sample_get_info      (GstSample *sample);
-
-/* refcounting */
-/**
- * gst_sample_ref:
- * @sample: a #GstSample
- *
- * Increases the refcount of the given sample by one.
- *
- * Returns: (transfer full): @sample
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstSample * gst_sample_ref (GstSample * sample);
-#endif
-
-static inline GstSample *
-gst_sample_ref (GstSample * sample)
-{
-  return GST_SAMPLE_CAST (gst_mini_object_ref (GST_MINI_OBJECT_CAST (
-      sample)));
-}
-
-/**
- * gst_sample_unref:
- * @sample: (transfer full): a #GstSample
- *
- * Decreases the refcount of the sample. If the refcount reaches 0, the
- * sample will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_sample_unref (GstSample * sample);
-#endif
-
-static inline void
-gst_sample_unref (GstSample * sample)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (sample));
-}
-
-/**
- * gst_value_set_sample:
- * @v: a #GValue to receive the data
- * @b: (transfer none): a #GstSample to assign to the GstValue
- *
- * Sets @b as the value of @v.  Caller retains reference to sample.
- */
-#define         gst_value_set_sample(v,b)       g_value_set_boxed((v),(b))
-/**
- * gst_value_take_sample:
- * @v: a #GValue to receive the data
- * @b: (transfer full): a #GstSample to assign to the GstValue
- *
- * Sets @b as the value of @v.  Caller gives away reference to sample.
- */
-#define         gst_value_take_sample(v,b)      g_value_take_boxed(v,(b))
-/**
- * gst_value_get_sample:
- * @v: a #GValue to query
- *
- * Receives a #GstSample as the value of @v. Does not return a reference to
- * the sample, so the pointer is only valid for as long as the caller owns
- * a reference to @v.
- *
- * Returns: (transfer none): sample
- */
-#define         gst_value_get_sample(v)         GST_SAMPLE_CAST (g_value_get_boxed(v))
-
-G_END_DECLS
-
-#endif /* __GST_SAMPLE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsegment.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsegment.h
deleted file mode 100644
index c364ce60..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsegment.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Wim Taymans <wim@fluendo.com>
- *
- * gstsegment.h: Header for GstSegment subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_SEGMENT_H__
-#define __GST_SEGMENT_H__
-
-#include <gst/gstformat.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_SEGMENT             (gst_segment_get_type())
-
-typedef struct _GstSegment GstSegment;
-
-/**
- * GstSeekType:
- * @GST_SEEK_TYPE_NONE: no change in position is required
- * @GST_SEEK_TYPE_SET: absolute position is requested
- * @GST_SEEK_TYPE_END: relative position to duration is requested
- *
- * The different types of seek events. When constructing a seek event with
- * gst_event_new_seek() or when doing gst_segment_do_seek ().
- */
-typedef enum {
-  /* one of these */
-  GST_SEEK_TYPE_NONE            = 0,
-  GST_SEEK_TYPE_SET             = 1,
-  GST_SEEK_TYPE_END             = 2
-} GstSeekType;
-
-/**
- * GstSeekFlags:
- * @GST_SEEK_FLAG_NONE: no flag
- * @GST_SEEK_FLAG_FLUSH: flush pipeline
- * @GST_SEEK_FLAG_ACCURATE: accurate position is requested, this might
- *                     be considerably slower for some formats.
- * @GST_SEEK_FLAG_KEY_UNIT: seek to the nearest keyframe. This might be
- *                     faster but less accurate.
- * @GST_SEEK_FLAG_SEGMENT: perform a segment seek.
- * @GST_SEEK_FLAG_SKIP: when doing fast foward or fast reverse playback, allow
- *                     elements to skip frames instead of generating all
- *                     frames.
- * @GST_SEEK_FLAG_SNAP_BEFORE: go to a location before the requested position,
- *                     if KEY_UNIT this means the keyframe at or before the
- *                     requested position the one at or before the seek target.
- * @GST_SEEK_FLAG_SNAP_AFTER: go to a location after the requested position,
- *                     if KEY_UNIT this means the keyframe at of after the
- *                     requested position.
- * @GST_SEEK_FLAG_SNAP_NEAREST: go to a position near the requested position,
- *                     if KEY_UNIT this means the keyframe closest to the
- *                     requested position, if both keyframes are at an equal
- *                     distance, behaves like SNAP_BEFORE.
- *
- * Flags to be used with gst_element_seek() or gst_event_new_seek(). All flags
- * can be used together.
- *
- * A non flushing seek might take some time to perform as the currently
- * playing data in the pipeline will not be cleared.
- *
- * An accurate seek might be slower for formats that don't have any indexes
- * or timestamp markers in the stream. Specifying this flag might require a
- * complete scan of the file in those cases.
- *
- * When performing a segment seek: after the playback of the segment completes,
- * no EOS will be emmited by the element that performed the seek, but a
- * #GST_MESSAGE_SEGMENT_DONE message will be posted on the bus by the element.
- * When this message is posted, it is possible to send a new seek event to
- * continue playback. With this seek method it is possible to perform seamless
- * looping or simple linear editing.
- *
- * When doing fast forward (rate > 1.0) or fast reverse (rate < -1.0) trickmode
- * playback, the @GST_SEEK_FLAG_SKIP flag can be used to instruct decoders
- * and demuxers to adjust the playback rate by skipping frames. This can improve
- * performance and decrease CPU usage because not all frames need to be decoded.
- *
- * The @GST_SEEK_FLAG_SNAP_BEFORE flag can be used to snap to the previous
- * relevant location, and the @GST_SEEK_FLAG_SNAP_AFTER flag can be used to
- * select the next relevant location. If KEY_UNIT is specified, the relevant
- * location is a keyframe. If both flags are specified, the nearest of these
- * locations will be selected. If none are specified, the implementation is
- * free to select whichever it wants.
- * The before and after here are in running time, so when playing backwards,
- * the next location refers to the one that will played in next, and not the
- * one that is located after in the actual source stream.
- *
- * Also see part-seeking.txt in the GStreamer design documentation for more
- * details on the meaning of these flags and the behaviour expected of
- * elements that handle them.
- */
-typedef enum {
-  GST_SEEK_FLAG_NONE            = 0,
-  GST_SEEK_FLAG_FLUSH           = (1 << 0),
-  GST_SEEK_FLAG_ACCURATE        = (1 << 1),
-  GST_SEEK_FLAG_KEY_UNIT        = (1 << 2),
-  GST_SEEK_FLAG_SEGMENT         = (1 << 3),
-  GST_SEEK_FLAG_SKIP            = (1 << 4),
-  GST_SEEK_FLAG_SNAP_BEFORE     = (1 << 5),
-  GST_SEEK_FLAG_SNAP_AFTER      = (1 << 6),
-  GST_SEEK_FLAG_SNAP_NEAREST    = GST_SEEK_FLAG_SNAP_BEFORE | GST_SEEK_FLAG_SNAP_AFTER,
-  /* Careful to restart next flag with 1<<7 here */
-} GstSeekFlags;
-
-/**
- * GstSegmentFlags:
- * @GST_SEGMENT_FLAG_NONE: no flags
- * @GST_SEGMENT_FLAG_RESET: reset the pipeline running_time to the segment
- *                          running_time
- * @GST_SEGMENT_FLAG_SKIP: perform skip playback
- * @GST_SEGMENT_FLAG_SEGMENT: send SEGMENT_DONE instead of EOS
- *
- * Flags for the GstSegment structure. Currently mapped to the corresponding
- * values of the seek flags.
- */
-/* Note: update gst_segment_do_seek() when adding new flags here */
-typedef enum { /*< flags >*/
-  GST_SEGMENT_FLAG_NONE            = GST_SEEK_FLAG_NONE,
-  GST_SEGMENT_FLAG_RESET           = GST_SEEK_FLAG_FLUSH,
-  GST_SEGMENT_FLAG_SKIP            = GST_SEEK_FLAG_SKIP,
-  GST_SEGMENT_FLAG_SEGMENT         = GST_SEEK_FLAG_SEGMENT
-} GstSegmentFlags;
-
-/**
- * GstSegment:
- * @flags: flags for this segment
- * @rate: the rate of the segment
- * @applied_rate: the already applied rate to the segment
- * @format: the format of the segment values
- * @base: the base of the segment
- * @offset: the offset to apply to @start or @stop
- * @start: the start of the segment
- * @stop: the stop of the segment
- * @time: the stream time of the segment
- * @position: the position in the segment
- * @duration: the duration of the segment
- *
- * A helper structure that holds the configured region of
- * interest in a media file.
- */
-struct _GstSegment {
-  /*< public >*/
-  GstSegmentFlags flags;
-
-  gdouble         rate;
-  gdouble         applied_rate;
-
-  GstFormat       format;
-  guint64         base;
-  guint64         offset;
-  guint64         start;
-  guint64         stop;
-  guint64         time;
-
-  guint64         position;
-  guint64         duration;
-
-  /* < private > */
-  gpointer        _gst_reserved[GST_PADDING];
-};
-
-GType        gst_segment_get_type            (void);
-
-GstSegment * gst_segment_new                 (void) G_GNUC_MALLOC;
-GstSegment * gst_segment_copy                (const GstSegment *segment) G_GNUC_MALLOC;
-void         gst_segment_copy_into           (const GstSegment *src, GstSegment *dest);
-void         gst_segment_free                (GstSegment *segment);
-
-void         gst_segment_init                (GstSegment *segment, GstFormat format);
-
-guint64      gst_segment_to_stream_time      (const GstSegment *segment, GstFormat format, guint64 position);
-guint64      gst_segment_to_running_time     (const GstSegment *segment, GstFormat format, guint64 position);
-guint64      gst_segment_to_position         (const GstSegment *segment, GstFormat format, guint64 running_time);
-
-gboolean     gst_segment_set_running_time    (GstSegment *segment, GstFormat format, guint64 running_time);
-
-gboolean     gst_segment_clip                (const GstSegment *segment, GstFormat format, guint64 start,
-                                              guint64 stop, guint64 *clip_start, guint64 *clip_stop);
-
-
-gboolean     gst_segment_do_seek             (GstSegment * segment, gdouble rate,
-                                              GstFormat format, GstSeekFlags flags,
-                                              GstSeekType start_type, guint64 start,
-                                              GstSeekType stop_type, guint64 stop, gboolean * update);
-
-G_END_DECLS
-
-#endif /* __GST_SEGMENT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gststructure.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gststructure.h
deleted file mode 100644
index 90c4b59b..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gststructure.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 David A. Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_STRUCTURE_H__
-#define __GST_STRUCTURE_H__
-
-#include <gst/gstconfig.h>
-#include <glib-object.h>
-#include <gst/gstclock.h>
-#include <gst/gstdatetime.h>
-#include <gst/glib-compat.h>
-
-G_BEGIN_DECLS
-
-GST_EXPORT GType _gst_structure_type;
-
-typedef struct _GstStructure GstStructure;
-
-#define GST_TYPE_STRUCTURE             (_gst_structure_type)
-#define GST_IS_STRUCTURE(object)       ((object) && (GST_STRUCTURE(object)->type == GST_TYPE_STRUCTURE))
-#define GST_STRUCTURE_CAST(object)     ((GstStructure *)(object))
-#define GST_STRUCTURE(object)          (GST_STRUCTURE_CAST(object))
-
-
-/**
- * GstStructureForeachFunc:
- * @field_id: the #GQuark of the field name
- * @value: the #GValue of the field
- * @user_data: user data
- *
- * A function that will be called in gst_structure_foreach(). The function may
- * not modify @value.
- *
- * Returns: TRUE if the foreach operation should continue, FALSE if
- * the foreach operation should stop with FALSE.
- */
-typedef gboolean (*GstStructureForeachFunc) (GQuark   field_id,
-					     const GValue * value,
-					     gpointer user_data);
-
-/**
- * GstStructureMapFunc:
- * @field_id: the #GQuark of the field name
- * @value: the #GValue of the field
- * @user_data: user data
- *
- * A function that will be called in gst_structure_map_in_place(). The function
- * may modify @value.
- *
- * Returns: TRUE if the map operation should continue, FALSE if
- * the map operation should stop with FALSE.
- */
-typedef gboolean (*GstStructureMapFunc)     (GQuark   field_id,
-					     GValue * value,
-					     gpointer user_data);
-
-/**
- * GstStructure:
- * @type: the GType of a structure
- *
- * The GstStructure object. Most fields are private.
- */
-struct _GstStructure {
-  GType type;
-
-  /*< private >*/
-  GQuark name;
-};
-
-GType                   gst_structure_get_type             (void);
-
-GstStructure *          gst_structure_new_empty            (const gchar *            name) G_GNUC_MALLOC;
-GstStructure *          gst_structure_new_id_empty         (GQuark                   quark) G_GNUC_MALLOC;
-GstStructure *          gst_structure_new                  (const gchar *            name,
-					                    const gchar *            firstfield,
-							    ...) G_GNUC_NULL_TERMINATED  G_GNUC_MALLOC;
-GstStructure *          gst_structure_new_valist           (const gchar *            name,
-						            const gchar *            firstfield,
-							    va_list                  varargs) G_GNUC_MALLOC;
-GstStructure *          gst_structure_new_id               (GQuark                   name_quark,
-                                                            GQuark                   field_quark,
-                                                            ...) G_GNUC_MALLOC;
-GstStructure *          gst_structure_copy                 (const GstStructure      *structure) G_GNUC_MALLOC;
-gboolean		gst_structure_set_parent_refcount  (GstStructure            *structure,
-                                                            gint                    *refcount);
-void                    gst_structure_free                 (GstStructure            *structure);
-
-const gchar *		gst_structure_get_name             (const GstStructure      *structure);
-GQuark			gst_structure_get_name_id          (const GstStructure      *structure);
-gboolean                gst_structure_has_name             (const GstStructure      *structure,
-							    const gchar             *name);
-void                    gst_structure_set_name             (GstStructure            *structure,
-							    const gchar             *name);
-
-void                    gst_structure_id_set_value         (GstStructure            *structure,
-							    GQuark                   field,
-							    const GValue            *value);
-void                    gst_structure_set_value            (GstStructure            *structure,
-							    const gchar             *fieldname,
-							    const GValue            *value);
-void                    gst_structure_id_take_value         (GstStructure            *structure,
-							    GQuark                   field,
-							    GValue                  *value);
-void                    gst_structure_take_value            (GstStructure            *structure,
-							    const gchar             *fieldname,
-							    GValue                  *value);
-void                    gst_structure_set                  (GstStructure            *structure,
-							    const gchar             *fieldname,
-							    ...) G_GNUC_NULL_TERMINATED;
-
-void                    gst_structure_set_valist           (GstStructure            *structure,
-							    const gchar             *fieldname,
-							    va_list varargs);
-
-void                    gst_structure_id_set                (GstStructure            *structure,
-							    GQuark                   fieldname,
-							    ...) G_GNUC_NULL_TERMINATED;
-
-void                    gst_structure_id_set_valist         (GstStructure            *structure,
-							    GQuark                   fieldname,
-							    va_list varargs);
-
-gboolean                gst_structure_get_valist           (const GstStructure      *structure,
-                                                            const char              *first_fieldname,
-                                                            va_list                  args);
-
-gboolean                gst_structure_get                  (const GstStructure      *structure,
-                                                            const char              *first_fieldname,
-                                                            ...) G_GNUC_NULL_TERMINATED;
-
-gboolean                gst_structure_id_get_valist        (const GstStructure      *structure,
-                                                            GQuark                   first_field_id,
-                                                            va_list                  args);
-
-gboolean                gst_structure_id_get               (const GstStructure      *structure,
-                                                            GQuark                   first_field_id,
-                                                            ...) G_GNUC_NULL_TERMINATED;
-
-const GValue *		gst_structure_id_get_value         (const GstStructure      *structure,
-							    GQuark                   field);
-const GValue *		gst_structure_get_value            (const GstStructure      *structure,
-							    const gchar             *fieldname);
-void                    gst_structure_remove_field         (GstStructure            *structure,
-							    const gchar             *fieldname);
-void                    gst_structure_remove_fields        (GstStructure            *structure,
-							     const gchar            *fieldname,
-							    ...) G_GNUC_NULL_TERMINATED;
-void                    gst_structure_remove_fields_valist (GstStructure             *structure,
-							    const gchar             *fieldname,
-							    va_list                  varargs);
-void                    gst_structure_remove_all_fields    (GstStructure            *structure);
-
-GType                   gst_structure_get_field_type       (const GstStructure      *structure,
-							    const gchar             *fieldname);
-gboolean                gst_structure_foreach              (const GstStructure      *structure,
-							    GstStructureForeachFunc  func,
-							    gpointer                 user_data);
-gboolean                gst_structure_map_in_place         (GstStructure            *structure,
-							    GstStructureMapFunc      func,
-							    gpointer                 user_data);
-gint                    gst_structure_n_fields             (const GstStructure      *structure);
-const gchar *           gst_structure_nth_field_name       (const GstStructure      *structure, guint index);
-gboolean                gst_structure_id_has_field         (const GstStructure      *structure,
-							    GQuark                   field);
-gboolean                gst_structure_id_has_field_typed   (const GstStructure      *structure,
-							    GQuark                   field,
-							    GType                    type);
-gboolean                gst_structure_has_field            (const GstStructure      *structure,
-							    const gchar             *fieldname);
-gboolean                gst_structure_has_field_typed      (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    GType                    type);
-
-/* utility functions */
-gboolean                gst_structure_get_boolean          (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    gboolean                *value);
-gboolean                gst_structure_get_int              (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    gint                    *value);
-gboolean                gst_structure_get_uint             (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    guint                   *value);
-gboolean                gst_structure_get_double           (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    gdouble                 *value);
-gboolean                gst_structure_get_date             (const GstStructure      *structure,
-							    const gchar             *fieldname,
-                                                            GDate                  **value);
-gboolean                gst_structure_get_date_time        (const GstStructure      *structure,
-							    const gchar             *fieldname,
-                                                            GstDateTime              **value);
-gboolean                gst_structure_get_clock_time       (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    GstClockTime            *value);
-const gchar *		gst_structure_get_string           (const GstStructure      *structure,
-							    const gchar             *fieldname);
-gboolean                gst_structure_get_enum             (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    GType                    enumtype,
-							    gint                    *value);
-gboolean                gst_structure_get_fraction         (const GstStructure      *structure,
-							    const gchar             *fieldname,
-							    gint *value_numerator,
-							    gint *value_denominator);
-
-gchar *                 gst_structure_to_string            (const GstStructure      *structure) G_GNUC_MALLOC;
-GstStructure *          gst_structure_from_string          (const gchar             *string,
-							    gchar                  **end) G_GNUC_MALLOC;
-
-gboolean                 gst_structure_fixate_field_nearest_int    (GstStructure *structure,
-									 const char   *field_name,
-									 int           target);
-gboolean                 gst_structure_fixate_field_nearest_double (GstStructure *structure,
-									 const char   *field_name,
-									 double        target);
-
-gboolean                 gst_structure_fixate_field_boolean (GstStructure *structure,
-									 const char   *field_name,
-									 gboolean        target);
-gboolean                 gst_structure_fixate_field_string (GstStructure *structure,
-									 const char   *field_name,
-									 const gchar  *target);
-gboolean                 gst_structure_fixate_field_nearest_fraction (GstStructure *structure,
-									 const char   *field_name,
-									 const gint target_numerator,
-									 const gint target_denominator);
-gboolean                 gst_structure_fixate_field  (GstStructure *structure,
-						      const char   *field_name);
-
-gboolean                 gst_structure_is_equal(const GstStructure *structure1,
-						const GstStructure *structure2);
-gboolean                 gst_structure_is_subset(const GstStructure *subset,
-                                                 const GstStructure *superset);
-gboolean                 gst_structure_can_intersect(const GstStructure *struct1,
-						     const GstStructure *struct2);
-GstStructure*            gst_structure_intersect (const GstStructure *struct1,
-                                                  const GstStructure *struct2)  G_GNUC_MALLOC;
-void                     gst_structure_fixate    (GstStructure *structure);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsystemclock.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsystemclock.h
deleted file mode 100644
index fc3b9b18..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstsystemclock.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstsystemclock.h: A clock implementation based on system time
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_SYSTEM_CLOCK_H__
-#define __GST_SYSTEM_CLOCK_H__
-
-#include <gst/gstclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_SYSTEM_CLOCK                   (gst_system_clock_get_type ())
-#define GST_SYSTEM_CLOCK(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SYSTEM_CLOCK, GstSystemClock))
-#define GST_SYSTEM_CLOCK_CAST(obj)              ((GstSystemClock *)(obj))
-#define GST_IS_SYSTEM_CLOCK(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SYSTEM_CLOCK))
-#define GST_SYSTEM_CLOCK_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SYSTEM_CLOCK, GstSystemClockClass))
-#define GST_IS_SYSTEM_CLOCK_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SYSTEM_CLOCK))
-#define GST_SYSTEM_CLOCK_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_SYSTEM_CLOCK, GstSystemClockClass))
-
-
-typedef struct _GstSystemClock GstSystemClock;
-typedef struct _GstSystemClockClass GstSystemClockClass;
-typedef struct _GstSystemClockPrivate GstSystemClockPrivate;
-
-/**
- * GstClockType:
- * @GST_CLOCK_TYPE_REALTIME: time since Epoch
- * @GST_CLOCK_TYPE_MONOTONIC: monotonic time since some unspecified starting
- *                            point
- * @GST_CLOCK_TYPE_OTHER: some other time source is used (Since: 1.0.5)
- *
- * The different kind of clocks.
- */
-typedef enum {
-  GST_CLOCK_TYPE_REALTIME       = 0,
-  GST_CLOCK_TYPE_MONOTONIC      = 1,
-  GST_CLOCK_TYPE_OTHER          = 2
-} GstClockType;
-
-/**
- * GstSystemClock:
- *
- * The default implementation of a #GstClock that uses the system time.
- */
-struct _GstSystemClock {
-  GstClock       clock;
-
-  /*< private >*/
-  GstSystemClockPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstSystemClockClass {
-  GstClockClass  parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_system_clock_get_type       (void);
-
-GstClock*               gst_system_clock_obtain         (void);
-
-G_END_DECLS
-
-#endif /* __GST_SYSTEM_CLOCK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttaglist.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttaglist.h
deleted file mode 100644
index a818105e..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttaglist.h
+++ /dev/null
@@ -1,1049 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttaglist.h: Header for tag support
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TAGLIST_H__
-#define __GST_TAGLIST_H__
-
-#include <gst/gstdatetime.h>
-#include <gst/gstsample.h>
-#include <gst/gstbuffer.h>
-#include <gst/glib-compat.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstTagMergeMode:
- * @GST_TAG_MERGE_UNDEFINED: undefined merge mode
- * @GST_TAG_MERGE_REPLACE_ALL: replace all tags (clear list and append)
- * @GST_TAG_MERGE_REPLACE: replace tags
- * @GST_TAG_MERGE_APPEND: append tags
- * @GST_TAG_MERGE_PREPEND: prepend tags
- * @GST_TAG_MERGE_KEEP: keep existing tags
- * @GST_TAG_MERGE_KEEP_ALL: keep all existing tags
- * @GST_TAG_MERGE_COUNT: the number of merge modes
- *
- * The different tag merging modes are basically replace, overwrite and append,
- * but they can be seen from two directions. Given two taglists: (A) the tags
- * already in the element and (B) the ones that are supplied to the element (
- * e.g. via gst_tag_setter_merge_tags() / gst_tag_setter_add_tags() or a
- * %GST_EVENT_TAG), how are these tags merged?
- * In the table below this is shown for the cases that a tag exists in the list
- * (A) or does not exists (!A) and combinations thereof.
- *
- * <table frame="all" colsep="1" rowsep="1">
- *   <title>merge mode</title>
- *   <tgroup cols='5' align='left'>
- *     <thead>
- *       <row>
- *         <entry>merge mode</entry>
- *         <entry>A + B</entry>
- *         <entry>A + !B</entry>
- *         <entry>!A + B</entry>
- *         <entry>!A + !B</entry>
- *       </row>
- *     </thead>
- *     <tbody>
- *       <row>
- *         <entry>REPLACE_ALL</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>REPLACE</entry>
- *         <entry>B</entry>
- *         <entry>A</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>APPEND</entry>
- *         <entry>A, B</entry>
- *         <entry>A</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>PREPEND</entry>
- *         <entry>B, A</entry>
- *         <entry>A</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>KEEP</entry>
- *         <entry>A</entry>
- *         <entry>A</entry>
- *         <entry>B</entry>
- *         <entry>-</entry>
- *       </row>
- *       <row>
- *         <entry>KEEP_ALL</entry>
- *         <entry>A</entry>
- *         <entry>A</entry>
- *         <entry>-</entry>
- *         <entry>-</entry>
- *       </row>
- *     </tbody>
- *   </tgroup>
- * </table>
- */
-typedef enum {
-  GST_TAG_MERGE_UNDEFINED,
-  GST_TAG_MERGE_REPLACE_ALL,
-  GST_TAG_MERGE_REPLACE,
-  GST_TAG_MERGE_APPEND,
-  GST_TAG_MERGE_PREPEND,
-  GST_TAG_MERGE_KEEP,
-  GST_TAG_MERGE_KEEP_ALL,
-  /* add more */
-  GST_TAG_MERGE_COUNT
-} GstTagMergeMode;
-
-#define GST_TAG_MODE_IS_VALID(mode)     (((mode) > GST_TAG_MERGE_UNDEFINED) && ((mode) < GST_TAG_MERGE_COUNT))
-
-/**
- * GstTagFlag:
- * @GST_TAG_FLAG_UNDEFINED: undefined flag
- * @GST_TAG_FLAG_META: tag is meta data
- * @GST_TAG_FLAG_ENCODED: tag is encoded
- * @GST_TAG_FLAG_DECODED: tag is decoded
- * @GST_TAG_FLAG_COUNT: number of tag flags
- *
- * Extra tag flags used when registering tags.
- */
-/* FIXME: these are not really flags .. */
-typedef enum {
-  GST_TAG_FLAG_UNDEFINED,
-  GST_TAG_FLAG_META,
-  GST_TAG_FLAG_ENCODED,
-  GST_TAG_FLAG_DECODED,
-  GST_TAG_FLAG_COUNT
-} GstTagFlag;
-
-#define GST_TAG_FLAG_IS_VALID(flag)     (((flag) > GST_TAG_FLAG_UNDEFINED) && ((flag) < GST_TAG_FLAG_COUNT))
-
-/**
- * GstTagList:
- * @mini_object: the parent type
- *
- * Object describing tags / metadata.
- */
-typedef struct _GstTagList GstTagList;
-struct _GstTagList {
-  GstMiniObject mini_object;
-};
-
-#define GST_TAG_LIST(x)       ((GstTagList *) (x))
-#define GST_TYPE_TAG_LIST     (gst_tag_list_get_type ())
-#define GST_IS_TAG_LIST(obj)  (GST_IS_MINI_OBJECT_TYPE((obj), GST_TYPE_TAG_LIST))
-
-/**
- * GstTagForeachFunc:
- * @list: the #GstTagList
- * @tag: a name of a tag in @list
- * @user_data: user data
- *
- * A function that will be called in gst_tag_list_foreach(). The function may
- * not modify the tag list.
- */
-typedef void (*GstTagForeachFunc) (const GstTagList * list,
-                                   const gchar      * tag,
-                                   gpointer           user_data);
-
-/**
- * GstTagMergeFunc:
- * @dest: the destination #GValue
- * @src: the source #GValue
- *
- * A function for merging multiple values of a tag used when registering
- * tags.
- */
-typedef void (* GstTagMergeFunc) (GValue *dest, const GValue *src);
-
-GType        gst_tag_list_get_type (void);
-
-/* tag registration */
-void         gst_tag_register      (const gchar     * name,
-                                    GstTagFlag        flag,
-                                    GType             type,
-                                    const gchar     * nick,
-                                    const gchar     * blurb,
-                                    GstTagMergeFunc   func);
-
-void         gst_tag_register_static (const gchar   * name,
-                                      GstTagFlag      flag,
-                                      GType           type,
-                                      const gchar   * nick,
-                                      const gchar   * blurb,
-                                      GstTagMergeFunc func);
-
-/* some default merging functions */
-void      gst_tag_merge_use_first          (GValue * dest, const GValue * src);
-void      gst_tag_merge_strings_with_comma (GValue * dest, const GValue * src);
-
-/* basic tag support */
-gboolean               gst_tag_exists          (const gchar * tag);
-GType                  gst_tag_get_type        (const gchar * tag);
-const gchar *          gst_tag_get_nick        (const gchar * tag);
-const gchar *          gst_tag_get_description (const gchar * tag);
-GstTagFlag             gst_tag_get_flag        (const gchar * tag);
-gboolean               gst_tag_is_fixed        (const gchar * tag);
-
-/* tag lists */
-
-/**
- * GstTagScope:
- * @GST_TAG_SCOPE_STREAM: tags specific to this single stream
- * @GST_TAG_SCOPE_GLOBAL: global tags for the complete medium
- *
- * GstTagScope specifies if a taglist applies to the complete
- * medium or only to one single stream.
- */
-typedef enum {
-  GST_TAG_SCOPE_STREAM,
-  GST_TAG_SCOPE_GLOBAL
-} GstTagScope;
-
-GstTagList * gst_tag_list_new_empty         (void) G_GNUC_MALLOC;
-GstTagList * gst_tag_list_new               (const gchar * tag, ...) G_GNUC_MALLOC;
-GstTagList * gst_tag_list_new_valist        (va_list var_args) G_GNUC_MALLOC;
-
-void         gst_tag_list_set_scope         (GstTagList * list, GstTagScope scope);
-GstTagScope  gst_tag_list_get_scope         (const GstTagList * list);
-
-gchar      * gst_tag_list_to_string         (const GstTagList * list) G_GNUC_MALLOC;
-GstTagList * gst_tag_list_new_from_string   (const gchar      * str) G_GNUC_MALLOC;
-
-gint         gst_tag_list_n_tags            (const GstTagList * list);
-const gchar* gst_tag_list_nth_tag_name      (const GstTagList * list, guint index);
-gboolean     gst_tag_list_is_empty          (const GstTagList * list);
-gboolean     gst_tag_list_is_equal          (const GstTagList * list1,
-                                             const GstTagList * list2);
-void         gst_tag_list_insert            (GstTagList       * into,
-                                             const GstTagList * from,
-                                             GstTagMergeMode    mode);
-GstTagList * gst_tag_list_merge             (const GstTagList * list1,
-                                             const GstTagList * list2,
-                                             GstTagMergeMode    mode) G_GNUC_MALLOC;
-guint        gst_tag_list_get_tag_size      (const GstTagList * list,
-                                             const gchar      * tag);
-void         gst_tag_list_add               (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             ...) G_GNUC_NULL_TERMINATED;
-void         gst_tag_list_add_values        (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             ...) G_GNUC_NULL_TERMINATED;
-void         gst_tag_list_add_valist        (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             va_list        var_args);
-void         gst_tag_list_add_valist_values (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             va_list            var_args);
-void         gst_tag_list_add_value         (GstTagList       * list,
-                                             GstTagMergeMode    mode,
-                                             const gchar      * tag,
-                                             const GValue     * value);
-void         gst_tag_list_remove_tag        (GstTagList       * list,
-                                             const gchar      * tag);
-void         gst_tag_list_foreach           (const GstTagList * list,
-                                             GstTagForeachFunc  func,
-                                             gpointer           user_data);
-
-const GValue *
-             gst_tag_list_get_value_index   (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index);
-gboolean     gst_tag_list_copy_value        (GValue           * dest,
-                                             const GstTagList * list,
-                                             const gchar      * tag);
-
-/* simplifications (FIXME: do we want them?) */
-gboolean     gst_tag_list_get_boolean       (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gboolean         * value);
-gboolean     gst_tag_list_get_boolean_index (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gboolean         * value);
-gboolean     gst_tag_list_get_int           (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gint             * value);
-gboolean     gst_tag_list_get_int_index     (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gint             * value);
-gboolean     gst_tag_list_get_uint          (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint            * value);
-gboolean     gst_tag_list_get_uint_index    (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             guint            * value);
-gboolean     gst_tag_list_get_int64         (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gint64           * value);
-gboolean     gst_tag_list_get_int64_index   (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gint64           * value);
-gboolean     gst_tag_list_get_uint64        (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint64          * value);
-gboolean     gst_tag_list_get_uint64_index  (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             guint64          * value);
-gboolean     gst_tag_list_get_float         (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gfloat           * value);
-gboolean     gst_tag_list_get_float_index   (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gfloat           * value);
-gboolean     gst_tag_list_get_double        (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gdouble          * value);
-gboolean     gst_tag_list_get_double_index  (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gdouble          * value);
-gboolean     gst_tag_list_get_string        (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gchar           ** value);
-gboolean     gst_tag_list_get_string_index  (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gchar           ** value);
-gboolean     gst_tag_list_peek_string_index (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             const gchar     ** value);
-gboolean     gst_tag_list_get_pointer       (const GstTagList * list,
-                                             const gchar      * tag,
-                                             gpointer         * value);
-gboolean     gst_tag_list_get_pointer_index (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             gpointer         * value);
-gboolean     gst_tag_list_get_date          (const GstTagList * list,
-                                             const gchar      * tag,
-                                             GDate           ** value);
-gboolean     gst_tag_list_get_date_index    (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             GDate           ** value);
-gboolean     gst_tag_list_get_date_time     (const GstTagList * list,
-                                             const gchar      * tag,
-                                             GstDateTime     ** value);
-gboolean     gst_tag_list_get_date_time_index (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             GstDateTime     ** value);
-gboolean     gst_tag_list_get_sample        (const GstTagList * list,
-                                             const gchar      * tag,
-                                             GstSample       ** sample);
-gboolean     gst_tag_list_get_sample_index  (const GstTagList * list,
-                                             const gchar      * tag,
-                                             guint              index,
-                                             GstSample       ** sample);
-
-/* refcounting */
-/**
- * gst_tag_list_ref:
- * @taglist: the #GstTagList to reference
- *
- * Add a reference to a #GstTagList mini object.
- *
- * From this point on, until the caller calls gst_tag_list_unref() or
- * gst_tag_list_make_writable(), it is guaranteed that the taglist object will
- * not change. To use a #GstTagList object, you must always have a refcount on
- * it -- either the one made implicitly by e.g. gst_tag_list_new(), or via
- * taking one explicitly with this function.
- *
- * Returns: the same #GstTagList mini object.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstTagList * gst_tag_list_ref (GstTagList * taglist);
-#endif
-
-static inline GstTagList *
-gst_tag_list_ref (GstTagList * taglist)
-{
-  return (GstTagList *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (taglist));
-}
-
-/**
- * gst_tag_list_unref:
- * @taglist: a #GstTagList.
- *
- * Unref a #GstTagList, and and free all its memory when the refcount reaches 0.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void gst_tag_list_unref (GstTagList * taglist);
-#endif
-
-static inline void
-gst_tag_list_unref (GstTagList * taglist)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (taglist));
-}
-
-/**
- * gst_tag_list_copy:
- * @taglist: a #GstTagList.
- *
- * Creates a new #GstTagList as a copy of the old @taglist. The new taglist
- * will have a refcount of 1, owned by the caller, and will be writable as
- * a result.
- *
- * Note that this function is the semantic equivalent of a gst_tag_list_ref()
- * followed by a gst_tag_list_make_writable(). If you only want to hold on to a
- * reference to the data, you should use gst_tag_list_ref().
- *
- * When you are finished with the taglist, call gst_tag_list_unref() on it.
- *
- * Returns: the new #GstTagList
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstTagList * gst_tag_list_copy (const GstTagList * taglist);
-#endif
-
-static inline GstTagList *
-gst_tag_list_copy (const GstTagList * taglist)
-{
-  return GST_TAG_LIST (gst_mini_object_copy (GST_MINI_OBJECT_CAST (taglist)));
-}
-
-/**
- * gst_tag_list_is_writable:
- * @taglist: a #GstTagList
- *
- * Tests if you can safely modify @taglist. It is only safe to modify taglist
- * when there is only one owner of the taglist - ie, the refcount is 1.
- */
-#define gst_tag_list_is_writable(taglist)    gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (taglist))
-
-/**
- * gst_tag_list_make_writable:
- * @taglist: (transfer full): a #GstTagList
- *
- * Returns a writable copy of @taglist.
- *
- * If there is only one reference count on @taglist, the caller must be the
- * owner, and so this function will return the taglist object unchanged. If on
- * the other hand there is more than one reference on the object, a new taglist
- * object will be returned (which will be a copy of @taglist). The caller's
- * reference on @taglist will be removed, and instead the caller will own a
- * reference to the returned object.
- *
- * In short, this function unrefs the taglist in the argument and refs the
- * taglist that it returns. Don't access the argument after calling this
- * function. See also: gst_tag_list_ref().
- *
- * Returns: (transfer full): a writable taglist which may or may not be the
- *     same as @taglist
- */
-#define gst_tag_list_make_writable(taglist)   GST_TAG_LIST (gst_mini_object_make_writable (GST_MINI_OBJECT_CAST (taglist)))
-
-/* GStreamer core tags */
-/**
- * GST_TAG_TITLE:
- *
- * commonly used title (string)
- *
- * The title as it should be displayed, e.g. 'The Doll House'
- */
-#define GST_TAG_TITLE                  "title"
-/**
- * GST_TAG_TITLE_SORTNAME:
- *
- * commonly used title, as used for sorting (string)
- *
- * The title as it should be sorted, e.g. 'Doll House, The'
- */
-#define GST_TAG_TITLE_SORTNAME         "title-sortname"
-/**
- * GST_TAG_ARTIST:
- *
- * person(s) responsible for the recording (string)
- *
- * The artist name as it should be displayed, e.g. 'Jimi Hendrix' or
- * 'The Guitar Heroes'
- */
-#define GST_TAG_ARTIST                 "artist"
-/**
- * GST_TAG_ARTIST_SORTNAME:
- *
- * person(s) responsible for the recording, as used for sorting (string)
- *
- * The artist name as it should be sorted, e.g. 'Hendrix, Jimi' or
- * 'Guitar Heroes, The'
- */
-#define GST_TAG_ARTIST_SORTNAME        "artist-sortname"
-/**
- * GST_TAG_ALBUM:
- *
- * album containing this data (string)
- *
- * The album name as it should be displayed, e.g. 'The Jazz Guitar'
- */
-#define GST_TAG_ALBUM                  "album"
-/**
- * GST_TAG_ALBUM_SORTNAME:
- *
- * album containing this data, as used for sorting (string)
- *
- * The album name as it should be sorted, e.g. 'Jazz Guitar, The'
- */
-#define GST_TAG_ALBUM_SORTNAME         "album-sortname"
-/**
- * GST_TAG_ALBUM_ARTIST:
- *
- * The artist of the entire album, as it should be displayed.
- */
-#define GST_TAG_ALBUM_ARTIST           "album-artist"
-/**
- * GST_TAG_ALBUM_ARTIST_SORTNAME:
- *
- * The artist of the entire album, as it should be sorted.
- */
-#define GST_TAG_ALBUM_ARTIST_SORTNAME  "album-artist-sortname"
-/**
- * GST_TAG_COMPOSER:
- *
- * person(s) who composed the recording (string)
- */
-#define GST_TAG_COMPOSER               "composer"
-/**
- * GST_TAG_DATE:
- *
- * date the data was created (#GDate structure)
- */
-#define GST_TAG_DATE                   "date"
-/**
- * GST_TAG_DATE_TIME:
- *
- * date and time the data was created (#GstDateTime structure)
- */
-#define GST_TAG_DATE_TIME              "datetime"
-/**
- * GST_TAG_GENRE:
- *
- * genre this data belongs to (string)
- */
-#define GST_TAG_GENRE                  "genre"
-/**
- * GST_TAG_COMMENT:
- *
- * free text commenting the data (string)
- */
-#define GST_TAG_COMMENT                "comment"
-/**
- * GST_TAG_EXTENDED_COMMENT:
- *
- * key/value text commenting the data (string)
- *
- * Must be in the form of 'key=comment' or
- * 'key[lc]=comment' where 'lc' is an ISO-639
- * language code.
- *
- * This tag is used for unknown Vorbis comment tags,
- * unknown APE tags and certain ID3v2 comment fields.
- */
-#define GST_TAG_EXTENDED_COMMENT       "extended-comment"
-/**
- * GST_TAG_TRACK_NUMBER:
- *
- * track number inside a collection (unsigned integer)
- */
-#define GST_TAG_TRACK_NUMBER           "track-number"
-/**
- * GST_TAG_TRACK_COUNT:
- *
- * count of tracks inside collection this track belongs to (unsigned integer)
- */
-#define GST_TAG_TRACK_COUNT            "track-count"
-/**
- * GST_TAG_ALBUM_VOLUME_NUMBER:
- *
- * disc number inside a collection (unsigned integer)
- */
-#define GST_TAG_ALBUM_VOLUME_NUMBER    "album-disc-number"
-/**
- * GST_TAG_ALBUM_VOLUME_COUNT:
- *
- * count of discs inside collection this disc belongs to (unsigned integer)
- */
-#define GST_TAG_ALBUM_VOLUME_COUNT    "album-disc-count"
-/**
- * GST_TAG_LOCATION:
- *
- * Origin of media as a URI (location, where the original of the file or stream
- * is hosted) (string)
- */
-#define GST_TAG_LOCATION               "location"
-/**
- * GST_TAG_HOMEPAGE:
- *
- * Homepage for this media (i.e. artist or movie homepage) (string)
- */
-#define GST_TAG_HOMEPAGE               "homepage"
-/**
- * GST_TAG_DESCRIPTION:
- *
- * short text describing the content of the data (string)
- */
-#define GST_TAG_DESCRIPTION            "description"
-/**
- * GST_TAG_VERSION:
- *
- * version of this data (string)
- */
-#define GST_TAG_VERSION                "version"
-/**
- * GST_TAG_ISRC:
- *
- * International Standard Recording Code - see http://www.ifpi.org/isrc/ (string)
- */
-#define GST_TAG_ISRC                   "isrc"
-/**
- * GST_TAG_ORGANIZATION:
- *
- * organization (string)
- */
-#define GST_TAG_ORGANIZATION           "organization"
-/**
- * GST_TAG_COPYRIGHT:
- *
- * copyright notice of the data (string)
- */
-#define GST_TAG_COPYRIGHT              "copyright"
-/**
- * GST_TAG_COPYRIGHT_URI:
- *
- * URI to location where copyright details can be found (string)
- */
-#define GST_TAG_COPYRIGHT_URI          "copyright-uri"
-/**
- * GST_TAG_ENCODED_BY:
- *
- * name of the person or organisation that encoded the file. May contain a
- * copyright message if the person or organisation also holds the copyright
- * (string)
- *
- * Note: do not use this field to describe the encoding application. Use
- * #GST_TAG_APPLICATION_NAME or #GST_TAG_COMMENT for that.
- */
-#define GST_TAG_ENCODED_BY             "encoded-by"
-/**
- * GST_TAG_CONTACT:
- *
- * contact information (string)
- */
-#define GST_TAG_CONTACT                "contact"
-/**
- * GST_TAG_LICENSE:
- *
- * license of data (string)
- */
-#define GST_TAG_LICENSE                "license"
-/**
- * GST_TAG_LICENSE_URI:
- *
- * URI to location where license details can be found (string)
- */
-#define GST_TAG_LICENSE_URI            "license-uri"
-/**
- * GST_TAG_PERFORMER:
- *
- * person(s) performing (string)
- */
-#define GST_TAG_PERFORMER              "performer"
-/**
- * GST_TAG_DURATION:
- *
- * length in GStreamer time units (nanoseconds) (unsigned 64-bit integer)
- */
-#define GST_TAG_DURATION               "duration"
-/**
- * GST_TAG_CODEC:
- *
- * codec the data is stored in (string)
- */
-#define GST_TAG_CODEC                  "codec"
-/**
- * GST_TAG_VIDEO_CODEC:
- *
- * codec the video data is stored in (string)
- */
-#define GST_TAG_VIDEO_CODEC            "video-codec"
-/**
- * GST_TAG_AUDIO_CODEC:
- *
- * codec the audio data is stored in (string)
- */
-#define GST_TAG_AUDIO_CODEC            "audio-codec"
-/**
- * GST_TAG_SUBTITLE_CODEC:
- *
- * codec/format the subtitle data is stored in (string)
- */
-#define GST_TAG_SUBTITLE_CODEC         "subtitle-codec"
-/**
- * GST_TAG_CONTAINER_FORMAT:
- *
- * container format the data is stored in (string)
- */
-#define GST_TAG_CONTAINER_FORMAT       "container-format"
-/**
- * GST_TAG_BITRATE:
- *
- * exact or average bitrate in bits/s (unsigned integer)
- */
-#define GST_TAG_BITRATE                "bitrate"
-/**
- * GST_TAG_NOMINAL_BITRATE:
- *
- * nominal bitrate in bits/s (unsigned integer). The actual bitrate might be
- * different from this target bitrate.
- */
-#define GST_TAG_NOMINAL_BITRATE        "nominal-bitrate"
-/**
- * GST_TAG_MINIMUM_BITRATE:
- *
- * minimum bitrate in bits/s (unsigned integer)
- */
-#define GST_TAG_MINIMUM_BITRATE        "minimum-bitrate"
-/**
- * GST_TAG_MAXIMUM_BITRATE:
- *
- * maximum bitrate in bits/s (unsigned integer)
- */
-#define GST_TAG_MAXIMUM_BITRATE        "maximum-bitrate"
-/**
- * GST_TAG_SERIAL:
- *
- * serial number of track (unsigned integer)
- */
-#define GST_TAG_SERIAL                 "serial"
-/**
- * GST_TAG_ENCODER:
- *
- * encoder used to encode this stream (string)
- */
-#define GST_TAG_ENCODER                "encoder"
-/**
- * GST_TAG_ENCODER_VERSION:
- *
- * version of the encoder used to encode this stream (unsigned integer)
- */
-#define GST_TAG_ENCODER_VERSION        "encoder-version"
-/**
- * GST_TAG_TRACK_GAIN:
- *
- * track gain in db (double)
- */
-#define GST_TAG_TRACK_GAIN             "replaygain-track-gain"
-/**
- * GST_TAG_TRACK_PEAK:
- *
- * peak of the track (double)
- */
-#define GST_TAG_TRACK_PEAK             "replaygain-track-peak"
-/**
- * GST_TAG_ALBUM_GAIN:
- *
- * album gain in db (double)
- */
-#define GST_TAG_ALBUM_GAIN             "replaygain-album-gain"
-/**
- * GST_TAG_ALBUM_PEAK:
- *
- * peak of the album (double)
- */
-#define GST_TAG_ALBUM_PEAK             "replaygain-album-peak"
-/**
- * GST_TAG_REFERENCE_LEVEL:
- *
- * reference level of track and album gain values (double)
- */
-#define GST_TAG_REFERENCE_LEVEL        "replaygain-reference-level"
-/**
- * GST_TAG_LANGUAGE_CODE:
- *
- * ISO-639-2 or ISO-639-1 code for the language the content is in (string)
- *
- * There is utility API in libgsttag in gst-plugins-base to obtain a translated
- * language name from the language code: gst_tag_get_language_name()
- */
-#define GST_TAG_LANGUAGE_CODE          "language-code"
-/**
- * GST_TAG_LANGUAGE_NAME:
- *
- * Name of the language the content is in (string)
- *
- * Free-form name of the language the content is in, if a language code
- * is not available. This tag should not be set in addition to a language
- * code. It is undefined what language or locale the language name is in.
- */
-#define GST_TAG_LANGUAGE_NAME          "language-name"
-/**
- * GST_TAG_IMAGE:
- *
- * image (sample) (sample taglist should specify the content type and preferably
- * also set "image-type" field as #GstTagImageType)
- */
-#define GST_TAG_IMAGE                  "image"
-/**
- * GST_TAG_PREVIEW_IMAGE:
- *
- * image that is meant for preview purposes, e.g. small icon-sized version
- * (sample) (sample taglist should specify the content type)
- */
-#define GST_TAG_PREVIEW_IMAGE          "preview-image"
-
-/**
- * GST_TAG_ATTACHMENT:
- *
- * generic file attachment (sample) (sample taglist should specify the content
- * type and if possible set "filename" to the file name of the
- * attachment)
- */
-#define GST_TAG_ATTACHMENT             "attachment"
-
-/**
- * GST_TAG_BEATS_PER_MINUTE:
- *
- * number of beats per minute in audio (double)
- */
-#define GST_TAG_BEATS_PER_MINUTE       "beats-per-minute"
-
-/**
- * GST_TAG_KEYWORDS:
- *
- * comma separated keywords describing the content (string).
- */
-#define GST_TAG_KEYWORDS               "keywords"
-
-/**
- * GST_TAG_GEO_LOCATION_NAME:
- *
- * human readable descriptive location of where the media has been recorded or
- * produced. (string).
- */
-#define GST_TAG_GEO_LOCATION_NAME               "geo-location-name"
-
-/**
- * GST_TAG_GEO_LOCATION_LATITUDE:
- *
- * geo latitude location of where the media has been recorded or produced in
- * degrees according to WGS84 (zero at the equator, negative values for southern
- * latitudes) (double).
- */
-#define GST_TAG_GEO_LOCATION_LATITUDE               "geo-location-latitude"
-
-/**
- * GST_TAG_GEO_LOCATION_LONGITUDE:
- *
- * geo longitude location of where the media has been recorded or produced in
- * degrees according to WGS84 (zero at the prime meridian in Greenwich/UK,
- * negative values for western longitudes). (double).
- */
-#define GST_TAG_GEO_LOCATION_LONGITUDE               "geo-location-longitude"
-
-/**
- * GST_TAG_GEO_LOCATION_ELEVATION:
- *
- * geo elevation of where the media has been recorded or produced in meters
- * according to WGS84 (zero is average sea level) (double).
- */
-#define GST_TAG_GEO_LOCATION_ELEVATION               "geo-location-elevation"
-/**
- * GST_TAG_GEO_LOCATION_COUNTRY:
- *
- * The country (english name) where the media has been produced (string).
- */
-#define GST_TAG_GEO_LOCATION_COUNTRY                 "geo-location-country"
-/**
- * GST_TAG_GEO_LOCATION_CITY:
- *
- * The city (english name) where the media has been produced (string).
- */
-#define GST_TAG_GEO_LOCATION_CITY                    "geo-location-city"
-/**
- * GST_TAG_GEO_LOCATION_SUBLOCATION:
- *
- * A location 'smaller' than GST_TAG_GEO_LOCATION_CITY that specifies better
- * where the media has been produced. (e.g. the neighborhood) (string).
- *
- * This tag has been added as this is how it is handled/named in XMP's
- * Iptc4xmpcore schema.
- */
-#define GST_TAG_GEO_LOCATION_SUBLOCATION             "geo-location-sublocation"
-/**
- * GST_TAG_GEO_LOCATION_HORIZONTAL_ERROR:
- *
- * Represents the expected error on the horizontal positioning in
- * meters (double).
- */
-#define GST_TAG_GEO_LOCATION_HORIZONTAL_ERROR   "geo-location-horizontal-error"
-/**
- * GST_TAG_GEO_LOCATION_MOVEMENT_SPEED:
- *
- * Speed of the capturing device when performing the capture.
- * Represented in m/s. (double)
- *
- * See also #GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION
- */
-#define GST_TAG_GEO_LOCATION_MOVEMENT_SPEED       "geo-location-movement-speed"
-/**
- * GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION:
- *
- * Indicates the movement direction of the device performing the capture
- * of a media. It is represented as degrees in floating point representation,
- * 0 means the geographic north, and increases clockwise (double from 0 to 360)
- *
- * See also #GST_TAG_GEO_LOCATION_CAPTURE_DIRECTION
- */
-#define GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION "geo-location-movement-direction"
-/**
- * GST_TAG_GEO_LOCATION_CAPTURE_DIRECTION:
- *
- * Indicates the direction the device is pointing to when capturing
- * a media. It is represented as degrees in floating point representation,
- * 0 means the geographic north, and increases clockwise (double from 0 to 360)
- *
- * See also #GST_TAG_GEO_LOCATION_MOVEMENT_DIRECTION
- */
-#define GST_TAG_GEO_LOCATION_CAPTURE_DIRECTION  "geo-location-capture-direction"
-/**
- * GST_TAG_SHOW_NAME:
- *
- * Name of the show, used for displaying (string)
- */
-#define GST_TAG_SHOW_NAME                         "show-name"
-/**
- * GST_TAG_SHOW_SORTNAME:
- *
- * Name of the show, used for sorting (string)
- */
-#define GST_TAG_SHOW_SORTNAME                     "show-sortname"
-/**
- * GST_TAG_SHOW_EPISODE_NUMBER:
- *
- * Number of the episode within a season/show (unsigned integer)
- */
-#define GST_TAG_SHOW_EPISODE_NUMBER               "show-episode-number"
-/**
- * GST_TAG_SHOW_SEASON_NUMBER:
- *
- * Number of the season of a show/series (unsigned integer)
- */
-#define GST_TAG_SHOW_SEASON_NUMBER                "show-season-number"
-/**
- * GST_TAG_LYRICS:
- *
- * The lyrics of the media (string)
- */
-#define GST_TAG_LYRICS                            "lyrics"
-/**
- * GST_TAG_COMPOSER_SORTNAME:
- *
- * The composer's name, used for sorting (string)
- */
-#define GST_TAG_COMPOSER_SORTNAME                 "composer-sortname"
-/**
- * GST_TAG_GROUPING:
- *
- * Groups together media that are related and spans multiple tracks. An
- * example are multiple pieces of a concerto. (string)
- */
-#define GST_TAG_GROUPING                          "grouping"
-/**
- * GST_TAG_USER_RATING:
- *
- * Rating attributed by a person (likely the application user).
- * The higher the value, the more the user likes this media
- * (unsigned int from 0 to 100)
- */
-#define GST_TAG_USER_RATING                       "user-rating"
-/**
- * GST_TAG_DEVICE_MANUFACTURER:
- *
- * Manufacturer of the device used to create the media (string)
- */
-#define GST_TAG_DEVICE_MANUFACTURER               "device-manufacturer"
-/**
- * GST_TAG_DEVICE_MODEL:
- *
- * Model of the device used to create the media (string)
- */
-#define GST_TAG_DEVICE_MODEL                      "device-model"
-/**
- * GST_TAG_APPLICATION_NAME:
- *
- * Name of the application used to create the media (string)
- */
-#define GST_TAG_APPLICATION_NAME                  "application-name"
-/**
- * GST_TAG_APPLICATION_DATA:
- *
- * Arbitrary application data (sample)
- *
- * Some formats allow applications to add their own arbitrary data
- * into files. This data is application dependent.
- */
-#define GST_TAG_APPLICATION_DATA          "application-data"
-/**
- * GST_TAG_IMAGE_ORIENTATION:
- *
- * Represents the 'Orientation' tag from EXIF. Defines how the image
- * should be rotated and mirrored for display. (string)
- *
- * This tag has a predefined set of allowed values:
- *   "rotate-0"
- *   "rotate-90"
- *   "rotate-180"
- *   "rotate-270"
- *   "flip-rotate-0"
- *   "flip-rotate-90"
- *   "flip-rotate-180"
- *   "flip-rotate-270"
- *
- * The naming is adopted according to a possible transformation to perform
- * on the image to fix its orientation, obviously equivalent operations will
- * yield the same result.
- *
- * Rotations indicated by the values are in clockwise direction and
- * 'flip' means an horizontal mirroring.
- */
-#define GST_TAG_IMAGE_ORIENTATION            "image-orientation"
-
-G_END_DECLS
-
-#endif /* __GST_TAGLIST_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttagsetter.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttagsetter.h
deleted file mode 100644
index 580053cc..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttagsetter.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttagsetter.h: Interfaces for tagging
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TAG_SETTER_H__
-#define __GST_TAG_SETTER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_SETTER             (gst_tag_setter_get_type ())
-#define GST_TAG_SETTER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TAG_SETTER, GstTagSetter))
-#define GST_IS_TAG_SETTER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TAG_SETTER))
-#define GST_TAG_SETTER_GET_INTERFACE(obj)       (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_TAG_SETTER, GstTagSetterInterface))
-
-/**
- * GstTagSetter:
- *
- * Opaque #GstTagSetter data structure.
- */
-typedef struct _GstTagSetter                    GstTagSetter; /* Dummy typedef */
-typedef struct _GstTagSetterInterface           GstTagSetterInterface;
-
-/**
- * GstTagSetterInterface:
- * @g_iface: parent interface type.
- *
- * #GstTagSetterInterface interface.
- */
-/* use an empty interface here to allow detection of elements using user-set
-   tags */
-struct _GstTagSetterInterface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  /* virtual table */
-};
-
-GType           gst_tag_setter_get_type             (void);
-
-void            gst_tag_setter_reset_tags             (GstTagSetter * setter);
-
-void            gst_tag_setter_merge_tags           (GstTagSetter *     setter,
-                                                     const GstTagList * list,
-                                                     GstTagMergeMode    mode);
-void            gst_tag_setter_add_tags             (GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     ...) G_GNUC_NULL_TERMINATED;
-
-void            gst_tag_setter_add_tag_values       (GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     ...) G_GNUC_NULL_TERMINATED;
-
-void            gst_tag_setter_add_tag_valist       (GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     va_list            var_args);
-
-void            gst_tag_setter_add_tag_valist_values(GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     va_list            var_args);
-
-void            gst_tag_setter_add_tag_value        (GstTagSetter *     setter,
-                                                     GstTagMergeMode    mode,
-                                                     const gchar *      tag,
-                                                     const GValue *     value);
-
-const GstTagList *
-                gst_tag_setter_get_tag_list          (GstTagSetter *    setter);
-
-void            gst_tag_setter_set_tag_merge_mode    (GstTagSetter *    setter,
-                                                      GstTagMergeMode   mode);
-GstTagMergeMode gst_tag_setter_get_tag_merge_mode    (GstTagSetter *    setter);
-
-G_END_DECLS
-
-#endif /* __GST_TAG_SETTER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttask.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttask.h
deleted file mode 100644
index 6464d865..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttask.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *               <2005> Wim Taymans <wim@fluendo.com>
- *
- * gsttask.h: Streaming tasks
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TASK_H__
-#define __GST_TASK_H__
-
-#include <gst/gstobject.h>
-#include <gst/gsttaskpool.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstTaskFunction:
- * @user_data: user data passed to the function
- *
- * A function that will repeatedly be called in the thread created by
- * a #GstTask.
- */
-typedef void         (*GstTaskFunction)          (gpointer user_data);
-
-/* --- standard type macros --- */
-#define GST_TYPE_TASK                   (gst_task_get_type ())
-#define GST_TASK(task)                  (G_TYPE_CHECK_INSTANCE_CAST ((task), GST_TYPE_TASK, GstTask))
-#define GST_IS_TASK(task)               (G_TYPE_CHECK_INSTANCE_TYPE ((task), GST_TYPE_TASK))
-#define GST_TASK_CLASS(tclass)          (G_TYPE_CHECK_CLASS_CAST ((tclass), GST_TYPE_TASK, GstTaskClass))
-#define GST_IS_TASK_CLASS(tclass)       (G_TYPE_CHECK_CLASS_TYPE ((tclass), GST_TYPE_TASK))
-#define GST_TASK_GET_CLASS(task)        (G_TYPE_INSTANCE_GET_CLASS ((task), GST_TYPE_TASK, GstTaskClass))
-#define GST_TASK_CAST(task)             ((GstTask*)(task))
-
-typedef struct _GstTask GstTask;
-typedef struct _GstTaskClass GstTaskClass;
-typedef struct _GstTaskPrivate GstTaskPrivate;
-
-/**
- * GstTaskState:
- * @GST_TASK_STARTED: the task is started and running
- * @GST_TASK_STOPPED: the task is stopped
- * @GST_TASK_PAUSED: the task is paused
- *
- * The different states a task can be in
- */
-typedef enum {
-  GST_TASK_STARTED,
-  GST_TASK_STOPPED,
-  GST_TASK_PAUSED
-} GstTaskState;
-
-/**
- * GST_TASK_STATE:
- * @task: Task to get the state of
- *
- * Get access to the state of the task.
- */
-#define GST_TASK_STATE(task)            (GST_TASK_CAST(task)->state)
-
-/**
- * GST_TASK_GET_COND:
- * @task: Task to get the cond of
- *
- * Get access to the cond of the task.
- */
-#define GST_TASK_GET_COND(task)         (&GST_TASK_CAST(task)->cond)
-/**
- * GST_TASK_WAIT:
- * @task: Task to wait for
- *
- * Wait for the task cond to be signalled
- */
-#define GST_TASK_WAIT(task)             g_cond_wait(GST_TASK_GET_COND (task), GST_OBJECT_GET_LOCK (task))
-/**
- * GST_TASK_SIGNAL:
- * @task: Task to signal
- *
- * Signal the task cond
- */
-#define GST_TASK_SIGNAL(task)           g_cond_signal(GST_TASK_GET_COND (task))
-/**
- * GST_TASK_BROADCAST:
- * @task: Task to broadcast
- *
- * Send a broadcast signal to all waiting task conds
- */
-#define GST_TASK_BROADCAST(task)        g_cond_broadcast(GST_TASK_GET_COND (task))
-
-/**
- * GST_TASK_GET_LOCK:
- * @task: Task to get the lock of
- *
- * Get access to the task lock.
- */
-#define GST_TASK_GET_LOCK(task)         (GST_TASK_CAST(task)->lock)
-
-/**
- * GstTaskThreadFunc:
- * @task: The #GstTask
- * @thread: The #GThread
- * @user_data: user data
- *
- * Custom GstTask thread callback functions that can be installed.
- */
-typedef void (*GstTaskThreadFunc) (GstTask *task, GThread *thread, gpointer user_data);
-
-/**
- * GstTask:
- * @state: the state of the task
- * @cond: used to pause/resume the task
- * @lock: The lock taken when iterating the task function
- * @func: the function executed by this task
- * @user_data: user_data passed to the task function
- * @notify: GDestroyNotify for @user_data
- * @running: a flag indicating that the task is running
- *
- * The #GstTask object.
- */
-struct _GstTask {
-  GstObject      object;
-
-  /*< public >*/ /* with LOCK */
-  GstTaskState     state;
-  GCond            cond;
-
-  GRecMutex       *lock;
-
-  GstTaskFunction  func;
-  gpointer         user_data;
-  GDestroyNotify   notify;
-
-  gboolean         running;
-
-  /*< private >*/
-  GThread         *thread;
-
-  GstTaskPrivate  *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstTaskClass {
-  GstObjectClass parent_class;
-
-  /*< private >*/
-  GstTaskPool *pool;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-void            gst_task_cleanup_all    (void);
-
-GType           gst_task_get_type       (void);
-
-GstTask*        gst_task_new            (GstTaskFunction func,
-                                         gpointer user_data, GDestroyNotify notify);
-
-void            gst_task_set_lock       (GstTask *task, GRecMutex *mutex);
-
-GstTaskPool *   gst_task_get_pool       (GstTask *task);
-void            gst_task_set_pool       (GstTask *task, GstTaskPool *pool);
-
-void            gst_task_set_enter_callback  (GstTask *task,
-                                              GstTaskThreadFunc enter_func,
-                                              gpointer user_data,
-                                              GDestroyNotify notify);
-void            gst_task_set_leave_callback  (GstTask *task,
-                                              GstTaskThreadFunc leave_func,
-                                              gpointer user_data,
-                                              GDestroyNotify notify);
-
-GstTaskState    gst_task_get_state      (GstTask *task);
-gboolean        gst_task_set_state      (GstTask *task, GstTaskState state);
-
-gboolean        gst_task_start          (GstTask *task);
-gboolean        gst_task_stop           (GstTask *task);
-gboolean        gst_task_pause          (GstTask *task);
-
-gboolean        gst_task_join           (GstTask *task);
-
-G_END_DECLS
-
-#endif /* __GST_TASK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttaskpool.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttaskpool.h
deleted file mode 100644
index 4eccbfb9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttaskpool.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* GStreamer
- * Copyright (C) <2009> Wim Taymans <wim.taymans@gmail.com>
- *
- * gsttaskpool.h: Pool for creating streaming threads
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TASK_POOL_H__
-#define __GST_TASK_POOL_H__
-
-#include <gst/gstobject.h>
-
-G_BEGIN_DECLS
-
-/* --- standard type macros --- */
-#define GST_TYPE_TASK_POOL             (gst_task_pool_get_type ())
-#define GST_TASK_POOL(pool)            (G_TYPE_CHECK_INSTANCE_CAST ((pool), GST_TYPE_TASK_POOL, GstTaskPool))
-#define GST_IS_TASK_POOL(pool)         (G_TYPE_CHECK_INSTANCE_TYPE ((pool), GST_TYPE_TASK_POOL))
-#define GST_TASK_POOL_CLASS(pclass)    (G_TYPE_CHECK_CLASS_CAST ((pclass), GST_TYPE_TASK_POOL, GstTaskPoolClass))
-#define GST_IS_TASK_POOL_CLASS(pclass) (G_TYPE_CHECK_CLASS_TYPE ((pclass), GST_TYPE_TASK_POOL))
-#define GST_TASK_POOL_GET_CLASS(pool)  (G_TYPE_INSTANCE_GET_CLASS ((pool), GST_TYPE_TASK_POOL, GstTaskPoolClass))
-#define GST_TASK_POOL_CAST(pool)       ((GstTaskPool*)(pool))
-
-typedef struct _GstTaskPool GstTaskPool;
-typedef struct _GstTaskPoolClass GstTaskPoolClass;
-
-/**
- * GstTaskPoolFunction:
- * @user_data: user data for the task function
- *
- * Task function, see gst_task_pool_push().
- */
-typedef void   (*GstTaskPoolFunction)          (void *user_data);
-
-/**
- * GstTaskPool:
- *
- * The #GstTaskPool object.
- */
-struct _GstTaskPool {
-  GstObject      object;
-
-  /*< private >*/
-  GThreadPool   *pool;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstTaskPoolClass:
- * @parent_class: the parent class structure
- * @prepare: prepare the threadpool
- * @cleanup: make sure all threads are stopped
- * @push: start a new thread
- * @join: join a thread
- *
- * The #GstTaskPoolClass object.
- */
-struct _GstTaskPoolClass {
-  GstObjectClass parent_class;
-
-  /*< public >*/
-  void      (*prepare)  (GstTaskPool *pool, GError **error);
-  void      (*cleanup)  (GstTaskPool *pool);
-
-  gpointer  (*push)     (GstTaskPool *pool, GstTaskPoolFunction func,
-                         gpointer user_data, GError **error);
-  void      (*join)     (GstTaskPool *pool, gpointer id);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_task_pool_get_type    (void);
-
-GstTaskPool *   gst_task_pool_new         (void);
-void            gst_task_pool_prepare     (GstTaskPool *pool, GError **error);
-
-gpointer        gst_task_pool_push        (GstTaskPool *pool, GstTaskPoolFunction func,
-                                           gpointer user_data, GError **error);
-void            gst_task_pool_join        (GstTaskPool *pool, gpointer id);
-
-void		gst_task_pool_cleanup     (GstTaskPool *pool);
-
-G_END_DECLS
-
-#endif /* __GST_TASK_POOL_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttoc.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttoc.h
deleted file mode 100644
index 9439cca2..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttoc.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* GStreamer
- * (c) 2010, 2012 Alexander Saprykin <xelfium@gmail.com>
- *
- * gsttoc.h: generic TOC API declaration
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TOC_H__
-#define __GST_TOC_H__
-
-#include <gst/gstconfig.h>
-#include <gst/gstminiobject.h>
-#include <gst/gststructure.h>
-#include <gst/gsttaglist.h>
-#include <gst/gstformat.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TOC (gst_toc_get_type ())
-#define GST_TYPE_TOC_ENTRY (gst_toc_entry_get_type ())
-
-typedef struct _GstTocEntry GstTocEntry;
-typedef struct _GstToc GstToc;
-
-/**
- * GstTocScope:
- * @GST_TOC_SCOPE_GLOBAL: global TOC representing all selectable options
- *     (this is what applications are usually interested in)
- * @GST_TOC_SCOPE_CURRENT: TOC for the currently active/selected stream
- *     (this is a TOC representing the current stream from start to EOS,
- *     and is what a TOC writer / muxer is usually interested in; it will
- *     usually be a subset of the global TOC, e.g. just the chapters of
- *     the current title, or the chapters selected for playback from the
- *     current title)
- *
- * The scope of a TOC.
- */
-typedef enum {
-  GST_TOC_SCOPE_GLOBAL = 1,
-  GST_TOC_SCOPE_CURRENT = 2
-} GstTocScope;
-
-/**
- * GstTocEntryType:
- * @GST_TOC_ENTRY_TYPE_ANGLE: entry is an angle (i.e. an alternative)
- * @GST_TOC_ENTRY_TYPE_VERSION: entry is a version (i.e. alternative)
- * @GST_TOC_ENTRY_TYPE_EDITION: entry is an edition (i.e. alternative)
- * @GST_TOC_ENTRY_TYPE_INVALID: invalid entry type value
- * @GST_TOC_ENTRY_TYPE_TITLE: entry is a title (i.e. a part of a sequence)
- * @GST_TOC_ENTRY_TYPE_TRACK: entry is a track (i.e. a part of a sequence)
- * @GST_TOC_ENTRY_TYPE_CHAPTER: entry is a chapter (i.e. a part of a sequence)
- *
- * The different types of TOC entries (see #GstTocEntry).
- *
- * There are two types of TOC entries: alternatives or parts in a sequence.
- */
-typedef enum {
-  GST_TOC_ENTRY_TYPE_ANGLE       = -3,
-  GST_TOC_ENTRY_TYPE_VERSION     = -2,
-  GST_TOC_ENTRY_TYPE_EDITION     = -1,
-  GST_TOC_ENTRY_TYPE_INVALID     = 0,
-  GST_TOC_ENTRY_TYPE_TITLE       = 1,
-  GST_TOC_ENTRY_TYPE_TRACK       = 2,
-  GST_TOC_ENTRY_TYPE_CHAPTER     = 3,
-} GstTocEntryType;
-
-#define GST_TOC_ENTRY_TYPE_IS_ALTERNATIVE(entry_type)  (entry_type < 0)
-#define GST_TOC_ENTRY_TYPE_IS_SEQUENCE(entry_type)     (entry_type > 0)
-
-/* functions to return type structures */
-GType           gst_toc_get_type                (void);
-GType           gst_toc_entry_get_type          (void);
-
-/* functions to create, ref and unref/free TOCs */
-GstToc *           gst_toc_new                     (GstTocScope scope);
-
-GstTocScope        gst_toc_get_scope               (const GstToc *toc);
-
-void               gst_toc_set_tags                (GstToc *toc, GstTagList * tags);
-void               gst_toc_merge_tags              (GstToc *toc, GstTagList *tags, GstTagMergeMode mode);
-GstTagList *       gst_toc_get_tags                (const GstToc *toc);
-
-void               gst_toc_append_entry               (GstToc *toc, GstTocEntry *entry);
-GList *            gst_toc_get_entries             (const GstToc *toc);
-
-void               gst_toc_dump                    (GstToc *toc);
-
-#define gst_toc_ref(toc)            (GstToc*)gst_mini_object_ref(GST_MINI_OBJECT_CAST(toc))
-#define gst_toc_unref(toc)          gst_mini_object_unref(GST_MINI_OBJECT_CAST(toc))
-#define gst_toc_copy(toc)           (GstToc*)gst_mini_object_copy(GST_MINI_OBJECT_CAST(toc))
-#define gst_toc_make_writable(toc)  (GstToc*)gst_mini_object_make_writable(GST_MINI_OBJECT_CAST(toc))
-
-/* functions to create, ref and unref/free TOC entries */
-GstTocEntry *   gst_toc_entry_new               (GstTocEntryType type, const gchar *uid);
-
-#define gst_toc_entry_ref(entry)            (GstTocEntry*)gst_mini_object_ref(GST_MINI_OBJECT_CAST(entry))
-#define gst_toc_entry_unref(entry)          gst_mini_object_unref(GST_MINI_OBJECT_CAST(entry))
-#define gst_toc_entry_copy(entry)           (GstTocEntry*)gst_mini_object_copy(GST_MINI_OBJECT_CAST(entry))
-#define gst_toc_entry_make_writable(entry)  (GstTocEntry*)gst_mini_object_make_writable(GST_MINI_OBJECT_CAST(entry))
-
-GstTocEntry *      gst_toc_find_entry                    (const GstToc *toc, const gchar *uid);
-
-GstTocEntryType    gst_toc_entry_get_entry_type          (const GstTocEntry *entry);
-const gchar *      gst_toc_entry_get_uid                 (const GstTocEntry *entry);
-
-void               gst_toc_entry_append_sub_entry           (GstTocEntry *entry, GstTocEntry *subentry);
-GList *            gst_toc_entry_get_sub_entries         (const GstTocEntry *entry);
-
-void               gst_toc_entry_set_tags                (GstTocEntry *entry, GstTagList *tags);
-void               gst_toc_entry_merge_tags              (GstTocEntry *entry, GstTagList *tags, GstTagMergeMode mode);
-GstTagList *       gst_toc_entry_get_tags                (const GstTocEntry *entry);
-
-gboolean           gst_toc_entry_is_alternative          (const GstTocEntry *entry);
-gboolean           gst_toc_entry_is_sequence             (const GstTocEntry *entry);
-
-void               gst_toc_entry_set_start_stop_times    (GstTocEntry *entry, gint64 start, gint64 stop);
-gboolean           gst_toc_entry_get_start_stop_times    (const GstTocEntry *entry, gint64 *start, gint64 *stop);
-
-GstToc *           gst_toc_entry_get_toc                 (GstTocEntry *entry);
-GstTocEntry *      gst_toc_entry_get_parent              (GstTocEntry *entry);
-
-
-const gchar *      gst_toc_entry_type_get_nick     (GstTocEntryType type);
-
-G_END_DECLS
-
-#endif /* __GST_TOC_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttocsetter.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttocsetter.h
deleted file mode 100644
index 9c59fa56..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttocsetter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GStreamer
- * Copyright (C) 2010, 2012 Alexander Saprykin <xelfium@gmail.com>
- *
- * gsttocsetter.h: Interfaces for TOC
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TOC_SETTER_H__
-#define __GST_TOC_SETTER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TOC_SETTER              (gst_toc_setter_get_type ())
-#define GST_TOC_SETTER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TOC_SETTER, GstTocSetter))
-#define GST_IS_TOC_SETTER(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TOC_SETTER))
-#define GST_TOC_SETTER_GET_IFACE(obj)    (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_TOC_SETTER, GstTocSetterInterface))
-/**
- * GstTocSetter:
- *
- * Opaque #GstTocSetter data structure.
- */
-typedef struct _GstTocSetter GstTocSetter;
-typedef struct _GstTocSetterInterface GstTocSetterInterface;
-
-/**
- * GstTocSetterInterface:
- * @g_iface: parent interface type.
- *
- * #GstTocSetterInterface interface.
- */
-
-struct _GstTocSetterInterface
-{
-  GTypeInterface g_iface;
-
-  /* signals */
-
-  /* virtual table */
-};
-
-GType         gst_toc_setter_get_type (void);
-
-void          gst_toc_setter_reset   (GstTocSetter *setter);
-
-GstToc *      gst_toc_setter_get_toc (GstTocSetter *setter);
-
-void          gst_toc_setter_set_toc (GstTocSetter *setter, GstToc *toc);
-
-G_END_DECLS
-
-#endif /* __GST_TOC_SETTER_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttypefind.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttypefind.h
deleted file mode 100644
index 0a987e4a..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttypefind.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttypefind.h: typefinding subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TYPE_FIND_H__
-#define __GST_TYPE_FIND_H__
-
-#include <gst/gstcaps.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TYPE_FIND  (gst_type_find_get_type())
-
-typedef struct _GstTypeFind GstTypeFind;
-
-/**
- * GstTypeFindFunction:
- * @find: A #GstTypeFind structure
- * @user_data: optionnal data to pass to the function
- *
- * A function that will be called by typefinding.
- */
-typedef void (* GstTypeFindFunction) (GstTypeFind *find, gpointer user_data);
-
-/**
- * GstTypeFindProbability:
- * @GST_TYPE_FIND_NONE: type undetected.
- * @GST_TYPE_FIND_MINIMUM: unlikely typefind.
- * @GST_TYPE_FIND_POSSIBLE: possible type detected.
- * @GST_TYPE_FIND_LIKELY: likely a type was detected.
- * @GST_TYPE_FIND_NEARLY_CERTAIN: nearly certain that a type was detected.
- * @GST_TYPE_FIND_MAXIMUM: very certain a type was detected.
- *
- * The probability of the typefind function. Higher values have more certainty
- * in doing a reliable typefind.
- */
-typedef enum {
-  GST_TYPE_FIND_NONE = 0,
-  GST_TYPE_FIND_MINIMUM = 1,
-  GST_TYPE_FIND_POSSIBLE = 50,
-  GST_TYPE_FIND_LIKELY = 80,
-  GST_TYPE_FIND_NEARLY_CERTAIN = 99,
-  GST_TYPE_FIND_MAXIMUM = 100
-} GstTypeFindProbability;
-
-/**
- * GstTypeFind:
- * @peek: Method to peek data.
- * @suggest: Method to suggest #GstCaps with a given probability.
- * @data: The data used by the caller of the typefinding function.
- * @get_length: Returns the length of current data.
- *
- * Object that stores typefind callbacks. To use with #GstTypeFindFactory.
- */
-struct _GstTypeFind {
-  /* private to the caller of the typefind function */
-  const guint8 *  (* peek)       (gpointer         data,
-                                  gint64           offset,
-                                  guint            size);
-
-  void            (* suggest)    (gpointer         data,
-                                  guint            probability,
-                                  GstCaps         *caps);
-
-  gpointer         data;
-
-  /* optional */
-  guint64         (* get_length) (gpointer data);
-
-  /* <private> */
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType     gst_type_find_get_type   (void);
-
-/* typefind function interface */
-const guint8 *  gst_type_find_peek       (GstTypeFind   * find,
-                                          gint64          offset,
-                                          guint           size);
-
-void            gst_type_find_suggest    (GstTypeFind   * find,
-                                          guint           probability,
-                                          GstCaps       * caps);
-
-void            gst_type_find_suggest_simple (GstTypeFind * find,
-                                              guint         probability,
-                                              const char  * media_type,
-                                              const char  * fieldname, ...);
-
-guint64   gst_type_find_get_length (GstTypeFind   * find);
-
-/* registration interface */
-gboolean  gst_type_find_register   (GstPlugin            * plugin,
-                                    const gchar          * name,
-                                    guint                  rank,
-                                    GstTypeFindFunction    func,
-                                    const gchar          * extensions,
-                                    GstCaps              * possible_caps,
-                                    gpointer               data,
-                                    GDestroyNotify         data_notify);
-
-G_END_DECLS
-
-#endif /* __GST_TYPE_FIND_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttypefindfactory.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttypefindfactory.h
deleted file mode 100644
index 332134bf..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsttypefindfactory.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- *
- * gsttypefindfactory.h: typefinding subsystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TYPE_FIND_FACTORY_H__
-#define __GST_TYPE_FIND_FACTORY_H__
-
-#include <gst/gstcaps.h>
-#include <gst/gstplugin.h>
-#include <gst/gstpluginfeature.h>
-#include <gst/gsttypefind.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TYPE_FIND_FACTORY                 (gst_type_find_factory_get_type())
-#define GST_TYPE_FIND_FACTORY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TYPE_FIND_FACTORY, GstTypeFindFactory))
-#define GST_IS_TYPE_FIND_FACTORY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TYPE_FIND_FACTORY))
-#define GST_TYPE_FIND_FACTORY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TYPE_FIND_FACTORY, GstTypeFindFactoryClass))
-#define GST_IS_TYPE_FIND_FACTORY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TYPE_FIND_FACTORY))
-#define GST_TYPE_FIND_FACTORY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_TYPE_FIND_FACTORY, GstTypeFindFactoryClass))
-
-/**
- * GstTypeFindFactory:
- *
- * Opaque object that stores information about a typefind function.
- */
-typedef struct _GstTypeFindFactory GstTypeFindFactory;
-typedef struct _GstTypeFindFactoryClass GstTypeFindFactoryClass;
-
-/* typefinding interface */
-
-GType           gst_type_find_factory_get_type          (void);
-
-GList *         gst_type_find_factory_get_list          (void);
-
-const gchar * const * gst_type_find_factory_get_extensions (GstTypeFindFactory *factory);
-
-GstCaps *       gst_type_find_factory_get_caps          (GstTypeFindFactory *factory);
-gboolean        gst_type_find_factory_has_function      (GstTypeFindFactory *factory);
-void            gst_type_find_factory_call_function     (GstTypeFindFactory *factory,
-                                                         GstTypeFind *find);
-
-G_END_DECLS
-
-#endif /* __GST_TYPE_FIND_FACTORY_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsturi.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsturi.h
deleted file mode 100644
index d140c3d4..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gsturi.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gsturi.h: Header for uri to element mappings
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_URI_H__
-#define __GST_URI_H__
-
-#include <glib.h>
-#include <gst/gstelement.h>
-
-G_BEGIN_DECLS
-
-GQuark gst_uri_error_quark (void);
-
-/**
- * GST_URI_ERROR:
- *
- * Get access to the error quark of the uri subsystem.
- */
-#define GST_URI_ERROR gst_uri_error_quark ()
-
-/**
- * GstURIError:
- * @GST_URI_ERROR_UNSUPPORTED_PROTOCOL: The protocol is not supported
- * @GST_URI_ERROR_BAD_URI: There was a problem with the URI
- * @GST_URI_ERROR_BAD_STATE: Could not set or change the URI because the
- *     URI handler was in a state where that is not possible or not permitted
- * @GST_URI_ERROR_BAD_REFERENCE: There was a problem with the entity that
- *     the URI references
- *
- * Different URI-related errors that can occur.
- */
-typedef enum
-{
-  GST_URI_ERROR_UNSUPPORTED_PROTOCOL,
-  GST_URI_ERROR_BAD_URI,
-  GST_URI_ERROR_BAD_STATE,
-  GST_URI_ERROR_BAD_REFERENCE
-} GstURIError;
-
-/**
- * GstURIType:
- * @GST_URI_UNKNOWN: The URI direction is unknown
- * @GST_URI_SINK: The URI is a consumer.
- * @GST_URI_SRC: The URI is a producer.
- *
- * The different types of URI direction.
- */
-
-typedef enum {
-  GST_URI_UNKNOWN,
-  GST_URI_SINK,
-  GST_URI_SRC
-} GstURIType;
-
-/**
- * GST_URI_TYPE_IS_VALID:
- * @type: A #GstURIType
- *
- * Tests if the type direction is valid.
- */
-#define GST_URI_TYPE_IS_VALID(type) ((type) == GST_URI_SRC || (type) == GST_URI_SINK)
-
-/* uri handler functions */
-#define GST_TYPE_URI_HANDLER               (gst_uri_handler_get_type ())
-#define GST_URI_HANDLER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_URI_HANDLER, GstURIHandler))
-#define GST_IS_URI_HANDLER(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_URI_HANDLER))
-#define GST_URI_HANDLER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_URI_HANDLER, GstURIHandlerInterface))
-
-/**
- * GstURIHandler:
- *
- * Opaque #GstURIHandler structure.
- */
-typedef struct _GstURIHandler GstURIHandler;
-typedef struct _GstURIHandlerInterface GstURIHandlerInterface;
-
-/**
- * GstURIHandlerInterface:
- * @parent: The parent interface type
- * @get_type: Method to tell whether the element handles source or sink URI.
- * @get_protocols: Method to return the list of protocols handled by the element.
- * @get_uri: Method to return the URI currently handled by the element.
- * @set_uri: Method to set a new URI.
- *
- * Any #GstElement using this interface should implement these methods.
- */
-struct _GstURIHandlerInterface {
-  GTypeInterface parent;
-
-  /* vtable */
-  /*< public >*/
-  /* querying capabilities */
-  GstURIType             (* get_type)           (GType type);
-  const gchar * const *  (* get_protocols)      (GType type);
-
-  /* using the interface */
-  gchar *                (* get_uri)            (GstURIHandler * handler);
-  gboolean               (* set_uri)            (GstURIHandler * handler,
-                                                 const gchar   * uri,
-                                                 GError       ** error);
-};
-
-/* general URI functions */
-
-gboolean        gst_uri_protocol_is_valid       (const gchar * protocol);
-gboolean        gst_uri_protocol_is_supported   (const GstURIType type,
-                                                 const gchar *protocol);
-gboolean        gst_uri_is_valid                (const gchar * uri);
-gchar *         gst_uri_get_protocol            (const gchar * uri) G_GNUC_MALLOC;
-gboolean        gst_uri_has_protocol            (const gchar * uri,
-                                                 const gchar * protocol);
-gchar *         gst_uri_get_location            (const gchar * uri) G_GNUC_MALLOC;
-gchar *         gst_uri_construct               (const gchar * protocol,
-                                                 const gchar * location) G_GNUC_MALLOC;
-
-gchar *         gst_filename_to_uri             (const gchar * filename,
-                                                 GError     ** error) G_GNUC_MALLOC;
-
-GstElement *    gst_element_make_from_uri       (const GstURIType type,
-                                                 const gchar *    uri,
-                                                 const gchar *    elementname,
-                                                 GError      **   error) G_GNUC_MALLOC;
-
-/* accessing the interface */
-GType                 gst_uri_handler_get_type (void);
-
-GstURIType            gst_uri_handler_get_uri_type  (GstURIHandler * handler);
-const gchar * const * gst_uri_handler_get_protocols (GstURIHandler * handler);
-gchar *               gst_uri_handler_get_uri       (GstURIHandler * handler) G_GNUC_MALLOC;
-gboolean              gst_uri_handler_set_uri       (GstURIHandler * handler,
-                                                     const gchar   * uri,
-                                                     GError       ** error);
-
-G_END_DECLS
-
-#endif /* __GST_URI_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstutils.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstutils.h
deleted file mode 100644
index 269b3752..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstutils.h
+++ /dev/null
@@ -1,948 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *                    2002 Thomas Vander Stichele <thomas@apestaart.org>
- *
- * gstutils.h: Header for various utility functions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_UTILS_H__
-#define __GST_UTILS_H__
-
-#include <glib.h>
-#include <gst/gstconfig.h>
-#include <gst/gstbin.h>
-#include <gst/gstparse.h>
-
-G_BEGIN_DECLS
-
-void            gst_util_set_value_from_string  (GValue *value, const gchar *value_str);
-void            gst_util_set_object_arg         (GObject *object, const gchar *name, const gchar *value);
-void            gst_util_dump_mem               (const guchar *mem, guint size);
-
-guint64         gst_util_gdouble_to_guint64     (gdouble value)  G_GNUC_CONST;
-gdouble         gst_util_guint64_to_gdouble     (guint64 value)  G_GNUC_CONST;
-
-/**
- * gst_guint64_to_gdouble:
- * @value: the #guint64 value to convert
- *
- * Convert @value to a gdouble.
- *
- * Returns: @value converted to a #gdouble.
- */
-
-/**
- * gst_gdouble_to_guint64:
- * @value: the #gdouble value to convert
- *
- * Convert @value to a guint64.
- *
- * Returns: @value converted to a #guint64.
- */
-#ifdef WIN32
-#define         gst_gdouble_to_guint64(value)   gst_util_gdouble_to_guint64(value)
-#define         gst_guint64_to_gdouble(value)   gst_util_guint64_to_gdouble(value)
-#else
-#define         gst_gdouble_to_guint64(value)   ((guint64) (value))
-#define         gst_guint64_to_gdouble(value)   ((gdouble) (value))
-#endif
-
-guint64         gst_util_uint64_scale           (guint64 val, guint64 num, guint64 denom);
-guint64         gst_util_uint64_scale_round     (guint64 val, guint64 num, guint64 denom);
-guint64         gst_util_uint64_scale_ceil      (guint64 val, guint64 num, guint64 denom);
-
-guint64         gst_util_uint64_scale_int       (guint64 val, gint num, gint denom);
-guint64         gst_util_uint64_scale_int_round (guint64 val, gint num, gint denom);
-guint64         gst_util_uint64_scale_int_ceil  (guint64 val, gint num, gint denom);
-
-guint32         gst_util_seqnum_next            (void);
-gint32          gst_util_seqnum_compare         (guint32 s1, guint32 s2);
-
-
-/**
- * GST_CALL_PARENT:
- * @parent_class_cast: the name of the class cast macro for the parent type
- * @name: name of the function to call
- * @args: arguments enclosed in '( )'
- *
- * Just call the parent handler.  This assumes that there is a variable
- * named parent_class that points to the (duh!) parent class.  Note that
- * this macro is not to be used with things that return something, use
- * the _WITH_DEFAULT version for that
- */
-#define GST_CALL_PARENT(parent_class_cast, name, args)                  \
-        ((parent_class_cast(parent_class)->name != NULL) ?              \
-         parent_class_cast(parent_class)->name args : (void) 0)
-
-/**
- * GST_CALL_PARENT_WITH_DEFAULT:
- * @parent_class_cast: the name of the class cast macro for the parent type
- * @name: name of the function to call
- * @args: arguments enclosed in '( )'
- * @def_return: default result
- *
- * Same as GST_CALL_PARENT(), but in case there is no implementation, it
- * evaluates to @def_return.
- */
-#define GST_CALL_PARENT_WITH_DEFAULT(parent_class_cast, name, args, def_return)\
-        ((parent_class_cast(parent_class)->name != NULL) ?              \
-         parent_class_cast(parent_class)->name args : def_return)
-
-/* Define PUT and GET functions for unaligned memory */
-#define _GST_GET(__data, __idx, __size, __shift) \
-    (((guint##__size) (((const guint8 *) (__data))[__idx])) << (__shift))
-
-#define _GST_PUT(__data, __idx, __size, __shift, __num) \
-    (((guint8 *) (__data))[__idx] = (((guint##__size) (__num)) >> (__shift)) & 0xff)
-
-#if GST_HAVE_UNALIGNED_ACCESS
-static inline guint16 __gst_fast_read16(const guint8 *v) {
-  return *(const guint16*)(v);
-}
-static inline guint32 __gst_fast_read32(const guint8 *v) {
-  return *(const guint32*)(v);
-}
-static inline guint64 __gst_fast_read64(const guint8 *v) {
-  return *(const guint64*)(v);
-}
-static inline guint16 __gst_fast_read_swap16(const guint8 *v) {
-  return GUINT16_SWAP_LE_BE(*(const guint16*)(v));
-}
-static inline guint32 __gst_fast_read_swap32(const guint8 *v) {
-  return GUINT32_SWAP_LE_BE(*(const guint32*)(v));
-}
-static inline guint64 __gst_fast_read_swap64(const guint8 *v) {
-  return GUINT64_SWAP_LE_BE(*(const guint64*)(v));
-}
-# define _GST_FAST_READ(s, d) __gst_fast_read##s((const guint8 *)(d))
-# define _GST_FAST_READ_SWAP(s, d) __gst_fast_read_swap##s((const guint8 *)(d))
-#endif
-
-
-/**
- * GST_READ_UINT64_BE:
- * @data: memory location
- *
- * Read a 64 bit unsigned integer value in big endian format from the memory buffer.
- */
-
-/**
- * GST_READ_UINT64_LE:
- * @data: memory location
- *
- * Read a 64 bit unsigned integer value in little endian format from the memory buffer.
- */
-#if GST_HAVE_UNALIGNED_ACCESS
-# if (G_BYTE_ORDER == G_BIG_ENDIAN)
-#  define GST_READ_UINT64_BE(data)      _GST_FAST_READ (64, data)
-#  define GST_READ_UINT64_LE(data)      _GST_FAST_READ_SWAP (64, data)
-# else
-#  define GST_READ_UINT64_BE(data)      _GST_FAST_READ_SWAP (64, data)
-#  define GST_READ_UINT64_LE(data)      _GST_FAST_READ (64, data)
-# endif
-#else
-# define GST_READ_UINT64_BE(data)	(_GST_GET (data, 0, 64, 56) | \
-					 _GST_GET (data, 1, 64, 48) | \
-					 _GST_GET (data, 2, 64, 40) | \
-					 _GST_GET (data, 3, 64, 32) | \
-					 _GST_GET (data, 4, 64, 24) | \
-					 _GST_GET (data, 5, 64, 16) | \
-					 _GST_GET (data, 6, 64,  8) | \
-					 _GST_GET (data, 7, 64,  0))
-
-# define GST_READ_UINT64_LE(data)	(_GST_GET (data, 7, 64, 56) | \
-					 _GST_GET (data, 6, 64, 48) | \
-					 _GST_GET (data, 5, 64, 40) | \
-					 _GST_GET (data, 4, 64, 32) | \
-					 _GST_GET (data, 3, 64, 24) | \
-					 _GST_GET (data, 2, 64, 16) | \
-					 _GST_GET (data, 1, 64,  8) | \
-					 _GST_GET (data, 0, 64,  0))
-#endif
-
-/**
- * GST_READ_UINT32_BE:
- * @data: memory location
- *
- * Read a 32 bit unsigned integer value in big endian format from the memory buffer.
- */
-
-/**
- * GST_READ_UINT32_LE:
- * @data: memory location
- *
- * Read a 32 bit unsigned integer value in little endian format from the memory buffer.
- */
-#if GST_HAVE_UNALIGNED_ACCESS
-# if (G_BYTE_ORDER == G_BIG_ENDIAN)
-#  define GST_READ_UINT32_BE(data)      _GST_FAST_READ (32, data)
-#  define GST_READ_UINT32_LE(data)      _GST_FAST_READ_SWAP (32, data)
-# else
-#  define GST_READ_UINT32_BE(data)      _GST_FAST_READ_SWAP (32, data)
-#  define GST_READ_UINT32_LE(data)      _GST_FAST_READ (32, data)
-# endif
-#else
-# define GST_READ_UINT32_BE(data)	(_GST_GET (data, 0, 32, 24) | \
-					 _GST_GET (data, 1, 32, 16) | \
-					 _GST_GET (data, 2, 32,  8) | \
-					 _GST_GET (data, 3, 32,  0))
-
-# define GST_READ_UINT32_LE(data)	(_GST_GET (data, 3, 32, 24) | \
-					 _GST_GET (data, 2, 32, 16) | \
-					 _GST_GET (data, 1, 32,  8) | \
-					 _GST_GET (data, 0, 32,  0))
-#endif
-
-/**
- * GST_READ_UINT24_BE:
- * @data: memory location
- *
- * Read a 24 bit unsigned integer value in big endian format from the memory buffer.
- */
-#define GST_READ_UINT24_BE(data)        (_GST_GET (data, 0, 32, 16) | \
-                                         _GST_GET (data, 1, 32,  8) | \
-                                         _GST_GET (data, 2, 32,  0))
-
-/**
- * GST_READ_UINT24_LE:
- * @data: memory location
- *
- * Read a 24 bit unsigned integer value in little endian format from the memory buffer.
- */
-#define GST_READ_UINT24_LE(data)        (_GST_GET (data, 2, 32, 16) | \
-                                         _GST_GET (data, 1, 32,  8) | \
-                                         _GST_GET (data, 0, 32,  0))
-
-/**
- * GST_READ_UINT16_BE:
- * @data: memory location
- *
- * Read a 16 bit unsigned integer value in big endian format from the memory buffer.
- */
-/**
- * GST_READ_UINT16_LE:
- * @data: memory location
- *
- * Read a 16 bit unsigned integer value in little endian format from the memory buffer.
- */
-#if GST_HAVE_UNALIGNED_ACCESS
-# if (G_BYTE_ORDER == G_BIG_ENDIAN)
-#  define GST_READ_UINT16_BE(data)      _GST_FAST_READ (16, data)
-#  define GST_READ_UINT16_LE(data)      _GST_FAST_READ_SWAP (16, data)
-# else
-#  define GST_READ_UINT16_BE(data)      _GST_FAST_READ_SWAP (16, data)
-#  define GST_READ_UINT16_LE(data)      _GST_FAST_READ (16, data)
-# endif
-#else
-# define GST_READ_UINT16_BE(data)	(_GST_GET (data, 0, 16,  8) | \
-					 _GST_GET (data, 1, 16,  0))
-
-# define GST_READ_UINT16_LE(data)	(_GST_GET (data, 1, 16,  8) | \
-					 _GST_GET (data, 0, 16,  0))
-#endif
-
-/**
- * GST_READ_UINT8:
- * @data: memory location
- *
- * Read an 8 bit unsigned integer value from the memory buffer.
- */
-#define GST_READ_UINT8(data)            (_GST_GET (data, 0,  8,  0))
-
-/**
- * GST_WRITE_UINT64_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 64 bit unsigned integer value in big endian format into the memory buffer.
- */
-#define GST_WRITE_UINT64_BE(data, num)  do { \
-                                          _GST_PUT (data, 0, 64, 56, num); \
-                                          _GST_PUT (data, 1, 64, 48, num); \
-                                          _GST_PUT (data, 2, 64, 40, num); \
-                                          _GST_PUT (data, 3, 64, 32, num); \
-                                          _GST_PUT (data, 4, 64, 24, num); \
-                                          _GST_PUT (data, 5, 64, 16, num); \
-                                          _GST_PUT (data, 6, 64,  8, num); \
-                                          _GST_PUT (data, 7, 64,  0, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT64_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 64 bit unsigned integer value in little endian format into the memory buffer.
- */
-#define GST_WRITE_UINT64_LE(data, num)  do { \
-                                          _GST_PUT (data, 0, 64,  0, num); \
-                                          _GST_PUT (data, 1, 64,  8, num); \
-                                          _GST_PUT (data, 2, 64, 16, num); \
-                                          _GST_PUT (data, 3, 64, 24, num); \
-                                          _GST_PUT (data, 4, 64, 32, num); \
-                                          _GST_PUT (data, 5, 64, 40, num); \
-                                          _GST_PUT (data, 6, 64, 48, num); \
-                                          _GST_PUT (data, 7, 64, 56, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT32_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 32 bit unsigned integer value in big endian format into the memory buffer.
- */
-#define GST_WRITE_UINT32_BE(data, num)  do { \
-                                          _GST_PUT (data, 0, 32, 24, num); \
-                                          _GST_PUT (data, 1, 32, 16, num); \
-                                          _GST_PUT (data, 2, 32,  8, num); \
-                                          _GST_PUT (data, 3, 32,  0, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT32_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 32 bit unsigned integer value in little endian format into the memory buffer.
- */
-#define GST_WRITE_UINT32_LE(data, num)  do { \
-                                          _GST_PUT (data, 0, 32,  0, num); \
-                                          _GST_PUT (data, 1, 32,  8, num); \
-                                          _GST_PUT (data, 2, 32, 16, num); \
-                                          _GST_PUT (data, 3, 32, 24, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT24_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 24 bit unsigned integer value in big endian format into the memory buffer.
- */
-#define GST_WRITE_UINT24_BE(data, num)  do { \
-                                          _GST_PUT (data, 0, 32,  16, num); \
-                                          _GST_PUT (data, 1, 32,  8, num); \
-                                          _GST_PUT (data, 2, 32,  0, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT24_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 24 bit unsigned integer value in little endian format into the memory buffer.
- */
-#define GST_WRITE_UINT24_LE(data, num)  do { \
-                                          _GST_PUT (data, 0, 32,  0, num); \
-                                          _GST_PUT (data, 1, 32,  8, num); \
-                                          _GST_PUT (data, 2, 32,  16, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT16_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 16 bit unsigned integer value in big endian format into the memory buffer.
- */
-#define GST_WRITE_UINT16_BE(data, num)  do { \
-                                          _GST_PUT (data, 0, 16,  8, num); \
-                                          _GST_PUT (data, 1, 16,  0, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT16_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 16 bit unsigned integer value in little endian format into the memory buffer.
- */
-#define GST_WRITE_UINT16_LE(data, num)  do { \
-                                          _GST_PUT (data, 0, 16,  0, num); \
-                                          _GST_PUT (data, 1, 16,  8, num); \
-                                        } while (0)
-
-/**
- * GST_WRITE_UINT8:
- * @data: memory location
- * @num: value to store
- *
- * Store an 8 bit unsigned integer value into the memory buffer.
- */
-#define GST_WRITE_UINT8(data, num)      do { \
-                                          _GST_PUT (data, 0,  8,  0, num); \
-                                        } while (0)
-
-/* Float endianness conversion macros */
-
-/* FIXME: Remove this once we depend on a GLib version with this */
-#ifndef GFLOAT_FROM_LE
-/**
- * GFLOAT_SWAP_LE_BE:
- * @in: input value
- *
- * Swap byte order of a 32-bit floating point value (float).
- *
- * Returns: @in byte-swapped.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gfloat GFLOAT_SWAP_LE_BE (gfloat in);
-#endif
-
-inline static gfloat
-GFLOAT_SWAP_LE_BE(gfloat in)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.f = in;
-  u.i = GUINT32_SWAP_LE_BE (u.i);
-  return u.f;
-}
-
-/**
- * GDOUBLE_SWAP_LE_BE:
- * @in: input value
- *
- * Swap byte order of a 64-bit floating point value (double).
- *
- * Returns: @in byte-swapped.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gdouble GDOUBLE_SWAP_LE_BE (gdouble in);
-#endif
-
-inline static gdouble
-GDOUBLE_SWAP_LE_BE(gdouble in)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.d = in;
-  u.i = GUINT64_SWAP_LE_BE (u.i);
-  return u.d;
-}
-
-/**
- * GDOUBLE_TO_LE:
- * @val: value
- *
- * Convert 64-bit floating point value (double) from native byte order into
- * little endian byte order.
- */
-/**
- * GDOUBLE_TO_BE:
- * @val: value
- *
- * Convert 64-bit floating point value (double) from native byte order into
- * big endian byte order.
- */
-/**
- * GDOUBLE_FROM_LE:
- * @val: value
- *
- * Convert 64-bit floating point value (double) from little endian byte order
- * into native byte order.
- */
-/**
- * GDOUBLE_FROM_BE:
- * @val: value
- *
- * Convert 64-bit floating point value (double) from big endian byte order
- * into native byte order.
- */
-
-/**
- * GFLOAT_TO_LE:
- * @val: value
- *
- * Convert 32-bit floating point value (float) from native byte order into
- * little endian byte order.
- */
-/**
- * GFLOAT_TO_BE:
- * @val: value
- *
- * Convert 32-bit floating point value (float) from native byte order into
- * big endian byte order.
- */
-/**
- * GFLOAT_FROM_LE:
- * @val: value
- *
- * Convert 32-bit floating point value (float) from little endian byte order
- * into native byte order.
- */
-/**
- * GFLOAT_FROM_BE:
- * @val: value
- *
- * Convert 32-bit floating point value (float) from big endian byte order
- * into native byte order.
- */
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define GFLOAT_TO_LE(val)    ((gfloat) (val))
-#define GFLOAT_TO_BE(val)    (GFLOAT_SWAP_LE_BE (val))
-#define GDOUBLE_TO_LE(val)   ((gdouble) (val))
-#define GDOUBLE_TO_BE(val)   (GDOUBLE_SWAP_LE_BE (val))
-
-#elif G_BYTE_ORDER == G_BIG_ENDIAN
-#define GFLOAT_TO_LE(val)    (GFLOAT_SWAP_LE_BE (val))
-#define GFLOAT_TO_BE(val)    ((gfloat) (val))
-#define GDOUBLE_TO_LE(val)   (GDOUBLE_SWAP_LE_BE (val))
-#define GDOUBLE_TO_BE(val)   ((gdouble) (val))
-
-#else /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-#error unknown ENDIAN type
-#endif /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-
-#define GFLOAT_FROM_LE(val)  (GFLOAT_TO_LE (val))
-#define GFLOAT_FROM_BE(val)  (GFLOAT_TO_BE (val))
-#define GDOUBLE_FROM_LE(val) (GDOUBLE_TO_LE (val))
-#define GDOUBLE_FROM_BE(val) (GDOUBLE_TO_BE (val))
-
-#endif /* !defined(GFLOAT_FROM_LE) */
-
-/**
- * GST_READ_FLOAT_LE:
- * @data: memory location
- *
- * Read a 32 bit float value in little endian format from the memory buffer.
- *
- * Returns: The floating point value read from @data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gfloat GST_READ_FLOAT_LE (const guint8 *data);
-#endif
-
-inline static gfloat
-GST_READ_FLOAT_LE(const guint8 *data)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.i = GST_READ_UINT32_LE (data);
-  return u.f;
-}
-
-/**
- * GST_READ_FLOAT_BE:
- * @data: memory location
- *
- * Read a 32 bit float value in big endian format from the memory buffer.
- *
- * Returns: The floating point value read from @data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gfloat GST_READ_FLOAT_BE (const guint8 *data);
-#endif
-
-inline static gfloat
-GST_READ_FLOAT_BE(const guint8 *data)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.i = GST_READ_UINT32_BE (data);
-  return u.f;
-}
-
-/**
- * GST_READ_DOUBLE_LE:
- * @data: memory location
- *
- * Read a 64 bit double value in little endian format from the memory buffer.
- *
- * Returns: The double-precision floating point value read from @data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gdouble GST_READ_DOUBLE_LE (const guint8 *data);
-#endif
-
-inline static gdouble
-GST_READ_DOUBLE_LE(const guint8 *data)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.i = GST_READ_UINT64_LE (data);
-  return u.d;
-}
-
-/**
- * GST_READ_DOUBLE_BE:
- * @data: memory location
- *
- * Read a 64 bit double value in big endian format from the memory buffer.
- *
- * Returns: The double-precision floating point value read from @data
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC gdouble GST_READ_DOUBLE_BE (const guint8 *data);
-#endif
-
-inline static gdouble
-GST_READ_DOUBLE_BE(const guint8 *data)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.i = GST_READ_UINT64_BE (data);
-  return u.d;
-}
-
-/**
- * GST_WRITE_FLOAT_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 32 bit float value in little endian format into the memory buffer.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void GST_WRITE_FLOAT_LE (guint8 *data, gfloat num);
-#endif
-
-inline static void
-GST_WRITE_FLOAT_LE(guint8 *data, gfloat num)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.f = num;
-  GST_WRITE_UINT32_LE (data, u.i);
-}
-
-/**
- * GST_WRITE_FLOAT_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 32 bit float value in big endian format into the memory buffer.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void GST_WRITE_FLOAT_BE (guint8 *data, gfloat num);
-#endif
-
-inline static void
-GST_WRITE_FLOAT_BE(guint8 *data, gfloat num)
-{
-  union
-  {
-    guint32 i;
-    gfloat f;
-  } u;
-
-  u.f = num;
-  GST_WRITE_UINT32_BE (data, u.i);
-}
-
-/**
- * GST_WRITE_DOUBLE_LE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 64 bit double value in little endian format into the memory buffer.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void GST_WRITE_DOUBLE_LE (guint8 *data, gdouble num);
-#endif
-
-inline static void
-GST_WRITE_DOUBLE_LE(guint8 *data, gdouble num)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.d = num;
-  GST_WRITE_UINT64_LE (data, u.i);
-}
-
-/**
- * GST_WRITE_DOUBLE_BE:
- * @data: memory location
- * @num: value to store
- *
- * Store a 64 bit double value in big endian format into the memory buffer.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void GST_WRITE_DOUBLE_BE (guint8 *data, gdouble num);
-#endif
-
-inline static void
-GST_WRITE_DOUBLE_BE(guint8 *data, gdouble num)
-{
-  union
-  {
-    guint64 i;
-    gdouble d;
-  } u;
-
-  u.d = num;
-  GST_WRITE_UINT64_BE (data, u.i);
-}
-
-/* Miscellaneous utility macros */
-
-/**
- * GST_ROUND_UP_2:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 2.
- */
-#define GST_ROUND_UP_2(num)  (((num)+1)&~1)
-/**
- * GST_ROUND_UP_4:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 4.
- */
-#define GST_ROUND_UP_4(num)  (((num)+3)&~3)
-/**
- * GST_ROUND_UP_8:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 8.
- */
-#define GST_ROUND_UP_8(num)  (((num)+7)&~7)
-/**
- * GST_ROUND_UP_16:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 16.
- */
-#define GST_ROUND_UP_16(num) (((num)+15)&~15)
-/**
- * GST_ROUND_UP_32:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 32.
- */
-#define GST_ROUND_UP_32(num) (((num)+31)&~31)
-/**
- * GST_ROUND_UP_64:
- * @num: integer value to round up
- *
- * Rounds an integer value up to the next multiple of 64.
- */
-#define GST_ROUND_UP_64(num) (((num)+63)&~63)
-
-/**
- * GST_ROUND_DOWN_2:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 2.
- */
-#define GST_ROUND_DOWN_2(num)  ((num)&(~1))
-/**
- * GST_ROUND_DOWN_4:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 4.
- */
-#define GST_ROUND_DOWN_4(num)  ((num)&(~3))
-/**
- * GST_ROUND_DOWN_8:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 8.
- */
-#define GST_ROUND_DOWN_8(num)  ((num)&(~7))
-/**
- * GST_ROUND_DOWN_16:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 16.
- */
-#define GST_ROUND_DOWN_16(num) ((num)&(~15))
-/**
- * GST_ROUND_DOWN_32:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 32.
- */
-#define GST_ROUND_DOWN_32(num) ((num)&(~31))
-/**
- * GST_ROUND_DOWN_64:
- * @num: integer value to round down
- *
- * Rounds an integer value down to the next multiple of 64.
- */
-#define GST_ROUND_DOWN_64(num) ((num)&(~63))
-
-void                    gst_object_default_error        (GstObject    * source,
-                                                         const GError * error,
-                                                         const gchar  * debug);
-
-/* element functions */
-void                    gst_element_create_all_pads     (GstElement *element);
-GstPad*                 gst_element_get_compatible_pad  (GstElement *element, GstPad *pad,
-                                                         GstCaps *caps);
-
-GstPadTemplate*         gst_element_get_compatible_pad_template (GstElement *element, GstPadTemplate *compattempl);
-
-const gchar*            gst_element_state_get_name      (GstState state);
-const gchar *           gst_element_state_change_return_get_name (GstStateChangeReturn state_ret);
-
-gboolean                gst_element_link                (GstElement *src, GstElement *dest);
-gboolean                gst_element_link_many           (GstElement *element_1,
-                                                         GstElement *element_2, ...) G_GNUC_NULL_TERMINATED;
-gboolean                gst_element_link_filtered       (GstElement * src,
-                                                         GstElement * dest,
-                                                         GstCaps *filter);
-void                    gst_element_unlink              (GstElement *src, GstElement *dest);
-void                    gst_element_unlink_many         (GstElement *element_1,
-                                                         GstElement *element_2, ...) G_GNUC_NULL_TERMINATED;
-
-gboolean                gst_element_link_pads           (GstElement *src, const gchar *srcpadname,
-                                                         GstElement *dest, const gchar *destpadname);
-gboolean                gst_element_link_pads_full      (GstElement *src, const gchar *srcpadname,
-                                                         GstElement *dest, const gchar *destpadname,
-                                                         GstPadLinkCheck flags);
-void                    gst_element_unlink_pads         (GstElement *src, const gchar *srcpadname,
-                                                         GstElement *dest, const gchar *destpadname);
-
-gboolean                gst_element_link_pads_filtered  (GstElement * src, const gchar * srcpadname,
-                                                         GstElement * dest, const gchar * destpadname,
-                                                         GstCaps *filter);
-
-gboolean                gst_element_seek_simple         (GstElement   *element,
-                                                         GstFormat     format,
-                                                         GstSeekFlags  seek_flags,
-                                                         gint64        seek_pos);
-
-/* util elementfactory functions */
-gboolean gst_element_factory_can_sink_all_caps (GstElementFactory *factory, const GstCaps *caps);
-gboolean gst_element_factory_can_src_all_caps  (GstElementFactory *factory, const GstCaps *caps);
-gboolean gst_element_factory_can_sink_any_caps (GstElementFactory *factory, const GstCaps *caps);
-gboolean gst_element_factory_can_src_any_caps  (GstElementFactory *factory, const GstCaps *caps);
-
-/* util query functions */
-gboolean                gst_element_query_position      (GstElement *element, GstFormat format, gint64 *cur);
-gboolean                gst_element_query_duration      (GstElement *element, GstFormat format, gint64 *duration);
-gboolean                gst_element_query_convert       (GstElement *element, GstFormat src_format, gint64 src_val,
-                                                         GstFormat dest_format, gint64 *dest_val);
-
-/* pad functions */
-void                    gst_pad_use_fixed_caps          (GstPad *pad);
-GstElement*             gst_pad_get_parent_element      (GstPad *pad);
-
-/* util query functions */
-gboolean                gst_pad_proxy_query_accept_caps (GstPad *pad, GstQuery *query);
-gboolean                gst_pad_proxy_query_caps        (GstPad *pad, GstQuery *query);
-
-gboolean                gst_pad_query_position          (GstPad *pad, GstFormat format, gint64 *cur);
-gboolean                gst_pad_query_duration          (GstPad *pad, GstFormat format, gint64 *duration);
-gboolean                gst_pad_query_convert           (GstPad *pad, GstFormat src_format, gint64 src_val,
-                                                         GstFormat dest_format, gint64 *dest_val);
-GstCaps *               gst_pad_query_caps              (GstPad *pad, GstCaps *filter);
-gboolean                gst_pad_query_accept_caps       (GstPad *pad, GstCaps *caps);
-
-
-gboolean                gst_pad_peer_query_position     (GstPad *pad, GstFormat format, gint64 *cur);
-gboolean                gst_pad_peer_query_duration     (GstPad *pad, GstFormat format, gint64 *duration);
-gboolean                gst_pad_peer_query_convert      (GstPad *pad, GstFormat src_format, gint64 src_val,
-                                                         GstFormat dest_format, gint64 *dest_val);
-GstCaps *               gst_pad_peer_query_caps         (GstPad * pad, GstCaps *filter);
-gboolean                gst_pad_peer_query_accept_caps  (GstPad * pad, GstCaps *caps);
-
-gchar *                 gst_pad_create_stream_id               (GstPad * pad, GstElement * parent, const gchar *stream_id);
-gchar *                 gst_pad_create_stream_id_printf        (GstPad * pad, GstElement * parent, const gchar *stream_id, ...);
-gchar *                 gst_pad_create_stream_id_printf_valist (GstPad * pad, GstElement * parent, const gchar *stream_id, va_list var_args);
-
-/* bin functions */
-void                    gst_bin_add_many                (GstBin *bin, GstElement *element_1, ...) G_GNUC_NULL_TERMINATED;
-void                    gst_bin_remove_many             (GstBin *bin, GstElement *element_1, ...) G_GNUC_NULL_TERMINATED;
-GstPad *                gst_bin_find_unlinked_pad       (GstBin *bin, GstPadDirection direction);
-
-/* parse utility functions */
-GstElement *            gst_parse_bin_from_description      (const gchar     * bin_description,
-                                                             gboolean          ghost_unlinked_pads,
-                                                             GError         ** err);
-
-GstElement *            gst_parse_bin_from_description_full (const gchar     * bin_description,
-                                                             gboolean          ghost_unlinked_pads,
-                                                             GstParseContext * context,
-                                                             GstParseFlags     flags,
-                                                             GError         ** err);
-
-GstClockTime            gst_util_get_timestamp          (void);
-
-/**
- * GstSearchMode:
- * @GST_SEARCH_MODE_EXACT : Only search for exact matches.
- * @GST_SEARCH_MODE_BEFORE: Search for an exact match or the element just before.
- * @GST_SEARCH_MODE_AFTER : Search for an exact match or the element just after.
- *
- * The different search modes.
- */
-typedef enum {
-  GST_SEARCH_MODE_EXACT = 0,
-  GST_SEARCH_MODE_BEFORE,
-  GST_SEARCH_MODE_AFTER
-} GstSearchMode;
-
-gpointer      gst_util_array_binary_search      (gpointer array, guint num_elements,
-                                                 gsize element_size, GCompareDataFunc search_func,
-                                                 GstSearchMode mode, gconstpointer search_data,
-                                                 gpointer user_data);
-
-/* fraction operations */
-gint          gst_util_greatest_common_divisor  (gint a, gint b);
-gint64        gst_util_greatest_common_divisor_int64 (gint64 a, gint64 b);
-
-void          gst_util_fraction_to_double       (gint src_n, gint src_d, gdouble *dest);
-void          gst_util_double_to_fraction       (gdouble src, gint *dest_n, gint *dest_d);
-
-gboolean      gst_util_fraction_multiply        (gint a_n, gint a_d, gint b_n, gint b_d,
-                                                 gint *res_n, gint *res_d);
-gboolean      gst_util_fraction_add             (gint a_n, gint a_d, gint b_n, gint b_d,
-                                                 gint *res_n, gint *res_d);
-gint          gst_util_fraction_compare         (gint a_n, gint a_d, gint b_n, gint b_d);
-
-
-G_END_DECLS
-
-#endif /* __GST_UTILS_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstvalue.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstvalue.h
deleted file mode 100644
index 4ea492fc..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstvalue.h
+++ /dev/null
@@ -1,528 +0,0 @@
-/* GStreamer
- * Copyright (C) <2003> David A. Schleef <ds@schleef.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VALUE_H__
-#define __GST_VALUE_H__
-
-#include <gst/gstconfig.h>
-#include <gst/gstcaps.h>
-#include <gst/gststructure.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_MAKE_FOURCC:
- * @a: the first character
- * @b: the second character
- * @c: the third character
- * @d: the fourth character
- *
- * Transform four characters into a #guint32 fourcc value with host
- * endianness.
- * <informalexample>
- * <programlisting>
- * guint32 fourcc = GST_MAKE_FOURCC ('M', 'J', 'P', 'G');
- * </programlisting>
- * </informalexample>
- */
-#define GST_MAKE_FOURCC(a,b,c,d)        ((guint32)((a)|(b)<<8|(c)<<16|(d)<<24))
-
-/**
- * GST_STR_FOURCC:
- * @f: a string with at least four characters
- *
- * Transform an input string into a #guint32 fourcc value with host
- * endianness.
- * Caller is responsible for ensuring the input string consists of at least
- * four characters.
- * <informalexample>
- * <programlisting>
- * guint32 fourcc = GST_STR_FOURCC ("MJPG");
- * </programlisting>
- * </informalexample>
- */
-#define GST_STR_FOURCC(f)               ((guint32)(((f)[0])|((f)[1]<<8)|((f)[2]<<16)|((f)[3]<<24)))
-
-/**
- * GST_FOURCC_FORMAT:
- *
- * Can be used together with #GST_FOURCC_ARGS to properly output a
- * #guint32 fourcc value in a printf()-style text message.
- * <informalexample>
- * <programlisting>
- * printf ("fourcc: %" GST_FOURCC_FORMAT "\n", GST_FOURCC_ARGS (fcc));
- * </programlisting>
- * </informalexample>
- */
-#define GST_FOURCC_FORMAT "c%c%c%c"
-
-/**
- * GST_FOURCC_ARGS:
- * @fourcc: a #guint32 fourcc value to output
- *
- * Can be used together with #GST_FOURCC_FORMAT to properly output a
- * #guint32 fourcc value in a printf()-style text message.
- */
-#define GST_FOURCC_ARGS(fourcc) \
-        ((gchar) ((fourcc)     &0xff)), \
-        ((gchar) (((fourcc)>>8 )&0xff)), \
-        ((gchar) (((fourcc)>>16)&0xff)), \
-        ((gchar) (((fourcc)>>24)&0xff))
-
-/**
- * GST_VALUE_HOLDS_INT_RANGE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_INT_RANGE value.
- */
-#define GST_VALUE_HOLDS_INT_RANGE(x)    (G_VALUE_HOLDS((x), gst_int_range_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_INT64_RANGE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_INT64_RANGE value.
- */
-#define GST_VALUE_HOLDS_INT64_RANGE(x)    (G_VALUE_HOLDS((x), gst_int64_range_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_DOUBLE_RANGE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_DOUBLE_RANGE value.
- */
-#define GST_VALUE_HOLDS_DOUBLE_RANGE(x) (G_VALUE_HOLDS((x), gst_double_range_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_FRACTION_RANGE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_FRACTION_RANGE value.
- */
-#define GST_VALUE_HOLDS_FRACTION_RANGE(x)    (G_VALUE_HOLDS((x), gst_fraction_range_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_LIST:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_LIST value.
- */
-#define GST_VALUE_HOLDS_LIST(x)         (G_VALUE_HOLDS((x), gst_value_list_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_ARRAY:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_ARRAY value.
- */
-#define GST_VALUE_HOLDS_ARRAY(x)        (G_VALUE_HOLDS((x), gst_value_array_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_CAPS:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_CAPS value.
- */
-#define GST_VALUE_HOLDS_CAPS(x)         (G_VALUE_HOLDS((x), GST_TYPE_CAPS))
-
-/**
- * GST_VALUE_HOLDS_STRUCTURE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_STRUCTURE value.
- */
-#define GST_VALUE_HOLDS_STRUCTURE(x)            (G_VALUE_HOLDS((x), GST_TYPE_STRUCTURE))
-
-/**
- * GST_VALUE_HOLDS_BUFFER:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_BUFFER value.
- */
-#define GST_VALUE_HOLDS_BUFFER(x)       (G_VALUE_HOLDS((x), GST_TYPE_BUFFER))
-
-/**
- * GST_VALUE_HOLDS_SAMPLE:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_SAMPLE value.
- */
-#define GST_VALUE_HOLDS_SAMPLE(x)       (G_VALUE_HOLDS((x), GST_TYPE_SAMPLE))
-
-/**
- * GST_VALUE_HOLDS_FRACTION:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_FRACTION value.
- */
-#define GST_VALUE_HOLDS_FRACTION(x)     (G_VALUE_HOLDS((x), gst_fraction_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_DATE_TIME:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_DATE_TIME value.
- */
-#define GST_VALUE_HOLDS_DATE_TIME(x)    (G_VALUE_HOLDS((x), gst_date_time_get_type ()))
-
-/**
- * GST_VALUE_HOLDS_BITMASK:
- * @x: the #GValue to check
- *
- * Checks if the given #GValue contains a #GST_TYPE_BITMASK value.
- */
-#define GST_VALUE_HOLDS_BITMASK(x)      (G_VALUE_HOLDS((x), gst_bitmask_get_type ()))
-
-/**
- * GST_TYPE_INT_RANGE:
- *
- * a #GValue type that represents an integer range
- *
- * Returns: the #GType of GstIntRange
- */
-#define GST_TYPE_INT_RANGE               gst_int_range_get_type ()
-
-/**
- * GST_TYPE_INT64_RANGE:
- *
- * a #GValue type that represents an #gint64 range
- *
- * Returns: the #GType of GstInt64Range
- */
-#define GST_TYPE_INT64_RANGE             gst_int64_range_get_type ()
-
-/**
- * GST_TYPE_DOUBLE_RANGE:
- *
- * a #GValue type that represents a floating point range with double precission
- *
- * Returns: the #GType of GstIntRange
- */
-#define GST_TYPE_DOUBLE_RANGE            gst_double_range_get_type ()
-
-/**
- * GST_TYPE_FRACTION_RANGE:
- *
- * a #GValue type that represents a GstFraction range
- *
- * Returns: the #GType of GstFractionRange
- */
-#define GST_TYPE_FRACTION_RANGE            gst_fraction_range_get_type ()
-
-/**
- * GST_TYPE_LIST:
- *
- * a #GValue type that represents an unordered list of #GValue values. This
- * is used for example to express a list of possible values for a field in
- * a caps structure, like a list of possible sample rates, of which only one
- * will be chosen in the end. This means that all values in the list are
- * meaningful on their own.
- *
- * Returns: the #GType of GstValueList (which is not explicitly typed)
- */
-#define GST_TYPE_LIST                    gst_value_list_get_type ()
-
-/**
- * GST_TYPE_ARRAY:
- *
- * a #GValue type that represents an ordered list of #GValue values. This is
- * used to express a set of values that is meaningful only in their specific
- * combination and order of values. Each value on its own is not particularly
- * meaningful, only the ordered array in its entirety is meaningful. This is
- * used for example to express channel layouts for multichannel audio where
- * each channel needs to be mapped to a position in the room.
- *
- * Returns: the #GType of GstArrayList (which is not explicitly typed)
- */
-#define GST_TYPE_ARRAY                   gst_value_array_get_type ()
-
-/**
- * GST_TYPE_FRACTION:
- *
- * a #GValue type that represents a fraction of an integer numerator over
- * an integer denominator
- *
- * Returns: the #GType of GstFraction (which is not explicitly typed)
- */
-
-#define GST_TYPE_FRACTION                gst_fraction_get_type ()
-
-/**
- * GST_TYPE_DATE_TIME:
- *
- * a boxed #GValue type for #GstDateTime that represents a date and time.
- *
- * Returns: the #GType of GstDateTime
- */
-
-#define GST_TYPE_DATE_TIME               gst_date_time_get_type ()
-
-/**
- * GST_TYPE_BITMASK:
- *
- * a #GValue type that represents a 64-bit bitmask.
- *
- * Returns: the #GType of GstBitmask (which is not explicitly typed)
- */
-
-#define GST_TYPE_BITMASK                 gst_bitmask_get_type ()
-
-/**
- * GST_VALUE_LESS_THAN:
- *
- * Indicates that the first value provided to a comparison function
- * (gst_value_compare()) is lesser than the second one.
- */
-#define GST_VALUE_LESS_THAN              (-1)
-
-/**
- * GST_VALUE_EQUAL:
- *
- * Indicates that the first value provided to a comparison function
- * (gst_value_compare()) is equal to the second one.
- */
-#define GST_VALUE_EQUAL                   0
-
-/**
- * GST_VALUE_GREATER_THAN:
- *
- * Indicates that the first value provided to a comparison function
- * (gst_value_compare()) is greater than the second one.
- */
-#define GST_VALUE_GREATER_THAN            1
-
-/**
- * GST_VALUE_UNORDERED:
- *
- * Indicates that the comparison function (gst_value_compare()) can not
- * determine a order for the two provided values.
- */
-#define GST_VALUE_UNORDERED               2
-
-/**
- * GstValueCompareFunc:
- * @value1: first value for comparison
- * @value2: second value for comparison
- *
- * Used together with gst_value_compare() to compare #GValue items.
- *
- * Returns: one of GST_VALUE_LESS_THAN, GST_VALUE_EQUAL, GST_VALUE_GREATER_THAN
- * or GST_VALUE_UNORDERED
- */
-typedef gint     (* GstValueCompareFunc)     (const GValue *value1,
-                                              const GValue *value2);
-
-/**
- * GstValueSerializeFunc:
- * @value1: a #GValue
- *
- * Used by gst_value_serialize() to obtain a non-binary form of the #GValue.
- *
- * Free-function: g_free
- *
- * Returns: (transfer full): the string representation of the value
- */
-typedef gchar *  (* GstValueSerializeFunc)   (const GValue *value1);
-
-/**
- * GstValueDeserializeFunc:
- * @dest: a #GValue
- * @s: a string
- *
- * Used by gst_value_deserialize() to parse a non-binary form into the #GValue.
- *
- * Returns: %TRUE for success
- */
-typedef gboolean (* GstValueDeserializeFunc) (GValue       *dest,
-                                              const gchar  *s);
-
-typedef struct _GstValueTable GstValueTable;
-/**
- * GstValueTable:
- * @type: a #GType
- * @compare: a #GstValueCompareFunc
- * @serialize: a #GstValueSerializeFunc
- * @deserialize: a #GstValueDeserializeFunc
- *
- * VTable for the #GValue @type.
- */
-struct _GstValueTable {
-  GType type;
-  GstValueCompareFunc compare;
-  GstValueSerializeFunc serialize;
-  GstValueDeserializeFunc deserialize;
-
-  /*< private >*/
-  gpointer _gst_reserved [GST_PADDING];
-};
-
-GType gst_int_range_get_type (void);
-GType gst_int64_range_get_type (void);
-GType gst_double_range_get_type (void);
-GType gst_fraction_range_get_type (void);
-GType gst_fraction_get_type (void);
-GType gst_value_list_get_type (void);
-GType gst_value_array_get_type (void);
-GType gst_bitmask_get_type (void);
-
-GType gst_date_time_get_type (void);
-
-void            gst_value_register              (const GstValueTable   *table);
-void            gst_value_init_and_copy         (GValue                *dest,
-                                                 const GValue          *src);
-
-gchar *         gst_value_serialize             (const GValue          *value) G_GNUC_MALLOC;
-gboolean        gst_value_deserialize           (GValue                *dest,
-                                                 const gchar           *src);
-
-/* list */
-void            gst_value_list_append_value     (GValue         *value,
-                                                 const GValue   *append_value);
-void            gst_value_list_prepend_value    (GValue         *value,
-                                                 const GValue   *prepend_value);
-void            gst_value_list_concat           (GValue         *dest,
-                                                 const GValue   *value1,
-                                                 const GValue   *value2);
-void            gst_value_list_merge            (GValue         *dest,
-                                                 const GValue   *value1,
-                                                 const GValue   *value2);
-guint           gst_value_list_get_size         (const GValue   *value);
-const GValue *  gst_value_list_get_value        (const GValue   *value,
-                                                 guint          index);
-
-/* array */
-void            gst_value_array_append_value    (GValue         *value,
-                                                 const GValue   *append_value);
-void            gst_value_array_prepend_value   (GValue         *value,
-                                                 const GValue   *prepend_value);
-guint           gst_value_array_get_size        (const GValue   *value);
-const GValue *  gst_value_array_get_value       (const GValue   *value,
-                                                 guint          index);
-
-/* int range */
-void            gst_value_set_int_range         (GValue         *value,
-                                                 gint           start,
-                                                 gint           end);
-void            gst_value_set_int_range_step    (GValue         *value,
-                                                 gint           start,
-                                                 gint           end,
-                                                 gint           step);
-gint            gst_value_get_int_range_min     (const GValue   *value);
-gint            gst_value_get_int_range_max     (const GValue   *value);
-gint            gst_value_get_int_range_step    (const GValue   *value);
-
-/* int64 range */
-void            gst_value_set_int64_range       (GValue         *value,
-                                                 gint64         start,
-                                                 gint64         end);
-void            gst_value_set_int64_range_step  (GValue         *value,
-                                                 gint64         start,
-                                                 gint64         end,
-                                                 gint64         step);
-gint64          gst_value_get_int64_range_min   (const GValue   *value);
-gint64          gst_value_get_int64_range_max   (const GValue   *value);
-gint64          gst_value_get_int64_range_step  (const GValue   *value);
-
-/* double range */
-void            gst_value_set_double_range      (GValue         *value,
-                                                 gdouble        start,
-                                                 gdouble        end);
-gdouble         gst_value_get_double_range_min  (const GValue   *value);
-gdouble         gst_value_get_double_range_max  (const GValue   *value);
-
-/* caps */
-const GstCaps * gst_value_get_caps              (const GValue   *value);
-void            gst_value_set_caps              (GValue         *value,
-                                                 const GstCaps  *caps);
-
-/* structure */
-const GstStructure *
-                gst_value_get_structure         (const GValue   *value);
-void            gst_value_set_structure         (GValue         *value,
-                                                 const GstStructure  *structure);
-
-/* fraction */
-void            gst_value_set_fraction          (GValue         *value,
-                                                 gint           numerator,
-                                                 gint           denominator);
-gint            gst_value_get_fraction_numerator   (const GValue  *value);
-gint            gst_value_get_fraction_denominator (const GValue *value);
-gboolean        gst_value_fraction_multiply        (GValue         *product,
-                                                    const GValue   *factor1,
-                                                    const GValue   *factor2);
-gboolean        gst_value_fraction_subtract     (GValue * dest,
-                                                 const GValue * minuend,
-                                                 const GValue * subtrahend);
-
-/* fraction range */
-void            gst_value_set_fraction_range    (GValue         *value,
-                                                 const GValue   *start,
-                                                 const GValue   *end);
-void            gst_value_set_fraction_range_full (GValue       *value,
-                                                 gint numerator_start,
-                                                 gint denominator_start,
-                                                 gint numerator_end,
-                                                 gint denominator_end);
-const GValue    *gst_value_get_fraction_range_min (const GValue *value);
-const GValue    *gst_value_get_fraction_range_max (const GValue *value);
-
-/* bitmask */
-guint64         gst_value_get_bitmask           (const GValue   *value);
-void            gst_value_set_bitmask           (GValue         *value,
-                                                 guint64         bitmask);
-
-/* compare */
-gint            gst_value_compare               (const GValue   *value1,
-                                                 const GValue   *value2);
-gboolean        gst_value_can_compare           (const GValue   *value1,
-                                                 const GValue   *value2);
-gboolean        gst_value_is_subset             (const GValue   *value1,
-                                                 const GValue   *value2);
-
-/* union */
-gboolean        gst_value_union                 (GValue         *dest,
-                                                 const GValue   *value1,
-                                                 const GValue   *value2);
-gboolean        gst_value_can_union             (const GValue   *value1,
-                                                 const GValue   *value2);
-
-/* intersection */
-gboolean        gst_value_intersect             (GValue         *dest,
-                                                 const GValue   *value1,
-                                                 const GValue   *value2);
-gboolean        gst_value_can_intersect         (const GValue   *value1,
-                                                 const GValue   *value2);
-
-/* subtraction */
-gboolean        gst_value_subtract              (GValue         *dest,
-                                                 const GValue   *minuend,
-                                                 const GValue   *subtrahend);
-gboolean        gst_value_can_subtract          (const GValue   *minuend,
-                                                 const GValue   *subtrahend);
-
-/* fixation */
-gboolean        gst_value_is_fixed              (const GValue   *value);
-gboolean        gst_value_fixate                (GValue         *dest,
-                                                 const GValue   *src);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstversion.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstversion.h
deleted file mode 100644
index 82b17344..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/gstversion.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wtay@chello.be>
- *
- * gstversion.h: Version information for GStreamer
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/**
- * SECTION:gstversion
- * @short_description: GStreamer version macros.
- *
- * Use the GST_VERSION_* macros e.g. when defining own plugins. The GStreamer
- * runtime checks if these plugin and core version match and refuses to use a
- * plugin compiled against a different version of GStreamer.
- * You can also use the macros to keep the GStreamer version information in
- * your application.
- *
- * Use the gst_version() function if you want to know which version of
- * GStreamer you are currently linked against.
- *
- * The version macros get defined by including "gst/gst.h".
- */
-
-#ifndef __GST_VERSION_H__
-#define __GST_VERSION_H__
-
-G_BEGIN_DECLS
-
-/**
- * GST_VERSION_MAJOR:
- *
- * The major version of GStreamer at compile time:
- */
-#define GST_VERSION_MAJOR (1)
-/**
- * GST_VERSION_MINOR:
- *
- * The minor version of GStreamer at compile time:
- */
-#define GST_VERSION_MINOR (0)
-/**
- * GST_VERSION_MICRO:
- *
- * The micro version of GStreamer at compile time:
- */
-#define GST_VERSION_MICRO (5)
-/**
- * GST_VERSION_NANO:
- *
- * The nano version of GStreamer at compile time:
- * Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
- */
-#define GST_VERSION_NANO (0)
-
-/**
- * GST_CHECK_VERSION:
- * @major: a number indicating the major version
- * @minor: a number indicating the minor version
- * @micro: a number indicating the micro version
- *
- * Check whether a GStreamer version equal to or greater than
- * major.minor.micro is present.
- */
-#define	GST_CHECK_VERSION(major,minor,micro)	\
-    (GST_VERSION_MAJOR > (major) || \
-     (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR > (minor)) || \
-     (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \
-      GST_VERSION_MICRO >= (micro)) || \
-     (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \
-      GST_VERSION_MICRO + 1 == (micro) && GST_VERSION_NANO > 0))
-
-G_END_DECLS
-
-#endif /* __GST_VERSION_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/interfaces/photography-enumtypes.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/interfaces/photography-enumtypes.h
deleted file mode 100644
index 4c0a5aa3..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/interfaces/photography-enumtypes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-#ifndef __GST_PHOTOGRAPHY_ENUM_TYPES_H__
-#define __GST_PHOTOGRAPHY_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "photography.h" */
-GType gst_photography_noise_reduction_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_NOISE_REDUCTION (gst_photography_noise_reduction_get_type())
-GType gst_photography_white_balance_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_WHITE_BALANCE_MODE (gst_photography_white_balance_mode_get_type())
-GType gst_photography_color_tone_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_COLOR_TONE_MODE (gst_photography_color_tone_mode_get_type())
-GType gst_photography_scene_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_SCENE_MODE (gst_photography_scene_mode_get_type())
-GType gst_photography_flash_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_FLASH_MODE (gst_photography_flash_mode_get_type())
-GType gst_photography_focus_status_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_FOCUS_STATUS (gst_photography_focus_status_get_type())
-GType gst_photography_caps_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_CAPS (gst_photography_caps_get_type())
-GType gst_photography_shake_risk_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_SHAKE_RISK (gst_photography_shake_risk_get_type())
-GType gst_photography_flicker_reduction_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_FLICKER_REDUCTION_MODE (gst_photography_flicker_reduction_mode_get_type())
-GType gst_photography_focus_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_FOCUS_MODE (gst_photography_focus_mode_get_type())
-GType gst_photography_exposure_mode_get_type (void);
-#define GST_TYPE_PHOTOGRAPHY_EXPOSURE_MODE (gst_photography_exposure_mode_get_type())
-G_END_DECLS
-
-#endif /* __GST_PHOTOGRAPHY_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/interfaces/photography.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/interfaces/photography.h
deleted file mode 100644
index d3a16e9d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/interfaces/photography.h
+++ /dev/null
@@ -1,590 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2008 Nokia Corporation <multimedia@maemo.org>
- *
- * photography.h: photography interface for digital imaging
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PHOTOGRAPHY_H__
-#define __GST_PHOTOGRAPHY_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The GstPhotography interface is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning." 
-#endif
-
-#include <gst/gst.h>
-#include <gst/interfaces/photography-enumtypes.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_PHOTOGRAPHY \
-  (gst_photography_get_type ())
-#define GST_PHOTOGRAPHY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PHOTOGRAPHY, GstPhotography))
-#define GST_IS_PHOTOGRAPHY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PHOTOGRAPHY))
-#define GST_PHOTOGRAPHY_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_PHOTOGRAPHY, GstPhotographyInterface))
-
-
-/**
- * GST_PHOTOGRAPHY_AUTOFOCUS_DONE:
- *
- * Name of custom GstMessage that will be posted to #GstBus when autofocusing
- * is complete.
- * This message contains following fields:
- * <itemizedlist>
- * <listitem>
- *   <para>
- *   #GstPhotographyFocusStatus
- *   <classname>&quot;status&quot;</classname>:
- *   Tells if focusing succeeded or failed.
- *   </para>
- * </listitem>
- * <listitem>
- *   <para>
- *   #G_TYPE_INT
- *   <classname>&quot;focus-window-rows&quot;</classname>:
- *   Tells number of focus matrix rows.
- *   </para>
- * </listitem>
- * <listitem>
- *   <para>
- *   #G_TYPE_INT
- *   <classname>&quot;focus-window-columns&quot;</classname>:
- *   Tells number of focus matrix columns.
- *   </para>
- * </listitem>
- * <listitem>
- *   <para>
- *   #G_TYPE_INT
- *   <classname>&quot;focus-window-mask&quot;</classname>:
- *   Bitmask containing rows x columns bits which mark the focus points in the
- *   focus matrix. Lowest bit (LSB) always represents the top-left corner of the
- *   focus matrix. This field is only valid when focusing status is SUCCESS.
- *   </para>
- * </listitem>
- * </itemizedlist>
- */
-#define GST_PHOTOGRAPHY_AUTOFOCUS_DONE "autofocus-done"
-
-/**
- * GST_PHOTOGRAPHY_SHAKE_RISK:
- *
- * Name of custom GstMessage that is posted to #GstBus during autofocusing
- * process. It is posted if there is change in the risk of captured image
- * becoming "shaken" due to camera movement and too long exposure time.
- *
- * This message contains following fields:
- * <itemizedlist>
- * <listitem>
- *   <para>
- *   #GstPhotographyShakeRisk
- *   <classname>&quot;status&quot;</classname>:
- *   Tells risk level of capturing shaken image.
- *   </para>
- * </listitem>
- * </itemizedlist>
- */
-#define GST_PHOTOGRAPHY_SHAKE_RISK "shake-risk"
-
-/* Maximum white point values used in #GstPhotographySettings */
-#define MAX_WHITE_POINT_VALUES 4
-
-/* Interface property names */
-#define GST_PHOTOGRAPHY_PROP_WB_MODE      "white-balance-mode"
-#define GST_PHOTOGRAPHY_PROP_COLOR_TONE   "color-tone-mode"
-#define GST_PHOTOGRAPHY_PROP_SCENE_MODE   "scene-mode"
-#define GST_PHOTOGRAPHY_PROP_FLASH_MODE   "flash-mode"
-#define GST_PHOTOGRAPHY_PROP_NOISE_REDUCTION   "noise-reduction"
-#define GST_PHOTOGRAPHY_PROP_FOCUS_STATUS "focus-status"
-#define GST_PHOTOGRAPHY_PROP_CAPABILITIES "capabilities"
-#define GST_PHOTOGRAPHY_PROP_SHAKE_RISK   "shake-risk"
-#define GST_PHOTOGRAPHY_PROP_EV_COMP      "ev-compensation"
-#define GST_PHOTOGRAPHY_PROP_ISO_SPEED    "iso-speed"
-#define GST_PHOTOGRAPHY_PROP_APERTURE     "aperture"
-#define GST_PHOTOGRAPHY_PROP_EXPOSURE_TIME     "exposure-time"
-#define GST_PHOTOGRAPHY_PROP_IMAGE_CAPTURE_SUPPORTED_CAPS \
-    "image-capture-supported-caps"
-#define GST_PHOTOGRAPHY_PROP_IMAGE_PREVIEW_SUPPORTED_CAPS \
-    "image-preview-supported-caps"
-#define GST_PHOTOGRAPHY_PROP_FLICKER_MODE "flicker-mode"
-#define GST_PHOTOGRAPHY_PROP_FOCUS_MODE   "focus-mode"
-#define GST_PHOTOGRAPHY_PROP_ZOOM   "zoom"
-#define GST_PHOTOGRAPHY_PROP_COLOR_TEMPERATURE "color-temperature"
-#define GST_PHOTOGRAPHY_PROP_WHITE_POINT  "white-point"
-#define GST_PHOTOGRAPHY_PROP_ANALOG_GAIN  "analog-gain"
-#define GST_PHOTOGRAPHY_PROP_EXPOSURE_MODE     "exposure-mode"
-#define GST_PHOTOGRAPHY_PROP_LENS_FOCUS   "lens-focus"
-#define GST_PHOTOGRAPHY_PROP_MIN_EXPOSURE_TIME "min-exposure-time"
-#define GST_PHOTOGRAPHY_PROP_MAX_EXPOSURE_TIME "max-exposure-time"
-
-/**
- * GstPhotography:
- *
- * Opaque #GstPhotography data structure.
- */
-typedef struct _GstPhotography GstPhotography;
-
-/**
- * GstPhotographyNoiseReduction:
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_BAYER: Adaptive noise reduction on Bayer
- * format
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_YCC: reduces the noise on Y and 2-chroma
- * images.
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_TEMPORAL: Multi-frame adaptive NR,
- * provided for the video mode
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_FIXED: Fixed Pattern Noise refers to noise
- * that does not change between frames. The noise is removed from the sensor
- * image, by subtracting a previously-captured black image in memory.
- * @GST_PHOTOGRAPHY_NOISE_REDUCTION_EXTRA: Extra Noise Reduction. In the case
- * of high-ISO capturing, some noise remains after YCC NR. XNR reduces this
- * remaining noise.
- *
- * Noise Reduction features of a photography capture or filter element.
- *
- * Since: 0.10.21
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_BAYER = ( 1<<0 ),
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_YCC = ( 1<<1 ),
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_TEMPORAL= ( 1<< 2),
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_FIXED = (1 << 3),
-  GST_PHOTOGRAPHY_NOISE_REDUCTION_EXTRA = (1 << 4)
-} GstPhotographyNoiseReduction;
-
-/**
- * GstPhotographyWhiteBalanceMode:
- * @GST_PHOTOGRAPHY_WB_MODE_AUTO: Choose white balance mode automatically
- * @GST_PHOTOGRAPHY_WB_MODE_DAYLIGHT: Mode for daylight conditions
- * @GST_PHOTOGRAPHY_WB_MODE_CLOUDY: Mode for cloudy conditions
- * @GST_PHOTOGRAPHY_WB_MODE_SUNSET: Mode for sunset conditions
- * @GST_PHOTOGRAPHY_WB_MODE_TUNGSTEN: Mode for tungsten lighting
- * @GST_PHOTOGRAPHY_WB_MODE_FLUORESCENT: Mode for fluorescent lighting
- * @GST_PHOTOGRAPHY_WB_MODE_MANUAL: Disable automatic white balance adjustment
- * and keep current values.
- *
- * Modes for white balance control.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_WB_MODE_AUTO = 0,
-  GST_PHOTOGRAPHY_WB_MODE_DAYLIGHT,
-  GST_PHOTOGRAPHY_WB_MODE_CLOUDY,
-  GST_PHOTOGRAPHY_WB_MODE_SUNSET,
-  GST_PHOTOGRAPHY_WB_MODE_TUNGSTEN,
-  GST_PHOTOGRAPHY_WB_MODE_FLUORESCENT,
-  GST_PHOTOGRAPHY_WB_MODE_MANUAL
-} GstPhotographyWhiteBalanceMode;
-
-/**
- * GstPhotographyColorToneMode:
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_NORMAL: No effects
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SEPIA: Sepia
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_NEGATIVE: Negative
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRAYSCALE: Grayscale
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_NATURAL: Natural
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_VIVID: Vivid
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_COLORSWAP: Colorswap
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SOLARIZE: Solarize
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_OUT_OF_FOCUS: Out of focus
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKY_BLUE: Sky blue
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRASS_GREEN: Grass green
- * @GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKIN_WHITEN: Skin whiten
- *
- * Modes for special color effects.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_NORMAL = 0,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SEPIA,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_NEGATIVE,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRAYSCALE,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_NATURAL,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_VIVID,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_COLORSWAP,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SOLARIZE,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_OUT_OF_FOCUS,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKY_BLUE,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_GRASS_GREEN,
-  GST_PHOTOGRAPHY_COLOR_TONE_MODE_SKIN_WHITEN
-} GstPhotographyColorToneMode;
-
-/**
- * GstPhotographySceneMode:
- * @GST_PHOTOGRAPHY_SCENE_MODE_MANUAL: Set individual options manually
- * @GST_PHOTOGRAPHY_SCENE_MODE_CLOSEUP: Mode for close objects
- * @GST_PHOTOGRAPHY_SCENE_MODE_PORTRAIT: Mode for portraits
- * @GST_PHOTOGRAPHY_SCENE_MODE_LANDSCAPE: Mode for landscapes
- * @GST_PHOTOGRAPHY_SCENE_MODE_SPORT: Mode for scene with fast motion
- * @GST_PHOTOGRAPHY_SCENE_MODE_NIGHT: Mode for night conditions
- * @GST_PHOTOGRAPHY_SCENE_MODE_AUTO: Choose scene mode automatically
- *
- * Each mode contains preset #GstPhotography options in order to produce
- * good capturing result in certain scene.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_SCENE_MODE_MANUAL = 0,
-  GST_PHOTOGRAPHY_SCENE_MODE_CLOSEUP,
-  GST_PHOTOGRAPHY_SCENE_MODE_PORTRAIT,
-  GST_PHOTOGRAPHY_SCENE_MODE_LANDSCAPE,
-  GST_PHOTOGRAPHY_SCENE_MODE_SPORT,
-  GST_PHOTOGRAPHY_SCENE_MODE_NIGHT,
-  GST_PHOTOGRAPHY_SCENE_MODE_AUTO
-} GstPhotographySceneMode;
-
-/**
- * GstPhotographyFlashMode:
- * @GST_PHOTOGRAPHY_FLASH_MODE_AUTO: Fire flash automatically according to
- * lighting conditions.
- * @GST_PHOTOGRAPHY_FLASH_MODE_OFF: Never fire flash
- * @GST_PHOTOGRAPHY_FLASH_MODE_ON: Always fire flash
- * @GST_PHOTOGRAPHY_FLASH_MODE_FILL_IN: Fill in flash
- * @GST_PHOTOGRAPHY_FLASH_MODE_RED_EYE: Flash mode for reducing chance of
- * capturing red eyes
- *
- * Modes for flash control.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_FLASH_MODE_AUTO = 0,
-  GST_PHOTOGRAPHY_FLASH_MODE_OFF,
-  GST_PHOTOGRAPHY_FLASH_MODE_ON,
-  GST_PHOTOGRAPHY_FLASH_MODE_FILL_IN,
-  GST_PHOTOGRAPHY_FLASH_MODE_RED_EYE
-} GstPhotographyFlashMode;
-
-/**
- * GstPhotographyFocusStatus:
- * @GST_PHOTOGRAPHY_FOCUS_STATUS_NONE: No status available
- * @GST_PHOTOGRAPHY_FOCUS_STATUS_RUNNING: Focusing is ongoing
- * @GST_PHOTOGRAPHY_FOCUS_STATUS_FAIL: Focusing failed
- * @GST_PHOTOGRAPHY_FOCUS_STATUS_SUCCESS: Focusing succeeded
- *
- * Status of the focusing operation, used in #GST_PHOTOGRAPHY_AUTOFOCUS_DONE
- * message.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_FOCUS_STATUS_NONE = 0,
-  GST_PHOTOGRAPHY_FOCUS_STATUS_RUNNING,
-  GST_PHOTOGRAPHY_FOCUS_STATUS_FAIL,
-  GST_PHOTOGRAPHY_FOCUS_STATUS_SUCCESS
-} GstPhotographyFocusStatus;
-
-/**
- * GstPhotographyCaps:
- *
- * Bitmask that indicates which #GstPhotography interface features an instance
- * supports.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_CAPS_NONE = (0 << 0),
-  GST_PHOTOGRAPHY_CAPS_EV_COMP = (1 << 0),
-  GST_PHOTOGRAPHY_CAPS_ISO_SPEED = (1 << 1),
-  GST_PHOTOGRAPHY_CAPS_WB_MODE = (1 << 2),
-  GST_PHOTOGRAPHY_CAPS_TONE = (1 << 3),
-  GST_PHOTOGRAPHY_CAPS_SCENE = (1 << 4),
-  GST_PHOTOGRAPHY_CAPS_FLASH = (1 << 5),
-  GST_PHOTOGRAPHY_CAPS_ZOOM = (1 << 6),
-  GST_PHOTOGRAPHY_CAPS_FOCUS = (1 << 7),
-  GST_PHOTOGRAPHY_CAPS_APERTURE = (1 << 8),
-  GST_PHOTOGRAPHY_CAPS_EXPOSURE = (1 << 9),
-  GST_PHOTOGRAPHY_CAPS_SHAKE = (1 << 10),
-  GST_PHOTOGRAPHY_CAPS_WHITE_BALANCE = (1 << 11),
-  GST_PHOTOGRAPHY_CAPS_NOISE_REDUCTION = (1 << 12),
-  GST_PHOTOGRAPHY_CAPS_FLICKER_REDUCTION = (1 << 13),
-  GST_PHOTOGRAPHY_CAPS_ALL = (~0)
-} GstPhotographyCaps;
-
-/**
- * GstPhotographyShakeRisk:
- * @GST_PHOTOGRAPHY_SHAKE_RISK_LOW: Low risk
- * @GST_PHOTOGRAPHY_SHAKE_RISK_MEDIUM: Medium risk
- * @GST_PHOTOGRAPHY_SHAKE_RISK_HIGH: High risk
- *
- * Risk level of captured image becoming "shaken" due to camera movement and
- * too long exposure time. Used in #GST_PHOTOGRAPHY_SHAKE_RISK #GstMessage.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_SHAKE_RISK_LOW = 0,
-  GST_PHOTOGRAPHY_SHAKE_RISK_MEDIUM,
-  GST_PHOTOGRAPHY_SHAKE_RISK_HIGH,
-} GstPhotographyShakeRisk;
-
-/**
- * GstPhotographyFlickerReductionMode:
- * @GST_PHOTOGRAPHY_FLICKER_REDUCTION_OFF: Disable flicker reduction
- * @GST_PHOTOGRAPHY_FLICKER_REDUCTION_50HZ: 50Hz flicker reduction
- * @GST_PHOTOGRAPHY_FLICKER_REDUCTION_60HZ: 60Hz flicker reduction
- * @GST_PHOTOGRAPHY_FLICKER_REDUCTION_AUTO: Choose mode automatically
- *
- * Reduce flicker in video caused by light source fluctuation.
- */
-typedef enum
-{
-  GST_PHOTOGRAPHY_FLICKER_REDUCTION_OFF = 0,
-  GST_PHOTOGRAPHY_FLICKER_REDUCTION_50HZ,
-  GST_PHOTOGRAPHY_FLICKER_REDUCTION_60HZ,
-  GST_PHOTOGRAPHY_FLICKER_REDUCTION_AUTO,
-} GstPhotographyFlickerReductionMode;
-
-/**
- * GstPhotographyFocusMode:
- * @GST_PHOTOGRAPHY_FOCUS_MODE_AUTO: Choose focus mode automatically
- * @GST_PHOTOGRAPHY_FOCUS_MODE_MACRO: Mode for focusing objects close to lens
- * @GST_PHOTOGRAPHY_FOCUS_MODE_PORTRAIT: Mode for portraits
- * @GST_PHOTOGRAPHY_FOCUS_MODE_INFINITY: Mode for landscapes and far away objects
- * @GST_PHOTOGRAPHY_FOCUS_MODE_HYPERFOCAL: Mode for maximum depth of field, keeping
- * focus acceptable both in infinify and as close objects as possible
- * @GST_PHOTOGRAPHY_FOCUS_MODE_EXTENDED: Extended focus mode
- * @GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_NORMAL: Continuous autofocus mode
- * @GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_EXTENDED: Extended continuous
- * autofocus mode
- * @GST_PHOTOGRAPHY_FOCUS_MODE_MANUAL: Disable automatic focusing
- * and keep current value. #GstPhotography:lens-focus property can
- * be used to change focus manually.
- *
- * Choose mode for focusing algorithm.
- */
-typedef enum {
-    GST_PHOTOGRAPHY_FOCUS_MODE_AUTO = 0,
-    GST_PHOTOGRAPHY_FOCUS_MODE_MACRO,
-    GST_PHOTOGRAPHY_FOCUS_MODE_PORTRAIT,
-    GST_PHOTOGRAPHY_FOCUS_MODE_INFINITY,
-    GST_PHOTOGRAPHY_FOCUS_MODE_HYPERFOCAL,
-    GST_PHOTOGRAPHY_FOCUS_MODE_EXTENDED,
-    GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_NORMAL,
-    GST_PHOTOGRAPHY_FOCUS_MODE_CONTINUOUS_EXTENDED,
-    GST_PHOTOGRAPHY_FOCUS_MODE_MANUAL
-} GstPhotographyFocusMode;
-
-/**
- * GstPhotographyExposureMode:
- * @GST_PHOTOGRAPHY_EXPOSURE_MODE_AUTO: Adjust exposure automatically
- * @GST_PHOTOGRAPHY_EXPOSURE_MODE_MANUAL: Disable automatic exposure adjustment
- * and keep current values.
- *
- */
-typedef enum {
-    GST_PHOTOGRAPHY_EXPOSURE_MODE_AUTO = 0,
-    GST_PHOTOGRAPHY_EXPOSURE_MODE_MANUAL
-} GstPhotographyExposureMode;
-
-/**
- * GstPhotographySettings:
- *
- * Structure containing all #GstPhotography settings, used to set all
- * settings in one call with @gst_photography_set_config().
- */
-typedef struct
-{
-  GstPhotographyWhiteBalanceMode wb_mode;
-  GstPhotographyColorToneMode tone_mode;
-  GstPhotographySceneMode scene_mode;
-  GstPhotographyFlashMode flash_mode;
-  guint32 exposure_time;
-  guint aperture;
-  gfloat ev_compensation;
-  guint iso_speed;
-  gfloat zoom;
-  GstPhotographyFlickerReductionMode flicker_mode;
-  GstPhotographyFocusMode focus_mode;
-  GstPhotographyNoiseReduction noise_reduction;
-  GstPhotographyExposureMode exposure_mode;
-  guint color_temperature;
-  guint white_point[MAX_WHITE_POINT_VALUES];
-  gfloat analog_gain;
-  gfloat lens_focus;
-  guint min_exposure_time;
-  guint max_exposure_time;
-} GstPhotographySettings;
-
-/**
- * GstPhotographyCapturePrepared:
- * @data: user data that has been given, when registering the callback
- * @configured_caps: #GstCaps defining the configured capture format.
- *     Ownership of these caps stays in the element.
- *
- * This callback will be called when the element has finished preparations
- * and is ready for image capture. The next buffer that element produces
- * will be of @configured_caps format, so this callback allows the application
- * to e.g. reconfigure capsfilters in pipeline if any.
- */
-typedef void (*GstPhotographyCapturePrepared) (gpointer data,
-    const GstCaps *configured_caps);
-
-/**
- * GstPhotographyInterface:
- * @parent: parent interface type.
- * @get_ev_compensation: vmethod to get ev exposure compensation value
- * @get_iso_speed: vmethod to get iso speed (light sensitivity) value
- * @get_aperture: vmethod to get aperture value
- * @get_exposure: vmethod to get exposure time value
- * @get_white_balance_mode: vmethod to get white balance mode value
- * @get_color_tone_mode: vmethod to get color tone mode value
- * @get_scene_mode: vmethod to get scene mode value
- * @get_flash_mode: vmethod to get flash mode value
- * @get_noise_reduction: vmethod to get noise reduction mode value
- * @get_zoom: vmethod to get zoom factor value
- * @set_ev_compensation: vmethod to set ev exposure compensation value
- * @set_iso_speed: vmethod to set iso speed (light sensitivity) value
- * @set_aperture: vmethod to set aperture value
- * @set_exposure: vmethod to set exposure time value
- * @set_white_balance_mode: vmethod to set white balance mode value
- * @set_color_tone_mode: vmethod to set color tone mode value
- * @set_scene_mode: vmethod to set scene mode value
- * @set_flash_mode: vmethod to set flash mode value
- * @set_noise_reduction: vmethod to set noise reduction mode value
- * @set_zoom: vmethod to set zoom factor value
- * @get_capabilities: vmethod to get supported capabilities of the interface
- * @prepare_for_capture: vmethod to tell the element to prepare for capturing
- * @set_autofocus: vmethod to set autofocus on/off
- * @set_config: vmethod to set all configuration parameters at once
- * @get_config: vmethod to get all configuration parameters at once
- * @get_image_capture_supported_caps: vmethod to get caps describing supported image capture formats
- *
- * #GstPhotographyInterface interface.
- */
-typedef struct _GstPhotographyInterface
-{
-  GTypeInterface parent;
-
-  /* virtual functions */
-  gboolean (*get_ev_compensation) (GstPhotography * photo, gfloat * ev_comp);
-  gboolean (*get_iso_speed) (GstPhotography * photo, guint * iso_speed);
-  gboolean (*get_aperture) (GstPhotography * photo, guint * aperture);
-  gboolean (*get_exposure) (GstPhotography * photo, guint32 * exposure);
-  gboolean (*get_white_balance_mode) (GstPhotography * photo,
-    GstPhotographyWhiteBalanceMode * wb_mode);
-  gboolean (*get_color_tone_mode) (GstPhotography * photo,
-    GstPhotographyColorToneMode * tone_mode);
-  gboolean (*get_scene_mode) (GstPhotography * photo,
-    GstPhotographySceneMode * scene_mode);
-  gboolean (*get_flash_mode) (GstPhotography * photo,
-    GstPhotographyFlashMode * flash_mode);
-  gboolean (*get_zoom) (GstPhotography * photo, gfloat * zoom);
-    gboolean (*get_flicker_mode) (GstPhotography * photo,
-    GstPhotographyFlickerReductionMode * flicker_mode);
-  gboolean (*get_focus_mode) (GstPhotography * photo,
-    GstPhotographyFocusMode * focus_mode);
-
-  gboolean (*set_ev_compensation) (GstPhotography * photo, gfloat ev_comp);
-  gboolean (*set_iso_speed) (GstPhotography * photo, guint iso_speed);
-  gboolean (*set_aperture) (GstPhotography * photo, guint aperture);
-  gboolean (*set_exposure) (GstPhotography * photo, guint32 exposure);
-  gboolean (*set_white_balance_mode) (GstPhotography * photo,
-    GstPhotographyWhiteBalanceMode wb_mode);
-  gboolean (*set_color_tone_mode) (GstPhotography * photo,
-    GstPhotographyColorToneMode tone_mode);
-  gboolean (*set_scene_mode) (GstPhotography * photo,
-    GstPhotographySceneMode scene_mode);
-  gboolean (*set_flash_mode) (GstPhotography * photo,
-    GstPhotographyFlashMode flash_mode);
-  gboolean (*set_zoom) (GstPhotography * photo, gfloat zoom);
-  gboolean (*set_flicker_mode) (GstPhotography * photo,
-    GstPhotographyFlickerReductionMode flicker_mode);
-  gboolean (*set_focus_mode) (GstPhotography * photo,
-    GstPhotographyFocusMode focus_mode);
-
-  GstPhotographyCaps (*get_capabilities) (GstPhotography * photo);
-  gboolean (*prepare_for_capture) (GstPhotography * photo,
-    GstPhotographyCapturePrepared func, GstCaps *capture_caps, gpointer user_data);
-  void (*set_autofocus) (GstPhotography * photo, gboolean on);
-  gboolean (*set_config) (GstPhotography * photo, GstPhotographySettings * config);
-  gboolean (*get_config) (GstPhotography * photo, GstPhotographySettings * config);
-
-  gboolean (*get_noise_reduction) (GstPhotography * photo,
-    GstPhotographyNoiseReduction * noise_reduction);
-  gboolean (*set_noise_reduction) (GstPhotography * photo,
-    GstPhotographyNoiseReduction noise_reduction);
-
-  /*< private > */
-  gpointer _gst_reserved[GST_PADDING];
-} GstPhotographyInterface;
-
-GType gst_photography_get_type (void);
-
-/* virtual class function wrappers */
-gboolean gst_photography_get_ev_compensation (GstPhotography * photo,
-    gfloat * ev_comp);
-gboolean gst_photography_get_iso_speed (GstPhotography * photo,
-    guint * iso_speed);
-gboolean gst_photography_get_aperture (GstPhotography * photo,
-    guint * aperture);
-gboolean gst_photography_get_exposure (GstPhotography * photo,
-    guint32 * exposure);
-gboolean gst_photography_get_white_balance_mode (GstPhotography * photo,
-    GstPhotographyWhiteBalanceMode * wb_mode);
-gboolean gst_photography_get_color_tone_mode (GstPhotography * photo,
-    GstPhotographyColorToneMode * tone_mode);
-gboolean gst_photography_get_scene_mode (GstPhotography * photo,
-    GstPhotographySceneMode * scene_mode);
-gboolean gst_photography_get_flash_mode (GstPhotography * photo,
-    GstPhotographyFlashMode * flash_mode);
-gboolean gst_photography_get_noise_reduction (GstPhotography * photo,
-    GstPhotographyNoiseReduction * noise_reduction);
-gboolean gst_photography_get_zoom (GstPhotography * photo, gfloat * zoom);
-gboolean gst_photography_get_flicker_mode (GstPhotography * photo,
-    GstPhotographyFlickerReductionMode *mode);
-gboolean gst_photography_get_focus_mode (GstPhotography * photo,
-    GstPhotographyFocusMode *mode);
-
-gboolean gst_photography_set_ev_compensation (GstPhotography * photo,
-    gfloat ev_comp);
-gboolean gst_photography_set_iso_speed (GstPhotography * photo,
-    guint iso_speed);
-gboolean gst_photography_set_aperture (GstPhotography * photo, guint aperture);
-gboolean gst_photography_set_exposure (GstPhotography * photo, guint exposure);
-gboolean gst_photography_set_white_balance_mode (GstPhotography * photo,
-    GstPhotographyWhiteBalanceMode wb_mode);
-gboolean gst_photography_set_color_tone_mode (GstPhotography * photo,
-    GstPhotographyColorToneMode tone_mode);
-gboolean gst_photography_set_scene_mode (GstPhotography * photo,
-    GstPhotographySceneMode scene_mode);
-gboolean gst_photography_set_flash_mode (GstPhotography * photo,
-    GstPhotographyFlashMode flash_mode);
-gboolean gst_photography_set_noise_reduction (GstPhotography * photo,
-    GstPhotographyNoiseReduction noise_reduction);
-gboolean gst_photography_set_zoom (GstPhotography * photo, gfloat zoom);
-gboolean gst_photography_set_flicker_mode (GstPhotography * photo,
-    GstPhotographyFlickerReductionMode mode);
-gboolean gst_photography_set_focus_mode (GstPhotography * photo,
-    GstPhotographyFocusMode mode);
-
-GstPhotographyCaps gst_photography_get_capabilities (GstPhotography * photo);
-
-gboolean gst_photography_prepare_for_capture (GstPhotography * photo,
-    GstPhotographyCapturePrepared func, GstCaps *capture_caps, gpointer user_data);
-
-void gst_photography_set_autofocus (GstPhotography * photo, gboolean on);
-
-gboolean gst_photography_set_config (GstPhotography * photo,
-    GstPhotographySettings * config);
-gboolean gst_photography_get_config (GstPhotography * photo,
-    GstPhotographySettings * config);
-
-G_END_DECLS
-
-#endif /* __GST_PHOTOGRAPHY_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/math-compat.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/math-compat.h
deleted file mode 100644
index d160c2cf..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/math-compat.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GStreamer
- * Copyright (C) 2010 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_MATH_COMPAT_H__
-#define __GST_MATH_COMPAT_H__
-
-/* This header is not included automatically via gst/gst.h, you need to
- * include it explicitly if you need it. */
-
-#ifndef _USE_MATH_DEFINES
-#define _USE_MATH_DEFINES /* so MSVC defines M_PI etc. */
-#endif
-#include <math.h>
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* http://en.wikipedia.org/wiki/Math.h */
-
-#define __GST_MATH_COMPAT_NEED_RINT
-#define __GST_MATH_COMPAT_NEED_RINTF
-#define __GST_MATH_COMPAT_NEED_ISNAN
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#undef __GST_MATH_COMPAT_NEED_RINT
-#undef __GST_MATH_COMPAT_NEED_RINTF
-#undef __GST_MATH_COMPAT_NEED_ISNAN
-#endif
-
-#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
-#undef __GST_MATH_COMPAT_NEED_RINT
-#undef __GST_MATH_COMPAT_NEED_RINTF
-#undef __GST_MATH_COMPAT_NEED_ISNAN
-#endif
-
-#ifndef M_PI
-#define M_PI G_PI
-#endif
-
-#ifndef M_PI_2
-#define M_PI_2 G_PI_2
-#endif
-
-#ifndef M_PI_4
-#define M_PI_4 G_PI_4
-#endif
-
-static inline double
-__gst_math_compat_rint (double x)
-{
-  return floor (x + 0.5);
-}
-
-static inline float
-__gst_math_compat_rintf (float x)
-{
-  return floorf (x + 0.5);
-}
-
-static inline gboolean
-__gst_math_compat_isnan (double x)
-{
-  return x != x;
-}
-
-#if defined (__GST_MATH_COMPAT_NEED_RINT) && !defined (rint)
-#define rint(x) __gst_math_compat_rint(x)
-#endif
-
-#if defined (__GST_MATH_COMPAT_NEED_RINTF) && !defined (rintf)
-#define rintf(x) __gst_math_compat_rintf(x)
-#endif
-
-#if defined (__GST_MATH_COMPAT_NEED_ISNAN) && !defined (isnan)
-#define isnan(x) __gst_math_compat_isnan (x)
-#endif
-
-#ifndef NAN
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-#define __GST_NAN_BYTES        { 0x7f, 0xc0, 0, 0 }
-#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define __GST_NAN_BYTES        { 0, 0, 0xc0, 0x7f }
-#endif
-static union {
-  unsigned char __c[4];
-  float __d;
-} __gst_nan_union G_GNUC_UNUSED = {
-  __GST_NAN_BYTES
-};
-#define NAN    (__gst_nan_union.__d)
-#endif
-
-G_END_DECLS
-
-#endif /* __GST_MATH_COMPAT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnet.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnet.h
deleted file mode 100644
index 078cad59..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnet.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_NET_H__
-#define __GST_NET_H__
-
-
-#include <gst/net/gstnetclientclock.h>
-#include <gst/net/gstnettimepacket.h>
-#include <gst/net/gstnettimeprovider.h>
-
-
-#endif /* __GST_NET_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnetaddressmeta.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnetaddressmeta.h
deleted file mode 100644
index 0173d874..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnetaddressmeta.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_NET_ADDRESS_META_H__
-#define __GST_NET_ADDRESS_META_H__
-
-#include <gst/gst.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstNetAddressMeta GstNetAddressMeta;
-
-/**
- * GstNetAddressMeta:
- *
- * Buffer metadata for network addresses.
- */
-struct _GstNetAddressMeta {
-  GstMeta       meta;
-
-  GSocketAddress *addr;
-};
-
-GType gst_net_address_meta_api_get_type (void);
-#define GST_NET_ADDRESS_META_API_TYPE (gst_net_address_meta_api_get_type())
-
-#define gst_buffer_get_net_address_meta(b) \
-  ((GstNetAddressMeta*)gst_buffer_get_meta((b),GST_NET_ADDRESS_META_API_TYPE))
-
-/* implementation */
-const GstMetaInfo *gst_net_address_meta_get_info (void);
-#define GST_NET_ADDRESS_META_INFO (gst_net_address_meta_get_info())
-
-GstNetAddressMeta * gst_buffer_add_net_address_meta (GstBuffer      *buffer,
-                                                     GSocketAddress *addr);
-
-G_END_DECLS
-
-#endif /* __GST_NET_ADDRESS_META_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnetclientclock.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnetclientclock.h
deleted file mode 100644
index a0fcf1f9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnetclientclock.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *                    2005 Andy Wingo <wingo@pobox.com>
- * Copyright (C) 2012 Collabora Ltd. <tim.muller@collabora.co.uk>
- *
- * gstnetclientclock.h: clock that synchronizes itself to a time provider over
- * the network
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_NET_CLIENT_CLOCK_H__
-#define __GST_NET_CLIENT_CLOCK_H__
-
-#include <gst/gst.h>
-#include <gst/gstsystemclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_NET_CLIENT_CLOCK \
-  (gst_net_client_clock_get_type())
-#define GST_NET_CLIENT_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_NET_CLIENT_CLOCK,GstNetClientClock))
-#define GST_NET_CLIENT_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NET_CLIENT_CLOCK,GstNetClientClockClass))
-#define GST_IS_NET_CLIENT_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NET_CLIENT_CLOCK))
-#define GST_IS_NET_CLIENT_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NET_CLIENT_CLOCK))
-
-typedef struct _GstNetClientClock GstNetClientClock;
-typedef struct _GstNetClientClockClass GstNetClientClockClass;
-typedef struct _GstNetClientClockPrivate GstNetClientClockPrivate;
-
-/**
- * GstNetClientClock:
- *
- * Opaque #GstNetClientClock structure.
- */
-struct _GstNetClientClock {
-  GstSystemClock clock;
-
-  /*< private >*/
-  GstNetClientClockPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstNetClientClockClass {
-  GstSystemClockClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_net_client_clock_get_type	(void);
-
-GstClock*	gst_net_client_clock_new	(gchar *name, const gchar *remote_address,
-                                                 gint remote_port, GstClockTime base_time);
-
-G_END_DECLS
-
-#endif /* __GST_NET_CLIENT_CLOCK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnettimepacket.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnettimepacket.h
deleted file mode 100644
index 88395967..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnettimepacket.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_NET_TIME_PACKET_H__
-#define __GST_NET_TIME_PACKET_H__
-
-#include <gst/gst.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_NET_TIME_PACKET_SIZE:
- *
- * The size of the packets sent between network clocks.
- */
-#define GST_NET_TIME_PACKET_SIZE 16
-
-typedef struct _GstNetTimePacket GstNetTimePacket;
-
-/**
- * GstNetTimePacket:
- * @local_time: the local time when this packet was sent
- * @remote_time: the remote time observation
- *
- * Content of a #GstNetTimePacket.
- */
-struct _GstNetTimePacket {
-  GstClockTime local_time;
-  GstClockTime remote_time;
-};
-
-GType gst_net_time_packet_get_type(void);
-
-GstNetTimePacket*       gst_net_time_packet_new         (const guint8 *buffer);
-GstNetTimePacket*       gst_net_time_packet_copy        (const GstNetTimePacket *packet);
-void                    gst_net_time_packet_free        (GstNetTimePacket *packet);
-
-guint8*                 gst_net_time_packet_serialize   (const GstNetTimePacket *packet);
-
-GstNetTimePacket*	gst_net_time_packet_receive     (GSocket         * socket,
-                                                         GSocketAddress ** src_address,
-                                                         GError         ** error);
-
-gboolean                gst_net_time_packet_send        (const GstNetTimePacket * packet,
-                                                         GSocket                * socket,
-                                                         GSocketAddress         * dest_address,
-                                                         GError                ** error);
-
-G_END_DECLS
-
-
-#endif /* __GST_NET_TIME_PACKET_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnettimeprovider.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnettimeprovider.h
deleted file mode 100644
index 81c0fbe9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/net/gstnettimeprovider.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* GStreamer
- * Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
- *               2006 Joni Valtanen <joni.valtanen@movial.fi>
- * Copyright (C) 2012 Collabora Ltd. <tim.muller@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_NET_TIME_PROVIDER_H__
-#define __GST_NET_TIME_PROVIDER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_NET_TIME_PROVIDER \
-  (gst_net_time_provider_get_type())
-#define GST_NET_TIME_PROVIDER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_NET_TIME_PROVIDER,GstNetTimeProvider))
-#define GST_NET_TIME_PROVIDER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NET_TIME_PROVIDER,GstNetTimeProviderClass))
-#define GST_IS_NET_TIME_PROVIDER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NET_TIME_PROVIDER))
-#define GST_IS_NET_TIME_PROVIDER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NET_TIME_PROVIDER))
-
-typedef struct _GstNetTimeProvider GstNetTimeProvider;
-typedef struct _GstNetTimeProviderClass GstNetTimeProviderClass;
-typedef struct _GstNetTimeProviderPrivate GstNetTimeProviderPrivate;
-
-/**
- * GstNetTimeProvider:
- *
- * Opaque #GstNetTimeProvider structure.
- */
-struct _GstNetTimeProvider {
-  GstObject parent;
-
-  /*< private >*/
-  GstNetTimeProviderPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstNetTimeProviderClass {
-  GstObjectClass parent_class;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType                   gst_net_time_provider_get_type  (void);
-
-GstNetTimeProvider*     gst_net_time_provider_new       (GstClock *clock,
-                                                         const gchar *address,
-                                                         gint port);
-
-G_END_DECLS
-
-
-#endif /* __GST_NET_TIME_PROVIDER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/codec-utils.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/codec-utils.h
deleted file mode 100644
index 7c2febf7..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/codec-utils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GStreamer base utils library codec-specific utility functions
- * Copyright (C) 2010 Arun Raghavan <arun.raghavan@collabora.co.uk>
- *               2010 Collabora Multimedia
- *               2010 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_CODEC_UTILS_H__
-#define __GST_PB_UTILS_CODEC_UTILS_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/* AAC */
-
-guint         gst_codec_utils_aac_get_sample_rate_from_index (guint sr_idx);
-
-const gchar * gst_codec_utils_aac_get_profile (const guint8 * audio_config, guint len);
-
-const gchar * gst_codec_utils_aac_get_level   (const guint8 * audio_config, guint len);
-
-gboolean      gst_codec_utils_aac_caps_set_level_and_profile (GstCaps      * caps,
-                                                              const guint8 * audio_config,
-                                                              guint          len);
-
-/* H.264 */
-
-const gchar * gst_codec_utils_h264_get_profile (const guint8 * sps, guint len);
-
-const gchar * gst_codec_utils_h264_get_level   (const guint8 * sps, guint len);
-
-guint8        gst_codec_utils_h264_get_level_idc (const gchar * level);
-
-gboolean      gst_codec_utils_h264_caps_set_level_and_profile (GstCaps      * caps,
-                                                               const guint8 * sps,
-                                                               guint          len);
-
-/* MPEG-4 part 2 */
-
-const gchar * gst_codec_utils_mpeg4video_get_profile (const guint8 * vis_obj_seq, guint len);
-
-const gchar * gst_codec_utils_mpeg4video_get_level   (const guint8 * vis_obj_seq, guint len);
-
-gboolean      gst_codec_utils_mpeg4video_caps_set_level_and_profile (GstCaps      * caps,
-                                                                     const guint8 * vis_obj_seq,
-                                                                     guint          len);
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_CODEC_UTILS_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/descriptions.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/descriptions.h
deleted file mode 100644
index 5b19ecca..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/descriptions.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GStreamer base utils library source/sink/codec description support
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_DESCRIPTIONS_H__
-#define __GST_PB_UTILS_DESCRIPTIONS_H__
-
-#include <gst/gsttaglist.h>
-#include <gst/gstcaps.h>
-
-G_BEGIN_DECLS
-
-/*
- * functions for use by demuxers or decoders to add CODEC tags to tag lists
- * from caps
- */
-
-gboolean   gst_pb_utils_add_codec_description_to_tag_list (GstTagList    * taglist,
-                                                             const gchar   * codec_tag,
-                                                             const GstCaps * caps);
-
-gchar    * gst_pb_utils_get_codec_description (const GstCaps * caps);
-
-/*
- * functions mainly used by the missing plugins message creation functions to
- * find descriptions of what exactly is missing
- */
-
-gchar    * gst_pb_utils_get_source_description (const gchar * protocol);
-
-gchar    * gst_pb_utils_get_sink_description (const gchar * protocol);
-
-gchar    * gst_pb_utils_get_decoder_description (const GstCaps * caps);
-
-gchar    * gst_pb_utils_get_encoder_description (const GstCaps * caps);
-
-gchar    * gst_pb_utils_get_element_description (const gchar * factory_name);
-
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_DESCRIPTIONS_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/encoding-profile.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/encoding-profile.h
deleted file mode 100644
index f6de6ed3..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/encoding-profile.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* GStreamer encoding profiles library
- * Copyright (C) 2009-2010 Edward Hervey <edward.hervey@collabora.co.uk>
- *           (C) 2009-2010 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PROFILE_H__
-#define __GST_PROFILE_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#include <gst/pbutils/pbutils-enumtypes.h>
-#include <gst/pbutils/gstdiscoverer.h>
-
-/**
- * GstEncodingProfile:
- *
- * The opaque base class object for all encoding profiles. This contains generic
- * information like name, description, format and preset.
- */
-
-#define GST_TYPE_ENCODING_PROFILE                       \
-  (gst_encoding_profile_get_type ())
-#define GST_ENCODING_PROFILE(obj)                       \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_PROFILE, GstEncodingProfile))
-#define GST_IS_ENCODING_PROFILE(obj)                    \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_PROFILE))
-typedef struct _GstEncodingProfile GstEncodingProfile;
-typedef struct _GstEncodingProfileClass GstEncodingProfileClass;
-GType gst_encoding_profile_get_type (void);
-
-
-
-/**
- * GstEncodingContainerProfile:
- *
- * Encoding profiles for containers. Keeps track of a list of #GstEncodingProfile
- */
-#define GST_TYPE_ENCODING_CONTAINER_PROFILE                     \
-  (gst_encoding_container_profile_get_type ())
-#define GST_ENCODING_CONTAINER_PROFILE(obj)                     \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_CONTAINER_PROFILE, GstEncodingContainerProfile))
-#define GST_IS_ENCODING_CONTAINER_PROFILE(obj)                  \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_CONTAINER_PROFILE))
-typedef struct _GstEncodingContainerProfile GstEncodingContainerProfile;
-typedef struct _GstEncodingContainerProfileClass GstEncodingContainerProfileClass;
-GType gst_encoding_container_profile_get_type (void);
-
-
-
-/**
- * GstEncodingVideoProfile:
- *
- * Variant of #GstEncodingProfile for video streams, allows specifying the @pass.
- */
-#define GST_TYPE_ENCODING_VIDEO_PROFILE                 \
-  (gst_encoding_video_profile_get_type ())
-#define GST_ENCODING_VIDEO_PROFILE(obj)                 \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_VIDEO_PROFILE, GstEncodingVideoProfile))
-#define GST_IS_ENCODING_VIDEO_PROFILE(obj)                      \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_VIDEO_PROFILE))
-typedef struct _GstEncodingVideoProfile GstEncodingVideoProfile;
-typedef struct _GstEncodingVideoProfileClass GstEncodingVideoProfileClass;
-GType gst_encoding_video_profile_get_type (void);
-
-
-
-/**
- * GstEncodingAudioProfile:
- *
- * Variant of #GstEncodingProfile for audio streams.
- */
-#define GST_TYPE_ENCODING_AUDIO_PROFILE                 \
-  (gst_encoding_audio_profile_get_type ())
-#define GST_ENCODING_AUDIO_PROFILE(obj)                 \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_AUDIO_PROFILE, GstEncodingAudioProfile))
-#define GST_IS_ENCODING_AUDIO_PROFILE(obj)                      \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_AUDIO_PROFILE))
-typedef struct _GstEncodingAudioProfile GstEncodingAudioProfile;
-typedef struct _GstEncodingAudioProfileClass GstEncodingAudioProfileClass;
-GType gst_encoding_audio_profile_get_type (void);
-
-
-
-/* GstEncodingProfile API */
-
-/**
- * gst_encoding_profile_unref:
- * @profile: a #GstEncodingProfile
- *
- * Decreases the reference count of the @profile, possibly freeing the @profile.
- */
-#define gst_encoding_profile_unref(profile) (g_object_unref ((GObject*) profile))
-
-/**
- * gst_encoding_profile_ref:
- * @profile: a #GstEncodingProfile
- *
- * Increases the reference count of the @profile.
- */
-#define gst_encoding_profile_ref(profile) (g_object_ref ((GObject*) profile))
-
-const gchar *   gst_encoding_profile_get_name           (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_name           (GstEncodingProfile *profile,
-                                                         const gchar *name);
-const gchar *   gst_encoding_profile_get_description    (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_description    (GstEncodingProfile *profile,
-                                                         const gchar *description);
-GstCaps *       gst_encoding_profile_get_format         (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_format         (GstEncodingProfile *profile,
-                                                         GstCaps *format);
-const gchar *   gst_encoding_profile_get_preset         (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_preset         (GstEncodingProfile *profile,
-                                                         const gchar *preset);
-guint           gst_encoding_profile_get_presence       (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_presence       (GstEncodingProfile *profile,
-                                                         guint presence);
-GstCaps *       gst_encoding_profile_get_restriction    (GstEncodingProfile *profile);
-void            gst_encoding_profile_set_restriction    (GstEncodingProfile *profile,
-                                                         GstCaps *restriction);
-
-gboolean        gst_encoding_profile_is_equal           (GstEncodingProfile *a,
-                                                         GstEncodingProfile *b);
-GstCaps *       gst_encoding_profile_get_input_caps     (GstEncodingProfile *profile);
-const gchar *   gst_encoding_profile_get_type_nick      (GstEncodingProfile *profile);
-
-GstEncodingProfile * gst_encoding_profile_find (const gchar *targetname,
-                                                const gchar *profilename,
-                                                const gchar *category);
-
-/* GstEncodingContainerProfile API */
-gboolean        gst_encoding_container_profile_add_profile       (GstEncodingContainerProfile *container,
-                                                                  GstEncodingProfile *profile);
-gboolean        gst_encoding_container_profile_contains_profile  (GstEncodingContainerProfile * container,
-                                                                  GstEncodingProfile *profile);
-const GList *   gst_encoding_container_profile_get_profiles      (GstEncodingContainerProfile *profile);
-
-
-GstEncodingContainerProfile *  gst_encoding_container_profile_new (const gchar *name,
-                                                                   const gchar *description,
-                                                                   GstCaps *format,
-                                                                   const gchar *preset);
-
-
-/* Invidual stream encodingprofile API */
-GstEncodingVideoProfile * gst_encoding_video_profile_new (GstCaps *format,
-                                                          const gchar *preset,
-                                                          GstCaps *restriction,
-                                                          guint presence);
-GstEncodingAudioProfile * gst_encoding_audio_profile_new (GstCaps *format,
-                                                          const gchar *preset,
-                                                          GstCaps *restriction,
-                                                          guint presence);
-
-guint    gst_encoding_video_profile_get_pass              (GstEncodingVideoProfile *prof);
-gboolean gst_encoding_video_profile_get_variableframerate (GstEncodingVideoProfile *prof);
-
-void     gst_encoding_video_profile_set_pass              (GstEncodingVideoProfile *prof,
-                                                           guint pass);
-void     gst_encoding_video_profile_set_variableframerate (GstEncodingVideoProfile *prof,
-                                                           gboolean variableframerate);
-
-GstEncodingProfile * gst_encoding_profile_from_discoverer (GstDiscovererInfo *info);
-
-G_END_DECLS
-
-#endif /* __GST_PROFILE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/encoding-target.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/encoding-target.h
deleted file mode 100644
index bdfe3065..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/encoding-target.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* GStreamer encoding profile registry
- * Copyright (C) 2010 Edward Hervey <edward.hervey@collabora.co.uk>
- *           (C) 2010 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PROFILE_REGISTRY_H__
-#define __GST_PROFILE_REGISTRY_H__
-
-#include <gst/pbutils/encoding-profile.h>
-
-G_BEGIN_DECLS
-
-
-/* FIXME/UNKNOWNS
- *
- * Should encoding categories be well-known strings/quarks ?
- *
- */
-
-/**
- * GST_ENCODING_CATEGORY_DEVICE:
- *
- * #GstEncodingTarget category for device-specific targets.
- * The name of the target will usually be the constructor and model of the device,
- * and that target will contain #GstEncodingProfiles suitable for that device.
- */
-#define GST_ENCODING_CATEGORY_DEVICE            "device"
-
-/**
- * GST_ENCODING_CATEGORY_ONLINE_SERVICE:
- *
- * #GstEncodingTarget category for online-services.
- * The name of the target will usually be the name of the online service
- * and that target will contain #GstEncodingProfiles suitable for that online
- * service.
- */
-
-#define GST_ENCODING_CATEGORY_ONLINE_SERVICE    "online-service"
-
-/**
- * GST_ENCODING_CATEGORY_STORAGE_EDITING:
- *
- * #GstEncodingTarget category for storage, archiving and editing targets.
- * Those targets can be lossless and/or provide very fast random access content.
- * The name of the target will usually be the container type or editing target,
- * and that target will contain #GstEncodingProfiles suitable for editing or
- * storage.
- */
-#define GST_ENCODING_CATEGORY_STORAGE_EDITING   "storage-editing"
-
-/**
- * GST_ENCODING_CATEGORY_CAPTURE:
- *
- * #GstEncodingTarget category for recording and capture.
- * Targets within this category are optimized for low latency encoding.
- */
-#define GST_ENCODING_CATEGORY_CAPTURE           "capture"
-
-/**
- * GstEncodingTarget:
- *
- * Collection of #GstEncodingProfile for a specific target or use-case.
- *
- * When being stored/loaded, targets come from a specific category, like
- * #GST_ENCODING_CATEGORY_DEVICE.
- */
-#define GST_TYPE_ENCODING_TARGET                        \
-  (gst_encoding_target_get_type ())
-#define GST_ENCODING_TARGET(obj)                        \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_TARGET, GstEncodingTarget))
-#define GST_IS_ENCODING_TARGET(obj)                     \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_TARGET))
-
-typedef struct _GstEncodingTarget GstEncodingTarget;
-typedef GObjectClass GstEncodingTargetClass;
-
-GType gst_encoding_target_get_type (void);
-
-/**
- * gst_encoding_target_unref:
- * @target: a #GstEncodingTarget
- *
- * Decreases the reference count of the @target, possibly freeing it.
- */
-#define gst_encoding_target_unref(target) \
-  (g_object_unref ((GObject*) target))
-
-/**
- * gst_encoding_target_ref:
- * @target: a #GstEncodingTarget
- *
- * Increases the reference count of the @target.
- */
-#define gst_encoding_target_ref(target) \
-  (g_object_ref ((GObject*) target))
-
-GstEncodingTarget *     gst_encoding_target_new                 (const gchar *name,
-                                                                 const gchar *category,
-                                                                 const gchar *description,
-                                                                 const GList *profiles);
-
-const gchar *           gst_encoding_target_get_name            (GstEncodingTarget *target);
-const gchar *           gst_encoding_target_get_category        (GstEncodingTarget *target);
-const gchar *           gst_encoding_target_get_description     (GstEncodingTarget *target);
-const GList *           gst_encoding_target_get_profiles        (GstEncodingTarget *target);
-GstEncodingProfile *    gst_encoding_target_get_profile         (GstEncodingTarget *target,
-                                                                 const gchar *name);
-
-gboolean                gst_encoding_target_add_profile         (GstEncodingTarget *target,
-                                                                 GstEncodingProfile *profile);
-
-gboolean                gst_encoding_target_save                (GstEncodingTarget *target,
-                                                                 GError **error);
-gboolean                gst_encoding_target_save_to_file        (GstEncodingTarget *target,
-                                                                 const gchar *filepath,
-                                                                 GError **error);
-GstEncodingTarget *     gst_encoding_target_load                (const gchar *name,
-                                                                 const gchar *category,
-                                                                 GError **error);
-GstEncodingTarget *     gst_encoding_target_load_from_file      (const gchar *filepath,
-                                                                 GError **error);
-
-GList *                 gst_encoding_list_available_categories  (void);
-GList *                 gst_encoding_list_all_targets           (const gchar * categoryname);
-
-G_END_DECLS
-
-#endif  /* __GST_PROFILE_REGISTRY_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/gstdiscoverer.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/gstdiscoverer.h
deleted file mode 100644
index d71272ca..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/gstdiscoverer.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Edward Hervey <edward.hervey@collabora.co.uk>
- *               2009 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_DISCOVERER_H_
-#define _GST_DISCOVERER_H_
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_DISCOVERER_STREAM_INFO \
-  (gst_discoverer_stream_info_get_type ())
-#define GST_DISCOVERER_STREAM_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_STREAM_INFO, GstDiscovererStreamInfo))
-#define GST_IS_DISCOVERER_STREAM_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_STREAM_INFO))
-typedef struct _GstDiscovererStreamInfo GstDiscovererStreamInfo;
-typedef GObjectClass GstDiscovererStreamInfoClass;
-GType gst_discoverer_stream_info_get_type (void);
-
-/**
- * GstDiscovererStreamInfo:
- *
- * Base structure for information concerning a media stream. Depending on the
- * stream type, one can find more media-specific information in
- * #GstDiscovererAudioInfo, #GstDiscovererVideoInfo, and
- * #GstDiscovererContainerInfo.
- *
- * The #GstDiscovererStreamInfo represents the topology of the stream. Siblings
- * can be iterated over with gst_discoverer_stream_info_get_next() and
- * gst_discoverer_stream_info_get_previous(). Children (sub-streams) of a
- * stream can be accessed using the #GstDiscovererContainerInfo API.
- *
- * As a simple example, if you run #GstDiscoverer on an AVI file with one audio
- * and one video stream, you will get a #GstDiscovererContainerInfo
- * corresponding to the AVI container, which in turn will have a
- * #GstDiscovererAudioInfo sub-stream and a #GstDiscovererVideoInfo sub-stream
- * for the audio and video streams respectively.
- */
-#define gst_discoverer_stream_info_ref(info) ((GstDiscovererStreamInfo*) g_object_ref((GObject*) info))
-#define gst_discoverer_stream_info_unref(info) (g_object_unref((GObject*) info))
-
-GstDiscovererStreamInfo* gst_discoverer_stream_info_get_previous(GstDiscovererStreamInfo* info);
-GstDiscovererStreamInfo* gst_discoverer_stream_info_get_next(GstDiscovererStreamInfo* info);
-GstCaps*                 gst_discoverer_stream_info_get_caps(GstDiscovererStreamInfo* info);
-const GstTagList*        gst_discoverer_stream_info_get_tags(GstDiscovererStreamInfo* info);
-const GstToc*            gst_discoverer_stream_info_get_toc(GstDiscovererStreamInfo* info);
-const GstStructure*      gst_discoverer_stream_info_get_misc(GstDiscovererStreamInfo* info);
-const gchar *            gst_discoverer_stream_info_get_stream_type_nick(GstDiscovererStreamInfo* info);
-
-/**
- * GstDiscovererContainerInfo:
- *
- * #GstDiscovererStreamInfo specific to container streams.
- */
-#define GST_TYPE_DISCOVERER_CONTAINER_INFO \
-  (gst_discoverer_container_info_get_type ())
-#define GST_DISCOVERER_CONTAINER_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_CONTAINER_INFO, GstDiscovererContainerInfo))
-#define GST_IS_DISCOVERER_CONTAINER_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_CONTAINER_INFO))
-typedef struct _GstDiscovererContainerInfo GstDiscovererContainerInfo;
-typedef GObjectClass GstDiscovererContainerInfoClass;
-
-GType gst_discoverer_container_info_get_type (void);
-
-GList *gst_discoverer_container_info_get_streams(GstDiscovererContainerInfo *info);
-
-
-/**
- * GstDiscovererAudioInfo:
- *
- * #GstDiscovererStreamInfo specific to audio streams.
- */
-#define GST_TYPE_DISCOVERER_AUDIO_INFO \
-  (gst_discoverer_audio_info_get_type ())
-#define GST_DISCOVERER_AUDIO_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_AUDIO_INFO, GstDiscovererAudioInfo))
-#define GST_IS_DISCOVERER_AUDIO_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_AUDIO_INFO))
-typedef struct _GstDiscovererAudioInfo GstDiscovererAudioInfo;
-typedef GObjectClass GstDiscovererAudioInfoClass;
-
-GType gst_discoverer_audio_info_get_type (void);
-
-guint gst_discoverer_audio_info_get_channels(const GstDiscovererAudioInfo* info);
-guint gst_discoverer_audio_info_get_sample_rate(const GstDiscovererAudioInfo* info);
-guint gst_discoverer_audio_info_get_depth(const GstDiscovererAudioInfo* info);
-guint gst_discoverer_audio_info_get_bitrate(const GstDiscovererAudioInfo* info);
-guint gst_discoverer_audio_info_get_max_bitrate(const GstDiscovererAudioInfo* info);
-const gchar * gst_discoverer_audio_info_get_language(const GstDiscovererAudioInfo* info);
-
-/**
- * GstDiscovererVideoInfo:
- *
- * #GstDiscovererStreamInfo specific to video streams (this includes images).
- */
-#define GST_TYPE_DISCOVERER_VIDEO_INFO \
-  (gst_discoverer_video_info_get_type ())
-#define GST_DISCOVERER_VIDEO_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_VIDEO_INFO, GstDiscovererVideoInfo))
-#define GST_IS_DISCOVERER_VIDEO_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_VIDEO_INFO))
-typedef struct _GstDiscovererVideoInfo GstDiscovererVideoInfo;
-typedef GObjectClass GstDiscovererVideoInfoClass;
-GType gst_discoverer_video_info_get_type (void);
-
-guint           gst_discoverer_video_info_get_width(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_height(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_depth(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_framerate_num(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_framerate_denom(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_par_num(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_par_denom(const GstDiscovererVideoInfo* info);
-gboolean        gst_discoverer_video_info_is_interlaced(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_bitrate(const GstDiscovererVideoInfo* info);
-guint           gst_discoverer_video_info_get_max_bitrate(const GstDiscovererVideoInfo* info);
-gboolean        gst_discoverer_video_info_is_image(const GstDiscovererVideoInfo* info);
-
-/**
- * GstDiscovererSubtitleInfo:
- *
- * #GstDiscovererStreamInfo specific to subtitle streams (this includes text and
- * image based ones).
- */
-#define GST_TYPE_DISCOVERER_SUBTITLE_INFO \
-  (gst_discoverer_subtitle_info_get_type ())
-#define GST_DISCOVERER_SUBTITLE_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_SUBTITLE_INFO, GstDiscovererSubtitleInfo))
-#define GST_IS_DISCOVERER_SUBTITLE_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_SUBTITLE_INFO))
-typedef struct _GstDiscovererSubtitleInfo GstDiscovererSubtitleInfo;
-typedef GObjectClass GstDiscovererSubtitleInfoClass;
-GType gst_discoverer_subtitle_info_get_type (void);
-
-const gchar *   gst_discoverer_subtitle_info_get_language(const GstDiscovererSubtitleInfo* info);
-
-/**
- * GstDiscovererResult:
- * @GST_DISCOVERER_OK: The discovery was successful
- * @GST_DISCOVERER_URI_INVALID: the URI is invalid
- * @GST_DISCOVERER_ERROR: an error happened and the GError is set
- * @GST_DISCOVERER_TIMEOUT: the discovery timed-out
- * @GST_DISCOVERER_BUSY: the discoverer was already discovering a file
- * @GST_DISCOVERER_MISSING_PLUGINS: Some plugins are missing for full discovery
- *
- * Result values for the discovery process.
- */
-typedef enum {
-  GST_DISCOVERER_OK               = 0,
-  GST_DISCOVERER_URI_INVALID      = 1,
-  GST_DISCOVERER_ERROR            = 2,
-  GST_DISCOVERER_TIMEOUT          = 3,
-  GST_DISCOVERER_BUSY             = 4,
-  GST_DISCOVERER_MISSING_PLUGINS  = 5
-} GstDiscovererResult;
-
-
-/**
- * GstDiscovererInfo:
- *
- * Structure containing the information of a URI analyzed by #GstDiscoverer.
- */
-typedef struct _GstDiscovererInfo GstDiscovererInfo;
-
-#define GST_TYPE_DISCOVERER_INFO \
-  (gst_discoverer_info_get_type ())
-#define GST_DISCOVERER_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER_INFO, GstDiscovererInfo))
-#define GST_IS_DISCOVERER_INFO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER_INFO))
-typedef GObjectClass GstDiscovererInfoClass;
-GType gst_discoverer_info_get_type (void);
-
-#define gst_discoverer_info_unref(info) (g_object_unref((GObject*)info))
-#define gst_discoverer_info_ref(info) (g_object_ref((Gbject*)info))
-
-GstDiscovererInfo*        gst_discoverer_info_copy (GstDiscovererInfo * ptr);
-
-const gchar*              gst_discoverer_info_get_uri(const GstDiscovererInfo* info);
-GstDiscovererResult       gst_discoverer_info_get_result(const GstDiscovererInfo* info);
-GstDiscovererStreamInfo*  gst_discoverer_info_get_stream_info(GstDiscovererInfo* info);
-GList*                    gst_discoverer_info_get_stream_list(GstDiscovererInfo* info);
-GstClockTime              gst_discoverer_info_get_duration(const GstDiscovererInfo* info);
-gboolean                  gst_discoverer_info_get_seekable(const GstDiscovererInfo* info);
-const GstStructure*       gst_discoverer_info_get_misc(const GstDiscovererInfo* info);
-const GstTagList*         gst_discoverer_info_get_tags(const GstDiscovererInfo* info); 
-const GstToc*             gst_discoverer_info_get_toc(const GstDiscovererInfo* info);
-
-GList *                   gst_discoverer_info_get_streams (GstDiscovererInfo *info,
-							   GType streamtype);
-GList *                   gst_discoverer_info_get_audio_streams (GstDiscovererInfo *info);
-GList *                   gst_discoverer_info_get_video_streams (GstDiscovererInfo *info);
-GList *                   gst_discoverer_info_get_subtitle_streams (GstDiscovererInfo *info);
-GList *                   gst_discoverer_info_get_container_streams (GstDiscovererInfo *info);
-
-void                      gst_discoverer_stream_info_list_free (GList *infos);
-
-#define GST_TYPE_DISCOVERER \
-  (gst_discoverer_get_type())
-#define GST_DISCOVERER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DISCOVERER,GstDiscoverer))
-#define GST_DISCOVERER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DISCOVERER,GstDiscovererClass))
-#define GST_IS_DISCOVERER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DISCOVERER))
-#define GST_IS_DISCOVERER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DISCOVERER))
-
-typedef struct _GstDiscoverer GstDiscoverer;
-typedef struct _GstDiscovererClass GstDiscovererClass;
-typedef struct _GstDiscovererPrivate GstDiscovererPrivate;
-
-/**
- * GstDiscoverer:
- *
- * The #GstDiscoverer structure.
- **/
-struct _GstDiscoverer {
-  GObject parent;
-
-  /*< private >*/
-  GstDiscovererPrivate *priv;
-
-  gpointer _reserved[GST_PADDING];
-};
-
-struct _GstDiscovererClass {
-  GObjectClass parentclass;
-
-  /* signals */
-  void        (*finished)        (GstDiscoverer *discoverer);
-  void        (*starting)        (GstDiscoverer *discoverer);
-  void        (*discovered)      (GstDiscoverer *discoverer,
-                                  GstDiscovererInfo *info,
-				  const GError *err);
-  void        (*source_setup)    (GstDiscoverer *discoverer,
-                                  GstElement *source);
-
-  gpointer _reserved[GST_PADDING];
-};
-
-GType          gst_discoverer_get_type (void);
-GstDiscoverer *gst_discoverer_new (GstClockTime timeout, GError **err);
-
-/* Asynchronous API */
-void           gst_discoverer_start (GstDiscoverer *discoverer);
-void           gst_discoverer_stop (GstDiscoverer *discoverer);
-gboolean       gst_discoverer_discover_uri_async (GstDiscoverer *discoverer,
-						  const gchar *uri);
-
-/* Synchronous API */
-GstDiscovererInfo *
-gst_discoverer_discover_uri (GstDiscoverer * discoverer,
-			     const gchar * uri,
-			     GError ** err);
-
-G_END_DECLS
-
-#endif /* _GST_DISCOVERER_H */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/gstpluginsbaseversion.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/gstpluginsbaseversion.h
deleted file mode 100644
index c8ff07a2..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/gstpluginsbaseversion.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* GStreamer base plugins libraries version information
- * Copyright (C) 2010 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PLUGINS_BASE_VERSION_H__
-#define __GST_PLUGINS_BASE_VERSION_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_PLUGINS_BASE_VERSION_MAJOR:
- *
- * The major version of GStreamer's gst-plugins-base libraries at compile time.
- */
-#define GST_PLUGINS_BASE_VERSION_MAJOR (1)
-/**
- * GST_PLUGINS_BASE_VERSION_MINOR:
- *
- * The minor version of GStreamer's gst-plugins-base libraries at compile time.
- */
-#define GST_PLUGINS_BASE_VERSION_MINOR (0)
-/**
- * GST_PLUGINS_BASE_VERSION_MICRO:
- *
- * The micro version of GStreamer's gst-plugins-base libraries at compile time.
- */
-#define GST_PLUGINS_BASE_VERSION_MICRO (5)
-/**
- * GST_PLUGINS_BASE_VERSION_NANO:
- *
- * The nano version of GStreamer's gst-plugins-base libraries at compile time.
- * Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
- */
-#define GST_PLUGINS_BASE_VERSION_NANO (0)
-
-/**
- * GST_CHECK_PLUGIN_BASE_VERSION:
- * @major: a number indicating the major version
- * @minor: a number indicating the minor version
- * @micro: a number indicating the micro version
- *
- * Check whether a GStreamer's gst-plugins-base libraries' version equal to
- * or greater than major.minor.micro is present.
- */
-#define	GST_CHECK_PLUGINS_BASE_VERSION(major,minor,micro)	\
-    (GST_PLUGINS_BASE_VERSION_MAJOR > (major) || \
-     (GST_PLUGINS_BASE_VERSION_MAJOR == (major) && GST_PLUGINS_BASE_VERSION_MINOR > (minor)) || \
-     (GST_PLUGINS_BASE_VERSION_MAJOR == (major) && GST_PLUGINS_BASE_VERSION_MINOR == (minor) && \
-      GST_PLUGINS_BASE_VERSION_MICRO >= (micro)) || \
-     (GST_PLUGINS_BASE_VERSION_MAJOR == (major) && GST_PLUGINS_BASE_VERSION_MINOR == (minor) && \
-      GST_PLUGINS_BASE_VERSION_MICRO + 1 == (micro) && GST_PLUGINS_BASE_VERSION_NANO > 0))
-
-void     gst_plugins_base_version (guint *major, guint *minor, guint *micro, guint *nano);
-
-gchar *  gst_plugins_base_version_string (void);
-
-G_END_DECLS
-
-#endif /* __GST_PLUGINS_BASE_VERSION_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/install-plugins.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/install-plugins.h
deleted file mode 100644
index 173adb1b..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/install-plugins.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GStreamer base utils library plugin install support for applications
- * Copyright (C) 2007 Tim-Philipp Müller <tim centricular net>
- * Copyright (C) 2006 Ryan Lortie <desrt desrt ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_INSTALL_PLUGINS_H__
-#define __GST_PB_UTILS_INSTALL_PLUGINS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/*
- * functions for use by applications to initiate installation of missing plugins
- */
-
-/**
- * GstInstallPluginsReturn:
- * @GST_INSTALL_PLUGINS_SUCCESS: all of the requested plugins could be
- *     installed
- * @GST_INSTALL_PLUGINS_NOT_FOUND: no appropriate installation candidate for
- *     any of the requested plugins could be found. Only return this if nothing
- *     has been installed. Return #GST_INSTALL_PLUGINS_PARTIAL_SUCCESS if
- *     some (but not all) of the requested plugins could be installed.
- * @GST_INSTALL_PLUGINS_ERROR: an error occured during the installation. If
- *     this happens, the  user has already seen an error message and another
- *     one should not be displayed
- * @GST_INSTALL_PLUGINS_CRASHED: the installer had an unclean exit code
- *     (ie. death by signal)
- * @GST_INSTALL_PLUGINS_PARTIAL_SUCCESS: some of the requested plugins could
- *     be installed, but not all
- * @GST_INSTALL_PLUGINS_USER_ABORT: the user has aborted the installation
- * @GST_INSTALL_PLUGINS_INVALID: the helper returned an invalid status code
- * @GST_INSTALL_PLUGINS_STARTED_OK: returned by gst_install_plugins_async() to
- *     indicate that everything went fine so far and the provided callback
- *     will be called with the result of the installation later
- * @GST_INSTALL_PLUGINS_INTERNAL_FAILURE: some internal failure has
- *     occured when trying to start the installer
- * @GST_INSTALL_PLUGINS_HELPER_MISSING: the helper script to call the
- *     actual installer is not installed
- * @GST_INSTALL_PLUGINS_INSTALL_IN_PROGRESS: a previously-started plugin
- *     installation is still in progress, try again later
- *
- * Result codes returned by gst_install_plugins_async() and
- * gst_install_plugins_sync(), and also the result code passed to the
- * #GstInstallPluginsResultFunc specified with gst_install_plugins_async().
- *
- * These codes indicate success or failure of starting an external installer
- * program and to what extent the requested plugins could be installed.
- */
-typedef enum {
-  /* Return codes from the installer. Returned by gst_install_plugins_sync(),
-   * or passed as result code to your #GstInstallPluginsResultFunc */
-  GST_INSTALL_PLUGINS_SUCCESS = 0,
-  GST_INSTALL_PLUGINS_NOT_FOUND = 1,
-  GST_INSTALL_PLUGINS_ERROR = 2,
-  GST_INSTALL_PLUGINS_PARTIAL_SUCCESS = 3,
-  GST_INSTALL_PLUGINS_USER_ABORT = 4,
-
-  /* Returned by gst_install_plugins_sync(), or passed as result code to your
-   * #GstInstallPluginsResultFunc */
-  GST_INSTALL_PLUGINS_CRASHED = 100,
-  GST_INSTALL_PLUGINS_INVALID,
-
-  /* Return codes from starting the external helper, may be returned by both
-   * gst_install_plugins_sync() and gst_install_plugins_async(), but should
-   * never be seen by a #GstInstallPluginsResultFunc */
-  GST_INSTALL_PLUGINS_STARTED_OK = 200,
-  GST_INSTALL_PLUGINS_INTERNAL_FAILURE,
-  GST_INSTALL_PLUGINS_HELPER_MISSING,
-  GST_INSTALL_PLUGINS_INSTALL_IN_PROGRESS
-} GstInstallPluginsReturn;
-
-/**
- * GstInstallPluginsContext:
- *
- * Opaque context structure for the plugin installation. Use the provided
- * API to set details on it.
- */
-
-#define GST_TYPE_INSTALL_PLUGINS_CONTEXT	(gst_install_plugins_context_get_type())
-
-typedef struct _GstInstallPluginsContext GstInstallPluginsContext;
-
-GstInstallPluginsContext * gst_install_plugins_context_new (void);
-
-void   gst_install_plugins_context_free    (GstInstallPluginsContext * ctx);
-
-void   gst_install_plugins_context_set_xid (GstInstallPluginsContext * ctx,
-                                            guint                      xid);
-
-GType  gst_install_plugins_context_get_type (void);
-
-/**
- * GstInstallPluginsResultFunc:
- * @result: whether the installation of the requested plugins succeeded or not
- * @user_data: the user data passed to gst_install_plugins_async()
- *
- * The prototype of the callback function that will be called once the
- * external plugin installer program has returned. You only need to provide
- * a callback function if you are using the asynchronous interface.
- */
-typedef void (*GstInstallPluginsResultFunc) (GstInstallPluginsReturn  result,
-                                             gpointer                 user_data);
-
-GstInstallPluginsReturn  gst_install_plugins_async (const gchar * const * details,
-                                                    GstInstallPluginsContext  * ctx,
-                                                    GstInstallPluginsResultFunc func,
-                                                    gpointer                    user_data);
-
-GstInstallPluginsReturn  gst_install_plugins_sync  (const gchar * const       * details,
-                                                    GstInstallPluginsContext  * ctx);
-
-const gchar * gst_install_plugins_return_get_name (GstInstallPluginsReturn ret);
-
-gboolean      gst_install_plugins_installation_in_progress (void);
-
-gboolean      gst_install_plugins_supported (void);
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_INSTALL_PLUGINS_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/missing-plugins.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/missing-plugins.h
deleted file mode 100644
index 508304e4..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/missing-plugins.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* GStreamer base utils library missing plugins support
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_MISSING_PLUGINS_H__
-#define __GST_PB_UTILS_MISSING_PLUGINS_H__
-
-#include <gst/gstmessage.h>
-#include <gst/gstcaps.h>
-
-G_BEGIN_DECLS
-
-/*
- * functions to create missing-plugin messages, for use by plugins primarily
- */
-
-GstMessage * gst_missing_uri_source_message_new (GstElement    * element,
-                                                 const gchar   * protocol);
-
-GstMessage * gst_missing_uri_sink_message_new   (GstElement    * element,
-                                                 const gchar   * protocol);
-
-GstMessage * gst_missing_element_message_new    (GstElement    * element,
-                                                 const gchar   * factory_name);
-
-GstMessage * gst_missing_decoder_message_new    (GstElement    * element,
-                                                 const GstCaps * decode_caps);
-
-GstMessage * gst_missing_encoder_message_new    (GstElement    * element,
-                                                 const GstCaps * encode_caps);
-
-/*
- * functions for use by applications when dealing with missing-plugin messages
- */
-
-gchar       * gst_missing_plugin_message_get_installer_detail (GstMessage * msg);
-
-gchar       * gst_missing_plugin_message_get_description (GstMessage * msg);
-
-gboolean      gst_is_missing_plugin_message (GstMessage * msg);
-
-
-/*
- * functions for use by applications that know exactly what plugins they are
- * missing and want to request them directly rather than just react to
- * missing-plugin messages posted by elements such as playbin or decodebin
- */
-
-gchar * gst_missing_uri_source_installer_detail_new (const gchar * protocol);
-
-gchar * gst_missing_uri_sink_installer_detail_new (const gchar * protocol);
-
-gchar * gst_missing_element_installer_detail_new (const gchar * factory_name);
-
-gchar * gst_missing_decoder_installer_detail_new (const GstCaps * decode_caps);
-
-gchar * gst_missing_encoder_installer_detail_new (const GstCaps * encode_caps);
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_MISSING_PLUGINS_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/pbutils-enumtypes.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/pbutils-enumtypes.h
deleted file mode 100644
index 30dadfd9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/pbutils-enumtypes.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-#ifndef __PB_UTILS_ENUM_TYPES_H__
-#define __PB_UTILS_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "install-plugins.h" */
-GType gst_install_plugins_return_get_type (void);
-#define GST_TYPE_INSTALL_PLUGINS_RETURN (gst_install_plugins_return_get_type())
-
-/* enumerations from "gstdiscoverer.h" */
-GType gst_discoverer_result_get_type (void);
-#define GST_TYPE_DISCOVERER_RESULT (gst_discoverer_result_get_type())
-G_END_DECLS
-
-#endif /* __PB_UTILS_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/pbutils.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/pbutils.h
deleted file mode 100644
index b9277b13..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/pbutils/pbutils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* GStreamer base utils library
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_PB_UTILS_BASE_UTILS_H__
-#define __GST_PB_UTILS_BASE_UTILS_H__
-
-#include <gst/gst.h>
-
-#include <gst/pbutils/gstpluginsbaseversion.h>
-#include <gst/pbutils/descriptions.h>
-#include <gst/pbutils/missing-plugins.h>
-#include <gst/pbutils/install-plugins.h>
-#include <gst/pbutils/codec-utils.h>
-#include <gst/pbutils/pbutils-enumtypes.h>
-#include <gst/pbutils/gstdiscoverer.h>
-#include <gst/pbutils/encoding-profile.h>
-#include <gst/pbutils/encoding-target.h>
-
-G_BEGIN_DECLS
-
-void    gst_pb_utils_init (void);
-
-G_END_DECLS
-
-#endif /* __GST_PB_UTILS_BASE_UTILS_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-ids.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-ids.h
deleted file mode 100644
index ab561792..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-ids.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/* GStreamer RIFF I/O
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * riff-ids.h: RIFF IDs and structs
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RIFF_IDS_H__
-#define __GST_RIFF_IDS_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/* RIFF types */
-#define GST_RIFF_RIFF_WAVE GST_MAKE_FOURCC ('W','A','V','E')
-#define GST_RIFF_RIFF_AVI  GST_MAKE_FOURCC ('A','V','I',' ')
-#define GST_RIFF_RIFF_CDXA GST_MAKE_FOURCC ('C','D','X','A')
-
-/* tags */
-#define GST_RIFF_TAG_RIFF GST_MAKE_FOURCC ('R','I','F','F')
-#define GST_RIFF_TAG_AVF0 GST_MAKE_FOURCC ('A','V','F','0')
-#define GST_RIFF_TAG_RIFX GST_MAKE_FOURCC ('R','I','F','X')
-#define GST_RIFF_TAG_LIST GST_MAKE_FOURCC ('L','I','S','T')
-#define GST_RIFF_TAG_avih GST_MAKE_FOURCC ('a','v','i','h')
-#define GST_RIFF_TAG_strd GST_MAKE_FOURCC ('s','t','r','d')
-#define GST_RIFF_TAG_strn GST_MAKE_FOURCC ('s','t','r','n')
-#define GST_RIFF_TAG_strh GST_MAKE_FOURCC ('s','t','r','h')
-#define GST_RIFF_TAG_strf GST_MAKE_FOURCC ('s','t','r','f')
-#define GST_RIFF_TAG_vedt GST_MAKE_FOURCC ('v','e','d','t')
-#define GST_RIFF_TAG_JUNK GST_MAKE_FOURCC ('J','U','N','K')
-#define GST_RIFF_TAG_JUNQ GST_MAKE_FOURCC ('J','U','N','Q')
-#define GST_RIFF_TAG_idx1 GST_MAKE_FOURCC ('i','d','x','1')
-#define GST_RIFF_TAG_dmlh GST_MAKE_FOURCC ('d','m','l','h')
-#define GST_RIFF_TAG_ID32 GST_MAKE_FOURCC ('I','D','3','2')
-#define GST_RIFF_TAG_IDVX GST_MAKE_FOURCC ('I','D','V','X')
-/* WAV stuff */
-#define GST_RIFF_TAG_fmt  GST_MAKE_FOURCC ('f','m','t',' ')
-#define GST_RIFF_TAG_data GST_MAKE_FOURCC ('d','a','t','a')
-#define GST_RIFF_TAG_plst GST_MAKE_FOURCC ('p','l','s','t')
-#define GST_RIFF_TAG_cue  GST_MAKE_FOURCC ('c','u','e',' ')
-#define GST_RIFF_TAG_bext GST_MAKE_FOURCC ('b','e','x','t')
-#define GST_RIFF_TAG_BEXT GST_MAKE_FOURCC ('B','E','X','T')
-#define GST_RIFF_TAG_fact GST_MAKE_FOURCC ('f','a','c','t')
-#define GST_RIFF_TAG_acid GST_MAKE_FOURCC ('a','c','i','d')
-#define GST_RIFF_TAG_labl GST_MAKE_FOURCC ('l','a','b','l')
-
-/* LIST types */
-#define GST_RIFF_LIST_movi GST_MAKE_FOURCC ('m','o','v','i')
-#define GST_RIFF_LIST_hdrl GST_MAKE_FOURCC ('h','d','r','l')
-#define GST_RIFF_LIST_odml GST_MAKE_FOURCC ('o','d','m','l')
-#define GST_RIFF_LIST_strl GST_MAKE_FOURCC ('s','t','r','l')
-#define GST_RIFF_LIST_INFO GST_MAKE_FOURCC ('I','N','F','O')
-#define GST_RIFF_LIST_AVIX GST_MAKE_FOURCC ('A','V','I','X')
-#define GST_RIFF_LIST_adtl GST_MAKE_FOURCC ('a','d','t','l')
-
-/* fcc types */
-#define GST_RIFF_FCC_vids GST_MAKE_FOURCC ('v','i','d','s')
-#define GST_RIFF_FCC_auds GST_MAKE_FOURCC ('a','u','d','s')
-#define GST_RIFF_FCC_pads GST_MAKE_FOURCC ('p','a','d','s')
-#define GST_RIFF_FCC_txts GST_MAKE_FOURCC ('t','x','t','s')
-#define GST_RIFF_FCC_vidc GST_MAKE_FOURCC ('v','i','d','c')
-#define GST_RIFF_FCC_iavs GST_MAKE_FOURCC ('i','a','v','s')
-/* fcc handlers */
-#define GST_RIFF_FCCH_RLE  GST_MAKE_FOURCC ('R','L','E',' ')
-#define GST_RIFF_FCCH_msvc GST_MAKE_FOURCC ('m','s','v','c')
-#define GST_RIFF_FCCH_MSVC GST_MAKE_FOURCC ('M','S','V','C')
-
-/* INFO types - see http://www.saettler.com/RIFFMCI/riffmci.html */
-#define GST_RIFF_INFO_IARL GST_MAKE_FOURCC ('I','A','R','L') /* location */
-#define GST_RIFF_INFO_IART GST_MAKE_FOURCC ('I','A','R','T') /* artist */
-#define GST_RIFF_INFO_ICMS GST_MAKE_FOURCC ('I','C','M','S') /* commissioned */
-#define GST_RIFF_INFO_ICMT GST_MAKE_FOURCC ('I','C','M','T') /* comment */
-#define GST_RIFF_INFO_ICOP GST_MAKE_FOURCC ('I','C','O','P') /* copyright */
-#define GST_RIFF_INFO_ICRD GST_MAKE_FOURCC ('I','C','R','D') /* creation date */
-#define GST_RIFF_INFO_ICRP GST_MAKE_FOURCC ('I','C','R','P') /* cropped */
-#define GST_RIFF_INFO_IDIM GST_MAKE_FOURCC ('I','D','I','M') /* dimensions */
-#define GST_RIFF_INFO_IDPI GST_MAKE_FOURCC ('I','D','P','I') /* dots-per-inch */
-#define GST_RIFF_INFO_IENG GST_MAKE_FOURCC ('I','E','N','G') /* engineer(s) */
-#define GST_RIFF_INFO_IGNR GST_MAKE_FOURCC ('I','G','N','R') /* genre */
-#define GST_RIFF_INFO_IKEY GST_MAKE_FOURCC ('I','K','E','Y') /* keywords */
-#define GST_RIFF_INFO_ILGT GST_MAKE_FOURCC ('I','L','G','T') /* lightness */
-#define GST_RIFF_INFO_IMED GST_MAKE_FOURCC ('I','M','E','D') /* medium */
-#define GST_RIFF_INFO_INAM GST_MAKE_FOURCC ('I','N','A','M') /* name */
-#define GST_RIFF_INFO_IPLT GST_MAKE_FOURCC ('I','P','L','T') /* palette setting */
-#define GST_RIFF_INFO_IPRD GST_MAKE_FOURCC ('I','P','R','D') /* product (album) */
-#define GST_RIFF_INFO_ISBJ GST_MAKE_FOURCC ('I','S','B','J') /* subject */
-#define GST_RIFF_INFO_ISFT GST_MAKE_FOURCC ('I','S','F','T') /* software */
-#define GST_RIFF_INFO_ISHP GST_MAKE_FOURCC ('I','S','H','P') /* sharpness */
-#define GST_RIFF_INFO_ISRC GST_MAKE_FOURCC ('I','S','R','C') /* source */
-#define GST_RIFF_INFO_ISRF GST_MAKE_FOURCC ('I','S','R','F') /* source form */
-#define GST_RIFF_INFO_ITCH GST_MAKE_FOURCC ('I','T','C','H') /* technician(s) */
-
-#define GST_RIFF_INFO_IAAR GST_MAKE_FOURCC ('I','A','A','R') /* album artist */
-#define GST_RIFF_INFO_ITRK GST_MAKE_FOURCC ('I','T','R','K') /* track number */
-
-/*********Chunk Names***************/
-#define GST_RIFF_FF00 GST_MAKE_FOURCC (0xFF,0xFF,0x00,0x00)
-#define GST_RIFF_00   GST_MAKE_FOURCC ('0', '0',0x00,0x00)
-#define GST_RIFF_01   GST_MAKE_FOURCC ('0', '1',0x00,0x00)
-#define GST_RIFF_02   GST_MAKE_FOURCC ('0', '2',0x00,0x00)
-#define GST_RIFF_03   GST_MAKE_FOURCC ('0', '3',0x00,0x00)
-#define GST_RIFF_04   GST_MAKE_FOURCC ('0', '4',0x00,0x00)
-#define GST_RIFF_05   GST_MAKE_FOURCC ('0', '5',0x00,0x00)
-#define GST_RIFF_06   GST_MAKE_FOURCC ('0', '6',0x00,0x00)
-#define GST_RIFF_07   GST_MAKE_FOURCC ('0', '7',0x00,0x00)
-#define GST_RIFF_00pc GST_MAKE_FOURCC ('0', '0', 'p', 'c')
-#define GST_RIFF_01pc GST_MAKE_FOURCC ('0', '1', 'p', 'c')
-#define GST_RIFF_00dc GST_MAKE_FOURCC ('0', '0', 'd', 'c')
-#define GST_RIFF_00dx GST_MAKE_FOURCC ('0', '0', 'd', 'x')
-#define GST_RIFF_00db GST_MAKE_FOURCC ('0', '0', 'd', 'b')
-#define GST_RIFF_00xx GST_MAKE_FOURCC ('0', '0', 'x', 'x')
-#define GST_RIFF_00id GST_MAKE_FOURCC ('0', '0', 'i', 'd')
-#define GST_RIFF_00rt GST_MAKE_FOURCC ('0', '0', 'r', 't')
-#define GST_RIFF_0021 GST_MAKE_FOURCC ('0', '0', '2', '1')
-#define GST_RIFF_00iv GST_MAKE_FOURCC ('0', '0', 'i', 'v')
-#define GST_RIFF_0031 GST_MAKE_FOURCC ('0', '0', '3', '1')
-#define GST_RIFF_0032 GST_MAKE_FOURCC ('0', '0', '3', '2')
-#define GST_RIFF_00vc GST_MAKE_FOURCC ('0', '0', 'v', 'c')
-#define GST_RIFF_00xm GST_MAKE_FOURCC ('0', '0', 'x', 'm')
-#define GST_RIFF_01wb GST_MAKE_FOURCC ('0', '1', 'w', 'b')
-#define GST_RIFF_01dc GST_MAKE_FOURCC ('0', '1', 'd', 'c')
-#define GST_RIFF_00__ GST_MAKE_FOURCC ('0', '0', '_', '_')
-
-/*********VIDEO CODECS**************/
-#define GST_RIFF_cram GST_MAKE_FOURCC ('c', 'r', 'a', 'm')
-#define GST_RIFF_CRAM GST_MAKE_FOURCC ('C', 'R', 'A', 'M')
-#define GST_RIFF_wham GST_MAKE_FOURCC ('w', 'h', 'a', 'm')
-#define GST_RIFF_WHAM GST_MAKE_FOURCC ('W', 'H', 'A', 'M')
-#define GST_RIFF_rgb  GST_MAKE_FOURCC (0x00,0x00,0x00,0x00)
-#define GST_RIFF_RGB  GST_MAKE_FOURCC ('R', 'G', 'B', ' ')
-#define GST_RIFF_RAW  GST_MAKE_FOURCC ('R', 'A', 'W', ' ')
-#define GST_RIFF_DIB  GST_MAKE_FOURCC ('D', 'I', 'B', ' ')
-#define GST_RIFF_rle8 GST_MAKE_FOURCC (0x01,0x00,0x00,0x00)
-#define GST_RIFF_RLE8 GST_MAKE_FOURCC ('R', 'L', 'E', '8')
-#define GST_RIFF_rle4 GST_MAKE_FOURCC (0x02,0x00,0x00,0x00)
-#define GST_RIFF_RLE4 GST_MAKE_FOURCC ('R', 'L', 'E', '4')
-#define GST_RIFF_none GST_MAKE_FOURCC (0x00,0x00,0xFF,0xFF)
-#define GST_RIFF_NONE GST_MAKE_FOURCC ('N', 'O', 'N', 'E')
-#define GST_RIFF_pack GST_MAKE_FOURCC (0x01,0x00,0xFF,0xFF)
-#define GST_RIFF_PACK GST_MAKE_FOURCC ('P', 'A', 'C', 'K')
-#define GST_RIFF_tran GST_MAKE_FOURCC (0x02,0x00,0xFF,0xFF)
-#define GST_RIFF_TRAN GST_MAKE_FOURCC ('T', 'R', 'A', 'N')
-#define GST_RIFF_ccc  GST_MAKE_FOURCC (0x03,0x00,0xFF,0xFF)
-#define GST_RIFF_CCC  GST_MAKE_FOURCC ('C', 'C', 'C', ' ')
-#define GST_RIFF_cyuv GST_MAKE_FOURCC ('c', 'y', 'u', 'v')
-#define GST_RIFF_CYUV GST_MAKE_FOURCC ('C', 'Y', 'U', 'V')
-#define GST_RIFF_jpeg GST_MAKE_FOURCC (0x04,0x00,0xFF,0xFF)
-#define GST_RIFF_JPEG GST_MAKE_FOURCC ('J', 'P', 'E', 'G')
-#define GST_RIFF_MJPG GST_MAKE_FOURCC ('M', 'J', 'P', 'G')
-#define GST_RIFF_mJPG GST_MAKE_FOURCC ('m', 'J', 'P', 'G')
-#define GST_RIFF_IJPG GST_MAKE_FOURCC ('I', 'J', 'P', 'G')
-#define GST_RIFF_rt21 GST_MAKE_FOURCC ('r', 't', '2', '1')
-#define GST_RIFF_RT21 GST_MAKE_FOURCC ('R', 'T', '2', '1')
-#define GST_RIFF_iv31 GST_MAKE_FOURCC ('i', 'v', '3', '1')
-#define GST_RIFF_IV31 GST_MAKE_FOURCC ('I', 'V', '3', '1')
-#define GST_RIFF_iv32 GST_MAKE_FOURCC ('i', 'v', '3', '2')
-#define GST_RIFF_IV32 GST_MAKE_FOURCC ('I', 'V', '3', '2')
-#define GST_RIFF_iv41 GST_MAKE_FOURCC ('i', 'v', '4', '1')
-#define GST_RIFF_IV41 GST_MAKE_FOURCC ('I', 'V', '4', '1')
-#define GST_RIFF_iv50 GST_MAKE_FOURCC ('i', 'v', '5', '0')
-#define GST_RIFF_IV50 GST_MAKE_FOURCC ('I', 'V', '5', '0')
-#define GST_RIFF_cvid GST_MAKE_FOURCC ('c', 'v', 'i', 'd')
-#define GST_RIFF_CVID GST_MAKE_FOURCC ('C', 'V', 'I', 'D')
-#define GST_RIFF_ULTI GST_MAKE_FOURCC ('U', 'L', 'T', 'I')
-#define GST_RIFF_ulti GST_MAKE_FOURCC ('u', 'l', 't', 'i')
-#define GST_RIFF_YUV9 GST_MAKE_FOURCC ('Y', 'V', 'U', '9')
-#define GST_RIFF_YVU9 GST_MAKE_FOURCC ('Y', 'U', 'V', '9')
-#define GST_RIFF_XMPG GST_MAKE_FOURCC ('X', 'M', 'P', 'G')
-#define GST_RIFF_xmpg GST_MAKE_FOURCC ('x', 'm', 'p', 'g')
-#define GST_RIFF_VDOW GST_MAKE_FOURCC ('V', 'D', 'O', 'W')
-#define GST_RIFF_MVI1 GST_MAKE_FOURCC ('M', 'V', 'I', '1')
-#define GST_RIFF_v422 GST_MAKE_FOURCC ('v', '4', '2', '2')
-#define GST_RIFF_V422 GST_MAKE_FOURCC ('V', '4', '2', '2')
-#define GST_RIFF_mvi1 GST_MAKE_FOURCC ('m', 'v', 'i', '1')
-#define GST_RIFF_MPIX GST_MAKE_FOURCC (0x04,0x00, 'i', '1')     /* MotionPixels munged their id */
-#define GST_RIFF_AURA GST_MAKE_FOURCC ('A', 'U', 'R', 'A')
-#define GST_RIFF_DMB1 GST_MAKE_FOURCC ('D', 'M', 'B', '1')
-#define GST_RIFF_dmb1 GST_MAKE_FOURCC ('d', 'm', 'b', '1')
-
-#define GST_RIFF_BW10 GST_MAKE_FOURCC ('B', 'W', '1', '0')
-#define GST_RIFF_bw10 GST_MAKE_FOURCC ('b', 'w', '1', '0')
-
-#define GST_RIFF_yuy2 GST_MAKE_FOURCC ('y', 'u', 'y', '2')
-#define GST_RIFF_YUY2 GST_MAKE_FOURCC ('Y', 'U', 'Y', '2')
-#define GST_RIFF_YUV8 GST_MAKE_FOURCC ('Y', 'U', 'V', '8')
-#define GST_RIFF_WINX GST_MAKE_FOURCC ('W', 'I', 'N', 'X')
-#define GST_RIFF_WPY2 GST_MAKE_FOURCC ('W', 'P', 'Y', '2')
-#define GST_RIFF_m263 GST_MAKE_FOURCC ('m', '2', '6', '3')
-#define GST_RIFF_M263 GST_MAKE_FOURCC ('M', '2', '6', '3')
-#define GST_RIFF_H263 GST_MAKE_FOURCC ('H', '2', '6', '3')
-#define GST_RIFF_h263 GST_MAKE_FOURCC ('h', '2', '6', '3')
-#define GST_RIFF_i263 GST_MAKE_FOURCC ('i', '2', '6', '3')
-#define GST_RIFF_L263 GST_MAKE_FOURCC ('L', '2', '6', '3')
-#define GST_RIFF_x263 GST_MAKE_FOURCC ('x', '2', '6', '3')
-#define GST_RIFF_VSSH GST_MAKE_FOURCC ( 'V', 'S', 'S', 'H') /* H2.64 */
-
-#define GST_RIFF_Q1_0 GST_MAKE_FOURCC ('Q', '1',0x2e, '0')
-#define GST_RIFF_SFMC GST_MAKE_FOURCC ('S', 'F', 'M', 'C')
-
-#define GST_RIFF_y41p GST_MAKE_FOURCC ('y', '4', '1', 'p')
-#define GST_RIFF_Y41P GST_MAKE_FOURCC ('Y', '4', '1', 'P')
-#define GST_RIFF_yv12 GST_MAKE_FOURCC ('y', 'v', '1', '2')
-#define GST_RIFF_YV12 GST_MAKE_FOURCC ('Y', 'V', '1', '2')
-#define GST_RIFF_vixl GST_MAKE_FOURCC ('v', 'i', 'x', 'l')
-#define GST_RIFF_VIXL GST_MAKE_FOURCC ('V', 'I', 'X', 'L')
-#define GST_RIFF_iyuv GST_MAKE_FOURCC ('i', 'y', 'u', 'v')
-#define GST_RIFF_IYUV GST_MAKE_FOURCC ('I', 'Y', 'U', 'V')
-#define GST_RIFF_i420 GST_MAKE_FOURCC ('i', '4', '2', '0')
-#define GST_RIFF_I420 GST_MAKE_FOURCC ('I', '4', '2', '0')
-#define GST_RIFF_vyuy GST_MAKE_FOURCC ('v', 'y', 'u', 'y')
-#define GST_RIFF_VYUY GST_MAKE_FOURCC ('V', 'Y', 'U', 'Y')
-
-#define GST_RIFF_DIV3 GST_MAKE_FOURCC ('D', 'I', 'V', '3')
-
-#define GST_RIFF_rpza GST_MAKE_FOURCC ('r', 'p', 'z', 'a')
-/* And this here's the mistakes that need to be supported */
-#define GST_RIFF_azpr GST_MAKE_FOURCC ('a', 'z', 'p', 'r')  /* recognize Apple's rpza mangled? */
-
-/*********** FND in MJPG **********/
-#define GST_RIFF_ISFT GST_MAKE_FOURCC ('I', 'S', 'F', 'T')
-#define GST_RIFF_IDIT GST_MAKE_FOURCC ('I', 'D', 'I', 'T')
-
-#define GST_RIFF_00AM GST_MAKE_FOURCC ('0', '0', 'A', 'M')
-#define GST_RIFF_DISP GST_MAKE_FOURCC ('D', 'I', 'S', 'P')
-#define GST_RIFF_ISBJ GST_MAKE_FOURCC ('I', 'S', 'B', 'J')
-
-#define GST_RIFF_rec  GST_MAKE_FOURCC ('r', 'e', 'c', ' ')
-
-/* common data structures */
-typedef struct _gst_riff_strh {
-  guint32 type;             /* stream type */
-  guint32 fcc_handler;       /* fcc_handler */
-  guint32 flags;
-/* flags values */
-#define GST_RIFF_STRH_DISABLED        0x000000001
-#define GST_RIFF_STRH_VIDEOPALCHANGES 0x000010000
-  guint32 priority;
-  guint32 init_frames;       /* initial frames (???) */
-  guint32 scale;
-  guint32 rate;
-  guint32 start;
-  guint32 length;
-  guint32 bufsize;           /* suggested buffer size */
-  guint32 quality;
-  guint32 samplesize;
-  /* rcFrame, RECT structure(struct of 4 shorts)
-  gint32  left;
-  gint32  top;
-  gint32  right;
-  gint32  bottom;
-  */
-} gst_riff_strh;
-
-typedef struct _gst_riff_strf_vids {       /* == BitMapInfoHeader */
-  guint32 size;
-  guint32 width;
-  guint32 height;
-  guint16 planes;
-  guint16 bit_cnt;
-  guint32 compression;
-  guint32 image_size;
-  guint32 xpels_meter;
-  guint32 ypels_meter;
-  guint32 num_colors;        /* used colors */
-  guint32 imp_colors;        /* important colors */
-  /* may be more for some codecs */
-} gst_riff_strf_vids;
-
-
-typedef struct _gst_riff_strf_auds {       /* == WaveHeader (?) */
-  guint16 format;
-/**** from public Microsoft RIFF docs ******/
-#define GST_RIFF_WAVE_FORMAT_UNKNOWN        (0x0000)
-#define GST_RIFF_WAVE_FORMAT_PCM            (0x0001)
-#define GST_RIFF_WAVE_FORMAT_ADPCM          (0x0002)
-#define GST_RIFF_WAVE_FORMAT_IEEE_FLOAT     (0x0003)
-#define GST_RIFF_WAVE_FORMAT_VSELP          (0x0004)
-#define GST_RIFF_WAVE_FORMAT_IBM_CVSD       (0x0005)
-#define GST_RIFF_WAVE_FORMAT_ALAW           (0x0006)
-#define GST_RIFF_WAVE_FORMAT_MULAW          (0x0007)
-#define GST_RIFF_WAVE_FORMAT_WMS            (0x000a) /* WMS Windows Media Audio Speech */
-#define GST_RIFF_WAVE_FORMAT_OKI_ADPCM      (0x0010)
-#define GST_RIFF_WAVE_FORMAT_DVI_ADPCM      (0x0011)
-#define GST_RIFF_WAVE_FORMAT_MEDIASPACE_ADPCM (0x0012)
-#define GST_RIFF_WAVE_FORMAT_SIERRA_ADPCM   (0x0013)
-#define GST_RIFF_WAVE_FORMAT_G723_ADPCM     (0x0014)
-#define GST_RIFF_WAVE_FORMAT_DIGISTD        (0x0015)
-#define GST_RIFF_WAVE_FORMAT_DIGIFIX        (0x0016)
-#define GST_RIFF_WAVE_FORMAT_DIALOGIC_OKI_ADPCM (0x0017)
-#define GST_RIFF_WAVE_FORMAT_MEDIAVISION_ADPCM  (0x0018)
-#define GST_RIFF_WAVE_FORMAT_CU_CODEC       (0x0019)
-#define GST_RIFF_WAVE_FORMAT_YAMAHA_ADPCM   (0x0020)
-#define GST_RIFF_WAVE_FORMAT_SONARC         (0x0021)
-#define GST_RIFF_WAVE_FORMAT_DSP_TRUESPEECH (0x0022)
-#define GST_RIFF_WAVE_FORMAT_ECHOSC1        (0x0023)
-#define GST_RIFF_WAVE_FORMAT_AUDIOFILE_AF36 (0x0024)
-#define GST_RIFF_WAVE_FORMAT_APTX           (0x0025)
-#define GST_RIFF_WAVE_FORMAT_AUDIOFILE_AF10 (0x0026)
-#define GST_RIFF_WAVE_FORMAT_PROSODY_1612   (0x0027)
-#define GST_RIFF_WAVE_FORMAT_LRC            (0x0028)
-#define GST_RIFF_WAVE_FORMAT_DOLBY_AC2      (0x0030)
-#define GST_RIFF_WAVE_FORMAT_GSM610         (0x0031)
-#define GST_RIFF_WAVE_FORMAT_MSN            (0x0032)
-#define GST_RIFF_WAVE_FORMAT_ANTEX_ADPCME   (0x0033 
-#define GST_RIFF_WAVE_FORMAT_CONTROL_RES_VQLPC (0x0034)
-#define GST_RIFF_WAVE_FORMAT_DIGIREAL       (0x0035)
-#define GST_RIFF_WAVE_FORMAT_DIGIADPCM      (0x0036)
-#define GST_RIFF_WAVE_FORMAT_CONTROL_RES_CR10  (0x0037)
-#define GST_RIFF_WAVE_FORMAT_NMS_VBXADPCM   (0x0038)
-#define GST_RIFF_WAVE_FORMAT_CS_IMAADPCM    (0x0039)
-#define GST_RIFF_WAVE_FORMAT_ECHOSC3        (0x003A)
-#define GST_RIFF_WAVE_FORMAT_ROCKWELL_ADPCM (0x003B)
-#define GST_RIFF_WAVE_FORMAT_ROCKWELL_DIGITALK (0x003C)
-#define GST_RIFF_WAVE_FORMAT_XEBEC          (0x003D)
-#define GST_RIFF_WAVE_FORMAT_ITU_G721_ADPCM (0x0040)
-#define GST_RIFF_WAVE_FORMAT_G728_CELP      (0x0041)
-#define GST_RIFF_WAVE_FORMAT_MSG723         (0x0042)
-#define GST_RIFF_WAVE_FORMAT_MPEGL12        (0x0050)
-#define GST_RIFF_WAVE_FORMAT_RT24           (0x0052)
-#define GST_RIFF_WAVE_FORMAT_PAC            (0x0053)
-#define GST_RIFF_WAVE_FORMAT_MPEGL3         (0x0055)
-#define GST_RIFF_WAVE_FORMAT_AMR_NB         (0x0057)
-#define GST_RIFF_WAVE_FORMAT_AMR_WB         (0x0058)
-#define GST_RIFF_WAVE_FORMAT_LUCENT_G723    (0x0059)
-#define GST_RIFF_WAVE_FORMAT_CIRRUS         (0x0060)
-#define GST_RIFF_WAVE_FORMAT_ADPCM_IMA_DK4  (0x0061)  /* not official */
-#define GST_RIFF_WAVE_FORMAT_ADPCM_IMA_DK3  (0x0062)  /* not official */
-/* FIXME: where are these from? are they used at all? */
-#if 0
-#define GST_RIFF_WAVE_FORMAT_ESPCM          (0x0061)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE        (0x0062)
-#endif
-#define GST_RIFF_WAVE_FORMAT_CANOPUS_ATRAC  (0x0063)
-#define GST_RIFF_WAVE_FORMAT_G726_ADPCM     (0x0064)
-#define GST_RIFF_WAVE_FORMAT_G722_ADPCM     (0x0065)
-#define GST_RIFF_WAVE_FORMAT_DSAT_DISPLAY   (0x0067)
-#define GST_RIFF_WAVE_FORMAT_ADPCM_IMA_WAV (0x0069)
-/* FIXME: where are these from? are they used at all? */
-#if 0
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_BYTE_ALIGNED (0x0069)
-#endif
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC8    (0x0070)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC10   (0x0071)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC16   (0x0072)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC20   (0x0073)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_METAVOICE (0x0074)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_METASOUND (0x0075)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_RT29HW (0x0076)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_VR12   (0x0077)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_VR18   (0x0078)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_TQ40   (0x0079)
-#define GST_RIFF_WAVE_FORMAT_SOFTSOUND      (0x0080)
-#define GST_RIFF_WAVE_FORMAT_VOXWARE_TQ60   (0x0081)
-#define GST_RIFF_WAVE_FORMAT_MSRT24         (0x0082)
-#define GST_RIFF_WAVE_FORMAT_G729A          (0x0083)
-#define GST_RIFF_WAVE_FORMAT_MVI_MVI2       (0x0084)
-#define GST_RIFF_WAVE_FORMAT_DF_G726        (0x0085)
-#define GST_RIFF_WAVE_FORMAT_DF_GSM610      (0x0086)
-#define GST_RIFF_WAVE_FORMAT_ISIAUDIO       (0x0088)
-#define GST_RIFF_WAVE_FORMAT_ONLIVE         (0x0089)
-#define GST_RIFF_WAVE_FORMAT_SBC24          (0x0091)
-#define GST_RIFF_WAVE_FORMAT_DOLBY_AC3_SPDIF  (0x0092)
-#define GST_RIFF_WAVE_FORMAT_MEDIASONIC_G723  (0x0093)
-#define GST_RIFF_WAVE_FORMAT_PROSODY_8KBPS  (0x0094)
-#define GST_RIFF_WAVE_FORMAT_ZYXEL_ADPCM    (0x0097)
-#define GST_RIFF_WAVE_FORMAT_PHILIPS_LPCBB  (0x0098)
-#define GST_RIFF_WAVE_FORMAT_PACKED         (0x0099)
-#define GST_RIFF_WAVE_FORMAT_MALDEN_PHONYTALK (0x00A0)
-#define GST_RIFF_WAVE_FORMAT_AAC            (0x00ff)
-#define GST_RIFF_WAVE_FORMAT_RHETOREX_ADPCM (0x0100)
-#define GST_RIFF_IBM_FORMAT_MULAW           (0x0101)
-#define GST_RIFF_IBM_FORMAT_ALAW            (0x0102)
-#define GST_RIFF_IBM_FORMAT_ADPCM           (0x0103)
-#define GST_RIFF_WAVE_FORMAT_VIVO_G723      (0x0111)
-#define GST_RIFF_WAVE_FORMAT_VIVO_SIREN     (0x0112)
-#define GST_RIFF_WAVE_FORMAT_DIGITAL_G723   (0x0123)
-#define GST_RIFF_WAVE_FORMAT_SANYO_LD_ADPCM (0x0125)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_ACEPLNET  (0x0130)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_ACELP4800 (0x0131)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_ACELP8V3  (0x0132)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_G729   (0x0133)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_G729A  (0x0134)
-#define GST_RIFF_WAVE_FORMAT_SIPROLAB_KELVIN (0x0135)
-#define GST_RIFF_WAVE_FORMAT_G726ADPCM       (0x0140)
-#define GST_RIFF_WAVE_FORMAT_QUALCOMM_PUREVOICE (0x0150)
-#define GST_RIFF_WAVE_FORMAT_QUALCOMM_HALFRATE  (0x0151)
-#define GST_RIFF_WAVE_FORMAT_TUBGSM             (0x0155)
-#define GST_RIFF_WAVE_FORMAT_WMAV1          (0x0160)
-#define GST_RIFF_WAVE_FORMAT_WMAV2          (0x0161)
-#define GST_RIFF_WAVE_FORMAT_WMAV3          (0x0162)
-#define GST_RIFF_WAVE_FORMAT_WMAV3_L        (0x0163)
-#define GST_RIFF_WAVE_FORMAT_CREATIVE_ADPCM (0x0200)
-#define GST_RIFF_WAVE_FORMAT_CREATIVE_FASTSPEECH8  (0x0202)
-#define GST_RIFF_WAVE_FORMAT_CREATIVE_FASTSPEECH10 (0x0203)
-#define GST_RIFF_WAVE_FORMAT_UHER_ADPCM     (0x0210)
-#define GST_RIFF_WAVE_FORMAT_QUARTERDECK    (0x0220)
-#define GST_RIFF_WAVE_FORMAT_ILINK_VC       (0x0230)
-#define GST_RIFF_WAVE_FORMAT_RAW_SPORT      (0x0240)
-#define GST_RIFF_WAVE_FORMAT_IPI_HSX        (0x0250)
-#define GST_RIFF_WAVE_FORMAT_IPI_RPELP      (0x0251)
-#define GST_RIFF_WAVE_FORMAT_CS2            (0x0260)
-#define GST_RIFF_WAVE_FORMAT_SONY_ATRAC3    (0x0270)
-#define GST_RIFF_WAVE_FORMAT_SIREN          (0x028E)
-#define GST_RIFF_WAVE_FORMAT_FM_TOWNS_SND   (0x0300)
-#define GST_RIFF_WAVE_FORMAT_BTV_DIGITAL    (0x0400)
-#define GST_RIFF_WAVE_FORMAT_IMC            (0x0401)
-#define GST_RIFF_WAVE_FORMAT_QDESIGN_MUSIC  (0x0450)
-#define GST_RIFF_WAVE_FORMAT_VME_VMPCM      (0x0680)
-#define GST_RIFF_WAVE_FORMAT_TPC            (0x0681)
-#define GST_RIFF_WAVE_FORMAT_OLIGSM         (0x1000)
-#define GST_RIFF_WAVE_FORMAT_OLIADPCM       (0x1001)
-#define GST_RIFF_WAVE_FORMAT_OLICELP        (0x1002)
-#define GST_RIFF_WAVE_FORMAT_OLISBC         (0x1003)
-#define GST_RIFF_WAVE_FORMAT_OLIOPR         (0x1004)
-#define GST_RIFF_WAVE_FORMAT_LH_CODEC       (0x1100)
-#define GST_RIFF_WAVE_FORMAT_NORRIS         (0x1400)
-#define GST_RIFF_WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS (0x1500)
-#define GST_RIFF_WAVE_FORMAT_A52            (0x2000)
-#define GST_RIFF_WAVE_FORMAT_DTS            (0x2001)
-#define GST_RIFF_WAVE_FORMAT_SONIC          (0x2048)
-#define GST_RIFF_WAVE_FORMAT_SONIC_LS       (0x2048)
-#define GST_RIFF_WAVE_FORMAT_AAC_AC         (0x4143)
-#define GST_RIFF_WAVE_FORMAT_VORBIS1        (0x674f)
-#define GST_RIFF_WAVE_FORMAT_VORBIS2        (0x6750)
-#define GST_RIFF_WAVE_FORMAT_VORBIS3        (0x6751)
-#define GST_RIFF_WAVE_FORMAT_VORBIS1PLUS    (0x676f)
-#define GST_RIFF_WAVE_FORMAT_VORBIS2PLUS    (0x6770)
-#define GST_RIFF_WAVE_FORMAT_VORBIS3PLUS    (0x6771)
-#define GST_RIFF_WAVE_FORMAT_AAC_pm         (0x706d)
-#define GST_RIFF_WAVE_FORMAT_GSM_AMR_CBR    (0x7A21)
-#define GST_RIFF_WAVE_FORMAT_GSM_AMR_VBR    (0x7A22)
-#define GST_RIFF_WAVE_FORMAT_FLAC           (0xF1AC)
-#define GST_RIFF_WAVE_FORMAT_EXTENSIBLE     (0xFFFE)
-  guint16 channels;
-  guint32 rate;
-  guint32 av_bps;
-  guint16 blockalign;
-  guint16 bits_per_sample;
-#if 0
-  /* missing field */
-  guint16 extra_size;
-#endif
-} gst_riff_strf_auds;
-
-typedef struct _gst_riff_strf_iavs {    
-  guint32 DVAAuxSrc;
-  guint32 DVAAuxCtl;
-  guint32 DVAAuxSrc1;
-  guint32 DVAAuxCtl1;
-  guint32 DVVAuxSrc;
-  guint32 DVVAuxCtl;
-  guint32 DVReserved1;
-  guint32 DVReserved2;
-} gst_riff_strf_iavs;
-
-typedef struct _gst_riff_index_entry {  
-  guint32 id;
-  guint32 flags;
-#define GST_RIFF_IF_LIST                (0x00000001L)
-#define GST_RIFF_IF_KEYFRAME            (0x00000010L)
-#define GST_RIFF_IF_NO_TIME             (0x00000100L)
-#define GST_RIFF_IF_COMPUSE             (0x0FFF0000L)
-  guint32 offset;
-  guint32 size;
-} gst_riff_index_entry;
-
-typedef struct _gst_riff_dmlh {
-  guint32 totalframes;
-} gst_riff_dmlh;
-
-/* taken from libsndfile/wav.c (LGPL) */
-typedef struct _gst_riff_acid {
-  /* 4 bytes (int)     type of file:
-   *  this appears to be a bit mask,however some combinations
-   *  are probably impossible and/or qualified as "errors"
-   *
-   *  0x01 On: One Shot         Off: Loop
-   *  0x02 On: Root note is Set Off: No root
-   *  0x04 On: Stretch is On,   Off: Strech is OFF
-   *  0x08 On: Disk Based       Off: Ram based
-   *  0x10 On: ??????????       Off: ????????? (Acidizer puts that ON)
-   */
-  guint32 loop_type;
-  /* 2 bytes (short)      root note
-   *  if type 0x10 is OFF : [C,C#,(...),B] -> [0x30 to 0x3B]
-   *  if type 0x10 is ON  : [C,C#,(...),B] -> [0x3C to 0x47]
-   *  (both types fit on same MIDI pitch albeit different octaves, so who cares)
-   */
-  guint16 root_note;
-  /* 2 bytes (short)      ??? always set to 0x8000
-   * 4 bytes (float)      ??? seems to be always 0
-   */
-  guint16 unknown1;
-  gfloat unknown2;
-  /* 4 bytes (int)        number of beats
-   * 2 bytes (short)      meter denominator   //always 4 in SF/ACID
-   * 2 bytes (short)      meter numerator     //always 4 in SF/ACID
-   *                      //are we sure about the order?? usually its num/denom
-   * 4 bytes (float)      tempo
-   */
-  guint32 number_of_beats;
-  guint16 meter_d, meter_n;
-  gfloat tempo;
-} gst_riff_acid;
-
-G_END_DECLS
-
-#endif /* __GST_RIFF_IDS_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-media.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-media.h
deleted file mode 100644
index ef5bc2bc..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-media.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GStreamer RIFF I/O
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * riff-media.h: RIFF-id to/from caps routines
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RIFF_MEDIA_H__
-#define __GST_RIFF_MEDIA_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-#include "riff-ids.h"
-
-G_BEGIN_DECLS
-
-/*
- * Create caos. strh/strf, strf/strd_data and codec_name can be NULL.
- */
-
-GstCaps * gst_riff_create_video_caps (guint32              codec_fcc,
-                                      gst_riff_strh      * strh,
-                                      gst_riff_strf_vids * strf,
-                                      GstBuffer          * strf_data,
-                                      GstBuffer          * strd_data,
-                                      char              ** codec_name);
-
-GstCaps * gst_riff_create_audio_caps (guint16              codec_id,
-                                      gst_riff_strh      * strh,
-                                      gst_riff_strf_auds * strf,
-                                      GstBuffer          * strf_data,
-                                      GstBuffer          * strd_data,
-                                      char              ** codec_name,
-                                      gint                 channel_reorder_map[18]);
-
-GstCaps * gst_riff_create_iavs_caps  (guint32              codec_fcc,
-                                      gst_riff_strh      * strh,
-                                      gst_riff_strf_iavs * strf,
-                                      GstBuffer          * strf_data,
-                                      GstBuffer          * strd_data,
-                                      char              ** codec_name);
-/*
- * Create template caps (includes all known types).
- */
-
-GstCaps * gst_riff_create_video_template_caps (void);
-GstCaps * gst_riff_create_audio_template_caps (void);
-GstCaps * gst_riff_create_iavs_template_caps  (void);
-
-G_END_DECLS
-
-#endif /* __GST_RIFF_READ_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-read.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-read.h
deleted file mode 100644
index cf07dda2..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/riff/riff-read.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GStreamer RIFF I/O
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * riff-read.h: function declarations for parsing a RIFF file
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RIFF_READ_H__
-#define __GST_RIFF_READ_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "riff-ids.h"
-
-G_BEGIN_DECLS
-
-/*
- * Operate using pull_range().
- */
-
-GstFlowReturn gst_riff_read_chunk   (GstElement * element,
-                                     GstPad     * pad,
-                                     guint64    * offset,
-                                     guint32    * tag,
-                                     GstBuffer ** chunk_data);
-
-/*
- * These functions operate on provided data (the caller is
- * supposed to strip the chunk headers). The buffer is
- * provided by the caller, the strf/strh/data are filled in
- * by the function.
- */
-
-gboolean gst_riff_parse_chunk       (GstElement * element,
-                                     GstBuffer  * buf,
-                                     guint      * offset,
-                                     guint32    * fourcc,
-                                     GstBuffer ** chunk_data);
-
-gboolean gst_riff_parse_file_header (GstElement * element,
-                                     GstBuffer  * buf,
-                                     guint32    * doctype);
-
-gboolean gst_riff_parse_strh        (GstElement     * element,
-                                     GstBuffer      * buf,
-                                     gst_riff_strh ** strh);
-
-gboolean gst_riff_parse_strf_vids   (GstElement          * element,
-                                     GstBuffer           * buf,
-                                     gst_riff_strf_vids ** strf,
-                                     GstBuffer          ** data);
-gboolean gst_riff_parse_strf_auds   (GstElement          * element,
-                                     GstBuffer           * buf,
-                                     gst_riff_strf_auds ** strf,
-                                     GstBuffer          ** data);
-gboolean gst_riff_parse_strf_iavs   (GstElement          * element,
-                                     GstBuffer           * buf,
-                                     gst_riff_strf_iavs ** strf,
-                                     GstBuffer          ** data);
-
-void gst_riff_parse_info            (GstElement  * element,
-                                     GstBuffer   * buf,
-                                     GstTagList ** taglist);
-
-/*
- * Init.
- */
-void gst_riff_init                  (void);
-
-G_END_DECLS
-
-#endif /* __GST_RIFF_READ_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtcpbuffer.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtcpbuffer.h
deleted file mode 100644
index b1a76559..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtcpbuffer.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Wim Taymans <wim@fluendo.com>
- *
- * gstrtcpbuffer.h: various helper functions to manipulate buffers
- *     with RTCP payload.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTCPBUFFER_H__
-#define __GST_RTCPBUFFER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_RTCP_VERSION:
- *
- * The supported RTCP version 2.
- */
-#define GST_RTCP_VERSION 2
-
-/**
- * GstRTCPType:
- * @GST_RTCP_TYPE_INVALID: Invalid type
- * @GST_RTCP_TYPE_SR: Sender report
- * @GST_RTCP_TYPE_RR: Receiver report
- * @GST_RTCP_TYPE_SDES: Source description
- * @GST_RTCP_TYPE_BYE: Goodbye
- * @GST_RTCP_TYPE_APP: Application defined
- * @GST_RTCP_TYPE_RTPFB: Transport layer feedback.
- * @GST_RTCP_TYPE_PSFB: Payload-specific feedback.
- *
- * Different RTCP packet types.
- */
-typedef enum
-{
-  GST_RTCP_TYPE_INVALID = 0,
-  GST_RTCP_TYPE_SR      = 200,
-  GST_RTCP_TYPE_RR      = 201,
-  GST_RTCP_TYPE_SDES    = 202,
-  GST_RTCP_TYPE_BYE     = 203,
-  GST_RTCP_TYPE_APP     = 204,
-  GST_RTCP_TYPE_RTPFB   = 205,
-  GST_RTCP_TYPE_PSFB    = 206
-} GstRTCPType;
-
-/**
- * GstRTCPFBType:
- * @GST_RTCP_FB_TYPE_INVALID: Invalid type
- * @GST_RTCP_RTPFB_TYPE_NACK: Generic NACK
- * @GST_RTCP_RTPFB_TYPE_TMMBR: Temporary Maximum Media Stream Bit Rate Request
- * @GST_RTCP_RTPFB_TYPE_TMMBN: Temporary Maximum Media Stream Bit Rate
- *    Notification
- * @GST_RTCP_PSFB_TYPE_PLI: Picture Loss Indication
- * @GST_RTCP_PSFB_TYPE_SLI: Slice Loss Indication
- * @GST_RTCP_PSFB_TYPE_RPSI: Reference Picture Selection Indication
- * @GST_RTCP_PSFB_TYPE_AFB: Application layer Feedback
- * @GST_RTCP_PSFB_TYPE_FIR: Full Intra Request Command
- * @GST_RTCP_PSFB_TYPE_TSTR: Temporal-Spatial Trade-off Request
- * @GST_RTCP_PSFB_TYPE_TSTN: Temporal-Spatial Trade-off Notification
- * @GST_RTCP_PSFB_TYPE_VBCN: Video Back Channel Message
- *
- * Different types of feedback messages.
- */
-typedef enum
-{
-  /* generic */
-  GST_RTCP_FB_TYPE_INVALID    = 0,
-  /* RTPFB types */
-  GST_RTCP_RTPFB_TYPE_NACK    = 1,
-  /* RTPFB types assigned in RFC 5104 */
-  GST_RTCP_RTPFB_TYPE_TMMBR   = 3,
-  GST_RTCP_RTPFB_TYPE_TMMBN   = 4,
-  /* PSFB types */
-  GST_RTCP_PSFB_TYPE_PLI      = 1,
-  GST_RTCP_PSFB_TYPE_SLI      = 2,
-  GST_RTCP_PSFB_TYPE_RPSI     = 3,
-  GST_RTCP_PSFB_TYPE_AFB      = 15,
-  /* PSFB types assigned in RFC 5104 */
-  GST_RTCP_PSFB_TYPE_FIR      = 4,
-  GST_RTCP_PSFB_TYPE_TSTR     = 5,
-  GST_RTCP_PSFB_TYPE_TSTN     = 6,
-  GST_RTCP_PSFB_TYPE_VBCN     = 7,
-} GstRTCPFBType;
-
-/**
- * GstRTCPSDESType:
- * @GST_RTCP_SDES_INVALID: Invalid SDES entry
- * @GST_RTCP_SDES_END: End of SDES list
- * @GST_RTCP_SDES_CNAME: Canonical name
- * @GST_RTCP_SDES_NAME: User name
- * @GST_RTCP_SDES_EMAIL: User's electronic mail address
- * @GST_RTCP_SDES_PHONE: User's phone number
- * @GST_RTCP_SDES_LOC: Geographic user location
- * @GST_RTCP_SDES_TOOL: Name of application or tool
- * @GST_RTCP_SDES_NOTE: Notice about the source
- * @GST_RTCP_SDES_PRIV: Private extensions
- *
- * Different types of SDES content.
- */
-typedef enum
-{
-  GST_RTCP_SDES_INVALID  = -1,
-  GST_RTCP_SDES_END      = 0,
-  GST_RTCP_SDES_CNAME    = 1,
-  GST_RTCP_SDES_NAME     = 2,
-  GST_RTCP_SDES_EMAIL    = 3,
-  GST_RTCP_SDES_PHONE    = 4,
-  GST_RTCP_SDES_LOC      = 5,
-  GST_RTCP_SDES_TOOL     = 6,
-  GST_RTCP_SDES_NOTE     = 7,
-  GST_RTCP_SDES_PRIV     = 8
-} GstRTCPSDESType;
-
-/**
- * GST_RTCP_MAX_SDES:
- *
- * The maximum text length for an SDES item.
- */
-#define GST_RTCP_MAX_SDES 255
-
-/**
- * GST_RTCP_MAX_RB_COUNT:
- *
- * The maximum amount of Receiver report blocks in RR and SR messages.
- */
-#define GST_RTCP_MAX_RB_COUNT   31
-
-/**
- * GST_RTCP_MAX_SDES_ITEM_COUNT:
- *
- * The maximum amount of SDES items.
- */
-#define GST_RTCP_MAX_SDES_ITEM_COUNT   31
-
-/**
- * GST_RTCP_MAX_BYE_SSRC_COUNT:
- *
- * The maximum amount of SSRCs in a BYE packet.
- */
-#define GST_RTCP_MAX_BYE_SSRC_COUNT   31
-
-/**
- * GST_RTCP_VALID_MASK:
- *
- * Mask for version, padding bit and packet type pair
- */
-#define GST_RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe)
-/**
- * GST_RTCP_VALID_VALUE:
- *
- * Valid value for the first two bytes of an RTCP packet after applying
- * #GST_RTCP_VALID_MASK to them.
- */
-#define GST_RTCP_VALID_VALUE ((GST_RTCP_VERSION << 14) | GST_RTCP_TYPE_SR)
-
-typedef struct _GstRTCPBuffer GstRTCPBuffer;
-typedef struct _GstRTCPPacket GstRTCPPacket;
-
-struct _GstRTCPBuffer
-{
-  GstBuffer   *buffer;
-  GstMapInfo   map;
-};
-
-#define GST_RTCP_BUFFER_INIT { NULL, GST_MAP_INFO_INIT }
-
-/**
- * GstRTCPPacket:
- * @rtcp: pointer to RTCP buffer
- * @offset: offset of packet in buffer data
- *
- * Data structure that points to a packet at @offset in @buffer.
- * The size of the structure is made public to allow stack allocations.
- */
-struct _GstRTCPPacket
-{
-  GstRTCPBuffer *rtcp;
-  guint          offset;
-
-  /*< private >*/
-  gboolean       padding;      /* padding field of current packet */
-  guint8         count;        /* count field of current packet */
-  GstRTCPType    type;         /* type of current packet */
-  guint16        length;       /* length of current packet in 32-bits words */
-
-  guint          item_offset;  /* current item offset for navigating SDES */
-  guint          item_count;   /* current item count */
-  guint          entry_offset; /* current entry offset for navigating SDES items */
-};
-
-/* creating buffers */
-GstBuffer*      gst_rtcp_buffer_new_take_data     (gpointer data, guint len);
-GstBuffer*      gst_rtcp_buffer_new_copy_data     (gpointer data, guint len);
-
-gboolean        gst_rtcp_buffer_validate_data     (guint8 *data, guint len);
-gboolean        gst_rtcp_buffer_validate          (GstBuffer *buffer);
-
-GstBuffer*      gst_rtcp_buffer_new               (guint mtu);
-
-gboolean        gst_rtcp_buffer_map               (GstBuffer *buffer, GstMapFlags flags, GstRTCPBuffer *rtcp);
-gboolean        gst_rtcp_buffer_unmap             (GstRTCPBuffer *rtcp);
-
-/* adding/retrieving packets */
-guint           gst_rtcp_buffer_get_packet_count  (GstRTCPBuffer *rtcp);
-gboolean        gst_rtcp_buffer_get_first_packet  (GstRTCPBuffer *rtcp, GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_move_to_next      (GstRTCPPacket *packet);
-
-gboolean        gst_rtcp_buffer_add_packet        (GstRTCPBuffer *rtcp, GstRTCPType type,
-                                                   GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_remove            (GstRTCPPacket *packet);
-
-/* working with packets */
-gboolean        gst_rtcp_packet_get_padding       (GstRTCPPacket *packet);
-guint8          gst_rtcp_packet_get_count         (GstRTCPPacket *packet);
-GstRTCPType     gst_rtcp_packet_get_type          (GstRTCPPacket *packet);
-guint16         gst_rtcp_packet_get_length        (GstRTCPPacket *packet);
-
-
-/* sender reports */
-void            gst_rtcp_packet_sr_get_sender_info    (GstRTCPPacket *packet, guint32 *ssrc,
-                                                       guint64 *ntptime, guint32 *rtptime,
-                                                       guint32 *packet_count, guint32 *octet_count);
-void            gst_rtcp_packet_sr_set_sender_info    (GstRTCPPacket *packet, guint32 ssrc,
-                                                       guint64 ntptime, guint32 rtptime,
-                                                       guint32 packet_count, guint32 octet_count);
-/* receiver reports */
-guint32         gst_rtcp_packet_rr_get_ssrc           (GstRTCPPacket *packet);
-void            gst_rtcp_packet_rr_set_ssrc           (GstRTCPPacket *packet, guint32 ssrc);
-
-
-/* report blocks for SR and RR */
-guint           gst_rtcp_packet_get_rb_count          (GstRTCPPacket *packet);
-void            gst_rtcp_packet_get_rb                (GstRTCPPacket *packet, guint nth, guint32 *ssrc,
-                                                       guint8 *fractionlost, gint32 *packetslost,
-                                                       guint32 *exthighestseq, guint32 *jitter,
-                                                       guint32 *lsr, guint32 *dlsr);
-gboolean        gst_rtcp_packet_add_rb                (GstRTCPPacket *packet, guint32 ssrc,
-                                                       guint8 fractionlost, gint32 packetslost,
-                                                       guint32 exthighestseq, guint32 jitter,
-                                                       guint32 lsr, guint32 dlsr);
-void            gst_rtcp_packet_set_rb                (GstRTCPPacket *packet, guint nth, guint32 ssrc,
-                                                       guint8 fractionlost, gint32 packetslost,
-                                                       guint32 exthighestseq, guint32 jitter,
-                                                       guint32 lsr, guint32 dlsr);
-
-/* source description packet */
-guint           gst_rtcp_packet_sdes_get_item_count   (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_first_item       (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_next_item        (GstRTCPPacket *packet);
-guint32         gst_rtcp_packet_sdes_get_ssrc         (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_first_entry      (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_next_entry       (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_sdes_get_entry        (GstRTCPPacket *packet,
-                                                       GstRTCPSDESType *type, guint8 *len,
-                                                       guint8 **data);
-gboolean        gst_rtcp_packet_sdes_copy_entry       (GstRTCPPacket *packet,
-                                                       GstRTCPSDESType *type, guint8 *len,
-                                                       guint8 **data);
-
-gboolean        gst_rtcp_packet_sdes_add_item         (GstRTCPPacket *packet, guint32 ssrc);
-gboolean        gst_rtcp_packet_sdes_add_entry        (GstRTCPPacket *packet, GstRTCPSDESType type,
-                                                       guint8 len, const guint8 *data);
-
-/* bye packet */
-guint           gst_rtcp_packet_bye_get_ssrc_count    (GstRTCPPacket *packet);
-guint32         gst_rtcp_packet_bye_get_nth_ssrc      (GstRTCPPacket *packet, guint nth);
-gboolean        gst_rtcp_packet_bye_add_ssrc          (GstRTCPPacket *packet, guint32 ssrc);
-gboolean        gst_rtcp_packet_bye_add_ssrcs         (GstRTCPPacket *packet, guint32 *ssrc, guint len);
-guint8          gst_rtcp_packet_bye_get_reason_len    (GstRTCPPacket *packet);
-gchar*          gst_rtcp_packet_bye_get_reason        (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_bye_set_reason        (GstRTCPPacket *packet, const gchar *reason);
-
-/* feedback packets */
-guint32         gst_rtcp_packet_fb_get_sender_ssrc    (GstRTCPPacket *packet);
-void            gst_rtcp_packet_fb_set_sender_ssrc    (GstRTCPPacket *packet, guint32 ssrc);
-guint32         gst_rtcp_packet_fb_get_media_ssrc     (GstRTCPPacket *packet);
-void            gst_rtcp_packet_fb_set_media_ssrc     (GstRTCPPacket *packet, guint32 ssrc);
-GstRTCPFBType   gst_rtcp_packet_fb_get_type           (GstRTCPPacket *packet);
-void            gst_rtcp_packet_fb_set_type           (GstRTCPPacket *packet, GstRTCPFBType type);
-guint16         gst_rtcp_packet_fb_get_fci_length     (GstRTCPPacket *packet);
-gboolean        gst_rtcp_packet_fb_set_fci_length     (GstRTCPPacket *packet, guint16 wordlen);
-guint8 *        gst_rtcp_packet_fb_get_fci            (GstRTCPPacket *packet);
-
-/* helper functions */
-guint64         gst_rtcp_ntp_to_unix                  (guint64 ntptime);
-guint64         gst_rtcp_unix_to_ntp                  (guint64 unixtime);
-
-const gchar *   gst_rtcp_sdes_type_to_name            (GstRTCPSDESType type);
-GstRTCPSDESType gst_rtcp_sdes_name_to_type            (const gchar *name);
-
-G_END_DECLS
-
-#endif /* __GST_RTCPBUFFER_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbaseaudiopayload.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbaseaudiopayload.h
deleted file mode 100644
index a6dedd86..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbaseaudiopayload.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* GStreamer
- * Copyright (C) <2006> Philippe Khalaf <philippe.kalaf@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTP_BASE_AUDIO_PAYLOAD_H__
-#define __GST_RTP_BASE_AUDIO_PAYLOAD_H__
-
-#include <gst/gst.h>
-#include <gst/rtp/gstrtpbasepayload.h>
-#include <gst/base/gstadapter.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstRTPBaseAudioPayload GstRTPBaseAudioPayload;
-typedef struct _GstRTPBaseAudioPayloadClass GstRTPBaseAudioPayloadClass;
-
-typedef struct _GstRTPBaseAudioPayloadPrivate GstRTPBaseAudioPayloadPrivate;
-
-#define GST_TYPE_RTP_BASE_AUDIO_PAYLOAD \
-  (gst_rtp_base_audio_payload_get_type())
-#define GST_RTP_BASE_AUDIO_PAYLOAD(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-  GST_TYPE_RTP_BASE_AUDIO_PAYLOAD,GstRTPBaseAudioPayload))
-#define GST_RTP_BASE_AUDIO_PAYLOAD_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-  GST_TYPE_RTP_BASE_AUDIO_PAYLOAD,GstRTPBaseAudioPayloadClass))
-#define GST_IS_RTP_BASE_AUDIO_PAYLOAD(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_BASE_AUDIO_PAYLOAD))
-#define GST_IS_RTP_BASE_AUDIO_PAYLOAD_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_BASE_AUDIO_PAYLOAD))
-#define GST_RTP_BASE_AUDIO_PAYLOAD_CAST(obj) \
-  ((GstRTPBaseAudioPayload *) (obj))
-
-struct _GstRTPBaseAudioPayload
-{
-  GstRTPBasePayload payload;
-
-  GstRTPBaseAudioPayloadPrivate *priv;
-
-  GstClockTime base_ts;
-  gint frame_size;
-  gint frame_duration;
-
-  gint sample_size;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstRTPBaseAudioPayloadClass:
- * @parent_class: the parent class
- *
- * Base class for audio RTP payloader.
- */
-struct _GstRTPBaseAudioPayloadClass
-{
-  GstRTPBasePayloadClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_rtp_base_audio_payload_get_type (void);
-
-/* configure frame based */
-void            gst_rtp_base_audio_payload_set_frame_based        (GstRTPBaseAudioPayload *rtpbaseaudiopayload);
-
-void            gst_rtp_base_audio_payload_set_frame_options      (GstRTPBaseAudioPayload *rtpbaseaudiopayload,
-                                                                   gint frame_duration, gint frame_size);
-
-/* configure sample based */
-void            gst_rtp_base_audio_payload_set_sample_based       (GstRTPBaseAudioPayload *rtpbaseaudiopayload);
-void            gst_rtp_base_audio_payload_set_sample_options     (GstRTPBaseAudioPayload *rtpbaseaudiopayload,
-                                                                   gint sample_size);
-void            gst_rtp_base_audio_payload_set_samplebits_options (GstRTPBaseAudioPayload *rtpbaseaudiopayload,
-                                                                   gint sample_size);
-
-/* get the internal adapter */
-GstAdapter*     gst_rtp_base_audio_payload_get_adapter            (GstRTPBaseAudioPayload *rtpbaseaudiopayload);
-
-/* push and flushing data */
-GstFlowReturn   gst_rtp_base_audio_payload_push                   (GstRTPBaseAudioPayload * baseaudiopayload,
-                                                                   const guint8 * data, guint payload_len,
-                                                                   GstClockTime timestamp);
-GstFlowReturn   gst_rtp_base_audio_payload_flush                  (GstRTPBaseAudioPayload * baseaudiopayload,
-                                                                   guint payload_len, GstClockTime timestamp);
-
-G_END_DECLS
-
-#endif /* __GST_RTP_BASE_AUDIO_PAYLOAD_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbasedepayload.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbasedepayload.h
deleted file mode 100644
index fc838a2c..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbasedepayload.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005> Philippe Khalaf <burger@speedy.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTP_BASE_DEPAYLOAD_H__
-#define __GST_RTP_BASE_DEPAYLOAD_H__
-
-#include <gst/gst.h>
-#include <gst/rtp/gstrtpbuffer.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_RTP_BASE_DEPAYLOAD (gst_rtp_base_depayload_get_type())
-#define GST_RTP_BASE_DEPAYLOAD(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_BASE_DEPAYLOAD,GstRTPBaseDepayload))
-#define GST_RTP_BASE_DEPAYLOAD_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_BASE_DEPAYLOAD,GstRTPBaseDepayloadClass))
-#define GST_RTP_BASE_DEPAYLOAD_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_RTP_BASE_DEPAYLOAD,GstRTPBaseDepayloadClass))
-#define GST_IS_RTP_BASE_DEPAYLOAD(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_BASE_DEPAYLOAD))
-#define GST_IS_RTP_BASE_DEPAYLOAD_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_BASE_DEPAYLOAD))
-
-#define GST_RTP_BASE_DEPAYLOAD_SINKPAD(depayload) (GST_RTP_BASE_DEPAYLOAD (depayload)->sinkpad)
-#define GST_RTP_BASE_DEPAYLOAD_SRCPAD(depayload)  (GST_RTP_BASE_DEPAYLOAD (depayload)->srcpad)
-
-typedef struct _GstRTPBaseDepayload      GstRTPBaseDepayload;
-typedef struct _GstRTPBaseDepayloadClass GstRTPBaseDepayloadClass;
-typedef struct _GstRTPBaseDepayloadPrivate GstRTPBaseDepayloadPrivate;
-
-struct _GstRTPBaseDepayload
-{
-  GstElement parent;
-
-  GstPad *sinkpad, *srcpad;
-
-  /* this attribute must be set by the child */
-  guint clock_rate;
-
-  GstSegment segment;
-  gboolean need_newsegment;
-
-  /*< private >*/
-  GstRTPBaseDepayloadPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstRTPBaseDepayloadClass:
- * @parent_class: the parent class
- * @set_caps: configure the depayloader
- * @process: process incoming rtp packets
- * @packet_lost: signal the depayloader about packet loss
- * @handle_event: custom event handling
- *
- * Base class for audio RTP payloader.
- */
-struct _GstRTPBaseDepayloadClass
-{
-  GstElementClass parent_class;
-
-  /* virtuals, inform the subclass of the caps. */
-  gboolean (*set_caps) (GstRTPBaseDepayload *filter, GstCaps *caps);
-
-  /* pure virtual function, child must use this to process incoming
-   * rtp packets. If the child returns a buffer without a valid timestamp,
-   * the timestamp of @in will be applied to the result buffer and the
-   * buffer will be pushed. If this function returns %NULL, nothing is
-   * pushed.  */
-  GstBuffer * (*process) (GstRTPBaseDepayload *base, GstBuffer *in);
-
-  /* non-pure function used to to signal the depayloader about packet loss. the
-   * timestamp and duration are the estimated values of the lost packet.
-   * The default implementation of this message pushes a segment update. */
-  gboolean (*packet_lost) (GstRTPBaseDepayload *filter, GstEvent *event);
-
-  /* the default implementation does the default actions for events but
-   * implementation can override. */
-  gboolean (*handle_event) (GstRTPBaseDepayload * filter, GstEvent * event);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_rtp_base_depayload_get_type (void);
-
-GstFlowReturn   gst_rtp_base_depayload_push       (GstRTPBaseDepayload *filter, GstBuffer *out_buf);
-GstFlowReturn   gst_rtp_base_depayload_push_list  (GstRTPBaseDepayload *filter, GstBufferList *out_list);
-
-
-G_END_DECLS
-
-#endif /* __GST_RTP_BASE_DEPAYLOAD_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbasepayload.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbasepayload.h
deleted file mode 100644
index 39ce430a..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbasepayload.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTP_BASE_PAYLOAD_H__
-#define __GST_RTP_BASE_PAYLOAD_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_RTP_BASE_PAYLOAD \
-        (gst_rtp_base_payload_get_type())
-#define GST_RTP_BASE_PAYLOAD(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_BASE_PAYLOAD,GstRTPBasePayload))
-#define GST_RTP_BASE_PAYLOAD_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_BASE_PAYLOAD,GstRTPBasePayloadClass))
-#define GST_RTP_BASE_PAYLOAD_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_RTP_BASE_PAYLOAD, GstRTPBasePayloadClass))
-#define GST_IS_RTP_BASE_PAYLOAD(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_BASE_PAYLOAD))
-#define GST_IS_RTP_BASE_PAYLOAD_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_BASE_PAYLOAD))
-#define GST_RTP_BASE_PAYLOAD_CAST(obj) \
-        ((GstRTPBasePayload*)(obj))
-
-typedef struct _GstRTPBasePayload GstRTPBasePayload;
-typedef struct _GstRTPBasePayloadPrivate GstRTPBasePayloadPrivate;
-typedef struct _GstRTPBasePayloadClass GstRTPBasePayloadClass;
-
-/**
- * GST_RTP_BASE_PAYLOAD_SINKPAD:
- * @payload: a #GstRTPBasePayload
- *
- * Get access to the sinkpad of @payload.
- */
-#define GST_RTP_BASE_PAYLOAD_SINKPAD(payload) (GST_RTP_BASE_PAYLOAD (payload)->sinkpad)
-/**
- * GST_RTP_BASE_PAYLOAD_SRCPAD:
- * @payload: a #GstRTPBasePayload
- *
- * Get access to the srcpad of @payload.
- */
-#define GST_RTP_BASE_PAYLOAD_SRCPAD(payload)  (GST_RTP_BASE_PAYLOAD (payload)->srcpad)
-
-/**
- * GST_RTP_BASE_PAYLOAD_PT:
- * @payload: a #GstRTPBasePayload
- *
- * Get access to the configured payload type of @payload.
- */
-#define GST_RTP_BASE_PAYLOAD_PT(payload)  (GST_RTP_BASE_PAYLOAD (payload)->pt)
-/**
- * GST_RTP_BASE_PAYLOAD_MTU:
- * @payload: a #GstRTPBasePayload
- *
- * Get access to the configured MTU of @payload.
- */
-#define GST_RTP_BASE_PAYLOAD_MTU(payload) (GST_RTP_BASE_PAYLOAD (payload)->mtu)
-
-struct _GstRTPBasePayload
-{
-  GstElement element;
-
-  /*< private >*/
-  GstPad  *sinkpad;
-  GstPad  *srcpad;
-
-  guint32  ts_base;
-  guint16  seqnum_base;
-
-  gchar   *media;
-  gchar   *encoding_name;
-  gboolean dynamic;
-  guint32  clock_rate;
-
-  gint32   ts_offset;
-  guint32  timestamp;
-  gint16   seqnum_offset;
-  guint16  seqnum;
-  gint64   max_ptime;
-  guint    pt;
-  guint    ssrc;
-  guint    current_ssrc;
-  guint    mtu;
-
-  GstSegment segment;
-
-  guint64  min_ptime;
-  guint64  ptime; /* in ns */
-  guint64  ptime_multiple; /* in ns */
-
-  /*< private >*/
-  GstRTPBasePayloadPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstRTPBasePayloadClass:
- * @parent_class: the parent class
- * @get_caps: get desired caps
- * @set_caps: configure the payloader
- * @handle_buffer: process data
- * @sink_event: custom event handling on the sinkpad
- * @src_event: custom event handling on the srcpad
- * @query: custom query handling
- *
- * Base class for audio RTP payloader.
- */
-struct _GstRTPBasePayloadClass
-{
-  GstElementClass parent_class;
-
-  /* query accepted caps */
-  GstCaps *     (*get_caps)             (GstRTPBasePayload *payload, GstPad * pad, GstCaps * filter);
-  /* receive caps on the sink pad, configure the payloader. */
-  gboolean      (*set_caps)             (GstRTPBasePayload *payload, GstCaps *caps);
-
-  /* handle a buffer, perform 0 or more gst_rtp_base_payload_push() on
-   * the RTP buffers. This function takes ownership of the buffer. */
-  GstFlowReturn (*handle_buffer)        (GstRTPBasePayload *payload,
-                                         GstBuffer *buffer);
-  /* handle events and queries */
-  gboolean      (*sink_event)           (GstRTPBasePayload *payload, GstEvent * event);
-  gboolean      (*src_event)            (GstRTPBasePayload *payload, GstEvent * event);
-  gboolean      (*query)                (GstRTPBasePayload *payload, GstPad *pad, GstQuery * query);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType           gst_rtp_base_payload_get_type           (void);
-
-void            gst_rtp_base_payload_set_options        (GstRTPBasePayload *payload,
-                                                         const gchar *media,
-                                                         gboolean dynamic,
-                                                         const gchar *encoding_name,
-                                                         guint32 clock_rate);
-
-gboolean        gst_rtp_base_payload_set_outcaps        (GstRTPBasePayload *payload,
-                                                         const gchar *fieldname, ...);
-
-gboolean        gst_rtp_base_payload_is_filled          (GstRTPBasePayload *payload,
-                                                         guint size, GstClockTime duration);
-
-GstFlowReturn   gst_rtp_base_payload_push               (GstRTPBasePayload *payload,
-                                                         GstBuffer *buffer);
-
-GstFlowReturn   gst_rtp_base_payload_push_list          (GstRTPBasePayload *payload,
-                                                         GstBufferList *list);
-
-G_END_DECLS
-
-#endif /* __GST_RTP_BASE_PAYLOAD_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbuffer.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbuffer.h
deleted file mode 100644
index 5551c5a3..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtpbuffer.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005> Philippe Khalaf <burger@speedy.org>
- *               <2005> Wim Taymans <wim@fluendo.com>
- *
- * gstrtpbuffer.h: various helper functions to manipulate buffers
- *     with RTP payload.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTPBUFFER_H__
-#define __GST_RTPBUFFER_H__
-
-#include <gst/gst.h>
-#include <gst/rtp/gstrtppayloads.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_RTP_VERSION:
- *
- * The supported RTP version 2.
- */
-#define GST_RTP_VERSION 2
-
-
-typedef struct _GstRTPBuffer GstRTPBuffer;
-
-/**
- * GstRTPBuffer:
- * @buffer: pointer to RTP buffer
- * @state: internal state
- * @data: array of data
- * @size: array of size
- * @map: array of #GstMapInfo
- *
- * Data structure that points to an RTP packet.
- * The size of the structure is made public to allow stack allocations.
- */
-struct _GstRTPBuffer
-{
-  GstBuffer   *buffer;
-  guint        state;
-  gpointer     data[4];
-  gsize        size[4];
-  GstMapInfo   map[4];
-};
-
-#define GST_RTP_BUFFER_INIT { NULL, 0, { NULL, NULL, NULL, NULL}, { 0, 0, 0, 0 }, \
-  { GST_MAP_INFO_INIT, GST_MAP_INFO_INIT, GST_MAP_INFO_INIT, GST_MAP_INFO_INIT} }
-
-/* creating buffers */
-void            gst_rtp_buffer_allocate_data         (GstBuffer *buffer, guint payload_len,
-                                                      guint8 pad_len, guint8 csrc_count);
-
-GstBuffer*      gst_rtp_buffer_new_take_data         (gpointer data, gsize len);
-GstBuffer*      gst_rtp_buffer_new_copy_data         (gpointer data, gsize len);
-GstBuffer*      gst_rtp_buffer_new_allocate          (guint payload_len, guint8 pad_len, guint8 csrc_count);
-GstBuffer*      gst_rtp_buffer_new_allocate_len      (guint packet_len, guint8 pad_len, guint8 csrc_count);
-
-guint           gst_rtp_buffer_calc_header_len       (guint8 csrc_count);
-guint           gst_rtp_buffer_calc_packet_len       (guint payload_len, guint8 pad_len, guint8 csrc_count);
-guint           gst_rtp_buffer_calc_payload_len      (guint packet_len, guint8 pad_len, guint8 csrc_count);
-
-gboolean        gst_rtp_buffer_map                   (GstBuffer *buffer, GstMapFlags flags, GstRTPBuffer *rtp);
-void            gst_rtp_buffer_unmap                 (GstRTPBuffer *rtp);
-
-void            gst_rtp_buffer_set_packet_len        (GstRTPBuffer *rtp, guint len);
-guint           gst_rtp_buffer_get_packet_len        (GstRTPBuffer *rtp);
-
-guint           gst_rtp_buffer_get_header_len        (GstRTPBuffer *rtp);
-
-guint8          gst_rtp_buffer_get_version           (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_version           (GstRTPBuffer *rtp, guint8 version);
-
-gboolean        gst_rtp_buffer_get_padding           (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_padding           (GstRTPBuffer *rtp, gboolean padding);
-void            gst_rtp_buffer_pad_to                (GstRTPBuffer *rtp, guint len);
-
-gboolean        gst_rtp_buffer_get_extension         (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_extension         (GstRTPBuffer *rtp, gboolean extension);
-gboolean        gst_rtp_buffer_get_extension_data    (GstRTPBuffer *rtp, guint16 *bits,
-                                                      gpointer *data, guint *wordlen);
-gboolean        gst_rtp_buffer_set_extension_data    (GstRTPBuffer *rtp, guint16 bits, guint16 length);
-
-guint32         gst_rtp_buffer_get_ssrc              (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_ssrc              (GstRTPBuffer *rtp, guint32 ssrc);
-
-guint8          gst_rtp_buffer_get_csrc_count        (GstRTPBuffer *rtp);
-guint32         gst_rtp_buffer_get_csrc              (GstRTPBuffer *rtp, guint8 idx);
-void            gst_rtp_buffer_set_csrc              (GstRTPBuffer *rtp, guint8 idx, guint32 csrc);
-
-gboolean        gst_rtp_buffer_get_marker            (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_marker            (GstRTPBuffer *rtp, gboolean marker);
-
-guint8          gst_rtp_buffer_get_payload_type      (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_payload_type      (GstRTPBuffer *rtp, guint8 payload_type);
-
-guint16         gst_rtp_buffer_get_seq               (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_seq               (GstRTPBuffer *rtp, guint16 seq);
-
-guint32         gst_rtp_buffer_get_timestamp         (GstRTPBuffer *rtp);
-void            gst_rtp_buffer_set_timestamp         (GstRTPBuffer *rtp, guint32 timestamp);
-
-GstBuffer*      gst_rtp_buffer_get_payload_buffer    (GstRTPBuffer *rtp);
-GstBuffer*      gst_rtp_buffer_get_payload_subbuffer (GstRTPBuffer *rtp, guint offset, guint len);
-
-guint           gst_rtp_buffer_get_payload_len       (GstRTPBuffer *rtp);
-gpointer        gst_rtp_buffer_get_payload           (GstRTPBuffer *rtp);
-
-/* some helpers */
-guint32         gst_rtp_buffer_default_clock_rate    (guint8 payload_type);
-gint            gst_rtp_buffer_compare_seqnum        (guint16 seqnum1, guint16 seqnum2);
-guint64         gst_rtp_buffer_ext_timestamp         (guint64 *exttimestamp, guint32 timestamp);
-
-gboolean        gst_rtp_buffer_get_extension_onebyte_header  (GstRTPBuffer *rtp,
-                                                              guint8 id,
-                                                              guint nth,
-                                                              gpointer * data,
-                                                              guint * size);
-gboolean        gst_rtp_buffer_get_extension_twobytes_header (GstRTPBuffer *rtp,
-                                                              guint8 * appbits,
-                                                              guint8 id,
-                                                              guint nth,
-                                                              gpointer * data,
-                                                              guint * size);
-
-gboolean       gst_rtp_buffer_add_extension_onebyte_header  (GstRTPBuffer *rtp,
-                                                             guint8 id,
-                                                             gpointer data,
-                                                             guint size);
-gboolean       gst_rtp_buffer_add_extension_twobytes_header (GstRTPBuffer *rtp,
-                                                             guint8 appbits,
-                                                             guint8 id,
-                                                             gpointer data,
-                                                             guint size);
-
-
-G_END_DECLS
-
-#endif /* __GST_RTPBUFFER_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtppayloads.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtppayloads.h
deleted file mode 100644
index cdfef135..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtp/gstrtppayloads.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* GStreamer
- * Copyright (C) <2007> Wim Taymans <wim.taymans@gmail.com>
- *
- * gstrtppayloads.h: various helper functions to deal with RTP payload
- *     types.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTPPAYLOADS_H__
-#define __GST_RTPPAYLOADS_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTPPayload:
- * @GST_RTP_PAYLOAD_PCMU: ITU-T G.711. mu-law audio (RFC 3551)
- * @GST_RTP_PAYLOAD_1016: RFC 3551 says reserved
- * @GST_RTP_PAYLOAD_G721: RFC 3551 says reserved
- * @GST_RTP_PAYLOAD_GSM: GSM audio
- * @GST_RTP_PAYLOAD_G723: ITU G.723.1 audio
- * @GST_RTP_PAYLOAD_DVI4_8000: IMA ADPCM wave type (RFC 3551)
- * @GST_RTP_PAYLOAD_DVI4_16000: IMA ADPCM wave type (RFC 3551)
- * @GST_RTP_PAYLOAD_LPC: experimental linear predictive encoding
- * @GST_RTP_PAYLOAD_PCMA: ITU-T G.711 A-law audio (RFC 3551)
- * @GST_RTP_PAYLOAD_G722: ITU-T G.722 (RFC 3551)
- * @GST_RTP_PAYLOAD_L16_STEREO: stereo PCM
- * @GST_RTP_PAYLOAD_L16_MONO: mono PCM
- * @GST_RTP_PAYLOAD_QCELP: EIA & TIA standard IS-733
- * @GST_RTP_PAYLOAD_CN: Comfort Noise (RFC 3389)
- * @GST_RTP_PAYLOAD_MPA: Audio MPEG 1-3.
- * @GST_RTP_PAYLOAD_G728: ITU-T G.728 Speech coder (RFC 3551)
- * @GST_RTP_PAYLOAD_DVI4_11025: IMA ADPCM wave type (RFC 3551)
- * @GST_RTP_PAYLOAD_DVI4_22050: IMA ADPCM wave type (RFC 3551)
- * @GST_RTP_PAYLOAD_G729: ITU-T G.729 Speech coder (RFC 3551)
- * @GST_RTP_PAYLOAD_CELLB: See RFC 2029
- * @GST_RTP_PAYLOAD_JPEG: ISO Standards 10918-1 and 10918-2 (RFC 2435)
- * @GST_RTP_PAYLOAD_NV: nv encoding by Ron Frederick
- * @GST_RTP_PAYLOAD_H261: ITU-T Recommendation H.261 (RFC 2032)
- * @GST_RTP_PAYLOAD_MPV: Video MPEG 1 & 2 (RFC 2250)
- * @GST_RTP_PAYLOAD_MP2T: MPEG-2 transport stream (RFC 2250)
- * @GST_RTP_PAYLOAD_H263: Video H263 (RFC 2190)
- *
- *
- * Standard predefined fixed payload types.
- *
- * The official list is at:
- * http://www.iana.org/assignments/rtp-parameters
- *
- * Audio:
- * reserved: 19
- * unassigned: 20-23,
- *
- * Video:
- * unassigned: 24, 27, 29, 30, 35-71, 77-95
- * Reserved for RTCP conflict avoidance: 72-76
- */
-typedef enum
-{
-  /* Audio: */
-  GST_RTP_PAYLOAD_PCMU = 0,
-  GST_RTP_PAYLOAD_1016 = 1, /* RFC 3551 says reserved */
-  GST_RTP_PAYLOAD_G721 = 2, /* RFC 3551 says reserved */
-  GST_RTP_PAYLOAD_GSM = 3,
-  GST_RTP_PAYLOAD_G723 = 4,
-  GST_RTP_PAYLOAD_DVI4_8000 = 5,
-  GST_RTP_PAYLOAD_DVI4_16000 = 6,
-  GST_RTP_PAYLOAD_LPC = 7,
-  GST_RTP_PAYLOAD_PCMA = 8,
-  GST_RTP_PAYLOAD_G722 = 9,
-  GST_RTP_PAYLOAD_L16_STEREO = 10,
-  GST_RTP_PAYLOAD_L16_MONO = 11,
-  GST_RTP_PAYLOAD_QCELP = 12,
-  GST_RTP_PAYLOAD_CN = 13,
-  GST_RTP_PAYLOAD_MPA = 14,
-  GST_RTP_PAYLOAD_G728 = 15,
-  GST_RTP_PAYLOAD_DVI4_11025 = 16,
-  GST_RTP_PAYLOAD_DVI4_22050 = 17,
-  GST_RTP_PAYLOAD_G729 = 18,
-
-  /* Video: */
-
-  GST_RTP_PAYLOAD_CELLB = 25,
-  GST_RTP_PAYLOAD_JPEG = 26,
-  GST_RTP_PAYLOAD_NV = 28,
-  GST_RTP_PAYLOAD_H261 = 31,
-  GST_RTP_PAYLOAD_MPV = 32,
-  GST_RTP_PAYLOAD_MP2T = 33,
-  GST_RTP_PAYLOAD_H263 = 34,
-
-  /* BOTH */
-} GstRTPPayload;
-
-/* backward compatibility */
-#define GST_RTP_PAYLOAD_G723_63 16
-#define GST_RTP_PAYLOAD_G723_53 17
-#define GST_RTP_PAYLOAD_TS48 18
-#define GST_RTP_PAYLOAD_TS41 19
-
-#define GST_RTP_PAYLOAD_G723_63_STRING "16"
-#define GST_RTP_PAYLOAD_G723_53_STRING "17"
-#define GST_RTP_PAYLOAD_TS48_STRING "18"
-#define GST_RTP_PAYLOAD_TS41_STRING "19"
-
-/* Defining the above as strings, to make the declaration of pad_templates
- * easier. So if please keep these synchronized with the above.
- */
-#define GST_RTP_PAYLOAD_PCMU_STRING "0"
-#define GST_RTP_PAYLOAD_1016_STRING "1"
-#define GST_RTP_PAYLOAD_G721_STRING "2"
-#define GST_RTP_PAYLOAD_GSM_STRING "3"
-#define GST_RTP_PAYLOAD_G723_STRING "4"
-#define GST_RTP_PAYLOAD_DVI4_8000_STRING "5"
-#define GST_RTP_PAYLOAD_DVI4_16000_STRING "6"
-#define GST_RTP_PAYLOAD_LPC_STRING "7"
-#define GST_RTP_PAYLOAD_PCMA_STRING "8"
-#define GST_RTP_PAYLOAD_G722_STRING "9"
-#define GST_RTP_PAYLOAD_L16_STEREO_STRING "10"
-#define GST_RTP_PAYLOAD_L16_MONO_STRING "11"
-#define GST_RTP_PAYLOAD_QCELP_STRING "12"
-#define GST_RTP_PAYLOAD_CN_STRING "13"
-#define GST_RTP_PAYLOAD_MPA_STRING "14"
-#define GST_RTP_PAYLOAD_G728_STRING "15"
-#define GST_RTP_PAYLOAD_DVI4_11025_STRING "16"
-#define GST_RTP_PAYLOAD_DVI4_22050_STRING "17"
-#define GST_RTP_PAYLOAD_G729_STRING "18"
-
-#define GST_RTP_PAYLOAD_CELLB_STRING "25"
-#define GST_RTP_PAYLOAD_JPEG_STRING "26"
-#define GST_RTP_PAYLOAD_NV_STRING "28"
-
-#define GST_RTP_PAYLOAD_H261_STRING "31"
-#define GST_RTP_PAYLOAD_MPV_STRING "32"
-#define GST_RTP_PAYLOAD_MP2T_STRING "33"
-#define GST_RTP_PAYLOAD_H263_STRING "34"
-
-#define GST_RTP_PAYLOAD_DYNAMIC_STRING "[96, 127]"
-
-/**
- * GST_RTP_PAYLOAD_IS_DYNAMIC:
- * @pt: a payload type
- *
- * Check if @pt is a dynamic payload type.
- */
-#define GST_RTP_PAYLOAD_IS_DYNAMIC(pt) ((pt) >= 96 && (pt) <= 127)
-
-typedef struct _GstRTPPayloadInfo GstRTPPayloadInfo;
-
-/**
- * GstRTPPayloadInfo:
- * @payload_type: payload type, -1 means dynamic
- * @media: the media type(s), usually "audio", "video", "application", "text",
- * "message".
- * @encoding_name: the encoding name of @pt
- * @clock_rate: default clock rate, 0 = unknown/variable
- * @encoding_parameters: encoding parameters. For audio this is the number of
- * channels. NULL = not applicable.
- * @bitrate: the bitrate of the media. 0 = unknown/variable.
- *
- * Structure holding default payload type information.
- */
-struct _GstRTPPayloadInfo
-{
-  guint8       payload_type;
-  const gchar *media;
-  const gchar *encoding_name;
-  guint        clock_rate;
-  const gchar *encoding_parameters;
-  guint        bitrate;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-const GstRTPPayloadInfo *  gst_rtp_payload_info_for_pt     (guint8 payload_type);
-const GstRTPPayloadInfo *  gst_rtp_payload_info_for_name   (const gchar *media, const gchar *encoding_name);
-
-G_END_DECLS
-
-#endif /* __GST_RTPPAYLOADS_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsp-enumtypes.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsp-enumtypes.h
deleted file mode 100644
index 3254324f..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsp-enumtypes.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-#ifndef __gst_rtsp_ENUM_TYPES_H__
-#define __gst_rtsp_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "gstrtspdefs.h" */
-GType gst_rtsp_result_get_type (void);
-#define GST_TYPE_RTSP_RESULT (gst_rtsp_result_get_type())
-GType gst_rtsp_event_get_type (void);
-#define GST_TYPE_RTSP_EVENT (gst_rtsp_event_get_type())
-GType gst_rtsp_family_get_type (void);
-#define GST_TYPE_RTSP_FAMILY (gst_rtsp_family_get_type())
-GType gst_rtsp_state_get_type (void);
-#define GST_TYPE_RTSP_STATE (gst_rtsp_state_get_type())
-GType gst_rtsp_version_get_type (void);
-#define GST_TYPE_RTSP_VERSION (gst_rtsp_version_get_type())
-GType gst_rtsp_method_get_type (void);
-#define GST_TYPE_RTSP_METHOD (gst_rtsp_method_get_type())
-GType gst_rtsp_auth_method_get_type (void);
-#define GST_TYPE_RTSP_AUTH_METHOD (gst_rtsp_auth_method_get_type())
-GType gst_rtsp_header_field_get_type (void);
-#define GST_TYPE_RTSP_HEADER_FIELD (gst_rtsp_header_field_get_type())
-GType gst_rtsp_status_code_get_type (void);
-#define GST_TYPE_RTSP_STATUS_CODE (gst_rtsp_status_code_get_type())
-G_END_DECLS
-
-#endif /* __gst_rtsp_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspconnection.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspconnection.h
deleted file mode 100644
index c004535a..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspconnection.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2009> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_CONNECTION_H__
-#define __GST_RTSP_CONNECTION_H__
-
-#include <glib.h>
-
-#include <gst/gstconfig.h>
-#include <gst/rtsp/gstrtspdefs.h>
-#include <gst/rtsp/gstrtspurl.h>
-#include <gst/rtsp/gstrtspmessage.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTSPConnection:
- *
- * Opaque RTSP connection object.
- */
-typedef struct _GstRTSPConnection GstRTSPConnection;
-
-/* opening/closing a connection */
-GstRTSPResult      gst_rtsp_connection_create         (const GstRTSPUrl *url, GstRTSPConnection **conn);
-GstRTSPResult      gst_rtsp_connection_create_from_socket (GSocket * socket,
-                                                       const gchar * ip,
-                                                       guint16 port,
-                                                       const gchar * initial_buffer,
-                                                       GstRTSPConnection ** conn);
-GstRTSPResult      gst_rtsp_connection_accept         (GSocket *socket, GstRTSPConnection **conn, GCancellable *cancellable);
-GstRTSPResult      gst_rtsp_connection_connect        (GstRTSPConnection *conn, GTimeVal *timeout);
-GstRTSPResult      gst_rtsp_connection_close          (GstRTSPConnection *conn);
-GstRTSPResult      gst_rtsp_connection_free           (GstRTSPConnection *conn);
-
-
-/* sending/receiving raw bytes */
-GstRTSPResult      gst_rtsp_connection_read           (GstRTSPConnection * conn, guint8 * data,
-                                                       guint size, GTimeVal * timeout);
-GstRTSPResult      gst_rtsp_connection_write          (GstRTSPConnection * conn, const guint8 * data,
-                                                       guint size, GTimeVal * timeout);
-
-/* sending/receiving messages */
-GstRTSPResult      gst_rtsp_connection_send           (GstRTSPConnection *conn, GstRTSPMessage *message,
-                                                       GTimeVal *timeout);
-GstRTSPResult      gst_rtsp_connection_receive        (GstRTSPConnection *conn, GstRTSPMessage *message,
-                                                       GTimeVal *timeout);
-
-/* status management */
-GstRTSPResult      gst_rtsp_connection_poll           (GstRTSPConnection *conn, GstRTSPEvent events,
-                                                       GstRTSPEvent *revents, GTimeVal *timeout);
-
-/* reset the timeout */
-GstRTSPResult      gst_rtsp_connection_next_timeout   (GstRTSPConnection *conn, GTimeVal *timeout);
-GstRTSPResult      gst_rtsp_connection_reset_timeout  (GstRTSPConnection *conn);
-
-/* flushing state */
-GstRTSPResult      gst_rtsp_connection_flush          (GstRTSPConnection *conn, gboolean flush);
-
-/* HTTP proxy support */
-GstRTSPResult      gst_rtsp_connection_set_proxy      (GstRTSPConnection *conn,
-                                                       const gchar *host, guint port);
-
-/* configure authentication data */
-GstRTSPResult      gst_rtsp_connection_set_auth       (GstRTSPConnection *conn, GstRTSPAuthMethod method,
-                                                       const gchar *user, const gchar *pass);
-
-void               gst_rtsp_connection_set_auth_param    (GstRTSPConnection *conn,
-                                                          const gchar * param,
-                                                          const gchar *value);
-void               gst_rtsp_connection_clear_auth_params (GstRTSPConnection *conn);
-
-/* configure DSCP */
-GstRTSPResult      gst_rtsp_connection_set_qos_dscp   (GstRTSPConnection *conn,
-                                                       guint qos_dscp);
-
-/* accessors */
-GstRTSPUrl *       gst_rtsp_connection_get_url        (const GstRTSPConnection *conn);
-const gchar *      gst_rtsp_connection_get_ip         (const GstRTSPConnection *conn);
-void               gst_rtsp_connection_set_ip         (GstRTSPConnection *conn, const gchar *ip);
-
-GSocket *          gst_rtsp_connection_get_read_socket  (const GstRTSPConnection *conn);
-GSocket *          gst_rtsp_connection_get_write_socket (const GstRTSPConnection *conn);
-
-void               gst_rtsp_connection_set_http_mode  (GstRTSPConnection *conn,
-                                                       gboolean enable);
-
-/* tunneling */
-void               gst_rtsp_connection_set_tunneled   (GstRTSPConnection *conn, gboolean tunneled);
-gboolean           gst_rtsp_connection_is_tunneled    (const GstRTSPConnection *conn);
-
-const gchar *      gst_rtsp_connection_get_tunnelid   (const GstRTSPConnection *conn);
-GstRTSPResult      gst_rtsp_connection_do_tunnel      (GstRTSPConnection *conn, GstRTSPConnection *conn2);
-
-/* async IO */
-
-/**
- * GstRTSPWatch:
- *
- * Opaque RTSP watch object that can be used for asynchronous RTSP
- * operations.
- */
-typedef struct _GstRTSPWatch GstRTSPWatch;
-
-/**
- * GstRTSPWatchFuncs:
- * @message_received: callback when a message was received
- * @message_sent: callback when a message was sent
- * @closed: callback when the connection is closed
- * @error: callback when an error occured
- * @tunnel_start: a client started a tunneled connection. The tunnelid of the
- *   connection must be saved.
- * @tunnel_complete: a client finished a tunneled connection. In this callback
- *   you usually pair the tunnelid of this connection with the saved one using
- *   gst_rtsp_connection_do_tunnel().
- * @error_full: callback when an error occured with more information than
- *   the @error callback.
- * @tunnel_lost: callback when the post connection of a tunnel is closed.
- *
- * Callback functions from a #GstRTSPWatch.
- */
-typedef struct {
-  GstRTSPResult     (*message_received) (GstRTSPWatch *watch, GstRTSPMessage *message,
-                                         gpointer user_data);
-  GstRTSPResult     (*message_sent)     (GstRTSPWatch *watch, guint id,
-                                         gpointer user_data);
-  GstRTSPResult     (*closed)           (GstRTSPWatch *watch, gpointer user_data);
-  GstRTSPResult     (*error)            (GstRTSPWatch *watch, GstRTSPResult result,
-                                         gpointer user_data);
-  GstRTSPStatusCode (*tunnel_start)     (GstRTSPWatch *watch, gpointer user_data);
-  GstRTSPResult     (*tunnel_complete)  (GstRTSPWatch *watch, gpointer user_data);
-  GstRTSPResult     (*error_full)       (GstRTSPWatch *watch, GstRTSPResult result,
-                                         GstRTSPMessage *message, guint id,
-                                         gpointer user_data);
-  GstRTSPResult     (*tunnel_lost)      (GstRTSPWatch *watch, gpointer user_data);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-} GstRTSPWatchFuncs;
-
-GstRTSPWatch *     gst_rtsp_watch_new                (GstRTSPConnection *conn,
-                                                      GstRTSPWatchFuncs *funcs,
-                                                      gpointer user_data,
-                                                      GDestroyNotify notify);
-void               gst_rtsp_watch_reset              (GstRTSPWatch *watch);
-void               gst_rtsp_watch_unref              (GstRTSPWatch *watch);
-
-guint              gst_rtsp_watch_attach             (GstRTSPWatch *watch,
-                                                      GMainContext *context);
-
-GstRTSPResult      gst_rtsp_watch_write_data         (GstRTSPWatch *watch,
-                                                      const guint8 *data,
-                                                      guint size, guint *id);
-GstRTSPResult      gst_rtsp_watch_send_message       (GstRTSPWatch *watch,
-                                                      GstRTSPMessage *message,
-                                                      guint *id);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_CONNECTION_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspdefs.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspdefs.h
deleted file mode 100644
index e0b37935..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspdefs.h
+++ /dev/null
@@ -1,410 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_DEFS_H__
-#define __GST_RTSP_DEFS_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_RTSP_CHECK:
- * @stmt: a statement
- * @label: a label
- *
- * Macro that checks the return value of @stmt and jumps to @label when it does
- * not equal #GST_RTSP_OK.
- */
-#define GST_RTSP_CHECK(stmt, label)  \
-G_STMT_START { \
-  if (G_UNLIKELY ((res = (stmt)) != GST_RTSP_OK)) \
-    goto label; \
-} G_STMT_END
-
-/**
- * GstRTSPResult:
- * @GST_RTSP_OK: no error
- * @GST_RTSP_ERROR: some unspecified error occured
- * @GST_RTSP_EINVAL: invalid arguments were provided to a function
- * @GST_RTSP_EINTR: an operation was canceled
- * @GST_RTSP_ENOMEM: no memory was available for the operation
- * @GST_RTSP_ERESOLV: a host resolve error occured
- * @GST_RTSP_ENOTIMPL: function not implemented
- * @GST_RTSP_ESYS: a system error occured, errno contains more details
- * @GST_RTSP_EPARSE: a persing error occured
- * @GST_RTSP_EWSASTART: windows networking could not start
- * @GST_RTSP_EWSAVERSION: windows networking stack has wrong version
- * @GST_RTSP_EEOF: end-of-file was reached
- * @GST_RTSP_ENET: a network problem occured, h_errno contains more details
- * @GST_RTSP_ENOTIP: the host is not an IP host
- * @GST_RTSP_ETIMEOUT: a timeout occured
- * @GST_RTSP_ETGET: the tunnel GET request has been performed
- * @GST_RTSP_ETPOST: the tunnel POST request has been performed
- * @GST_RTSP_ELAST: last error
- *
- * Result codes from the RTSP functions.
- */
-typedef enum {
-  GST_RTSP_OK          =  0,
-  /* errors */
-  GST_RTSP_ERROR       = -1,
-  GST_RTSP_EINVAL      = -2,
-  GST_RTSP_EINTR       = -3,
-  GST_RTSP_ENOMEM      = -4,
-  GST_RTSP_ERESOLV     = -5,
-  GST_RTSP_ENOTIMPL    = -6,
-  GST_RTSP_ESYS        = -7,
-  GST_RTSP_EPARSE      = -8,
-  GST_RTSP_EWSASTART   = -9,
-  GST_RTSP_EWSAVERSION = -10,
-  GST_RTSP_EEOF        = -11,
-  GST_RTSP_ENET        = -12,
-  GST_RTSP_ENOTIP      = -13,
-  GST_RTSP_ETIMEOUT    = -14,
-  GST_RTSP_ETGET       = -15,
-  GST_RTSP_ETPOST      = -16,
-
-  GST_RTSP_ELAST       = -17
-} GstRTSPResult;
-
-/**
- * GstRTSPEvent:
- * @GST_RTSP_EV_READ: connection is readable
- * @GST_RTSP_EV_WRITE: connection is writable
- *
- * The possible events for the connection.
- */
-typedef enum {
-  GST_RTSP_EV_READ  = (1 << 0),
-  GST_RTSP_EV_WRITE = (1 << 1)
-} GstRTSPEvent;
-
-/**
- * GstRTSPFamily:
- * @GST_RTSP_FAM_NONE: unknown network family
- * @GST_RTSP_FAM_INET: internet
- * @GST_RTSP_FAM_INET6: internet V6
- *
- * The possible network families.
- */
-typedef enum {
-  GST_RTSP_FAM_NONE,
-  GST_RTSP_FAM_INET,
-  GST_RTSP_FAM_INET6
-} GstRTSPFamily;
-
-/**
- * GstRTSPState:
- * @GST_RTSP_STATE_INVALID: invalid state
- * @GST_RTSP_STATE_INIT: initializing
- * @GST_RTSP_STATE_READY: ready for operation
- * @GST_RTSP_STATE_SEEKING: seeking in progress
- * @GST_RTSP_STATE_PLAYING: playing
- * @GST_RTSP_STATE_RECORDING: recording
- *
- * The different RTSP states.
- */
-typedef enum {
-  GST_RTSP_STATE_INVALID,
-  GST_RTSP_STATE_INIT,
-  GST_RTSP_STATE_READY,
-  GST_RTSP_STATE_SEEKING,
-  GST_RTSP_STATE_PLAYING,
-  GST_RTSP_STATE_RECORDING
-} GstRTSPState;
-
-/**
- * GstRTSPVersion:
- * @GST_RTSP_VERSION_INVALID: unknown/invalid version
- * @GST_RTSP_VERSION_1_0: version 1.0
- * @GST_RTSP_VERSION_1_1: version 1.1.
- *
- * The supported RTSP versions.
- */
-typedef enum {
-  GST_RTSP_VERSION_INVALID = 0x00,
-  GST_RTSP_VERSION_1_0     = 0x10,
-  GST_RTSP_VERSION_1_1     = 0x11
-} GstRTSPVersion;
-
-/**
- * GstRTSPMethod:
- * @GST_RTSP_INVALID: invalid method
- * @GST_RTSP_DESCRIBE: the DESCRIBE method
- * @GST_RTSP_ANNOUNCE: the ANNOUNCE method
- * @GST_RTSP_GET_PARAMETER: the GET_PARAMETER method
- * @GST_RTSP_OPTIONS: the OPTIONS method
- * @GST_RTSP_PAUSE: the PAUSE method
- * @GST_RTSP_PLAY: the PLAY method
- * @GST_RTSP_RECORD: the RECORD method
- * @GST_RTSP_REDIRECT: the REDIRECT method
- * @GST_RTSP_SETUP: the SETUP method
- * @GST_RTSP_SET_PARAMETER: the SET_PARAMETER method
- * @GST_RTSP_TEARDOWN: the TEARDOWN method
- * @GST_RTSP_GET: the GET method (HTTP).
- * @GST_RTSP_POST: the POST method (HTTP).
- *
- * The different supported RTSP methods.
- */
-typedef enum {
-  GST_RTSP_INVALID          = 0,
-  GST_RTSP_DESCRIBE         = (1 <<  0),
-  GST_RTSP_ANNOUNCE         = (1 <<  1),
-  GST_RTSP_GET_PARAMETER    = (1 <<  2),
-  GST_RTSP_OPTIONS          = (1 <<  3),
-  GST_RTSP_PAUSE            = (1 <<  4),
-  GST_RTSP_PLAY             = (1 <<  5),
-  GST_RTSP_RECORD           = (1 <<  6),
-  GST_RTSP_REDIRECT         = (1 <<  7),
-  GST_RTSP_SETUP            = (1 <<  8),
-  GST_RTSP_SET_PARAMETER    = (1 <<  9),
-  GST_RTSP_TEARDOWN         = (1 << 10),
-  GST_RTSP_GET              = (1 << 11),
-  GST_RTSP_POST             = (1 << 12)
-} GstRTSPMethod;
-
-/**
- * GstRTSPAuthMethod:
- * @GST_RTSP_AUTH_NONE: no authentication
- * @GST_RTSP_AUTH_BASIC: basic authentication
- * @GST_RTSP_AUTH_DIGEST: digest authentication
- *
- * Authentication methods, ordered by strength
- */
-typedef enum {
-  GST_RTSP_AUTH_NONE    = 0x00,
-  GST_RTSP_AUTH_BASIC   = 0x01,
-  GST_RTSP_AUTH_DIGEST  = 0x02
-} GstRTSPAuthMethod;
-
-/**
- * GST_RTSP_AUTH_MAX:
- *
- * Strongest available authentication method
- */
-#define GST_RTSP_AUTH_MAX GST_RTSP_AUTH_DIGEST
-
-/**
- * GstRTSPHeaderField:
- *
- * Enumeration of rtsp header fields
- */
-typedef enum {
-  GST_RTSP_HDR_INVALID,
-
-  /*
-   * R = Request
-   * r = response
-   * g = general
-   * e = entity
-   */
-  GST_RTSP_HDR_ACCEPT,              /* Accept               R      opt.      entity */
-  GST_RTSP_HDR_ACCEPT_ENCODING,     /* Accept-Encoding      R      opt.      entity */
-  GST_RTSP_HDR_ACCEPT_LANGUAGE,     /* Accept-Language      R      opt.      all */
-  GST_RTSP_HDR_ALLOW,               /* Allow                r      opt.      all */
-  GST_RTSP_HDR_AUTHORIZATION,       /* Authorization        R      opt.      all */
-  GST_RTSP_HDR_BANDWIDTH,           /* Bandwidth            R      opt.      all */
-  GST_RTSP_HDR_BLOCKSIZE,           /* Blocksize            R      opt.      all but OPTIONS, TEARDOWN */
-  GST_RTSP_HDR_CACHE_CONTROL,       /* Cache-Control        g      opt.      SETUP */
-  GST_RTSP_HDR_CONFERENCE,          /* Conference           R      opt.      SETUP */
-  GST_RTSP_HDR_CONNECTION,          /* Connection           g      req.      all */
-  GST_RTSP_HDR_CONTENT_BASE,        /* Content-Base         e      opt.      entity */
-  GST_RTSP_HDR_CONTENT_ENCODING,    /* Content-Encoding     e      req.      SET_PARAMETER, DESCRIBE, ANNOUNCE */
-  GST_RTSP_HDR_CONTENT_LANGUAGE,    /* Content-Language     e      req.      DESCRIBE, ANNOUNCE */
-  GST_RTSP_HDR_CONTENT_LENGTH,      /* Content-Length       e      req.      SET_PARAMETER, ANNOUNCE, entity */
-  GST_RTSP_HDR_CONTENT_LOCATION,    /* Content-Location     e      opt.      entity */
-  GST_RTSP_HDR_CONTENT_TYPE,        /* Content-Type         e      req.      SET_PARAMETER, ANNOUNCE, entity */
-  GST_RTSP_HDR_CSEQ,                /* CSeq                 g      req.      all */
-  GST_RTSP_HDR_DATE,                /* Date                 g      opt.      all */
-  GST_RTSP_HDR_EXPIRES,             /* Expires              e      opt.      DESCRIBE, ANNOUNCE */
-  GST_RTSP_HDR_FROM,                /* From                 R      opt.      all */
-  GST_RTSP_HDR_IF_MODIFIED_SINCE,   /* If-Modified-Since    R      opt.      DESCRIBE, SETUP */
-  GST_RTSP_HDR_LAST_MODIFIED,       /* Last-Modified        e      opt.      entity */
-  GST_RTSP_HDR_PROXY_AUTHENTICATE,  /* Proxy-Authenticate */
-  GST_RTSP_HDR_PROXY_REQUIRE,       /* Proxy-Require        R      req.      all */
-  GST_RTSP_HDR_PUBLIC,              /* Public               r      opt.      all */
-  GST_RTSP_HDR_RANGE,               /* Range                Rr     opt.      PLAY, PAUSE, RECORD */
-  GST_RTSP_HDR_REFERER,             /* Referer              R      opt.      all */
-  GST_RTSP_HDR_REQUIRE,             /* Require              R      req.      all */
-  GST_RTSP_HDR_RETRY_AFTER,         /* Retry-After          r      opt.      all */
-  GST_RTSP_HDR_RTP_INFO,            /* RTP-Info             r      req.      PLAY */
-  GST_RTSP_HDR_SCALE,               /* Scale                Rr     opt.      PLAY, RECORD */
-  GST_RTSP_HDR_SESSION,             /* Session              Rr     req.      all but SETUP, OPTIONS */
-  GST_RTSP_HDR_SERVER,              /* Server               r      opt.      all */
-  GST_RTSP_HDR_SPEED,               /* Speed                Rr     opt.      PLAY */
-  GST_RTSP_HDR_TRANSPORT,           /* Transport            Rr     req.      SETUP */
-  GST_RTSP_HDR_UNSUPPORTED,         /* Unsupported          r      req.      all */
-  GST_RTSP_HDR_USER_AGENT,          /* User-Agent           R      opt.      all */
-  GST_RTSP_HDR_VIA,                 /* Via                  g      opt.      all */
-  GST_RTSP_HDR_WWW_AUTHENTICATE,    /* WWW-Authenticate     r      opt.      all */
-
-  /* Real extensions */
-  GST_RTSP_HDR_CLIENT_CHALLENGE,    /* ClientChallenge */
-  GST_RTSP_HDR_REAL_CHALLENGE1,     /* RealChallenge1 */
-  GST_RTSP_HDR_REAL_CHALLENGE2,     /* RealChallenge2 */
-  GST_RTSP_HDR_REAL_CHALLENGE3,     /* RealChallenge3 */
-  GST_RTSP_HDR_SUBSCRIBE,           /* Subscribe */
-  GST_RTSP_HDR_ALERT,               /* Alert */
-  GST_RTSP_HDR_CLIENT_ID,           /* ClientID */
-  GST_RTSP_HDR_COMPANY_ID,          /* CompanyID */
-  GST_RTSP_HDR_GUID,                /* GUID */
-  GST_RTSP_HDR_REGION_DATA,         /* RegionData */
-  GST_RTSP_HDR_MAX_ASM_WIDTH,       /* SupportsMaximumASMBandwidth */
-  GST_RTSP_HDR_LANGUAGE,            /* Language */
-  GST_RTSP_HDR_PLAYER_START_TIME,   /* PlayerStarttime */
-
-  /* Since 0.10.16 */
-  GST_RTSP_HDR_LOCATION,            /* Location */
-
-  /* Since 0.10.23 */
-  GST_RTSP_HDR_ETAG,                /* ETag */
-  GST_RTSP_HDR_IF_MATCH,            /* If-Match */
-
-  /* WM extensions [MS-RTSP] Since 0.10.23 */
-  GST_RTSP_HDR_ACCEPT_CHARSET,      /* Accept-Charset */
-  GST_RTSP_HDR_SUPPORTED,           /* Supported */
-  GST_RTSP_HDR_VARY,                /* Vary */
-  GST_RTSP_HDR_X_ACCELERATE_STREAMING,    /* X-Accelerate-Streaming */
-  GST_RTSP_HDR_X_ACCEPT_AUTHENT,    /* X-Accept-Authentication */
-  GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT,    /* X-Accept-Proxy-Authentication */
-  GST_RTSP_HDR_X_BROADCAST_ID,      /* X-Broadcast-Id */
-  GST_RTSP_HDR_X_BURST_STREAMING,   /* X-Burst-Streaming */
-  GST_RTSP_HDR_X_NOTICE,            /* X-Notice */
-  GST_RTSP_HDR_X_PLAYER_LAG_TIME,   /* X-Player-Lag-Time */
-  GST_RTSP_HDR_X_PLAYLIST,          /* X-Playlist */
-  GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE,  /* X-Playlist-Change-Notice */
-  GST_RTSP_HDR_X_PLAYLIST_GEN_ID,   /* X-Playlist-Gen-Id */
-  GST_RTSP_HDR_X_PLAYLIST_SEEK_ID,  /* X-Playlist-Seek-Id */
-  GST_RTSP_HDR_X_PROXY_CLIENT_AGENT,      /* X-Proxy-Client-Agent */
-  GST_RTSP_HDR_X_PROXY_CLIENT_VERB, /* X-Proxy-Client-Verb */
-  GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE, /* X-Receding-PlaylistChange */
-  GST_RTSP_HDR_X_RTP_INFO,          /* X-RTP-Info */
-  GST_RTSP_HDR_X_STARTUPPROFILE,    /* X-StartupProfile */
-
-  /* Since 0.10.24 */
-  GST_RTSP_HDR_TIMESTAMP,           /* Timestamp */
-
-  /* Since 0.10.25 */
-  GST_RTSP_HDR_AUTHENTICATION_INFO, /* Authentication-Info */
-  GST_RTSP_HDR_HOST,                /* Host */
-  GST_RTSP_HDR_PRAGMA,              /* Pragma */
-  GST_RTSP_HDR_X_SERVER_IP_ADDRESS, /* X-Server-IP-Address */
-  GST_RTSP_HDR_X_SESSIONCOOKIE,     /* X-Sessioncookie */
-
-  /* Since 0.10.36 */
-  GST_RTSP_HDR_RTCP_INTERVAL,       /* RTCP-Interval */
-
-  GST_RTSP_HDR_LAST
-} GstRTSPHeaderField;
-
-/**
- * GstRTSPStatusCode:
- *
- * Enumeration of rtsp status codes
- */
-typedef enum {
-  GST_RTSP_STS_INVALID                              = 0,
-  GST_RTSP_STS_CONTINUE                             = 100,
-  GST_RTSP_STS_OK                                   = 200,
-  GST_RTSP_STS_CREATED                              = 201,
-  GST_RTSP_STS_LOW_ON_STORAGE                       = 250,
-  GST_RTSP_STS_MULTIPLE_CHOICES                     = 300,
-  GST_RTSP_STS_MOVED_PERMANENTLY                    = 301,
-  GST_RTSP_STS_MOVE_TEMPORARILY                     = 302,
-  GST_RTSP_STS_SEE_OTHER                            = 303,
-  GST_RTSP_STS_NOT_MODIFIED                         = 304,
-  GST_RTSP_STS_USE_PROXY                            = 305,
-  GST_RTSP_STS_BAD_REQUEST                          = 400,
-  GST_RTSP_STS_UNAUTHORIZED                         = 401,
-  GST_RTSP_STS_PAYMENT_REQUIRED                     = 402,
-  GST_RTSP_STS_FORBIDDEN                            = 403,
-  GST_RTSP_STS_NOT_FOUND                            = 404,
-  GST_RTSP_STS_METHOD_NOT_ALLOWED                   = 405,
-  GST_RTSP_STS_NOT_ACCEPTABLE                       = 406,
-  GST_RTSP_STS_PROXY_AUTH_REQUIRED                  = 407,
-  GST_RTSP_STS_REQUEST_TIMEOUT                      = 408,
-  GST_RTSP_STS_GONE                                 = 410,
-  GST_RTSP_STS_LENGTH_REQUIRED                      = 411,
-  GST_RTSP_STS_PRECONDITION_FAILED                  = 412,
-  GST_RTSP_STS_REQUEST_ENTITY_TOO_LARGE             = 413,
-  GST_RTSP_STS_REQUEST_URI_TOO_LARGE                = 414,
-  GST_RTSP_STS_UNSUPPORTED_MEDIA_TYPE               = 415,
-  GST_RTSP_STS_PARAMETER_NOT_UNDERSTOOD             = 451,
-  GST_RTSP_STS_CONFERENCE_NOT_FOUND                 = 452,
-  GST_RTSP_STS_NOT_ENOUGH_BANDWIDTH                 = 453,
-  GST_RTSP_STS_SESSION_NOT_FOUND                    = 454,
-  GST_RTSP_STS_METHOD_NOT_VALID_IN_THIS_STATE       = 455,
-  GST_RTSP_STS_HEADER_FIELD_NOT_VALID_FOR_RESOURCE  = 456,
-  GST_RTSP_STS_INVALID_RANGE                        = 457,
-  GST_RTSP_STS_PARAMETER_IS_READONLY                = 458,
-  GST_RTSP_STS_AGGREGATE_OPERATION_NOT_ALLOWED      = 459,
-  GST_RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED     = 460,
-  GST_RTSP_STS_UNSUPPORTED_TRANSPORT                = 461,
-  GST_RTSP_STS_DESTINATION_UNREACHABLE              = 462,
-  GST_RTSP_STS_INTERNAL_SERVER_ERROR                = 500,
-  GST_RTSP_STS_NOT_IMPLEMENTED                      = 501,
-  GST_RTSP_STS_BAD_GATEWAY                          = 502,
-  GST_RTSP_STS_SERVICE_UNAVAILABLE                  = 503,
-  GST_RTSP_STS_GATEWAY_TIMEOUT                      = 504,
-  GST_RTSP_STS_RTSP_VERSION_NOT_SUPPORTED           = 505,
-  GST_RTSP_STS_OPTION_NOT_SUPPORTED                 = 551
-} GstRTSPStatusCode;
-
-gchar*             gst_rtsp_strresult          (GstRTSPResult result);
-
-const gchar*       gst_rtsp_method_as_text     (GstRTSPMethod method);
-const gchar*       gst_rtsp_version_as_text    (GstRTSPVersion version);
-const gchar*       gst_rtsp_header_as_text     (GstRTSPHeaderField field);
-const gchar*       gst_rtsp_status_as_text     (GstRTSPStatusCode code);
-
-gchar*             gst_rtsp_options_as_text    (GstRTSPMethod options);
-
-GstRTSPHeaderField gst_rtsp_find_header_field  (const gchar *header);
-GstRTSPMethod      gst_rtsp_find_method        (const gchar *method);
-
-gboolean           gst_rtsp_header_allow_multiple (GstRTSPHeaderField field);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_DEFS_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspextension.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspextension.h
deleted file mode 100644
index 66aa7ac7..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspextension.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* GStreamer RTSP Extension
- * Copyright (C) 2007 Wim Taymans <wim@fluendo.com>
- *
- * gstrtspextension.h: RTSP Extension interface.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_RTSP_EXTENSION_H__
-#define __GST_RTSP_EXTENSION_H__
-
-#include <gst/gst.h>
-
-#include <gst/sdp/gstsdpmessage.h>
-#include <gst/rtsp/gstrtsptransport.h>
-#include <gst/rtsp/gstrtspmessage.h>
-#include <gst/rtsp/gstrtspurl.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_RTSP_EXTENSION \
-  (gst_rtsp_extension_get_type ())
-#define GST_RTSP_EXTENSION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_RTSP_EXTENSION, GstRTSPExtension))
-#define GST_IS_RTSP_EXTENSION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_RTSP_EXTENSION))
-#define GST_RTSP_EXTENSION_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_RTSP_EXTENSION, GstRTSPExtensionInterface))
-
-typedef struct _GstRTSPExtension GstRTSPExtension;
-typedef struct _GstRTSPExtensionInterface GstRTSPExtensionInterface;
-
-struct _GstRTSPExtensionInterface {
-  GTypeInterface parent;
-
-  /* vfunctions */
-  gboolean      (*detect_server)    (GstRTSPExtension *ext, GstRTSPMessage *resp);
-
-  GstRTSPResult (*before_send)      (GstRTSPExtension *ext, GstRTSPMessage *req);
-  GstRTSPResult (*after_send)       (GstRTSPExtension *ext, GstRTSPMessage *req, GstRTSPMessage *resp);
-
-  GstRTSPResult (*parse_sdp)        (GstRTSPExtension *ext, GstSDPMessage *sdp, GstStructure *s);
-  GstRTSPResult (*setup_media)      (GstRTSPExtension *ext, GstSDPMedia *media);
-
-  gboolean      (*configure_stream) (GstRTSPExtension *ext, GstCaps *caps);
-
-  GstRTSPResult (*get_transports)   (GstRTSPExtension *ext, GstRTSPLowerTrans protocols, gchar **transport);
-
-  GstRTSPResult (*stream_select)    (GstRTSPExtension *ext, GstRTSPUrl *url);
-
-  /* signals */
-  GstRTSPResult (*send)             (GstRTSPExtension *ext, GstRTSPMessage *req, GstRTSPMessage *resp);
-
-  /* ABI: more vfunctions added later */
-  GstRTSPResult (*receive_request)  (GstRTSPExtension *ext, GstRTSPMessage *req);
-
-  /*< private >*/
-  gpointer                 _gst_reserved[GST_PADDING];
-};
-
-GType           gst_rtsp_extension_get_type          (void);
-
-/* invoke vfunction on interface */
-gboolean        gst_rtsp_extension_detect_server     (GstRTSPExtension *ext, GstRTSPMessage *resp);
-
-GstRTSPResult   gst_rtsp_extension_before_send       (GstRTSPExtension *ext, GstRTSPMessage *req);
-GstRTSPResult   gst_rtsp_extension_after_send        (GstRTSPExtension *ext, GstRTSPMessage *req,
-                                                      GstRTSPMessage *resp);
-GstRTSPResult   gst_rtsp_extension_parse_sdp         (GstRTSPExtension *ext, GstSDPMessage *sdp,
-                                                      GstStructure *s);
-GstRTSPResult   gst_rtsp_extension_setup_media       (GstRTSPExtension *ext, GstSDPMedia *media);
-gboolean        gst_rtsp_extension_configure_stream  (GstRTSPExtension *ext, GstCaps *caps);
-GstRTSPResult   gst_rtsp_extension_get_transports    (GstRTSPExtension *ext, GstRTSPLowerTrans protocols,
-                                                      gchar **transport);
-GstRTSPResult   gst_rtsp_extension_stream_select     (GstRTSPExtension *ext, GstRTSPUrl *url);
-GstRTSPResult   gst_rtsp_extension_receive_request   (GstRTSPExtension *ext, GstRTSPMessage *req);
-
-/* signal emision */
-GstRTSPResult   gst_rtsp_extension_send              (GstRTSPExtension *ext, GstRTSPMessage *req,
-                                                      GstRTSPMessage *resp);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_EXTENSION_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspmessage.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspmessage.h
deleted file mode 100644
index b430ce29..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspmessage.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_MESSAGE_H__
-#define __GST_RTSP_MESSAGE_H__
-
-#include <glib.h>
-
-#include <gst/rtsp/gstrtspdefs.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTSPMsgType:
- * @GST_RTSP_MESSAGE_INVALID: invalid message type
- * @GST_RTSP_MESSAGE_REQUEST: RTSP request message
- * @GST_RTSP_MESSAGE_RESPONSE: RTSP response message
- * @GST_RTSP_MESSAGE_HTTP_REQUEST: HTTP request message.
- * @GST_RTSP_MESSAGE_HTTP_RESPONSE: HTTP response message.
- * @GST_RTSP_MESSAGE_DATA: data message
- *
- * The type of a message.
- */
-typedef enum
-{
-  GST_RTSP_MESSAGE_INVALID,
-  GST_RTSP_MESSAGE_REQUEST,
-  GST_RTSP_MESSAGE_RESPONSE,
-  GST_RTSP_MESSAGE_HTTP_REQUEST,
-  GST_RTSP_MESSAGE_HTTP_RESPONSE,
-  GST_RTSP_MESSAGE_DATA
-} GstRTSPMsgType;
-
-typedef struct _GstRTSPMessage GstRTSPMessage;
-
-/**
- * GstRTSPMessage:
- * @type: the message type
- *
- * An RTSP message containing request, response or data messages. Depending on
- * the @type, the appropriate structure may be accessed.
- */
-struct _GstRTSPMessage
-{
-  GstRTSPMsgType    type;
-
-  union {
-    struct {
-      GstRTSPMethod      method;
-      gchar             *uri;
-      GstRTSPVersion     version;
-    } request;
-    struct {
-      GstRTSPStatusCode  code;
-      gchar             *reason;
-      GstRTSPVersion     version;
-    } response;
-    struct {
-      guint8             channel;
-    } data;
-  } type_data;
-
-  /*< private >*/
-  GArray        *hdr_fields;
-
-  guint8        *body;
-  guint          body_size;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/* memory management */
-GstRTSPResult      gst_rtsp_message_new             (GstRTSPMessage **msg);
-GstRTSPResult      gst_rtsp_message_init            (GstRTSPMessage *msg);
-GstRTSPResult      gst_rtsp_message_unset           (GstRTSPMessage *msg);
-GstRTSPResult      gst_rtsp_message_free            (GstRTSPMessage *msg);
-
-GstRTSPMsgType     gst_rtsp_message_get_type        (GstRTSPMessage *msg);
-
-/* request */
-GstRTSPResult      gst_rtsp_message_new_request     (GstRTSPMessage **msg,
-                                                     GstRTSPMethod method,
-                                                     const gchar *uri);
-GstRTSPResult      gst_rtsp_message_init_request    (GstRTSPMessage *msg,
-                                                     GstRTSPMethod method,
-                                                     const gchar *uri);
-GstRTSPResult      gst_rtsp_message_parse_request   (GstRTSPMessage *msg,
-                                                     GstRTSPMethod *method,
-                                                     const gchar **uri,
-						     GstRTSPVersion *version);
-
-/* response */
-GstRTSPResult      gst_rtsp_message_new_response    (GstRTSPMessage **msg,
-                                                     GstRTSPStatusCode code,
-                                                     const gchar *reason,
-                                                     const GstRTSPMessage *request);
-GstRTSPResult      gst_rtsp_message_init_response   (GstRTSPMessage *msg,
-                                                     GstRTSPStatusCode code,
-                                                     const gchar *reason,
-                                                     const GstRTSPMessage *request);
-GstRTSPResult      gst_rtsp_message_parse_response  (GstRTSPMessage *msg,
-                                                     GstRTSPStatusCode *code,
-                                                     const gchar **reason,
-                                                     GstRTSPVersion *version);
-
-/* data */
-GstRTSPResult      gst_rtsp_message_new_data        (GstRTSPMessage **msg,
-                                                     guint8 channel);
-GstRTSPResult      gst_rtsp_message_init_data       (GstRTSPMessage *msg,
-                                                     guint8 channel);
-GstRTSPResult      gst_rtsp_message_parse_data      (GstRTSPMessage *msg,
-                                                     guint8 *channel);
-
-/* headers */
-GstRTSPResult      gst_rtsp_message_add_header      (GstRTSPMessage *msg,
-                                                     GstRTSPHeaderField field,
-                                                     const gchar *value);
-GstRTSPResult      gst_rtsp_message_take_header     (GstRTSPMessage *msg,
-                                                     GstRTSPHeaderField field,
-                                                     gchar *value);
-GstRTSPResult      gst_rtsp_message_remove_header   (GstRTSPMessage *msg,
-                                                     GstRTSPHeaderField field,
-                                                     gint indx);
-GstRTSPResult      gst_rtsp_message_get_header      (const GstRTSPMessage *msg,
-                                                     GstRTSPHeaderField field,
-                                                     gchar **value,
-                                                     gint indx);
-GstRTSPResult      gst_rtsp_message_append_headers  (const GstRTSPMessage *msg,
-                                                     GString *str);
-
-/* handling the body */
-GstRTSPResult      gst_rtsp_message_set_body        (GstRTSPMessage *msg,
-                                                     const guint8 *data,
-                                                     guint size);
-GstRTSPResult      gst_rtsp_message_take_body       (GstRTSPMessage *msg,
-                                                     guint8 *data,
-                                                     guint size);
-GstRTSPResult      gst_rtsp_message_get_body        (const GstRTSPMessage *msg,
-                                                     guint8 **data,
-                                                     guint *size);
-GstRTSPResult      gst_rtsp_message_steal_body      (GstRTSPMessage *msg,
-                                                     guint8 **data,
-                                                     guint *size);
-
-/* debug */
-GstRTSPResult      gst_rtsp_message_dump            (GstRTSPMessage *msg);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_MESSAGE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsprange.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsprange.h
deleted file mode 100644
index 6778fea8..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsprange.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_RANGE_H__
-#define __GST_RTSP_RANGE_H__
-
-#include <glib.h>
-
-#include <gst/rtsp/gstrtspdefs.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTSPRangeUnit:
- * @GST_RTSP_RANGE_SMPTE: SMPTE timecode
- * @GST_RTSP_RANGE_SMPTE_30_DROP: 29.97 frames per second
- * @GST_RTSP_RANGE_SMPTE_25: 25 frames per second
- * @GST_RTSP_RANGE_NPT: Normal play time
- * @GST_RTSP_RANGE_CLOCK: Absolute time expressed as ISO 8601 timestamps
- *
- * Different possible time range units.
- */
-typedef enum
-{
-  GST_RTSP_RANGE_SMPTE,
-  GST_RTSP_RANGE_SMPTE_30_DROP,
-  GST_RTSP_RANGE_SMPTE_25,
-  GST_RTSP_RANGE_NPT,
-  GST_RTSP_RANGE_CLOCK
-} GstRTSPRangeUnit;
-
-typedef struct _GstRTSPTimeRange GstRTSPTimeRange;
-typedef struct _GstRTSPTime GstRTSPTime;
-
-/**
- * GstRTSPTimeType:
- * @GST_RTSP_TIME_SECONDS: seconds
- * @GST_RTSP_TIME_NOW: now
- * @GST_RTSP_TIME_END: end
- *
- * Possible time types.
- */
-typedef enum {
-  GST_RTSP_TIME_SECONDS,
-  GST_RTSP_TIME_NOW,
-  GST_RTSP_TIME_END
-} GstRTSPTimeType;
-
-/**
- * GstRTSPTime:
- * @type: the time of the time
- * @seconds: seconds when @type is GST_RTSP_TIME_SECONDS
- *
- * A time indication.
- */
-struct _GstRTSPTime {
-  GstRTSPTimeType type;
-  gdouble         seconds;
-};
-
-/**
- * GstRTSPTimeRange:
- * @unit: the time units used
- * @min: the minimum interval
- * @max: the maximum interval
- *
- * A time range.
- */
-struct _GstRTSPTimeRange {
-  GstRTSPRangeUnit unit;
-
-  GstRTSPTime min;
-  GstRTSPTime max;
-};
-
-GstRTSPResult   gst_rtsp_range_parse        (const gchar *rangestr, GstRTSPTimeRange **range);
-gchar *         gst_rtsp_range_to_string    (const GstRTSPTimeRange *range);
-void            gst_rtsp_range_free         (GstRTSPTimeRange *range);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_RANGE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsptransport.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsptransport.h
deleted file mode 100644
index e971ef7b..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtsptransport.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_TRANSPORT_H__
-#define __GST_RTSP_TRANSPORT_H__
-
-#include <gst/gstconfig.h>
-#include <gst/rtsp/gstrtspdefs.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstRTSPTransMode:
- * @GST_RTSP_TRANS_UNKNOWN: invalid tansport mode
- * @GST_RTSP_TRANS_RTP: transfer RTP data
- * @GST_RTSP_TRANS_RDT: transfer RDT (RealMedia) data
- *
- * The transfer mode to use.
- */
-typedef enum {
-  GST_RTSP_TRANS_UNKNOWN =  0,
-  GST_RTSP_TRANS_RTP     = (1 << 0),
-  GST_RTSP_TRANS_RDT     = (1 << 1)
-} GstRTSPTransMode;
-
-/**
- * GstRTSPProfile:
- * @GST_RTSP_PROFILE_UNKNOWN: invalid profile
- * @GST_RTSP_PROFILE_AVP: the Audio/Visual profile
- * @GST_RTSP_PROFILE_SAVP: the secure Audio/Visual profile
- *
- * The transfer profile to use.
- */
-typedef enum {
-  GST_RTSP_PROFILE_UNKNOWN =  0,
-  GST_RTSP_PROFILE_AVP     = (1 << 0),
-  GST_RTSP_PROFILE_SAVP    = (1 << 1)
-} GstRTSPProfile;
-
-/**
- * GstRTSPLowerTrans:
- * @GST_RTSP_LOWER_TRANS_UNKNOWN: invalid transport flag
- * @GST_RTSP_LOWER_TRANS_UDP: stream data over UDP
- * @GST_RTSP_LOWER_TRANS_UDP_MCAST: stream data over UDP multicast
- * @GST_RTSP_LOWER_TRANS_TCP: stream data over TCP
- * @GST_RTSP_LOWER_TRANS_HTTP: stream data tunneled over HTTP.
- *
- * The different transport methods.
- */
-typedef enum {
-  GST_RTSP_LOWER_TRANS_UNKNOWN   = 0,
-  GST_RTSP_LOWER_TRANS_UDP       = (1 << 0),
-  GST_RTSP_LOWER_TRANS_UDP_MCAST = (1 << 1),
-  GST_RTSP_LOWER_TRANS_TCP       = (1 << 2),
-  GST_RTSP_LOWER_TRANS_HTTP      = (1 << 4)
-} GstRTSPLowerTrans;
-
-#define GST_TYPE_RTSP_LOWER_TRANS (gst_rtsp_lower_trans_get_type())
-GType gst_rtsp_lower_trans_get_type (void);
-
-typedef struct _GstRTSPRange GstRTSPRange;
-typedef struct _GstRTSPTransport GstRTSPTransport;
-
-/**
- * GstRTSPRange:
- * @min: minimum value of the range
- * @max: maximum value of the range
- *
- * A type to specify a range.
- */
-
-struct _GstRTSPRange {
-  gint min;
-  gint max;
-};
-
-/**
- * GstRTSPTransport:
- * @trans: the transport mode
- * @profile: the tansport profile
- * @lower_transport: the lower transport
- * @destination: the destination ip/hostname
- * @source: the source ip/hostname
- * @layers: the number of layers
- * @mode_play: if play mode was selected
- * @mode_record: if record mode was selected
- * @append: is append mode was selected
- * @interleaved: the interleave range
- * @ttl: the time to live for multicast UDP
- * @port: the port pair for multicast sessions
- * @client_port: the client port pair for receiving data
- * @server_port: the server port pair for receiving data
- * @ssrc: the ssrc that the sender/receiver will use
- *
- * A structure holding the RTSP transport values.
- */
-
-struct _GstRTSPTransport {
-  GstRTSPTransMode  trans;
-  GstRTSPProfile    profile;
-  GstRTSPLowerTrans lower_transport;
-
-  gchar         *destination;
-  gchar         *source;
-  guint          layers;
-  gboolean       mode_play;
-  gboolean       mode_record;
-  gboolean       append;
-  GstRTSPRange   interleaved;
-
-  /* multicast specific */
-  guint  ttl;
-
-  /* UDP specific */
-  GstRTSPRange   port;
-  GstRTSPRange   client_port;
-  GstRTSPRange   server_port;
-  /* RTP specific */
-  guint          ssrc;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GstRTSPResult      gst_rtsp_transport_new          (GstRTSPTransport **transport);
-GstRTSPResult      gst_rtsp_transport_init         (GstRTSPTransport *transport);
-
-GstRTSPResult      gst_rtsp_transport_parse        (const gchar *str, GstRTSPTransport *transport);
-gchar*             gst_rtsp_transport_as_text      (GstRTSPTransport *transport);
-
-GstRTSPResult      gst_rtsp_transport_get_mime     (GstRTSPTransMode trans, const gchar **mime);
-GstRTSPResult      gst_rtsp_transport_get_manager  (GstRTSPTransMode trans, const gchar **manager, guint option);
-
-GstRTSPResult      gst_rtsp_transport_free         (GstRTSPTransport *transport);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_TRANSPORT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspurl.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspurl.h
deleted file mode 100644
index 61b2dfaa..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/rtsp/gstrtspurl.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_RTSP_URL_H__
-#define __GST_RTSP_URL_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <gst/rtsp/gstrtspdefs.h>
-#include <gst/rtsp/gstrtsptransport.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_RTSP_DEFAULT_PORT:
- *
- * The default RTSP port to connect to.
- */
-#define GST_RTSP_DEFAULT_PORT       554
-
-#define GST_TYPE_RTSP_URL  (gst_rtsp_url_get_type())
-
-typedef struct _GstRTSPUrl GstRTSPUrl;
-
-/**
- * GstRTSPUrl:
- * @transports: the transports allowed
- * @family: the family
- * @user: the user
- * @passwd: the password
- * @host: the host
- * @port: the port
- * @abspath: the absolute path
- * @query: additional query parameters
- *
- * This structure contains the result of a parsed RTSP URL
- */
-struct _GstRTSPUrl {
-  GstRTSPLowerTrans  transports;
-  GstRTSPFamily      family;
-  gchar             *user;
-  gchar             *passwd;
-  gchar             *host;
-  guint16            port;
-  gchar             *abspath;
-  gchar             *query;
-};
-
-GType gst_rtsp_url_get_type (void);
-
-GstRTSPResult      gst_rtsp_url_parse           (const gchar *urlstr, GstRTSPUrl **url);
-GstRTSPUrl*        gst_rtsp_url_copy            (const GstRTSPUrl *url);
-void               gst_rtsp_url_free            (GstRTSPUrl *url);
-gchar*             gst_rtsp_url_get_request_uri (const GstRTSPUrl *url);
-gchar**            gst_rtsp_url_decode_path_components
-                                                (const GstRTSPUrl *url);
-
-GstRTSPResult      gst_rtsp_url_set_port        (GstRTSPUrl *url, guint16 port);
-GstRTSPResult      gst_rtsp_url_get_port        (const GstRTSPUrl *url, guint16 *port);
-
-G_END_DECLS
-
-#endif /* __GST_RTSP_URL_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/sdp/gstsdp.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/sdp/gstsdp.h
deleted file mode 100644
index 3dbd86d2..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/sdp/gstsdp.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_SDP_H__
-#define __GST_SDP_H__
-
-/**
- * GstSDPResult:
- * @GST_SDP_OK: A successful return value
- * @GST_SDP_EINVAL: a function was given invalid parameters
- *
- * Return values for the SDP functions.
- */
-typedef enum {
-  GST_SDP_OK     = 0,
-  GST_SDP_EINVAL = -1
-} GstSDPResult;
-
-#endif /* __GST_SDP_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/sdp/gstsdpmessage.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/sdp/gstsdpmessage.h
deleted file mode 100644
index d1e65ddb..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/sdp/gstsdpmessage.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/* GStreamer
- * Copyright (C) <2005,2006> Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-/*
- * Unless otherwise indicated, Source Code is licensed under MIT license.
- * See further explanation attached in License Statement (distributed in the file
- * LICENSE).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __GST_SDP_MESSAGE_H__
-#define __GST_SDP_MESSAGE_H__
-
-#include <glib.h>
-#include <gst/gst.h>
-#include <gst/sdp/gstsdp.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstSDPOrigin:
- * @username: the user's login on the originating host, or it is "-"
- *    if the originating host does not support the concept of user ids.
- * @sess_id: is a numeric string such that the tuple of @username, @sess_id,
- *    @nettype, @addrtype and @addr form a globally unique identifier for the
- *    session.
- * @sess_version: a version number for this announcement
- * @nettype: the type of network. "IN" is defined to have the meaning
- *    "Internet".
- * @addrtype: the type of @addr.
- * @addr: the globally unique address of the machine from which the session was
- *     created.
- *
- * The contents of the SDP "o=" field which gives the originator of the session
- * (their username and the address of the user's host) plus a session id and
- * session version number.
- */
-typedef struct {
-  gchar *username;
-  gchar *sess_id;
-  gchar *sess_version;
-  gchar *nettype;
-  gchar *addrtype;
-  gchar *addr;
-} GstSDPOrigin;
-
-/**
- * GstSDPConnection:
- * @nettype: the type of network. "IN" is defined to have the meaning
- *    "Internet".
- * @addrtype: the type of @address.
- * @address: the address
- * @ttl: the time to live of the address
- * @addr_number: the number of layers
- *
- * The contents of the SDP "c=" field which contains connection data.
- */
-typedef struct {
-  gchar *nettype;
-  gchar *addrtype;
-  gchar *address;
-  guint  ttl;
-  guint  addr_number;
-} GstSDPConnection;
-
-/**
- * GST_SDP_BWTYPE_CT:
- *
- * The Conference Total bandwidth modifier.
- */
-#define GST_SDP_BWTYPE_CT               "CT"
-/**
- * GST_SDP_BWTYPE_AS:
- *
- * The Application-Specific Maximum bandwidth modifier.
- */
-#define GST_SDP_BWTYPE_AS               "AS"
-/**
- * GST_SDP_BWTYPE_EXT_PREFIX:
- *
- * The extension prefix bandwidth modifier.
- */
-#define GST_SDP_BWTYPE_EXT_PREFIX       "X-"
-
-/**
- * GST_SDP_BWTYPE_RS:
- *
- * RTCP bandwidth allocated to active data senders (RFC 3556).
- */
-#define GST_SDP_BWTYPE_RS               "RS"
-/**
- * GST_SDP_BWTYPE_RR:
- *
- * RTCP bandwidth allocated to data receivers (RFC 3556).
- */
-#define GST_SDP_BWTYPE_RR               "RR"
-/**
- * GST_SDP_BWTYPE_TIAS:
- *
- * Transport Independent Application Specific Maximum bandwidth (RFC 3890).
- */
-#define GST_SDP_BWTYPE_TIAS             "TIAS"
-
-
-/**
- * GstSDPBandwidth:
- * @bwtype: the bandwidth modifier type
- * @bandwidth: the bandwidth in kilobits per second
- *
- * The contents of the SDP "b=" field which specifies the proposed bandwidth to
- * be used by the session or media.
- */
-typedef struct {
-  gchar *bwtype;
-  guint  bandwidth;
-} GstSDPBandwidth;
-
-/**
- * GstSDPTime:
- * @start: start time for the conference. The value is the decimal
- *     representation of Network Time Protocol (NTP) time values in seconds
- * @stop: stop time for the conference. The value is the decimal
- *     representation of Network Time Protocol (NTP) time values in seconds
- * @repeat: repeat times for a session
- *
- * The contents of the SDP "t=" field which specify the start and stop times for
- * a conference session.
- */
-typedef struct {
-  gchar  *start;
-  gchar  *stop;
-  GArray *repeat;
-} GstSDPTime;
-
-/**
- * GstSDPZone:
- * @time: the NTP time that a time zone adjustment happens
- * @typed_time: the offset from the time when the session was first scheduled
- *
- * The contents of the SDP "z=" field which allows the sender to
- * specify a list of time zone adjustments and offsets from the base
- * time.
- */
-typedef struct {
-  gchar *time;
-  gchar *typed_time;
-} GstSDPZone;
-
-/**
- * GstSDPKey:
- * @type: the encryption type
- * @data: the encryption data
- *
- * The contents of the SDP "k=" field which is used to convey encryption
- * keys.
- */
-typedef struct {
-  gchar *type;
-  gchar *data;
-} GstSDPKey;
-
-/**
- * GstSDPAttribute:
- * @key: the attribute key
- * @value: the attribute value or NULL when it was a property attribute
- *
- * The contents of the SDP "a=" field which contains a key/value pair.
- */
-typedef struct {
-  gchar *key;
-  gchar *value;
-} GstSDPAttribute;
-
-/**
- * GstSDPMedia:
- * @media: the media type
- * @port: the transport port to which the media stream will be sent
- * @num_ports: the number of ports or -1 if only one port was specified
- * @proto: the transport protocol
- * @fmts: an array of #gchar formats
- * @information: the media title
- * @connections: array of #GstSDPConnection with media connection information
- * @bandwidths: array of #GstSDPBandwidth with media bandwidth information
- * @key: the encryption key
- * @attributes: array of #GstSDPAttribute with the additional media attributes
- *
- * The contents of the SDP "m=" field with all related fields.
- */
-typedef struct {
-  gchar            *media;
-  guint             port;
-  guint             num_ports;
-  gchar            *proto;
-  GArray           *fmts;
-  gchar            *information;
-  GArray           *connections;
-  GArray           *bandwidths;
-  GstSDPKey         key;
-  GArray           *attributes;
-} GstSDPMedia;
-
-/**
- * GstSDPMessage:
- * @version: the protocol version
- * @origin: owner/creator and session identifier
- * @session_name: session name
- * @information: session information
- * @uri: URI of description
- * @emails: array of #gchar with email addresses
- * @phones: array of #gchar with phone numbers
- * @connection: connection information for the session
- * @bandwidths: array of #GstSDPBandwidth with bandwidth information
- * @times: array of #GstSDPTime with time descriptions
- * @zones: array of #GstSDPZone with time zone adjustments
- * @key: encryption key
- * @attributes: array of #GstSDPAttribute with session attributes
- * @medias: array of #GstSDPMedia with media descriptions
- *
- * The contents of the SDP message.
- */
-typedef struct {
-  gchar            *version;
-  GstSDPOrigin      origin;
-  gchar            *session_name;
-  gchar            *information;
-  gchar            *uri;
-  GArray           *emails;
-  GArray           *phones;
-  GstSDPConnection  connection;
-  GArray           *bandwidths;
-  GArray           *times;
-  GArray           *zones;
-  GstSDPKey         key;
-  GArray           *attributes;
-  GArray           *medias;
-} GstSDPMessage;
-
-/* Session descriptions */
-GstSDPResult            gst_sdp_message_new                 (GstSDPMessage **msg);
-GstSDPResult            gst_sdp_message_init                (GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_uninit              (GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_free                (GstSDPMessage *msg);
-
-GstSDPResult            gst_sdp_message_parse_buffer        (const guint8 *data, guint size, GstSDPMessage *msg);
-gchar*                  gst_sdp_message_as_text             (const GstSDPMessage *msg);
-
-/* convert from/to uri */
-GstSDPResult            gst_sdp_message_parse_uri           (const gchar *uri, GstSDPMessage *msg);
-gchar*                  gst_sdp_message_as_uri              (const gchar *scheme, const GstSDPMessage *msg);
-
-/* utils */
-gboolean                gst_sdp_address_is_multicast        (const gchar *nettype, const gchar *addrtype,
-                                                             const gchar *addr);
-/* v=.. */
-const gchar*            gst_sdp_message_get_version         (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_version         (GstSDPMessage *msg, const gchar *version);
-
-/* o=<username> <sess-id> <sess-version> <nettype> <addrtype> <unicast-address> */
-const GstSDPOrigin*     gst_sdp_message_get_origin          (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_origin          (GstSDPMessage *msg, const gchar *username,
-                                                             const gchar *sess_id, const gchar *sess_version,
-                                                             const gchar *nettype, const gchar *addrtype,
-                                                             const gchar *addr);
-
-/* s=<session name> */
-const gchar*            gst_sdp_message_get_session_name    (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_session_name    (GstSDPMessage *msg, const gchar *session_name);
-
-/* i=<session description> */
-const gchar*            gst_sdp_message_get_information     (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_information     (GstSDPMessage *msg, const gchar *information);
-
-/* u=<uri> */
-const gchar*            gst_sdp_message_get_uri             (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_uri             (GstSDPMessage *msg, const gchar *uri);
-
-/* e=<email-address> */
-guint                   gst_sdp_message_emails_len          (const GstSDPMessage *msg);
-const gchar*            gst_sdp_message_get_email           (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_email           (GstSDPMessage *msg, const gchar *email);
-
-/* p=<phone-number> */
-guint                   gst_sdp_message_phones_len          (const GstSDPMessage *msg);
-const gchar*            gst_sdp_message_get_phone           (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_phone           (GstSDPMessage *msg, const gchar *phone);
-
-/* c=<nettype> <addrtype> <connection-address>[/<ttl>][/<number of addresses>] */
-const GstSDPConnection* gst_sdp_message_get_connection      (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_connection      (GstSDPMessage *msg, const gchar *nettype,
-                                                             const gchar *addrtype, const gchar *address,
-                                                             guint ttl, guint addr_number);
-/* b=<bwtype>:<bandwidth> */
-guint                   gst_sdp_message_bandwidths_len      (const GstSDPMessage *msg);
-const GstSDPBandwidth*  gst_sdp_message_get_bandwidth       (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_bandwidth       (GstSDPMessage *msg, const gchar *bwtype,
-                                                             guint bandwidth);
-/* t=<start-time> <stop-time> and
- * r=<repeat interval> <active duration> <offsets from start-time> */
-guint                   gst_sdp_message_times_len           (const GstSDPMessage *msg);
-const GstSDPTime*       gst_sdp_message_get_time            (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_time            (GstSDPMessage *msg, const gchar *start, const gchar *stop, const gchar **repeat);
-
-/* z=<adjustment time> <offset> <adjustment time> <offset> .... */
-guint                   gst_sdp_message_zones_len           (const GstSDPMessage *msg);
-const GstSDPZone*       gst_sdp_message_get_zone            (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_zone            (GstSDPMessage *msg, const gchar *adj_time,
-                                                             const gchar *typed_time);
-
-/* k=<method>[:<encryption key>] */
-const GstSDPKey*        gst_sdp_message_get_key             (const GstSDPMessage *msg);
-GstSDPResult            gst_sdp_message_set_key             (GstSDPMessage *msg, const gchar *type,
-                                                             const gchar *data);
-/* a=... */
-guint                   gst_sdp_message_attributes_len      (const GstSDPMessage *msg);
-const GstSDPAttribute*  gst_sdp_message_get_attribute       (const GstSDPMessage *msg, guint idx);
-const gchar*            gst_sdp_message_get_attribute_val   (const GstSDPMessage *msg, const gchar *key);
-const gchar*            gst_sdp_message_get_attribute_val_n (const GstSDPMessage *msg, const gchar *key,
-                                                             guint nth);
-GstSDPResult            gst_sdp_message_add_attribute       (GstSDPMessage *msg, const gchar *key,
-                                                             const gchar *value);
-
-/* m=.. sections */
-guint                   gst_sdp_message_medias_len          (const GstSDPMessage *msg);
-const GstSDPMedia*      gst_sdp_message_get_media           (const GstSDPMessage *msg, guint idx);
-GstSDPResult            gst_sdp_message_add_media           (GstSDPMessage *msg, GstSDPMedia *media);
-
-GstSDPResult            gst_sdp_message_dump                (const GstSDPMessage *msg);
-
-/* Media descriptions */
-GstSDPResult            gst_sdp_media_new                   (GstSDPMedia **media);
-GstSDPResult            gst_sdp_media_init                  (GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_uninit                (GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_free                  (GstSDPMedia *media);
-
-gchar*                  gst_sdp_media_as_text               (const GstSDPMedia *media);
-
-/* m=<media> <port>/<number of ports> <proto> <fmt> ... */
-const gchar*            gst_sdp_media_get_media             (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_media             (GstSDPMedia *media, const gchar *med);
-
-guint                   gst_sdp_media_get_port              (const GstSDPMedia *media);
-guint                   gst_sdp_media_get_num_ports         (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_port_info         (GstSDPMedia *media, guint port,
-                                                             guint num_ports);
-
-const gchar*            gst_sdp_media_get_proto             (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_proto             (GstSDPMedia *media, const gchar *proto);
-
-guint                   gst_sdp_media_formats_len           (const GstSDPMedia *media);
-const gchar*            gst_sdp_media_get_format            (const GstSDPMedia *media, guint idx);
-GstSDPResult            gst_sdp_media_add_format            (GstSDPMedia *media, const gchar *format);
-
-/* i=<session description> */
-const gchar*            gst_sdp_media_get_information       (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_information       (GstSDPMedia *media, const gchar *information);
-
-/* c=<nettype> <addrtype> <connection-address>[/<ttl>][/<number of addresses>] */
-guint                   gst_sdp_media_connections_len       (const GstSDPMedia *media);
-const GstSDPConnection* gst_sdp_media_get_connection        (const GstSDPMedia *media, guint idx);
-GstSDPResult            gst_sdp_media_add_connection        (GstSDPMedia *media, const gchar *nettype,
-                                                             const gchar *addrtype, const gchar *address,
-                                                             guint ttl, guint addr_number);
-
-/* b=<bwtype>:<bandwidth> */
-guint                   gst_sdp_media_bandwidths_len        (const GstSDPMedia *media);
-const GstSDPBandwidth*  gst_sdp_media_get_bandwidth         (const GstSDPMedia *media, guint idx);
-GstSDPResult            gst_sdp_media_add_bandwidth         (GstSDPMedia *media, const gchar *bwtype,
-                                                             guint bandwidth);
-
-/* k=<method>:<encryption key> */
-const GstSDPKey*        gst_sdp_media_get_key               (const GstSDPMedia *media);
-GstSDPResult            gst_sdp_media_set_key               (GstSDPMedia *media, const gchar *type,
-                                                             const gchar *data);
-/* a=... */
-guint                   gst_sdp_media_attributes_len        (const GstSDPMedia *media);
-const GstSDPAttribute * gst_sdp_media_get_attribute         (const GstSDPMedia *media, guint idx);
-const gchar*            gst_sdp_media_get_attribute_val     (const GstSDPMedia *media, const gchar *key);
-const gchar*            gst_sdp_media_get_attribute_val_n   (const GstSDPMedia *media, const gchar *key,
-                                                             guint nth);
-GstSDPResult            gst_sdp_media_add_attribute         (GstSDPMedia *media, const gchar *key,
-                                                             const gchar *value);
-
-G_END_DECLS
-
-#endif /* __GST_SDP_MESSAGE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/signalprocessor/gstsignalprocessor.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/signalprocessor/gstsignalprocessor.h
deleted file mode 100644
index 05dd3dee..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/signalprocessor/gstsignalprocessor.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2005 Wim Taymans <wim@fluendo.com>
- *
- * gstsignalprocessor.h:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_SIGNAL_PROCESSOR_H__
-#define __GST_SIGNAL_PROCESSOR_H__
-
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-
-G_BEGIN_DECLS
-
-
-typedef enum 
-{
-  GST_SIGNAL_PROCESSOR_CLASS_FLAG_CAN_PROCESS_IN_PLACE = 1<<0
-} GstSignalProcessorClassFlags;
-
-#define GST_SIGNAL_PROCESSOR_CLASS_CAN_PROCESS_IN_PLACE(klass)		\
-  (GST_SIGNAL_PROCESSOR_CLASS (klass)->flags & 				\
-   GST_SIGNAL_PROCESSOR_CLASS_FLAG_CAN_PROCESS_IN_PLACE)
-#define GST_SIGNAL_PROCESSOR_CLASS_SET_CAN_PROCESS_IN_PLACE(klass)	\
-  GST_SIGNAL_PROCESSOR_CLASS (klass)->flags |=				\
-    GST_SIGNAL_PROCESSOR_CLASS_FLAG_CAN_PROCESS_IN_PLACE
-
-typedef enum 
-{
-  GST_SIGNAL_PROCESSOR_STATE_NULL,
-  GST_SIGNAL_PROCESSOR_STATE_INITIALIZED,
-  GST_SIGNAL_PROCESSOR_STATE_RUNNING
-} GstSignalProcessorState;
-
-
-#define GST_TYPE_SIGNAL_PROCESSOR            (gst_signal_processor_get_type())
-#define GST_SIGNAL_PROCESSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessor))
-#define GST_SIGNAL_PROCESSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessorClass))
-#define GST_SIGNAL_PROCESSOR_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessorClass))
-#define GST_IS_SIGNAL_PROCESSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SIGNAL_PROCESSOR))
-#define GST_IS_SIGNAL_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SIGNAL_PROCESSOR))
-
-#define GST_SIGNAL_PROCESSOR_IS_INITIALIZED(obj) \
-  (GST_SIGNAL_PROCESSOR (obj)->state >= GST_SIGNAL_PROCESSOR_STATE_INITIALIZED)
-#define GST_SIGNAL_PROCESSOR_IS_RUNNING(obj) \
-  (GST_SIGNAL_PROCESSOR (obj)->state == GST_SIGNAL_PROCESSOR_STATE_RUNNING)
-
-typedef struct _GstSignalProcessorGroup GstSignalProcessorGroup;
-typedef struct _GstSignalProcessor GstSignalProcessor;
-typedef struct _GstSignalProcessorClass GstSignalProcessorClass;
-
-
-struct _GstSignalProcessorGroup {
-  guint channels; /**< Number of channels in buffers */
-  guint nframes; /**< Number of frames currently allocated per channel */
-  GstMapInfo interleaved_map; /**< Interleaved buffer (c1c2c1c2...)*/
-  gfloat *buffer; /**< De-interleaved buffer (c1c1...c2c2...) */
-};
-
-struct _GstSignalProcessor {
-  GstElement     element;
-
-  /* state */
-  GstCaps *caps;
-  GstSignalProcessorState state;
-  GstFlowReturn flow_state;
-  GstPadMode mode;
-
-  /* pending inputs before processing can take place */
-  guint pending_in;
-  /* pending outputs to be filled */
-  guint pending_out;
-
-  /* multi-channel signal pads */
-  GstSignalProcessorGroup *group_in;
-  GstSignalProcessorGroup *group_out;
-
-  /* single channel signal pads */
-  GstMapInfo *audio_in;
-  GstMapInfo *audio_out;
-
-  /* sampling rate */
-  gint sample_rate;
-
-};
-
-struct _GstSignalProcessorClass {
-  GstElementClass parent_class;
-
-  /*< public >*/
-  guint num_group_in;
-  guint num_group_out;
-  guint num_audio_in;
-  guint num_audio_out;
-
-  guint flags;
-
-  /* virtual methods for subclasses */
-
-  gboolean      (*setup)        (GstSignalProcessor *self, GstCaps *caps);
-  gboolean      (*start)        (GstSignalProcessor *self);
-  void          (*stop)         (GstSignalProcessor *self);
-  void          (*cleanup)      (GstSignalProcessor *self);
-  void          (*process)      (GstSignalProcessor *self, guint num_frames);
-  gboolean      (*event)        (GstSignalProcessor *self, GstEvent *event);
-};
-
-
-GType gst_signal_processor_get_type (void);
-void gst_signal_processor_class_add_pad_template (GstSignalProcessorClass *klass,
-    const gchar *name, GstPadDirection direction, guint index, guint channels);
-
-
-
-G_END_DECLS
-
-
-#endif /* __GST_SIGNAL_PROCESSOR_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/gsttagdemux.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/gsttagdemux.h
deleted file mode 100644
index ba49447a..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/gsttagdemux.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* GStreamer Base Class for Tag Demuxing
- * Copyright (C) 2005  Jan Schmidt <thaytan@mad.scientist.com>
- * Copyright (C) 2006  Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_TAG_DEMUX_H__
-#define __GST_TAG_DEMUX_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_DEMUX            (gst_tag_demux_get_type())
-#define GST_TAG_DEMUX(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TAG_DEMUX,GstTagDemux))
-#define GST_TAG_DEMUX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TAG_DEMUX,GstTagDemuxClass))
-#define GST_IS_TAG_DEMUX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TAG_DEMUX))
-#define GST_IS_TAG_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TAG_DEMUX))
-
-typedef struct _GstTagDemux        GstTagDemux;
-typedef struct _GstTagDemuxClass   GstTagDemuxClass;
-typedef struct _GstTagDemuxPrivate GstTagDemuxPrivate;
-
-/**
- * GstTagDemuxResult:
- * @GST_TAG_DEMUX_RESULT_BROKEN_TAG: cannot parse tag, just skip it
- * @GST_TAG_DEMUX_RESULT_AGAIN     : call again with less or more data
- * @GST_TAG_DEMUX_RESULT_OK	   : parsed tag successfully
- *
- * Result values from the parse_tag virtual function.
- */
-typedef enum {
-  GST_TAG_DEMUX_RESULT_BROKEN_TAG,
-  GST_TAG_DEMUX_RESULT_AGAIN,
-  GST_TAG_DEMUX_RESULT_OK
-} GstTagDemuxResult;
-
-GType gst_tag_demux_result_get_type (void);
-#define GST_TYPE_TAG_DEMUX_RESULT (gst_tag_demux_result_get_type())
-
-/**
- * GstTagDemux:
- * @element: parent element
- *
- * Opaque #GstTagDemux structure.
- */
-struct _GstTagDemux
-{
-  GstElement element;
-
-  /*< private >*/
-  GstTagDemuxPrivate  *priv;
-
-  gpointer             reserved[GST_PADDING];
-};
-
-/**
- * GstTagDemuxClass:
- * @parent_class: the parent class.
- * @min_start_size: minimum size required to identify a tag at the start and
- * determine its total size. Set to 0 if not interested in start tags.
- * Subclasses should set this in their class_init function.
- * @min_end_size: minimum size required to identify a tag at the end and
- * determine its total size. Set to 0 if not interested in end tags.
- * Subclasses should set this in their class_init function.
- * @identify_tag: identify tag and determine the size required to parse the
- * tag. Buffer may be larger than the specified minimum size.
- * Subclassed MUST override this vfunc in their class_init function.
- * @parse_tag: parse the tag. Buffer will be exactly of the size determined by
- * the identify_tag vfunc before. The parse_tag vfunc may change the size
- * stored in *tag_size and return GST_TAG_DEMUX_RESULT_AGAIN to request a
- * larger or smaller buffer. It is also permitted to adjust the tag_size to a
- * smaller value and then return GST_TAG_DEMUX_RESULT_OK in one go.
- * Subclassed MUST override the parse_tag vfunc in their class_init function.
- * @merge_tags: merge start and end tags. Subclasses may want to override this
- * vfunc to allow prioritising of start or end tag according to user
- * preference.  Note that both start_tags and end_tags may be NULL. By default
- * start tags are prefered over end tags.
- *
- * The #GstTagDemuxClass structure.  See documentation at beginning of section
- * for details about what subclasses need to override and do.
- */
-struct _GstTagDemuxClass
-{
-  GstElementClass parent_class;
-
-  /* minimum size required to identify a tag at the start and determine
-   * its total size */
-  guint                  min_start_size;
-
-  /* minimum size required to identify a tag at the end and determine
-   * its total size */
-  guint                  min_end_size;
-
-  /* vtable */
-
-  /* identify tag and determine the size required to parse the tag */
-  gboolean               (*identify_tag)  (GstTagDemux * demux,
-                                           GstBuffer   * buffer,
-                                           gboolean      start_tag,
-                                           guint       * tag_size);
-
-  /* parse the tag once it is identified and its size is known */
-  GstTagDemuxResult      (*parse_tag)     (GstTagDemux * demux,
-                                           GstBuffer   * buffer,
-                                           gboolean      start_tag,
-                                           guint       * tag_size,
-                                           GstTagList ** tags);
-
-  /* merge start and end tags (optional) */
-  GstTagList *           (*merge_tags)    (GstTagDemux      * demux,
-                                           const GstTagList * start_tags,
-                                           const GstTagList * end_tags);
-
-  /*< private >*/
-  gpointer               reserved[GST_PADDING];
-};
-
-GType     gst_tag_demux_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_TAG_DEMUX_H__ */
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/gsttagmux.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/gsttagmux.h
deleted file mode 100644
index 8b103e06..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/gsttagmux.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GStreamer tag muxer base class
- * Copyright (C) 2006 Christophe Fergeau  <teuf@gnome.org>
- * Copyright (C) 2006,2011 Tim-Philipp Müller <tim centricular net>
- * Copyright (C) 2009 Pioneers of the Inevitable <songbird@songbirdnest.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef GST_TAG_MUX_H
-#define GST_TAG_MUX_H
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_MUX \
-  (gst_tag_mux_get_type())
-#define GST_TAG_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TAG_MUX,GstTagMux))
-#define GST_TAG_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TAG_MUX,GstTagMuxClass))
-#define GST_IS_TAG_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TAG_MUX))
-#define GST_IS_TAG_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TAG_MUX))
-
-typedef struct _GstTagMux GstTagMux;
-typedef struct _GstTagMuxClass GstTagMuxClass;
-typedef struct _GstTagMuxPrivate GstTagMuxPrivate;
-
-/**
- * GstTagMux:
- * @element: parent element
- *
- * Opaque #GstTagMux structure.
- */
-struct _GstTagMux {
-  GstElement    element;
-
-  /*< private >*/
-  GstTagMuxPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstTagMuxClass:
- * @parent_class: the parent class.
- * @render_start_tag: create a tag buffer to add to the beginning of the
- *     input stream given a tag list, or NULL
- * @render_end_tag: create a tag buffer to add to the end of the
- *     input stream given a tag list, or NULL
- *
- * The #GstTagMuxClass structure. Subclasses need to override at least one
- * of the two render vfuncs.
- */
-struct _GstTagMuxClass {
-  GstElementClass parent_class;
-
-  /* vfuncs */
-  GstBuffer  * (*render_start_tag) (GstTagMux * mux, const GstTagList * tag_list);
-  GstBuffer  * (*render_end_tag)   (GstTagMux * mux, const GstTagList * tag_list);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_tag_mux_get_type (void);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/tag.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/tag.h
deleted file mode 100644
index b75ad6ea..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/tag.h
+++ /dev/null
@@ -1,591 +0,0 @@
-/* GStreamer
- * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
- * Copyright (C) 2006-2011 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TAG_TAG_H__
-#define __GST_TAG_TAG_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/* Tag names */
-
-/**
- * GST_TAG_MUSICBRAINZ_TRACKID:
- *
- * MusicBrainz track ID
- */
-#define GST_TAG_MUSICBRAINZ_TRACKID	"musicbrainz-trackid"
-/**
- * GST_TAG_MUSICBRAINZ_ARTISTID:
- *
- * MusicBrainz artist ID
- */
-#define GST_TAG_MUSICBRAINZ_ARTISTID	"musicbrainz-artistid"
-/**
- * GST_TAG_MUSICBRAINZ_ALBUMID:
- *
- * MusicBrainz album ID
- */
-#define GST_TAG_MUSICBRAINZ_ALBUMID	"musicbrainz-albumid"
-/**
- * GST_TAG_MUSICBRAINZ_ALBUMARTISTID:
- *
- * MusicBrainz album artist ID
- */
-#define GST_TAG_MUSICBRAINZ_ALBUMARTISTID	"musicbrainz-albumartistid"
-/**
- * GST_TAG_MUSICBRAINZ_TRMID:
- *
- * MusicBrainz track TRM ID
- */
-#define GST_TAG_MUSICBRAINZ_TRMID	"musicbrainz-trmid"
-
-/**
- * GST_TAG_CMML_STREAM:
- *
- * Annodex CMML stream element tag
- */
-#define GST_TAG_CMML_STREAM "cmml-stream"
-/**
- * GST_TAG_CMML_HEAD:
- *
- * Annodex CMML head element tag
- */
-
-#define GST_TAG_CMML_HEAD "cmml-head"
-/**
- * GST_TAG_CMML_CLIP:
- *
- * Annodex CMML clip element tag
- */
-#define GST_TAG_CMML_CLIP "cmml-clip"
-
-/* CDDA tags */
-
-/**
- * GST_TAG_CDDA_CDDB_DISCID:
- *
- * CDDB disc id in its short form (e.g. 'aa063d0f')
- */
-#define GST_TAG_CDDA_CDDB_DISCID              "discid"
-
-/**
- * GST_TAG_CDDA_CDDB_DISCID_FULL:
- *
- * CDDB disc id including all details
- */
-#define GST_TAG_CDDA_CDDB_DISCID_FULL         "discid-full"
-
-/**
- * GST_TAG_CDDA_MUSICBRAINZ_DISCID:
- *
- * Musicbrainz disc id (e.g. 'ahg7JUcfR3vCYBphSDIogOOWrr0-')
- */
-#define GST_TAG_CDDA_MUSICBRAINZ_DISCID       "musicbrainz-discid"
-
-/**
- * GST_TAG_CDDA_MUSICBRAINZ_DISCID_FULL:
- *
- * Musicbrainz disc id details
- */
-#define GST_TAG_CDDA_MUSICBRAINZ_DISCID_FULL  "musicbrainz-discid-full"
-
-/**
- * GST_TAG_CAPTURING_SHUTTER_SPEED:
- *
- * Shutter speed used when capturing an image, in seconds. (fraction)
- */
-#define GST_TAG_CAPTURING_SHUTTER_SPEED        "capturing-shutter-speed"
-
-/**
- * GST_TAG_CAPTURING_FOCAL_RATIO:
- *
- * Focal ratio (f-number) used when capturing an image. (double)
- *
- * The value stored is the denominator of the focal ratio (f-number).
- * For example, if this tag value is 2, the focal ratio is f/2.
- */
-#define GST_TAG_CAPTURING_FOCAL_RATIO          "capturing-focal-ratio"
-
-/**
- * GST_TAG_CAPTURING_FOCAL_LENGTH:
- *
- * Focal length used when capturing an image, in mm. (double)
- */
-#define GST_TAG_CAPTURING_FOCAL_LENGTH         "capturing-focal-length"
-
-/**
- * GST_TAG_CAPTURING_DIGITAL_ZOOM_RATIO:
- *
- * Digital zoom ratio used when capturing an image. (double)
- */
-#define GST_TAG_CAPTURING_DIGITAL_ZOOM_RATIO   "capturing-digital-zoom-ratio"
-
-/**
- * GST_TAG_CAPTURING_ISO_SPEED:
- *
- * ISO speed used when capturing an image. (integer)
- */
-#define GST_TAG_CAPTURING_ISO_SPEED           "capturing-iso-speed"
-
-/**
- * GST_TAG_CAPTURING_EXPOSURE_PROGRAM:
- *
- * Type of exposure control used when capturing an image. (string)
- *
- * The allowed values are:
- *   "undefined"
- *   "manual"
- *   "normal" - automatically controlled
- *   "aperture-priority" - user selects aperture value
- *   "shutter-priority" - user selects shutter speed
- *   "creative" - biased towards depth of field
- *   "action" - biased towards fast shutter speed
- *   "portrait" - closeup, leaving background out of focus
- *   "landscape" - landscape photos, background in focus
- */
-#define GST_TAG_CAPTURING_EXPOSURE_PROGRAM     "capturing-exposure-program"
-
-/**
- * GST_TAG_CAPTURING_EXPOSURE_MODE:
- *
- * Exposure mode used when capturing an image. (string)
- *
- * The allowed values are:
- *   "auto-exposure"
- *   "manual-exposure"
- *   "auto-bracket"
- */
-#define GST_TAG_CAPTURING_EXPOSURE_MODE       "capturing-exposure-mode"
-
-/**
- * GST_TAG_CAPTURING_EXPOSURE_COMPENSATION:
- *
- * Exposure compensation using when capturing an image in EV. (double)
- */
-#define GST_TAG_CAPTURING_EXPOSURE_COMPENSATION "capturing-exposure-compensation"
-
-/**
- * GST_TAG_CAPTURING_SCENE_CAPTURE_TYPE:
- *
- * Scene mode used when capturing an image. (string)
- *
- * The allowed values are:
- *   "standard"
- *   "landscape"
- *   "portrait"
- *   "night-scene"
- */
-#define GST_TAG_CAPTURING_SCENE_CAPTURE_TYPE  "capturing-scene-capture-type"
-
-/**
- * GST_TAG_CAPTURING_GAIN_ADJUSTMENT:
- *
- * Gain adjustment applied to an image. (string)
- *
- * The allowed values are:
- *   "none"
- *   "low-gain-up"
- *   "high-gain-up"
- *   "low-gain-down"
- *   "high-gain-down"
- */
-#define GST_TAG_CAPTURING_GAIN_ADJUSTMENT     "capturing-gain-adjustment"
-
-/**
- * GST_TAG_CAPTURING_WHITE_BALANCE:
- *
- * White balance mode used when capturing an image. (string)
- *
- * The allowed values are:
- *   "auto"
- *   "manual"
- *   "daylight"
- *   "cloudy"
- *   "tungsten"
- *   "fluorescent"
- *   "fluorescent h" (newer daylight-calibrated fluorescents)
- *   "flash"
- */
-#define GST_TAG_CAPTURING_WHITE_BALANCE       "capturing-white-balance"
-
-/**
- * GST_TAG_CAPTURING_CONTRAST:
- *
- * Direction of contrast processing applied when capturing an image. (string)
- *
- * The allowed values are:
- *  "normal"
- *  "soft"
- *  "hard"
- */
-#define GST_TAG_CAPTURING_CONTRAST            "capturing-contrast"
-
-/**
- * GST_TAG_CAPTURING_SATURATION:
- *
- * Direction of saturation processing applied when capturing an image. (string)
- *
- * The allowed values are:
- *  "normal"
- *  "low-saturation"
- *  "high-saturation"
- */
-#define GST_TAG_CAPTURING_SATURATION          "capturing-saturation"
-
-/**
- * GST_TAG_CAPTURING_SHARPNESS:
- *
- * Direction of sharpness processing applied when capturing an image. (string)
- *
- * The allowed values are:
- *  "normal"
- *  "soft"
- *  "hard"
- */
-#define GST_TAG_CAPTURING_SHARPNESS          "capturing-sharpness"
-
-/**
- * GST_TAG_CAPTURING_FLASH_FIRED:
- *
- * If flash was fired during the capture of an image. (boolean)
- *
- * Note that if this tag isn't present, it should not be assumed that
- * the flash did not fire. It should be treated as unknown.
- */
-#define GST_TAG_CAPTURING_FLASH_FIRED         "capturing-flash-fired"
-
-/**
- * GST_TAG_CAPTURING_FLASH_MODE:
- *
- * The flash mode selected during the capture of an image. (string)
- *
- * The allowed values are:
- *  "auto"
- *  "always"
- *  "never"
- */
-#define GST_TAG_CAPTURING_FLASH_MODE         "capturing-flash-mode"
-
-/**
- * GST_TAG_CAPTURING_METERING_MODE:
- *
- * Defines the way a camera determines the exposure. (string)
- *
- * The allowed values are:
- *   "unknown"
- *   "average"
- *   "center-weighted-average"
- *   "spot"
- *   "multi-spot"
- *   "pattern"
- *   "partial"
- *   "other"
- */
-#define GST_TAG_CAPTURING_METERING_MODE      "capturing-metering-mode"
-
-/**
- * GST_TAG_CAPTURING_SOURCE:
- *
- * Indicates the source of capture. The device/medium used to do the
- * capture. (string)
- *
- * Allowed values are:
- *   "dsc" (= digital still camera)
- *   "transparent-scanner"
- *   "reflex-scanner"
- *   "other"
- */
-#define GST_TAG_CAPTURING_SOURCE             "capturing-source"
-
-/**
- * GST_TAG_IMAGE_HORIZONTAL_PPI:
- *
- * Media (image/video) intended horizontal pixel density in ppi. (double)
- */
-#define GST_TAG_IMAGE_HORIZONTAL_PPI         "image-horizontal-ppi"
-/**
- * GST_TAG_IMAGE_VERTICAL_PPI:
- *
- * Media (image/video) intended vertical pixel density in ppi. (double)
- */
-#define GST_TAG_IMAGE_VERTICAL_PPI           "image-vertical-ppi"
-
-
-/* additional information for image tags */
-
-/**
- * GstTagImageType:
- * @GST_TAG_IMAGE_TYPE_NONE                  : No image type. Can be used to
- *      tell functions such as gst_tag_image_data_to_image_sample() that no
- *      image type should be set.
- * @GST_TAG_IMAGE_TYPE_UNDEFINED             : Undefined/other image type
- * @GST_TAG_IMAGE_TYPE_FRONT_COVER           : Cover (front)
- * @GST_TAG_IMAGE_TYPE_BACK_COVER            : Cover (back)
- * @GST_TAG_IMAGE_TYPE_LEAFLET_PAGE          : Leaflet page
- * @GST_TAG_IMAGE_TYPE_MEDIUM                : Medium (e.g. label side of CD)
- * @GST_TAG_IMAGE_TYPE_LEAD_ARTIST           : Lead artist/lead performer/soloist
- * @GST_TAG_IMAGE_TYPE_ARTIST                : Artist/performer
- * @GST_TAG_IMAGE_TYPE_CONDUCTOR             : Conductor
- * @GST_TAG_IMAGE_TYPE_BAND_ORCHESTRA        : Band/orchestra
- * @GST_TAG_IMAGE_TYPE_COMPOSER              : Composer
- * @GST_TAG_IMAGE_TYPE_LYRICIST              : Lyricist/text writer
- * @GST_TAG_IMAGE_TYPE_RECORDING_LOCATION    : Recording location
- * @GST_TAG_IMAGE_TYPE_DURING_RECORDING      : During recording
- * @GST_TAG_IMAGE_TYPE_DURING_PERFORMANCE    : During performance
- * @GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE         : Movie/video screen capture
- * @GST_TAG_IMAGE_TYPE_FISH                  : A fish as funny as the ID3v2 spec
- * @GST_TAG_IMAGE_TYPE_ILLUSTRATION          : Illustration
- * @GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO      : Band/artist logotype
- * @GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO : Publisher/studio logotype
- *
- * Type of image contained in an image tag (specified as field in
- * the image buffer's caps structure)
- */
-/* Note: keep in sync with register_tag_image_type_enum() */
-typedef enum {
-  GST_TAG_IMAGE_TYPE_NONE = -1,
-  GST_TAG_IMAGE_TYPE_UNDEFINED = 0,
-  GST_TAG_IMAGE_TYPE_FRONT_COVER,
-  GST_TAG_IMAGE_TYPE_BACK_COVER,
-  GST_TAG_IMAGE_TYPE_LEAFLET_PAGE,
-  GST_TAG_IMAGE_TYPE_MEDIUM,
-  GST_TAG_IMAGE_TYPE_LEAD_ARTIST,
-  GST_TAG_IMAGE_TYPE_ARTIST,
-  GST_TAG_IMAGE_TYPE_CONDUCTOR,
-  GST_TAG_IMAGE_TYPE_BAND_ORCHESTRA,
-  GST_TAG_IMAGE_TYPE_COMPOSER,
-  GST_TAG_IMAGE_TYPE_LYRICIST,
-  GST_TAG_IMAGE_TYPE_RECORDING_LOCATION,
-  GST_TAG_IMAGE_TYPE_DURING_RECORDING,
-  GST_TAG_IMAGE_TYPE_DURING_PERFORMANCE,
-  GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE,
-  GST_TAG_IMAGE_TYPE_FISH,
-  GST_TAG_IMAGE_TYPE_ILLUSTRATION,
-  GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO,
-  GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO
-} GstTagImageType;
-
-#define GST_TYPE_TAG_IMAGE_TYPE  (gst_tag_image_type_get_type ())
-GType   gst_tag_image_type_get_type (void);
-
-/**
- * GST_TAG_ID3V2_HEADER_SIZE:
- *
- * ID3V2 header size considered minimum input for some functions such as
- * gst_tag_list_from_id3v2_tag() and gst_tag_get_id3v2_tag_size() for example.
- */
-#define GST_TAG_ID3V2_HEADER_SIZE            10
-
-/* functions for vorbis comment manipulation */
-
-const gchar *           gst_tag_from_vorbis_tag                 (const gchar *          vorbis_tag);
-const gchar *           gst_tag_to_vorbis_tag                   (const gchar *          gst_tag);
-void                    gst_vorbis_tag_add                      (GstTagList *           list, 
-                                                                 const gchar *          tag, 
-                                                                 const gchar *          value);
-
-GList *                 gst_tag_to_vorbis_comments              (const GstTagList *     list, 
-                                                                 const gchar *          tag);
-
-/* functions to convert GstBuffers with vorbiscomment contents to GstTagLists and back */
-GstTagList *            gst_tag_list_from_vorbiscomment         (const guint8 *         data,
-                                                                 gsize                  size,
-                                                                 const guint8 *         id_data,
-                                                                 const guint            id_data_length,
-                                                                 gchar **               vendor_string);
-GstTagList *            gst_tag_list_from_vorbiscomment_buffer  (GstBuffer *            buffer,
-                                                                 const guint8 *         id_data,
-                                                                 const guint            id_data_length,
-                                                                 gchar **               vendor_string);
-GstBuffer *             gst_tag_list_to_vorbiscomment_buffer    (const GstTagList *     list,
-                                                                 const guint8 *         id_data,
-                                                                 const guint            id_data_length,
-                                                                 const gchar *          vendor_string);
-
-/* functions for ID3 tag manipulation */
-
-/* FIXME 0.11: inconsistent API naming: gst_tag_list_new_from_id3v1(), gst_tag_list_from_*_buffer(),
- * gst_tag_list_from_id3v2_tag(). Also, note gst.tag.list_xyz() namespace vs. gst.tag_list_xyz(),
- * which is a bit confusing and possibly doesn't map too well */
-
-guint                   gst_tag_id3_genre_count                 (void);
-const gchar *           gst_tag_id3_genre_get                   (const guint            id);
-GstTagList *            gst_tag_list_new_from_id3v1             (const guint8 *         data);
-
-const gchar *           gst_tag_from_id3_tag                    (const gchar *          id3_tag);
-const gchar *           gst_tag_from_id3_user_tag               (const gchar *          type,
-                                                                 const gchar *          id3_user_tag);
-const gchar *           gst_tag_to_id3_tag                      (const gchar *          gst_tag);
-
-gboolean                gst_tag_list_add_id3_image (GstTagList   * tag_list,
-                                                    const guint8 * image_data,
-                                                    guint          image_data_len,
-                                                    guint          id3_picture_type);
-
-GstTagList *            gst_tag_list_from_id3v2_tag (GstBuffer * buffer);
-
-guint                   gst_tag_get_id3v2_tag_size  (GstBuffer * buffer);
-
-/* functions to  convert GstBuffers with xmp packets contents to GstTagLists and back */
-GstTagList *            gst_tag_list_from_xmp_buffer (GstBuffer *  buffer);
-GstBuffer *		          gst_tag_list_to_xmp_buffer   (const GstTagList * list,
-							                                        gboolean read_only,
-							                                        const gchar ** schemas);
-const gchar**		        gst_tag_xmp_list_schemas     (void);
-
-/* functions related to exif */
-GstBuffer *             gst_tag_list_to_exif_buffer (const GstTagList * taglist,
-                                                     gint byte_order,
-                                                     guint32 base_offset);
-
-GstBuffer *             gst_tag_list_to_exif_buffer_with_tiff_header (const GstTagList * taglist);
-
-GstTagList *            gst_tag_list_from_exif_buffer (GstBuffer * buffer,
-                                                       gint byte_order,
-                                                       guint32 base_offset);
-
-GstTagList *            gst_tag_list_from_exif_buffer_with_tiff_header (
-                                                      GstBuffer * buffer);
-
-/* other tag-related functions */
-
-gboolean                gst_tag_parse_extended_comment (const gchar  * ext_comment,
-                                                        gchar       ** key,
-                                                        gchar       ** lang,
-                                                        gchar       ** value,
-                                                        gboolean       fail_if_no_key);
-
-gchar                 * gst_tag_freeform_string_to_utf8 (const gchar  * data,
-                                                         gint           size,
-                                                         const gchar ** env_vars);
-
-GstSample             * gst_tag_image_data_to_image_sample (const guint8   * image_data,
-                                                            guint            image_data_len,
-                                                            GstTagImageType  image_type);
-
-/* FIXME 0.11: get rid of this awkward register/init function, see tags.c */
-void                    gst_tag_register_musicbrainz_tags (void);
-
-
-/* language tag related functions */
-
-gchar **       gst_tag_get_language_codes (void);
-
-const gchar *  gst_tag_get_language_name (const gchar * language_code);
-
-const gchar *  gst_tag_get_language_code_iso_639_1 (const gchar * lang_code);
-
-const gchar *  gst_tag_get_language_code_iso_639_2B (const gchar * lang_code);
-
-const gchar *  gst_tag_get_language_code_iso_639_2T (const gchar * lang_code);
-
-gboolean       gst_tag_check_language_code          (const gchar * lang_code);
-
-/**
- * gst_tag_get_language_code:
- * @lang_code: ISO-639 language code (e.g. "deu" or "ger" or "de")
- *
- * Convenience macro wrapping gst_tag_get_language_code_iso_639_1().
- */
-#define gst_tag_get_language_code(lang_code) \
-    gst_tag_get_language_code_iso_639_1(lang_code)
-
-
-/* functions to deal with (mostly) Creative Commons licenses */
-
-/**
- * GstTagLicenseFlags:
- * @GST_TAG_LICENSE_PERMITS_REPRODUCTION: making multiple copies
- *     is allowed
- * @GST_TAG_LICENSE_PERMITS_DISTRIBUTION: distribution, public display
- *     and public performance are allowed
- * @GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS: distribution of derivative
- *     works is allowed
- * @GST_TAG_LICENSE_PERMITS_SHARING: commercial derivatives are allowed,
- *     but only non-commercial distribution is allowed
- * @GST_TAG_LICENSE_REQUIRES_NOTICE: copyright and license notices
- *     must be kept intact
- * @GST_TAG_LICENSE_REQUIRES_ATTRIBUTION: credit must be given to
- *     copyright holder and/or author
- * @GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE: derivative works must be
- *     licensed under the same terms or compatible terms as the original work
- * @GST_TAG_LICENSE_REQUIRES_SOURCE_CODE: source code (the preferred
- *     form for making modifications) must be provided when exercising some
- *     rights granted by the license
- * @GST_TAG_LICENSE_REQUIRES_COPYLEFT: derivative and combined works
- *     must be licensed under specified terms, similar to those of the original
- *     work
- * @GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT: derivative works must be
- *     licensed under specified terms, with at least the same conditions as
- *     the original work; combinations with the work may be licensed under
- *     different terms
- * @GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE: exercising rights for
- *     commercial purposes is prohibited
- * @GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE: use in a
- *     non-developing country is prohibited
- * @GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE: this license was created
- *     by the Creative Commons project
- * @GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE: this license was
- *     created by the Free Software Foundation (FSF)
- *
- * See http://creativecommons.org/ns for more information.
- */
-typedef enum {
-  GST_TAG_LICENSE_PERMITS_REPRODUCTION             = (1 << 0),
-  GST_TAG_LICENSE_PERMITS_DISTRIBUTION             = (1 << 1),
-  GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS         = (1 << 2),
-  GST_TAG_LICENSE_PERMITS_SHARING                  = (1 << 3),
-
-  GST_TAG_LICENSE_REQUIRES_NOTICE                  = (1 << 8),
-  GST_TAG_LICENSE_REQUIRES_ATTRIBUTION             = (1 << 9),
-  GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE             = (1 << 10),
-  GST_TAG_LICENSE_REQUIRES_SOURCE_CODE             = (1 << 11),
-  GST_TAG_LICENSE_REQUIRES_COPYLEFT                = (1 << 12),
-  GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT         = (1 << 13),
-
-  GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE         = (1 << 16),
-  GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE = (1 << 17),
-
-  GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE         = (1 << 24),
-  GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE = (1 << 25)
-} GstTagLicenseFlags;
-
-gchar **            gst_tag_get_licenses (void);
-
-GstTagLicenseFlags  gst_tag_get_license_flags (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_nick  (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_title (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_version (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_description  (const gchar * license_ref);
-
-const gchar *       gst_tag_get_license_jurisdiction (const gchar * license_ref);
-
-GType               gst_tag_license_flags_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_TAG_TAG_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/xmpwriter.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/xmpwriter.h
deleted file mode 100644
index a7f6e4a9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/tag/xmpwriter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GStreamer XmpConfig
- * Copyright (C) 2011 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TAG_XMP_WRITER_H__
-#define __TAG_XMP_WRITER_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_TAG_XMP_WRITER \
-  (gst_tag_xmp_writer_get_type ())
-#define GST_TAG_XMP_WRITER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TAG_XMP_WRITER, GstTagXmpWriter))
-#define GST_TAG_XMP_WRITER_INTERFACE(iface) \
-  (G_TYPE_CHECK_INTERFACE_CAST ((iface), GST_TYPE_TAG_XMP_WRITER, GstTagXmpWriterInterface))
-#define GST_IS_TAG_XMP_WRITER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TAG_XMP_WRITER))
-#define GST_IS_TAG_XMP_WRITER_INTERFACE(iface) \
-  (G_TYPE_CHECK_INTERFACE_TYPE ((iface), GST_TYPE_TAG_XMP_WRITER))
-#define GST_TAG_XMP_WRITER_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_TAG_XMP_WRITER, GstTagXmpWriterInterface))
-
-typedef struct _GstTagXmpWriter GstTagXmpWriter;
-typedef struct _GstTagXmpWriterInterface GstTagXmpWriterInterface;
-
-struct _GstTagXmpWriterInterface {
-  GTypeInterface parent;
-};
-
-GType           gst_tag_xmp_writer_get_type		(void);
-
-void		gst_tag_xmp_writer_add_all_schemas	(GstTagXmpWriter * config);
-
-void		gst_tag_xmp_writer_add_schema	(GstTagXmpWriter * config,
-						const gchar * schema);
-
-gboolean	gst_tag_xmp_writer_has_schema	(GstTagXmpWriter * config,
-						const gchar * schema);
-
-void		gst_tag_xmp_writer_remove_schema	(GstTagXmpWriter * config,
-						const gchar * schema);
-
-void		gst_tag_xmp_writer_remove_all_schemas (GstTagXmpWriter * config);
-
-GstBuffer*	gst_tag_xmp_writer_tag_list_to_xmp_buffer 	(GstTagXmpWriter * config,
-							 const GstTagList * taglist,
-							 gboolean read_only);
-
-G_END_DECLS
-
-#endif /* __TAG_XMP_WRITER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/colorbalance.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/colorbalance.h
deleted file mode 100644
index ec5d1722..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/colorbalance.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* GStreamer Color Balance
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * color-balance.h: image color balance interface design
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_COLOR_BALANCE_H__
-#define __GST_COLOR_BALANCE_H__
-
-#include <gst/gst.h>
-#include <gst/video/colorbalancechannel.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_COLOR_BALANCE \
-  (gst_color_balance_get_type ())
-#define GST_COLOR_BALANCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE, GstColorBalance))
-#define GST_IS_COLOR_BALANCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE))
-#define GST_COLOR_BALANCE_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceInterface))
-
-typedef struct _GstColorBalance GstColorBalance;
-typedef struct _GstColorBalanceInterface GstColorBalanceInterface;
-
-/**
- * GstColorBalanceType:
- * @GST_COLOR_BALANCE_HARDWARE: Color balance is implemented with dedicated
- *         hardware.
- * @GST_COLOR_BALANCE_SOFTWARE: Color balance is implemented via software
- *         processing.
- *
- * An enumeration indicating whether an element implements color balancing
- * operations in software or in dedicated hardware. In general, dedicated
- * hardware implementations (such as those provided by xvimagesink) are
- * preferred.
- */
-typedef enum
-{
-  GST_COLOR_BALANCE_HARDWARE,
-  GST_COLOR_BALANCE_SOFTWARE
-} GstColorBalanceType;
-
-/**
- * GstColorBalanceInterface:
- * @iface: the parent interface
- * @balance_type: implementation type
- * @list_channels: list handled channels
- * @set_value: set a channel value
- * @get_value: get a channel value
- * @value_changed: default handler for value changed notification
- *
- * Color-balance interface.
- */
-struct _GstColorBalanceInterface {
-  GTypeInterface iface;
-
-  /* virtual functions */
-  const GList * (* list_channels) (GstColorBalance        *balance);
-
-  void          (* set_value)     (GstColorBalance        *balance,
-                                   GstColorBalanceChannel *channel,
-                                   gint                    value);
-  gint          (* get_value)     (GstColorBalance        *balance,
-                                   GstColorBalanceChannel *channel);
-  GstColorBalanceType (*get_balance_type)  (GstColorBalance *balance);
-
-  /* signals */
-  void (* value_changed) (GstColorBalance        *balance,
-                          GstColorBalanceChannel *channel,
-                          gint                    value);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType   gst_color_balance_get_type      (void);
-
-/* virtual class function wrappers */
-const GList *
-        gst_color_balance_list_channels (GstColorBalance        *balance);
-void    gst_color_balance_set_value     (GstColorBalance        *balance,
-                                         GstColorBalanceChannel *channel,
-                                         gint                    value);
-gint    gst_color_balance_get_value     (GstColorBalance        *balance,
-                                         GstColorBalanceChannel *channel);
-
-GstColorBalanceType
-        gst_color_balance_get_balance_type (GstColorBalance        *balance);
-
-/* trigger signal */
-void    gst_color_balance_value_changed (GstColorBalance        *balance,
-                                         GstColorBalanceChannel *channel,
-                                         gint                    value);
-
-G_END_DECLS
-
-#endif /* __GST_COLOR_BALANCE_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/colorbalancechannel.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/colorbalancechannel.h
deleted file mode 100644
index ca23ee2c..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/colorbalancechannel.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* GStreamer Color Balance
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * colorbalancechannel.h: individual channel object
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_COLOR_BALANCE_CHANNEL_H__
-#define __GST_COLOR_BALANCE_CHANNEL_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_COLOR_BALANCE_CHANNEL \
-  (gst_color_balance_channel_get_type ())
-#define GST_COLOR_BALANCE_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE_CHANNEL, \
-                               GstColorBalanceChannel))
-#define GST_COLOR_BALANCE_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL, \
-                            GstColorBalanceChannelClass))
-#define GST_IS_COLOR_BALANCE_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE_CHANNEL))
-#define GST_IS_COLOR_BALANCE_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL))
-
-typedef struct _GstColorBalanceChannel GstColorBalanceChannel;
-typedef struct _GstColorBalanceChannelClass GstColorBalanceChannelClass;
-
-/**
- * GstColorBalanceChannel:
- * @label: A string containing a descriptive name for this channel
- * @min_value: The minimum valid value for this channel.
- * @max_value: The maximum valid value for this channel.
- */
-struct _GstColorBalanceChannel {
-  GObject parent;
-
-  /*< public >*/
-  gchar  *label;
-  gint    min_value;
-  gint    max_value;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstColorBalanceChannelClass:
- * @parent: the parent class
- * @value_changed: default handler for value changed notification
- *
- * Color-balance channel class.
- */
-struct _GstColorBalanceChannelClass {
-  GObjectClass parent;
-
-  /* signals */
-  void (* value_changed) (GstColorBalanceChannel *channel,
-                          gint                    value);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType   gst_color_balance_channel_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_COLOR_BALANCE_CHANNEL_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstsurfaceconverter.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstsurfaceconverter.h
deleted file mode 100644
index 70249449..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstsurfaceconverter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Collabora Ltd.
- * Copyright (C) 2011 Intel
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_SURFACE_CONVERTER_H_
-#define _GST_SURFACE_CONVERTER_H_
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstSurfaceConverter is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_SURFACE_CONVERTER             (gst_surface_converter_get_type ())
-#define GST_SURFACE_CONVERTER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SURFACE_CONVERTER, GstSurfaceConverter))
-#define GST_IS_SURFACE_CONVERTER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SURFACE_CONVERTER))
-#define GST_SURFACE_CONVERTER_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_SURFACE_CONVERTER, GstSurfaceConverterInterface))
-
-typedef struct _GstSurfaceConverter GstSurfaceConverter;
-typedef struct _GstSurfaceConverterInterface GstSurfaceConverterInterface;
-
-/**
- * GstSurfaceConverterInterface:
- * @parent: parent interface type.
- * @upload: vmethod to upload #GstSurfaceBuffer.
- *
- * #GstSurfaceConverterInterface interface.
- */
-struct _GstSurfaceConverterInterface
-{
-  GTypeInterface parent;
-
-  gboolean (*upload) (GstSurfaceConverter *converter,
-                      GstBuffer *buffer);
-};
-
-GType     gst_surface_converter_get_type (void);
-
-gboolean  gst_surface_converter_upload (GstSurfaceConverter *converter,
-                                        GstBuffer *buffer);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstsurfacemeta.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstsurfacemeta.h
deleted file mode 100644
index ed04bc28..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstsurfacemeta.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Collabora Ltd.
- * Copyright (C) 2011 Intel
- *
- * Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_SURFACE_META_H_
-#define _GST_SURFACE_META_H_
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstSurfaceMeta is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-#include <gst/video/gstsurfaceconverter.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstSurfaceMeta GstSurfaceMeta;
-
-/**
- * GstSurfaceMeta:
- * @create_converter: vmethod to create a converter.
- *
- */
-struct _GstSurfaceMeta {
-  GstMeta       meta;
-
-  GstSurfaceConverter * (*create_converter) (GstSurfaceMeta *meta,
-                                             const gchar *type,
-                                             GValue *dest);
-};
-
-GType gst_surface_meta_api_get_type (void);
-#define GST_SURFACE_META_API_TYPE (gst_surface_meta_api_get_type())
-
-const GstMetaInfo *gst_surface_meta_get_info (void);
-#define GST_SURFACE_META_INFO (gst_surface_meta_get_info())
-
-#define gst_buffer_get_surface_meta(b) \
-  ((GstSurfaceMeta*)gst_buffer_get_meta((b),GST_SURFACE_META_API_TYPE))
-#define gst_buffer_add_surface_meta(b) \
-  ((GstSurfaceMeta*)gst_buffer_add_meta((b),GST_SURFACE_META_INFO,NULL))
-
-GstSurfaceConverter  *gst_surface_meta_create_converter (GstSurfaceMeta *meta,
-                                                           const gchar *type,
-                                                           GValue *dest);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideodecoder.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideodecoder.h
deleted file mode 100644
index 8e2b7c70..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideodecoder.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_DECODER_H_
-#define _GST_VIDEO_DECODER_H_
-
-#include <gst/base/gstadapter.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideoutils.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_DECODER \
-  (gst_video_decoder_get_type())
-#define GST_VIDEO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_DECODER,GstVideoDecoder))
-#define GST_VIDEO_DECODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_DECODER,GstVideoDecoderClass))
-#define GST_VIDEO_DECODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_DECODER,GstVideoDecoderClass))
-#define GST_IS_VIDEO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_DECODER))
-#define GST_IS_VIDEO_DECODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_DECODER))
-
-/**
- * GST_VIDEO_DECODER_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- */
-#define GST_VIDEO_DECODER_SINK_NAME    "sink"
-/**
- * GST_VIDEO_DECODER_SRC_NAME:
- *
- * The name of the templates for the source pad.
- */
-#define GST_VIDEO_DECODER_SRC_NAME     "src"
-
-/**
- * GST_VIDEO_DECODER_SRC_PAD:
- * @obj: a #GstVideoDecoder
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_VIDEO_DECODER_SRC_PAD(obj)         (((GstVideoDecoder *) (obj))->srcpad)
-
-/**
- * GST_VIDEO_DECODER_SINK_PAD:
- * @obj: a #GstVideoDecoder
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_VIDEO_DECODER_SINK_PAD(obj)        (((GstVideoDecoder *) (obj))->sinkpad)
-/**
- * GST_VIDEO_DECODER_FLOW_NEED_DATA:
- *
- * Returned while parsing to indicate more data is needed.
- **/
-#define GST_VIDEO_DECODER_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
-
-/**
- * GST_VIDEO_DECODER_INPUT_SEGMENT:
- * @obj: base decoder instance
- *
- * Gives the segment of the element.
- */
-#define GST_VIDEO_DECODER_INPUT_SEGMENT(obj)     (GST_VIDEO_DECODER_CAST (obj)->input_segment)
-
-/**
- * GST_VIDEO_DECODER_OUTPUT_SEGMENT:
- * @obj: base decoder instance
- *
- * Gives the segment of the element.
- */
-#define GST_VIDEO_DECODER_OUTPUT_SEGMENT(obj)     (GST_VIDEO_DECODER_CAST (obj)->output_segment)
-
-/**
- * GST_VIDEO_DECODER_STREAM_LOCK:
- * @decoder: video decoder instance
- *
- * Obtain a lock to protect the decoder function from concurrent access.
- */
-#define GST_VIDEO_DECODER_STREAM_LOCK(decoder) g_rec_mutex_lock (&GST_VIDEO_DECODER (decoder)->stream_lock)
-
-/**
- * GST_VIDEO_DECODER_STREAM_UNLOCK:
- * @decoder: video decoder instance
- *
- * Release the lock that protects the decoder function from concurrent access.
- */
-#define GST_VIDEO_DECODER_STREAM_UNLOCK(decoder) g_rec_mutex_unlock (&GST_VIDEO_DECODER (decoder)->stream_lock)
-
-typedef struct _GstVideoDecoder GstVideoDecoder;
-typedef struct _GstVideoDecoderClass GstVideoDecoderClass;
-typedef struct _GstVideoDecoderPrivate GstVideoDecoderPrivate;
-
-
-/* do not use this one, use macro below */
-GstFlowReturn _gst_video_decoder_error (GstVideoDecoder *dec, gint weight,
-                                             GQuark domain, gint code,
-                                             gchar *txt, gchar *debug,
-                                             const gchar *file, const gchar *function,
-                                             gint line);
-
-/**
- * GST_VIDEO_DECODER_ERROR:
- * @el:     the base video decoder element that generates the error
- * @w:      element defined weight of the error, added to error count
- * @domain: like CORE, LIBRARY, RESOURCE or STREAM (see #gstreamer-GstGError)
- * @code:   error code defined for that domain (see #gstreamer-GstGError)
- * @text:   the message to display (format string and args enclosed in
- *          parentheses)
- * @debug:  debugging information for the message (format string and args
- *          enclosed in parentheses)
- * @ret:    variable to receive return value
- *
- * Utility function that video decoder elements can use in case they encountered
- * a data processing error that may be fatal for the current "data unit" but
- * need not prevent subsequent decoding.  Such errors are counted and if there
- * are too many, as configured in the context's max_errors, the pipeline will
- * post an error message and the application will be requested to stop further
- * media processing.  Otherwise, it is considered a "glitch" and only a warning
- * is logged. In either case, @ret is set to the proper value to
- * return to upstream/caller (indicating either GST_FLOW_ERROR or GST_FLOW_OK).
- */
-#define GST_VIDEO_DECODER_ERROR(el, w, domain, code, text, debug, ret) \
-G_STMT_START {                                                              \
-  gchar *__txt = _gst_element_error_printf text;                            \
-  gchar *__dbg = _gst_element_error_printf debug;                           \
-  GstVideoDecoder *dec = GST_VIDEO_DECODER (el);                   \
-  ret = _gst_video_decoder_error (dec, w, GST_ ## domain ## _ERROR,    \
-      GST_ ## domain ## _ERROR_ ## code, __txt, __dbg, __FILE__,            \
-      GST_FUNCTION, __LINE__);                                              \
-} G_STMT_END
-
-/**
- * GST_VIDEO_DECODER_MAX_ERRORS:
- *
- * Default maximum number of errors tolerated before signaling error.
- */
-#define GST_VIDEO_DECODER_MAX_ERRORS     10
-
-
-/**
- * GstVideoDecoder:
- *
- * The opaque #GstVideoDecoder data structure.
- */
-struct _GstVideoDecoder
-{
-  /*< private >*/
-  GstElement     element;
-
-  /*< protected >*/
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GRecMutex stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  GstVideoDecoderPrivate *priv;
-
-  /*< private >*/
-  void             *padding[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoDecoderClass:
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Notifies subclass of incoming data format (caps).
- * @parse:          Required for non-packetized input.
- *                  Allows chopping incoming data into manageable units (frames)
- *                  for subsequent decoding.
- * @reset:          Optional.
- *                  Allows subclass (decoder) to perform post-seek semantics reset.
- * @handle_frame:   Provides input data frame to subclass.
- * @finish:         Optional.
- *                  Called to request subclass to dispatch any pending remaining
- *                  data (e.g. at EOS).
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @src_event:      Optional.
- *                  Event handler on the source pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @negotiate:      Optional.
- *                  Negotiate with downstream and configure buffer pools, etc.
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @decide_allocation: Optional.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *                     Subclasses should chain up to the parent implementation to
- *                     invoke the default handler.
- * @propose_allocation: Optional.
- *                      Propose buffer allocation parameters for upstream elements.
- *                      Subclasses should chain up to the parent implementation to
- *                      invoke the default handler.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @handle_frame needs to be overridden, and @set_format
- * and likely as well.  If non-packetized input is supported or expected,
- * @parse needs to be overridden as well.
- */
-struct _GstVideoDecoderClass
-{
-  /*< private >*/
-  GstElementClass element_class;
-
-  /*< public >*/
-  gboolean      (*open)           (GstVideoDecoder *decoder);
-
-  gboolean      (*close)          (GstVideoDecoder *decoder);
-
-  gboolean      (*start)          (GstVideoDecoder *decoder);
-
-  gboolean      (*stop)           (GstVideoDecoder *decoder);
-
-  GstFlowReturn (*parse)          (GstVideoDecoder *decoder,
-				   GstVideoCodecFrame *frame,
-				   GstAdapter *adapter,
-				   gboolean at_eos);
-
-  gboolean      (*set_format)     (GstVideoDecoder *decoder,
-				   GstVideoCodecState * state);
-
-  gboolean      (*reset)          (GstVideoDecoder *decoder,
-				   gboolean hard);
-
-  GstFlowReturn (*finish)         (GstVideoDecoder *decoder);
-
-  GstFlowReturn (*handle_frame)   (GstVideoDecoder *decoder,
-				   GstVideoCodecFrame *frame);
-
-  gboolean      (*sink_event)     (GstVideoDecoder *decoder,
-				   GstEvent *event);
-
-  gboolean      (*src_event)      (GstVideoDecoder *decoder,
-				   GstEvent *event);
-
-  gboolean      (*negotiate)      (GstVideoDecoder *decoder);
-
-  gboolean      (*decide_allocation)  (GstVideoDecoder *decoder, GstQuery *query);
-
-  gboolean      (*propose_allocation) (GstVideoDecoder *decoder, GstQuery * query);
-
-  /*< private >*/
-  void         *padding[GST_PADDING_LARGE];
-};
-
-GType    gst_video_decoder_get_type (void);
-
-/* Context parameters */
-void     gst_video_decoder_set_packetized (GstVideoDecoder * decoder,
-					   gboolean packetized);
-
-gboolean gst_video_decoder_get_packetized (GstVideoDecoder * decoder);
-
-void     gst_video_decoder_set_estimate_rate (GstVideoDecoder * dec,
-					      gboolean          enabled);
-
-gint     gst_video_decoder_get_estimate_rate (GstVideoDecoder * dec);
-
-void     gst_video_decoder_set_max_errors (GstVideoDecoder * dec,
-					   gint              num);
-
-gint     gst_video_decoder_get_max_errors (GstVideoDecoder * dec);
-
-void     gst_video_decoder_set_latency (GstVideoDecoder *decoder,
-					GstClockTime min_latency,
-					GstClockTime max_latency);
-void     gst_video_decoder_get_latency (GstVideoDecoder *decoder,
-					GstClockTime *min_latency,
-					GstClockTime *max_latency);
-
-void     gst_video_decoder_get_allocator (GstVideoDecoder *decoder,
-                                          GstAllocator **allocator,
-                                          GstAllocationParams *params);
-GstBufferPool *gst_video_decoder_get_buffer_pool (GstVideoDecoder *decoder);
-
-/* Object methods */
-
-GstVideoCodecFrame *gst_video_decoder_get_frame        (GstVideoDecoder *decoder,
-						        int frame_number);
-
-GstVideoCodecFrame *gst_video_decoder_get_oldest_frame (GstVideoDecoder *decoder);
-
-GList *             gst_video_decoder_get_frames       (GstVideoDecoder *decoder);
-
-/* Parsing related methods */
-void           gst_video_decoder_add_to_frame     (GstVideoDecoder *decoder,
-						   int n_bytes);
-GstFlowReturn  gst_video_decoder_have_frame       (GstVideoDecoder *decoder);
-
-GstBuffer     *gst_video_decoder_allocate_output_buffer (GstVideoDecoder * decoder);
-
-GstFlowReturn  gst_video_decoder_allocate_output_frame  (GstVideoDecoder *decoder,
-						         GstVideoCodecFrame *frame);
-
-GstVideoCodecState *gst_video_decoder_set_output_state (GstVideoDecoder *decoder,
-							GstVideoFormat fmt, guint width, guint height,
-							GstVideoCodecState *reference);
-
-GstVideoCodecState *gst_video_decoder_get_output_state (GstVideoDecoder *decoder);
-
-gboolean         gst_video_decoder_negotiate           (GstVideoDecoder * decoder);
-
-GstClockTimeDiff gst_video_decoder_get_max_decode_time (GstVideoDecoder *decoder,
-							GstVideoCodecFrame *frame);
-
-gdouble          gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder);
-
-GstFlowReturn    gst_video_decoder_finish_frame (GstVideoDecoder *decoder,
-						 GstVideoCodecFrame *frame);
-
-GstFlowReturn    gst_video_decoder_drop_frame (GstVideoDecoder *dec,
-					       GstVideoCodecFrame *frame);
-
-void             gst_video_decoder_merge_tags (GstVideoDecoder *dec,
-                                               const GstTagList *tags,
-                                               GstTagMergeMode mode);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideoencoder.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideoencoder.h
deleted file mode 100644
index da420365..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideoencoder.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>.
- * Copyright (C) 2011 Nokia Corporation. All rights reserved.
- *   Contact: Stefan Kost <stefan.kost@nokia.com>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_ENCODER_H_
-#define _GST_VIDEO_ENCODER_H_
-
-#include <gst/video/gstvideoutils.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_ENCODER \
-  (gst_video_encoder_get_type())
-#define GST_VIDEO_ENCODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_ENCODER,GstVideoEncoder))
-#define GST_VIDEO_ENCODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_ENCODER,GstVideoEncoderClass))
-#define GST_VIDEO_ENCODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_VIDEO_ENCODER,GstVideoEncoderClass))
-#define GST_IS_VIDEO_ENCODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_ENCODER))
-#define GST_IS_VIDEO_ENCODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_ENCODER))
-#define GST_VIDEO_ENCODER_CAST(enc) ((GstVideoEncoder*)enc)
-
-/**
- * GST_VIDEO_ENCODER_SINK_NAME:
- *
- * The name of the templates for the sink pad.
- */
-#define GST_VIDEO_ENCODER_SINK_NAME    "sink"
-/**
- * GST_VIDEO_ENCODER_SRC_NAME:
- *
- * The name of the templates for the source pad.
- */
-#define GST_VIDEO_ENCODER_SRC_NAME     "src"
-
-/**
- * GST_VIDEO_ENCODER_SRC_PAD:
- * @obj: a #GstVideoEncoder
- *
- * Gives the pointer to the source #GstPad object of the element.
- */
-#define GST_VIDEO_ENCODER_SRC_PAD(obj)         (((GstVideoEncoder *) (obj))->srcpad)
-
-/**
- * GST_VIDEO_ENCODER_SINK_PAD:
- * @obj: a #GstVideoEncoder
- *
- * Gives the pointer to the sink #GstPad object of the element.
- */
-#define GST_VIDEO_ENCODER_SINK_PAD(obj)        (((GstVideoEncoder *) (obj))->sinkpad)
-
-/**
- * GST_VIDEO_ENCODER_FLOW_NEED_DATA:
- *
- * Returned while parsing to indicate more data is needed.
- **/
-#define GST_VIDEO_ENCODER_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
-
-/**
- * GST_VIDEO_ENCODER_FLOW_DROPPED:
- *
- * Returned when the event/buffer should be dropped.
- */
-#define GST_VIDEO_ENCODER_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS_1
-
-/**
- * GST_VIDEO_ENCODER_INPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the segment of the element.
- */
-#define GST_VIDEO_ENCODER_INPUT_SEGMENT(obj)     (GST_VIDEO_ENCODER_CAST (obj)->input_segment)
-
-/**
- * GST_VIDEO_ENCODER_OUTPUT_SEGMENT:
- * @obj: base parse instance
- *
- * Gives the segment of the element.
- */
-#define GST_VIDEO_ENCODER_OUTPUT_SEGMENT(obj)     (GST_VIDEO_ENCODER_CAST (obj)->output_segment)
-
-/**
- * GST_VIDEO_ENCODER_STREAM_LOCK:
- * @encoder: video encoder instance
- *
- * Obtain a lock to protect the encoder function from concurrent access.
- */
-#define GST_VIDEO_ENCODER_STREAM_LOCK(encoder) g_rec_mutex_lock (&GST_VIDEO_ENCODER (encoder)->stream_lock)
-
-/**
- * GST_VIDEO_ENCODER_STREAM_UNLOCK:
- * @encoder: video encoder instance
- *
- * Release the lock that protects the encoder function from concurrent access.
- */
-#define GST_VIDEO_ENCODER_STREAM_UNLOCK(encoder) g_rec_mutex_unlock (&GST_VIDEO_ENCODER (encoder)->stream_lock)
-
-typedef struct _GstVideoEncoder GstVideoEncoder;
-typedef struct _GstVideoEncoderPrivate GstVideoEncoderPrivate;
-typedef struct _GstVideoEncoderClass GstVideoEncoderClass;
-
-/**
- * GstVideoEncoder:
- *
- * The opaque #GstVideoEncoder data structure.
- */
-struct _GstVideoEncoder
-{
-  /*< private >*/
-  GstElement    element;
-
-  /*< protected >*/
-  GstPad         *sinkpad;
-  GstPad         *srcpad;
-
-  /* protects all data processing, i.e. is locked
-   * in the chain function, finish_frame and when
-   * processing serialized events */
-  GRecMutex stream_lock;
-
-  /* MT-protected (with STREAM_LOCK) */
-  GstSegment      input_segment;
-  GstSegment      output_segment;
-
-  /*< private >*/
-  GstVideoEncoderPrivate *priv;
-
-  void         *padding[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoEncoderClass:
- * @open:           Optional.
- *                  Called when the element changes to GST_STATE_READY.
- *                  Allows opening external resources.
- * @close:          Optional.
- *                  Called when the element changes to GST_STATE_NULL.
- *                  Allows closing external resources.
- * @start:          Optional.
- *                  Called when the element starts processing.
- *                  Allows opening external resources.
- * @stop:           Optional.
- *                  Called when the element stops processing.
- *                  Allows closing external resources.
- * @set_format:     Optional.
- *                  Notifies subclass of incoming data format.
- *                  GstVideoCodecState fields have already been
- *                  set according to provided caps.
- * @handle_frame:   Provides input frame to subclass.
- * @reset:          Optional.
- *                  Allows subclass (encoder) to perform post-seek semantics reset.
- * @finish:         Optional.
- *                  Called to request subclass to dispatch any pending remaining
- *                  data (e.g. at EOS).
- * @pre_push:   Optional.
- *                  Allows subclass to push frame downstream in whatever
- *                  shape or form it deems appropriate.  If not provided,
- *                  provided encoded frame data is simply pushed downstream.
- * @getcaps:        Optional.
- *                  Allows for a custom sink getcaps implementation (e.g.
- *                  for multichannel input specification).  If not implemented,
- *                  default returns gst_video_encoder_proxy_getcaps
- *                  applied to sink template caps.
- * @sink_event:     Optional.
- *                  Event handler on the sink pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @src_event:      Optional.
- *                  Event handler on the source pad. This function should return
- *                  TRUE if the event was handled and should be discarded
- *                  (i.e. not unref'ed).
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @negotiate:      Optional.
- *                  Negotiate with downstream and configure buffer pools, etc.
- *                  Subclasses should chain up to the parent implementation to
- *                  invoke the default handler.
- * @decide_allocation: Optional.
- *                     Setup the allocation parameters for allocating output
- *                     buffers. The passed in query contains the result of the
- *                     downstream allocation query.
- *                     Subclasses should chain up to the parent implementation to
- *                     invoke the default handler.
- * @propose_allocation: Optional.
- *                      Propose buffer allocation parameters for upstream elements.
- *                      Subclasses should chain up to the parent implementation to
- *                      invoke the default handler.
- *
- * Subclasses can override any of the available virtual methods or not, as
- * needed. At minimum @handle_frame needs to be overridden, and @set_format
- * and @get_caps are likely needed as well.
- */
-struct _GstVideoEncoderClass
-{
-  /*< private >*/
-  GstElementClass  element_class;
-
-  /*< public >*/
-  /* virtual methods for subclasses */
-  gboolean      (*open)         (GstVideoEncoder *encoder);
-
-  gboolean      (*close)        (GstVideoEncoder *encoder);
-
-  gboolean      (*start)        (GstVideoEncoder *encoder);
-
-  gboolean      (*stop)         (GstVideoEncoder *encoder);
-
-  gboolean      (*set_format)   (GstVideoEncoder *encoder,
-				 GstVideoCodecState *state);
-
-  GstFlowReturn (*handle_frame) (GstVideoEncoder *encoder,
-				 GstVideoCodecFrame *frame);
-
-  gboolean      (*reset)        (GstVideoEncoder *encoder,
-				 gboolean hard);
-
-  GstFlowReturn (*finish)       (GstVideoEncoder *encoder);
-
-  GstFlowReturn (*pre_push)     (GstVideoEncoder *encoder,
-				 GstVideoCodecFrame *frame);
-
-  GstCaps *     (*getcaps)      (GstVideoEncoder *enc,
-                                 GstCaps *filter);
-
-  gboolean      (*sink_event)   (GstVideoEncoder *encoder,
-				 GstEvent *event);
-
-  gboolean      (*src_event)    (GstVideoEncoder *encoder,
-				 GstEvent *event);
-
-  gboolean      (*negotiate)    (GstVideoEncoder *encoder);
-
-  gboolean      (*decide_allocation)  (GstVideoEncoder *encoder, GstQuery *query);
-
-  gboolean      (*propose_allocation) (GstVideoEncoder * encoder,
-                                       GstQuery * query);
-
-  /*< private >*/
-  gpointer       _gst_reserved[GST_PADDING_LARGE];
-};
-
-GType                gst_video_encoder_get_type (void);
-
-GstVideoCodecState*  gst_video_encoder_get_output_state (GstVideoEncoder *encoder);
-
-GstVideoCodecState*  gst_video_encoder_set_output_state (GstVideoEncoder * encoder,
-							 GstCaps * caps,
-							 GstVideoCodecState * reference);
-
-gboolean             gst_video_encoder_negotiate        (GstVideoEncoder * encoder);
-
-GstVideoCodecFrame*  gst_video_encoder_get_frame        (GstVideoEncoder *encoder,
-						         int frame_number);
-GstVideoCodecFrame*  gst_video_encoder_get_oldest_frame (GstVideoEncoder *encoder);
-
-GList *              gst_video_encoder_get_frames       (GstVideoEncoder *encoder);
-
-GstBuffer *          gst_video_encoder_allocate_output_buffer (GstVideoEncoder * encoder,
-                                                               gsize size);
-
-GstFlowReturn        gst_video_encoder_allocate_output_frame  (GstVideoEncoder *encoder,
-						               GstVideoCodecFrame *frame,
-                                                               gsize size);
-
-GstFlowReturn        gst_video_encoder_finish_frame (GstVideoEncoder *encoder,
-						     GstVideoCodecFrame *frame);
-
-GstCaps *            gst_video_encoder_proxy_getcaps (GstVideoEncoder * enc,
-						      GstCaps         * caps,
-                                                      GstCaps         * filter);
-void                 gst_video_encoder_set_discont (GstVideoEncoder *encoder);
-gboolean             gst_video_encoder_get_discont (GstVideoEncoder *encoder);
-
-void                 gst_video_encoder_set_latency (GstVideoEncoder *encoder,
-						    GstClockTime min_latency,
-						    GstClockTime max_latency);
-void		     gst_video_encoder_get_latency (GstVideoEncoder *encoder,
-						    GstClockTime *min_latency,
-						    GstClockTime *max_latency);
-
-void                 gst_video_encoder_set_headers (GstVideoEncoder *encoder,
-						    GList *headers);
-
-void                 gst_video_encoder_merge_tags  (GstVideoEncoder *encoder,
-                                                    const GstTagList *tags,
-                                                    GstTagMergeMode mode);
-
-void                 gst_video_encoder_get_allocator (GstVideoEncoder *encoder,
-                                                      GstAllocator **allocator,
-                                                      GstAllocationParams *params);
-
-G_END_DECLS
-
-#endif
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideofilter.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideofilter.h
deleted file mode 100644
index 8e21ba5d..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideofilter.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_VIDEO_FILTER_H__
-#define __GST_VIDEO_FILTER_H__
-
-#include <gst/base/gstbasetransform.h>
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstVideoFilter GstVideoFilter;
-typedef struct _GstVideoFilterClass GstVideoFilterClass;
-
-#define GST_TYPE_VIDEO_FILTER \
-  (gst_video_filter_get_type())
-#define GST_VIDEO_FILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_FILTER,GstVideoFilter))
-#define GST_VIDEO_FILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_FILTER,GstVideoFilterClass))
-#define GST_VIDEO_FILTER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_VIDEO_FILTER, GstVideoFilterClass))
-#define GST_IS_VIDEO_FILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_FILTER))
-#define GST_IS_VIDEO_FILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_FILTER))
-#define GST_VIDEO_FILTER_CAST(obj)  ((GstVideoFilter *)(obj))
-
-struct _GstVideoFilter {
-  GstBaseTransform element;
-
-  gboolean negotiated;
-  GstVideoInfo in_info;
-  GstVideoInfo out_info;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstVideoFilterClass:
- * @parent_class: the parent class structure
- * @set_info: function to be called with the negotiated caps and video infos
- * @transform_frame: transform a video frame
- * @transform_frame_ip: transform a video frame in place
- *
- * The video filter class structure.
- */
-struct _GstVideoFilterClass {
-  GstBaseTransformClass parent_class;
-
-  gboolean      (*set_info)           (GstVideoFilter *filter,
-                                       GstCaps *incaps, GstVideoInfo *in_info,
-                                       GstCaps *outcaps, GstVideoInfo *out_info);
-
-  /* transform */
-  GstFlowReturn (*transform_frame)    (GstVideoFilter *filter,
-                                       GstVideoFrame *inframe, GstVideoFrame *outframe);
-  GstFlowReturn (*transform_frame_ip) (GstVideoFilter *trans, GstVideoFrame *frame);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_video_filter_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_FILTER_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideometa.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideometa.h
deleted file mode 100644
index ffba35eb..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideometa.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_META_H__
-#define __GST_VIDEO_META_H__
-
-#include <gst/gst.h>
-
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-#define GST_VIDEO_META_API_TYPE (gst_video_meta_api_get_type())
-#define GST_VIDEO_META_INFO  (gst_video_meta_get_info())
-typedef struct _GstVideoMeta GstVideoMeta;
-
-#define GST_VIDEO_CROP_META_API_TYPE  (gst_video_crop_meta_api_get_type())
-#define GST_VIDEO_CROP_META_INFO  (gst_video_crop_meta_get_info())
-typedef struct _GstVideoCropMeta GstVideoCropMeta;
-
-/**
- * GstVideoMeta:
- * @meta: parent #GstMeta
- * @buffer: the buffer this metadata belongs to
- * @flags: additional video flags
- * @format: the video format
- * @id: identifier of the frame
- * @width: the video width
- * @height: the video height
- * @n_planes: the number of planes in the image
- * @offset: array of offsets for the planes. This field might not always be
- *          valid, it is used by the default implementation of @map.
- * @stride: array of strides for the planes. This field might not always be
- *          valid, it is used by the default implementation of @map.
- * @map: map the memory of a plane
- * @unmap: unmap the memory of a plane
- *
- * Extra buffer metadata describing image properties
- */
-struct _GstVideoMeta {
-  GstMeta            meta;
-
-  GstBuffer         *buffer;
-
-  GstVideoFrameFlags flags;
-  GstVideoFormat     format;
-  gint               id;
-  guint              width;
-  guint              height;
-
-  guint              n_planes;
-  gsize              offset[GST_VIDEO_MAX_PLANES];
-  gint               stride[GST_VIDEO_MAX_PLANES];
-
-  gboolean (*map)    (GstVideoMeta *meta, guint plane, GstMapInfo *info,
-                      gpointer *data, gint * stride, GstMapFlags flags);
-  gboolean (*unmap)  (GstVideoMeta *meta, guint plane, GstMapInfo *info);
-};
-
-GType gst_video_meta_api_get_type (void);
-const GstMetaInfo * gst_video_meta_get_info (void);
-
-#define gst_buffer_get_video_meta(b) ((GstVideoMeta*)gst_buffer_get_meta((b),GST_VIDEO_META_API_TYPE))
-GstVideoMeta * gst_buffer_get_video_meta_id    (GstBuffer *buffer, gint id);
-
-GstVideoMeta * gst_buffer_add_video_meta       (GstBuffer *buffer, GstVideoFrameFlags flags,
-                                                GstVideoFormat format, guint width, guint height);
-GstVideoMeta * gst_buffer_add_video_meta_full  (GstBuffer *buffer, GstVideoFrameFlags flags,
-                                                GstVideoFormat format, guint width, guint height,
-                                                guint n_planes, gsize offset[GST_VIDEO_MAX_PLANES],
-                                                gint stride[GST_VIDEO_MAX_PLANES]);
-
-gboolean       gst_video_meta_map        (GstVideoMeta *meta, guint plane, GstMapInfo *info,
-                                          gpointer *data, gint *stride, GstMapFlags flags);
-gboolean       gst_video_meta_unmap      (GstVideoMeta *meta, guint plane, GstMapInfo *info);
-
-/**
- * GstVideoCropMeta:
- * @meta: parent #GstMeta
- * @x: the horizontal offset
- * @y: the vertical offset
- * @width: the cropped width
- * @height: the cropped height
- *
- * Extra buffer metadata describing image cropping.
- */
-struct _GstVideoCropMeta {
-  GstMeta       meta;
-
-  guint         x;
-  guint         y;
-  guint         width;
-  guint         height;
-};
-
-GType gst_video_crop_meta_api_get_type (void);
-const GstMetaInfo * gst_video_crop_meta_get_info (void);
-
-#define gst_buffer_get_video_crop_meta(b) ((GstVideoCropMeta*)gst_buffer_get_meta((b),GST_VIDEO_CROP_META_API_TYPE))
-#define gst_buffer_add_video_crop_meta(b) ((GstVideoCropMeta*)gst_buffer_add_meta((b),GST_VIDEO_CROP_META_INFO, NULL))
-
-/* video metadata transforms */
-
-GQuark gst_video_meta_transform_scale_get_quark (void);
-/**
- * gst_video_meta_transform_scale:
- *
- * GQuark for the video "gst-video-scale" transform.
- */
-#define GST_VIDEO_META_TRANSFORM_IS_SCALE(type) ((type) == gst_video_meta_transform_scale_get_quark())
-
-/**
- * GstVideoMetaTransform:
- * @old_info: the old #GstVideoInfo
- * @new_info: the new #GstVideoInfo
- *
- * Extra data passed to a video transform #GstMetaTransformFunction such as:
- * "gst-video-scale".
- */
-typedef struct {
-  GstVideoInfo *in_info;
-  GstVideoInfo *out_info;
-} GstVideoMetaTransform;
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_META_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideopool.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideopool.h
deleted file mode 100644
index c1b3e1e9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideopool.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_POOL_H__
-#define __GST_VIDEO_POOL_H__
-
-#include <gst/gst.h>
-
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-/**
- * GST_BUFFER_POOL_OPTION_VIDEO_META:
- *
- * An option that can be activated on bufferpool to request video metadata
- * on buffers from the pool.
- */
-#define GST_BUFFER_POOL_OPTION_VIDEO_META "GstBufferPoolOptionVideoMeta"
-
-/**
- * GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT:
- *
- * A bufferpool option to enable extra padding. When a bufferpool supports this
- * option, gst_buffer_pool_config_set_video_alignment() can be called.
- *
- * When this option is enabled on the bufferpool,
- * #GST_BUFFER_POOL_OPTION_VIDEO_META should also be enabled.
- */
-#define GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT "GstBufferPoolOptionVideoAlignment"
-
-/* setting a bufferpool config */
-void             gst_buffer_pool_config_set_video_alignment  (GstStructure *config, GstVideoAlignment *align);
-gboolean         gst_buffer_pool_config_get_video_alignment  (GstStructure *config, GstVideoAlignment *align);
-
-/* video bufferpool */
-typedef struct _GstVideoBufferPool GstVideoBufferPool;
-typedef struct _GstVideoBufferPoolClass GstVideoBufferPoolClass;
-typedef struct _GstVideoBufferPoolPrivate GstVideoBufferPoolPrivate;
-
-#define GST_TYPE_VIDEO_BUFFER_POOL      (gst_video_buffer_pool_get_type())
-#define GST_IS_VIDEO_BUFFER_POOL(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_BUFFER_POOL))
-#define GST_VIDEO_BUFFER_POOL(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_BUFFER_POOL, GstVideoBufferPool))
-#define GST_VIDEO_BUFFER_POOL_CAST(obj) ((GstVideoBufferPool*)(obj))
-
-struct _GstVideoBufferPool
-{
-  GstBufferPool bufferpool;
-
-  GstVideoBufferPoolPrivate *priv;
-};
-
-struct _GstVideoBufferPoolClass
-{
-  GstBufferPoolClass parent_class;
-};
-
-GType             gst_video_buffer_pool_get_type      (void);
-
-GstBufferPool *   gst_video_buffer_pool_new           (void);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_POOL_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideosink.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideosink.h
deleted file mode 100644
index ac8dc956..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideosink.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*  GStreamer video sink base class
- *  Copyright (C) <2003> Julien Moutte <julien@moutte.net>
- *  Copyright (C) <2009> Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* FIXME 0.11: turn this into a proper base class */
-
-#ifndef __GST_VIDEO_SINK_H__
-#define __GST_VIDEO_SINK_H__
-
-#include <gst/gst.h>
-#include <gst/base/gstbasesink.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_SINK (gst_video_sink_get_type())
-#define GST_VIDEO_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_SINK, GstVideoSink))
-#define GST_VIDEO_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VIDEO_SINK, GstVideoSinkClass))
-#define GST_IS_VIDEO_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_SINK))
-#define GST_IS_VIDEO_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VIDEO_SINK))
-#define GST_VIDEO_SINK_GET_CLASS(klass) \
-  (G_TYPE_INSTANCE_GET_CLASS ((klass), GST_TYPE_VIDEO_SINK, GstVideoSinkClass))
-
-/**
- * GST_VIDEO_SINK_CAST:
- * @obj: a #GstVideoSink or derived object
- *
- * Cast @obj to a #GstVideoSink without runtime type check.
- */
-#define GST_VIDEO_SINK_CAST(obj)  ((GstVideoSink *) (obj))
-
-/**
- * GST_VIDEO_SINK_PAD:
- * @obj: a #GstVideoSink
- *
- * Get the sink #GstPad of @obj.
- */
-#define GST_VIDEO_SINK_PAD(obj) GST_BASE_SINK_PAD(obj)
-
-#define GST_VIDEO_SINK_WIDTH(obj) (GST_VIDEO_SINK_CAST (obj)->width)
-#define GST_VIDEO_SINK_HEIGHT(obj) (GST_VIDEO_SINK_CAST (obj)->height)
-
-typedef struct _GstVideoSink GstVideoSink;
-typedef struct _GstVideoSinkClass GstVideoSinkClass;
-typedef struct _GstVideoRectangle GstVideoRectangle;
-typedef struct _GstVideoSinkPrivate GstVideoSinkPrivate;
-
-/**
- * GstVideoRectangle:
- * @x: X coordinate of rectangle's top-left point
- * @y: Y coordinate of rectangle's top-left point
- * @w: width of the rectangle
- * @h: height of the rectangle
- *
- * Helper structure representing a rectangular area.
- */
-struct _GstVideoRectangle {
-  gint x;
-  gint y;
-  gint w;
-  gint h;
-};
-
-/**
- * GstVideoSink:
- * @height: video height (derived class needs to set this)
- * @width: video width (derived class needs to set this)
- *
- * The video sink instance structure. Derived video sinks should set the
- * @height and @width members.
- */
-struct _GstVideoSink {
-  GstBaseSink element;    /* FIXME 0.11: this should not be called 'element' */
-
-  /*< public >*/
-  gint width, height;
-
-  /*< private >*/
-  GstVideoSinkPrivate *priv;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/**
- * GstVideoSinkClass:
- * @parent_class: the parent class structure
- * @show_frame: render a video frame. Maps to #GstBaseSinkClass.render() and
- *     #GstBaseSinkClass.preroll() vfuncs. Rendering during preroll will be
- *     suppressed if the #GstVideoSink:show-preroll-frame property is set to 
- *     %FALSE.
- *
- * The video sink class structure. Derived classes should override the
- * @show_frame virtual function.
- */
-struct _GstVideoSinkClass {
-  GstBaseSinkClass parent_class;
-
-  GstFlowReturn  (*show_frame) (GstVideoSink *video_sink, GstBuffer *buf);
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_video_sink_get_type (void);
-
-void gst_video_sink_center_rect (GstVideoRectangle src, GstVideoRectangle dst,
-                                 GstVideoRectangle *result, gboolean scaling);
-
-G_END_DECLS
-
-#endif  /* __GST_VIDEO_SINK_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideoutils.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideoutils.h
deleted file mode 100644
index 63833e23..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/gstvideoutils.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* GStreamer
- * Copyright (C) 2008 David Schleef <ds@schleef.org>
- * Copyright (C) 2012 Collabora Ltd.
- *	Author : Edward Hervey <edward@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GST_VIDEO_UTILS_H_
-#define _GST_VIDEO_UTILS_H_
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-#define GST_TYPE_VIDEO_CODEC_STATE \
-  (gst_video_codec_state_get_type())
-
-#define GST_TYPE_VIDEO_CODEC_FRAME \
-  (gst_video_codec_frame_get_type())
-
-typedef struct _GstVideoCodecState GstVideoCodecState;
-typedef struct _GstVideoCodecFrame GstVideoCodecFrame;
-
-/**
- * GstVideoCodecState:
- * @info: The #GstVideoInfo describing the stream
- * @caps: The #GstCaps
- * @codec_data: (optional) a #GstBuffer corresponding to the
- *     'codec_data' field of a stream.
- *
- * Structure representing the state of an incoming or outgoing video
- * stream for encoders and decoders.
- *
- * Decoders and encoders will receive such a state through their
- * respective @set_format vmethods.
- *
- * Decoders and encoders can set the downstream state, by using the
- * @gst_video_decoder_set_output_state() or
- * @gst_video_encoder_set_output_state() methods.
- */
-struct _GstVideoCodecState
-{
-  /*< private >*/
-  gint ref_count;
-
-  /*< public >*/
-  GstVideoInfo info;
-
-  GstCaps *caps;
-
-  GstBuffer *codec_data;
-
-  /*< private >*/
-  void         *padding[GST_PADDING_LARGE];
-};
-
-/**
- * GstVideoCodecFrameFlags:
- * @GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY: is the frame only meant to be decoded
- * @GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT: is the frame a synchronization point (keyframe)
- * @GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME: should the output frame be made a keyframe
- * @GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS: should the encoder output stream headers
- *
- * Flags for #GstVideoCodecFrame
- */
-typedef enum
-{
-  GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY            = (1<<0),
-  GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT             = (1<<1),
-  GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME         = (1<<2),
-  GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS = (1<<3)
-} GstVideoCodecFrameFlags;
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAGS:
- * @frame: a #GstVideoCodecFrame
- *
- * The entire set of flags for the @frame
- */
-#define GST_VIDEO_CODEC_FRAME_FLAGS(frame) ((frame)->flags)
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_IS_SET:
- * @frame: a #GstVideoCodecFrame
- * @flag: a flag to check for
- *
- * Checks whether the given @flag is set
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame,flag)   !!(GST_VIDEO_CODEC_FRAME_FLAGS(frame) & (flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_SET:
- * @frame: a #GstVideoCodecFrame
- * @flag: Flag to set, can be any number of bits in guint32.
- *
- * This macro sets the given bits
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_SET(frame,flag)     (GST_VIDEO_CODEC_FRAME_FLAGS(frame) |= (flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_FLAG_UNSET:
- * @frame: a #GstVideoCodecFrame
- * @flag: Flag to unset
- *
- * This macro usets the given bits.
- */
-#define GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame,flag)   (GST_VIDEO_CODEC_FRAME_FLAGS(frame) &= ~(flag))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the buffer should only be decoded but not sent downstream.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY))
-
-/**
- * GST_VIDEO_CODEC_FRAME_SET_DECODE_ONLY:
- * @frame: a #GstVideoCodecFrame
- *
- * Sets the buffer to not be sent downstream.
- *
- * Decoder implementation can use this if they have frames that
- * are not meant to be displayed.
- *
- * Encoder implementation can safely ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_SET_DECODE_ONLY(frame)    (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the frame is a synchronization point (like a keyframe).
- *
- * Decoder implementations can use this to detect keyframes.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-
-/**
- * GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT:
- * @frame: a #GstVideoCodecFrame
- *
- * Sets the frame to be a synchronization point (like a keyframe).
- *
- * Encoder implementations should set this accordingly.
- *
- * Decoder implementing parsing features should set this when they
- * detect such a synchronization point.
- */
-#define GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-#define GST_VIDEO_CODEC_FRAME_UNSET_SYNC_POINT(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT))
-
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if the frame must be encoded as a keyframe. Applies only to
- * frames provided to encoders. Decoders can safely ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-#define GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-#define GST_VIDEO_CODEC_FRAME_UNSET_FORCE_KEYFRAME(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME))
-
-/**
- * GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME_HEADERS:
- * @frame: a #GstVideoCodecFrame
- *
- * Tests if encoder should output stream headers before outputting the
- * resulting encoded buffer for the given frame.
- *
- * Applies only to frames provided to encoders. Decoders can safely
- * ignore this field.
- */
-#define GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME_HEADERS(frame)      (GST_VIDEO_CODEC_FRAME_FLAG_IS_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-#define GST_VIDEO_CODEC_FRAME_SET_FORCE_KEYFRAME_HEADERS(frame)     (GST_VIDEO_CODEC_FRAME_FLAG_SET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-#define GST_VIDEO_CODEC_FRAME_UNSET_FORCE_KEYFRAME_HEADERS(frame)   (GST_VIDEO_CODEC_FRAME_FLAG_UNSET(frame, GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS))
-
-/**
- * GstVideoCodecFrame:
- * @pts: Presentation timestamp
- * @dts: Decoding timestamp
- * @duration: Duration of the frame
- * @system_frame_number: Unique identifier for the frame. Use this if you need
- *       to get hold of the frame later (like when data is being decoded).
- *       Typical usage in decoders is to set this on the opaque value provided
- *       to the library and get back the frame using gst_video_decoder_get_frame()
- * @distance_from_sync: Distance in frames from the last synchronization point.
- * @input_buffer: the input #GstBuffer that created this frame. The buffer is owned
- *           by the frame and references to the frame instead of the buffer should
- * @output_buffer: the output #GstBuffer. Implementations should set this either
- *           directly, or by using the @gst_video_decoder_alloc_output_frame() or
- *           @gst_video_decoder_alloc_output_buffer() methods. The buffer is owned
- *           by the frame and references to the frame instead of the buffer should
- *           be kept.
- * @deadline: Running time when the frame will be used.
- * @events: Events that will be pushed downstream before this frame is pushed.
- *
- * A #GstVideoCodecFrame represents a video frame both in raw and
- * encoded form.
- */
-struct _GstVideoCodecFrame
-{
-  /*< private >*/
-  gint ref_count;
-
-  guint32 flags;
-
-  /*< public >*/
-  guint32 system_frame_number;	/* ED */
-  guint32 decode_frame_number;	/* ED */
-  guint32 presentation_frame_number; /* ED */
-
-  GstClockTime dts;       /* ED */
-  GstClockTime pts;       /* ED */
-  GstClockTime duration;  /* ED */
-
-  int distance_from_sync;	/* ED */
-
-  GstBuffer *input_buffer;	/* ED */
-  GstBuffer *output_buffer;	/* ED */
-
-  GstClockTime deadline;	/* D */
-
-  /*< private >*/
-
-  /* Events that should be pushed downstream *before*
-   * the next output_buffer */
-  GList *events;		/* ED */
-
-  gpointer       user_data;
-  GDestroyNotify user_data_destroy_notify;
-
-  union {
-    struct {
-      GstClockTime ts;
-      GstClockTime ts2;
-    } ABI;
-    void         *padding[GST_PADDING_LARGE];
-  } abidata;
-};
-
-/* GstVideoCodecState */
-GType           gst_video_codec_state_get_type (void);
-
-GstVideoCodecState *gst_video_codec_state_ref (GstVideoCodecState * state);
-
-void                gst_video_codec_state_unref (GstVideoCodecState * state);
-
-
-/* GstVideoCodecFrame */
-GType                gst_video_codec_frame_get_type (void);
-
-GstVideoCodecFrame  *gst_video_codec_frame_ref (GstVideoCodecFrame * frame);
-void                 gst_video_codec_frame_unref (GstVideoCodecFrame * frame);
-void                 gst_video_codec_frame_set_user_data (GstVideoCodecFrame *frame,
-						          gpointer user_data,
-				                          GDestroyNotify notify);
-gpointer             gst_video_codec_frame_get_user_data (GstVideoCodecFrame *frame);
-
-G_END_DECLS
-
-#endif
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/navigation.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/navigation.h
deleted file mode 100644
index 2cec16d9..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/navigation.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/* GStreamer Navigation
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2003 David A. Schleef <ds@schleef.org>
- *
- * navigation.h: navigation interface design
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_NAVIGATION_H__
-#define __GST_NAVIGATION_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_NAVIGATION \
-  (gst_navigation_get_type ())
-#define GST_NAVIGATION(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_NAVIGATION, GstNavigation))
-#define GST_IS_NAVIGATION(obj) \
-      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_NAVIGATION))
-#define GST_NAVIGATION_GET_INTERFACE(obj) \
-    (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_NAVIGATION, GstNavigationInterface))
-
-typedef struct _GstNavigation GstNavigation;
-typedef struct _GstNavigationInterface GstNavigationInterface;
-
-/**
- * GstNavigationInterface:
- * @iface: the parent interface
- * @send_event: sending a navigation event
- *
- * Navigation interface.
- */
-struct _GstNavigationInterface {
-  GTypeInterface iface;
-
-  /* virtual functions */
-  void (*send_event) (GstNavigation *navigation, GstStructure *structure);
-};
-
-GType           gst_navigation_get_type (void);
-
-/* Navigation commands */
-
-/**
- * GstNavigationCommand:
- * @GST_NAVIGATION_COMMAND_INVALID: An invalid command entry
- * @GST_NAVIGATION_COMMAND_MENU1: Execute navigation menu command 1. For DVD,
- * this enters the DVD root menu, or exits back to the title from the menu.
- * @GST_NAVIGATION_COMMAND_MENU2: Execute navigation menu command 2. For DVD,
- * this jumps to the DVD title menu.
- * @GST_NAVIGATION_COMMAND_MENU3: Execute navigation menu command 3. For DVD,
- * this jumps into the DVD root menu.
- * @GST_NAVIGATION_COMMAND_MENU4: Execute navigation menu command 4. For DVD,
- * this jumps to the Subpicture menu.
- * @GST_NAVIGATION_COMMAND_MENU5: Execute navigation menu command 5. For DVD,
- * the jumps to the audio menu.
- * @GST_NAVIGATION_COMMAND_MENU6: Execute navigation menu command 6. For DVD,
- * this jumps to the angles menu.
- * @GST_NAVIGATION_COMMAND_MENU7: Execute navigation menu command 7. For DVD,
- * this jumps to the chapter menu.
- * @GST_NAVIGATION_COMMAND_LEFT: Select the next button to the left in a menu,
- * if such a button exists.
- * @GST_NAVIGATION_COMMAND_RIGHT: Select the next button to the right in a menu,
- * if such a button exists.
- * @GST_NAVIGATION_COMMAND_UP: Select the button above the current one in a
- * menu, if such a button exists.
- * @GST_NAVIGATION_COMMAND_DOWN: Select the button below the current one in a
- * menu, if such a button exists.
- * @GST_NAVIGATION_COMMAND_ACTIVATE: Activate (click) the currently selected
- * button in a menu, if such a button exists.
- * @GST_NAVIGATION_COMMAND_PREV_ANGLE: Switch to the previous angle in a
- * multiangle feature.
- * @GST_NAVIGATION_COMMAND_NEXT_ANGLE: Switch to the next angle in a multiangle
- * feature.
- *
- * A set of commands that may be issued to an element providing the
- * #GstNavigation interface. The available commands can be queried via
- * the gst_navigation_query_new_commands() query.
- *
- * For convenience in handling DVD navigation, the MENU commands are aliased as:
- *    GST_NAVIGATION_COMMAND_DVD_MENU            = @GST_NAVIGATION_COMMAND_MENU1
- *    GST_NAVIGATION_COMMAND_DVD_TITLE_MENU      = @GST_NAVIGATION_COMMAND_MENU2
- *    GST_NAVIGATION_COMMAND_DVD_ROOT_MENU       = @GST_NAVIGATION_COMMAND_MENU3
- *    GST_NAVIGATION_COMMAND_DVD_SUBPICTURE_MENU = @GST_NAVIGATION_COMMAND_MENU4
- *    GST_NAVIGATION_COMMAND_DVD_AUDIO_MENU      = @GST_NAVIGATION_COMMAND_MENU5
- *    GST_NAVIGATION_COMMAND_DVD_ANGLE_MENU      = @GST_NAVIGATION_COMMAND_MENU6
- *    GST_NAVIGATION_COMMAND_DVD_CHAPTER_MENU    = @GST_NAVIGATION_COMMAND_MENU7
- */
-typedef enum {
-  GST_NAVIGATION_COMMAND_INVALID  = 0,
-
-  GST_NAVIGATION_COMMAND_MENU1    = 1,
-  GST_NAVIGATION_COMMAND_MENU2    = 2,
-  GST_NAVIGATION_COMMAND_MENU3    = 3,
-  GST_NAVIGATION_COMMAND_MENU4    = 4,
-  GST_NAVIGATION_COMMAND_MENU5    = 5,
-  GST_NAVIGATION_COMMAND_MENU6    = 6,
-  GST_NAVIGATION_COMMAND_MENU7    = 7,
-
-  GST_NAVIGATION_COMMAND_LEFT     = 20,
-  GST_NAVIGATION_COMMAND_RIGHT    = 21,
-  GST_NAVIGATION_COMMAND_UP       = 22,
-  GST_NAVIGATION_COMMAND_DOWN     = 23,
-  GST_NAVIGATION_COMMAND_ACTIVATE = 24,
-
-  GST_NAVIGATION_COMMAND_PREV_ANGLE = 30,
-  GST_NAVIGATION_COMMAND_NEXT_ANGLE = 31
-} GstNavigationCommand;
-
-/* Some aliases for the menu command types */
-#define GST_NAVIGATION_COMMAND_DVD_MENU            GST_NAVIGATION_COMMAND_MENU1
-#define GST_NAVIGATION_COMMAND_DVD_TITLE_MENU      GST_NAVIGATION_COMMAND_MENU2
-#define GST_NAVIGATION_COMMAND_DVD_ROOT_MENU       GST_NAVIGATION_COMMAND_MENU3
-#define GST_NAVIGATION_COMMAND_DVD_SUBPICTURE_MENU GST_NAVIGATION_COMMAND_MENU4
-#define GST_NAVIGATION_COMMAND_DVD_AUDIO_MENU      GST_NAVIGATION_COMMAND_MENU5
-#define GST_NAVIGATION_COMMAND_DVD_ANGLE_MENU      GST_NAVIGATION_COMMAND_MENU6
-#define GST_NAVIGATION_COMMAND_DVD_CHAPTER_MENU    GST_NAVIGATION_COMMAND_MENU7
-
-/* Queries */
-/**
- * GstNavigationQueryType:
- * @GST_NAVIGATION_QUERY_INVALID: invalid query
- * @GST_NAVIGATION_QUERY_COMMANDS: command query
- * @GST_NAVIGATION_QUERY_ANGLES: viewing angle query
- *
- * Tyoes of navigation interface queries.
- */
-typedef enum
-{
-  GST_NAVIGATION_QUERY_INVALID     = 0,
-  GST_NAVIGATION_QUERY_COMMANDS    = 1,
-  GST_NAVIGATION_QUERY_ANGLES      = 2
-} GstNavigationQueryType;
-
-GstNavigationQueryType gst_navigation_query_get_type (GstQuery *query);
-
-GstQuery *      gst_navigation_query_new_commands       (void);
-void            gst_navigation_query_set_commands       (GstQuery *query, gint n_cmds, ...);
-void            gst_navigation_query_set_commandsv      (GstQuery *query, gint n_cmds,
-                                                         GstNavigationCommand *cmds);
-gboolean        gst_navigation_query_parse_commands_length     (GstQuery *query,
-                                                                guint *n_cmds);
-gboolean        gst_navigation_query_parse_commands_nth        (GstQuery *query, guint nth,
-                                                                GstNavigationCommand *cmd);
-
-GstQuery *      gst_navigation_query_new_angles         (void);
-void            gst_navigation_query_set_angles         (GstQuery *query, guint cur_angle,
-                                                         guint n_angles);
-gboolean        gst_navigation_query_parse_angles       (GstQuery *query, guint *cur_angle,
-                                                         guint *n_angles);
-
-/* Element messages */
-/**
- * GstNavigationMessageType:
- * @GST_NAVIGATION_MESSAGE_INVALID: Returned from
- * gst_navigation_message_get_type() when the passed message is not a
- * navigation message.
- * @GST_NAVIGATION_MESSAGE_MOUSE_OVER: Sent when the mouse moves over or leaves a
- * clickable region of the output, such as a DVD menu button.
- * @GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED: Sent when the set of available commands
- * changes and should re-queried by interested applications.
- * @GST_NAVIGATION_MESSAGE_ANGLES_CHANGED: Sent when display angles in a multi-angle
- * feature (such as a multiangle DVD) change - either angles have appeared or
- * disappeared.
- *
- * A set of notifications that may be received on the bus when navigation
- * related status changes.
- */
-typedef enum {
-  GST_NAVIGATION_MESSAGE_INVALID,
-  GST_NAVIGATION_MESSAGE_MOUSE_OVER,
-  GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED,
-  GST_NAVIGATION_MESSAGE_ANGLES_CHANGED
-} GstNavigationMessageType;
-
-GstNavigationMessageType gst_navigation_message_get_type (GstMessage *message);
-
-GstMessage *    gst_navigation_message_new_mouse_over       (GstObject *src,
-                                                             gboolean active);
-gboolean        gst_navigation_message_parse_mouse_over     (GstMessage *message,
-                                                             gboolean *active);
-
-GstMessage *    gst_navigation_message_new_commands_changed (GstObject *src);
-
-GstMessage *    gst_navigation_message_new_angles_changed   (GstObject *src,
-                                                             guint cur_angle,
-                                                             guint n_angles);
-gboolean        gst_navigation_message_parse_angles_changed (GstMessage *message,
-                                                             guint *cur_angle,
-                                                             guint *n_angles);
-
-/* event parsing functions */
-/**
- * GstNavigationEventType:
- * @GST_NAVIGATION_EVENT_INVALID: Returned from
- * gst_navigation_event_get_type() when the passed event is not a navigation event.
- * @GST_NAVIGATION_EVENT_KEY_PRESS: A key press event. Use
- * gst_navigation_event_parse_key_event() to extract the details from the event.
- * @GST_NAVIGATION_EVENT_KEY_RELEASE: A key release event. Use
- * gst_navigation_event_parse_key_event() to extract the details from the event.
- * @GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS: A mouse button press event. Use
- * gst_navigation_event_parse_mouse_button_event() to extract the details from the
- * event.
- * @GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE: A mouse button release event. Use
- * gst_navigation_event_parse_mouse_button_event() to extract the details from the
- * event.
- * @GST_NAVIGATION_EVENT_MOUSE_MOVE: A mouse movement event. Use
- * gst_navigation_event_parse_mouse_move_event() to extract the details from the
- * event.
- * @GST_NAVIGATION_EVENT_COMMAND: A navigation command event. Use
- * gst_navigation_event_parse_command() to extract the details from the event.
- *
- * Enum values for the various events that an element implementing the
- * GstNavigation interface might send up the pipeline.
- */
-typedef enum {
-  GST_NAVIGATION_EVENT_INVALID                    = 0,
-  GST_NAVIGATION_EVENT_KEY_PRESS                  = 1,
-  GST_NAVIGATION_EVENT_KEY_RELEASE                = 2,
-  GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS         = 3,
-  GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE       = 4,
-  GST_NAVIGATION_EVENT_MOUSE_MOVE                 = 5,
-  GST_NAVIGATION_EVENT_COMMAND                    = 6
-} GstNavigationEventType;
-
-GstNavigationEventType gst_navigation_event_get_type          (GstEvent *event);
-
-gboolean        gst_navigation_event_parse_key_event          (GstEvent *event,
-                                                               const gchar **key);
-gboolean        gst_navigation_event_parse_mouse_button_event (GstEvent *event,
-                                                               gint *button, gdouble *x, gdouble *y);
-gboolean        gst_navigation_event_parse_mouse_move_event   (GstEvent *event,
-                                                               gdouble *x, gdouble *y);
-gboolean        gst_navigation_event_parse_command            (GstEvent *event,
-                                                               GstNavigationCommand *command);
-
-/* interface virtual function wrappers */
-void    gst_navigation_send_event       (GstNavigation *navigation,
-                                         GstStructure *structure);
-void    gst_navigation_send_key_event   (GstNavigation *navigation,
-                                         const char *event, const char *key);
-void    gst_navigation_send_mouse_event (GstNavigation *navigation,
-                                         const char *event, int button, double x, double y);
-void    gst_navigation_send_command     (GstNavigation *navigation,
-                                         GstNavigationCommand command);
-
-G_END_DECLS
-
-#endif /* __GST_NAVIGATION_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-blend.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-blend.h
deleted file mode 100644
index 906752ba..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-blend.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Gstreamer video blending utility functions
- *
- * Copyright (C) <2011> Intel Corporation
- * Copyright (C) <2011> Collabora Ltd.
- * Copyright (C) <2011> Thibault Saunier <thibault.saunier@collabora.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef  __GST_VIDEO_BLEND__
-#define  __GST_VIDEO_BLEND__
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-void       gst_video_blend_scale_linear_RGBA  (GstVideoInfo * src, GstBuffer * src_buffer,
-                                               gint dest_height, gint dest_width,
-                                               GstVideoInfo * dest, GstBuffer ** dest_buffer);
-
-gboolean   gst_video_blend                    (GstVideoFrame * dest,
-                                               GstVideoFrame * src,
-                                               gint x, gint y,
-                                               gfloat global_alpha);
-
-#endif
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-color.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-color.h
deleted file mode 100644
index dcbb66f4..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-color.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_COLOR_H__
-#define __GST_VIDEO_COLOR_H__
-
-#include <gst/gst.h>
-
-#include <gst/video/video-format.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstVideoColorRange:
- * @GST_VIDEO_COLOR_RANGE_UNKNOWN: unknown range
- * @GST_VIDEO_COLOR_RANGE_0_255: [0..255] for 8 bit components
- * @GST_VIDEO_COLOR_RANGE_16_235: [16..235] for 8 bit components. Chroma has
- *                 [16..240] range.
- *
- * Possible color range values. These constants are defined for 8 bit color
- * values and can be scaled for other bit depths.
- */
-typedef enum {
-  GST_VIDEO_COLOR_RANGE_UNKNOWN = 0,
-  GST_VIDEO_COLOR_RANGE_0_255,
-  GST_VIDEO_COLOR_RANGE_16_235
-} GstVideoColorRange;
-
-/**
- * GstVideoColorMatrix:
- * @GST_VIDEO_COLOR_MATRIX_UNKNOWN: unknown matrix
- * @GST_VIDEO_COLOR_MATRIX_RGB: identity matrix
- * @GST_VIDEO_COLOR_MATRIX_FCC: FCC color matrix
- * @GST_VIDEO_COLOR_MATRIX_BT709: ITU-R BT.709 color matrix
- * @GST_VIDEO_COLOR_MATRIX_BT601: ITU-R BT.601 color matrix
- * @GST_VIDEO_COLOR_MATRIX_SMPTE240M: SMPTE 240M color matrix
- *
- * The color matrix is used to convert between Y'PbPr and
- * non-linear RGB (R'G'B')
- */
-typedef enum {
-  GST_VIDEO_COLOR_MATRIX_UNKNOWN = 0,
-  GST_VIDEO_COLOR_MATRIX_RGB,
-  GST_VIDEO_COLOR_MATRIX_FCC,
-  GST_VIDEO_COLOR_MATRIX_BT709,
-  GST_VIDEO_COLOR_MATRIX_BT601,
-  GST_VIDEO_COLOR_MATRIX_SMPTE240M
-} GstVideoColorMatrix;
-
-/**
- * GstVideoTransferFunction:
- * @GST_VIDEO_TRANSFER_UNKNOWN: unknown transfer function
- * @GST_VIDEO_TRANSFER_GAMMA10: linear RGB, gamma 1.0 curve
- * @GST_VIDEO_TRANSFER_GAMMA18: Gamma 1.8 curve
- * @GST_VIDEO_TRANSFER_GAMMA20: Gamma 2.0 curve
- * @GST_VIDEO_TRANSFER_GAMMA22: Gamma 2.2 curve
- * @GST_VIDEO_TRANSFER_BT709: Gamma 2.2 curve with a linear segment in the lower
- *                           range
- * @GST_VIDEO_TRANSFER_SMPTE240M: Gamma 2.2 curve with a linear segment in the
- *                               lower range
- * @GST_VIDEO_TRANSFER_SRGB: Gamma 2.4 curve with a linear segment in the lower
- *                          range
- * @GST_VIDEO_TRANSFER_GAMMA28: Gamma 2.8 curve
- * @GST_VIDEO_TRANSFER_LOG100: Logarithmic transfer characteristic
- *                             100:1 range
- * @GST_VIDEO_TRANSFER_LOG316: Logarithmic transfer characteristic
- *                             316.22777:1 range
- *
- * The video transfer function defines the formula for converting between
- * non-linear RGB (R'G'B') and linear RGB
- */
-typedef enum {
-  GST_VIDEO_TRANSFER_UNKNOWN = 0,
-  GST_VIDEO_TRANSFER_GAMMA10,
-  GST_VIDEO_TRANSFER_GAMMA18,
-  GST_VIDEO_TRANSFER_GAMMA20,
-  GST_VIDEO_TRANSFER_GAMMA22,
-  GST_VIDEO_TRANSFER_BT709,
-  GST_VIDEO_TRANSFER_SMPTE240M,
-  GST_VIDEO_TRANSFER_SRGB,
-  GST_VIDEO_TRANSFER_GAMMA28,
-  GST_VIDEO_TRANSFER_LOG100,
-  GST_VIDEO_TRANSFER_LOG316
-} GstVideoTransferFunction;
-
-/**
- * GstVideoColorPrimaries:
- * @GST_VIDEO_COLOR_PRIMARIES_UNKNOWN: unknown color primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT709: BT709 primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT470M: BT470M primaries
- * @GST_VIDEO_COLOR_PRIMARIES_BT470BG: BT470BG primaries
- * @GST_VIDEO_COLOR_PRIMARIES_SMPTE170M: SMPTE170M primaries
- * @GST_VIDEO_COLOR_PRIMARIES_SMPTE240M: SMPTE240M primaries
- * @GST_VIDEO_COLOR_PRIMARIES_FILM: Generic film
- *
- * The color primaries define the how to transform linear RGB values to and from
- * the CIE XYZ colorspace.
- */
-typedef enum {
-  GST_VIDEO_COLOR_PRIMARIES_UNKNOWN = 0,
-  GST_VIDEO_COLOR_PRIMARIES_BT709,
-  GST_VIDEO_COLOR_PRIMARIES_BT470M,
-  GST_VIDEO_COLOR_PRIMARIES_BT470BG,
-  GST_VIDEO_COLOR_PRIMARIES_SMPTE170M,
-  GST_VIDEO_COLOR_PRIMARIES_SMPTE240M,
-  GST_VIDEO_COLOR_PRIMARIES_FILM
-} GstVideoColorPrimaries;
-
-/**
- * GstVideoColorimetry:
- * @range: the color range. This is the valid range for the samples.
- *         It is used to convert the samples to Y'PbPr values.
- * @matrix: the color matrix. Used to convert between Y'PbPr and
- *          non-linear RGB (R'G'B')
- * @transfer: the transfer function. used to convert between R'G'B' and RGB
- * @primaries: color primaries. used to convert between R'G'B' and CIE XYZ
- *
- * Structure describing the color info.
- */
-typedef struct {
-  GstVideoColorRange        range;
-  GstVideoColorMatrix       matrix;
-  GstVideoTransferFunction  transfer;
-  GstVideoColorPrimaries    primaries;
-} GstVideoColorimetry;
-
-/* predefined colorimetry */
-#define GST_VIDEO_COLORIMETRY_BT601       "bt601"
-#define GST_VIDEO_COLORIMETRY_BT709       "bt709"
-#define GST_VIDEO_COLORIMETRY_SMPTE240M   "smpte240m"
-
-gboolean     gst_video_colorimetry_matches     (GstVideoColorimetry *cinfo, const gchar *color);
-gboolean     gst_video_colorimetry_from_string (GstVideoColorimetry *cinfo, const gchar *color);
-gchar *      gst_video_colorimetry_to_string   (GstVideoColorimetry *cinfo);
-
-/* compute offset and scale */
-void         gst_video_color_range_offsets     (GstVideoColorRange range,
-                                                const GstVideoFormatInfo *info,
-                                                gint offset[GST_VIDEO_MAX_COMPONENTS],
-                                                gint scale[GST_VIDEO_MAX_COMPONENTS]);
-
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_COLOR_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-enumtypes.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-enumtypes.h
deleted file mode 100644
index 6e78a829..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-enumtypes.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-#ifndef __GST_VIDEO_ENUM_TYPES_H__
-#define __GST_VIDEO_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "video-format.h" */
-GType gst_video_format_get_type (void);
-#define GST_TYPE_VIDEO_FORMAT (gst_video_format_get_type())
-GType gst_video_chroma_site_get_type (void);
-#define GST_TYPE_VIDEO_CHROMA_SITE (gst_video_chroma_site_get_type())
-GType gst_video_format_flags_get_type (void);
-#define GST_TYPE_VIDEO_FORMAT_FLAGS (gst_video_format_flags_get_type())
-GType gst_video_pack_flags_get_type (void);
-#define GST_TYPE_VIDEO_PACK_FLAGS (gst_video_pack_flags_get_type())
-
-/* enumerations from "video-color.h" */
-GType gst_video_color_range_get_type (void);
-#define GST_TYPE_VIDEO_COLOR_RANGE (gst_video_color_range_get_type())
-GType gst_video_color_matrix_get_type (void);
-#define GST_TYPE_VIDEO_COLOR_MATRIX (gst_video_color_matrix_get_type())
-GType gst_video_transfer_function_get_type (void);
-#define GST_TYPE_VIDEO_TRANSFER_FUNCTION (gst_video_transfer_function_get_type())
-GType gst_video_color_primaries_get_type (void);
-#define GST_TYPE_VIDEO_COLOR_PRIMARIES (gst_video_color_primaries_get_type())
-
-/* enumerations from "video-info.h" */
-GType gst_video_interlace_mode_get_type (void);
-#define GST_TYPE_VIDEO_INTERLACE_MODE (gst_video_interlace_mode_get_type())
-GType gst_video_flags_get_type (void);
-#define GST_TYPE_VIDEO_FLAGS (gst_video_flags_get_type())
-
-/* enumerations from "colorbalance.h" */
-GType gst_color_balance_type_get_type (void);
-#define GST_TYPE_COLOR_BALANCE_TYPE (gst_color_balance_type_get_type())
-
-/* enumerations from "navigation.h" */
-GType gst_navigation_command_get_type (void);
-#define GST_TYPE_NAVIGATION_COMMAND (gst_navigation_command_get_type())
-GType gst_navigation_query_type_get_type (void);
-#define GST_TYPE_NAVIGATION_QUERY_TYPE (gst_navigation_query_type_get_type())
-GType gst_navigation_message_type_get_type (void);
-#define GST_TYPE_NAVIGATION_MESSAGE_TYPE (gst_navigation_message_type_get_type())
-GType gst_navigation_event_type_get_type (void);
-#define GST_TYPE_NAVIGATION_EVENT_TYPE (gst_navigation_event_type_get_type())
-G_END_DECLS
-
-#endif /* __GST_VIDEO_ENUM_TYPES_H__ */
-
-
-
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-event.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-event.h
deleted file mode 100644
index 78559f6f..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-event.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_EVENT_H__
-#define __GST_VIDEO_EVENT_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-/* video still frame event creation and parsing */
-
-GstEvent *     gst_video_event_new_still_frame   (gboolean in_still);
-
-gboolean       gst_video_event_parse_still_frame (GstEvent * event, gboolean * in_still);
-
-/* video force key unit event creation and parsing */
-
-GstEvent * gst_video_event_new_downstream_force_key_unit (GstClockTime timestamp,
-                                                          GstClockTime stream_time,
-                                                          GstClockTime running_time,
-                                                          gboolean all_headers,
-                                                          guint count);
-
-gboolean gst_video_event_parse_downstream_force_key_unit (GstEvent * event,
-                                                          GstClockTime * timestamp,
-                                                          GstClockTime * stream_time,
-                                                          GstClockTime * running_time,
-                                                          gboolean * all_headers,
-                                                          guint * count);
-
-GstEvent * gst_video_event_new_upstream_force_key_unit (GstClockTime running_time,
-                                                        gboolean all_headers,
-                                                        guint count);
-
-gboolean gst_video_event_parse_upstream_force_key_unit (GstEvent * event,
-                                                        GstClockTime * running_time,
-                                                        gboolean * all_headers,
-                                                        guint * count);
-
-gboolean gst_video_event_is_force_key_unit(GstEvent *event);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_EVENT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-format.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-format.h
deleted file mode 100644
index 25229cc8..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-format.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_FORMAT_H__
-#define __GST_VIDEO_FORMAT_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#include <gst/video/video-enumtypes.h>
-
-/**
- * GstVideoFormat:
- * @GST_VIDEO_FORMAT_UNKNOWN: Unknown or unset video format id
- * @GST_VIDEO_FORMAT_ENCODED: Encoded video format
- * @GST_VIDEO_FORMAT_I420: planar 4:2:0 YUV
- * @GST_VIDEO_FORMAT_YV12: planar 4:2:0 YVU (like I420 but UV planes swapped)
- * @GST_VIDEO_FORMAT_YUY2: packed 4:2:2 YUV (Y0-U0-Y1-V0 Y2-U2-Y3-V2 Y4 ...)
- * @GST_VIDEO_FORMAT_UYVY: packed 4:2:2 YUV (U0-Y0-V0-Y1 U2-Y2-V2-Y3 U4 ...)
- * @GST_VIDEO_FORMAT_AYUV: packed 4:4:4 YUV with alpha channel (A0-Y0-U0-V0 ...)
- * @GST_VIDEO_FORMAT_RGBx: sparse rgb packed into 32 bit, space last
- * @GST_VIDEO_FORMAT_BGRx: sparse reverse rgb packed into 32 bit, space last
- * @GST_VIDEO_FORMAT_xRGB: sparse rgb packed into 32 bit, space first
- * @GST_VIDEO_FORMAT_xBGR: sparse reverse rgb packed into 32 bit, space first
- * @GST_VIDEO_FORMAT_RGBA: rgb with alpha channel last
- * @GST_VIDEO_FORMAT_BGRA: reverse rgb with alpha channel last
- * @GST_VIDEO_FORMAT_ARGB: rgb with alpha channel first
- * @GST_VIDEO_FORMAT_ABGR: reverse rgb with alpha channel first
- * @GST_VIDEO_FORMAT_RGB: rgb
- * @GST_VIDEO_FORMAT_BGR: reverse rgb
- * @GST_VIDEO_FORMAT_Y41B: planar 4:1:1 YUV
- * @GST_VIDEO_FORMAT_Y42B: planar 4:2:2 YUV
- * @GST_VIDEO_FORMAT_YVYU: packed 4:2:2 YUV (Y0-V0-Y1-U0 Y2-V2-Y3-U2 Y4 ...)
- * @GST_VIDEO_FORMAT_Y444: planar 4:4:4 YUV
- * @GST_VIDEO_FORMAT_v210: packed 4:2:2 10-bit YUV, complex format
- * @GST_VIDEO_FORMAT_v216: packed 4:2:2 16-bit YUV, Y0-U0-Y1-V1 order
- * @GST_VIDEO_FORMAT_NV12: planar 4:2:0 YUV with interleaved UV plane
- * @GST_VIDEO_FORMAT_NV21: planar 4:2:0 YUV with interleaved VU plane
- * @GST_VIDEO_FORMAT_GRAY8: 8-bit grayscale
- * @GST_VIDEO_FORMAT_GRAY16_BE: 16-bit grayscale, most significant byte first
- * @GST_VIDEO_FORMAT_GRAY16_LE: 16-bit grayscale, least significant byte first
- * @GST_VIDEO_FORMAT_v308: packed 4:4:4 YUV
- * @GST_VIDEO_FORMAT_RGB16: rgb 5-6-5 bits per component
- * @GST_VIDEO_FORMAT_BGR16: reverse rgb 5-6-5 bits per component
- * @GST_VIDEO_FORMAT_RGB15: rgb 5-5-5 bits per component
- * @GST_VIDEO_FORMAT_BGR15: reverse rgb 5-5-5 bits per component
- * @GST_VIDEO_FORMAT_UYVP: packed 10-bit 4:2:2 YUV (U0-Y0-V0-Y1 U2-Y2-V2-Y3 U4 ...)
- * @GST_VIDEO_FORMAT_A420: planar 4:4:2:0 AYUV
- * @GST_VIDEO_FORMAT_RGB8P: 8-bit paletted RGB
- * @GST_VIDEO_FORMAT_YUV9: planar 4:1:0 YUV
- * @GST_VIDEO_FORMAT_YVU9: planar 4:1:0 YUV (like YUV9 but UV planes swapped)
- * @GST_VIDEO_FORMAT_IYU1: packed 4:1:1 YUV (Cb-Y0-Y1-Cr-Y2-Y3 ...)
- * @GST_VIDEO_FORMAT_ARGB64: rgb with alpha channel first, 16 bits per channel
- * @GST_VIDEO_FORMAT_AYUV64: packed 4:4:4 YUV with alpha channel, 16 bits per channel (A0-Y0-U0-V0 ...)
- * @GST_VIDEO_FORMAT_r210: packed 4:4:4 RGB, 10 bits per channel
- * @GST_VIDEO_FORMAT_I420_10BE: planar 4:2:0 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I420_10LE: planar 4:2:0 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I422_10BE: planar 4:2:2 YUV, 10 bits per channel
- * @GST_VIDEO_FORMAT_I422_10LE: planar 4:2:2 YUV, 10 bits per channel
- *
- * Enum value describing the most common video formats.
- */
-typedef enum {
-  GST_VIDEO_FORMAT_UNKNOWN,
-  GST_VIDEO_FORMAT_ENCODED,
-  GST_VIDEO_FORMAT_I420,
-  GST_VIDEO_FORMAT_YV12,
-  GST_VIDEO_FORMAT_YUY2,
-  GST_VIDEO_FORMAT_UYVY,
-  GST_VIDEO_FORMAT_AYUV,
-  GST_VIDEO_FORMAT_RGBx,
-  GST_VIDEO_FORMAT_BGRx,
-  GST_VIDEO_FORMAT_xRGB,
-  GST_VIDEO_FORMAT_xBGR,
-  GST_VIDEO_FORMAT_RGBA,
-  GST_VIDEO_FORMAT_BGRA,
-  GST_VIDEO_FORMAT_ARGB,
-  GST_VIDEO_FORMAT_ABGR,
-  GST_VIDEO_FORMAT_RGB,
-  GST_VIDEO_FORMAT_BGR,
-  GST_VIDEO_FORMAT_Y41B,
-  GST_VIDEO_FORMAT_Y42B,
-  GST_VIDEO_FORMAT_YVYU,
-  GST_VIDEO_FORMAT_Y444,
-  GST_VIDEO_FORMAT_v210,
-  GST_VIDEO_FORMAT_v216,
-  GST_VIDEO_FORMAT_NV12,
-  GST_VIDEO_FORMAT_NV21,
-  GST_VIDEO_FORMAT_GRAY8,
-  GST_VIDEO_FORMAT_GRAY16_BE,
-  GST_VIDEO_FORMAT_GRAY16_LE,
-  GST_VIDEO_FORMAT_v308,
-  GST_VIDEO_FORMAT_RGB16,
-  GST_VIDEO_FORMAT_BGR16,
-  GST_VIDEO_FORMAT_RGB15,
-  GST_VIDEO_FORMAT_BGR15,
-  GST_VIDEO_FORMAT_UYVP,
-  GST_VIDEO_FORMAT_A420,
-  GST_VIDEO_FORMAT_RGB8P,
-  GST_VIDEO_FORMAT_YUV9,
-  GST_VIDEO_FORMAT_YVU9,
-  GST_VIDEO_FORMAT_IYU1,
-  GST_VIDEO_FORMAT_ARGB64,
-  GST_VIDEO_FORMAT_AYUV64,
-  GST_VIDEO_FORMAT_r210,
-  GST_VIDEO_FORMAT_I420_10BE,
-  GST_VIDEO_FORMAT_I420_10LE,
-  GST_VIDEO_FORMAT_I422_10BE,
-  GST_VIDEO_FORMAT_I422_10LE,
-} GstVideoFormat;
-
-#define GST_VIDEO_MAX_PLANES 4
-#define GST_VIDEO_MAX_COMPONENTS 4
-
-typedef struct _GstVideoFormatInfo GstVideoFormatInfo;
-
-/**
- * GstVideoChromaSite:
- * @GST_VIDEO_CHROMA_SITE_UNKNOWN: unknown cositing
- * @GST_VIDEO_CHROMA_SITE_NONE: no cositing
- * @GST_VIDEO_CHROMA_SITE_H_COSITED: chroma is horizontally cosited
- * @GST_VIDEO_CHROMA_SITE_V_COSITED: chroma is vertically cosited
- * @GST_VIDEO_CHROMA_SITE_ALT_LINE: choma samples are sited on alternate lines
- * @GST_VIDEO_CHROMA_SITE_COSITED: chroma samples cosited with luma samples
- * @GST_VIDEO_CHROMA_SITE_JPEG: jpeg style cositing, also for mpeg1 and mjpeg
- * @GST_VIDEO_CHROMA_SITE_MPEG2: mpeg2 style cositing
- * @GST_VIDEO_CHROMA_SITE_DV: DV style cositing
- *
- * Various Chroma sitings.
- */
-typedef enum {
-  GST_VIDEO_CHROMA_SITE_UNKNOWN   =  0,
-  GST_VIDEO_CHROMA_SITE_NONE      = (1 << 0),
-  GST_VIDEO_CHROMA_SITE_H_COSITED = (1 << 1),
-  GST_VIDEO_CHROMA_SITE_V_COSITED = (1 << 2),
-  GST_VIDEO_CHROMA_SITE_ALT_LINE  = (1 << 3),
-  /* some common chroma cositing */
-  GST_VIDEO_CHROMA_SITE_COSITED   = (GST_VIDEO_CHROMA_SITE_H_COSITED | GST_VIDEO_CHROMA_SITE_V_COSITED),
-  GST_VIDEO_CHROMA_SITE_JPEG      = (GST_VIDEO_CHROMA_SITE_NONE),
-  GST_VIDEO_CHROMA_SITE_MPEG2     = (GST_VIDEO_CHROMA_SITE_H_COSITED),
-  GST_VIDEO_CHROMA_SITE_DV        = (GST_VIDEO_CHROMA_SITE_COSITED | GST_VIDEO_CHROMA_SITE_ALT_LINE),
-} GstVideoChromaSite;
-
-GstVideoChromaSite    gst_video_chroma_from_string   (const gchar * s);
-const gchar *         gst_video_chroma_to_string     (GstVideoChromaSite site);
-
-/**
- * GstVideoFormatFlags:
- * @GST_VIDEO_FORMAT_FLAG_YUV: The video format is YUV, components are numbered
- *   0=Y, 1=U, 2=V.
- * @GST_VIDEO_FORMAT_FLAG_RGB: The video format is RGB, components are numbered
- *   0=R, 1=G, 2=B.
- * @GST_VIDEO_FORMAT_FLAG_GRAY: The video is gray, there is one gray component
- *   with index 0.
- * @GST_VIDEO_FORMAT_FLAG_ALPHA: The video format has an alpha components with
- *   the number 3.
- * @GST_VIDEO_FORMAT_FLAG_LE: The video format has data stored in little
- *   endianness.
- * @GST_VIDEO_FORMAT_FLAG_PALETTE: The video format has a palette. The palette
- *   is stored in the second plane and indexes are stored in the first plane.
- * @GST_VIDEO_FORMAT_FLAG_COMPLEX: The video format has a complex layout that
- *   can't be described with the usual information in the #GstVideoFormatInfo.
- * @GST_VIDEO_FORMAT_FLAG_UNPACK: This format can be used in a
- *   #GstVideoFormatUnpack and #GstVideoFormatPack function.
- *
- * The different video flags that a format info can have.
- */
-typedef enum
-{
-  GST_VIDEO_FORMAT_FLAG_YUV      = (1 << 0),
-  GST_VIDEO_FORMAT_FLAG_RGB      = (1 << 1),
-  GST_VIDEO_FORMAT_FLAG_GRAY     = (1 << 2),
-  GST_VIDEO_FORMAT_FLAG_ALPHA    = (1 << 3),
-  GST_VIDEO_FORMAT_FLAG_LE       = (1 << 4),
-  GST_VIDEO_FORMAT_FLAG_PALETTE  = (1 << 5),
-  GST_VIDEO_FORMAT_FLAG_COMPLEX  = (1 << 6),
-  GST_VIDEO_FORMAT_FLAG_UNPACK   = (1 << 7)
-} GstVideoFormatFlags;
-
-/* YUV components */
-#define GST_VIDEO_COMP_Y  0
-#define GST_VIDEO_COMP_U  1
-#define GST_VIDEO_COMP_V  2
-
-/* RGB components */
-#define GST_VIDEO_COMP_R  0
-#define GST_VIDEO_COMP_G  1
-#define GST_VIDEO_COMP_B  2
-
-/* alpha component */
-#define GST_VIDEO_COMP_A  3
-
-/* palette components */
-#define GST_VIDEO_COMP_INDEX    0
-#define GST_VIDEO_COMP_PALETTE  1
-
-/**
- * GstVideoPackFlags:
- * @GST_VIDEO_PACK_FLAG_NONE: No flag
- * @GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE: When the source has a smaller depth
- *   than the target format, set the least significant bits of the target
- *   to 0. This is likely sightly faster but less accurate. When this flag
- *   is not specified, the most significant bits of the source are duplicated
- *   in the least significant bits of the destination.
- *
- * The different flags that can be used when packing and unpacking.
- */
-typedef enum
-{
-  GST_VIDEO_PACK_FLAG_NONE           = 0,
-  GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE = 1
-} GstVideoPackFlags;
-
-/**
- * GstVideoFormatUnpack:
- * @info: a #GstVideoFormatInfo
- * @flags: flags to control the unpacking
- * @dest: a destination array
- * @data: pointers to the data planes
- * @stride: strides of the planes
- * @x: the x position in the image to start from
- * @y: the y position in the image to start from
- * @width: the amount of pixels to unpack.
- *
- * Unpacks @width pixels from the given planes and strides containing data of
- * format @info. The pixels will be unpacked into @dest which each component
- * interleaved. @dest should at least be big enough to hold @width *
- * n_components * size(unpack_format) bytes.
- */
-typedef void (*GstVideoFormatUnpack)         (const GstVideoFormatInfo *info,
-                                              GstVideoPackFlags flags, gpointer dest,
-                                              const gpointer data[GST_VIDEO_MAX_PLANES],
-                                              const gint stride[GST_VIDEO_MAX_PLANES],
-                                              gint x, gint y, gint width);
-/**
- * GstVideoFormatPack:
- * @info: a #GstVideoFormatInfo
- * @flags: flags to control the packing
- * @src: a source array
- * @sstride: the source array stride
- * @data: pointers to the destination data planes
- * @stride: strides of the destination planes
- * @chroma_site: the chroma siting of the target when subsampled
- * @y: the y position in the image to pack to
- * @width: the amount of pixels to pack.
- *
- * Packs @width pixels from @src to the given planes and strides in the
- * format @info. The pixels from source have each component interleaved
- * and will be packed into the planes in @data.
- *
- * This function operates on pack_lines lines, meaning that @src should
- * contain at least pack_lines lines with a stride of @sstride and @y
- * should be a multiple of pack_lines.
- */
-typedef void (*GstVideoFormatPack)           (const GstVideoFormatInfo *info,
-                                              GstVideoPackFlags flags,
-                                              const gpointer src, gint sstride,
-                                              gpointer data[GST_VIDEO_MAX_PLANES],
-                                              const gint stride[GST_VIDEO_MAX_PLANES],
-                                              GstVideoChromaSite chroma_site,
-                                              gint y, gint width);
-
-/**
- * GstVideoFormatInfo:
- * @format: #GstVideoFormat
- * @name: string representation of the format
- * @description: use readable description of the format
- * @flags: #GstVideoFormatFlags
- * @bits: The number of bits used to pack data items. This can be less than 8
- *    when multiple pixels are stored in a byte. for values > 8 multiple bytes
- *    should be read according to the endianness flag before applying the shift
- *    and mask.
- * @n_components: the number of components in the video format.
- * @shift: the number of bits to shift away to get the component data
- * @depth: the depth in bits for each component
- * @pixel_stride: the pixel stride of each component. This is the amount of
- *    bytes to the pixel immediately to the right. When bits < 8, the stride is
- *    expressed in bits. For 24-bit RGB, this would be 3 bytes, for example,
- *    while it would be 4 bytes for RGBx or ARGB.
- * @n_planes: the number of planes for this format. The number of planes can be
- *    less than the amount of components when multiple components are packed into
- *    one plane.
- * @plane: the plane number where a component can be found
- * @poffset: the offset in the plane where the first pixel of the components
- *    can be found.
- * @w_sub: subsampling factor of the width for the component. Use
- *     GST_VIDEO_SUB_SCALE to scale a width.
- * @h_sub: subsampling factor of the height for the component. Use
- *     GST_VIDEO_SUB_SCALE to scale a height.
- * @unpack_format: the format of the unpacked pixels. This format must have the
- *     #GST_VIDEO_FORMAT_FLAG_UNPACK flag set.
- * @unpack_func: an unpack function for this format
- * @pack_lines: the amount of lines that will be packed
- * @pack_func: an pack function for this format
- *
- * Information for a video format.
- */
-struct _GstVideoFormatInfo {
-  GstVideoFormat format;
-  const gchar *name;
-  const gchar *description;
-  GstVideoFormatFlags flags;
-  guint bits;
-  guint n_components;
-  guint shift[GST_VIDEO_MAX_COMPONENTS];
-  guint depth[GST_VIDEO_MAX_COMPONENTS];
-  gint  pixel_stride[GST_VIDEO_MAX_COMPONENTS];
-  guint n_planes;
-  guint plane[GST_VIDEO_MAX_COMPONENTS];
-  guint poffset[GST_VIDEO_MAX_COMPONENTS];
-  guint w_sub[GST_VIDEO_MAX_COMPONENTS];
-  guint h_sub[GST_VIDEO_MAX_COMPONENTS];
-
-  GstVideoFormat unpack_format;
-  GstVideoFormatUnpack unpack_func;
-  gint pack_lines;
-  GstVideoFormatPack pack_func;
-
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-#define GST_VIDEO_FORMAT_INFO_FORMAT(info)       ((info)->format)
-#define GST_VIDEO_FORMAT_INFO_NAME(info)         ((info)->name)
-#define GST_VIDEO_FORMAT_INFO_FLAGS(info)        ((info)->flags)
-
-#define GST_VIDEO_FORMAT_INFO_IS_YUV(info)       ((info)->flags & GST_VIDEO_FORMAT_FLAG_YUV)
-#define GST_VIDEO_FORMAT_INFO_IS_RGB(info)       ((info)->flags & GST_VIDEO_FORMAT_FLAG_RGB)
-#define GST_VIDEO_FORMAT_INFO_IS_GRAY(info)      ((info)->flags & GST_VIDEO_FORMAT_FLAG_GRAY)
-#define GST_VIDEO_FORMAT_INFO_HAS_ALPHA(info)    ((info)->flags & GST_VIDEO_FORMAT_FLAG_ALPHA)
-#define GST_VIDEO_FORMAT_INFO_IS_LE(info)        ((info)->flags & GST_VIDEO_FORMAT_FLAG_LE)
-#define GST_VIDEO_FORMAT_INFO_HAS_PALETTE(info)  ((info)->flags & GST_VIDEO_FORMAT_FLAG_PALETTE)
-#define GST_VIDEO_FORMAT_INFO_IS_COMPLEX(info)   ((info)->flags & GST_VIDEO_FORMAT_FLAG_COMPLEX)
-
-#define GST_VIDEO_FORMAT_INFO_BITS(info)         ((info)->bits)
-#define GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info) ((info)->n_components)
-#define GST_VIDEO_FORMAT_INFO_SHIFT(info,c)      ((info)->shift[c])
-#define GST_VIDEO_FORMAT_INFO_DEPTH(info,c)      ((info)->depth[c])
-/**
- * GST_VIDEO_FORMAT_INFO_PSTRIDE:
- *
- * pixel stride for the given component. This is the amount of bytes to the
- * pixel immediately to the right, so basically bytes from one pixel to the
- * next. When bits < 8, the stride is expressed in bits.
- *
- * Examples: for 24-bit RGB, the pixel stride would be 3 bytes, while it
- * would be 4 bytes for RGBx or ARGB, and 8 bytes for ARGB64 or AYUV64.
- * For planar formats such as I420 the pixel stride is usually 1. For
- * YUY2 it would be 2 bytes.
- */
-#define GST_VIDEO_FORMAT_INFO_PSTRIDE(info,c)    ((info)->pixel_stride[c])
-/**
- * GST_VIDEO_FORMAT_INFO_N_PLANES:
- *
- * Number of planes. This is the number of planes the pixel layout is
- * organized in in memory. The number of planes can be less than the
- * number of components (e.g. Y,U,V,A or R, G, B, A) when multiple
- * components are packed into one plane.
- *
- * Examples: RGB/RGBx/RGBA: 1 plane, 3/3/4 components;
- * I420: 3 planes, 3 components; NV21/NV12: 2 planes, 3 components.
- */
-#define GST_VIDEO_FORMAT_INFO_N_PLANES(info)     ((info)->n_planes)
-/**
- * GST_VIDEO_FORMAT_INFO_PLANE:
- *
- * Plane number where the given component can be found. A plane may
- * contain data for multiple components.
- */
-#define GST_VIDEO_FORMAT_INFO_PLANE(info,c)      ((info)->plane[c])
-#define GST_VIDEO_FORMAT_INFO_POFFSET(info,c)    ((info)->poffset[c])
-#define GST_VIDEO_FORMAT_INFO_W_SUB(info,c)      ((info)->w_sub[c])
-#define GST_VIDEO_FORMAT_INFO_H_SUB(info,c)      ((info)->h_sub[c])
-
-/* rounds up */
-#define GST_VIDEO_SUB_SCALE(scale,val)   (-((-((gint)(val)))>>(scale)))
-
-#define GST_VIDEO_FORMAT_INFO_SCALE_WIDTH(info,c,w)  GST_VIDEO_SUB_SCALE ((info)->w_sub[c],(w))
-#define GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT(info,c,h) GST_VIDEO_SUB_SCALE ((info)->h_sub[c],(h))
-
-#define GST_VIDEO_FORMAT_INFO_DATA(info,planes,comp) \
-  (((guint8*)(planes)[(info)->plane[comp]]) + (info)->poffset[comp])
-/**
- * GST_VIDEO_FORMAT_INFO_STRIDE:
- *
- * Row stride in bytes, that is number of bytes from the first pixel component
- * of a row to the first pixel component in the next row. This might include
- * some row padding (memory not actually used for anything, to make sure the
- * beginning of the next row is aligned in a particular way).
- */
-#define GST_VIDEO_FORMAT_INFO_STRIDE(info,strides,comp) ((strides)[(info)->plane[comp]])
-#define GST_VIDEO_FORMAT_INFO_OFFSET(info,offsets,comp) \
-  (((offsets)[(info)->plane[comp]]) + (info)->poffset[comp])
-
-/* format properties */
-GstVideoFormat gst_video_format_from_masks           (gint depth, gint bpp, gint endianness,
-                                                      gint red_mask, gint green_mask,
-                                                      gint blue_mask, gint alpha_mask) G_GNUC_CONST;
-
-GstVideoFormat gst_video_format_from_fourcc          (guint32 fourcc) G_GNUC_CONST;
-GstVideoFormat gst_video_format_from_string          (const gchar *format) G_GNUC_CONST;
-
-guint32        gst_video_format_to_fourcc            (GstVideoFormat format) G_GNUC_CONST;
-const gchar *  gst_video_format_to_string            (GstVideoFormat format) G_GNUC_CONST;
-
-const GstVideoFormatInfo *
-               gst_video_format_get_info             (GstVideoFormat format) G_GNUC_CONST;
-
-#define GST_VIDEO_SIZE_RANGE "(int) [ 1, max ]"
-#define GST_VIDEO_FPS_RANGE "(fraction) [ 0, max ]"
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-# define GST_VIDEO_NE(s) G_STRINGIFY(s)"_LE"
-# define GST_VIDEO_OE(s) G_STRINGIFY(s)"_BE"
-#else
-# define GST_VIDEO_NE(s) G_STRINGIFY(s)"_BE"
-# define GST_VIDEO_OE(s) G_STRINGIFY(s)"_LE"
-#endif
-
-#define GST_VIDEO_FORMATS_ALL "{ I420, YV12, YUY2, UYVY, AYUV, RGBx, "  \
-    "BGRx, xRGB, xBGR, RGBA, BGRA, ARGB, ABGR, RGB, BGR, Y41B, Y42B, "  \
-    "YVYU, Y444, v210, v216, NV12, NV21, GRAY8, GRAY16_BE, GRAY16_LE, " \
-    "v308, RGB16, BGR16, RGB15, BGR15, UYVP, A420, RGB8P, YUV9, YVU9, " \
-    "IYU1, ARGB64, AYUV64, r210, I420_10LE, I420_10BE, I422_10LE, I422_10BE }"
-
-/**
- * GST_VIDEO_CAPS_MAKE:
- * @format: string format that describes the pixel layout, as string
- *     (e.g. "I420", "RGB", "YV12", "YUY2", "AYUV", etc.)
- *
- * Generic caps string for video, for use in pad templates.
- */
-#define GST_VIDEO_CAPS_MAKE(format)                                     \
-    "video/x-raw, "                                                     \
-    "format = (string) " format ", "                                    \
-    "width = " GST_VIDEO_SIZE_RANGE ", "                                \
-    "height = " GST_VIDEO_SIZE_RANGE ", "                               \
-    "framerate = " GST_VIDEO_FPS_RANGE
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_FORMAT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-frame.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-frame.h
deleted file mode 100644
index 8f55fbd3..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-frame.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_FRAME_H__
-#define __GST_VIDEO_FRAME_H__
-
-#include <gst/gst.h>
-#include <gst/video/video-info.h>
-
-G_BEGIN_DECLS
-
-#include <gst/video/video-enumtypes.h>
-
-typedef struct _GstVideoFrame GstVideoFrame;
-
-/**
- * GstVideoFrameFlags:
- * @GST_VIDEO_FRAME_FLAG_NONE: no flags
- * @GST_VIDEO_FRAME_FLAG_INTERLACED: The video frame is interlaced. In mixed
- *           interlace-mode, this flags specifies if the frame is interlace or
- *           progressive.
- * @GST_VIDEO_FRAME_FLAG_TFF: The video frame has the top field first
- * @GST_VIDEO_FRAME_FLAG_RFF: The video frame has the repeat flag
- * @GST_VIDEO_FRAME_FLAG_ONEFIELD: The video frame has one field
- *
- * Extra video frame flags
- */
-typedef enum {
-  GST_VIDEO_FRAME_FLAG_NONE         = 0,
-  GST_VIDEO_FRAME_FLAG_INTERLACED   = (1 << 0),
-  GST_VIDEO_FRAME_FLAG_TFF          = (1 << 1),
-  GST_VIDEO_FRAME_FLAG_RFF          = (1 << 2),
-  GST_VIDEO_FRAME_FLAG_ONEFIELD     = (1 << 3)
-} GstVideoFrameFlags;
-
-/**
- * GstVideoFrame:
- * @info: the #GstVideoInfo
- * @buffer: the mapped buffer
- * @meta: pointer to metadata if any
- * @id: id of the mapped frame. the id can for example be used to
- *   indentify the frame in case of multiview video.
- * @data: pointers to the plane data
- * @map: mappings of the planes
- *
- * A video frame obtained from gst_video_frame_map()
- */
-struct _GstVideoFrame {
-  GstVideoInfo info;
-  GstVideoFrameFlags flags;
-
-  GstBuffer *buffer;
-  gpointer   meta;
-  gint       id;
-
-  gpointer   data[GST_VIDEO_MAX_PLANES];
-  GstMapInfo map[GST_VIDEO_MAX_PLANES];
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-gboolean    gst_video_frame_map           (GstVideoFrame *frame, GstVideoInfo *info,
-                                           GstBuffer *buffer, GstMapFlags flags);
-gboolean    gst_video_frame_map_id        (GstVideoFrame *frame, GstVideoInfo *info,
-                                           GstBuffer *buffer, gint id, GstMapFlags flags);
-void        gst_video_frame_unmap         (GstVideoFrame *frame);
-
-gboolean    gst_video_frame_copy          (GstVideoFrame *dest, const GstVideoFrame *src);
-gboolean    gst_video_frame_copy_plane    (GstVideoFrame *dest, const GstVideoFrame *src,
-                                           guint plane);
-
-/* general info */
-#define GST_VIDEO_FRAME_FORMAT(f)         (GST_VIDEO_INFO_FORMAT(&(f)->info))
-#define GST_VIDEO_FRAME_WIDTH(f)          (GST_VIDEO_INFO_WIDTH(&(f)->info))
-#define GST_VIDEO_FRAME_HEIGHT(f)         (GST_VIDEO_INFO_HEIGHT(&(f)->info))
-#define GST_VIDEO_FRAME_SIZE(f)           (GST_VIDEO_INFO_SIZE(&(f)->info))
-
-/* flags */
-#define GST_VIDEO_FRAME_FLAGS(f)          ((f)->flags)
-#define GST_VIDEO_FRAME_FLAG_IS_SET(f,fl) ((GST_VIDEO_FRAME_FLAGS(f) & (fl)) == (fl))
-#define GST_VIDEO_FRAME_IS_INTERLACED(f)  (GST_VIDEO_FRAME_FLAG_IS_SET(f, GST_VIDEO_FRAME_FLAG_INTERLACED))
-#define GST_VIDEO_FRAME_IS_TFF(f)         (GST_VIDEO_FRAME_FLAG_IS_SET(f, GST_VIDEO_FRAME_FLAG_TFF))
-#define GST_VIDEO_FRAME_IS_RFF(f)         (GST_VIDEO_FRAME_FLAG_IS_SET(f, GST_VIDEO_FRAME_FLAG_RFF))
-#define GST_VIDEO_FRAME_IS_ONEFIELD(f)    (GST_VIDEO_FRAME_FLAG_IS_SET(f, GST_VIDEO_FRAME_FLAG_ONEFIELD))
-
-/* dealing with planes */
-#define GST_VIDEO_FRAME_N_PLANES(f)       (GST_VIDEO_INFO_N_PLANES(&(f)->info))
-#define GST_VIDEO_FRAME_PLANE_DATA(f,p)   ((f)->data[p])
-#define GST_VIDEO_FRAME_PLANE_OFFSET(f,p) (GST_VIDEO_INFO_PLANE_OFFSET(&(f)->info,(p)))
-#define GST_VIDEO_FRAME_PLANE_STRIDE(f,p) (GST_VIDEO_INFO_PLANE_STRIDE(&(f)->info,(p)))
-
-/* dealing with components */
-#define GST_VIDEO_FRAME_N_COMPONENTS(f)   GST_VIDEO_INFO_N_COMPONENTS(&(f)->info)
-#define GST_VIDEO_FRAME_COMP_DEPTH(f,c)   GST_VIDEO_INFO_COMP_DEPTH(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_DATA(f,c)    GST_VIDEO_INFO_COMP_DATA(&(f)->info,(f)->data,(c))
-#define GST_VIDEO_FRAME_COMP_STRIDE(f,c)  GST_VIDEO_INFO_COMP_STRIDE(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_OFFSET(f,c)  GST_VIDEO_INFO_COMP_OFFSET(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_WIDTH(f,c)   GST_VIDEO_INFO_COMP_WIDTH(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_HEIGHT(f,c)  GST_VIDEO_INFO_COMP_HEIGHT(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_PLANE(f,c)   GST_VIDEO_INFO_COMP_PLANE(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_PSTRIDE(f,c) GST_VIDEO_INFO_COMP_PSTRIDE(&(f)->info,(c))
-#define GST_VIDEO_FRAME_COMP_POFFSET(f,c) GST_VIDEO_INFO_COMP_POFFSET(&(f)->info,(c))
-
-/* buffer flags */
-
-/**
- * GstVideoBufferFlags:
- * @GST_VIDEO_BUFFER_FLAG_INTERLACED:  If the #GstBuffer is interlaced. In mixed
- *                                     interlace-mode, this flags specifies if the frame is
- *                                     interlaced or progressive.
- * @GST_VIDEO_BUFFER_FLAG_TFF:         If the #GstBuffer is interlaced, then the first field
- *                                     in the video frame is the top field.  If unset, the
- *                                     bottom field is first.
- * @GST_VIDEO_BUFFER_FLAG_RFF:         If the #GstBuffer is interlaced, then the first field
- *                                     (as defined by the %GST_VIDEO_BUFFER_TFF flag setting)
- *                                     is repeated.
- * @GST_VIDEO_BUFFER_FLAG_ONEFIELD:    If the #GstBuffer is interlaced, then only the
- *                                     first field (as defined by the %GST_VIDEO_BUFFER_TFF
- *                                     flag setting) is to be displayed.
- *
- * Additional video buffer flags.
- */
-typedef enum {
-  GST_VIDEO_BUFFER_FLAG_INTERLACED  = (GST_BUFFER_FLAG_LAST << 0),
-  GST_VIDEO_BUFFER_FLAG_TFF         = (GST_BUFFER_FLAG_LAST << 1),
-  GST_VIDEO_BUFFER_FLAG_RFF         = (GST_BUFFER_FLAG_LAST << 2),
-  GST_VIDEO_BUFFER_FLAG_ONEFIELD    = (GST_BUFFER_FLAG_LAST << 3),
-
-  GST_VIDEO_BUFFER_FLAG_LAST        = (GST_BUFFER_FLAG_LAST << 8)
-} GstVideoBufferFlags;
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_FRAME_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-info.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-info.h
deleted file mode 100644
index ce0f0fef..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-info.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_INFO_H__
-#define __GST_VIDEO_INFO_H__
-
-#include <gst/gst.h>
-#include <gst/video/video-format.h>
-#include <gst/video/video-color.h>
-
-G_BEGIN_DECLS
-
-#include <gst/video/video-enumtypes.h>
-
-typedef struct _GstVideoInfo GstVideoInfo;
-
-/**
- * GstVideoInterlaceMode:
- * @GST_VIDEO_INTERLACE_MODE_PROGRESSIVE: all frames are progressive
- * @GST_VIDEO_INTERLACE_MODE_INTERLEAVED: 2 fields are interleaved in one video
- *     frame. Extra buffer flags describe the field order.
- * @GST_VIDEO_INTERLACE_MODE_MIXED: frames contains both interlaced and
- *     progressive video, the buffer flags describe the frame and fields.
- * @GST_VIDEO_INTERLACE_MODE_FIELDS: 2 fields are stored in one buffer, use the
- *     frame ID to get access to the required field. For multiview (the
- *     'views' property > 1) the fields of view N can be found at frame ID
- *     (N * 2) and (N * 2) + 1.
- *     Each field has only half the amount of lines as noted in the
- *     height property. This mode requires multiple GstVideoMeta metadata
- *     to describe the fields.
- *
- * The possible values of the #GstVideoInterlaceMode describing the interlace
- * mode of the stream.
- */
-typedef enum {
-  GST_VIDEO_INTERLACE_MODE_PROGRESSIVE = 0,
-  GST_VIDEO_INTERLACE_MODE_INTERLEAVED,
-  GST_VIDEO_INTERLACE_MODE_MIXED,
-  GST_VIDEO_INTERLACE_MODE_FIELDS
-} GstVideoInterlaceMode;
-
-/**
- * GstVideoFlags:
- * @GST_VIDEO_FLAG_NONE: no flags
- * @GST_VIDEO_FLAG_VARIABLE_FPS: a variable fps is selected, fps_n and fps_d
- *     denote the maximum fps of the video
- * @GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA: Each color has been scaled by the alpha
- *     value.
- *
- * Extra video flags
- */
-typedef enum {
-  GST_VIDEO_FLAG_NONE                = 0,
-  GST_VIDEO_FLAG_VARIABLE_FPS        = (1 << 0),
-  GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA = (1 << 1)
-} GstVideoFlags;
-
-/**
- * GstVideoInfo:
- * @finfo: the format info of the video
- * @interlace_mode: the interlace mode
- * @flags: additional video flags
- * @width: the width of the video
- * @height: the height of the video
- * @views: the number of views for multiview video
- * @size: the default size of one frame
- * @chroma_site: a #GstVideoChromaSite.
- * @colorimetry: the colorimetry info
- * @par_n: the pixel-aspect-ratio numerator
- * @par_d: the pixel-aspect-ratio demnominator
- * @fps_n: the framerate numerator
- * @fps_d: the framerate demnominator
- * @offset: offsets of the planes
- * @stride: strides of the planes
- *
- * Information describing image properties. This information can be filled
- * in from GstCaps with gst_video_info_from_caps(). The information is also used
- * to store the specific video info when mapping a video frame with
- * gst_video_frame_map().
- *
- * Use the provided macros to access the info in this structure.
- */
-struct _GstVideoInfo {
-  const GstVideoFormatInfo *finfo;
-
-  GstVideoInterlaceMode     interlace_mode;
-  GstVideoFlags             flags;
-  gint                      width;
-  gint                      height;
-  gsize                     size;
-  gint                      views;
-
-  GstVideoChromaSite        chroma_site;
-  GstVideoColorimetry       colorimetry;
-
-  gint                      par_n;
-  gint                      par_d;
-  gint                      fps_n;
-  gint                      fps_d;
-
-  gsize                     offset[GST_VIDEO_MAX_PLANES];
-  gint                      stride[GST_VIDEO_MAX_PLANES];
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-/* general info */
-#define GST_VIDEO_INFO_FORMAT(i)         (GST_VIDEO_FORMAT_INFO_FORMAT((i)->finfo))
-#define GST_VIDEO_INFO_NAME(i)           (GST_VIDEO_FORMAT_INFO_NAME((i)->finfo))
-#define GST_VIDEO_INFO_IS_YUV(i)         (GST_VIDEO_FORMAT_INFO_IS_YUV((i)->finfo))
-#define GST_VIDEO_INFO_IS_RGB(i)         (GST_VIDEO_FORMAT_INFO_IS_RGB((i)->finfo))
-#define GST_VIDEO_INFO_IS_GRAY(i)        (GST_VIDEO_FORMAT_INFO_IS_GRAY((i)->finfo))
-#define GST_VIDEO_INFO_HAS_ALPHA(i)      (GST_VIDEO_FORMAT_INFO_HAS_ALPHA((i)->finfo))
-
-#define GST_VIDEO_INFO_INTERLACE_MODE(i) ((i)->interlace_mode)
-#define GST_VIDEO_INFO_IS_INTERLACED(i)  ((i)->interlace_mode != GST_VIDEO_INTERLACE_MODE_PROGRESSIVE)
-#define GST_VIDEO_INFO_FLAGS(i)          ((i)->flags)
-#define GST_VIDEO_INFO_WIDTH(i)          ((i)->width)
-#define GST_VIDEO_INFO_HEIGHT(i)         ((i)->height)
-#define GST_VIDEO_INFO_SIZE(i)           ((i)->size)
-#define GST_VIDEO_INFO_VIEWS(i)          ((i)->views)
-#define GST_VIDEO_INFO_PAR_N(i)          ((i)->par_n)
-#define GST_VIDEO_INFO_PAR_D(i)          ((i)->par_d)
-#define GST_VIDEO_INFO_FPS_N(i)          ((i)->fps_n)
-#define GST_VIDEO_INFO_FPS_D(i)          ((i)->fps_d)
-
-/* dealing with GstVideoInfo flags */
-#define GST_VIDEO_INFO_FLAG_IS_SET(i,flag) ((GST_VIDEO_INFO_FLAGS(i) & (flag)) == (flag))
-#define GST_VIDEO_INFO_FLAG_SET(i,flag)    (GST_VIDEO_INFO_FLAGS(i) |= (flag))
-#define GST_VIDEO_INFO_FLAG_UNSET(i,flag)  (GST_VIDEO_INFO_FLAGS(i) &= ~(flag))
-
-/* dealing with planes */
-#define GST_VIDEO_INFO_N_PLANES(i)       (GST_VIDEO_FORMAT_INFO_N_PLANES((i)->finfo))
-#define GST_VIDEO_INFO_PLANE_OFFSET(i,p) ((i)->offset[p])
-#define GST_VIDEO_INFO_PLANE_STRIDE(i,p) ((i)->stride[p])
-
-/* dealing with components */
-#define GST_VIDEO_INFO_N_COMPONENTS(i)   GST_VIDEO_FORMAT_INFO_N_COMPONENTS((i)->finfo)
-#define GST_VIDEO_INFO_COMP_DEPTH(i,c)   GST_VIDEO_FORMAT_INFO_DEPTH((i)->finfo,(c))
-#define GST_VIDEO_INFO_COMP_DATA(i,d,c)  GST_VIDEO_FORMAT_INFO_DATA((i)->finfo,d,(c))
-#define GST_VIDEO_INFO_COMP_OFFSET(i,c)  GST_VIDEO_FORMAT_INFO_OFFSET((i)->finfo,(i)->offset,(c))
-#define GST_VIDEO_INFO_COMP_STRIDE(i,c)  GST_VIDEO_FORMAT_INFO_STRIDE((i)->finfo,(i)->stride,(c))
-#define GST_VIDEO_INFO_COMP_WIDTH(i,c)   GST_VIDEO_FORMAT_INFO_SCALE_WIDTH((i)->finfo,(c),(i)->width)
-#define GST_VIDEO_INFO_COMP_HEIGHT(i,c)  GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT((i)->finfo,(c),(i)->height)
-#define GST_VIDEO_INFO_COMP_PLANE(i,c)   GST_VIDEO_FORMAT_INFO_PLANE((i)->finfo,(c))
-#define GST_VIDEO_INFO_COMP_PSTRIDE(i,c) GST_VIDEO_FORMAT_INFO_PSTRIDE((i)->finfo,(c))
-#define GST_VIDEO_INFO_COMP_POFFSET(i,c) GST_VIDEO_FORMAT_INFO_POFFSET((i)->finfo,(c))
-
-void         gst_video_info_init        (GstVideoInfo *info);
-
-void         gst_video_info_set_format  (GstVideoInfo *info, GstVideoFormat format,
-                                         guint width, guint height);
-
-gboolean     gst_video_info_from_caps   (GstVideoInfo *info, const GstCaps  * caps);
-
-GstCaps *    gst_video_info_to_caps     (GstVideoInfo *info);
-
-gboolean     gst_video_info_convert     (GstVideoInfo *info,
-                                         GstFormat     src_format,
-                                         gint64        src_value,
-                                         GstFormat     dest_format,
-                                         gint64       *dest_value);
-gboolean     gst_video_info_is_equal    (const GstVideoInfo *info,
-					 const GstVideoInfo *other);
-
-#include <gst/video/video.h>
-
-void         gst_video_info_align       (GstVideoInfo * info, GstVideoAlignment * align);
-
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_INFO_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-overlay-composition.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-overlay-composition.h
deleted file mode 100644
index d2f62d03..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video-overlay-composition.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* GStreamer Video Overlay Composition
- * Copyright (C) 2011 Intel Corporation
- * Copyright (C) 2011 Collabora Ltd.
- * Copyright (C) 2011 Tim-Philipp Müller <tim centricular net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_OVERLAY_COMPOSITION_H__
-#define __GST_VIDEO_OVERLAY_COMPOSITION_H__
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstVideoOverlayRectangle:
- *
- * An opaque video overlay rectangle object. A rectangle contains a single
- * overlay rectangle which can be added to a composition.
- */
-#define GST_TYPE_VIDEO_OVERLAY_RECTANGLE			\
-  (gst_video_overlay_rectangle_get_type ())
-#define GST_VIDEO_OVERLAY_RECTANGLE_CAST(obj)			\
-  ((GstVideoOverlayRectangle *)(obj)
-#define GST_VIDEO_OVERLAY_RECTANGLE(obj)			\
-  (GST_VIDEO_OVERLAY_RECTANGLE_CAST(obj))
-#define GST_IS_VIDEO_OVERLAY_RECTANGLE(obj)			\
-  (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_VIDEO_OVERLAY_RECTANGLE))
-
-typedef struct _GstVideoOverlayRectangle      GstVideoOverlayRectangle;
-
-/**
- * gst_video_overlay_rectangle_ref:
- * @comp: a a #GstVideoOverlayRectangle.
- *
- * Increases the refcount of the given rectangle by one.
- *
- * Note that the refcount affects the writeability
- * of @comp, use gst_video_overlay_rectangle_copy() to ensure a rectangle can
- * be modified (there is no gst_video_overlay_rectangle_make_writable() because
- * it is unlikely that someone will hold the single reference to the rectangle
- * and not know that that's the case).
- *
- * Returns: (transfer full): @comp
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstVideoOverlayRectangle *
-gst_video_overlay_rectangle_ref (GstVideoOverlayRectangle * comp);
-#endif
-
-static inline GstVideoOverlayRectangle *
-gst_video_overlay_rectangle_ref (GstVideoOverlayRectangle * comp)
-{
-  return (GstVideoOverlayRectangle *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (comp));
-}
-
-/**
- * gst_video_overlay_rectangle_unref:
- * @comp: (transfer full): a #GstVideoOverlayRectangle.
- *
- * Decreases the refcount of the rectangle. If the refcount reaches 0, the
- * rectangle will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void
-gst_video_overlay_rectangle_unref (GstVideoOverlayRectangle * comp);
-#endif
-
-static inline void
-gst_video_overlay_rectangle_unref (GstVideoOverlayRectangle * comp)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (comp));
-}
-
-/**
- * GstVideoOverlayFormatFlags:
- * @GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE: no flags
- * @GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA: RGB are premultiplied by A/255.
- * @GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA: a global-alpha value != 1 is set.
- *
- * Overlay format flags.
- */
-typedef enum {
-  GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE = 0,
-  GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA = 1,
-  GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA = 2
-} GstVideoOverlayFormatFlags;
-
-/**
-  * GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_RGB:
-  *
-  * Supported RGB overlay video format.
-  */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_RGB      GST_VIDEO_FORMAT_BGRA
-#else
-#define GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_RGB      GST_VIDEO_FORMAT_ARGB
-#endif
-
-/**
-  * GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_YUV:
-  *
-  * Supported YUV overlay video format.
-  */
-#define GST_VIDEO_OVERLAY_COMPOSITION_FORMAT_YUV      GST_VIDEO_FORMAT_AYUV
-
-GType                        gst_video_overlay_rectangle_get_type (void);
-
-GstVideoOverlayRectangle *   gst_video_overlay_rectangle_new_raw  (GstBuffer * pixels,
-                                                                   gint render_x, gint render_y,
-                                                                   guint render_width, guint render_height,
-                                                                   GstVideoOverlayFormatFlags flags);
-
-GstVideoOverlayRectangle *   gst_video_overlay_rectangle_copy     (GstVideoOverlayRectangle * rectangle);
-
-guint                        gst_video_overlay_rectangle_get_seqnum (GstVideoOverlayRectangle  * rectangle);
-
-void                         gst_video_overlay_rectangle_set_render_rectangle     (GstVideoOverlayRectangle  * rectangle,
-                                                                                   gint                        render_x,
-                                                                                   gint                        render_y,
-                                                                                   guint                       render_width,
-                                                                                   guint                       render_height);
-
-gboolean                     gst_video_overlay_rectangle_get_render_rectangle     (GstVideoOverlayRectangle  * rectangle,
-                                                                                   gint                      * render_x,
-                                                                                   gint                      * render_y,
-                                                                                   guint                     * render_width,
-                                                                                   guint                     * render_height);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_raw           (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_argb          (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_ayuv          (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_unscaled_raw  (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_unscaled_argb (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstBuffer *                  gst_video_overlay_rectangle_get_pixels_unscaled_ayuv (GstVideoOverlayRectangle  * rectangle,
-                                                                                   GstVideoOverlayFormatFlags  flags);
-
-GstVideoOverlayFormatFlags   gst_video_overlay_rectangle_get_flags                (GstVideoOverlayRectangle  * rectangle);
-
-gfloat                       gst_video_overlay_rectangle_get_global_alpha         (GstVideoOverlayRectangle  * rectangle);
-void                         gst_video_overlay_rectangle_set_global_alpha         (GstVideoOverlayRectangle  * rectangle,
-                                                                                   gfloat                      global_alpha);
-
-/**
- * GstVideoOverlayComposition:
- *
- * An opaque video overlay composition object. A composition contains
- * multiple overlay rectangles.
- */
-#define GST_TYPE_VIDEO_OVERLAY_COMPOSITION			\
-  (gst_video_overlay_composition_get_type ())
-#define GST_VIDEO_OVERLAY_COMPOSITION_CAST(obj)			\
-  ((GstVideoOverlayComposition *)(obj)
-#define GST_VIDEO_OVERLAY_COMPOSITION(obj)			\
-  (GST_VIDEO_OVERLAY_COMPOSITION_CAST(obj))
-#define GST_IS_VIDEO_OVERLAY_COMPOSITION(obj)			\
-  (GST_IS_MINI_OBJECT_TYPE(obj, GST_TYPE_VIDEO_OVERLAY_COMPOSITION))
-
-typedef struct _GstVideoOverlayComposition      GstVideoOverlayComposition;
-
-/**
- * gst_video_overlay_composition_ref:
- * @comp: a a #GstVideoOverlayComposition.
- *
- * Increases the refcount of the given composition by one.
- *
- * Note that the refcount affects the writeability
- * of @comp, use gst_video_overlay_composition_make_writable() to ensure
- * a composition and its rectangles can be modified.
- *
- * Returns: (transfer full): @comp
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC GstVideoOverlayComposition *
-gst_video_overlay_composition_ref (GstVideoOverlayComposition * comp);
-#endif
-
-static inline GstVideoOverlayComposition *
-gst_video_overlay_composition_ref (GstVideoOverlayComposition * comp)
-{
-  return (GstVideoOverlayComposition *) gst_mini_object_ref (GST_MINI_OBJECT_CAST (comp));
-}
-
-/**
- * gst_video_overlay_composition_unref:
- * @comp: (transfer full): a #GstVideoOverlayComposition.
- *
- * Decreases the refcount of the composition. If the refcount reaches 0, the
- * composition will be freed.
- */
-#ifdef _FOOL_GTK_DOC_
-G_INLINE_FUNC void
-gst_video_overlay_composition_unref (GstVideoOverlayComposition * comp);
-#endif
-
-static inline void
-gst_video_overlay_composition_unref (GstVideoOverlayComposition * comp)
-{
-  gst_mini_object_unref (GST_MINI_OBJECT_CAST (comp));
-}
-
-GType                        gst_video_overlay_composition_get_type (void);
-
-GstVideoOverlayComposition * gst_video_overlay_composition_copy          (GstVideoOverlayComposition * comp);
-
-GstVideoOverlayComposition * gst_video_overlay_composition_make_writable (GstVideoOverlayComposition * comp);
-
-GstVideoOverlayComposition * gst_video_overlay_composition_new           (GstVideoOverlayRectangle * rectangle);
-
-void                         gst_video_overlay_composition_add_rectangle (GstVideoOverlayComposition * comp,
-                                                                          GstVideoOverlayRectangle   * rectangle);
-
-guint                        gst_video_overlay_composition_n_rectangles  (GstVideoOverlayComposition * comp);
-
-GstVideoOverlayRectangle *   gst_video_overlay_composition_get_rectangle (GstVideoOverlayComposition * comp, guint n);
-
-guint                        gst_video_overlay_composition_get_seqnum    (GstVideoOverlayComposition * comp);
-
-/* blend composition onto raw video buffer */
-
-gboolean                     gst_video_overlay_composition_blend         (GstVideoOverlayComposition * comp,
-                                                                          GstVideoFrame              * video_buf);
-
-/* attach/retrieve composition from buffers */
-
-#define GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE \
-    (gst_video_overlay_composition_meta_api_get_type())
-#define GST_VIDEO_OVERLAY_COMPOSITION_META_INFO \
-    (gst_video_overlay_composition_meta_get_info())
-
-typedef struct _GstVideoOverlayCompositionMeta GstVideoOverlayCompositionMeta;
-
-/**
- * GstVideoOverlayCompositionMeta:
- * @meta: parent #GstMeta
- * @overlay: the attached #GstVideoOverlayComposition
- *
- * Extra buffer metadata describing image overlay data.
- */
-struct _GstVideoOverlayCompositionMeta
-{
-  GstMeta meta;
-
-  GstVideoOverlayComposition *overlay;
-};
-
-GType gst_video_overlay_composition_meta_api_get_type (void);
-const GstMetaInfo *gst_video_overlay_composition_meta_get_info (void);
-
-GstVideoOverlayCompositionMeta * gst_buffer_add_video_overlay_composition_meta (GstBuffer                  * buf,
-                                                                                GstVideoOverlayComposition * comp);
-
-#define gst_buffer_get_video_overlay_composition_meta(b) \
-  ((GstVideoOverlayCompositionMeta*)gst_buffer_get_meta((b),GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE))
-#define gst_buffer_remove_video_overlay_composition_meta(b,m) \
-  gst_buffer_remove_meta((b),((GstMeta *) m))
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_OVERLAY_COMPOSITION_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video.h
deleted file mode 100644
index cafa58c6..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/video.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GStreamer
- * Copyright (C) <2011> Wim Taymans <wim.taymans@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_H__
-#define __GST_VIDEO_H__
-
-#include <gst/gst.h>
-
-typedef struct _GstVideoAlignment GstVideoAlignment;
-
-#include <gst/video/video-event.h>
-#include <gst/video/video-format.h>
-#include <gst/video/video-color.h>
-#include <gst/video/video-info.h>
-#include <gst/video/video-frame.h>
-#include <gst/video/video-enumtypes.h>
-
-G_BEGIN_DECLS
-
-/**
- * GstVideoAlignment:
- * @padding_left: extra pixels on the left side
- * @padding_right: extra pixels on the right side
- * @padding_top: extra pixels on the top
- * @padding_bottom: extra pixels on the bottom
- * @stride_align: array with extra alignment requirements for the strides
- *
- * Extra alignment paramters for the memory of video buffers. This
- * structure is usually used to configure the bufferpool if it supports the
- * #GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT.
- */
-struct _GstVideoAlignment
-{
-  guint padding_top;
-  guint padding_bottom;
-  guint padding_left;
-  guint padding_right;
-  guint stride_align[GST_VIDEO_MAX_PLANES];
-};
-
-void           gst_video_alignment_reset         (GstVideoAlignment *align);
-
-
-/* some helper functions */
-gboolean       gst_video_calculate_display_ratio (guint * dar_n,
-                                                  guint * dar_d,
-                                                  guint   video_width,
-                                                  guint   video_height,
-                                                  guint   video_par_n,
-                                                  guint   video_par_d,
-                                                  guint   display_par_n,
-                                                  guint   display_par_d);
-
-/* convert/encode video sample from one format to another */
-
-typedef void (*GstVideoConvertSampleCallback) (GstSample * sample, GError *error, gpointer user_data);
-
-void          gst_video_convert_sample_async (GstSample                    * sample,
-                                              const GstCaps                * to_caps,
-                                              GstClockTime                   timeout,
-                                              GstVideoConvertSampleCallback  callback,
-                                              gpointer                       user_data,
-                                              GDestroyNotify                 destroy_notify);
-
-GstSample *   gst_video_convert_sample       (GstSample     * sample,
-                                              const GstCaps * to_caps,
-                                              GstClockTime    timeout,
-                                              GError       ** error);
-G_END_DECLS
-
-#endif /* __GST_VIDEO_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videocontext.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videocontext.h
deleted file mode 100644
index 98d4b542..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videocontext.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* GStreamer
- *
- * Copyright (C) 2011 Intel
- * Copyright (C) 2011 Collabora Ltd.
- *   Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
- *
- * video-context.h: Video Context interface and helpers
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_CONTEXT_H__
-#define __GST_VIDEO_CONTEXT_H__
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "The GstVideoContext interface is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_CONTEXT              (gst_video_context_iface_get_type ())
-#define GST_VIDEO_CONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_CONTEXT, GstVideoContext))
-#define GST_IS_VIDEO_CONTEXT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_CONTEXT))
-#define GST_VIDEO_CONTEXT_GET_IFACE(inst)   (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_CONTEXT, GstVideoContextInterface))
-
-/**
- * GstVideoContext:
- *
- * Opaque #GstVideoContext data structure.
- */
-typedef struct _GstVideoContext GstVideoContext;
-typedef struct _GstVideoContextInterface GstVideoContextInterface;
-
-/**
- * GstVideoContextInterface:
- * @parent: parent interface type.
- * @set_context: vmethod to set video context.
- *
- * #GstVideoContextInterface interface.
- */
-struct _GstVideoContextInterface
-{
-  GTypeInterface parent;
-
-  /* virtual functions */
-  void (*set_context) (GstVideoContext * context,
-                       const gchar * type,
-                       const GValue * value);
-
-};
-
-GType    gst_video_context_iface_get_type (void);
-
-/* virtual class method and associated helpers */
-void     gst_video_context_set_context           (GstVideoContext * context,
-                                                  const gchar * type,
-                                                  const GValue * value);
-void     gst_video_context_set_context_string    (GstVideoContext * context,
-                                                  const gchar * type,
-                                                  const gchar * value);
-void     gst_video_context_set_context_pointer   (GstVideoContext * context,
-                                                  const gchar * type,
-                                                  gpointer value);
-void     gst_video_context_set_context_object    (GstVideoContext * context,
-                                                  const gchar * type,
-                                                  GObject * value);
-
-
-/* message helpers */
-void      gst_video_context_prepare                (GstVideoContext *context,
-                                                    const gchar ** types);
-
-gboolean  gst_video_context_message_parse_prepare  (GstMessage * message,
-                                                    const gchar *** types,
-                                                    GstVideoContext ** ctx);
-
-/* query helpers */
-GstQuery     * gst_video_context_query_new                    (const gchar ** types);
-gboolean       gst_video_context_run_query                    (GstElement *element,
-                                                               GstQuery *query);
-const gchar ** gst_video_context_query_get_supported_types    (GstQuery * query);
-void           gst_video_context_query_parse_value            (GstQuery * query,
-                                                               const gchar ** type,
-                                                               const GValue ** value);
-void           gst_video_context_query_set_value              (GstQuery * query,
-                                                               const gchar * type,
-                                                               GValue * value);
-void           gst_video_context_query_set_string             (GstQuery * query,
-                                                               const gchar * type,
-                                                               const gchar * value);
-void           gst_video_context_query_set_pointer            (GstQuery * query,
-                                                               const gchar * type,
-                                                               gpointer value);
-void           gst_video_context_query_set_object             (GstQuery * query,
-                                                               const gchar * type,
-                                                               GObject * value);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_CONTEXT_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videoorientation.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videoorientation.h
deleted file mode 100644
index c7407b71..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videoorientation.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* GStreamer
- * Copyright (C) 2006 Nokia <stefan.kost@nokia.com
- *
- * videoorientation.h: video flipping and centering interface
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_ORIENTATION_H__
-#define __GST_VIDEO_ORIENTATION_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_ORIENTATION \
-  (gst_video_orientation_get_type ())
-#define GST_VIDEO_ORIENTATION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_ORIENTATION, GstVideoOrientation))
-#define GST_IS_VIDEO_ORIENTATION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_ORIENTATION))
-#define GST_VIDEO_ORIENTATION_GET_INTERFACE(inst) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_ORIENTATION, GstVideoOrientationInterface))
-
-/**
- * GstVideoOrientation:
- *
- * Opaque #GstVideoOrientation data structure.
- */
-typedef struct _GstVideoOrientation GstVideoOrientation;
-typedef struct _GstVideoOrientationInterface GstVideoOrientationInterface;
-
-/**
- * GstVideoOrientationInterface:
- * @iface: parent interface type.
- * @get_hflip: virtual method to get horizontal flipping state
- * @get_vflip: virtual method to get vertical flipping state
- * @get_hcenter: virtual method to get horizontal centering state
- * @get_vcenter: virtual method to get vertical centering state
- * @set_hflip: virtual method to set horizontal flipping state
- * @set_vflip: virtual method to set vertical flipping state
- * @set_hcenter: virtual method to set horizontal centering state
- * @set_vcenter: virtual method to set vertical centering state
- *
- * #GstVideoOrientationInterface interface.
- */
-struct _GstVideoOrientationInterface {
-  GTypeInterface iface;
-
-  /* FIXME 0.11: fix awkward API? add some kind of get_supported flags thing
-   * and then just return booleans/int from all vfuncs requiring the caller
-   * to check the flags first */
-
-  /* virtual functions */
-  gboolean (* get_hflip)   (GstVideoOrientation *video_orientation, gboolean *flip);
-  gboolean (* get_vflip)   (GstVideoOrientation *video_orientation, gboolean *flip);
-  gboolean (* get_hcenter) (GstVideoOrientation *video_orientation, gint *center);
-  gboolean (* get_vcenter) (GstVideoOrientation *video_orientation, gint *center);
-
-  gboolean (* set_hflip)   (GstVideoOrientation *video_orientation, gboolean flip);
-  gboolean (* set_vflip)   (GstVideoOrientation *video_orientation, gboolean flip);
-  gboolean (* set_hcenter) (GstVideoOrientation *video_orientation, gint center);
-  gboolean (* set_vcenter) (GstVideoOrientation *video_orientation, gint center);
-};
-
-GType           gst_video_orientation_get_type              (void);
-
-/* virtual class function wrappers */
-gboolean gst_video_orientation_get_hflip (GstVideoOrientation *video_orientation, gboolean *flip);
-gboolean gst_video_orientation_get_vflip (GstVideoOrientation *video_orientation, gboolean *flip);
-gboolean gst_video_orientation_get_hcenter (GstVideoOrientation *video_orientation, gint *center);
-gboolean gst_video_orientation_get_vcenter (GstVideoOrientation *video_orientation, gint *center);
-
-gboolean gst_video_orientation_set_hflip (GstVideoOrientation *video_orientation, gboolean flip);
-gboolean gst_video_orientation_set_vflip (GstVideoOrientation *video_orientation, gboolean flip);
-gboolean gst_video_orientation_set_hcenter (GstVideoOrientation *video_orientation, gint center);
-gboolean gst_video_orientation_set_vcenter (GstVideoOrientation *video_orientation, gint center);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_ORIENTATION_H__ */
diff --git a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videooverlay.h b/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videooverlay.h
deleted file mode 100644
index 2c01c5d6..00000000
--- a/GstreamerHelper/x86/include/gstreamer-1.0/gst/video/videooverlay.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* GStreamer Video Overlay Interface
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2003 Julien Moutte <julien@moutte.net>
- * Copyright (C) 2011 Tim-Philipp Müller <tim@centricular.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_VIDEO_OVERLAY_H__
-#define __GST_VIDEO_OVERLAY_H__
-
-#include <gst/gst.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_OVERLAY \
-    (gst_video_overlay_get_type ())
-#define GST_VIDEO_OVERLAY(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_OVERLAY, GstVideoOverlay))
-#define GST_IS_VIDEO_OVERLAY(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_OVERLAY))
-#define GST_VIDEO_OVERLAY_GET_INTERFACE(inst) \
-    (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_VIDEO_OVERLAY, GstVideoOverlayInterface))
-
-/**
- * GstVideoOverlay:
- *
- * Opaque #GstVideoOverlay interface structure
- */
-typedef struct _GstVideoOverlay GstVideoOverlay;
-typedef struct _GstVideoOverlayInterface GstVideoOverlayInterface;
-
-/**
- * GstVideoOverlayInterface:
- * @iface: parent interface type.
- * @expose: virtual method to handle expose events
- * @handle_events: virtual method to handle events
- * @set_render_rectangle: virtual method to set the render rectangle
- * @set_window_handle: virtual method to configure the window handle
- *
- * #GstVideoOverlay interface
- */
-struct _GstVideoOverlayInterface {
-  GTypeInterface iface;
-
-  /* virtual functions */
-  void (*expose)               (GstVideoOverlay *overlay);
-
-  void (*handle_events)        (GstVideoOverlay *overlay, gboolean handle_events);
-
-  void (*set_render_rectangle) (GstVideoOverlay *overlay,
-                                gint x, gint y,
-                                gint width, gint height);
-
-  void (*set_window_handle)    (GstVideoOverlay *overlay, guintptr handle);
-};
-
-GType   gst_video_overlay_get_type (void);
-
-/* virtual function wrappers */
-
-gboolean        gst_video_overlay_set_render_rectangle  (GstVideoOverlay * overlay,
-                                                         gint              x,
-                                                         gint              y,
-                                                         gint              width,
-                                                         gint              height);
-
-void            gst_video_overlay_expose                (GstVideoOverlay * overlay);
-
-void            gst_video_overlay_handle_events         (GstVideoOverlay * overlay,
-                                                         gboolean          handle_events);
-
-void            gst_video_overlay_set_window_handle     (GstVideoOverlay * overlay,
-                                                         guintptr handle);
-
-/* public methods to dispatch bus messages */
-void            gst_video_overlay_got_window_handle     (GstVideoOverlay * overlay,
-                                                         guintptr          handle);
-
-void            gst_video_overlay_prepare_window_handle (GstVideoOverlay * overlay);
-
-gboolean        gst_is_video_overlay_prepare_window_handle_message (GstMessage * msg);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEO_OVERLAY_H__ */
diff --git a/GstreamerHelper/x86/lib/glib-2.0.lib b/GstreamerHelper/x86/lib/glib-2.0.lib
deleted file mode 100644
index 0e7b43cf..00000000
Binary files a/GstreamerHelper/x86/lib/glib-2.0.lib and /dev/null differ
diff --git a/GstreamerHelper/x86/lib/glib-2.0/include/glibconfig.h b/GstreamerHelper/x86/lib/glib-2.0/include/glibconfig.h
deleted file mode 100644
index 4d169fb2..00000000
--- a/GstreamerHelper/x86/lib/glib-2.0/include/glibconfig.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/* glibconfig.h.win32.in. Originally merged from two versions of
- * glibconfig.h, generated by the GLib configure script, for gcc and
- * MSVC.
- */
-
-/* glibconfig.h
- *
- * This is a generated file.  Please modify 'glibconfig.h.win32.in'
- */
-
-#ifndef __G_LIBCONFIG_H__
-#define __G_LIBCONFIG_H__
-
-#include <glib/gmacros.h>
-
-#include <limits.h>
-#include <float.h>
-
-G_BEGIN_DECLS
-
-#define G_MINFLOAT	FLT_MIN
-#define G_MAXFLOAT	FLT_MAX
-#define G_MINDOUBLE	DBL_MIN
-#define G_MAXDOUBLE	DBL_MAX
-#define G_MINSHORT	SHRT_MIN
-#define G_MAXSHORT	SHRT_MAX
-#define G_MAXUSHORT	USHRT_MAX
-#define G_MININT	INT_MIN
-#define G_MAXINT	INT_MAX
-#define G_MAXUINT	UINT_MAX
-#define G_MINLONG	LONG_MIN
-#define G_MAXLONG	LONG_MAX
-#define G_MAXULONG	ULONG_MAX
-
-typedef signed char gint8;
-typedef unsigned char guint8;
-typedef signed short gint16;
-typedef unsigned short guint16;
-#define G_GINT16_MODIFIER "h"
-#define G_GINT16_FORMAT "hi"
-#define G_GUINT16_FORMAT "hu"
-typedef signed int gint32;
-typedef unsigned int guint32;
-#define G_GINT32_MODIFIER ""
-#define G_GINT32_FORMAT "i"
-#define G_GUINT32_FORMAT "u"
-#define G_HAVE_GINT64 1          /* deprecated, always true */
-
-#ifndef _MSC_VER
-G_GNUC_EXTENSION typedef signed long long gint64;
-G_GNUC_EXTENSION typedef unsigned long long guint64;
-#else /* _MSC_VER */
-typedef signed __int64 gint64;
-typedef unsigned __int64 guint64;
-#endif /* _MSC_VER */
-
-#ifndef _MSC_VER
-#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
-#else /* _MSC_VER */
-#define G_GINT64_CONSTANT(val)	(val##i64)
-#endif /* _MSC_VER */
-#ifndef _MSC_VER
-#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
-#else /* _MSC_VER */
-#define G_GUINT64_CONSTANT(val)	(val##Ui64)
-#endif /* _MSC_VER */
-#define G_GINT64_MODIFIER "I64"
-#define G_GINT64_FORMAT "I64i"
-#define G_GUINT64_FORMAT "I64u"
-
-#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
-
-#define GLIB_SIZEOF_VOID_P 8
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 8
-
-typedef signed long long gssize;
-typedef unsigned long long gsize;
-#define G_GSIZE_MODIFIER "I64"
-#define G_GSSIZE_FORMAT "I64d"
-#define G_GSIZE_FORMAT "I64u"
-
-#define G_MAXSIZE	G_MAXUINT64
-#define G_MINSSIZE	G_MININT64
-#define G_MAXSSIZE	G_MAXINT64
-
-#else
-
-#define GLIB_SIZEOF_VOID_P 4
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 4
-
-typedef signed int gssize;
-typedef unsigned int gsize;
-#define G_GSIZE_MODIFIER ""
-#define G_GSSIZE_FORMAT "i"
-#define G_GSIZE_FORMAT "u"
-
-#define G_MAXSIZE	G_MAXUINT
-#define G_MINSSIZE	G_MININT
-#define G_MAXSSIZE	G_MAXINT
-
-#endif
-
-typedef gint64 goffset;
-#define G_MINOFFSET	G_MININT64
-#define G_MAXOFFSET	G_MAXINT64
-
-#define G_GOFFSET_MODIFIER      G_GINT64_MODIFIER
-#define G_GOFFSET_FORMAT        G_GINT64_FORMAT
-#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
-
-
-#ifndef _WIN64
-
-#define GPOINTER_TO_INT(p)	((gint)   (p))
-#define GPOINTER_TO_UINT(p)	((guint)  (p))
-
-#define GINT_TO_POINTER(i)	((gpointer)  (i))
-#define GUINT_TO_POINTER(u)	((gpointer)  (u))
-
-typedef signed int gintptr;
-typedef unsigned int guintptr;
-
-#define G_GINTPTR_MODIFIER      ""
-#define G_GINTPTR_FORMAT        "i"
-#define G_GUINTPTR_FORMAT       "u"
-
-#else
-
-#define GPOINTER_TO_INT(p)	((gint)  (gint64) (p))
-#define GPOINTER_TO_UINT(p)	((guint) (guint64) (p))
-
-#define GINT_TO_POINTER(i)	((gpointer) (gint64) (i))
-#define GUINT_TO_POINTER(u)	((gpointer) (guint64) (u))
-
-#ifndef _MSC_VER
-typedef signed long long gintptr;
-typedef unsigned long long guintptr;
-#else
-typedef signed __int64 gintptr;
-typedef unsigned __int64 guintptr;
-#endif
-
-#define G_GINTPTR_MODIFIER      "I64"
-#define G_GINTPTR_FORMAT        "I64i"
-#define G_GUINTPTR_FORMAT       "I64u"
-
-#endif
-
-#ifdef NeXT /* @#%@! NeXTStep */
-# define g_ATEXIT(proc)	(!atexit (proc))
-#else
-# define g_ATEXIT(proc)	(atexit (proc))
-#endif
-
-#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
-
-#define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 34
-#define GLIB_MICRO_VERSION 2
-
-#define G_OS_WIN32
-#define G_PLATFORM_WIN32
-
-
-#ifndef _MSC_VER
-#define G_VA_COPY	va_copy
-#endif /* not _MSC_VER */
-
-#ifdef	__cplusplus
-#define	G_HAVE_INLINE	1
-#else	/* !__cplusplus */
-#ifndef _MSC_VER
-#define G_HAVE_INLINE 1
-#endif /* _MSC_VER */
-#define G_HAVE___INLINE 1
-#if !defined(_MSC_VER) && !defined(__DMC__)
-#define G_HAVE___INLINE__ 1
-#endif /* !_MSC_VER and !__DMC__ */
-#endif	/* !__cplusplus */
-
-#define G_CAN_INLINE	1
-
-#ifndef _MSC_VER
-#define G_HAVE_ISO_VARARGS 1
-
-/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
- * is passed ISO vararg support is turned off, and there is no work
- * around to turn it on, so we unconditionally turn it off.
- */
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
-#  undef G_HAVE_ISO_VARARGS
-#endif
-
-#define G_HAVE_GNUC_VARARGS 1
-#else /* _MSC_VER */
-/* varargs macros available since msvc8 (vs2005) */
-#  if _MSC_VER >= 1400
-#    define G_HAVE_ISO_VARARGS 1
-#   endif
-#endif /* not _MSC_VER */
-#define G_HAVE_GROWING_STACK 0
-
-#define G_GNUC_INTERNAL
-
-#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_WIN32
-
-#define G_ATOMIC_LOCK_FREE
-
-#define GINT16_TO_LE(val)	((gint16) (val))
-#define GUINT16_TO_LE(val)	((guint16) (val))
-#define GINT16_TO_BE(val)	((gint16) GUINT16_SWAP_LE_BE (val))
-#define GUINT16_TO_BE(val)	(GUINT16_SWAP_LE_BE (val))
-#define GINT32_TO_LE(val)	((gint32) (val))
-#define GUINT32_TO_LE(val)	((guint32) (val))
-#define GINT32_TO_BE(val)	((gint32) GUINT32_SWAP_LE_BE (val))
-#define GUINT32_TO_BE(val)	(GUINT32_SWAP_LE_BE (val))
-#define GINT64_TO_LE(val)	((gint64) (val))
-#define GUINT64_TO_LE(val)	((guint64) (val))
-#define GINT64_TO_BE(val)	((gint64) GUINT64_SWAP_LE_BE (val))
-#define GUINT64_TO_BE(val)	(GUINT64_SWAP_LE_BE (val))
-#define GLONG_TO_LE(val)	((glong) GINT32_TO_LE (val))
-#define GULONG_TO_LE(val)	((gulong) GUINT32_TO_LE (val))
-#define GLONG_TO_BE(val)	((glong) GINT32_TO_BE (val))
-#define GULONG_TO_BE(val)	((gulong) GUINT32_TO_BE (val))
-#define GINT_TO_LE(val)		((gint) GINT32_TO_LE (val))
-#define GUINT_TO_LE(val)	((guint) GUINT32_TO_LE (val))
-#define GINT_TO_BE(val)		((gint) GINT32_TO_BE (val))
-#define GUINT_TO_BE(val)	((guint) GUINT32_TO_BE (val))
-#define GSIZE_TO_LE(val)	((gsize) GUINT32_TO_LE (val))
-#define GSSIZE_TO_LE(val)	((gssize) GINT32_TO_LE (val))
-#define GSIZE_TO_BE(val)	((gsize) GUINT32_TO_BE (val))
-#define GSSIZE_TO_BE(val)	((gssize) GINT32_TO_BE (val))
-#define G_BYTE_ORDER G_LITTLE_ENDIAN
-
-#define GLIB_SYSDEF_POLLIN =1
-#define GLIB_SYSDEF_POLLOUT =4
-#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLHUP =16
-#define GLIB_SYSDEF_POLLERR =8
-#define GLIB_SYSDEF_POLLNVAL =32
-
-#define G_MODULE_SUFFIX "dll"
-
-/* A GPid is an abstraction for a process "handle". It is *not* an
- * abstraction for a process identifier in general. GPid is used in
- * GLib only for descendant processes spawned with the g_spawn*
- * functions. On POSIX there is no "process handle" concept as such,
- * but on Windows a GPid is a handle to a process, a kind of pointer,
- * not a process identifier.
- */
-typedef void * GPid;
-
-#define GLIB_SYSDEF_AF_UNIX 1
-#define GLIB_SYSDEF_AF_INET 2
-#define GLIB_SYSDEF_AF_INET6 23
-
-#define GLIB_SYSDEF_MSG_OOB       1
-#define GLIB_SYSDEF_MSG_PEEK      2
-#define GLIB_SYSDEF_MSG_DONTROUTE 4
-
-G_END_DECLS
-
-#endif /* GLIBCONFIG_H */
diff --git a/GstreamerHelper/x86/lib/gobject-2.0.lib b/GstreamerHelper/x86/lib/gobject-2.0.lib
deleted file mode 100644
index 1c69913d..00000000
Binary files a/GstreamerHelper/x86/lib/gobject-2.0.lib and /dev/null differ
diff --git a/GstreamerHelper/x86/lib/gstapp-1.0.lib b/GstreamerHelper/x86/lib/gstapp-1.0.lib
deleted file mode 100644
index 2194e64d..00000000
Binary files a/GstreamerHelper/x86/lib/gstapp-1.0.lib and /dev/null differ
diff --git a/GstreamerHelper/x86/lib/gstcontroller-1.0.lib b/GstreamerHelper/x86/lib/gstcontroller-1.0.lib
deleted file mode 100644
index 5f17c134..00000000
Binary files a/GstreamerHelper/x86/lib/gstcontroller-1.0.lib and /dev/null differ
diff --git a/GstreamerHelper/x86/lib/gstreamer-1.0.lib b/GstreamerHelper/x86/lib/gstreamer-1.0.lib
deleted file mode 100644
index 431a3575..00000000
Binary files a/GstreamerHelper/x86/lib/gstreamer-1.0.lib and /dev/null differ
diff --git a/Output/AForge.Video.DirectShow.dll b/Output/AForge.Video.DirectShow.dll
index 2d14556a..e3f806f3 100644
Binary files a/Output/AForge.Video.DirectShow.dll and b/Output/AForge.Video.DirectShow.dll differ
diff --git a/Output/AForge.Video.dll b/Output/AForge.Video.dll
index 7ff735b4..dc67243e 100644
Binary files a/Output/AForge.Video.dll and b/Output/AForge.Video.dll differ
diff --git a/Output/LICENSE.txt b/Output/LICENSE.txt
index 20d40b6b..e587591e 100644
--- a/Output/LICENSE.txt
+++ b/Output/LICENSE.txt
@@ -618,57 +618,4 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
+                     END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/Output/Languages/Czech.xml b/Output/Languages/Czech.xml
index 918fe778..d4895f48 100644
--- a/Output/Languages/Czech.xml
+++ b/Output/Languages/Czech.xml
@@ -205,9 +205,9 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Pozadí obrazu</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Náhled obrazu</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Obrazové záznamy během přehrávání</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Zobrazit nynější obrazový záznam k hudbě na pozadí</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Kamery</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Schopnosti kamer</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Zobrazit nynější obrazový záznam k hudbě na pozadí</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Kamery</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Schopnosti kamer</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Přizpůsobení obrazovky</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Stiskněte Ctrl + Alt + Shift + šipky pro upravení obrazovky</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">Ctrl + Alt + Shift + 0 pro vrácení úprav zpět na výchozí hodnoty</string>
diff --git a/Output/Languages/Dutch.xml b/Output/Languages/Dutch.xml
index a50c8be9..8d959590 100644
--- a/Output/Languages/Dutch.xml
+++ b/Output/Languages/Dutch.xml
@@ -199,8 +199,8 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Videoachtergronden</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Videopreview</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Video tijdens zingen</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Toon huidige achtergrondmuziekvideo</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Webcams</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Webcaminstellingen</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Toon huidige achtergrondmuziekvideo</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webcaminstellingen</string>
   <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volume</string>
 </resources>
diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml
index ea889529..b7360541 100644
--- a/Output/Languages/English.xml
+++ b/Output/Languages/English.xml
@@ -205,9 +205,9 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video Backgrounds</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video Preview</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videos while singing</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Display current backgroundmusic video</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Webcams</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Webcamcapabilities</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Display current backgroundmusic video</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webcam-Resolution</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Screen adjustments</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Press CTR + ALT + SHIFT + Arrows to adjust screen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + SHIFT + 0 to reset</string>
diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml
index ceab4219..5873c73b 100644
--- a/Output/Languages/French.xml
+++ b/Output/Languages/French.xml
@@ -205,9 +205,9 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Vidéo en arrière plan</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Prévisualisation des Vidéos</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Vidéos pendant que l\'on chante</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Afficher la vidéo de la musique de fond</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Webcams</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Configuration Webcam</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Afficher la vidéo de la musique de fond</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Configuration Webcam</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Ajustements de l\'écran</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Appuyer sur CTR + ALT + SHIFT + Flèches pour ajuster l\'écran</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + SHIFT + 0 pour réinitialiser</string>
diff --git a/Output/Languages/German.xml b/Output/Languages/German.xml
index 3025f8e1..52859778 100644
--- a/Output/Languages/German.xml
+++ b/Output/Languages/German.xml
@@ -206,9 +206,9 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video-Hintergründe</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video-Vorschau</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videos während des Singens</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Videos der Hintergrundmusik</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Webcams</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Webcamfähigkeiten</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Videos der Hintergrundmusik</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webcams</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webcam-Auflösung</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Anzeigeanpassungen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">STRG + ALT + SHIFT + Pfeiltasten drücken um den Bildschirm anzupassen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">STRG + ALT + SHIFT + 0 um die Anpassungen zurückzusetzen</string>
diff --git a/Output/Languages/Hungarian.xml b/Output/Languages/Hungarian.xml
index 2be6681a..3756f68e 100644
--- a/Output/Languages/Hungarian.xml
+++ b/Output/Languages/Hungarian.xml
@@ -190,8 +190,8 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Animált Háttér</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Videó Előnézet</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videó Éneklés Közben</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Jelenlegi Háttérzene Videó Mutatása</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Webkamerák</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Webkamera Tulajdonságok</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Jelenlegi Háttérzene Videó Mutatása</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkamerák</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera Tulajdonságok</string>
   <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Hangerő</string>
 </resources>
diff --git a/Output/Languages/Spanish.xml b/Output/Languages/Spanish.xml
index 7e3b28c2..558e20bc 100644
--- a/Output/Languages/Spanish.xml
+++ b/Output/Languages/Spanish.xml
@@ -173,5 +173,5 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Videos de Fondo</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Previsualización del Video</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Videos al Cantar</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">TODO: Display current backgroundmusic video</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">TODO: Display current backgroundmusic video</string>
 </resources>
diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml
index 9d4068f9..aae0a1a7 100644
--- a/Output/Languages/Swedish.xml
+++ b/Output/Languages/Swedish.xml
@@ -205,9 +205,9 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video Bakgrund</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video Förhandsvisning</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Video Samtidigt Med LÃ¥t</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Visa nuvarande Video för Bakgrundsmusik</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Webkameror</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Webkamera Kapacitet</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Visa nuvarande Video för Bakgrundsmusik</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkameror</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera Kapacitet</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Skärmjusteringar</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTRL + ALT +SHIFT + Pilar för att justera skärmen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTRL + ALT + SHIFT + 0 för att återställa</string>
diff --git a/Output/Languages/Turkish.xml b/Output/Languages/Turkish.xml
index 6268cd7f..dff41110 100644
--- a/Output/Languages/Turkish.xml
+++ b/Output/Languages/Turkish.xml
@@ -190,8 +190,8 @@
   <string name="TR_SCREENOVIDEO_VIDEOBACKGROUNDS">Video Arka Planları</string>
   <string name="TR_SCREENOVIDEO_VIDEOPREVIEW">Video Önizleme</string>
   <string name="TR_SCREENOVIDEO_VIDEOINSONGS">Şarkı Söylerken Videoları Gösterme</string>
-  <string name="TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND">Mevcut Arka Plan Müziği Videosunu Göster</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMDEVICES">Web Kameraları</string>
-  <string name="TR_SCREENO_VIDEO_WEBCAMCAPABILITIES">Web Kameraları Özellikleri</string>
+  <string name="TR_SCREENOVIDEO_VIDEOSTOBACKGROUND">Mevcut Arka Plan Müziği Videosunu Göster</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Web Kameraları</string>
+  <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Web Kameraları Özellikleri</string>
   <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Ses</string>
 </resources>
diff --git a/Output/Licenses/AForge/License.txt b/Output/Licenses/AForge/License.txt
new file mode 100644
index 00000000..39482789
--- /dev/null
+++ b/Output/Licenses/AForge/License.txt
@@ -0,0 +1,18 @@
+AForge.NET Framework
+http://www.aforgenet.com/framework
+==================================
+
+License agreement
+
+Due to some external dependencies, the framework does not have a common
+single license. The AForge.Video.FFMPEG component is GPL v3 licensed, because
+it depends on the GPL build of the FFMPEG library. The rest of the framework
+is LGPL v3 licensed.
+
+Both licenses can be found in the gpl-3.0.txt and lgpl-3.0.txt files, or
+the next web pages:
+http://www.gnu.org/licenses/gpl.html
+http://www.gnu.org/licenses/lgpl.html
+
+Copyright © AForge.NET, 2006-2013
+contacts@aforgenet.com
\ No newline at end of file
diff --git a/Output/Licenses/AForge/SourceAndVersion.txt b/Output/Licenses/AForge/SourceAndVersion.txt
new file mode 100644
index 00000000..24332f3d
--- /dev/null
+++ b/Output/Licenses/AForge/SourceAndVersion.txt
@@ -0,0 +1,7 @@
+http://code.google.com/p/aforge
+
+Version: 2.2.5
+
+Files:
+AForge.Video.dll
+AForge.Video.DirectShow.dll
\ No newline at end of file
diff --git a/Output/Licenses/AForge/gpl-3.0.txt b/Output/Licenses/AForge/gpl-3.0.txt
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/Output/Licenses/AForge/gpl-3.0.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Output/Licenses/AForge/lgpl-3.0.txt b/Output/Licenses/AForge/lgpl-3.0.txt
new file mode 100644
index 00000000..5e5be416
--- /dev/null
+++ b/Output/Licenses/AForge/lgpl-3.0.txt
@@ -0,0 +1,166 @@
+           GNU LESSER GENERAL PUBLIC LICENSE
+                Version 3, 29 June 2007
+ 
+ 
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/Output/LICENSE Newtonsoft.Json.txt b/Output/Licenses/Newtonsoft.Json/LICENSE.txt
similarity index 100%
rename from Output/LICENSE Newtonsoft.Json.txt
rename to Output/Licenses/Newtonsoft.Json/LICENSE.txt
diff --git a/Output/Licenses/Newtonsoft.Json/SourceAndVersion.txt b/Output/Licenses/Newtonsoft.Json/SourceAndVersion.txt
new file mode 100644
index 00000000..a61fd5b6
--- /dev/null
+++ b/Output/Licenses/Newtonsoft.Json/SourceAndVersion.txt
@@ -0,0 +1,6 @@
+http://json.codeplex.com/
+
+Version: Json.NET 6.0 Release 1 (.Net 4.0)
+
+Files:
+Newtonsoft.Json.dll
\ No newline at end of file
diff --git a/Output/Licenses/PortAudio-Sharp/SourceAndVersion.txt b/Output/Licenses/PortAudio-Sharp/SourceAndVersion.txt
new file mode 100644
index 00000000..d9759e5b
--- /dev/null
+++ b/Output/Licenses/PortAudio-Sharp/SourceAndVersion.txt
@@ -0,0 +1,7 @@
+https://code.google.com/p/portaudiosharp/
+
+Version: rev44 (Feb 26, 2012)
+
+Files:
+PortAudioSharp.dll
+PortAudioSharp.dll.config
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Portaudio/copyright.txt b/Output/Licenses/PortAudio-Sharp/copyright.txt
similarity index 100%
rename from Vocaluxe/Lib/Sound/Portaudio/copyright.txt
rename to Output/Licenses/PortAudio-Sharp/copyright.txt
diff --git a/Vocaluxe/Lib/Sound/Portaudio/license.txt b/Output/Licenses/PortAudio-Sharp/license.txt
similarity index 100%
rename from Vocaluxe/Lib/Sound/Portaudio/license.txt
rename to Output/Licenses/PortAudio-Sharp/license.txt
diff --git a/Vocaluxe/Lib/Sound/Portaudio/readme.txt b/Output/Licenses/PortAudio-Sharp/readme.txt
similarity index 100%
rename from Vocaluxe/Lib/Sound/Portaudio/readme.txt
rename to Output/Licenses/PortAudio-Sharp/readme.txt
diff --git a/Output/Licenses/PortAudio/LICENSE.txt b/Output/Licenses/PortAudio/LICENSE.txt
new file mode 100644
index 00000000..e0ac4e8a
--- /dev/null
+++ b/Output/Licenses/PortAudio/LICENSE.txt
@@ -0,0 +1,81 @@
+Portable header file to contain:
+>>>>>
+/*
+ * PortAudio Portable Real-Time Audio Library
+ * PortAudio API Header File
+ * Latest version available at: http://www.portaudio.com
+ *
+ * Copyright (c) 1999-2006 Ross Bencina and Phil Burk
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+<<<<<
+ 
+
+Implementation files to contain:
+>>>>>
+/*
+ * PortAudio Portable Real-Time Audio Library
+ * Latest version at: http://www.portaudio.com
+ * <platform> Implementation
+ * Copyright (c) 1999-2000 <author(s)>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+<<<<<
\ No newline at end of file
diff --git a/Output/Licenses/PortAudio/README.txt b/Output/Licenses/PortAudio/README.txt
new file mode 100644
index 00000000..21138278
--- /dev/null
+++ b/Output/Licenses/PortAudio/README.txt
@@ -0,0 +1,98 @@
+README for PortAudio
+
+/*
+ * PortAudio Portable Real-Time Audio Library
+ * Latest Version at: http://www.portaudio.com
+ *
+ * Copyright (c) 1999-2008 Phil Burk and Ross Bencina
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however, 
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also 
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
+
+
+PortAudio is a portable audio I/O library designed for cross-platform
+support of audio. It uses either a callback mechanism to request audio 
+processing, or blocking read/write calls to buffer data between the 
+native audio subsystem and the client. Audio can be processed in various 
+formats, including 32 bit floating point, and will be converted to the 
+native format internally.
+
+Documentation:
+	Documentation is available in "/doc/html/index.html"
+	Also see "src/common/portaudio.h" for API spec.
+	Also see http://www.portaudio.com/docs/
+	And see the "test/" directory for many examples of usage
+		(we suggest "test/patest_saw.c" for an example)
+
+For information on compiling programs with PortAudio, please see the
+tutorial at:
+
+  http://portaudio.com/trac/wiki/TutorialDir/TutorialStart
+  
+We have an active mailing list for user and developer discussions.
+Please feel free to join. See http://www.portaudio.com for details.
+
+
+Important Files and Folders:
+    include/portaudio.h     = header file for PortAudio API. Specifies API.	
+    src/common/             = platform independant code, host independant 
+                              code for all implementations.
+    src/os                  = os specific (but host api neutral) code
+    src/hostapi             = implementations for different host apis
+
+
+Host API Implementations:
+    src/hostapi/alsa        = Advanced Linux Sound Architecture (ALSA)
+    src/hostapi/asihpi      = AudioScience HPI
+    src/hostapi/asio        = ASIO for Windows and Macintosh
+    src/hostapi/coreaudio   = Macintosh Core Audio for OS X
+    src/hostapi/dsound      = Windows Direct Sound
+    src/hostapi/jack        = JACK Audio Connection Kit
+    src/hostapi/oss         = Unix Open Sound System (OSS)
+    src/hostapi/wasapi      = Windows Vista WASAPI
+    src/hostapi/wdmks       = Windows WDM Kernel Streaming
+    src/hostapi/wmme        = Windows MultiMedia Extensions (MME)
+
+
+Test Programs:
+    test/pa_fuzz.c         = guitar fuzz box
+    test/pa_devs.c         = print a list of available devices
+    test/pa_minlat.c       = determine minimum latency for your machine
+    test/paqa_devs.c       = self test that opens all devices
+    test/paqa_errs.c       = test error detection and reporting
+    test/patest_clip.c     = hear a sine wave clipped and unclipped
+    test/patest_dither.c   = hear effects of dithering (extremely subtle)
+    test/patest_pink.c     = fun with pink noise
+    test/patest_record.c   = record and playback some audio
+    test/patest_maxsines.c = how many sine waves can we play? Tests Pa_GetCPULoad().
+    test/patest_sine.c     = output a sine wave in a simple PA app
+    test/patest_sync.c     = test syncronization of audio and video
+    test/patest_wire.c     = pass input to output, wire simulator
diff --git a/Output/Licenses/PortAudio/SourceAndVersion.txt b/Output/Licenses/PortAudio/SourceAndVersion.txt
new file mode 100644
index 00000000..0042f210
--- /dev/null
+++ b/Output/Licenses/PortAudio/SourceAndVersion.txt
@@ -0,0 +1,7 @@
+http://www.portaudio.com/
+
+Version: January 30, 2014, SVN rev 1919
+
+Files:
+x86/PortAudio.dll
+x64/PortAudio.dll
\ No newline at end of file
diff --git a/Output/LICENSE QRCoder.txt b/Output/Licenses/QR Coder/QRCoder.txt
similarity index 94%
rename from Output/LICENSE QRCoder.txt
rename to Output/Licenses/QR Coder/QRCoder.txt
index 5624f5cf..e331740c 100644
--- a/Output/LICENSE QRCoder.txt	
+++ b/Output/Licenses/QR Coder/QRCoder.txt	
@@ -1,5 +1,3 @@
-// QRCode.dll from https://github.com/codebude/QRCoder/
-
 The MIT License (MIT)
 
 Copyright (c) 2013 Raffael Herrmann
diff --git a/Output/Licenses/QR Coder/SourceAndVersion.txt b/Output/Licenses/QR Coder/SourceAndVersion.txt
new file mode 100644
index 00000000..21625974
--- /dev/null
+++ b/Output/Licenses/QR Coder/SourceAndVersion.txt	
@@ -0,0 +1,6 @@
+https://github.com/codebude/QRCoder/
+
+Version: master 19.01.2014
+
+Files:
+QRCoder.dll
\ No newline at end of file
diff --git a/Output/Licenses/SlimDx/License.txt b/Output/Licenses/SlimDx/License.txt
new file mode 100644
index 00000000..a976ec46
--- /dev/null
+++ b/Output/Licenses/SlimDx/License.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2007-2012 SlimDX Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/Output/Licenses/SlimDx/SourceAndVersion.txt b/Output/Licenses/SlimDx/SourceAndVersion.txt
new file mode 100644
index 00000000..7ad52997
--- /dev/null
+++ b/Output/Licenses/SlimDx/SourceAndVersion.txt
@@ -0,0 +1,7 @@
+http://slimdx.org/download.php
+
+SVN r2171 (Feb 4, 2012) -> Equal to Jan 12 release but recompiled with VS2012
+
+Files:
+x86/SlimDx.dll
+x64/SlimDx.dll
\ No newline at end of file
diff --git a/Output/Newtonsoft.Json.dll b/Output/Newtonsoft.Json.dll
index a1c39382..339e470c 100644
Binary files a/Output/Newtonsoft.Json.dll and b/Output/Newtonsoft.Json.dll differ
diff --git a/Output/PortAudioSharp.dll b/Output/PortAudioSharp.dll
new file mode 100644
index 00000000..f48cfc2a
Binary files /dev/null and b/Output/PortAudioSharp.dll differ
diff --git a/Output/PortAudioSharp.dll.config b/Output/PortAudioSharp.dll.config
new file mode 100644
index 00000000..9147bca7
--- /dev/null
+++ b/Output/PortAudioSharp.dll.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration><startup><supportedRuntime version="v2.0.50727" /></startup>
+	<dllmap dll="PortAudio.dll" target="libportaudio.so.2" />
+</configuration>
\ No newline at end of file
diff --git a/Output/Security.dll b/Output/Security.dll
deleted file mode 100644
index f0c2c513..00000000
Binary files a/Output/Security.dll and /dev/null differ
diff --git a/Output/Themes/Ambient/Screens/ScreenNames.xml b/Output/Themes/Ambient/Screens/ScreenNames.xml
index 4efddb2d..5d17ebe2 100644
--- a/Output/Themes/Ambient/Screens/ScreenNames.xml
+++ b/Output/Themes/Ambient/Screens/ScreenNames.xml
@@ -1155,8 +1155,8 @@
       <NumBars>8</NumBars>
       <!--<Space>: Space between equalizer-elements.-->
       <Space>2,00</Space>
-      <!--<Style>: Style of equalizer-elements: Collums-->
-      <Style>Collums</Style>
+      <!--<Style>: Style of equalizer-elements: Columns-->
+      <Style>Columns</Style>
       <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON-->
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Color>: Equalizer color from ColorScheme (high priority)-->
@@ -1182,8 +1182,8 @@
       <NumBars>8</NumBars>
       <!--<Space>: Space between equalizer-elements.-->
       <Space>2,00</Space>
-      <!--<Style>: Style of equalizer-elements: Collums-->
-      <Style>Collums</Style>
+      <!--<Style>: Style of equalizer-elements: Columns-->
+      <Style>Columns</Style>
       <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON-->
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Color>: Equalizer color from ColorScheme (high priority)-->
@@ -1209,8 +1209,8 @@
       <NumBars>8</NumBars>
       <!--<Space>: Space between equalizer-elements.-->
       <Space>2,00</Space>
-      <!--<Style>: Style of equalizer-elements: Collums-->
-      <Style>Collums</Style>
+      <!--<Style>: Style of equalizer-elements: Columns-->
+      <Style>Columns</Style>
       <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON-->
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Color>: Equalizer color from ColorScheme (high priority)-->
@@ -1236,8 +1236,8 @@
       <NumBars>8</NumBars>
       <!--<Space>: Space between equalizer-elements.-->
       <Space>2,00</Space>
-      <!--<Style>: Style of equalizer-elements: Collums-->
-      <Style>Collums</Style>
+      <!--<Style>: Style of equalizer-elements: Columns-->
+      <Style>Columns</Style>
       <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON-->
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Color>: Equalizer color from ColorScheme (high priority)-->
@@ -1263,8 +1263,8 @@
       <NumBars>8</NumBars>
       <!--<Space>: Space between equalizer-elements.-->
       <Space>2,00</Space>
-      <!--<Style>: Style of equalizer-elements: Collums-->
-      <Style>Collums</Style>
+      <!--<Style>: Style of equalizer-elements: Columns-->
+      <Style>Columns</Style>
       <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON-->
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Color>: Equalizer color from ColorScheme (high priority)-->
@@ -1290,8 +1290,8 @@
       <NumBars>8</NumBars>
       <!--<Space>: Space between equalizer-elements.-->
       <Space>2,00</Space>
-      <!--<Style>: Style of equalizer-elements: Collums-->
-      <Style>Collums</Style>
+      <!--<Style>: Style of equalizer-elements: Columns-->
+      <Style>Columns</Style>
       <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON-->
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Color>: Equalizer color from ColorScheme (high priority)-->
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
index ba0ce824..77c04934 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
@@ -782,11 +782,11 @@
       <W>230</W>
       <H>150</H>
       <!--<NumBars>: Number of equalizer-elements.-->
-      <NumBars>10</NumBars>
+      <NumBars>12</NumBars>
       <!--<Space>: Space between equalizer-elements.-->
       <Space>2,00</Space>
-      <!--<Style>: Style of equalizer-elements: Collums-->
-      <Style>Collums</Style>
+      <!--<Style>: Style of equalizer-elements: Columns-->
+      <Style>Columns</Style>
       <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON-->
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Color>: Equalizer color from ColorScheme (high priority)-->
@@ -794,7 +794,7 @@
       <Color>ButtonColor</Color>
       <!--<MaxColor>: Equalizer color for maximal volume from ColorScheme (high priority)-->
       <!--or <MaxR>, <MaxG>, <MaxB>, <MaxA> (lower priority)-->
-      <MaxColor>ButtonColor</MaxColor>
+      <MaxColor>ButtonTextColor</MaxColor>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
@@ -813,11 +813,11 @@
       <W>230</W>
       <H>150</H>
       <!--<NumBars>: Number of equalizer-elements.-->
-      <NumBars>10</NumBars>
+      <NumBars>12</NumBars>
       <!--<Space>: Space between equalizer-elements.-->
       <Space>2,00</Space>
-      <!--<Style>: Style of equalizer-elements: Collums-->
-      <Style>Collums</Style>
+      <!--<Style>: Style of equalizer-elements: Columns-->
+      <Style>Columns</Style>
       <!--<DrawNegative>: Draw negative values: TR_CONFIG_OFF, TR_CONFIG_ON-->
       <DrawNegative>TR_CONFIG_OFF</DrawNegative>
       <!--<Color>: Equalizer color from ColorScheme (high priority)-->
@@ -825,7 +825,7 @@
       <Color>ButtonColor</Color>
       <!--<MaxColor>: Equalizer color for maximal volume from ColorScheme (high priority)-->
       <!--or <MaxR>, <MaxG>, <MaxB>, <MaxA> (lower priority)-->
-      <MaxColor>ButtonColor</MaxColor>
+      <MaxColor>ButtonTextColor</MaxColor>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
index e7e928c0..cabb55d9 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <ScreenOptionsVideo>
-    <ScreenVersion>4</ScreenVersion>
+    <ScreenVersion>5</ScreenVersion>
     <Background1>
       <!--<Type>: Background type: None, Color, Texture, Video-->
       <Type>Video</Type>
@@ -233,12 +233,12 @@
       <!--<Font>: Text font name-->
       <Font>Outline</Font>
       <!--<Text>: Nothing or translation tag-->
-      <Text>TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND</Text>
+      <Text>TR_SCREENOVIDEO_VIDEOSTOBACKGROUND</Text>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
     </Text5>
-    <Text6>
+    <TextWebcams>
       <!--<X>, <Y>: Text position-->
       <X>75</X>
       <Y>347</Y>
@@ -262,12 +262,12 @@
       <!--<Font>: Text font name-->
       <Font>Outline</Font>
       <!--<Text>: Nothing or translation tag-->
-      <Text>TR_SCREENO_VIDEO_WEBCAMDEVICES</Text>
+      <Text>TR_SCREENOVIDEO_WEBCAMDEVICES</Text>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
-    </Text6>
-    <Text7>
+    </TextWebcams>
+    <TextWebcamResolution>
       <!--<X>, <Y>: Text position-->
       <X>75</X>
       <Y>407</Y>
@@ -291,11 +291,11 @@
       <!--<Font>: Text font name-->
       <Font>Outline</Font>
       <!--<Text>: Nothing or translation tag-->
-      <Text>TR_SCREENO_VIDEO_WEBCAMCAPABILITIES</Text>
+      <Text>TR_SCREENOVIDEO_WEBCAMRESOLUTION</Text>
       <!--<Reflection> If exists:-->
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
-    </Text7>
+    </TextWebcamResolution>
     <ButtonExit>
       <!--<Skin>: Texture name-->
       <Skin>Button</Skin>
diff --git a/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt b/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt
index dea01208..9e8d37df 100644
--- a/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt
+++ b/Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt
@@ -1,4 +1,8 @@
-ScreenOptionsTheme
+++++++++++
+Version 5:
+
+Rename:
+Text5/6 to TextWebcam/TextWebcamResolution
 
 ++++++++++
 Version 4:
diff --git a/Output/x64/PortAudio.dll b/Output/x64/PortAudio.dll
new file mode 100644
index 00000000..033672a2
Binary files /dev/null and b/Output/x64/PortAudio.dll differ
diff --git a/Output/x64/SlimDX.dll b/Output/x64/SlimDX.dll
index e2304d42..36d058d1 100644
Binary files a/Output/x64/SlimDX.dll and b/Output/x64/SlimDX.dll differ
diff --git a/Output/x64/portaudio_x64.dll b/Output/x64/portaudio_x64.dll
deleted file mode 100644
index 106610f8..00000000
Binary files a/Output/x64/portaudio_x64.dll and /dev/null differ
diff --git a/Output/x86/PortAudio.dll b/Output/x86/PortAudio.dll
new file mode 100644
index 00000000..0367aa1e
Binary files /dev/null and b/Output/x86/PortAudio.dll differ
diff --git a/Output/x86/SlimDX.dll b/Output/x86/SlimDX.dll
index 3ff12733..1593c2a6 100644
Binary files a/Output/x86/SlimDX.dll and b/Output/x86/SlimDX.dll differ
diff --git a/Output/x86/portaudio_x86.dll b/Output/x86/portaudio_x86.dll
deleted file mode 100644
index 61617743..00000000
Binary files a/Output/x86/portaudio_x86.dll and /dev/null differ
diff --git a/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs
index 46d00571..14b5102c 100644
--- a/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs
+++ b/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs
@@ -17,10 +17,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Profile;
 
 namespace VocaluxeLib.PartyModes.Challenge
 {
diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
index e9ca8fc6..193da7d0 100644
--- a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
+++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A4053F1-5AD5-441F-B254-D97A088127B6}</ProjectGuid>
@@ -14,29 +14,7 @@
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN</DefineConstants>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -48,7 +26,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <CodeAnalysisRuleSet>..\..\CheckingRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -59,7 +37,7 @@
     <DefineConstants>WIN</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugLinux|x86' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -70,7 +48,7 @@
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLinux|x86' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -81,42 +59,7 @@
     <DefineConstants>LINUX</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>LINUX</DefineConstants>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>WIN</DefineConstants>
-    <Optimize>true</Optimize>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|AnyCPU'">
     <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
diff --git a/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs
index 3858de80..9c3521af 100644
--- a/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs
+++ b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs
@@ -17,10 +17,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Profile;
 
 namespace VocaluxeLib.PartyModes.ChallengeMedley
 {
diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
index 4f6ab862..135ffa4c 100644
--- a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
+++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6F3E1874-F28A-40E9-AFBD-31934D593678}</ProjectGuid>
@@ -14,29 +14,7 @@
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN</DefineConstants>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -48,7 +26,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <CodeAnalysisRuleSet>..\..\CheckingRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -59,7 +37,7 @@
     <DefineConstants>WIN</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugLinux|x86' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -70,7 +48,7 @@
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLinux|x86' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -81,42 +59,7 @@
     <DefineConstants>LINUX</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>LINUX</DefineConstants>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>WIN</DefineConstants>
-    <Optimize>true</Optimize>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|AnyCPU'">
     <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
diff --git a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
index 6cfad473..2131cd14 100644
--- a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
+++ b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
@@ -379,7 +379,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         {
             base.OnClose();
             CBase.BackgroundMusic.SetStatus(false);
-            CBase.Sound.FadeAndStop(_PreviewStream, 0f, 0.5f);
+            CBase.Sound.FadeAndClose(_PreviewStream, 0f, 0.5f);
         }
 
         private void _CreateFields()
@@ -503,7 +503,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
 
             CBase.BackgroundMusic.SetStatus(true);
 
-            _PreviewStream = CBase.Sound.Load(song.GetMP3(), false);
+            _PreviewStream = CBase.Sound.Load(song.GetMP3());
             CBase.Sound.SetPosition(_PreviewStream, song.Preview.StartTime);
             CBase.Sound.SetStreamVolume(_PreviewStream, 0f);
             CBase.Sound.Play(_PreviewStream);
@@ -527,7 +527,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             CSong song = CBase.Songs.GetSongByID(songID);
             CBase.BackgroundMusic.SetStatus(true);
 
-            _PreviewStream = CBase.Sound.Load(song.GetMP3(), false);
+            _PreviewStream = CBase.Sound.Load(song.GetMP3());
             CBase.Sound.SetPosition(_PreviewStream, song.Preview.StartTime);
             CBase.Sound.SetStreamVolume(_PreviewStream, 0f);
             CBase.Sound.Play(_PreviewStream);
@@ -574,7 +574,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                     {
                         _GameData.NumJokerRandom[teamNr]--;
                         if (!CBase.Sound.IsFinished(_PreviewStream))
-                            CBase.Sound.FadeAndStop(_PreviewStream, 0, 1);
+                            CBase.Sound.FadeAndClose(_PreviewStream, 0, 1);
                         _FieldSelected(true);
                     }
                     break;
@@ -586,7 +586,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
                         _GameData.NumJokerRetry[teamNr]--;
                         _GameData.Team = teamNr;
                         if (!CBase.Sound.IsFinished(_PreviewStream))
-                            CBase.Sound.FadeAndStop(_PreviewStream, 0, 1);
+                            CBase.Sound.FadeAndClose(_PreviewStream, 0, 1);
                         _Status = EStatus.JokerRetry;
                         _OldSelectedField = _SelectedField;
                         _SelectedField = -1;
@@ -627,7 +627,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
 
         private void _NextRound()
         {
-            CBase.Sound.FadeAndStop(_PreviewStream, 0f, 0.5f);
+            CBase.Sound.FadeAndClose(_PreviewStream, 0f, 0.5f);
             _Data.ScreenMain.Rounds = _GameData.Rounds;
             _Data.ScreenMain.FadeToNameSelection = false;
             _Data.ScreenMain.FadeToSinging = true;
@@ -640,7 +640,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
 
         private void _EndParty()
         {
-            CBase.Sound.FadeAndStop(_PreviewStream, 0f, 0.5f);
+            CBase.Sound.FadeAndClose(_PreviewStream, 0f, 0.5f);
             _FadeTo(EScreens.ScreenParty);
         }
 
@@ -659,7 +659,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
 
         private void _Back()
         {
-            CBase.Sound.FadeAndStop(_PreviewStream, 0f, 0.5f);
+            CBase.Sound.FadeAndClose(_PreviewStream, 0f, 0.5f);
             _Data.ScreenMain.FadeToNameSelection = true;
             _Data.ScreenMain.FadeToSinging = false;
             _Data.ScreenMain.SingRoundNr = _SelectedField;
diff --git a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs
index 00f99acc..ebc7eddf 100644
--- a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs
+++ b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs
@@ -17,10 +17,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Profile;
 
 namespace VocaluxeLib.PartyModes.TicTacToe
 {
diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
index fb739e23..0ccffb7b 100644
--- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
+++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6F3E1874-F28A-40E9-AFBD-31934D593679}</ProjectGuid>
@@ -14,29 +14,7 @@
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN</DefineConstants>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -48,7 +26,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <CodeAnalysisRuleSet>..\..\CheckingRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -59,7 +37,7 @@
     <DefineConstants>WIN</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugLinux|x86' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -70,7 +48,7 @@
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLinux|x86' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -81,42 +59,7 @@
     <DefineConstants>LINUX</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>LINUX</DefineConstants>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
-    <OutputPath>bin</OutputPath>
-    <DefineConstants>WIN</DefineConstants>
-    <Optimize>true</Optimize>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|AnyCPU'">
     <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
diff --git a/PitchTracker/FFT/FFT.cpp b/PitchTracker/FFT/FFT.cpp
new file mode 100644
index 00000000..39fdb52f
--- /dev/null
+++ b/PitchTracker/FFT/FFT.cpp
@@ -0,0 +1,180 @@
+/**********************************************************************
+
+  FFT.cpp
+
+  Dominic Mazzoni
+
+  September 2000
+
+*******************************************************************//*!
+
+\file FFT.cpp
+\brief Fast Fourier Transform routines.
+
+  This file contains a few FFT routines, including a real-FFT
+  routine that is almost twice as fast as a normal complex FFT,
+  and a power spectrum routine when you know you don't care
+  about phase information.
+
+  Some of this code was based on a free implementation of an FFT
+  by Don Cross, available on the web at:
+
+    http://www.intersrv.com/~dcross/fft.html
+
+  The basic algorithm for his code was based on Numerican Recipes
+  in Fortran.  I optimized his code further by reducing array
+  accesses, caching the bit reversal table, and eliminating
+  float-to-double conversions, and I added the routines to
+  calculate a real FFT and a real power spectrum.
+
+*//*******************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+
+#include "FFT.h"
+
+#include "RealFFTf.h"
+
+void DeinitFFT()
+{
+   // Deallocate any unused RealFFTf tables
+   CleanupFFT();
+}
+
+/*
+ * Real Fast Fourier Transform
+ *
+ */
+void RealFFT(int NumSamples, float *RealIn, float *RealOut, float *ImagOut)
+{
+   // Remap to RealFFTf() function
+   int i;
+   HFFT hFFT = GetFFT(NumSamples);
+   float *pFFT = new float[NumSamples];
+   // Copy the data into the processing buffer
+   for(i=0; i<NumSamples; i++)
+      pFFT[i] = RealIn[i];
+
+   // Perform the FFT
+   RealFFTf(pFFT, hFFT);
+
+   // Copy the data into the real and imaginary outputs
+   for(i=1;i<(NumSamples/2);i++) {
+      RealOut[i]=pFFT[hFFT->BitReversed[i]  ];
+      ImagOut[i]=pFFT[hFFT->BitReversed[i]+1];
+   }
+   // Handle the (real-only) DC and Fs/2 bins
+   RealOut[0] = pFFT[0];
+   RealOut[i] = pFFT[1];
+   ImagOut[0] = ImagOut[i] = 0;
+   // Fill in the upper half using symmetry properties
+   for(i++ ; i<NumSamples; i++) {
+      RealOut[i] =  RealOut[NumSamples-i];
+      ImagOut[i] = -ImagOut[NumSamples-i];
+   }
+   delete [] pFFT;
+   ReleaseFFT(hFFT);
+}
+
+/*
+ * InverseRealFFT
+ *
+ * This function computes the inverse of RealFFT, above.
+ * The RealIn and ImagIn is assumed to be conjugate-symmetric
+ * and as a result the output is purely real.
+ * Only the first half of RealIn and ImagIn are used due to this
+ * symmetry assumption.
+ */
+void InverseRealFFT(int NumSamples, float *RealIn, float *ImagIn, float *RealOut)
+{
+   // Remap to RealFFTf() function
+   int i;
+   HFFT hFFT = GetFFT(NumSamples);
+   float *pFFT = new float[NumSamples];
+   // Copy the data into the processing buffer
+   for(i=0; i<(NumSamples/2); i++)
+      pFFT[2*i  ] = RealIn[i];
+   if(ImagIn == NULL) {
+      for(i=0; i<(NumSamples/2); i++)
+         pFFT[2*i+1] = 0;
+   } else {
+      for(i=0; i<(NumSamples/2); i++)
+         pFFT[2*i+1] = ImagIn[i];
+   }
+   // Put the fs/2 component in the imaginary part of the DC bin
+   pFFT[1] = RealIn[i];
+
+   // Perform the FFT
+   InverseRealFFTf(pFFT, hFFT);
+
+   // Copy the data to the (purely real) output buffer
+   ReorderToTime(hFFT, pFFT, RealOut);
+
+   delete [] pFFT;
+   ReleaseFFT(hFFT);
+}
+
+void RealInverseRealFFT(int NumSamples,	float *In, float *Out){
+	// Remap to RealFFTf() function
+	int i;
+	HFFT hFFT = GetFFT(NumSamples);
+	float *pFFT = new float[NumSamples];
+	// Copy the data into the processing buffer
+	pFFT[0] = In[0];
+	for(i=1; i<NumSamples/2; i++){
+		pFFT[i] = In[i];
+		pFFT[NumSamples - i] = In[i];
+	}
+	pFFT[NumSamples/2] = In[NumSamples/2];
+
+	// Perform the FFT
+	RealFFTf(pFFT, hFFT);
+
+	// Copy the data into the output
+	for(i=1;i<NumSamples/2;i++) {
+		Out[i]=pFFT[hFFT->BitReversed[i]];
+	}
+	// Handle the (real-only) DC
+	Out[0] = pFFT[0];
+	delete [] pFFT;
+	ReleaseFFT(hFFT);
+}
+
+/*
+ * PowerSpectrum
+ *
+ * This function computes the same as RealFFT, above, but
+ * adds the squares of the real and imaginary part of each
+ * coefficient, extracting the power and throwing away the
+ * phase.
+ *
+ * For speed, it does not call RealFFT, but duplicates some
+ * of its code.
+ */
+
+void PowerSpectrum(int NumSamples, float *In, float *Out)
+{
+   // Remap to RealFFTf() function
+   int i;
+   HFFT hFFT = GetFFT(NumSamples);
+   float *pFFT = new float[NumSamples];
+   // Copy the data into the processing buffer
+   for(i=0; i<NumSamples; i++)
+      pFFT[i] = In[i];
+
+   // Perform the FFT
+   RealFFTf(pFFT, hFFT);
+
+   // Copy the data into the real and imaginary outputs
+   for(i=1;i<NumSamples/2;i++) {
+      Out[i]= (pFFT[hFFT->BitReversed[i]  ]*pFFT[hFFT->BitReversed[i]  ])
+         + (pFFT[hFFT->BitReversed[i]+1]*pFFT[hFFT->BitReversed[i]+1]);
+   }
+   // Handle the (real-only) DC and Fs/2 bins
+   Out[0] = pFFT[0]*pFFT[0];
+   Out[i] = pFFT[1]*pFFT[1];
+   delete [] pFFT;
+   ReleaseFFT(hFFT);
+}
\ No newline at end of file
diff --git a/PitchTracker/FFT/FFT.h b/PitchTracker/FFT/FFT.h
new file mode 100644
index 00000000..b8919e61
--- /dev/null
+++ b/PitchTracker/FFT/FFT.h
@@ -0,0 +1,65 @@
+/**********************************************************************
+
+  FFT.h
+
+  Dominic Mazzoni
+
+  September 2000
+
+  This file contains a few FFT routines, including a real-FFT
+  routine that is almost twice as fast as a normal complex FFT,
+  and a power spectrum routine which is more convenient when
+  you know you don't care about phase information.  It now also
+  contains a few basic windowing functions.
+
+  Some of this code was based on a free implementation of an FFT
+  by Don Cross, available on the web at:
+
+    http://www.intersrv.com/~dcross/fft.html
+
+  The basic algorithm for his code was based on Numerical Recipes
+  in Fortran.  I optimized his code further by reducing array
+  accesses, caching the bit reversal table, and eliminating
+  float-to-double conversions, and I added the routines to
+  calculate a real FFT and a real power spectrum.
+
+  Note: all of these routines use single-precision floats.
+  I have found that in practice, floats work well until you
+  get above 8192 samples.  If you need to do a larger FFT,
+  you need to use doubles.
+
+**********************************************************************/
+
+/*
+ * This is the function you will use the most often.
+ * Given an array of floats, this will compute the power
+ * spectrum by doing a Real FFT and then computing the
+ * sum of the squares of the real and imaginary parts.
+ * Note that the output array is half the length of the
+ * input array, and that NumSamples must be a power of two.
+ */
+
+void PowerSpectrum(int NumSamples, float *In, float *Out);
+
+/*
+ * Computes an FFT when the input data is real but you still
+ * want complex data as output.  The output arrays are the
+ * same length as the input, but will be conjugate-symmetric
+ * NumSamples must be a power of two.
+ */
+
+void RealFFT(int NumSamples,
+             float *RealIn, float *RealOut, float *ImagOut);
+
+/*
+ * Computes an Inverse FFT when the input data is conjugate symmetric
+ * so the output is purely real.  NumSamples must be a power of
+ * two.
+ * Requires: EXPERIMENTAL_USE_REALFFTF
+ */
+void InverseRealFFT(int NumSamples,
+					float *RealIn, float *ImagIn, float *RealOut);
+
+void RealInverseRealFFT(int NumSamples,	float *In, float *Out);
+
+void DeinitFFT();
diff --git a/PitchTracker/FFT/License.txt b/PitchTracker/FFT/License.txt
new file mode 100644
index 00000000..c2e7eafa
--- /dev/null
+++ b/PitchTracker/FFT/License.txt
@@ -0,0 +1,299 @@
+Code in this folder is based on Code from Audacity.
+License of that code is below:
+
+------------------------------------------------------------------------
+
+Note: Audacity is distributed under the terms of the GNU GPL.
+This includes everything in the source code distribution
+except code in the lib-src directory. Code in the lib-src
+directory may be released under a different license
+(which is GPL-compatible). For a summary, see the
+README.txt file, and for specific details, see the license
+information inside each subdirectory of lib-src.
+
+Documentation is distributed under the Creative Commons license.
+Please see here for that:
+http://creativecommons.org/licenses/by/3.0/legalcode
+
+The full text of the GNU GPL follows:
+
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any
+part thereof, to be licensed as a whole at no charge to all third
+parties under the terms of this License.
+
+c) If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such
+interactive use in the most ordinary way, to print or display an
+announcement including an appropriate copyright notice and a
+notice that there is no warranty (or else, saying that you provide
+a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this
+License. (Exception: if the Program itself is interactive but
+does not normally print such an announcement, your work based on
+the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your
+cost of physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer
+to distribute corresponding source code. (This alternative is
+allowed only for noncommercial distribution and only if you
+received the program in object code or executable form with such
+an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/PitchTracker/FFT/RealFFTf.cpp b/PitchTracker/FFT/RealFFTf.cpp
new file mode 100644
index 00000000..a18be257
--- /dev/null
+++ b/PitchTracker/FFT/RealFFTf.cpp
@@ -0,0 +1,388 @@
+/*
+*     Program: REALFFTF.C
+*      Author: Philip Van Baren
+*        Date: 2 September 1993
+*
+* Description: These routines perform an FFT on real data to get a conjugate-symmetric
+*              output, and an inverse FFT on conjugate-symmetric input to get a real
+*              output sequence.
+*
+*              This code is for floating point data.
+*
+*              Modified 8/19/1998 by Philip Van Baren
+*                 - made the InitializeFFT and EndFFT routines take a structure
+*                   holding the length and pointers to the BitReversed and SinTable
+*                   tables.
+*              Modified 5/23/2009 by Philip Van Baren
+*                 - Added GetFFT and ReleaseFFT routines to retain common SinTable
+*                   and BitReversed tables so they don't need to be reallocated
+*                   and recomputed on every call.
+*                 - Added Reorder* functions to undo the bit-reversal
+*
+*  Copyright (C) 2009  Philip VanBaren
+*
+*  This program is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program; if not, write to the Free Software
+*  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+
+#include "RealFFTf.h"
+#ifdef EXPERIMENTAL_EQ_SSE_THREADED
+#include "RealFFTf48x.h"
+#endif
+
+#ifndef M_PI
+#define	M_PI		3.14159265358979323846  /* pi */
+#endif
+
+/*
+*  Initialize the Sine table and Twiddle pointers (bit-reversed pointers)
+*  for the FFT routine.
+*/
+HFFT InitializeFFT(int fftlen)
+{
+   int i;
+   int temp;
+   int mask;
+   HFFT h;
+
+   if((h=(HFFT)malloc(sizeof(FFTParam)))==NULL)
+   {
+      fprintf(stderr,"Error allocating memory for FFT\n");
+      exit(8);
+   }
+   /*
+   *  FFT size is only half the number of data points
+   *  The full FFT output can be reconstructed from this FFT's output.
+   *  (This optimization can be made since the data is real.)
+   */
+   h->Points = fftlen/2;
+
+   if((h->SinTable=(fft_type *)malloc(2*h->Points*sizeof(fft_type)))==NULL)
+   {
+      fprintf(stderr,"Error allocating memory for Sine table.\n");
+      exit(8);
+   }
+
+   if((h->BitReversed=(int *)malloc(h->Points*sizeof(int)))==NULL)
+   {
+      fprintf(stderr,"Error allocating memory for BitReversed.\n");
+      exit(8);
+   }
+
+   for(i=0;i<h->Points;i++)
+   {
+      temp=0;
+      for(mask=h->Points/2;mask>0;mask >>= 1)
+         temp=(temp >> 1) + (i&mask ? h->Points : 0);
+
+      h->BitReversed[i]=temp;
+   } 
+
+   for(i=0;i<h->Points;i++)
+   {
+      h->SinTable[h->BitReversed[i]  ]=(fft_type)-sin(2*M_PI*i/(2*h->Points));
+      h->SinTable[h->BitReversed[i]+1]=(fft_type)-cos(2*M_PI*i/(2*h->Points));
+   }
+
+   return h;
+}
+
+/*
+*  Free up the memory allotted for Sin table and Twiddle Pointers
+*/
+void EndFFT(HFFT h)
+{
+   if(h->Points>0) {
+      free(h->BitReversed);
+      free(h->SinTable);
+   }
+   h->Points=0;
+   free(h);
+}
+
+#define MAX_HFFT 10
+static HFFT hFFTArray[MAX_HFFT] = { NULL };
+static int nFFTLockCount[MAX_HFFT] = { 0 };
+
+/* Get a handle to the FFT tables of the desired length */
+/* This version keeps common tables rather than allocating a new table every time */
+HFFT GetFFT(int fftlen)
+{
+   int h,n = fftlen/2;
+   for(h=0; (h<MAX_HFFT) && (hFFTArray[h] != NULL) && (n != hFFTArray[h]->Points); h++);
+   if(h<MAX_HFFT) {
+      if(hFFTArray[h] == NULL) {
+         hFFTArray[h] = InitializeFFT(fftlen);
+         nFFTLockCount[h] = 0;
+      }
+      nFFTLockCount[h]++;
+      return hFFTArray[h];
+   } else {
+      // All buffers used, so fall back to allocating a new set of tables
+      return InitializeFFT(fftlen);;
+   }
+}
+
+/* Release a previously requested handle to the FFT tables */
+void ReleaseFFT(HFFT hFFT)
+{
+   int h;
+   for(h=0; (h<MAX_HFFT) && (hFFTArray[h] != hFFT); h++);
+   if(h<MAX_HFFT) {
+      nFFTLockCount[h]--;
+   } else {
+      EndFFT(hFFT);
+   }
+}
+
+/* Deallocate any unused FFT tables */
+void CleanupFFT()
+{
+   int h;
+   for(h=0; (h<MAX_HFFT); h++) {
+      if((nFFTLockCount[h] <= 0) && (hFFTArray[h] != NULL)) {
+         EndFFT(hFFTArray[h]);
+         hFFTArray[h] = NULL;
+      }
+   }
+}
+
+/*
+*  Forward FFT routine.  Must call InitializeFFT(fftlen) first!
+*
+*  Note: Output is BIT-REVERSED! so you must use the BitReversed to
+*        get legible output, (i.e. Real_i = buffer[ h->BitReversed[i] ]
+*                                  Imag_i = buffer[ h->BitReversed[i]+1 ] )
+*        Input is in normal order.
+*
+* Output buffer[0] is the DC bin, and output buffer[1] is the Fs/2 bin
+* - this can be done because both values will always be real only
+* - this allows us to not have to allocate an extra complex value for the Fs/2 bin
+*
+*  Note: The scaling on this is done according to the standard FFT definition,
+*        so a unit amplitude DC signal will output an amplitude of (N)
+*        (Older revisions would progressively scale the input, so the output
+*        values would be similar in amplitude to the input values, which is
+*        good when using fixed point arithmetic)
+*/
+void RealFFTf(fft_type *buffer,HFFT h)
+{
+   fft_type *A,*B;
+   fft_type *sptr;
+   fft_type *endptr1,*endptr2;
+   int *br1,*br2;
+   fft_type HRplus,HRminus,HIplus,HIminus;
+   fft_type v1,v2,sin,cos;
+
+   int ButterfliesPerGroup=h->Points/2;
+
+   /*
+   *  Butterfly:
+   *     Ain-----Aout
+   *         \ /
+   *         / \
+   *     Bin-----Bout
+   */
+
+   endptr1=buffer+h->Points*2;
+
+   while(ButterfliesPerGroup>0)
+   {
+      A=buffer;
+      B=buffer+ButterfliesPerGroup*2;
+      sptr=h->SinTable;
+
+      while(A<endptr1)
+      {
+         sin=*sptr;
+         cos=*(sptr+1);
+         endptr2=B;
+         while(A<endptr2)
+         {
+            v1=*B*cos + *(B+1)*sin;
+            v2=*B*sin - *(B+1)*cos;
+            *B=(*A+v1);
+            *(A++)=*(B++)-2*v1;
+            *B=(*A-v2);
+            *(A++)=*(B++)+2*v2;
+         }
+         A=B;
+         B+=ButterfliesPerGroup*2;
+         sptr+=2;
+      }
+      ButterfliesPerGroup >>= 1;
+   }
+   /* Massage output to get the output for a real input sequence. */
+   br1=h->BitReversed+1;
+   br2=h->BitReversed+h->Points-1;
+
+   while(br1<br2)
+   {
+      sin=h->SinTable[*br1];
+      cos=h->SinTable[*br1+1];
+      A=buffer+*br1;
+      B=buffer+*br2;
+      HRplus = (HRminus = *A     - *B    ) + (*B     * 2);
+      HIplus = (HIminus = *(A+1) - *(B+1)) + (*(B+1) * 2);
+      v1 = (sin*HRminus - cos*HIplus);
+      v2 = (cos*HRminus + sin*HIplus);
+      *A = (HRplus  + v1) * (fft_type)0.5;
+      *B = *A - v1;
+      *(A+1) = (HIminus + v2) * (fft_type)0.5;
+      *(B+1) = *(A+1) - HIminus;
+
+      br1++;
+      br2--;
+   }
+   /* Handle the center bin (just need a conjugate) */
+   A=buffer+*br1+1;
+   *A=-*A;
+   /* Handle DC bin separately - and ignore the Fs/2 bin
+   buffer[0]+=buffer[1];
+   buffer[1]=(fft_type)0;*/
+   /* Handle DC and Fs/2 bins separately */
+   /* Put the Fs/2 value into the imaginary part of the DC bin */
+   v1=buffer[0]-buffer[1];
+   buffer[0]+=buffer[1];
+   buffer[1]=v1;
+}
+
+
+/* Description: This routine performs an inverse FFT to real data.
+*              This code is for floating point data.
+*
+*  Note: Output is BIT-REVERSED! so you must use the BitReversed to
+*        get legible output, (i.e. wave[2*i]   = buffer[ BitReversed[i] ]
+*                                  wave[2*i+1] = buffer[ BitReversed[i]+1 ] )
+*        Input is in normal order, interleaved (real,imaginary) complex data
+*        You must call InitializeFFT(fftlen) first to initialize some buffers!
+*
+* Input buffer[0] is the DC bin, and input buffer[1] is the Fs/2 bin
+* - this can be done because both values will always be real only
+* - this allows us to not have to allocate an extra complex value for the Fs/2 bin
+*
+*  Note: The scaling on this is done according to the standard FFT definition,
+*        so a unit amplitude DC signal will output an amplitude of (N)
+*        (Older revisions would progressively scale the input, so the output
+*        values would be similar in amplitude to the input values, which is
+*        good when using fixed point arithmetic)
+*/
+void InverseRealFFTf(fft_type *buffer,HFFT h)
+{
+   fft_type *A,*B;
+   fft_type *sptr;
+   fft_type *endptr1,*endptr2;
+   int *br1;
+   fft_type HRplus,HRminus,HIplus,HIminus;
+   fft_type v1,v2,sin,cos;
+
+   int ButterfliesPerGroup=h->Points/2;
+
+   /* Massage input to get the input for a real output sequence. */
+   A=buffer+2;
+   B=buffer+h->Points*2-2;
+   br1=h->BitReversed+1;
+   while(A<B)
+   {
+      sin=h->SinTable[*br1];
+      cos=h->SinTable[*br1+1];
+      HRplus = (HRminus = *A     - *B    ) + (*B     * 2);
+      HIplus = (HIminus = *(A+1) - *(B+1)) + (*(B+1) * 2);
+      v1 = (sin*HRminus + cos*HIplus);
+      v2 = (cos*HRminus - sin*HIplus);
+      *A = (HRplus  + v1) * (fft_type)0.5;
+      *B = *A - v1;
+      *(A+1) = (HIminus - v2) * (fft_type)0.5;
+      *(B+1) = *(A+1) - HIminus;
+
+      A+=2;
+      B-=2;
+      br1++;
+   }
+   /* Handle center bin (just need conjugate) */
+   *(A+1)=-*(A+1);
+   /* Handle DC bin separately - this ignores any Fs/2 component
+   buffer[1]=buffer[0]=buffer[0]/2;*/
+   /* Handle DC and Fs/2 bins specially */
+   /* The DC bin is passed in as the real part of the DC complex value */
+   /* The Fs/2 bin is passed in as the imaginary part of the DC complex value */
+   /* (v1+v2) = buffer[0] == the DC component */
+   /* (v1-v2) = buffer[1] == the Fs/2 component */
+   v1=0.5f*(buffer[0]+buffer[1]);
+   v2=0.5f*(buffer[0]-buffer[1]);
+   buffer[0]=v1;
+   buffer[1]=v2;
+
+   /*
+   *  Butterfly:
+   *     Ain-----Aout
+   *         \ /
+   *         / \
+   *     Bin-----Bout
+   */
+
+   endptr1=buffer+h->Points*2;
+
+   while(ButterfliesPerGroup>0)
+   {
+      A=buffer;
+      B=buffer+ButterfliesPerGroup*2;
+      sptr=h->SinTable;
+
+      while(A<endptr1)
+      {
+         sin=*(sptr++);
+         cos=*(sptr++);
+         endptr2=B;
+         while(A<endptr2)
+         {
+            v1=*B*cos - *(B+1)*sin;
+            v2=*B*sin + *(B+1)*cos;
+            *B=(*A+v1)*(fft_type)0.5;
+            *(A++)=*(B++)-v1;
+            *B=(*A+v2)*(fft_type)0.5;
+            *(A++)=*(B++)-v2;
+         }
+         A=B;
+         B+=ButterfliesPerGroup*2;
+      }
+      ButterfliesPerGroup >>= 1;
+   }
+}
+
+void ReorderToFreq(HFFT hFFT, fft_type *buffer, fft_type *RealOut, fft_type *ImagOut)
+{
+   // Copy the data into the real and imaginary outputs
+   for(int i=1;i<hFFT->Points;i++) {
+      RealOut[i]=buffer[hFFT->BitReversed[i]  ];
+      ImagOut[i]=buffer[hFFT->BitReversed[i]+1];
+   }
+   RealOut[0] = buffer[0]; // DC component
+   ImagOut[0] = 0;
+   RealOut[hFFT->Points] = buffer[1]; // Fs/2 component
+   ImagOut[hFFT->Points] = 0;
+}
+
+void ReorderToTime(HFFT hFFT, fft_type *buffer, fft_type *TimeOut)
+{
+   // Copy the data into the real outputs
+   for(int i=0;i<hFFT->Points;i++) {
+      TimeOut[i*2  ]=buffer[hFFT->BitReversed[i]  ];
+      TimeOut[i*2+1]=buffer[hFFT->BitReversed[i]+1];
+   }
+}
diff --git a/PitchTracker/FFT/RealFFTf.h b/PitchTracker/FFT/RealFFTf.h
new file mode 100644
index 00000000..f46119ca
--- /dev/null
+++ b/PitchTracker/FFT/RealFFTf.h
@@ -0,0 +1,23 @@
+#ifndef __realfftf_h
+#define __realfftf_h
+
+#define fft_type float
+typedef struct FFTParamType {
+   int *BitReversed;
+   fft_type *SinTable;
+   int Points;
+} FFTParam;
+#define HFFT FFTParam *
+
+HFFT InitializeFFT(int);
+void EndFFT(HFFT);
+HFFT GetFFT(int);
+void ReleaseFFT(HFFT);
+void CleanupFFT();
+void RealFFTf(fft_type *,HFFT);
+void InverseRealFFTf(fft_type *,HFFT);
+void ReorderToTime(HFFT hFFT, fft_type *buffer, fft_type *TimeOut);
+void ReorderToFreq(HFFT hFFT, fft_type *buffer, fft_type *RealOut, fft_type *ImagOut);
+
+#endif
+
diff --git a/PitchTracker/Helper.cpp b/PitchTracker/Helper.cpp
new file mode 100644
index 00000000..f49de316
--- /dev/null
+++ b/PitchTracker/Helper.cpp
@@ -0,0 +1,43 @@
+#include "Helper.h"
+#include <stdlib.h>
+#include <cmath>
+
+float* short2FloatArray(short* in, size_t len){
+	const float maxShort = 32767.0f;
+
+	float* result = static_cast<float*>(malloc(len * sizeof(float)));
+	float* curOut = result;
+	for(size_t i=0; i<len; i++){
+		*curOut = *in / maxShort;
+		curOut++;
+		in++;
+	}
+	return result;
+}
+
+double* short2DoubleArray(short* in, size_t len, bool scale){
+	const double maxShort = 32767.0;
+
+	double* result = static_cast<double*>(malloc(len * sizeof(double)));
+	double* curOut = result;
+	for(size_t i=0; i<len; i++){
+		*curOut = *in;
+		if(scale)
+			*curOut /= maxShort;
+		curOut++;
+		in++;
+	}
+	return result;
+}
+
+void freeFloatArray(float* floats){
+	free(floats);
+}
+
+void freeDoubleArray(double* floats){
+	free(floats);
+}
+
+double FreqToNote(double freq){
+	return 12.0 * std::log(freq / 127.09) / std::log(2.0) + 27.5 - 16; // 16 = C2
+}
\ No newline at end of file
diff --git a/PitchTracker/Helper.h b/PitchTracker/Helper.h
new file mode 100644
index 00000000..6b36eff2
--- /dev/null
+++ b/PitchTracker/Helper.h
@@ -0,0 +1,24 @@
+#pragma once
+
+float* short2FloatArray(short* in, size_t len);
+double* short2DoubleArray(short* in, size_t len, bool scale = true);
+void freeFloatArray(float* floats);
+void freeDoubleArray(double* floats);
+double FreqToNote(double freq);
+
+/*
+namespace Native{
+	namespace PitchTracking{
+		CTone^ ConvertToneToManaged(Tone* tone){
+			CTone^ result = gcnew CTone();
+			result->Freq = tone->freq;
+			result->DB = tone->db;
+			result->Stabledb = tone->stabledb;
+			result->Age = static_cast<int>(tone->age);
+			result->NoteExact = 12.0 * std::log(tone->freq / 127.09) / std::log(2.0) + 27.5 - 16; // 16 = C2
+			result->Note = static_cast<int>(std::round(result->NoteExact));
+			return result;
+		}
+	}
+}
+*/
\ No newline at end of file
diff --git a/PitchTracker/PitchTracker.vcxproj b/PitchTracker/PitchTracker.vcxproj
new file mode 100644
index 00000000..65ce0ada
--- /dev/null
+++ b/PitchTracker/PitchTracker.vcxproj
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{54A48AF7-515C-4EDD-B395-2BFFA096050A}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>PitchTracker</RootNamespace>
+    <ProjectName>PitchTracker</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110_xp</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110_xp</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
+    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
+    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
+    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
+    <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <MinimalRebuild>false</MinimalRebuild>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\" /I /Y</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <MinimalRebuild>false</MinimalRebuild>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\" /I /Y</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <OmitFramePointers>false</OmitFramePointers>
+      <OpenMPSupport>true</OpenMPSupport>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\" /I /Y</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <OpenMPSupport>true</OpenMPSupport>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x86\" /I /Y</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="compatibility.cpp" />
+    <ClCompile Include="dywapitchtrack\dywapitchtrack.cpp" />
+    <ClCompile Include="dywapitchtrack\ptDyWa.cpp" />
+    <ClCompile Include="FFT\FFT.cpp" />
+    <ClCompile Include="FFT\RealFFTf.cpp" />
+    <ClCompile Include="Helper.cpp" />
+    <ClCompile Include="performous\pitch.cc" />
+    <ClCompile Include="ptAKF.cpp" />
+    <ClCompile Include="PitchWrapper.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="compatibility.h" />
+    <ClInclude Include="dywapitchtrack\dywapitchtrack.h" />
+    <ClInclude Include="dywapitchtrack\ptDyWa.h" />
+    <ClInclude Include="FFT\FFT.h" />
+    <ClInclude Include="FFT\RealFFTf.h" />
+    <ClInclude Include="Helper.h" />
+    <ClInclude Include="performous\libda\fft.hpp" />
+    <ClInclude Include="performous\libda\sample.hpp" />
+    <ClInclude Include="ptAKF.h" />
+    <ClInclude Include="PitchWrapper.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="performous\pitch.hh" />
+    <None Include="performous\util.hh" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/PitchTracker/PitchTracker.vcxproj.filters b/PitchTracker/PitchTracker.vcxproj.filters
new file mode 100644
index 00000000..81447394
--- /dev/null
+++ b/PitchTracker/PitchTracker.vcxproj.filters
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Quelldateien">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headerdateien">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Ressourcendateien">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Quelldateien\performous">
+      <UniqueIdentifier>{a47c9d33-78d2-453d-bb59-e5724cd85f67}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Headerdateien\performous">
+      <UniqueIdentifier>{4c72400a-ff2c-4842-8c20-54deb5df606d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Headerdateien\performous\libda">
+      <UniqueIdentifier>{d71782a0-47fc-4fe1-8569-0a0ce8fe9b45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Quelldateien\dywapitchtrack">
+      <UniqueIdentifier>{e8eab624-6cc3-42db-93d9-575aaeff06f7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Headerdateien\dywapitchtrack">
+      <UniqueIdentifier>{2a09cee1-51b7-4c24-aa9f-32bec53c3a36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Quelldateien\FFT">
+      <UniqueIdentifier>{498f64e2-ff83-41fd-be25-c613750f0e34}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Headerdateien\FFT">
+      <UniqueIdentifier>{0791b62f-ef8d-40e2-b67e-a6d9dead8720}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="PitchWrapper.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="compatibility.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="performous\pitch.cc">
+      <Filter>Quelldateien\performous</Filter>
+    </ClCompile>
+    <ClCompile Include="ptAKF.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="dywapitchtrack\ptDyWa.cpp">
+      <Filter>Quelldateien\dywapitchtrack</Filter>
+    </ClCompile>
+    <ClCompile Include="dywapitchtrack\dywapitchtrack.cpp">
+      <Filter>Quelldateien\dywapitchtrack</Filter>
+    </ClCompile>
+    <ClCompile Include="Helper.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="FFT\FFT.cpp">
+      <Filter>Quelldateien\FFT</Filter>
+    </ClCompile>
+    <ClCompile Include="FFT\RealFFTf.cpp">
+      <Filter>Quelldateien\FFT</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="compatibility.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="PitchWrapper.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="Helper.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="performous\libda\fft.hpp">
+      <Filter>Headerdateien\performous\libda</Filter>
+    </ClInclude>
+    <ClInclude Include="performous\libda\sample.hpp">
+      <Filter>Headerdateien\performous\libda</Filter>
+    </ClInclude>
+    <ClInclude Include="ptAKF.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="dywapitchtrack\dywapitchtrack.h">
+      <Filter>Headerdateien\dywapitchtrack</Filter>
+    </ClInclude>
+    <ClInclude Include="dywapitchtrack\ptDyWa.h">
+      <Filter>Headerdateien\dywapitchtrack</Filter>
+    </ClInclude>
+    <ClInclude Include="FFT\FFT.h">
+      <Filter>Headerdateien\FFT</Filter>
+    </ClInclude>
+    <ClInclude Include="FFT\RealFFTf.h">
+      <Filter>Headerdateien\FFT</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="performous\pitch.hh">
+      <Filter>Headerdateien\performous</Filter>
+    </None>
+    <None Include="performous\util.hh">
+      <Filter>Headerdateien\performous</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/PitchTracker/PitchWrapper.cpp b/PitchTracker/PitchWrapper.cpp
new file mode 100644
index 00000000..612882c0
--- /dev/null
+++ b/PitchTracker/PitchWrapper.cpp
@@ -0,0 +1,233 @@
+#include "PitchWrapper.h"
+#include "Helper.h"
+
+
+Analyzer* Analyzer_Create(unsigned step){
+    return new Analyzer(44100, "", step);
+}
+
+void Analyzer_Free(Analyzer* analyzer){
+    if(analyzer)
+		delete analyzer;
+}
+
+void Analyzer_InputFloat(Analyzer* analyzer, float* data, int sampleCt){
+	if(sampleCt == 0 || !analyzer)
+		return;
+	analyzer->input(data, data + sampleCt);
+}
+
+void Analyzer_InputShort(Analyzer* analyzer, short* data, int sampleCt){
+	if(sampleCt == 0 || !analyzer)
+		return;
+	float* dataFloat = short2FloatArray(data, sampleCt);
+	analyzer->input(dataFloat, dataFloat + sampleCt);
+	freeFloatArray(dataFloat);  
+}
+
+void Analyzer_InputByte(Analyzer* analyzer, char* data, int sampleCt){
+	if(sampleCt <= 0 || !analyzer)
+		return;
+	float* dataFloat = short2FloatArray(static_cast<short*>(static_cast<void*>(data)), sampleCt);
+	analyzer->input(dataFloat, dataFloat + sampleCt);
+	freeFloatArray(dataFloat);
+}
+
+void Analyzer_Process(Analyzer* analyzer){
+	if(!analyzer)
+		return;
+    analyzer->process();
+}
+
+float Analyzer_GetPeak(Analyzer* analyzer){
+	if(!analyzer)
+		return -999;
+	return static_cast<float>(analyzer->getPeakRaw());
+}
+
+double Analyzer_FindNote(Analyzer* analyzer, double minFreq, double maxFreq){
+	if(!analyzer)
+		return -1;
+	const Tone* tone = analyzer->findTone(minFreq, maxFreq);
+	return (tone == NULL) ? -1 : FreqToNote(tone->freq);
+}
+
+bool Analyzer_OutputFloat(Analyzer* analyzer, float* data, int sampleCt, float rate){
+	if(!analyzer)
+		return false;
+    return analyzer->output(data, data + sampleCt, rate);
+}
+
+PtAKF* PtAKF_Create(unsigned step){
+	return new PtAKF(step);
+}
+
+void PtAKF_Free(PtAKF* analyzer){
+	if(analyzer)
+		delete analyzer;
+}
+
+int PtAKF_GetNumHalfTones(){
+	return PtAKF::GetNumHalfTones();
+}
+
+void PtAKF_SetVolumeThreshold(PtAKF* analyzer, float threshold){
+	if(!analyzer)
+		return;
+	analyzer->SetVolumeThreshold(threshold);
+}
+
+float PtAKF_GetVolumeThreshold(PtAKF* analyzer){
+	if(!analyzer)
+		return 0.f;
+	return analyzer->GetVolumeThreshold();
+}
+
+void PtAKF_InputByte(PtAKF* analyzer, char* data, int sampleCt){
+	if(sampleCt <= 0 || !analyzer)
+		return;
+	//short* dataShort = static_cast<short*>(static_cast<void*>(data));
+	float* dataFloat = short2FloatArray(static_cast<short*>(static_cast<void*>(data)), sampleCt);
+	analyzer->input(dataFloat, dataFloat + sampleCt);
+	freeFloatArray(dataFloat);
+
+	//analyzer->input(dataShort, dataShort + sampleCt);
+}
+
+int PtAKF_GetNote(PtAKF* analyzer, float* maxVolume, float* weights){
+	if(!analyzer)
+		return -1;
+	return analyzer->GetNote(maxVolume, weights);
+}
+
+PtDyWa* PtDyWa_Create(unsigned step){
+	return new PtDyWa(step);
+}
+
+void PtDyWa_Free(PtDyWa* analyzer){
+	if(analyzer)
+		delete analyzer;
+}
+
+void PtDyWa_SetVolumeTreshold(PtDyWa* analyzer, float threshold){
+	if(!analyzer)
+		return;
+	analyzer->SetVolumeThreshold(threshold);
+}
+
+float PtDyWa_GetVolumeThreshold(PtDyWa* analyzer){
+	if(!analyzer)
+		return 0.f;
+	return analyzer->GetVolumeThreshold();
+}
+
+void PtDyWa_InputByte(PtDyWa* analyzer, char* data, int sampleCt){
+	if(sampleCt <= 0 || !analyzer)
+		return;
+	float* dataFloat = short2FloatArray(static_cast<short*>(static_cast<void*>(data)), sampleCt);
+	analyzer->input(dataFloat, dataFloat + sampleCt);
+	freeFloatArray(dataFloat);
+}
+
+double PtDyWa_FindNote(PtDyWa* analyzer, float* maxVolume){
+	if(!analyzer)
+		return -1;
+	return analyzer->FindNote(maxVolume);
+}
+
+/*
+namespace Native{
+	namespace PitchTracking{
+
+		//CAnalyzer
+
+		void CAnalyzer::Input(array<float>^ data){
+			if(data->Length == 0)
+				return;
+			pin_ptr<float> dataPtr = &data[0];
+			float* dataPtr2 = dataPtr;
+			m_analyzer->input(dataPtr2, dataPtr2 + data->Length);
+		}
+
+		void CAnalyzer::Input(array<short>^ data){
+			if(data->Length == 0)
+				return;
+			pin_ptr<short> dataPtr = &data[0];
+			float* dataFloat = short2FloatArray(dataPtr, data->Length);
+			m_analyzer->input(dataFloat, dataFloat + data->Length);
+			freeFloatArray(dataFloat);
+		}
+
+		void CAnalyzer::Input(array<Byte>^ data){
+			if(data->Length == 0)
+				return;
+			pin_ptr<Byte> dataPtr = &data[0];
+			float* dataFloat = short2FloatArray(static_cast<short*>(static_cast<void*>(dataPtr)), data->Length / 2);
+			m_analyzer->input(dataFloat, dataFloat + data->Length);
+			freeFloatArray(dataFloat);
+		}
+
+		void CAnalyzer::Process(){
+			m_analyzer->process();
+		}
+
+		double CAnalyzer::GetPeak(){
+			return m_analyzer->getPeak();
+		}
+
+		array<CTone^>^ CAnalyzer::GetTones(){
+			Analyzer::tones_t umTones = m_analyzer->getTones();
+			array<CTone^>^ tones = gcnew array<CTone^>(static_cast<int>(umTones.size()));
+			int i = 0;
+			for(auto it=umTones.begin(); it!=umTones.end(); it++, i++){
+				tones[i]=ConvertToneToManaged(*it);
+			}
+			return tones;
+		}
+
+		CTone^ CAnalyzer::FindTone(){
+			return FindTone(65.0);
+		}
+
+		CTone^ CAnalyzer::FindTone(double minFreq){
+			return FindTone(minFreq, 1000.0);
+		}
+
+		CTone^ CAnalyzer::FindTone(double minFreq, double maxFreq){
+			const Tone* tone = m_analyzer->findTone(minFreq, maxFreq);
+			return (tone == NULL) ? nullptr : ConvertToneToManaged(tone);
+		}
+
+		void CAnalyzer::Output(array<float>^ data, float rate){
+			pin_ptr<float> dataPtr = &data[0];
+			m_analyzer->output(dataPtr, dataPtr + data->Length, rate);
+		}
+
+		String^ CAnalyzer::GetId(){
+			return m_id;
+		}
+
+
+		//CPitchTracker
+
+		void CPitchTracker::Init(double baseToneFrequency, int minHalfTone, int maxHalfTone){
+			PitchTracker::Init(baseToneFrequency, minHalfTone, maxHalfTone);
+		}
+
+		void CPitchTracker::DeInit(){
+			PitchTracker::DeInit();
+		}
+
+		int CPitchTracker::GetTone(array<short>^ samples, array<float>^ weights){
+			if(samples->Length == 0)
+				return -1;
+			pin_ptr<short> dataPtr = &samples[0];
+			pin_ptr<float> weightsPtr = &weights[0];
+			double* dataDouble = short2DoubleArray(dataPtr, samples->Length, false);
+			int result = PitchTracker::GetTone(dataDouble, samples->Length, weightsPtr, true);
+			freeDoubleArray(dataDouble);
+			return result;
+		}
+	}
+}
+*/
\ No newline at end of file
diff --git a/PitchTracker/PitchWrapper.h b/PitchTracker/PitchWrapper.h
new file mode 100644
index 00000000..11b32b84
--- /dev/null
+++ b/PitchTracker/PitchWrapper.h
@@ -0,0 +1,85 @@
+#pragma once
+
+#include "performous/pitch.hh"
+#include "ptAKF.h"
+#include "dywapitchtrack/ptDyWa.h"
+
+#define DllExport extern "C" __declspec(dllexport)
+
+DllExport Analyzer* Analyzer_Create(unsigned step);
+DllExport void Analyzer_Free(Analyzer* analyzer);
+DllExport void Analyzer_InputFloat(Analyzer* analyzer, float* data, int sampleCt);
+DllExport void Analyzer_InputShort(Analyzer* analyzer, short* data, int sampleCt);
+DllExport void Analyzer_InputByte(Analyzer* analyzer, char* data, int sampleCt);
+DllExport void Analyzer_Process(Analyzer* analyzer);
+DllExport float Analyzer_GetPeak(Analyzer* analyzer);
+DllExport double Analyzer_FindNote(Analyzer* analyzer, double minFreq, double maxFreq);
+DllExport bool Analyzer_OutputFloat(Analyzer* analyzer, float* data, int sampleCt, float rate);
+
+DllExport PtAKF* PtAKF_Create(unsigned step);
+DllExport void PtAKF_Free(PtAKF* analyzer);
+DllExport int PtAKF_GetNumHalfTones();
+DllExport void PtAKF_SetVolumeThreshold(PtAKF* analyzer, float threshold);
+DllExport float PtAKF_GetVolumeThreshold(PtAKF* analyzer);
+DllExport void PtAKF_InputByte(PtAKF* analyzer, char* data, int sampleCt);
+DllExport int PtAKF_GetNote(PtAKF* analyzer, float* maxVolume, float* weights);
+
+DllExport PtDyWa* PtDyWa_Create(unsigned step);
+DllExport void PtDyWa_Free(PtDyWa* analyzer);
+DllExport void PtDyWa_SetVolumeTreshold(PtDyWa* analyzer,float threshold);
+DllExport float PtDyWa_GetVolumeThreshold(PtDyWa* analyzer);
+DllExport void PtDyWa_InputByte(PtDyWa* analyzer, char* data, int sampleCt);
+DllExport double PtDyWa_FindNote(PtDyWa* analyzer, float* maxVolume);
+
+/*
+public ref class CTone {
+public:
+	static const int MAXHARM = 48; ///< The maximum number of harmonics tracked
+	static const int MINAGE = 2; ///< The minimum age required for a tone to be output
+	double Freq; ///< Frequency (Hz)
+	double DB; ///< Level (dB)
+	double Stabledb; ///< Stable level, useful for graphics rendering
+	int Age; ///< How many times the tone has been detected in row
+	double NoteExact;
+	int Note;
+	/// Less-than compare by levels (instead of frequencies like operator< does)
+	static bool dbCompare(CTone l, CTone r) { return l.DB < r.DB; }
+};
+
+public ref class CAnalyzer {
+public:
+	CAnalyzer(double rate, String^ id) {
+		m_analyzer = new Analyzer(rate,"");
+		m_id = id;
+	}
+	CAnalyzer(double rate, String^ id, unsigned step) {
+		m_analyzer = new Analyzer(rate,"",step);
+		m_id = id;
+	}
+	~CAnalyzer() { this->!CAnalyzer(); }
+	!CAnalyzer() { delete m_analyzer; }
+
+	void Input(array<float>^ data);
+	void Input(array<short>^ data);
+	void Input(array<Byte>^ data);
+	void Process();
+	double GetPeak();
+	array<CTone^>^ GetTones();
+	CTone^ FindTone();
+	CTone^ FindTone(double minFreq);
+	CTone^ FindTone(double minFreq, double maxFreq);
+	void Output(array<float>^ data, float rate);
+	String^ GetId();
+
+private:
+	Analyzer* m_analyzer;
+	String^ m_id;
+};
+
+public ref class CPitchTracker abstract sealed{
+public:
+	static void Init(double baseToneFrequency, int minHalfTone, int maxHalfTone);
+	static void DeInit();
+	static int GetTone(array<short>^ samples, array<float>^ weights);
+};
+*/
\ No newline at end of file
diff --git a/PitchTracker/TestSounds.rar b/PitchTracker/TestSounds.rar
new file mode 100644
index 00000000..3e956da1
Binary files /dev/null and b/PitchTracker/TestSounds.rar differ
diff --git a/PitchTracker/compatibility.cpp b/PitchTracker/compatibility.cpp
new file mode 100644
index 00000000..207b750d
--- /dev/null
+++ b/PitchTracker/compatibility.cpp
@@ -0,0 +1,30 @@
+#include "compatibility.h"
+
+#include <math.h> 
+
+#ifdef _MSC_VER
+#if(_MSC_VER < 1800) // < VS2013
+namespace std
+{
+	float round(float d)
+	{
+		return static_cast<float>(floor(d + 0.5));
+	}
+
+	double round(double d)
+	{
+		return floor(d + 0.5);
+	}
+
+	long double round(long double d)
+	{
+		return floor(d + 0.5);
+	}
+
+}
+
+double remainder(double num, double denom){
+	return num - std::round(num/denom) * denom;
+}
+#endif
+#endif
\ No newline at end of file
diff --git a/PitchTracker/compatibility.h b/PitchTracker/compatibility.h
new file mode 100644
index 00000000..ebdf8a88
--- /dev/null
+++ b/PitchTracker/compatibility.h
@@ -0,0 +1,17 @@
+//Contains some definitions to make the code work with compilers that do not support all feautures
+
+#pragma once
+
+#ifdef _MSC_VER
+	#define constexpr const
+	#if(_MSC_VER < 1800) // < VS2013
+		namespace std
+		{
+			float round(float d);
+			double round(double d);
+			long double round(long double d);
+		}
+
+		double remainder(double num, double denom);
+	#endif
+#endif
\ No newline at end of file
diff --git a/PitchTracker/dywapitchtrack/DOCUMENTATION.txt b/PitchTracker/dywapitchtrack/DOCUMENTATION.txt
new file mode 100644
index 00000000..7c064fe7
--- /dev/null
+++ b/PitchTracker/dywapitchtrack/DOCUMENTATION.txt
@@ -0,0 +1,29 @@
+
+dywapitchtrack pitch tracking library
+Documentation
+
+The dywapitchtrack library computes the pitch of an audio stream in real time. The pitch is the main frequency of the waveform (the 'note' being played or sung). It is expressed as a float in Hz.
+
+Unlike the human ear, pitch detection is difficult to achieve for computers. Many algorithms have been designed and experimented, but there is no 'best' algorithm. They all depend on the context and the tradeoffs acceptable in terms of speed and latency. The context includes the quality and 'cleanness' of the audio : obviously polyphonic sounds (multiple instruments playing different notes at the same time) are extremely difficult to track, percussive or noisy audio has no pitch, most real-life audio have some noisy moments, some instruments have a lot of harmonics, etc...
+
+The dywapitchtrack is based on a custom-tailored algorithm which is of very high quality: both very accurate (precision < 0.05 semitones), very low latency (< 23 ms) and very low error rate. It has been thoroughly tested on human voice.
+
+It can best be described as a dynamic wavelet algorithm (dywa):
+
+The heart of the algorithm is a very powerful wavelet algorithm, described in a paper by Eric Larson and Ross Maddox :
+"Real-Time Time-Domain Pitch Tracking Using Wavelets" http://online.physics.uiuc.edu/courses/phys406/NSF_REU_Reports/2005_reu/Real-Time_Time-Domain_Pitch_Tracking_Using_Wavelets.pdf
+
+This central algorithm has been improved by adding dynamic tracking, to reduce the common problems of frequency-halving and voiced/unvoiced errors. This dynamic tracking explains the need for a tracking structure (dywapitchtracker). The dynamic tracking assumes that the main function dywapitch_computepitch is called repeatedly, as it follows the pitch over time and makes assumptions about human voice capabilities and reallife conditions (as documented inside the code).
+
+Note : The algorithm currently assumes a 44100Hz audio sampling rate. If you use a different samplerate, you can just multiply the resulting pitch by the ratio between your samplerate and 44100.
+
+See the dywapitchtrack.h file for the library API documentation.
+
+History :
+This algorithm has been designed during a mission for a customer. As I had kept the author's rights on the source code, I eventually decided to make this code public and open source, because it is of really high quality. This algorithms has been extensibely tested, especially it has been included in an Adobe Director Xtra (plugin), asPitchDetect Xtra, that has been distributed widely for a few years.
+
+I hope that it can be used with pleasure and efficiency in your project.
+
+Thank you
+Antoine Schmitt April 2010
+
diff --git a/PitchTracker/dywapitchtrack/README.txt b/PitchTracker/dywapitchtrack/README.txt
new file mode 100644
index 00000000..db8bfbcc
--- /dev/null
+++ b/PitchTracker/dywapitchtrack/README.txt
@@ -0,0 +1,43 @@
+dywapitchtrack
+Dynamic Wavelet Algorithm Pitch Tracking library
+
+Copyright (c) 2010 Antoine Schmitt as@schmittmachine.com
+
+-- Documentation
+
+See the dywapitchtrack.h file for the library API documentation.
+
+
+-- Version history
+
+Inital release : Antoine Schmitt April 2010
+jan 2012 : Minor update : changed the link to the Eric Larson and Ross Maddox paper
+apr 2012 : Included the SpeakHere iPhone app example
+
+-- Building, Installing
+
+- the algorithm can be included directly in your project by including the .h and .c files. 
+- the iPhone/dywapitchtrack.xcodeproj builds an iPhone static library, against which one can statically link an iPhone application.
+
+
+-- MIT open source licence
+ 
+ Copyright (c) 2010 Antoine Schmitt
+  
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
diff --git a/PitchTracker/dywapitchtrack/dywapitchtrack.cpp b/PitchTracker/dywapitchtrack/dywapitchtrack.cpp
new file mode 100644
index 00000000..ec17f052
--- /dev/null
+++ b/PitchTracker/dywapitchtrack/dywapitchtrack.cpp
@@ -0,0 +1,451 @@
+/* dywapitchtrack.c
+ 
+ Dynamic Wavelet Algorithm Pitch Tracking library
+ Released under the MIT open source licence
+  
+ Copyright (c) 2010 Antoine Schmitt
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+*/
+
+#include "dywapitchtrack.h"
+#include <math.h>
+#include <stdlib.h>
+#include <string.h> // for memset
+
+
+//**********************
+//       Utils
+//**********************
+
+#ifndef max
+#define max(x, y) ((x) > (y)) ? (x) : (y)
+#endif
+#ifndef min
+#define min(x, y) ((x) < (y)) ? (x) : (y)
+#endif
+
+// returns 1 if power of 2
+int _power2p(int value) {
+	if (value == 0) return 1;
+	if (value == 2) return 1;
+	if (value & 0x1) return 0;
+	return (_power2p(value >> 1));
+}
+
+// count number of bits
+int _bitcount(int value) {
+	if (value == 0) return 0;
+	if (value == 1) return 1;
+	if (value == 2) return 2;
+	return _bitcount(value >> 1) + 1;
+}
+
+// closest power of 2 above or equal
+int _ceil_power2(int value) {
+	if (_power2p(value)) return value;
+	
+	if (value == 1) return 2;
+	int j, i = _bitcount(value);
+	int res = 1;
+	for (j = 0; j < i; j++) res <<= 1;
+	return res;
+}
+
+// closest power of 2 below or equal
+int _floor_power2(int value) {
+	if (_power2p(value)) return value;
+	return _ceil_power2(value)/2;
+}
+
+// abs value
+int _iabs(int x) {
+	if (x >= 0) return x;
+	return -x;
+}
+
+// 2 power
+int _2power(int i) {
+	int res = 1, j;
+	for (j = 0; j < i; j++) res <<= 1;
+	return res;
+}
+
+//******************************
+// the Wavelet algorithm itself
+//******************************
+
+int dywapitch_neededsamplecount(int minFreq) {
+	int nbSam = 3*44100/minFreq; // 1017. for 130 Hz
+	nbSam = _ceil_power2(nbSam); // 1024
+	return nbSam;
+}
+
+typedef struct _minmax {
+	int index;
+	struct _minmax *next;
+} minmax;
+
+double _dywapitch_computeWaveletPitch(double * samples, int startsample, int samplecount, float* maxVolume, double volThreshold) {
+	double pitchF = 0.0;
+	
+	int i, j;
+	double si, si1;
+	
+	// must be a power of 2
+	samplecount = _floor_power2(samplecount);
+	
+	double *sam = (double *)malloc(sizeof(double)*samplecount);
+	memcpy(sam, samples + startsample, sizeof(double)*samplecount);
+	int curSamNb = samplecount;
+	
+	int *distances = (int *)malloc(sizeof(int)*samplecount);
+	int *mins = (int *)malloc(sizeof(int)*samplecount);
+	int *maxs = (int *)malloc(sizeof(int)*samplecount);
+	int nbMins, nbMaxs;
+	
+	// algorithm parameters
+	int maxFLWTlevels = 6;
+	double maxF = 3000.;
+	int differenceLevelsN = 3;
+	double maximaThresholdRatio = 0.75;
+	
+	double ampltitudeThreshold;  
+	double theDC = 0.0;
+	
+	{ // compute ampltitudeThreshold and theDC
+		//first compute the DC and maxAMplitude
+		double maxValue = 0.0;
+		double minValue = 0.0;
+		for (i = 0; i < samplecount;i++) {
+			si = sam[i];
+			theDC = theDC + si;
+			if (si > maxValue) maxValue = si;
+			if (si < minValue) minValue = si;
+		}
+		theDC = theDC/samplecount;
+		maxValue = maxValue - theDC;
+		minValue = minValue - theDC;
+		double amplitudeMax = (maxValue > -minValue ? maxValue : -minValue);
+		*maxVolume = static_cast<float>(amplitudeMax + theDC);
+		if(*maxVolume < volThreshold)
+			return 0.0;
+		
+		ampltitudeThreshold = amplitudeMax*maximaThresholdRatio;
+		//asLog("dywapitch theDC=%f ampltitudeThreshold=%f\n", theDC, ampltitudeThreshold);
+		
+	}
+	
+	// levels, start without downsampling..
+	int curLevel = 0;
+	double curModeDistance = -1.;
+	int delta;
+	
+	while(1) {
+		
+		// delta
+		delta = static_cast<int>(44100./(_2power(curLevel)*maxF));
+		//("dywapitch doing level=%ld delta=%ld\n", curLevel, delta);
+		
+		if (curSamNb < 2) goto cleanup;
+		
+		// compute the first maximums and minumums after zero-crossing
+		// store if greater than the min threshold
+		// and if at a greater distance than delta
+		double dv, previousDV = -1000;
+		nbMins = nbMaxs = 0;   
+		int lastMinIndex = -1000000;
+		int lastmaxIndex = -1000000;
+		int findMax = 0;
+		int findMin = 0;
+		for (i = 2; i < curSamNb; i++) {
+			si = sam[i] - theDC;
+			si1 = sam[i-1] - theDC;
+			
+			if (si1 <= 0 && si > 0) findMax = 1;
+			if (si1 >= 0 && si < 0) findMin = 1;
+			
+			// min or max ?
+			dv = si - si1;
+			
+			if (previousDV > -1000) {
+				
+				if (findMin && previousDV < 0 && dv >= 0) { 
+					// minimum
+					if (fabs(si) >= ampltitudeThreshold) {
+						if (i > lastMinIndex + delta) {
+							mins[nbMins++] = i;
+							lastMinIndex = i;
+							findMin = 0;
+							//if DEBUGG then put "min ok"&&si
+							//
+						} else {
+							//if DEBUGG then put "min too close to previous"&&(i - lastMinIndex)
+							//
+						}
+					} else {
+						// if DEBUGG then put "min "&abs(si)&" < thresh = "&ampltitudeThreshold
+						//--
+					}
+				}
+				
+				if (findMax && previousDV > 0 && dv <= 0) {
+					// maximum
+					if (fabs(si) >= ampltitudeThreshold) {
+						if (i > lastmaxIndex + delta) {
+							maxs[nbMaxs++] = i;
+							lastmaxIndex = i;
+							findMax = 0;
+						} else {
+							//if DEBUGG then put "max too close to previous"&&(i - lastmaxIndex)
+							//--
+						}
+					} else {
+						//if DEBUGG then put "max "&abs(si)&" < thresh = "&ampltitudeThreshold
+						//--
+					}
+				}
+			}
+			
+			previousDV = dv;
+		}
+		
+		if (nbMins == 0 && nbMaxs == 0) {
+			// no best distance !
+			//asLog("dywapitch no mins nor maxs, exiting\n");
+			
+			// if DEBUGG then put "no mins nor maxs, exiting"
+			goto cleanup;
+		}
+		//if DEBUGG then put count(maxs)&&"maxs &"&&count(mins)&&"mins"
+		
+		// maxs = [5, 20, 100,...]
+		// compute distances
+		int d;
+		memset(distances, 0, samplecount*sizeof(int));
+		for (i = 0 ; i < nbMins ; i++) {
+			for (j = 1; j < differenceLevelsN; j++) {
+				if (i+j < nbMins) {
+					d = _iabs(mins[i] - mins[i+j]);
+					//asLog("dywapitch i=%ld j=%ld d=%ld\n", i, j, d);
+					distances[d] = distances[d] + 1;
+				}
+			}
+		}
+		for (i = 0 ; i < nbMaxs ; i++) {
+			for (j = 1; j < differenceLevelsN; j++) {
+				if (i+j < nbMaxs) {
+					d = _iabs(maxs[i] - maxs[i+j]);
+					//asLog("dywapitch i=%ld j=%ld d=%ld\n", i, j, d);
+					distances[d] = distances[d] + 1;
+				}
+			}
+		}
+		
+		// find best summed distance
+		int bestDistance = -1;
+		int bestValue = -1;
+		for (i = 0; i< curSamNb; i++) {
+			int summed = 0;
+			for (j = -delta ; j <= delta ; j++) {
+				if (i+j >=0 && i+j < curSamNb)
+					summed += distances[i+j];
+			}
+			//asLog("dywapitch i=%ld summed=%ld bestDistance=%ld\n", i, summed, bestDistance);
+			if (summed == bestValue) {
+				if (i == 2*bestDistance)
+					bestDistance = i;
+				
+			} else if (summed > bestValue) {
+				bestValue = summed;
+				bestDistance = i;
+			}
+		}
+		//asLog("dywapitch bestDistance=%ld\n", bestDistance);
+		
+		// averaging
+		double distAvg = 0.0;
+		double nbDists = 0;
+		for (j = -delta ; j <= delta ; j++) {
+			if (bestDistance+j >=0 && bestDistance+j < samplecount) {
+				int nbDist = distances[bestDistance+j];
+				if (nbDist > 0) {
+					nbDists += nbDist;
+					distAvg += (bestDistance+j)*nbDist;
+				}
+			}
+		}
+		// this is our mode distance !
+		distAvg /= nbDists;
+		//asLog("dywapitch distAvg=%f\n", distAvg);
+		
+		// continue the levels ?
+		if (curModeDistance > -1.) {
+			double similarity = fabs(distAvg*2 - curModeDistance);
+			if (similarity <= 2*delta) {
+				//if DEBUGG then put "similarity="&similarity&&"delta="&delta&&"ok"
+ 				//asLog("dywapitch similarity=%f OK !\n", similarity);
+				// two consecutive similar mode distances : ok !
+				pitchF = 44100./(_2power(curLevel-1)*curModeDistance);
+				goto cleanup;
+			}
+			//if DEBUGG then put "similarity="&similarity&&"delta="&delta&&"not"
+		}
+		
+		// not similar, continue next level
+		curModeDistance = distAvg;
+		
+		curLevel = curLevel + 1;
+		if (curLevel >= maxFLWTlevels) {
+			// put "max levels reached, exiting"
+ 			//asLog("dywapitch max levels reached, exiting\n");
+			goto cleanup;
+		}
+		
+		// downsample
+		if (curSamNb < 2) {
+ 			//asLog("dywapitch not enough samples, exiting\n");
+			goto cleanup;
+		}
+		for (i = 0; i < curSamNb/2; i++) {
+			sam[i] = (sam[2*i] + sam[2*i + 1])/2.;
+		}
+		curSamNb /= 2;
+	}
+	
+	///
+cleanup:
+	free(distances);
+	free(mins);
+	free(maxs);
+	free(sam);
+	
+	return pitchF;
+}
+
+// ***********************************
+// the dynamic postprocess
+// ***********************************
+
+/***
+It states: 
+ - a pitch cannot change much all of a sudden (20%) (impossible humanly,
+ so if such a situation happens, consider that it is a mistake and drop it. 
+ - a pitch cannot double or be divided by 2 all of a sudden : it is an
+ algorithm side-effect : divide it or double it by 2. 
+ - a lonely voiced pitch cannot happen, nor can a sudden drop in the middle
+ of a voiced segment. Smooth the plot. 
+***/
+
+double _dywapitch_dynamicprocess(dywapitchtracker *pitchtracker, double pitch) {
+	
+	// equivalence
+	if (pitch == 0.0) pitch = -1.0;
+	
+	//
+	double estimatedPitch = -1;
+	double acceptedError = 0.2f;
+	int maxConfidence = 5;
+	
+	if (pitch != -1) {
+		// I have a pitch here
+		
+		if (pitchtracker->_prevPitch == -1) {
+			// no previous
+			estimatedPitch = pitch;
+			pitchtracker->_prevPitch = pitch;
+			pitchtracker->_pitchConfidence = 1;
+			
+		} else if (abs(pitchtracker->_prevPitch - pitch)/pitch < acceptedError) {
+			// similar : remember and increment pitch
+			pitchtracker->_prevPitch = pitch;
+			estimatedPitch = pitch;
+			pitchtracker->_pitchConfidence = min(maxConfidence, pitchtracker->_pitchConfidence + 1); // maximum 3
+			
+		} else if ((pitchtracker->_pitchConfidence >= maxConfidence-2) && abs(pitchtracker->_prevPitch - 2.*pitch)/(2.*pitch) < acceptedError) {
+			// close to half the last pitch, which is trusted
+			estimatedPitch = 2.*pitch;
+			pitchtracker->_prevPitch = estimatedPitch;
+			
+		} else if ((pitchtracker->_pitchConfidence >= maxConfidence-2) && abs(pitchtracker->_prevPitch - 0.5*pitch)/(0.5*pitch) < acceptedError) {
+			// close to twice the last pitch, which is trusted
+			estimatedPitch = 0.5*pitch;
+			pitchtracker->_prevPitch = estimatedPitch;
+			
+		} else {
+			// nothing like this : very different value
+			if (pitchtracker->_pitchConfidence >= 1) {
+				// previous trusted : keep previous
+				estimatedPitch = pitchtracker->_prevPitch;
+				pitchtracker->_pitchConfidence = max(0, pitchtracker->_pitchConfidence - 1);
+			} else {
+				// previous not trusted : take current
+				estimatedPitch = pitch;
+				pitchtracker->_prevPitch = pitch;
+				pitchtracker->_pitchConfidence = 1;
+			}
+		}
+		
+	} else {
+		// no pitch now
+		if (pitchtracker->_prevPitch != -1) {
+			// was pitch before
+			if (pitchtracker->_pitchConfidence >= 1) {
+				// continue previous
+				estimatedPitch = pitchtracker->_prevPitch;
+				pitchtracker->_pitchConfidence = max(0, pitchtracker->_pitchConfidence - 1);
+			} else {
+				pitchtracker->_prevPitch = -1;
+				estimatedPitch = -1.;
+				pitchtracker->_pitchConfidence = 0;
+			}
+		}
+	}
+	
+	// put "_pitchConfidence="&pitchtracker->_pitchConfidence
+	if (pitchtracker->_pitchConfidence >= 1) {
+		// ok
+		pitch = estimatedPitch;
+	} else {
+		pitch = -1;
+	}
+	
+	// equivalence
+	if (pitch == -1) pitch = 0.0;
+	
+	return pitch;
+}
+
+
+// ************************************
+// the API main entry points
+// ************************************
+
+void dywapitch_inittracking(dywapitchtracker *pitchtracker) {
+	pitchtracker->_prevPitch = -1.;
+	pitchtracker->_pitchConfidence = -1;
+}
+
+double dywapitch_computepitch(dywapitchtracker *pitchtracker, double * samples, int startsample, int samplecount, float* maxVolume, double volThreshold) {
+	double raw_pitch = _dywapitch_computeWaveletPitch(samples, startsample, samplecount, maxVolume, volThreshold);
+	return _dywapitch_dynamicprocess(pitchtracker, raw_pitch);
+}
+
+
+
diff --git a/PitchTracker/dywapitchtrack/dywapitchtrack.h b/PitchTracker/dywapitchtrack/dywapitchtrack.h
new file mode 100644
index 00000000..95767c29
--- /dev/null
+++ b/PitchTracker/dywapitchtrack/dywapitchtrack.h
@@ -0,0 +1,110 @@
+/* dywapitchtrack.h
+ 
+ Dynamic Wavelet Algorithm Pitch Tracking library
+ Released under the MIT open source licence
+ 
+ Copyright (c) 2010 Antoine Schmitt
+  
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+*/
+
+/* Documentation
+ 
+ The dywapitchtrack library computes the pitch of an audio stream in real time.
+ 
+ The pitch is the main frequency of the waveform (the 'note' being played or sung).
+ It is expressed as a float in Hz.
+ 
+ Unlike the human ear, pitch detection is difficult to achieve for computers. Many
+ algorithms have been designed and experimented, but there is no 'best' algorithm.
+ They all depend on the context and the tradeoffs acceptable in terms of speed and
+ latency. The context includes the quality and 'cleanness' of the audio : obviously
+ polyphonic sounds (multiple instruments playing different notes at the same time)
+ are extremely difficult to track, percussive or noisy audio has no pitch, most
+ real-life audio have some noisy moments, some instruments have a lot of harmonics,
+ etc...
+ 
+ The dywapitchtrack is based on a custom-tailored algorithm which is of very high quality:
+ both very accurate (precision < 0.05 semitones), very low latency (< 23 ms) and
+ very low error rate. It has been  thoroughly tested on human voice.
+ 
+ It can best be described as a dynamic wavelet algorithm (dywa):
+ 
+ The heart of the algorithm is a very powerful wavelet algorithm, described in a paper
+ by Eric Larson and Ross Maddox : "Real-Time Time-Domain Pitch Tracking Using Wavelets"
+ http://online.physics.uiuc.edu/courses/phys498pom/NSF_REU_Reports/2005_reu/Real-Time_Time-Domain_Pitch_Tracking_Using_Wavelets.pdf
+ 
+ This central algorithm has been improved by adding dynamic tracking, to reduce the
+ common problems of frequency-halving and voiced/unvoiced errors. This dynamic tracking
+ explains the need for a tracking structure (dywapitchtracker). The dynamic tracking assumes
+ that the main function dywapitch_computepitch is called repeatedly, as it follows the pitch
+ over time and makes assumptions about human voice capabilities and reallife conditions
+ (as documented inside the code).
+ 
+ Note : The algorithm currently assumes a 44100Hz audio sampling rate. If you use a different
+ samplerate, you can just multiply the resulting pitch by the ratio between your samplerate and 44100.
+*/
+
+/* Usage
+
+ // Allocate your audio buffers and start the audio stream.
+ // Allocate a 'dywapitchtracker' structure.
+ // Start the pitch tracking by calling 'dywapitch_inittracking'.
+ dywapitchtracker pitchtracker;
+ dywapitch_inittracking(&pitchtracker);
+ 
+ // For each available audio buffer, call 'dywapitch_computepitch'
+ double thepitch = dywapitch_computepitch(&pitchtracker, samples, start, count);
+ 
+*/
+
+#ifndef dywapitchtrack__H
+#define dywapitchtrack__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// structure to hold tracking data
+typedef struct _dywapitchtracker {
+	double	_prevPitch;
+	int		_pitchConfidence;
+} dywapitchtracker;
+
+// returns the number of samples needed to compute pitch for fequencies equal and above the given minFreq (in Hz)
+// useful to allocate large enough audio buffer 
+// ex : for frequencies above 130Hz, you need 1024 samples (assuming a 44100 Hz samplerate)
+int dywapitch_neededsamplecount(int minFreq);
+
+// call before computing any pitch, passing an allocated dywapitchtracker structure
+void dywapitch_inittracking(dywapitchtracker *pitchtracker);
+
+// computes the pitch. Pass the inited dywapitchtracker structure
+// samples : a pointer to the sample buffer
+// startsample : the index of the first sample to use in the sample buffer
+// samplecount : the number of samples to use to compte the pitch
+// return 0.0 if no pitch was found (sound too low, noise, etc..)
+double dywapitch_computepitch(dywapitchtracker *pitchtracker, double * samples, int startsample, int samplecount, float* maxVolume, double volThreshold);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif
+
diff --git a/PitchTracker/dywapitchtrack/ptDyWa.cpp b/PitchTracker/dywapitchtrack/ptDyWa.cpp
new file mode 100644
index 00000000..96572e27
--- /dev/null
+++ b/PitchTracker/dywapitchtrack/ptDyWa.cpp
@@ -0,0 +1,31 @@
+#include "ptDyWa.h"
+#include "../Helper.h"
+
+
+PtDyWa::PtDyWa(unsigned step){
+	_Step = step;
+	dywapitch_inittracking(&_State);
+	_VolTreshold = 0.01f;
+	_LastMaxVol = 0.f;
+}
+
+void PtDyWa::SetVolumeThreshold(float threshold){
+	_VolTreshold = threshold;
+}
+
+double PtDyWa::FindNote(float* maxVolume){
+	double AnaylsisBuf[_SampleCt];
+	size_t size = _AnalysisBuf.size();
+	if(size > _SampleCt)
+		_AnalysisBuf.pop(size - _SampleCt);
+	if(!_AnalysisBuf.read(AnaylsisBuf, AnaylsisBuf + _SampleCt)){
+		*maxVolume = _LastMaxVol * 0.85f;
+		return -1;
+	}
+	_AnalysisBuf.pop(_Step);
+	double pitch = dywapitch_computepitch(&_State, AnaylsisBuf, 0, _SampleCt, maxVolume, _VolTreshold);
+	if(pitch == 0.0)
+		return -1;
+	else
+		return FreqToNote(pitch);
+}
\ No newline at end of file
diff --git a/PitchTracker/dywapitchtrack/ptDyWa.h b/PitchTracker/dywapitchtrack/ptDyWa.h
new file mode 100644
index 00000000..dd0eb615
--- /dev/null
+++ b/PitchTracker/dywapitchtrack/ptDyWa.h
@@ -0,0 +1,24 @@
+#pragma once
+#include "../performous/pitch.hh"
+#include "dywapitchtrack.h"
+
+class PtDyWa{
+public:
+	PtDyWa(unsigned step);
+
+	/** Add input data to buffer. This is thread-safe (against other functions). **/
+	template <typename InIt> void input(InIt begin, InIt end) {
+		_AnalysisBuf.insert(begin, end);
+	}
+
+	double FindNote(float* maxVolume);
+	void SetVolumeThreshold(float threshold);
+	float GetVolumeThreshold(){return _VolTreshold;}
+private:
+	dywapitchtracker _State;
+	constexpr static size_t _SampleCt = 2048;
+	RingBuffer<_SampleCt * 2> _AnalysisBuf;
+	unsigned _Step;
+	float _VolTreshold;
+	float _LastMaxVol;
+};
\ No newline at end of file
diff --git a/PitchTracker/performous/License.txt b/PitchTracker/performous/License.txt
new file mode 100644
index 00000000..9a031336
--- /dev/null
+++ b/PitchTracker/performous/License.txt
@@ -0,0 +1,3 @@
+code is based on Performous: https://github.com/performous/performous/tree/master/game
+Some modifications were made to make it compile with VS2012, fix warnings and make it suitable for our needs
+From 25.03.2014
\ No newline at end of file
diff --git a/PitchTracker/performous/Performous.txt b/PitchTracker/performous/Performous.txt
new file mode 100644
index 00000000..5861375b
--- /dev/null
+++ b/PitchTracker/performous/Performous.txt
@@ -0,0 +1,346 @@
+GNU GPLv2 or later. Some parts of the project may have more liberal licenses.
+See Authors.txt for information on copyright holders and licenses of specific
+parts. Fonts are licensed under SIL OFL.
+
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
diff --git a/PitchTracker/performous/libda/fft.hpp b/PitchTracker/performous/libda/fft.hpp
new file mode 100644
index 00000000..1611c2fb
--- /dev/null
+++ b/PitchTracker/performous/libda/fft.hpp
@@ -0,0 +1,84 @@
+#pragma once
+
+/**
+ * @file fft.hpp FFT and related facilities.
+ */
+
+#include "sample.hpp"
+#include <complex>
+#include <cstddef>
+#include <vector>
+
+#ifndef M_PI
+#define M_PI 3.141592653589793
+#endif
+
+#define M_TAU (2.0 * M_PI)
+
+namespace da {
+
+	// With g++ optimization -fcx-limited-range should be used for 5x performance boost.
+	
+	// Based on the description of Volodymyr Myrnyy in
+	// http://www.dspdesignline.com/showArticle.jhtml?printableArticle=true&articleId=199903272
+	template<unsigned P, typename T> struct DanielsonLanczos {
+		static void apply(std::complex<T>* data) {
+			constexpr std::size_t N = 1 << P;
+			constexpr std::size_t M = N / 2;
+			// Compute even and odd halves
+			DanielsonLanczos<P - 1, T>().apply(data);
+			DanielsonLanczos<P - 1, T>().apply(data + M);
+			// Combine the results
+			std::complex<T> w(1.0);
+			for (std::size_t i = 0; i < M; ++i) {
+				const std::complex<T> temp = data[i + M] * w;
+				data[M + i] = data[i] - temp;
+				data[i] += temp;
+				w *= std::polar(1.0, -M_TAU / N);
+			}
+		}
+	};
+
+	template<typename T> struct DanielsonLanczos<0, T> { static void apply(std::complex<T>*) {} };
+
+	/** Perform FFT on data. **/
+	template<unsigned P, typename T> void fft(std::complex<T>* data) {
+		// Perform bit-reversal sorting of sample data.
+		constexpr std::size_t N = 1 << P;
+		std::size_t j = 0;
+		for (std::size_t i = 0; i < N; ++i) {
+			if (i < j) std::swap(data[i], data[j]);
+			std::size_t m = N / 2;
+			while (m > 1 && m <= j) { j -= m; m >>= 1; }
+			j += m;
+		}
+		// Do the actual calculation
+		DanielsonLanczos<P, T>::apply(data);
+	}
+
+	/** Perform FFT on data from floating point iterator, windowing the input. **/
+	template<unsigned P, typename InIt, typename Window> std::vector<std::complex<float> > fft(InIt begin, Window window) {
+		std::vector<std::complex<float> > data(1 << P);
+		// Perform bit-reversal sorting of sample data.
+		constexpr std::size_t N = 1 << P;
+		std::size_t j = 0;
+		for (std::size_t i = 0; i < N; ++i) {
+			data[j] = *begin++ * window[i];
+			std::size_t m = N / 2;
+			while (m > 1 && m <= j) { j -= m; m >>= 1; }
+			j += m;
+		}
+		// Do the actual calculation
+		DanielsonLanczos<P, float>::apply(&data[0]);
+		return data;
+	}
+
+	template<unsigned P, typename T> void ifft(std::complex<T>* data) {
+		constexpr std::size_t N = 1 << P;
+		for (std::size_t i = 0; i < N; ++i) data[i] = std::conj(data[i]);  // Invert phase so that we can use FFT to do IFFT
+		fft<P>(data);
+		constexpr std::complex<T> scale(1.0/N, 0.0);
+		for (std::size_t i = 0; i < N; ++i) data[i] = scale * std::conj(data[i]);  // Invert back, and apply IFFT scaling
+	}
+	
+}
diff --git a/PitchTracker/performous/libda/sample.hpp b/PitchTracker/performous/libda/sample.hpp
new file mode 100644
index 00000000..da55bda7
--- /dev/null
+++ b/PitchTracker/performous/libda/sample.hpp
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <cmath>
+
+/**
+ * @file sample.hpp Sample format definition and format conversions.
+ */
+
+namespace da {
+
+	using std::round;
+	
+	// Should be a floating-point type
+	typedef float sample_t;
+
+	// A helper function for clamping a value to a certain range
+	template <typename T> T clamp(T val, T min, T max) {
+		if (val < min) val = min;
+		if (val > max) val = max;
+		return val;
+	}
+
+	constexpr sample_t max_s16(32767), min_s16 = -max_s16 - sample_t(1);
+	constexpr sample_t max_s24(8388607), min_s24 = -max_s24 - sample_t(1);
+	constexpr sample_t max_s32(2147483647), min_s32= -max_s32 - sample_t(1);
+	constexpr double tau(6.2831853071795864769252867665590057683943387987502116);  ///< One full circle
+	constexpr double pi = tau / sample_t(2);  ///< Half circle
+	constexpr double eps(1e-10);  ///< Tiny positive value
+	
+	/// Mathematical sinc function
+	template<typename Float> static inline Float msinc(Float x) { return std::abs(x) < Float(eps) ? Float(1) : std::sin(x) / x; }
+	
+	/// Normalized (signal processing) sinc function
+	template<typename Float> static inline Float sinc(Float x) { return msinc(Float(pi) * x); }
+	
+	/// Lanczos kernel of size A
+	template<unsigned A, typename Float> static inline Float lanc(Float x) {
+		return std::abs(x) < A ? sinc(x) * sinc(x / A) : Float();
+	}
+
+	// The following conversions provide lossless conversions between floats
+	// and integers. Be sure to use only these conversions or otherwise the
+	// conversions may not be lossless, due to different scaling factors being
+	// used by different libraries.
+
+	// The negative minimum integer value produces sample_t value slightly
+	// more negative than -1.0 but this is necessary in order to prevent
+	// clipping in the float-to-int conversions. Now amplitude 1.0 in floating
+	// point produces -32767 .. 32767 symmetrical non-clipping range in s16.
+
+	static inline sample_t conv_from_s16(int s) { return s / max_s16; }
+	static inline sample_t conv_from_s24(int s) { return s / max_s24; }
+	static inline sample_t conv_from_s32(int s) { return s / max_s32; }
+	// The rounding is strictly not necessary, but it greatly improves
+	// the error tolerance if any floating point calculations are done.
+	// The ugly static_casts are required to avoid warnings in MSVC.
+	static inline int conv_to_s16(sample_t s) { return clamp(static_cast<int>(round(s * max_s16)), static_cast<int>(min_s16), static_cast<int>(max_s16)); }
+	static inline int conv_to_s24(sample_t s) { return clamp(static_cast<int>(round(s * max_s24)), static_cast<int>(min_s24), static_cast<int>(max_s24)); }
+	static inline int conv_to_s32(sample_t s) { return static_cast<int>(clamp(round(s * max_s32), min_s32, max_s32 )); }
+	// Non-rounding non-clamping versions are provided for very low end devices (still lossless)
+	static inline int conv_to_s16_fast(sample_t s) { return static_cast<int>(s * max_s16); }
+	static inline int conv_to_s24_fast(sample_t s) { return static_cast<int>(s * max_s24); }
+	static inline int conv_to_s32_fast(sample_t s) { return static_cast<int>(s * max_s32); }
+
+	template <typename ValueType> class step_iterator: public std::iterator<std::random_access_iterator_tag, ValueType> {
+		ValueType* m_pos;
+		std::ptrdiff_t m_step;
+	  public:
+		step_iterator(ValueType* pos, std::ptrdiff_t step): m_pos(pos), m_step(step) {}
+		ValueType& operator*() { return *m_pos; }
+		step_iterator operator+(std::ptrdiff_t rhs) { return step_iterator(m_pos + m_step * rhs, m_step); }
+		step_iterator& operator++() { m_pos += m_step; return *this; }
+		step_iterator operator++(int) { step_iterator ret = *this; ++*this; return ret; }
+		bool operator!=(step_iterator const& rhs) const { return m_pos != rhs.m_pos; }
+		std::ptrdiff_t operator-(step_iterator const& rhs) const { return (m_pos - rhs.m_pos) / m_step; }
+		// TODO: more operators
+	};
+
+	typedef step_iterator<sample_t> sample_iterator;
+	typedef step_iterator<sample_t const> sample_const_iterator;
+}
diff --git a/PitchTracker/performous/pitch.cc b/PitchTracker/performous/pitch.cc
new file mode 100644
index 00000000..a8453764
--- /dev/null
+++ b/PitchTracker/performous/pitch.cc
@@ -0,0 +1,235 @@
+#include "pitch.hh"
+
+#include "util.hh"
+#include "libda/fft.hpp"
+#include <cmath>
+#include <iostream>
+#include <iomanip>
+
+// Limit the range to avoid noise and useless computation
+static const double FFT_MINFREQ = 45.0;
+static const double FFT_MAXFREQ = 5000.0;
+
+Tone::Tone():
+  freq(0.0),
+  db(-getInf()),
+  stabledb(-getInf()),
+  age()
+{
+	for (auto& h: harmonics) h = -getInf();
+}
+
+void Tone::print() const {
+	if (age < Tone::MINAGE) return;
+	std::cout << std::fixed << std::setprecision(1) << freq << " Hz, age " << age << ", " << db << " dB:";
+	for (std::size_t i = 0; i < 8; ++i) std::cout << " " << harmonics[i];
+	std::cout << std::endl;
+}
+
+bool Tone::operator==(double f) const {
+	return std::abs(freq / f - 1.0) < 0.05;
+}
+
+Analyzer::Analyzer(double rate, std::string id, unsigned step):
+  m_step(step),
+  m_resampleFactor(1.0),
+  m_resamplePos(),
+  m_rate(rate),
+  m_id(id),
+  m_window(FFT_N),
+  m_fftLastPhase(FFT_N / 2),
+  m_peak(0.0),
+  m_oldfreq(0.0)
+{
+	if (m_step > FFT_N) throw std::logic_error("Analyzer step is larger that FFT_N (ideally it should be less than a fourth of FFT_N).");
+	// Hamming window
+	for (size_t i=0; i < FFT_N; i++) {
+		m_window[i] = static_cast<float>(0.53836 - 0.46164 * std::cos(2.0 * M_PI * i / (FFT_N - 1)));
+	}
+}
+
+bool Analyzer::output(float* begin, float* end, double rate) {
+	constexpr unsigned a = 2;
+	const size_t size = m_passthrough.size();
+	const unsigned out = static_cast<unsigned>((end - begin) / 2 /* stereo */);
+	if (out == 0) return false;
+	const unsigned in = static_cast<unsigned>(m_resampleFactor * (m_rate / rate) * out + 2 * a /* lanczos kernel */ + 5 /* safety margin for rounding errors */);
+	float pcm[m_passthrough.capacity];
+	if(!m_passthrough.read(pcm, pcm + in + 4))
+		return false;
+	for (unsigned i = 0; i < out; ++i) {
+		double s = 0.0;
+		unsigned k = static_cast<unsigned>(m_resamplePos);
+		double x = m_resamplePos - k;
+		// Lanczos sampling of input at m_resamplePos
+		for (unsigned j = 0; j <= 2 * a; ++j) s += pcm[k + j] * da::lanc<a>(x - j + a);
+		s *= 5.0;
+		begin[i * 2] += (float) s;
+		begin[i * 2 + 1] += (float) s;
+		m_resamplePos += m_resampleFactor;
+	}
+	unsigned num = static_cast<unsigned>(m_resamplePos);
+	m_resamplePos -= num;
+	if (size > 3000) {
+		// Reset
+		m_passthrough.pop(size - 700);
+		m_resampleFactor = 1.0;
+	} else {
+		m_passthrough.pop(num);
+		m_resampleFactor = 0.99 * m_resampleFactor + 0.01 * (size > 700 ? 1.02 : 0.98);
+	}
+	return true;
+}
+
+
+namespace {
+	struct Peak {
+		double freq;
+		double db;
+		bool harm[Tone::MAXHARM];
+		Peak(double _freq = 0.0, double _db = -getInf()):
+		  freq(_freq), db(_db)
+		{
+			for (auto& h: harm) h = false;
+		}
+		void clear() {
+			freq = 0.0;
+			db = -getInf();
+		}
+	};
+
+	Peak& match(std::vector<Peak>& peaks, std::size_t pos) {
+		std::size_t best = pos;
+		if (peaks[pos - 1].db > peaks[best].db) best = pos - 1;
+		if (peaks[pos + 1].db > peaks[best].db) best = pos + 1;
+		return peaks[best];
+	}
+}
+
+bool Analyzer::calcFFT() {
+	float pcm[FFT_N];
+	// Read FFT_N samples, move forward by m_step samples
+	if (!m_buf.read(pcm, pcm + FFT_N)) return false;
+	m_buf.pop(m_step);
+	// Peak level calculation of the most recent m_step samples (the rest is overlap)
+	for (float const* ptr = pcm + FFT_N - m_step; ptr != pcm + FFT_N; ++ptr) {
+		float s = *ptr;
+		float p = s * s;
+		if (p > m_peak) m_peak = p; else m_peak *= 0.999;
+	}
+	// Calculate FFT
+	m_fft = da::fft<FFT_P>(pcm, m_window);
+	return true;
+}
+
+void Analyzer::calcTones() {
+	// Precalculated constants
+	const double freqPerBin = m_rate / FFT_N;
+	const double phaseStep = 2.0 * M_PI * m_step / FFT_N;
+	const double normCoeff = 1.0 / FFT_N;
+	const double minMagnitude = pow(10, -100.0 / 20.0) / normCoeff; // -100 dB
+	// Limit frequency range of processing
+	const size_t kMin = std::max(size_t(1), size_t(FFT_MINFREQ / freqPerBin));
+	const size_t kMax = std::min(FFT_N / 2, size_t(FFT_MAXFREQ / freqPerBin));
+	std::vector<Peak> peaks(kMax + 1); // One extra to simplify loops
+	for (size_t k = 1; k <= kMax; ++k) {
+		double magnitude = std::abs(m_fft[k]);
+		double phase = std::arg(m_fft[k]);
+		// process phase difference
+		double delta = phase - m_fftLastPhase[k];
+		m_fftLastPhase[k] = static_cast<float>(phase);
+		delta -= k * phaseStep;  // subtract expected phase difference
+		delta = remainder(delta, M_PI);  // map delta phase into +/- M_PI interval
+		delta /= phaseStep;  // calculate diff from bin center frequency
+		double freq = (k + delta) * freqPerBin;  // calculate the true frequency
+		if (freq > 1.0 && magnitude > minMagnitude) {
+			peaks[k].freq = freq;
+			peaks[k].db = 20.0 * log10(normCoeff * magnitude);
+		}
+	}
+	// Prefilter peaks
+	double prevdb = peaks[0].db;
+	for (size_t k = 1; k < kMax; ++k) {
+		double db = peaks[k].db;
+		if (db > prevdb) peaks[k - 1].clear();
+		if (db < prevdb) peaks[k].clear();
+		prevdb = db;
+	}
+	// Find the tones (collections of harmonics) from the array of peaks
+	tones_t tones;
+	for (size_t k = kMax - 1; k >= kMin; --k) {
+		if (peaks[k].db < -70.0) continue;
+		// Find the best divider for getting the fundamental from peaks[k]
+		std::size_t bestDiv = 1;
+		int bestScore = 0;
+		for (std::size_t div = 2; div <= Tone::MAXHARM && k / div > 1; ++div) {
+			double freq = peaks[k].freq / div; // Fundamental
+			double db = peaks[k].db;
+			int score = 0;
+			for (std::size_t n = 1; n < div && n < 8; ++n) {
+				Peak& p = match(peaks, k * n / div);
+				--score;
+				if (std::abs(p.db/db - 1.0) > 0.4 || std::abs(p.freq / n / freq - 1.0) > .04) continue;
+				if (n == 1) score += 1; // Extra for fundamental
+				score += 2;
+			}
+			if (score >= bestScore) {
+				bestScore = score;
+				bestDiv = div;
+			}
+		}
+		// Construct a Tone by combining the fundamental frequency (freq) and all harmonics
+		Tone t;
+		std::size_t count = 0;
+		double freq = peaks[k].freq / bestDiv;
+		t.db = peaks[k].db;
+		for (std::size_t n = 1; n <= bestDiv; ++n) {
+			// Find the peak for n'th harmonic
+			Peak& p = match(peaks, k * n / bestDiv);
+			if (std::abs(p.freq / n / freq - 1.0) > .04) continue; // Does it match the fundamental freq?
+			if (std::abs(p.db/t.db - 1.0) > 0.4) continue;
+			t.db = std::max(t.db, p.db);
+			++count;
+			t.freq += p.freq / n;
+			t.harmonics[n - 1] = p.db;
+			p.clear();
+		}
+		t.freq /= count;
+		// If the tone seems strong enough, add it (-3 dB compensation for each harmonic)
+		if (t.db > -50.0 - 3.0 * count) {
+			t.stabledb = t.db;
+			tones.push_back(t);
+		}
+	}
+	mergeWithOld(tones);
+	m_tones.swap(tones);
+}
+
+void Analyzer::mergeWithOld(tones_t& tones) const {
+	tones.sort();
+	auto it = tones.begin();
+	// Iterate over old tones
+	for (auto const& old: m_tones) {
+		// Try to find a matching new tone
+		while (it != tones.end() && *it < old) ++it;
+		// If match found
+		if (it != tones.end() && *it == old) {
+			// Merge the old tone into the new tone
+			it->age = old.age + 1;
+			it->stabledb = 0.8 * old.stabledb + 0.2 * it->db;
+			it->freq = 0.5 * old.freq + 0.5 * it->freq;
+		} else if (old.db > -80.0) {
+			// Insert a decayed version of the old tone into new tones
+			Tone& t = *tones.insert(it, old);
+			t.db -= 5.0;
+			t.stabledb -= 0.1;
+		}
+	}
+}
+
+void Analyzer::process() {
+	// Try calculating FFT and calculate tones until no more data in input buffer
+	while (calcFFT()) calcTones();
+}
+
+
diff --git a/PitchTracker/performous/pitch.hh b/PitchTracker/performous/pitch.hh
new file mode 100644
index 00000000..f87a7638
--- /dev/null
+++ b/PitchTracker/performous/pitch.hh
@@ -0,0 +1,132 @@
+#pragma once
+
+#include <complex>
+#include <vector>
+#include <list>
+#include <algorithm>
+#include <cmath>
+#include "../compatibility.h"
+
+/// struct to represent tones
+struct Tone {
+	static const std::size_t MAXHARM = 48; ///< The maximum number of harmonics tracked
+	static const std::size_t MINAGE = 2; ///< The minimum age required for a tone to be output
+	double freq; ///< Frequency (Hz)
+	double db; ///< Level (dB)
+	double stabledb; ///< Stable level, useful for graphics rendering
+	double harmonics[MAXHARM]; ///< Harmonics' levels
+	std::size_t age; ///< How many times the tone has been detected in row
+	Tone(); 
+	void print() const; ///< Prints Tone to std::cout
+	bool operator==(double f) const; ///< Compare for rough frequency match
+	/// Less-than compare by levels (instead of frequencies like operator< does)
+	static bool dbCompare(Tone const& l, Tone const& r) { return l.db < r.db; }
+};
+
+static inline bool operator==(Tone const& lhs, Tone const& rhs) { return lhs == rhs.freq; }
+static inline bool operator!=(Tone const& lhs, Tone const& rhs) { return !(lhs == rhs); }
+static inline bool operator<=(Tone const& lhs, Tone const& rhs) { return lhs.freq < rhs.freq || lhs == rhs; }
+static inline bool operator>=(Tone const& lhs, Tone const& rhs) { return lhs.freq > rhs.freq || lhs == rhs; }
+static inline bool operator<(Tone const& lhs, Tone const& rhs) { return lhs.freq < rhs.freq && lhs != rhs; }
+static inline bool operator>(Tone const& lhs, Tone const& rhs) { return lhs.freq > rhs.freq && lhs != rhs; }
+
+static const unsigned FFT_P = 10;
+static const std::size_t FFT_N = 1 << FFT_P;
+
+/// Lock-free ring buffer. Discards oldest data on overflow (not strictly thread-safe).
+template <size_t SIZE> class RingBuffer {
+public:
+	constexpr static size_t capacity = SIZE;
+	RingBuffer(): m_read(), m_write() {}  ///< Initialize empty buffer
+	template <typename InIt> void insert(InIt begin, InIt end) {
+		size_t r = m_read;  // The read position
+		size_t w = m_write;  // The write position
+		bool overflow = (static_cast<size_t>(end - begin) >= SIZE - size());
+		while (begin != end) {
+			m_buf[w] = *begin++;  // Copy sample
+			w = modulo(w + 1);  // Update cursor
+		}
+		m_write = w;
+		if (overflow) m_read = modulo(w + 1);  // Reset read pointer on overflow
+	}
+	/// Read data from current position if there is enough data to fill the range (otherwise return false). Does not move read pointer.
+	template <typename OutIt> bool read(OutIt begin, OutIt end) {
+		size_t r = m_read;
+		if (size() < static_cast<size_t>(end - begin)) return false;  // Not enough audio available
+		while (begin != end) *begin++ = m_buf[r++ % SIZE];  // Copy audio to output iterator
+		return true;
+	}
+	void pop(size_t n) { m_read = modulo(m_read + n); } ///< Move reading pointer forward.
+	size_t size() const { return modulo(m_write - m_read); }
+private:
+	static size_t modulo(size_t idx) { return idx % SIZE; }  ///< Modulo operation with proper rounding (handles slightly "negative" idx as well)
+	float m_buf[SIZE];
+	volatile size_t m_read, m_write;  ///< The indices of the next read/write operations. read == write implies that buffer is empty.
+};
+
+/// analyzer class
+ /** class to analyze input audio and transform it into useable data
+ */
+class Analyzer {
+public:
+	/// fast fourier transform vector
+	typedef std::vector<std::complex<float> > fft_t;
+	/// list of tones
+	typedef std::list<Tone> tones_t;
+	/// constructor
+	Analyzer(double rate, std::string id, unsigned step = 200);
+	/** Add input data to buffer. This is thread-safe (against other functions). **/
+	template <typename InIt> void input(InIt begin, InIt end) {
+		m_buf.insert(begin, end);
+		m_passthrough.insert(begin, end);
+	}
+	/** Call this to process all data input so far. **/
+	void process();
+	/** Get the raw FFT. **/
+	fft_t const& getFFT() const { return m_fft; }
+	/** Get the peak level in dB (negative value, 0.0 = clipping). **/
+	double getPeak() const { return 10.0 * log10(m_peak); }
+	double getPeakRaw() const { return m_peak; }
+	/** Get a list of all tones detected. **/
+	tones_t const& getTones() const { return m_tones; }
+	/** Find a tone within the singing range; prefers strong tones around 200-400 Hz. **/
+	Tone const* findTone(double minfreq = 65.0, double maxfreq = 1000.0) const {
+		if (m_tones.empty()) { m_oldfreq = 0.0; return NULL; }
+		double db = std::max_element(m_tones.begin(), m_tones.end(), Tone::dbCompare)->db;
+		Tone const* best = NULL;
+		double bestscore = 0;
+		for (tones_t::const_iterator it = m_tones.begin(); it != m_tones.end(); ++it) {
+			if (it->db < db - 20.0 || it->freq < minfreq || it->age < Tone::MINAGE) continue;
+			if (it->freq > maxfreq) break;
+			double score = it->db - std::max(180.0, std::abs(it->freq - 300.0)) / 10.0;
+			if (m_oldfreq != 0.0 && std::fabs(it->freq/m_oldfreq - 1.0) < 0.05) score += 10.0;
+			if (best && bestscore > score) break;
+			best = &*it;
+			bestscore = score;
+		}
+		m_oldfreq = (best ? best->freq : 0.0);
+		return best;
+	}
+	/** Give data away for mic pass-through */
+	bool output(float* begin, float* end, double rate);
+	/** Returns the id (color name) of the mic */
+	std::string const& getId() const { return m_id; }
+
+private:
+	const unsigned m_step;
+	RingBuffer<4 * FFT_N> m_buf;  // Twice the FFT size should give enough room for sliding window and for engine delays
+	RingBuffer<4096> m_passthrough;
+	double m_resampleFactor;
+	double m_resamplePos;
+	double m_rate;
+	std::string m_id;
+	std::vector<float> m_window;
+	fft_t m_fft;
+	std::vector<float> m_fftLastPhase;
+	double m_peak;
+	tones_t m_tones;
+	mutable double m_oldfreq;
+	bool calcFFT();
+	void calcTones();
+	void mergeWithOld(tones_t& tones) const;
+};
diff --git a/PitchTracker/performous/util.hh b/PitchTracker/performous/util.hh
new file mode 100644
index 00000000..f07753d4
--- /dev/null
+++ b/PitchTracker/performous/util.hh
@@ -0,0 +1,45 @@
+#pragma once
+
+#include <cstdint>
+#include <limits>
+#include <vector>
+#include <stdexcept>
+
+/** Limit val to range [min, max] **/
+template <typename T> T clamp(T val, T min = 0, T max = 1) {
+	if (min > max) throw std::logic_error("min > max");
+	if (val < min) return min;
+	if (val > max) return max;
+	return val;
+}
+
+template <typename Numeric> struct MinMax {
+	Numeric min, max;
+	explicit MinMax(Numeric min = std::numeric_limits<Numeric>::min(), Numeric max = std::numeric_limits<Numeric>::max()): min(min), max(max) {}
+	bool matches(Numeric val) const { return val >= min && val <= max; }
+};
+
+/** A convenient way for getting NaNs **/
+static inline double getNaN() { return std::numeric_limits<double>::quiet_NaN(); }
+
+/** A convenient way for getting infs **/
+static inline double getInf() { return std::numeric_limits<double>::infinity(); }
+
+static inline bool isPow2(unsigned int val) {
+	if (val == 0) return false;
+	if ((val & (val-1)) == 0) return true; // From Wikipedia: Power_of_two
+	return false;
+}
+
+static inline unsigned int nextPow2(unsigned int val) {
+	unsigned int ret = 1;
+	while (ret < val) ret *= 2;
+	return ret;
+}
+
+static inline unsigned int prevPow2(unsigned int val) {
+	unsigned int ret = 1;
+	while ((ret*2) < val) ret *= 2;
+	return ret;
+}
+
diff --git a/PitchTracker/ptAKF.cpp b/PitchTracker/ptAKF.cpp
new file mode 100644
index 00000000..27251d72
--- /dev/null
+++ b/PitchTracker/ptAKF.cpp
@@ -0,0 +1,481 @@
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+
+#define _USE_MATH_DEFINES
+#include "ptAKF.h"
+#include <cmath>
+
+#ifdef USE_FFT
+#include "FFT/FFT.h"
+#endif
+
+static constexpr double BaseToneFrequency = 65.4064; // lowest (half-)tone to analyze (C2 = 65.4064 Hz)
+static constexpr double HalftoneBase = 1.05946309436; // 2^(1/12) -> HalftoneBase^12 = 2 (one octave)
+
+int PtAKF::_InitCount = 0;
+float* restrict PtAKF::_SamplesPerPeriodPerTone = NULL;
+float* restrict PtAKF::_SamplesPerPeriodPerToneFine = NULL;
+float* restrict PtAKF::_Window = NULL;
+
+double GetFrequencyFromTone(double toneIndex){
+	return BaseToneFrequency * pow(HalftoneBase, toneIndex);
+}
+
+PtAKF::PtAKF(unsigned step){
+	_InitCount++;
+	if(_InitCount == 1){
+		_SamplesPerPeriodPerTone = new float[_MaxHalfTone + 1 + _HalfTonesAdd];
+		_SamplesPerPeriodPerToneFine = new float[(_MaxHalfTone + 1 + _HalfTonesAdd) * 2];
+		//Init Array to avoid costly calculations
+		for (int toneIndex = 0; toneIndex <= _MaxHalfTone + _HalfTonesAdd; toneIndex++)
+		{
+			_SamplesPerPeriodPerTone[toneIndex] = static_cast<float>(44100.0 / GetFrequencyFromTone(toneIndex)); // samples in one period
+			_SamplesPerPeriodPerToneFine[2 * toneIndex] = static_cast<float>(44100.0 / GetFrequencyFromTone(toneIndex - 1./3.)); // samples for a bit below exact frequency
+			_SamplesPerPeriodPerToneFine[2 * toneIndex + 1] = static_cast<float>(44100.0 / GetFrequencyFromTone(toneIndex + 1./3.)); // samples for a bit above exact frequency
+		}
+		_Window = new float[_SampleCt];
+		double cosMult = 2. * M_PI / (2 * _SampleCt - 1.); //To simplify and speed up; 2 * _SampleCt because we extend the data by a factor of 2
+		for (int i = 0; i < _SampleCt; i++) {
+			_Window[i] = static_cast<float>(0.54 - 0.46 * cos(i * cosMult));
+		}
+	}
+	_Step = step;
+	_VolTreshold = 0.01f;
+	_LastMaxVol = 0.f;
+	for(int i = 0; i < _SmoothCt; i++)
+		_LastTones[i] = -1;
+	_LastToneIndex = 0;
+}
+
+PtAKF::~PtAKF(){
+	_InitCount--;
+	if(!_InitCount){
+		delete[] _SamplesPerPeriodPerTone;
+		_SamplesPerPeriodPerTone = NULL;
+		delete[] _SamplesPerPeriodPerToneFine;
+		_SamplesPerPeriodPerToneFine = NULL;
+	}
+}
+
+void PtAKF::SetVolumeThreshold(float threshold){
+	_VolTreshold = threshold;
+}
+
+int PtAKF::GetNote(float* restrict maxVolume, float* restrict weights){
+	float AnaylsisBuf[_SampleCt];
+	int note = _LastTones[_LastToneIndex];
+	if(_AnalysisBuf.read(AnaylsisBuf, AnaylsisBuf + _SampleCt)){
+		do{
+			_AnalysisBuf.pop(_Step);
+			note = _GetNote(AnaylsisBuf, maxVolume, weights);
+			if(++_LastToneIndex >= _SmoothCt)
+				_LastToneIndex = 0;
+			_LastTones[_LastToneIndex] = note;
+		}while(_AnalysisBuf.read(AnaylsisBuf, AnaylsisBuf + _SampleCt));
+		note = _GetSmoothTone();
+		_LastMaxVol = *maxVolume;
+	}else{
+		*maxVolume = _LastMaxVol * 0.85f;
+	}
+	return note;
+}
+
+int PtAKF::_GetSmoothTone(){
+	int tones[_SmoothCt];
+	int ct = 0;
+	for(int i=0; i < _SmoothCt; i++){
+		int j;
+		int tone = _LastTones[i];
+		if(tone < 0)
+			continue;
+		for(j = ct; j > 0; j--){
+			if(tones[j-1] > tone)
+				tones[j] = tones[j-1];
+			else break;
+		}
+		tones[j] = tone;
+		ct++;
+	}
+	if(ct == 0)
+		return -1; //Nothing detected
+	if(ct % 2 == 0)
+		return (tones[ct/2] + tones[ct/2-1]) / 2; //For even cts get the mean of the 2 middle tones
+	return tones[ct/2]; //For odd cts get the median (middle tone)
+}
+
+void PtAKF::InitPeaks(SPeak peaks[_MaxPeaks]){
+	for(int i = 0; i < _MaxPeaks; i++){
+		peaks[i].toneIndex = -1;
+		peaks[i].weight = -9.f;
+	}
+}
+
+void PtAKF::AddPeak(SPeak peaks[], float curWeight, int toneIndex){
+	if(curWeight > peaks[0].weight){
+		int i;
+		for(i = 1; i < _MaxPeaks; i++){
+			if(curWeight < peaks[i].weight){
+				peaks[i-1].toneIndex = toneIndex;
+				peaks[i-1].weight = curWeight;
+				break;
+			}else{
+				peaks[i-1] = peaks[i];
+			}
+		}
+		if(i == _MaxPeaks){
+			peaks[i-1].toneIndex = toneIndex;
+			peaks[i-1].weight = curWeight;
+		}
+	}
+}
+
+int PtAKF::_GetNote(float samples[_SampleCt], float* restrict maxVolume, float weights[_MaxHalfTone+1]){
+	// Calculate maximum volume
+
+	float maxVolumeL = 0;
+	for(int i = _SampleCt / 2; i < _SampleCt; i++){
+		float vol = abs(samples[i]);
+		if(vol > maxVolumeL)
+			maxVolumeL = vol;
+	}
+	//maxVolumeL /= 32767.f;
+	*maxVolume = maxVolumeL;
+
+	if(maxVolumeL < _VolTreshold)
+		return -1;
+
+	float samplesWindowed[_SampleCt * 2];
+
+	for(int i = 0; i < _SampleCt; i++){
+		samplesWindowed[i] = samples[i] * _Window[i];
+	}
+
+#ifdef USE_FFT
+	for(int i = _SampleCt; i < _SampleCt * 2; i++){
+		samplesWindowed[i] = 0.f;
+	}
+	float samplesFFT[_SampleCt+1]; // +1 for middle value!
+	PowerSpectrum(_SampleCt*2, samplesWindowed, samplesFFT);
+	RealInverseRealFFT(_SampleCt*2, samplesFFT, _AKFValues);
+#endif
+	// Now analyze the samples and get peaks at the most appropriate tones
+
+	//Attention: We have a peak at lag 0 that might stretch that far, that we detect a wrong "peak" at _MaxHalfTone
+	//Because of that we filter out all tones that are past the last zero crossing from below but keep tones with decreasing weights (going towards zero crossing from above)
+	int lastValidTone = 0;
+	float lastWeight = 1.f;
+	float maxWeight = 0.f;
+
+	//TODO: When using FFT this can be speed up a lot by only checking around the AKF peaks
+	#pragma omp parallel for schedule(static)
+	for (int toneIndex = 0; toneIndex <= _MaxHalfTone; toneIndex++){
+		float curWeight = _AnalyzeByTone(samples, samplesWindowed, toneIndex);
+
+		weights[toneIndex] = curWeight;
+	}
+
+	for (int toneIndex = 0; toneIndex <= _MaxHalfTone; toneIndex++){
+		float curWeight = weights[toneIndex];
+		if(curWeight > maxWeight){
+			maxWeight = curWeight;
+		}
+		if(lastWeight > curWeight || (lastWeight > 0.f && curWeight <= 0.f))
+			lastValidTone = toneIndex - 1;
+		lastWeight = curWeight;
+	}
+
+	// Now clear off the lag 0 peak if required
+
+	if(maxWeight >= weights[_MaxHalfTone]){
+		//We might have caught the lag 0 peak so go a bit further to check for other zero crossings (or we won't be able to detect _MaxHalfTone)
+		float lastWeight =  _AKFByTone(samples, _MaxHalfTone);
+		for(int toneIndex = _MaxHalfTone+1; toneIndex <= _MaxHalfTone + _HalfTonesAdd; toneIndex++){
+			float curWeight = _AKFByTone(samples, toneIndex);
+			if(lastWeight > curWeight || (lastWeight > 0.f && curWeight <= 0.f)){
+				lastValidTone = toneIndex - 1;
+				break;
+			}
+			lastWeight = curWeight;
+		}
+		if(lastValidTone < 0)
+			return -1;
+		//Set all invalid weights to 0
+		for(int toneIndex = lastValidTone + 1;toneIndex <= _MaxHalfTone; toneIndex++){
+			weights[toneIndex] = 0.f;
+		}
+	}
+
+	SPeak peaks[_MaxPeaks];
+	InitPeaks(peaks);
+	int numPeaks = 0;
+	bool up = true;
+	for(int i = 1; i <= _MaxHalfTone; i++){
+		if(weights[i - 1] > weights[i]){
+			if(up){
+				AddPeak(peaks, weights[i - 1], i - 1);
+				numPeaks++;
+				up = false;
+			}
+		}else if(!up){
+			up = true;
+		}
+	}
+	if(up && weights[_MaxHalfTone] > 0.001f){
+		AddPeak(peaks, weights[_MaxHalfTone], _MaxHalfTone);
+		numPeaks++;
+	}
+	if(numPeaks > _MaxPeaks)
+		numPeaks = _MaxPeaks;
+
+	// Further analyze the found peaks and find the real maximum
+	// This is necessary because we may have our real peak a bit off the exact tone frequency
+	// and a 'wrong' peak that is exactly at another tone which might become higher than the one at the 'right' tone
+
+	maxWeight = peaks[_MaxPeaks-1].weight;
+	if(maxWeight < 0.00001f) // Just a small number to check for zero values
+		return -1;
+	int maxTone = peaks[_MaxPeaks-1].toneIndex;
+	int maxToneFine = -1;
+	for(int i = _MaxPeaks - numPeaks; i < _MaxPeaks; i++){
+		float curWeight = peaks[i].weight;
+		if(curWeight * 3.f < maxWeight)
+			continue;
+		int toneIndex = peaks[i].toneIndex;
+		float curWeightDown = _AnalyzeBySampleCt(samples, samplesWindowed, _SamplesPerPeriodPerToneFine[toneIndex * 2]);
+		int otherToneIndex;
+		int otherToneFineIndex;
+		if(curWeightDown > curWeight){
+			otherToneIndex = toneIndex - 1;
+			otherToneFineIndex = 1;
+			curWeight = curWeightDown;
+		}else{
+			float curWeightUp = _AnalyzeBySampleCt(samples,  samplesWindowed, _SamplesPerPeriodPerToneFine[toneIndex * 2 + 1]);
+			if(curWeightUp > curWeight){
+				otherToneIndex = (toneIndex < _MaxHalfTone) ? toneIndex + 1: -1; // If the other tone is invalid just set it to -1 which will be skipped below
+				otherToneFineIndex = 0;
+				curWeight = curWeightUp;
+			}else
+				continue;
+		}
+		weights[toneIndex] = curWeight;
+		if(curWeight > maxWeight){
+			maxTone = toneIndex;
+			maxToneFine = 1 - otherToneFineIndex;
+			maxWeight = curWeight;
+		}
+
+		// Now check also neighbouring tone
+		if(otherToneIndex >= 0){
+			float curWeightOther = _AnalyzeBySampleCt(samples,  samplesWindowed, _SamplesPerPeriodPerToneFine[otherToneIndex * 2 + otherToneFineIndex]);
+			if(curWeightOther > weights[otherToneIndex]){
+				weights[otherToneIndex] = curWeightOther;
+				if(curWeightOther > maxWeight){
+					maxTone = otherToneIndex;
+					maxToneFine = otherToneFineIndex;
+					maxWeight = curWeightOther;
+				}
+			}
+		}
+	}
+
+	float energy = _AKFBySampleCt(samplesWindowed, 0);
+	float maxAKF = (maxToneFine < 0) ? _AKFByTone(samplesWindowed, maxTone) : _AKFBySampleCt(samplesWindowed, _SamplesPerPeriodPerToneFine[maxTone * 2 + maxToneFine]);
+
+	//if(maxWeight - minWeight > 0.025){
+	if(maxAKF >= 0.33f * energy){
+		return maxTone;
+	}else return -1;
+}
+
+float PtAKF::_AnalyzeByTone(float samples[_SampleCt], float samplesWindowed[_SampleCt], int toneIndex){
+	return _AnalyzeBySampleCt(samples, samplesWindowed, _SamplesPerPeriodPerTone[toneIndex]);
+}
+
+float PtAKF::_AnalyzeBySampleCt(float samples[_SampleCt], float samplesWindowed[_SampleCt], float samplesPerPeriodD){
+	// Use method by Kobayashi and Shimamura (2001): Combine AKF and AMDF to a new f(z)=AKF(z)/(AMDF(z)+k) with k=1
+
+	float akf = _AKFBySampleCt(samplesWindowed, samplesPerPeriodD);
+	float amdf = _AMDFBySampleCt(samples, samplesPerPeriodD);
+
+	//return accumDistAKF / (accumDistAMDF * 32767.f + 32767.f * 32767.f); // Need to scale AKF by MAX^2 and AMDF by MAX, so do some maths to divide only once
+	float result = akf / (amdf + 1.f);
+	return result; // Need to scale AKF by MAX^2 and AMDF by MAX, so do some maths to divide only once
+	//{toneIndex}: {accumDistAKF} ; {accumDistAMDF}; {result}
+}
+
+float PtAKF::_AKFByTone(float samples[_SampleCt], int toneIndex){
+	return _AKFBySampleCt(samples, _SamplesPerPeriodPerTone[toneIndex]);
+}
+
+float PtAKF::_AKFBySampleCt(float samples[_SampleCt], float samplesPerPeriodD){
+	int samplesPerPeriod = static_cast<int>(samplesPerPeriodD);
+	float fHigh = samplesPerPeriodD - samplesPerPeriod;
+	float fLow = 1.0f - fHigh;
+#ifdef USE_FFT
+	float akf2 = _AKFValues[samplesPerPeriod] * fLow + _AKFValues[samplesPerPeriod+1] * fHigh;
+	return akf2 / (_SampleCt * _SampleCt);
+#else
+
+	float accumDist = 0; // accumulated distances
+
+	// compare correlating samples
+	int sampleIndex = 0; // index of sample to analyze
+	// Start value= index of sample one period ahead
+	for (int correlatingSampleIndex = sampleIndex + samplesPerPeriod; correlatingSampleIndex + 1 < _SampleCt; correlatingSampleIndex++, sampleIndex++)
+	{
+		// calc distance to corresponding sample in next period
+		float xn = samples[sampleIndex];
+		float xnt = samples[correlatingSampleIndex] * fLow + samples[correlatingSampleIndex + 1] * fHigh;
+		accumDist += xn * xnt;
+	}
+
+	return accumDist / _SampleCt;
+#endif
+}
+
+float PtAKF::_AMDFByTone(float samples[_SampleCt], int toneIndex){
+	return _AMDFBySampleCt(samples, _SamplesPerPeriodPerTone[toneIndex]);
+}
+
+float PtAKF::_AMDFBySampleCt(float samples[_SampleCt], float samplesPerPeriodD){
+	int samplesPerPeriod = static_cast<int>(samplesPerPeriodD);
+	float fHigh = samplesPerPeriodD - samplesPerPeriod;
+	float fLow = 1.0f - fHigh;
+
+	float accumDist = 0; // accumulated distances
+
+	// compare correlating samples
+	int sampleIndex = 0; // index of sample to analyze
+	// Start value= index of sample one period ahead
+	for (int correlatingSampleIndex = sampleIndex + samplesPerPeriod; correlatingSampleIndex + 1 < _SampleCt; correlatingSampleIndex++, sampleIndex++)
+	{
+		// calc distance to corresponding sample in next period
+		float xn = samples[sampleIndex];
+		float xnt = samples[correlatingSampleIndex] * fLow + samples[correlatingSampleIndex + 1] * fHigh;
+		accumDist += abs(xn - xnt);
+	}
+
+	return accumDist / sampleIndex;
+}
+/*
+
+
+
+namespace PitchTrackerAKF{
+	static double *SamplesPerPeriodPerTone = NULL;
+	static double BaseToneFrequency = -1;
+	static int MinHalfTone = -1, MaxHalfTone = -1;
+	static const double HalftoneBase = 1.05946309436; // 2^(1/12) -> HalftoneBase^12 = 2 (one octave)
+
+	void Init(double baseToneFrequency, int minHalfTone, int maxHalfTone){
+		if(SamplesPerPeriodPerTone && abs(baseToneFrequency - BaseToneFrequency) < 1. && minHalfTone == MinHalfTone && maxHalfTone == MaxHalfTone)
+			return;
+		BaseToneFrequency = baseToneFrequency;
+		MinHalfTone = minHalfTone;
+		MaxHalfTone = maxHalfTone;
+		DeInit();
+		if(minHalfTone < 0 || maxHalfTone < minHalfTone)
+			return;
+		SamplesPerPeriodPerTone = (double*) malloc((MaxHalfTone + 1) * sizeof(double));
+		//Init Array to avoid costly calculations
+		for (int toneIndex = 0; toneIndex <= MaxHalfTone; toneIndex++)
+		{
+			double freq = baseToneFrequency * pow(HalftoneBase, toneIndex);
+			SamplesPerPeriodPerTone[toneIndex] = 44100.0 / freq; // samples in one period
+		}
+	}
+
+	void DeInit(){
+		if(SamplesPerPeriodPerTone){
+			free(SamplesPerPeriodPerTone);
+			SamplesPerPeriodPerTone=NULL;
+		}
+	}
+
+	template<typename T>
+	static T _AnalyzeToneFunc(T *samples, int sampleCt, int toneIndex, bool scale){
+		// Use method by Kobayashi and Shimamura (1995): Combine AKF and AMDF to a new f(z)=AKF(z)/(AMDF(z)+k) with k=1
+		double samplesPerPeriodD = SamplesPerPeriodPerTone[toneIndex]; // samples in one period
+		int samplesPerPeriod = static_cast<int>(samplesPerPeriodD);
+		T fHigh = static_cast<T>(samplesPerPeriodD - samplesPerPeriod);
+		T fLow = static_cast<T>(1.0 - fHigh);
+
+		T accumDistAKF = 0; // accumulated distances
+		T accumDistAMDF = 0; // accumulated distances
+
+		// compare correlating samples
+		int sampleIndex = 0; // index of sample to analyze
+		// Start value= index of sample one period ahead
+		for (int correlatingSampleIndex = sampleIndex + samplesPerPeriod; correlatingSampleIndex + 1 < sampleCt; correlatingSampleIndex++, sampleIndex++)
+		{
+			// calc distance to corresponding sample in next period
+			T xn = samples[sampleIndex];
+			T xnt = samples[correlatingSampleIndex] * fLow + samples[correlatingSampleIndex + 1] * fHigh;
+			accumDistAKF += xn * xnt;
+			accumDistAMDF += abs(xn - xnt);
+		}
+
+		accumDistAKF /= sampleCt;
+		accumDistAMDF /= sampleIndex;
+
+		if(scale)
+			return accumDistAKF / (accumDistAMDF * 32767.f + 32767.f); // Need to scale AKF by MAX^2 and AMDF by MAX, so do some maths to divide only once
+		else
+			return accumDistAKF / (accumDistAMDF + 1.f);
+	}
+
+	template<typename T>
+	int GetTone(T *samples, int sampleCt, double* maxVolume, float *weights, bool scale){
+		if(!SamplesPerPeriodPerTone)
+			return -1;
+		T maxVolumeL = 0;
+		for(int i = 0; i < sampleCt; i++){
+			T vol = abs(samples[i]);
+			if(vol > maxVolumeL)
+				maxVolumeL = vol;
+		}
+		if(scale)
+			maxVolumeL /= 32767.;
+		*maxVolume = maxVolumeL;
+
+		T maxWeight = -1;
+		T minWeight = 1;
+		int maxTone = -1;
+		for (int toneIndex = MinHalfTone; toneIndex <= MaxHalfTone; toneIndex++)
+		{
+			T curWeight = _AnalyzeToneFunc<T>(samples, sampleCt, toneIndex, scale);
+
+			if (curWeight > maxWeight)
+			{
+				maxWeight = curWeight;
+				maxTone = toneIndex;
+			}
+
+			if (curWeight < minWeight)
+				minWeight = curWeight;
+
+			weights[toneIndex - MinHalfTone] = static_cast<float>(curWeight);
+		}
+
+		if(maxWeight - minWeight > 0.01){
+			return maxTone;
+		}else return -1;
+	}
+
+	template int GetTone(float *samples, int sampleCt, double* maxVolume, float *weights, bool scale);
+	template int GetTone(double *samples, int sampleCt, double* maxVolume, float *weights, bool scale);
+
+}
+*/
\ No newline at end of file
diff --git a/PitchTracker/ptAKF.h b/PitchTracker/ptAKF.h
new file mode 100644
index 00000000..00f8aeb5
--- /dev/null
+++ b/PitchTracker/ptAKF.h
@@ -0,0 +1,75 @@
+#pragma once
+#include "performous/pitch.hh"
+
+#if __STDC__ != 1
+#    define restrict __restrict
+#else
+#    ifndef __STDC_VERSION__
+#        define restrict __restrict
+#    else
+#        if __STDC_VERSION__ < 199901L
+#            define restrict __restrict
+#        endif
+#    endif
+#endif
+
+#define USE_FFT
+
+struct SPeak{
+	int toneIndex;
+	float weight;
+};
+
+// A pitch detection that is based on the AKF and AMDF (initially from original Vocaluxe/USDx)
+class PtAKF{
+public:
+	PtAKF(unsigned step);
+	~PtAKF();
+
+	/** Add input data to buffer. This is thread-safe (against other functions). **/
+	template <typename InIt> void input(InIt begin, InIt end) {
+		_AnalysisBuf.insert(begin, end);
+	}
+
+	int GetNote(float* restrict maxVolume, float* restrict weights);
+	void SetVolumeThreshold(float threshold);
+	float GetVolumeThreshold(){return _VolTreshold;}
+	static int GetNumHalfTones(){ return _MaxHalfTone + 1;}
+
+private:
+	static int _InitCount;
+	static float* restrict _SamplesPerPeriodPerTone;
+	// Use a 3 times finer resolution for exact peak detection
+	// So this array will store for each note the number of samples 1/3 below and up
+	// (cannot use halves as it would be ambiguous)
+	static float* restrict _SamplesPerPeriodPerToneFine;
+	static float* restrict _Window;
+	//static constexpr int _MinHalfTone = 0;  //C2
+	static constexpr int _MaxHalfTone = 56;//47; //B5
+	static constexpr int _HalfTonesAdd = 4; //Additonal half tones to analyze to remove the peak at lag 0
+	static constexpr int _MaxPeaks = 10;
+	static constexpr int _SmoothCt = 3; //Number of samples used for smoothing the result
+
+	constexpr static size_t _SampleCt = 2048;
+	RingBuffer<_SampleCt * 2> _AnalysisBuf;
+	unsigned _Step;
+	float _VolTreshold;
+	float _LastMaxVol;
+	int _LastTones[_SmoothCt];
+	int _LastToneIndex;
+#ifdef USE_FFT
+	float _AKFValues[_SampleCt*2];
+#endif
+
+	int _GetNote(float samples[_SampleCt], float* restrict maxVolume, float weights[_MaxHalfTone+1]);
+	int _GetSmoothTone();
+
+	float _AnalyzeBySampleCt(float samples[_SampleCt], float samplesWindowed[_SampleCt], float samplesPerPeriodD);
+	inline float _AnalyzeByTone(float samples[_SampleCt], float samplesWindowed[_SampleCt], int toneIndex);
+	float _AKFBySampleCt(float samples[_SampleCt], float samplesPerPeriodD);
+	inline float _AKFByTone(float samples[_SampleCt], int toneIndex);
+	static float _AMDFBySampleCt(float samples[_SampleCt], float samplesPerPeriodD);
+	static inline float _AMDFByTone(float samples[_SampleCt], int toneIndex);
+	static inline void InitPeaks(SPeak peaks[_MaxPeaks]);
+	static inline void AddPeak(SPeak peaks[_MaxPeaks], float curWeight, int toneIndex);
+};
\ No newline at end of file
diff --git a/Vocaluxe.sln b/Vocaluxe.sln
index 5d225110..da685caf 100644
--- a/Vocaluxe.sln
+++ b/Vocaluxe.sln
@@ -5,10 +5,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe", "Vocaluxe\Vocalu
 		{55F89808-4E79-4FFE-BC13-48258913F5C9} = {55F89808-4E79-4FFE-BC13-48258913F5C9}
 		{6F3E1874-F28A-40E9-AFBD-31934D593678} = {6F3E1874-F28A-40E9-AFBD-31934D593678}
 		{6F3E1874-F28A-40E9-AFBD-31934D593679} = {6F3E1874-F28A-40E9-AFBD-31934D593679}
-		{ED007796-367F-4142-AA55-5450C7645C2C} = {ED007796-367F-4142-AA55-5450C7645C2C}
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3} = {EC5167E4-CCFB-4CEE-987C-CF816F1062A3}
 		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC} = {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}
 		{5A4053F1-5AD5-441F-B254-D97A088127B6} = {5A4053F1-5AD5-441F-B254-D97A088127B6}
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A} = {54A48AF7-515C-4EDD-B395-2BFFA096050A}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VocaluxeLib", "VocaluxeLib\VocaluxeLib.csproj", "{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}"
@@ -19,12 +19,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PartyModeChallenge", "Party
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PartyModeChallengeMedley", "PartyModes\PartyModeChallengeMedley\PartyModeChallengeMedley.csproj", "{6F3E1874-F28A-40E9-AFBD-31934D593678}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GstreamerHelper", "GstreamerHelper\GstreamerHelper.vcxproj", "{ED007796-367F-4142-AA55-5450C7645C2C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerLib", "ClientServerLib\ClientServerLib\ServerLib.csproj", "{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebserverInitalConfig", "WebserverInitalConfig\WebserverInitalConfig.csproj", "{55F89808-4E79-4FFE-BC13-48258913F5C9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PitchTracker", "PitchTracker\PitchTracker.vcxproj", "{54A48AF7-515C-4EDD-B395-2BFFA096050A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		DebugLinux|x64 = DebugLinux|x64
@@ -59,111 +59,106 @@ Global
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseWin|x64.Build.0 = ReleaseWin|x64
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseWin|x86.Build.0 = ReleaseWin|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x64.ActiveCfg = DebugLinux|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x64.Build.0 = DebugLinux|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x86.ActiveCfg = DebugLinux|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x86.Build.0 = DebugLinux|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.ActiveCfg = DebugWin|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.Build.0 = DebugWin|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.ActiveCfg = DebugWin|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.Build.0 = DebugWin|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x64.ActiveCfg = InstallerWin|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x64.Build.0 = InstallerWin|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x86.ActiveCfg = InstallerWin|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x86.Build.0 = InstallerWin|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.Build.0 = ReleaseLinux|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x64.Build.0 = ReleaseWin|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x86.Build.0 = ReleaseWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x64.ActiveCfg = DebugLinux|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x64.Build.0 = DebugLinux|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x86.ActiveCfg = DebugLinux|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x86.Build.0 = DebugLinux|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x64.ActiveCfg = DebugWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x64.Build.0 = DebugWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.ActiveCfg = DebugWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.Build.0 = DebugWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x64.ActiveCfg = InstallerWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x64.Build.0 = InstallerWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x86.ActiveCfg = InstallerWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x86.Build.0 = InstallerWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x86.Build.0 = ReleaseLinux|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x64.Build.0 = ReleaseWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x86.Build.0 = ReleaseWin|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugLinux|x64.ActiveCfg = DebugLinux|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugLinux|x64.Build.0 = DebugLinux|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugLinux|x86.ActiveCfg = DebugLinux|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugLinux|x86.Build.0 = DebugLinux|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x64.ActiveCfg = DebugWin|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x64.Build.0 = DebugWin|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x86.ActiveCfg = DebugWin|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x86.Build.0 = DebugWin|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x64.ActiveCfg = ReleaseWin|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x86.ActiveCfg = ReleaseWin|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x86.Build.0 = ReleaseLinux|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseWin|x64.Build.0 = ReleaseWin|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseWin|x86.Build.0 = ReleaseWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugLinux|x64.ActiveCfg = DebugLinux|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugLinux|x64.Build.0 = DebugLinux|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugLinux|x86.ActiveCfg = DebugLinux|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugLinux|x86.Build.0 = DebugLinux|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x64.ActiveCfg = DebugWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x64.Build.0 = DebugWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x86.ActiveCfg = DebugWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x86.Build.0 = DebugWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x64.ActiveCfg = ReleaseWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x86.ActiveCfg = ReleaseWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x86.Build.0 = ReleaseLinux|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x64.Build.0 = ReleaseWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x86.Build.0 = ReleaseWin|x86
-		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugLinux|x64.ActiveCfg = DebugWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugLinux|x86.ActiveCfg = DebugWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x64.ActiveCfg = DebugWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x64.Build.0 = DebugWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x86.ActiveCfg = DebugWin|Win32
-		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x86.Build.0 = DebugWin|Win32
-		{ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x64.ActiveCfg = ReleaseWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x86.ActiveCfg = ReleaseWin|Win32
-		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x64.ActiveCfg = ReleaseWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x86.ActiveCfg = ReleaseWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x64.Build.0 = ReleaseWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x86.ActiveCfg = ReleaseWin|Win32
-		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x86.Build.0 = ReleaseWin|Win32
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x64.ActiveCfg = DebugLinux|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x64.Build.0 = DebugLinux|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x86.ActiveCfg = DebugLinux|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugLinux|x86.Build.0 = DebugLinux|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.ActiveCfg = DebugWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.Build.0 = DebugWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.ActiveCfg = DebugWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.Build.0 = DebugWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x64.ActiveCfg = InstallerWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x64.Build.0 = InstallerWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x86.ActiveCfg = InstallerWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x86.Build.0 = InstallerWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.Build.0 = ReleaseLinux|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.Build.0 = ReleaseLinux|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x64.ActiveCfg = ReleaseWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x64.Build.0 = ReleaseWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x86.ActiveCfg = ReleaseWin|Any CPU
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x86.Build.0 = ReleaseWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x64.ActiveCfg = DebugLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x64.Build.0 = DebugLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x86.ActiveCfg = DebugLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x86.Build.0 = DebugLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x64.ActiveCfg = DebugWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x64.Build.0 = DebugWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.ActiveCfg = DebugWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.Build.0 = DebugWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x64.ActiveCfg = InstallerWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x64.Build.0 = InstallerWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x86.ActiveCfg = InstallerWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x86.Build.0 = InstallerWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.Build.0 = ReleaseLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x86.Build.0 = ReleaseLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x64.ActiveCfg = ReleaseWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x64.Build.0 = ReleaseWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x86.ActiveCfg = ReleaseWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x86.Build.0 = ReleaseWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugLinux|x64.ActiveCfg = DebugLinux|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugLinux|x64.Build.0 = DebugLinux|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugLinux|x86.ActiveCfg = DebugLinux|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugLinux|x86.Build.0 = DebugLinux|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x64.ActiveCfg = DebugWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x64.Build.0 = DebugWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x86.ActiveCfg = DebugWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x86.Build.0 = DebugWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x64.ActiveCfg = InstallerWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x64.Build.0 = InstallerWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x86.ActiveCfg = InstallerWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x86.Build.0 = InstallerWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x64.Build.0 = ReleaseLinux|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x86.Build.0 = ReleaseLinux|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseWin|x64.ActiveCfg = ReleaseWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseWin|x64.Build.0 = ReleaseWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseWin|x86.ActiveCfg = ReleaseWin|Any CPU
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseWin|x86.Build.0 = ReleaseWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugLinux|x64.ActiveCfg = DebugLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugLinux|x64.Build.0 = DebugLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugLinux|x86.ActiveCfg = DebugLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugLinux|x86.Build.0 = DebugLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x64.ActiveCfg = DebugWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x64.Build.0 = DebugWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x86.ActiveCfg = DebugWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x86.Build.0 = DebugWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x64.ActiveCfg = InstallerWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x64.Build.0 = InstallerWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x86.ActiveCfg = InstallerWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x86.Build.0 = InstallerWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x64.Build.0 = ReleaseLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x86.Build.0 = ReleaseLinux|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x64.ActiveCfg = ReleaseWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x64.Build.0 = ReleaseWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x86.ActiveCfg = ReleaseWin|Any CPU
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseWin|x86.Build.0 = ReleaseWin|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.DebugLinux|x64.ActiveCfg = DebugLinux|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.DebugLinux|x64.Build.0 = DebugLinux|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.DebugLinux|x86.ActiveCfg = DebugLinux|Any CPU
+		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.DebugLinux|x86.Build.0 = DebugLinux|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.DebugWin|x64.ActiveCfg = DebugWin|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.DebugWin|x64.Build.0 = DebugWin|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.DebugWin|x86.ActiveCfg = DebugWin|Any CPU
+		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.DebugWin|x86.Build.0 = DebugWin|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.InstallerWin|x64.ActiveCfg = ReleaseWin|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.InstallerWin|x64.Build.0 = ReleaseWin|Any CPU
-		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.InstallerWin|x86.ActiveCfg = ReleaseLinux|Any CPU
+		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.InstallerWin|x86.ActiveCfg = ReleaseWin|Any CPU
+		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.InstallerWin|x86.Build.0 = ReleaseWin|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.ReleaseLinux|x64.Build.0 = ReleaseLinux|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|Any CPU
+		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.ReleaseLinux|x86.Build.0 = ReleaseLinux|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.ReleaseWin|x64.ActiveCfg = ReleaseWin|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.ReleaseWin|x64.Build.0 = ReleaseWin|Any CPU
 		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.ReleaseWin|x86.ActiveCfg = ReleaseWin|Any CPU
+		{EC5167E4-CCFB-4CEE-987C-CF816F1062A3}.ReleaseWin|x86.Build.0 = ReleaseWin|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.DebugLinux|x64.ActiveCfg = Debug|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.DebugLinux|x86.ActiveCfg = Debug|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.DebugWin|x64.ActiveCfg = Debug|Any CPU
@@ -173,12 +168,33 @@ Global
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.InstallerWin|x64.ActiveCfg = Release|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.InstallerWin|x64.Build.0 = Release|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.InstallerWin|x86.ActiveCfg = Release|Any CPU
+		{55F89808-4E79-4FFE-BC13-48258913F5C9}.InstallerWin|x86.Build.0 = Release|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.ReleaseLinux|x64.ActiveCfg = Release|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.ReleaseLinux|x86.ActiveCfg = Release|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.ReleaseWin|x64.ActiveCfg = Release|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.ReleaseWin|x64.Build.0 = Release|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.ReleaseWin|x86.ActiveCfg = Release|Any CPU
 		{55F89808-4E79-4FFE-BC13-48258913F5C9}.ReleaseWin|x86.Build.0 = Release|Any CPU
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.DebugLinux|x64.ActiveCfg = Debug|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.DebugLinux|x64.Build.0 = Debug|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.DebugLinux|x86.ActiveCfg = Debug|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.DebugLinux|x86.Build.0 = Debug|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.DebugWin|x64.ActiveCfg = Debug|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.DebugWin|x64.Build.0 = Debug|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.DebugWin|x86.ActiveCfg = Debug|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.DebugWin|x86.Build.0 = Debug|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.InstallerWin|x64.ActiveCfg = Release|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.InstallerWin|x64.Build.0 = Release|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.InstallerWin|x86.ActiveCfg = Release|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.InstallerWin|x86.Build.0 = Release|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseLinux|x64.ActiveCfg = Release|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseLinux|x64.Build.0 = Release|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseLinux|x86.ActiveCfg = Release|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseLinux|x86.Build.0 = Release|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.ActiveCfg = Release|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x64.Build.0 = Release|x64
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.ActiveCfg = Release|Win32
+		{54A48AF7-515C-4EDD-B395-2BFFA096050A}.ReleaseWin|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Vocaluxe.sln.DotSettings b/Vocaluxe.sln.DotSettings
index 0a1c7cf8..661e1a2c 100644
--- a/Vocaluxe.sln.DotSettings
+++ b/Vocaluxe.sln.DotSettings
@@ -10,7 +10,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Cleanup"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;IMPLICIT_WHEN_INITIALIZER_HAS_TYPE&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;True&lt;/SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;&lt;SA1021NegativeSignsMustBeSpacedCorrectly&gt;True&lt;/SA1021NegativeSignsMustBeSpacedCorrectly&gt;&lt;SA1022PositiveSignsMustBeSpacedCorrectly&gt;True&lt;/SA1022PositiveSignsMustBeSpacedCorrectly&gt;&lt;SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;True&lt;/SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;&lt;/StyleCop.Spacing&gt;&lt;StyleCop.Ordering&gt;&lt;AlphabeticalUsingDirectives&gt;Ignore&lt;/AlphabeticalUsingDirectives&gt;&lt;ExpandUsingDirectives&gt;Ignore&lt;/ExpandUsingDirectives&gt;&lt;SA1212PropertyAccessorsMustFollowOrder&gt;True&lt;/SA1212PropertyAccessorsMustFollowOrder&gt;&lt;SA1213EventAccessorsMustFollowOrder&gt;True&lt;/SA1213EventAccessorsMustFollowOrder&gt;&lt;/StyleCop.Ordering&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;/Profile&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Simple_0020Reformat/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Simple Reformat"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;True&lt;/SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;&lt;SA1021NegativeSignsMustBeSpacedCorrectly&gt;True&lt;/SA1021NegativeSignsMustBeSpacedCorrectly&gt;&lt;SA1022PositiveSignsMustBeSpacedCorrectly&gt;True&lt;/SA1022PositiveSignsMustBeSpacedCorrectly&gt;&lt;SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;True&lt;/SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;&lt;/StyleCop.Spacing&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Ordering&gt;&lt;AlphabeticalUsingDirectives&gt;Ignore&lt;/AlphabeticalUsingDirectives&gt;&lt;ExpandUsingDirectives&gt;Ignore&lt;/ExpandUsingDirectives&gt;&lt;SA1212PropertyAccessorsMustFollowOrder&gt;True&lt;/SA1212PropertyAccessorsMustFollowOrder&gt;&lt;SA1213EventAccessorsMustFollowOrder&gt;True&lt;/SA1213EventAccessorsMustFollowOrder&gt;&lt;/StyleCop.Ordering&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;IMPLICIT_WHEN_INITIALIZER_HAS_TYPE&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Simple_0020Reformat/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Simple Reformat"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;True&lt;/SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;&lt;SA1021NegativeSignsMustBeSpacedCorrectly&gt;True&lt;/SA1021NegativeSignsMustBeSpacedCorrectly&gt;&lt;SA1022PositiveSignsMustBeSpacedCorrectly&gt;True&lt;/SA1022PositiveSignsMustBeSpacedCorrectly&gt;&lt;SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;True&lt;/SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;&lt;/StyleCop.Spacing&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Ordering&gt;&lt;AlphabeticalUsingDirectives&gt;Ignore&lt;/AlphabeticalUsingDirectives&gt;&lt;ExpandUsingDirectives&gt;Ignore&lt;/ExpandUsingDirectives&gt;&lt;SA1212PropertyAccessorsMustFollowOrder&gt;True&lt;/SA1212PropertyAccessorsMustFollowOrder&gt;&lt;SA1213EventAccessorsMustFollowOrder&gt;True&lt;/SA1213EventAccessorsMustFollowOrder&gt;&lt;/StyleCop.Ordering&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;IMPLICIT_WHEN_INITIALIZER_HAS_TYPE&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Cleanup</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Simple Reformat</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_FIELD/@EntryValue">0</s:Int64>
diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs
index 9afc32dd..b4be306f 100644
--- a/Vocaluxe/Base/CBackgroundMusic.cs
+++ b/Vocaluxe/Base/CBackgroundMusic.cs
@@ -17,8 +17,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using VocaluxeLib;
 using VocaluxeLib.Songs;
 using VocaluxeLib.Draw;
@@ -27,25 +27,27 @@ namespace Vocaluxe.Base
 {
     static class CBackgroundMusic
     {
-        private static int _CurrentMusicStream = -1;
-        private static int _PreviousMusicIndex;
-        private static CPlaylistElement _CurrentPlaylistElement = new CPlaylistElement();
+        private static bool _Initialized;
 
-        private static readonly List<CPlaylistElement> _AllFileNames = new List<CPlaylistElement>();
-        private static readonly List<CPlaylistElement> _NotPlayedFileNames = new List<CPlaylistElement>();
-        private static readonly List<CPlaylistElement> _BGMusicFileNames = new List<CPlaylistElement>();
-        private static readonly List<CPlaylistElement> _PreviousFileNames = new List<CPlaylistElement>();
+        private static bool _OwnSongsAvailable;
+        private static EBackgroundMusicSource _MusicSource;
+        private static bool _VideoEnabled;
+
+        private static CPlaylistElement _CurrentPlaylistElement; //Currently played music
+        private static int _CurrentMusicStream = -1; //Current active music stream
+        private static int _PreviousMusicIndex; //Index of _CurrentPlaylistElement in _PreviousFiles (kept for performance)
+
+        private static readonly List<CPlaylistElement> _BGMusicFiles = new List<CPlaylistElement>(); //Background music files
+        private static readonly List<CPlaylistElement> _NotPlayedFiles = new List<CPlaylistElement>(); //Not played files
+        private static readonly List<CPlaylistElement> _PreviousFiles = new List<CPlaylistElement>(); //Played files
 
         private static int _Video = -1;
         private static CTexture _CurrentVideoTexture;
         private static CFading _VideoFading;
-        private static bool _VideoEnabled;
 
         private static bool _OwnMusicAdded;
         private static bool _BackgroundMusicAdded;
         private static bool _Disabled;
-        private static bool _CanSing;
-        private static bool _RepeatSong;
 
         public static bool VideoEnabled
         {
@@ -54,16 +56,19 @@ namespace Vocaluxe.Base
             {
                 if (_VideoEnabled == value)
                     return;
-                ToggleVideo();
                 _VideoEnabled = value;
+                if (_VideoEnabled)
+                    _LoadVideo();
+                else if (_Video != -1)
+                {
+                    CVideo.Close(_Video);
+                    CDraw.RemoveTexture(ref _CurrentVideoTexture);
+                    _Video = -1;
+                }
             }
         }
 
-        public static bool CanSing
-        {
-            get { return _CanSing; }
-            set { _CanSing = value; }
-        }
+        public static bool CanSing { get; private set; }
 
         public static bool Disabled
         {
@@ -78,20 +83,16 @@ namespace Vocaluxe.Base
             }
         }
 
-        public static bool RepeatSong
-        {
-            get { return _RepeatSong; }
-            set { _RepeatSong = value; }
-        }
+        public static bool RepeatSong { get; set; }
 
         public static int SongID
         {
-            get { return _CurrentPlaylistElement.SongID; }
+            get { return _CurrentPlaylistElement == null ? -1 : _CurrentPlaylistElement.SongID; }
         }
 
         public static bool SongHasVideo
         {
-            get { return File.Exists(_CurrentPlaylistElement.VideoFilePath); }
+            get { return _CurrentPlaylistElement != null && File.Exists(_CurrentPlaylistElement.VideoFilePath); }
         }
 
         public static bool IsPlaying { get; private set; }
@@ -100,6 +101,8 @@ namespace Vocaluxe.Base
         {
             get
             {
+                if (_CurrentPlaylistElement == null)
+                    return "";
                 if (_CurrentPlaylistElement.Artist != "" && _CurrentPlaylistElement.Title != "")
                     return _CurrentPlaylistElement.Artist + " - " + _CurrentPlaylistElement.Title;
                 return Path.GetFileNameWithoutExtension(_CurrentPlaylistElement.MusicFilePath);
@@ -108,50 +111,83 @@ namespace Vocaluxe.Base
 
         public static CTexture Cover
         {
-            get { return _CurrentPlaylistElement.Cover; }
+            get { return _CurrentPlaylistElement == null ? CCover.NoCover : _CurrentPlaylistElement.Cover; }
         }
 
+        //Use this to set whether own songs are available for access
+        public static bool OwnSongsAvailable
+        {
+            get { return _OwnSongsAvailable; }
+            set
+            {
+                _OwnSongsAvailable = value;
+                if (_OwnSongsAvailable && _MusicSource != EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC)
+                    _AddOwnMusic();
+            }
+        }
+
+        /// <summary>
+        ///     Initializes the background music with values from config
+        ///     Has to be called before any other method is used
+        /// </summary>
         public static void Init()
         {
-            var templist = new List<string>();
+            if (_Initialized)
+                return;
 
-            foreach (string ending in CSettings.MusicFileTypes)
-                templist.AddRange(CHelper.ListFiles(CSettings.FolderBackgroundMusic, ending, true, true));
+            List<string> soundFiles = CHelper.ListSoundFiles(CSettings.FolderBackgroundMusic, true, true);
 
-            foreach (string path in templist)
-                _BGMusicFileNames.Add(new CPlaylistElement(path));
-
-            if (CConfig.BackgroundMusicSource != EBackgroundMusicSource.TR_CONFIG_ONLY_OWN_MUSIC)
-                AddBackgroundMusic();
+            foreach (string path in soundFiles)
+                _BGMusicFiles.Add(new CPlaylistElement(path));
+            //Set a default to have a consistent starting point, use SetMusicSource afterwards
+            _MusicSource = EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC;
+            _AddBackgroundMusic();
 
+            _PreviousMusicIndex = -1;
+            IsPlaying = false;
             _VideoEnabled = (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON);
+            SetMusicSource(CConfig.BackgroundMusicSource);
+            _Initialized = true;
+        }
+
+        public static void Close()
+        {
+            if (_CurrentMusicStream >= 0)
+            {
+                CSound.Close(_CurrentMusicStream);
+                _CurrentMusicStream = -1;
+            }
+            if (_Video != -1)
+            {
+                CVideo.Close(_Video);
+                CDraw.RemoveTexture(ref _CurrentVideoTexture);
+                _Video = -1;
+            }
+            _BGMusicFiles.Clear();
+            _NotPlayedFiles.Clear();
+            _PreviousFiles.Clear();
 
             IsPlaying = false;
+            _Initialized = false;
         }
 
         public static void Play()
         {
-            if (IsPlaying)
+            if (IsPlaying || CConfig.BackgroundMusic == EOffOn.TR_CONFIG_OFF)
                 return;
 
-            if (CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
+            if (_CurrentMusicStream != -1)
             {
-                if (_AllFileNames.Count > 0)
-                {
-                    if (_CurrentMusicStream != -1)
-                    {
-                        CSound.Fade(_CurrentMusicStream, 100f, CSettings.BackgroundMusicFadeTime);
-                        CSound.Play(_CurrentMusicStream);
-                        if (_VideoEnabled && _Video != -1)
-                            CVideo.Resume(_Video);
-                        IsPlaying = true;
-                    }
-                    else
-                        Next();
-
-                    _CanSing = !_IsBackgroundFile(_CurrentPlaylistElement);
-                }
+                //Resume
+                CSound.SetStreamVolume(_CurrentMusicStream, 0f);
+                CSound.Fade(_CurrentMusicStream, 100f, CSettings.BackgroundMusicFadeTime);
+                CSound.Play(_CurrentMusicStream);
+                if (_VideoEnabled && _Video != -1)
+                    CVideo.Resume(_Video);
+                IsPlaying = true;
             }
+            else
+                Next();
         }
 
         public static void Stop()
@@ -159,7 +195,7 @@ namespace Vocaluxe.Base
             if (!IsPlaying)
                 return;
 
-            if (_VideoEnabled && _Video != -1)
+            if (_Video != -1)
             {
                 CVideo.Close(_Video);
                 CDraw.RemoveTexture(ref _CurrentVideoTexture);
@@ -168,7 +204,7 @@ namespace Vocaluxe.Base
             CSound.FadeAndClose(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime);
             _CurrentMusicStream = -1;
 
-            _CurrentPlaylistElement = new CPlaylistElement();
+            _CurrentPlaylistElement = null;
             IsPlaying = false;
         }
 
@@ -177,7 +213,7 @@ namespace Vocaluxe.Base
             if (!IsPlaying)
                 return;
 
-            if (_VideoEnabled && _Video != -1)
+            if (_Video != -1)
             {
                 CVideo.Pause(_Video);
                 CVideo.Skip(_Video, CSound.GetPosition(_CurrentMusicStream) + CSettings.BackgroundMusicFadeTime, _CurrentPlaylistElement.VideoGap);
@@ -186,277 +222,201 @@ namespace Vocaluxe.Base
             IsPlaying = false;
         }
 
-        public static void Update()
-        {
-            if (_AllFileNames.Count > 0 && _CurrentMusicStream != -1)
-            {
-                float timeToPlay;
-                if (Math.Abs(_CurrentPlaylistElement.Finish) < 0.001) //No End-Tag defined
-                    timeToPlay = CSound.GetLength(_CurrentMusicStream) - CSound.GetPosition(_CurrentMusicStream);
-                else //End-Tag found
-                    timeToPlay = _CurrentPlaylistElement.Finish - CSound.GetPosition(_CurrentMusicStream);
-
-                bool finished = CSound.IsFinished(_CurrentMusicStream);
-                if (IsPlaying && ((timeToPlay <= CSettings.BackgroundMusicFadeTime && timeToPlay > 0) || finished))
-                {
-                    if (_RepeatSong)
-                    {
-                        //Seek to #Start-Tag, if found
-                        if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
-                            CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
-                        else
-                            CSound.SetPosition(_CurrentMusicStream, 0);
-                        if (_VideoEnabled && _Video != -1)
-                        {
-                            if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
-                                CVideo.Skip(_Video, _CurrentPlaylistElement.Start, _CurrentPlaylistElement.VideoGap);
-                            else
-                                CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
-                        }
-                    }
-                    else
-                        Next();
-                }
-            }
-        }
-
         public static void Next()
         {
-            if (_AllFileNames.Count > 0)
+            Stop(); //stop last song if any
+            if (_PreviousMusicIndex < _PreviousFiles.Count - 2)
             {
-                if (_PreviousMusicIndex == _PreviousFileNames.Count - 1 || _PreviousFileNames.Count == 0)
-                {
-                    //We are not currently in the previous list
-                    Stop();
-                    if (_NotPlayedFileNames.Count == 0)
-                        _NotPlayedFileNames.AddRange(_AllFileNames);
-
-                    _CurrentPlaylistElement = _NotPlayedFileNames[CGame.Rand.Next(_NotPlayedFileNames.Count)];
-                    _NotPlayedFileNames.Remove(_CurrentPlaylistElement);
-
-                    _PreviousFileNames.Add(_CurrentPlaylistElement);
-                    _PreviousMusicIndex = _PreviousFileNames.Count - 1;
-                }
-                else if (_PreviousFileNames.Count > 0)
-                {
-                    //We are in the previous list
-                    Stop();
-                    _PreviousMusicIndex++;
-
-                    _CurrentPlaylistElement = _PreviousFileNames[_PreviousMusicIndex];
-                }
-                _CurrentMusicStream = CSound.Load(_CurrentPlaylistElement.MusicFilePath);
-                CSound.SetStreamVolumeMax(_CurrentMusicStream, CConfig.BackgroundMusicVolume);
-
-                //Seek to #Start-Tag, if found
-                if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
-                    CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
-
-                if (_VideoEnabled)
-                    _LoadVideo();
-                CSound.SetStreamVolume(_CurrentMusicStream, 0f);
-                Play();
+                //We are in the previous list and next element exists
+                _PreviousMusicIndex++;
+                _CurrentPlaylistElement = _PreviousFiles[_PreviousMusicIndex];
             }
             else
-                Stop();
+            {
+                //We are not in the previous list (anymore)
+                if (_NotPlayedFiles.Count == 0)
+                {
+                    if (_PreviousFiles.Count == 0)
+                        return; //No songs to play
+                    _NotPlayedFiles.AddRange(_PreviousFiles);
+                }
+
+                _CurrentPlaylistElement = _NotPlayedFiles[CGame.Rand.Next(_NotPlayedFiles.Count)];
+                _NotPlayedFiles.Remove(_CurrentPlaylistElement);
+
+                _PreviousFiles.Add(_CurrentPlaylistElement);
+                _PreviousMusicIndex = _PreviousFiles.Count - 1;
+            }
+            _StartSong();
+            CanSing = !_IsBackgroundFile(_CurrentPlaylistElement);
         }
 
         public static void Previous()
         {
-            if (_PreviousFileNames.Count > 0 && _PreviousMusicIndex >= 0)
+            if (_PreviousMusicIndex < 0)
+                return;
+            Debug.Assert(_CurrentMusicStream != -1 && _CurrentPlaylistElement != null);
+            if (CSound.GetPosition(_CurrentMusicStream) <= 1.5f && _PreviousMusicIndex > 0)
             {
-                if (CSound.GetPosition(_CurrentMusicStream) >= 1.5f)
-                {
-                    //Seek to #Start-Tag, if found
-                    if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
-                        CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
-                    else
-                        CSound.SetPosition(_CurrentMusicStream, 0);
-                    if (_VideoEnabled && _Video != -1)
-                    {
-                        if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
-                            CVideo.Skip(_Video, _CurrentPlaylistElement.Start, _CurrentPlaylistElement.VideoGap);
-                        else
-                            CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
-                    }
-                }
-                else
-                {
-                    Stop();
-                    _PreviousMusicIndex--;
-                    if (_PreviousMusicIndex < 0)
-                        _PreviousMusicIndex = 0; //No previous songs left, so play the first
+                Stop(); //stop last song
+                _PreviousMusicIndex--;
 
-                    _CurrentPlaylistElement = _PreviousFileNames[_PreviousMusicIndex];
-
-                    _CurrentMusicStream = CSound.Load(_CurrentPlaylistElement.MusicFilePath);
-                    CSound.SetStreamVolumeMax(_CurrentMusicStream, CConfig.BackgroundMusicVolume);
-                    if (_VideoEnabled)
-                        _LoadVideo();
-                    CSound.SetStreamVolume(_CurrentMusicStream, 0f);
-                    Play();
-                }
+                _CurrentPlaylistElement = _PreviousFiles[_PreviousMusicIndex];
+                CanSing = !_IsBackgroundFile(_CurrentPlaylistElement);
             }
-            else if (_CurrentMusicStream != -1)
+            _StartSong();
+        }
+
+        public static void Update()
+        {
+            if (!IsPlaying)
+                return;
+            Debug.Assert(_CurrentMusicStream != -1 && _CurrentPlaylistElement != null);
+
+            float timeToPlay;
+            if (Math.Abs(_CurrentPlaylistElement.Finish) < 0.001)
             {
-                //Seek to #Start-Tag, if found
-                if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
-                    CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
+                //No End-Tag defined
+                float len = CSound.GetLength(_CurrentMusicStream);
+                timeToPlay = (len > 0f) ? len - CSound.GetPosition(_CurrentMusicStream) : CSettings.BackgroundMusicFadeTime + 1f;
+            }
+            else //End-Tag found
+                timeToPlay = _CurrentPlaylistElement.Finish - CSound.GetPosition(_CurrentMusicStream);
+
+            bool finished = CSound.IsFinished(_CurrentMusicStream);
+            if (timeToPlay <= CSettings.BackgroundMusicFadeTime || finished)
+            {
+                if (RepeatSong)
+                    _StartSong();
                 else
-                    CSound.SetPosition(_CurrentMusicStream, 0);
-                if (_VideoEnabled && _Video != -1)
+                    Next();
+            }
+        }
+
+        public static CTexture GetVideoTexture()
+        {
+            if (_Video == -1)
+                return null;
+            float vtime;
+            if (CVideo.GetFrame(_Video, ref _CurrentVideoTexture, CSound.GetPosition(_CurrentMusicStream), out vtime))
+            {
+                if (_VideoFading != null)
+                {
+                    bool finished;
+                    _CurrentVideoTexture.Color.A = _VideoFading.GetValue(out finished);
+                    if (finished)
+                        _VideoFading = null;
+                }
+                return _CurrentVideoTexture;
+            }
+            return null;
+        }
+
+        public static void SetMusicSource(EBackgroundMusicSource source)
+        {
+            if (_MusicSource == source)
+                return;
+            _MusicSource = source;
+            switch (_MusicSource)
+            {
+                case EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC:
+                    _AddBackgroundMusic();
+                    _RemoveOwnMusic();
+                    break;
+
+                case EBackgroundMusicSource.TR_CONFIG_ONLY_OWN_MUSIC:
+                    _AddOwnMusic();
+                    _RemoveBackgroundMusic();
+                    break;
+                case EBackgroundMusicSource.TR_CONFIG_OWN_MUSIC:
+                    _AddBackgroundMusic();
+                    _AddOwnMusic();
+                    break;
+            }
+        }
+
+        /// <summary>
+        ///     (Re-)Starts the _CurrentPlaylistElement
+        /// </summary>
+        private static void _StartSong()
+        {
+            Debug.Assert(_CurrentPlaylistElement != null);
+            //If we have an active stream, reuse it
+            if (_CurrentMusicStream < 0)
+            {
+                //otherwhise load
+                _CurrentMusicStream = CSound.Load(_CurrentPlaylistElement.MusicFilePath);
+                if (_CurrentMusicStream < 0)
+                    return;
+                CSound.SetStreamVolume(_CurrentMusicStream, 0f);
+                CSound.Fade(_CurrentMusicStream, 100f, CSettings.BackgroundMusicFadeTime);
+            }
+            //Seek to #Start-Tag, if found
+            if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
+                CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
+
+            if (_VideoEnabled)
+            {
+                if (_Video != -1)
                 {
                     if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
-                        CVideo.Skip(_Video, _CurrentPlaylistElement.Start, _CurrentPlaylistElement.VideoGap);
+                        CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap + _CurrentPlaylistElement.Start);
                     else
                         CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
                 }
+                else
+                    _LoadVideo();
             }
         }
 
-        public static void ApplyVolume()
+        private static void _AddOwnMusic()
         {
-            CSound.SetStreamVolumeMax(_CurrentMusicStream, CConfig.BackgroundMusicVolume);
-        }
-
-        public static void AddOwnMusic()
-        {
-            if (!_OwnMusicAdded)
-            {
-                foreach (CSong song in CSongs.AllSongs)
-                {
-                    _AllFileNames.Add(new CPlaylistElement(song));
-                    _NotPlayedFileNames.Add(new CPlaylistElement(song));
-                }
-            }
+            if (_OwnMusicAdded || !_OwnSongsAvailable)
+                return;
+            foreach (CSong song in CSongs.AllSongs)
+                _NotPlayedFiles.Add(new CPlaylistElement(song));
             _OwnMusicAdded = true;
         }
 
-        public static void RemoveOwnMusic()
+        private static void _RemoveOwnMusic()
         {
-            _AllFileNames.Clear();
-            _NotPlayedFileNames.Clear();
+            if (!_OwnMusicAdded)
+                return;
+            _NotPlayedFiles.RemoveAll(el => el.SongID >= 0);
+            _PreviousFiles.RemoveAll(el => el.SongID >= 0);
+            _PreviousMusicIndex = _PreviousFiles.IndexOf(_CurrentPlaylistElement);
 
-            if (_BackgroundMusicAdded)
-            {
-                _AllFileNames.AddRange(_BGMusicFileNames);
-                _NotPlayedFileNames.AddRange(_BGMusicFileNames);
-            }
-
-            if (IsPlaying && !_IsBackgroundFile(_CurrentPlaylistElement) || _AllFileNames.Count == 0)
+            if (IsPlaying && !_IsBackgroundFile(_CurrentPlaylistElement))
                 Next();
 
             _OwnMusicAdded = false;
         }
 
-        public static void AddBackgroundMusic()
-        {
-            if (!_BackgroundMusicAdded)
-            {
-                _AllFileNames.AddRange(_BGMusicFileNames);
-                _NotPlayedFileNames.AddRange(_BGMusicFileNames);
-                _BackgroundMusicAdded = true;
-            }
-        }
-
-        public static void RemoveBackgroundMusic()
+        private static void _AddBackgroundMusic()
         {
             if (_BackgroundMusicAdded)
-            {
-                _AllFileNames.Clear();
-                _OwnMusicAdded = false;
-                AddOwnMusic();
-                _BackgroundMusicAdded = false;
-
-                if (IsPlaying && _IsBackgroundFile(_CurrentPlaylistElement) || _AllFileNames.Count == 0)
-                    Next();
-            }
+                return;
+            _NotPlayedFiles.AddRange(_BGMusicFiles);
+            _BackgroundMusicAdded = true;
         }
 
-        public static void CheckAndApplyConfig(EOffOn newOnOff, EBackgroundMusicSource newSource, float newVolume)
+        private static void _RemoveBackgroundMusic()
         {
-            if (CConfig.BackgroundMusicSource != newSource || (newOnOff == EOffOn.TR_CONFIG_ON && !_OwnMusicAdded && !_BackgroundMusicAdded))
-            {
-                CConfig.BackgroundMusicSource = newSource;
+            if (!_BackgroundMusicAdded)
+                return;
+            _NotPlayedFiles.RemoveAll(el => el.SongID < 0);
+            _PreviousFiles.RemoveAll(el => el.SongID < 0);
+            _PreviousMusicIndex = _PreviousFiles.IndexOf(_CurrentPlaylistElement);
 
-                switch (newSource)
-                {
-                    case EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC:
-                        if (!_BackgroundMusicAdded)
-                            AddBackgroundMusic();
+            if (IsPlaying && _IsBackgroundFile(_CurrentPlaylistElement))
+                Next();
 
-                        RemoveOwnMusic();
-                        break;
-
-                    case EBackgroundMusicSource.TR_CONFIG_ONLY_OWN_MUSIC:
-                        if (!_OwnMusicAdded)
-                            AddOwnMusic();
-
-                        RemoveBackgroundMusic();
-                        break;
-                    case EBackgroundMusicSource.TR_CONFIG_OWN_MUSIC:
-                        if (!_BackgroundMusicAdded)
-                            AddBackgroundMusic();
-
-                        if (!_OwnMusicAdded)
-                            AddOwnMusic();
-                        break;
-                }
-            }
-
-            if (CConfig.BackgroundMusic != newOnOff)
-            {
-                CConfig.BackgroundMusic = newOnOff;
-                if (newOnOff == EOffOn.TR_CONFIG_ON)
-                    Play();
-                else
-                    Pause();
-            }
-
-            if (Math.Abs(CConfig.BackgroundMusicVolume - newVolume) > 0.01)
-            {
-                CConfig.BackgroundMusicVolume = (int)newVolume;
-                ApplyVolume();
-            }
-
-            CConfig.SaveConfig();
-        }
-
-        public static void ToggleVideo()
-        {
-            if (_Video != -1)
-            {
-                CVideo.Close(_Video);
-                CDraw.RemoveTexture(ref _CurrentVideoTexture);
-                _Video = -1;
-            }
-            else
-                _LoadVideo();
-        }
-
-        public static CTexture GetVideoTexture()
-        {
-            if (_Video != -1)
-            {
-                float vtime;
-                if (CVideo.GetFrame(_Video, ref _CurrentVideoTexture, CSound.GetPosition(_CurrentMusicStream), out vtime))
-                {
-                    if (_VideoFading != null)
-                    {
-                        bool finished;
-                        _CurrentVideoTexture.Color.A = _VideoFading.GetValue(out finished);
-                        if (finished)
-                            _VideoFading = null;
-                    }
-                    return _CurrentVideoTexture;
-                }
-            }
-            return null;
+            _BackgroundMusicAdded = false;
         }
 
         private static bool _IsBackgroundFile(CPlaylistElement element)
         {
-            return _BGMusicFileNames.Any(elements => elements.MusicFilePath == element.MusicFilePath);
+            return _BGMusicFiles.Contains(element);
         }
 
         private static void _LoadVideo()
@@ -464,134 +424,11 @@ namespace Vocaluxe.Base
             if (_Video != -1 || String.IsNullOrEmpty(_CurrentPlaylistElement.VideoFilePath))
                 return;
             _Video = CVideo.Load(_CurrentPlaylistElement.VideoFilePath);
-            if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
-                CVideo.Skip(_Video, _CurrentPlaylistElement.Start, _CurrentPlaylistElement.VideoGap);
+            if (CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
+                CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap + _CurrentPlaylistElement.Start); //Use gap, otherwhise we will overwrite position in GetVideoTexture
             else
                 CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
             _VideoFading = new CFading(0f, 1f, 3f);
         }
     }
-
-    class CPlaylistElement
-    {
-        private readonly CSong _Song;
-
-        private readonly int _SongID;
-        public int SongID
-        {
-            get { return _SongID; }
-        }
-
-        private string _MusicFilePath = String.Empty;
-
-        public string MusicFilePath
-        {
-            get
-            {
-                if (_Song != null)
-                    return _Song.GetMP3();
-
-                return _MusicFilePath;
-            }
-
-            set { _MusicFilePath = value; }
-        }
-
-        public string VideoFilePath
-        {
-            get
-            {
-                if (_Song != null)
-                    return _Song.GetVideo();
-
-                return string.Empty;
-            }
-        }
-
-        public string Title
-        {
-            get
-            {
-                if (_Song != null)
-                    return _Song.Title;
-
-                return "";
-            }
-        }
-
-        public string Artist
-        {
-            get
-            {
-                if (_Song != null)
-                    return _Song.Artist;
-
-                return "";
-            }
-        }
-
-        public float Start
-        {
-            get
-            {
-                if (_Song != null)
-                    return _Song.Start;
-
-                return 0f;
-            }
-        }
-
-        public float Finish
-        {
-            get
-            {
-                if (_Song != null)
-                    return _Song.Finish;
-
-                return 0f;
-            }
-        }
-
-        public CTexture Cover
-        {
-            get
-            {
-                if (_Song != null)
-                    return _Song.CoverTextureSmall;
-
-                return CCover.NoCover;
-            }
-        }
-
-        public float VideoGap
-        {
-            get
-            {
-                if (_Song != null)
-                    return _Song.VideoGap;
-
-                return 0;
-            }
-        }
-
-        public CPlaylistElement(CSong song)
-        {
-            MusicFilePath = string.Empty;
-            _SongID = song.ID;
-
-            _Song = song;
-        }
-
-        public CPlaylistElement(string filePath)
-        {
-            MusicFilePath = filePath;
-            _SongID = -1;
-        }
-
-        public CPlaylistElement()
-        {
-            MusicFilePath = string.Empty;
-            _SongID = -1;
-        }
-    }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 2b5d8b3d..cc523c70 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -24,7 +24,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml;
-using Vocaluxe.Lib.Sound;
+using Vocaluxe.Lib.Sound.Record;
 using Vocaluxe.Lib.Webcam;
 using VocaluxeLib;
 using VocaluxeLib.Profile;
@@ -43,6 +43,15 @@ namespace Vocaluxe.Base
                 ConformanceLevel = ConformanceLevel.Document
             };
 
+        private static bool _Initialized;
+
+        // Base file and folder names (formerly from CSettings but they can be changed)
+        private const string _FolderProfiles = "Profiles"; //Use ProfileFolders for access
+        private const string _FolderSongs = "Songs"; //Use SongFolders for access
+        public static string FolderPlaylists = "Playlists";
+        public static string FileHighscoreDB = "HighscoreDB.sqlite";
+        private static string _FileConfig = "Config.xml";
+
         // Debug
         public static EDebugLevel DebugLevel = EDebugLevel.TR_CONFIG_OFF;
         public static EOffOn SaveModifiedSongs = EOffOn.TR_CONFIG_OFF;
@@ -86,19 +95,38 @@ namespace Vocaluxe.Base
         public static ELyricStyle LyricStyle = ELyricStyle.Slide;
 
         // Sound
-        public static EPlaybackLib PlayBackLib = EPlaybackLib.Gstreamer;
-        public static ERecordLib RecordLib = ERecordLib.PortAudio;
+        public static EPlaybackLib PlayBackLib = EPlaybackLib.GstreamerSharp;
         public static EBufferSize AudioBufferSize = EBufferSize.B2048;
         public static int AudioLatency;
         private static int _BackgroundMusicVolume = 30;
         public static EOffOn BackgroundMusic = EOffOn.TR_CONFIG_ON;
         public static EBackgroundMusicSource BackgroundMusicSource = EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC;
         public static EOffOn BackgroundMusicUseStart = EOffOn.TR_CONFIG_ON;
-        public static int PreviewMusicVolume = 50;
-        public static int GameMusicVolume = 80;
+        private static int _PreviewMusicVolume = 50;
+        private static int _GameMusicVolume = 80;
+
+        //Folders
+        public static readonly List<string> SongFolders = new List<string>
+            {
+                Path.Combine(Directory.GetCurrentDirectory(), _FolderSongs)
+
+#if INSTALLER
+            ,Path.Combine(CSettings.DataPath, CSettings.FolderSongs);           
+#endif
+            };
+        /// <summary>
+        ///     Folders with profiles
+        ///     First one is used for new profiles
+        /// </summary>
+        public static readonly List<string> ProfileFolders = new List<string>
+            {
+#if INSTALLER
+                Path.Combine(Environment.CurrentDirectory, CSettings.FolderProfiles),
+#endif
+                Path.Combine(CSettings.DataPath, _FolderProfiles)
+            };
 
         // Game
-        public static readonly List<string> SongFolder = new List<string>();
         public static ESongMenu SongMenu = ESongMenu.TR_CONFIG_TILE_BOARD;
         public static ESongSorting SongSorting = ESongSorting.TR_CONFIG_ARTIST;
         public static EOffOn IgnoreArticles = EOffOn.TR_CONFIG_ON;
@@ -120,8 +148,11 @@ namespace Vocaluxe.Base
         public static EOffOn VideosToBackground = EOffOn.TR_CONFIG_OFF;
 
         // Record
-        public static SMicConfig[] MicConfig;
-        public static int MicDelay = 300; //[ms]
+        public static ERecordLib RecordLib = ERecordLib.PortAudio;
+        public static readonly SMicConfig[] MicConfig = new SMicConfig[CSettings.MaxNumPlayer];
+        public static int MicDelay = 200; //[ms]
+
+        // Webcam
         public static EWebcamLib WebcamLib = EWebcamLib.OpenCV;
         public static SWebcamConfig WebcamConfig;
 
@@ -135,46 +166,53 @@ namespace Vocaluxe.Base
         private static readonly List<string> _Params = new List<string>();
         private static readonly List<string> _Values = new List<string>();
 
-        //Variables to save old values for commandline-parameters
-        private static readonly List<string> _SongFolderOld = new List<string>();
         public static int BackgroundMusicVolume
         {
             get { return _BackgroundMusicVolume; }
             set
             {
-                if (value < 0)
-                    _BackgroundMusicVolume = 0;
-                else if (value > 100)
-                    _BackgroundMusicVolume = 100;
-                else
-                    _BackgroundMusicVolume = value;
+                _BackgroundMusicVolume = value.Clamp(0, 100);
+                SaveConfig();
+            }
+        }
+
+        public static int GameMusicVolume
+        {
+            get { return _GameMusicVolume; }
+            set
+            {
+                _GameMusicVolume = value.Clamp(0, 100);
+                SaveConfig();
+            }
+        }
+
+        public static int PreviewMusicVolume
+        {
+            get { return _PreviewMusicVolume; }
+            set
+            {
+                _PreviewMusicVolume = value.Clamp(0, 100);
                 SaveConfig();
             }
         }
 
         public static void Init()
         {
-            SongFolder.Add(Path.Combine(Directory.GetCurrentDirectory(), CSettings.FolderSongs));
-
-#if INSTALLER
-            SongFolder.Add(Path.Combine(CSettings.DataPath, CSettings.FolderSongs));            
-#endif
-
-            foreach (string folder in SongFolder)
-                CSettings.CreateFolder(folder);
-
-            MicConfig = new SMicConfig[CSettings.MaxNumPlayer];
+            if (_Initialized)
+                return;
 
             // Init config file
-            if (!File.Exists(Path.Combine(CSettings.DataPath, CSettings.FileConfig)))
+            if (!File.Exists(Path.Combine(CSettings.DataPath, _FileConfig)))
                 SaveConfig();
+            else
+                _LoadConfig();
 
-            _LoadConfig();
+            _Initialized = true;
         }
 
         private static void _LoadConfig()
         {
-            CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.DataPath, CSettings.FileConfig));
+            CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.DataPath, _FileConfig));
             if (xmlReader == null)
                 return;
 
@@ -225,21 +263,20 @@ namespace Vocaluxe.Base
             xmlReader.TryGetIntValueRange("//root/Sound/BackgroundMusicVolume", ref _BackgroundMusicVolume);
             xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusicSource", ref BackgroundMusicSource);
             xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusicUseStart", ref BackgroundMusicUseStart);
-            xmlReader.TryGetIntValueRange("//root/Sound/PreviewMusicVolume", ref PreviewMusicVolume);
-            xmlReader.TryGetIntValueRange("//root/Sound/GameMusicVolume", ref GameMusicVolume);
+            xmlReader.TryGetIntValueRange("//root/Sound/PreviewMusicVolume", ref _PreviewMusicVolume);
+            xmlReader.TryGetIntValueRange("//root/Sound/GameMusicVolume", ref _GameMusicVolume);
             #endregion Sound
 
             #region Game
             // Songfolder
-            string value = string.Empty;
+            string value = String.Empty;
             int i = 1;
             while (xmlReader.GetValue("//root/Game/SongFolder" + i, out value, value))
             {
                 if (i == 1)
-                    SongFolder.Clear();
-
-                SongFolder.Add(value);
-                value = string.Empty;
+                    SongFolders.Clear();
+                SongFolders.Add(value);
+                value = String.Empty;
                 i++;
             }
 
@@ -271,7 +308,7 @@ namespace Vocaluxe.Base
 
             //Read players from config
             for (i = 1; i <= CSettings.MaxNumPlayer; i++)
-                xmlReader.GetValue("//root/Game/Players/Player" + i, out Players[i - 1], string.Empty);
+                xmlReader.GetValue("//root/Game/Players/Player" + i, out Players[i - 1], String.Empty);
             #endregion Game
 
             #region Video
@@ -290,7 +327,6 @@ namespace Vocaluxe.Base
             #endregion Video
 
             #region Record
-            MicConfig = new SMicConfig[CSettings.MaxNumPlayer];
             for (int p = 1; p <= CSettings.MaxNumPlayer; p++)
             {
                 MicConfig[p - 1] = new SMicConfig(0);
@@ -319,7 +355,7 @@ namespace Vocaluxe.Base
             XmlWriter writer = null;
             try
             {
-                writer = XmlWriter.Create(Path.Combine(CSettings.DataPath, CSettings.FileConfig), XMLSettings);
+                writer = XmlWriter.Create(Path.Combine(CSettings.DataPath, _FileConfig), XMLSettings);
                 writer.WriteStartDocument();
                 writer.WriteStartElement("root");
 
@@ -470,21 +506,9 @@ namespace Vocaluxe.Base
                 writer.WriteElementString("Language", Language);
 
                 // SongFolder
-                // Check, if program was started with songfolder-parameters
-                if (_SongFolderOld.Count > 0)
-                {
-                    //Write "old" song-folders to config.
-                    writer.WriteComment("SongFolder: SongFolder1, SongFolder2, SongFolder3, ...");
-                    for (int i = 0; i < _SongFolderOld.Count; i++)
-                        writer.WriteElementString("SongFolder" + (i + 1), _SongFolderOld[i]);
-                }
-                else
-                {
-                    //Write "normal" song-folders to config.
-                    writer.WriteComment("SongFolder: SongFolder1, SongFolder2, SongFolder3, ...");
-                    for (int i = 0; i < SongFolder.Count; i++)
-                        writer.WriteElementString("SongFolder" + (i + 1), SongFolder[i]);
-                }
+                writer.WriteComment("SongFolder: SongFolder1, SongFolder2, SongFolder3, ...");
+                for (int i = 0; i < SongFolders.Count; i++)
+                    writer.WriteElementString("SongFolder" + (i + 1), SongFolders[i]);
 
                 writer.WriteComment("SongMenu: " + CHelper.ListStrings(Enum.GetNames(typeof(ESongMenu))));
                 writer.WriteElementString("SongMenu", Enum.GetName(typeof(ESongMenu), SongMenu));
@@ -626,7 +650,7 @@ namespace Vocaluxe.Base
         /// <returns></returns>
         public static bool IsMicConfig()
         {
-            ReadOnlyCollection<CRecordDevice> devices = CSound.RecordGetDevices();
+            ReadOnlyCollection<CRecordDevice> devices = CRecord.GetDevices();
             if (devices == null)
                 return false;
 
@@ -640,7 +664,7 @@ namespace Vocaluxe.Base
         /// <returns></returns>
         public static bool IsMicConfig(int player)
         {
-            ReadOnlyCollection<CRecordDevice> devices = CSound.RecordGetDevices();
+            ReadOnlyCollection<CRecordDevice> devices = CRecord.GetDevices();
             if (devices == null)
                 return false;
 
@@ -666,8 +690,8 @@ namespace Vocaluxe.Base
         public static bool AutoAssignMics()
         {
             //Look for (usb-)mic
-            //SRecordDevice[] Devices = new SRecordDevice[CSound.RecordGetDevices().Length];
-            ReadOnlyCollection<CRecordDevice> devices = CSound.RecordGetDevices();
+            //SRecordDevice[] Devices = new SRecordDevice[CRecord.RecordGetDevices().Length];
+            ReadOnlyCollection<CRecordDevice> devices = CRecord.GetDevices();
             if (devices == null)
                 return false;
 
@@ -731,7 +755,7 @@ namespace Vocaluxe.Base
             Regex spliterParam = new Regex(@"-{1,2}|\/", RegexOptions.IgnoreCase);
 
             //Complete argument string
-            string arguments = args.Aggregate(string.Empty, (current, arg) => current + (arg + " "));
+            string arguments = args.Aggregate(String.Empty, (current, arg) => current + arg + " ");
 
             args = spliterParam.Split(arguments);
 
@@ -792,24 +816,22 @@ namespace Vocaluxe.Base
                     case "configfile":
                         //Check if value is valid                      
                         if (_CheckFile(value))
-                            CSettings.FileConfig = value;
+                            _FileConfig = value;
                         break;
 
                     case "scorefile":
                         //Check if value is valid
                         if (_CheckFile(value))
-                            CSettings.FileHighscoreDB = value;
+                            FileHighscoreDB = value;
                         break;
 
                     case "playlistfolder":
-                        CSettings.CreateFolder(value);
-                        CSettings.FolderPlaylists = value;
+                        FolderPlaylists = value;
                         break;
 
                     case "profilefolder":
-                        CSettings.CreateFolder(value);
-                        CSettings.FoldersProfiles.Clear();
-                        CSettings.FoldersProfiles.Add(value);
+                        ProfileFolders.Clear();
+                        ProfileFolders.Add(value);
                         break;
                 }
             }
@@ -820,6 +842,7 @@ namespace Vocaluxe.Base
         /// </summary>
         public static void UseCommandLineParamsAfter()
         {
+            bool songFoldersOverwritten = false;
             //Check each parameter
             for (int i = 0; i < _Params.Count; i++)
             {
@@ -834,15 +857,13 @@ namespace Vocaluxe.Base
                 {
                     case "songfolder":
                     case "songpath":
-                        //Check if SongFolders from config.xml are saved
-                        if (_SongFolderOld.Count == 0)
+                        if (!songFoldersOverwritten)
                         {
-                            _SongFolderOld.Clear();
-                            _SongFolderOld.AddRange(SongFolder);
-                            SongFolder.Clear();
+                            SongFolders.Clear();
+                            songFoldersOverwritten = true;
                         }
-                        //Add parameter-value to SongFolder
-                        SongFolder.Add(value);
+                        if (!SongFolders.Contains(value))
+                            SongFolders.Add(value);
                         break;
                 }
             }
diff --git a/Vocaluxe/Base/CController.cs b/Vocaluxe/Base/CController.cs
index ce70f459..604b17c0 100644
--- a/Vocaluxe/Base/CController.cs
+++ b/Vocaluxe/Base/CController.cs
@@ -36,19 +36,26 @@ namespace Vocaluxe.Base
             _KeysPool = new List<SKeyEvent>();
             _MousePool = new List<SMouseEvent>();
 
-            _Controller.Add(new CWiiMote());
-            _Controller.Add(CVocaluxeServer.Controller);
+            _AddController(new CWiiMote());
+            _AddController(CVocaluxeServer.Controller);
+        }
 
-            foreach (IController controller in _Controller)
-                controller.Init();
+        private static void _AddController(IController controller)
+        {
+            if (controller.Init())
+                _Controller.Add(controller);
         }
 
         public static void Close()
         {
-            foreach (IController controller in _Controller)
-                controller.Close();
-
-            _Controller = new List<IController>();
+            if (_Controller != null)
+            {
+                foreach (IController controller in _Controller)
+                    controller.Close();
+                _Controller = null;
+                _KeysPool = null;
+                _MousePool = null;
+            }
         }
 
         public static void Connect()
diff --git a/Vocaluxe/Base/CCover.cs b/Vocaluxe/Base/CCover.cs
index a156fa8b..26eb6866 100644
--- a/Vocaluxe/Base/CCover.cs
+++ b/Vocaluxe/Base/CCover.cs
@@ -18,9 +18,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Xml;
 using VocaluxeLib;
 using VocaluxeLib.Draw;
 
@@ -35,24 +32,23 @@ namespace Vocaluxe.Base
 
     static class CCover
     {
-        private static readonly XmlWriterSettings _Settings = new XmlWriterSettings();
-        private static readonly Dictionary<string, CTexture> _Cover = new Dictionary<string, CTexture>();
+        private static readonly Dictionary<string, CTexture> _Covers = new Dictionary<string, CTexture>();
         private static readonly List<SCoverTheme> _CoverThemes = new List<SCoverTheme>();
 
-        private static readonly Object _MutexCover = new Object();
-
         public static CTexture NoCover { get; private set; }
 
         public static void Init()
         {
-            _Settings.Indent = true;
-            _Settings.Encoding = Encoding.UTF8;
-            _Settings.ConformanceLevel = ConformanceLevel.Document;
-
             _LoadCoverThemes();
             _LoadCover(CConfig.CoverTheme);
         }
 
+        public static void Close()
+        {
+            _UnloadCovers();
+            _CoverThemes.Clear();
+        }
+
         /// <summary>
         ///     Returns an array of CoverThemes-Names
         /// </summary>
@@ -87,42 +83,46 @@ namespace Vocaluxe.Base
         /// </summary>
         public static CTexture Cover(string name)
         {
-            lock (_MutexCover)
+            lock (_Covers)
             {
                 if (!_CoverExists(name))
                     return NoCover;
 
-                return _Cover[name];
+                return _Covers[name];
             }
         }
 
         /// <summary>
         ///     Returns true if a cover with the given name exists.
+        ///     MUST HOLD _Covers lock at this point
         /// </summary>
         private static bool _CoverExists(string name)
         {
-            lock (_MutexCover)
-            {
-                return _Cover.ContainsKey(name);
-            }
+            return _Covers.ContainsKey(name);
         }
 
         /// <summary>
         ///     Reloads cover to use a new cover-theme
         /// </summary>
-        public static void ReloadCover()
+        public static void ReloadCovers()
         {
-            List<string> keys = _Cover.Keys.ToList();
-
-            foreach (string key in keys)
-            {
-                CTexture texture = _Cover[key];
-                CDraw.RemoveTexture(ref texture);
-            }
-            _Cover.Clear();
+            _UnloadCovers();
             _LoadCover(CConfig.CoverTheme);
         }
 
+        private static void _UnloadCovers()
+        {
+            lock (_Covers)
+            {
+                foreach (string key in _Covers.Keys)
+                {
+                    CTexture texture = _Covers[key];
+                    CDraw.RemoveTexture(ref texture);
+                }
+                _Covers.Clear();
+            }
+        }
+
         /// <summary>
         ///     Returns a SCoverTheme by cover-theme-name
         /// </summary>
@@ -178,12 +178,16 @@ namespace Vocaluxe.Base
                 return;
 
             var ignoreList = new List<string>();
+
+            string coverPath = Path.Combine(CSettings.FolderCover, coverTheme.Folder);
+            List<string> files = CHelper.ListImageFiles(coverPath, true, true);
+
             CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.FolderCover, coverTheme.File));
-            if (xmlReader != null)
+            lock (_Covers)
             {
-                lock (_MutexCover)
+                if (xmlReader != null)
                 {
-                    _Cover.Clear();
+                    _Covers.Clear();
                     List<string> cover = xmlReader.GetValues("Cover");
                     foreach (string coverName in cover)
                     {
@@ -199,38 +203,36 @@ namespace Vocaluxe.Base
                         ignoreList.Add(Path.GetFileName(coverFilePath));
 
                         if (name == "NoCover")
-                            NoCover = _Cover[name];
+                            NoCover = _Covers[name];
                     }
                 }
-            }
-
-            var files = new List<string>();
-
-            string coverPath = Path.Combine(CSettings.FolderCover, coverTheme.Folder);
-            files.AddRange(CHelper.ListFiles(coverPath, "*.png", true, true));
-            files.AddRange(CHelper.ListFiles(coverPath, "*.jpg", true, true));
-            files.AddRange(CHelper.ListFiles(coverPath, "*.jpeg", true, true));
-            files.AddRange(CHelper.ListFiles(coverPath, "*.bmp", true, true));
 
 
-            foreach (string file in files)
-            {
-                if (!ignoreList.Contains(Path.GetFileName(file)))
-                    _AddCover(Path.GetFileNameWithoutExtension(file), file);
+                foreach (string file in files)
+                {
+                    if (!ignoreList.Contains(Path.GetFileName(file)))
+                        _AddCover(Path.GetFileNameWithoutExtension(file), file);
+                }
             }
         }
 
+        /// <summary>
+        ///     Ads a cover with the given name if it does not exist yet
+        ///     MUST HOLD _Covers lock at this point
+        /// </summary>
+        /// <param name="name">Name of the cover</param>
+        /// <param name="file">Filename of image file</param>
         private static void _AddCover(string name, string file)
         {
             CTexture texture = CDraw.AddTexture(file);
 
             if (!_CoverExists(name))
-                _Cover.Add(name, texture);
+                _Covers.Add(name, texture);
             else
             {
-                CTexture tex = _Cover[name];
+                CTexture tex = _Covers[name];
                 CDraw.RemoveTexture(ref tex);
-                _Cover[name] = texture;
+                _Covers[name] = texture;
             }
         }
     }
diff --git a/Vocaluxe/Base/CCursor.cs b/Vocaluxe/Base/CCursor.cs
index 94a1e495..ecb0738c 100644
--- a/Vocaluxe/Base/CCursor.cs
+++ b/Vocaluxe/Base/CCursor.cs
@@ -24,6 +24,7 @@ namespace Vocaluxe.Base
 {
     class CCursor
     {
+        private int _MouseMoveDiffMin = CSettings.MouseMoveDiffMinActive;
         private CFading _Fading;
         private CTexture _Cursor;
 
@@ -49,12 +50,8 @@ namespace Vocaluxe.Base
 
         public void Draw()
         {
-            if (_Movetimer.IsRunning && _Movetimer.ElapsedMilliseconds > CSettings.MouseMoveOffTime)
-            {
-                _Movetimer.Stop();
-                _Fade(0f, 0.5f);
-            }
-
+            if (_Movetimer.ElapsedMilliseconds > CSettings.MouseMoveOffTime)
+                Deactivate();
 
             if (_Fading != null)
             {
@@ -64,21 +61,15 @@ namespace Vocaluxe.Base
                     _Fading = null;
             }
 
-            if (Visible && (CSettings.GameState == EGameState.EditTheme || ShowCursor))
+            if (Visible && (CSettings.ProgramState == EProgramState.EditTheme || ShowCursor))
                 CDraw.DrawTexture(_Cursor);
         }
 
         public void UpdatePosition(int x, int y)
         {
-            if (Math.Abs(_Cursor.Rect.X - x) > CSettings.MouseMoveDiffMin ||
-                Math.Abs(_Cursor.Rect.Y - y) > CSettings.MouseMoveDiffMin)
-            {
-                if (!IsActive)
-                    _Fade(1f, 0.2f);
-
-                _Movetimer.Restart();
-                CSettings.MouseActive();
-            }
+            if (Math.Abs(_Cursor.Rect.X - x) > _MouseMoveDiffMin ||
+                Math.Abs(_Cursor.Rect.Y - y) > _MouseMoveDiffMin)
+                Activate();
 
             _Cursor.Rect.X = x;
             _Cursor.Rect.Y = y;
@@ -109,14 +100,20 @@ namespace Vocaluxe.Base
             UpdatePosition(x, y);
         }
 
-        public void FadeOut()
+        public void Deactivate()
         {
-            _Movetimer.Stop();
+            if (!IsActive)
+                return;
+            _MouseMoveDiffMin = CSettings.MouseMoveDiffMinInactive;
+            _Movetimer.Reset();
             _Fade(0f, 0.5f);
         }
 
-        public void FadeIn()
+        public void Activate()
         {
+            if (IsActive)
+                return;
+            _MouseMoveDiffMin = CSettings.MouseMoveDiffMinActive;
             _Movetimer.Restart();
             _Fade(1f, 0.2f);
         }
diff --git a/Vocaluxe/Base/CDataBase.cs b/Vocaluxe/Base/CDataBase.cs
index 888ea52d..065e7170 100644
--- a/Vocaluxe/Base/CDataBase.cs
+++ b/Vocaluxe/Base/CDataBase.cs
@@ -17,1511 +17,95 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Runtime.InteropServices;
 using System.IO;
-using System.Text;
-#if WIN
-using System.Data.SQLite;
-#else
-using Mono.Data.Sqlite;
-using SQLiteConnection = Mono.Data.Sqlite.SqliteConnection;
-using SQLiteTransaction = Mono.Data.Sqlite.SqliteTransaction;
-using SQLiteCommand = Mono.Data.Sqlite.SqliteCommand;
-using SQLiteDataReader = Mono.Data.Sqlite.SqliteDataReader;
-#endif
-using Community.CsharpSqlite;
+using Vocaluxe.Lib.Database;
 using VocaluxeLib;
-using VocaluxeLib.Songs;
 using VocaluxeLib.Draw;
 
 namespace Vocaluxe.Base
 {
     static class CDataBase
     {
-        private struct SData
+        private static CHighscoreDB _HighscoreDB;
+        private static CCoverDB _CoverDB;
+        private static CResourceDB _ResourceDB;
+
+        public static bool Init()
         {
-            public int Id;
-            public long Ticks;
-            public string Str1;
-            public string Str2;
-        }
+            _HighscoreDB = new CHighscoreDB(Path.Combine(Environment.CurrentDirectory, CConfig.FileHighscoreDB));
+            _CoverDB = new CCoverDB(Path.Combine(Environment.CurrentDirectory, CSettings.FileCoverDB));
+            _ResourceDB = new CResourceDB(Path.Combine(Environment.CurrentDirectory, CSettings.FileCreditsRessourcesDB));
 
-        private static string _HighscoreFilePath;
-        private static string _CoverFilePath;
-        private static string _CreditsRessourcesFilePath;
-
-        private static SQLiteConnection _ConnectionCover;
-        private static SQLiteTransaction _TransactionCover;
-
-        public static void Init()
-        {
-            _HighscoreFilePath = Path.Combine(Environment.CurrentDirectory, CSettings.FileHighscoreDB);
-            _CoverFilePath = Path.Combine(Environment.CurrentDirectory, CSettings.FileCoverDB);
-            _CreditsRessourcesFilePath = Path.Combine(Environment.CurrentDirectory, CSettings.FileCreditsRessourcesDB);
-
-            _InitHighscoreDB();
-            if (!_InitCoverDB())
+            if (!_HighscoreDB.Init())
+            {
+                CLog.LogError("Error initializing Highscore-DB", true, true);
+                return false;
+            }
+            if (!_CoverDB.Init())
             {
                 CLog.LogError("Error initializing Cover-DB", true, true);
-                return;
+                return false;
             }
-            if (!_InitCreditsRessourcesDB())
+            if (!_ResourceDB.Init())
             {
-                CLog.LogError("Error initializing Cover-DB", true, true);
-                return;
+                CLog.LogError("Error initializing Credits-DB", true, true);
+                return false;
             }
-            GC.Collect();
+            return true;
         }
 
-        #region Highscores
-        public static bool GetDataBaseSongInfos(string artist, string title, out int numPlayed, out string dateAdded, out int highscoreID)
+        public static void Close()
         {
-            string sArtist;
-            string sTitle;
-            int songID;
-            using (var connection = new SQLiteConnection())
+            if (_HighscoreDB != null)
             {
-                connection.ConnectionString = "Data Source=" + _HighscoreFilePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception) {}
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    songID = _GetDataBaseSongID(artist, title, 0, command);
-                    highscoreID = songID;
-                }
+                _HighscoreDB.Close();
+                _HighscoreDB = null;
             }
-            return _GetDataBaseSongInfos(songID, out sArtist, out sTitle, out numPlayed, out dateAdded, _HighscoreFilePath);
-        }
-
-        public static void IncreaseSongCounter(int dataBaseSongID)
-        {
-            using (var connection = new SQLiteConnection())
+            if (_CoverDB != null)
             {
-                connection.ConnectionString = "Data Source=" + _HighscoreFilePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception) {}
-
-                using (var command = new SQLiteCommand(connection))
-                    _IncreaseSongCounter(dataBaseSongID, command);
+                _CoverDB.Close();
+                _CoverDB = null;
+            }
+            if (_ResourceDB != null)
+            {
+                _ResourceDB.Close();
+                _ResourceDB = null;
             }
         }
 
-        public static int AddScore(string playerName, int score, int lineNr, long date, int medley, int duet, int shortSong, int difficulty,
-                                   string artist, string title, int numPlayed, string filePath)
+        public static bool GetDataBaseSongInfos(string artist, string title, out int numPlayed, out DateTime dateAdded, out int highscoreID)
         {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + filePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return -1;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    int dataBaseSongID = _GetDataBaseSongID(artist, title, numPlayed, command);
-                    int result = _AddScore(playerName, score, lineNr, date, medley, duet, shortSong, difficulty, dataBaseSongID, command);
-                    return result;
-                }
-            }
-        }
-
-        public static int AddScore(SPlayer player)
-        {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + _HighscoreFilePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return -1;
-                }
-
-                int medley = 0;
-                int duet = 0;
-                int shortSong = 0;
-                switch (player.GameMode)
-                {
-                    case EGameMode.TR_GAMEMODE_MEDLEY:
-                        medley = 1;
-                        break;
-                    case EGameMode.TR_GAMEMODE_DUET:
-                        duet = 1;
-                        break;
-                    case EGameMode.TR_GAMEMODE_SHORTSONG:
-                        shortSong = 1;
-                        break;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    int dataBaseSongID = CSongs.GetSong(player.SongID).DataBaseSongID;
-                    return _AddScore(CProfiles.GetPlayerName(player.ProfileID), (int)Math.Round(player.Points), player.VoiceNr, player.DateTicks, medley,
-                                     duet, shortSong, (int)CProfiles.GetDifficulty(player.ProfileID), dataBaseSongID, command);
-                }
-            }
-        }
-
-        private static int _AddScore(string playerName, int score, int lineNr, long date, int medley, int duet, int shortSong, int difficulty,
-                                     int dataBaseSongID, SQLiteCommand command)
-        {
-            int lastInsertID = -1;
-
-            if (dataBaseSongID >= 0)
-            {
-                command.CommandText = "SELECT id FROM Scores WHERE SongID = @SongID AND PlayerName = @PlayerName AND Score = @Score AND " +
-                                      "LineNr = @LineNr AND Date = @Date AND Medley = @Medley AND Duet = @Duet AND ShortSong = @ShortSong AND Difficulty = @Difficulty";
-                command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
-                command.Parameters.Add("@PlayerName", DbType.String, 0).Value = playerName;
-                command.Parameters.Add("@Score", DbType.Int32, 0).Value = score;
-                command.Parameters.Add("@LineNr", DbType.Int32, 0).Value = lineNr;
-                command.Parameters.Add("@Date", DbType.Int64, 0).Value = date;
-                command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
-                command.Parameters.Add("@Duet", DbType.Int32, 0).Value = duet;
-                command.Parameters.Add("@ShortSong", DbType.Int32, 0).Value = shortSong;
-                command.Parameters.Add("@Difficulty", DbType.Int32, 0).Value = difficulty;
-
-                SQLiteDataReader reader = null;
-                try
-                {
-                    reader = command.ExecuteReader();
-                }
-                catch (Exception) {}
-
-                if (reader != null && reader.HasRows)
-                {
-                    if (reader.Read())
-                        return reader.GetInt32(0);
-                }
-
-                if (reader != null)
-                    reader.Dispose();
-
-                command.CommandText = "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, ShortSong, Difficulty) " +
-                                      "VALUES (@SongID, @PlayerName, @Score, @LineNr, @Date, @Medley, @Duet, @ShortSong, @Difficulty)";
-                command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
-                command.Parameters.Add("@PlayerName", DbType.String, 0).Value = playerName;
-                command.Parameters.Add("@Score", DbType.Int32, 0).Value = score;
-                command.Parameters.Add("@LineNr", DbType.Int32, 0).Value = lineNr;
-                command.Parameters.Add("@Date", DbType.Int64, 0).Value = date;
-                command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
-                command.Parameters.Add("@Duet", DbType.Int32, 0).Value = duet;
-                command.Parameters.Add("@ShortSong", DbType.Int32, 0).Value = shortSong;
-                command.Parameters.Add("@Difficulty", DbType.Int32, 0).Value = difficulty;
-                command.ExecuteNonQuery();
-
-                //Read last insert line
-                command.CommandText = "SELECT id FROM Scores ORDER BY id DESC LIMIT 0, 1";
-
-                reader = command.ExecuteReader();
-
-                if (reader != null && reader.HasRows)
-                {
-                    while (reader.Read())
-                        lastInsertID = reader.GetInt32(0);
-                    reader.Dispose();
-                }
-            }
-
-            return lastInsertID;
+            return _HighscoreDB.GetDataBaseSongInfos(artist, title, out numPlayed, out dateAdded, out highscoreID);
         }
 
         public static List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode)
         {
-            var scores = new List<SDBScoreEntry>();
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + _HighscoreFilePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return scores;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    int medley = 0;
-                    int duet = 0;
-                    int shortSong = 0;
-                    switch (gameMode)
-                    {
-                        case EGameMode.TR_GAMEMODE_MEDLEY:
-                            medley = 1;
-                            break;
-                        case EGameMode.TR_GAMEMODE_DUET:
-                            duet = 1;
-                            break;
-                        case EGameMode.TR_GAMEMODE_SHORTSONG:
-                            shortSong = 1;
-                            break;
-                    }
-
-                    int dataBaseSongID = _GetDataBaseSongID(songID, command);
-                    if (dataBaseSongID < 0)
-                        return scores;
-
-                    command.CommandText = "SELECT PlayerName, Score, Date, Difficulty, LineNr, id FROM Scores " +
-                                          "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
-                                          "ORDER BY [Score] DESC";
-                    command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
-                    command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
-                    command.Parameters.Add("@Duet", DbType.Int32, 0).Value = duet;
-                    command.Parameters.Add("@ShortSong", DbType.Int32, 0).Value = shortSong;
-
-                    SQLiteDataReader reader = command.ExecuteReader();
-                    if (reader != null && reader.HasRows)
-                    {
-                        while (reader.Read())
-                        {
-                            var score = new SDBScoreEntry
-                                {
-                                    Name = reader.GetString(0),
-                                    Score = reader.GetInt32(1),
-                                    Date = new DateTime(reader.GetInt64(2)).ToString("dd/MM/yyyy"),
-                                    Difficulty = (EGameDifficulty)reader.GetInt32(3),
-                                    VoiceNr = reader.GetInt32(4),
-                                    ID = reader.GetInt32(5)
-                                };
-
-                            scores.Add(score);
-                        }
-                        reader.Dispose();
-                    }
-                }
-            }
-            return scores;
+            return _HighscoreDB.LoadScore(songID, gameMode);
         }
 
-        private static void _IncreaseSongCounter(int dataBaseSongID, SQLiteCommand command)
+        public static int AddScore(SPlayer player)
         {
-            command.CommandText = "UPDATE Songs SET NumPlayed = NumPlayed + 1 WHERE [id] = @id";
-            command.Parameters.Add("@id", DbType.Int32, 0).Value = dataBaseSongID;
-            command.ExecuteNonQuery();
+            return _HighscoreDB.AddScore(player);
         }
 
-        private static int _GetDataBaseSongID(int songID, SQLiteCommand command)
+        public static void IncreaseSongCounter(int dataBaseSongID)
         {
-            CSong song = CSongs.GetSong(songID);
-
-            if (song == null)
-                return -1;
-
-            return _GetDataBaseSongID(song.Artist, song.Title, 0, command);
+            _HighscoreDB.IncreaseSongCounter(dataBaseSongID);
         }
 
-        private static int _GetDataBaseSongID(string artist, string title, int defNumPlayed, SQLiteCommand command)
+        public static bool GetCover(string fileName, ref CTexture tex, int maxSize)
         {
-            command.CommandText = "SELECT id FROM Songs WHERE [Title] = @title AND [Artist] = @artist";
-            command.Parameters.Add("@title", DbType.String, 0).Value = title;
-            command.Parameters.Add("@artist", DbType.String, 0).Value = artist;
-
-            SQLiteDataReader reader = command.ExecuteReader();
-
-            if (reader != null && reader.HasRows)
-            {
-                reader.Read();
-                int id = reader.GetInt32(0);
-                reader.Dispose();
-                return id;
-            }
-
-            if (reader != null)
-                reader.Close();
-
-            command.CommandText = "INSERT INTO Songs (Title, Artist, NumPlayed, DateAdded) " +
-                                  "VALUES (@title, @artist, @numplayed, @dateadded)";
-            command.Parameters.Add("@title", DbType.String, 0).Value = title;
-            command.Parameters.Add("@artist", DbType.String, 0).Value = artist;
-            command.Parameters.Add("@numplayed", DbType.Int32, 0).Value = defNumPlayed;
-            command.Parameters.Add("@dateadded", DbType.Int64, 0).Value = DateTime.Now.Ticks;
-            command.ExecuteNonQuery();
-
-            command.CommandText = "SELECT id FROM Songs WHERE [Title] = @title AND [Artist] = @artist";
-            command.Parameters.Add("@title", DbType.String, 0).Value = title;
-            command.Parameters.Add("@artist", DbType.String, 0).Value = artist;
-
-            reader = command.ExecuteReader();
-
-            if (reader != null)
-            {
-                reader.Read();
-                int id = reader.GetInt32(0);
-                reader.Dispose();
-                return id;
-            }
-
-            return -1;
-        }
-
-        private static bool _GetDataBaseSongInfos(int songID, out string artist, out string title, out int numPlayed, out string dateAdded, string filePath)
-        {
-            artist = String.Empty;
-            title = String.Empty;
-            numPlayed = 0;
-            dateAdded = String.Empty;
-
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + filePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "SELECT Artist, Title, NumPlayed, DateAdded FROM Songs WHERE [id] = @id";
-                    command.Parameters.Add("@id", DbType.String, 0).Value = songID;
-
-                    SQLiteDataReader reader;
-                    try
-                    {
-                        reader = command.ExecuteReader();
-                    }
-                    catch (Exception)
-                    {
-                        return false;
-                    }
-
-                    if (reader != null && reader.HasRows)
-                    {
-                        reader.Read();
-                        artist = reader.GetString(0);
-                        title = reader.GetString(1);
-                        numPlayed = reader.GetInt32(2);
-                        dateAdded = new DateTime(reader.GetInt64(3)).ToString("dd/MM/yyyy");
-                        reader.Dispose();
-                        return true;
-                    }
-                    if (reader != null)
-                        reader.Dispose();
-                }
-            }
-
-            return false;
-        }
-
-        private static void _InitHighscoreDB()
-        {
-            string oldDBFilePath = Path.Combine(Environment.CurrentDirectory, CSettings.FileOldHighscoreDB);
-            if (File.Exists(oldDBFilePath))
-            {
-                if (File.Exists(_HighscoreFilePath))
-                {
-                    if (!_CreateOrConvert(oldDBFilePath))
-                    {
-                        CLog.LogError("Cannot init Highscore DB: Error opening database: " + oldDBFilePath, true, true);
-                        return;
-                    }
-                    if (!_CreateOrConvert(_HighscoreFilePath))
-                    {
-                        CLog.LogError("Cannot init Highscore DB: Error opening database: " + _HighscoreFilePath, true, true);
-                        return;
-                    }
-                    if (!_ImportData(oldDBFilePath))
-                    {
-                        CLog.LogError("Cannot init Highscore DB: Error importing data", true, true);
-                        return;
-                    }
-                }
-                else
-                {
-                    File.Copy(oldDBFilePath, _HighscoreFilePath);
-                    if (!_CreateOrConvert(_HighscoreFilePath))
-                    {
-                        CLog.LogError("Cannot init Highscore DB: Error opening database: " + _HighscoreFilePath, true, true);
-                        return;
-                    }
-                }
-                File.Delete(oldDBFilePath);
-            }
-            else if (!_CreateOrConvert(_HighscoreFilePath))
-                CLog.LogError("Cannot init Highscore DB: Error opening database: " + _HighscoreFilePath, true, true);
-        }
-
-        private static void _CreateHighscoreDB(string filePath)
-        {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + filePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Version ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Value INTEGER NOT NULL);";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "INSERT INTO Version (id, Value) VALUES(NULL, @Value)";
-                    command.Parameters.Add("@Value", DbType.Int32).Value = CSettings.DatabaseHighscoreVersion;
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Songs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER, DateAdded BIGING);";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "SongID INTEGER NOT NULL, PlayerName TEXT NOT NULL, Score INTEGER NOT NULL, LineNr INTEGER NOT NULL, Date BIGINT NOT NULL, " +
-                                          "Medley INTEGER NOT NULL, Duet INTEGER NOT NULL, ShortSong INTEGER NOT NULL, Difficulty INTEGER NOT NULL);";
-                    command.ExecuteNonQuery();
-                }
-            }
-        }
-
-        private static void _CreateHighscoreDBV1(string filePath)
-        {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + filePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Version ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Value INTEGER NOT NULL);";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "INSERT INTO Version (id, Value) VALUES(NULL, 1 )";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Songs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER);";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "SongID INTEGER NOT NULL, PlayerName TEXT NOT NULL, Score INTEGER NOT NULL, LineNr INTEGER NOT NULL, Date BIGINT NOT NULL, " +
-                                          "Medley INTEGER NOT NULL, Duet INTEGER NOT NULL, Difficulty INTEGER NOT NULL);";
-                    command.ExecuteNonQuery();
-                }
-            }
-        }
-
-        /// <summary>
-        ///     Creates a new Vocaluxe Database if no file exists. Converts an existing old Ultrastar Deluxe highscore database into vocaluxe format.
-        /// </summary>
-        /// <param name="filePath">Database file path</param>
-        /// <returns></returns>
-        private static bool _CreateOrConvert(string filePath)
-        {
-            bool result = true;
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + filePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "PRAGMA user_version";
-                    SQLiteDataReader reader = command.ExecuteReader();
-                    reader.Read();
-
-                    int version = reader.GetInt32(0);
-
-                    reader.Dispose();
-
-                    //Check if old scores table exists
-                    command.CommandText = "SELECT name FROM sqlite_master WHERE type='table' AND name='US_Scores';";
-                    reader = command.ExecuteReader();
-                    reader.Read();
-                    bool scoresTableExists = reader.HasRows;
-
-                    reader.Dispose();
-
-                    command.CommandText = "SELECT Value FROM Version";
-                    reader = null;
-
-                    try
-                    {
-                        reader = command.ExecuteReader();
-                    }
-                    catch (Exception) {}
-
-                    if (reader == null || reader.FieldCount == 0)
-                    {
-                        // create new database/tables
-                        if (version == 1)
-                        {
-                            //Check for USDX 1.1 DB
-                            _CreateHighscoreDBV1(filePath);
-                            result &= !_ConvertFrom110(filePath);
-                            result &= _UpdateDatabase(1, connection);
-                            result &= _UpdateDatabase(2, connection);
-                        }
-                        else if (version == 0 && scoresTableExists)
-                        {
-                            //Check for USDX 1.01 or CMD Mod DB
-                            _CreateHighscoreDBV1(filePath);
-                            result &= _ConvertFrom101(filePath);
-                            result &= _UpdateDatabase(1, connection);
-                            result &= _UpdateDatabase(2, connection);
-                        }
-                        else
-                            _CreateHighscoreDB(filePath);
-                    }
-                    else
-                    {
-                        reader.Read();
-                        int currentVersion = reader.GetInt32(0);
-                        if (currentVersion < CSettings.DatabaseHighscoreVersion)
-                        {
-                            // update database
-                            result &= _UpdateDatabase(currentVersion, connection);
-                        }
-                    }
-
-                    if (reader != null)
-                        reader.Dispose();
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        ///     Converts a USDX 1.1 database into the Vocaluxe format
-        /// </summary>
-        /// <param name="filePath">Database file path</param>
-        /// <returns>True if succeeded</returns>
-        private static bool _ConvertFrom110(string filePath)
-        {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + filePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    //The USDX database has no column for LineNr, Medley and Duet so just fill 0 in there
-                    command.CommandText =
-                        "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, Difficulty) SELECT SongID, Player, Score, '0', Date, '0', '0', Difficulty from US_Scores";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "INSERT INTO Songs SELECT ID, Artist, Title, TimesPlayed from US_Songs";
-                    command.ExecuteNonQuery();
-
-                    var scores = new List<SData>();
-                    var songs = new List<SData>();
-
-                    command.CommandText = "SELECT id, PlayerName, Date FROM Scores";
-                    SQLiteDataReader reader = command.ExecuteReader();
-
-                    if (reader != null && reader.HasRows)
-                    {
-                        while (reader.Read())
-                        {
-                            var data = new SData {Id = reader.GetInt32(0), Str1 = reader.GetString(1)};
-                            Int64 ticks = 0;
-
-                            try
-                            {
-                                ticks = reader.GetInt64(2);
-                            }
-                            catch {}
-
-                            data.Ticks = _UnixTimeToTicks((int)ticks);
-
-                            scores.Add(data);
-                        }
-                        reader.Close();
-                    }
-
-                    command.CommandText = "SELECT id, Artist, Title FROM Songs";
-
-                    reader = command.ExecuteReader();
-
-                    if (reader != null && reader.HasRows)
-                    {
-                        while (reader.Read())
-                        {
-                            var data = new SData {Id = reader.GetInt32(0), Str1 = reader.GetString(1), Str2 = reader.GetString(2)};
-                            songs.Add(data);
-                        }
-                    }
-
-                    if (reader != null)
-                        reader.Dispose();
-
-                    SQLiteTransaction transaction = connection.BeginTransaction();
-                    // update Title and Artist strings
-                    foreach (SData data in songs)
-                    {
-                        command.CommandText = "UPDATE Songs SET [Artist] = @artist, [Title] = @title WHERE [ID] = @id";
-                        command.Parameters.Add("@title", DbType.String, 0).Value = data.Str2;
-                        command.Parameters.Add("@artist", DbType.String, 0).Value = data.Str1;
-                        command.Parameters.Add("@id", DbType.Int32, 0).Value = data.Id;
-                        command.ExecuteNonQuery();
-                    }
-
-                    // update player names
-                    foreach (SData data in scores)
-                    {
-                        command.CommandText = "UPDATE Scores SET [PlayerName] = @player, [Date] = @date WHERE [id] = @id";
-                        command.Parameters.Add("@player", DbType.String, 0).Value = data.Str1;
-                        command.Parameters.Add("@date", DbType.Int64, 0).Value = data.Ticks;
-                        command.Parameters.Add("@id", DbType.Int32, 0).Value = data.Id;
-                        command.ExecuteNonQuery();
-                    }
-                    transaction.Commit();
-
-                    //Delete old tables after conversion
-                    command.CommandText = "DROP TABLE US_Scores;";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "DROP TABLE US_Songs;";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "DROP TABLE us_statistics_info;";
-                    command.ExecuteNonQuery();
-
-                    //This versioning is not used in Vocaluxe so reset it to 0
-                    command.CommandText = "PRAGMA user_version = 0";
-                    command.ExecuteNonQuery();
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        ///     Converts a USDX 1.01 or CMD 1.01 database to Vocaluxe format
-        /// </summary>
-        /// <param name="filePath">Database file path</param>
-        /// <returns>True if succeeded</returns>
-        private static bool _ConvertFrom101(string filePath)
-        {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + filePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "PRAGMA table_info(US_Scores);";
-                    bool dateExists = false;
-                    using (SQLiteDataReader reader = command.ExecuteReader())
-                    {
-                        //Check for column Date
-                        while (reader.Read())
-                        {
-                            for (int i = 0; i < reader.FieldCount; i++)
-                            {
-                                if (reader.GetName(i) == "name")
-                                {
-                                    if (reader.GetString(i) == "Date")
-                                        dateExists = true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    //This is a USDX 1.01 DB
-                    command.CommandText = !dateExists
-                                              ? "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, Difficulty) SELECT SongID, Player, Score, '0', '0', '0', '0', Difficulty from US_Scores"
-                                              : "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, Difficulty) SELECT SongID, Player, Score, '0', Date, '0', '0', Difficulty from US_Scores";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "INSERT INTO Songs SELECT ID, Artist, Title, TimesPlayed from US_Songs";
-                    command.ExecuteNonQuery();
-
-                    // convert from CP1252 to UTF8
-                    var scores = new List<SData>();
-                    var songs = new List<SData>();
-
-                    Sqlite3.sqlite3 oldDB;
-                    int res = Sqlite3.sqlite3_open(filePath, out oldDB);
-
-                    if (res != Sqlite3.SQLITE_OK)
-                        CLog.LogError("Error opening Database: " + filePath + " (" + Sqlite3.sqlite3_errmsg(oldDB) + ")");
-                    else
-                    {
-                        var stmt = new Sqlite3.Vdbe();
-                        res = Sqlite3.sqlite3_prepare_v2(oldDB, "SELECT id, Artist, Title FROM Songs", -1, ref stmt, 0);
-
-                        if (res != Sqlite3.SQLITE_OK)
-                            CLog.LogError("Error query Database: " + filePath + " (" + Sqlite3.sqlite3_errmsg(oldDB) + ")");
-                        else
-                        {
-                            //Sqlite3.sqlite3_step(Stmt);
-                            Encoding utf8 = Encoding.UTF8;
-                            Encoding cp1252 = Encoding.GetEncoding(1252);
-
-                            while (Sqlite3.sqlite3_step(stmt) == Sqlite3.SQLITE_ROW)
-                            {
-                                var data = new SData {Id = Sqlite3.sqlite3_column_int(stmt, 0)};
-
-                                byte[] bytes = Sqlite3.sqlite3_column_rawbytes(stmt, 1);
-                                data.Str1 = bytes != null ? utf8.GetString(Encoding.Convert(cp1252, utf8, bytes)) : "Someone";
-
-                                bytes = Sqlite3.sqlite3_column_rawbytes(stmt, 2);
-                                data.Str2 = bytes != null ? utf8.GetString(Encoding.Convert(cp1252, utf8, bytes)) : "Someone";
-
-                                songs.Add(data);
-                            }
-                            Sqlite3.sqlite3_finalize(stmt);
-                        }
-
-                        stmt = new Sqlite3.Vdbe();
-
-                        // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
-                        if (!dateExists)
-                            // ReSharper restore ConvertIfStatementToConditionalTernaryExpression
-                            res = Sqlite3.sqlite3_prepare_v2(oldDB, "SELECT id, PlayerName FROM Scores", -1, ref stmt, 0);
-                        else
-                            res = Sqlite3.sqlite3_prepare_v2(oldDB, "SELECT id, PlayerName, Date FROM Scores", -1, ref stmt, 0);
-
-                        if (res != Sqlite3.SQLITE_OK)
-                            CLog.LogError("Error query Database: " + filePath + " (" + Sqlite3.sqlite3_errmsg(oldDB) + ")");
-                        else
-                        {
-                            //Sqlite3.sqlite3_step(Stmt);
-                            Encoding utf8 = Encoding.UTF8;
-                            Encoding cp1252 = Encoding.GetEncoding(1252);
-
-                            while (Sqlite3.sqlite3_step(stmt) == Sqlite3.SQLITE_ROW)
-                            {
-                                var data = new SData {Id = Sqlite3.sqlite3_column_int(stmt, 0)};
-
-                                byte[] bytes = Sqlite3.sqlite3_column_rawbytes(stmt, 1);
-                                data.Str1 = bytes != null ? utf8.GetString(Encoding.Convert(cp1252, utf8, bytes)) : "Someone";
-
-                                if (dateExists)
-                                    data.Ticks = _UnixTimeToTicks(Sqlite3.sqlite3_column_int(stmt, 2));
-
-                                scores.Add(data);
-                            }
-                            Sqlite3.sqlite3_finalize(stmt);
-                        }
-                    }
-                    Sqlite3.sqlite3_close(oldDB);
-
-                    SQLiteTransaction transaction = connection.BeginTransaction();
-
-                    // update Title and Artist strings
-                    foreach (SData data in songs)
-                    {
-                        command.CommandText = "UPDATE Songs SET [Artist] = @artist, [Title] = @title WHERE [ID] = @id";
-                        command.Parameters.Add("@title", DbType.String, 0).Value = data.Str2;
-                        command.Parameters.Add("@artist", DbType.String, 0).Value = data.Str1;
-                        command.Parameters.Add("@id", DbType.Int32, 0).Value = data.Id;
-                        command.ExecuteNonQuery();
-                    }
-
-                    // update player names
-                    foreach (SData data in scores)
-                    {
-                        if (!dateExists)
-                            command.CommandText = "UPDATE Scores SET [PlayerName] = @player WHERE [id] = @id";
-                        else
-                        {
-                            command.CommandText = "UPDATE Scores SET [PlayerName] = @player, [Date] = @date WHERE [id] = @id";
-                            command.Parameters.Add("@date", DbType.Int64, 0).Value = data.Ticks;
-                        }
-                        command.Parameters.Add("@player", DbType.String, 0).Value = data.Str1;
-                        command.Parameters.Add("@id", DbType.Int32, 0).Value = data.Id;
-                        command.ExecuteNonQuery();
-                    }
-                    transaction.Commit();
-
-                    //Delete old tables after conversion
-                    command.CommandText = "DROP TABLE US_Scores;";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "DROP TABLE US_Songs;";
-                    command.ExecuteNonQuery();
-                }
-            }
-
-            return true;
-        }
-
-        private static bool _UpdateDatabase(int currentVersion, SQLiteConnection connection)
-        {
-            bool updated = true;
-
-            if (currentVersion < 2)
-                updated &= _ConvertV1toV2(connection);
-            if (currentVersion < 3)
-                updated &= _ConvertV2toV3(connection);
-
-            return updated;
-        }
-
-        private static bool _ConvertV1toV2(SQLiteConnection connection)
-        {
-            using (var command = new SQLiteCommand(connection))
-            {
-                command.CommandText = "ALTER TABLE Scores ADD ShortSong INTEGER";
-                command.ExecuteNonQuery();
-                command.CommandText = "UPDATE Scores SET [ShortSong] = @ShortSong";
-                command.Parameters.Add("@ShortSong", DbType.Int32, 0).Value = 0;
-                command.ExecuteNonQuery();
-                command.CommandText = "UPDATE Version SET [Value] = @version";
-                command.Parameters.Add("@version", DbType.Int32, 0).Value = 2;
-                command.ExecuteNonQuery();
-            }
-
-            return true;
-        }
-
-        private static bool _ConvertV2toV3(SQLiteConnection connection)
-        {
-            var command = new SQLiteCommand(connection) {CommandText = "ALTER TABLE Songs ADD DateAdded BIGINT"};
-
-            command.ExecuteNonQuery();
-            command.CommandText = "UPDATE Songs SET [DateAdded] = @DateAdded";
-            command.Parameters.Add("@DateAdded", DbType.Int64, 0).Value = DateTime.Now.Ticks;
-            command.ExecuteNonQuery();
-            command.CommandText = "UPDATE Version SET [Value] = @version";
-            command.Parameters.Add("@version", DbType.Int32, 0).Value = 3;
-            command.ExecuteNonQuery();
-
-            //Read NumPlayed from Scores and save to Songs
-            command.CommandText = "SELECT SongID, Date FROM Scores ORDER BY Date ASC";
-
-            SQLiteDataReader reader;
-            try
-            {
-                reader = command.ExecuteReader();
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-
-            long lastDateAdded = -1;
-            int lastID = -1;
-            DateTime dt = new DateTime(1, 1, 1, 0, 0, 5);
-            long sec = dt.Ticks;
-            List<int> ids = new List<int>();
-            while (reader.Read())
-            {
-                int id = reader.GetInt32(0);
-                long dateAdded = reader.GetInt64(1);
-                if (id != lastID || dateAdded > lastDateAdded + sec)
-                {
-                    ids.Add(id);
-                    lastID = id;
-                    lastDateAdded = dateAdded;
-                }
-            }
-            reader.Dispose();
-
-            foreach (int id in ids)
-                _IncreaseSongCounter(id, command);
-            command.Dispose();
-
-            return true;
-        }
-
-        private static bool _ImportData(string sourceDBPath)
-        {
-            #region open db
-            using (var connSource = new SQLiteConnection())
-            {
-                connSource.ConnectionString = "Data Source=" + sourceDBPath;
-
-                try
-                {
-                    connSource.Open();
-                }
-                catch (Exception e)
-                {
-                    CLog.LogError("Error on import high score data. Can't open source database \"" + sourceDBPath + "\" (" + e.Message + ")");
-                    return false;
-                }
-                #endregion open db
-
-                using (var cmdSource = new SQLiteCommand(connSource))
-                {
-                    #region import table scores
-                    cmdSource.CommandText = "SELECT SongID, PlayerName, Score, LineNr, Date, Medley, Duet, ShortSong, Difficulty FROM Scores";
-                    SQLiteDataReader source = cmdSource.ExecuteReader();
-                    if (source == null)
-                        return false;
-
-                    if (source.FieldCount == 0)
-                    {
-                        source.Close();
-                        return true;
-                    }
-
-                    while (source.Read())
-                    {
-                        int songid = source.GetInt32(0);
-                        string player = source.GetString(1);
-                        int score = source.GetInt32(2);
-                        int linenr = source.GetInt32(3);
-                        long date = source.GetInt64(4);
-                        int medley = source.GetInt32(5);
-                        int duet = source.GetInt32(6);
-                        int shortsong = source.GetInt32(7);
-                        int diff = source.GetInt32(8);
-
-                        string artist, title, dateadded;
-                        int numplayed;
-                        if (_GetDataBaseSongInfos(songid, out artist, out title, out numplayed, out dateadded, sourceDBPath))
-                            AddScore(player, score, linenr, date, medley, duet, shortsong, diff, artist, title, numplayed, _HighscoreFilePath);
-                    }
-                    #endregion import table scores
-
-                    source.Close();
-                }
-            }
-
-            return true;
-        }
-        #endregion Highscores
-
-        #region Cover
-        public static bool GetCover(string coverPath, ref CTexture tex, int maxSize)
-        {
-            if (!File.Exists(coverPath))
-            {
-                CLog.LogError("Can't find File: " + coverPath);
-                return false;
-            }
-
-            if (_ConnectionCover == null)
-            {
-                _ConnectionCover = new SQLiteConnection {ConnectionString = "Data Source=" + _CoverFilePath};
-                _ConnectionCover.Open();
-            }
-
-            using (var command = new SQLiteCommand(_ConnectionCover))
-            {
-                command.CommandText = "SELECT id, width, height FROM Cover WHERE [Path] = @path";
-                command.Parameters.Add("@path", DbType.String, 0).Value = coverPath;
-
-                SQLiteDataReader reader = command.ExecuteReader();
-
-                if (reader != null && reader.HasRows)
-                {
-                    reader.Read();
-                    int id = reader.GetInt32(0);
-                    int w = reader.GetInt32(1);
-                    int h = reader.GetInt32(2);
-                    reader.Close();
-
-                    command.CommandText = "SELECT Data FROM CoverData WHERE CoverID = @id";
-                    command.Parameters.Add("@id", DbType.Int32).Value = id;
-                    reader = command.ExecuteReader();
-
-                    if (reader.HasRows)
-                    {
-                        reader.Read();
-                        byte[] data = _GetBytes(reader);
-                        reader.Dispose();
-                        tex = CDraw.EnqueueTexture(w, h, data);
-                        return true;
-                    }
-                }
-                else
-                {
-                    if (reader != null)
-                        reader.Close();
-
-                    if (_TransactionCover == null)
-                        _TransactionCover = _ConnectionCover.BeginTransaction();
-
-                    Bitmap origin;
-                    try
-                    {
-                        origin = new Bitmap(coverPath);
-                    }
-                    catch (Exception)
-                    {
-                        CLog.LogError("Error loading Texture: " + coverPath);
-                        return false;
-                    }
-
-                    int w = maxSize;
-                    int h = maxSize;
-                    byte[] data;
-
-                    try
-                    {
-                        if (origin.Width >= origin.Height && origin.Width > w)
-                            h = (int)Math.Round((float)w / origin.Width * origin.Height);
-                        else if (origin.Height > origin.Width && origin.Height > h)
-                            w = (int)Math.Round((float)h / origin.Height * origin.Width);
-
-                        using (var bmp = new Bitmap(w, h))
-                        {
-                            using (Graphics g = Graphics.FromImage(bmp))
-                                g.DrawImage(origin, new Rectangle(0, 0, w, h));
-
-                            data = new byte[w * h * 4];
-                            BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-                            Marshal.Copy(bmpData.Scan0, data, 0, w * h * 4);
-                            bmp.UnlockBits(bmpData);
-                        }
-                    }
-                    finally
-                    {
-                        origin.Dispose();
-                    }
-
-                    tex = CDraw.EnqueueTexture(w, h, data);
-
-                    command.CommandText = "INSERT INTO Cover (Path, width, height) VALUES (@path, @w, @h)";
-                    command.Parameters.Add("@w", DbType.Int32).Value = w;
-                    command.Parameters.Add("@h", DbType.Int32).Value = h;
-                    command.Parameters.Add("@path", DbType.String, 0).Value = coverPath;
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "SELECT id FROM Cover WHERE [Path] = @path";
-                    command.Parameters.Add("@path", DbType.String, 0).Value = coverPath;
-                    reader = command.ExecuteReader();
-
-                    if (reader != null)
-                    {
-                        reader.Read();
-                        int id = reader.GetInt32(0);
-                        reader.Dispose();
-                        command.CommandText = "INSERT INTO CoverData (CoverID, Data) VALUES (@id, @data)";
-                        command.Parameters.Add("@id", DbType.Int32).Value = id;
-                        command.Parameters.Add("@data", DbType.Binary, 20).Value = data;
-                        command.ExecuteReader();
-                        return true;
-                    }
-                }
-            }
-
-            return false;
+            return _CoverDB.GetCover(fileName, ref tex, maxSize);
         }
 
         public static void CommitCovers()
         {
-            if (_TransactionCover != null)
-            {
-                _TransactionCover.Commit();
-                _TransactionCover = null;
-                GC.Collect();
-            }
+            _CoverDB.CommitCovers();
         }
 
-        public static void CloseConnections()
-        {
-            CommitCovers();
-
-            if (_ConnectionCover != null)
-            {
-                _ConnectionCover.Close();
-                _ConnectionCover.Dispose();
-                _ConnectionCover = null;
-            }
-        }
-
-        private static bool _InitCoverDB()
-        {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + _CoverFilePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "SELECT Value FROM Version";
-
-                    SQLiteDataReader reader = null;
-
-                    try
-                    {
-                        reader = command.ExecuteReader();
-                    }
-                    catch (Exception) {}
-
-                    if (reader == null)
-                    {
-                        // create new database/tables
-                        _CreateCoverDB();
-                    }
-                    else if (reader.FieldCount == 0)
-                    {
-                        // create new database/tables
-                        _CreateCoverDB();
-                    }
-                    else
-                    {
-                        reader.Read();
-
-                        if (reader.GetInt32(0) < CSettings.DatabaseHighscoreVersion)
-                        {
-                            // update database
-                        }
-                    }
-                    if (reader != null)
-                        reader.Dispose();
-                }
-            }
-            return true;
-        }
-
-        private static void _CreateCoverDB()
-        {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + _CoverFilePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Version ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Value INTEGER NOT NULL);";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "INSERT INTO Version (id, Value) VALUES(NULL, @Value)";
-                    command.Parameters.Add("@Value", DbType.Int32).Value = CSettings.DatabaseCoverVersion;
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Cover ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "Path TEXT NOT NULL, width INTEGER NOT NULL, height INTEGER NOT NULL);";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS CoverData ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "CoverID INTEGER NOT NULL, Data BLOB NOT NULL);";
-                    command.ExecuteNonQuery();
-                }
-            }
-        }
-        #endregion Cover
-
-        #region CreditsRessources
         public static bool GetCreditsRessource(string fileName, ref CTexture tex)
         {
-            bool result = false;
-
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + _CreditsRessourcesFilePath;
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "SELECT id, width, height FROM Images WHERE [Path] = @path";
-                    command.Parameters.Add("@path", DbType.String, 0).Value = fileName;
-
-                    SQLiteDataReader reader = command.ExecuteReader();
-
-                    if (reader != null && reader.HasRows)
-                    {
-                        reader.Read();
-                        int id = reader.GetInt32(0);
-                        int w = reader.GetInt32(1);
-                        int h = reader.GetInt32(2);
-                        reader.Close();
-
-                        command.CommandText = "SELECT Data FROM ImageData WHERE ImageID = @id";
-                        command.Parameters.Add("@id", DbType.Int32).Value = id;
-                        reader = command.ExecuteReader();
-
-                        if (reader.HasRows)
-                        {
-                            result = true;
-                            reader.Read();
-                            byte[] data = _GetBytes(reader);
-                            tex = CDraw.AddTexture(w, h, data);
-                            /*using (Bitmap bmp = new Bitmap(w, h))
-                            {
-                                BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-                                Marshal.Copy(data, 0, bmpData.Scan0, w * h * 4);
-                                bmp.UnlockBits(bmpData);
-                                bmp.Save(fileName);
-                            }*/
-                        }
-                    }
-
-                    if (reader != null)
-                        reader.Dispose();
-                }
-            }
-
-            return result;
-        }
-
-        //If you want to add an image to db, call this method!
-        /*
-        private static bool _AddImageToCreditsDB(String imagePath)
-        {
-            bool result = false;
-
-            if (File.Exists(imagePath))
-            {
-                using (SQLiteConnection connection = new SQLiteConnection())
-                {
-                    connection.ConnectionString = "Data Source=" + _CreditsRessourcesFilePath;
-                    try
-                    {
-                        connection.Open();
-                    }
-                    catch (Exception)
-                    {
-                        return false;
-                    }
-                    using (SQLiteCommand command = new SQLiteCommand(connection))
-                    {
-                        Bitmap origin;
-                        try
-                        {
-                            origin = new Bitmap(imagePath);
-                        }
-                        catch (Exception)
-                        {
-                            CLog.LogError("Error loading Texture: " + imagePath);
-                            return false;
-                        }
-                        int w = origin.Width;
-                        int h = origin.Height;
-                        byte[] data;
-
-                        try
-                        {
-                            data = new byte[w * h * 4];
-
-                            BitmapData bmpData = origin.LockBits(new Rectangle(0, 0, w, h), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-                            Marshal.Copy(bmpData.Scan0, data, 0, w * h * 4);
-                            origin.UnlockBits(bmpData);
-
-                            command.CommandText = "INSERT INTO Images (Path, width, height) VALUES (@path, @w, @h)";
-                            command.Parameters.Add("@path", DbType.String, 0).Value = Path.GetFileName(imagePath);
-                            command.Parameters.Add("@w", DbType.Int32, 0).Value = w;
-                            command.Parameters.Add("@h", DbType.Int32, 0).Value = h;
-                            command.ExecuteNonQuery();
-
-                            command.CommandText = "SELECT id FROM Images WHERE [Path] = @path";
-                            command.Parameters.Add("@path", DbType.String, 0).Value = Path.GetFileName(imagePath);
-                            SQLiteDataReader reader = command.ExecuteReader();
-
-                            if (reader != null)
-                            {
-                                reader.Read();
-                                int id = reader.GetInt32(0);
-                                reader.Close();
-                                command.CommandText = "INSERT INTO ImageData (ImageID, Data) VALUES (@id, @data)";
-                                command.Parameters.Add("@id", DbType.Int32, 20).Value = id;
-                                command.Parameters.Add("@data", DbType.Binary, 20).Value = data;
-                                command.ExecuteReader();
-                                result = true;
-                            }
-                        }
-                        finally
-                        {
-                            origin.Dispose();
-                        }
-                    }
-                }
-            }
-
-            return result;
-        }
-*/
-
-        private static bool _InitCreditsRessourcesDB()
-        {
-            using (var connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + _CreditsRessourcesFilePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-
-                using (var command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "SELECT Value FROM Version";
-
-                    SQLiteDataReader reader = null;
-
-                    try
-                    {
-                        reader = command.ExecuteReader();
-                    }
-                    catch (Exception) {}
-
-                    if (reader == null)
-                    {
-                        // Log error
-                        CLog.LogError("Can't find Credits-DB!");
-                    }
-                    else if (reader.FieldCount == 0)
-                    {
-                        // Log error
-                        CLog.LogError("Can't find Credits-DB! Field-Count = 0");
-                    }
-                    else
-                    {
-                        reader.Read();
-
-                        if (reader.GetInt32(0) < CSettings.DatabaseHighscoreVersion)
-                        {
-                            // update database
-                        }
-                    }
-
-                    if (reader != null)
-                        reader.Dispose();
-                }
-            }
-            return true;
-        }
-
-        /*
-        private static void _CreateCreditsRessourcesDB()
-        {
-            using (SQLiteConnection connection = new SQLiteConnection())
-            {
-                connection.ConnectionString = "Data Source=" + _CreditsRessourcesFilePath;
-
-                try
-                {
-                    connection.Open();
-                }
-                catch (Exception)
-                {
-                    return;
-                }
-
-                using (SQLiteCommand command = new SQLiteCommand(connection))
-                {
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Version ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Value INTEGER NOT NULL);";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "INSERT INTO Version (id, Value) VALUES(NULL, @Value)";
-                    command.Parameters.Add("@Value", DbType.Int32).Value = CSettings.DatabaseCreditsRessourcesVersion;
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS Images ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "Path TEXT NOT NULL, width INTEGER NOT NULL, height INTEGER NOT NULL);";
-                    command.ExecuteNonQuery();
-
-                    command.CommandText = "CREATE TABLE IF NOT EXISTS ImageData ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
-                                          "ImageID INTEGER NOT NULL, Data BLOB NOT NULL);";
-                    command.ExecuteNonQuery();
-                }
-            }
-        }
-*/
-        #endregion CreditsRessources
-
-        private static byte[] _GetBytes(SQLiteDataReader reader)
-        {
-            const int chunkSize = 2 * 1024;
-            var buffer = new byte[chunkSize];
-            long fieldOffset = 0;
-            using (var stream = new MemoryStream())
-            {
-                long bytesRead;
-                while ((bytesRead = reader.GetBytes(0, fieldOffset, buffer, 0, buffer.Length)) > 0)
-                {
-                    var actualRead = new byte[bytesRead];
-                    Buffer.BlockCopy(buffer, 0, actualRead, 0, (int)bytesRead);
-                    stream.Write(actualRead, 0, actualRead.Length);
-                    fieldOffset += bytesRead;
-                }
-                return stream.ToArray();
-            }
-        }
-
-        private static long _UnixTimeToTicks(int unixTime)
-        {
-            var t70 = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-            t70 = t70.AddSeconds(unixTime);
-            return t70.Ticks;
+            return _ResourceDB.GetCreditsRessource(fileName, ref tex);
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Base/CDraw.cs b/Vocaluxe/Base/CDraw.cs
index e888cad3..f109645b 100644
--- a/Vocaluxe/Base/CDraw.cs
+++ b/Vocaluxe/Base/CDraw.cs
@@ -28,8 +28,10 @@ namespace Vocaluxe.Base
     {
         private static IDraw _Draw;
 
-        public static void InitDraw()
+        public static bool Init()
         {
+            if (_Draw != null)
+                return false;
             switch (CConfig.Renderer)
             {
                 case ERenderer.TR_CONFIG_SOFTWARE:
@@ -45,6 +47,7 @@ namespace Vocaluxe.Base
                     {
                         CLog.LogError(e.Message + " - Error in initializing of OpenGL. Please check whether" +
                                       " your graphic card drivers are up to date.", true, true);
+                        return false;
                     }
                     break;
 
@@ -59,6 +62,7 @@ namespace Vocaluxe.Base
                         CLog.LogError(e.Message + " - Error in initializing of Direct3D. Please check if " +
                                       "your DirectX redistributables and graphic card drivers are up to date. You can " +
                                       "download the DirectX runtimes at http://www.microsoft.com/download/en/details.aspx?id=8109", true, true);
+                        return false;
                     }
                     break;
 #endif
@@ -67,8 +71,7 @@ namespace Vocaluxe.Base
                     _Draw = new CDrawWinForm();
                     break;
             }
-            if (!_Draw.Init())
-                CLog.LogError("Could not init drawing interface!", true, true);
+            return _Draw.Init();
         }
 
         public static void MainLoop()
@@ -79,8 +82,11 @@ namespace Vocaluxe.Base
 
         public static void Unload()
         {
-            _Draw.Unload();
-            _Draw = null;
+            if (_Draw != null)
+            {
+                _Draw.Unload();
+                _Draw = null;
+            }
         }
 
         public static int GetScreenWidth()
diff --git a/Vocaluxe/Base/CGame.cs b/Vocaluxe/Base/CGame.cs
index 009e585f..46df686f 100644
--- a/Vocaluxe/Base/CGame.cs
+++ b/Vocaluxe/Base/CGame.cs
@@ -15,6 +15,9 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
+//Uncomment to make the engine hit every note
+//#define DEBUG_HIT
+
 using System;
 using System.Collections.Generic;
 using Vocaluxe.SongQueue;
@@ -208,8 +211,6 @@ namespace Vocaluxe.Base
 
         public static void UpdatePoints(float time)
         {
-            const bool DEBUG_HIT = false;
-
             CSong song = _SongQueue.GetSong();
 
             if (song == null)
@@ -224,7 +225,7 @@ namespace Vocaluxe.Base
             MidRecordedBeat = -0.5f + GetBeatFromTime(time, song.BPM, song.Gap + CConfig.MicDelay / 1000f);
 
             for (int p = 0; p < _NumPlayer; p++)
-                CSound.AnalyzeBuffer(p);
+                CRecord.AnalyzeBuffer(p);
 
             if (_LastEvalBeat >= RecordedBeat)
                 return;
@@ -270,10 +271,14 @@ namespace Vocaluxe.Base
                     if (line == lines.Length - 1 && beat == lines[line].LastNoteBeat)
                         Players[p].SongFinished = true;
 
-                    if (notes[note].PointsForBeat > 0 && (CSound.RecordToneValid(p) || DEBUG_HIT))
+                    if (notes[note].PointsForBeat > 0 && (CRecord.ToneValid(p)
+#if DEBUG_HIT
+                        || true
+#endif
+                                                         ))
                     {
                         int tone = notes[note].Tone;
-                        int tonePlayer = CSound.RecordGetTone(p);
+                        int tonePlayer = CRecord.GetTone(p);
 
                         while (tonePlayer - tone > 6)
                             tonePlayer -= 12;
@@ -281,8 +286,9 @@ namespace Vocaluxe.Base
                         while (tonePlayer - tone < -6)
                             tonePlayer += 12;
 
-                        if (DEBUG_HIT)
+#if DEBUG_HIT
                             tonePlayer = tone;
+#endif
 
                         Players[p].NoteDiff = Math.Abs(tone - tonePlayer);
                         bool hit = Players[p].NoteDiff <= (2 - (int)CProfiles.GetDifficulty(Players[p].ProfileID));
@@ -290,7 +296,7 @@ namespace Vocaluxe.Base
                         if (hit)
                         {
                             // valid
-                            //CSound.RecordSetTone(p, Tone);
+                            //CRecord.RecordSetTone(p, Tone);
                             double points = (CSettings.MaxScore - CSettings.LinebonusScore) * (double)notes[note].PointsForBeat /
                                             song.Notes.GetVoice(Players[p].VoiceNr).Points;
                             if (notes[note].Type == ENoteType.Golden)
diff --git a/Vocaluxe/Base/CGraphics.cs b/Vocaluxe/Base/CGraphics.cs
index 0966424a..837cd713 100644
--- a/Vocaluxe/Base/CGraphics.cs
+++ b/Vocaluxe/Base/CGraphics.cs
@@ -61,10 +61,10 @@ namespace Vocaluxe.Base
         }
 
         #region public methods
-        public static void InitGraphics()
+        public static void Init()
         {
             // Add Screens, must be the same order as in EScreens!
-            CLog.StartBenchmark(1, "Build Screen List");
+            CLog.StartBenchmark("Build Screen List");
 
             _Screens.Add(new CScreenTest());
             _Screens.Add(new CScreenLoad());
@@ -91,7 +91,7 @@ namespace Vocaluxe.Base
             _PopupScreens.Add(new CPopupScreenVolumeControl());
             _PopupScreens.Add(new CPopupScreenServerQR());
 
-            CLog.StopBenchmark(1, "Build Screen List");
+            CLog.StopBenchmark("Build Screen List");
 
             _CurrentScreen = EScreens.ScreenLoad;
             _NextScreen = EScreens.ScreenNull;
@@ -101,9 +101,16 @@ namespace Vocaluxe.Base
             _GlobalAlpha = 1f;
             _ZOffset = 0f;
 
-            CLog.StartBenchmark(0, "Load Theme");
+            CLog.StartBenchmark("Load Theme");
             LoadTheme();
-            CLog.StopBenchmark(0, "Load Theme");
+            CLog.StopBenchmark("Load Theme");
+        }
+
+        public static void Close()
+        {
+            if (_CurrentPopupScreen != EPopupScreens.NoPopup)
+                _PopupScreens[(int)_CurrentPopupScreen].OnClose();
+            _Screens[(int)_CurrentScreen].OnClose();
         }
 
         public static void LoadTheme()
@@ -112,10 +119,10 @@ namespace Vocaluxe.Base
 
             for (int i = 0; i < _Screens.Count; i++)
             {
-                CLog.StartBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
+                CLog.StartBenchmark("Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
                 _Screens[i].Init();
                 _Screens[i].LoadTheme(CTheme.GetThemeScreensPath(-1));
-                CLog.StopBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
+                CLog.StopBenchmark("Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
             }
 
             foreach (IMenu popup in _PopupScreens)
@@ -178,7 +185,7 @@ namespace Vocaluxe.Base
             if (CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC && _CurrentScreen != EScreens.ScreenSing)
                 CSongs.LoadCover();
 
-            if (CSettings.GameState != EGameState.EditTheme)
+            if (CSettings.ProgramState != EProgramState.EditTheme)
             {
                 run &= _HandleInputs(keys, mouse);
                 run &= _Update();
@@ -236,8 +243,6 @@ namespace Vocaluxe.Base
                     _Screens[(int)_CurrentScreen].OnClose();
                     _CurrentScreen = _NextScreen;
                     _NextScreen = EScreens.ScreenNull;
-                    if (CBackgroundMusic.IsPlaying)
-                        CBackgroundMusic.Play();
                     _Screens[(int)_CurrentScreen].OnShowFinish();
                     _Screens[(int)_CurrentScreen].ProcessMouseMove(_Cursor.X, _Cursor.Y);
 
@@ -346,8 +351,7 @@ namespace Vocaluxe.Base
                 if (keyEvent.Key == Keys.Left || keyEvent.Key == Keys.Right || keyEvent.Key == Keys.Up || keyEvent.Key == Keys.Down || keyEvent.Key == Keys.NumPad0 ||
                     keyEvent.Key == Keys.D0)
                 {
-                    CSettings.MouseInactive();
-                    _Cursor.FadeOut();
+                    _Cursor.Deactivate();
 
                     if (keyEvent.ModAlt && keyEvent.ModCtrl && keyEvent.ModShift)
                     {
@@ -411,6 +415,7 @@ namespace Vocaluxe.Base
 
                 if (popupVolumeControlAllowed)
                 {
+                    //TODO: Handle this in the volume popup
                     int diff = 0;
                     if ((keyEvent.ModShift && (keyEvent.Key == Keys.Add || keyEvent.Key == Keys.PageUp)) || (keyEvent.Sender == ESender.WiiMote && keyEvent.Key == Keys.Add))
                         diff = 5;
@@ -426,23 +431,23 @@ namespace Vocaluxe.Base
                                 if (CSongs.IsInCategory)
                                 {
                                     CConfig.PreviewMusicVolume += diff;
-                                    _Screens[(int)_CurrentScreen].ApplyVolume();
+                                    CSound.SetGlobalVolume(CConfig.PreviewMusicVolume);
                                 }
                                 else
                                 {
                                     CConfig.BackgroundMusicVolume += diff;
-                                    CBackgroundMusic.ApplyVolume();
+                                    CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
                                 }
                                 break;
 
                             case EScreens.ScreenSing:
                                 CConfig.GameMusicVolume += diff;
-                                _Screens[(int)_CurrentScreen].ApplyVolume();
+                                CSound.SetGlobalVolume(CConfig.GameMusicVolume);
                                 break;
 
                             default:
                                 CConfig.BackgroundMusicVolume += diff;
-                                CBackgroundMusic.ApplyVolume();
+                                CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
                                 break;
                         }
                         CConfig.SaveConfig();
@@ -453,14 +458,12 @@ namespace Vocaluxe.Base
                         ShowPopup(EPopupScreens.PopupVolumeControl);
                         _VolumePopupTimer.Restart();
                     }
-
-                    CBackgroundMusic.ApplyVolume();
                 }
 
                 if (keyEvent.ModShift && (keyEvent.Key == Keys.F1))
-                    CSettings.GameState = EGameState.EditTheme;
+                    CSettings.ProgramState = EProgramState.EditTheme;
                 else if (keyEvent.ModAlt && (keyEvent.Key == Keys.Enter))
-                    CSettings.IsFullScreen = !CSettings.IsFullScreen;
+                    CConfig.FullScreen = (CConfig.FullScreen == EOffOn.TR_CONFIG_ON) ? EOffOn.TR_CONFIG_OFF : EOffOn.TR_CONFIG_ON;
                 else if (keyEvent.ModAlt && (keyEvent.Key == Keys.P))
                     CDraw.MakeScreenShot();
                 else
@@ -488,10 +491,7 @@ namespace Vocaluxe.Base
                     mouseEvent = inputMouseEvent;
 
                 if (mouseEvent.Wheel != 0)
-                {
-                    CSettings.MouseActive();
-                    _Cursor.FadeIn();
-                }
+                    _Cursor.Activate();
 
                 _UpdateMousePosition(mouseEvent.X, mouseEvent.Y);
 
@@ -529,13 +529,8 @@ namespace Vocaluxe.Base
 
                 bool handled = false;
                 if (_CurrentPopupScreen != EPopupScreens.NoPopup)
-                {
                     handled = _PopupScreens[(int)_CurrentPopupScreen].HandleMouse(mouseEvent);
 
-                    if (handled && _CurrentPopupScreen == EPopupScreens.PopupVolumeControl)
-                        _Screens[(int)_CurrentScreen].ApplyVolume();
-                }
-
                 if (!handled && _Fading == null && (_Cursor.IsActive || mouseEvent.LB || mouseEvent.RB || mouseEvent.MB))
                     resume &= _Screens[(int)_CurrentScreen].HandleMouse(mouseEvent);
 
@@ -554,11 +549,11 @@ namespace Vocaluxe.Base
             {
                 if (keyEvent.ModShift && (keyEvent.Key == Keys.F1))
                 {
-                    CSettings.GameState = EGameState.Normal;
+                    CSettings.ProgramState = EProgramState.Normal;
                     _Screens[(int)_CurrentScreen].NextInteraction();
                 }
                 else if (keyEvent.ModAlt && (keyEvent.Key == Keys.Enter))
-                    CSettings.IsFullScreen = !CSettings.IsFullScreen;
+                    CConfig.FullScreen = (CConfig.FullScreen == EOffOn.TR_CONFIG_ON) ? EOffOn.TR_CONFIG_OFF : EOffOn.TR_CONFIG_ON;
                 else if (keyEvent.ModAlt && (keyEvent.Key == Keys.P))
                     CDraw.MakeScreenShot();
                 else
@@ -592,7 +587,7 @@ namespace Vocaluxe.Base
             }
 
             if (_VolumePopupTimer.IsRunning)
-                _Cursor.FadeIn();
+                _Cursor.Activate();
 
             if (_CurrentPopupScreen != EPopupScreens.NoPopup)
                 _PopupScreens[(int)_CurrentPopupScreen].UpdateGame();
@@ -616,10 +611,10 @@ namespace Vocaluxe.Base
 
                 if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL2)
                 {
-                    debugOutput.Add(CSound.RecordGetToneAbs(0).ToString(CLanguage.Translate("TR_DEBUG_TONE_ABS") + " P1: 00"));
-                    debugOutput.Add(CSound.RecordGetMaxVolume(0).ToString(CLanguage.Translate("TR_DEBUG_MAX_VOLUME") + " P1: 0.000"));
-                    debugOutput.Add(CSound.RecordGetToneAbs(1).ToString(CLanguage.Translate("TR_DEBUG_TONE_ABS") + " P2: 00"));
-                    debugOutput.Add(CSound.RecordGetMaxVolume(1).ToString(CLanguage.Translate("TR_DEBUG_MAX_VOLUME") + " P2: 0.000"));
+                    debugOutput.Add(CRecord.GetToneAbs(0).ToString(CLanguage.Translate("TR_DEBUG_TONE_ABS") + " P1: 00"));
+                    debugOutput.Add(CRecord.GetMaxVolume(0).ToString(CLanguage.Translate("TR_DEBUG_MAX_VOLUME") + " P1: 0.000"));
+                    debugOutput.Add(CRecord.GetToneAbs(1).ToString(CLanguage.Translate("TR_DEBUG_TONE_ABS") + " P2: 00"));
+                    debugOutput.Add(CRecord.GetMaxVolume(1).ToString(CLanguage.Translate("TR_DEBUG_MAX_VOLUME") + " P2: 0.000"));
 
                     if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL3)
                     {
diff --git a/Vocaluxe/Base/CLanguage.cs b/Vocaluxe/Base/CLanguage.cs
index 2cf54d9d..343aabc0 100644
--- a/Vocaluxe/Base/CLanguage.cs
+++ b/Vocaluxe/Base/CLanguage.cs
@@ -19,8 +19,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Xml;
 using VocaluxeLib;
 
 namespace Vocaluxe.Base
@@ -42,7 +40,6 @@ namespace Vocaluxe.Base
 
     static class CLanguage
     {
-        private static readonly XmlWriterSettings _Settings = new XmlWriterSettings();
         private static List<SLanguage> _Languages;
         private static int _CurrentLanguage;
         private static int _FallbackLanguage;
@@ -75,9 +72,6 @@ namespace Vocaluxe.Base
         public static void Init()
         {
             _Languages = new List<SLanguage>();
-            _Settings.Indent = true;
-            _Settings.Encoding = Encoding.UTF8;
-            _Settings.ConformanceLevel = ConformanceLevel.Document;
 
             var files = new List<string>();
             files.AddRange(CHelper.ListFiles(CSettings.FolderLanguages, "*.xml", true, true));
diff --git a/Vocaluxe/Base/CLog.cs b/Vocaluxe/Base/CLog.cs
index 8afe6cd4..f90b7043 100644
--- a/Vocaluxe/Base/CLog.cs
+++ b/Vocaluxe/Base/CLog.cs
@@ -103,6 +103,8 @@ namespace Vocaluxe.Base
     static class CLog
     {
         private const int _MaxBenchmarks = 10;
+        private static int _BenchmarksRunning;
+        private static bool _Initialized;
 
         private static CLogFile _ErrorLog;
         private static CLogFile _PerformanceLog;
@@ -124,15 +126,26 @@ namespace Vocaluxe.Base
             _BenchmarkTimer = new Stopwatch[_MaxBenchmarks];
             for (int i = 0; i < _BenchmarkTimer.Length; i++)
                 _BenchmarkTimer[i] = new Stopwatch();
+            _BenchmarksRunning = 0;
+            _Initialized = true;
         }
 
         public static void CloseAll()
         {
-            _ErrorLog.Close();
-            _PerformanceLog.Close();
-            _BenchmarkLog.Close();
-            _DebugLog.Close();
-            _SongInfoLog.Close();
+            if (_Initialized)
+            {
+                _ErrorLog.Dispose();
+                _ErrorLog = null;
+                _PerformanceLog.Dispose();
+                _PerformanceLog = null;
+                _BenchmarkLog.Dispose();
+                _BenchmarkLog = null;
+                _DebugLog.Dispose();
+                _DebugLog = null;
+                _SongInfoLog.Dispose();
+                _SongInfoLog = null;
+                _Initialized = false;
+            }
         }
 
         #region LogError
@@ -151,6 +164,9 @@ namespace Vocaluxe.Base
         public static void LogDebug(string text)
         {
             _DebugLog.Add(String.Format("{0:HH:mm:ss.ffff}", DateTime.Now) + ":" + text);
+#if DEBUG
+            Console.WriteLine(text);
+#endif
         }
 
         public static void LogSongInfo(string text)
@@ -165,41 +181,44 @@ namespace Vocaluxe.Base
         }
 
         #region LogBenchmark
-        public static void StartBenchmark(int benchmarkNr, string text)
+        public static void StartBenchmark(string text)
         {
-            if (benchmarkNr >= 0 && benchmarkNr < _MaxBenchmarks)
+            if (_BenchmarksRunning < _MaxBenchmarks)
             {
-                _BenchmarkTimer[benchmarkNr].Stop();
-                _BenchmarkTimer[benchmarkNr].Reset();
-
                 string space = String.Empty;
-                for (int i = 0; i < benchmarkNr; i++)
+                for (int i = 0; i < _BenchmarksRunning; i++)
                     space += "  ";
                 _BenchmarkLog.Add(space + "Start " + text);
 
-                _BenchmarkTimer[benchmarkNr].Start();
+                _BenchmarkTimer[_BenchmarksRunning].Restart();
             }
+            else
+                LogError("Tried to start to many benchmarks at once"); //Log and ignore
+            _BenchmarksRunning++; //Inc even if not started to correct right Stop() call
         }
 
-        public static void StopBenchmark(int benchmarkNr, string text)
+        public static void StopBenchmark(string text)
         {
-            if (benchmarkNr >= 0 && benchmarkNr < _MaxBenchmarks)
+            if (_BenchmarksRunning > 0 && _BenchmarksRunning <= _MaxBenchmarks)
             {
-                _BenchmarkTimer[benchmarkNr].Stop();
+                _BenchmarksRunning--;
+                _BenchmarkTimer[_BenchmarksRunning].Stop();
 
                 string space = String.Empty;
-                for (int i = 0; i < benchmarkNr; i++)
+                for (int i = 0; i < _BenchmarksRunning; i++)
                     space += "  ";
 
                 float ms;
                 if (Stopwatch.IsHighResolution && _NanosecPerTick > 0)
-                    ms = (float)((_NanosecPerTick * _BenchmarkTimer[benchmarkNr].ElapsedTicks) / (1000.0 * 1000.0));
+                    ms = (float)((_NanosecPerTick * _BenchmarkTimer[_BenchmarksRunning].ElapsedTicks) / (1000.0 * 1000.0));
                 else
-                    ms = _BenchmarkTimer[benchmarkNr].ElapsedMilliseconds;
+                    ms = _BenchmarkTimer[_BenchmarksRunning].ElapsedMilliseconds;
 
                 _BenchmarkLog.Add(space + "Stop " + text + ", Elapsed Time: " + ms.ToString("0.000") + "ms");
                 _BenchmarkLog.Add(String.Empty);
             }
+            else
+                _BenchmarksRunning--;
         }
         #endregion LogBenchmark
     }
diff --git a/Vocaluxe/Base/CMain.cs b/Vocaluxe/Base/CMain.cs
index e0f02c3d..f8d0b073 100644
--- a/Vocaluxe/Base/CMain.cs
+++ b/Vocaluxe/Base/CMain.cs
@@ -118,7 +118,7 @@ namespace Vocaluxe.Base
 
         public IEnumerable<string> GetSongFolders()
         {
-            return CConfig.SongFolder;
+            return CConfig.SongFolders;
         }
 
         public ESongSorting GetSongSorting()
@@ -179,9 +179,9 @@ namespace Vocaluxe.Base
             return CSettings.ZNear;
         }
 
-        public EGameState GetGameState()
+        public EProgramState GetProgramState()
         {
-            return CSettings.GameState;
+            return CSettings.ProgramState;
         }
 
         public int GetToneMin()
@@ -226,7 +226,7 @@ namespace Vocaluxe.Base
 
         public string GetFolderProfiles()
         {
-            return CSettings.FolderProfiles;
+            return CConfig.ProfileFolders[0];
         }
 
         public string GetDataPath()
@@ -360,11 +360,6 @@ namespace Vocaluxe.Base
             CBackgroundMusic.Play();
         }
 
-        public void ApplyVolume()
-        {
-            CBackgroundMusic.ApplyVolume();
-        }
-
         public CTexture GetVideoTexture()
         {
             return CBackgroundMusic.GetVideoTexture();
@@ -606,6 +601,11 @@ namespace Vocaluxe.Base
             return CProfiles.GetAvatarTextureFromProfile(profileID);
         }
 
+        public CAvatar GetAvatarByFilename(string fileName)
+        {
+            return CProfiles.GetAvatarByFilename(fileName);
+        }
+
         public bool IsProfileIDValid(int profileID)
         {
             return CProfiles.IsProfileIDValid(profileID);
@@ -626,7 +626,7 @@ namespace Vocaluxe.Base
     {
         public int GetToneAbs(int playerNr)
         {
-            return CSound.RecordGetToneAbs(playerNr);
+            return CRecord.GetToneAbs(playerNr);
         }
     }
 
@@ -773,9 +773,9 @@ namespace Vocaluxe.Base
 
     class CBsound : ISound
     {
-        public int Load(string soundFile, bool prescan)
+        public int Load(string soundFile, bool loop = false, bool prescan = false)
         {
-            return CSound.Load(soundFile, prescan);
+            return CSound.Load(soundFile, loop, prescan);
         }
 
         public void SetPosition(int soundStream, float newPosition)
@@ -808,7 +808,7 @@ namespace Vocaluxe.Base
             return CSound.GetLength(soundStream);
         }
 
-        public void FadeAndStop(int soundStream, float targetVolume, float duration)
+        public void FadeAndClose(int soundStream, float targetVolume, float duration)
         {
             CSound.FadeAndClose(soundStream, targetVolume, duration);
         }
@@ -817,11 +817,6 @@ namespace Vocaluxe.Base
         {
             CSound.SetStreamVolume(soundStream, volume);
         }
-
-        public void SetStreamVolumeMax(int soundStream, float maxVolume)
-        {
-            CSound.SetStreamVolumeMax(soundStream, maxVolume);
-        }
     }
 
     class CBcover : ICover
@@ -839,7 +834,7 @@ namespace Vocaluxe.Base
             return CDataBase.GetCover(fileName, ref texture, coverSize);
         }
 
-        public bool GetDataBaseSongInfos(string artist, string title, out int numPlayed, out string dateAdded, out int highscoreID)
+        public bool GetDataBaseSongInfos(string artist, string title, out int numPlayed, out DateTime dateAdded, out int highscoreID)
         {
             return CDataBase.GetDataBaseSongInfos(artist, title, out numPlayed, out dateAdded, out highscoreID);
         }
diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs
index 5735786f..2fd180c1 100644
--- a/Vocaluxe/Base/CParty.cs
+++ b/Vocaluxe/Base/CParty.cs
@@ -223,7 +223,8 @@ namespace Vocaluxe.Base
             foreach (string file in files)
             {
                 SPartyMode pm = _LoadPartyMode(file);
-                _PartyModes.Add(pm.PartyModeID, pm);
+                if (pm.NoErrors)
+                    _PartyModes.Add(pm.PartyModeID, pm);
             }
         }
 
diff --git a/Vocaluxe/Base/CPlaylistElement.cs b/Vocaluxe/Base/CPlaylistElement.cs
new file mode 100644
index 00000000..3b6588de
--- /dev/null
+++ b/Vocaluxe/Base/CPlaylistElement.cs
@@ -0,0 +1,84 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using VocaluxeLib.Draw;
+using VocaluxeLib.Songs;
+
+namespace Vocaluxe.Base
+{
+    class CPlaylistElement
+    {
+        private readonly CSong _Song;
+        private readonly string _MusicFilePath = String.Empty;
+
+        public int SongID
+        {
+            get { return (_Song == null) ? -1 : _Song.ID; }
+        }
+
+        public string MusicFilePath
+        {
+            get { return _Song != null ? _Song.GetMP3() : _MusicFilePath; }
+        }
+
+        public string VideoFilePath
+        {
+            get { return _Song != null ? _Song.GetVideo() : string.Empty; }
+        }
+
+        public string Title
+        {
+            get { return _Song != null ? _Song.Title : ""; }
+        }
+
+        public string Artist
+        {
+            get { return _Song != null ? _Song.Artist : ""; }
+        }
+
+        public float Start
+        {
+            get { return _Song != null ? _Song.Start : 0f; }
+        }
+
+        public float Finish
+        {
+            get { return _Song != null ? _Song.Finish : 0f; }
+        }
+
+        public CTexture Cover
+        {
+            get { return _Song != null ? _Song.CoverTextureSmall : CCover.NoCover; }
+        }
+
+        public float VideoGap
+        {
+            get { return _Song != null ? _Song.VideoGap : 0; }
+        }
+
+        public CPlaylistElement(CSong song)
+        {
+            _Song = song;
+        }
+
+        public CPlaylistElement(string filePath)
+        {
+            _MusicFilePath = filePath;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Base/CPlaylists.cs b/Vocaluxe/Base/CPlaylists.cs
index e73dbd2b..5d928c7c 100644
--- a/Vocaluxe/Base/CPlaylists.cs
+++ b/Vocaluxe/Base/CPlaylists.cs
@@ -58,7 +58,7 @@ namespace Vocaluxe.Base
         private static void _ConvertUSDXPlaylists()
         {
             var files = new List<string>();
-            files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataPath, CSettings.FolderPlaylists), "*.upl", true, true));
+            files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists), "*.upl", true, true));
 
             foreach (string file in files)
             {
@@ -73,7 +73,7 @@ namespace Vocaluxe.Base
             _Playlists = new List<CPlaylistFile>();
 
             var files = new List<string>();
-            files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataPath, CSettings.FolderPlaylists), "*.xml", true, true));
+            files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists), "*.xml", true, true));
 
             foreach (string file in files)
             {
diff --git a/Vocaluxe/Base/CProfiles.cs b/Vocaluxe/Base/CProfiles.cs
index b4f4ae50..8c5c9887 100644
--- a/Vocaluxe/Base/CProfiles.cs
+++ b/Vocaluxe/Base/CProfiles.cs
@@ -17,10 +17,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.IO;
 using VocaluxeLib;
-using VocaluxeLib.Profile;
 using VocaluxeLib.Draw;
+using VocaluxeLib.Profile;
 
 namespace Vocaluxe.Base
 {
@@ -111,13 +112,21 @@ namespace Vocaluxe.Base
                             break;
 
                         case EAction.AddProfile:
-                            if (change.Profile == null)
+                            CProfile newProf = change.Profile;
+                            if (newProf == null)
                                 break;
 
-                            change.Profile.ID = _ProfileIDs.Dequeue();
-                            change.Profile.Avatar = _GetAvatar(change.Profile.AvatarFileName);
-                            change.Profile.SaveProfile();
-                            _Profiles.Add(change.Profile.ID, change.Profile);
+                            newProf.ID = _ProfileIDs.Dequeue();
+                            if (newProf.Avatar == null)
+                                newProf.Avatar = _Avatars.Values.First();
+                            else if (newProf.Avatar.ID < 0)
+                            {
+                                newProf.Avatar.ID = _AvatarIDs.Dequeue();
+                                _Avatars.Add(newProf.Avatar.ID, newProf.Avatar);
+                                _AvatarsChanged = true;
+                            }
+                            newProf.SaveProfile();
+                            _Profiles.Add(newProf.ID, newProf);
 
                             _ProfilesChanged = true;
                             break;
@@ -318,7 +327,7 @@ namespace Vocaluxe.Base
         {
             var profile = new CProfile
                 {
-                    FileName = fileName != "" ? Path.Combine(CSettings.DataPath, CSettings.FolderProfiles, fileName) : String.Empty
+                    FileName = fileName != "" ? Path.Combine(CConfig.ProfileFolders[0], fileName) : String.Empty
                 };
 
             if (File.Exists(profile.FileName))
@@ -332,8 +341,8 @@ namespace Vocaluxe.Base
 
         public static int NewAvatar(string fileName)
         {
-            var avatar = new CAvatar(-1);
-            if (!avatar.LoadFromFile(fileName))
+            CAvatar avatar = CAvatar.GetAvatar(fileName);
+            if (avatar == null)
                 return -1;
 
             avatar.ID = _AvatarIDs.Dequeue();
@@ -474,7 +483,7 @@ namespace Vocaluxe.Base
 
         public static int GetAvatarID(int profileID)
         {
-            if (!IsProfileIDValid(profileID))
+            if (!IsProfileIDValid(profileID) || _Profiles[profileID].Avatar == null)
                 return -1;
 
             return _Profiles[profileID].Avatar.ID;
@@ -505,7 +514,7 @@ namespace Vocaluxe.Base
 
         public static CTexture GetAvatarTextureFromProfile(int profileID)
         {
-            if (!IsProfileIDValid(profileID))
+            if (!IsProfileIDValid(profileID) || _Profiles[profileID].Avatar == null)
                 return null;
 
             return _Profiles[profileID].Avatar.Texture;
@@ -525,10 +534,7 @@ namespace Vocaluxe.Base
                 foreach (int id in ids)
                 {
                     if (_Profiles[id].LoadProfile())
-                    {
-                        _Profiles[id].Avatar = _GetAvatar(_Profiles[id].AvatarFileName);
                         knownFiles.Add(Path.GetFileName(_Profiles[id].FileName));
-                    }
                     else
                         _Profiles.Remove(id);
                 }
@@ -536,7 +542,7 @@ namespace Vocaluxe.Base
 
 
             var files = new List<string>();
-            foreach (string path in CSettings.FoldersProfiles)
+            foreach (string path in CConfig.ProfileFolders)
                 files.AddRange(CHelper.ListFiles(path, "*.xml", true, true));
 
             foreach (string file in files)
@@ -552,7 +558,6 @@ namespace Vocaluxe.Base
 
                 if (profile.LoadProfile())
                 {
-                    profile.Avatar = _GetAvatar(profile.AvatarFileName);
                     profile.ID = _ProfileIDs.Dequeue();
                     _Profiles.Add(profile.ID, profile);
                 }
@@ -577,21 +582,16 @@ namespace Vocaluxe.Base
             }
 
             var files = new List<string>();
-            foreach (string path in CSettings.FoldersProfiles)
-            {
-                files.AddRange(CHelper.ListFiles(path, "*.png", true, true));
-                files.AddRange(CHelper.ListFiles(path, "*.jpg", true, true));
-                files.AddRange(CHelper.ListFiles(path, "*.jpeg", true, true));
-                files.AddRange(CHelper.ListFiles(path, "*.bmp", true, true));
-            }
+            foreach (string path in CConfig.ProfileFolders)
+                files.AddRange(CHelper.ListImageFiles(path, true, true));
 
             foreach (string file in files)
             {
                 if (knownFiles.Contains(Path.GetFileName(file)))
                     continue;
 
-                var avatar = new CAvatar(-1);
-                if (avatar.LoadFromFile(file))
+                CAvatar avatar = CAvatar.GetAvatar(file);
+                if (avatar != null)
                 {
                     avatar.ID = _AvatarIDs.Dequeue();
                     _Avatars.Add(avatar.ID, avatar);
@@ -655,7 +655,7 @@ namespace Vocaluxe.Base
             return String.CompareOrdinal(a.PlayerName, b.PlayerName);
         }
 
-        private static CAvatar _GetAvatar(string fileName)
+        public static CAvatar GetAvatarByFilename(string fileName)
         {
             string name = Path.GetFileName(fileName);
 
@@ -664,7 +664,7 @@ namespace Vocaluxe.Base
                 if (Path.GetFileName(_Avatars[id].FileName) == name)
                     return _Avatars[id];
             }
-            return new CAvatar(-1);
+            return null;
         }
         #endregion private methods
     }
diff --git a/Vocaluxe/Base/CRecord.cs b/Vocaluxe/Base/CRecord.cs
new file mode 100644
index 00000000..43c8f099
--- /dev/null
+++ b/Vocaluxe/Base/CRecord.cs
@@ -0,0 +1,149 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System.Collections.ObjectModel;
+using Vocaluxe.Lib.Sound.Record;
+using Vocaluxe.Lib.Sound.Record.DirectSound;
+using Vocaluxe.Lib.Sound.Record.PortAudio;
+using VocaluxeLib;
+
+namespace Vocaluxe.Base
+{
+    static class CRecord
+    {
+        private static IRecord _Record;
+
+        public static bool Init()
+        {
+            if (_Record != null)
+                return false;
+            switch (CConfig.RecordLib)
+            {
+#if WIN
+                case ERecordLib.DirectSound:
+                    _Record = new CDirectSoundRecord();
+                    break;
+#endif
+
+                    // case ERecordLib.PortAudio:
+                default:
+                    _Record = new CPortAudioRecord();
+                    break;
+            }
+            return _Record.Init();
+        }
+
+        public static void Close()
+        {
+            if (_Record != null)
+            {
+                _Record.Close();
+                _Record = null;
+            }
+        }
+
+        public static bool Start()
+        {
+            return _Record.Start();
+        }
+
+        public static bool Stop()
+        {
+            return _Record.Stop();
+        }
+
+        public static void AnalyzeBuffer(int player)
+        {
+            _Record.AnalyzeBuffer(player);
+        }
+
+        public static int GetToneAbs(int player)
+        {
+            return _Record.GetToneAbs(player);
+        }
+
+        public static int GetTone(int player)
+        {
+            return _Record.GetTone(player);
+        }
+
+        public static void SetTone(int player, int tone)
+        {
+            _Record.SetTone(player, tone);
+        }
+
+        public static bool ToneValid(int player)
+        {
+            return _Record.ToneValid(player);
+        }
+
+        public static float GetMaxVolume(int player)
+        {
+            return _Record.GetMaxVolume(player);
+        }
+
+        public static float GetVolumeThreshold(int player)
+        {
+            return _Record.GetVolumeThreshold(player);
+        }
+
+        public static void SetVolumeThreshold(int player, float threshold)
+        {
+            _Record.SetVolumeThreshold(player, threshold);
+        }
+
+        public static int NumHalfTones(int player)
+        {
+            return _Record.NumHalfTones();
+        }
+
+        public static float[] ToneWeigth(int player)
+        {
+            return _Record.ToneWeigth(player);
+        }
+
+        public static ReadOnlyCollection<CRecordDevice> GetDevices()
+        {
+            ReadOnlyCollection<CRecordDevice> devices = _Record.RecordDevices();
+
+            if (devices != null)
+            {
+                foreach (CRecordDevice device in devices)
+                {
+                    device.PlayerChannel1 = _GetPlayerFromMicConfig(device.Name, device.Driver, 1);
+                    device.PlayerChannel2 = _GetPlayerFromMicConfig(device.Name, device.Driver, 2);
+                }
+                return devices;
+            }
+
+            return null;
+        }
+
+        private static int _GetPlayerFromMicConfig(string device, string devicedriver, int channel)
+        {
+            for (int p = 0; p < CSettings.MaxNumPlayer; p++)
+            {
+                if (CConfig.MicConfig[p].Channel != 0 &&
+                    CConfig.MicConfig[p].DeviceName == device &&
+                    CConfig.MicConfig[p].DeviceDriver == devicedriver &&
+                    CConfig.MicConfig[p].Channel == channel)
+                    return p + 1;
+            }
+            return 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs
index e978691d..3de72e98 100644
--- a/Vocaluxe/Base/CSettings.cs
+++ b/Vocaluxe/Base/CSettings.cs
@@ -33,6 +33,10 @@ namespace Vocaluxe.Base
         // ReSharper restore UnusedMember.Global
     }
 
+    /// <summary>
+    ///     This class contains settings for the program
+    ///     These are not editable, everything that can be changed by the user is in CConfig
+    /// </summary>
     static class CSettings
     {
 #if ARCH_X86
@@ -43,7 +47,9 @@ namespace Vocaluxe.Base
         private const String _Arch = "x64";
 #endif
 
-        public static EGameState GameState = EGameState.Start;
+        //TODO: This should not be here as it can change
+        //State of the program
+        public static EProgramState ProgramState = EProgramState.Start;
 
         //Adjusting of programName and version now in the assembly config.
         //I'd use the major and minor for Main releases, build number for every public release and revision for every bugfix version without any features
@@ -63,23 +69,20 @@ namespace Vocaluxe.Base
         public const int ZNear = -100;
         public const int ZFar = 100;
 
-        public static bool IsFullScreen;
         public const int VertexBufferElements = 10000;
 
 #if INSTALLER
-        public static string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Vocaluxe");
+        public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Vocaluxe");
 #else
-        public static string DataPath = Environment.CurrentDirectory;
+        public static readonly string DataPath = Environment.CurrentDirectory;
 #endif
 
         public const string Icon = "Vocaluxe.ico";
         public const string Logo = "Logo.png";
         public const string FallbackLanguage = "English";
-        public static string FileConfig = "Config.xml";
         public const string FileFonts = "Fonts.xml";
 
         public const string FileOldHighscoreDB = "Ultrastar.db";
-        public static string FileHighscoreDB = "HighscoreDB.sqlite";
         public const string FileCoverDB = "CoverDB.sqlite";
         public const string FileCreditsRessourcesDB = "CreditsRessourcesDB.sqlite";
         public const string FilePerformanceLog = "Performance.log";
@@ -96,21 +99,11 @@ namespace Vocaluxe.Base
         public const string FolderThemes = "Themes";
         public const string FolderThemeFonts = "Fonts";
         public const string FolderScreens = "Screens";
-        public const string FolderProfiles = "Profiles";
-        public static List<string> FoldersProfiles = new List<string>
-            {
-#if INSTALLER
-                Path.Combine(Environment.CurrentDirectory, FolderProfiles),
-#endif
-                Path.Combine(DataPath, FolderProfiles)
-            };
         public const string FolderPhotos = "Photos";
-        public const string FolderSongs = "Songs";
         public const string FolderSounds = "Sounds";
         public const string FolderLanguages = "Languages";
         public const string FolderScreenshots = "Screenshots";
         public const string FolderBackgroundMusic = "BackgroundMusic";
-        public static string FolderPlaylists = "Playlists";
 
         public const string FolderPartyModes = "PartyModes";
         public const string FolderPartyModeCode = "Code";
@@ -128,8 +121,10 @@ namespace Vocaluxe.Base
         public const int ToneMax = 89;
 
         public const int NumNoteLines = 11;
-        public static int MouseMoveDiffMin = 2;
+
         public const int MouseMoveOffTime = 3000; //in ms
+        public const int MouseMoveDiffMinActive = 3;
+        public const int MouseMoveDiffMinInactive = 15;
 
         public const int MaxNumPlayer = 6;
         public const int MaxScore = 10000;
@@ -153,14 +148,6 @@ namespace Vocaluxe.Base
         public const float SlideShowImageTime = 3500f;
         public const float SlideShowFadeTime = 500f;
 
-        public static readonly List<string> MusicFileTypes = new List<string>
-            {
-                "*.mp3",
-                "*.wma",
-                "*.ogg",
-                "*.wav"
-            };
-
         private static AssemblyName _Assembly
         {
             get { return Assembly.GetExecutingAssembly().GetName(); }
@@ -220,40 +207,37 @@ namespace Vocaluxe.Base
             return RenderW / (float)RenderH;
         }
 
-        public static void MouseInactive()
-        {
-            MouseMoveDiffMin = 15;
-        }
-
-        public static void MouseActive()
-        {
-            MouseMoveDiffMin = 3;
-        }
-
         public static void CreateFolders()
         {
             var folders = new List<string>
                 {
-                    FolderCover,
-                    FolderFonts,
+                    Path.Combine(Environment.CurrentDirectory, FolderCover),
+                    Path.Combine(Environment.CurrentDirectory, FolderFonts),
                     Path.Combine(DataPath, FolderScreenshots),
-                    FolderBackgroundMusic,
-                    FolderSounds,
-                    Path.Combine(DataPath, FolderPlaylists)
+                    Path.Combine(Environment.CurrentDirectory, FolderBackgroundMusic),
+                    Path.Combine(Environment.CurrentDirectory, FolderSounds),
+                    Path.Combine(DataPath, CConfig.FolderPlaylists)
                 };
-            folders.AddRange(FoldersProfiles);
+            folders.AddRange(CConfig.ProfileFolders);
+            folders.AddRange(CConfig.SongFolders);
 
             foreach (string folder in folders)
-            {
-                string path = Path.Combine(Environment.CurrentDirectory, folder);
-                CreateFolder(path);
-            }
+                _CreateFolder(folder);
         }
 
-        public static void CreateFolder(string path)
+        private static void _CreateFolder(string path)
         {
             if (!Directory.Exists(path))
-                Directory.CreateDirectory(path);
+            {
+                try
+                {
+                    Directory.CreateDirectory(path);
+                }
+                catch (Exception e)
+                {
+                    CLog.LogError("Cannot create directory \"" + path + "\": " + e.Message);
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Base/CSongCategorizer.cs b/Vocaluxe/Base/CSongCategorizer.cs
index 74784cc2..282e62a7 100644
--- a/Vocaluxe/Base/CSongCategorizer.cs
+++ b/Vocaluxe/Base/CSongCategorizer.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics;
 using VocaluxeLib;
 using VocaluxeLib.Songs;
 
@@ -61,36 +61,10 @@ namespace Vocaluxe.Base
             _SetChanged();
         }
 
-        private void _CreateCategoriesLetter()
+        private void _CreateCategories()
         {
-            CCategory lastCategory = null;
-            CCategory notLetterCat = null;
-            foreach (CSongPointer songPointer in CSongs.Sorter.SortedSongs)
-            {
-                Char firstLetter = Char.ToUpper(songPointer.SortString.Normalize(NormalizationForm.FormD)[0]);
-                if (Char.IsLetter(firstLetter))
-                {
-                    if (lastCategory == null || firstLetter.ToString() != lastCategory.Name)
-                    {
-                        lastCategory = new CCategory(firstLetter.ToString());
-                        _Categories.Add(lastCategory);
-                    }
-                    lastCategory.Songs.Add(songPointer);
-                }
-                else
-                {
-                    if (notLetterCat == null)
-                    {
-                        notLetterCat = new CCategory("#");
-                        _Categories.Add(notLetterCat);
-                    }
-                    notLetterCat.Songs.Add(songPointer);
-                }
-            }
-        }
+            _AdjustCategoryNames();
 
-        private void _CreateCategoriesNormal(string noCategoryName)
-        {
             CCategory lastCategory = null;
             CCategory noCategory = null;
             foreach (CSongPointer songPointer in CSongs.Sorter.SortedSongs)
@@ -108,7 +82,7 @@ namespace Vocaluxe.Base
                 {
                     if (noCategory == null)
                     {
-                        noCategory = new CCategory(noCategoryName);
+                        noCategory = new CCategory(_GetNoCategoryName());
                         _Categories.Add(noCategory);
                     }
                     noCategory.Songs.Add(songPointer);
@@ -116,37 +90,15 @@ namespace Vocaluxe.Base
             }
         }
 
-        private void _CreateCategories()
+        /// <summary>
+        ///     Sets the SortStrings of the songpointers to the actual category names
+        /// </summary>
+        private static void _AdjustCategoryNames()
         {
-            string noCategoryName = "";
-
             ESongSorting sorting = CSongs.Sorter.SongSorting;
-
             switch (sorting)
             {
-                case ESongSorting.TR_CONFIG_EDITION:
-                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOEDITION");
-                    break;
-                case ESongSorting.TR_CONFIG_GENRE:
-                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOGENRE");
-                    break;
                 case ESongSorting.TR_CONFIG_DECADE:
-                case ESongSorting.TR_CONFIG_YEAR:
-                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOYEAR");
-                    break;
-                case ESongSorting.TR_CONFIG_LANGUAGE:
-                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOLANGUAGE");
-                    break;
-                case ESongSorting.TR_CONFIG_NONE:
-                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_ALLSONGS");
-                    break;
-            }
-            if (sorting == ESongSorting.TR_CONFIG_ARTIST_LETTER || sorting == ESongSorting.TR_CONFIG_TITLE_LETTER)
-                _CreateCategoriesLetter();
-            else
-            {
-                if (sorting == ESongSorting.TR_CONFIG_DECADE)
-                {
                     foreach (CSongPointer songPointer in CSongs.Sorter.SortedSongs)
                     {
                         string year = songPointer.SortString;
@@ -156,11 +108,59 @@ namespace Vocaluxe.Base
                             songPointer.SortString = year + "0 - " + year + "9";
                         }
                     }
-                }
-                _CreateCategoriesNormal(noCategoryName);
+                    break;
+                case ESongSorting.TR_CONFIG_TITLE_LETTER:
+                case ESongSorting.TR_CONFIG_ARTIST_LETTER:
+                    foreach (CSongPointer songPointer in CSongs.Sorter.SortedSongs)
+                        songPointer.SortString = (songPointer.SortString.Length == 0 || !Char.IsLetter(songPointer.SortString, 0)) ? "#" : songPointer.SortString[0].ToString();
+                    break;
+                case ESongSorting.TR_CONFIG_DATEADDED:
+                    foreach (CSongPointer songPointer in CSongs.Sorter.SortedSongs)
+                        songPointer.SortString = CSongs.GetSong(songPointer.SongID).DateAdded.ToString("dd/MM/yyyy");
+                    break;
             }
         }
 
+        private static string _GetNoCategoryName()
+        {
+            string noCategoryName;
+            switch (CSongs.Sorter.SongSorting)
+            {
+                case ESongSorting.TR_CONFIG_NONE:
+                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_ALLSONGS");
+                    break;
+                case ESongSorting.TR_CONFIG_FOLDER:
+                case ESongSorting.TR_CONFIG_ARTIST:
+                case ESongSorting.TR_CONFIG_ARTIST_LETTER:
+                case ESongSorting.TR_CONFIG_TITLE_LETTER:
+                    noCategoryName = "";
+                    Debug.Assert(false, "Should not have an uncategorized song");
+                    break;
+                case ESongSorting.TR_CONFIG_EDITION:
+                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOEDITION");
+                    break;
+                case ESongSorting.TR_CONFIG_GENRE:
+                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOGENRE");
+                    break;
+                case ESongSorting.TR_CONFIG_LANGUAGE:
+                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOLANGUAGE");
+                    break;
+                case ESongSorting.TR_CONFIG_DECADE:
+                case ESongSorting.TR_CONFIG_YEAR:
+                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOYEAR");
+                    break;
+                case ESongSorting.TR_CONFIG_DATEADDED:
+                    noCategoryName = "";
+                    Debug.Assert(false, "Should not have an uncategorized song");
+                    break;
+                default:
+                    noCategoryName = "";
+                    Debug.Assert(false, "Forgot category option");
+                    break;
+            }
+            return noCategoryName;
+        }
+
         private void _FillCategories()
         {
             if (!_Changed)
diff --git a/Vocaluxe/Base/CSongSorter.cs b/Vocaluxe/Base/CSongSorter.cs
index eefb796f..f1703224 100644
--- a/Vocaluxe/Base/CSongSorter.cs
+++ b/Vocaluxe/Base/CSongSorter.cs
@@ -17,7 +17,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
+using System.Diagnostics;
+using System.Linq;
 using VocaluxeLib;
 using VocaluxeLib.Songs;
 
@@ -110,83 +111,65 @@ namespace Vocaluxe.Base
             return res;
         }
 
-        private List<CSongPointer> _CreateSortList(string fieldName)
+        private void _AddSongToList(CSong song, List<CSongPointer> list)
         {
-            var sortList = new List<CSongPointer>();
-            if (fieldName == "")
-                CSongs.Filter.FilteredSongs.ForEach(song => sortList.Add(new CSongPointer(song.ID, "")));
+            string value = null;
+            List<string> values = null;
+            switch (_SongSorting)
+            {
+                case ESongSorting.TR_CONFIG_NONE:
+                    value = "";
+                    break;
+                case ESongSorting.TR_CONFIG_FOLDER:
+                    value = song.FolderName;
+                    break;
+                case ESongSorting.TR_CONFIG_ARTIST:
+                case ESongSorting.TR_CONFIG_ARTIST_LETTER:
+                    value = _IgnoreArticles == EOffOn.TR_CONFIG_ON ? song.ArtistSorting : song.Artist;
+                    break;
+                case ESongSorting.TR_CONFIG_TITLE_LETTER:
+                    value = _IgnoreArticles == EOffOn.TR_CONFIG_ON ? song.TitleSorting : song.Title;
+                    break;
+                case ESongSorting.TR_CONFIG_EDITION:
+                    values = song.Editions;
+                    break;
+                case ESongSorting.TR_CONFIG_GENRE:
+                    values = song.Genres;
+                    break;
+                case ESongSorting.TR_CONFIG_LANGUAGE:
+                    values = song.Languages;
+                    break;
+                case ESongSorting.TR_CONFIG_DECADE:
+                case ESongSorting.TR_CONFIG_YEAR:
+                    value = song.Year;
+                    break;
+                case ESongSorting.TR_CONFIG_DATEADDED:
+                    value = song.DateAdded.ToString("yyyyMMdd");
+                    break;
+                default:
+                    Debug.Assert(false, "Forgot sorting option");
+                    break;
+            }
+            Debug.Assert(value != null || values != null, "Sorting implementation faulty");
+            if (value != null)
+                list.Add(new CSongPointer(song.ID, value));
             else
             {
-                FieldInfo field = typeof(CSong).GetField(fieldName, BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public);
-                if (field == null)
-                {
-                    CLog.LogError("Unknow sorting field: " + fieldName);
-                    return _CreateSortList("");
-                }
-                bool isString = field.FieldType == typeof(string);
-                if (!isString && field.FieldType != typeof(List<String>))
-                    throw new Exception("Unkown sort field type");
-                foreach (CSong song in CSongs.Filter.FilteredSongs)
-                {
-                    object value = field.GetValue(song);
-                    if (isString)
-                        sortList.Add(new CSongPointer(song.ID, (String)value));
-                    else
-                    {
-                        var values = (List<String>)value;
-                        if (values.Count == 0)
-                            sortList.Add(new CSongPointer(song.ID, ""));
-                        else
-                        {
-                            // ReSharper disable LoopCanBeConvertedToQuery
-                            foreach (String sortString in values)
-                                // ReSharper restore LoopCanBeConvertedToQuery
-                                sortList.Add(new CSongPointer(song.ID, sortString));
-                        }
-                    }
-                }
+                if (list.Count == 0)
+                    list.Add(new CSongPointer(song.ID, ""));
+                else
+                    list.AddRange(values.Select(val => new CSongPointer(song.ID, val)));
             }
-            return sortList;
         }
 
         private void _SortSongs()
         {
             if (!_Changed)
                 return;
-            String fieldName;
-            switch (_SongSorting)
-            {
-                case ESongSorting.TR_CONFIG_EDITION:
-                    fieldName = "Editions";
-                    break;
-                case ESongSorting.TR_CONFIG_GENRE:
-                    fieldName = "Genres";
-                    break;
-                case ESongSorting.TR_CONFIG_FOLDER:
-                    fieldName = "FolderName";
-                    break;
-                case ESongSorting.TR_CONFIG_ARTIST_LETTER:
-                case ESongSorting.TR_CONFIG_ARTIST:
-                    fieldName = _IgnoreArticles == EOffOn.TR_CONFIG_ON ? "ArtistSorting" : "Artist";
-                    break;
-                case ESongSorting.TR_CONFIG_TITLE_LETTER:
-                    fieldName = _IgnoreArticles == EOffOn.TR_CONFIG_ON ? "TitleSorting" : "Title";
-                    break;
-                case ESongSorting.TR_CONFIG_YEAR:
-                case ESongSorting.TR_CONFIG_DECADE:
-                    fieldName = "Year";
-                    break;
-                case ESongSorting.TR_CONFIG_LANGUAGE:
-                    fieldName = "Languages";
-                    break;
-                case ESongSorting.TR_CONFIG_DATEADDED:
-                    fieldName = "DateAdded";
-                    break;
-                default:
-                    fieldName = "";
-                    break;
-            }
-            List<CSongPointer> sortList = _CreateSortList(fieldName);
+
+            List<CSongPointer> sortList = new List<CSongPointer>();
+            foreach (CSong song in CSongs.Filter.FilteredSongs)
+                _AddSongToList(song, sortList);
             switch (_SongSorting)
             {
                 case ESongSorting.TR_CONFIG_ARTIST_LETTER:
diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs
index 14b2100e..36d0d6f2 100644
--- a/Vocaluxe/Base/CSongs.cs
+++ b/Vocaluxe/Base/CSongs.cs
@@ -332,21 +332,21 @@ namespace Vocaluxe.Base
 
         public static void LoadSongs()
         {
-            CLog.StartBenchmark(1, "Load Songs");
+            CLog.StartBenchmark("Load Songs");
             SongsLoaded = false;
             _Songs.Clear();
 
-            CLog.StartBenchmark(2, "List Songs");
+            CLog.StartBenchmark("List Songs");
             var files = new List<string>();
-            foreach (string p in CConfig.SongFolder)
+            foreach (string p in CConfig.SongFolders)
             {
                 string path = p;
                 files.AddRange(CHelper.ListFiles(path, "*.txt", true, true));
                 files.AddRange(CHelper.ListFiles(path, "*.txd", true, true));
             }
-            CLog.StopBenchmark(2, "List Songs");
+            CLog.StopBenchmark("List Songs");
 
-            CLog.StartBenchmark(2, "Read TXTs");
+            CLog.StartBenchmark("Read TXTs");
             foreach (string file in files)
             {
                 CSong song = CSong.LoadSong(file);
@@ -356,25 +356,24 @@ namespace Vocaluxe.Base
                 if (song.LoadNotes())
                     _Songs.Add(song);
             }
-            CLog.StopBenchmark(2, "Read TXTs");
+            CLog.StopBenchmark("Read TXTs");
 
-            CLog.StartBenchmark(2, "Sort Songs");
+            CLog.StartBenchmark("Sort Songs");
             Sorter.SongSorting = CConfig.SongSorting;
             Sorter.IgnoreArticles = CConfig.IgnoreArticles;
             Categorizer.Tabs = CConfig.Tabs;
             Categorizer.ObjectChanged += _HandleCategoriesChanged;
-            CLog.StopBenchmark(2, "Sort Songs");
+            CLog.StopBenchmark("Sort Songs");
             Category = -1;
             SongsLoaded = true;
 
             if (CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART)
             {
-                CLog.StartBenchmark(2, "Load Covers/Notes");
+                CLog.StartBenchmark("Load Covers/Notes");
                 _LoadCover();
-                CLog.StopBenchmark(2, "Load Covers/Notes");
+                CLog.StopBenchmark("Load Covers/Notes");
             }
-            CLog.StopBenchmark(1, "Load Songs ");
-            GC.Collect();
+            CLog.StopBenchmark("Load Songs ");
         }
 
         public static void LoadCover()
@@ -419,7 +418,6 @@ namespace Vocaluxe.Base
                 song.LoadSmallCover();
                 NumSongsWithCoverLoaded++;
             }
-            GC.Collect();
             _CoverLoaded = true;
             CDataBase.CommitCovers();
         }
diff --git a/Vocaluxe/Base/CSound.cs b/Vocaluxe/Base/CSound.cs
index d6b55cbe..9d7f65dd 100644
--- a/Vocaluxe/Base/CSound.cs
+++ b/Vocaluxe/Base/CSound.cs
@@ -16,10 +16,13 @@
 #endregion
 
 using System;
-using System.Collections.ObjectModel;
 using System.IO;
-using Vocaluxe.Lib.Sound;
+using Vocaluxe.Lib.Sound.Playback;
+using Vocaluxe.Lib.Sound.Playback.GstreamerSharp;
+using Vocaluxe.Lib.Sound.Playback.OpenAL;
+using Vocaluxe.Lib.Sound.Playback.PortAudio;
 using VocaluxeLib;
+using System.Threading;
 
 namespace Vocaluxe.Base
 {
@@ -35,6 +38,8 @@ namespace Vocaluxe.Base
 
         public static bool Init()
         {
+            if (_Playback != null)
+                return false;
             switch (CConfig.PlayBackLib)
             {
                 case EPlaybackLib.PortAudio:
@@ -45,10 +50,6 @@ namespace Vocaluxe.Base
                     _Playback = new COpenALPlay();
                     break;
 
-                case EPlaybackLib.Gstreamer:
-                    _Playback = new CGstreamerAudio();
-                    break;
-
                 case EPlaybackLib.GstreamerSharp:
                     _Playback = new CGstreamerSharpAudio();
                     break;
@@ -72,18 +73,21 @@ namespace Vocaluxe.Base
 
         public static void CloseAllStreams()
         {
-            _Playback.CloseAll();
+            if (_Playback != null)
+                _Playback.CloseAll();
+        }
+
+        public static void Close()
+        {
+            if (_Playback != null)
+                _Playback.Close();
+            _Playback = null;
         }
 
         #region Stream Handling
-        public static int Load(string media)
+        public static int Load(string media, bool loop=false, bool prescan=false)
         {
-            return _Playback.Load(media);
-        }
-
-        public static int Load(string media, bool prescan)
-        {
-            return _Playback.Load(media, prescan);
+            return _Playback.Load(media, loop, prescan);
         }
 
         public static void Close(int stream)
@@ -96,11 +100,6 @@ namespace Vocaluxe.Base
             _Playback.Play(stream);
         }
 
-        public static void Play(int stream, bool loop)
-        {
-            _Playback.Play(stream, loop);
-        }
-
         public static void Pause(int stream)
         {
             _Playback.Pause(stream);
@@ -111,24 +110,24 @@ namespace Vocaluxe.Base
             _Playback.Stop(stream);
         }
 
-        public static void Fade(int stream, float targetVolume, float seconds)
+        public static void Fade(int stream, float targetVolume, float seconds, EStreamAction afterFadeAction = EStreamAction.Nothing)
         {
-            _Playback.Fade(stream, targetVolume, seconds);
+            _Playback.Fade(stream, targetVolume, seconds, afterFadeAction);
         }
 
         public static void FadeAndPause(int stream, float targetVolume, float seconds)
         {
-            _Playback.FadeAndPause(stream, targetVolume, seconds);
+            Fade(stream, targetVolume, seconds, EStreamAction.Pause);
         }
 
         public static void FadeAndClose(int stream, float targetVolume, float seconds)
         {
-            _Playback.FadeAndClose(stream, targetVolume, seconds);
+            Fade(stream, targetVolume, seconds, EStreamAction.Close);
         }
 
         public static void FadeAndStop(int stream, float targetVolume, float seconds)
         {
-            _Playback.FadeAndStop(stream, targetVolume, seconds);
+            Fade(stream, targetVolume, seconds, EStreamAction.Stop);
         }
 
         public static void SetStreamVolume(int stream, float volume)
@@ -136,11 +135,6 @@ namespace Vocaluxe.Base
             _Playback.SetStreamVolume(stream, volume);
         }
 
-        public static void SetStreamVolumeMax(int stream, float volume)
-        {
-            _Playback.SetStreamVolumeMax(stream, volume);
-        }
-
         public static float GetLength(int stream)
         {
             return _Playback.GetLength(stream);
@@ -195,119 +189,28 @@ namespace Vocaluxe.Base
             if (!File.Exists(file))
                 return -1;
 
-            int stream = Load(file, true);
-            float length = GetLength(stream);
+            int stream = Load(file, false, fade);
+            if (stream < 0)
+                return -1;
             Play(stream);
             if (fade)
-                FadeAndClose(stream, 100f, length);
+            {
+                float length = -1f;
+                for (int i = 0; i < 5; i++)
+                {
+                    length = GetLength(stream);
+                    if (length >= 0f)
+                        break;
+                    Thread.Sleep(1);
+                }
+                if (length > 0f)
+                {
+                    SetStreamVolume(stream, 0f);
+                    Fade(stream, 100f, length);
+                }
+            }
             return stream;
         }
         #endregion Sounds
-
-        #region Record
-        private static IRecord _Record;
-
-        public static void RecordInit()
-        {
-            switch (CConfig.RecordLib)
-            {
-#if WIN
-                case ERecordLib.DirectSound:
-                    _Record = new CDirectSoundRecord();
-                    break;
-#endif
-
-                    // case ERecordLib.PortAudio:
-                default:
-                    _Record = new CPortAudioRecord();
-                    break;
-            }
-        }
-
-        public static void RecordCloseAll()
-        {
-            _Record.CloseAll();
-        }
-
-        public static bool RecordStart()
-        {
-            return _Record.Start();
-        }
-
-        public static bool RecordStop()
-        {
-            return _Record.Stop();
-        }
-
-        public static void AnalyzeBuffer(int player)
-        {
-            _Record.AnalyzeBuffer(player);
-        }
-
-        public static int RecordGetToneAbs(int player)
-        {
-            return _Record.GetToneAbs(player);
-        }
-
-        public static int RecordGetTone(int player)
-        {
-            return _Record.GetTone(player);
-        }
-
-        public static void RecordSetTone(int player, int tone)
-        {
-            _Record.SetTone(player, tone);
-        }
-
-        public static bool RecordToneValid(int player)
-        {
-            return _Record.ToneValid(player);
-        }
-
-        public static float RecordGetMaxVolume(int player)
-        {
-            return _Record.GetMaxVolume(player);
-        }
-
-        public static int NumHalfTones(int player)
-        {
-            return _Record.NumHalfTones(player);
-        }
-
-        public static float[] ToneWeigth(int player)
-        {
-            return _Record.ToneWeigth(player);
-        }
-
-        public static ReadOnlyCollection<CRecordDevice> RecordGetDevices()
-        {
-            ReadOnlyCollection<CRecordDevice> devices = _Record.RecordDevices();
-
-            if (devices != null)
-            {
-                foreach (CRecordDevice device in devices)
-                {
-                    device.PlayerChannel1 = _GetPlayerFromMicConfig(device.Name, device.Driver, 1);
-                    device.PlayerChannel2 = _GetPlayerFromMicConfig(device.Name, device.Driver, 2);
-                }
-                return devices;
-            }
-
-            return null;
-        }
-
-        private static int _GetPlayerFromMicConfig(string device, string devicedriver, int channel)
-        {
-            for (int p = 0; p < CSettings.MaxNumPlayer; p++)
-            {
-                if (CConfig.MicConfig[p].Channel != 0 &&
-                    CConfig.MicConfig[p].DeviceName == device &&
-                    CConfig.MicConfig[p].DeviceDriver == devicedriver &&
-                    CConfig.MicConfig[p].Channel == channel)
-                    return p + 1;
-            }
-            return 0;
-        }
-        #endregion Record
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Base/CTheme.cs b/Vocaluxe/Base/CTheme.cs
index 35180bcb..4f9dd431 100644
--- a/Vocaluxe/Base/CTheme.cs
+++ b/Vocaluxe/Base/CTheme.cs
@@ -142,22 +142,30 @@ namespace Vocaluxe.Base
         #endregion Vars
 
         #region Theme and Skin loading and writing
-        public static void InitTheme()
+        public static bool Init()
         {
             _ListThemes();
             ListSkins();
 
-            LoadSkins();
-            LoadTheme();
+            return LoadSkins() && LoadTheme();
         }
 
-        public static void LoadSkins()
+        public static bool LoadSkins()
         {
+            //Fail if loading of any skin failed or no skin was loaded
+            //TODO: implement handlers that failing skins are logged and ignored
+            bool result = false;
             for (int index = 0; index < _Skins.Count; index++)
             {
                 if (_Skins[index].PartyModeID == -1)
-                    LoadSkin(index);
+                {
+                    if (LoadSkin(index))
+                        result = true;
+                    else
+                        return false;
+                }
             }
+            return result;
         }
 
         public static bool LoadSkin(int skinIndex)
@@ -225,13 +233,14 @@ namespace Vocaluxe.Base
             }
         }
 
-        public static void LoadTheme()
+        public static bool LoadTheme()
         {
             for (int i = 0; i < _Themes.Count; i++)
             {
                 if (_Themes[i].Name == CConfig.Theme && _Themes[i].PartyModeID == -1)
-                    LoadTheme(i);
+                    return LoadTheme(i);
             }
+            return false;
         }
 
         public static bool LoadTheme(int themeIndex)
diff --git a/Vocaluxe/Base/CVideo.cs b/Vocaluxe/Base/CVideo.cs
index 76a7ce5e..5bb596e9 100644
--- a/Vocaluxe/Base/CVideo.cs
+++ b/Vocaluxe/Base/CVideo.cs
@@ -29,29 +29,32 @@ namespace Vocaluxe.Base
         private static IVideoDecoder _VideoDecoder;
 
         #region Init
-        public static void Init()
+        public static bool Init()
         {
+            if (_VideoDecoder != null)
+                return false;
             switch (CConfig.VideoDecoder)
             {
                 case EVideoDecoder.FFmpeg:
                     _VideoDecoder = new CVideoDecoderFFmpeg();
                     break;
-                case EVideoDecoder.Gstreamer:
-                    _VideoDecoder = new CVideoDecoderGstreamer();
-                    break;
                 default:
                     _VideoDecoder = new CVideoDecoderFFmpeg();
                     break;
             }
 
-            _VideoDecoder.Init();
+            return _VideoDecoder.Init();
         }
         #endregion Init
 
         #region Interface
-        public static void CloseAll()
+        public static void Close()
         {
-            _VideoDecoder.CloseAll();
+            if (_VideoDecoder != null)
+            {
+                _VideoDecoder.CloseAll();
+                _VideoDecoder = null;
+            }
         }
 
         public static int GetNumStreams()
diff --git a/Vocaluxe/Base/CWebcam.cs b/Vocaluxe/Base/CWebcam.cs
index dac871aa..af66025a 100644
--- a/Vocaluxe/Base/CWebcam.cs
+++ b/Vocaluxe/Base/CWebcam.cs
@@ -26,8 +26,10 @@ namespace Vocaluxe.Base
     {
         private static IWebcam _Webcam;
 
-        public static void Init()
+        public static bool Init()
         {
+            if (_Webcam != null)
+                return false;
             switch (CConfig.WebcamLib)
             {
                 case EWebcamLib.AForgeNet:
@@ -38,61 +40,79 @@ namespace Vocaluxe.Base
                     _Webcam = new CAForgeNet();
                     break;
             }
-            _Webcam.Init();
+            if (!_Webcam.Init())
+                return false;
             _Webcam.Select(CConfig.WebcamConfig);
 
             CConfig.WebcamConfig = _Webcam.GetConfig();
             CConfig.SaveConfig();
-        }
-
-        public static bool GetFrame(ref CTexture tex)
-        {
-            return _Webcam.GetFrame(ref tex);
-        }
-
-        public static Bitmap GetBitmap()
-        {
-            return _Webcam.GetBitmap();
+            return true;
         }
 
         public static void Close()
         {
+            if (_Webcam == null)
+                return;
             _Webcam.Close();
+            _Webcam = null;
+        }
+
+        public static bool GetFrame(ref CTexture tex)
+        {
+            return _Webcam != null && _Webcam.GetFrame(ref tex);
+        }
+
+        public static Bitmap GetBitmap()
+        {
+            return _Webcam == null ? null : _Webcam.GetBitmap();
         }
 
         public static void Pause()
         {
+            if (_Webcam == null)
+                return;
             _Webcam.Pause();
         }
 
         public static void Start()
         {
+            if (_Webcam == null)
+                return;
             _Webcam.Start();
         }
 
         public static void Stop()
         {
+            if (_Webcam == null)
+                return;
             _Webcam.Stop();
         }
 
-        public static void Select(SWebcamConfig c)
+        public static bool Select(SWebcamConfig c)
         {
-            _Webcam.Select(c);
+            return _Webcam != null && _Webcam.Select(c);
+        }
+
+        public static void DeSelect()
+        {
+            if (_Webcam == null)
+                return;
+            _Webcam.DeSelect();
         }
 
         public static SWebcamDevice[] GetDevices()
         {
-            return _Webcam.GetDevices();
+            return _Webcam == null ? null : _Webcam.GetDevices();
         }
 
         public static bool IsDeviceAvailable()
         {
-            return _Webcam.IsDeviceAvailable();
+            return (_Webcam != null) && _Webcam.IsDeviceAvailable();
         }
 
         public static bool IsCapturing()
         {
-            return _Webcam.IsCapturing();
+            return (_Webcam != null) && _Webcam.IsCapturing();
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Base/Fonts/CFonts.cs b/Vocaluxe/Base/Fonts/CFonts.cs
index 8b561072..2c838aac 100644
--- a/Vocaluxe/Base/Fonts/CFonts.cs
+++ b/Vocaluxe/Base/Fonts/CFonts.cs
@@ -19,7 +19,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml;
 using VocaluxeLib;
 using VocaluxeLib.Menu;
@@ -28,8 +27,6 @@ namespace Vocaluxe.Base.Fonts
 {
     static class CFonts
     {
-        private static readonly XmlWriterSettings _Settings = new XmlWriterSettings();
-
         private static readonly List<SFont> _Fonts = new List<SFont>();
         private static int _CurrentFont;
         private static float _Height = 1f;
@@ -58,10 +55,6 @@ namespace Vocaluxe.Base.Fonts
 
         public static void Init()
         {
-            _Settings.Indent = true;
-            _Settings.Encoding = Encoding.UTF8;
-            _Settings.ConformanceLevel = ConformanceLevel.Document;
-
             _CurrentFont = 0;
             PartyModeID = -1;
             _BuildFonts();
@@ -361,9 +354,9 @@ namespace Vocaluxe.Base.Fonts
         public static void LoadThemeFonts(string themeName, string fontFolder, CXMLReader xmlReader)
         {
             _LoadFontFiles(xmlReader, fontFolder, themeName);
-            CLog.StartBenchmark(1, "BuildGlyphs");
+            CLog.StartBenchmark("BuildGlyphs");
             _BuildGlyphs();
-            CLog.StopBenchmark(1, "BuildGlyphs");
+            CLog.StopBenchmark("BuildGlyphs");
         }
 
         /// <summary>
@@ -372,9 +365,9 @@ namespace Vocaluxe.Base.Fonts
         public static void LoadPartyModeFonts(int partyModeID, string fontFolder, CXMLReader xmlReader)
         {
             _LoadFontFiles(xmlReader, fontFolder, "", partyModeID);
-            CLog.StartBenchmark(1, "BuildGlyphs");
+            CLog.StartBenchmark("BuildGlyphs");
             _BuildGlyphs();
-            CLog.StopBenchmark(1, "BuildGlyphs");
+            CLog.StopBenchmark("BuildGlyphs");
         }
 
         public static void SaveThemeFonts(string themeName, XmlWriter writer)
diff --git a/Vocaluxe/Base/Fonts/CGlyph.cs b/Vocaluxe/Base/Fonts/CGlyph.cs
index cab5d9b6..c694c84d 100644
--- a/Vocaluxe/Base/Fonts/CGlyph.cs
+++ b/Vocaluxe/Base/Fonts/CGlyph.cs
@@ -15,6 +15,9 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
+//Uncomment to make the font write the glyphs to file
+//#define FONT_DEBUG_OUTPUT
+
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
@@ -119,19 +122,15 @@ namespace Vocaluxe.Base.Fonts
                         _DrawBounding.Y *= _Texture.Width / _DrawBounding.Width;
                         _DrawBounding.Width = _Texture.Width;
                         _DrawBounding.Height = _Texture.Height;*/
-#pragma warning disable 162
-                        // ReSharper disable HeuristicUnreachableCode
-                        // ReSharper disable ConditionIsAlwaysTrueOrFalse
-                        if (false && Char.IsLetterOrDigit(chr))
+#if FONT_DEBUG_OUTPUT
+                        if (Char.IsLetterOrDigit(chr))
                         {
                             if (outline > 0)
                                 bmpCropped.Save("font_" + chr + "o" + CFonts.Style + "2.png", ImageFormat.Png);
                             else
                                 bmpCropped.Save("font_" + chr + CFonts.Style + "2.png", ImageFormat.Png);
                         }
-                        // ReSharper restore ConditionIsAlwaysTrueOrFalse
-                        // ReSharper restore HeuristicUnreachableCode
-#pragma warning restore 162
+#endif
                     }
                 }
             }
diff --git a/Vocaluxe/Base/Server/CVocaluxeServer.cs b/Vocaluxe/Base/Server/CVocaluxeServer.cs
index 154dd1db..c25462d0 100644
--- a/Vocaluxe/Base/Server/CVocaluxeServer.cs
+++ b/Vocaluxe/Base/Server/CVocaluxeServer.cs
@@ -18,8 +18,9 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
 using System.Text;
 using System.Windows.Forms;
 using ServerLib;
@@ -29,16 +30,34 @@ using VocaluxeLib;
 using VocaluxeLib.Menu;
 using VocaluxeLib.Profile;
 using VocaluxeLib.Songs;
-using System.Security.Cryptography;
 
 namespace Vocaluxe.Base.Server
 {
     static class CVocaluxeServer
     {
+        private class CServerController : CControllerFramework
+        {
+            public override string GetName()
+            {
+                return "App controller";
+            }
+
+            public override void Connect() {}
+
+            public override void Disconnect() {}
+
+            public override bool IsConnected()
+            {
+                return true;
+            }
+
+            public override void SetRumble(float duration) {}
+        }
+
         private static CServer _Server;
         //private static CDiscover _Discover;
 
-        public static readonly CControllerFramework Controller = new CControllerFramework();
+        public static readonly CControllerFramework Controller = new CServerController();
 
         public static void Init()
         {
@@ -69,7 +88,6 @@ namespace Vocaluxe.Base.Server
             CServer.AddPlaylist = _AddPlaylist;
 
             //_Discover = new CDiscover(CConfig.ServerPort, CCommands.BroadcastKeyword);
-            Controller.Init();
         }
 
         public static void Start()
@@ -83,8 +101,12 @@ namespace Vocaluxe.Base.Server
 
         public static void Close()
         {
-            _Server.Stop();
-            //_Discover.Stop();
+            if (_Server != null)
+            {
+                _Server.Stop();
+                _Server = null;
+                //_Discover.Stop();
+            }
         }
 
         public static string GetServerAddress()
@@ -148,7 +170,7 @@ namespace Vocaluxe.Base.Server
                             else
                                 keyChar = c;
 
-                            if ((keyChar >= 0x30 && keyChar <= 0x39) || (keyChar >= 0x41 && keyChar <= 0x5A))
+                            if ((keyChar >= '0' && keyChar <= '9') || (keyChar >= 'A' && keyChar <= 'Z'))
                             {
                                 Keys keys = (Keys)keyChar;
                                 if (shift)
@@ -185,7 +207,6 @@ namespace Vocaluxe.Base.Server
                         ID = existingProfile.ID,
                         FileName = existingProfile.FileName,
                         Active = existingProfile.Active,
-                        AvatarFileName = existingProfile.AvatarFileName,
                         Avatar = existingProfile.Avatar,
                         Difficulty = existingProfile.Difficulty,
                         UserRole = existingProfile.UserRole,
@@ -295,10 +316,10 @@ namespace Vocaluxe.Base.Server
         {
             try
             {
-                string filename = _SaveImage(avatarData, "snapshot", CSettings.FolderProfiles);
+                string filename = _SaveImage(avatarData, "snapshot", CConfig.ProfileFolders[0]);
 
-                var avatar = new CAvatar(-1);
-                if (avatar.LoadFromFile(filename))
+                CAvatar avatar = CAvatar.GetAvatar(filename);
+                if (avatar != null)
                 {
                     CProfiles.AddAvatar(avatar);
                     return avatar;
diff --git a/Vocaluxe/COSFunctions.cs b/Vocaluxe/COSFunctions.cs
new file mode 100644
index 00000000..d8aec79a
--- /dev/null
+++ b/Vocaluxe/COSFunctions.cs
@@ -0,0 +1,103 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Vocaluxe
+{
+    static class COSFunctions
+    {
+#if WIN
+        private static bool _DefaultDllDirSet;
+        private static bool _UsePath;
+        private static bool _UseSetDllDir;
+
+        private static class CWindowsFunctions
+        {
+            [DllImport("kernel32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
+            public static extern void AddDllDirectory(string lpPathName);
+
+            [DllImport("kernel32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
+            public static extern void SetDllDirectory(string lpPathName);
+
+            [DllImport("user32.dll", CallingConvention = CallingConvention.StdCall)]
+            [return: MarshalAs(UnmanagedType.Bool)]
+            public static extern bool SetForegroundWindow(IntPtr hWnd);
+
+            [DllImport("kernel32.dll", CallingConvention = CallingConvention.StdCall)]
+            [return: MarshalAs(UnmanagedType.Bool)]
+            public static extern bool SetDefaultDllDirectories(int directoryFlags);
+
+            // ReSharper disable InconsistentNaming
+            public const int LOAD_LIBRARY_SEARCH_DEFAULT_DIRS = 0x00001000;
+            // ReSharper restore InconsistentNaming
+        }
+#endif
+
+        public static void AddEnvironmentPath(string path)
+        {
+            string newPath = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
+            if (newPath.Length > 0)
+                newPath += ";";
+            newPath += path;
+
+            Environment.SetEnvironmentVariable("PATH", newPath);
+        }
+
+        public static void AddLibrarySearchpath(string path)
+        {
+#if WIN
+            if (!_DefaultDllDirSet)
+            {
+                try
+                {
+                    CWindowsFunctions.SetDefaultDllDirectories(CWindowsFunctions.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
+                }
+                catch (Exception)
+                {
+                    _UsePath = true;
+                    _UseSetDllDir = true;
+                }
+                _DefaultDllDirSet = true;
+            }
+            if (_UsePath)
+                AddEnvironmentPath(path);
+            if (!_UseSetDllDir)
+            {
+                try
+                {
+                    CWindowsFunctions.AddDllDirectory(path);
+                }
+                catch (Exception)
+                {
+                    _UseSetDllDir = true;
+                }
+            }
+            if (_UseSetDllDir)
+                CWindowsFunctions.SetDllDirectory(path);
+#endif
+        }
+
+        public static void SetForegroundWindow(IntPtr hWnd)
+        {
+#if WIN
+            CWindowsFunctions.SetForegroundWindow(hWnd);
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/CProgrammHelper.cs b/Vocaluxe/CProgrammHelper.cs
index f4425776..800b907a 100644
--- a/Vocaluxe/CProgrammHelper.cs
+++ b/Vocaluxe/CProgrammHelper.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.IO;
+using System.Reflection;
 using System.Security;
 using Microsoft.Win32;
 using Vocaluxe.Base;
@@ -49,6 +50,16 @@ namespace Vocaluxe
             return false;
         }
 
+        private static bool _KeyExists(string key)
+        {
+            using (RegistryKey rk = Registry.LocalMachine.OpenSubKey(key))
+            {
+                if (rk != null)
+                    return true;
+            }
+            return false;
+        }
+
         /// <summary>
         ///     Checks if a given program is installed by checking the Uninstall registry key.
         /// </summary>
@@ -56,10 +67,11 @@ namespace Vocaluxe
         /// <returns></returns>
         private static bool _IsProgramInstalled(string name)
         {
-            const string uninstallKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall";
-            const string uninstallKeyx64 = @"SOFTWARE\WoW6432Node\Microsoft\Windows\CurrentVersion\Uninstall";
+            const string baseKey = @"SOFTWARE\";
+            const string baseKey64 = @"SOFTWARE\WoW6432Node\";
+            const string uninstallKey = @"Microsoft\Windows\CurrentVersion\Uninstall";
             name = name.ToLower();
-            return _CheckUninstallKey(name, uninstallKey) || _CheckUninstallKey(name, uninstallKeyx64);
+            return _CheckUninstallKey(name, baseKey + uninstallKey) || (_KeyExists(baseKey64) && _CheckUninstallKey(name, baseKey64 + uninstallKey));
         }
 
         private static bool _SystemDllExists(string dllName)
@@ -93,6 +105,7 @@ namespace Vocaluxe
                     true, true);
                 return false;
             }
+            /*
             bool vc2008Installed = _IsVC2008Installed();
             if (!vc2008Installed)
             {
@@ -106,7 +119,21 @@ namespace Vocaluxe
                     true, true);
                 return false;
             }
+             * */
             return true;
         }
+
+        public static void Init()
+        {
+#if ARCH_X86
+            string path = "x86";
+#endif
+#if ARCH_X64
+            string path = "x64";
+#endif
+            path = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + Path.DirectorySeparatorChar + path;
+            COSFunctions.AddLibrarySearchpath(path);
+            COSFunctions.AddLibrarySearchpath(path + Path.DirectorySeparatorChar + "gstreamer");
+        }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/GlobalSuppressions.cs b/Vocaluxe/GlobalSuppressions.cs
index da284174..8a667a11 100644
--- a/Vocaluxe/GlobalSuppressions.cs
+++ b/Vocaluxe/GlobalSuppressions.cs
@@ -38,9 +38,6 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("Microsoft.Reliability", "CA2000:Objekte verwerfen, bevor Bereich verloren geht", Scope = "member", Target = "Vocaluxe.Lib.Draw.CDirect3D.#CopyScreen()")
 ]
 [assembly: SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Scope = "type", Target = "Vocaluxe.Lib.Input.WiiMote.InputReport")]
-[assembly: SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Scope = "type", Target = "PortAudioSharp.PortAudio+PaDeviceIndex")]
-[assembly: SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Scope = "type", Target = "PortAudioSharp.PortAudio+PaSampleFormat")]
-[assembly: SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue", Scope = "type", Target = "PortAudioSharp.PortAudio+PaStreamCallbackFlags")]
 [assembly:
     SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Scope = "member",
         Target = "Vocaluxe.Lib.Video.Gstreamer.CGstreamerVideoWrapper.#GetFrame(System.Int32,System.Single)")]
@@ -49,19 +46,4 @@ using System.Diagnostics.CodeAnalysis;
         Target = "Vocaluxe.Lib.Input.CHIDAPI.#ReadTimeout(System.IntPtr,System.Byte[]&,System.Int32,System.Int32)")]
 [assembly:
     SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Scope = "member",
-        Target = "Vocaluxe.Lib.Input.CHIDAPI.#Read(System.IntPtr,System.Byte[]&,System.Int32)")]
-[assembly: SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Scope = "member", Target = "PortAudioSharp.PortAudio.#Pa_GetVersionText()")]
-[assembly:
-    SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Scope = "member",
-        Target = "PortAudioSharp.PortAudio.#Pa_GetErrorText(PortAudioSharp.PortAudio+PaError)")]
-[assembly:
-    SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Scope = "member",
-        Target = "PortAudioSharp.PortAudio.#Pa_GetHostApiInfo(System.Int32)")]
-[assembly:
-    SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Scope = "member", Target = "PortAudioSharp.PortAudio.#Pa_GetLastHostErrorInfo()")]
-[assembly:
-    SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Scope = "member",
-        Target = "PortAudioSharp.PortAudio.#Pa_GetDeviceInfo(System.Int32)")]
-[assembly:
-    SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Scope = "member",
-        Target = "PortAudioSharp.PortAudio.#Pa_GetStreamInfo(System.IntPtr)")]
\ No newline at end of file
+        Target = "Vocaluxe.Lib.Input.CHIDAPI.#Read(System.IntPtr,System.Byte[]&,System.Int32)")]
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Database/CCoverDB.cs b/Vocaluxe/Lib/Database/CCoverDB.cs
new file mode 100644
index 00000000..7723e2d4
--- /dev/null
+++ b/Vocaluxe/Lib/Database/CCoverDB.cs
@@ -0,0 +1,234 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Runtime.InteropServices;
+using Vocaluxe.Base;
+using VocaluxeLib.Draw;
+#if WIN
+using System.Data.SQLite;
+
+#else
+using Mono.Data.Sqlite;
+#endif
+
+namespace Vocaluxe.Lib.Database
+{
+    public class CCoverDB : CDatabaseBase
+    {
+        //You have to lock all actions using cover connection or transaction, otherwhise order is not guaranted
+        private readonly object _CoverMutex = new object();
+        private SQLiteTransaction _TransactionCover;
+
+        public CCoverDB(string filePath) : base(filePath) {}
+
+        public override bool Init()
+        {
+            if (!base.Init())
+                return false;
+
+            if (_Version < 0)
+                return _CreateCoverDB();
+            if (_Version < CSettings.DatabaseCoverVersion)
+                throw new NotImplementedException("Upgrading of cover DB not implemented");
+            return true;
+        }
+
+        public override void Close()
+        {
+            //Do commit and close atomicly otherwhise we may loose changes
+            lock (_CoverMutex)
+            {
+                _CommitCovers();
+
+                base.Close();
+            }
+        }
+
+        public bool GetCover(string coverPath, ref CTexture tex, int maxSize)
+        {
+            if (_Connection == null)
+                return false;
+            if (!File.Exists(coverPath))
+            {
+                CLog.LogError("Can't find File: " + coverPath);
+                return false;
+            }
+
+            lock (_CoverMutex)
+            {
+                //Double check here because we may have just closed our connection
+                if (_Connection == null)
+                    return false;
+                using (var command = new SQLiteCommand(_Connection))
+                {
+                    command.CommandText = "SELECT id, width, height FROM Cover WHERE [Path] = @path";
+                    command.Parameters.Add("@path", DbType.String, 0).Value = coverPath;
+
+                    SQLiteDataReader reader = command.ExecuteReader();
+
+                    if (reader != null && reader.HasRows)
+                    {
+                        reader.Read();
+                        int id = reader.GetInt32(0);
+                        int w = reader.GetInt32(1);
+                        int h = reader.GetInt32(2);
+                        reader.Close();
+
+                        command.CommandText = "SELECT Data FROM CoverData WHERE CoverID = @id";
+                        command.Parameters.Add("@id", DbType.Int32).Value = id;
+                        reader = command.ExecuteReader();
+
+                        if (reader.HasRows)
+                        {
+                            reader.Read();
+                            byte[] data = _GetBytes(reader);
+                            reader.Dispose();
+                            tex = CDraw.EnqueueTexture(w, h, data);
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        if (reader != null)
+                            reader.Close();
+
+                        if (_TransactionCover == null)
+                            _TransactionCover = _Connection.BeginTransaction();
+
+                        Bitmap origin;
+                        try
+                        {
+                            origin = new Bitmap(coverPath);
+                        }
+                        catch (Exception)
+                        {
+                            CLog.LogError("Error loading Texture: " + coverPath);
+                            return false;
+                        }
+
+                        int w = maxSize;
+                        int h = maxSize;
+                        byte[] data;
+
+                        try
+                        {
+                            if (origin.Width >= origin.Height && origin.Width > w)
+                                h = (int)Math.Round((float)w / origin.Width * origin.Height);
+                            else if (origin.Height > origin.Width && origin.Height > h)
+                                w = (int)Math.Round((float)h / origin.Height * origin.Width);
+
+                            using (var bmp = new Bitmap(w, h))
+                            {
+                                using (Graphics g = Graphics.FromImage(bmp))
+                                    g.DrawImage(origin, new Rectangle(0, 0, w, h));
+
+                                data = new byte[w * h * 4];
+                                BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+                                Marshal.Copy(bmpData.Scan0, data, 0, w * h * 4);
+                                bmp.UnlockBits(bmpData);
+                            }
+                        }
+                        finally
+                        {
+                            origin.Dispose();
+                        }
+
+                        tex = CDraw.EnqueueTexture(w, h, data);
+
+                        command.CommandText = "INSERT INTO Cover (Path, width, height) VALUES (@path, @w, @h)";
+                        command.Parameters.Add("@w", DbType.Int32).Value = w;
+                        command.Parameters.Add("@h", DbType.Int32).Value = h;
+                        command.Parameters.Add("@path", DbType.String, 0).Value = coverPath;
+                        command.ExecuteNonQuery();
+
+                        command.CommandText = "SELECT id FROM Cover WHERE [Path] = @path";
+                        command.Parameters.Add("@path", DbType.String, 0).Value = coverPath;
+                        reader = command.ExecuteReader();
+
+                        if (reader != null)
+                        {
+                            reader.Read();
+                            int id = reader.GetInt32(0);
+                            reader.Dispose();
+                            command.CommandText = "INSERT INTO CoverData (CoverID, Data) VALUES (@id, @data)";
+                            command.Parameters.Add("@id", DbType.Int32).Value = id;
+                            command.Parameters.Add("@data", DbType.Binary, 20).Value = data;
+                            command.ExecuteReader();
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        public void CommitCovers()
+        {
+            lock (_CoverMutex)
+            {
+                _CommitCovers();
+            }
+        }
+
+        /// <summary>
+        ///     You have to hold the CoverMutex when calling this!
+        /// </summary>
+        private void _CommitCovers()
+        {
+            if (_TransactionCover == null)
+                return;
+            _TransactionCover.Commit();
+            _TransactionCover.Dispose();
+            _TransactionCover = null;
+        }
+
+        private bool _CreateCoverDB()
+        {
+            try
+            {
+                using (var command = new SQLiteCommand(_Connection))
+                {
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Version (Value INTEGER NOT NULL);";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "INSERT INTO Version (Value) VALUES(@Value)";
+                    command.Parameters.Add("@Value", DbType.Int32).Value = CSettings.DatabaseCoverVersion;
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Cover ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+                                          "Path TEXT NOT NULL, width INTEGER NOT NULL, height INTEGER NOT NULL);";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS CoverData ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+                                          "CoverID INTEGER NOT NULL, Data BLOB NOT NULL);";
+                    command.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                CLog.LogError("Error creating Cover DB " + e);
+                return false;
+            }
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Database/CDatabaseBase.cs b/Vocaluxe/Lib/Database/CDatabaseBase.cs
new file mode 100644
index 00000000..068530e5
--- /dev/null
+++ b/Vocaluxe/Lib/Database/CDatabaseBase.cs
@@ -0,0 +1,112 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.IO;
+using Vocaluxe.Base;
+#if WIN
+using System.Data.SQLite;
+
+#else
+using Mono.Data.Sqlite;
+#endif
+
+namespace Vocaluxe.Lib.Database
+{
+    public class CDatabaseBase
+    {
+        protected readonly string _FilePath;
+        protected SQLiteConnection _Connection;
+
+        protected int _Version; //Version of the database (value of row "Value" in table "Version") or -1 if none
+
+        public CDatabaseBase(string filePath)
+        {
+            _FilePath = filePath;
+        }
+
+        public virtual bool Init()
+        {
+            _Connection = new SQLiteConnection("Data Source=" + _FilePath);
+            try
+            {
+                _Connection.Open();
+            }
+            catch (Exception)
+            {
+                _Connection.Dispose();
+                _Connection = null;
+                return false;
+            }
+
+            using (var command = new SQLiteCommand(_Connection))
+            {
+                command.CommandText = "SELECT Value FROM Version";
+
+                SQLiteDataReader reader = null;
+
+                try
+                {
+                    reader = command.ExecuteReader();
+                }
+                catch (Exception) {}
+
+                if (reader == null || !reader.Read() || reader.FieldCount == 0)
+                    _Version = -1;
+                else
+                    _Version = reader.GetInt32(0);
+
+                if (reader != null)
+                    reader.Dispose();
+            }
+            return true;
+        }
+
+        public virtual void Close()
+        {
+            if (_Connection != null)
+            {
+                _Connection.Dispose();
+                _Connection = null;
+            }
+        }
+
+        protected static long _UnixTimeToTicks(int unixTime)
+        {
+            var t70 = new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            t70 = t70.AddSeconds(unixTime);
+            return t70.Ticks;
+        }
+
+        protected static byte[] _GetBytes(SQLiteDataReader reader, int field = 0)
+        {
+            const int chunkSize = 2 * 1024;
+            var buffer = new byte[chunkSize];
+            long fieldOffset = 0;
+            using (var stream = new MemoryStream())
+            {
+                int bytesRead;
+                while ((bytesRead = (int)reader.GetBytes(field, fieldOffset, buffer, 0, buffer.Length)) > 0)
+                {
+                    stream.Write(buffer, 0, bytesRead);
+                    fieldOffset += bytesRead;
+                }
+                return stream.ToArray();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Database/CHighscoreDB.cs b/Vocaluxe/Lib/Database/CHighscoreDB.cs
new file mode 100644
index 00000000..43d25424
--- /dev/null
+++ b/Vocaluxe/Lib/Database/CHighscoreDB.cs
@@ -0,0 +1,1021 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Text;
+using Community.CsharpSqlite;
+using Vocaluxe.Base;
+using VocaluxeLib;
+using VocaluxeLib.Songs;
+#if WIN
+using System.Data.SQLite;
+
+#else
+using Mono.Data.Sqlite;
+#endif
+
+namespace Vocaluxe.Lib.Database
+{
+    public class CHighscoreDB : CDatabaseBase
+    {
+        private struct SData
+        {
+            public int Id;
+            public long Ticks;
+            public string Str1;
+            public string Str2;
+        }
+
+        public CHighscoreDB(string filePath) : base(filePath) {}
+
+        public override bool Init()
+        {
+            string oldDBFilePath = Path.Combine(Environment.CurrentDirectory, CSettings.FileOldHighscoreDB);
+            if (File.Exists(oldDBFilePath))
+            {
+                if (File.Exists(_FilePath))
+                {
+                    if (!_CreateOrConvert(oldDBFilePath))
+                    {
+                        CLog.LogError("Cannot init Highscore DB: Error opening database: " + oldDBFilePath, true, true);
+                        return false;
+                    }
+                    if (!_CreateOrConvert(_FilePath))
+                    {
+                        CLog.LogError("Cannot init Highscore DB: Error opening database: " + _FilePath, true, true);
+                        return false;
+                    }
+                    if (!_ImportData(oldDBFilePath))
+                    {
+                        CLog.LogError("Cannot init Highscore DB: Error importing data", true, true);
+                        return false;
+                    }
+                }
+                else
+                {
+                    File.Copy(oldDBFilePath, _FilePath);
+                    if (!_CreateOrConvert(_FilePath))
+                    {
+                        CLog.LogError("Cannot init Highscore DB: Error opening database: " + _FilePath, true, true);
+                        return false;
+                    }
+                }
+                File.Delete(oldDBFilePath);
+            }
+            else if (!_CreateOrConvert(_FilePath))
+            {
+                CLog.LogError("Cannot init Highscore DB: Error opening database: " + _FilePath, true, true);
+                return false;
+            }
+            return true;
+        }
+
+        public override void Close()
+        {
+            //Do nothing
+        }
+
+        public bool GetDataBaseSongInfos(string artist, string title, out int numPlayed, out DateTime dateAdded, out int highscoreID)
+        {
+            string sArtist;
+            string sTitle;
+            int songID;
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + _FilePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception) {}
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    songID = _GetDataBaseSongID(artist, title, 0, command);
+                    highscoreID = songID;
+                }
+            }
+            return _GetDataBaseSongInfos(songID, out sArtist, out sTitle, out numPlayed, out dateAdded, _FilePath);
+        }
+
+        public void IncreaseSongCounter(int dataBaseSongID)
+        {
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + _FilePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception) {}
+
+                using (var command = new SQLiteCommand(connection))
+                    _IncreaseSongCounter(dataBaseSongID, command);
+            }
+        }
+
+        public int AddScore(string playerName, int score, int lineNr, long date, int medley, int duet, int shortSong, int difficulty,
+                            string artist, string title, int numPlayed, string filePath)
+        {
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + filePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return -1;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    int dataBaseSongID = _GetDataBaseSongID(artist, title, numPlayed, command);
+                    int result = _AddScore(playerName, score, lineNr, date, medley, duet, shortSong, difficulty, dataBaseSongID, command);
+                    return result;
+                }
+            }
+        }
+
+        public int AddScore(SPlayer player)
+        {
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + _FilePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return -1;
+                }
+
+                int medley = 0;
+                int duet = 0;
+                int shortSong = 0;
+                switch (player.GameMode)
+                {
+                    case EGameMode.TR_GAMEMODE_MEDLEY:
+                        medley = 1;
+                        break;
+                    case EGameMode.TR_GAMEMODE_DUET:
+                        duet = 1;
+                        break;
+                    case EGameMode.TR_GAMEMODE_SHORTSONG:
+                        shortSong = 1;
+                        break;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    int dataBaseSongID = CSongs.GetSong(player.SongID).DataBaseSongID;
+                    return _AddScore(CProfiles.GetPlayerName(player.ProfileID), (int)Math.Round(player.Points), player.VoiceNr, player.DateTicks, medley,
+                                     duet, shortSong, (int)CProfiles.GetDifficulty(player.ProfileID), dataBaseSongID, command);
+                }
+            }
+        }
+
+        private int _AddScore(string playerName, int score, int lineNr, long date, int medley, int duet, int shortSong, int difficulty,
+                              int dataBaseSongID, SQLiteCommand command)
+        {
+            int lastInsertID = -1;
+
+            if (dataBaseSongID >= 0)
+            {
+                command.CommandText = "SELECT id FROM Scores WHERE SongID = @SongID AND PlayerName = @PlayerName AND Score = @Score AND " +
+                                      "LineNr = @LineNr AND Date = @Date AND Medley = @Medley AND Duet = @Duet AND ShortSong = @ShortSong AND Difficulty = @Difficulty";
+                command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
+                command.Parameters.Add("@PlayerName", DbType.String, 0).Value = playerName;
+                command.Parameters.Add("@Score", DbType.Int32, 0).Value = score;
+                command.Parameters.Add("@LineNr", DbType.Int32, 0).Value = lineNr;
+                command.Parameters.Add("@Date", DbType.Int64, 0).Value = date;
+                command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
+                command.Parameters.Add("@Duet", DbType.Int32, 0).Value = duet;
+                command.Parameters.Add("@ShortSong", DbType.Int32, 0).Value = shortSong;
+                command.Parameters.Add("@Difficulty", DbType.Int32, 0).Value = difficulty;
+
+                SQLiteDataReader reader = null;
+                try
+                {
+                    reader = command.ExecuteReader();
+                }
+                catch (Exception) {}
+
+                if (reader != null && reader.HasRows)
+                {
+                    if (reader.Read())
+                        return reader.GetInt32(0);
+                }
+
+                if (reader != null)
+                    reader.Dispose();
+
+                command.CommandText = "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, ShortSong, Difficulty) " +
+                                      "VALUES (@SongID, @PlayerName, @Score, @LineNr, @Date, @Medley, @Duet, @ShortSong, @Difficulty)";
+                command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
+                command.Parameters.Add("@PlayerName", DbType.String, 0).Value = playerName;
+                command.Parameters.Add("@Score", DbType.Int32, 0).Value = score;
+                command.Parameters.Add("@LineNr", DbType.Int32, 0).Value = lineNr;
+                command.Parameters.Add("@Date", DbType.Int64, 0).Value = date;
+                command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
+                command.Parameters.Add("@Duet", DbType.Int32, 0).Value = duet;
+                command.Parameters.Add("@ShortSong", DbType.Int32, 0).Value = shortSong;
+                command.Parameters.Add("@Difficulty", DbType.Int32, 0).Value = difficulty;
+                command.ExecuteNonQuery();
+
+                //Read last insert line
+                command.CommandText = "SELECT id FROM Scores ORDER BY id DESC LIMIT 0, 1";
+
+                reader = command.ExecuteReader();
+
+                if (reader != null && reader.HasRows)
+                {
+                    while (reader.Read())
+                        lastInsertID = reader.GetInt32(0);
+                    reader.Dispose();
+                }
+            }
+
+            return lastInsertID;
+        }
+
+        public List<SDBScoreEntry> LoadScore(int songID, EGameMode gameMode)
+        {
+            var scores = new List<SDBScoreEntry>();
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + _FilePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return scores;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    int medley = 0;
+                    int duet = 0;
+                    int shortSong = 0;
+                    switch (gameMode)
+                    {
+                        case EGameMode.TR_GAMEMODE_MEDLEY:
+                            medley = 1;
+                            break;
+                        case EGameMode.TR_GAMEMODE_DUET:
+                            duet = 1;
+                            break;
+                        case EGameMode.TR_GAMEMODE_SHORTSONG:
+                            shortSong = 1;
+                            break;
+                    }
+
+                    int dataBaseSongID = _GetDataBaseSongID(songID, command);
+                    if (dataBaseSongID < 0)
+                        return scores;
+
+                    command.CommandText = "SELECT PlayerName, Score, Date, Difficulty, LineNr, id FROM Scores " +
+                                          "WHERE [SongID] = @SongID AND [Medley] = @Medley AND [Duet] = @Duet AND [ShortSong] = @ShortSong " +
+                                          "ORDER BY [Score] DESC";
+                    command.Parameters.Add("@SongID", DbType.Int32, 0).Value = dataBaseSongID;
+                    command.Parameters.Add("@Medley", DbType.Int32, 0).Value = medley;
+                    command.Parameters.Add("@Duet", DbType.Int32, 0).Value = duet;
+                    command.Parameters.Add("@ShortSong", DbType.Int32, 0).Value = shortSong;
+
+                    SQLiteDataReader reader = command.ExecuteReader();
+                    if (reader != null && reader.HasRows)
+                    {
+                        while (reader.Read())
+                        {
+                            var score = new SDBScoreEntry
+                                {
+                                    Name = reader.GetString(0),
+                                    Score = reader.GetInt32(1),
+                                    Date = new DateTime(reader.GetInt64(2)).ToString("dd/MM/yyyy"),
+                                    Difficulty = (EGameDifficulty)reader.GetInt32(3),
+                                    VoiceNr = reader.GetInt32(4),
+                                    ID = reader.GetInt32(5)
+                                };
+
+                            scores.Add(score);
+                        }
+                        reader.Dispose();
+                    }
+                }
+            }
+            return scores;
+        }
+
+        private void _IncreaseSongCounter(int dataBaseSongID, SQLiteCommand command)
+        {
+            command.CommandText = "UPDATE Songs SET NumPlayed = NumPlayed + 1 WHERE [id] = @id";
+            command.Parameters.Add("@id", DbType.Int32, 0).Value = dataBaseSongID;
+            command.ExecuteNonQuery();
+        }
+
+        private int _GetDataBaseSongID(int songID, SQLiteCommand command)
+        {
+            CSong song = CSongs.GetSong(songID);
+
+            if (song == null)
+                return -1;
+
+            return _GetDataBaseSongID(song.Artist, song.Title, 0, command);
+        }
+
+        private int _GetDataBaseSongID(string artist, string title, int defNumPlayed, SQLiteCommand command)
+        {
+            command.CommandText = "SELECT id FROM Songs WHERE [Title] = @title AND [Artist] = @artist";
+            command.Parameters.Add("@title", DbType.String, 0).Value = title;
+            command.Parameters.Add("@artist", DbType.String, 0).Value = artist;
+
+            SQLiteDataReader reader = command.ExecuteReader();
+
+            if (reader != null && reader.HasRows)
+            {
+                reader.Read();
+                int id = reader.GetInt32(0);
+                reader.Dispose();
+                return id;
+            }
+
+            if (reader != null)
+                reader.Close();
+
+            command.CommandText = "INSERT INTO Songs (Title, Artist, NumPlayed, DateAdded) " +
+                                  "VALUES (@title, @artist, @numplayed, @dateadded)";
+            command.Parameters.Add("@title", DbType.String, 0).Value = title;
+            command.Parameters.Add("@artist", DbType.String, 0).Value = artist;
+            command.Parameters.Add("@numplayed", DbType.Int32, 0).Value = defNumPlayed;
+            command.Parameters.Add("@dateadded", DbType.Int64, 0).Value = DateTime.Now.Ticks;
+            command.ExecuteNonQuery();
+
+            command.CommandText = "SELECT id FROM Songs WHERE [Title] = @title AND [Artist] = @artist";
+            command.Parameters.Add("@title", DbType.String, 0).Value = title;
+            command.Parameters.Add("@artist", DbType.String, 0).Value = artist;
+
+            reader = command.ExecuteReader();
+
+            if (reader != null)
+            {
+                reader.Read();
+                int id = reader.GetInt32(0);
+                reader.Dispose();
+                return id;
+            }
+
+            return -1;
+        }
+
+        private bool _GetDataBaseSongInfos(int songID, out string artist, out string title, out int numPlayed, out DateTime dateAdded, string filePath)
+        {
+            artist = String.Empty;
+            title = String.Empty;
+            numPlayed = 0;
+            dateAdded = DateTime.Today;
+
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + filePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return false;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    command.CommandText = "SELECT Artist, Title, NumPlayed, DateAdded FROM Songs WHERE [id] = @id";
+                    command.Parameters.Add("@id", DbType.String, 0).Value = songID;
+
+                    SQLiteDataReader reader;
+                    try
+                    {
+                        reader = command.ExecuteReader();
+                    }
+                    catch (Exception)
+                    {
+                        return false;
+                    }
+
+                    if (reader != null && reader.HasRows)
+                    {
+                        reader.Read();
+                        artist = reader.GetString(0);
+                        title = reader.GetString(1);
+                        numPlayed = reader.GetInt32(2);
+                        dateAdded = new DateTime(reader.GetInt64(3));
+                        reader.Dispose();
+                        return true;
+                    }
+                    if (reader != null)
+                        reader.Dispose();
+                }
+            }
+
+            return false;
+        }
+
+        private void _CreateHighscoreDB(string filePath)
+        {
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + filePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Version ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Value INTEGER NOT NULL);";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "INSERT INTO Version (id, Value) VALUES(NULL, @Value)";
+                    command.Parameters.Add("@Value", DbType.Int32).Value = CSettings.DatabaseHighscoreVersion;
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Songs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+                                          "Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER, DateAdded BIGING);";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+                                          "SongID INTEGER NOT NULL, PlayerName TEXT NOT NULL, Score INTEGER NOT NULL, LineNr INTEGER NOT NULL, Date BIGINT NOT NULL, " +
+                                          "Medley INTEGER NOT NULL, Duet INTEGER NOT NULL, ShortSong INTEGER NOT NULL, Difficulty INTEGER NOT NULL);";
+                    command.ExecuteNonQuery();
+                }
+            }
+        }
+
+        private void _CreateHighscoreDBV1(string filePath)
+        {
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + filePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Version ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, Value INTEGER NOT NULL);";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "INSERT INTO Version (id, Value) VALUES(NULL, 1 )";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Songs ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+                                          "Artist TEXT NOT NULL, Title TEXT NOT NULL, NumPlayed INTEGER);";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Scores ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+                                          "SongID INTEGER NOT NULL, PlayerName TEXT NOT NULL, Score INTEGER NOT NULL, LineNr INTEGER NOT NULL, Date BIGINT NOT NULL, " +
+                                          "Medley INTEGER NOT NULL, Duet INTEGER NOT NULL, Difficulty INTEGER NOT NULL);";
+                    command.ExecuteNonQuery();
+                }
+            }
+        }
+
+        /// <summary>
+        ///     Creates a new Vocaluxe Database if no file exists. Converts an existing old Ultrastar Deluxe highscore database into vocaluxe format.
+        /// </summary>
+        /// <param name="filePath">Database file path</param>
+        /// <returns></returns>
+        private bool _CreateOrConvert(string filePath)
+        {
+            bool result = true;
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + filePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return false;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    command.CommandText = "PRAGMA user_version";
+                    SQLiteDataReader reader = command.ExecuteReader();
+                    reader.Read();
+
+                    int version = reader.GetInt32(0);
+
+                    reader.Dispose();
+
+                    //Check if old scores table exists
+                    command.CommandText = "SELECT name FROM sqlite_master WHERE type='table' AND name='US_Scores';";
+                    reader = command.ExecuteReader();
+                    reader.Read();
+                    bool scoresTableExists = reader.HasRows;
+
+                    reader.Dispose();
+
+                    command.CommandText = "SELECT Value FROM Version";
+                    reader = null;
+
+                    try
+                    {
+                        reader = command.ExecuteReader();
+                    }
+                    catch (Exception) {}
+
+                    if (reader == null || reader.FieldCount == 0)
+                    {
+                        // create new database/tables
+                        if (version == 1)
+                        {
+                            //Check for USDX 1.1 DB
+                            _CreateHighscoreDBV1(filePath);
+                            result &= !_ConvertFrom110(filePath);
+                            result &= _UpdateDatabase(1, connection);
+                            result &= _UpdateDatabase(2, connection);
+                        }
+                        else if (version == 0 && scoresTableExists)
+                        {
+                            //Check for USDX 1.01 or CMD Mod DB
+                            _CreateHighscoreDBV1(filePath);
+                            result &= _ConvertFrom101(filePath);
+                            result &= _UpdateDatabase(1, connection);
+                            result &= _UpdateDatabase(2, connection);
+                        }
+                        else
+                            _CreateHighscoreDB(filePath);
+                    }
+                    else
+                    {
+                        reader.Read();
+                        int currentVersion = reader.GetInt32(0);
+                        if (currentVersion < CSettings.DatabaseHighscoreVersion)
+                        {
+                            // update database
+                            result &= _UpdateDatabase(currentVersion, connection);
+                        }
+                    }
+
+                    if (reader != null)
+                        reader.Dispose();
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        ///     Converts a USDX 1.1 database into the Vocaluxe format
+        /// </summary>
+        /// <param name="filePath">Database file path</param>
+        /// <returns>True if succeeded</returns>
+        private bool _ConvertFrom110(string filePath)
+        {
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + filePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return false;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    //The USDX database has no column for LineNr, Medley and Duet so just fill 0 in there
+                    command.CommandText =
+                        "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, Difficulty) SELECT SongID, Player, Score, '0', Date, '0', '0', Difficulty from US_Scores";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "INSERT INTO Songs SELECT ID, Artist, Title, TimesPlayed from US_Songs";
+                    command.ExecuteNonQuery();
+
+                    var scores = new List<SData>();
+                    var songs = new List<SData>();
+
+                    command.CommandText = "SELECT id, PlayerName, Date FROM Scores";
+                    SQLiteDataReader reader = command.ExecuteReader();
+
+                    if (reader != null && reader.HasRows)
+                    {
+                        while (reader.Read())
+                        {
+                            var data = new SData {Id = reader.GetInt32(0), Str1 = reader.GetString(1)};
+                            Int64 ticks = 0;
+
+                            try
+                            {
+                                ticks = reader.GetInt64(2);
+                            }
+                            catch {}
+
+                            data.Ticks = _UnixTimeToTicks((int)ticks);
+
+                            scores.Add(data);
+                        }
+                        reader.Close();
+                    }
+
+                    command.CommandText = "SELECT id, Artist, Title FROM Songs";
+
+                    reader = command.ExecuteReader();
+
+                    if (reader != null && reader.HasRows)
+                    {
+                        while (reader.Read())
+                        {
+                            var data = new SData {Id = reader.GetInt32(0), Str1 = reader.GetString(1), Str2 = reader.GetString(2)};
+                            songs.Add(data);
+                        }
+                    }
+
+                    if (reader != null)
+                        reader.Dispose();
+
+                    SQLiteTransaction transaction = connection.BeginTransaction();
+                    // update Title and Artist strings
+                    foreach (SData data in songs)
+                    {
+                        command.CommandText = "UPDATE Songs SET [Artist] = @artist, [Title] = @title WHERE [ID] = @id";
+                        command.Parameters.Add("@title", DbType.String, 0).Value = data.Str2;
+                        command.Parameters.Add("@artist", DbType.String, 0).Value = data.Str1;
+                        command.Parameters.Add("@id", DbType.Int32, 0).Value = data.Id;
+                        command.ExecuteNonQuery();
+                    }
+
+                    // update player names
+                    foreach (SData data in scores)
+                    {
+                        command.CommandText = "UPDATE Scores SET [PlayerName] = @player, [Date] = @date WHERE [id] = @id";
+                        command.Parameters.Add("@player", DbType.String, 0).Value = data.Str1;
+                        command.Parameters.Add("@date", DbType.Int64, 0).Value = data.Ticks;
+                        command.Parameters.Add("@id", DbType.Int32, 0).Value = data.Id;
+                        command.ExecuteNonQuery();
+                    }
+                    transaction.Commit();
+
+                    //Delete old tables after conversion
+                    command.CommandText = "DROP TABLE US_Scores;";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "DROP TABLE US_Songs;";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "DROP TABLE us_statistics_info;";
+                    command.ExecuteNonQuery();
+
+                    //This versioning is not used in Vocaluxe so reset it to 0
+                    command.CommandText = "PRAGMA user_version = 0";
+                    command.ExecuteNonQuery();
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        ///     Converts a USDX 1.01 or CMD 1.01 database to Vocaluxe format
+        /// </summary>
+        /// <param name="filePath">Database file path</param>
+        /// <returns>True if succeeded</returns>
+        private bool _ConvertFrom101(string filePath)
+        {
+            using (var connection = new SQLiteConnection())
+            {
+                connection.ConnectionString = "Data Source=" + filePath;
+
+                try
+                {
+                    connection.Open();
+                }
+                catch (Exception)
+                {
+                    return false;
+                }
+
+                using (var command = new SQLiteCommand(connection))
+                {
+                    command.CommandText = "PRAGMA table_info(US_Scores);";
+                    bool dateExists = false;
+                    using (SQLiteDataReader reader = command.ExecuteReader())
+                    {
+                        //Check for column Date
+                        while (reader.Read())
+                        {
+                            for (int i = 0; i < reader.FieldCount; i++)
+                            {
+                                if (reader.GetName(i) == "name")
+                                {
+                                    if (reader.GetString(i) == "Date")
+                                        dateExists = true;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    //This is a USDX 1.01 DB
+                    command.CommandText = !dateExists
+                                              ? "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, Difficulty) SELECT SongID, Player, Score, '0', '0', '0', '0', Difficulty from US_Scores"
+                                              : "INSERT INTO Scores (SongID, PlayerName, Score, LineNr, Date, Medley, Duet, Difficulty) SELECT SongID, Player, Score, '0', Date, '0', '0', Difficulty from US_Scores";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "INSERT INTO Songs SELECT ID, Artist, Title, TimesPlayed from US_Songs";
+                    command.ExecuteNonQuery();
+
+                    // convert from CP1252 to UTF8
+                    var scores = new List<SData>();
+                    var songs = new List<SData>();
+
+                    Sqlite3.sqlite3 oldDB;
+                    int res = Sqlite3.sqlite3_open(filePath, out oldDB);
+
+                    if (res != Sqlite3.SQLITE_OK)
+                        CLog.LogError("Error opening Database: " + filePath + " (" + Sqlite3.sqlite3_errmsg(oldDB) + ")");
+                    else
+                    {
+                        var stmt = new Sqlite3.Vdbe();
+                        res = Sqlite3.sqlite3_prepare_v2(oldDB, "SELECT id, Artist, Title FROM Songs", -1, ref stmt, 0);
+
+                        if (res != Sqlite3.SQLITE_OK)
+                            CLog.LogError("Error query Database: " + filePath + " (" + Sqlite3.sqlite3_errmsg(oldDB) + ")");
+                        else
+                        {
+                            //Sqlite3.sqlite3_step(Stmt);
+                            Encoding utf8 = Encoding.UTF8;
+                            Encoding cp1252 = Encoding.GetEncoding(1252);
+
+                            while (Sqlite3.sqlite3_step(stmt) == Sqlite3.SQLITE_ROW)
+                            {
+                                var data = new SData {Id = Sqlite3.sqlite3_column_int(stmt, 0)};
+
+                                byte[] bytes = Sqlite3.sqlite3_column_rawbytes(stmt, 1);
+                                data.Str1 = bytes != null ? utf8.GetString(Encoding.Convert(cp1252, utf8, bytes)) : "Someone";
+
+                                bytes = Sqlite3.sqlite3_column_rawbytes(stmt, 2);
+                                data.Str2 = bytes != null ? utf8.GetString(Encoding.Convert(cp1252, utf8, bytes)) : "Someone";
+
+                                songs.Add(data);
+                            }
+                            Sqlite3.sqlite3_finalize(stmt);
+                        }
+
+                        stmt = new Sqlite3.Vdbe();
+
+                        // ReSharper disable ConvertIfStatementToConditionalTernaryExpression
+                        if (!dateExists)
+                            // ReSharper restore ConvertIfStatementToConditionalTernaryExpression
+                            res = Sqlite3.sqlite3_prepare_v2(oldDB, "SELECT id, PlayerName FROM Scores", -1, ref stmt, 0);
+                        else
+                            res = Sqlite3.sqlite3_prepare_v2(oldDB, "SELECT id, PlayerName, Date FROM Scores", -1, ref stmt, 0);
+
+                        if (res != Sqlite3.SQLITE_OK)
+                            CLog.LogError("Error query Database: " + filePath + " (" + Sqlite3.sqlite3_errmsg(oldDB) + ")");
+                        else
+                        {
+                            //Sqlite3.sqlite3_step(Stmt);
+                            Encoding utf8 = Encoding.UTF8;
+                            Encoding cp1252 = Encoding.GetEncoding(1252);
+
+                            while (Sqlite3.sqlite3_step(stmt) == Sqlite3.SQLITE_ROW)
+                            {
+                                var data = new SData {Id = Sqlite3.sqlite3_column_int(stmt, 0)};
+
+                                byte[] bytes = Sqlite3.sqlite3_column_rawbytes(stmt, 1);
+                                data.Str1 = bytes != null ? utf8.GetString(Encoding.Convert(cp1252, utf8, bytes)) : "Someone";
+
+                                if (dateExists)
+                                    data.Ticks = _UnixTimeToTicks(Sqlite3.sqlite3_column_int(stmt, 2));
+
+                                scores.Add(data);
+                            }
+                            Sqlite3.sqlite3_finalize(stmt);
+                        }
+                    }
+                    Sqlite3.sqlite3_close(oldDB);
+
+                    SQLiteTransaction transaction = connection.BeginTransaction();
+
+                    // update Title and Artist strings
+                    foreach (SData data in songs)
+                    {
+                        command.CommandText = "UPDATE Songs SET [Artist] = @artist, [Title] = @title WHERE [ID] = @id";
+                        command.Parameters.Add("@title", DbType.String, 0).Value = data.Str2;
+                        command.Parameters.Add("@artist", DbType.String, 0).Value = data.Str1;
+                        command.Parameters.Add("@id", DbType.Int32, 0).Value = data.Id;
+                        command.ExecuteNonQuery();
+                    }
+
+                    // update player names
+                    foreach (SData data in scores)
+                    {
+                        if (!dateExists)
+                            command.CommandText = "UPDATE Scores SET [PlayerName] = @player WHERE [id] = @id";
+                        else
+                        {
+                            command.CommandText = "UPDATE Scores SET [PlayerName] = @player, [Date] = @date WHERE [id] = @id";
+                            command.Parameters.Add("@date", DbType.Int64, 0).Value = data.Ticks;
+                        }
+                        command.Parameters.Add("@player", DbType.String, 0).Value = data.Str1;
+                        command.Parameters.Add("@id", DbType.Int32, 0).Value = data.Id;
+                        command.ExecuteNonQuery();
+                    }
+                    transaction.Commit();
+
+                    //Delete old tables after conversion
+                    command.CommandText = "DROP TABLE US_Scores;";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "DROP TABLE US_Songs;";
+                    command.ExecuteNonQuery();
+                }
+            }
+
+            return true;
+        }
+
+        private bool _UpdateDatabase(int currentVersion, SQLiteConnection connection)
+        {
+            bool updated = true;
+
+            if (currentVersion < 2)
+                updated &= _ConvertV1toV2(connection);
+            if (currentVersion < 3)
+                updated &= _ConvertV2toV3(connection);
+
+            return updated;
+        }
+
+        private bool _ConvertV1toV2(SQLiteConnection connection)
+        {
+            using (var command = new SQLiteCommand(connection))
+            {
+                command.CommandText = "ALTER TABLE Scores ADD ShortSong INTEGER";
+                command.ExecuteNonQuery();
+                command.CommandText = "UPDATE Scores SET [ShortSong] = @ShortSong";
+                command.Parameters.Add("@ShortSong", DbType.Int32, 0).Value = 0;
+                command.ExecuteNonQuery();
+                command.CommandText = "UPDATE Version SET [Value] = @version";
+                command.Parameters.Add("@version", DbType.Int32, 0).Value = 2;
+                command.ExecuteNonQuery();
+            }
+
+            return true;
+        }
+
+        private bool _ConvertV2toV3(SQLiteConnection connection)
+        {
+            var command = new SQLiteCommand(connection) {CommandText = "ALTER TABLE Songs ADD DateAdded BIGINT"};
+
+            command.ExecuteNonQuery();
+            command.CommandText = "UPDATE Songs SET [DateAdded] = @DateAdded";
+            command.Parameters.Add("@DateAdded", DbType.Int64, 0).Value = DateTime.Now.Ticks;
+            command.ExecuteNonQuery();
+            command.CommandText = "UPDATE Version SET [Value] = @version";
+            command.Parameters.Add("@version", DbType.Int32, 0).Value = 3;
+            command.ExecuteNonQuery();
+
+            //Read NumPlayed from Scores and save to Songs
+            command.CommandText = "SELECT SongID, Date FROM Scores ORDER BY Date ASC";
+
+            SQLiteDataReader reader;
+            try
+            {
+                reader = command.ExecuteReader();
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+
+            long lastDateAdded = -1;
+            int lastID = -1;
+            DateTime dt = new DateTime(1, 1, 1, 0, 0, 5);
+            long sec = dt.Ticks;
+            List<int> ids = new List<int>();
+            while (reader.Read())
+            {
+                int id = reader.GetInt32(0);
+                long dateAdded = reader.GetInt64(1);
+                if (id != lastID || dateAdded > lastDateAdded + sec)
+                {
+                    ids.Add(id);
+                    lastID = id;
+                    lastDateAdded = dateAdded;
+                }
+            }
+            reader.Dispose();
+
+            foreach (int id in ids)
+                _IncreaseSongCounter(id, command);
+            command.Dispose();
+
+            return true;
+        }
+
+        private bool _ImportData(string sourceDBPath)
+        {
+            #region open db
+            using (var connSource = new SQLiteConnection())
+            {
+                connSource.ConnectionString = "Data Source=" + sourceDBPath;
+
+                try
+                {
+                    connSource.Open();
+                }
+                catch (Exception e)
+                {
+                    CLog.LogError("Error on import high score data. Can't open source database \"" + sourceDBPath + "\" (" + e.Message + ")");
+                    return false;
+                }
+                #endregion open db
+
+                using (var cmdSource = new SQLiteCommand(connSource))
+                {
+                    #region import table scores
+                    cmdSource.CommandText = "SELECT SongID, PlayerName, Score, LineNr, Date, Medley, Duet, ShortSong, Difficulty FROM Scores";
+                    SQLiteDataReader source = cmdSource.ExecuteReader();
+                    if (source == null)
+                        return false;
+
+                    if (source.FieldCount == 0)
+                    {
+                        source.Close();
+                        return true;
+                    }
+
+                    while (source.Read())
+                    {
+                        int songid = source.GetInt32(0);
+                        string player = source.GetString(1);
+                        int score = source.GetInt32(2);
+                        int linenr = source.GetInt32(3);
+                        long date = source.GetInt64(4);
+                        int medley = source.GetInt32(5);
+                        int duet = source.GetInt32(6);
+                        int shortsong = source.GetInt32(7);
+                        int diff = source.GetInt32(8);
+
+                        string artist, title;
+                        DateTime dateadded;
+                        int numplayed;
+                        if (_GetDataBaseSongInfos(songid, out artist, out title, out numplayed, out dateadded, sourceDBPath))
+                            AddScore(player, score, linenr, date, medley, duet, shortsong, diff, artist, title, numplayed, _FilePath);
+                    }
+                    #endregion import table scores
+
+                    source.Close();
+                }
+            }
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Database/CResourceDB.cs b/Vocaluxe/Lib/Database/CResourceDB.cs
new file mode 100644
index 00000000..51e07bf5
--- /dev/null
+++ b/Vocaluxe/Lib/Database/CResourceDB.cs
@@ -0,0 +1,253 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Runtime.InteropServices;
+using Vocaluxe.Base;
+using VocaluxeLib.Draw;
+#if WIN
+using System.Data.SQLite;
+
+#else
+using Mono.Data.Sqlite;
+#endif
+
+namespace Vocaluxe.Lib.Database
+{
+    public class CResourceDB : CDatabaseBase
+    {
+#if DEBUG
+        private readonly string[] _FilesV1 = new string[]
+            {
+                "Logo_voc.png", "PerfectNoteStar.png", "redDot.png", "blueDot.png", "brunzel.png", "Darkice.png", "flokuep.png", "flamefire.png", "bohning.png", "mesand.png",
+                "babene03.png", "pantero.png", "Pinky007.png"
+            };
+#endif
+        public CResourceDB(string filePath) : base(filePath) {}
+
+        public override bool Init()
+        {
+            if (!base.Init())
+                return false;
+            if (_Version < 0)
+            {
+                CLog.LogError("Can't find Ressource-DB!");
+                return false;
+            }
+
+            if (_Version < CSettings.DatabaseCreditsRessourcesVersion)
+            {
+#if DEBUG
+                return _CreateDB() && _UpdateV1();
+#else
+                CLog.LogError("Upgrading Ressource-DB not possible");
+                return false;
+#endif
+            }
+
+            return true;
+        }
+
+        public bool GetCreditsRessource(string fileName, ref CTexture tex)
+        {
+            if (_Connection == null)
+                return false;
+            bool result = false;
+
+            using (var command = new SQLiteCommand(_Connection))
+            {
+                command.CommandText = "SELECT id, width, height FROM Images WHERE [Path] = @path";
+                command.Parameters.Add("@path", DbType.String, 0).Value = fileName;
+
+                SQLiteDataReader reader = command.ExecuteReader();
+
+                if (reader != null && reader.HasRows)
+                {
+                    reader.Read();
+                    int id = reader.GetInt32(0);
+                    int w = reader.GetInt32(1);
+                    int h = reader.GetInt32(2);
+                    reader.Close();
+
+                    command.CommandText = "SELECT Data FROM ImageData WHERE ImageID = @id";
+                    command.Parameters.Add("@id", DbType.Int32).Value = id;
+                    reader = command.ExecuteReader();
+
+                    if (reader.HasRows)
+                    {
+                        result = true;
+                        reader.Read();
+                        byte[] data = _GetBytes(reader);
+                        tex = CDraw.AddTexture(w, h, data);
+                    }
+                }
+
+                if (reader != null)
+                    reader.Dispose();
+            }
+
+            return result;
+        }
+
+#if DEBUG
+        //Update from V0 (empty) to V1
+        private bool _UpdateV1()
+        {
+            if (_Connection == null || _Version >= 1)
+                return false;
+            using (SQLiteTransaction transaction = _Connection.BeginTransaction())
+            {
+                try
+                {
+                    foreach (string file in _FilesV1)
+                    {
+                        string filePath = Path.Combine(Environment.CurrentDirectory, file);
+                        if (!_AddImageToCreditsDB(filePath, transaction))
+                        {
+                            transaction.Rollback();
+                            return false;
+                        }
+                    }
+                    using (SQLiteCommand command = new SQLiteCommand(_Connection))
+                    {
+                        command.Transaction = transaction;
+                        command.CommandText = "Update Version SET Value=@Value)";
+                        command.Parameters.Add("@Value", DbType.Int32).Value = 1;
+                        command.ExecuteNonQuery();
+                    }
+                    transaction.Commit();
+                }
+                catch (Exception)
+                {
+                    transaction.Rollback();
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        //If you want to add an image to db, call this method!
+        private bool _AddImageToCreditsDB(string imagePath, SQLiteTransaction transaction)
+        {
+            if (_Connection == null || !File.Exists(imagePath))
+                return false;
+
+            Bitmap origin;
+            try
+            {
+                origin = new Bitmap(imagePath);
+            }
+            catch (Exception)
+            {
+                CLog.LogError("Error loading image: " + imagePath);
+                return false;
+            }
+            try
+            {
+                int w = origin.Width;
+                int h = origin.Height;
+                byte[] data = new byte[w * h * 4];
+
+                BitmapData bmpData = origin.LockBits(new Rectangle(0, 0, w, h), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+                Marshal.Copy(bmpData.Scan0, data, 0, w * h * 4);
+                origin.UnlockBits(bmpData);
+
+                using (SQLiteCommand command = new SQLiteCommand(_Connection))
+                {
+                    command.Transaction = transaction;
+                    command.CommandText = "INSERT INTO Images (Path, width, height) VALUES (@path, @w, @h)";
+                    command.Parameters.Add("@path", DbType.String).Value = Path.GetFileName(imagePath);
+                    command.Parameters.Add("@w", DbType.Int32).Value = w;
+                    command.Parameters.Add("@h", DbType.Int32).Value = h;
+                    command.ExecuteNonQuery();
+                }
+
+                int id = -1;
+                using (SQLiteCommand command = new SQLiteCommand(_Connection))
+                {
+                    command.Transaction = transaction;
+                    command.CommandText = "SELECT id FROM Images WHERE [Path] = @path";
+                    command.Parameters.Add("@path", DbType.String, 0).Value = Path.GetFileName(imagePath);
+                    using (SQLiteDataReader reader = command.ExecuteReader())
+                    {
+                        if (reader != null)
+                        {
+                            reader.Read();
+                            id = reader.GetInt32(0);
+                        }
+                    }
+                }
+                if (id < 0)
+                    return false;
+                using (SQLiteCommand command = new SQLiteCommand(_Connection))
+                {
+                    command.Transaction = transaction;
+                    command.CommandText = "INSERT INTO ImageData (ImageID, Data) VALUES (@id, @data)";
+                    command.Parameters.Add("@id", DbType.Int32).Value = id;
+                    command.Parameters.Add("@data", DbType.Binary).Value = data;
+                    command.ExecuteNonQuery();
+                    return true;
+                }
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+            finally
+            {
+                origin.Dispose();
+            }
+        }
+
+        private bool _CreateDB()
+        {
+            if (_Connection == null)
+                return false;
+
+            try
+            {
+                using (SQLiteCommand command = new SQLiteCommand(_Connection))
+                {
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Version (Value INTEGER NOT NULL);";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "INSERT INTO Version (Value) VALUES(0)";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS Images ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+                                          "Path TEXT NOT NULL, width INTEGER NOT NULL, height INTEGER NOT NULL);";
+                    command.ExecuteNonQuery();
+
+                    command.CommandText = "CREATE TABLE IF NOT EXISTS ImageData ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, " +
+                                          "ImageID INTEGER NOT NULL, Data BLOB NOT NULL);";
+                    command.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                CLog.LogError("Error creating Ressource DB " + e);
+                return false;
+            }
+            return true;
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs
index 11b11c21..032d952b 100644
--- a/Vocaluxe/Lib/Draw/CDirect3D.cs
+++ b/Vocaluxe/Lib/Draw/CDirect3D.cs
@@ -311,7 +311,6 @@ namespace Vocaluxe.Lib.Draw
             FormBorderStyle = FormBorderStyle.None;
             CenterToScreen();
             _Fullscreen = true;
-            CConfig.FullScreen = EOffOn.TR_CONFIG_ON;
 
             if (WindowState == FormWindowState.Maximized)
             {
@@ -321,8 +320,7 @@ namespace Vocaluxe.Lib.Draw
             }
             else
                 _DoResize();
-
-            CConfig.SaveConfig();
+            ;
         }
 
         /// <summary>
@@ -334,9 +332,6 @@ namespace Vocaluxe.Lib.Draw
             FormBorderStyle = FormBorderStyle.Sizable;
             CenterToScreen();
             _Fullscreen = false;
-            CConfig.FullScreen = EOffOn.TR_CONFIG_OFF;
-
-            CConfig.SaveConfig();
         }
         #endregion resize
 
@@ -486,10 +481,7 @@ namespace Vocaluxe.Lib.Draw
             Show();
 
             if (CConfig.FullScreen == EOffOn.TR_CONFIG_ON)
-            {
-                CSettings.IsFullScreen = true;
                 _EnterFullScreen();
-            }
 
             //Resize window if aspect ratio is incorrect
             if (Math.Abs(_W / (float)_H - CSettings.GetRenderAspect()) > 0.01)
@@ -530,7 +522,7 @@ namespace Vocaluxe.Lib.Draw
                     }
                 }
                 //Apply fullscreen mode
-                if (CSettings.IsFullScreen != _Fullscreen)
+                if ((CConfig.FullScreen == EOffOn.TR_CONFIG_ON) != _Fullscreen)
                 {
                     if (!_Fullscreen)
                         _EnterFullScreen();
diff --git a/Vocaluxe/Lib/Draw/CDrawWinForm.cs b/Vocaluxe/Lib/Draw/CDrawWinForm.cs
index d5309d25..c1fd96b9 100644
--- a/Vocaluxe/Lib/Draw/CDrawWinForm.cs
+++ b/Vocaluxe/Lib/Draw/CDrawWinForm.cs
@@ -127,9 +127,6 @@ namespace Vocaluxe.Lib.Draw
                 targetForm.Bounds = Screen.PrimaryScreen.Bounds;
                 targetForm.TopMost = true;
                 _Fullscreen = true;
-
-                CConfig.FullScreen = EOffOn.TR_CONFIG_ON;
-                CConfig.SaveConfig();
             }
         }
 
@@ -146,9 +143,6 @@ namespace Vocaluxe.Lib.Draw
             targetForm.TopMost = _TopMost;
             targetForm.Bounds = _Bounds;
             _Fullscreen = false;
-
-            CConfig.FullScreen = EOffOn.TR_CONFIG_OFF;
-            CConfig.SaveConfig();
         }
         #endregion FullScreenStuff
 
@@ -232,10 +226,7 @@ namespace Vocaluxe.Lib.Draw
             Show();
 
             if (CConfig.FullScreen == EOffOn.TR_CONFIG_ON)
-            {
-                CSettings.IsFullScreen = true;
                 _Maximize(this);
-            }
 
             while (_Run)
             {
@@ -247,7 +238,7 @@ namespace Vocaluxe.Lib.Draw
                     _Run = CGraphics.UpdateGameLogic(_Keys, _Mouse);
                     _FlipBuffer();
 
-                    if ((CSettings.IsFullScreen && !_Fullscreen) || (!CSettings.IsFullScreen && _Fullscreen))
+                    if ((CConfig.FullScreen == EOffOn.TR_CONFIG_ON) != _Fullscreen)
                         _ToggleFullScreen();
 
                     if (CTime.IsRunning())
diff --git a/Vocaluxe/Lib/Draw/COpenGL.cs b/Vocaluxe/Lib/Draw/COpenGL.cs
index f80147d5..5b7e19ae 100644
--- a/Vocaluxe/Lib/Draw/COpenGL.cs
+++ b/Vocaluxe/Lib/Draw/COpenGL.cs
@@ -235,7 +235,6 @@ namespace Vocaluxe.Lib.Draw
         private void _EnterFullScreen()
         {
             _Fullscreen = true;
-            CConfig.FullScreen = EOffOn.TR_CONFIG_ON;
 
             _Restore.Location = Location;
             _Restore.Width = Width;
@@ -261,19 +260,14 @@ namespace Vocaluxe.Lib.Draw
             }
             else
                 _DoResize();
-
-            CConfig.SaveConfig();
         }
 
         private void _LeaveFullScreen()
         {
             _Fullscreen = false;
-            CConfig.FullScreen = EOffOn.TR_CONFIG_OFF;
 
             FormBorderStyle = FormBorderStyle.Sizable;
             DesktopBounds = new Rectangle(_Restore.Location, new Size(_Restore.Width, _Restore.Height));
-
-            CConfig.SaveConfig();
         }
         #endregion Helpers
 
@@ -433,10 +427,7 @@ namespace Vocaluxe.Lib.Draw
             Show();
 
             if (CConfig.FullScreen == EOffOn.TR_CONFIG_ON)
-            {
-                CSettings.IsFullScreen = true;
                 _EnterFullScreen();
-            }
 
             while (_Run)
             {
@@ -448,7 +439,7 @@ namespace Vocaluxe.Lib.Draw
 
                 _Control.SwapBuffers();
 
-                if (CSettings.IsFullScreen != _Fullscreen)
+                if ((CConfig.FullScreen == EOffOn.TR_CONFIG_ON) != _Fullscreen)
                     _ToggleFullScreen();
 
                 _CheckQueue();
diff --git a/Vocaluxe/Lib/Input/CControllerFramework.cs b/Vocaluxe/Lib/Input/CControllerFramework.cs
index 265c0858..2ac282d1 100644
--- a/Vocaluxe/Lib/Input/CControllerFramework.cs
+++ b/Vocaluxe/Lib/Input/CControllerFramework.cs
@@ -15,51 +15,63 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
-using System;
 using System.Collections.Generic;
 using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Input
 {
-    public class CControllerFramework : IController
+    public abstract class CControllerFramework : IController
     {
-        private List<SKeyEvent> _KeysPool;
+        protected bool _Initialized;
+        private readonly List<SKeyEvent> _KeysPool = new List<SKeyEvent>();
         private List<SKeyEvent> _CurrentKeysPool;
-        private readonly Object _KeyCopyLock = new Object();
 
-        private List<SMouseEvent> _MousePool;
+        private readonly List<SMouseEvent> _MousePool = new List<SMouseEvent>();
         private List<SMouseEvent> _CurrentMousePool;
-        private readonly Object _MouseCopyLock = new Object();
 
-        public virtual void Init()
+        public abstract string GetName();
+
+        public virtual bool Init()
         {
-            _KeysPool = new List<SKeyEvent>();
+            if (_Initialized)
+                return false;
             _CurrentKeysPool = new List<SKeyEvent>();
-            _MousePool = new List<SMouseEvent>();
             _CurrentMousePool = new List<SMouseEvent>();
-        }
-
-        public virtual void Close() {}
-
-        public virtual void Connect() {}
-
-        public virtual void Disconnect() {}
-
-        public virtual bool IsConnected()
-        {
+            _Initialized = true;
             return true;
         }
 
+        public virtual void Close()
+        {
+            if (!_Initialized)
+                return;
+            _CurrentKeysPool = null;
+            _CurrentMousePool = null;
+            lock (_KeysPool)
+                _KeysPool.Clear();
+            lock (_MousePool)
+                _MousePool.Clear();
+            _Initialized = false;
+        }
+
+        public abstract void Connect();
+
+        public abstract void Disconnect();
+
+        public abstract bool IsConnected();
+
         public virtual void Update()
         {
-            lock (_KeyCopyLock)
+            if (!_Initialized)
+                return;
+            lock (_KeysPool)
             {
                 foreach (SKeyEvent e in _KeysPool)
                     _CurrentKeysPool.Add(e);
                 _KeysPool.Clear();
             }
 
-            lock (_MouseCopyLock)
+            lock (_MousePool)
             {
                 foreach (SMouseEvent e in _MousePool)
                     _CurrentMousePool.Add(e);
@@ -69,6 +81,8 @@ namespace Vocaluxe.Lib.Input
 
         public virtual bool PollKeyEvent(ref SKeyEvent keyEvent)
         {
+            if (!_Initialized)
+                return false;
             if (_CurrentKeysPool.Count > 0)
             {
                 keyEvent = _CurrentKeysPool[0];
@@ -80,6 +94,8 @@ namespace Vocaluxe.Lib.Input
 
         public virtual bool PollMouseEvent(ref SMouseEvent mouseEvent)
         {
+            if (!_Initialized)
+                return false;
             if (_CurrentMousePool.Count > 0)
             {
                 mouseEvent = _CurrentMousePool[0];
@@ -89,11 +105,13 @@ namespace Vocaluxe.Lib.Input
             return false;
         }
 
-        public virtual void SetRumble(float duration) {}
+        public abstract void SetRumble(float duration);
 
         public void AddKeyEvent(SKeyEvent keyEvent)
         {
-            lock (_KeyCopyLock)
+            if (!_Initialized)
+                return;
+            lock (_KeysPool)
             {
                 _KeysPool.Add(keyEvent);
             }
@@ -101,6 +119,8 @@ namespace Vocaluxe.Lib.Input
 
         public void AddMouseEvent(SMouseEvent mouseEvent)
         {
+            if (!_Initialized)
+                return;
             lock (_MousePool)
             {
                 _MousePool.Add(mouseEvent);
diff --git a/Vocaluxe/Lib/Input/IController.cs b/Vocaluxe/Lib/Input/IController.cs
index 7ad6c39b..cd6bec01 100644
--- a/Vocaluxe/Lib/Input/IController.cs
+++ b/Vocaluxe/Lib/Input/IController.cs
@@ -32,7 +32,8 @@ namespace Vocaluxe.Lib.Input
 
     interface IController
     {
-        void Init();
+        string GetName();
+        bool Init();
         void Close();
         void Connect();
         void Disconnect();
diff --git a/Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs b/Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs
index 6aa70841..fc29b7dc 100644
--- a/Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs
+++ b/Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs
@@ -16,7 +16,6 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Threading;
 using System.Windows.Forms;
@@ -25,99 +24,79 @@ using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Input.WiiMote
 {
-    class CWiiMote : IController
+    class CWiiMote : CControllerFramework
     {
         private CWiiMoteLib _WiiMote;
 
-        private List<SKeyEvent> _KeysPool;
-        private List<SKeyEvent> _CurrentKeysPool;
-        private readonly Object _KeyCopyLock = new Object();
-
-        private List<SMouseEvent> _MousePool;
-        private List<SMouseEvent> _CurrentMousePool;
-        private readonly Object _MouseCopyLock = new Object();
-
         private bool[] _ButtonStates;
         private Point _OldPosition;
         private bool _Connected;
 
         private Thread _HandlerThread;
+        private AutoResetEvent _EvTerminate;
         private Object _Sync;
         private bool _Active;
         private CRumbleTimer _RumbleTimer;
 
         private CGesture _Gesture;
 
-        public void Init()
+        public override string GetName()
         {
+            return "WiiMote";
+        }
+
+        public override bool Init()
+        {
+            if (!base.Init())
+                return false;
             _Sync = new Object();
             _RumbleTimer = new CRumbleTimer();
             _Gesture = new CGesture();
 
             _HandlerThread = new Thread(_MainLoop) {Name = "WiiMote", Priority = ThreadPriority.BelowNormal};
-
-            _KeysPool = new List<SKeyEvent>();
-            _CurrentKeysPool = new List<SKeyEvent>();
-
-            _MousePool = new List<SMouseEvent>();
-            _CurrentMousePool = new List<SMouseEvent>();
+            _EvTerminate = new AutoResetEvent(false);
 
             _ButtonStates = new bool[11];
             _OldPosition = new Point();
+            return true;
         }
 
-        public void Close()
+        public override void Close()
         {
             _Active = false;
-            _WiiMote.Disconnect();
+            if (_HandlerThread != null)
+            {
+                //Join before freeing stuff
+                //This also ensures, that no other thread is created till the current one is terminated
+                _EvTerminate.Set();
+                _HandlerThread.Join();
+                _HandlerThread = null;
+                _EvTerminate.Dispose();
+                _EvTerminate = null;
+            }
+            base.Close();
         }
 
-        public void Connect()
+        public override void Connect()
         {
-            if (_Active)
+            if (_Active || _HandlerThread == null)
                 return;
             _Active = true;
             _HandlerThread.Start();
         }
 
-        public void Disconnect()
+        public override void Disconnect()
         {
-            _Active = false;
+            //TODO: Allow reconnect
+            Close();
         }
 
-        public bool IsConnected()
+        public override bool IsConnected()
         {
             return _Connected;
         }
 
-        public void Update()
-        {
-            _CopyEvents();
-        }
-
-        public bool PollKeyEvent(ref SKeyEvent keyEvent)
-        {
-            if (_CurrentKeysPool.Count > 0)
-            {
-                keyEvent = _CurrentKeysPool[0];
-                _CurrentKeysPool.RemoveAt(0);
-                return true;
-            }
-            return false;
-        }
-
-        public bool PollMouseEvent(ref SMouseEvent mouseEvent)
-        {
-            if (_CurrentMousePool.Count > 0)
-            {
-                mouseEvent = _CurrentMousePool[0];
-                _CurrentMousePool.RemoveAt(0);
-                return true;
-            }
-            return false;
-        }
-
-        public void SetRumble(float duration)
+        public override void SetRumble(float duration)
         {
             lock (_Sync)
             {
@@ -137,7 +116,7 @@ namespace Vocaluxe.Lib.Input.WiiMote
                 if (!_WiiMote.Connected)
                 {
                     if (!_DoConnect())
-                        Thread.Sleep(1000);
+                        _EvTerminate.WaitOne(1000);
                 }
                 else
                 {
@@ -243,14 +222,7 @@ namespace Vocaluxe.Lib.Input.WiiMote
 
 
             if (key != Keys.None)
-            {
-                var pool = new SKeyEvent(ESender.WiiMote, false, false, false, false, char.MinValue, key);
-
-                lock (_KeyCopyLock)
-                {
-                    _KeysPool.Add(pool);
-                }
-            }
+                AddKeyEvent(new SKeyEvent(ESender.WiiMote, false, false, false, false, char.MinValue, key));
 
             //mouse events
             const float reducing = 0.15f;
@@ -270,48 +242,13 @@ namespace Vocaluxe.Lib.Input.WiiMote
             if (gesture == EGesture.ScrollDown)
                 wheel = 1;
 
-            var mpool = new SMouseEvent();
-            bool trigger = false;
-
             if (!lb && !rb && (p.X != _OldPosition.X || p.Y != _OldPosition.Y))
-            {
-                mpool = new SMouseEvent(ESender.WiiMote, EModifier.None, x, y, false, false, false, wheel, lbh, false, false, false);
-                trigger = true;
-            }
+                AddMouseEvent(new SMouseEvent(ESender.WiiMote, EModifier.None, x, y, false, false, false, wheel, lbh, false, false, false));
             else if (lb || rb)
-            {
-                mpool = new SMouseEvent(ESender.WiiMote, EModifier.None, x, y, lb, false, rb, wheel, false, false, false, false);
-                trigger = true;
-            }
-
-
-            if (trigger)
-            {
-                lock (_MouseCopyLock)
-                {
-                    _MousePool.Add(mpool);
-                }
-            }
+                AddMouseEvent(new SMouseEvent(ESender.WiiMote, EModifier.None, x, y, lb, false, rb, wheel, false, false, false, false));
 
             _OldPosition.X = p.X;
             _OldPosition.Y = p.Y;
         }
-
-        private void _CopyEvents()
-        {
-            lock (_KeyCopyLock)
-            {
-                foreach (SKeyEvent e in _KeysPool)
-                    _CurrentKeysPool.Add(e);
-                _KeysPool.Clear();
-            }
-
-            lock (_MouseCopyLock)
-            {
-                foreach (SMouseEvent e in _MousePool)
-                    _CurrentMousePool.Add(e);
-                _MousePool.Clear();
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Playlist/CPlaylistFile.cs b/Vocaluxe/Lib/Playlist/CPlaylistFile.cs
index 4ab37b0f..ef439692 100644
--- a/Vocaluxe/Lib/Playlist/CPlaylistFile.cs
+++ b/Vocaluxe/Lib/Playlist/CPlaylistFile.cs
@@ -63,14 +63,14 @@ namespace Vocaluxe.Lib.Playlist
                     filename = "1";
 
                 int i = 0;
-                while (File.Exists(Path.Combine(CSettings.DataPath, CSettings.FolderPlaylists, filename + ".xml")))
+                while (File.Exists(Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists, filename + ".xml")))
                 {
                     i++;
-                    if (!File.Exists(Path.Combine(CSettings.DataPath, CSettings.FolderPlaylists, filename + i + ".xml")))
+                    if (!File.Exists(Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists, filename + i + ".xml")))
                         filename += i;
                 }
 
-                PlaylistFile = Path.Combine(CSettings.DataPath, CSettings.FolderPlaylists, filename + ".xml");
+                PlaylistFile = Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists, filename + ".xml");
             }
 
             XmlWriter writer;
diff --git a/Vocaluxe/Lib/Sound/CBuffer.cs b/Vocaluxe/Lib/Sound/CBuffer.cs
deleted file mode 100644
index 34831ccd..00000000
--- a/Vocaluxe/Lib/Sound/CBuffer.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-using System;
-using System.IO;
-
-namespace Vocaluxe.Lib.Sound
-{
-    class CBuffer : IDisposable
-    {
-        private const double _BaseToneFreq = 65.4064;
-        public const int NumHalfTones = 17;
-
-        private const int _AnalysisBufLen = 4096;
-        private const int _AnalysisByteBufLen = _AnalysisBufLen * 2;
-
-        private readonly Int16[] _AnalysisBuffer = new Int16[_AnalysisBufLen];
-        private readonly byte[] _AnalysisByteBuffer = new byte[_AnalysisByteBufLen]; //tmp buffer (stream->tmpBuffer->(Int16)AnalysisBuffer)
-
-        private static readonly int[] _SamplesPerPeriodPerTone = new int[NumHalfTones]; //Precalculated table holding sample# per period for each tone
-        private readonly float[] _TmpWeight = new float[NumHalfTones]; //tmp buffer for weights (gets copied to ToneWeight when checked)
-
-        private double _MaxVolume;
-        private bool _NewSamples;
-
-        private MemoryStream _Stream = new MemoryStream(); // full buffer
-
-        public CBuffer()
-        {
-            ToneWeigth = new float[NumHalfTones];
-            for (int i = 0; i < ToneWeigth.Length; i++)
-                ToneWeigth[i] = 0.99f;
-        }
-
-        static CBuffer()
-        {
-            const double halftoneBase = 1.05946309436; // 2^(1/12) -> HalftoneBase^12 = 2 (one octave)
-            //Init Array to avoid costly calculations
-            for (int toneIndex = 0; toneIndex < NumHalfTones; toneIndex++)
-            {
-                double freq = _BaseToneFreq * Math.Pow(halftoneBase, toneIndex);
-                _SamplesPerPeriodPerTone[toneIndex] = (int)Math.Round(44100.0 / freq); // samples in one period
-            }
-        }
-
-        public int ToneAbs { get; private set; }
-
-        public int Tone { get; set; }
-
-        public float MaxVolume
-        {
-            get { return (float)_MaxVolume; }
-        }
-
-        public bool ToneValid { get; private set; }
-
-        public float[] ToneWeigth { get; private set; }
-
-        public void Reset()
-        {
-            lock (_Stream)
-            {
-                _Stream.SetLength(0L);
-                _NewSamples = false;
-            }
-            ToneValid = false;
-            ToneAbs = 0;
-            Tone = 0;
-        }
-
-        private void _Add(byte[] bytes)
-        {
-            _Stream.Write(bytes, 0, bytes.Length);
-        }
-
-        public void ProcessNewBuffer(byte[] buffer)
-        {
-            // apply software boost
-            //BoostBuffer(Buffer, BufferSize);
-
-            // voice passthrough (send data to playback-device)
-            //if (assigned(fVoiceStream)) then
-            //fVoiceStream.WriteData(Buffer, BufferSize);
-            lock (_Stream)
-            {
-                _Add(buffer);
-                _NewSamples = true;
-            }
-        }
-
-        public void AnalyzeBuffer()
-        {
-            if (!_NewSamples)
-                return;
-
-            lock (_Stream)
-            {
-                if (_Stream.Length >= _AnalysisByteBufLen)
-                {
-                    _Stream.Position -= _AnalysisByteBufLen;
-                    _Stream.Read(_AnalysisByteBuffer, 0, _AnalysisByteBufLen);
-                }
-                _NewSamples = false;
-            }
-
-            for (int i = 0; i < _AnalysisBufLen; i++)
-                _AnalysisBuffer[i] = BitConverter.ToInt16(_AnalysisByteBuffer, i * 2);
-
-            try
-            {
-                // find maximum volume
-                _FindMaxVolume();
-
-                if (MaxVolume >= 0.02)
-                    _AnalyzeByAutocorrelation();
-                else
-                    ToneValid = false;
-            }
-            catch (Exception) {}
-        }
-
-        private void _FindMaxVolume()
-        {
-            short maxVolume = 0;
-            for (int i = 0; i < _AnalysisBuffer.Length / 4; i++)
-            {
-                short volume = _AnalysisBuffer[i];
-                if (volume < 0)
-                {
-                    if (volume == Int16.MinValue)
-                    {
-                        maxVolume = Int16.MaxValue;
-                        break;
-                    }
-                    volume = (short)-volume;
-                }
-                if (volume > maxVolume)
-                    maxVolume = volume;
-            }
-            _MaxVolume = (double)maxVolume / Int16.MaxValue;
-        }
-
-        private void _AnalyzeByAutocorrelation()
-        {
-            // prepare to analyze
-            double maxWeight = -1.0;
-            double minWeight = 1.0;
-            int maxTone = -1;
-
-            // analyze halftones
-            // Note: at the lowest tone (~65Hz) and a buffer-size of 4096
-            // at 44.1 (or 48kHz) only 6 (or 5) samples are compared, this might be
-            // too few samples -> use a bigger buffer-size
-            for (int toneIndex = 0; toneIndex < NumHalfTones; toneIndex++)
-            {
-                double curWeight = _AnalyzeAutocorrelationTone(toneIndex);
-
-                if (curWeight > maxWeight)
-                {
-                    maxWeight = curWeight;
-                    maxTone = toneIndex;
-                }
-
-                if (curWeight < minWeight)
-                    minWeight = curWeight;
-
-                _TmpWeight[toneIndex] = (float)curWeight;
-            }
-
-            if (maxWeight - minWeight > 0.01)
-            {
-                Array.Copy(_TmpWeight, ToneWeigth, NumHalfTones);
-
-                ToneAbs = maxTone;
-                Tone = maxTone % 12;
-                ToneValid = true;
-            }
-            else
-                ToneValid = false;
-        }
-
-        private double _AnalyzeAutocorrelationTone(int tone)
-        {
-            int samplesPerPeriod = _SamplesPerPeriodPerTone[tone]; // samples in one period
-
-            int accumDist = 0; // accumulated distances
-
-            // compare correlating samples
-            int sampleIndex = 0; // index of sample to analyze
-            // Start value= index of sample one period ahead
-            for (int correlatingSampleIndex = sampleIndex + samplesPerPeriod; correlatingSampleIndex < _AnalysisBufLen; correlatingSampleIndex++, sampleIndex++)
-            {
-                // calc distance (correlation: 1-dist/IntMax) to corresponding sample in next period
-                // distance (0=equal .. IntMax=totally different) between correlated samples
-                int dist = Math.Abs(_AnalysisBuffer[sampleIndex] - _AnalysisBuffer[correlatingSampleIndex]);
-                accumDist += dist;
-            }
-
-            return 1.0 - (double)accumDist / Int16.MaxValue / _AnalysisBufLen;
-        }
-
-        public void Dispose()
-        {
-            if (_Stream != null)
-            {
-                _Stream.Dispose();
-                _Stream = null;
-            }
-            GC.SuppressFinalize(this);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/CDirectSoundRecord.cs b/Vocaluxe/Lib/Sound/CDirectSoundRecord.cs
deleted file mode 100644
index eabf0d73..00000000
--- a/Vocaluxe/Lib/Sound/CDirectSoundRecord.cs
+++ /dev/null
@@ -1,415 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System.Collections.ObjectModel;
-using SlimDX.DirectSound;
-using SlimDX.Multimedia;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using Vocaluxe.Base;
-
-namespace Vocaluxe.Lib.Sound
-{
-    class CDirectSoundRecord : IRecord
-    {
-        private bool _Initialized;
-        private List<CRecordDevice> _Devices;
-        private List<CSoundCardSource> _Sources;
-
-        private readonly CBuffer[] _Buffer;
-
-        public CDirectSoundRecord()
-        {
-            _Buffer = new CBuffer[CSettings.MaxNumPlayer];
-            for (int i = 0; i < _Buffer.Length; i++)
-                _Buffer[i] = new CBuffer();
-
-            Init();
-        }
-
-        public bool Init()
-        {
-            DeviceCollection devices = DirectSoundCapture.GetDevices();
-            _Devices = new List<CRecordDevice>();
-            _Sources = new List<CSoundCardSource>();
-
-            int id = 0;
-            foreach (DeviceInformation dev in devices)
-            {
-                using (var ds = new DirectSoundCapture(dev.DriverGuid))
-                {
-                    var device = new CRecordDevice {Driver = dev.DriverGuid.ToString(), ID = id, Name = dev.Description, Channels = ds.Capabilities.Channels};
-
-                    if (device.Channels > 2)
-                        device.Channels = 2; //more are not supported in vocaluxe
-
-                    _Devices.Add(device);
-
-                    id++;
-                }
-            }
-
-            _Initialized = true;
-
-            return true;
-        }
-
-        public void CloseAll()
-        {
-            if (_Initialized)
-            {
-                Stop();
-                _Initialized = false;
-            }
-            //System.IO.File.WriteAllBytes("test0.raw", _Buffer[0].Buffer);
-        }
-
-        public bool Start()
-        {
-            if (!_Initialized)
-                return false;
-
-            foreach (CBuffer buffer in _Buffer)
-                buffer.Reset();
-
-            var active = new bool[_Devices.Count];
-            var guid = new Guid[_Devices.Count];
-            var channels = new short[_Devices.Count];
-            for (int dev = 0; dev < _Devices.Count; dev++)
-            {
-                active[dev] = false;
-                if (_Devices[dev].PlayerChannel1 > 0 || _Devices[dev].PlayerChannel2 > 0)
-                    active[dev] = true;
-                guid[dev] = new Guid(_Devices[dev].Driver);
-                channels[dev] = (short)_Devices[dev].Channels;
-            }
-
-            for (int i = 0; i < _Devices.Count; i++)
-            {
-                if (active[i])
-                {
-                    var source = new CSoundCardSource(guid[i], channels[i]) {SampleRateKhz = 44.1};
-                    source.SampleDataReady += _OnDataReady;
-                    source.Start();
-
-                    _Sources.Add(source);
-                }
-            }
-            return true;
-        }
-
-        public bool Stop()
-        {
-            if (!_Initialized)
-                return false;
-
-            foreach (CSoundCardSource source in _Sources)
-            {
-                source.Stop();
-                source.Dispose();
-            }
-            _Sources.Clear();
-
-            return true;
-        }
-
-        public void AnalyzeBuffer(int player)
-        {
-            if (!_Initialized)
-                return;
-
-            _Buffer[player].AnalyzeBuffer();
-        }
-
-        public int GetToneAbs(int player)
-        {
-            if (!_Initialized)
-                return 0;
-
-            return _Buffer[player].ToneAbs;
-        }
-
-        public int GetTone(int player)
-        {
-            if (!_Initialized)
-                return 0;
-
-            return _Buffer[player].Tone;
-        }
-
-        public void SetTone(int player, int tone)
-        {
-            if (!_Initialized)
-                return;
-
-            _Buffer[player].Tone = tone;
-        }
-
-        public float GetMaxVolume(int player)
-        {
-            if (!_Initialized)
-                return 0f;
-
-            return _Buffer[player].MaxVolume;
-        }
-
-        public bool ToneValid(int player)
-        {
-            if (!_Initialized)
-                return false;
-
-            return _Buffer[player].ToneValid;
-        }
-
-        public ReadOnlyCollection<CRecordDevice> RecordDevices()
-        {
-            if (!_Initialized)
-                return null;
-
-            if (_Devices.Count == 0)
-                return null;
-
-            return _Devices.AsReadOnly();
-        }
-
-        public int NumHalfTones(int player)
-        {
-            if (!_Initialized)
-                return 0;
-
-            return CBuffer.NumHalfTones;
-        }
-
-        public float[] ToneWeigth(int player)
-        {
-            if (!_Initialized)
-                return null;
-
-            return _Buffer[player].ToneWeigth;
-        }
-
-        private void _OnDataReady(object sender, CSampleDataEventArgs e)
-        {
-            if (_Initialized)
-            {
-                var leftBuffer = new byte[e.Data.Length / 2];
-                var rightBuffer = new byte[e.Data.Length / 2];
-
-                //[]: Sample, L: Left channel R: Right channel
-                //[LR][LR][LR][LR][LR][LR]
-                //The data is interleaved and needs to be demultiplexed
-                for (int i = 0; i < e.Data.Length / 2; i++)
-                {
-                    leftBuffer[i] = e.Data[i * 2 - (i % 2)];
-                    rightBuffer[i] = e.Data[i * 2 - (i % 2) + 2];
-                }
-
-                foreach (CRecordDevice device in _Devices)
-                {
-                    if (device.Driver == e.Guid.ToString())
-                    {
-                        if (device.PlayerChannel1 > 0)
-                            _Buffer[device.PlayerChannel1 - 1].ProcessNewBuffer(leftBuffer);
-
-                        if (device.PlayerChannel2 > 0)
-                            _Buffer[device.PlayerChannel2 - 1].ProcessNewBuffer(rightBuffer);
-                    }
-                }
-            }
-        }
-
-        private class CSampleDataEventArgs : EventArgs
-        {
-            public CSampleDataEventArgs(byte[] data, Guid guid)
-            {
-                Data = data;
-                Guid = guid;
-            }
-
-            public byte[] Data { get; private set; }
-            public Guid Guid { get; private set; }
-        }
-
-        private class CSoundCardSource : IDisposable
-        {
-            private volatile bool _Running;
-            private readonly int _BufferSize;
-            private CaptureBuffer _CaptureBuffer;
-            private CaptureBufferDescription _BufferDescription;
-            private DirectSoundCapture _CaptureDevice;
-            private readonly WaveFormat _WaveFormat;
-            private Thread _CaptureThread;
-            private List<NotificationPosition> _Notifications;
-            private int _BufferPortionCount;
-            private int _BufferPortionSize;
-            private WaitHandle[] _WaitHandles;
-            private double _SampleRate;
-            private readonly Guid _Guid;
-            private readonly short _Channels;
-
-            public CSoundCardSource(Guid guid, short channels)
-            {
-                _Guid = guid;
-                _Channels = channels;
-                _WaveFormat = new WaveFormat();
-                SampleRateKhz = 44.1;
-                _BufferSize = 2048;
-            }
-
-            public event EventHandler<CSampleDataEventArgs> SampleDataReady = delegate { };
-
-            public double SampleRateKhz
-            {
-                get { return _SampleRate; }
-
-                set
-                {
-                    _SampleRate = value;
-
-                    if (_Running)
-                        Restart();
-                }
-            }
-
-            public void Start()
-            {
-                if (_Running)
-                    throw new InvalidOperationException();
-
-                if (_CaptureDevice == null)
-                    _CaptureDevice = new DirectSoundCapture(_Guid);
-
-                _WaveFormat.FormatTag = WaveFormatTag.Pcm; // Change to WaveFormatTag.IeeeFloat for float
-                _WaveFormat.BitsPerSample = 16; // Set this to 32 for float
-                _WaveFormat.BlockAlignment = (short)(_Channels * (_WaveFormat.BitsPerSample / 8));
-                _WaveFormat.Channels = _Channels;
-                _WaveFormat.SamplesPerSecond = (int)(SampleRateKhz * 1000D);
-                _WaveFormat.AverageBytesPerSecond =
-                    _WaveFormat.SamplesPerSecond *
-                    _WaveFormat.BlockAlignment;
-
-                _BufferPortionCount = 2;
-
-                _BufferDescription.BufferBytes = _BufferSize * sizeof(short) * _BufferPortionCount * _Channels;
-                _BufferDescription.Format = _WaveFormat;
-                _BufferDescription.WaveMapped = false;
-
-                _CaptureBuffer = new CaptureBuffer(_CaptureDevice, _BufferDescription);
-
-                _BufferPortionSize = _CaptureBuffer.SizeInBytes / _BufferPortionCount;
-                _Notifications = new List<NotificationPosition>();
-
-                for (int i = 0; i < _BufferPortionCount; i++)
-                {
-                    var notification = new NotificationPosition {Offset = _BufferPortionCount - 1 + (_BufferPortionSize * i), Event = new AutoResetEvent(false)};
-                    _Notifications.Add(notification);
-                }
-
-                _CaptureBuffer.SetNotificationPositions(_Notifications.ToArray());
-                _WaitHandles = new WaitHandle[_Notifications.Count];
-
-                for (int i = 0; i < _Notifications.Count; i++)
-                    _WaitHandles[i] = _Notifications[i].Event;
-
-                _CaptureThread = new Thread(_DoCapture) {Name = "DirectSoundCapture", IsBackground = true};
-
-                _Running = true;
-                _CaptureThread.Start();
-            }
-
-            public void Stop()
-            {
-                _Running = false;
-
-                if (_CaptureThread != null)
-                {
-                    _CaptureThread.Join();
-                    _CaptureThread = null;
-                }
-
-                if (_CaptureBuffer != null)
-                {
-                    _CaptureBuffer.Dispose();
-                    _CaptureBuffer = null;
-                }
-
-                if (_Notifications != null)
-                {
-                    foreach (NotificationPosition notification in _Notifications)
-                        notification.Event.Close();
-
-                    _Notifications.Clear();
-                    _Notifications = null;
-                }
-            }
-
-            public void Restart()
-            {
-                Stop();
-                Start();
-            }
-
-            private void _DoCapture()
-            {
-                int bufferPortionSamples = _BufferPortionSize / sizeof(byte);
-
-                // Buffer type must match this.waveFormat.FormatTag and this.waveFormat.BitsPerSample
-                var bufferPortion = new byte[bufferPortionSamples];
-
-                _CaptureBuffer.Start(true);
-
-                while (_Running)
-                {
-                    int bufferPortionIndex = WaitHandle.WaitAny(_WaitHandles);
-
-                    _CaptureBuffer.Read(
-                        bufferPortion,
-                        0,
-                        bufferPortionSamples,
-                        _BufferPortionSize * Math.Abs((bufferPortionIndex - 1) % _BufferPortionCount));
-
-                    SampleDataReady(this, new CSampleDataEventArgs(bufferPortion, _Guid));
-                }
-
-                _CaptureBuffer.Stop();
-            }
-
-            public void Dispose()
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            // ReSharper disable InconsistentNaming
-            protected void Dispose(bool disposing)
-                // ReSharper restore InconsistentNaming
-            {
-                if (disposing)
-                {
-                    Stop();
-
-                    if (_CaptureDevice != null)
-                    {
-                        _CaptureDevice.Dispose();
-                        _CaptureDevice = null;
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/CGstreamerAudio.cs b/Vocaluxe/Lib/Sound/CGstreamerAudio.cs
deleted file mode 100644
index e29937de..00000000
--- a/Vocaluxe/Lib/Sound/CGstreamerAudio.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System;
-using Vocaluxe.Base;
-using Vocaluxe.Lib.Sound.Gstreamer;
-
-namespace Vocaluxe.Lib.Sound
-{
-    class CGstreamerAudio : IPlayback
-    {
-        //static float LastPosition;
-        private readonly CGstreamerAudioWrapper.LogCallback _LogCallback;
-
-        #region log
-        private static void _LogHandler(string text)
-        {
-            CLog.LogError(text);
-        }
-        #endregion log
-
-        public CGstreamerAudio()
-        {
-            _LogCallback = _LogHandler;
-            //Is this really needed? CodaAnalyzer complains about it...
-            //GC.SuppressFinalize(_LogCallback);
-            CGstreamerAudioWrapper.SetLogCallback(_LogCallback);
-        }
-
-        public bool Init()
-        {
-            return CGstreamerAudioWrapper.Init();
-        }
-
-        public void SetGlobalVolume(float volume)
-        {
-            CGstreamerAudioWrapper.SetGlobalVolume(volume);
-        }
-
-        public int GetStreamCount()
-        {
-            return CGstreamerAudioWrapper.GetStreamCount();
-        }
-
-        public void CloseAll()
-        {
-            CGstreamerAudioWrapper.CloseAll();
-        }
-
-        public int Load(string media)
-        {
-            var u = new Uri(media);
-            int i = CGstreamerAudioWrapper.Load(u.AbsoluteUri);
-            return i;
-        }
-
-        public int Load(string media, bool prescan)
-        {
-            var u = new Uri(media);
-            int i = CGstreamerAudioWrapper.Load(u.AbsoluteUri, prescan);
-            return i;
-        }
-
-        public void Close(int stream)
-        {
-            CGstreamerAudioWrapper.Close(stream);
-        }
-
-        public void Play(int stream)
-        {
-            CGstreamerAudioWrapper.Play(stream);
-        }
-
-        public void Play(int stream, bool loop)
-        {
-            CGstreamerAudioWrapper.Play(stream, loop);
-        }
-
-        public void Pause(int stream)
-        {
-            CGstreamerAudioWrapper.Pause(stream);
-        }
-
-        public void Stop(int stream)
-        {
-            CGstreamerAudioWrapper.Stop(stream);
-        }
-
-        public void Fade(int stream, float targetVolume, float seconds)
-        {
-            CGstreamerAudioWrapper.Fade(stream, targetVolume, seconds);
-        }
-
-        public void FadeAndPause(int stream, float targetVolume, float seconds)
-        {
-            CGstreamerAudioWrapper.FadeAndPause(stream, targetVolume, seconds);
-        }
-
-        public void FadeAndClose(int stream, float targetVolume, float seconds)
-        {
-            CGstreamerAudioWrapper.FadeAndStop(stream, targetVolume, seconds);
-        }
-
-        public void SetStreamVolume(int stream, float volume)
-        {
-            CGstreamerAudioWrapper.SetStreamVolume(stream, volume);
-        }
-
-        public void SetStreamVolumeMax(int stream, float volume)
-        {
-            CGstreamerAudioWrapper.SetStreamVolumeMax(stream, volume);
-        }
-
-        public float GetLength(int stream)
-        {
-            return CGstreamerAudioWrapper.GetLength(stream);
-        }
-
-        public float GetPosition(int stream)
-        {
-            return CGstreamerAudioWrapper.GetPosition(stream);
-        }
-
-        public bool IsPlaying(int stream)
-        {
-            return CGstreamerAudioWrapper.IsPlaying(stream);
-        }
-
-        public bool IsPaused(int stream)
-        {
-            return CGstreamerAudioWrapper.IsPaused(stream);
-        }
-
-        public bool IsFinished(int stream)
-        {
-            return CGstreamerAudioWrapper.IsFinished(stream);
-        }
-
-        public void SetPosition(int stream, float position)
-        {
-            CGstreamerAudioWrapper.SetPosition(stream, position);
-        }
-
-        public void Update()
-        {
-            CGstreamerAudioWrapper.Update();
-        }
-
-        public void FadeAndStop(int stream, float targetVolume, float seconds)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/CGstreamerSharpAudio.cs b/Vocaluxe/Lib/Sound/CGstreamerSharpAudio.cs
deleted file mode 100644
index dc856e98..00000000
--- a/Vocaluxe/Lib/Sound/CGstreamerSharpAudio.cs
+++ /dev/null
@@ -1,494 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using Gst;
-using GLib;
-using System.Runtime.InteropServices;
-using Vocaluxe.Base;
-using VocaluxeLib;
-using Thread = System.Threading.Thread;
-
-namespace Vocaluxe.Lib.Sound
-{
-    public class CGstreamerSharpAudio : IPlayback
-    {
-        private readonly Dictionary<int, CGstreamerSharpAudioStream> _Streams = new Dictionary<int, CGstreamerSharpAudioStream>();
-        private static int _IDCount;
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto)]
-        private static extern void SetDllDirectory(string lpPathName);
-
-        public bool Init()
-        {
-#if ARCH_X86
-            const string path = ".\\x86\\gstreamer";
-#endif
-#if ARCH_X64
-            const string path = ".\\x64\\gstreamer";
-#endif
-            SetDllDirectory(path);
-            Application.Init();
-            Registry reg = Registry.Get();
-            reg.ScanPath(path);
-
-            return Application.IsInitialized;
-        }
-
-        public void SetGlobalVolume(float volume)
-        {
-            foreach (CGstreamerSharpAudioStream stream in _Streams.Values)
-                stream.Volume = volume;
-        }
-
-        public int GetStreamCount()
-        {
-            return _Streams.Count;
-        }
-
-        public void CloseAll()
-        {
-            foreach (CGstreamerSharpAudioStream stream in _Streams.Values)
-                stream.Close();
-        }
-
-        public int Load(string media)
-        {
-            return Load(media, false);
-        }
-
-        public int Load(string media, bool prescan)
-        {
-            var stream = new CGstreamerSharpAudioStream(media, prescan);
-            _Streams[_IDCount] = stream;
-            return _IDCount++;
-        }
-
-        public void Close(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].Close();
-        }
-
-        public void Play(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].Playing = true;
-        }
-
-        public void Play(int stream, bool loop)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            Play(stream, loop);
-        }
-
-        public void Pause(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].Paused = true;
-        }
-
-        public void Stop(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].Stop();
-        }
-
-        public void Fade(int stream, float targetVolume, float seconds)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].Fade(targetVolume, seconds);
-        }
-
-        public void FadeAndPause(int stream, float targetVolume, float seconds)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].FadeAndPause(targetVolume, seconds);
-        }
-
-        public void FadeAndClose(int stream, float targetVolume, float seconds)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].FadeAndClose(targetVolume, seconds);
-        }
-
-        public void FadeAndStop(int stream, float targetVolume, float seconds)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].FadeAndStop(targetVolume, seconds);
-        }
-
-        public void SetStreamVolume(int stream, float volume)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].Volume = volume;
-        }
-
-        public void SetStreamVolumeMax(int stream, float volume)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].MaxVolume = volume;
-        }
-
-        public float GetLength(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return -1;
-            return _Streams[stream].Length;
-        }
-
-        public float GetPosition(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return -1f;
-            return _Streams[stream].Position;
-        }
-
-        public bool IsPlaying(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return false;
-            return _Streams[stream].Playing;
-        }
-
-        public bool IsPaused(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return false;
-            return _Streams[stream].Paused;
-        }
-
-        public bool IsFinished(int stream)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return true;
-            return _Streams[stream].Finished;
-        }
-
-        public void SetPosition(int stream, float position)
-        {
-            if (!_Streams.ContainsKey(stream))
-                return;
-            _Streams[stream].Position = position;
-        }
-
-        public void Update()
-        {
-            var streamsToDelete = new List<int>();
-            foreach (KeyValuePair<int, CGstreamerSharpAudioStream> stream in _Streams)
-            {
-                if (stream.Value.Closed)
-                    streamsToDelete.Add(stream.Key);
-                stream.Value.Update();
-            }
-            foreach (int key in streamsToDelete)
-                _Streams.Remove(key);
-        }
-
-        private class CGstreamerSharpAudioStream
-        {
-            private Element _Element;
-            private bool _Loop;
-            public volatile bool Closed = true;
-            public volatile bool Finished;
-
-            private CFading _Fading;
-            private EStreamAction _AfterFadeAction;
-            private float _Volume = 1f;
-
-            private float _MaxVolume = 1f;
-
-            private volatile float _Duration = -1f;
-            private volatile float _Position;
-            private volatile bool _QueryingDuration;
-
-            public CGstreamerSharpAudioStream(string media, bool prescan)
-            {
-                Element convert = ElementFactory.Make("audioconvert", "convert");
-                Element audiosink = ElementFactory.Make("directsoundsink", "audiosink");
-                var audioSinkBin = new Bin("Audiosink");
-
-                if (convert == null || audiosink == null)
-                {
-                    CLog.LogError("Could not create pipeline");
-                    return;
-                }
-
-                audioSinkBin.Add(convert);
-                audioSinkBin.Add(audiosink);
-                convert.Link(audiosink);
-                Pad pad = convert.GetStaticPad("sink");
-                GhostPad ghostpad = new GhostPad("sink", pad);
-
-                if (pad == null)
-                {
-                    CLog.LogError("Could not create pads");
-                    return;
-                }
-
-                if (!ghostpad.SetActive(true))
-                {
-                    CLog.LogError("Could not link pads");
-                    return;
-                }
-                if (!audioSinkBin.AddPad(ghostpad))
-                {
-                    CLog.LogError("Could not add pad");
-                    return;
-                }
-
-                _Element = ElementFactory.Make("playbin", "playbin");
-                if (_Element == null)
-                {
-                    CLog.LogError("Could not create playbin");
-                    return;
-                }
-                _Element["audio-sink"] = audioSinkBin;
-                _Element["flags"] = 1 << 1;
-                _Element["uri"] = new Uri(media).AbsoluteUri;
-                _Element.SetState(State.Paused);
-
-                Closed = false; //Enable stream
-
-                // Passing CLOCK_TIME_NONE here causes the pipeline to block for a long time so with
-                // prescan enabled the pipeline will wait 500ms for stream to initialize and then continue
-                // if it takes more than 500ms, duration queries will be performed asynchronously
-                if (prescan)
-                {
-                    Message msg = _Element.Bus.TimedPopFiltered(0xffffffffffffffff, MessageType.AsyncDone);
-                    if (msg.Handle != IntPtr.Zero)
-                        _UpdateDuration();
-                }
-            }
-
-            private void _OnMessage(Message msg)
-            {
-                if (msg.Handle == IntPtr.Zero)
-                    return;
-                switch (msg.Type)
-                {
-                    case MessageType.Eos:
-                        if (_Loop)
-                            Position = 0;
-                        else
-                        {
-                            Finished = true;
-                            Close();
-                        }
-                        break;
-                    case MessageType.Error:
-                        GException error;
-                        string debug;
-                        msg.ParseError(out error, out debug);
-                        CLog.LogError("Gstreamer error: message" + error.Message + ", code" + error.Code + " ,debug information" + debug);
-                        break;
-                    case MessageType.DurationChanged:
-                        if (!_QueryingDuration)
-                            _UpdateDuration();
-                        break;
-                }
-                msg.Unref();
-            }
-
-            public void Close()
-            {
-                if (!Closed)
-                {
-                    Closed = true;
-                    Finished = true;
-                    var t = new Thread(_TerminateStream) {Name = "GSt Terminate"};
-                    t.Start();
-                }
-            }
-
-            private void _TerminateStream()
-            {
-                if (_Element != null)
-                {
-                    _Element.SetState(State.Null);
-                    _Element.Dispose();
-                    _Element = null;
-                }
-            }
-
-            public void Play(bool loop = false)
-            {
-                if (_Element != null)
-                    _Element.SetState(State.Playing);
-                _Loop = loop;
-            }
-
-            public void Stop()
-            {
-                if (_Element != null)
-                    _Element.SetState(State.Ready);
-                Position = 0;
-            }
-
-            public void Fade(float targetVolume, float seconds)
-            {
-                _Fading = new CFading(_Volume, targetVolume, seconds);
-                _AfterFadeAction = EStreamAction.Nothing;
-            }
-
-            public void FadeAndPause(float targetVolume, float seconds)
-            {
-                Fade(targetVolume, seconds);
-                _AfterFadeAction = EStreamAction.Pause;
-            }
-
-            public void FadeAndClose(float targetVolume, float seconds)
-            {
-                Fade(targetVolume, seconds);
-                _AfterFadeAction = EStreamAction.Close;
-            }
-
-            public void FadeAndStop(float targetVolume, float seconds)
-            {
-                Fade(targetVolume, seconds);
-                _AfterFadeAction = EStreamAction.Stop;
-            }
-
-            public float Volume
-            {
-                get { return _Volume * 100f; }
-                set
-                {
-                    _Volume = value / 100f;
-                    if (_Element != null)
-                        _Element["volume"] = (_Volume * _MaxVolume);
-                }
-            }
-
-            public float MaxVolume
-            {
-                get { return _MaxVolume * 100f; }
-                set
-                {
-                    _MaxVolume = value / 100f;
-                    Volume = _Volume;
-                }
-            }
-
-            public float Length
-            {
-                get
-                {
-                    if (_Duration < 0 && !_QueryingDuration)
-                    {
-                        _QueryingDuration = true; // Set this to avoid race conditions
-                        var t = new Thread(_UpdateDuration) {Name = "GSt Update Duration"};
-                        t.Start();
-                    }
-                    return _Duration > 0 ? _Duration : -1;
-                }
-            }
-
-            public float Position
-            {
-                get
-                {
-                    long position;
-                    if (!_Element.QueryPosition(Format.Time, out position))
-                        CLog.LogError("Could not query position");
-                    else
-                        _Position = (float)(position / (double)Constants.SECOND);
-                    return _Position;
-                }
-                set
-                {
-                    if (_Element != null)
-                        _Element.SeekSimple(Format.Time, SeekFlags.Accurate | SeekFlags.Flush, (long)(value * (double)Constants.SECOND));
-                }
-            }
-
-            public bool Paused
-            {
-                get { return _Element == null || _Element.TargetState == State.Paused; }
-                set
-                {
-                    if (value && _Element != null)
-                        _Element.SetState(State.Paused);
-                }
-            }
-
-            public bool Playing
-            {
-                get { return _Element != null && (_Element.TargetState == State.Playing && !Finished); }
-                set
-                {
-                    if (value && _Element != null)
-                        _Element.SetState(State.Playing);
-                }
-            }
-
-            public void Update()
-            {
-                while (_Element != null && _Element.Bus != null && _Element.Bus.HavePending())
-                    _OnMessage(_Element.Bus.Pop());
-
-                if (_Fading != null)
-                {
-                    bool finished;
-                    Volume = _Fading.GetValue(out finished);
-                    if (finished)
-                    {
-                        switch (_AfterFadeAction)
-                        {
-                            case EStreamAction.Pause:
-                                Paused = true;
-                                break;
-                            case EStreamAction.Stop:
-                                Stop();
-                                break;
-                            case EStreamAction.Close:
-                                Close();
-                                break;
-                        }
-                        _Fading = null;
-                    }
-                }
-            }
-
-            private void _UpdateDuration()
-            {
-                _QueryingDuration = true;
-                long duration = -1;
-                while (duration < 0 && !Closed && !Finished && _Element != null)
-                {
-                    if (_Element.QueryDuration(Format.Time, out duration))
-                    {
-                        _Duration = duration / (float)Constants.SECOND;
-                        _QueryingDuration = false;
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/COpenALPlay.cs b/Vocaluxe/Lib/Sound/COpenALPlay.cs
deleted file mode 100644
index 6ab9f2b4..00000000
--- a/Vocaluxe/Lib/Sound/COpenALPlay.cs
+++ /dev/null
@@ -1,848 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System.Linq;
-using OpenTK.Audio;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using Vocaluxe.Base;
-using Vocaluxe.Lib.Sound.Decoder;
-using VocaluxeLib;
-
-namespace Vocaluxe.Lib.Sound
-{
-    class COpenALPlay : IPlayback, IDisposable
-    {
-        private bool _Initialized;
-        private readonly List<COpenAlStream> _Decoder = new List<COpenAlStream>();
-        private Closeproc _Closeproc;
-        private int _Count = 1;
-        private AudioContext _Context;
-
-        private readonly Object _MutexDecoder = new Object();
-
-        private List<SAudioStreams> _Streams;
-
-        public bool Init()
-        {
-            if (_Initialized)
-                CloseAll();
-
-            _Context = new AudioContext();
-
-            _Context.MakeCurrent();
-
-
-            _Closeproc = _CloseProc;
-            _Initialized = true;
-
-            _Streams = new List<SAudioStreams>();
-            return true;
-        }
-
-        public void CloseAll()
-        {
-            lock (_MutexDecoder)
-            {
-                for (int i = 0; i < _Decoder.Count; i++)
-                    _Decoder[i].Free(_Closeproc, i + 1, _MutexDecoder);
-            }
-        }
-
-        public void SetGlobalVolume(float volume)
-        {
-            if (_Initialized)
-            {
-                //Bass.BASS_SetVolume(Volume / 100f);
-            }
-        }
-
-        public int GetStreamCount()
-        {
-            if (!_Initialized)
-                return 0;
-
-            lock (_MutexDecoder)
-            {
-                return _Streams.Count;
-            }
-        }
-
-        public void Update()
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    foreach (COpenAlStream stream in _Decoder)
-                        stream.UploadData();
-                }
-            }
-        }
-
-        #region Stream Handling
-        public int Load(string media)
-        {
-            return Load(media, false);
-        }
-
-        public int Load(string media, bool prescan)
-        {
-            var stream = new SAudioStreams(0);
-            var decoder = new COpenAlStream();
-
-            if (decoder.Open(media) > -1)
-            {
-                lock (_MutexDecoder)
-                {
-                    _Decoder.Add(decoder);
-                    stream.Handle = _Count++;
-                    _Streams.Add(stream);
-                    return stream.Handle;
-                }
-            }
-            return 0;
-        }
-
-        public void Close(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Free(_Closeproc, stream, _MutexDecoder);
-                }
-            }
-        }
-
-        public void Play(int stream)
-        {
-            Play(stream, false);
-        }
-
-        public void Play(int stream, bool loop)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                    {
-                        _Decoder[_GetStreamIndex(stream)].Loop = loop;
-                        _Decoder[_GetStreamIndex(stream)].Play();
-                    }
-                }
-            }
-        }
-
-        public void Pause(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Paused = true;
-                }
-            }
-        }
-
-        public void Stop(int stream)
-        {
-            Pause(stream);
-        }
-
-        public void Fade(int stream, float targetVolume, float seconds)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Fade(targetVolume, seconds);
-                }
-            }
-        }
-
-        public void FadeAndPause(int stream, float targetVolume, float seconds)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].FadeAndPause(targetVolume, seconds);
-                }
-            }
-        }
-
-        public void FadeAndClose(int stream, float targetVolume, float seconds)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].FadeAndStop(targetVolume, seconds, _Closeproc, stream);
-                }
-            }
-        }
-
-        public void SetStreamVolume(int stream, float volume)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Volume = volume;
-                }
-            }
-        }
-
-        public void SetStreamVolumeMax(int stream, float volume)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].VolumeMax = volume;
-                }
-            }
-        }
-
-        public float GetLength(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return _Decoder[_GetStreamIndex(stream)].Length;
-                }
-            }
-            return 0f;
-        }
-
-        public float GetPosition(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return _Decoder[_GetStreamIndex(stream)].Position;
-                }
-
-                return 0f;
-            }
-            return 0f;
-        }
-
-        public bool IsPlaying(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return !_Decoder[_GetStreamIndex(stream)].Paused && !_Decoder[_GetStreamIndex(stream)].Finished;
-                }
-            }
-            return false;
-        }
-
-        public bool IsPaused(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return _Decoder[_GetStreamIndex(stream)].Paused;
-                }
-            }
-            return false;
-        }
-
-        public bool IsFinished(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return _Decoder[_GetStreamIndex(stream)].Finished;
-                }
-            }
-            return true;
-        }
-
-        public void SetPosition(int stream, float position)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Skip(position);
-                }
-            }
-        }
-        #endregion Stream Handling
-
-        private bool _AlreadyAdded(int stream)
-        {
-            return _Streams.Any(st => st.Handle == stream);
-        }
-
-        private int _GetStreamIndex(int stream)
-        {
-            for (int i = 0; i < _Streams.Count; i++)
-            {
-                if (_Streams[i].Handle == stream)
-                    return i;
-            }
-            return -1;
-        }
-
-        private void _CloseProc(int streamID)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(streamID))
-                    {
-                        int index = _GetStreamIndex(streamID);
-                        _Decoder.RemoveAt(index);
-                        _Streams.RemoveAt(index);
-                    }
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            _Context.Dispose();
-            _Context = null;
-        }
-
-        public void FadeAndStop(int stream, float targetVolume, float seconds)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    class COpenAlStream : IDisposable
-    {
-        private const int _BufferSize = 2048;
-        private const int _BufferCount = 5;
-        private const long _Bufsize = 50000L;
-
-        private Object _CloseMutex;
-
-        private int[] _Buffers;
-        private int _State;
-        private int _Source;
-        private SFormatInfo _Format;
-
-        private bool _Initialized;
-        private int _ByteCount = 4;
-        private float _Volume = 1f;
-        private float _VolumeMax = 1f;
-
-        private EStreamAction _AfterFadeAction;
-        private CFading _Fading;
-
-        private readonly Stopwatch _Timer = new Stopwatch();
-
-        private Closeproc _Closeproc;
-        private int _StreamID;
-        private IAudioDecoder _Decoder;
-        private float _BytesPerSecond;
-        private bool _NoMoreData;
-
-        private bool _FileOpened;
-
-        private bool _Waiting;
-        private bool _Skip;
-
-        private bool _Loop;
-        private float _Duration;
-        private float _CurrentTime;
-        private float _TimeCode;
-
-        private bool _Paused;
-
-        private CRingBuffer _Data;
-        private float _SetStart;
-        private float _Start;
-        private bool _SetLoop;
-        private bool _SetSkip;
-        private bool _Terminated;
-
-        private readonly Thread _DecoderThread;
-
-        private AutoResetEvent _EventDecode = new AutoResetEvent(false);
-
-        private readonly Object _MutexData = new Object();
-        private readonly Object _MutexSyncSignals = new Object();
-
-        public COpenAlStream()
-        {
-            _Initialized = false;
-            _DecoderThread = new Thread(_Execute) {Name = "OpenAL Decode"};
-        }
-
-        public void Free(Closeproc closeProc, int streamID, Object closeMutex)
-        {
-            _Closeproc = closeProc;
-            _StreamID = streamID;
-            _Terminated = true;
-            _CloseMutex = closeMutex;
-        }
-
-        public float Length
-        {
-            get
-            {
-                if (_FileOpened)
-                    return _Duration;
-
-                return 0f;
-            }
-        }
-
-        public bool Finished
-        {
-            get
-            {
-                lock (_MutexData)
-                {
-                    return _NoMoreData && _Data.BytesNotRead == 0L;
-                }
-            }
-        }
-
-        public float Volume
-        {
-            get { return _Volume * 100f; }
-            set
-            {
-                lock (_MutexData)
-                {
-                    _Volume = value / 100f;
-                    if (_Volume < 0f)
-                        _Volume = 0f;
-
-                    if (_Volume > 1f)
-                        _Volume = 1f;
-                }
-            }
-        }
-
-        public float VolumeMax
-        {
-            get { return _VolumeMax * 100f; }
-            set
-            {
-                lock (_MutexData)
-                {
-                    _VolumeMax = value / 100f;
-                    if (_VolumeMax < 0f)
-                        _VolumeMax = 0f;
-
-                    if (_VolumeMax > 1f)
-                        _VolumeMax = 1f;
-                }
-            }
-        }
-
-        public float Position
-        {
-            get
-            {
-                if (Finished)
-                    _Timer.Stop();
-                //TODO: Why not use Decoder.GetPosition()?
-                return _CurrentTime + _Timer.ElapsedMilliseconds / 1000f;
-            }
-        }
-
-        public bool Paused
-        {
-            get { return _Paused; }
-            set
-            {
-                _Paused = value;
-                lock (_MutexSyncSignals)
-                {
-                    if (_Paused)
-                    {
-                        _Timer.Stop();
-                        AL.SourceStop(_Source);
-                    }
-                    else
-                    {
-                        _Timer.Start();
-                        _EventDecode.Set();
-                        AL.SourcePlay(_Source);
-                    }
-                }
-            }
-        }
-
-        public void Fade(float targetVolume, float fadeTime)
-        {
-            _Fading = new CFading(_Volume, targetVolume, fadeTime);
-            _AfterFadeAction = EStreamAction.Nothing;
-        }
-
-        public void FadeAndPause(float targetVolume, float fadeTime)
-        {
-            Fade(targetVolume, fadeTime);
-            _AfterFadeAction = EStreamAction.Pause;
-        }
-
-        public void FadeAndStop(float targetVolume, float fadeTime, Closeproc closeProc, int streamID)
-        {
-            _Closeproc = closeProc;
-            _StreamID = streamID;
-            Fade(targetVolume, fadeTime);
-            _AfterFadeAction = EStreamAction.Stop;
-        }
-
-        public void Play()
-        {
-            Paused = false;
-            _AfterFadeAction = EStreamAction.Nothing;
-            AL.SourcePlay(_Source);
-        }
-
-        public void Stop()
-        {
-            AL.SourceStop(_Source);
-            Skip(0f);
-        }
-
-        public bool Loop
-        {
-            get { return _SetLoop; }
-            set { _SetLoop = value; }
-        }
-
-        public int Open(string fileName)
-        {
-            if (_FileOpened)
-                return -1;
-
-            if (!File.Exists(fileName))
-                return -1;
-
-            _Decoder = new CAudioDecoderFFmpeg();
-            _Decoder.Init();
-
-            try
-            {
-                _Source = AL.GenSource();
-                _Buffers = new int[_BufferCount];
-                for (int i = 0; i < _BufferCount; i++)
-                    _Buffers[i] = AL.GenBuffer();
-
-                _State = 0;
-                //AL.SourceQueueBuffers(_source, _buffers.Length, _buffers);
-            }
-            catch (Exception)
-            {
-                _Initialized = false;
-                CLog.LogError("Error Init OpenAL Playback");
-                return -1;
-            }
-
-            _Decoder.Open(fileName);
-            _Duration = _Decoder.GetLength();
-
-            _Format = _Decoder.GetFormatInfo();
-            _ByteCount = 2 * _Format.ChannelCount;
-            _BytesPerSecond = _Format.SamplesPerSecond * _ByteCount;
-            _CurrentTime = 0f;
-            _Timer.Reset();
-
-            var stream = new SAudioStreams(0) {Handle = _Buffers[0]};
-
-            if (stream.Handle != 0)
-            {
-                _FileOpened = true;
-                _Data = new CRingBuffer(_Bufsize);
-                _NoMoreData = false;
-                _DecoderThread.Priority = ThreadPriority.Normal;
-                _DecoderThread.Name = Path.GetFileName(fileName);
-                _DecoderThread.Start();
-
-                return stream.Handle;
-            }
-            _Initialized = true;
-            return -1;
-        }
-
-        public bool Skip(float time)
-        {
-            lock (_MutexSyncSignals)
-            {
-                _SetStart = time;
-                _SetSkip = true;
-            }
-            _EventDecode.Set();
-
-            return true;
-        }
-
-        #region Threading
-        private void _DoSkip()
-        {
-            _Decoder.SetPosition(_Start);
-            _CurrentTime = _Start;
-            _TimeCode = _Start;
-            _Timer.Reset();
-            _Waiting = false;
-
-            lock (_MutexData)
-            {
-                _Data = new CRingBuffer(_Bufsize);
-                _NoMoreData = false;
-            }
-        }
-
-        private void _Execute()
-        {
-            while (!_Terminated)
-            {
-                _Waiting = false;
-                if (_EventDecode.WaitOne(1) || !_Waiting)
-                {
-                    if (_Skip)
-                    {
-                        _DoSkip();
-                        _Skip = false;
-                    }
-
-                    _DoDecode();
-                }
-                if (!_Terminated)
-                {
-                    lock (_MutexSyncSignals)
-                    {
-                        if (_SetSkip)
-                            _Skip = true;
-
-                        _SetSkip = false;
-
-                        _Start = _SetStart;
-                        _Loop = _SetLoop;
-                    }
-                }
-            }
-
-            _DoFree();
-        }
-
-        private void _DoDecode()
-        {
-            if (!_FileOpened)
-                return;
-
-            if (_Paused)
-                return;
-
-            if (_Terminated)
-                return;
-
-            float timecode;
-            byte[] buffer;
-
-            bool doIt = false;
-            lock (_MutexData)
-            {
-                if (_Bufsize - 10000L > _Data.BytesNotRead)
-                    doIt = true;
-            }
-
-            if (!doIt)
-                return;
-
-            _Decoder.Decode(out buffer, out timecode);
-
-            if (buffer == null)
-            {
-                if (_Loop)
-                {
-                    lock (_MutexSyncSignals)
-                    {
-                        _CurrentTime = 0f;
-                        _Start = 0f;
-                    }
-
-                    _DoSkip();
-                }
-                else
-                    _NoMoreData = true;
-                return;
-            }
-
-            lock (_MutexData)
-            {
-                _Data.Write(buffer);
-                _TimeCode = timecode;
-            }
-        }
-
-        private void _DoFree()
-        {
-            if (_Initialized)
-            {
-                lock (_CloseMutex)
-                {
-                    Stop();
-                    AL.DeleteSource(_Source);
-                    AL.DeleteBuffers(_Buffers);
-                }
-                _Decoder.Close();
-            }
-
-            _Closeproc(_StreamID);
-        }
-        #endregion Threading
-
-        private void _Update()
-        {
-            if (_Fading != null)
-            {
-                bool finished;
-                _Volume = _Fading.GetValue(out finished);
-                if (finished)
-                {
-                    switch (_AfterFadeAction)
-                    {
-                        case EStreamAction.Close:
-                        case EStreamAction.Stop:
-                            _Terminated = true;
-                            break;
-                        case EStreamAction.Pause:
-                            Paused = true;
-                            break;
-                    }
-                    _Fading = null;
-                }
-            }
-        }
-
-        public void UploadData()
-        {
-            _Update();
-
-            if (_Paused)
-                return;
-
-            int queuedCount;
-            bool doit = true;
-            AL.GetSource(_Source, ALGetSourcei.BuffersQueued, out queuedCount);
-
-            int processedCount = _BufferCount;
-            if (queuedCount > 0)
-            {
-                AL.GetSource(_Source, ALGetSourcei.BuffersProcessed, out processedCount);
-                doit = false;
-                Console.WriteLine("Buffers Processed on Stream " + _Source + " = " + processedCount);
-                if (processedCount < 1)
-                    return;
-            }
-
-            var buf = new byte[_BufferSize];
-
-            lock (_MutexData)
-            {
-                while (processedCount > 0)
-                {
-                    if (_Data.BytesNotRead >= buf.Length)
-                    {
-                        _Data.Read(buf);
-
-
-                        var b = new byte[2];
-                        for (int i = 0; i < buf.Length; i += _ByteCount)
-                        {
-                            b[0] = buf[i];
-                            b[1] = buf[i + 1];
-
-                            b = BitConverter.GetBytes((Int16)(BitConverter.ToInt16(b, 0) * _Volume * _VolumeMax));
-                            buf[i] = b[0];
-                            buf[i + 1] = b[1];
-
-                            if (_ByteCount == 4)
-                            {
-                                b[0] = buf[i + 2];
-                                b[1] = buf[i + 3];
-
-                                b = BitConverter.GetBytes((Int16)(BitConverter.ToInt16(b, 0) * _Volume * _VolumeMax));
-                                buf[i + 2] = b[0];
-                                buf[i + 3] = b[1];
-                            }
-                        }
-
-
-                        int buffer;
-                        if (!doit)
-                            buffer = AL.SourceUnqueueBuffer(_Source);
-                        else
-                        {
-                            buffer = _Buffers[queuedCount];
-                            queuedCount++;
-                        }
-
-                        if (buffer != 0)
-                        {
-                            ALFormat alFormat = (_Format.ChannelCount == 2) ? ALFormat.Stereo16 : ALFormat.Mono16;
-                            AL.BufferData(buffer, alFormat, buf, buf.Length, _Format.SamplesPerSecond);
-                            Console.WriteLine("Write to Buffer: " + buffer);
-                            AL.SourceQueueBuffer(_Source, buffer);
-                        }
-                    }
-                    processedCount--;
-                }
-                AL.GetSource(_Source, ALGetSourcei.SourceState, out _State);
-                if ((ALSourceState)_State != ALSourceState.Playing)
-                    AL.SourcePlay(_Source);
-            }
-
-            _CurrentTime = _TimeCode - _Data.BytesNotRead / _BytesPerSecond - 0.1f;
-            _Timer.Reset();
-            _Timer.Start();
-        }
-
-        public void Dispose()
-        {
-            _EventDecode.Close();
-            _EventDecode = null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/CPortAudioHandle.cs b/Vocaluxe/Lib/Sound/CPortAudioHandle.cs
new file mode 100644
index 00000000..217afafa
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/CPortAudioHandle.cs
@@ -0,0 +1,219 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using PortAudioSharp;
+using Vocaluxe.Base;
+
+namespace Vocaluxe.Lib.Sound
+{
+    /// <summary>
+    ///     PortAudio can be used for record and playback
+    ///     So do some common stuff here and make sure those 2 do not interfere
+    ///     Basic lifetime: On Init() get a new handle, close/dispose it in your close/dispose
+    ///     DO NEVER use following Pa_* functions other than the ones from this class:
+    ///     Initialize, Terminate, OpenStream, CloseStream
+    /// </summary>
+    class CPortAudioHandle : IDisposable
+    {
+        private static int _RefCount;
+        private static readonly object _Mutex = new object();
+
+        private bool _Disposed;
+        private readonly List<IntPtr> _Streams = new List<IntPtr>();
+
+        /// <summary>
+        ///     Initializes PortAudio library (if required)
+        /// </summary>
+        public CPortAudioHandle()
+        {
+            lock (_Mutex)
+            {
+                if (_RefCount == 0)
+                {
+                    if (CheckError("Initialize", PortAudio.Pa_Initialize()))
+                        throw new Exception();
+                }
+                _RefCount++;
+            }
+        }
+
+        ~CPortAudioHandle()
+        {
+            _Dispose(false);
+        }
+
+        private void _Dispose(bool disposing)
+        {
+            if (_Disposed)
+                return;
+            if (!disposing)
+                CLog.LogDebug("Did not close CPortAudioHandle");
+            //Make sure we do not leek any streams as we may keep PA open
+            if (_Streams.Count > 0)
+            {
+                CLog.LogDebug("Did not close " + _Streams.Count + "PortAudio-Stream(s)");
+                while (_Streams.Count > 0)
+                    CloseStream(_Streams[0]);
+            }
+            lock (_Mutex)
+            {
+                Debug.Assert(_RefCount > 0);
+                _RefCount--;
+                if (_RefCount == 0)
+                    PortAudio.Pa_Terminate();
+            }
+            _Disposed = true;
+        }
+
+        public void Dispose()
+        {
+            _Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        ///     Close the PortAudio handle once you are done
+        /// </summary>
+        public void Close()
+        {
+            Dispose();
+        }
+
+        public PortAudio.PaError OpenStream(out IntPtr stream, ref PortAudio.PaStreamParameters? inputParameters, ref PortAudio.PaStreamParameters? outputParameters,
+                                            double sampleRate, uint framesPerBuffer, PortAudio.PaStreamFlags streamFlags,
+                                            PortAudio.PaStreamCallbackDelegate streamCallback, IntPtr userData)
+        {
+            if (_Disposed)
+                throw new ObjectDisposedException("PortAudioHandle already disposed");
+
+            lock (_Mutex)
+            {
+                PortAudio.PaError res = PortAudio.Pa_OpenStream(out stream, ref inputParameters, ref outputParameters, sampleRate, framesPerBuffer, streamFlags, streamCallback,
+                                                                userData);
+                if (res == PortAudio.PaError.paNoError)
+                    _Streams.Add(stream);
+                return res;
+            }
+        }
+
+        /// <summary>
+        ///     Convenience method to safely open an input stream and log potential error
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="inputParameters"></param>
+        /// <param name="sampleRate"></param>
+        /// <param name="framesPerBuffer"></param>
+        /// <param name="streamFlags"></param>
+        /// <param name="streamCallback"></param>
+        /// <param name="userData"></param>
+        /// <returns>True on success</returns>
+        public bool OpenInputStream(out IntPtr stream, ref PortAudio.PaStreamParameters? inputParameters,
+                                    double sampleRate, uint framesPerBuffer, PortAudio.PaStreamFlags streamFlags,
+                                    PortAudio.PaStreamCallbackDelegate streamCallback, IntPtr userData)
+        {
+            PortAudio.PaStreamParameters? outputParameters = null;
+            return
+                !CheckError("OpenInputStream",
+                            OpenStream(out stream, ref inputParameters, ref outputParameters, sampleRate, framesPerBuffer, streamFlags, streamCallback, userData));
+        }
+
+        /// <summary>
+        ///     Convenience method to safely open an output stream and log potential error
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="outputParameters"></param>
+        /// <param name="sampleRate"></param>
+        /// <param name="framesPerBuffer"></param>
+        /// <param name="streamFlags"></param>
+        /// <param name="streamCallback"></param>
+        /// <param name="userData"></param>
+        /// <returns>True on success</returns>
+        public bool OpenOutputStream(out IntPtr stream, ref PortAudio.PaStreamParameters? outputParameters,
+                                     double sampleRate, uint framesPerBuffer, PortAudio.PaStreamFlags streamFlags,
+                                     PortAudio.PaStreamCallbackDelegate streamCallback, IntPtr userData)
+        {
+            PortAudio.PaStreamParameters? inputParameters = null;
+            return
+                !CheckError("OpenOutputStream",
+                            OpenStream(out stream, ref inputParameters, ref outputParameters, sampleRate, framesPerBuffer, streamFlags, streamCallback, userData));
+        }
+
+        public void CloseStream(IntPtr stream)
+        {
+            if (_Disposed)
+                throw new ObjectDisposedException("PortAudioHandle already disposed");
+
+            lock (_Mutex)
+            {
+                PortAudio.Pa_CloseStream(stream);
+                _Streams.Remove(stream);
+            }
+        }
+
+        /// <summary>
+        ///     Checks if PA returned an error and logs it
+        ///     Returns true on error
+        /// </summary>
+        /// <param name="action">Action identifier (E.g. openStream)</param>
+        /// <param name="errorCode">Result returned by Pa_* call</param>
+        /// <returns>True on error</returns>
+        public bool CheckError(String action, PortAudio.PaError errorCode)
+        {
+            if (_Disposed)
+                throw new ObjectDisposedException("PortAudioHandle already disposed");
+
+            if (errorCode != PortAudio.PaError.paNoError)
+            {
+                CLog.LogError(action + " error: " + PortAudio.Pa_GetErrorText(errorCode));
+                if (errorCode == PortAudio.PaError.paUnanticipatedHostError)
+                {
+                    PortAudio.PaHostErrorInfo errorInfo = PortAudio.Pa_GetLastHostErrorInfo();
+                    CLog.LogError("- Host error API type: " + errorInfo.hostApiType);
+                    CLog.LogError("- Host error code: " + errorInfo.errorCode);
+                    CLog.LogError("- Host error text: " + errorInfo.errorText);
+                }
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        ///     Selects the most appropriate host api
+        /// </summary>
+        /// <returns>The most appropriate host api</returns>
+        public int GetHostApi()
+        {
+            if (_Disposed)
+                throw new ObjectDisposedException("PortAudioHandle already disposed");
+
+            int selectedHostApi = PortAudio.Pa_GetDefaultHostApi();
+            int apiCount = PortAudio.Pa_GetHostApiCount();
+            for (int i = 0; i < apiCount; i++)
+            {
+                PortAudio.PaHostApiInfo apiInfo = PortAudio.Pa_GetHostApiInfo(i);
+                if ((apiInfo.type == PortAudio.PaHostApiTypeId.paDirectSound)
+                    || (apiInfo.type == PortAudio.PaHostApiTypeId.paALSA))
+                    selectedHostApi = i;
+            }
+            return selectedHostApi;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/CPortAudioPlay.cs b/Vocaluxe/Lib/Sound/CPortAudioPlay.cs
deleted file mode 100644
index 2be82c2c..00000000
--- a/Vocaluxe/Lib/Sound/CPortAudioPlay.cs
+++ /dev/null
@@ -1,946 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Vocaluxe.Base;
-using Vocaluxe.Lib.Sound.Decoder;
-using Vocaluxe.Lib.Sound.PortAudio;
-using VocaluxeLib;
-
-namespace Vocaluxe.Lib.Sound
-{
-    class CPortAudioPlay : IPlayback
-    {
-        private bool _Initialized;
-        private readonly List<CPortAudioStream> _Decoder = new List<CPortAudioStream>();
-        private Closeproc _Closeproc;
-        private int _Count = 1;
-
-        private readonly Object _MutexDecoder = new Object();
-
-        private List<SAudioStreams> _Streams;
-
-        public bool Init()
-        {
-            if (_Initialized)
-                CloseAll();
-
-            _Closeproc = _CloseProc;
-            _Initialized = true;
-
-            _Streams = new List<SAudioStreams>();
-            return true;
-        }
-
-        public void CloseAll()
-        {
-            lock (_MutexDecoder)
-            {
-                for (int i = 0; i < _Decoder.Count; i++)
-                    _Decoder[i].Free(_Closeproc, i + 1);
-            }
-        }
-
-        public void SetGlobalVolume(float volume)
-        {
-            if (_Initialized)
-            {
-                //Bass.BASS_SetVolume(Volume / 100f);
-            }
-        }
-
-        public int GetStreamCount()
-        {
-            if (!_Initialized)
-                return 0;
-
-            lock (_MutexDecoder)
-            {
-                return _Streams.Count;
-            }
-        }
-
-        public void Update() {}
-
-        #region Stream Handling
-        public int Load(string media)
-        {
-            return Load(media, false);
-        }
-
-        public int Load(string media, bool prescan)
-        {
-            var stream = new SAudioStreams(0);
-            var decoder = new CPortAudioStream();
-
-            if (decoder.Open(media) > -1)
-            {
-                lock (_MutexDecoder)
-                {
-                    _Decoder.Add(decoder);
-                    stream.Handle = _Count++;
-                    _Streams.Add(stream);
-                    return stream.Handle;
-                }
-            }
-            return 0;
-        }
-
-        public void Close(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Free(_Closeproc, stream);
-                }
-            }
-        }
-
-        public void Play(int stream)
-        {
-            Play(stream, false);
-        }
-
-        public void Play(int stream, bool loop)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                    {
-                        _Decoder[_GetStreamIndex(stream)].Loop = loop;
-                        _Decoder[_GetStreamIndex(stream)].Play();
-                    }
-                }
-            }
-        }
-
-        public void Pause(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Paused = true;
-                }
-            }
-        }
-
-        public void Stop(int stream)
-        {
-            Pause(stream);
-        }
-
-        public void Fade(int stream, float targetVolume, float seconds)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Fade(targetVolume, seconds);
-                }
-            }
-        }
-
-        public void FadeAndPause(int stream, float targetVolume, float seconds)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].FadeAndPause(targetVolume, seconds);
-                }
-            }
-        }
-
-        public void FadeAndClose(int stream, float targetVolume, float seconds)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].FadeAndClose(targetVolume, seconds, _Closeproc, stream);
-                }
-            }
-        }
-
-        public void FadeAndStop(int stream, float targetVolume, float seconds)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].FadeAndStop(targetVolume, seconds, _Closeproc, stream);
-                }
-            }
-        }
-
-        public void SetStreamVolume(int stream, float volume)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Volume = volume;
-                }
-            }
-        }
-
-        public void SetStreamVolumeMax(int stream, float volume)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].VolumeMax = volume;
-                }
-            }
-        }
-
-        public float GetLength(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return _Decoder[_GetStreamIndex(stream)].Length;
-                }
-            }
-            return 0f;
-        }
-
-        public float GetPosition(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return _Decoder[_GetStreamIndex(stream)].Position;
-                }
-
-                return 0f;
-            }
-            return 0f;
-        }
-
-        public bool IsPlaying(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return !_Decoder[_GetStreamIndex(stream)].Paused && !_Decoder[_GetStreamIndex(stream)].Finished;
-                }
-            }
-            return false;
-        }
-
-        public bool IsPaused(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return _Decoder[_GetStreamIndex(stream)].Paused;
-                }
-            }
-            return false;
-        }
-
-        public bool IsFinished(int stream)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        return _Decoder[_GetStreamIndex(stream)].Finished;
-                }
-            }
-            return true;
-        }
-
-        public void SetPosition(int stream, float position)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(stream))
-                        _Decoder[_GetStreamIndex(stream)].Skip(position);
-                }
-            }
-        }
-        #endregion Stream Handling
-
-        private bool _AlreadyAdded(int stream)
-        {
-            return _Streams.Any(st => st.Handle == stream);
-        }
-
-        private int _GetStreamIndex(int stream)
-        {
-            for (int i = 0; i < _Streams.Count; i++)
-            {
-                if (_Streams[i].Handle == stream)
-                    return i;
-            }
-            return -1;
-        }
-
-        private void _CloseProc(int streamID)
-        {
-            if (_Initialized)
-            {
-                lock (_MutexDecoder)
-                {
-                    if (_AlreadyAdded(streamID))
-                    {
-                        int index = _GetStreamIndex(streamID);
-                        _Decoder.RemoveAt(index);
-                        _Streams.RemoveAt(index);
-                    }
-                }
-            }
-        }
-    }
-
-    class CPortAudioStream : IDisposable
-    {
-        private const long _Bufsize = 1000000L;
-        private const long _Beginrefill = 800000L;
-
-        private readonly CSyncTimer _SyncTimer;
-        private static bool _Initialized;
-        private static int _NumStreams;
-        private static readonly Object _Mutex = new object();
-        private int _ByteCount = 4;
-        private float _Volume = 1f;
-        private float _VolumeMax = 1f;
-
-        private EStreamAction _AfterFadeAction;
-        private CFading _Fading;
-
-        private static CPortAudio.SPaHostApiInfo _ApiInfo;
-        private static CPortAudio.SPaDeviceInfo _OutputDeviceInfo;
-        private IntPtr _Ptr = new IntPtr(0);
-
-        private Closeproc _Closeproc;
-        private CPortAudio.PaStreamCallbackDelegate _PaStreamCallback;
-        private int _StreamID;
-        private IAudioDecoder _Decoder;
-        private float _BytesPerSecond;
-        private bool _NoMoreData;
-
-        private bool _FileOpened;
-
-        private bool _Waiting;
-        private bool _Skip;
-
-        private bool _Loop;
-        private float _Duration;
-        private float _CurrentTime;
-        private float _TimeCode;
-
-        private bool _Paused;
-
-        private CRingBuffer _Data;
-        private float _SetStart;
-        private float _Start;
-        private bool _SetLoop;
-        private bool _SetSkip;
-        private bool _Terminated;
-
-        private readonly Thread _DecoderThread;
-
-        private AutoResetEvent _EventDecode = new AutoResetEvent(false);
-
-        private readonly Object _LockData = new Object();
-        private readonly Object _LockSyncSignals = new Object();
-
-        public CPortAudioStream()
-        {
-            _SyncTimer = new CSyncTimer(0f, 1f, 0.02f);
-            _DecoderThread = new Thread(_Execute) {Name = "PortAudio Decode"};
-        }
-
-        ~CPortAudioStream()
-        {
-            Dispose();
-        }
-
-        public void Free(Closeproc closeProc, int streamID)
-        {
-            _Closeproc = closeProc;
-            _StreamID = streamID;
-            _Terminated = true;
-        }
-
-        public float Length
-        {
-            get
-            {
-                if (_FileOpened)
-                    return _Duration;
-
-                return 0f;
-            }
-        }
-
-        public bool Finished
-        {
-            get
-            {
-                lock (_LockData)
-                {
-                    return _NoMoreData && _Data.BytesNotRead == 0L && _SyncTimer.Time >= _Duration;
-                }
-            }
-        }
-
-        public float Volume
-        {
-            get { return _Volume * 100f; }
-            set
-            {
-                lock (_LockData)
-                {
-                    _Volume = value / 100f;
-                    if (_Volume < 0f)
-                        _Volume = 0f;
-
-                    if (_Volume > 1f)
-                        _Volume = 1f;
-                }
-            }
-        }
-
-        public float VolumeMax
-        {
-            get { return _VolumeMax * 100f; }
-            set
-            {
-                lock (_LockData)
-                {
-                    _VolumeMax = value / 100f;
-                    if (_VolumeMax < 0f)
-                        _VolumeMax = 0f;
-
-                    if (_VolumeMax > 1f)
-                        _VolumeMax = 1f;
-                }
-            }
-        }
-
-        public float Position
-        {
-            get
-            {
-                lock (_LockData)
-                {
-                    if (Finished)
-                        _SyncTimer.Pause();
-                    //TODO: Why not use Decoder.GetPosition()?
-                    return _SyncTimer.Time;
-                }
-            }
-        }
-
-        public bool Paused
-        {
-            get { return _Paused; }
-            set
-            {
-                _Paused = value;
-                lock (_LockData)
-                {
-                    if (_Paused)
-                        _SyncTimer.Pause();
-                    else
-                    {
-                        _SyncTimer.Resume();
-                        _EventDecode.Set();
-                    }
-                }
-            }
-        }
-
-        public void Fade(float targetVolume, float fadeTime)
-        {
-            _Fading = new CFading(_Volume, targetVolume, fadeTime);
-            _AfterFadeAction = EStreamAction.Nothing;
-        }
-
-        public void FadeAndPause(float targetVolume, float fadeTime)
-        {
-            Fade(targetVolume, fadeTime);
-        }
-
-        public void FadeAndClose(float targetVolume, float fadeTime, Closeproc closeProc, int streamID)
-        {
-            _Closeproc = closeProc;
-            _StreamID = streamID;
-            Fade(targetVolume, fadeTime);
-            _AfterFadeAction = EStreamAction.Close;
-        }
-
-        public void FadeAndStop(float targetVolume, float fadeTime, Closeproc closeProc, int streamID)
-        {
-            _Closeproc = closeProc;
-            _StreamID = streamID;
-            Fade(targetVolume, fadeTime);
-            _AfterFadeAction = EStreamAction.Stop;
-        }
-
-        public void Play()
-        {
-            Paused = false;
-            _AfterFadeAction = EStreamAction.Nothing;
-            lock (_Mutex)
-            {
-                _ErrorCheck("StartStream", CPortAudio.Pa_StartStream(_Ptr));
-            }
-        }
-
-        public void Stop()
-        {
-            lock (_Mutex)
-            {
-                _ErrorCheck("StopStream (playback)", CPortAudio.Pa_StopStream(_Ptr));
-            }
-            Skip(0f);
-        }
-
-        public bool Loop
-        {
-            get { return _SetLoop; }
-            set { _SetLoop = value; }
-        }
-
-        public int Open(string fileName)
-        {
-            if (_FileOpened)
-                return -1;
-
-            if (!File.Exists(fileName))
-                return -1;
-
-            if (_FileOpened)
-                return -1;
-
-            _Decoder = new CAudioDecoderFFmpeg();
-            _Decoder.Init();
-
-            try
-            {
-                lock (_Mutex)
-                {
-                    if (!_Initialized)
-                    {
-                        if (_ErrorCheck("Initialize", CPortAudio.Pa_Initialize()))
-                            return -1;
-                        _Initialized = true;
-
-                        int hostApi = _ApiSelect();
-                        _ApiInfo = CPortAudio.PaGetHostApiInfo(hostApi);
-                        _OutputDeviceInfo = CPortAudio.PaGetDeviceInfo(_ApiInfo.DefaultOutputDevice);
-                        if (_OutputDeviceInfo.DefaultLowOutputLatency < 0.1)
-                            _OutputDeviceInfo.DefaultLowOutputLatency = 0.1;
-                    }
-                }
-
-                _PaStreamCallback = _ProcessNewData;
-            }
-            catch (Exception)
-            {
-                _Initialized = false;
-                CLog.LogError("Error Init PortAudio Playback");
-                return -1;
-            }
-
-            _Decoder.Open(fileName);
-            _Duration = _Decoder.GetLength();
-
-            SFormatInfo format = _Decoder.GetFormatInfo();
-            if (format.SamplesPerSecond == 0)
-                return -1;
-
-            _ByteCount = 2 * format.ChannelCount;
-            _BytesPerSecond = format.SamplesPerSecond * _ByteCount;
-            _CurrentTime = 0f;
-            _SyncTimer.Time = _CurrentTime;
-
-            var stream = new SAudioStreams(0);
-
-            var data = new IntPtr(0);
-
-            var outputParams = new CPortAudio.SPaStreamParameters
-                {
-                    ChannelCount = format.ChannelCount,
-                    Device = _ApiInfo.DefaultOutputDevice,
-                    SampleFormat = CPortAudio.EPaSampleFormat.PaInt16,
-                    SuggestedLatency = _OutputDeviceInfo.DefaultLowOutputLatency
-                };
-
-            var bufsize = (uint)CConfig.AudioBufferSize;
-            lock (_Mutex)
-            {
-                _ErrorCheck("OpenDefaultStream (playback)", CPortAudio.Pa_OpenStream(
-                    out _Ptr,
-                    IntPtr.Zero,
-                    ref outputParams,
-                    format.SamplesPerSecond,
-                    bufsize,
-                    CPortAudio.EPaStreamFlags.PaNoFlag,
-                    _PaStreamCallback,
-                    data));
-            }
-
-            stream.Handle = _Ptr.ToInt32();
-
-            if (stream.Handle != 0)
-            {
-                _NumStreams++;
-                _Paused = true;
-                _Waiting = true;
-                _FileOpened = true;
-                _Data = new CRingBuffer(_Bufsize);
-                _NoMoreData = false;
-                _DecoderThread.Priority = ThreadPriority.Normal;
-                _DecoderThread.Name = Path.GetFileName(fileName);
-                _DecoderThread.Start();
-
-                return stream.Handle;
-            }
-            return -1;
-        }
-
-        public void Skip(float time)
-        {
-            lock (_LockSyncSignals)
-            {
-                _SetStart = time;
-                _SetSkip = true;
-                _Waiting = true;
-            }
-        }
-
-        #region Threading
-        private void _DoSkip()
-        {
-            lock (_LockData)
-            {
-                _Decoder.SetPosition(_Start);
-                _CurrentTime = _Start;
-                _TimeCode = _Start;
-                _Data = new CRingBuffer(_Bufsize);
-                _NoMoreData = false;
-                _EventDecode.Set();
-                _Waiting = false;
-                _SyncTimer.Time = _Start;
-            }
-        }
-
-        private void _Execute()
-        {
-            while (!_Terminated)
-            {
-                if (_EventDecode.WaitOne(10))
-                {
-                    lock (_LockSyncSignals)
-                    {
-                        if (_SetSkip)
-                        {
-                            _Skip = true;
-                            _EventDecode.Set();
-                            _Waiting = true;
-                        }
-
-                        _SetSkip = false;
-
-                        _Start = _SetStart;
-                        _Loop = _SetLoop;
-                    }
-
-                    if (_Skip)
-                    {
-                        _DoSkip();
-                        _Skip = false;
-                    }
-
-                    if (!_Waiting)
-                    {
-                        _DoDecode();
-                        _Update();
-                    }
-                }
-            }
-
-            _DoFree();
-        }
-
-        private void _DoDecode()
-        {
-            if (!_FileOpened)
-                return;
-
-            if (_Paused)
-                return;
-
-            if (_Terminated)
-                return;
-
-            float timecode;
-            byte[] buffer;
-
-            bool doIt = false;
-            lock (_LockData)
-            {
-                if (!_Skip && _Beginrefill > _Data.BytesNotRead)
-                    doIt = true;
-            }
-
-            if (!doIt)
-                return;
-
-            _Decoder.Decode(out buffer, out timecode);
-
-            if (buffer == null)
-            {
-                if (_Loop)
-                {
-                    lock (_LockSyncSignals)
-                    {
-                        _CurrentTime = 0f;
-                        _Start = 0f;
-                    }
-
-                    _DoSkip();
-                }
-                else
-                    _NoMoreData = true;
-                return;
-            }
-
-            lock (_LockData)
-            {
-                _Data.Write(buffer);
-                _TimeCode = timecode;
-                if (_Data.BytesNotRead < _Beginrefill)
-                {
-                    _Waiting = false;
-                    _EventDecode.Set();
-                }
-                else
-                    _Waiting = true;
-            }
-        }
-
-        private void _DoFree()
-        {
-            if (_Initialized)
-            {
-                Stop();
-                _NumStreams--;
-                if (_NumStreams == 0)
-                {
-                    lock (_Mutex)
-                    {
-                        CPortAudio.Pa_Terminate();
-                        _Initialized = false;
-                    }
-                }
-                _Decoder.Close();
-            }
-
-            _Closeproc(_StreamID);
-        }
-        #endregion Threading
-
-        #region Callbacks
-        private CPortAudio.EPaStreamCallbackResult _ProcessNewData(
-            IntPtr input,
-            IntPtr output,
-            uint frameCount,
-            ref CPortAudio.SPaStreamCallbackTimeInfo timeInfo,
-            CPortAudio.EPaStreamCallbackFlags statusFlags,
-            IntPtr userData)
-        {
-            var buf = new byte[frameCount * _ByteCount];
-
-            if (_Paused)
-            {
-                try
-                {
-                    Marshal.Copy(buf, 0, output, (int)frameCount * _ByteCount);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                }
-                return CPortAudio.EPaStreamCallbackResult.PaContinue;
-            }
-
-            lock (_LockData)
-            {
-                if (_NoMoreData || _Data.BytesNotRead >= buf.Length)
-                {
-                    _Data.Read(buf);
-
-                    var b = new byte[2];
-                    for (int i = 0; i < buf.Length; i += _ByteCount)
-                    {
-                        b[0] = buf[i];
-                        b[1] = buf[i + 1];
-
-                        b = BitConverter.GetBytes((Int16)(BitConverter.ToInt16(b, 0) * _Volume * _VolumeMax));
-                        buf[i] = b[0];
-                        buf[i + 1] = b[1];
-
-                        if (_ByteCount == 4)
-                        {
-                            b[0] = buf[i + 2];
-                            b[1] = buf[i + 3];
-
-                            b = BitConverter.GetBytes((Int16)(BitConverter.ToInt16(b, 0) * _Volume * _VolumeMax));
-                            buf[i + 2] = b[0];
-                            buf[i + 3] = b[1];
-                        }
-                    }
-                }
-
-                if (_Data.BytesNotRead < _Beginrefill)
-                {
-                    _EventDecode.Set();
-                    _Waiting = false;
-                }
-                else
-                    _Waiting = true;
-
-                float latency = buf.Length / _BytesPerSecond + CConfig.AudioLatency / 1000f;
-                float time = _TimeCode - _Data.BytesNotRead / _BytesPerSecond - latency;
-
-                if (!_NoMoreData)
-                    _CurrentTime = _SyncTimer.Update(time);
-            }
-
-            try
-            {
-                Marshal.Copy(buf, 0, output, (int)frameCount * _ByteCount);
-            }
-            catch (Exception e)
-            {
-                CLog.LogError("Error PortAudio.StreamCallback: " + e.Message);
-            }
-
-            return CPortAudio.EPaStreamCallbackResult.PaContinue;
-        }
-        #endregion Callbacks
-
-        private bool _ErrorCheck(String action, CPortAudio.EPaError errorCode)
-        {
-            if (errorCode != CPortAudio.EPaError.PaNoError)
-            {
-                if (errorCode == CPortAudio.EPaError.PaStreamIsNotStopped)
-                    return false;
-
-                CLog.LogError(action + " error (playback): " + CPortAudio.PaGetErrorText(errorCode));
-                if (errorCode == CPortAudio.EPaError.PaUnanticipatedHostError)
-                {
-                    CPortAudio.SPaHostErrorInfo errorInfo = CPortAudio.PaGetLastHostErrorInfo();
-                    CLog.LogError("- Host error API type: " + errorInfo.HostApiType);
-                    CLog.LogError("- Host error code: " + errorInfo.ErrorCode);
-                    CLog.LogError("- Host error text: " + errorInfo.ErrorText);
-                }
-                return true;
-            }
-
-            return false;
-        }
-
-        private int _ApiSelect()
-        {
-            if (!_Initialized)
-                return 0;
-
-            int selectedHostApi = CPortAudio.Pa_GetDefaultHostApi();
-            int apiCount = CPortAudio.Pa_GetHostApiCount();
-            for (int i = 0; i < apiCount; i++)
-            {
-                CPortAudio.SPaHostApiInfo apiInfo = CPortAudio.PaGetHostApiInfo(i);
-                if ((apiInfo.Type == CPortAudio.EPaHostApiTypeId.PaDirectSound)
-                    || (apiInfo.Type == CPortAudio.EPaHostApiTypeId.PaALSA))
-                    selectedHostApi = i;
-            }
-            return selectedHostApi;
-        }
-
-        private void _Update()
-        {
-            if (_Fading != null)
-            {
-                bool finished;
-                _Volume = _Fading.GetValue(out finished);
-                if (finished)
-                {
-                    switch (_AfterFadeAction)
-                    {
-                        case EStreamAction.Close:
-                            _Terminated = true;
-                            break;
-                        case EStreamAction.Stop:
-                            Stop();
-                            break;
-                        case EStreamAction.Pause:
-                            Paused = true;
-                            break;
-                    }
-                    _Fading = null;
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_EventDecode != null)
-            {
-                _EventDecode.Close();
-                _EventDecode = null;
-                GC.SuppressFinalize(this);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/CPortAudioRecord.cs b/Vocaluxe/Lib/Sound/CPortAudioRecord.cs
deleted file mode 100644
index 37d6c808..00000000
--- a/Vocaluxe/Lib/Sound/CPortAudioRecord.cs
+++ /dev/null
@@ -1,356 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System.Collections.ObjectModel;
-using System.Threading;
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using Vocaluxe.Base;
-using Vocaluxe.Lib.Sound.PortAudio;
-
-namespace Vocaluxe.Lib.Sound
-{
-    class CPortAudioRecord : IRecord
-    {
-        private bool _Initialized;
-        private List<CRecordDevice> _Devices;
-
-        private CPortAudio.PaStreamCallbackDelegate _MyRecProc;
-        private IntPtr[] _RecHandle;
-
-        private readonly CBuffer[] _Buffer;
-
-        public CPortAudioRecord()
-        {
-            _Devices = null;
-
-            _Buffer = new CBuffer[CSettings.MaxNumPlayer];
-            for (int i = 0; i < _Buffer.Length; i++)
-                _Buffer[i] = new CBuffer();
-
-            Init();
-        }
-
-        /// <summary>
-        ///     Init PortAudio and list record devices
-        /// </summary>
-        /// <returns>true if success</returns>
-        public bool Init()
-        {
-            _Devices = new List<CRecordDevice>();
-
-            try
-            {
-                if (_Initialized)
-                    CloseAll();
-
-                if (_ErrorCheck("Initialize", CPortAudio.Pa_Initialize()))
-                    return false;
-
-                _Initialized = true;
-                int hostAPI = _ApiSelect();
-
-                int numDevices = CPortAudio.Pa_GetDeviceCount();
-                for (int i = 0; i < numDevices; i++)
-                {
-                    CPortAudio.SPaDeviceInfo info = CPortAudio.PaGetDeviceInfo(i);
-                    if (info.HostApi == hostAPI && info.MaxInputChannels > 0)
-                    {
-                        var dev = new CRecordDevice {ID = i, Name = info.Name, Driver = info.Name + i, Channels = info.MaxInputChannels};
-
-                        if (dev.Channels > 2)
-                            dev.Channels = 2; //more are not supported in vocaluxe
-
-                        _Devices.Add(dev);
-                    }
-                }
-
-                _RecHandle = new IntPtr[_Devices.Count];
-                _MyRecProc = _MyPaStreamCallback;
-            }
-            catch (Exception e)
-            {
-                _Initialized = false;
-                CLog.LogError("Error initializing PortAudio: " + e.Message);
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        ///     Start Voice Capturing
-        /// </summary>
-        /// <returns></returns>
-        public bool Start()
-        {
-            if (!_Initialized)
-                return false;
-
-            if (_RecHandle == null || _RecHandle.Length == 0)
-                return false;
-
-            foreach (CBuffer buffer in _Buffer)
-                buffer.Reset();
-
-            foreach (IntPtr handle in _RecHandle)
-            {
-                int waitcount = 0;
-                while (waitcount < 5 && CPortAudio.Pa_IsStreamStopped(handle) == CPortAudio.EPaError.PaStreamIsNotStopped)
-                {
-                    Thread.Sleep(1);
-                    waitcount++;
-                }
-            }
-
-            for (int i = 0; i < _RecHandle.Length; i++)
-                _RecHandle[i] = IntPtr.Zero;
-
-            var active = new bool[_Devices.Count];
-            for (int dev = 0; dev < _Devices.Count; dev++)
-            {
-                active[dev] = false;
-                if (_Devices[dev].PlayerChannel1 > 0 || _Devices[dev].PlayerChannel2 > 0)
-                    active[dev] = true;
-            }
-
-            for (int i = 0; i < _RecHandle.Length; i++)
-            {
-                if (active[i])
-                {
-                    var inputParams = new CPortAudio.SPaStreamParameters
-                        {
-                            ChannelCount = _Devices[i].Channels,
-                            Device = _Devices[i].ID,
-                            SampleFormat = CPortAudio.EPaSampleFormat.PaInt16,
-                            SuggestedLatency = CPortAudio.PaGetDeviceInfo(_Devices[i].ID).DefaultLowInputLatency
-                        };
-
-                    if (_ErrorCheck("OpenStream (rec)", CPortAudio.Pa_OpenStream(
-                        out _RecHandle[i],
-                        ref inputParams,
-                        IntPtr.Zero,
-                        44100,
-                        882,
-                        CPortAudio.EPaStreamFlags.PaNoFlag,
-                        _MyRecProc,
-                        new IntPtr(i))))
-                        return false;
-
-                    if (_ErrorCheck("Start Stream (rec)", CPortAudio.Pa_StartStream(_RecHandle[i])))
-                        return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        ///     Stop Voice Capturing
-        /// </summary>
-        /// <returns></returns>
-        public bool Stop()
-        {
-            if (!_Initialized)
-                return false;
-
-            foreach (IntPtr handle in _RecHandle)
-                CPortAudio.Pa_StopStream(handle);
-            return true;
-        }
-
-        /// <summary>
-        ///     Stop all voice capturing streams and terminate PortAudio
-        /// </summary>
-        public void CloseAll()
-        {
-            Stop();
-
-            if (_Initialized)
-            {
-                CPortAudio.Pa_Terminate();
-                _Initialized = false;
-            }
-
-            //System.IO.File.WriteAllBytes("test0.raw", _Buffer[0].Buffer);
-        }
-
-        /// <summary>
-        ///     Detect Pitch and Volume of the newest voice buffer
-        /// </summary>
-        /// <param name="player"></param>
-        public void AnalyzeBuffer(int player)
-        {
-            if (!_Initialized)
-                return;
-
-            _Buffer[player].AnalyzeBuffer();
-        }
-
-        public int GetToneAbs(int player)
-        {
-            if (!_Initialized)
-                return 0;
-
-            return _Buffer[player].ToneAbs;
-        }
-
-        public int GetTone(int player)
-        {
-            if (!_Initialized)
-                return 0;
-
-            return _Buffer[player].Tone;
-        }
-
-        public void SetTone(int player, int tone)
-        {
-            if (!_Initialized)
-                return;
-
-            _Buffer[player].Tone = tone;
-        }
-
-        public float GetMaxVolume(int player)
-        {
-            if (!_Initialized)
-                return 0f;
-
-            return _Buffer[player].MaxVolume;
-        }
-
-        public bool ToneValid(int player)
-        {
-            if (!_Initialized)
-                return false;
-
-            return _Buffer[player].ToneValid;
-        }
-
-        public int NumHalfTones(int player)
-        {
-            if (!_Initialized)
-                return 0;
-
-            return CBuffer.NumHalfTones;
-        }
-
-        public float[] ToneWeigth(int player)
-        {
-            if (!_Initialized)
-                return null;
-
-            return _Buffer[player].ToneWeigth;
-        }
-
-        public ReadOnlyCollection<CRecordDevice> RecordDevices()
-        {
-            if (!_Initialized)
-                return null;
-
-            if (_Devices.Count == 0)
-                return null;
-
-            return _Devices.AsReadOnly();
-        }
-
-        private CPortAudio.EPaStreamCallbackResult _MyPaStreamCallback(
-            IntPtr input,
-            IntPtr output,
-            uint frameCount,
-            ref CPortAudio.SPaStreamCallbackTimeInfo timeInfo,
-            CPortAudio.EPaStreamCallbackFlags statusFlags,
-            IntPtr userData)
-        {
-            try
-            {
-                frameCount *= 4;
-                if (frameCount > 0 && input != IntPtr.Zero)
-                {
-                    var recbuffer = new byte[frameCount];
-                    var leftBuffer = new byte[frameCount / 2];
-                    var rightBuffer = new byte[frameCount / 2];
-
-                    // copy from managed to unmanaged memory
-                    Marshal.Copy(input, recbuffer, 0, (int)frameCount);
-
-                    // copy into left/right Buffer
-                    for (int i = 0; i < frameCount / 2; i++)
-                    {
-                        leftBuffer[i] = recbuffer[i * 2 - (i % 2)];
-                        rightBuffer[i] = recbuffer[i * 2 - (i % 2) + 2];
-                    }
-
-                    for (int i = 0; i < _RecHandle.Length; i++)
-                    {
-                        if (new IntPtr(i) == userData)
-                        {
-                            if (_Devices[i].PlayerChannel1 > 0)
-                                _Buffer[_Devices[i].PlayerChannel1 - 1].ProcessNewBuffer(leftBuffer);
-
-                            if (_Devices[i].PlayerChannel2 > 0)
-                                _Buffer[_Devices[i].PlayerChannel2 - 1].ProcessNewBuffer(rightBuffer);
-
-                            break;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                CLog.LogError("Error on Stream Callback (rec): " + e);
-            }
-
-            return CPortAudio.EPaStreamCallbackResult.PaContinue;
-        }
-
-        private bool _ErrorCheck(String action, CPortAudio.EPaError errorCode)
-        {
-            if (errorCode != CPortAudio.EPaError.PaNoError)
-            {
-                CLog.LogError(action + " error (rec): " + CPortAudio.PaGetErrorText(errorCode));
-                if (errorCode == CPortAudio.EPaError.PaUnanticipatedHostError)
-                {
-                    CPortAudio.SPaHostErrorInfo errorInfo = CPortAudio.PaGetLastHostErrorInfo();
-                    CLog.LogError("- Host error API type: " + errorInfo.HostApiType);
-                    CLog.LogError("- Host error code: " + errorInfo.ErrorCode);
-                    CLog.LogError("- Host error text: " + errorInfo.ErrorText);
-                }
-                return true;
-            }
-
-            return false;
-        }
-
-        private int _ApiSelect()
-        {
-            if (!_Initialized)
-                return 0;
-
-            int selectedHostApi = CPortAudio.Pa_GetDefaultHostApi();
-            int apiCount = CPortAudio.Pa_GetHostApiCount();
-            for (int i = 0; i < apiCount; i++)
-            {
-                CPortAudio.SPaHostApiInfo apiInfo = CPortAudio.PaGetHostApiInfo(i);
-                if ((apiInfo.Type == CPortAudio.EPaHostApiTypeId.PaDirectSound)
-                    || (apiInfo.Type == CPortAudio.EPaHostApiTypeId.PaALSA))
-                    selectedHostApi = i;
-            }
-            return selectedHostApi;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs b/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs
deleted file mode 100644
index e4db4114..00000000
--- a/Vocaluxe/Lib/Sound/Gstreamer/CGstreamerAudioWrapper.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System.Runtime.InteropServices;
-
-namespace Vocaluxe.Lib.Sound.Gstreamer
-{
-    public static class CGstreamerAudioWrapper
-    {
-        #region arch
-#if ARCH_X86
-#if WIN
-        private const string _Dll = "x86\\gstreamer\\GstreamerHelper.dll";
-#endif
-#endif
-
-#if ARCH_X64
-#if WIN
-        private const string _Dll = "x64\\gstreamer\\GstreamerHelper.dll";
-#endif
-#endif
-        #endregion arch
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void LogCallback(string message);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetLogCallback(LogCallback c);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool Init();
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetGlobalVolume(float volume);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GetStreamCount();
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void CloseAll();
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Load(string media);
-
-        [DllImport(_Dll, EntryPoint = "LoadPrescan", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Load(string media,
-                                      [MarshalAs(UnmanagedType.U1)] bool prescan);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Close(int stream);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Play(int stream);
-
-        [DllImport(_Dll, EntryPoint = "PlayLoop")]
-        public static extern void Play(int stream,
-                                       [MarshalAs(UnmanagedType.U1)] bool loop);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Pause(int stream);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Stop(int stream);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Fade(int stream, float targetVolume, float seconds);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void FadeAndPause(int stream, float targetVolume, float seconds);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void FadeAndStop(int stream, float targetVolume, float seconds);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetStreamVolume(int stream, float volume);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetStreamVolumeMax(int stream, float volume);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern float GetLength(int stream);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern float GetPosition(int stream);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool IsPlaying(int stream);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool IsPaused(int stream);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool IsFinished(int stream);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetPosition(int stream, float position);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Update();
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/IPlayback.cs b/Vocaluxe/Lib/Sound/IPlayback.cs
deleted file mode 100644
index 22d7d7b7..00000000
--- a/Vocaluxe/Lib/Sound/IPlayback.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-namespace Vocaluxe.Lib.Sound
-{
-    public enum EStreamAction
-    {
-        Nothing,
-        Pause,
-        Stop,
-        Close
-    }
-
-    struct SAudioStreams
-    {
-        public int Handle;
-
-        public SAudioStreams(int stream)
-        {
-            Handle = stream;
-        }
-    }
-
-    delegate void Closeproc(int streamID);
-
-    interface IPlayback
-    {
-        bool Init();
-        void SetGlobalVolume(float volume);
-        int GetStreamCount();
-        void CloseAll();
-
-        #region Stream Handling
-        int Load(string media);
-        int Load(string media, bool prescan);
-        void Close(int stream);
-
-        void Play(int stream);
-        void Play(int stream, bool loop);
-        void Pause(int stream);
-        void Stop(int stream);
-        void Fade(int stream, float targetVolume, float seconds);
-        void FadeAndPause(int stream, float targetVolume, float seconds);
-        void FadeAndClose(int stream, float targetVolume, float seconds);
-        void FadeAndStop(int stream, float targetVolume, float seconds);
-        void SetStreamVolume(int stream, float volume);
-        void SetStreamVolumeMax(int stream, float volume);
-
-        float GetLength(int stream);
-        float GetPosition(int stream);
-
-        bool IsPlaying(int stream);
-        bool IsPaused(int stream);
-        bool IsFinished(int stream);
-
-        void SetPosition(int stream, float position);
-
-        void Update();
-        #endregion Stream Handling
-    }
-
-    class CRingBuffer
-    {
-        private readonly byte[] _Data;
-        private readonly long _Size;
-        private long _ReadPos;
-        private long _WritePos;
-        private long _BytesNotRead;
-
-        public long BytesNotRead
-        {
-            get { return _BytesNotRead; }
-        }
-
-        public CRingBuffer(long size)
-        {
-            _Size = size;
-            _Data = new byte[size];
-            _ReadPos = 0L;
-            _WritePos = 0L;
-            _BytesNotRead = 0L;
-        }
-
-        public void Write(byte[] data)
-        {
-            long written = 0L;
-            while (written < data.Length)
-            {
-                _Data[_WritePos] = data[written];
-                _WritePos++;
-                if (_WritePos >= _Size)
-                    _WritePos = 0L;
-
-                written++;
-                _BytesNotRead++;
-            }
-        }
-
-        public void Read(byte[] data)
-        {
-            long read = 0L;
-            while (read < data.Length && _BytesNotRead > 0L)
-            {
-                data[read] = _Data[_ReadPos];
-                _ReadPos++;
-                if (_ReadPos >= _Size)
-                    _ReadPos = 0L;
-
-                read++;
-                _BytesNotRead--;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/IRecord.cs b/Vocaluxe/Lib/Sound/IRecord.cs
deleted file mode 100644
index f4568a93..00000000
--- a/Vocaluxe/Lib/Sound/IRecord.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System;
-using System.Collections.ObjectModel;
-
-namespace Vocaluxe.Lib.Sound
-{
-    class CRecordDevice
-    {
-        public int ID;
-        public string Name;
-        public string Driver;
-
-        public int Channels;
-        public int PlayerChannel1;
-        public int PlayerChannel2;
-    }
-
-    struct SMicConfig
-    {
-        public string DeviceName;
-        public string DeviceDriver;
-        public int Channel;
-
-        // ReSharper disable UnusedParameter.Local
-        public SMicConfig(int dummy)
-            // ReSharper restore UnusedParameter.Local
-        {
-            DeviceName = String.Empty;
-            DeviceDriver = String.Empty;
-            Channel = 0;
-        }
-    }
-
-    interface IRecord
-    {
-        bool Init();
-        void CloseAll();
-
-        bool Start();
-        bool Stop();
-        void AnalyzeBuffer(int player);
-
-        int GetToneAbs(int player);
-        int GetTone(int player);
-        void SetTone(int player, int tone);
-        float GetMaxVolume(int player);
-        bool ToneValid(int player);
-        int NumHalfTones(int player);
-        float[] ToneWeigth(int player);
-
-        ReadOnlyCollection<CRecordDevice> RecordDevices();
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs b/Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs
new file mode 100644
index 00000000..d8046b4d
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/CAudioStreamBase.cs
@@ -0,0 +1,120 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using VocaluxeLib;
+
+namespace Vocaluxe.Lib.Sound.Playback
+{
+    abstract class CAudioStreamBase : IAudioStream
+    {
+        private readonly int _ID;
+        protected readonly string _Medium;
+        protected readonly bool _Loop;
+
+        protected ICloseStreamListener _CloseStreamListener;
+
+        protected EStreamAction _AfterFadeAction = EStreamAction.Nothing;
+        protected CFading _Fading;
+
+        public int ID
+        {
+            get { return _ID; }
+        }
+
+        public virtual float Volume { get; set; }
+        public virtual float VolumeMax { get; set; }
+        public virtual float Length { get; protected set; }
+        public abstract float Position { get; set; }
+        public abstract bool IsPaused { get; set; }
+        public abstract bool IsFinished { get; }
+
+        public CAudioStreamBase(int id, string medium, bool loop)
+        {
+            _ID = id;
+            _Medium = medium;
+            _Loop = loop;
+        }
+
+        ~CAudioStreamBase()
+        {
+            _Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            _Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void _Dispose(bool disposing)
+        {
+            if (!disposing)
+                CBase.Log.LogDebug("Audio stream " + _Medium + " was not closed.");
+        }
+
+        public void Close()
+        {
+            Dispose();
+        }
+
+        public void SetOnCloseListener(ICloseStreamListener listener)
+        {
+            _CloseStreamListener = listener;
+        }
+
+        public void Fade(float targetVolume, float seconds, EStreamAction afterFadeAction)
+        {
+            _Fading = new CFading(Volume, targetVolume, seconds);
+            _AfterFadeAction = afterFadeAction;
+        }
+
+        public void CancelFading()
+        {
+            _Fading = null;
+        }
+
+        public virtual void Update()
+        {
+            if (_Fading != null)
+            {
+                bool finished;
+                Volume = _Fading.GetValue(out finished);
+                if (finished)
+                {
+                    switch (_AfterFadeAction)
+                    {
+                        case EStreamAction.Close:
+                            Close();
+                            break;
+                        case EStreamAction.Stop:
+                            Stop();
+                            break;
+                        case EStreamAction.Pause:
+                            IsPaused = true;
+                            break;
+                    }
+                    _Fading = null;
+                }
+            }
+        }
+
+        public abstract bool Open(bool prescan);
+        public abstract void Play();
+        public abstract void Stop();
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs b/Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs
new file mode 100644
index 00000000..05f5a35f
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/CPlaybackBase.cs
@@ -0,0 +1,323 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System.Collections.Generic;
+using System.Threading;
+using VocaluxeLib;
+
+namespace Vocaluxe.Lib.Sound.Playback
+{
+    public abstract class CPlaybackBase : IPlayback, ICloseStreamListener
+    {
+        protected bool _Initialized;
+        protected readonly List<IAudioStream> _Streams = new List<IAudioStream>();
+        private readonly List<IAudioStream> _StreamsToDelete = new List<IAudioStream>();
+        private bool _InUpdate;
+        private int _NextID;
+        protected float _GlobalVolume = 1f;
+
+        public abstract bool Init();
+
+        public virtual void Close()
+        {
+            if (!_Initialized)
+                return;
+            List<IAudioStream> streams = new List<IAudioStream>();
+            //Get all streams but do not modify list without holding the lock
+            //Calling dispose from within the lock may deadlock in closeproc (if a thread is already there)
+            lock (_Streams)
+            {
+                streams.AddRange(_Streams);
+            }
+            foreach (IAudioStream stream in streams)
+                stream.Dispose();
+            while (_Streams.Count > 0)
+                Thread.Sleep(5);
+            _Initialized = false;
+        }
+
+        public void CloseAll()
+        {
+            if (!_Initialized)
+                return;
+            lock (_Streams)
+            {
+                foreach (IAudioStream stream in _Streams)
+                    stream.Close();
+                _Streams.Clear();
+            }
+        }
+
+        public float GetGlobalVolume()
+        {
+            return (_Initialized) ? _GlobalVolume * 100f : 100f;
+        }
+
+        public void SetGlobalVolume(float volume)
+        {
+            if (!_Initialized)
+                return;
+            volume = volume.Clamp(0f, 100f) / 100f;
+            foreach (IAudioStream stream in _Streams)
+                stream.VolumeMax = volume;
+            _GlobalVolume = volume;
+        }
+
+        public int GetStreamCount()
+        {
+            if (!_Initialized)
+                return 0;
+
+            lock (_Streams)
+            {
+                return _Streams.Count;
+            }
+        }
+
+        public void Update()
+        {
+            if (!_Initialized)
+                return;
+            lock (_Streams)
+            {
+                _InUpdate = true;
+                foreach (IAudioStream stream in _Streams)
+                    stream.Update();
+                //This is required because a stream may call the close listener from inside the update method
+                //lock() only protects from different threads not from the same, so we use StreamsToDelete to not modify _Streams while iterating it
+                _InUpdate = false;
+                if (_StreamsToDelete.Count > 0)
+                {
+                    foreach (IAudioStream stream in _StreamsToDelete)
+                        _Streams.Remove(stream);
+                    _StreamsToDelete.Clear();
+                }
+            }
+        }
+
+        #region Stream Handling
+        //Factory method to get a stream instance
+        protected abstract IAudioStream _CreateStream(int id, string media, bool loop);
+
+        public int Load(string medium, bool loop = false, bool prescan = false)
+        {
+            if (!_Initialized)
+                return -1;
+            IAudioStream stream = _CreateStream(_NextID, medium, loop);
+
+            if (stream.Open(prescan))
+            {
+                lock (_Streams)
+                {
+                    stream.Volume = 1f;
+                    stream.VolumeMax = _GlobalVolume;
+                    stream.SetOnCloseListener(this);
+                    _Streams.Add(stream);
+                    _NextID++;
+                    return stream.ID;
+                }
+            }
+            return -1;
+        }
+
+        public void Close(int streamID)
+        {
+            if (!_Initialized)
+                return;
+            lock (_Streams)
+            {
+                int index = _GetStreamIndex(streamID);
+                if (index >= 0)
+                {
+                    _Streams[index].Close();
+                    _Streams.RemoveAt(index);
+                }
+            }
+        }
+
+        public void Play(int streamID)
+        {
+            if (!_Initialized)
+                return;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    _Streams[_GetStreamIndex(streamID)].Play();
+            }
+        }
+
+        public void Pause(int streamID)
+        {
+            if (!_Initialized)
+                return;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    _Streams[_GetStreamIndex(streamID)].IsPaused = true;
+            }
+        }
+
+        public void Stop(int streamID)
+        {
+            if (!_Initialized)
+                return;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    _Streams[_GetStreamIndex(streamID)].Stop();
+            }
+        }
+
+        public void Fade(int streamID, float targetVolume, float seconds, EStreamAction afterFadeAction = EStreamAction.Nothing)
+        {
+            if (!_Initialized)
+                return;
+            targetVolume = targetVolume.Clamp(0f, 100f) / 100f;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    _Streams[_GetStreamIndex(streamID)].Fade(targetVolume, seconds, afterFadeAction);
+            }
+        }
+
+        public void SetStreamVolume(int streamID, float volume)
+        {
+            if (!_Initialized)
+                return;
+            volume = volume.Clamp(0f, 100f) / 100f;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                {
+                    _Streams[_GetStreamIndex(streamID)].Volume = volume;
+                    _Streams[_GetStreamIndex(streamID)].CancelFading();
+                }
+            }
+        }
+
+        public float GetLength(int streamID)
+        {
+            if (!_Initialized)
+                return -1f;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    return _Streams[_GetStreamIndex(streamID)].Length;
+            }
+            return -1f;
+        }
+
+        public float GetPosition(int streamID)
+        {
+            if (!_Initialized)
+                return -1f;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    return _Streams[_GetStreamIndex(streamID)].Position;
+            }
+
+            return -1f;
+        }
+
+        public void SetPosition(int streamID, float position)
+        {
+            if (!_Initialized)
+                return;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    _Streams[_GetStreamIndex(streamID)].Position = position;
+            }
+        }
+
+        public bool IsPlaying(int streamID)
+        {
+            if (!_Initialized)
+                return false;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    return !_Streams[_GetStreamIndex(streamID)].IsPaused && !_Streams[_GetStreamIndex(streamID)].IsFinished;
+            }
+            return false;
+        }
+
+        public bool IsPaused(int streamID)
+        {
+            if (!_Initialized)
+                return false;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    return _Streams[_GetStreamIndex(streamID)].IsPaused;
+            }
+            return false;
+        }
+
+        public bool IsFinished(int streamID)
+        {
+            if (!_Initialized)
+                return true;
+            lock (_Streams)
+            {
+                if (_StreamExists(streamID))
+                    return _Streams[_GetStreamIndex(streamID)].IsFinished;
+            }
+            return true;
+        }
+
+        /// <summary>
+        ///     Returns true if stream with given id is found
+        ///     MUST hold _Stream-lock
+        /// </summary>
+        /// <param name="streamID">Stream id</param>
+        /// <returns></returns>
+        protected bool _StreamExists(int streamID)
+        {
+            return _GetStreamIndex(streamID) != -1;
+        }
+
+        /// <summary>
+        ///     Returns the index of the stream with the given id
+        ///     MUST hold _Stream-lock
+        /// </summary>
+        /// <param name="streamID">Stream id</param>
+        /// <returns></returns>
+        protected int _GetStreamIndex(int streamID)
+        {
+            for (int i = 0; i < _Streams.Count; i++)
+            {
+                if (_Streams[i].ID == streamID)
+                    return i;
+            }
+            return -1;
+        }
+        #endregion Stream Handling
+
+        public void OnCloseStream(IAudioStream stream)
+        {
+            lock (_Streams)
+            {
+                if (_InUpdate) //This is only possible if this is called from inside the update method
+                    _StreamsToDelete.Add(stream);
+                else
+                    _Streams.Remove(stream);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/CRingBuffer.cs b/Vocaluxe/Lib/Sound/Playback/CRingBuffer.cs
new file mode 100644
index 00000000..2d1c4dc7
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/CRingBuffer.cs
@@ -0,0 +1,96 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+
+namespace Vocaluxe.Lib.Sound.Playback
+{
+    class CRingBuffer
+    {
+        private readonly byte[] _Data;
+        private readonly int _Size;
+        private int _ReadPos;
+        private int _WritePos;
+        private int _BytesNotRead;
+
+        public int BytesNotRead
+        {
+            get { return _BytesNotRead; }
+        }
+
+        public CRingBuffer(int size)
+        {
+            _Size = size;
+            _Data = new byte[size];
+            Reset();
+        }
+
+        public void Reset()
+        {
+            _ReadPos = 0;
+            _WritePos = 0;
+            _BytesNotRead = 0;
+        }
+
+        public void Write(byte[] data)
+        {
+            int start = 0;
+            int end = data.Length;
+            if (end - start > _Size)
+                start = end - _Size;
+            int lenTotal = end - start;
+            int len = Math.Min(lenTotal, _Size - _WritePos);
+            Buffer.BlockCopy(data, start, _Data, _WritePos, len);
+            _WritePos += len;
+            if (_WritePos >= _Size)
+            {
+                _WritePos = 0;
+                start += len;
+                len = end - start;
+                if (len > 0)
+                {
+                    Buffer.BlockCopy(data, start, _Data, _WritePos, len);
+                    _WritePos += len;
+                }
+            }
+            _BytesNotRead += lenTotal;
+        }
+
+        public void Read(byte[] data)
+        {
+            int lenTotal = Math.Min(data.Length, _BytesNotRead);
+            if (lenTotal == 0)
+                return;
+
+            int len = Math.Min(lenTotal, _Size - _ReadPos);
+            Buffer.BlockCopy(_Data, _ReadPos, data, 0, len);
+            _ReadPos += len;
+            if (_ReadPos >= _Size)
+            {
+                _ReadPos = 0;
+                int start = len;
+                len = lenTotal - len;
+                if (len > 0)
+                {
+                    Buffer.BlockCopy(_Data, _ReadPos, data, start, len);
+                    _ReadPos += len;
+                }
+            }
+            _BytesNotRead -= lenTotal;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs b/Vocaluxe/Lib/Sound/Playback/Decoder/CAudioDecoderFFmpeg.cs
similarity index 94%
rename from Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs
rename to Vocaluxe/Lib/Sound/Playback/Decoder/CAudioDecoderFFmpeg.cs
index d1503dfc..505b3604 100644
--- a/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs
+++ b/Vocaluxe/Lib/Sound/Playback/Decoder/CAudioDecoderFFmpeg.cs
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Video.Acinerella;
 
-namespace Vocaluxe.Lib.Sound.Decoder
+namespace Vocaluxe.Lib.Sound.Playback.Decoder
 {
     class CAudioDecoderFFmpeg : IAudioDecoder, IDisposable
     {
@@ -34,9 +34,7 @@ namespace Vocaluxe.Lib.Sound.Decoder
         private string _FileName;
         private bool _FileOpened;
 
-        public void Init() {}
-
-        public void Open(string fileName)
+        public bool Open(string fileName)
         {
             _FileName = fileName;
 
@@ -49,14 +47,15 @@ namespace Vocaluxe.Lib.Sound.Decoder
             catch (Exception)
             {
                 CLog.LogError("Error opening audio file: " + _FileName);
-                return;
+                Close();
+                return false;
             }
 
 
             if (!_Instance.Opened)
             {
                 Close();
-                return;
+                return false;
             }
 
             int audioStreamIndex;
@@ -71,13 +70,13 @@ namespace Vocaluxe.Lib.Sound.Decoder
             {
                 CLog.LogError("Error opening audio file (can't find decoder): " + _FileName);
                 Close();
-                return;
+                return false;
             }
 
             if (audioStreamIndex < 0)
             {
                 Close();
-                return;
+                return false;
             }
 
             _FormatInfo = new SFormatInfo
@@ -93,9 +92,10 @@ namespace Vocaluxe.Lib.Sound.Decoder
             {
                 CLog.LogError("Unsupported BitDepth in file " + fileName);
                 Close();
-                return;
+                return false;
             }
             _FileOpened = true;
+            return true;
         }
 
         public void Close()
diff --git a/Vocaluxe/Lib/Sound/Decoder/IAudioDecoder.cs b/Vocaluxe/Lib/Sound/Playback/Decoder/IAudioDecoder.cs
similarity index 92%
rename from Vocaluxe/Lib/Sound/Decoder/IAudioDecoder.cs
rename to Vocaluxe/Lib/Sound/Playback/Decoder/IAudioDecoder.cs
index 7308ba09..98505b37 100644
--- a/Vocaluxe/Lib/Sound/Decoder/IAudioDecoder.cs
+++ b/Vocaluxe/Lib/Sound/Playback/Decoder/IAudioDecoder.cs
@@ -15,7 +15,7 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
-namespace Vocaluxe.Lib.Sound.Decoder
+namespace Vocaluxe.Lib.Sound.Playback.Decoder
 {
     struct SFormatInfo
     {
@@ -26,10 +26,9 @@ namespace Vocaluxe.Lib.Sound.Decoder
 
     interface IAudioDecoder
     {
-        void Init();
         void Close();
 
-        void Open(string fileName);
+        bool Open(string fileName);
         SFormatInfo GetFormatInfo();
 
         float GetLength();
diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
new file mode 100644
index 00000000..651dcd21
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
@@ -0,0 +1,56 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using Gst;
+
+namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
+{
+    public class CGstreamerSharpAudio : CPlaybackBase
+    {
+        public override bool Init()
+        {
+            if (_Initialized)
+                return false;
+#if ARCH_X86
+            const string path = ".\\x86\\gstreamer";
+#endif
+#if ARCH_X64
+            const string path = ".\\x64\\gstreamer";
+#endif
+            //SetDllDirectory(path);
+            Application.Init();
+            Registry reg = Registry.Get();
+            reg.ScanPath(path);
+
+            _Initialized = Application.IsInitialized;
+            return _Initialized;
+        }
+
+        public override void Close()
+        {
+            if (!_Initialized)
+                return;
+            base.Close();
+            Application.Deinit();
+        }
+
+        protected override IAudioStream _CreateStream(int id, string media, bool loop)
+        {
+            return new CGstreamerSharpAudioStream(id, media, loop);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
new file mode 100644
index 00000000..d7ac9f72
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudioStream.cs
@@ -0,0 +1,278 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using GLib;
+using Gst;
+using Vocaluxe.Base;
+
+namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
+{
+    class CGstreamerSharpAudioStream : CAudioStreamBase
+    {
+        private Element _Element;
+        private bool _FileOpened;
+
+        private volatile bool _IsFinished;
+
+        private volatile float _Position;
+
+        private readonly object _ElementLock = new object(); //Hold this if you set _Element=null or when accessing _Element from outside the main thread
+
+        public override float Volume
+        {
+            get { return base.Volume; }
+            set
+            {
+                base.Volume = value;
+                _SetElementVolume();
+            }
+        }
+
+        public override float VolumeMax
+        {
+            get { return base.VolumeMax; }
+            set
+            {
+                base.VolumeMax = value;
+                _SetElementVolume();
+            }
+        }
+
+        public override float Length
+        {
+            get
+            {
+                //TODO: Is it ok, to remove this? Gst should post a message if duration was changed so this should not be required
+                //if (base.Length < 0 && _Element != null)
+                //    _UpdateDuration();
+                return base.Length >= 0f ? base.Length : 0f;
+            }
+        }
+
+        public override float Position
+        {
+            get
+            {
+                if (_Element != null)
+                {
+                    long position;
+                    if (!_Element.QueryPosition(Format.Time, out position))
+                        CLog.LogError("Could not query position");
+                    else
+                        _Position = ((float)position / Constants.SECOND);
+                }
+                return _Position;
+            }
+            set
+            {
+                if (_Element != null)
+                    _Element.SeekSimple(Format.Time, SeekFlags.Accurate | SeekFlags.Flush, (long)(value * Constants.SECOND));
+            }
+        }
+
+        public override bool IsFinished
+        {
+            get { return _Element == null || _IsFinished; }
+        }
+
+        public override bool IsPaused
+        {
+            get { return _Element == null || _Element.TargetState == State.Paused; }
+            set
+            {
+                if (_Element != null)
+                    _Element.SetState(value ? State.Paused : State.Playing);
+            }
+        }
+
+        public CGstreamerSharpAudioStream(int id, string medium, bool loop) : base(id, medium, loop) {}
+
+        public override bool Open(bool prescan)
+        {
+            System.Diagnostics.Debug.Assert(!_FileOpened);
+            if (_FileOpened)
+                return false;
+            Length = -1;
+            Element convert = ElementFactory.Make("audioconvert", "convert");
+            Element audiosink = ElementFactory.Make("directsoundsink", "audiosink");
+
+            if (convert == null || audiosink == null)
+            {
+                CLog.LogError("Could not create pipeline");
+                if (convert != null)
+                    convert.Dispose();
+                if (audiosink != null)
+                    audiosink.Dispose();
+                return false;
+            }
+
+            var audioSinkBin = new Bin("Audiosink");
+            audioSinkBin.Add(convert);
+            audioSinkBin.Add(audiosink);
+            convert.Link(audiosink);
+            Pad pad = convert.GetStaticPad("sink");
+            GhostPad ghostpad = new GhostPad("sink", pad);
+
+            if (pad == null)
+            {
+                CLog.LogError("Could not create pads");
+                convert.Dispose();
+                audiosink.Dispose();
+                audioSinkBin.Dispose();
+                return false;
+            }
+
+            if (!ghostpad.SetActive(true))
+            {
+                CLog.LogError("Could not link pads");
+                convert.Dispose();
+                audiosink.Dispose();
+                audioSinkBin.Dispose();
+                ghostpad.Dispose();
+                return false;
+            }
+            if (!audioSinkBin.AddPad(ghostpad))
+            {
+                CLog.LogError("Could not add pad");
+                convert.Dispose();
+                audiosink.Dispose();
+                audioSinkBin.Dispose();
+                ghostpad.Dispose();
+                return false;
+            }
+
+            _Element = ElementFactory.Make("playbin", "playbin");
+            if (_Element == null)
+            {
+                CLog.LogError("Could not create playbin");
+                convert.Dispose();
+                audiosink.Dispose();
+                audioSinkBin.Dispose();
+                ghostpad.Dispose();
+                return false;
+            }
+            _Element["audio-sink"] = audioSinkBin;
+            _Element["flags"] = 1 << 1;
+            _Element["uri"] = new Uri(_Medium).AbsoluteUri;
+            _Element.SetState(State.Paused);
+
+            // Passing CLOCK_TIME_NONE here causes the pipeline to block for a long time so with
+            // prescan enabled the pipeline will wait 500ms for stream to initialize and then continue
+            // if it takes more than 500ms, duration queries will be performed asynchronously
+            Message msg = _Element.Bus.TimedPopFiltered(prescan ? ulong.MaxValue : 0L, MessageType.AsyncDone);
+            if (msg.Handle != IntPtr.Zero)
+                _UpdateDuration();
+            _FileOpened = true;
+            return true;
+        }
+
+        protected override void _Dispose(bool disposing)
+        {
+            if (_Element == null)
+                return;
+            Element element;
+            lock (_ElementLock)
+            {
+                //Atomic get and set
+                if (_Element == null)
+                    return;
+                element = _Element;
+                _Element = null; //Now everything "seems" closed
+            }
+            if (element.TargetState == State.Playing)
+                element.SetState(State.Paused); //Stop output
+            if (_CloseStreamListener != null)
+                _CloseStreamListener.OnCloseStream(this);
+            //Now really close it in the background
+            var t = new System.Threading.Thread(() => _TerminateStream(element)) {Name = "GSt Terminate"};
+            t.Start();
+        }
+
+        private static void _TerminateStream(Element element)
+        {
+            if (element == null)
+                return;
+            //One of these might take a bit, so better do this in the background to avoid lags
+            element.SetState(State.Null);
+            element.Dispose();
+        }
+
+        public override void Play()
+        {
+            if (_Element != null)
+                _Element.SetState(State.Playing);
+        }
+
+        public override void Stop()
+        {
+            if (_Element != null)
+                _Element.SetState(State.Ready);
+            Position = 0;
+        }
+
+        private void _SetElementVolume()
+        {
+            if (_Element != null)
+                _Element["volume"] = Volume * VolumeMax;
+        }
+
+        private void _OnMessage(Message msg)
+        {
+            if (msg.Handle == IntPtr.Zero)
+                return;
+            switch (msg.Type)
+            {
+                case MessageType.Eos:
+                    if (_Loop)
+                        Position = 0;
+                    else
+                        _IsFinished = true;
+                    break;
+                case MessageType.Error:
+                    GException error;
+                    string debug;
+                    msg.ParseError(out error, out debug);
+                    CLog.LogError("Gstreamer error: message" + error.Message + ", code" + error.Code + " ,debug information" + debug);
+                    break;
+                case MessageType.DurationChanged:
+                    _UpdateDuration();
+                    break;
+            }
+            msg.Unref();
+        }
+
+        public override void Update()
+        {
+            base.Update();
+            while (_Element != null && _Element.Bus != null && _Element.Bus.HavePending())
+                _OnMessage(_Element.Bus.Pop());
+        }
+
+        private void _UpdateDuration()
+        {
+            lock (_ElementLock)
+            {
+                if (_Element == null)
+                    return;
+                long duration;
+                if (_Element.QueryDuration(Format.Time, out duration))
+                    Length = duration / (float)Constants.SECOND;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/IAudioStream.cs b/Vocaluxe/Lib/Sound/Playback/IAudioStream.cs
new file mode 100644
index 00000000..8ec763fe
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/IAudioStream.cs
@@ -0,0 +1,48 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+
+namespace Vocaluxe.Lib.Sound.Playback
+{
+    public interface ICloseStreamListener
+    {
+        void OnCloseStream(IAudioStream stream);
+    }
+
+    public interface IAudioStream : IDisposable
+    {
+        int ID { get; }
+        float Volume { get; set; }
+        float VolumeMax { get; set; }
+        float Length { get; }
+        float Position { get; set; }
+        bool IsPaused { get; set; }
+        bool IsFinished { get; }
+
+        void SetOnCloseListener(ICloseStreamListener listener);
+
+        void Update();
+
+        bool Open(bool prescan);
+        void Close();
+        void Play();
+        void Stop();
+        void Fade(float targetVolume, float seconds, EStreamAction afterFadeAction);
+        void CancelFading();
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/IPlayback.cs b/Vocaluxe/Lib/Sound/Playback/IPlayback.cs
new file mode 100644
index 00000000..04d9be75
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/IPlayback.cs
@@ -0,0 +1,71 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+namespace Vocaluxe.Lib.Sound.Playback
+{
+    public enum EStreamAction
+    {
+        Nothing,
+        Pause,
+        Stop,
+        Close
+    }
+
+    interface IPlayback
+    {
+        bool Init();
+        void Close();
+        float GetGlobalVolume();
+
+        /// <summary>
+        ///     Set the global (maximum) volume<br />
+        ///     All streams (existent and future ones) will have their maximum volume set to this value
+        /// </summary>
+        /// <param name="volume">Volume in percent</param>
+        void SetGlobalVolume(float volume);
+
+        int GetStreamCount();
+        void CloseAll();
+
+        #region stream Handling
+        int Load(string medium, bool loop = false, bool prescan = false);
+        void Close(int streamID);
+
+        void Play(int streamID);
+        void Pause(int streamID);
+        void Stop(int streamID);
+        void Fade(int streamID, float targetVolume, float seconds, EStreamAction afterFadeAction = EStreamAction.Nothing);
+
+        /// <summary>
+        ///     Set the streams current volume. Cancels fading
+        /// </summary>
+        /// <param name="streamID">Id of the stream (optained by Load)</param>
+        /// <param name="volume">Volume in percent</param>
+        void SetStreamVolume(int streamID, float volume);
+
+        float GetLength(int streamID);
+        float GetPosition(int streamID);
+        void SetPosition(int streamID, float position);
+
+        bool IsPlaying(int streamID);
+        bool IsPaused(int streamID);
+        bool IsFinished(int streamID);
+
+        void Update();
+        #endregion stream Handling
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs b/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs
new file mode 100644
index 00000000..74a3704e
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenALPlay.cs
@@ -0,0 +1,52 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using OpenTK.Audio;
+
+namespace Vocaluxe.Lib.Sound.Playback.OpenAL
+{
+    class COpenALPlay : CPlaybackBase
+    {
+        private AudioContext _Context;
+
+        public override bool Init()
+        {
+            if (_Initialized)
+                return false;
+
+            _Context = new AudioContext();
+            _Context.MakeCurrent();
+
+            _Initialized = true;
+            return true;
+        }
+
+        public override void Close()
+        {
+            if (!_Initialized)
+                return;
+            base.Close();
+            _Context.Dispose();
+            _Context = null;
+        }
+
+        protected override IAudioStream _CreateStream(int id, string media, bool loop)
+        {
+            return new COpenAlStream(id, media, loop);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs b/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs
new file mode 100644
index 00000000..7428b494
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/OpenAL/COpenAlStream.cs
@@ -0,0 +1,392 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using OpenTK.Audio;
+using Vocaluxe.Base;
+using Vocaluxe.Lib.Sound.Playback.Decoder;
+
+namespace Vocaluxe.Lib.Sound.Playback.OpenAL
+{
+    class COpenAlStream : CAudioStreamBase
+    {
+        private const int _BufferCount = 5;
+        private const int _Bufsize = 500000;
+        private const int _BeginRefill = 50000;
+
+        private int[] _Buffers;
+        private byte[] _SampleBuf;
+        private int _Source;
+        private SFormatInfo _Format;
+
+        private readonly Stopwatch _Timer = new Stopwatch();
+
+        private IAudioDecoder _Decoder;
+        private int _ByteCount;
+        private float _BytesPerSecond;
+        private bool _NoMoreData;
+
+        private bool _FileOpened;
+
+        private bool _Skip;
+
+        private float _CurrentTime;
+        private float _TimeCode;
+
+        private bool _Paused;
+
+        private CRingBuffer _Data;
+        private volatile float _SetStart;
+        private float _Start;
+        private volatile bool _SetSkip;
+        private volatile bool _Terminated;
+
+        private Thread _DecoderThread;
+
+        private AutoResetEvent _EventDecode = new AutoResetEvent(false);
+
+        private readonly Object _MutexData = new Object();
+        private readonly Object _MutexSyncSignals = new Object();
+
+        public override bool IsFinished
+        {
+            get
+            {
+                lock (_MutexData)
+                {
+                    return _NoMoreData && _Data.BytesNotRead == 0 && Position >= Length;
+                }
+            }
+        }
+
+        public override float Position
+        {
+            get
+            {
+                float time = _CurrentTime + _Timer.ElapsedMilliseconds / 1000f;
+                if (time > Length)
+                {
+                    _Timer.Stop();
+                    time = Length;
+                }
+                return time;
+            }
+            set
+            {
+                lock (_MutexSyncSignals)
+                {
+                    _SetStart = value;
+                    _SetSkip = true;
+                }
+                //Set position here in case we immediately request it, it will be reset in Update method 
+                _CurrentTime = value;
+                _Timer.Restart();
+                _EventDecode.Set();
+            }
+        }
+
+        public override bool IsPaused
+        {
+            get { return _Paused; }
+            set
+            {
+                _Paused = value;
+                if (_Paused)
+                {
+                    _Timer.Stop();
+                    AL.SourceStop(_Source);
+                }
+                else
+                {
+                    _Timer.Start();
+                    _EventDecode.Set();
+                    AL.SourcePlay(_Source);
+                }
+            }
+        }
+
+        public COpenAlStream(int id, string medium, bool loop) : base(id, medium, loop) {}
+
+        protected override void _Dispose(bool disposing)
+        {
+            base._Dispose(disposing);
+            if (!_Terminated)
+            {
+                _Terminated = true;
+                if (_DecoderThread != null)
+                    _EventDecode.Set();
+                else
+                    _DoFree();
+            }
+        }
+
+        public override void Play()
+        {
+            IsPaused = false;
+        }
+
+        public override void Stop()
+        {
+            IsPaused = true;
+            Position = 0f;
+        }
+
+        public override bool Open(bool prescan)
+        {
+            Debug.Assert(!_FileOpened);
+            if (_FileOpened)
+                return false;
+
+            if (!File.Exists(_Medium))
+            {
+                Dispose();
+                return false;
+            }
+
+            bool ok = true;
+            try
+            {
+                _Source = AL.GenSource();
+                _Buffers = new int[_BufferCount];
+                for (int i = 0; i < _BufferCount; i++)
+                {
+                    _Buffers[i] = AL.GenBuffer();
+                    ok = ok && _Buffers[i] != 0;
+                }
+            }
+            catch (Exception)
+            {
+                ok = false;
+            }
+            if (!ok)
+            {
+                Dispose();
+                CLog.LogError("Error Init OpenAL Playback");
+                return false;
+            }
+
+
+            _Decoder = new CAudioDecoderFFmpeg();
+            if (!_Decoder.Open(_Medium))
+            {
+                Dispose();
+                CLog.LogError("Error opening audio file: " + _Medium);
+                return false;
+            }
+            _Format = _Decoder.GetFormatInfo();
+            if (_Format.SamplesPerSecond == 0)
+            {
+                Dispose();
+                CLog.LogError("Error Init OpenAL Playback (samples=0)");
+                return false;
+            }
+
+            Length = _Decoder.GetLength();
+
+            _ByteCount = 2 * _Format.ChannelCount;
+            _BytesPerSecond = _Format.SamplesPerSecond * _ByteCount;
+
+            _CurrentTime = 0f;
+            _TimeCode = 0f;
+            _Timer.Reset();
+            _Data = new CRingBuffer(_Bufsize);
+            _NoMoreData = false;
+            _SampleBuf = new byte[(int)CConfig.AudioBufferSize];
+            //From now on closing the driver and the decoder is handled by the thread ONLY!
+
+            _DecoderThread = new Thread(_Execute) {Priority = ThreadPriority.Normal, Name = Path.GetFileName(_Medium)};
+            _DecoderThread.Start();
+
+            _FileOpened = true;
+            return true;
+        }
+
+        #region Threading
+        private void _DoSkip()
+        {
+            _Decoder.SetPosition(_Start);
+            _TimeCode = _Start;
+
+            lock (_MutexData)
+            {
+                _Data.Reset();
+                _NoMoreData = false;
+            }
+        }
+
+        private void _Execute()
+        {
+            while (!_Terminated)
+            {
+                lock (_MutexSyncSignals)
+                {
+                    if (_SetSkip)
+                    {
+                        _Skip = true;
+                        _SetSkip = false;
+                    }
+
+                    _Start = _SetStart;
+                }
+
+                if (_Skip)
+                {
+                    _DoSkip();
+                    _Skip = false;
+                }
+
+                _DoDecode();
+                _EventDecode.WaitOne();
+            }
+
+            _DoFree();
+        }
+
+        private void _DoDecode()
+        {
+            if (_Paused || _Terminated || _NoMoreData)
+                return;
+
+            float timecode;
+            byte[] buffer;
+
+            lock (_MutexData)
+            {
+                if (_Data.BytesNotRead > _BeginRefill)
+                    return;
+            }
+
+            _Decoder.Decode(out buffer, out timecode);
+
+            if (buffer == null)
+            {
+                if (_Loop)
+                {
+                    _Start = 0f;
+                    _DoSkip();
+                }
+                else
+                    _NoMoreData = true;
+                return;
+            }
+
+            lock (_MutexData)
+            {
+                _Data.Write(buffer);
+                _TimeCode = timecode;
+                if (_Data.BytesNotRead < _BeginRefill)
+                    _EventDecode.Set();
+            }
+        }
+
+        private void _DoFree()
+        {
+            if (_Source != 0)
+            {
+                AL.SourceStop(_Source);
+                if (_Buffers != null)
+                {
+                    AL.DeleteBuffers(_Buffers);
+                    _Buffers = null;
+                }
+                AL.DeleteSource(_Source);
+                _Source = 0;
+            }
+            if (_DecoderThread != null)
+            {
+                if (Thread.CurrentThread.ManagedThreadId != _DecoderThread.ManagedThreadId)
+                    throw new Exception("Another thread should never free the decoder thread!");
+                _DecoderThread = null;
+            }
+            if (_Decoder != null)
+            {
+                _Decoder.Close();
+                _Decoder = null;
+            }
+            _SampleBuf = null;
+            if (_EventDecode != null)
+            {
+                _EventDecode.Close();
+                _EventDecode = null;
+            }
+            if (_CloseStreamListener != null)
+                _CloseStreamListener.OnCloseStream(this);
+        }
+        #endregion Threading
+
+        public override void Update()
+        {
+            base.Update();
+
+            if (_Paused || _Terminated || IsFinished)
+                return;
+
+            int queuedCount;
+            bool useQueuedBuffer = false;
+            AL.GetSource(_Source, ALGetSourcei.BuffersQueued, out queuedCount);
+
+            int freeBufferCt = _BufferCount;
+            if (queuedCount > 0)
+            {
+                AL.GetSource(_Source, ALGetSourcei.BuffersProcessed, out freeBufferCt);
+                useQueuedBuffer = true;
+                //Console.WriteLine("Buffers Processed on Stream " + _Source + " = " + processedCount);
+                if (freeBufferCt < 1)
+                    return;
+            }
+
+            lock (_MutexData)
+            {
+                queuedCount = 0;
+                for (int j = 0; j < freeBufferCt; j++)
+                {
+                    if (_Data.BytesNotRead < _SampleBuf.Length && !(_NoMoreData && _Data.BytesNotRead > 0))
+                        break;
+                    _Data.Read(_SampleBuf);
+
+                    float volume = Volume * VolumeMax;
+                    //We want to scale all values. No matter how many channels we have (_ByteCount=2 or 4) we have short values
+                    //So just process 2 bytes a time
+                    for (int i = 0; i < _SampleBuf.Length; i += 2)
+                    {
+                        byte[] b = BitConverter.GetBytes((Int16)(BitConverter.ToInt16(_SampleBuf, i) * volume));
+                        _SampleBuf[i] = b[0];
+                        _SampleBuf[i + 1] = b[1];
+                    }
+
+                    int buffer = useQueuedBuffer ? AL.SourceUnqueueBuffer(_Source) : _Buffers[queuedCount];
+
+
+                    if (buffer != 0)
+                    {
+                        ALFormat alFormat = (_Format.ChannelCount == 2) ? ALFormat.Stereo16 : ALFormat.Mono16;
+                        AL.BufferData(buffer, alFormat, _SampleBuf, _SampleBuf.Length, _Format.SamplesPerSecond);
+                        AL.SourceQueueBuffer(_Source, buffer);
+                    }
+                    queuedCount++;
+                }
+            }
+
+            float latency = CConfig.AudioLatency / 1000f + queuedCount * _SampleBuf.Length / _BytesPerSecond + 0.1f;
+            _CurrentTime = _TimeCode - _Data.BytesNotRead / _BytesPerSecond - latency;
+            _Timer.Restart();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs
new file mode 100644
index 00000000..e96eeeab
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioPlay.cs
@@ -0,0 +1,37 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+namespace Vocaluxe.Lib.Sound.Playback.PortAudio
+{
+    class CPortAudioPlay : CPlaybackBase
+    {
+        public override bool Init()
+        {
+            if (_Initialized)
+                return false;
+
+            _Initialized = true;
+
+            return true;
+        }
+
+        protected override IAudioStream _CreateStream(int id, string media, bool loop)
+        {
+            return new CPortAudioStream(id, media, loop);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs
new file mode 100644
index 00000000..ac913aaf
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPortAudioStream.cs
@@ -0,0 +1,425 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Vocaluxe.Base;
+using Vocaluxe.Lib.Sound.Playback.Decoder;
+
+namespace Vocaluxe.Lib.Sound.Playback.PortAudio
+{
+    class CPortAudioStream : CAudioStreamBase
+    {
+        private const int _Bufsize = 1000000;
+        private const int _BeginRefill = 800000;
+
+        private readonly CSyncTimer _SyncTimer = new CSyncTimer(0f, 1f, 0.02f);
+        private int _ByteCount;
+
+        private CPortAudioHandle _PaHandle;
+        private PortAudioSharp.PortAudio.PaHostApiInfo _ApiInfo;
+        private PortAudioSharp.PortAudio.PaDeviceInfo _OutputDeviceInfo;
+        private IntPtr _Stream = IntPtr.Zero;
+
+        private PortAudioSharp.PortAudio.PaStreamCallbackDelegate _PaStreamCallback;
+        private IAudioDecoder _Decoder;
+        private float _BytesPerSecond;
+        private float _Latency;
+        private bool _NoMoreData;
+
+        private bool _FileOpened;
+
+        private bool _Skip;
+
+        private volatile float _TimeCode;
+
+        private volatile bool _Paused;
+
+        private CRingBuffer _Data;
+        private volatile float _SetStart;
+        private float _Start;
+        private volatile bool _SetSkip;
+        private volatile bool _Terminated;
+
+        private Thread _DecoderThread;
+
+        private AutoResetEvent _EventDecode = new AutoResetEvent(false);
+
+        private readonly Object _LockData = new Object();
+        private readonly Object _LockSyncSignals = new Object();
+
+        public override float Position
+        {
+            get
+            {
+                lock (_LockData)
+                {
+                    // Decoder may return wrong timestamps. This is why we use the synctimer
+                    // If you change this do exessive testing for monoton timestamps espacially for ogg files
+                    float time = Math.Max(0f, _SyncTimer.Time);
+                    if (time > Length)
+                    {
+                        _SyncTimer.Pause();
+                        time = Length;
+                    }
+                    return time;
+                }
+            }
+            set
+            {
+                lock (_LockSyncSignals)
+                {
+                    _SetStart = value;
+                    _SetSkip = true;
+                    _EventDecode.Set();
+                }
+            }
+        }
+
+        public override bool IsPaused
+        {
+            get { return _Paused; }
+            set
+            {
+                if (_Paused == value)
+                    return;
+                if (!_FileOpened || _Terminated)
+                    return;
+                _Paused = value;
+                lock (_LockData)
+                {
+                    if (_Paused)
+                    {
+                        _PaHandle.CheckError("StopStream (playback)", PortAudioSharp.PortAudio.Pa_StopStream(_Stream));
+                        _SyncTimer.Pause();
+                    }
+                    else
+                    {
+                        _PaHandle.CheckError("StartStream", PortAudioSharp.PortAudio.Pa_StartStream(_Stream));
+                        _SyncTimer.Resume();
+                        _EventDecode.Set();
+                    }
+                }
+            }
+        }
+
+        public override bool IsFinished
+        {
+            get
+            {
+                lock (_LockData)
+                {
+                    return _NoMoreData && _Data.BytesNotRead == 0 && _SyncTimer.Time >= Length;
+                }
+            }
+        }
+
+        public CPortAudioStream(int id, string medium, bool loop) : base(id, medium, loop) {}
+
+        public override bool Open(bool prescan)
+        {
+            Debug.Assert(!_FileOpened);
+            if (_FileOpened)
+                return false;
+
+            if (!File.Exists(_Medium))
+            {
+                Dispose();
+                return false;
+            }
+
+            try
+            {
+                _PaHandle = new CPortAudioHandle();
+
+                int hostApi = _PaHandle.GetHostApi();
+                _ApiInfo = PortAudioSharp.PortAudio.Pa_GetHostApiInfo(hostApi);
+                _OutputDeviceInfo = PortAudioSharp.PortAudio.Pa_GetDeviceInfo(_ApiInfo.defaultOutputDevice);
+                if (_OutputDeviceInfo.defaultLowOutputLatency < 0.1)
+                    _OutputDeviceInfo.defaultLowOutputLatency = 0.1;
+
+                _PaStreamCallback = _ProcessNewData;
+            }
+            catch (Exception)
+            {
+                Dispose();
+                CLog.LogError("Error Init PortAudio Playback");
+                return false;
+            }
+
+            _Decoder = new CAudioDecoderFFmpeg();
+            if (!_Decoder.Open(_Medium))
+            {
+                Dispose();
+                CLog.LogError("Error opening audio file: " + _Medium);
+                return false;
+            }
+
+            SFormatInfo format = _Decoder.GetFormatInfo();
+            if (format.SamplesPerSecond == 0)
+            {
+                Dispose();
+                CLog.LogError("Error Init PortAudio Playback (samples=0)");
+                return false;
+            }
+
+            Length = _Decoder.GetLength();
+            _ByteCount = 2 * format.ChannelCount;
+            _BytesPerSecond = format.SamplesPerSecond * _ByteCount;
+            _SyncTimer.Pause();
+            _SyncTimer.Time = 0f;
+
+            PortAudioSharp.PortAudio.PaStreamParameters? outputParams = new PortAudioSharp.PortAudio.PaStreamParameters
+                {
+                    channelCount = format.ChannelCount,
+                    device = _ApiInfo.defaultOutputDevice,
+                    sampleFormat = PortAudioSharp.PortAudio.PaSampleFormat.paInt16,
+                    suggestedLatency = _OutputDeviceInfo.defaultLowOutputLatency,
+                    hostApiSpecificStreamInfo = IntPtr.Zero
+                };
+
+            if (!_PaHandle.OpenOutputStream(
+                out _Stream,
+                ref outputParams,
+                format.SamplesPerSecond,
+                (uint)CConfig.AudioBufferSize / 2,
+                PortAudioSharp.PortAudio.PaStreamFlags.paNoFlag,
+                _PaStreamCallback,
+                IntPtr.Zero) || _Stream == IntPtr.Zero)
+            {
+                Dispose();
+                return false;
+            }
+
+            _Latency = CConfig.AudioLatency / 1000f + (float)PortAudioSharp.PortAudio.Pa_GetStreamInfo(_Stream).outputLatency;
+
+            //From now on closing the driver and the decoder is handled by the thread ONLY!
+
+            _Paused = true;
+            _FileOpened = true;
+            _Data = new CRingBuffer(_Bufsize);
+            _NoMoreData = false;
+            _DecoderThread = new Thread(_Execute) {Priority = ThreadPriority.Normal, Name = Path.GetFileName(_Medium)};
+            _DecoderThread.Start();
+
+            return true;
+        }
+
+        protected override void _Dispose(bool disposing)
+        {
+            base._Dispose(disposing);
+            if (!_Terminated)
+            {
+                _Terminated = true;
+                if (_DecoderThread != null)
+                    _EventDecode.Set();
+                else
+                    _DoFree();
+            }
+        }
+
+        public override void Play()
+        {
+            if (!_FileOpened || _Terminated || !IsPaused)
+                return;
+            IsPaused = false;
+            _PaHandle.CheckError("StartStream", PortAudioSharp.PortAudio.Pa_StartStream(_Stream));
+        }
+
+        public override void Stop()
+        {
+            if (!_FileOpened || _Terminated)
+                return;
+            _Paused = true;
+            _PaHandle.CheckError("StopStream (playback)", PortAudioSharp.PortAudio.Pa_StopStream(_Stream));
+            Position = 0f;
+        }
+
+        #region Threading
+        private void _DoSkip()
+        {
+            _Decoder.SetPosition(_Start);
+            lock (_LockData)
+            {
+                _SyncTimer.Time = _Start;
+                _TimeCode = _Start;
+                _Data.Reset();
+                _NoMoreData = false;
+            }
+        }
+
+        private void _Execute()
+        {
+            while (!_Terminated)
+            {
+                lock (_LockSyncSignals)
+                {
+                    if (_SetSkip)
+                    {
+                        _Skip = true;
+                        _SetSkip = false;
+                    }
+
+                    _Start = _SetStart;
+                }
+
+                if (_Skip)
+                {
+                    _DoSkip();
+                    _Skip = false;
+                }
+
+                _DoDecode();
+                _EventDecode.WaitOne();
+            }
+
+            _DoFree();
+        }
+
+        private void _DoDecode()
+        {
+            if (_Paused || _Terminated || _NoMoreData)
+                return;
+
+            float timecode;
+            byte[] buffer;
+
+            lock (_LockData)
+            {
+                if (_Data.BytesNotRead > _BeginRefill)
+                    return;
+            }
+
+            _Decoder.Decode(out buffer, out timecode);
+
+            if (buffer == null)
+            {
+                if (_Loop)
+                {
+                    _Start = 0f;
+                    _DoSkip();
+                }
+                else
+                    _NoMoreData = true;
+                return;
+            }
+
+            lock (_LockData)
+            {
+                _Data.Write(buffer);
+                _TimeCode = timecode;
+                if (_Data.BytesNotRead < _BeginRefill)
+                    _EventDecode.Set();
+            }
+        }
+
+        private void _DoFree()
+        {
+            if (_PaHandle != null)
+            {
+                if (_Stream != IntPtr.Zero)
+                    _PaHandle.CloseStream(_Stream);
+                _PaHandle.Close();
+                _PaHandle = null;
+            }
+            if (_DecoderThread != null)
+            {
+                if (Thread.CurrentThread.ManagedThreadId != _DecoderThread.ManagedThreadId)
+                    throw new Exception("Another thread should never free the decoder thread!");
+                _DecoderThread = null;
+            }
+            if (_Decoder != null)
+            {
+                _Decoder.Close();
+                _Decoder = null;
+            }
+            if (_EventDecode != null)
+            {
+                _EventDecode.Close();
+                _EventDecode = null;
+            }
+            if (_CloseStreamListener != null)
+                _CloseStreamListener.OnCloseStream(this);
+        }
+        #endregion Threading
+
+        #region Callbacks
+        private PortAudioSharp.PortAudio.PaStreamCallbackResult _ProcessNewData(
+            IntPtr input,
+            IntPtr output,
+            uint frameCount,
+            ref PortAudioSharp.PortAudio.PaStreamCallbackTimeInfo timeInfo,
+            PortAudioSharp.PortAudio.PaStreamCallbackFlags statusFlags,
+            IntPtr userData)
+        {
+            var buf = new byte[frameCount * _ByteCount];
+
+            if (_Paused)
+            {
+                try
+                {
+                    Marshal.Copy(buf, 0, output, buf.Length);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
+                return PortAudioSharp.PortAudio.PaStreamCallbackResult.paContinue;
+            }
+
+            lock (_LockData)
+            {
+                int dataLen = _Data.BytesNotRead;
+                if ((_NoMoreData && dataLen > 0) || dataLen >= buf.Length)
+                {
+                    dataLen = Math.Min(dataLen, buf.Length);
+                    _Data.Read(buf);
+                    //We want to scale all values. No matter how many channels we have (_ByteCount=2 or 4) we have short values
+                    //So just process 2 bytes a time
+                    float volume = Volume * VolumeMax;
+                    for (int i = 0; i < dataLen; i += 2)
+                    {
+                        byte[] b = BitConverter.GetBytes((Int16)(BitConverter.ToInt16(buf, i) * volume));
+                        buf[i] = b[0];
+                        buf[i + 1] = b[1];
+                    }
+                    float latency = buf.Length / _BytesPerSecond + _Latency;
+                    float time = _TimeCode - _Data.BytesNotRead / _BytesPerSecond - latency;
+                    _SyncTimer.Update(time);
+                }
+
+                if (_Data.BytesNotRead < _BeginRefill && !_NoMoreData)
+                    _EventDecode.Set();
+            }
+
+            try
+            {
+                Marshal.Copy(buf, 0, output, (int)frameCount * _ByteCount);
+            }
+            catch (Exception e)
+            {
+                CLog.LogError("Error PortAudio.StreamCallback: " + e.Message);
+            }
+
+            return PortAudioSharp.PortAudio.PaStreamCallbackResult.paContinue;
+        }
+        #endregion Callbacks
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/CPt1.cs b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPt1.cs
similarity index 71%
rename from Vocaluxe/Lib/Sound/CPt1.cs
rename to Vocaluxe/Lib/Sound/Playback/PortAudio/CPt1.cs
index 4ca4b951..ea854457 100644
--- a/Vocaluxe/Lib/Sound/CPt1.cs
+++ b/Vocaluxe/Lib/Sound/Playback/PortAudio/CPt1.cs
@@ -1,6 +1,23 @@
-using System.Diagnostics;
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
 
-namespace Vocaluxe.Lib.Sound
+using System.Diagnostics;
+
+namespace Vocaluxe.Lib.Sound.Playback.PortAudio
 {
     class CPt1
     {
diff --git a/Vocaluxe/Lib/Sound/CSyncTimer.cs b/Vocaluxe/Lib/Sound/Playback/PortAudio/CSyncTimer.cs
similarity index 70%
rename from Vocaluxe/Lib/Sound/CSyncTimer.cs
rename to Vocaluxe/Lib/Sound/Playback/PortAudio/CSyncTimer.cs
index 6ccd380c..887c37cf 100644
--- a/Vocaluxe/Lib/Sound/CSyncTimer.cs
+++ b/Vocaluxe/Lib/Sound/Playback/PortAudio/CSyncTimer.cs
@@ -1,7 +1,24 @@
-using System;
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
 using System.Diagnostics;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Playback.PortAudio
 {
     class CSyncTimer
     {
@@ -48,8 +65,7 @@ namespace Vocaluxe.Lib.Sound
             float diff = et - dt;
             if (Math.Abs(diff) > 0.05f)
             {
-                _Timer.Reset();
-                _Timer.Start();
+                _Timer.Restart();
                 _SetValue = dt + diff;
                 dt = _SetValue;
                 //Console.WriteLine("DRIFTED!!! " + diff.ToString());
diff --git a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs
deleted file mode 100644
index d8c6c9f5..00000000
--- a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs
+++ /dev/null
@@ -1,558 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Vocaluxe.Lib.Sound.PortAudio
-{
-    /**
-		<summary>
-			PortAudio v.19 bindings for .NET
-		</summary>
-	*/
-    // ReSharper disable UnusedMember.Global
-    // ReSharper disable FieldCanBeMadeReadOnly.Global
-    // ReSharper disable MemberCanBePrivate.Global
-
-    public static class CPortAudio
-    {
-        #region **** PORTAUDIO CALLBACKS ****
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate EPaStreamCallbackResult PaStreamCallbackDelegate(
-            IntPtr input,
-            IntPtr output,
-            uint frameCount,
-            ref SPaStreamCallbackTimeInfo timeInfo,
-            EPaStreamCallbackFlags statusFlags,
-            IntPtr userData);
-
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void PaStreamFinishedCallbackDelegate(IntPtr userData);
-        #endregion
-
-        #region **** PORTAUDIO DATA STRUCTURES ****
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SPaDeviceInfo
-        {
-            public int StructVersion;
-            [MarshalAs(UnmanagedType.LPStr)] public string Name;
-            public int HostApi;
-            public int MaxInputChannels;
-            public int MaxOutputChannels;
-            public double DefaultLowInputLatency;
-            public double DefaultLowOutputLatency;
-            public double DefaultHighInputLatency;
-            public double DefaultHighOutputLatency;
-            public double DefaultSampleRate;
-
-            public override string ToString()
-            {
-                return "[" + GetType().Name + "]" + "\n"
-                       + "name: " + Name + "\n"
-                       + "hostApi: " + HostApi + "\n"
-                       + "maxInputChannels: " + MaxInputChannels + "\n"
-                       + "maxOutputChannels: " + MaxOutputChannels + "\n"
-                       + "defaultLowInputLatency: " + DefaultLowInputLatency + "\n"
-                       + "defaultLowOutputLatency: " + DefaultLowOutputLatency + "\n"
-                       + "defaultHighInputLatency: " + DefaultHighInputLatency + "\n"
-                       + "defaultHighOutputLatency: " + DefaultHighOutputLatency + "\n"
-                       + "defaultSampleRate: " + DefaultSampleRate;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SPaHostApiInfo
-        {
-            public int StructVersion;
-            public EPaHostApiTypeId Type;
-            [MarshalAs(UnmanagedType.LPStr)] public string Name;
-            public int DeviceCount;
-            public int DefaultInputDevice;
-            public int DefaultOutputDevice;
-
-            public override string ToString()
-            {
-                return "[" + GetType().Name + "]" + "\n"
-                       + "structVersion: " + StructVersion + "\n"
-                       + "type: " + Type + "\n"
-                       + "name: " + Name + "\n"
-                       + "deviceCount: " + DeviceCount + "\n"
-                       + "defaultInputDevice: " + DefaultInputDevice + "\n"
-                       + "defaultOutputDevice: " + DefaultOutputDevice;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SPaHostErrorInfo
-        {
-            public EPaHostApiTypeId HostApiType;
-            public int ErrorCode;
-            [MarshalAs(UnmanagedType.LPStr)] public string ErrorText;
-
-            public override string ToString()
-            {
-                return "[" + GetType().Name + "]" + "\n"
-                       + "hostApiType: " + HostApiType + "\n"
-                       + "errorCode: " + ErrorCode + "\n"
-                       + "errorText: " + ErrorText;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SPaStreamCallbackTimeInfo
-        {
-            public double InputBufferAdcTime;
-            public double CurrentTime;
-            public double OutputBufferDacTime;
-
-            public override string ToString()
-            {
-                return "[" + GetType().Name + "]" + "\n"
-                       + "currentTime: " + CurrentTime + "\n"
-                       + "inputBufferAdcTime: " + InputBufferAdcTime + "\n"
-                       + "outputBufferDacTime: " + OutputBufferDacTime;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SPaStreamInfo
-        {
-            public int StructVersion;
-            public double InputLatency;
-            public double OutputLatency;
-            public double SampleRate;
-
-            public override string ToString()
-            {
-                return "[" + GetType().Name + "]" + "\n"
-                       + "structVersion: " + StructVersion + "\n"
-                       + "inputLatency: " + InputLatency + "\n"
-                       + "outputLatency: " + OutputLatency + "\n"
-                       + "sampleRate: " + SampleRate;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct SPaStreamParameters
-        {
-            public int Device;
-            public int ChannelCount;
-            public EPaSampleFormat SampleFormat;
-            public double SuggestedLatency;
-            internal IntPtr HostApiSpecificStreamInfo;
-
-            public override string ToString()
-            {
-                return "[" + GetType().Name + "]" + "\n"
-                       + "device: " + Device + "\n"
-                       + "channelCount: " + ChannelCount + "\n"
-                       + "sampleFormat: " + SampleFormat + "\n"
-                       + "suggestedLatency: " + SuggestedLatency;
-            }
-        }
-        #endregion
-
-        #region **** PORTAUDIO DEFINES ****
-        public enum EPaDeviceIndex
-        {
-            PaNoDevice = -1,
-            PaUseHostApiSpecificDeviceSpecification = -2
-        }
-
-        public enum EPaSampleFormat : uint
-        {
-            PaFloat32 = 0x00000001,
-            PaInt32 = 0x00000002,
-            PaInt24 = 0x00000004,
-            PaInt16 = 0x00000008,
-            PaInt8 = 0x00000010,
-            PaUInt8 = 0x00000020,
-            PaCustomFormat = 0x00010000,
-            PaNonInterleaved = 0x80000000,
-        }
-
-        public const int PaFormatIsSupported = 0;
-        public const int PaFramesPerBufferUnspecified = 0;
-
-        public enum EPaStreamFlags : uint
-        {
-            PaNoFlag = 0,
-            PaClipOff = 0x00000001,
-            PaDitherOff = 0x00000002,
-            PaNeverDropInput = 0x00000004,
-            PaPrimeOutputBuffersUsingStreamCallback = 0x00000008,
-            PaPlatformSpecificFlags = 0xFFFF0000
-        }
-
-        public enum EPaStreamCallbackFlags : uint
-        {
-            PaInputUnderflow = 0x00000001,
-            PaInputOverflow = 0x00000002,
-            PaOutputUnderflow = 0x00000004,
-            PaOutputOverflow = 0x00000008,
-            PaPrimingOutput = 0x00000010
-        }
-        #endregion
-
-        #region **** PORTAUDIO ENUMERATIONS ****
-        public enum EPaError
-        {
-            PaNoError = 0,
-            PaNotInitialized = -10000,
-            PaUnanticipatedHostError,
-            PaInvalidChannelCount,
-            PaInvalidSampleRate,
-            PaInvalidDevice,
-            PaInvalidFlag,
-            PaSampleFormatNotSupported,
-            PaBadIODeviceCombination,
-            PaInsufficientMemory,
-            PaBufferTooBig,
-            PaBufferTooSmall,
-            PaNullCallback,
-            PaBadStreamPtr,
-            PaTimedOut,
-            PaInternalError,
-            PaDeviceUnavailable,
-            PaIncompatibleHostApiSpecificStreamInfo,
-            PaStreamIsStopped,
-            PaStreamIsNotStopped,
-            PaInputOverflowed,
-            PaOutputUnderflowed,
-            PaHostApiNotFound,
-            PaInvalidHostApi,
-            PaCanNotReadFromCallbackStream,
-            PaCanNotWriteToACallbackStream,
-            PaCanNotReadFromAnOutputOnlyStream,
-            PaCanNotWriteToAnInputOnlyStream,
-            PaIncompatibleStreamHostApi,
-            PaBadBufferPtr
-        }
-
-        public enum EPaHostApiTypeId : uint
-        {
-            PaInDevelopment = 0,
-            PaDirectSound = 1,
-            PaMME = 2,
-            PaASIO = 3,
-            PaSoundManager = 4,
-            PaCoreAudio = 5,
-            PaOSS = 7,
-            PaALSA = 8,
-            PaAL = 9,
-            PaBeOS = 10,
-            PaWDMKS = 11,
-            PaJACK = 12,
-            PaWASAPI = 13,
-            PaAudioScienceHPI = 14
-        }
-
-        public enum EPaStreamCallbackResult : uint
-        {
-            PaContinue = 0,
-            PaComplete = 1,
-            PaAbort = 2
-        }
-        #endregion
-
-        #region **** PORTAUDIO FUNCTIONS ****
-#if ARCH_X86
-#if WIN
-        private const string _PaDll = "x86\\portaudio_x86.dll";
-#endif
-
-#if LINUX
-        private const string _PaDll = "libportaudio.so.2.0.0";
-#endif
-#endif
-
-#if ARCH_X64
-#if WIN
-        private const string _PaDll = "x64\\portaudio_x64.dll";
-#endif
-
-#if LINUX
-        private const string _PaDll = "libportaudio.so.2.0.0";
-#endif
-#endif
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_GetVersion();
-
-        [DllImport(_PaDll, EntryPoint = "Pa_GetVersionText", CallingConvention = CallingConvention.Cdecl)]
-        private static extern IntPtr IntPtr_Pa_GetVersionText();
-
-        public static string PaGetVersionText()
-        {
-            IntPtr strptr = IntPtr_Pa_GetVersionText();
-            return Marshal.PtrToStringAnsi(strptr);
-        }
-
-        [DllImport(_PaDll, EntryPoint = "Pa_GetErrorText", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr IntPtr_Pa_GetErrorText(EPaError errorCode);
-
-        public static string PaGetErrorText(EPaError errorCode)
-        {
-            IntPtr strptr = IntPtr_Pa_GetErrorText(errorCode);
-            return Marshal.PtrToStringAnsi(strptr);
-        }
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_Initialize();
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_Terminate();
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_GetHostApiCount();
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_GetDefaultHostApi();
-
-        [DllImport(_PaDll, EntryPoint = "Pa_GetHostApiInfo", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr IntPtr_Pa_GetHostApiInfo(int hostApi);
-
-        public static SPaHostApiInfo PaGetHostApiInfo(int hostApi)
-        {
-            IntPtr structptr = IntPtr_Pa_GetHostApiInfo(hostApi);
-            return (SPaHostApiInfo)Marshal.PtrToStructure(structptr, typeof(SPaHostApiInfo));
-        }
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_HostApiTypeIdToHostApiIndex(EPaHostApiTypeId type);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_HostApiDeviceIndexToDeviceIndex(int hostApi, int hostApiDeviceIndex);
-
-        [DllImport(_PaDll, EntryPoint = "Pa_GetLastHostErrorInfo", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr IntPtr_Pa_GetLastHostErrorInfo();
-
-        public static SPaHostErrorInfo PaGetLastHostErrorInfo()
-        {
-            IntPtr structptr = IntPtr_Pa_GetLastHostErrorInfo();
-            return (SPaHostErrorInfo)Marshal.PtrToStructure(structptr, typeof(SPaHostErrorInfo));
-        }
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_GetDeviceCount();
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_GetDefaultInputDevice();
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_GetDefaultOutputDevice();
-
-        [DllImport(_PaDll, EntryPoint = "Pa_GetDeviceInfo", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr IntPtr_Pa_GetDeviceInfo(int device);
-
-        public static SPaDeviceInfo PaGetDeviceInfo(int device)
-        {
-            IntPtr structptr = IntPtr_Pa_GetDeviceInfo(device);
-            return (SPaDeviceInfo)Marshal.PtrToStructure(structptr, typeof(SPaDeviceInfo));
-        }
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_IsFormatSupported(
-            ref SPaStreamParameters inputParameters,
-            ref SPaStreamParameters outputParameters,
-            double sampleRate);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_OpenStream(
-            out IntPtr stream,
-            ref SPaStreamParameters inputParameters,
-            ref SPaStreamParameters outputParameters,
-            double sampleRate,
-            uint framesPerBuffer,
-            EPaStreamFlags streamFlags,
-            PaStreamCallbackDelegate streamCallback,
-            IntPtr userData);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_OpenStream(
-            out IntPtr stream,
-            ref SPaStreamParameters inputParameters,
-            IntPtr outputParameters,
-            double sampleRate,
-            uint framesPerBuffer,
-            EPaStreamFlags streamFlags,
-            PaStreamCallbackDelegate streamCallback,
-            IntPtr userData);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_OpenStream(
-            out IntPtr stream,
-            IntPtr inputParameters,
-            ref SPaStreamParameters outputParameters,
-            double sampleRate,
-            uint framesPerBuffer,
-            EPaStreamFlags streamFlags,
-            PaStreamCallbackDelegate streamCallback,
-            IntPtr userData);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_OpenDefaultStream(
-            out IntPtr stream,
-            int numInputChannels,
-            int numOutputChannels,
-            uint sampleFormat,
-            double sampleRate,
-            uint framesPerBuffer,
-            PaStreamCallbackDelegate streamCallback,
-            IntPtr userData);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_CloseStream(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_SetStreamFinishedCallback(
-            ref IntPtr stream,
-            [MarshalAs(UnmanagedType.FunctionPtr)] PaStreamFinishedCallbackDelegate streamFinishedCallback);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_StartStream(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_StopStream(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_AbortStream(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_IsStreamStopped(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_IsStreamActive(IntPtr stream);
-
-        [DllImport(_PaDll, EntryPoint = "Pa_GetStreamInfo", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr IntPtr_Pa_GetStreamInfo(IntPtr stream);
-
-        public static SPaStreamInfo PaGetStreamInfo(IntPtr stream)
-        {
-            IntPtr structptr = IntPtr_Pa_GetStreamInfo(stream);
-            return (SPaStreamInfo)Marshal.PtrToStructure(structptr, typeof(SPaStreamInfo));
-        }
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Pa_GetStreamTime(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern double Pa_GetStreamCpuLoad(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_ReadStream(
-            IntPtr stream,
-            [Out] float[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_ReadStream(
-            IntPtr stream,
-            [Out] byte[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_ReadStream(
-            IntPtr stream,
-            [Out] sbyte[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_ReadStream(
-            IntPtr stream,
-            [Out] ushort[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_ReadStream(
-            IntPtr stream,
-            [Out] short[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_ReadStream(
-            IntPtr stream,
-            [Out] uint[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_ReadStream(
-            IntPtr stream,
-            [Out] int[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_WriteStream(
-            IntPtr stream,
-            [In] float[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_WriteStream(
-            IntPtr stream,
-            [In] byte[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_WriteStream(
-            IntPtr stream,
-            [In] sbyte[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_WriteStream(
-            IntPtr stream,
-            [In] ushort[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_WriteStream(
-            IntPtr stream,
-            [In] short[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_WriteStream(
-            IntPtr stream,
-            [In] uint[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_WriteStream(
-            IntPtr stream,
-            [In] int[] buffer,
-            uint frames);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_GetStreamReadAvailable(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int Pa_GetStreamWriteAvailable(IntPtr stream);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern EPaError Pa_GetSampleSize(EPaSampleFormat format);
-
-        [DllImport(_PaDll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Pa_Sleep(int msec);
-        #endregion
-    }
-
-    // ReSharper restore UnusedMember.Global
-    // ReSharper restore FieldCanBeMadeReadOnly.Global
-    // ReSharper restore MemberCanBePrivate.Global
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/CBuffer.cs b/Vocaluxe/Lib/Sound/Record/CBuffer.cs
new file mode 100644
index 00000000..c55e572f
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/CBuffer.cs
@@ -0,0 +1,126 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+//#define TEST_PITCH
+
+using System;
+using Vocaluxe.Lib.Sound.Record.PitchTracker;
+
+namespace Vocaluxe.Lib.Sound.Record
+{
+    class CBuffer : IDisposable
+    {
+        private CPitchTracker _PitchTracker = new CPtAKF();
+
+        private float _MaxVolume;
+
+        public CBuffer()
+        {
+            VolTreshold = 0.02f;
+            ToneWeigths = new float[GetNumHalfTones()];
+            Reset();
+#if TEST_PITCH
+            CPitchTrackerTest tester = new CPitchTrackerTest();
+            tester.AddAnalyzer(new CAnalyzer());
+            tester.AddAnalyzer(new CPtAKF());
+            tester.AddAnalyzer(new CPtDyWa());
+            tester.AddAnalyzer(new CPtSharp());
+            tester.RunTest();
+#endif
+        }
+
+        ~CBuffer()
+        {
+            _Dispose(false);
+        }
+
+        public int GetNumHalfTones()
+        {
+            return _PitchTracker.GetNumHalfTones();
+        }
+
+        public int ToneAbs { get; private set; }
+
+        public int Tone { get; set; }
+
+        public float MaxVolume
+        {
+            get { return _MaxVolume; }
+        }
+
+        public bool ToneValid { get; private set; }
+
+        public float[] ToneWeigths { get; private set; }
+
+        /// <summary>
+        ///     Minimum volume for a tone to be valid
+        /// </summary>
+        public float VolTreshold
+        {
+            get { return _PitchTracker.VolumeTreshold; }
+            set { _PitchTracker.VolumeTreshold = value; }
+        }
+
+        public void Reset()
+        {
+            ToneValid = false;
+            ToneAbs = 0;
+            Tone = 0;
+            for (int i = 0; i < ToneWeigths.Length; i++)
+                ToneWeigths[i] = 0f;
+        }
+
+        public void ProcessNewBuffer(byte[] buffer)
+        {
+            // apply software boost
+            //BoostBuffer(Buffer, BufferSize);
+
+            // voice passthrough (send data to playback-device)
+            //if (assigned(fVoiceStream)) then
+            //fVoiceStream.WriteData(Buffer, BufferSize);
+            _PitchTracker.Input(buffer);
+        }
+
+        public void AnalyzeBuffer()
+        {
+            int tone = _PitchTracker.GetNote(out _MaxVolume, ToneWeigths);
+            if (tone >= 0)
+            {
+                ToneAbs = tone;
+                Tone = ToneAbs % 12;
+                ToneValid = true;
+            }
+            else
+                ToneValid = false;
+        }
+
+        public void Dispose()
+        {
+            _Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void _Dispose(bool disposing)
+        {
+            if (disposing && _PitchTracker != null)
+            {
+                _PitchTracker.Dispose();
+                _PitchTracker = null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/CDelayTest.cs b/Vocaluxe/Lib/Sound/Record/CDelayTest.cs
similarity index 56%
rename from Vocaluxe/Lib/Sound/CDelayTest.cs
rename to Vocaluxe/Lib/Sound/Record/CDelayTest.cs
index 047b3999..456885d9 100644
--- a/Vocaluxe/Lib/Sound/CDelayTest.cs
+++ b/Vocaluxe/Lib/Sound/Record/CDelayTest.cs
@@ -1,7 +1,23 @@
-using System.Diagnostics;
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
 using Vocaluxe.Base;
 
-namespace Vocaluxe.Lib.Sound
+namespace Vocaluxe.Lib.Sound.Record
 {
     class CDelayTest
     {
@@ -9,11 +25,11 @@ namespace Vocaluxe.Lib.Sound
         {
             public int Channel;
             public bool Finished;
+            public float OrigThreshold;
         }
 
         private const float _MaxDelayTime = 1000;
         public bool Running { get; private set; }
-        private readonly Stopwatch _Timer = new Stopwatch();
         private int _Stream = -1;
 
         private readonly SDelayChannel[] _DelaysChannel;
@@ -34,24 +50,38 @@ namespace Vocaluxe.Lib.Sound
             Reset();
             for (int i = 0; i < _DelaysChannel.Length; i++)
             {
-                if (i < channels.Length)
+                if (i < channels.Length && channels[i] >= 0)
                 {
                     _DelaysChannel[i].Finished = false;
                     _DelaysChannel[i].Channel = channels[i];
+                    _DelaysChannel[i].OrigThreshold = CRecord.GetVolumeThreshold(channels[i]);
+                    CRecord.SetVolumeThreshold(channels[i], _DelaysChannel[i].OrigThreshold / 3);
                 }
                 else
-                    _DelaysChannel[i].Finished = true;
+                    _DelaysChannel[i].Channel = -1;
             }
             _Stream = CSound.PlaySound(ESounds.T440, false);
             Running = true;
         }
 
+        private void _Stop()
+        {
+            if (!Running)
+                return;
+            Running = false;
+            _CloseStream();
+            foreach (SDelayChannel delay in _DelaysChannel)
+            {
+                if (delay.Channel >= 0)
+                    CRecord.SetVolumeThreshold(delay.Channel, delay.OrigThreshold);
+            }
+        }
+
         public void Reset()
         {
-            Running = false;
+            _Stop();
             for (int i = 0; i < _DelaysChannel.Length; i++)
                 Delays[i] = 0;
-            _CloseStream();
         }
 
         private void _CloseStream()
@@ -67,24 +97,21 @@ namespace Vocaluxe.Lib.Sound
         {
             if (!Running)
                 return;
-            if (!_Timer.IsRunning)
-            {
-                if (CSound.GetPosition(_Stream) > 0f)
-                    _Timer.Restart();
-            }
-            if (!_Timer.IsRunning)
+
+            float time = CSound.GetPosition(_Stream) * 1000f;
+            if (time <= 0f)
                 return;
 
             bool isActive = false;
-            if (_Timer.ElapsedMilliseconds <= _MaxDelayTime)
+            if (time <= _MaxDelayTime)
             {
                 for (int i = 0; i < _DelaysChannel.Length; i++)
                 {
                     if (_DelaysChannel[i].Channel < 0 || _DelaysChannel[i].Finished)
                         continue;
-                    if (CSound.RecordGetMaxVolume(_DelaysChannel[i].Channel) > 0.1f && CSound.RecordGetTone(_DelaysChannel[i].Channel) == 9)
+                    if (CRecord.GetTone(_DelaysChannel[i].Channel) == 9)
                     {
-                        Delays[i] = (int)_Timer.ElapsedMilliseconds;
+                        Delays[i] = (int)time;
                         _DelaysChannel[i].Finished = true;
                     }
                     else
@@ -92,11 +119,7 @@ namespace Vocaluxe.Lib.Sound
                 }
             }
             if (!isActive)
-            {
-                Running = false;
-                _CloseStream();
-                _Timer.Stop();
-            }
+                _Stop();
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/CRecordBase.cs b/Vocaluxe/Lib/Sound/Record/CRecordBase.cs
new file mode 100644
index 00000000..62c67da7
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/CRecordBase.cs
@@ -0,0 +1,161 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Vocaluxe.Base;
+
+namespace Vocaluxe.Lib.Sound.Record
+{
+    /// <summary>
+    ///     Base class to implement common functionality for Record classes
+    /// </summary>
+    abstract class CRecordBase
+    {
+        private bool _Initialized;
+        protected List<CRecordDevice> _Devices;
+        protected CBuffer[] _Buffer;
+
+        /// <summary>
+        ///     Init recording
+        ///     Child class should overwrite this to list devices
+        /// </summary>
+        /// <returns>true if success</returns>
+        public virtual bool Init()
+        {
+            if (_Initialized)
+                return false;
+
+            _Devices = new List<CRecordDevice>();
+            _Buffer = new CBuffer[CSettings.MaxNumPlayer];
+            for (int i = 0; i < _Buffer.Length; i++)
+                _Buffer[i] = new CBuffer();
+
+            _Initialized = true;
+
+            return true;
+        }
+
+        /// <summary>
+        ///     Stop all voice capturing streams and terminates recording freeing resources
+        /// </summary>
+        public virtual void Close()
+        {
+            if (!_Initialized)
+                return;
+
+            _Devices = null;
+            if (_Buffer != null)
+            {
+                foreach (CBuffer buffer in _Buffer)
+                    buffer.Dispose();
+                _Buffer = null;
+            }
+
+            _Initialized = false;
+        }
+
+        /// <summary>
+        ///     Procedure to be called by descendent classes with data that got recorded
+        /// </summary>
+        /// <param name="device">Device from which the data was recorded</param>
+        /// <param name="data">Recorded samples, assume Int16 and interleaved for multi-channels</param>
+        protected void _HandleData(CRecordDevice device, byte[] data)
+        {
+            byte[] leftBuffer;
+            byte[] rightBuffer;
+
+            if (device.Channels == 2)
+            {
+                leftBuffer = new byte[data.Length / 2];
+                rightBuffer = new byte[data.Length / 2];
+                //[]: Sample, L: Left channel R: Right channel
+                //[LR][LR][LR][LR][LR][LR]
+                //The data is interleaved and needs to be demultiplexed
+                for (int i = 0; i < data.Length / 4; i++)
+                {
+                    leftBuffer[i * 2] = data[i * 4];
+                    leftBuffer[i * 2 + 1] = data[i * 4 + 1];
+                    rightBuffer[i * 2] = data[i * 4 + 2];
+                    rightBuffer[i * 2 + 1] = data[i * 4 + 3];
+                }
+            }
+            else
+                leftBuffer = rightBuffer = data;
+
+            if (device.PlayerChannel1 > 0)
+                _Buffer[device.PlayerChannel1 - 1].ProcessNewBuffer(leftBuffer);
+
+            if (device.PlayerChannel2 > 0)
+                _Buffer[device.PlayerChannel2 - 1].ProcessNewBuffer(rightBuffer);
+        }
+
+        /// <summary>
+        ///     Detect Pitch and Volume of the newest voice buffer
+        /// </summary>
+        /// <param name="player"></param>
+        public void AnalyzeBuffer(int player)
+        {
+            if (!_Initialized)
+                return;
+
+            _Buffer[player].AnalyzeBuffer();
+        }
+
+        public int GetToneAbs(int player)
+        {
+            if (!_Initialized)
+                return 0;
+
+            return _Buffer[player].ToneAbs;
+        }
+
+        public int GetTone(int player)
+        {
+            return _Initialized ? _Buffer[player].Tone : 0;
+        }
+
+        public void SetTone(int player, int tone)
+        {
+            if (!_Initialized)
+                return;
+
+            _Buffer[player].Tone = tone;
+        }
+
+        public float GetMaxVolume(int player)
+        {
+            return _Initialized ? _Buffer[player].MaxVolume : 0f;
+        }
+
+        public float GetVolumeThreshold(int player)
+        {
+            return _Initialized ? _Buffer[player].VolTreshold : 0f;
+        }
+
+        public void SetVolumeThreshold(int player, float threshold)
+        {
+            if (!_Initialized)
+                return;
+
+            _Buffer[player].VolTreshold = threshold;
+        }
+
+        public bool ToneValid(int player)
+        {
+            return _Initialized && _Buffer[player].ToneValid;
+        }
+
+        public int NumHalfTones()
+        {
+            return _Buffer[0].GetNumHalfTones();
+        }
+
+        public float[] ToneWeigth(int player)
+        {
+            return _Initialized ? _Buffer[player].ToneWeigths : null;
+        }
+
+        public ReadOnlyCollection<CRecordDevice> RecordDevices()
+        {
+            return (_Initialized && _Devices.Count > 0) ? _Devices.AsReadOnly() : null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/DirectSound/CDirectSoundRecord.cs b/Vocaluxe/Lib/Sound/Record/DirectSound/CDirectSoundRecord.cs
new file mode 100644
index 00000000..43e501bf
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/DirectSound/CDirectSoundRecord.cs
@@ -0,0 +1,109 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using SlimDX.DirectSound;
+
+namespace Vocaluxe.Lib.Sound.Record.DirectSound
+{
+    class CDirectSoundRecord : CRecordBase, IRecord
+    {
+        private bool _Initialized;
+
+        private List<CSoundCardSource> _Sources;
+
+        public override bool Init()
+        {
+            if (!base.Init())
+                return false;
+
+            _Sources = new List<CSoundCardSource>();
+
+            DeviceCollection devices = DirectSoundCapture.GetDevices();
+
+            foreach (DeviceInformation dev in devices)
+            {
+                using (var ds = new DirectSoundCapture(dev.DriverGuid))
+                {
+                    var device = new CRecordDevice(_Devices.Count, dev.DriverGuid.ToString(), dev.Description, ds.Capabilities.Channels);
+
+                    _Devices.Add(device);
+                }
+            }
+
+            _Initialized = true;
+
+            return true;
+        }
+
+        public override void Close()
+        {
+            Stop();
+            _Initialized = false;
+            base.Close();
+        }
+
+        public bool Start()
+        {
+            if (!_Initialized)
+                return false;
+
+            foreach (CBuffer buffer in _Buffer)
+                buffer.Reset();
+
+            foreach (CRecordDevice device in _Devices)
+            {
+                if (device.PlayerChannel1 > 0 || device.PlayerChannel2 > 0)
+                {
+                    var source = new CSoundCardSource(device.Driver, (short)device.Channels) {SampleRateKhz = 44.1};
+                    source.SampleDataReady += _OnDataReady;
+                    source.Start();
+
+                    _Sources.Add(source);
+                }
+            }
+
+            return true;
+        }
+
+        public bool Stop()
+        {
+            if (!_Initialized)
+                return false;
+
+            foreach (CSoundCardSource source in _Sources)
+            {
+                source.Stop();
+                source.Dispose();
+            }
+            _Sources.Clear();
+
+            return true;
+        }
+
+        private void _OnDataReady(object sender, CSampleDataEventArgs e)
+        {
+            if (!_Initialized)
+                return;
+            CRecordDevice dev = _Devices.FirstOrDefault(device => device.Driver == e.Guid);
+            if (dev == null)
+                return;
+            _HandleData(dev, e.Data);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/DirectSound/CSampleDataEventArgs.cs b/Vocaluxe/Lib/Sound/Record/DirectSound/CSampleDataEventArgs.cs
new file mode 100644
index 00000000..b52911e4
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/DirectSound/CSampleDataEventArgs.cs
@@ -0,0 +1,33 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+
+namespace Vocaluxe.Lib.Sound.Record.DirectSound
+{
+    public class CSampleDataEventArgs : EventArgs
+    {
+        public readonly byte[] Data;
+        public readonly string Guid;
+
+        public CSampleDataEventArgs(byte[] data, string guid)
+        {
+            Data = data;
+            Guid = guid;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/DirectSound/CSoundCardSource.cs b/Vocaluxe/Lib/Sound/Record/DirectSound/CSoundCardSource.cs
new file mode 100644
index 00000000..50858b15
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/DirectSound/CSoundCardSource.cs
@@ -0,0 +1,192 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using SlimDX.DirectSound;
+using SlimDX.Multimedia;
+
+namespace Vocaluxe.Lib.Sound.Record.DirectSound
+{
+    public class CSoundCardSource : IDisposable
+    {
+        private volatile bool _Running;
+        private readonly int _BufferSize;
+        private CaptureBuffer _CaptureBuffer;
+        private CaptureBufferDescription _BufferDescription;
+        private DirectSoundCapture _CaptureDevice;
+        private readonly WaveFormat _WaveFormat;
+        private Thread _CaptureThread;
+        private List<NotificationPosition> _Notifications;
+        private int _BufferPortionCount;
+        private int _BufferPortionSize;
+        private WaitHandle[] _WaitHandles;
+        private double _SampleRate;
+        private readonly string _Guid;
+        private readonly short _Channels;
+
+        public CSoundCardSource(string guid, short channels)
+        {
+            _Guid = guid;
+            _Channels = channels;
+            _WaveFormat = new WaveFormat();
+            SampleRateKhz = 44.1;
+            _BufferSize = 2048;
+        }
+
+        public event EventHandler<CSampleDataEventArgs> SampleDataReady = delegate { };
+
+        public double SampleRateKhz
+        {
+            get { return _SampleRate; }
+
+            set
+            {
+                _SampleRate = value;
+
+                if (_Running)
+                    Restart();
+            }
+        }
+
+        public void Start()
+        {
+            if (_Running)
+                throw new InvalidOperationException();
+
+            if (_CaptureDevice == null)
+                _CaptureDevice = new DirectSoundCapture(new Guid(_Guid));
+
+            _WaveFormat.FormatTag = WaveFormatTag.Pcm; // Change to WaveFormatTag.IeeeFloat for float
+            _WaveFormat.BitsPerSample = 16; // Set this to 32 for float
+            _WaveFormat.BlockAlignment = (short)(_Channels * (_WaveFormat.BitsPerSample / 8));
+            _WaveFormat.Channels = _Channels;
+            _WaveFormat.SamplesPerSecond = (int)(SampleRateKhz * 1000D);
+            _WaveFormat.AverageBytesPerSecond =
+                _WaveFormat.SamplesPerSecond *
+                _WaveFormat.BlockAlignment;
+
+            _BufferPortionCount = 2;
+
+            _BufferDescription.BufferBytes = _BufferSize * sizeof(short) * _BufferPortionCount * _Channels;
+            _BufferDescription.Format = _WaveFormat;
+            _BufferDescription.WaveMapped = false;
+
+            _CaptureBuffer = new CaptureBuffer(_CaptureDevice, _BufferDescription);
+
+            _BufferPortionSize = _CaptureBuffer.SizeInBytes / _BufferPortionCount;
+            _Notifications = new List<NotificationPosition>();
+
+            for (int i = 0; i < _BufferPortionCount; i++)
+            {
+                var notification = new NotificationPosition {Offset = _BufferPortionCount - 1 + (_BufferPortionSize * i), Event = new AutoResetEvent(false)};
+                _Notifications.Add(notification);
+            }
+
+            _CaptureBuffer.SetNotificationPositions(_Notifications.ToArray());
+            _WaitHandles = new WaitHandle[_Notifications.Count];
+
+            for (int i = 0; i < _Notifications.Count; i++)
+                _WaitHandles[i] = _Notifications[i].Event;
+
+            _CaptureThread = new Thread(_DoCapture) {Name = "DirectSoundCapture", IsBackground = true};
+
+            _Running = true;
+            _CaptureThread.Start();
+        }
+
+        public void Stop()
+        {
+            _Running = false;
+
+            if (_CaptureThread != null)
+            {
+                _CaptureThread.Join();
+                _CaptureThread = null;
+            }
+
+            if (_CaptureBuffer != null)
+            {
+                _CaptureBuffer.Dispose();
+                _CaptureBuffer = null;
+            }
+
+            if (_Notifications != null)
+            {
+                foreach (NotificationPosition notification in _Notifications)
+                    notification.Event.Close();
+
+                _Notifications.Clear();
+                _Notifications = null;
+            }
+        }
+
+        public void Restart()
+        {
+            Stop();
+            Start();
+        }
+
+        private void _DoCapture()
+        {
+            int bufferPortionSamples = _BufferPortionSize / sizeof(byte);
+
+            // Buffer type must match this.waveFormat.FormatTag and this.waveFormat.BitsPerSample
+            var bufferPortion = new byte[bufferPortionSamples];
+
+            _CaptureBuffer.Start(true);
+
+            while (_Running)
+            {
+                int bufferPortionIndex = WaitHandle.WaitAny(_WaitHandles);
+
+                _CaptureBuffer.Read(
+                    bufferPortion,
+                    0,
+                    bufferPortionSamples,
+                    _BufferPortionSize * Math.Abs((bufferPortionIndex - 1) % _BufferPortionCount));
+
+                SampleDataReady(this, new CSampleDataEventArgs(bufferPortion, _Guid));
+            }
+
+            _CaptureBuffer.Stop();
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        // ReSharper disable InconsistentNaming
+        protected void Dispose(bool disposing)
+            // ReSharper restore InconsistentNaming
+        {
+            if (disposing)
+            {
+                Stop();
+
+                if (_CaptureDevice != null)
+                {
+                    _CaptureDevice.Dispose();
+                    _CaptureDevice = null;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/IRecord.cs b/Vocaluxe/Lib/Sound/Record/IRecord.cs
new file mode 100644
index 00000000..7f020daa
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/IRecord.cs
@@ -0,0 +1,163 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Collections.ObjectModel;
+
+namespace Vocaluxe.Lib.Sound.Record
+{
+    class CRecordDevice
+    {
+        public readonly int ID;
+        public readonly string Name;
+        public readonly string Driver;
+
+        public readonly int Channels;
+        public int PlayerChannel1;
+        public int PlayerChannel2;
+
+        public CRecordDevice(int id, string name, string driver, int channels)
+        {
+            ID = id;
+            Name = name;
+            Driver = driver;
+
+            if (channels > 2)
+                channels = 2; //more are not supported in vocaluxe
+
+            Channels = channels;
+        }
+    }
+
+    struct SMicConfig
+    {
+        public string DeviceName;
+        public string DeviceDriver;
+        public int Channel;
+
+        // ReSharper disable UnusedParameter.Local
+        public SMicConfig(int dummy)
+            // ReSharper restore UnusedParameter.Local
+        {
+            DeviceName = String.Empty;
+            DeviceDriver = String.Empty;
+            Channel = 0;
+        }
+    }
+
+    interface IRecord
+    {
+        /// <summary>
+        ///     Initializes recording
+        /// </summary>
+        /// <returns>True on success</returns>
+        bool Init();
+
+        /// <summary>
+        ///     Closes recording. You must not use it before calling Init again
+        /// </summary>
+        void Close();
+
+        /// <summary>
+        ///     Starts recording on all enabled devices (PlayerChannelX set)
+        /// </summary>
+        /// <returns>True on success, false on error or not initialized</returns>
+        bool Start();
+
+        /// <summary>
+        ///     Stops recording on all devices
+        /// </summary>
+        /// <returns>True on success, false on error or not initialized</returns>
+        bool Stop();
+
+        /// <summary>
+        ///     Analyzes the buffer for the given player
+        /// </summary>
+        /// <param name="player"></param>
+        void AnalyzeBuffer(int player);
+
+        /// <summary>
+        ///     Get the current raw tone value for a player
+        /// </summary>
+        /// <param name="player">0-based player index</param>
+        /// <returns>Tone between 0 and NumHalftones-1</returns>
+        int GetToneAbs(int player);
+
+        /// <summary>
+        ///     Get the current tone value for a player
+        /// </summary>
+        /// <param name="player">0-based player index</param>
+        /// <returns>Tone between 0 and 11 (one octave)</returns>
+        int GetTone(int player);
+
+        /// <summary>
+        ///     DEBUG ONLY: Sets a tone for a player
+        /// </summary>
+        /// <param name="player">0-based player index</param>
+        /// <param name="tone">Raw tone value between 0 and NumHalfTones-1</param>
+        void SetTone(int player, int tone);
+
+        /// <summary>
+        ///     Get the current maximum input volume (normalized) for a player
+        /// </summary>
+        /// <param name="player">0-based player index</param>
+        /// <returns>Maximum volume between 0 and 1</returns>
+        float GetMaxVolume(int player);
+
+        /// <summary>
+        ///     Gets the treshold for detecting silence
+        ///     Value (0-1) for which everything below is considered silence
+        ///     <param name="player">0-based player index</param>
+        ///     <returns>Threshold</returns>
+        /// </summary>
+        float GetVolumeThreshold(int player);
+
+        /// <summary>
+        ///     Sets the treshold for detecting silence
+        ///     Value (0-1) for which everything below is considered silence
+        ///     <param name="player">0-based player index</param>
+        ///     <param name="threshold">Threshold</param>
+        /// </summary>
+        void SetVolumeThreshold(int player, float threshold);
+
+        /// <summary>
+        ///     Returns whether the current tone is valid. That includes, if maximum volume is higher than the threshold
+        /// </summary>
+        /// <param name="player">0-based player index</param>
+        /// <returns>True if tone is detected and volume higher than threshold</returns>
+        bool ToneValid(int player);
+
+        /// <summary>
+        ///     Returns the number of half tones used for the raw tone detection
+        /// </summary>
+        /// <returns>number of half tones used for the raw tone detection</returns>
+        int NumHalfTones();
+
+        /// <summary>
+        ///     Returns the tone weights for a player as an array of normalized values for each halftone
+        /// </summary>
+        /// <param name="player">0-based player index</param>
+        /// <returns>Array of values (0-1) with one entry per halftone</returns>
+        float[] ToneWeigth(int player);
+
+        /// <summary>
+        ///     Readonly list of all detected record devices. Modifying the devices should not be done when record is running.
+        /// </summary>
+        /// <returns>Readonly list of all detected record devices</returns>
+        ReadOnlyCollection<CRecordDevice> RecordDevices();
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CAnalyzer.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CAnalyzer.cs
new file mode 100644
index 00000000..2a50540f
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CAnalyzer.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker
+{
+    /// <summary>
+    /// Analyzer from Performous
+    /// Should be very reliable but needs some proof (artificial tests show some errors)
+    /// </summary>
+    class CAnalyzer : CPitchTracker
+    {
+        #region Imports
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern IntPtr Analyzer_Create(uint step = 200);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void Analyzer_Free(IntPtr analyzer);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void Analyzer_InputFloat(IntPtr analyzer, [In] float[] data, int sampleCt);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void Analyzer_InputShort(IntPtr analyzer, [In] short[] data, int sampleCt);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void Analyzer_InputByte(IntPtr analyzer, [In] byte[] data, int sampleCt);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void Analyzer_Process(IntPtr analyzer);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern float Analyzer_GetPeak(IntPtr analyzer);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern double Analyzer_FindNote(IntPtr analyzer, double minFreq, double maxFreq);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern bool Analyzer_OutputFloat(IntPtr analyzer, [Out] float[] data, int sampleCt, float rate);
+        #endregion
+
+        private IntPtr _Instance;
+        private float _VolumeTreshold;
+
+        public CAnalyzer(uint step = 200)
+        {
+            _Instance = Analyzer_Create(step);
+            _VolumeTreshold = 0.01f;
+        }
+
+        public override void Input(byte[] data)
+        {
+            Analyzer_InputByte(_Instance, data, data.Length / 2);
+        }
+
+        public override int GetNote(out float maxVolume, float[] weights)
+        {
+            Analyzer_Process(_Instance);
+            maxVolume = Analyzer_GetPeak(_Instance);
+            if (maxVolume < _VolumeTreshold)
+                return -1;
+            int note = (int)Math.Round(Analyzer_FindNote(_Instance, 60, 1800));
+            _SetWeights(note, weights);
+            return note;
+        }
+
+        public bool Output(float[] data, float rate)
+        {
+            return Analyzer_OutputFloat(_Instance, data, data.Length, rate);
+        }
+
+        protected override void _Dispose(bool disposing)
+        {
+            if (_Instance == IntPtr.Zero)
+                throw new ObjectDisposedException(GetType().Name);
+            Analyzer_Free(_Instance);
+            _Instance = IntPtr.Zero;
+        }
+
+        public override int GetNumHalfTones()
+        {
+            return NumHalfTonesDef;
+        }
+
+        public override float VolumeTreshold
+        {
+            get { return _VolumeTreshold; }
+            set { _VolumeTreshold = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPitchTrackerTest.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPitchTrackerTest.cs
new file mode 100644
index 00000000..7ba4966b
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPitchTrackerTest.cs
@@ -0,0 +1,399 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using VocaluxeLib;
+using VocaluxeLib.Utils;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker
+{
+    class CPitchTrackerTest
+    {
+        //Half tones: C C# D D# E F F# G G# A A# B
+        private const double _BaseToneFreq = 65.4064; // lowest (half-)tone to analyze (C2 = 65.4064 Hz)
+        private const double _HalftoneBase = 1.05946309436; // 2^(1/12) -> HalftoneBase^12 = 2 (one octave)
+
+        private readonly List<CPitchTracker> _Analyzers = new List<CPitchTracker>();
+        private int[] _Tones;
+        private float[][] _Weights;
+        private float _MaxVolume;
+        private int _CurTestCount;
+        private int[] _CurPassedCount;
+        private int _TestCount;
+        private int[] _PassedCount;
+        private int[] _SamplesPerSec;
+
+        private static bool _IsRun;
+
+        public void AddAnalyzer(CPitchTracker analyzer)
+        {
+            _Analyzers.Add(analyzer);
+        }
+
+        #region Init
+        private void _InitTests()
+        {
+            _Tones = new int[_Analyzers.Count];
+            _TestCount = 0;
+            _PassedCount = new int[_Analyzers.Count];
+            _CurTestCount = 0;
+            _CurPassedCount = new int[_Analyzers.Count];
+            _Weights = new float[_Analyzers.Count][];
+            for (int i = 0; i < _Analyzers.Count; i++)
+                _Weights[i] = new float[_Analyzers[i].GetNumHalfTones()];
+            _SamplesPerSec = new int[_Analyzers.Count];
+        }
+
+        private void _InitNext(string lastTest)
+        {
+            string msg = "Errors " + lastTest + ": ";
+            for (int i = 0; i < _CurPassedCount.Length; i++)
+            {
+                msg += _CurTestCount - _CurPassedCount[i] + " ";
+                _PassedCount[i] += _CurPassedCount[i];
+                _CurPassedCount[i] = 0;
+            }
+            msg += "of " + _CurTestCount;
+            CBase.Log.LogDebug(msg);
+            _TestCount += _CurTestCount;
+            _CurTestCount = 0;
+            //Do a reset first as we actually have an impossible situation (drop by multiple octaves)
+            byte[] data = new byte[4096 * 2];
+            _Process(data);
+        }
+        #endregion
+
+        public void RunTest(bool reRun = false)
+        {
+            if (_IsRun && !reRun)
+                return;
+            _IsRun = true;
+
+            _InitTests();
+
+            _TestSines();
+            _InitNext("Sines");
+
+            _TestFile("toneG3.wav", 19);
+            _InitNext("Real G3");
+
+            _TestFile("toneG3Miss.wav", 19);
+            _InitNext("Real G3 with miss. fundamental");
+
+            _TestFile("toneG4.wav", 31);
+            _InitNext("Real G4");
+
+            _TestFile("whistling3.wav", "whistling3.txt");
+            _InitNext("High whistling");
+
+            _TestFile("sClausVoc.wav", "sClausVoc.txt");
+            _InitNext("Real song");
+
+            _TestSpeed();
+            CBase.Log.LogDebug("Finished: ");
+            for (int i = 0; i < _Analyzers.Count; i++)
+            {
+                string msg = _Analyzers[i].GetType().Name + ":";
+                msg += " Errors=" + (_TestCount - _PassedCount[i]);
+                msg += " Passed=" + _PassedCount[i];
+                msg += " Total=" + _TestCount;
+                msg += " Speed=" + _SamplesPerSec[i] / 1000 + "kSamples/s (=" + (_SamplesPerSec[i] / 44100) + "rec.s/s)";
+                CBase.Log.LogDebug(msg);
+            }
+        }
+
+        private void _TestSpeed()
+        {
+            const int samplesPerBuffer = 512;
+            byte[] data;
+            byte[] data2 = new byte[samplesPerBuffer * 2];
+            double angle = 0;
+            const int repeats = 100;
+            _GetSineWave(_BaseToneFreq * Math.Pow(_HalftoneBase, 5), 44100, samplesPerBuffer * repeats, ref angle, out data);
+            for (int i = 0; i < _Analyzers.Count; i++)
+            {
+                CPitchTracker analyzer = _Analyzers[i];
+                Stopwatch sw = new Stopwatch();
+                sw.Start();
+                for (int j = 0; j < repeats; j++)
+                {
+                    Buffer.BlockCopy(data, 0, data2, 0, samplesPerBuffer * 2);
+                    analyzer.Input(data2);
+                    analyzer.GetNote(out _MaxVolume, _Weights[i]);
+                }
+                sw.Stop();
+                _SamplesPerSec[i] = (int)Math.Round(samplesPerBuffer * repeats / (sw.ElapsedMilliseconds / 1000.0));
+            }
+        }
+
+        private void _Process(byte[] data)
+        {
+            for (int j = 0; j < _Analyzers.Count; j++)
+            {
+                _Analyzers[j].Input(data);
+                _Tones[j] = _Analyzers[j].GetNote(out _MaxVolume, _Weights[j]);
+            }
+        }
+
+        private static string _ToneToNote(int tone, bool withOctave = true)
+        {
+            if (tone < 0)
+                return "inv.";
+            tone += 24;
+            string[] notes = {"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"};
+            string result = notes[tone % 12];
+            if (withOctave)
+                result += (tone / 12);
+            return result;
+        }
+
+        #region Sines
+        private void _TestSines()
+        {
+            const int toneFrom = 0;
+            const int toneTo = 47; //B5
+            const int sampleCt = 4096;
+            const int batchCt = 512;
+            byte[] data2 = new byte[batchCt * 2];
+            Console.WriteLine("Testing notes " + _ToneToNote(toneFrom) + " - " + _ToneToNote(toneTo));
+            double angle = 0;
+            bool[] valids = new bool[_Analyzers.Count];
+            for (int distort = 0; distort < 10; distort++)
+            {
+                //Do a reset first as we actually have an impossible situation (drop by multiple octaves)
+                byte[] data = new byte[sampleCt * 2];
+                _Process(data);
+                for (int tone = toneFrom; tone <= toneTo; tone++)
+                {
+                    _GetSineWave(_BaseToneFreq * Math.Pow(_HalftoneBase, tone), 44100, sampleCt, ref angle, out data);
+                    if (tone == 46 && distort == 4)
+                        data = new byte[data.Length];
+                    _Distort(data, tone, distort);
+
+                    for (int i = 0; i < sampleCt / batchCt; i++)
+                    {
+                        Buffer.BlockCopy(data, i * batchCt * 2, data2, 0, batchCt * 2);
+                        _Process(data2);
+                        if (i * batchCt < 2048)
+                            continue;
+                        _CurTestCount++;
+                        bool ok = true;
+                        for (int j = 0; j < valids.Length; j++)
+                        {
+                            valids[j] = _Tones[j] == tone;
+                            if (!valids[j])
+                                ok = false;
+                            else
+                                _CurPassedCount[j]++;
+                        }
+                        if (ok)
+                            continue;
+                        string msg = "Note " + _ToneToNote(tone) + "(" + distort + ") at buffer " + (i + 1) + "/" + (sampleCt / batchCt) + " detected as ";
+                        for (int j = 0; j < valids.Length; j++)
+                            msg += _ToneToNote(_Tones[j]) + (valids[j] ? "" : "(!)") + "; ";
+                        CBase.Log.LogDebug(msg);
+                        /*CWavFile w = new CWavFile();
+                        w.Create(tone + "-" + distort + ".wav", 1, 44100, 16);
+                        w.Write16BitSamples(data);
+                        w.Close();*/
+                    }
+                }
+            }
+        }
+
+        private static short[] _GetDistort(int sampleCt, int tone, int type)
+        {
+            short[] sdata = new short[sampleCt];
+            if (type < 9)
+            {
+                int newTone = 1;
+                switch (type)
+                {
+                    case 0:
+                        newTone = 2;
+                        break;
+                    case 1:
+                        newTone = 3;
+                        break;
+                    case 2:
+                        newTone = 6;
+                        break;
+                    case 3:
+                        newTone = 8;
+                        break;
+                    case 4:
+                        newTone = 10;
+                        break;
+                    case 5:
+                        newTone = 15;
+                        break;
+                    case 6:
+                        newTone = 25;
+                        break;
+                    case 7:
+                        newTone = 26;
+                        break;
+                    case 8:
+                        newTone = 29;
+                        break;
+                }
+                byte[] data2;
+                double angle = 0;
+                _GetSineWave(_BaseToneFreq * Math.Pow(_HalftoneBase, tone + newTone), 44100, sampleCt, ref angle, out data2);
+                Buffer.BlockCopy(data2, 0, sdata, 0, sampleCt * 2);
+            }
+            else
+            {
+                Random r = new Random(0xBEEF);
+                for (int i = 0; i < sdata.Length; i++)
+                    sdata[i] = (short)(r.Next() - Int16.MinValue);
+            }
+            return sdata;
+        }
+
+        private static void _Distort(byte[] data, int tone, int distortCt)
+        {
+            if (distortCt < 1)
+                return;
+            short[] sdata = new short[data.Length / 2];
+            Buffer.BlockCopy(data, 0, sdata, 0, data.Length);
+
+            short[][] distortions = new short[distortCt][];
+            for (int i = 0; i < distortCt; i++)
+                distortions[i] = _GetDistort(data.Length / 2, tone, i);
+
+            for (int i = 0; i < sdata.Length; i++)
+            {
+                double distortion = 0;
+                for (int j = 0; j < distortCt; j++)
+                    distortion += distortions[j][i];
+                distortion /= distortCt;
+                sdata[i] = (short)(sdata[i] * 4.0 / 5.0 + distortion / 5.0);
+            }
+            Buffer.BlockCopy(sdata, 0, data, 0, data.Length);
+        }
+
+        private static void _GetSineWave(double freq, int sampleRate, int sampleCt, ref double angle, out byte[] data)
+        {
+            const short max = short.MaxValue;
+            short[] data16Bit = new short[sampleCt];
+            for (int i = 0; i < sampleCt; i++)
+                data16Bit[i] = (short)(Math.Sin(2 * Math.PI * i / sampleRate * freq + angle) * max);
+            angle = 2 * Math.PI * sampleCt / sampleRate * freq + angle;
+            angle = angle % (2 * Math.PI);
+            data = new byte[data16Bit.Length * 2];
+            Buffer.BlockCopy(data16Bit, 0, data, 0, data.Length);
+        }
+        #endregion
+
+        #region File
+        private struct STimedNote
+        {
+            public int Time, Note;
+        }
+
+        private void _TestFile(string fileName, string testFileName)
+        {
+            if (!File.Exists(testFileName))
+                return;
+            List<STimedNote> tones = new List<STimedNote>();
+            using (StreamReader reader = new StreamReader(testFileName))
+            {
+                String line;
+                while ((line = reader.ReadLine()) != null)
+                {
+                    int p = line.IndexOf(' ');
+                    if (p < 0)
+                        continue;
+                    STimedNote note;
+                    note.Time = int.Parse(line.Substring(0, p));
+                    note.Note = int.Parse(line.Substring(p + 1));
+                    tones.Add(note);
+                }
+            }
+            _TestFile(fileName, tones);
+        }
+
+        private void _TestFile(string fileName, int tone)
+        {
+            STimedNote note;
+            note.Note = tone;
+            note.Time = 46;
+            List<STimedNote> tones = new List<STimedNote> {note};
+            _TestFile(fileName, tones);
+        }
+
+        private static bool _IsNoteValid(int note, int time, IList<STimedNote> tones)
+        {
+            const int lastNoteMaxTimeDiff = 1536 * 1000 / 44100; // old note is valid for 1536 more samples
+            for (int i = 0; i < tones.Count; i++)
+            {
+                if (tones[i].Time > time)
+                    break;
+                if (i + 1 == tones.Count || time <= tones[i + 1].Time + lastNoteMaxTimeDiff)
+                {
+                    if (tones[i].Note == note || tones[i].Note < 0)
+                        return true;
+                }
+            }
+            return false;
+        }
+
+        private void _TestFile(string fileName, IList<STimedNote> tones)
+        {
+            CWavFile wavFile = new CWavFile();
+            try
+            {
+                if (!wavFile.Open(fileName))
+                    return;
+                if (wavFile.BitsPerSample != 16)
+                {
+                    wavFile.Close();
+                    return;
+                }
+                int samplesRead = 0;
+                int curTimeIndex = -1;
+                int curNote = -1;
+                const int maxSamplesPerBatch = 512;
+                bool[] valids = new bool[_Tones.Length];
+                while (wavFile.NumSamplesLeft > maxSamplesPerBatch)
+                {
+                    byte[] samples = wavFile.GetNextSamples16BitAsBytes(maxSamplesPerBatch, 1);
+                    samplesRead += samples.Length / 2;
+                    int time = samplesRead * 1000 / wavFile.SampleRate;
+                    _Process(samples);
+                    while (curTimeIndex + 1 < tones.Count && time >= tones[curTimeIndex + 1].Time)
+                    {
+                        curTimeIndex++;
+                        curNote = tones[curTimeIndex].Note;
+                    }
+                    if (curNote < 0)
+                        continue;
+                    _CurTestCount++;
+                    bool error = false;
+                    for (int i = 0; i < _Tones.Length; i++)
+                    {
+                        valids[i] = _IsNoteValid(_Tones[i], time, tones);
+                        if (valids[i])
+                            _CurPassedCount[i]++;
+                        else
+                            error = true;
+                    }
+                    if (error)
+                    {
+                        string msg = "Note " + _ToneToNote(curNote) + " at " + time + "ms detected as ";
+                        for (int i = 0; i < _Tones.Length; i++)
+                            msg += _ToneToNote(_Tones[i]) + (valids[i] ? "" : "(!)") + "; ";
+                        CBase.Log.LogDebug(msg);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Error on file " + fileName + ": " + e);
+            }
+            wavFile.Close();
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs
new file mode 100644
index 00000000..842fdb22
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker
+{
+    /// <summary>
+    /// Pitchtracker (Pt) that uses autocorrelation (AKF) and AMDF
+    /// Quite fast and perfect in artificial tests, but may fail in real world scenarios (e.g. missing fundamental)
+    /// </summary>
+    class CPtAKF : CPitchTracker
+    {
+        #region Imports
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern IntPtr PtAKF_Create(uint step);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void PtAKF_Free(IntPtr analyzer);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern int PtAKF_GetNumHalfTones();
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void PtAKF_InputByte(IntPtr analyzer, [In] byte[] data, int sampleCt);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void PtAKF_SetVolumeThreshold(IntPtr analyzer, float threshold);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern float PtAKF_GetVolumeThreshold(IntPtr analyzer);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern int PtAKF_GetNote(IntPtr analyzer, [Out] out float maxVolume, [Out] float[] weights);
+        #endregion
+
+        private IntPtr _Instance;
+
+        public CPtAKF(uint step = 400)
+        {
+            _Instance = PtAKF_Create(step);
+        }
+
+        public override int GetNumHalfTones()
+        {
+            return PtAKF_GetNumHalfTones();
+        }
+
+        public override float VolumeTreshold
+        {
+            get { return PtAKF_GetVolumeThreshold(_Instance); }
+            set { PtAKF_SetVolumeThreshold(_Instance, value); }
+        }
+
+        public override void Input(byte[] data)
+        {
+            PtAKF_InputByte(_Instance, data, data.Length / 2);
+        }
+
+        public override int GetNote(out float maxVolume, float[] weights)
+        {
+            return PtAKF_GetNote(_Instance, out maxVolume, weights);
+        }
+
+        protected override void _Dispose(bool disposing)
+        {
+            if (_Instance == IntPtr.Zero)
+                throw new ObjectDisposedException(GetType().Name);
+            PtAKF_Free(_Instance);
+            _Instance = IntPtr.Zero;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtDyWa.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtDyWa.cs
new file mode 100644
index 00000000..2907f1c8
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtDyWa.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker
+{
+    /// <summary>
+    /// Pitchtracker (Pt) that uses a dynamic wavelet (DyWa) algorithm 
+    /// </summary>
+    class CPtDyWa : CPitchTracker
+    {
+        #region Imports
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern IntPtr PtDyWa_Create(uint step);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void PtDyWa_Free(IntPtr analyzer);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void PtDyWa_SetVolumeThreshold(IntPtr analyzer, float threshold);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern float PtDyWa_GetVolumeThreshold(IntPtr analyzer);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void PtDyWa_InputByte(IntPtr analyzer, [In] byte[] data, int sampleCt);
+
+        [DllImport("PitchTracker.dll", CallingConvention = CallingConvention.Cdecl)]
+        private static extern double PtDyWa_FindNote(IntPtr analyzer, [Out] out float maxVolume);
+        #endregion
+
+        private IntPtr _Instance;
+
+        public CPtDyWa(uint step = 200)
+        {
+            _Instance = PtDyWa_Create(step);
+        }
+
+        public override void Input(byte[] data)
+        {
+            PtDyWa_InputByte(_Instance, data, data.Length / 2);
+        }
+
+        public override int GetNote(out float maxVolume, float[] weights)
+        {
+            int note = (int)Math.Round(PtDyWa_FindNote(_Instance, out maxVolume));
+            _SetWeights(note, weights);
+            return note;
+        }
+
+        public override int GetNumHalfTones()
+        {
+            return NumHalfTonesDef;
+        }
+
+        public override float VolumeTreshold
+        {
+            get { return PtDyWa_GetVolumeThreshold(_Instance); }
+            set { PtDyWa_SetVolumeThreshold(_Instance, value); }
+        }
+
+        protected override void _Dispose(bool disposing)
+        {
+            if (_Instance == IntPtr.Zero)
+                throw new ObjectDisposedException(GetType().Name);
+            PtDyWa_Free(_Instance);
+            _Instance = IntPtr.Zero;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtSharp.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtSharp.cs
new file mode 100644
index 00000000..9f73b0f2
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtSharp.cs
@@ -0,0 +1,54 @@
+using System;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker
+{
+    /// <summary>
+    /// Pitchtracker (Pt) in C# that uses IIR filters for smoothing and an intelligent detection algorithm to reduce calculations
+    /// DO NOT USE in 32 Bit! Due to floating point errors the filter will raise all values to NAN (TODO: FIX it!)
+    /// </summary>
+    class CPtSharp : CPitchTracker
+    {
+        private Pitch.PitchTracker _Instance;
+
+        public CPtSharp()
+        {
+            _Instance = new Pitch.PitchTracker {SampleRate = 44100, DetectLevelThreshold = 0.01f, PitchRecordHistorySize = 1};
+        }
+
+        public override void Input(byte[] data)
+        {
+            short[] samplesShort = new short[data.Length / 2];
+            Buffer.BlockCopy(data, 0, samplesShort, 0, data.Length);
+            float[] samplesFloat = new float[samplesShort.Length];
+            for (int i = 0; i < samplesShort.Length; i++)
+                samplesFloat[i] = (float)samplesShort[i] / short.MaxValue;
+            _Instance.ProcessBuffer(samplesFloat);
+        }
+
+        public override int GetNote(out float maxVolume, float[] weights)
+        {
+            int note = _Instance.CurrentPitchRecord.MidiNote - 15 - 21;
+            maxVolume = _Instance.LastMaxVol;
+            _SetWeights(note, weights);
+            return note;
+        }
+
+        public override int GetNumHalfTones()
+        {
+            return NumHalfTonesDef;
+        }
+
+        public override float VolumeTreshold
+        {
+            get { return _Instance.DetectLevelThreshold; }
+            set { _Instance.DetectLevelThreshold = value; }
+        }
+
+        protected override void _Dispose(bool disposing)
+        {
+            if (_Instance == null)
+                throw new ObjectDisposedException(GetType().Name);
+            _Instance = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/IPitchTracker.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/IPitchTracker.cs
new file mode 100644
index 00000000..94c4876f
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/IPitchTracker.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Diagnostics;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker
+{
+    /// <summary>
+    /// Base class/Interface for pitch detectors
+    /// Most likely some structures or system resources are used, hence it should be disposed if no longer needed
+    /// </summary>
+    abstract class CPitchTracker : IDisposable
+    {
+        //Default number of half tones (1 octave)
+        protected const int NumHalfTonesDef = 12;
+
+        ~CPitchTracker()
+        {
+            _Dispose(false);
+        }
+
+        protected abstract void _Dispose(bool disposing);
+
+        public void Dispose()
+        {
+            _Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Method to set weights if the algorithm does not provide anything that could simulate a visualizer.
+        /// Should be called with each valid detection
+        /// </summary>
+        /// <param name="note">Current note</param>
+        /// <param name="weights">Array of weights (Length = NumHalfTonesDef)</param>
+        protected static void _SetWeights(int note, float[] weights)
+        {
+            Debug.Assert(weights.Length == NumHalfTonesDef);
+            for (int i = 0; i < NumHalfTonesDef; i++)
+                weights[i] *= 0.9f;
+            if (note < 0)
+                return;
+            int w = note % NumHalfTonesDef;
+            weights[w] = Math.Min(1f, weights[w] + 0.15f);
+        }
+
+        /// <summary>
+        /// Gets the number of half tones the algorithm provides weights for.
+        /// This may not be the number of half tones the algorithm detects!
+        /// </summary>
+        /// <returns></returns>
+        public abstract int GetNumHalfTones();
+
+        /// <summary>
+        /// The treshold for detecting silence
+        /// Value (0-1) for which everything below is considered silence
+        /// </summary>
+        public abstract float VolumeTreshold { get; set; }
+
+        /// <summary>
+        /// Recorded data. Has to be 16 bit short values.
+        /// </summary>
+        /// <param name="data">16bit short values of data</param>
+        public abstract void Input(byte[] data);
+
+        /// <summary>
+        /// Returns the current note detected
+        /// </summary>
+        /// <param name="maxVolume">Current maximum volume (0-1)</param>
+        /// <param name="weights">Array of NumHalfTones floats that gets filled with the current weights (0-1) where each value indicates how strong that tone is.
+        /// Only for basic visualization as it may not be accurate.</param>
+        /// <returns>Current note index (0 = C2, 12 = C3, ...)</returns>
+        public abstract int GetNote(out float maxVolume, float[] weights);
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/CircularBuffer.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/CircularBuffer.cs
new file mode 100644
index 00000000..07b6836b
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/CircularBuffer.cs
@@ -0,0 +1,173 @@
+using System;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker.Pitch
+{
+    public class CircularBuffer<T> : IDisposable
+    {
+        int m_bufSize;
+        int m_begBufOffset;
+        int m_availBuf;
+        long m_startPos;   // total circular buffer position
+        T[] m_buffer;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public CircularBuffer()
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="bufCount"></param>
+        public CircularBuffer(int bufCount)
+        {
+            SetSize(bufCount);
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            SetSize(0);
+        }
+
+        /// <summary>
+        /// Reset to the beginning of the buffer
+        /// </summary>
+        public void Reset()
+        {
+            m_begBufOffset = 0;
+            m_availBuf = 0;
+            m_startPos = 0;
+        }
+
+        /// <summary>
+        /// Set the buffer to the specified size
+        /// </summary>
+        /// <param name="newSize"></param>
+        public void SetSize(int newSize)
+        {
+            Reset();
+
+            if (m_bufSize == newSize)
+                return;
+
+            if (m_buffer != null)
+                m_buffer = null;
+
+            m_bufSize = newSize;
+
+            if (m_bufSize > 0)
+                m_buffer = new T[m_bufSize];
+        }
+
+        /// <summary>
+        /// Clear the buffer
+        /// </summary>
+        public void Clear()
+        {
+            Array.Clear(m_buffer, 0, m_buffer.Length);
+        }
+
+        /// <summary>
+        /// Get or set the start position
+        /// </summary>
+        public long StartPosition
+        {
+            get { return m_startPos; }
+            set { m_startPos = value; }
+        }
+
+        /// <summary>
+        /// Get the end position
+        /// </summary>
+        public long EndPosition
+        {
+            get { return m_startPos + m_availBuf; }
+        }
+
+        /// <summary>
+        /// Get or set the amount of avaliable space
+        /// </summary>
+        public int Available
+        {
+            get { return m_availBuf; }
+            set { m_availBuf = Math.Min(value, m_bufSize); }
+        }
+
+        /// <summary>
+        /// Write data into the buffer
+        /// </summary>
+        /// <param name="m_pInBuffer"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public int WriteBuffer(T[] m_pInBuffer, int count)
+        {
+            count = Math.Min(count, m_bufSize);
+
+            var startPos = m_availBuf != m_bufSize ? m_availBuf : m_begBufOffset;
+            var pass1Count = Math.Min(count, m_bufSize - startPos);
+            var pass2Count = count - pass1Count;
+
+            PitchDsp.CopyBuffer(m_pInBuffer, 0, m_buffer, startPos, pass1Count);
+
+            if (pass2Count > 0)
+                PitchDsp.CopyBuffer(m_pInBuffer, pass1Count, m_buffer, 0, pass2Count);
+
+            if (pass2Count == 0)
+            {
+                // did not wrap around
+                if (m_availBuf != m_bufSize)
+                    m_availBuf += count;   // have never wrapped around
+                else
+                {
+                    m_begBufOffset += count;
+                    m_startPos += count;
+                }
+            }
+            else
+            {
+                // wrapped around
+                if (m_availBuf != m_bufSize)
+                    m_startPos += pass2Count;  // first time wrap-around
+                else
+                    m_startPos += count;
+
+                m_begBufOffset = pass2Count;
+                m_availBuf = m_bufSize;
+            }
+
+            return count;
+        }
+
+        /// <summary>
+        /// Read from the buffer
+        /// </summary>
+        /// <param name="outBuffer"></param>
+        /// <param name="startRead"></param>
+        /// <param name="readCount"></param>
+        /// <returns></returns>
+        public bool ReadBuffer(T[] outBuffer, long startRead, int readCount)
+        {
+            var endRead = (int)(startRead + readCount);
+            var endAvail = (int)(m_startPos + m_availBuf);
+
+            if (startRead < m_startPos || endRead > endAvail)
+                return false;
+
+            var startReadPos = (int)(((startRead - m_startPos) + m_begBufOffset) % m_bufSize);
+            var block1Samples = Math.Min(readCount, m_bufSize - startReadPos);
+            var block2Samples = readCount - block1Samples;
+
+            PitchDsp.CopyBuffer(m_buffer, startReadPos, outBuffer, 0, block1Samples);
+
+            if (block2Samples > 0)
+                PitchDsp.CopyBuffer(m_buffer, 0, outBuffer, block1Samples, block2Samples);
+
+            return true;
+        }
+    }
+}
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/Extensions.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/Extensions.cs
new file mode 100644
index 00000000..4cbd7c81
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/Extensions.cs
@@ -0,0 +1,105 @@
+using System;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker.Pitch
+{
+    public static class Extensions
+    {
+        /// <summary>
+        /// Clear the buffer
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="buffer"></param>
+        public static void Clear(this float[] buffer)
+        {
+            Array.Clear(buffer, 0, buffer.Length);
+        }
+
+        /// <summary>
+        /// Clear the buffer
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="buffer"></param>
+        public static void Clear(this double[] buffer)
+        {
+            Array.Clear(buffer, 0, buffer.Length);
+        }
+
+        /// <summary>
+        /// Copy the values from one buffer to a different or the same buffer. 
+        /// It is safe to copy to the same buffer, even if the areas overlap
+        /// </summary>
+        /// <param name="buffer"></param>
+        /// <param name="shiftBy"></param>
+        /// <param name="startIdx"></param>
+        /// <param name="length"></param>
+        public static void Copy(this float[] fromBuffer, float[] toBuffer, int fromStart, int toStart, int length)
+        {
+            if (toBuffer == null || fromBuffer.Length == 0 || toBuffer.Length == 0)
+                return;
+
+            int fromBegIdx = fromStart;
+            int fromEndIdx = fromStart + length;
+            int toBegIdx = toStart;
+            int toEndIdx = toStart + length;
+
+            if (fromBegIdx < 0)
+            {
+                toBegIdx -= fromBegIdx;
+                fromBegIdx = 0;
+            }
+
+            if (toBegIdx < 0)
+            {
+                fromBegIdx -= toBegIdx;
+                toBegIdx = 0;
+            }
+
+            if (fromEndIdx >= fromBuffer.Length)
+            {
+                toEndIdx -= fromEndIdx - fromBuffer.Length + 1;
+                fromEndIdx = fromBuffer.Length - 1;
+            }
+
+            if (toEndIdx >= toBuffer.Length)
+            {
+                fromEndIdx -= toEndIdx - toBuffer.Length + 1;
+                toEndIdx = fromBuffer.Length - 1;
+            }
+
+            if (fromBegIdx < toBegIdx)
+            {
+                // Shift right, so start at the right
+                for (int fromIdx = fromEndIdx, toIdx = toEndIdx; fromIdx >= fromBegIdx; fromIdx--, toIdx--)
+                    toBuffer[toIdx] = fromBuffer[fromIdx];
+            }
+            else
+            {
+                // Shift left, so start at the left
+                for (int fromIdx = fromBegIdx, toIdx = toBegIdx; fromIdx <= fromEndIdx; fromIdx++, toIdx++)
+                    toBuffer[toIdx] = fromBuffer[fromIdx];
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="buffer"></param>
+        public static void Clear(this float[] buffer, int startIdx, int endIdx)
+        {
+            Array.Clear(buffer, startIdx, endIdx - startIdx + 1);
+        }
+
+        /// <summary>
+        /// Fill the buffer with the specified value
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="buffer"></param>
+        /// <param name="?"></param>
+        public static void Fill(this double[] buffer, double value)
+        {
+            for (int idx = 0; idx < buffer.Length; idx++)
+                buffer[idx] = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/IIRFilter.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/IIRFilter.cs
new file mode 100644
index 00000000..e180ff72
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/IIRFilter.cs
@@ -0,0 +1,613 @@
+using System;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker.Pitch
+{
+    /// <summary>
+    /// Infinite impulse response filter (old style analog filters)
+    /// </summary>
+    class IIRFilter
+    {
+        /// <summary>
+        /// The type of filter
+        /// </summary>
+        public enum FilterType
+        {
+            None = 0,
+            LP,
+            HP,
+            BP
+        }
+
+        /// <summary>
+        /// The filter prototype
+        /// </summary>
+        public enum ProtoType
+        {
+            None = 0,
+            Butterworth,
+            Chebyshev,
+        }
+
+        const int kHistMask = 31;
+        const int kHistSize = 32;
+
+        private int m_order;
+        private ProtoType m_protoType;
+        private FilterType m_filterType;
+
+        private float m_fp1;
+        private float m_fp2;
+        private float m_fN;
+        private float m_ripple;
+        private float m_sampleRate;
+        private double[] m_real;
+        private double[] m_imag;
+        private double[] m_z;
+        private double[] m_aCoeff;
+        private double[] m_bCoeff;
+        private double[] m_inHistory;
+        private double[] m_outHistory;
+        private int m_histIdx;
+        private bool m_invertDenormal;
+
+        public IIRFilter()
+        {
+        }
+
+        /// <summary>
+        /// Returns true if all the filter parameters are valid
+        /// </summary>
+        public bool FilterValid
+        {
+            get
+            {
+                if (m_order < 1 || m_order > 16 ||
+                    m_protoType == ProtoType.None ||
+                    m_filterType == FilterType.None ||
+                    m_sampleRate <= 0.0f ||
+                    m_fN <= 0.0f)
+                    return false;
+
+                switch (m_filterType)
+                {
+                    case FilterType.LP:
+                        if (m_fp2 <= 0.0f)
+                            return false;
+                        break;
+
+                    case FilterType.BP:
+                        if (m_fp1 <= 0.0f || m_fp2 <= 0.0f || m_fp1 >= m_fp2)
+                            return false;
+                        break;
+
+                    case FilterType.HP:
+                        if (m_fp1 <= 0.0f)
+                            return false;
+                        break;
+                }
+
+                // For bandpass, the order must be even
+                if (m_filterType == FilterType.BP && (m_order & 1) != 0)
+                    return false;
+
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Set the filter prototype
+        /// </summary>
+        public ProtoType Proto
+        {
+            get { return m_protoType; }
+
+            set
+            {
+                m_protoType = value;
+                Design();
+            }
+        }
+
+        /// <summary>
+        /// Set the filter type
+        /// </summary>
+        public FilterType Type
+        {
+            get { return m_filterType; }
+
+            set
+            {
+                m_filterType = value;
+                Design();
+            }
+        }
+
+        public int Order
+        {
+            get { return m_order; }
+
+            set
+            {
+                m_order = Math.Min(16, Math.Max(1, Math.Abs(value)));
+
+                if (m_filterType == FilterType.BP && Odd(m_order))
+                    m_order++;
+
+                Design();
+            }
+        }
+
+        public float SampleRate
+        {
+            get { return m_sampleRate; }
+
+            set
+            {
+                m_sampleRate = value;
+                m_fN = 0.5f * m_sampleRate;
+                Design();
+            }
+        }
+
+        public float FreqLow
+        {
+            get { return m_fp1; }
+
+            set
+            {
+                m_fp1 = value;
+                Design();
+            }
+        }
+
+        public float FreqHigh
+        {
+            get { return m_fp2; }
+
+            set
+            {
+                m_fp2 = value;
+                Design();
+            }
+        }
+
+        public float Ripple
+        {
+            get { return m_ripple; }
+
+            set
+            {
+                m_ripple = value;
+                Design();
+            }
+        }
+
+        /// <summary>
+        /// Returns true if n is odd
+        /// </summary>
+        /// <param name="n"></param>
+        /// <returns></returns>
+        private bool Odd(int n)
+        {
+            return (n & 1) == 1;
+        }
+
+        /// <summary>
+        /// Square
+        /// </summary>
+        /// <param name="f"></param>
+        /// <returns></returns>
+        private float Sqr(float value)
+        {
+            return value * value;
+        }
+
+        /// <summary>
+        /// Square
+        /// </summary>
+        /// <param name="f"></param>
+        /// <returns></returns>
+        private double Sqr(double value)
+        {
+            return value * value;
+        }
+
+        /// <summary>
+        /// Determines poles and zeros of IIR filter
+        /// based on bilinear transform method
+        /// </summary>
+        private void LocatePolesAndZeros()
+        {
+            m_real = new double[m_order + 1];
+            m_imag = new double[m_order + 1];
+            m_z = new double[m_order + 1];
+            double ln10 = Math.Log(10.0);
+
+            // Butterworth, Chebyshev parameters
+            int n = m_order;
+
+            if (m_filterType == FilterType.BP)
+                n = n / 2;
+
+            int ir = n % 2;
+            int n1 = n + ir;
+            int n2 = (3 * n + ir) / 2 - 1;
+            double f1;
+
+            switch (m_filterType)
+            {
+                case FilterType.LP:
+                    f1 = m_fp2;
+                    break;
+
+                case FilterType.HP:
+                    f1 = m_fN - m_fp1;
+                    break;
+
+                case FilterType.BP:
+                    f1 = m_fp2 - m_fp1;
+                    break;
+
+                default:
+                    f1 = 0.0;
+                    break;
+            }
+
+            double tanw1 = Math.Tan(0.5 * Math.PI * f1 / m_fN);
+            double tansqw1 = Sqr(tanw1);
+
+            // Real and Imaginary parts of low-pass poles
+            double t, a = 1.0, r = 1.0, i = 1.0;
+
+            for (int k = n1; k <= n2; k++)
+            {
+                t = 0.5 * (2 * k + 1 - ir) * Math.PI / (double)n;
+
+                switch (m_protoType)
+                {
+                    case ProtoType.Butterworth:
+                        double b3 = 1.0 - 2.0 * tanw1 * Math.Cos(t) + tansqw1;
+                        r = (1.0 - tansqw1) / b3;
+                        i = 2.0 * tanw1 * Math.Sin(t) / b3;
+                        break;
+
+                    case ProtoType.Chebyshev:
+                        double d = 1.0 - Math.Exp(-0.05 * m_ripple * ln10);
+                        double e = 1.0 / Math.Sqrt(1.0 / Sqr(1.0 - d) - 1.0);
+                        double x = Math.Pow(Math.Sqrt(e * e + 1.0) + e, 1.0 / (double)n);
+                        a = 0.5 * (x - 1.0 / x);
+                        double b = 0.5 * (x + 1.0 / x);
+                        double c3 = a * tanw1 * Math.Cos(t);
+                        double c4 = b * tanw1 * Math.Sin(t);
+                        double c5 = Sqr(1.0 - c3) + Sqr(c4);
+                        r = 2.0 * (1.0 - c3) / c5 - 1.0;
+                        i = 2.0 * c4 / c5;
+                        break;
+                }
+
+                int m = 2 * (n2 - k) + 1;
+                m_real[m + ir] = r;
+                m_imag[m + ir] = Math.Abs(i);
+                m_real[m + ir + 1] = r;
+                m_imag[m + ir + 1] = -Math.Abs(i);
+            }
+
+            if (Odd(n))
+            {
+                if (m_protoType == ProtoType.Butterworth)
+                    r = (1.0 - tansqw1) / (1.0 + 2.0 * tanw1 + tansqw1);
+
+                if (m_protoType == ProtoType.Chebyshev)
+                    r = 2.0 / (1.0 + a * tanw1) - 1.0;
+
+                m_real[1] = r;
+                m_imag[1] = 0.0;
+            }
+
+            switch (m_filterType)
+            {
+                case FilterType.LP:
+                    for (int m = 1; m <= n; m++)
+                        m_z[m] = -1.0;
+                    break;
+
+                case FilterType.HP:
+                    // Low-pass to high-pass transformation
+                    for (int m = 1; m <= n; m++)
+                    {
+                        m_real[m] = -m_real[m];
+                        m_z[m] = 1.0;
+                    }
+                    break;
+
+                case FilterType.BP:
+                    // Low-pass to bandpass transformation
+                    for (int m = 1; m <= n; m++)
+                    {
+                        m_z[m] = 1.0;
+                        m_z[m + n] = -1.0;
+                    }
+
+                    double f4 = 0.5 * Math.PI * m_fp1 / m_fN;
+                    double f5 = 0.5 * Math.PI * m_fp2 / m_fN;
+                    double aa = Math.Cos(f4 + f5) / Math.Cos(f5 - f4);
+                    double aR, aI, h1, h2, p1R, p2R, p1I, p2I;
+
+                    for (int m1 = 0; m1 <= (m_order - 1) / 2; m1++)
+                    {
+                        int m = 1 + 2 * m1;
+                        aR = m_real[m];
+                        aI = m_imag[m];
+
+                        if (Math.Abs(aI) < 0.0001)
+                        {
+                            h1 = 0.5 * aa * (1.0 + aR);
+                            h2 = Sqr(h1) - aR;
+                            if (h2 > 0.0)
+                            {
+                                p1R = h1 + Math.Sqrt(h2);
+                                p2R = h1 - Math.Sqrt(h2);
+                                p1I = 0.0;
+                                p2I = 0.0;
+                            }
+                            else
+                            {
+                                p1R = h1;
+                                p2R = h1;
+                                p1I = Math.Sqrt(Math.Abs(h2));
+                                p2I = -p1I;
+                            }
+                        }
+                        else
+                        {
+                            double fR = aa * 0.5 * (1.0 + aR);
+                            double fI = aa * 0.5 * aI;
+                            double gR = Sqr(fR) - Sqr(fI) - aR;
+                            double gI = 2 * fR * fI - aI;
+                            double sR = Math.Sqrt(0.5 * Math.Abs(gR + Math.Sqrt(Sqr(gR) + Sqr(gI))));
+                            double sI = gI / (2.0 * sR);
+                            p1R = fR + sR;
+                            p1I = fI + sI;
+                            p2R = fR - sR;
+                            p2I = fI - sI;
+                        }
+
+                        m_real[m] = p1R;
+                        m_real[m + 1] = p2R;
+                        m_imag[m] = p1I;
+                        m_imag[m + 1] = p2I;
+                    }
+
+                    if (Odd(n))
+                    {
+                        m_real[2] = m_real[n + 1];
+                        m_imag[2] = m_imag[n + 1];
+                    }
+
+                    for (int k = n; k >= 1; k--)
+                    {
+                        int m = 2 * k - 1;
+                        m_real[m] = m_real[k];
+                        m_real[m + 1] = m_real[k];
+                        m_imag[m] = Math.Abs(m_imag[k]);
+                        m_imag[m + 1] = -Math.Abs(m_imag[k]);
+                    }
+
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Calculate all the values
+        /// </summary>
+        public void Design()
+        {
+            if (!this.FilterValid)
+                return;
+
+            m_aCoeff = new double[m_order + 1];
+            m_bCoeff = new double[m_order + 1];
+            m_inHistory = new double[kHistSize];
+            m_outHistory = new double[kHistSize];
+
+            double[] newA = new double[m_order + 1];
+            double[] newB = new double[m_order + 1];
+
+            // Find filter poles and zeros
+            LocatePolesAndZeros();
+
+            // Compute filter coefficients from pole/zero values
+            m_aCoeff[0] = 1.0;
+            m_bCoeff[0] = 1.0;
+
+            for (int i = 1; i <= m_order; i++)
+            {
+                m_aCoeff[i] = 0.0;
+                m_bCoeff[i] = 0.0;
+            }
+
+            int k = 0;
+            int n = m_order;
+            int pairs = n / 2;
+
+            if (Odd(m_order))
+            {
+                // First subfilter is first order
+                m_aCoeff[1] = -m_z[1];
+                m_bCoeff[1] = -m_real[1];
+                k = 1;
+            }
+
+            for (int p = 1; p <= pairs; p++)
+            {
+                int m = 2 * p - 1 + k;
+                double alpha1 = -(m_z[m] + m_z[m + 1]);
+                double alpha2 = m_z[m] * m_z[m + 1];
+                double beta1 = -2.0 * m_real[m];
+                double beta2 = Sqr(m_real[m]) + Sqr(m_imag[m]);
+
+                newA[1] = m_aCoeff[1] + alpha1 * m_aCoeff[0];
+                newB[1] = m_bCoeff[1] + beta1 * m_bCoeff[0];
+
+                for (int i = 2; i <= n; i++)
+                {
+                    newA[i] = m_aCoeff[i] + alpha1 * m_aCoeff[i - 1] + alpha2 * m_aCoeff[i - 2];
+                    newB[i] = m_bCoeff[i] + beta1 * m_bCoeff[i - 1] + beta2 * m_bCoeff[i - 2];
+                }
+
+                for (int i = 1; i <= n; i++)
+                {
+                    m_aCoeff[i] = newA[i];
+                    m_bCoeff[i] = newB[i];
+                }
+            }
+
+            // Ensure the filter is normalized
+            FilterGain(1000);
+        }
+
+        /// <summary>
+        /// Reset the history buffers
+        /// </summary>
+        public void Reset()
+        {
+            if (m_inHistory != null)
+                m_inHistory.Clear();
+
+            if (m_outHistory != null)
+                m_outHistory.Clear();
+
+            m_histIdx = 0;
+        }
+
+        /// <summary>
+        /// Reset the filter, and fill the appropriate history buffers with the specified value
+        /// </summary>
+        /// <param name="historyValue"></param>
+        public void Reset(double startValue)
+        {
+            m_histIdx = 0;
+
+            if (m_inHistory == null || m_outHistory == null)
+                return;
+
+            m_inHistory.Fill(startValue);
+
+            if (m_inHistory != null)
+            {
+                switch (m_filterType)
+                {
+                    case FilterType.LP:
+                        m_outHistory.Fill(startValue);
+                        break;
+
+                    default:
+                        m_outHistory.Clear();
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Apply the filter to the buffer
+        /// </summary>
+        /// <param name="bufIn"></param>
+        public void FilterBuffer(float[] srcBuf, long srcPos, float[] dstBuf, long dstPos, long nLen)
+        {
+            const double kDenormal = 0.000000000000001;
+            double denormal = m_invertDenormal ? -kDenormal : kDenormal;
+            m_invertDenormal = !m_invertDenormal;
+
+            for (int sampleIdx = 0; sampleIdx < nLen; sampleIdx++)
+            {
+                double sum = 0.0f;
+
+                m_inHistory[m_histIdx] = srcBuf[srcPos + sampleIdx] + denormal;
+
+                for (int idx = 0; idx < m_aCoeff.Length; idx++)
+                    sum += m_aCoeff[idx] * m_inHistory[(m_histIdx - idx) & kHistMask];
+
+                for (int idx = 1; idx < m_bCoeff.Length; idx++)
+                    sum -= m_bCoeff[idx] * m_outHistory[(m_histIdx - idx) & kHistMask];
+
+                m_outHistory[m_histIdx] = sum;
+                m_histIdx = (m_histIdx + 1) & kHistMask;
+                dstBuf[dstPos + sampleIdx] = (float)sum;
+            }
+        }
+
+        public float FilterSample(float inVal)
+        {
+            double sum = 0.0f;
+
+            m_inHistory[m_histIdx] = inVal;
+
+            for (int idx = 0; idx < m_aCoeff.Length; idx++)
+                sum += m_aCoeff[idx] * m_inHistory[(m_histIdx - idx) & kHistMask];
+
+            for (int idx = 1; idx < m_bCoeff.Length; idx++)
+                sum -= m_bCoeff[idx] * m_outHistory[(m_histIdx - idx) & kHistMask];
+
+            m_outHistory[m_histIdx] = sum;
+            m_histIdx = (m_histIdx + 1) & kHistMask;
+
+            return (float)sum;
+        }
+
+        /// <summary>
+        /// Get the gain at the specified number of frequency points
+        /// </summary>
+        /// <param name="freqPoints"></param>
+        /// <returns></returns>
+        public float[] FilterGain(int freqPoints)
+        {
+            // Filter gain at uniform frequency intervals
+            float[] g = new float[freqPoints];
+            double theta, s, c, sac, sas, sbc, sbs;
+            float gMax = -100.0f;
+            float sc = 10.0f / (float)Math.Log(10.0f);
+            double t = Math.PI / (freqPoints - 1);
+
+            for (int i = 0; i < freqPoints; i++)
+            {
+                theta = i * t;
+
+                if (i == 0)
+                    theta = Math.PI * 0.0001;
+
+                if (i == freqPoints - 1)
+                    theta = Math.PI * 0.9999;
+
+                sac = 0.0f;
+                sas = 0.0f;
+                sbc = 0.0f;
+                sbs = 0.0f;
+
+                for (int k = 0; k <= m_order; k++)
+                {
+                    c = Math.Cos(k * theta);
+                    s = Math.Sin(k * theta);
+                    sac += c * m_aCoeff[k];
+                    sas += s * m_aCoeff[k];
+                    sbc += c * m_bCoeff[k];
+                    sbs += s * m_bCoeff[k];
+                }
+
+                g[i] = sc * (float)Math.Log((Sqr(sac) + Sqr(sas)) / (Sqr(sbc) + Sqr(sbs)));
+                gMax = Math.Max(gMax, g[i]);
+            }
+
+            // Normalize to 0 dB maximum gain
+            for (int i = 0; i < freqPoints; i++)
+                g[i] -= gMax;
+
+            // Normalize numerator (a) coefficients
+            float normFactor = (float)Math.Pow(10.0, -0.05 * gMax);
+
+            for (int i = 0; i <= m_order; i++)
+                m_aCoeff[i] *= normFactor;
+
+            return g;
+        }
+    }
+}
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/PitchDsp.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/PitchDsp.cs
new file mode 100644
index 00000000..3fc22ee6
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/PitchDsp.cs
@@ -0,0 +1,561 @@
+using System;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker.Pitch
+{
+    /// <summary>
+    /// Pitch related DSP
+    /// </summary>
+    public class PitchDsp
+    {
+        public static readonly double InverseLog2 = 1.0 / Math.Log10(2.0);
+
+        private const int kCourseOctaveSteps = 96;
+        private const int kScanHiSize = 31;
+        private const float kScanHiFreqStep = 1.005f;
+        private const int kMinMidiNote = 21; // A0
+        private const int kMaxMidiNote = 108; // C8
+
+        private float m_minPitch;
+        private float m_maxPitch;
+        private int m_minNote;
+        private int m_maxNote;
+        private int m_blockLen14; // 1/4 block len
+        private int m_blockLen24; // 2/4 block len
+        private int m_blockLen34; // 3/4 block len
+        private int m_blockLen44; // 4/4 block len
+        private double m_sampleRate;
+
+        private int m_numCourseSteps;
+        private float[] m_pCourseFreqOffset;
+        private float[] m_pCourseFreq;
+        private float[] m_scanHiOffset = new float[kScanHiSize];
+        private float[] m_peakBuf = new float[kScanHiSize];
+        private int m_prevPitchIdx;
+        private float[] m_detectCurve;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="fSampleRate"></param>
+        /// <param name="minFreq"></param>
+        /// <param name="maxFreq"></param>
+        /// <param name="fFreqStep"></param>
+        public PitchDsp(double sampleRate, float minPitch, float maxPitch)
+        {
+            m_sampleRate = sampleRate;
+            m_minPitch = minPitch;
+            m_maxPitch = maxPitch;
+
+            m_minNote = (int)(PitchToMidiNote(m_minPitch) + 0.5f) + 2;
+            m_maxNote = (int)(PitchToMidiNote(m_maxPitch) + 0.5f) - 2;
+
+            m_blockLen44 = (int)(m_sampleRate / m_minPitch + 0.5f);
+            m_blockLen34 = (m_blockLen44 * 3) / 4;
+            m_blockLen24 = m_blockLen44 / 2;
+            m_blockLen14 = m_blockLen44 / 4;
+
+            m_numCourseSteps = (int)((Math.Log((double)m_maxPitch / (double)m_minPitch) / Math.Log(2.0)) * kCourseOctaveSteps + 0.5) + 3;
+
+            m_pCourseFreqOffset = new float[m_numCourseSteps + 10000];
+            m_pCourseFreq = new float[m_numCourseSteps + 10000];
+
+            m_detectCurve = new float[m_numCourseSteps];
+
+            double freqStep = 1.0 / Math.Pow(2.0, 1.0 / kCourseOctaveSteps);
+            double curFreq = m_maxPitch / freqStep;
+
+            // frequency is stored from high to low
+            for (int idx = 0; idx < m_numCourseSteps; idx++)
+            {
+                m_pCourseFreq[idx] = (float)curFreq;
+                m_pCourseFreqOffset[idx] = (float)(m_sampleRate / curFreq);
+                curFreq *= freqStep;
+            }
+
+            for (int idx = 0; idx < kScanHiSize; idx++)
+                m_scanHiOffset[idx] = (float)Math.Pow(kScanHiFreqStep, (kScanHiSize / 2) - idx);
+        }
+
+        /// <summary>
+        /// Get the max detected pitch
+        /// </summary>
+        public float MaxPitch
+        {
+            get { return m_maxPitch; }
+        }
+
+        /// <summary>
+        /// Get the min detected pitch
+        /// </summary>
+        public float MinPitch
+        {
+            get { return m_minPitch; }
+        }
+
+        /// <summary>
+        /// Get the max note
+        /// </summary>
+        public int MaxNote
+        {
+            get { return m_maxNote; }
+        }
+
+        /// <summary>
+        /// Get the min note
+        /// </summary>
+        public int MinNote
+        {
+            get { return m_minNote; }
+        }
+
+        /// <summary>
+        /// Detect the pitch
+        /// </summary>
+        public float DetectPitch(float[] samplesLo, float[] samplesHi)
+        {
+            return DetectPitchLo(samplesLo, samplesHi);
+        }
+
+        /// <summary>
+        /// Low resolution pitch detection
+        /// </summary>
+        /// <param name="dataIdx"></param>
+        /// <param name="begFreqIdx"></param>
+        /// <param name="endFreqIdx"></param>
+        /// <param name="blockLen"></param>
+        /// <param name="stepSize"></param>
+        /// <returns></returns>
+        private float DetectPitchLo(float[] samplesLo, float[] samplesHi)
+        {
+            m_detectCurve.Clear();
+
+            const int skipSize = 8;
+            const int peakScanSize = 23;
+            const int peakScanSizeHalf = peakScanSize / 2;
+
+            float peakThresh1 = 200.0f;
+            float peakThresh2 = 600.0f;
+            bool bufferSwitched = false;
+
+            for (int idx = 0; idx < m_numCourseSteps; idx += skipSize)
+            {
+                int blockLen = Math.Min(m_blockLen44, (int)m_pCourseFreqOffset[idx] * 2);
+                float[] curSamples = null;
+
+                // 258 is at 250 Hz, which is the switchover frequency for the two filters
+                bool loBuffer = idx >= 258;
+
+                if (loBuffer)
+                {
+                    if (!bufferSwitched)
+                    {
+                        m_detectCurve.Clear(258 - peakScanSizeHalf, 258 + peakScanSizeHalf);
+                        bufferSwitched = true;
+                    }
+
+                    curSamples = samplesLo;
+                }
+                else
+                    curSamples = samplesHi;
+
+                int stepSizeLoRes = blockLen / 10;
+                int stepSizeHiRes = Math.Max(1, Math.Min(5, idx * 5 / m_numCourseSteps));
+
+                float fValue = RatioAbsDiffLinear(curSamples, idx, blockLen, stepSizeLoRes, false);
+
+                if (fValue > peakThresh1)
+                {
+                    // Do a closer search for the peak
+                    int peakIdx = -1;
+                    float peakVal = 0.0f;
+                    float prevVal = 0.0f;
+                    int dir = 4; // start going forward
+                    int curPos = idx; // start at center of the scan range
+                    int begSearch = Math.Max(idx - peakScanSizeHalf, 0);
+                    int endSearch = Math.Min(idx + peakScanSizeHalf, m_numCourseSteps - 1);
+
+                    while (curPos >= begSearch && curPos < endSearch)
+                    {
+                        float curVal = RatioAbsDiffLinear(curSamples, curPos, blockLen, stepSizeHiRes, true);
+
+                        if (peakVal < curVal)
+                        {
+                            peakVal = curVal;
+                            peakIdx = curPos;
+                        }
+
+                        if (prevVal > curVal)
+                        {
+                            dir = -dir >> 1;
+
+                            if (dir == 0)
+                            {
+                                if (peakVal > peakThresh2 && peakIdx >= 6 && peakIdx <= m_numCourseSteps - 7)
+                                {
+                                    float fValL = RatioAbsDiffLinear(curSamples, peakIdx - 5, blockLen, stepSizeHiRes, true);
+                                    float fValR = RatioAbsDiffLinear(curSamples, peakIdx + 5, blockLen, stepSizeHiRes, true);
+                                    float fPointy = peakVal / (fValL + fValR) * 2.0f;
+
+                                    float minPointy = (m_prevPitchIdx > 0 && Math.Abs(m_prevPitchIdx - peakIdx) < 10) ? 1.2f : 1.5f;
+
+                                    if (fPointy > minPointy)
+                                    {
+                                        float pitchHi = DetectPitchHi(curSamples, peakIdx);
+
+                                        if (pitchHi > 1.0f)
+                                        {
+                                            m_prevPitchIdx = peakIdx;
+                                            return pitchHi;
+                                        }
+                                    }
+                                }
+
+                                break;
+                            }
+                        }
+
+                        prevVal = curVal;
+                        curPos += dir;
+                    }
+                }
+            }
+
+            m_prevPitchIdx = 0;
+            return 0.0f;
+        }
+
+        /// <summary>
+        /// High resolution pitch detection
+        /// </summary>
+        /// <param name="dataIdx"></param>
+        /// <param name="lowFreqIdx"></param>
+        /// <returns></returns>
+        private float DetectPitchHi(float[] samples, int lowFreqIdx)
+        {
+            int peakIdx = -1;
+            float prevVal = 0.0f;
+            int dir = 4; // start going forward
+            int curPos = kScanHiSize >> 1; // start at center of the scan range
+
+            m_peakBuf.Clear();
+
+            float offset = m_pCourseFreqOffset[lowFreqIdx];
+
+            while (curPos >= 0 && curPos < kScanHiSize)
+            {
+                if (m_peakBuf[curPos] == 0.0f)
+                    m_peakBuf[curPos] = SumAbsDiffHermite(samples, offset * m_scanHiOffset[curPos], m_blockLen44, 1);
+
+                if (peakIdx < 0 || m_peakBuf[peakIdx] < m_peakBuf[curPos])
+                    peakIdx = curPos;
+
+                if (prevVal > m_peakBuf[curPos])
+                {
+                    dir = -dir >> 1;
+
+                    if (dir == 0)
+                    {
+                        // found the peak
+                        float minVal = Math.Min(m_peakBuf[peakIdx - 1], m_peakBuf[peakIdx + 1]);
+
+                        minVal -= minVal * (1.0f / 32.0f);
+
+                        var y1 = (float)Math.Log10(m_peakBuf[peakIdx - 1] - minVal);
+                        var y2 = (float)Math.Log10(m_peakBuf[peakIdx] - minVal);
+                        var y3 = (float)Math.Log10(m_peakBuf[peakIdx + 1] - minVal);
+
+                        float fIdx = (float)peakIdx + (y3 - y1) / (2.0f * (2.0f * y2 - y1 - y3));
+
+                        return (float)Math.Pow(kScanHiFreqStep, fIdx - (kScanHiSize / 2)) * m_pCourseFreq[lowFreqIdx];
+                    }
+                }
+
+                prevVal = m_peakBuf[curPos];
+                curPos += dir;
+            }
+
+            return 0.0f;
+        }
+
+        /// <summary>
+        /// Create a sine wave with the specified frequency, amplitude and starting angle.
+        /// Returns the updated angle.
+        /// </summary>
+        /// <param name="buffer"></param>
+        /// <param name="numSamples"></param>
+        /// <param name="freq"></param>
+        /// <param name="amplitude"></param>
+        /// <param name="startAngle"></param>
+        /// <returns></returns>
+        public static double CreateSineWave(float[] buffer, int numSamples, float sampleRate,
+                                            float freq, float amplitude, double startAngle)
+        {
+            double angleStep = freq / sampleRate * Math.PI * 2.0;
+            double curAngle = startAngle;
+
+            for (int idx = 0; idx < numSamples; idx++)
+            {
+                buffer[idx] = (float)Math.Sin(curAngle) * amplitude;
+
+                curAngle += angleStep;
+
+                while (curAngle > Math.PI)
+                    curAngle -= Math.PI * 2.0;
+            }
+
+            return curAngle;
+        }
+
+        /// <summary>
+        /// Returns true if the level is above the specified value
+        /// </summary>
+        /// <param name="buffer"></param>
+        /// <param name="startIdx"></param>
+        /// <param name="len"></param>
+        /// <param name="level"></param>
+        /// <returns></returns>
+        public bool LevelIsAbove(float[] buffer, int len, float level)
+        {
+            if (buffer == null || buffer.Length == 0)
+                return false;
+
+            int endIdx = Math.Min(buffer.Length, len);
+
+            for (int idx = 0; idx < endIdx; idx++)
+            {
+                if (Math.Abs(buffer[idx]) >= level)
+                    return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Copy the data from the source to the destination buffer
+        /// </summary>
+        /// <param name="source"></param>
+        /// <param name="destination"></param>
+        /// <param name="startPos"></param>  
+        /// <param name="length"></param>
+        public static void CopyBuffer<T>(T[] source, int srcStart, T[] destination, int dstStart, int length)
+        {
+            if (length < 0)
+                throw new ArgumentOutOfRangeException("length");
+
+            if (source == null || source.Length < srcStart + length)
+                throw new Exception("Source buffer is null or not large enough");
+
+            if (destination == null || destination.Length < dstStart + length)
+                throw new Exception("Destination buffer is null or not large enough");
+
+            int srcIdx = srcStart;
+            int dstIdx = dstStart;
+
+            for (int idx = 0; idx < length; idx++)
+                destination[dstIdx++] = source[srcIdx++];
+        }
+
+        /// <summary>
+        /// // 4-point, 3rd-order Hermite (x-form)
+        /// </summary>
+        private float InterpolateHermite(float fY0, float fY1, float fY2, float fY3, float frac)
+        {
+            float c1 = 0.5f * (fY2 - fY0);
+            float c3 = 1.5f * (fY1 - fY2) + 0.5f * (fY3 - fY0);
+            float c2 = fY0 - fY1 + c1 - c3;
+
+            return ((c3 * frac + c2) * frac + c1) * frac + fY1;
+        }
+
+        /// <summary>
+        /// Linear interpolation
+        /// nFrac is based on 1.0 = 256
+        /// </summary>
+        private float InterpolateLinear(float y0, float y1, float frac)
+        {
+            return y0 * (1.0f - frac) + y1 * frac;
+        }
+
+        /// <summary>
+        /// Medium Low res SumAbsDiff
+        /// </summary>
+        private float RatioAbsDiffLinear(float[] samples, int freqIdx, int blockLen, int stepSize, bool hiRes)
+        {
+            if (hiRes && m_detectCurve[freqIdx] > 0.0f)
+                return m_detectCurve[freqIdx];
+
+            var offsetInt = (int)m_pCourseFreqOffset[freqIdx];
+            float offsetFrac = m_pCourseFreqOffset[freqIdx] - offsetInt;
+            float rect = 0.0f;
+            float absDiff = 0.01f; // prevent divide by zero
+            int count = 0;
+            float interp;
+            float sample;
+
+            // Do a scan using linear interpolation and the specified step size
+            for (int idx = 0; idx < blockLen; idx += stepSize, count++)
+            {
+                sample = samples[idx];
+                interp = InterpolateLinear(samples[offsetInt + idx], samples[offsetInt + idx + 1], offsetFrac);
+                absDiff += Math.Abs(sample - interp);
+                rect += Math.Abs(sample) + Math.Abs(interp);
+            }
+
+            float finalVal = rect / absDiff * 100.0f;
+
+            if (hiRes)
+                m_detectCurve[freqIdx] = finalVal;
+
+            return finalVal;
+        }
+
+        /// <summary>
+        /// Medium High res SumAbsDiff
+        /// </summary>
+        private float SumAbsDiffHermite(float[] samples, float fOffset, int blockLen, int stepSize)
+        {
+            var offsetInt = (int)fOffset;
+            float offsetFrac = fOffset - offsetInt;
+            float value = 0.001f; // prevent divide by zero
+            int count = 0;
+
+            // do a scan using linear interpolation and the specified step size
+            for (int idx = 0; idx < blockLen; idx += stepSize, count++)
+            {
+                int offsetIdx = offsetInt + idx;
+
+                value += Math.Abs(samples[idx] - InterpolateHermite(samples[offsetIdx - 1],
+                                                                    samples[offsetIdx],
+                                                                    samples[offsetIdx + 1],
+                                                                    samples[offsetIdx + 2],
+                                                                    offsetFrac));
+            }
+
+            return count / value;
+        }
+
+        /// <summary>
+        /// Get the MIDI note and cents of the pitch 
+        /// </summary>
+        /// <param name="pitch"></param>
+        /// <param name="note"></param>
+        /// <param name="cents"></param>
+        /// <returns></returns>
+        public static bool PitchToMidiNote(float pitch, out int note, out int cents)
+        {
+            if (pitch < 20.0f)
+            {
+                note = 0;
+                cents = 0;
+                return false;
+            }
+
+            float fNote = (float)((12.0 * Math.Log10(pitch / 55.0) * InverseLog2)) + 33.0f;
+            note = (int)(fNote + 0.5f);
+            cents = (int)((note - fNote) * 100);
+            return true;
+        }
+
+        /// <summary>
+        /// Get the pitch from the MIDI note
+        /// </summary>
+        /// <param name="pitch"></param>
+        /// <returns></returns>
+        public static float PitchToMidiNote(float pitch)
+        {
+            if (pitch < 20.0f)
+                return 0.0f;
+
+            return (float)(12.0 * Math.Log10(pitch / 55.0) * InverseLog2) + 33.0f;
+        }
+
+        /// <summary>
+        /// Get the pitch from the MIDI note
+        /// </summary>
+        /// <param name="note"></param>
+        /// <returns></returns>
+        public float MidiNoteToPitch(float note)
+        {
+            if (note < 33.0f)
+                return 0.0f;
+
+            float pitch = (float)Math.Pow(10.0, (note - 33.0f) / InverseLog2 / 12.0f) * 55.0f;
+            return pitch <= m_maxPitch ? pitch : 0.0f;
+        }
+
+        /// <summary>
+        /// Format a midi note to text
+        /// </summary>
+        /// <param name="note"></param>
+        /// <param name="sharps"></param>
+        /// <param name="showOctave"></param>
+        /// <returns></returns>
+        public static string GetNoteName(int note, bool sharps, bool showOctave)
+        {
+            if (note < kMinMidiNote || note > kMaxMidiNote)
+                return null;
+
+            note -= kMinMidiNote;
+
+            int octave = (note + 9) / 12;
+            note = note % 12;
+            string noteText = null;
+
+            switch (note)
+            {
+                case 0:
+                    noteText = "A";
+                    break;
+
+                case 1:
+                    noteText = sharps ? "A#" : "Bb";
+                    break;
+
+                case 2:
+                    noteText = "B";
+                    break;
+
+                case 3:
+                    noteText = "C";
+                    break;
+
+                case 4:
+                    noteText = sharps ? "C#" : "Db";
+                    break;
+
+                case 5:
+                    noteText = "D";
+                    break;
+
+                case 6:
+                    noteText = sharps ? "D#" : "Eb";
+                    break;
+
+                case 7:
+                    noteText = "E";
+                    break;
+
+                case 8:
+                    noteText = "F";
+                    break;
+
+                case 9:
+                    noteText = sharps ? "F#" : "Gb";
+                    break;
+
+                case 10:
+                    noteText = "G";
+                    break;
+
+                case 11:
+                    noteText = sharps ? "G#" : "Ab";
+                    break;
+            }
+
+            if (showOctave)
+                noteText += " " + octave.ToString();
+
+            return noteText;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/PitchTracker.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/PitchTracker.cs
new file mode 100644
index 00000000..59522197
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/Pitch/PitchTracker.cs
@@ -0,0 +1,431 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace Vocaluxe.Lib.Sound.Record.PitchTracker.Pitch
+{
+    /// <summary>
+    /// Tracks pitch
+    /// </summary>
+    // ReSharper disable InconsistentNaming
+    public class PitchTracker
+    {
+        private const int kOctaveSteps = 96;
+        private const int kStepOverlap = 4;
+        private const float kMinFreq = 50.0f; // A1, Midi note 33, 55.0Hz
+        private const float kMaxFreq = 1800.0f; // A#6. Midi note 92
+        private const int kStartCircular = 40; // how far into the sample buffer do we start checking (allow for filter settling)
+        private const float kDetectOverlapSec = 0.005f;
+        private const float kMaxOctaveSecRate = 10.0f;
+
+        private const float kAvgOffset = 0.005f; // time offset between pitch averaging values
+        private const int kAvgCount = 1; // number of average pitch samples to take
+        private const float kCircularBufSaveTime = 1.0f; // Amount of samples to store in the history buffer
+
+        private PitchDsp m_dsp;
+        private CircularBuffer<float> m_circularBufferLo;
+        private CircularBuffer<float> m_circularBufferHi;
+        private double m_sampleRate;
+        private float m_detectLevelThreshold = 0.01f; // -40dB
+        private int m_pitchRecordsPerSecond = 50; // default is 50, or one record every 20ms
+
+        private float[] m_pitchBufLo;
+        private float[] m_pitchBufHi;
+        private int m_pitchBufSize;
+        private int m_samplesPerPitchBlock;
+        private int m_curPitchIndex;
+        private long m_curPitchSamplePos;
+
+        private int m_detectOverlapSamples;
+        private float m_maxOverlapDiff;
+
+        private bool m_recordPitchRecords;
+        private int m_pitchRecordHistorySize;
+        private List<PitchRecord> m_pitchRecords = new List<PitchRecord>();
+        private PitchRecord m_curPitchRecord = new PitchRecord();
+
+        private IIRFilter m_iirFilterLoLo;
+        private IIRFilter m_iirFilterLoHi;
+        private IIRFilter m_iirFilterHiLo;
+        private IIRFilter m_iirFilterHiHi;
+
+        public float LastMaxVol = 0;
+
+        public delegate void PitchDetectedHandler(PitchTracker sender, PitchRecord pitchRecord);
+
+        public event PitchDetectedHandler PitchDetected;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public PitchTracker() {}
+
+        /// <summary>
+        /// Set the sample rate
+        /// </summary>
+        public double SampleRate
+        {
+            set
+            {
+                if (m_sampleRate == value)
+                    return;
+
+                m_sampleRate = value;
+                Setup();
+            }
+        }
+
+        /// <summary>
+        /// Set the detect level threshold, The value must be between 0.0001f and 1.0f (-80 dB to 0 dB)
+        /// </summary>
+        public float DetectLevelThreshold
+        {
+            set
+            {
+                float newValue = Math.Max(0.0001f, Math.Min(1.0f, value));
+
+                if (m_detectLevelThreshold == newValue)
+                    return;
+
+                m_detectLevelThreshold = newValue;
+                //Setup();
+            }
+            get { return m_detectLevelThreshold; }
+        }
+
+        /// <summary>
+        /// Return the samples per pitch block
+        /// </summary>
+        public int SamplesPerPitchBlock
+        {
+            get { return m_samplesPerPitchBlock; }
+        }
+
+        /// <summary>
+        /// Get or set the number of pitch records per second (default is 50, or one record every 20ms)
+        /// </summary>
+        public int PitchRecordsPerSecond
+        {
+            get { return m_pitchRecordsPerSecond; }
+            set
+            {
+                m_pitchRecordsPerSecond = Math.Max(1, Math.Min(100, value));
+                Setup();
+            }
+        }
+
+        /// <summary>
+        /// Get or set whether pitch records should be recorded into a history buffer
+        /// </summary>
+        public bool RecordPitchRecords
+        {
+            get { return m_recordPitchRecords; }
+            set
+            {
+                if (m_recordPitchRecords == value)
+                    return;
+
+                m_recordPitchRecords = value;
+
+                if (!m_recordPitchRecords)
+                    m_pitchRecords = new List<PitchRecord>();
+            }
+        }
+
+        /// <summary>
+        /// Get or set the max number of pitch records to keep. A value of 0 means no limit.
+        /// Don't leave this at 0 when RecordPitchRecords is true and this is used in a realtime
+        /// application since the buffer will grow indefinately!
+        /// </summary>
+        public int PitchRecordHistorySize
+        {
+            get { return m_pitchRecordHistorySize; }
+            set
+            {
+                m_pitchRecordHistorySize = value;
+
+                m_pitchRecords.Capacity = m_pitchRecordHistorySize;
+            }
+        }
+
+        /// <summary>
+        /// Get the current pitch records
+        /// </summary>
+        public IList PitchRecords
+        {
+            get { return m_pitchRecords.AsReadOnly(); }
+        }
+
+        /// <summary>
+        /// Get the latest pitch record
+        /// </summary>
+        public PitchRecord CurrentPitchRecord
+        {
+            get { return m_curPitchRecord; }
+        }
+
+        /// <summary>
+        /// Get the current pitch position
+        /// </summary>
+        public long CurrentPitchSamplePosition
+        {
+            get { return m_curPitchSamplePos; }
+        }
+
+        /// <summary>
+        /// Get the minimum frequency that can be detected
+        /// </summary>
+        public static float MinDetectFrequency
+        {
+            get { return kMinFreq; }
+        }
+
+        /// <summary>
+        /// Get the maximum frequency that can be detected
+        /// </summary>
+        public static float MaxDetectFrequency
+        {
+            get { return kMaxFreq; }
+        }
+
+        /// <summary>
+        /// Get the frequency step
+        /// </summary>
+        public static double FrequencyStep
+        {
+            get { return Math.Pow(2.0, 1.0 / kOctaveSteps); }
+        }
+
+        /// <summary>
+        /// Get the number of samples that the detected pitch is offset from the input buffer.
+        /// This is just an estimate to sync up the samples and detected pitch
+        /// </summary>
+        public int DetectSampleOffset
+        {
+            get { return (m_pitchBufSize + m_detectOverlapSamples) / 2; }
+        }
+
+        /// <summary>
+        /// Reset the pitch tracker. Call this when the sample position is
+        /// not consecutive from the previous position
+        /// </summary>
+        public void Reset()
+        {
+            m_curPitchIndex = 0;
+            m_curPitchSamplePos = 0;
+            m_pitchRecords.Clear();
+            m_iirFilterLoLo.Reset();
+            m_iirFilterLoHi.Reset();
+            m_iirFilterHiLo.Reset();
+            m_iirFilterHiHi.Reset();
+            m_circularBufferLo.Reset();
+            m_circularBufferLo.Clear();
+            m_circularBufferHi.Reset();
+            m_circularBufferHi.Clear();
+            m_pitchBufLo.Clear();
+            m_pitchBufHi.Clear();
+
+            m_circularBufferLo.StartPosition = -m_detectOverlapSamples;
+            m_circularBufferLo.Available = m_detectOverlapSamples;
+            m_circularBufferHi.StartPosition = -m_detectOverlapSamples;
+            m_circularBufferHi.Available = m_detectOverlapSamples;
+        }
+
+        ///  <summary>
+        ///  Process the passed in buffer of data. During this call, the PitchDetected event will
+        ///  be fired zero or more times, depending how many pitch records will fit in the new
+        ///  and previously cached buffer.
+        /// 
+        ///  This means that there is no size restriction on the buffer that is passed into ProcessBuffer.
+        ///  For instance, ProcessBuffer can be called with one very large buffer that contains all of the
+        ///  audio to be processed (many PitchDetected events will be fired), or just a small buffer at
+        ///  a time which is more typical for realtime applications. In the latter case, the PitchDetected
+        ///  event might not be fired at all since additional calls must first be made to accumulate enough
+        ///  data do another pitch detect operation.
+        ///  </summary>
+        ///  <param name="inBuffer">Input buffer. Samples must be in the range -1.0 to 1.0</param>
+        /// <param name="maxVolume"></param>
+        /// <param name="sampleCount">Number of samples to process. Zero means all samples in the buffer</param>
+        public void ProcessBuffer(float[] inBuffer, int sampleCount = 0)
+        {
+            if (inBuffer == null)
+                throw new ArgumentNullException("inBuffer", "Input buffer cannot be null");
+
+            int samplesProcessed = 0;
+            int srcLength = sampleCount == 0 ? inBuffer.Length : Math.Min(sampleCount, inBuffer.Length);
+
+            float maxVolume = LastMaxVol * 0.85f;
+
+            while (samplesProcessed < srcLength)
+            {
+                int frameCount = Math.Min(srcLength - samplesProcessed, m_pitchBufSize + m_detectOverlapSamples);
+
+                m_iirFilterLoLo.FilterBuffer(inBuffer, samplesProcessed, m_pitchBufLo, 0, frameCount);
+                m_iirFilterLoHi.FilterBuffer(m_pitchBufLo, 0, m_pitchBufLo, 0, frameCount);
+
+                m_iirFilterHiLo.FilterBuffer(inBuffer, samplesProcessed, m_pitchBufHi, 0, frameCount);
+                m_iirFilterHiHi.FilterBuffer(m_pitchBufHi, 0, m_pitchBufHi, 0, frameCount);
+
+                m_circularBufferLo.WriteBuffer(m_pitchBufLo, frameCount);
+                m_circularBufferHi.WriteBuffer(m_pitchBufHi, frameCount);
+
+                // Loop while there is enough samples in the circular buffer
+                while (m_circularBufferLo.ReadBuffer(m_pitchBufLo, m_curPitchSamplePos, m_pitchBufSize + m_detectOverlapSamples))
+                {
+                    float pitch1;
+                    float pitch2;
+                    float detectedPitch = 0.0f;
+
+                    m_circularBufferHi.ReadBuffer(m_pitchBufHi, m_curPitchSamplePos, m_pitchBufSize + m_detectOverlapSamples);
+
+                    maxVolume = 0f;
+                    for (int i = 0; i < (m_pitchBufSize + m_detectOverlapSamples) / 2; i++)
+                    {
+                        if (maxVolume < m_pitchBufHi[i])
+                            maxVolume = m_pitchBufHi[i];
+                        if (maxVolume < m_pitchBufLo[i])
+                            maxVolume = m_pitchBufLo[i];
+                    }
+
+                    pitch1 = (maxVolume >= m_detectLevelThreshold) ? m_dsp.DetectPitch(m_pitchBufLo, m_pitchBufHi) : 0f;
+
+                    if (pitch1 > 0.0f)
+                    {
+                        // Shift the buffers left by the overlapping amount
+                        m_pitchBufLo.Copy(m_pitchBufLo, m_detectOverlapSamples - 1, 0, m_pitchBufSize);
+                        m_pitchBufHi.Copy(m_pitchBufHi, m_detectOverlapSamples - 1, 0, m_pitchBufSize);
+
+                        pitch2 = m_dsp.DetectPitch(m_pitchBufLo, m_pitchBufHi);
+
+                        if (pitch2 > 0.0f)
+                        {
+                            float fDiff = Math.Max(pitch1, pitch2) / Math.Min(pitch1, pitch2) - 1.0f;
+
+                            if (fDiff < m_maxOverlapDiff)
+                                detectedPitch = (pitch1 + pitch2) * 0.5f;
+                        }
+                    }
+
+                    // Log the pitch record
+                    AddPitchRecord(detectedPitch);
+
+                    m_curPitchSamplePos += m_samplesPerPitchBlock;
+                    m_curPitchIndex++;
+                }
+
+                samplesProcessed += frameCount;
+            }
+            LastMaxVol = maxVolume;
+        }
+
+        /// <summary>
+        /// Setup
+        /// </summary>
+        private void Setup()
+        {
+            if (m_sampleRate < 1.0f)
+                return;
+
+            m_dsp = new PitchDsp(m_sampleRate, kMinFreq, kMaxFreq);
+
+            m_iirFilterLoLo = new IIRFilter();
+            m_iirFilterLoLo.Proto = IIRFilter.ProtoType.Butterworth;
+            m_iirFilterLoLo.Type = IIRFilter.FilterType.HP;
+            m_iirFilterLoLo.Order = 5;
+            m_iirFilterLoLo.FreqLow = 45.0f;
+            m_iirFilterLoLo.SampleRate = (float)m_sampleRate;
+
+            m_iirFilterLoHi = new IIRFilter();
+            m_iirFilterLoHi.Proto = IIRFilter.ProtoType.Butterworth;
+            m_iirFilterLoHi.Type = IIRFilter.FilterType.LP;
+            m_iirFilterLoHi.Order = 5;
+            m_iirFilterLoHi.FreqHigh = 280.0f;
+            m_iirFilterLoHi.SampleRate = (float)m_sampleRate;
+
+            m_iirFilterHiLo = new IIRFilter();
+            m_iirFilterHiLo.Proto = IIRFilter.ProtoType.Butterworth;
+            m_iirFilterHiLo.Type = IIRFilter.FilterType.HP;
+            m_iirFilterHiLo.Order = 5;
+            m_iirFilterHiLo.FreqLow = 45.0f;
+            m_iirFilterHiLo.SampleRate = (float)m_sampleRate;
+
+            m_iirFilterHiHi = new IIRFilter();
+            m_iirFilterHiHi.Proto = IIRFilter.ProtoType.Butterworth;
+            m_iirFilterHiHi.Type = IIRFilter.FilterType.LP;
+            m_iirFilterHiHi.Order = 5;
+            m_iirFilterHiHi.FreqHigh = 2000.0f;
+            m_iirFilterHiHi.SampleRate = (float)m_sampleRate;
+
+            m_detectOverlapSamples = (int)(kDetectOverlapSec * m_sampleRate);
+            m_maxOverlapDiff = kMaxOctaveSecRate * kDetectOverlapSec;
+
+            m_pitchBufSize = (int)(((1.0f / (float)kMinFreq) * 2.0f + ((kAvgCount - 1) * kAvgOffset)) * m_sampleRate) + 16;
+            m_pitchBufLo = new float[m_pitchBufSize + m_detectOverlapSamples];
+            m_pitchBufHi = new float[m_pitchBufSize + m_detectOverlapSamples];
+            m_samplesPerPitchBlock = (int)Math.Round(m_sampleRate / m_pitchRecordsPerSecond);
+
+            m_circularBufferLo = new CircularBuffer<float>((int)(kCircularBufSaveTime * m_sampleRate + 0.5f) + 10000);
+            m_circularBufferHi = new CircularBuffer<float>((int)(kCircularBufSaveTime * m_sampleRate + 0.5f) + 10000);
+        }
+
+        /// <summary>
+        /// The pitch was detected - add the record
+        /// </summary>
+        /// <param name="pitch"></param>
+        private void AddPitchRecord(float pitch)
+        {
+            int midiNote = 0;
+            int midiCents = 0;
+
+            PitchDsp.PitchToMidiNote(pitch, out midiNote, out midiCents);
+
+            var record = new PitchRecord();
+
+            record.RecordIndex = m_curPitchIndex;
+            record.Pitch = pitch;
+            record.MidiNote = midiNote;
+            record.MidiCents = midiCents;
+
+            m_curPitchRecord = record;
+
+            if (m_recordPitchRecords)
+            {
+                if (m_pitchRecordHistorySize > 0 && m_pitchRecords.Count >= m_pitchRecordHistorySize)
+                    m_pitchRecords.RemoveAt(0);
+
+                m_pitchRecords.Add(record);
+            }
+
+            if (this.PitchDetected != null)
+                this.PitchDetected(this, record);
+        }
+
+        /// <summary>
+        /// Stores one record
+        /// </summary>
+        public struct PitchRecord
+        {
+            /// <summary>
+            /// The index of the pitch record since the last Reset call
+            /// </summary>
+            public int RecordIndex { get; set; }
+
+            /// <summary>
+            /// The detected pitch
+            /// </summary>
+            public float Pitch { get; set; }
+
+            /// <summary>
+            /// The detected MIDI note, or 0 for no pitch
+            /// </summary>
+            public int MidiNote { get; set; }
+
+            /// <summary>
+            /// The offset from the detected MIDI note in cents, from -50 to +50.
+            /// </summary>
+            public int MidiCents { get; set; }
+        }
+    }
+
+    // ReSharper restore InconsistentNaming
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Sound/Record/PortAudio/CPortAudioRecord.cs b/Vocaluxe/Lib/Sound/Record/PortAudio/CPortAudioRecord.cs
new file mode 100644
index 00000000..76b952da
--- /dev/null
+++ b/Vocaluxe/Lib/Sound/Record/PortAudio/CPortAudioRecord.cs
@@ -0,0 +1,201 @@
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Vocaluxe.Base;
+
+namespace Vocaluxe.Lib.Sound.Record.PortAudio
+{
+    class CPortAudioRecord : CRecordBase, IRecord
+    {
+        private bool _Initialized;
+        private CPortAudioHandle _PaHandle;
+        private PortAudioSharp.PortAudio.PaStreamCallbackDelegate _MyRecProc;
+        private IntPtr[] _RecHandle;
+
+        /// <summary>
+        ///     Init PortAudio and list record devices
+        /// </summary>
+        /// <returns>true if success</returns>
+        public override bool Init()
+        {
+            if (!base.Init())
+                return false;
+
+            try
+            {
+                _PaHandle = new CPortAudioHandle();
+
+                int hostAPI = _PaHandle.GetHostApi();
+                int numDevices = PortAudioSharp.PortAudio.Pa_GetDeviceCount();
+                for (int i = 0; i < numDevices; i++)
+                {
+                    PortAudioSharp.PortAudio.PaDeviceInfo info = PortAudioSharp.PortAudio.Pa_GetDeviceInfo(i);
+                    if (info.hostApi == hostAPI && info.maxInputChannels > 0)
+                    {
+                        var dev = new CRecordDevice(i, info.name, info.name + i, info.maxInputChannels);
+
+                        _Devices.Add(dev);
+                    }
+                }
+
+                _RecHandle = new IntPtr[_Devices.Count];
+                _MyRecProc = _MyPaStreamCallback;
+                _Initialized = true;
+            }
+            catch (Exception e)
+            {
+                _Initialized = false;
+                CLog.LogError("Error initializing PortAudio: " + e.Message);
+                Close();
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        ///     Start Voice Capturing
+        /// </summary>
+        /// <returns></returns>
+        public bool Start()
+        {
+            if (!_Initialized)
+                return false;
+
+            Stop();
+
+            foreach (IntPtr handle in _RecHandle)
+            {
+                int waitcount = 0;
+                while (waitcount < 5 && PortAudioSharp.PortAudio.Pa_IsStreamStopped(handle) == PortAudioSharp.PortAudio.PaError.paStreamIsNotStopped)
+                {
+                    Thread.Sleep(1);
+                    waitcount++;
+                }
+            }
+
+            foreach (CBuffer buffer in _Buffer)
+                buffer.Reset();
+
+            for (int i = 0; i < _RecHandle.Length; i++)
+                _RecHandle[i] = IntPtr.Zero;
+
+            for (int dev = 0; dev < _Devices.Count; dev++)
+            {
+                if (_Devices[dev].PlayerChannel1 > 0 || _Devices[dev].PlayerChannel2 > 0)
+                {
+                    PortAudioSharp.PortAudio.PaStreamParameters? inputParams = new PortAudioSharp.PortAudio.PaStreamParameters
+                        {
+                            channelCount = _Devices[dev].Channels,
+                            device = _Devices[dev].ID,
+                            sampleFormat = PortAudioSharp.PortAudio.PaSampleFormat.paInt16,
+                            suggestedLatency = PortAudioSharp.PortAudio.Pa_GetDeviceInfo(_Devices[dev].ID).defaultLowInputLatency,
+                            hostApiSpecificStreamInfo = IntPtr.Zero
+                        };
+                    if (!_PaHandle.OpenInputStream(
+                        out _RecHandle[dev],
+                        ref inputParams,
+                        44100,
+                        882,
+                        PortAudioSharp.PortAudio.PaStreamFlags.paNoFlag,
+                        _MyRecProc,
+                        new IntPtr(dev)))
+                        return false;
+
+                    if (_PaHandle.CheckError("Start Stream (rec)", PortAudioSharp.PortAudio.Pa_StartStream(_RecHandle[dev])))
+                        return false;
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        ///     Stop Voice Capturing
+        /// </summary>
+        /// <returns></returns>
+        public bool Stop()
+        {
+            if (!_Initialized)
+                return false;
+
+            foreach (IntPtr handle in _RecHandle)
+                PortAudioSharp.PortAudio.Pa_StopStream(handle);
+            return true;
+        }
+
+        /// <summary>
+        ///     Stop all voice capturing streams and terminate PortAudio
+        /// </summary>
+        public override void Close()
+        {
+            if (_RecHandle != null)
+            {
+                foreach (IntPtr handle in _RecHandle)
+                {
+                    if (handle != IntPtr.Zero)
+                        _PaHandle.CloseStream(handle);
+                }
+            }
+            if (_PaHandle != null)
+            {
+                _PaHandle.Close();
+                _PaHandle = null;
+            }
+
+            _Initialized = false;
+
+            base.Close();
+        }
+
+        private PortAudioSharp.PortAudio.PaStreamCallbackResult _MyPaStreamCallback(
+            IntPtr input,
+            IntPtr output,
+            uint frameCount,
+            ref PortAudioSharp.PortAudio.PaStreamCallbackTimeInfo timeInfo,
+            PortAudioSharp.PortAudio.PaStreamCallbackFlags statusFlags,
+            IntPtr userData)
+        {
+            try
+            {
+                if (frameCount > 0 && input != IntPtr.Zero)
+                {
+                    CRecordDevice dev = _Devices[userData.ToInt32()];
+                    uint numBytes;
+                    if (dev.Channels == 2)
+                        numBytes = frameCount * 4;
+                    else
+                        numBytes = frameCount * 2;
+
+                    byte[] recbuffer = new byte[numBytes];
+
+                    // copy from managed to unmanaged memory
+                    Marshal.Copy(input, recbuffer, 0, (int)numBytes);
+                    _HandleData(dev, recbuffer);
+                }
+            }
+            catch (Exception e)
+            {
+                CLog.LogError("Error on Stream Callback (rec): " + e);
+            }
+
+            return PortAudioSharp.PortAudio.PaStreamCallbackResult.paContinue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Video/Acinerella/CDecoder.cs b/Vocaluxe/Lib/Video/Acinerella/CDecoder.cs
index 743d5747..9203b118 100644
--- a/Vocaluxe/Lib/Video/Acinerella/CDecoder.cs
+++ b/Vocaluxe/Lib/Video/Acinerella/CDecoder.cs
@@ -15,7 +15,6 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
-using System;
 using System.Diagnostics;
 using System.IO;
 using VocaluxeLib.Draw;
diff --git a/Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs b/Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs
index 2b254b98..0ff06799 100644
--- a/Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs
+++ b/Vocaluxe/Lib/Video/Acinerella/CDecoderThread.cs
@@ -1,4 +1,21 @@
-using System;
+#region license
+// This file is part of Vocaluxe.
+// 
+// Vocaluxe is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Vocaluxe is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
+#endregion
+
+using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -170,7 +187,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
         }
 
         /// <summary>
-        /// Gets a frame
+        ///     Gets a frame
         /// </summary>
         /// <param name="frame">Referenz to texture where frame should be put in (can be null, then texture is created)</param>
         /// <param name="time">Maximum start time for frame</param>
diff --git a/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs b/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
deleted file mode 100644
index 31740333..00000000
--- a/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System;
-using Vocaluxe.Base;
-using Vocaluxe.Lib.Video.Gstreamer;
-using VocaluxeLib.Draw;
-
-namespace Vocaluxe.Lib.Video
-{
-    class CVideoDecoderGstreamer : IVideoDecoder
-    {
-        #region log
-        private CGstreamerVideoWrapper.LogCallback _Log;
-
-        private void _LogHandler(string text)
-        {
-            CLog.LogError(text);
-        }
-        #endregion log
-
-        public bool Init()
-        {
-            bool retval = CGstreamerVideoWrapper.InitVideo();
-            _Log = _LogHandler;
-            //Really needed? CodeAnalysis complains
-            //GC.SuppressFinalize(Log);
-            CGstreamerVideoWrapper.SetVideoLogCallback(_Log);
-            return retval;
-        }
-
-        public void CloseAll()
-        {
-            CGstreamerVideoWrapper.CloseAllVideos();
-        }
-
-        public int Load(string videoFileName)
-        {
-            int i = -1;
-            try
-            {
-                var u = new Uri(videoFileName);
-                i = CGstreamerVideoWrapper.LoadVideo(u.AbsoluteUri);
-                return i;
-            }
-            catch (Exception) {}
-            return i;
-        }
-
-        public bool Close(int streamID)
-        {
-            return CGstreamerVideoWrapper.CloseVideo(streamID);
-        }
-
-        public int GetNumStreams()
-        {
-            return CGstreamerVideoWrapper.GetVideoNumStreams();
-        }
-
-        public float GetLength(int streamID)
-        {
-            return CGstreamerVideoWrapper.GetVideoLength(streamID);
-        }
-
-        public bool GetFrame(int streamID, ref CTexture frame, float time, out float videoTime)
-        {
-            SManagedFrame managedFrame = CGstreamerVideoWrapper.GetFrame(streamID, time);
-            videoTime = managedFrame.Videotime;
-
-            _UploadNewFrame(ref frame, ref managedFrame.Buffer, managedFrame.Width, managedFrame.Height);
-            return frame != null;
-        }
-
-        public bool Skip(int streamID, float start, float gap)
-        {
-            return CGstreamerVideoWrapper.Skip(streamID, start, gap);
-        }
-
-        public void SetLoop(int streamID, bool loop)
-        {
-            CGstreamerVideoWrapper.SetVideoLoop(streamID, loop);
-        }
-
-        public void Pause(int streamID)
-        {
-            CGstreamerVideoWrapper.PauseVideo(streamID);
-        }
-
-        public void Resume(int streamID)
-        {
-            CGstreamerVideoWrapper.ResumeVideo(streamID);
-        }
-
-        public bool Finished(int streamID)
-        {
-            return CGstreamerVideoWrapper.Finished(streamID);
-        }
-
-        public void Update()
-        {
-            CGstreamerVideoWrapper.UpdateVideo();
-        }
-
-        private void _UploadNewFrame(ref CTexture frame, ref byte[] data, int width, int height)
-        {
-            if (data == null)
-                return;
-            CDraw.UpdateOrAddTexture(ref frame, width, height, data);
-            data = null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs b/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs
deleted file mode 100644
index 5c17198a..00000000
--- a/Vocaluxe/Lib/Video/Gstreamer/CGstreamerVideoWrapper.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-#region license
-// This file is part of Vocaluxe.
-// 
-// Vocaluxe is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// Vocaluxe is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
-#endregion
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Vocaluxe.Lib.Video.Gstreamer
-{
-    public struct SNativeFrame
-    {
-        // ReSharper disable UnassignedField.Global
-        internal IntPtr Buffer;
-        public int Size;
-        public int Width;
-        public int Height;
-        public float Videotime;
-        // ReSharper restore UnassignedField.Global
-    }
-
-    public struct SManagedFrame
-    {
-        public byte[] Buffer;
-        public int Width;
-        public int Height;
-        public float Videotime;
-    }
-
-    public static class CGstreamerVideoWrapper
-    {
-        #region arch
-#if ARCH_X86
-#if WIN
-        private const string _Dll = "x86\\gstreamer\\gstreamerhelper.dll";
-#endif
-#endif
-
-#if ARCH_X64
-#if WIN
-        private const string _Dll = "x64\\gstreamer\\gstreamerhelper.dll";
-#endif
-#endif
-        #endregion arch
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        public delegate void LogCallback(string message);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetVideoLogCallback(LogCallback c);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool InitVideo();
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void CloseAllVideos();
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int LoadVideo(string videoFileName);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool CloseVideo(int streamID);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GetVideoNumStreams();
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern float GetVideoLength(int streamID);
-
-        [DllImport(_Dll, EntryPoint = "GetFrame", CallingConvention = CallingConvention.Cdecl)]
-        public static extern SNativeFrame GetFrameNative(int streamID, float time);
-
-        public static SManagedFrame GetFrame(int streamID, float time)
-        {
-            SNativeFrame f = GetFrameNative(streamID, time);
-
-            byte[] buffer = null;
-
-            if (f.Size > 0)
-            {
-                buffer = new byte[f.Size];
-                Marshal.Copy(f.Buffer, buffer, 0, f.Size);
-            }
-
-            SManagedFrame m;
-            m.Buffer = buffer;
-            m.Height = f.Height;
-            m.Videotime = f.Videotime;
-            m.Width = f.Width;
-            return m;
-        }
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool Skip(int streamID, float start, float gap);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetVideoLoop(int streamID,
-                                               [MarshalAs(UnmanagedType.U1)] bool loop);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void PauseVideo(int streamID);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void ResumeVideo(int streamID);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool Finished(int streamID);
-
-        [DllImport(_Dll, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.U1)]
-        public static extern bool UpdateVideo();
-    }
-}
\ No newline at end of file
diff --git a/Vocaluxe/Lib/Webcam/CAForgeNet.cs b/Vocaluxe/Lib/Webcam/CAForgeNet.cs
index b07c9f46..13bc4d20 100644
--- a/Vocaluxe/Lib/Webcam/CAForgeNet.cs
+++ b/Vocaluxe/Lib/Webcam/CAForgeNet.cs
@@ -15,6 +15,7 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
+using System;
 using AForge.Video;
 using AForge.Video.DirectShow;
 using System.Collections.Generic;
@@ -31,66 +32,33 @@ namespace Vocaluxe.Lib.Webcam
         private readonly List<SWebcamDevice> _Devices = new List<SWebcamDevice>();
         private bool _Paused;
         private VideoCaptureDevice _Webcam;
-        private FilterInfoCollection _WebcamDevices;
         private SWebcamConfig _Config;
-        private byte[] _Data = new byte[1];
+        private byte[] _Data;
         private static readonly object _MutexData = new object();
         private int _Width, _Height;
-
-        public void Close()
-        {
-            if (_Webcam == null)
-                return;
-            _Webcam.SignalToStop();
-            _Webcam.WaitForStop();
-            _Webcam.NewFrame -= _OnFrame;
-            _Data = new byte[1];
-        }
-
-        public bool GetFrame(ref CTexture frame)
-        {
-            lock (_MutexData)
-            {
-                if (_Webcam != null && _Width > 0 && _Height > 0 && _Data.Length == _Width * _Height * 4)
-                    CDraw.UpdateOrAddTexture(ref frame, _Width, _Height, _Data);
-            }
-            return false;
-        }
-
-        public Bitmap GetBitmap()
-        {
-            if (_Webcam != null && _Width > 0 && _Height > 0 && _Data.Length == _Height * _Width * 4)
-            {
-                lock (_MutexData)
-                {
-                    var bmp = new Bitmap(_Width, _Height);
-                    BitmapData bitmapdata = bmp.LockBits(new Rectangle(0, 0, _Width, _Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-                    Marshal.Copy(_Data, 0, bitmapdata.Scan0, _Data.Length);
-                    bmp.UnlockBits(bitmapdata);
-                    return bmp;
-                }
-            }
-            return null;
-        }
+        private bool _NewFrameAvailable;
+        private bool _IsCapturing;
 
         public bool Init()
         {
-            _WebcamDevices = new FilterInfoCollection(FilterCategory.VideoInputDevice);
-            foreach (FilterInfo info in _WebcamDevices)
+            FilterInfoCollection webcams = new FilterInfoCollection(FilterCategory.VideoInputDevice);
+            foreach (FilterInfo info in webcams)
             {
+                var tmpdev = new VideoCaptureDevice(info.MonikerString);
+                if (tmpdev.VideoCapabilities.Length == 0)
+                    continue;
                 var device = new SWebcamDevice
                     {
                         Name = info.Name,
                         MonikerString = info.MonikerString,
-                        Capabilities = new List<SCapabilities>()
+                        Capabilities = new List<SCapabilities>(tmpdev.VideoCapabilities.Length)
                     };
-                var tmpdev = new VideoCaptureDevice(info.MonikerString);
 
                 foreach (VideoCapabilities capabilities in tmpdev.VideoCapabilities)
                 {
                     var item = new SCapabilities
                         {
-                            Framerate = capabilities.FrameRate,
+                            Framerate = capabilities.AverageFrameRate,
                             Height = capabilities.FrameSize.Height,
                             Width = capabilities.FrameSize.Width
                         };
@@ -101,44 +69,188 @@ namespace Vocaluxe.Lib.Webcam
             return true;
         }
 
-        private void _OnFrame(object sender, NewFrameEventArgs e)
+        public void Close()
         {
-            if (_Paused)
+            DeSelect();
+            _Devices.Clear();
+        }
+
+        public void DeSelect()
+        {
+            if (_Webcam == null)
                 return;
+            _Webcam.Stop();
+            _Webcam.NewFrame -= _OnFrame;
+            _IsCapturing = false;
             lock (_MutexData)
             {
-                if (_Width != e.Frame.Width || _Height != e.Frame.Height || _Data.Length != e.Frame.Width * e.Frame.Height * 4)
-                    _Data = new byte[4 * e.Frame.Width * e.Frame.Height];
-
-                _Width = e.Frame.Width;
-                _Height = e.Frame.Height;
-                BitmapData bitmapdata = e.Frame.LockBits(new Rectangle(0, 0, _Width, _Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-                Marshal.Copy(bitmapdata.Scan0, _Data, 0, _Data.Length);
-                e.Frame.UnlockBits(bitmapdata);
+                _Data = null;
+                _Webcam = null;
             }
         }
 
-        public void Pause()
+        #region ConfigSelection
+        private static float _GetScore(int value, int valueRequested)
         {
-            if (_Webcam != null)
-                _Paused = true;
+            if (valueRequested <= 0)
+                return 1;
+            return 1.0f - (float)Math.Abs(value - valueRequested) / Math.Max(value, valueRequested);
+        }
+
+        private static VideoCapabilities _SelectWebcamConfig(VideoCapabilities[] capabilities, SWebcamConfig config)
+        {
+            int configTaken = 0;
+            if (config.Framerate != 0 && config.Height != 0 && config.Width != 0)
+            {
+                float bestMatchScore = 0;
+                for (int i = 0; i < capabilities.Length; i++)
+                {
+                    float score = _GetScore(capabilities[i].AverageFrameRate, config.Framerate);
+                    score += _GetScore(capabilities[i].FrameSize.Height, config.Height);
+                    score += _GetScore(capabilities[i].FrameSize.Width, config.Width);
+                    if (score >= bestMatchScore)
+                    {
+                        // Take the config with the best score, Higher indizes should indicate a better resolution
+                        // so choose the last one with best score if 2 have equal scores
+                        bestMatchScore = score;
+                        configTaken = i;
+                    }
+                }
+            }
+
+            return capabilities[configTaken];
+        }
+        #endregion
+
+        public bool Select(SWebcamConfig config)
+        {
+            //Close old camera connection
+            DeSelect();
+
+            if (_Devices.Count < 1)
+                return false;
+
+            string moniker = _Devices[0].MonikerString;
+            if (config.MonikerString != "")
+            {
+                foreach (SWebcamDevice device in _Devices)
+                {
+                    if (device.MonikerString == config.MonikerString)
+                    {
+                        moniker = device.MonikerString;
+                        break;
+                    }
+                }
+            }
+            _Webcam = new VideoCaptureDevice(moniker);
+
+            _Webcam.VideoResolution = _SelectWebcamConfig(_Webcam.VideoCapabilities, config);
+
+            _Config.Framerate = _Webcam.VideoResolution.AverageFrameRate;
+            _Config.Height = _Webcam.VideoResolution.FrameSize.Height;
+            _Config.Width = _Webcam.VideoResolution.FrameSize.Width;
+            _Config.MonikerString = _Webcam.Source;
+
+            return true;
         }
 
         public void Start()
         {
             if (_Webcam == null)
                 return;
-            _Webcam.NewFrame -= _OnFrame;
-            //Subscribe to NewFrame event
-            _Webcam.NewFrame += _OnFrame;
-            _Webcam.Start();
-            _Paused = false;
+            if (_IsCapturing)
+            {
+                if (_Paused)
+                {
+                    _Webcam.NewFrame += _OnFrame;
+                    _Paused = false;
+                }
+            }
+            else
+            {
+                //Subscribe to NewFrame event
+                _Webcam.NewFrame += _OnFrame;
+                _Paused = false;
+                _Webcam.Start();
+                _IsCapturing = true;
+            }
+        }
+
+        public void Pause()
+        {
+            if (_Webcam != null && !_Paused)
+            {
+                _Webcam.NewFrame -= _OnFrame;
+                lock (_MutexData) //Make sure all events are finished or not yet startet for consistency
+                {
+                    _Paused = true;
+                }
+            }
         }
 
         public void Stop()
         {
             if (_Webcam != null)
+            {
                 _Webcam.SignalToStop();
+                _Webcam.NewFrame -= _OnFrame;
+                lock (_MutexData) //Make sure all events are finished or not yet startet for consistency
+                {
+                    _IsCapturing = false;
+                }
+            }
+        }
+
+        public bool GetFrame(ref CTexture frame)
+        {
+            lock (_MutexData)
+            {
+                if (_Data != null && _Data.Length == _Width * _Height * 4 && _NewFrameAvailable)
+                {
+                    CDraw.UpdateOrAddTexture(ref frame, _Width, _Height, _Data);
+                    _NewFrameAvailable = false;
+                    return true;
+                }
+                return false;
+            }
+        }
+
+        public Bitmap GetBitmap()
+        {
+            lock (_MutexData)
+            {
+                if (_Data != null && _Data.Length == _Width * _Height * 4)
+                {
+                    var bmp = new Bitmap(_Width, _Height);
+                    BitmapData bitmapdata = bmp.LockBits(new Rectangle(0, 0, _Width, _Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+                    Marshal.Copy(_Data, 0, bitmapdata.Scan0, _Data.Length);
+                    bmp.UnlockBits(bitmapdata);
+                    return bmp;
+                }
+                return null;
+            }
+        }
+
+        private void _OnFrame(object sender, NewFrameEventArgs e)
+        {
+            if (_Paused)
+                return;
+            if (e.Frame.Width == 0 || e.Frame.Height == 0)
+                return;
+            lock (_MutexData)
+            {
+                if (!IsCapturing())
+                    return;
+                if (_Data == null || _Data.Length != e.Frame.Width * e.Frame.Height * 4)
+                    _Data = new byte[e.Frame.Width * e.Frame.Height * 4];
+
+                _Width = e.Frame.Width;
+                _Height = e.Frame.Height;
+                BitmapData bitmapdata = e.Frame.LockBits(new Rectangle(0, 0, _Width, _Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+                Marshal.Copy(bitmapdata.Scan0, _Data, 0, _Data.Length);
+                e.Frame.UnlockBits(bitmapdata);
+                _NewFrameAvailable = true;
+            }
         }
 
         public SWebcamDevice[] GetDevices()
@@ -148,42 +260,12 @@ namespace Vocaluxe.Lib.Webcam
 
         public bool IsDeviceAvailable()
         {
-            return _Devices.Count > 0;
+            return _Webcam != null;
         }
 
         public bool IsCapturing()
         {
-            return _Webcam.IsRunning;
-        }
-
-        public bool Select(SWebcamConfig config)
-        {
-            //Close old camera connection
-            Close();
-
-            if (_WebcamDevices == null)
-                return false;
-            if (_WebcamDevices.Count < 1)
-                return false;
-
-            //No MonikerString found, try first webcam
-            _Webcam = config.MonikerString == "" ? new VideoCaptureDevice(_WebcamDevices[0].MonikerString) : new VideoCaptureDevice(config.MonikerString);
-
-            if (_Webcam == null)
-                return false;
-
-            if (config.Framerate != 0 && config.Height != 0 && config.Width != 0)
-            {
-                _Webcam.DesiredFrameRate = config.Framerate;
-                _Webcam.DesiredFrameSize = new Size(config.Width, config.Height);
-            }
-
-            _Config.Framerate = _Webcam.DesiredFrameRate;
-            _Config.Height = _Webcam.DesiredFrameSize.Height;
-            _Config.Width = _Webcam.DesiredFrameSize.Width;
-            _Config.MonikerString = _Webcam.Source;
-
-            return true;
+            return _IsCapturing && !_Paused;
         }
 
         public SWebcamConfig GetConfig()
diff --git a/Vocaluxe/Lib/Webcam/IWebcam.cs b/Vocaluxe/Lib/Webcam/IWebcam.cs
index aa108411..98ae1804 100644
--- a/Vocaluxe/Lib/Webcam/IWebcam.cs
+++ b/Vocaluxe/Lib/Webcam/IWebcam.cs
@@ -46,19 +46,33 @@ namespace Vocaluxe.Lib.Webcam
     interface IWebcam
     {
         bool Init();
+        void Close();
 
         void Start();
         void Pause();
         void Stop();
-        void Close();
 
+        /// <summary>
+        ///     Gets last captured frame. Returns true if frame was updated<br />
+        ///     Note that this will invalidate the last frame and not return it again with this function
+        /// </summary>
+        /// <param name="frame"></param>
+        /// <returns></returns>
         bool GetFrame(ref CTexture frame);
+
+        /// <summary>
+        ///     Gets the last captured frame as a bitma
+        /// </summary>
+        /// <param name="frame"></param>
+        /// <returns>Null if no frame was captured, the bitmap otherwise</returns>
         Bitmap GetBitmap();
+
         SWebcamConfig GetConfig();
         SWebcamDevice[] GetDevices();
         bool IsDeviceAvailable();
         bool IsCapturing();
 
         bool Select(SWebcamConfig webcamConfig);
+        void DeSelect();
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Program.cs b/Vocaluxe/Program.cs
index b59d4f9e..b7e0d20c 100644
--- a/Vocaluxe/Program.cs
+++ b/Vocaluxe/Program.cs
@@ -20,24 +20,23 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Runtime.ExceptionServices;
 using System.Threading;
 using System.Windows.Forms;
 using Vocaluxe.Base;
-using System.Runtime.ExceptionServices;
 using Vocaluxe.Base.Fonts;
 using Vocaluxe.Base.Server;
 
 namespace Vocaluxe
 {
+    class CLoadingException : Exception
+    {
+        public CLoadingException(string component)
+            : base("Failed to load " + component) {}
+    }
+
     static class CMainProgram
     {
-#if WIN
-        [DllImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool SetForegroundWindow(IntPtr hWnd);
-#endif
-
         private static CSplashScreen _SplashScreen;
 
         [STAThread, HandleProcessCorruptedStateExceptions]
@@ -85,156 +84,171 @@ namespace Vocaluxe
 
                 if (!CProgrammHelper.CheckRequirements())
                     return;
+                CProgrammHelper.Init();
 
                 CMain.Init();
-                CSettings.CreateFolders();
                 Application.DoEvents();
 
                 // Init Language
-                CLog.StartBenchmark(0, "Init Language");
+                CLog.StartBenchmark("Init Language");
                 CLanguage.Init();
-                CLog.StopBenchmark(0, "Init Language");
+                CLog.StopBenchmark("Init Language");
 
                 Application.DoEvents();
 
                 // load config
-                CLog.StartBenchmark(0, "Init Config");
+                CLog.StartBenchmark("Init Config");
                 CConfig.LoadCommandLineParams(args);
                 CConfig.UseCommandLineParamsBefore();
                 CConfig.Init();
                 CConfig.UseCommandLineParamsAfter();
-                CLog.StopBenchmark(0, "Init Config");
+                CLog.StopBenchmark("Init Config");
+
+                // Create folders
+                CSettings.CreateFolders();
 
-                Application.DoEvents();
                 _SplashScreen = new CSplashScreen();
                 Application.DoEvents();
 
                 // Init Draw
-                CLog.StartBenchmark(0, "Init Draw");
-                CDraw.InitDraw();
-                CLog.StopBenchmark(0, "Init Draw");
-
-                Application.DoEvents();
-
-                // Init Database
-                CLog.StartBenchmark(0, "Init Database");
-                CDataBase.Init();
-                CLog.StopBenchmark(0, "Init Database");
+                CLog.StartBenchmark("Init Draw");
+                if (!CDraw.Init())
+                    throw new CLoadingException("drawing");
+                CLog.StopBenchmark("Init Draw");
 
                 Application.DoEvents();
 
                 // Init Playback
-                CLog.StartBenchmark(0, "Init Playback");
-                CSound.Init();
-                CLog.StopBenchmark(0, "Init Playback");
+                CLog.StartBenchmark("Init Playback");
+                if (!CSound.Init())
+                    throw new CLoadingException("playback");
+                CLog.StopBenchmark("Init Playback");
 
                 Application.DoEvents();
 
                 // Init Record
-                CLog.StartBenchmark(0, "Init Record");
-                CSound.RecordInit();
-                CLog.StopBenchmark(0, "Init Record");
-
-                Application.DoEvents();
-
-                //Init Webcam
-                CLog.StartBenchmark(0, "Init Webcam");
-                CWebcam.Init();
-                CLog.StopBenchmark(0, "Init Webcam");
-
-                Application.DoEvents();
-
-                // Init Background Music
-                CLog.StartBenchmark(0, "Init Background Music");
-                CBackgroundMusic.Init();
-                CLog.StopBenchmark(0, "Init Background Music");
-
-                Application.DoEvents();
-
-                // Init Profiles
-                CLog.StartBenchmark(0, "Init Profiles");
-                CProfiles.Init();
-                CLog.StopBenchmark(0, "Init Profiles");
-
-                Application.DoEvents();
-
-                // Init Font
-                CLog.StartBenchmark(0, "Init Font");
-                CFonts.Init();
-                CLog.StopBenchmark(0, "Init Font");
+                CLog.StartBenchmark("Init Record");
+                if (!CRecord.Init())
+                    throw new CLoadingException("record");
+                CLog.StopBenchmark("Init Record");
 
                 Application.DoEvents();
 
                 // Init VideoDecoder
-                CLog.StartBenchmark(0, "Init Videodecoder");
-                CVideo.Init();
-                CLog.StopBenchmark(0, "Init Videodecoder");
+                CLog.StartBenchmark("Init Videodecoder");
+                if (!CVideo.Init())
+                    throw new CLoadingException("video");
+                CLog.StopBenchmark("Init Videodecoder");
+
+                Application.DoEvents();
+
+                // Init Database
+                CLog.StartBenchmark("Init Database");
+                if (!CDataBase.Init())
+                    throw new CLoadingException("database");
+                CLog.StopBenchmark("Init Database");
+
+                Application.DoEvents();
+
+                //Init Webcam
+                CLog.StartBenchmark("Init Webcam");
+                if (!CWebcam.Init())
+                    throw new CLoadingException("webcam");
+                CLog.StopBenchmark("Init Webcam");
+
+                Application.DoEvents();
+
+                // Init Background Music
+                CLog.StartBenchmark("Init Background Music");
+                CBackgroundMusic.Init();
+                CLog.StopBenchmark("Init Background Music");
+
+                Application.DoEvents();
+
+                // Init Profiles
+                CLog.StartBenchmark("Init Profiles");
+                CProfiles.Init();
+                CLog.StopBenchmark("Init Profiles");
+
+                Application.DoEvents();
+
+                // Init Font
+                CLog.StartBenchmark("Init Font");
+                CFonts.Init();
+                CLog.StopBenchmark("Init Font");
 
                 Application.DoEvents();
 
                 // Load Cover
-                CLog.StartBenchmark(0, "Init Cover");
+                CLog.StartBenchmark("Init Cover");
                 CCover.Init();
-                CLog.StopBenchmark(0, "Init Cover");
+                CLog.StopBenchmark("Init Cover");
 
                 Application.DoEvents();
 
                 // Theme System
-                CLog.StartBenchmark(0, "Init Theme");
-                CTheme.InitTheme();
-                CLog.StopBenchmark(0, "Init Theme");
+                CLog.StartBenchmark("Init Theme");
+                if (!CTheme.Init())
+                    throw new CLoadingException("theme");
+                CLog.StopBenchmark("Init Theme");
 
                 Application.DoEvents();
 
                 // Init Screens
-                CLog.StartBenchmark(0, "Init Screens");
-                CGraphics.InitGraphics();
-                CLog.StopBenchmark(0, "Init Screens");
+                CLog.StartBenchmark("Init Screens");
+                CGraphics.Init();
+                CLog.StopBenchmark("Init Screens");
 
                 Application.DoEvents();
 
                 // Init Server
-                CLog.StartBenchmark(0, "Init Server");
+                CLog.StartBenchmark("Init Server");
                 CVocaluxeServer.Init();
-                CLog.StopBenchmark(0, "Init Server");
+                CLog.StopBenchmark("Init Server");
 
                 Application.DoEvents();
 
                 // Init Input
-                CLog.StartBenchmark(0, "Init Input");
+                CLog.StartBenchmark("Init Input");
                 CController.Init();
                 CController.Connect();
-                CLog.StopBenchmark(0, "Init Input");
+                CLog.StopBenchmark("Init Input");
 
                 Application.DoEvents();
 
                 // Init Game;
-                CLog.StartBenchmark(0, "Init Game");
+                CLog.StartBenchmark("Init Game");
                 CGame.Init();
                 CProfiles.Update();
                 CConfig.UsePlayers();
-                CLog.StopBenchmark(0, "Init Game");
+                CLog.StopBenchmark("Init Game");
 
                 Application.DoEvents();
 
                 // Init Party Modes;
-                CLog.StartBenchmark(0, "Init Party Modes");
+                CLog.StartBenchmark("Init Party Modes");
                 CParty.Init();
-                CLog.StopBenchmark(0, "Init Party Modes");
+                CLog.StopBenchmark("Init Party Modes");
 
                 Application.DoEvents();
+                //Only reasonable point to call GC.Collect() because initialization may cause lots of garbage
+                //Rely on GC doing its job afterwards and call Dispose methods where appropriate
+                GC.Collect();
             }
             catch (Exception e)
             {
-                MessageBox.Show("Error on start up: " + e.Message + e.StackTrace);
+                MessageBox.Show("Error on start up: " + e.Message);
                 CLog.LogError("Error on start up: " + e);
-                _SplashScreen.Close();
+                if (_SplashScreen != null)
+                    _SplashScreen.Close();
                 _CloseProgram();
+                return;
             }
             Application.DoEvents();
 
             // Start Main Loop
-            _SplashScreen.Close();
+            if (_SplashScreen != null)
+                _SplashScreen.Close();
             CVocaluxeServer.Start();
 
             CDraw.MainLoop();
@@ -242,18 +256,22 @@ namespace Vocaluxe
 
         private static void _CloseProgram()
         {
-            // Unloading
+            // Unloading in reverse order
             try
             {
-                CVocaluxeServer.Close();
                 CController.Close();
-                CSound.RecordCloseAll();
-                CSound.CloseAllStreams();
-                CVideo.CloseAll();
-                CDraw.Unload();
-                CDataBase.CloseConnections();
+                CVocaluxeServer.Close();
+                CGraphics.Close();
+                CCover.Close();
+                CBackgroundMusic.Close();
                 CWebcam.Close();
-                CLog.CloseAll();
+                CDataBase.Close();
+                CVideo.Close();
+                CRecord.Close();
+                CSound.Close();
+                CDraw.Unload();
+                GC.Collect(); // Do a GC run here before we close logs to have finalizers run
+                CLog.CloseAll(); // Do this last, so we get all log entries!
             }
             catch (Exception) {}
             Environment.Exit(Environment.ExitCode);
@@ -332,7 +350,7 @@ namespace Vocaluxe
                 {
                     IntPtr wnd = process.MainWindowHandle;
                     if (wnd != IntPtr.Zero)
-                        SetForegroundWindow(wnd);
+                        COSFunctions.SetForegroundWindow(wnd);
                 }
 #endif
                 return false;
diff --git a/Vocaluxe/Properties/AssemblyInfo.cs b/Vocaluxe/Properties/AssemblyInfo.cs
index 861326f6..56f417d4 100644
--- a/Vocaluxe/Properties/AssemblyInfo.cs
+++ b/Vocaluxe/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Runtime.InteropServices;
 //      Revision
 //
 
-[assembly: AssemblyVersion("0.3.0.83")]
-[assembly: AssemblyFileVersion("0.3.0.83")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.3.1.0")]
+[assembly: AssemblyFileVersion("0.3.1.0")]
\ No newline at end of file
diff --git a/Vocaluxe/Screens/CPopupScreenVolumeControl.cs b/Vocaluxe/Screens/CPopupScreenVolumeControl.cs
index f95f651a..4bfde64c 100644
--- a/Vocaluxe/Screens/CPopupScreenVolumeControl.cs
+++ b/Vocaluxe/Screens/CPopupScreenVolumeControl.cs
@@ -107,49 +107,49 @@ namespace Vocaluxe.Screens
 
         private void _SaveConfig()
         {
+            int volume = _SelectSlides[_SelectSlideVolume].Selection * 5;
             switch (CGraphics.CurrentScreen)
             {
                 case EScreens.ScreenSong:
                     if (CSongs.IsInCategory)
-                        CConfig.PreviewMusicVolume = _SelectSlides[_SelectSlideVolume].Selection * 5;
+                        CConfig.PreviewMusicVolume = volume;
                     else
-                    {
-                        CConfig.BackgroundMusicVolume = _SelectSlides[_SelectSlideVolume].Selection * 5;
-                        CBackgroundMusic.ApplyVolume();
-                    }
+                        CConfig.BackgroundMusicVolume = volume;
                     break;
 
                 case EScreens.ScreenSing:
-                    CConfig.GameMusicVolume = _SelectSlides[_SelectSlideVolume].Selection * 5;
+                    CConfig.GameMusicVolume = volume;
                     break;
 
                 default:
-                    CConfig.BackgroundMusicVolume = _SelectSlides[_SelectSlideVolume].Selection * 5;
-                    CBackgroundMusic.ApplyVolume();
+                    CConfig.BackgroundMusicVolume = volume;
                     break;
             }
             CConfig.SaveConfig();
+            CSound.SetGlobalVolume(volume);
         }
 
         private void _UpdateSlides()
         {
+            int volume;
             switch (CGraphics.CurrentScreen)
             {
                 case EScreens.ScreenSong:
                     if (CSongs.IsInCategory)
-                        _SelectSlides[_SelectSlideVolume].Selection = CConfig.PreviewMusicVolume / 5;
+                        volume = CConfig.PreviewMusicVolume;
                     else
-                        _SelectSlides[_SelectSlideVolume].Selection = CConfig.BackgroundMusicVolume / 5;
+                        volume = CConfig.BackgroundMusicVolume;
                     break;
 
                 case EScreens.ScreenSing:
-                    _SelectSlides[_SelectSlideVolume].Selection = CConfig.GameMusicVolume / 5;
+                    volume = CConfig.GameMusicVolume;
                     break;
 
                 default:
-                    _SelectSlides[_SelectSlideVolume].Selection = CConfig.BackgroundMusicVolume / 5;
+                    volume = CConfig.BackgroundMusicVolume;
                     break;
             }
+            _SelectSlides[_SelectSlideVolume].Selection = volume / 5;
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Screens/CScreenLoad.cs b/Vocaluxe/Screens/CScreenLoad.cs
index 4b6cf767..5bcc054d 100644
--- a/Vocaluxe/Screens/CScreenLoad.cs
+++ b/Vocaluxe/Screens/CScreenLoad.cs
@@ -42,8 +42,6 @@ namespace Vocaluxe.Screens
         private bool _IntroOutPlayed;
         private CVideoPlayer[] _Intros;
 
-        private bool _BGMusicStarted;
-
         public override void Init()
         {
             base.Init();
@@ -99,8 +97,6 @@ namespace Vocaluxe.Screens
                 }
             }
 
-            _SongLoaderThread = new Thread(CSongs.LoadSongs) {Name = "SongLoader"};
-
             _Texts[_TextStatus].Text = CLanguage.Translate("TR_SCREENLOAD_TOTAL") + ": 0 " +
                                        CLanguage.Translate("TR_SCREENLOAD_SONGS") + " (0 " +
                                        CLanguage.Translate("TR_SCREENLOAD_LOADED") + ")";
@@ -115,8 +111,6 @@ namespace Vocaluxe.Screens
                     _Intros[i].Load(_IntroVideo[i]);
                 _Texts[_TextProgramName].Visible = false;
             }
-
-            _BGMusicStarted = false;
         }
 
         public override void OnShowFinish()
@@ -129,22 +123,12 @@ namespace Vocaluxe.Screens
                     videoPlayer.PreLoad();
             }
 
-            CLog.StartBenchmark(0, "Load Songs Full");
-            _SongLoaderThread.IsBackground = true;
+            CLog.StartBenchmark("Load Songs Full");
+            _SongLoaderThread = new Thread(CSongs.LoadSongs) {Name = "SongLoader", IsBackground = true};
             _SongLoaderThread.Start();
+            CBackgroundMusic.OwnSongsAvailable = false;
 
-            if (CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON &&
-                CConfig.BackgroundMusicSource == EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC && !_BGMusicStarted)
-            {
-                CBackgroundMusic.AddOwnMusic();
-
-                if (!CBackgroundMusic.IsPlaying)
-                    CBackgroundMusic.Next();
-
-                _BGMusicStarted = true;
-            }
-
-            CBackgroundMusic.CanSing = false;
+            CBackgroundMusic.Play();
         }
 
         public override bool UpdateGame()
@@ -153,10 +137,10 @@ namespace Vocaluxe.Screens
 
             bool next = CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART || CSongs.CoverLoaded;
 
-            if ((_IntroOutPlayed || _SkipIntro) && next && CSettings.GameState != EGameState.EditTheme && CSongs.SongsLoaded)
-                CSettings.GameState = EGameState.Normal;
+            if ((_IntroOutPlayed || _SkipIntro) && next && CSettings.ProgramState != EProgramState.EditTheme && CSongs.SongsLoaded)
+                CSettings.ProgramState = EProgramState.Normal;
 
-            if (CSettings.GameState == EGameState.Normal)
+            if (CSettings.ProgramState == EProgramState.Normal)
                 CGraphics.FadeTo(EScreens.ScreenMain);
 
             _Texts[_TextStatus].Text =
@@ -164,15 +148,11 @@ namespace Vocaluxe.Screens
                 CLanguage.Translate("TR_SCREENLOAD_SONGS") + " (" + CSongs.NumSongsWithCoverLoaded + " " +
                 CLanguage.Translate("TR_SCREENLOAD_LOADED") + ")";
 
-            if (CSongs.SongsLoaded && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON &&
-                CConfig.BackgroundMusicSource != EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC && !_BGMusicStarted)
+            if (CSongs.SongsLoaded && !CBackgroundMusic.OwnSongsAvailable)
             {
-                CBackgroundMusic.AddOwnMusic();
+                CBackgroundMusic.OwnSongsAvailable = true;
 
-                if (!CBackgroundMusic.IsPlaying)
-                    CBackgroundMusic.Next();
-
-                _BGMusicStarted = true;
+                CBackgroundMusic.Play();
             }
 
             return true;
@@ -196,14 +176,12 @@ namespace Vocaluxe.Screens
             foreach (CVideoPlayer videoPlayer in _Intros)
                 videoPlayer.Close();
 
-            CBackgroundMusic.CanSing = true;
-
-            CLog.StopBenchmark(0, "Load Songs Full");
+            CLog.StopBenchmark("Load Songs Full");
 
             //Init Playlists
-            CLog.StartBenchmark(0, "Init Playlists");
+            CLog.StartBenchmark("Init Playlists");
             CPlaylists.Init();
-            CLog.StopBenchmark(0, "Init Playlists");
+            CLog.StopBenchmark("Init Playlists");
         }
 
         private void _CheckStartIntroVideos()
@@ -224,6 +202,7 @@ namespace Vocaluxe.Screens
             }
             else if (_CurrentIntroVideo == 0 && _Intros[0].IsFinished && CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART)
             {
+                _Intros[_CurrentIntroVideo].Close();
                 _CurrentIntroVideo = 1;
                 _Intros[1].Loop = true;
                 _Intros[1].Start();
@@ -231,6 +210,7 @@ namespace Vocaluxe.Screens
             else if ((_CurrentIntroVideo == 1 && CSongs.CoverLoaded) ||
                      (_CurrentIntroVideo == 0 && _Intros[0].IsFinished))
             {
+                _Intros[_CurrentIntroVideo].Close();
                 _CurrentIntroVideo = 2;
                 _Intros[2].Start();
             }
diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index be65f5cc..945e6731 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -546,8 +546,8 @@ namespace Vocaluxe.Screens
 
             for (int i = 1; i <= CGame.NumPlayer; i++)
             {
-                CSound.AnalyzeBuffer(i - 1);
-                _Equalizers["EqualizerPlayer" + i].Update(CSound.ToneWeigth(i - 1));
+                CRecord.AnalyzeBuffer(i - 1);
+                _Equalizers["EqualizerPlayer" + i].Update(CRecord.ToneWeigth(i - 1), CRecord.GetMaxVolume(i - 1));
             }
             return true;
         }
@@ -555,7 +555,7 @@ namespace Vocaluxe.Screens
         public override void OnShow()
         {
             base.OnShow();
-            CSound.RecordStart();
+            CRecord.Start();
 
             _NameSelections[_NameSelection].Init();
             _LoadProfiles();
@@ -565,7 +565,7 @@ namespace Vocaluxe.Screens
         public override void OnClose()
         {
             base.OnClose();
-            CSound.RecordStop();
+            CRecord.Stop();
         }
 
         public override bool Draw()
diff --git a/Vocaluxe/Screens/CScreenOptionsRecord.cs b/Vocaluxe/Screens/CScreenOptionsRecord.cs
index 979809c6..1a658fe5 100644
--- a/Vocaluxe/Screens/CScreenOptionsRecord.cs
+++ b/Vocaluxe/Screens/CScreenOptionsRecord.cs
@@ -19,7 +19,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows.Forms;
 using Vocaluxe.Base;
-using Vocaluxe.Lib.Sound;
+using Vocaluxe.Lib.Sound.Record;
 using VocaluxeLib;
 using VocaluxeLib.Menu;
 
@@ -212,7 +212,7 @@ namespace Vocaluxe.Screens
         public override bool UpdateGame()
         {
             for (int i = 0; i < CSettings.MaxNumPlayer; i++)
-                CSound.AnalyzeBuffer(i);
+                CRecord.AnalyzeBuffer(i);
 
             if (_DelayTest.Running)
             {
@@ -223,25 +223,29 @@ namespace Vocaluxe.Screens
 
             if (_CheckMicConfig())
             {
-                _ChannelEnergy[0] = 0f;
-                int player = _SelectSlides[_SelectSlideRecordChannel1].Selection;
-                if (player > 0)
+                int player = _SelectSlides[_SelectSlideRecordChannel1].Selection - 1;
+                if (player >= 0)
                 {
-                    _ChannelEnergy[0] = CSound.RecordGetMaxVolume(player - 1);
-                    _Equalizers[_EqualizerChannel1].Update(CSound.ToneWeigth(player - 1));
+                    _ChannelEnergy[0] = CRecord.GetMaxVolume(player);
+                    _Equalizers[_EqualizerChannel1].Update(CRecord.ToneWeigth(player), CRecord.GetMaxVolume(player));
                 }
                 else
+                {
+                    _ChannelEnergy[0] = 0f;
                     _Equalizers[_EqualizerChannel1].Reset();
+                }
 
-                _ChannelEnergy[1] = 0f;
-                player = _SelectSlides[_SelectSlideRecordChannel2].Selection;
-                if (player > 0)
+                player = _SelectSlides[_SelectSlideRecordChannel2].Selection - 1;
+                if (player >= 0)
                 {
-                    _ChannelEnergy[1] = CSound.RecordGetMaxVolume(player - 1);
-                    _Equalizers[_EqualizerChannel2].Update(CSound.ToneWeigth(player - 1));
+                    _ChannelEnergy[1] = CRecord.GetMaxVolume(player);
+                    _Equalizers[_EqualizerChannel2].Update(CRecord.ToneWeigth(player), CRecord.GetMaxVolume(player));
                 }
                 else
+                {
+                    _ChannelEnergy[1] = 0f;
                     _Equalizers[_EqualizerChannel2].Reset();
+                }
             }
             else
             {
@@ -265,7 +269,7 @@ namespace Vocaluxe.Screens
 
             _DeviceNr = -1;
 
-            _Devices = CSound.RecordGetDevices();
+            _Devices = CRecord.GetDevices();
             if (_Devices != null)
             {
                 _DeviceNr = 0;
@@ -336,7 +340,7 @@ namespace Vocaluxe.Screens
         public override void OnClose()
         {
             base.OnClose();
-            CSound.RecordStop();
+            CRecord.Stop();
 
             _DelayTest.Reset();
             CBackgroundMusic.Disabled = false;
@@ -362,7 +366,7 @@ namespace Vocaluxe.Screens
             if (_Devices == null)
                 return;
 
-            CSound.RecordStop();
+            CRecord.Stop();
             _SetMicConfig();
 
             if (_CheckMicConfig())
@@ -388,7 +392,7 @@ namespace Vocaluxe.Screens
                 }
                 CConfig.SaveConfig();
             }
-            CSound.RecordStart();
+            CRecord.Start();
         }
 
         private void _SetPlayerColors()
diff --git a/Vocaluxe/Screens/CScreenOptionsSound.cs b/Vocaluxe/Screens/CScreenOptionsSound.cs
index 847586f8..502f4c28 100644
--- a/Vocaluxe/Screens/CScreenOptionsSound.cs
+++ b/Vocaluxe/Screens/CScreenOptionsSound.cs
@@ -150,13 +150,17 @@ namespace Vocaluxe.Screens
         {
             CConfig.GameMusicVolume = _SelectSlides[_SelectSlideGameMusicVolume].Selection * 5;
             CConfig.PreviewMusicVolume = _SelectSlides[_SelectSlidePreviewMusicVolume].Selection * 5;
+            CConfig.BackgroundMusic = (EOffOn)_SelectSlides[_SelectSlideBackgroundMusic].Selection;
+            CConfig.BackgroundMusicSource = (EBackgroundMusicSource)_SelectSlides[_SelectSlideBackgroundMusicSource].Selection;
+            CConfig.BackgroundMusicVolume = _SelectSlides[_SelectSlideBackgroundMusicVolume].Selection * 5;
             CConfig.SaveConfig();
 
-            var newOffOn = (EOffOn)_SelectSlides[_SelectSlideBackgroundMusic].Selection;
-            var newSource = (EBackgroundMusicSource)_SelectSlides[_SelectSlideBackgroundMusicSource].Selection;
-            float newVolume = _SelectSlides[_SelectSlideBackgroundMusicVolume].Selection * 5;
-
-            CBackgroundMusic.CheckAndApplyConfig(newOffOn, newSource, newVolume);
+            CBackgroundMusic.SetMusicSource(CConfig.BackgroundMusicSource);
+            CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
+            if (CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
+                CBackgroundMusic.Play();
+            else
+                CBackgroundMusic.Pause();
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Screens/CScreenOptionsTheme.cs b/Vocaluxe/Screens/CScreenOptionsTheme.cs
index 5bcbe620..a58226a8 100644
--- a/Vocaluxe/Screens/CScreenOptionsTheme.cs
+++ b/Vocaluxe/Screens/CScreenOptionsTheme.cs
@@ -179,7 +179,7 @@ namespace Vocaluxe.Screens
             CConfig.SaveConfig();
 
             if (_OldCoverTheme != _SelectSlides[_SelectSlideCover].Selection)
-                CCover.ReloadCover();
+                CCover.ReloadCovers();
 
             if (_OldTheme != _SelectSlides[_SelectSlideTheme].Selection)
             {
diff --git a/Vocaluxe/Screens/CScreenOptionsVideo.cs b/Vocaluxe/Screens/CScreenOptionsVideo.cs
index d1b446c8..a2bf330d 100644
--- a/Vocaluxe/Screens/CScreenOptionsVideo.cs
+++ b/Vocaluxe/Screens/CScreenOptionsVideo.cs
@@ -30,7 +30,7 @@ namespace Vocaluxe.Screens
         // Version number for theme files. Increment it, if you've changed something on the theme files!
         protected override int _ScreenVersion
         {
-            get { return 4; }
+            get { return 5; }
         }
 
         private const string _SelectSlideVideoBackgrounds = "SelectSlideVideoBackgrounds";
@@ -45,6 +45,9 @@ namespace Vocaluxe.Screens
         private const string _ButtonScreenAdjustments = "ButtonScreenAdjustments";
         private const string _ButtonExit = "ButtonExit";
 
+        private const string _TextWebcams = "TextWebcams";
+        private const string _TextWebcamResolution = "TextWebcamResolution";
+
         private SWebcamConfig _Config;
         private CTexture _WebcamTexture;
         private int _DeviceNr;
@@ -61,6 +64,7 @@ namespace Vocaluxe.Screens
                     _SelectSlideVideoBackgrounds, _SelectSlideVideoPreview, _SelectSlideVideosInSongs, _SelectSlideVideosToBackground, _SelectSlideWebcamDevices,
                     _SelectSlideWebcamCapabilities
                 };
+            _ThemeTexts = new string[] {_TextWebcams, _TextWebcamResolution};
         }
 
         public override void LoadTheme(string xmlPath)
@@ -154,8 +158,8 @@ namespace Vocaluxe.Screens
 
         public override bool UpdateGame()
         {
-            CWebcam.GetFrame(ref _WebcamTexture);
-            _Statics[_StaticWebcamOutput].Texture = _WebcamTexture;
+            if (CWebcam.GetFrame(ref _WebcamTexture))
+                _Statics[_StaticWebcamOutput].Texture = _WebcamTexture;
             _SelectSlides[_SelectSlideVideosToBackground].Selection = (int)CConfig.VideosToBackground;
             return true;
         }
@@ -170,7 +174,7 @@ namespace Vocaluxe.Screens
         public override void OnClose()
         {
             base.OnClose();
-            CWebcam.Close();
+            CWebcam.Stop();
         }
 
         public override void OnShow()
@@ -189,25 +193,20 @@ namespace Vocaluxe.Screens
             {
                 if (devices != null && devices.Length > 0)
                 {
-                    _DeviceNr = 0;
-                    _CapabilityNr = 0;
-                    _GetFirstConfiguredWebcamDevice(ref _DeviceNr, ref _CapabilityNr);
-
                     foreach (SWebcamDevice d in devices)
                         _SelectSlides[_SelectSlideWebcamDevices].AddValue(d.Name);
-                    _SelectSlides[_SelectSlideWebcamDevices].Selection = _DeviceNr;
 
-                    foreach (SCapabilities c in devices[_DeviceNr].Capabilities)
-                        _SelectSlides[_SelectSlideWebcamCapabilities].AddValue(c.Width + " x " + c.Height + " @ " + c.Framerate + " FPS ");
-                    _Config.MonikerString = devices[_SelectSlides[_SelectSlideWebcamDevices].Selection].MonikerString;
-                    _Config.Width = devices[_SelectSlides[_SelectSlideWebcamDevices].Selection].Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Width;
-                    _Config.Height = devices[_SelectSlides[_SelectSlideWebcamDevices].Selection].Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Height;
-                    _Config.Framerate =
-                        devices[_SelectSlides[_SelectSlideWebcamDevices].Selection].Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Framerate;
-                    CWebcam.Close();
-                    CWebcam.Select(CConfig.WebcamConfig);
-                    CWebcam.Start();
-                    ssVisible = true;
+                    int devNr;
+                    int capNr;
+                    if (_GetFirstConfiguredWebcamDevice(out devNr, out capNr))
+                    {
+                        _SelectSlides[_SelectSlideWebcamDevices].Selection = devNr;
+                        _OnDeviceEvent();
+                        _SelectSlides[_SelectSlideWebcamCapabilities].Selection = capNr;
+                        _OnCapabilitiesEvent();
+
+                        ssVisible = true;
+                    }
                 }
             }
             catch (Exception e)
@@ -218,6 +217,8 @@ namespace Vocaluxe.Screens
             _SelectSlides[_SelectSlideWebcamDevices].Visible = ssVisible;
             _SelectSlides[_SelectSlideWebcamCapabilities].Visible = ssVisible;
             _Statics[_StaticWebcamOutput].Visible = ssVisible;
+            _Texts[_TextWebcams].Visible = ssVisible;
+            _Texts[_TextWebcamResolution].Visible = ssVisible;
         }
 
         private void _SaveConfig()
@@ -239,7 +240,6 @@ namespace Vocaluxe.Screens
             {
                 _SelectSlides[_SelectSlideWebcamCapabilities].Clear();
                 _DeviceNr = _SelectSlides[_SelectSlideWebcamDevices].Selection;
-                _CapabilityNr = 0;
 
                 SWebcamDevice d = CWebcam.GetDevices()[_DeviceNr];
                 for (int i = 0; i < d.Capabilities.Count; i++)
@@ -247,16 +247,8 @@ namespace Vocaluxe.Screens
                     _SelectSlides[_SelectSlideWebcamCapabilities].AddValue(d.Capabilities[i].Width + " x " + d.Capabilities[i].Height +
                                                                            " @ " + d.Capabilities[i].Framerate + "FPS");
                 }
-                _SelectSlides[_SelectSlideWebcamCapabilities].Selection = 0;
-
-                _Config.MonikerString = d.MonikerString;
-                _Config.Width = d.Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Width;
-                _Config.Height = d.Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Height;
-                _Config.Framerate = d.Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Framerate;
-
-                CWebcam.Close();
-                CWebcam.Select(_Config);
-                CWebcam.Start();
+                _CapabilityNr = -1;
+                _OnCapabilitiesEvent();
             }
         }
 
@@ -266,24 +258,27 @@ namespace Vocaluxe.Screens
             {
                 _CapabilityNr = _SelectSlides[_SelectSlideWebcamCapabilities].Selection;
 
-                SWebcamDevice d = CWebcam.GetDevices()[_SelectSlides[_SelectSlideWebcamDevices].Selection];
+                SWebcamDevice d = CWebcam.GetDevices()[_DeviceNr];
                 _Config.MonikerString = d.MonikerString;
-                _Config.Width = d.Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Width;
-                _Config.Height = d.Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Height;
-                _Config.Framerate = d.Capabilities[_SelectSlides[_SelectSlideWebcamCapabilities].Selection].Framerate;
+                _Config.Width = d.Capabilities[_CapabilityNr].Width;
+                _Config.Height = d.Capabilities[_CapabilityNr].Height;
+                _Config.Framerate = d.Capabilities[_CapabilityNr].Framerate;
 
-                CWebcam.Close();
                 CWebcam.Select(_Config);
                 CWebcam.Start();
             }
         }
 
-        private void _GetFirstConfiguredWebcamDevice(ref int device, ref int capabilities)
+        private bool _GetFirstConfiguredWebcamDevice(out int device, out int capabilities)
         {
             SWebcamDevice[] devices = CWebcam.GetDevices();
 
             if (devices == null)
-                return;
+            {
+                device = -1;
+                capabilities = -1;
+                return false;
+            }
 
             for (int i = 0; i < devices.Length; i++)
             {
@@ -296,10 +291,13 @@ namespace Vocaluxe.Screens
                     {
                         device = i;
                         capabilities = j;
-                        return;
+                        return true;
                     }
                 }
             }
+            device = 0;
+            capabilities = 0;
+            return true;
         }
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Screens/CScreenProfiles.cs b/Vocaluxe/Screens/CScreenProfiles.cs
index d3b06914..2c29383d 100644
--- a/Vocaluxe/Screens/CScreenProfiles.cs
+++ b/Vocaluxe/Screens/CScreenProfiles.cs
@@ -141,13 +141,13 @@ namespace Vocaluxe.Screens
                         }
                         else if (_Buttons[_ButtonDelete].Selected)
                             _DeleteProfile();
-                        else if (_Buttons[_ButtonWebcam].Selected && CWebcam.IsDeviceAvailable())
+                        else if (_Buttons[_ButtonWebcam].Selected)
                             _OnWebcam();
-                        else if (_Buttons[_ButtonSaveSnapshot].Selected && CWebcam.IsDeviceAvailable())
+                        else if (_Buttons[_ButtonSaveSnapshot].Selected)
                             _OnSaveSnapshot();
-                        else if (_Buttons[_ButtonDiscardSnapshot].Selected && CWebcam.IsDeviceAvailable())
+                        else if (_Buttons[_ButtonDiscardSnapshot].Selected)
                             _OnDiscardSnapshot();
-                        else if (_Buttons[_ButtonTakeSnapshot].Selected && CWebcam.IsDeviceAvailable())
+                        else if (_Buttons[_ButtonTakeSnapshot].Selected)
                             _OnTakeSnapshot();
                         break;
 
@@ -235,13 +235,13 @@ namespace Vocaluxe.Screens
                     CProfiles.SetActive(_SelectSlides[_SelectSlideProfiles].ValueIndex,
                                         (EOffOn)_SelectSlides[_SelectSlideActive].Selection);
                 }
-                else if (_Buttons[_ButtonWebcam].Selected && CWebcam.IsDeviceAvailable())
+                else if (_Buttons[_ButtonWebcam].Selected)
                     _OnWebcam();
-                else if (_Buttons[_ButtonSaveSnapshot].Selected && CWebcam.IsDeviceAvailable())
+                else if (_Buttons[_ButtonSaveSnapshot].Selected)
                     _OnSaveSnapshot();
-                else if (_Buttons[_ButtonDiscardSnapshot].Selected && CWebcam.IsDeviceAvailable())
+                else if (_Buttons[_ButtonDiscardSnapshot].Selected)
                     _OnDiscardSnapshot();
-                else if (_Buttons[_ButtonTakeSnapshot].Selected && CWebcam.IsDeviceAvailable())
+                else if (_Buttons[_ButtonTakeSnapshot].Selected)
                     _OnTakeSnapshot();
             }
 
@@ -270,15 +270,16 @@ namespace Vocaluxe.Screens
 
                 int avatarID = CProfiles.GetAvatarID(_SelectSlides[_SelectSlideProfiles].ValueIndex);
                 _SelectSlides[_SelectSlideAvatars].SetSelectionByValueIndex(avatarID);
-                if (CWebcam.IsDeviceAvailable() && CWebcam.IsCapturing())
+                if (_Snapshot == null)
                 {
-                    if (_Snapshot == null)
-                        CWebcam.GetFrame(ref _WebcamTexture);
-
-                    _Statics[_StaticAvatar].Texture = _WebcamTexture;
+                    if (CWebcam.IsCapturing())
+                    {
+                        if (CWebcam.GetFrame(ref _WebcamTexture))
+                            _Statics[_StaticAvatar].Texture = _WebcamTexture;
+                    }
+                    else
+                        _Statics[_StaticAvatar].Texture = CProfiles.GetAvatarTexture(avatarID);
                 }
-                else
-                    _Statics[_StaticAvatar].Texture = CProfiles.GetAvatarTexture(avatarID);
             }
 
             return true;
@@ -310,27 +311,41 @@ namespace Vocaluxe.Screens
 
         private void _OnTakeSnapshot()
         {
-            _Buttons[_ButtonSaveSnapshot].Visible = true;
-            _Buttons[_ButtonDiscardSnapshot].Visible = true;
-            _Buttons[_ButtonWebcam].Visible = false;
-            _Buttons[_ButtonTakeSnapshot].Visible = false;
-            _Snapshot = CWebcam.GetBitmap();
+            if (!CWebcam.IsDeviceAvailable())
+            {
+                CDraw.RemoveTexture(ref _WebcamTexture);
+                _Snapshot = null;
+                _Buttons[_ButtonSaveSnapshot].Visible = false;
+                _Buttons[_ButtonDiscardSnapshot].Visible = false;
+                _Buttons[_ButtonTakeSnapshot].Visible = false;
+                _Buttons[_ButtonWebcam].Visible = false;
+            }
+            else
+            {
+                CWebcam.Stop(); //Do this first to get consistent frame and bitmap
+                _Snapshot = CWebcam.GetBitmap();
+                if (CWebcam.GetFrame(ref _WebcamTexture))
+                    _Statics[_StaticAvatar].Texture = _WebcamTexture;
+                _Buttons[_ButtonSaveSnapshot].Visible = true;
+                _Buttons[_ButtonDiscardSnapshot].Visible = true;
+                _Buttons[_ButtonTakeSnapshot].Visible = false;
+                _Buttons[_ButtonWebcam].Visible = false;
+            }
         }
 
         private void _OnDiscardSnapshot()
         {
-            CWebcam.Stop();
-            CDraw.RemoveTexture(ref _WebcamTexture);
             _Snapshot = null;
+            CDraw.RemoveTexture(ref _WebcamTexture);
             _Buttons[_ButtonSaveSnapshot].Visible = false;
             _Buttons[_ButtonDiscardSnapshot].Visible = false;
             _Buttons[_ButtonTakeSnapshot].Visible = false;
-            _Buttons[_ButtonWebcam].Visible = true;
+            _Buttons[_ButtonWebcam].Visible = CWebcam.IsDeviceAvailable();
         }
 
         private void _OnSaveSnapshot()
         {
-            string filename = Path.Combine(CSettings.DataPath, CSettings.FolderProfiles, "snapshot");
+            string filename = Path.Combine(CSettings.DataPath, CConfig.ProfileFolders[0], "snapshot");
             int i = 0;
             while (File.Exists(filename + i + ".png"))
                 i++;
@@ -339,13 +354,12 @@ namespace Vocaluxe.Screens
             _Snapshot.Save(filename, ImageFormat.Png);
 
             _Snapshot = null;
-            CWebcam.Stop();
             CDraw.RemoveTexture(ref _WebcamTexture);
 
             _Buttons[_ButtonSaveSnapshot].Visible = false;
             _Buttons[_ButtonDiscardSnapshot].Visible = false;
             _Buttons[_ButtonTakeSnapshot].Visible = false;
-            _Buttons[_ButtonWebcam].Visible = true;
+            _Buttons[_ButtonWebcam].Visible = CWebcam.IsDeviceAvailable();
 
             int id = CProfiles.NewAvatar(filename);
             CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].ValueIndex, id);
@@ -354,9 +368,13 @@ namespace Vocaluxe.Screens
 
         private void _OnWebcam()
         {
+            if (!CWebcam.IsDeviceAvailable())
+            {
+                _Buttons[_ButtonWebcam].Visible = false;
+                return;
+            }
             _Snapshot = null;
             CWebcam.Start();
-            CWebcam.GetFrame(ref _WebcamTexture);
             _Buttons[_ButtonSaveSnapshot].Visible = false;
             _Buttons[_ButtonDiscardSnapshot].Visible = false;
             _Buttons[_ButtonTakeSnapshot].Visible = true;
@@ -449,7 +467,7 @@ namespace Vocaluxe.Screens
                 foreach (CAvatar avatar in avatars)
                 {
                     _SelectSlides[_SelectSlideAvatars].AddValue(
-                        Path.GetFileName(avatar.FileName),
+                        avatar.GetDisplayName(),
                         null,
                         avatar.ID,
                         -1);
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 4eb21fbd..d39a6202 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -235,7 +235,7 @@ namespace Vocaluxe.Screens
                     case Keys.W:
                         if (CWebcam.IsDeviceAvailable())
                         {
-                            _Webcam = !_Webcam;
+                            _Webcam = !CWebcam.IsCapturing();
                             if (_Webcam)
                                 CWebcam.Start();
                             else
@@ -258,11 +258,8 @@ namespace Vocaluxe.Screens
                     case Keys.PageUp:
                         if (keyEvent.ModShift)
                         {
-                            CConfig.GameMusicVolume = CConfig.GameMusicVolume + 5;
-                            if (CConfig.GameMusicVolume > 100)
-                                CConfig.GameMusicVolume = 100;
-                            CConfig.SaveConfig();
-                            ApplyVolume();
+                            CConfig.GameMusicVolume += 5;
+                            CSound.SetGlobalVolume(CConfig.GameMusicVolume);
                         }
                         break;
 
@@ -270,11 +267,8 @@ namespace Vocaluxe.Screens
                     case Keys.PageDown:
                         if (keyEvent.ModShift)
                         {
-                            CConfig.GameMusicVolume = CConfig.GameMusicVolume - 5;
-                            if (CConfig.GameMusicVolume < 0)
-                                CConfig.GameMusicVolume = 0;
-                            CConfig.SaveConfig();
-                            ApplyVolume();
+                            CConfig.GameMusicVolume -= 5;
+                            CSound.SetGlobalVolume(CConfig.GameMusicVolume);
                         }
                         break;
                 }
@@ -441,6 +435,7 @@ namespace Vocaluxe.Screens
 
             CBackgroundMusic.Disabled = true;
             _CloseSong();
+            CSound.SetGlobalVolume(CConfig.GameMusicVolume);
         }
 
         public override void OnShowFinish()
@@ -449,7 +444,6 @@ namespace Vocaluxe.Screens
 
             CGame.Start();
             _LoadNextSong();
-            CBackgroundMusic.Disabled = true;
         }
 
         public override bool Draw()
@@ -540,23 +534,21 @@ namespace Vocaluxe.Screens
         public override void OnClose()
         {
             base.OnClose();
-            CBackgroundMusic.Disabled = false;
+            _CloseSong();
             if (_Webcam)
                 CWebcam.Stop();
-            _CloseSong();
-        }
-
-        public override void ApplyVolume()
-        {
-            if (_CurrentStream > -1)
-                CSound.SetStreamVolumeMax(_CurrentStream, CConfig.GameMusicVolume);
+            CBackgroundMusic.Disabled = false;
+            CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
         }
 
         private void _CloseSong()
         {
             if (_CurrentStream > -1)
+            {
                 CSound.FadeAndClose(_CurrentStream, 0f, 0.5f);
-            CSound.RecordStop();
+                _CurrentStream = -1;
+            }
+            CRecord.Stop();
             if (_CurrentVideo != -1)
             {
                 CVideo.Close(_CurrentVideo);
@@ -577,7 +569,6 @@ namespace Vocaluxe.Screens
             _Texts[_TextSongName].Text = String.Empty;
             _Texts[_TextDuetName1].Text = String.Empty;
             _Texts[_TextDuetName2].Text = String.Empty;
-            GC.Collect();
         }
 
         private void _LoadNextSong()
@@ -606,8 +597,7 @@ namespace Vocaluxe.Screens
                 songname += " (" + CGame.RoundNr + "/" + rounds + ")";
             _Texts[_TextSongName].Text = songname;
 
-            _CurrentStream = CSound.Load(song.GetMP3(), true);
-            CSound.SetStreamVolumeMax(_CurrentStream, CConfig.GameMusicVolume);
+            _CurrentStream = CSound.Load(song.GetMP3(), false, true);
             CSound.SetStreamVolume(_CurrentStream, _Volume);
             CSound.SetPosition(_CurrentStream, song.Start);
             _CurrentTime = song.Start;
@@ -639,7 +629,6 @@ namespace Vocaluxe.Screens
                 _SlideShow = GetNewBackground();
                 foreach (string bgFile in song.BackgroundFileNames)
                     _SlideShow.AddSlideShowTexture(Path.Combine(song.Folder, bgFile));
-                _Background = null;
             }
             else if (song.BackgroundFileNames.Count == 1)
             {
@@ -738,7 +727,7 @@ namespace Vocaluxe.Screens
         {
             _PrepareTimeLine();
             CSound.Play(_CurrentStream);
-            CSound.RecordStart();
+            CRecord.Start();
             if (_Webcam)
                 CWebcam.Start();
         }
@@ -758,7 +747,7 @@ namespace Vocaluxe.Screens
             CParty.FinishedSinging();
 
             if (_Webcam)
-                CWebcam.Close();
+                CWebcam.Stop();
         }
 
         private int _FindCurrentLine(CVoice voice, CSongLine[] lines, CSong song)
diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 50043dc4..996f427c 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -148,8 +148,6 @@ namespace Vocaluxe.Screens
             _Playlists[_Playlist].Init();
 
             _AvailableGameModes.Clear();
-
-            ApplyVolume();
         }
 
         public override bool HandleInput(SKeyEvent keyEvent)
@@ -365,21 +363,23 @@ namespace Vocaluxe.Screens
                 }
             }
 
+            int volumeDiff = 0;
             if (keyEvent.ModShift && (keyEvent.Key == Keys.Add || keyEvent.Key == Keys.PageUp))
-            {
-                CConfig.PreviewMusicVolume = CConfig.PreviewMusicVolume + 5;
-                if (CConfig.PreviewMusicVolume > 100)
-                    CConfig.PreviewMusicVolume = 100;
-                CConfig.SaveConfig();
-                ApplyVolume();
-            }
+                volumeDiff = 5;
             else if (keyEvent.ModShift && (keyEvent.Key == Keys.Subtract || keyEvent.Key == Keys.PageDown))
+                volumeDiff = -5;
+            if (volumeDiff != 0)
             {
-                CConfig.PreviewMusicVolume = CConfig.PreviewMusicVolume - 5;
-                if (CConfig.PreviewMusicVolume < 0)
-                    CConfig.PreviewMusicVolume = 0;
-                CConfig.SaveConfig();
-                ApplyVolume();
+                if (CSongs.IsInCategory)
+                {
+                    CConfig.PreviewMusicVolume += volumeDiff;
+                    CSound.SetGlobalVolume(CConfig.PreviewMusicVolume);
+                }
+                else
+                {
+                    CConfig.BackgroundMusicVolume += volumeDiff;
+                    CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
+                }
             }
 
             return true;
@@ -643,6 +643,8 @@ namespace Vocaluxe.Screens
             _Playlists[_Playlist].DragAndDropSongID = -1;
 
             UpdateGame();
+            if (CSongs.IsInCategory)
+                CSound.SetGlobalVolume(CConfig.PreviewMusicVolume);
         }
 
         public override bool UpdateGame()
@@ -700,14 +702,10 @@ namespace Vocaluxe.Screens
         {
             base.OnClose();
             CBackgroundMusic.Disabled = false;
+            CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
             _SongMenus[_SongMenu].OnHide();
         }
 
-        public override void ApplyVolume()
-        {
-            _SongMenus[_SongMenu].ApplyVolume(CConfig.PreviewMusicVolume);
-        }
-
         private void _HandlePartySongSelection(int songNr)
         {
             if ((CSongs.Category >= 0) && (songNr >= 0))
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 1b5d5b87..f18b3b11 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -199,6 +199,10 @@
     <Reference Include="OpenTK.GLControl">
       <HintPath>..\Output\OpenTK.GLControl.dll</HintPath>
     </Reference>
+    <Reference Include="PortAudioSharp, Version=0.19.3.27472, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Output\PortAudioSharp.dll</HintPath>
+    </Reference>
     <Reference Include="QRCoder, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Output\QRCoder.dll</HintPath>
@@ -212,14 +216,30 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Base\CBackgroundMusic.cs" />
-    <Compile Include="Lib\Sound\CBuffer.cs" />
+    <Compile Include="Base\CPlaylistElement.cs" />
+    <Compile Include="Base\CRecord.cs" />
+    <Compile Include="COSFunctions.cs" />
+    <Compile Include="Lib\Database\CCoverDB.cs" />
+    <Compile Include="Lib\Database\CDatabaseBase.cs" />
+    <Compile Include="Lib\Database\CHighscoreDB.cs" />
+    <Compile Include="Lib\Database\CResourceDB.cs" />
+    <Compile Include="Lib\Sound\Playback\CAudioStreamBase.cs" />
+    <Compile Include="Lib\Sound\Playback\CPlaybackBase.cs" />
+    <Compile Include="Lib\Sound\Playback\CRingBuffer.cs" />
+    <Compile Include="Lib\Sound\Playback\GstreamerSharp\CGstreamerSharpAudioStream.cs" />
+    <Compile Include="Lib\Sound\Playback\IAudioStream.cs" />
+    <Compile Include="Lib\Sound\Playback\OpenAL\COpenAlStream.cs" />
+    <Compile Include="Lib\Sound\Playback\PortAudio\CPortAudioStream.cs" />
+    <Compile Include="Lib\Sound\CPortAudioHandle.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\CAnalyzer.cs" />
+    <Compile Include="Lib\Sound\Record\CBuffer.cs" />
     <Compile Include="Base\CConfig.cs" />
     <Compile Include="Base\CCover.cs" />
     <Compile Include="Base\CCursor.cs" />
     <Compile Include="Base\CDataBase.cs" />
     <Compile Include="Base\CDraw.cs" />
-    <Compile Include="Lib\Sound\CPt1.cs" />
-    <Compile Include="Lib\Sound\CSyncTimer.cs" />
+    <Compile Include="Lib\Sound\Playback\PortAudio\CPt1.cs" />
+    <Compile Include="Lib\Sound\Playback\PortAudio\CSyncTimer.cs" />
     <Compile Include="Base\Fonts\CFont.cs" />
     <Compile Include="Base\CGame.cs" />
     <Compile Include="Base\CController.cs" />
@@ -252,11 +272,24 @@
     <Compile Include="GameModes\CGameMode.cs" />
     <Compile Include="GameModes\CGameModes.cs" />
     <Compile Include="Lib\Input\CControllerFramework.cs" />
-    <Compile Include="Lib\Sound\CGstreamerSharpAudio.cs" />
+    <Compile Include="Lib\Sound\Playback\GstreamerSharp\CGstreamerSharpAudio.cs" />
+    <Compile Include="Lib\Sound\Record\CRecordBase.cs" />
+    <Compile Include="Lib\Sound\Record\DirectSound\CSampleDataEventArgs.cs" />
+    <Compile Include="Lib\Sound\Record\DirectSound\CSoundCardSource.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\CPitchTrackerTest.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\CPtAKF.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\CPtDyWa.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\CPtSharp.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\IPitchTracker.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\Pitch\CircularBuffer.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\Pitch\Extensions.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\Pitch\IIRFilter.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\Pitch\PitchDsp.cs" />
+    <Compile Include="Lib\Sound\Record\PitchTracker\Pitch\PitchTracker.cs" />
     <Compile Include="Lib\Video\Acinerella\CDecoder.cs" />
     <Compile Include="Lib\Video\Acinerella\CDecoderThread.cs" />
     <Compile Include="Lib\Video\Acinerella\CFramebuffer.cs" />
-    <Compile Include="Lib\Sound\CDelayTest.cs" />
+    <Compile Include="Lib\Sound\Record\CDelayTest.cs" />
     <Compile Include="Screens\CPopupScreenServerQR.cs" />
     <Compile Include="Screens\CScreenOptionsVideoAdjustments.cs" />
     <Compile Include="SongQueue\CSongQueue.cs" />
@@ -278,21 +311,17 @@
     <Compile Include="Lib\Input\WiiMote\CWiiMote.cs" />
     <Compile Include="Lib\Input\WiiMote\WiiMoteLib.cs" />
     <Compile Include="Lib\Playlist\CPlaylistFile.cs" />
-    <Compile Include="Lib\Sound\CDirectSoundRecord.cs" />
-    <Compile Include="Lib\Sound\CGstreamerAudio.cs" />
-    <Compile Include="Lib\Sound\COpenALPlay.cs" />
+    <Compile Include="Lib\Sound\Record\DirectSound\CDirectSoundRecord.cs" />
+    <Compile Include="Lib\Sound\Playback\OpenAL\COpenALPlay.cs" />
     <Compile Include="Base\CSound.cs" />
-    <Compile Include="Lib\Sound\CPortAudioPlay.cs" />
-    <Compile Include="Lib\Sound\CPortAudioRecord.cs" />
-    <Compile Include="Lib\Sound\Decoder\CAudioDecoderFFmpeg.cs" />
-    <Compile Include="Lib\Sound\Decoder\IAudioDecoder.cs" />
-    <Compile Include="Lib\Sound\Gstreamer\CGstreamerAudioWrapper.cs" />
-    <Compile Include="Lib\Sound\IPlayback.cs" />
-    <Compile Include="Lib\Sound\IRecord.cs" />
+    <Compile Include="Lib\Sound\Playback\PortAudio\CPortAudioPlay.cs" />
+    <Compile Include="Lib\Sound\Record\PortAudio\CPortAudioRecord.cs" />
+    <Compile Include="Lib\Sound\Playback\Decoder\CAudioDecoderFFmpeg.cs" />
+    <Compile Include="Lib\Sound\Playback\Decoder\IAudioDecoder.cs" />
+    <Compile Include="Lib\Sound\Playback\IPlayback.cs" />
+    <Compile Include="Lib\Sound\Record\IRecord.cs" />
     <Compile Include="Lib\Video\Acinerella\CAcinerella.cs" />
     <Compile Include="Lib\Video\CVideoDecoderFFmpeg.cs" />
-    <Compile Include="Lib\Video\CVideoDecoderGstreamer.cs" />
-    <Compile Include="Lib\Video\Gstreamer\CGstreamerVideoWrapper.cs" />
     <Compile Include="Lib\Video\IVideoDecoder.cs" />
     <Compile Include="Lib\Webcam\CAForgeNet.cs" />
     <Compile Include="Lib\Webcam\IWebcam.cs" />
@@ -322,7 +351,6 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
-    <Compile Include="Lib\Sound\PortAudio\PortAudio.cs" />
     <None Include="Doc\SQLite.NET.chm" />
     <Content Include="Website\locales\de.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/VocaluxeLib/CFading.cs b/VocaluxeLib/CFading.cs
index 0b6761cb..e66c10db 100644
--- a/VocaluxeLib/CFading.cs
+++ b/VocaluxeLib/CFading.cs
@@ -43,7 +43,7 @@ namespace VocaluxeLib
         }
 
         /// <summary>
-        /// Gets the current value and sets finished
+        ///     Gets the current value and sets finished
         /// </summary>
         /// <param name="finished">Set to whether fading has finished</param>
         /// <returns>Current value (between from and to values)</returns>
diff --git a/VocaluxeLib/CHelper.cs b/VocaluxeLib/CHelper.cs
index a03b1ad9..9d37b818 100644
--- a/VocaluxeLib/CHelper.cs
+++ b/VocaluxeLib/CHelper.cs
@@ -26,6 +26,22 @@ namespace VocaluxeLib
 {
     public static class CHelper
     {
+        private static readonly List<string> _SoundFileTypes = new List<string>
+            {
+                "*.mp3",
+                "*.wma",
+                "*.ogg",
+                "*.wav"
+            };
+
+        private static readonly List<string> _ImageFileTypes = new List<string>
+            {
+                "*.jpg",
+                "*.jpeg",
+                "*.png",
+                "*.gif"
+            };
+
         public static int CombinationCount(int n, int k)
         {
             if (k > n)
@@ -61,7 +77,7 @@ namespace VocaluxeLib
         /// </summary>
         public static string ListStrings(string[] str)
         {
-            string result = string.Empty;
+            string result = String.Empty;
             for (int i = 0; i < str.Length; i++)
             {
                 result += str[i];
@@ -95,7 +111,7 @@ namespace VocaluxeLib
                 return 0;
             }
             int result;
-            return int.TryParse(value, out result) ? result : 0;
+            return Int32.TryParse(value, out result) ? result : 0;
         }
 
         public static void SetRect(RectangleF bounds, out RectangleF rect, float rectAspect, EAspect aspect)
@@ -145,7 +161,15 @@ namespace VocaluxeLib
             rect = new RectangleF(left, upper, scaledWidth, scaledHeight);
         }
 
-        public static List<string> ListFiles(string path, string cast, bool recursive = false, bool fullpath = false)
+        /// <summary>
+        ///     Returns a list with all files in the given path that match a given pattern
+        /// </summary>
+        /// <param name="path">Path to search for</param>
+        /// <param name="searchPattern">Pattern to match (e.g. "*.jpg")</param>
+        /// <param name="recursive">Search directories recursively</param>
+        /// <param name="fullpath">False for just file names, True for full path</param>
+        /// <returns>List of file names</returns>
+        public static List<string> ListFiles(string path, string searchPattern, bool recursive = false, bool fullpath = false)
         {
             var files = new List<string>();
             var dir = new DirectoryInfo(path);
@@ -155,14 +179,14 @@ namespace VocaluxeLib
             try
             {
                 // ReSharper disable LoopCanBeConvertedToQuery
-                foreach (FileInfo file in dir.GetFiles(cast))
+                foreach (FileInfo file in dir.GetFiles(searchPattern))
                     // ReSharper restore LoopCanBeConvertedToQuery
                     files.Add(!fullpath ? file.Name : file.FullName);
 
                 if (recursive)
                 {
                     foreach (DirectoryInfo di in dir.GetDirectories())
-                        files.AddRange(ListFiles(di.FullName, cast, true, fullpath));
+                        files.AddRange(ListFiles(di.FullName, searchPattern, true, fullpath));
                 }
             }
             catch (Exception) {}
@@ -170,6 +194,47 @@ namespace VocaluxeLib
             return files;
         }
 
+        /// <summary>
+        ///     Returns a list with all files in the given path that matches at least one of the given patterns
+        /// </summary>
+        /// <param name="path">Path to search for</param>
+        /// <param name="searchPatterns">List of patterns to match</param>
+        /// <param name="recursive">Search directories recursively</param>
+        /// <param name="fullpath">False for just file names, True for full path</param>
+        /// <returns>List of file names</returns>
+        public static List<string> ListFiles(string path, IEnumerable<string> searchPatterns, bool recursive = false, bool fullpath = false)
+        {
+            var files = new List<string>();
+            foreach (string pattern in searchPatterns)
+                files.AddRange(ListFiles(path, pattern, recursive, fullpath));
+
+            return files;
+        }
+
+        /// <summary>
+        ///     Returns a list with all image files in the given path
+        /// </summary>
+        /// <param name="path">Path to search for</param>
+        /// <param name="recursive">Search directories recursively</param>
+        /// <param name="fullpath">False for just file names, True for full path</param>
+        /// <returns>List of image file names</returns>
+        public static List<string> ListImageFiles(string path, bool recursive = false, bool fullpath = false)
+        {
+            return ListFiles(path, _ImageFileTypes, recursive, fullpath);
+        }
+
+        /// <summary>
+        ///     Returns a list with all image files in the given path
+        /// </summary>
+        /// <param name="path">Path to search for</param>
+        /// <param name="recursive">Search directories recursively</param>
+        /// <param name="fullpath">False for just file names, True for full path</param>
+        /// <returns>List of image file names</returns>
+        public static List<string> ListSoundFiles(string path, bool recursive = false, bool fullpath = false)
+        {
+            return ListFiles(path, _SoundFileTypes, recursive, fullpath);
+        }
+
         public static bool TryParse<T>(string value, out T result, bool ignoreCase = false)
             where T : struct
         {
@@ -187,7 +252,7 @@ namespace VocaluxeLib
         public static bool TryParse(string value, out float result)
         {
             value = value.Replace(',', '.');
-            return float.TryParse(value, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, NumberFormatInfo.InvariantInfo, out result);
+            return Single.TryParse(value, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, NumberFormatInfo.InvariantInfo, out result);
         }
 
         public static bool IsInBounds(SRectF bounds, SMouseEvent mouseEvent)
diff --git a/VocaluxeLib/Enums.cs b/VocaluxeLib/Enums.cs
index 5ac45bd3..0df1d888 100644
--- a/VocaluxeLib/Enums.cs
+++ b/VocaluxeLib/Enums.cs
@@ -144,7 +144,6 @@ namespace VocaluxeLib
     {
         PortAudio,
         OpenAL,
-        Gstreamer,
         GstreamerSharp
     }
 
@@ -164,8 +163,7 @@ namespace VocaluxeLib
 
     public enum EVideoDecoder
     {
-        FFmpeg,
-        Gstreamer
+        FFmpeg
     }
 
     public enum ESongMenu
@@ -189,7 +187,6 @@ namespace VocaluxeLib
     {
         // ReSharper disable InconsistentNaming
         TR_CONFIG_NONE,
-        //TR_CONFIG_RANDOM,
         TR_CONFIG_FOLDER,
         TR_CONFIG_ARTIST,
         TR_CONFIG_ARTIST_LETTER,
@@ -291,7 +288,7 @@ namespace VocaluxeLib
     }
     #endregion Config
 
-    public enum EGameState
+    public enum EProgramState
     {
         Start,
         Normal,
diff --git a/VocaluxeLib/IBasic.cs b/VocaluxeLib/IBasic.cs
index 334221a0..739bbdf7 100644
--- a/VocaluxeLib/IBasic.cs
+++ b/VocaluxeLib/IBasic.cs
@@ -71,7 +71,7 @@ namespace VocaluxeLib
         float GetZFar();
         float GetZNear();
 
-        EGameState GetGameState();
+        EProgramState GetProgramState();
 
         int GetToneMin();
         int GetToneMax();
@@ -124,8 +124,6 @@ namespace VocaluxeLib
         void Pause();
         void Play();
 
-        void ApplyVolume();
-
         CTexture GetVideoTexture();
     }
 
@@ -211,6 +209,7 @@ namespace VocaluxeLib
         EGameDifficulty GetDifficulty(int profileID);
         string GetPlayerName(int profileID, int playerNum = 0);
         CTexture GetAvatar(int profileID);
+        CAvatar GetAvatarByFilename(string fileName);
         bool IsProfileIDValid(int profileID);
         bool IsGuest(int profileID);
         void AddProfileChangedCallback(ProfileChangedCallback notification);
@@ -257,7 +256,7 @@ namespace VocaluxeLib
 
     public interface ISound
     {
-        int Load(string soundFile, bool prescan);
+        int Load(string soundFile, bool loop = false, bool prescan = false);
         void SetPosition(int soundStream, float newPosition);
         void Play(int soundStream);
         void Fade(int soundStream, float targetVolume, float duration);
@@ -265,10 +264,9 @@ namespace VocaluxeLib
         bool IsFinished(int soundStream);
         float GetPosition(int soundStream);
         float GetLength(int soundStream);
-        void FadeAndStop(int soundStream, float targetVolume, float duration);
+        void FadeAndClose(int soundStream, float targetVolume, float duration);
 
         void SetStreamVolume(int soundStream, float volume);
-        void SetStreamVolumeMax(int soundStream, float maxVolume);
     }
 
     public interface ICover
@@ -279,7 +277,7 @@ namespace VocaluxeLib
     public interface IDataBase
     {
         bool GetCover(string fileName, ref CTexture texture, int coverSize);
-        bool GetDataBaseSongInfos(string artist, string title, out int numPlayed, out string dateAdded, out int highscoreID);
+        bool GetDataBaseSongInfos(string artist, string title, out int numPlayed, out DateTime dateAdded, out int highscoreID);
     }
 
     public interface IControllers
diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs
index 7a9726ec..1a9a8a49 100644
--- a/VocaluxeLib/Menu/CButton.cs
+++ b/VocaluxeLib/Menu/CButton.cs
@@ -276,7 +276,7 @@ namespace VocaluxeLib.Menu
 
         public void Draw(bool forceDraw = false)
         {
-            if (!Visible && CBase.Settings.GetGameState() != EGameState.EditTheme && !forceDraw)
+            if (!Visible && CBase.Settings.GetProgramState() != EProgramState.EditTheme && !forceDraw)
                 return;
 
             CTexture texture;
diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs
index 5d75a478..83bb74c0 100644
--- a/VocaluxeLib/Menu/CEqualizer.cs
+++ b/VocaluxeLib/Menu/CEqualizer.cs
@@ -22,7 +22,7 @@ namespace VocaluxeLib.Menu
 {
     enum EEqualizerStyle
     {
-        Collums
+        Columns
     }
 
     struct SThemeEqualizer
@@ -64,6 +64,8 @@ namespace VocaluxeLib.Menu
         }
 
         private float[] _Bars;
+        private int _MaxBar;
+        private float _MaxVolume;
 
         public CEqualizer(int partyModeID)
         {
@@ -211,17 +213,35 @@ namespace VocaluxeLib.Menu
             return false;
         }
 
-        public void Update(float[] weights)
+        public void Update(float[] weights, float volume)
         {
             if (weights == null || weights.Length == 0 || _Bars == null)
                 return;
+            if (volume < 0.001)
+            {
+                for (int i = 0; i < _Bars.Length; i++)
+                    _Bars[i] = 0f;
+                return;
+            }
+            if (volume > _MaxVolume)
+                _MaxVolume = volume;
+            _MaxBar = 0;
+            float maxVal = -99f;
             for (int i = 0; i < _Bars.Length; i++)
             {
-                if (weights.Length > i)
+                if (i < weights.Length)
                 {
-                    _Bars[i] = 1f - weights[i];
                     if (_Theme.DrawNegative == EOffOn.TR_CONFIG_OFF && weights[i] < 0)
-                        _Bars[i] = 1f + weights[i];
+                        _Bars[i] = 0f;
+                    else
+                    {
+                        _Bars[i] = weights[i] * volume / _MaxVolume;
+                        if (_Bars[i] > maxVal)
+                        {
+                            maxVal = _Bars[i];
+                            _MaxBar = i;
+                        }
+                    }
                 }
                 else
                     _Bars[i] = 0f;
@@ -235,30 +255,24 @@ namespace VocaluxeLib.Menu
 
             for (int i = 0; i < _Bars.Length; i++)
                 _Bars[i] = 0f;
+            _MaxBar = 0;
+            _MaxVolume = 0f;
         }
 
         public void Draw()
         {
-            if (_Bars == null || _Theme.Style != EEqualizerStyle.Collums)
+            if (_Bars == null || _Theme.Style != EEqualizerStyle.Columns)
                 return;
 
             float dx = Rect.W / _Bars.Length;
-            int max = _Bars.Length - 1;
-            float maxB = _Bars[max];
-            for (int i = 0; i < _Bars.Length - 1; i++)
-            {
-                if (_Bars[i] > maxB)
-                {
-                    maxB = _Bars[i];
-                    max = i;
-                }
-            }
+            float scaleVal = (_Bars[_MaxBar] < 0.00001f) ? 0f : 1 / _Bars[_MaxBar];
 
             for (int i = 0; i < _Bars.Length; i++)
             {
-                var bar = new SRectF(Rect.X + dx * i, Rect.Y + Rect.H - _Bars[i] * Rect.H, dx - Space, _Bars[i] * Rect.H, Rect.Z);
+                float value = _Bars[i] * scaleVal;
+                var bar = new SRectF(Rect.X + dx * i, Rect.Y + Rect.H - value * Rect.H, dx - Space, value * Rect.H, Rect.Z);
                 SColorF color = Color;
-                if (i == max)
+                if (i == _MaxBar)
                     color = MaxColor;
 
                 CBase.Drawing.DrawColor(color, bar);
diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs
index a1c72daa..68b26136 100644
--- a/VocaluxeLib/Menu/CLyric.cs
+++ b/VocaluxeLib/Menu/CLyric.cs
@@ -224,7 +224,7 @@ namespace VocaluxeLib.Menu
         #region draw
         public void Draw(float actualBeat)
         {
-            if (Visible || CBase.Settings.GetGameState() == EGameState.EditTheme)
+            if (Visible || CBase.Settings.GetProgramState() == EProgramState.EditTheme)
             {
                 switch (LyricStyle)
                 {
diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs
index c64c9400..af2e5443 100644
--- a/VocaluxeLib/Menu/CMenu.cs
+++ b/VocaluxeLib/Menu/CMenu.cs
@@ -968,7 +968,7 @@ namespace VocaluxeLib.Menu
             float z = CBase.Settings.GetZFar();
             for (int i = 0; i < _Interactions.Count; i++)
             {
-                if ((CBase.Settings.GetGameState() != EGameState.EditTheme) && (_Interactions[i].ThemeEditorOnly || !_IsVisible(i) || !_IsEnabled(i)))
+                if ((CBase.Settings.GetProgramState() != EProgramState.EditTheme) && (_Interactions[i].ThemeEditorOnly || !_IsVisible(i) || !_IsEnabled(i)))
                     continue;
                 if (!_IsMouseOver(x, y, _Interactions[i]))
                     continue;
@@ -1043,7 +1043,7 @@ namespace VocaluxeLib.Menu
         private void _NextInteraction()
         {
             _UnsetSelected();
-            if (CBase.Settings.GetGameState() != EGameState.EditTheme)
+            if (CBase.Settings.GetProgramState() != EProgramState.EditTheme)
             {
                 bool found = false;
                 int start = _Selection;
@@ -1070,7 +1070,7 @@ namespace VocaluxeLib.Menu
         private void _PrevInteraction()
         {
             _UnsetSelected();
-            if (CBase.Settings.GetGameState() != EGameState.EditTheme)
+            if (CBase.Settings.GetProgramState() != EProgramState.EditTheme)
             {
                 bool found = false;
                 int start = _Selection;
diff --git a/VocaluxeLib/Menu/CObjectInteractions.cs b/VocaluxeLib/Menu/CObjectInteractions.cs
index 57d86b00..791412d8 100644
--- a/VocaluxeLib/Menu/CObjectInteractions.cs
+++ b/VocaluxeLib/Menu/CObjectInteractions.cs
@@ -470,7 +470,7 @@ namespace VocaluxeLib.Menu
             float z = CBase.Settings.GetZFar();
             for (int i = 0; i < _Interactions.Count; i++)
             {
-                if ((CBase.Settings.GetGameState() == EGameState.EditTheme) || (!_Interactions[i].ThemeEditorOnly && _IsVisible(i) && _IsEnabled(i)))
+                if ((CBase.Settings.GetProgramState() == EProgramState.EditTheme) || (!_Interactions[i].ThemeEditorOnly && _IsVisible(i) && _IsEnabled(i)))
                 {
                     if (_IsMouseOver(x, y, _Interactions[i]))
                     {
@@ -553,7 +553,7 @@ namespace VocaluxeLib.Menu
         private void _NextInteraction()
         {
             _UnsetSelected();
-            if (CBase.Settings.GetGameState() != EGameState.EditTheme)
+            if (CBase.Settings.GetProgramState() != EProgramState.EditTheme)
             {
                 bool found = false;
                 int start = _Selection;
@@ -580,7 +580,7 @@ namespace VocaluxeLib.Menu
         private void _PrevInteraction()
         {
             _UnsetSelected();
-            if (CBase.Settings.GetGameState() != EGameState.EditTheme)
+            if (CBase.Settings.GetProgramState() != EProgramState.EditTheme)
             {
                 bool found = false;
                 int start = _Selection;
diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs
index 1610fd52..1e71a262 100644
--- a/VocaluxeLib/Menu/CPlaylist.cs
+++ b/VocaluxeLib/Menu/CPlaylist.cs
@@ -416,7 +416,7 @@ namespace VocaluxeLib.Menu
         {
             if (_PlaylistElements.Count <= 0)
                 LoadPlaylist(0);
-            if (!Visible && CBase.Settings.GetGameState() != EGameState.EditTheme && !forceDraw)
+            if (!Visible && CBase.Settings.GetProgramState() != EProgramState.EditTheme && !forceDraw)
                 return;
 
             for (int i = 0; i < _PlaylistElements.Count; i++)
diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs
index 93d0bea3..039533f4 100644
--- a/VocaluxeLib/Menu/CSelectSlide.cs
+++ b/VocaluxeLib/Menu/CSelectSlide.cs
@@ -710,7 +710,7 @@ namespace VocaluxeLib.Menu
 
         public void Draw()
         {
-            if (!Visible && CBase.Settings.GetGameState() != EGameState.EditTheme)
+            if (!Visible && CBase.Settings.GetProgramState() != EProgramState.EditTheme)
                 return;
 
             CTexture texture = CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
@@ -733,7 +733,7 @@ namespace VocaluxeLib.Menu
             else
                 CBase.Drawing.DrawTexture(texture, Rect, Color);
 
-            if (_Selection > 0 || CBase.Settings.GetGameState() == EGameState.EditTheme)
+            if (_Selection > 0 || CBase.Settings.GetProgramState() == EProgramState.EditTheme)
             {
                 if (_ArrowLeftSelected)
                     CBase.Drawing.DrawTexture(selTextureArrowLeft, RectArrowLeft, SelColorArrow);
@@ -741,7 +741,7 @@ namespace VocaluxeLib.Menu
                     CBase.Drawing.DrawTexture(textureArrowLeft, RectArrowLeft, ColorArrow);
             }
 
-            if (_Selection < _ValueNames.Count - 1 || CBase.Settings.GetGameState() == EGameState.EditTheme)
+            if (_Selection < _ValueNames.Count - 1 || CBase.Settings.GetProgramState() == EProgramState.EditTheme)
             {
                 if (_ArrowRightSelected)
                     CBase.Drawing.DrawTexture(selTextureArrowRight, RectArrowRight, SelColorArrow);
diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs
index 5051abe7..24b9b56c 100644
--- a/VocaluxeLib/Menu/CStatic.cs
+++ b/VocaluxeLib/Menu/CStatic.cs
@@ -227,14 +227,14 @@ namespace VocaluxeLib.Menu
             }
 
             var color = new SColorF(Color.R, Color.G, Color.B, Color.A * Alpha);
-            if (Visible || forceDraw || (CBase.Settings.GetGameState() == EGameState.EditTheme))
+            if (Visible || forceDraw || (CBase.Settings.GetProgramState() == EProgramState.EditTheme))
             {
                 CBase.Drawing.DrawTexture(texture, rect, color, bounds);
                 if (Reflection)
                     CBase.Drawing.DrawTextureReflection(texture, rect, color, bounds, ReflectionSpace, ReflectionHeight);
             }
 
-            if (Selected && (CBase.Settings.GetGameState() == EGameState.EditTheme))
+            if (Selected && (CBase.Settings.GetProgramState() == EProgramState.EditTheme))
                 CBase.Drawing.DrawColor(new SColorF(1f, 1f, 1f, 0.5f), rect);
         }
 
diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs
index 94c2c01c..711cc930 100644
--- a/VocaluxeLib/Menu/CText.cs
+++ b/VocaluxeLib/Menu/CText.cs
@@ -457,7 +457,7 @@ namespace VocaluxeLib.Menu
 
         public void Draw(bool forceDraw = false)
         {
-            if (!forceDraw && !Visible && CBase.Settings.GetGameState() != EGameState.EditTheme)
+            if (!forceDraw && !Visible && CBase.Settings.GetProgramState() != EProgramState.EditTheme)
                 return;
 
             // Update Text
@@ -474,7 +474,7 @@ namespace VocaluxeLib.Menu
             if (ReflectionHeight > 0)
                 CBase.Fonts.DrawTextReflection(_Text, Rect.H, Rect.X, Rect.Y, Z, color, ReflectionSpace, ReflectionHeight);
 
-            if (Selected && (CBase.Settings.GetGameState() == EGameState.EditTheme))
+            if (Selected && (CBase.Settings.GetProgramState() == EProgramState.EditTheme))
                 CBase.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f), new SRectF(Rect.X, Rect.Y, Rect.W, Rect.H, Z));
         }
 
@@ -493,7 +493,7 @@ namespace VocaluxeLib.Menu
                 // TODO
             }
 
-            if (Selected && (CBase.Settings.GetGameState() == EGameState.EditTheme))
+            if (Selected && (CBase.Settings.GetProgramState() == EProgramState.EditTheme))
                 CBase.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f), new SRectF(X, Y, Rect.W, Rect.H, Z));
         }
 
diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenu.cs b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs
index 964a2ab5..84e729b6 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenu.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs
@@ -81,11 +81,6 @@ namespace VocaluxeLib.Menu.SongMenu
             _SongMenu.Draw();
         }
 
-        public void ApplyVolume(float volumeMax)
-        {
-            _SongMenu.ApplyVolume(volumeMax);
-        }
-
         public bool IsActive()
         {
             return _SongMenu.IsActive();
diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
index 9cdd19dd..7d1f0be2 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
@@ -402,7 +402,6 @@ namespace VocaluxeLib.Menu.SongMenu
         {
             _PreviewSongStream = -1;
             _Vidtex = null;
-            ApplyVolume(CBase.Config.GetPreviewMusicVolume());
         }
 
         public virtual void OnHide()
@@ -423,14 +422,6 @@ namespace VocaluxeLib.Menu.SongMenu
                 CBase.Drawing.DrawTexture(_Vidtex, new SRectF(0, 0, 1280, 720, 0));
         }
 
-        public virtual void ApplyVolume(float volumeMax)
-        {
-            _MaxVolume = volumeMax;
-
-            foreach (int stream in _Streams)
-                CBase.Sound.SetStreamVolumeMax(stream, _MaxVolume);
-        }
-
         public virtual bool IsActive()
         {
             return _Active;
@@ -532,9 +523,8 @@ namespace VocaluxeLib.Menu.SongMenu
                 if (song == null)
                     return;
 
+                //TODO: Using prescan here causes Vocaluxe to hang a bit on loading the song but we need the length below
                 int stream = CBase.Sound.Load(Path.Combine(song.Folder, song.MP3FileName), true);
-                CBase.Sound.SetStreamVolumeMax(stream, _MaxVolume);
-                CBase.Sound.SetStreamVolume(stream, 0f);
 
                 float startposition = song.Preview.StartTime;
                 float length = CBase.Sound.GetLength(stream);
@@ -549,7 +539,7 @@ namespace VocaluxeLib.Menu.SongMenu
 
                 CBase.Sound.SetPosition(stream, startposition);
                 CBase.Sound.Play(stream);
-                CBase.Sound.SetStreamVolumeMax(stream, CBase.Config.GetPreviewMusicVolume());
+                CBase.Sound.SetStreamVolume(stream, 0f);
                 CBase.Sound.Fade(stream, 100f, 3f);
                 _Streams.Add(stream);
                 _PreviewSongStream = stream;
@@ -570,7 +560,7 @@ namespace VocaluxeLib.Menu.SongMenu
         protected void _Reset()
         {
             foreach (int stream in _Streams)
-                CBase.Sound.FadeAndStop(stream, 0f, 0.75f);
+                CBase.Sound.FadeAndClose(stream, 0f, 0.75f);
             _Streams.Clear();
 
             CBase.Video.Close(_PreviewVideoStream);
diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
index 46781018..1fef5094 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
@@ -67,11 +67,11 @@ namespace VocaluxeLib.Menu.SongMenu
         {
             set
             {
-                _PlaySong(value);
-                _PreviewIdInternal = value;
+                if (value == base._PreviewId)
+                    return;
+                base._PreviewId = value;
                 _UpdatePreview();
             }
-            get { return _PreviewIdInternal; }
         }
 
         public override int GetActualSelection()
@@ -137,7 +137,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     _Tiles[i].Selected = _Locked == i + _Offset;
             }
 
-            if (_Length < 0 && CBase.Sound.GetLength(_PreviewSongStream) > 0 && CBase.Songs.IsInCategory())
+            if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.Sound.GetLength(_PreviewSongStream) > 0)
                 _UpdateLength(CBase.Songs.GetVisibleSong(_PreviewId));
         }
 
@@ -215,6 +215,8 @@ namespace VocaluxeLib.Menu.SongMenu
                 _SongLength.Text = min.ToString("00") + ":" + sec.ToString("00");
                 _Length = time;
             }
+            else
+                _SongLength.Text = "...";
         }
 
         public override void OnShow()
@@ -373,8 +375,7 @@ namespace VocaluxeLib.Menu.SongMenu
                 if (!keyEvent.Handled)
                 {
                     _ActualSelection = _Locked;
-                    if (_PreviewId != _Locked)
-                        _PreviewId = _Locked;
+                    _PreviewId = _Locked;
 
                     for (int i = 0; i < _Tiles.Count; i++)
                         _Tiles[i].Selected = _Locked == i + _Offset;
diff --git a/VocaluxeLib/Menu/SongMenu/ISongMenu.cs b/VocaluxeLib/Menu/SongMenu/ISongMenu.cs
index 8d8e82c2..e1ea8998 100644
--- a/VocaluxeLib/Menu/SongMenu/ISongMenu.cs
+++ b/VocaluxeLib/Menu/SongMenu/ISongMenu.cs
@@ -29,8 +29,6 @@ namespace VocaluxeLib.Menu.SongMenu
         void HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions);
         void Draw();
 
-        void ApplyVolume(float volumeMax);
-
         int GetSelectedSong();
         CStatic GetSelectedSongCover();
         void SetSelectedSong(int visibleSongNr);
diff --git a/VocaluxeLib/Profile/CAvatar.cs b/VocaluxeLib/Profile/CAvatar.cs
index 1928c915..1daba02e 100644
--- a/VocaluxeLib/Profile/CAvatar.cs
+++ b/VocaluxeLib/Profile/CAvatar.cs
@@ -15,6 +15,8 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
+using System.Diagnostics;
+using System.IO;
 using VocaluxeLib.Draw;
 
 namespace VocaluxeLib.Profile
@@ -22,36 +24,52 @@ namespace VocaluxeLib.Profile
     public class CAvatar
     {
         public int ID;
-        public string FileName = "";
-        public CTexture Texture;
+        private readonly string _FileName = "";
+        private CTexture _Texture;
+        private const int _MaxNameLen = 12;
 
-        public CAvatar(int id)
+        public CTexture Texture
         {
-            ID = id;
+            get { return _Texture; }
+        }
+        public string FileName
+        {
+            get { return _FileName; }
         }
 
-        public bool LoadFromFile(string fileName)
+        public static CAvatar GetAvatar(string fileName)
         {
-            FileName = fileName;
-            return Reload();
+            CTexture texture = CBase.Drawing.AddTexture(fileName);
+            return texture == null ? null : new CAvatar(texture, fileName);
+        }
+
+        private CAvatar(CTexture texture, string fileName, int id = -1)
+        {
+            _Texture = texture;
+            _FileName = fileName;
+            ID = id;
         }
 
         public bool Reload()
         {
-            CBase.Drawing.RemoveTexture(ref Texture);
-            Texture = CBase.Drawing.AddTexture(FileName);
+            Unload();
+            _Texture = CBase.Drawing.AddTexture(_FileName);
 
-            return Texture != null;
+            return _Texture != null;
         }
 
         public void Unload()
         {
-            CBase.Drawing.RemoveTexture(ref Texture);
+            CBase.Drawing.RemoveTexture(ref _Texture);
         }
 
-        public string GetFileName()
+        public string GetDisplayName()
         {
-            return FileName;
+            string name = Path.GetFileNameWithoutExtension(_FileName);
+            Debug.Assert(name != null);
+            if (name.Length > _MaxNameLen)
+                name = name.Substring(0, _MaxNameLen);
+            return name;
         }
     }
 }
\ No newline at end of file
diff --git a/VocaluxeLib/Profile/CProfile.cs b/VocaluxeLib/Profile/CProfile.cs
index 4e27b4bd..ca8de4d6 100644
--- a/VocaluxeLib/Profile/CProfile.cs
+++ b/VocaluxeLib/Profile/CProfile.cs
@@ -38,22 +38,12 @@ namespace VocaluxeLib.Profile
         public string PlayerName;
         public string FilePath;
         public string FileName;
-        public string AvatarFileName;
         public byte[] PasswordHash;
         public byte[] PasswordSalt;
 
         public EGameDifficulty Difficulty;
 
-        private CAvatar _Avatar;
-        public CAvatar Avatar
-        {
-            get { return _Avatar; }
-            set
-            {
-                _Avatar = value;
-                AvatarFileName = _Avatar.FileName;
-            }
-        }
+        public CAvatar Avatar { get; set; }
 
         public EUserRole UserRole;
         public EOffOn Active;
@@ -62,11 +52,9 @@ namespace VocaluxeLib.Profile
         {
             PlayerName = String.Empty;
             Difficulty = EGameDifficulty.TR_CONFIG_EASY;
-            Avatar = new CAvatar(-1);
             UserRole = EUserRole.TR_USERROLE_NORMAL;
             Active = EOffOn.TR_CONFIG_ON;
 
-            AvatarFileName = String.Empty;
             FileName = String.Empty;
         }
 
@@ -95,9 +83,10 @@ namespace VocaluxeLib.Profile
             if (xmlReader.GetValue("//root/Info/PlayerName", out value, value))
             {
                 PlayerName = value;
-
+                string avatarFileName;
                 xmlReader.TryGetEnumValue("//root/Info/Difficulty", ref Difficulty);
-                xmlReader.GetValue("//root/Info/Avatar", out AvatarFileName, String.Empty);
+                xmlReader.GetValue("//root/Info/Avatar", out avatarFileName, String.Empty);
+                Avatar = CBase.Profiles.GetAvatarByFilename(avatarFileName);
                 xmlReader.TryGetEnumValue("//root/Info/UserRole", ref UserRole);
                 xmlReader.TryGetEnumValue("//root/Info/Active", ref Active);
                 string passwordHash;
diff --git a/VocaluxeLib/Songs/CSong.cs b/VocaluxeLib/Songs/CSong.cs
index c16c1874..26d1d6fd 100644
--- a/VocaluxeLib/Songs/CSong.cs
+++ b/VocaluxeLib/Songs/CSong.cs
@@ -130,6 +130,7 @@ namespace VocaluxeLib.Songs
 
         public string Creator = "";
         public string Version = "";
+        public string Length = ""; //Length set in song file, SHOULD match actual song length but is more a hint
         public string Source = "";
         public readonly List<String> UnknownTags = new List<string>();
 
@@ -172,7 +173,7 @@ namespace VocaluxeLib.Songs
         public readonly List<string> Languages = new List<string>();
 
         public int DataBaseSongID = -1;
-        public string DateAdded = "";
+        public DateTime DateAdded = DateTime.Today;
         public int NumPlayed;
         public int NumPlayedSession;
 
@@ -240,6 +241,7 @@ namespace VocaluxeLib.Songs
 
             Creator = song.Creator;
             Version = song.Version;
+            Length = song.Length;
             Source = song.Source;
             UnknownTags = new List<string>(song.UnknownTags);
 
@@ -318,10 +320,7 @@ namespace VocaluxeLib.Songs
         {
             if (CoverFileName == "")
             {
-                List<string> files = CHelper.ListFiles(Folder, "*.jpg");
-                files.AddRange(CHelper.ListFiles(Folder, "*.jpeg"));
-                files.AddRange(CHelper.ListFiles(Folder, "*.png"));
-                files.AddRange(CHelper.ListFiles(Folder, "*.gif"));
+                List<string> files = CHelper.ListImageFiles(Folder);
                 foreach (String file in files)
                 {
                     if (file.ContainsIgnoreCase("[CO]") &&
@@ -332,10 +331,7 @@ namespace VocaluxeLib.Songs
 
             if (BackgroundFileNames.Count == 0)
             {
-                List<string> files = CHelper.ListFiles(Folder, "*.jpg");
-                files.AddRange(CHelper.ListFiles(Folder, "*.jpeg"));
-                files.AddRange(CHelper.ListFiles(Folder, "*.png"));
-                files.AddRange(CHelper.ListFiles(Folder, "*.gif"));
+                List<string> files = CHelper.ListImageFiles(Folder);
                 foreach (String file in files)
                 {
                     if (file.ContainsIgnoreCase("[BG]") &&
diff --git a/VocaluxeLib/Songs/CSongLoader.cs b/VocaluxeLib/Songs/CSongLoader.cs
index 8c959583..7c18a981 100644
--- a/VocaluxeLib/Songs/CSongLoader.cs
+++ b/VocaluxeLib/Songs/CSongLoader.cs
@@ -192,6 +192,9 @@ namespace VocaluxeLib.Songs
                             case "YOUTUBE":
                                 _Song.Source = value;
                                 break;
+                            case "LENGTH":
+                                _Song.Length = value;
+                                break;
                             case "MP3":
                                 if (File.Exists(Path.Combine(_Song.Folder, value)))
                                 {
diff --git a/VocaluxeLib/Songs/CSongWriter.cs b/VocaluxeLib/Songs/CSongWriter.cs
index 1e3221d8..7d5eb4ca 100644
--- a/VocaluxeLib/Songs/CSongWriter.cs
+++ b/VocaluxeLib/Songs/CSongWriter.cs
@@ -71,6 +71,7 @@ namespace VocaluxeLib.Songs
                     _WriteHeaderEntry("ENCODING", _Song.Encoding.GetEncodingName());
                 _WriteHeaderEntry("CREATOR", _Song.Creator);
                 _WriteHeaderEntry("VERSION", _Song.Version);
+                _WriteHeaderEntry("LENGTH", _Song.Length);
                 _WriteHeaderEntry("SOURCE", _Song.Source);
                 if (!String.IsNullOrEmpty(_Song._Comment))
                 {
@@ -121,6 +122,35 @@ namespace VocaluxeLib.Songs
                     _Tw.WriteLine(addLine);
             }
 
+            /// <summary>
+            ///     Gets a good beat for a line break that is &gt;=firstPossibleBeat and &lt;firstNoteBeat
+            ///     Based on algorithm used by YASS: http://www.yass-along.com/errors.html
+            /// </summary>
+            /// <param name="firstPossibleBeat">First beat that is possible for a line break (equal (just after) previous line note end)</param>
+            /// <param name="firstNoteBeat">First note beat on current line</param>
+            /// <returns>A good beat for the line break</returns>
+            private int _GetBreakBeat(int firstPossibleBeat, int firstNoteBeat)
+            {
+                int breakBeat;
+                int diff = firstNoteBeat - firstPossibleBeat;
+                float timeDiff = CBase.Game.GetTimeFromBeats(diff, _Song.BPM);
+                if (timeDiff > 4f)
+                    breakBeat = firstPossibleBeat + (int)CBase.Game.GetBeatFromTime(2f, _Song.BPM, 0f);
+                else if (timeDiff > 2f)
+                    breakBeat = firstPossibleBeat + (int)CBase.Game.GetBeatFromTime(1f, _Song.BPM, 0f);
+                else if (diff < 2)
+                    breakBeat = firstPossibleBeat;
+                else if (diff < 9)
+                    breakBeat = firstNoteBeat - 2;
+                else if (diff < 13)
+                    breakBeat = firstNoteBeat - 3;
+                else if (diff < 17)
+                    breakBeat = firstNoteBeat - 4;
+                else
+                    breakBeat = firstPossibleBeat + 12;
+                return breakBeat;
+            }
+
             private void _WriteNotes()
             {
                 for (int i = 0; i < _Song.Notes.VoiceCount; i++)
@@ -128,13 +158,13 @@ namespace VocaluxeLib.Songs
                     CVoice voice = _Song.Notes.GetVoice(i);
                     if (_Song.Notes.VoiceCount > 1)
                         _Tw.WriteLine("P" + Math.Pow(2, i));
-                    bool firstLine = true;
                     int currentBeat = 0;
+                    CSongLine lastLine = null;
                     foreach (CSongLine line in voice.Lines)
                     {
-                        if (!firstLine)
+                        if (lastLine != null)
                         {
-                            string lineTxt = "- " + (line.StartBeat - currentBeat);
+                            string lineTxt = "- " + (_GetBreakBeat(lastLine.EndBeat + 1, line.FirstNoteBeat) - currentBeat);
                             if (_Song.Relative)
                             {
                                 lineTxt += " " + (line.FirstNoteBeat - currentBeat);
@@ -142,8 +172,6 @@ namespace VocaluxeLib.Songs
                             }
                             _Tw.WriteLine(lineTxt);
                         }
-                        else
-                            firstLine = false;
                         foreach (CSongNote note in line.Notes)
                         {
                             string tag;
@@ -163,6 +191,7 @@ namespace VocaluxeLib.Songs
                             }
                             _Tw.WriteLine(tag + " " + (note.StartBeat - currentBeat) + " " + note.Duration + " " + note.Tone + " " + note.Text);
                         }
+                        lastLine = line;
                     }
                 }
                 _Tw.WriteLine("E");
@@ -176,11 +205,21 @@ namespace VocaluxeLib.Songs
                     _WriteHeader();
                     _WriteNotes();
                 }
+                catch (UnauthorizedAccessException)
+                {
+                    CBase.Log.LogError("Cannot write " + filePath + ". Directory might be readonly or requires admin rights.");
+                    return false;
+                }
                 catch (Exception e)
                 {
                     CBase.Log.LogError("Unhandled exception while writing " + filePath + ": " + e);
                     return false;
                 }
+                finally
+                {
+                    if (_Tw != null)
+                        _Tw.Dispose();
+                }
                 return true;
             }
         }
diff --git a/VocaluxeLib/Utils/CWavFile.cs b/VocaluxeLib/Utils/CWavFile.cs
new file mode 100644
index 00000000..9993ed24
--- /dev/null
+++ b/VocaluxeLib/Utils/CWavFile.cs
@@ -0,0 +1,294 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+
+namespace VocaluxeLib.Utils
+{
+    //Simple class to read and write WAV files
+    public class CWavFile
+    {
+        public short NumChannels { get; private set; }
+        public int SampleRate { get; private set; }
+        public short BitsPerSample { get; private set; }
+        public string FileName { get; private set; }
+        //Unless this is true, all fields are to be considered as invalid
+        public int DataSize { get; private set; }
+        //Number of samples (per channel)
+        public int NumSamples
+        {
+            get { return (DataSize / (BitsPerSample / 8 * NumChannels)); }
+        }
+        //Number of samples left to be read (per channel)
+        public int NumSamplesLeft { get; private set; }
+        public bool IsOpen { get; private set; }
+        private int _DataPos;
+        private FileStream _File;
+        private bool _IsWritable;
+
+        public CWavFile()
+        {
+            IsOpen = false;
+        }
+
+        ~CWavFile()
+        {
+            Debug.Assert(!IsOpen);
+            Close();
+        }
+
+        public void Create(string fileName, short numChannels, int sampleRate, short bitsPerSample)
+        {
+            if (IsOpen)
+                Close();
+            _File = new FileStream(fileName, FileMode.Create);
+            FileName = fileName;
+            NumChannels = numChannels;
+            SampleRate = sampleRate;
+            BitsPerSample = bitsPerSample;
+            DataSize = 0;
+            NumSamplesLeft = 0;
+            IsOpen = true;
+            _IsWritable = true;
+            _WriteHeader();
+        }
+
+        public void Close()
+        {
+            if (!IsOpen)
+                return;
+            if (_IsWritable)
+            {
+                BinaryWriter writer = new BinaryWriter(_File);
+                writer.Seek(4, SeekOrigin.Begin);
+                writer.Write((int)_File.Length - 8);
+                writer.Seek(_DataPos - 4, SeekOrigin.Begin);
+                writer.Write(DataSize);
+            }
+            _File.Dispose();
+            _File = null;
+            IsOpen = false;
+        }
+
+        public bool Open(string fileName)
+        {
+            if (IsOpen)
+                Close();
+            if (!File.Exists(fileName))
+                return false;
+            FileName = fileName;
+            _File = new FileStream(FileName, FileMode.Open);
+            try
+            {
+                BinaryReader reader = new BinaryReader(_File);
+                if (Encoding.ASCII.GetString(reader.ReadBytes(4)) != "RIFF")
+                    return false;
+                reader.ReadInt32(); //Chunksize (file)
+                if (Encoding.ASCII.GetString(reader.ReadBytes(4)) != "WAVE")
+                    return false;
+                long curPos = _File.Position;
+                if (_SeekTo(reader, "fmt ") < 0)
+                    return false;
+                short audioFormat = reader.ReadInt16();
+                if (audioFormat != 1) //PCM
+                    return false;
+                NumChannels = reader.ReadInt16();
+                SampleRate = reader.ReadInt32();
+                int bytesPerSec = reader.ReadInt32();
+                short blockAlign = reader.ReadInt16();
+                BitsPerSample = reader.ReadInt16();
+                if (BitsPerSample != 8 && BitsPerSample != 16)
+                    return false;
+                if (blockAlign != NumChannels * (BitsPerSample / 8))
+                    return false;
+                if (bytesPerSec != blockAlign * SampleRate)
+                    return false;
+                _File.Position = curPos;
+                DataSize = _SeekTo(reader, "data");
+                if (DataSize <= 0)
+                    return false;
+                _DataPos = (int)_File.Position;
+                DataSize = Math.Min(DataSize, (int)_File.Length - _DataPos);
+                NumSamplesLeft = NumSamples;
+            }
+            catch (Exception)
+            {
+                _File.Dispose();
+                throw;
+            }
+            IsOpen = true;
+            return true;
+        }
+
+        /// <summary>
+        /// Gets an array of numSamples samples per channel for the selected channel(s)
+        /// </summary>
+        /// <param name="numSamples">Samples per channel</param>
+        /// <param name="channel">Channel for which to get the samples (0=all)</param>
+        /// <returns></returns>
+        public byte[] GetNextSamples8Bit(int numSamples, int channel = 0)
+        {
+            if (channel < 0 || channel > NumChannels || BitsPerSample != 8)
+                return null;
+            if (numSamples > NumSamplesLeft)
+                return null;
+            byte[] result;
+            BinaryReader reader = new BinaryReader(_File);
+            if (channel == 0 || NumChannels == 1)
+                result = reader.ReadBytes(numSamples * NumChannels);
+            else
+            {
+                result = new byte[numSamples];
+                for (int i = 0; i < numSamples; i++)
+                {
+                    _File.Seek(channel - 1, SeekOrigin.Current);
+                    result[i] = reader.ReadByte();
+                    _File.Seek(NumChannels - channel, SeekOrigin.Current);
+                }
+            }
+            NumSamplesLeft -= numSamples;
+            return result;
+        }
+
+        /// <summary>
+        /// Gets an array of numSamples samples per channel for the selected channel(s)
+        /// </summary>
+        /// <param name="numSamples">Samples per channel</param>
+        /// <param name="channel">Channel for which to get the samples (0=all)</param>
+        /// <returns></returns>
+        public short[] GetNextSamples16Bit(int numSamples, int channel = 0)
+        {
+            if (channel < 0 || channel > NumChannels || BitsPerSample != 16)
+                return null;
+            if (numSamples > NumSamplesLeft)
+                return null;
+            short[] result;
+            BinaryReader reader = new BinaryReader(_File);
+            try
+            {
+                if (channel == 0 || NumChannels == 1)
+                {
+                    result = new short[numSamples * NumChannels];
+                    for (int i = 0; i < numSamples * NumChannels; i++)
+                        result[i] = reader.ReadInt16();
+                }
+                else
+                {
+                    result = new short[numSamples];
+                    for (int i = 0; i < numSamples; i++)
+                    {
+                        _File.Seek((channel - 1) * 2, SeekOrigin.Current);
+                        result[i] = reader.ReadInt16();
+                        _File.Seek((NumChannels - channel) * 2, SeekOrigin.Current);
+                    }
+                }
+                NumSamplesLeft -= numSamples;
+            }
+            catch (EndOfStreamException e)
+            {
+                Console.WriteLine("Error: " + e);
+                return null;
+            }
+            return result;
+        }
+
+        public byte[] GetNextSamples16BitAsBytes(int numSamples, int channel = 0)
+        {
+            short[] samples = GetNextSamples16Bit(numSamples, channel);
+            if (samples == null)
+                return null;
+            byte[] samplesByte = new byte[samples.Length * 2];
+            Buffer.BlockCopy(samples, 0, samplesByte, 0, samplesByte.Length);
+            return samplesByte;
+        }
+
+        public bool WriteSamples(byte[] samples, int channel = 0)
+        {
+            if (!_IsWritable || channel < 0 || channel > NumChannels || BitsPerSample != 8)
+                return false;
+            BinaryWriter writer = new BinaryWriter(_File);
+            if (channel == 0 || NumChannels == 1)
+                writer.Write(samples);
+            else
+            {
+                foreach (byte sample in samples)
+                {
+                    _File.Seek(channel - 1, SeekOrigin.Current);
+                    writer.Write(sample);
+                    _File.Seek(NumChannels - channel, SeekOrigin.Current);
+                }
+            }
+            DataSize += samples.Length;
+            return true;
+        }
+
+        public bool Write16BitSamples(short[] samples, int channel = 0)
+        {
+            if (!_IsWritable || channel < 0 || channel > NumChannels || BitsPerSample != 16)
+                return false;
+            BinaryWriter writer = new BinaryWriter(_File);
+            if (channel == 0 || NumChannels == 1)
+            {
+                foreach (short sample in samples)
+                    writer.Write(sample);
+            }
+            else
+            {
+                foreach (short sample in samples)
+                {
+                    _File.Seek((channel - 1) * 2, SeekOrigin.Current);
+                    writer.Write(sample);
+                    _File.Seek((NumChannels - channel) * 2, SeekOrigin.Current);
+                }
+            }
+            DataSize += samples.Length * 2;
+            return true;
+        }
+
+        public bool Write16BitSamples(byte[] samples, int channel = 0)
+        {
+            if (samples.Length == 0)
+                return true;
+            short[] samplesShort = new short[samples.Length / 2];
+            Buffer.BlockCopy(samples, 0, samplesShort, 0, samples.Length);
+            return Write16BitSamples(samplesShort, channel);
+        }
+
+        private void _WriteHeader()
+        {
+            if (!IsOpen || !_IsWritable)
+                return;
+            BinaryWriter writer = new BinaryWriter(_File);
+            writer.Write(Encoding.ASCII.GetBytes("RIFF"));
+            writer.Write(0);
+            writer.Write(Encoding.ASCII.GetBytes("WAVE"));
+            writer.Write(Encoding.ASCII.GetBytes("fmt "));
+            writer.Write(16);
+            writer.Write((short)1); // PCM
+            writer.Write(NumChannels); // Channels
+            writer.Write(SampleRate); // Sample rate
+            writer.Write(SampleRate * NumChannels * (BitsPerSample / 8)); // Average bytes per second
+            writer.Write((short)((BitsPerSample / 8) * NumChannels)); // block align
+            writer.Write(BitsPerSample); // bits per sample
+            writer.Write(Encoding.ASCII.GetBytes("data"));
+            writer.Write(DataSize);
+            _DataPos = (int)_File.Position;
+            writer.Seek(4, SeekOrigin.Begin);
+            writer.Write((int)writer.BaseStream.Length);
+            writer.Seek(_DataPos, SeekOrigin.Begin);
+        }
+
+        private static int _SeekTo(BinaryReader reader, string chunkId)
+        {
+            do
+            {
+                string curChunkId = Encoding.ASCII.GetString(reader.ReadBytes(4));
+                int chunkSize = reader.ReadInt32();
+                if (curChunkId == chunkId)
+                    return chunkSize;
+                reader.BaseStream.Seek(chunkSize, SeekOrigin.Current);
+            } while (reader.BaseStream.Position < reader.BaseStream.Length);
+            return -1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj
index 22d6a2b1..3e17ea26 100644
--- a/VocaluxeLib/VocaluxeLib.csproj
+++ b/VocaluxeLib/VocaluxeLib.csproj
@@ -14,29 +14,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN</DefineConstants>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -48,7 +26,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <CodeAnalysisRuleSet>..\CheckingRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -59,7 +37,7 @@
     <DefineConstants>WIN</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugLinux|x86' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -70,7 +48,7 @@
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLinux|x86' ">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -81,39 +59,7 @@
     <DefineConstants>LINUX</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>LINUX</DefineConstants>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>WIN</DefineConstants>
-    <Optimize>true</Optimize>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|AnyCPU'">
     <OutputPath>bin\</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
@@ -188,6 +134,7 @@
     <Compile Include="PartyModes\CScreenPartyDummy.cs" />
     <Compile Include="PartyModes\IPartyMode.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Utils\CWavFile.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/WebserverInitalConfig/CConfigHttpApi.cs b/WebserverInitalConfig/CConfigHttpApi.cs
index 38002df3..e13a9cda 100644
--- a/WebserverInitalConfig/CConfigHttpApi.cs
+++ b/WebserverInitalConfig/CConfigHttpApi.cs
@@ -17,6 +17,7 @@
 
 using System.Security.Authentication;
 using System.Security.Principal;
+using System.Windows.Forms;
 using Security.Cryptography;
 using Security.Cryptography.X509Certificates;
 using System;
@@ -124,7 +125,22 @@ namespace WebserverInitalConfig
 
             keyParam.Parameters.Add(new CngProperty("Length", BitConverter.GetBytes(2048), CngPropertyOptions.None));
 
-            CngKey key = CngKey.Create(CngAlgorithm2.Rsa, Guid.NewGuid().ToString(), keyParam);
+            CngKey key;
+            try
+            {
+                key = CngKey.Create(CngAlgorithm2.Rsa, Guid.NewGuid().ToString(), keyParam);
+            }
+            catch (PlatformNotSupportedException)
+            {
+                try
+                {
+                    key = CngKey.Create(CngAlgorithm2.Aes, Guid.NewGuid().ToString(), keyParam);
+                }
+                catch (PlatformNotSupportedException)
+                {
+                    return null;
+                }
+            }
 
             X509CertificateCreationParameters param = new X509CertificateCreationParameters(new X500DistinguishedName(subjectName))
                 {
@@ -156,6 +172,11 @@ namespace WebserverInitalConfig
                 if (!IsAdministrator())
                     throw new AuthenticationException();
                 cert = _GetSelfSignedCert(certName);
+                if (cert == null)
+                {
+                    MessageBox.Show("Could not create certificate. Secure server connection may not work. Disable it if required.");
+                    return;
+                }
                 _AddCertToStore(cert);
             }
             _BindCert(cert);
diff --git a/WebserverInitalConfig/Program.cs b/WebserverInitalConfig/Program.cs
index fc09dac1..60e3ce4a 100644
--- a/WebserverInitalConfig/Program.cs
+++ b/WebserverInitalConfig/Program.cs
@@ -20,6 +20,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Security.Authentication;
+using System.Windows.Forms;
 
 namespace WebserverInitalConfig
 {
@@ -29,49 +30,56 @@ namespace WebserverInitalConfig
         private static void Main(string[] args)
             // ReSharper restore InconsistentNaming
         {
-            int port;
-            if (args.Length < 2 || !int.TryParse(args[0], out port))
+            try
             {
-                Console.WriteLine("Usage: VocaluxeServerConfig port isHttps");
-                Environment.Exit(-1);
-            }
-            else
-            {
-                CConfigHttpApi config = new CConfigHttpApi("Vocaluxe", Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Vocaluxe.exe"), "0.0.0.0", port, true);
-                try
+                int port;
+                if (args.Length < 2 || !int.TryParse(args[0], out port))
                 {
-                    config.AddFirewallRule();
-                    if (args[1].ToLower() == "true")
-                        config.CreateAndAddCert(Dns.GetHostName());
-
-                    if ((args.Length >= 3 && args[2] == "reserve") || CConfigHttpApi.IsAdministrator())
-                        config.ReserveUrl();
+                    Console.WriteLine("Usage: VocaluxeServerConfig port isHttps");
+                    Environment.Exit(-1);
                 }
-                catch (AuthenticationException)
+                else
                 {
-                    ProcessStartInfo proc = new ProcessStartInfo
-                        {
-                            UseShellExecute = true,
-                            WorkingDirectory = Environment.CurrentDirectory,
-                            FileName = Process.GetCurrentProcess().MainModule.FileName,
-                            Arguments = args[0] + " " + args[1],
-                            Verb = "runas",
-                            CreateNoWindow = true,
-                            WindowStyle = ProcessWindowStyle.Hidden,
-                        };
-
+                    CConfigHttpApi config = new CConfigHttpApi("Vocaluxe", Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Vocaluxe.exe"), "0.0.0.0", port, true);
                     try
                     {
-                        Process.Start(proc);
+                        config.AddFirewallRule();
+                        if (args[1].ToLower() == "true")
+                            config.CreateAndAddCert(Dns.GetHostName());
+
+                        if ((args.Length >= 3 && args[2] == "reserve") || CConfigHttpApi.IsAdministrator())
+                            config.ReserveUrl();
                     }
-                    catch
+                    catch (AuthenticationException)
                     {
-                        // The user refused the elevation.
-                        // Do nothing and return directly ...
-                        Environment.Exit(-1);
+                        ProcessStartInfo proc = new ProcessStartInfo
+                            {
+                                UseShellExecute = true,
+                                WorkingDirectory = Environment.CurrentDirectory,
+                                FileName = Process.GetCurrentProcess().MainModule.FileName,
+                                Arguments = args[0] + " " + args[1],
+                                Verb = "runas",
+                                CreateNoWindow = true,
+                                WindowStyle = ProcessWindowStyle.Hidden,
+                            };
+
+                        try
+                        {
+                            Process.Start(proc);
+                        }
+                        catch
+                        {
+                            // The user refused the elevation.
+                            // Do nothing and return directly ...
+                            Environment.Exit(-1);
+                        }
                     }
                 }
             }
+            catch (Exception e)
+            {
+                MessageBox.Show("Error while installing server: " + e.Message);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/WebserverInitalConfig/WebserverInitalConfig.csproj b/WebserverInitalConfig/WebserverInitalConfig.csproj
index 2f48f927..5405cbe2 100644
--- a/WebserverInitalConfig/WebserverInitalConfig.csproj
+++ b/WebserverInitalConfig/WebserverInitalConfig.csproj
@@ -41,16 +41,13 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\Output\Interop.NetFwTypeLib.dll</HintPath>
     </Reference>
-    <Reference Include="Security, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Output\Security.dll</HintPath>
-    </Reference>
     <Reference Include="Security.Cryptography, Version=1.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Output\Security.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/gstreamerhelper/VocaluxeClock.cpp b/gstreamerhelper/VocaluxeClock.cpp
deleted file mode 100644
index ba84cfd0..00000000
--- a/gstreamerhelper/VocaluxeClock.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "stdafx.h"
-#include "VocaluxeClock.h"
-
-static void vocaluxe_clock_class_init (VocaluxeClockClass * klass);
-static void vocaluxe_clock_init (VocaluxeClock * clock);
-
-static GstClockTime vocaluxe_clock_get_internal_time (GstClock * clock);
-
-static GstSystemClockClass *parent_class = NULL;
-
-GType
-vocaluxe_clock_get_type (void)
-{
-  static GType clock_type = 0;
-
-  if (!clock_type) {
-    static const GTypeInfo clock_info = {
-      sizeof (VocaluxeClockClass),
-      NULL,
-      NULL,
-      (GClassInitFunc) vocaluxe_clock_class_init,
-      NULL,
-      NULL,
-      sizeof (VocaluxeClock),
-      4,
-      (GInstanceInitFunc) vocaluxe_clock_init,
-      NULL
-    };
-
-    clock_type = g_type_register_static (GST_TYPE_SYSTEM_CLOCK, "VocaluxeClock",
-        &clock_info, (GTypeFlags) 0);
-  }
-  return clock_type;
-}
-
-
-static void
-vocaluxe_clock_class_init (VocaluxeClockClass * klass)
-{
-  GstClockClass *gstclock_class;
-
-  gstclock_class = (GstClockClass *) klass;
-
-  parent_class = (GstSystemClockClass*) g_type_class_peek_parent (klass);
-
-  gstclock_class->get_internal_time = vocaluxe_clock_get_internal_time;
-}
-
-static void
-vocaluxe_clock_init (VocaluxeClock * clock)
-{
-  clock->last_time = 0;
-  GST_OBJECT_FLAG_SET (clock, GST_CLOCK_FLAG_CAN_SET_MASTER);
-}
-
-VocaluxeClock *
-vocaluxe_clock_new (const gchar * name)
-{
-  VocaluxeClock *_vocaluxeclock =
-      VOCALUXE_CLOCK (g_object_new (GST_TYPE_VOCALUXE_CLOCK, "name", name, NULL));
-
-  return _vocaluxeclock;
-}
-
-static GstClockTime
-vocaluxe_clock_get_internal_time (GstClock * clock)
-{
-  VocaluxeClock *_vocaluxeclock;
-  GstClockTime result;
-
-  _vocaluxeclock = GST_VOCALUXE_CLOCK_CAST (clock);
-
-  result = (GstClockTime) _vocaluxeclock->time * GST_SECOND;
-  return result;
-}
-
-void
-vocaluxe_clock_set_time (VocaluxeClock * clock, float time)
-{
-  clock->time = time;
-}
\ No newline at end of file
diff --git a/gstreamerhelper/VocaluxeClock.h b/gstreamerhelper/VocaluxeClock.h
deleted file mode 100644
index e6377220..00000000
--- a/gstreamerhelper/VocaluxeClock.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <gst/gst.h>
-#include <gst/gstsystemclock.h>
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VOCALUXE_CLOCK \
-  (vocaluxe_clock_get_type())
-#define VOCALUXE_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VOCALUXE_CLOCK,VocaluxeClock))
-#define VOCALUXE_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VOCALUXE_CLOCK,VocaluxeClockClass))
-#define GST_IS_VOCALUXE_CLOCK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VOCALUXE_CLOCK))
-#define GST_IS_VOCALUXE_CLOCK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VOCALUXE_CLOCK))
-#define GST_VOCALUXE_CLOCK_CAST(obj) \
-  ((VocaluxeClock*)(obj))
-
-typedef struct _VocaluxeClock VocaluxeClock;
-typedef struct _VocaluxeClockClass VocaluxeClockClass;
-
-struct _VocaluxeClock {
-  GstSystemClock clock;
-
-  GstClockTime last_time;
-  gfloat time;
-};
-
-struct _VocaluxeClockClass {
-  GstSystemClockClass parent_class;
-
-  /*< private >*/
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType          vocaluxe_clock_get_type        (void);
-VocaluxeClock*   vocaluxe_clock_new             (const gchar *name);
-void            vocaluxe_clock_set_time      (VocaluxeClock *clock, float time);
-
-}
\ No newline at end of file
diff --git a/gstreamerhelper/x64/lib/gstapp-1.0.lib b/gstreamerhelper/x64/lib/gstapp-1.0.lib
deleted file mode 100644
index 9d5f770b..00000000
Binary files a/gstreamerhelper/x64/lib/gstapp-1.0.lib and /dev/null differ