[retro-gtk] Move retro-gtk/audio to retro-gobject/audio
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk] Move retro-gtk/audio to retro-gobject/audio
- Date: Mon, 13 Feb 2017 16:09:21 +0000 (UTC)
commit 0a74391e7164e76cbcc3aa720cf492b0c0c6eca2
Author: Adrien Plazas <kekun plazas laposte net>
Date: Mon Feb 13 11:16:21 2017 +0100
Move retro-gtk/audio to retro-gobject/audio
https://bugzilla.gnome.org/show_bug.cgi?id=777489
configure.ac | 4 ++--
retro-gobject/Makefile.am | 4 ++++
{retro-gtk => retro-gobject}/audio/pa-player.vala | 11 +++--------
retro-gtk/Makefile.am | 4 ----
4 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ea5be54..e7bf4a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ LT_INIT
# retro-gobject
###############
-retro_gobject_pkg_modules="gobject-2.0 glib-2.0 gmodule-2.0 gio-2.0 gtk+-3.0 cairo"
+retro_gobject_pkg_modules="gobject-2.0 glib-2.0 gmodule-2.0 gio-2.0 gtk+-3.0 cairo libpulse libpulse-simple"
PKG_CHECK_MODULES(RETRO_GOBJECT, $retro_gobject_pkg_modules)
AC_SUBST(retro_gobject_pkg_modules)
@@ -46,7 +46,7 @@ AC_SUBST(retro_gobject_pkg_modules)
# retro-gtk
###########
-retro_gtk_pkg_modules="gobject-2.0 glib-2.0 gtk+-3.0 libpulse libpulse-simple"
+retro_gtk_pkg_modules="gobject-2.0 glib-2.0 gtk+-3.0"
PKG_CHECK_MODULES(RETRO_GTK, $retro_gtk_pkg_modules)
retro_gtk_pkg_modules="$retro_gtk_pkg_modules retro-gobject-0.8"
AC_SUBST(retro_gtk_pkg_modules)
diff --git a/retro-gobject/Makefile.am b/retro-gobject/Makefile.am
index a7c728b..e03cda5 100644
--- a/retro-gobject/Makefile.am
+++ b/retro-gobject/Makefile.am
@@ -27,6 +27,8 @@ dist_vapi_DATA = retro-gobject-0.8.vapi retro-gobject-0.8.deps
BUILT_SOURCES = retro-gobject-internal.h
libretro_gobject_la_SOURCES = \
+ audio/pa-player.vala \
+ \
input/controller.vala \
input/device.vala \
input/input.vala \
@@ -79,6 +81,8 @@ libretro_gobject_la_VALAFLAGS = \
--pkg gmodule-2.0 \
--pkg gobject-2.0 \
--pkg gtk+-3.0 \
+ --pkg libpulse \
+ --pkg libpulse-simple \
--vapidir=vapi \
--thread \
--target-glib 2.32 \
diff --git a/retro-gtk/audio/pa-player.vala b/retro-gobject/audio/pa-player.vala
similarity index 88%
rename from retro-gtk/audio/pa-player.vala
rename to retro-gobject/audio/pa-player.vala
index f77fe23..f58d03b 100644
--- a/retro-gtk/audio/pa-player.vala
+++ b/retro-gobject/audio/pa-player.vala
@@ -1,14 +1,12 @@
// This file is part of RetroGtk. License: GPLv3
-namespace RetroGtk {
-
-public class PaPlayer : GLib.Object {
- private Retro.Core core;
+public class Retro.PaPlayer : GLib.Object {
+ private Core core;
private ulong on_audio_output_id;
private double sample_rate;
private PulseAudio.Simple simple;
- public void set_core (Retro.Core core) {
+ public void set_core (Core core) {
if (this.core != null)
this.core.disconnect (on_audio_output_id);
@@ -37,6 +35,3 @@ public class PaPlayer : GLib.Object {
null);
}
}
-
-}
-
diff --git a/retro-gtk/Makefile.am b/retro-gtk/Makefile.am
index 0b0a64c..16cc38b 100644
--- a/retro-gtk/Makefile.am
+++ b/retro-gtk/Makefile.am
@@ -24,8 +24,6 @@ dist_vapi_DATA = retro-gtk-0.8.vapi retro-gtk-0.8.deps
BUILT_SOURCES =
libretro_gtk_la_SOURCES = \
- audio/pa-player.vala \
- \
input/gamepad-button-type.vala \
input/gamepad-configuration.vala \
input/input-device-manager.vala \
@@ -42,8 +40,6 @@ libretro_gtk_la_VALAFLAGS = \
--pkg glib-2.0 \
--pkg gobject-2.0 \
--pkg gtk+-3.0 \
- --pkg libpulse \
- --pkg libpulse-simple \
--pkg retro-gobject-0.8 \
--thread \
--target-glib 2.32 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]