[retro-gtk] Move retro-gtk/video to retro-gobject/video
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk] Move retro-gtk/video to retro-gobject/video
- Date: Mon, 13 Feb 2017 16:09:16 +0000 (UTC)
commit a16d2a88f0cd1d7271fe48154beb79ad1ff8a64a
Author: Adrien Plazas <kekun plazas laposte net>
Date: Mon Feb 13 11:11:51 2017 +0100
Move retro-gtk/video to retro-gobject/video
https://bugzilla.gnome.org/show_bug.cgi?id=777489
configure.ac | 4 ++--
retro-gobject/Makefile.am | 14 ++++++++++++--
.../video/cairo-display.vala | 10 +++++-----
.../video/retro-video-converter.c | 0
.../video/video-filter.vala | 2 +-
retro-gtk/Makefile.am | 5 -----
6 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 742e164..ea5be54 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"
+retro_gobject_pkg_modules="gobject-2.0 glib-2.0 gmodule-2.0 gio-2.0 gtk+-3.0 cairo"
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 cairo libpulse libpulse-simple"
+retro_gtk_pkg_modules="gobject-2.0 glib-2.0 gtk+-3.0 libpulse libpulse-simple"
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 9947728..a7c728b 100644
--- a/retro-gobject/Makefile.am
+++ b/retro-gobject/Makefile.am
@@ -33,11 +33,15 @@ libretro_gobject_la_SOURCES = \
input/input-device.vala \
input/input-device-manager.vala \
input/keyboard.vala \
+ \
log/file-stream-log.vala \
log/log.vala \
+ \
loop/main-loop.vala \
+ \
variable/options.vala \
variable/variables.vala \
+ \
av-info.vala \
core.vala \
core-error.vala \
@@ -55,6 +59,10 @@ libretro_gobject_la_SOURCES = \
retro-core.c \
retro-environment.c \
libretro-environment.h \
+ \
+ video/cairo-display.vala \
+ video/retro-video-converter.c \
+ video/video-filter.vala \
$(NULL)
retro-core.c: retro-gobject-internal.h
@@ -64,11 +72,13 @@ retro-environment.c: retro-gobject-internal.h libretro-environment.h
libretro_gobject_la_LDFLAGS =
libretro_gobject_la_VALAFLAGS = \
+ --pkg cairo \
--pkg config \
+ --pkg gio-2.0 \
--pkg glib-2.0 \
- --pkg gobject-2.0 \
--pkg gmodule-2.0 \
- --pkg gio-2.0 \
+ --pkg gobject-2.0 \
+ --pkg gtk+-3.0 \
--vapidir=vapi \
--thread \
--target-glib 2.32 \
diff --git a/retro-gtk/video/cairo-display.vala b/retro-gobject/video/cairo-display.vala
similarity index 92%
rename from retro-gtk/video/cairo-display.vala
rename to retro-gobject/video/cairo-display.vala
index 3018324..e22bbc2 100644
--- a/retro-gtk/video/cairo-display.vala
+++ b/retro-gobject/video/cairo-display.vala
@@ -1,9 +1,9 @@
// This file is part of RetroGtk. License: GPLv3
-public class RetroGtk.CairoDisplay : Gtk.DrawingArea {
+public class Retro.CairoDisplay : Gtk.DrawingArea {
public Gdk.Pixbuf pixbuf { set; get; }
- private Retro.Core core;
+ private Core core;
private VideoFilter filter;
private ulong on_video_output_id;
private float aspect_ratio;
@@ -18,9 +18,9 @@ public class RetroGtk.CairoDisplay : Gtk.DrawingArea {
}
[CCode (cname = "gdk_pixbuf_new_from_video")]
- static extern Gdk.Pixbuf gdk_pixbuf_new_from_video ([CCode (array_length = false)] uint8[] data, uint
width, uint height, size_t pitch, Retro.PixelFormat pixel_format);
+ static extern Gdk.Pixbuf gdk_pixbuf_new_from_video ([CCode (array_length = false)] uint8[] data, uint
width, uint height, size_t pitch, PixelFormat pixel_format);
- public void set_core (Retro.Core core) {
+ public void set_core (Core core) {
if (this.core != null)
this.core.disconnect (on_video_output_id);
@@ -33,7 +33,7 @@ public class RetroGtk.CairoDisplay : Gtk.DrawingArea {
queue_draw ();
}
- private void on_video_output (uint8[] data, uint width, uint height, size_t pitch, Retro.PixelFormat
pixel_format, float aspect_ratio) {
+ private void on_video_output (uint8[] data, uint width, uint height, size_t pitch, PixelFormat
pixel_format, float aspect_ratio) {
this.aspect_ratio = aspect_ratio;
pixbuf = gdk_pixbuf_new_from_video (data, width, height, pitch, pixel_format);
}
diff --git a/retro-gtk/video/retro-video-converter.c b/retro-gobject/video/retro-video-converter.c
similarity index 100%
rename from retro-gtk/video/retro-video-converter.c
rename to retro-gobject/video/retro-video-converter.c
diff --git a/retro-gtk/video/video-filter.vala b/retro-gobject/video/video-filter.vala
similarity index 66%
rename from retro-gtk/video/video-filter.vala
rename to retro-gobject/video/video-filter.vala
index 2a3002b..4165a75 100644
--- a/retro-gtk/video/video-filter.vala
+++ b/retro-gobject/video/video-filter.vala
@@ -1,6 +1,6 @@
// This file is part of RetroGtk. License: GPLv3
-public enum RetroGtk.VideoFilter {
+public enum Retro.VideoFilter {
SMOOTH,
SHARP,
}
diff --git a/retro-gtk/Makefile.am b/retro-gtk/Makefile.am
index 1b96f4f..0b0a64c 100644
--- a/retro-gtk/Makefile.am
+++ b/retro-gtk/Makefile.am
@@ -33,10 +33,6 @@ libretro_gtk_la_SOURCES = \
input/keyboard-state.vala \
input/mouse.vala \
input/virtual-gamepad.vala \
- \
- video/cairo-display.vala \
- video/retro-video-converter.c \
- video/video-filter.vala \
$(NULL)
libretro_gtk_la_LDFLAGS =
@@ -46,7 +42,6 @@ libretro_gtk_la_VALAFLAGS = \
--pkg glib-2.0 \
--pkg gobject-2.0 \
--pkg gtk+-3.0 \
- --pkg cairo \
--pkg libpulse \
--pkg libpulse-simple \
--pkg retro-gobject-0.8 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]