Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5698eb6cbba2789accbfc2ab3132d83053821303
commit 5698eb6cbba2789accbfc2ab3132d83053821303 Author: crazy <[email protected]> Date: Wed Nov 4 00:14:41 2015 +0100 gnome-media-player-0.1.3-10-x86_64 - removed - repo cleanup diff --git a/source/gnome-extra/gnome-media-player/FrugalBuild b/source/gnome-extra/gnome-media-player/FrugalBuild deleted file mode 100644 index e398f6a..0000000 --- a/source/gnome-extra/gnome-media-player/FrugalBuild +++ /dev/null @@ -1,22 +0,0 @@ -# Compiling Time: 0.07 SBU -# Maintainer: Devil505 <[email protected]> - -pkgname=gnome-media-player -pkgver=0.1.3 -pkgrel=10 -pkgdesc="Gnome Media Player" -url="http://launchpad.net/gnome-media-player"; -depends=('gtkmm2' 'unique1' 'vlc>=2.1.5' 'xine-lib>=1.2.6-2' 'gst-plugins-base' 'gconf') -makedepends=('intltool') -groups=('gnome-extra') -_F_gnome_desktop="y" -Finclude gnome-scriptlet -archs=('i686' 'x86_64') -up2date="Flasttar $url" -source=($url/0.1/$pkgver/+download/$pkgname-$pkgver.tar.gz - vlc-1.1.0-upgrade.patch) -sha1sums=('c33c3a0ef7ff242384538c7dc43107c460dd5da5' \ - 'e1116363f6996df7ac7d3f64edf663dba7978359') - - -# optimization OK diff --git a/source/gnome-extra/gnome-media-player/vlc-1.1.0-upgrade.patch b/source/gnome-extra/gnome-media-player/vlc-1.1.0-upgrade.patch deleted file mode 100644 index 174f232..0000000 --- a/source/gnome-extra/gnome-media-player/vlc-1.1.0-upgrade.patch +++ /dev/null @@ -1,242 +0,0 @@ -Description: Patch to make GNOME Media Player use vlc 1.1.0 - This patch makes GNOME Media Player use VLC 1.1.0 to fix FTBFS in - Maverick. -Author: Bilal Akhtar <[email protected]> - ---- a/src/vlc_engine.cc -+++ b/src/vlc_engine.cc -@@ -35,8 +35,6 @@ - instance = NULL; - media_player = NULL; - -- libvlc_exception_init (&exception); -- - int i = 0; - const char * vlc_argv[50]; - -@@ -66,18 +64,13 @@ - g_debug("Deinterlacer disabled"); - } - -- instance = libvlc_new (i, vlc_argv, &exception); -- check_exception("To use the VLC engine you must install VLC"); -- -- media_player = libvlc_media_player_new(instance, &exception); -- check_exception(); -+ instance = libvlc_new (i, vlc_argv); - -- libvlc_audio_set_volume(instance, DEFAULT_VOLUME, &exception); -- check_exception(); -+ media_player = libvlc_media_player_new(instance); -+ libvlc_audio_set_volume(media_player, DEFAULT_VOLUME); - -- event_manager = libvlc_media_player_event_manager(media_player, &exception); -- libvlc_event_attach(event_manager, libvlc_MediaPlayerEndReached, end_reached_callback, NULL, &exception); -- check_exception(); -+ event_manager = libvlc_media_player_event_manager(media_player); -+ libvlc_event_attach(event_manager, libvlc_MediaPlayerEndReached, end_reached_callback, NULL); - - g_message("VLC engine created"); - } -@@ -103,30 +96,9 @@ - g_debug("VLC engine destroyed"); - } - --void VlcEngine::check_exception(const Glib::ustring& message) --{ -- if (libvlc_exception_raised(&exception)) -- { -- Glib::ustring text; -- Glib::ustring exception_message = libvlc_exception_get_message(&exception); -- -- if (message.empty()) -- { -- text = exception_message; -- } -- else -- { -- text = Glib::ustring::compose("%1: %2", message, exception_message); -- } -- -- throw Exception(text); -- } --} -- - void VlcEngine::set_window(int window) - { -- libvlc_media_player_set_xwindow(media_player, window, &exception); -- check_exception(); -+ libvlc_media_player_set_xwindow(media_player, window); - } - - void VlcEngine::pause(gboolean state) -@@ -135,13 +107,12 @@ - { - if (state) - { -- libvlc_media_player_pause(media_player, &exception); -+ libvlc_media_player_pause(media_player); - } - else - { -- libvlc_media_player_play(media_player, &exception); -+ libvlc_media_player_play(media_player); - } -- check_exception(); - } - } - -@@ -149,8 +120,7 @@ - { - if (has_media()) - { -- libvlc_media_player_play(media_player, &exception); -- check_exception(); -+ libvlc_media_player_play(media_player); - } - } - -@@ -158,17 +128,10 @@ - { - if (has_media()) - { -- libvlc_media_t* media = libvlc_media_player_get_media(media_player, &exception); -- check_exception(); -- -- libvlc_media_player_stop(media_player, &exception); -- check_exception(); -- -- libvlc_media_player_set_media(media_player, NULL, &exception); -- check_exception(); -- -+ libvlc_media_t* media = libvlc_media_player_get_media(media_player); -+ libvlc_media_player_stop(media_player); -+ libvlc_media_player_set_media(media_player, NULL); - libvlc_media_release(media); -- check_exception(); - } - } - -@@ -181,12 +144,8 @@ - - stop(); - -- libvlc_media_t* media = libvlc_media_new(instance, mrl.c_str(), &exception); -- check_exception(); -- -- libvlc_media_player_set_media(media_player, media, &exception); -- check_exception(); -- -+ libvlc_media_t* media = libvlc_media_new_path(instance, mrl.c_str()); -+ libvlc_media_player_set_media(media_player, media); - libvlc_media_release(media); - } - -@@ -206,16 +165,14 @@ - } - else - { -- libvlc_media_player_set_time(media_player, new_time, &exception); -- check_exception(); -+ libvlc_media_player_set_time(media_player, new_time); - } - } - } - - bool VlcEngine::has_media() - { -- libvlc_media_t* media = libvlc_media_player_get_media(media_player, &exception); -- check_exception(); -+ libvlc_media_t* media = libvlc_media_player_get_media(media_player); - return media != NULL; - } - -@@ -225,11 +182,10 @@ - - if (has_media()) - { -- result = libvlc_media_player_get_time(media_player, &exception); -- check_exception(); -+ result = libvlc_media_player_get_time(media_player); - } - -- return result; -+ return result; - } - - int VlcEngine::get_length() -@@ -238,11 +194,10 @@ - - if (has_media()) - { -- result = libvlc_media_player_get_length(media_player, &exception); -- check_exception(); -+ result = libvlc_media_player_get_length(media_player); - } - -- return result; -+ return result; - } - - float VlcEngine::get_percentage() -@@ -251,8 +206,7 @@ - - if (has_media()) - { -- result = libvlc_media_player_get_position(media_player, &exception); -- check_exception(); -+ result = libvlc_media_player_get_position(media_player); - } - - return result; -@@ -262,30 +216,19 @@ - { - if (has_media()) - { -- libvlc_media_player_set_position(media_player, percentage, &exception); -- check_exception(); -+ libvlc_media_player_set_position(media_player, percentage); - } - } - - void VlcEngine::set_volume(double value) - { --if (has_media()) --{ --libvlc_audio_set_volume(instance, value, &exception); --check_exception(); --} -+ if (has_media()) -+ { -+ libvlc_audio_set_volume(media_player, value); -+ } - } - - double VlcEngine::get_volume() - { --if (has_media()) --{ --int returnn=libvlc_audio_get_volume(instance,&exception); --check_exception(); --return returnn; --} --else --{ --return 0; --} -+ return has_media() ? libvlc_audio_get_volume(media_player) : 0; - } ---- a/src/vlc_engine.h -+++ b/src/vlc_engine.h -@@ -28,11 +28,8 @@ - private: - libvlc_instance_t* instance; - libvlc_media_player_t* media_player; -- libvlc_exception_t exception; - libvlc_event_manager_t* event_manager; - -- void check_exception(const Glib::ustring& message = ""); -- - public: - VlcEngine(bool use_ffmpeg_demux = false); - ~VlcEngine(); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
