[banshee] GStreamerSharp: Update to build with the latest gstreamer-sharp git
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] GStreamerSharp: Update to build with the latest gstreamer-sharp git
- Date: Sat, 9 May 2015 15:28:10 +0000 (UTC)
commit e35092655886a6cce314d2310404f977233588a4
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Sat May 9 17:24:12 2015 +0200
GStreamerSharp: Update to build with the latest gstreamer-sharp git
This is mainly to take into account namespace re-organization.
.../Banshee.GStreamerSharp/DvdManager.cs | 2 +-
.../Banshee.GStreamerSharp/PlayerEngine.cs | 28 ++++++++++----------
.../Banshee.GStreamerSharp/VideoManager.cs | 2 +-
.../Banshee.GStreamerSharp/Visualization.cs | 8 +++---
4 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/DvdManager.cs
b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/DvdManager.cs
index 094b9a5..dca5e9e 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/DvdManager.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/DvdManager.cs
@@ -141,7 +141,7 @@ namespace Banshee.GStreamerSharp
InDvdMenu = false;
// Get available command to know if player is in menu
// FIXME: GlobalVideo should be Gst.Video.Global
- Gst.Query query = GlobalVideo.NavigationQueryNewCommands ();
+ Gst.Query query = Gst.Video.Global.NavigationQueryNewCommands ();
NavigationCommand[] cmds;
if (Navigation == null) {
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
index 811c3ba..c823b78 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
@@ -39,6 +39,7 @@ using Mono.Unix;
using Gst;
using Gst.PbUtils;
+using Gst.Video;
using Hyena;
using Banshee.Collection;
@@ -47,7 +48,6 @@ using Banshee.MediaEngine;
using Banshee.ServiceStack;
using Banshee.Configuration;
using Banshee.Preferences;
-using Gst.Video;
namespace Banshee.GStreamerSharp
{
@@ -464,7 +464,7 @@ namespace Banshee.GStreamerSharp
if (accurate_seek) {
seek_flags |= SeekFlags.Accurate;
}
- playbin.SeekSimple (Format.Time, seek_flags, (((long)position) * Constants.MSECOND));
+ playbin.SeekSimple (Format.Time, seek_flags, (((long)position) * Gst.Constants.MSECOND));
OnEventChanged (PlayerEvent.Seek);
}
@@ -534,8 +534,8 @@ namespace Banshee.GStreamerSharp
case MessageType.Element:
- if (GlobalPbUtil.IsMissingPluginMessage (msg)) {
- string detail = GlobalPbUtil.MissingPluginMessageGetInstallerDetail (msg);
+ if (Gst.PbUtils.Global.IsMissingPluginMessage (msg)) {
+ string detail = Gst.PbUtils.Global.MissingPluginMessageGetInstallerDetail (msg);
if (detail == null)
return false;
@@ -548,10 +548,10 @@ namespace Banshee.GStreamerSharp
Log.DebugFormat ("Saving missing element details ('{0}')", detail);
missing_details.Add (detail);
- Log.Error ("Missing GStreamer Plugin",
GlobalPbUtil.MissingPluginMessageGetDescription (msg), true);
+ Log.Error ("Missing GStreamer Plugin",
Gst.PbUtils.Global.MissingPluginMessageGetDescription (msg), true);
InstallPluginsContext install_context = new InstallPluginsContext ();
- GlobalPbUtil.InstallPluginsAsync (missing_details.ToArray (), install_context,
OnInstallPluginsReturn);
+ Gst.PbUtils.Global.InstallPluginsAsync (missing_details.ToArray (), install_context,
OnInstallPluginsReturn);
} else if (NavigationAdapter.MessageGetType (msg) ==
NavigationMessageType.CommandsChanged) {
dvd_manager.HandleCommandsChanged (playbin);
}
@@ -611,7 +611,7 @@ namespace Banshee.GStreamerSharp
var error_message = String.IsNullOrEmpty (ex.Message) ? Catalog.GetString ("Unknown Error") :
ex.Message;
- if (ex.Domain == Global.ResourceErrorQuark ()) {
+ if (ex.Domain == Gst.Global.ResourceErrorQuark ()) {
ResourceError domain_code = (ResourceError)ex.Code;
if (failed_track != null) {
switch (domain_code) {
@@ -623,7 +623,7 @@ namespace Banshee.GStreamerSharp
}
}
Log.Error (String.Format ("GStreamer resource error: {0}", domain_code), false);
- } else if (ex.Domain == Global.StreamErrorQuark ()) {
+ } else if (ex.Domain == Gst.Global.StreamErrorQuark ()) {
StreamError domain_code = (StreamError)ex.Code;
if (failed_track != null) {
switch (domain_code) {
@@ -636,7 +636,7 @@ namespace Banshee.GStreamerSharp
}
Log.Error (String.Format ("GStreamer stream error: {0}", domain_code), false);
- } else if (ex.Domain == Global.CoreErrorQuark ()) {
+ } else if (ex.Domain == Gst.Global.CoreErrorQuark ()) {
CoreError domain_code = (CoreError)ex.Code;
if (failed_track != null) {
switch (domain_code) {
@@ -651,7 +651,7 @@ namespace Banshee.GStreamerSharp
if (domain_code != CoreError.MissingPlugin) {
Log.Error (String.Format ("GStreamer core error: {0}", domain_code), false);
}
- } else if (ex.Domain == Global.LibraryErrorQuark ()) {
+ } else if (ex.Domain == Gst.Global.LibraryErrorQuark ()) {
Log.Error (String.Format ("GStreamer library error: {0}", ex.Code), false);
}
@@ -796,10 +796,10 @@ namespace Banshee.GStreamerSharp
return String.Empty;
string code;
- if (!list.GetString (Constants.TAG_LANGUAGE_CODE, out code))
+ if (!list.GetString (Gst.Constants.TAG_LANGUAGE_CODE, out code))
return String.Empty;
- var name = Gst.Tags.GlobalTag.TagGetLanguageName (code);
+ var name = Tag.GetLanguageName (code);
Log.Debug ("Subtitle language code " + code + " resolved to " + name);
return name;
@@ -843,7 +843,7 @@ namespace Banshee.GStreamerSharp
get {
long pos;
playbin.QueryPosition (query_format, out pos);
- return (uint) ((ulong)pos / Constants.MSECOND);
+ return (uint) ((ulong)pos / Gst.Constants.MSECOND);
}
set { Seek (value); }
}
@@ -852,7 +852,7 @@ namespace Banshee.GStreamerSharp
get {
long duration;
playbin.QueryDuration (query_format, out duration);
- return (uint) ((ulong)duration / Constants.MSECOND);
+ return (uint) ((ulong)duration / Gst.Constants.MSECOND);
}
}
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/VideoManager.cs
b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/VideoManager.cs
index 9f08e2e..c0f2c1c 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/VideoManager.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/VideoManager.cs
@@ -114,7 +114,7 @@ namespace Banshee.GStreamerSharp
return;
}
- if (!GlobalVideo.IsVideoOverlayPrepareWindowHandleMessage (message)) {
+ if (!Gst.Video.Global.IsVideoOverlayPrepareWindowHandleMessage (message)) {
return;
}
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Visualization.cs
b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Visualization.cs
index c12f168..23a7633 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Visualization.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Visualization.cs
@@ -99,7 +99,7 @@ namespace Banshee.GStreamerSharp
audiosinkqueue ["leaky"] = GST_QUEUE_LEAK_DOWNSTREAM;
audiosinkqueue ["max-size-buffers"] = 0;
audiosinkqueue ["max-size-bytes"] = 0;
- audiosinkqueue ["max-size-time"] = ((long)Constants.SECOND) * 5L;
+ audiosinkqueue ["max-size-time"] = ((long)Gst.Constants.SECOND) * 5L;
fakesink.Connect ("handoff", PCMHandoff);
@@ -109,11 +109,11 @@ namespace Banshee.GStreamerSharp
fakesink ["sync"] = true;
// Drop buffers if they come in too late. This is mainly used when
// thawing the vis pipeline.
- fakesink ["max-lateness"] = ((long)Constants.SECOND / 120L);
+ fakesink ["max-lateness"] = ((long)Gst.Constants.SECOND / 120L);
// Deliver buffers one frame early. This allows for rendering
// time. (TODO: It would be great to calculate this on-the-fly so
// we match the rendering time.
- fakesink ["ts-offset"] = -((long)Constants.SECOND / 60L);
+ fakesink ["ts-offset"] = -((long)Gst.Constants.SECOND / 60L);
// Don't go to PAUSED when we freeze the pipeline.
fakesink ["async"] = false;
@@ -147,7 +147,7 @@ namespace Banshee.GStreamerSharp
private Caps caps = Caps.FromString (
"audio/x-raw, " +
//FIXME: is this correct way to port this?
https://github.com/GNOME/banshee/commit/e40923df1bc55129832dff5ca2c782f5040b412f#diff-7c442526ef990528be03ffbca9921ec3R38
- "format = (string) " + Gst.Audio.GlobalAudio.AudioFormatToString (Gst.Audio.AudioFormat.F32) +
", " +
+ "format = (string) " + Gst.Audio.Global.AudioFormatToString (Gst.Audio.AudioFormat.F32) + ", " +
"rate = (int) 44100, " +
"channels = (int) 2");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]