[retro-gtk] Fix C code indentation and style
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk] Fix C code indentation and style
- Date: Thu, 11 May 2017 08:38:20 +0000 (UTC)
commit e3adfa49d5162d3d18b4de5d64628372a4ecab8e
Author: Adrien Plazas <kekun plazas laposte net>
Date: Thu May 11 07:59:44 2017 +0200
Fix C code indentation and style
This will help to make the style consistent as more C code will be
added.
https://bugzilla.gnome.org/show_bug.cgi?id=782501
retro-gtk/retro-core.c | 272 +++++++------
retro-gtk/retro-environment.c | 659 ++++++++++++++++++-------------
retro-gtk/video/retro-video-converter.c | 103 +++---
3 files changed, 594 insertions(+), 440 deletions(-)
---
diff --git a/retro-gtk/retro-core.c b/retro-gtk/retro-core.c
index b086ae0..7996036 100644
--- a/retro-gtk/retro-core.c
+++ b/retro-gtk/retro-core.c
@@ -2,157 +2,177 @@
#include "retro-gtk-internal.h"
-gboolean retro_core_supports_serialization (RetroCore *self) {
- RetroSerializeSize serialize_size = NULL;
- gsize size;
+gboolean
+retro_core_supports_serialization (RetroCore *self)
+{
+ RetroSerializeSize serialize_size = NULL;
+ gsize size;
- g_return_val_if_fail (self != NULL, FALSE);
+ g_return_val_if_fail (self != NULL, FALSE);
- retro_core_push_cb_data (self);
- serialize_size = retro_module_get_serialize_size (self->module);
- size = serialize_size ();
- retro_core_pop_cb_data ();
+ retro_core_push_cb_data (self);
+ serialize_size = retro_module_get_serialize_size (self->module);
+ size = serialize_size ();
+ retro_core_pop_cb_data ();
- return size > 0;
+ return size > 0;
}
-guint8 *retro_core_serialize_state (RetroCore *self, gsize *length, GError **error) {
- RetroSerializeSize serialize_size = NULL;
- RetroSerialize serialize = NULL;
- guint8 *data;
- gsize size;
- gboolean success;
+guint8 *
+retro_core_serialize_state (RetroCore *self,
+ gsize *length,
+ GError **error)
+{
+ RetroSerializeSize serialize_size = NULL;
+ RetroSerialize serialize = NULL;
+ guint8 *data;
+ gsize size;
+ gboolean success;
- g_return_val_if_fail (self != NULL, NULL);
- g_return_val_if_fail (length != NULL, NULL);
+ g_return_val_if_fail (self != NULL, NULL);
+ g_return_val_if_fail (length != NULL, NULL);
- serialize_size = retro_module_get_serialize_size (self->module);
+ serialize_size = retro_module_get_serialize_size (self->module);
- retro_core_push_cb_data (self);
- size = serialize_size ();
- retro_core_pop_cb_data ();
+ retro_core_push_cb_data (self);
+ size = serialize_size ();
+ retro_core_pop_cb_data ();
- if (size <= 0) {
- g_set_error (error,
- RETRO_CORE_ERROR,
- RETRO_CORE_ERROR_SERIALIZATION_NOT_SUPPORTED,
- "Couldn't serialize the internal state: serialization not supported.");
+ if (size <= 0) {
+ g_set_error (error,
+ RETRO_CORE_ERROR,
+ RETRO_CORE_ERROR_SERIALIZATION_NOT_SUPPORTED,
+ "Couldn't serialize the internal state: serialization not supported.");
- return NULL;
- }
+ return NULL;
+ }
- serialize = retro_module_get_serialize (self->module);
- data = g_new0 (guint8, size);
+ serialize = retro_module_get_serialize (self->module);
+ data = g_new0 (guint8, size);
- retro_core_push_cb_data (self);
- success = serialize (data, size);
- retro_core_pop_cb_data ();
+ retro_core_push_cb_data (self);
+ success = serialize (data, size);
+ retro_core_pop_cb_data ();
- if (!success) {
- g_set_error (error,
- RETRO_CORE_ERROR,
- RETRO_CORE_ERROR_COULDNT_SERIALIZE,
- "Couldn't serialize the internal state: serialization failed.");
- g_free (data);
+ if (!success) {
+ g_set_error (error,
+ RETRO_CORE_ERROR,
+ RETRO_CORE_ERROR_COULDNT_SERIALIZE,
+ "Couldn't serialize the internal state: serialization failed.");
+ g_free (data);
- return NULL;
- }
+ return NULL;
+ }
- *length = size;
+ *length = size;
- return data;
+ return data;
}
-void retro_core_deserialize_state (RetroCore *self, guint8 *data, gsize length, GError **error) {
- RetroSerializeSize serialize_size = NULL;
- RetroUnserialize unserialize = NULL;
- gsize size;
- gboolean success;
-
- g_return_if_fail (self != NULL);
- g_return_if_fail (data != NULL);
-
- serialize_size = retro_module_get_serialize_size (self->module);
-
- retro_core_push_cb_data (self);
- size = serialize_size ();
- retro_core_pop_cb_data ();
-
- if (size <= 0) {
- g_set_error (error,
- RETRO_CORE_ERROR,
- RETRO_CORE_ERROR_SERIALIZATION_NOT_SUPPORTED,
- "Couldn't deserialize the internal state: serialization not supported.");
-
- return;
- }
-
- if (length > size) {
- g_set_error (error,
- RETRO_CORE_ERROR,
- RETRO_CORE_ERROR_COULDNT_DESERIALIZE,
- "Couldn't deserialize the internal state: expected at most %"G_GSIZE_FORMAT"
bytes, got %"G_GSIZE_FORMAT".", size, length);
-
- return;
- }
-
- unserialize = retro_module_get_unserialize (self->module);
-
- retro_core_push_cb_data (self);
- success = unserialize (data, length);
- retro_core_pop_cb_data ();
-
- if (!success) {
- g_set_error (error,
- RETRO_CORE_ERROR,
- RETRO_CORE_ERROR_COULDNT_DESERIALIZE,
- "Couldn't deserialize the internal state: deserialization failed.");
- }
+void
+retro_core_deserialize_state (RetroCore *self,
+ guint8 *data,
+ gsize length,
+ GError **error)
+{
+ RetroSerializeSize serialize_size = NULL;
+ RetroUnserialize unserialize = NULL;
+ gsize size;
+ gboolean success;
+
+ g_return_if_fail (self != NULL);
+ g_return_if_fail (data != NULL);
+
+ serialize_size = retro_module_get_serialize_size (self->module);
+
+ retro_core_push_cb_data (self);
+ size = serialize_size ();
+ retro_core_pop_cb_data ();
+
+ if (size <= 0) {
+ g_set_error (error,
+ RETRO_CORE_ERROR,
+ RETRO_CORE_ERROR_SERIALIZATION_NOT_SUPPORTED,
+ "Couldn't deserialize the internal state: serialization not supported.");
+
+ return;
+ }
+
+ if (length > size) {
+ g_set_error (error,
+ RETRO_CORE_ERROR,
+ RETRO_CORE_ERROR_COULDNT_DESERIALIZE,
+ "Couldn't deserialize the internal state: expected at most %"G_GSIZE_FORMAT" bytes, got
%"G_GSIZE_FORMAT".", size, length);
+
+ return;
+ }
+
+ unserialize = retro_module_get_unserialize (self->module);
+
+ retro_core_push_cb_data (self);
+ success = unserialize (data, length);
+ retro_core_pop_cb_data ();
+
+ if (!success) {
+ g_set_error (error,
+ RETRO_CORE_ERROR,
+ RETRO_CORE_ERROR_COULDNT_DESERIALIZE,
+ "Couldn't deserialize the internal state: deserialization failed.");
+ }
}
-guint8 *retro_core_get_memory (RetroCore *self, RetroMemoryType id, gint *length) {
- RetroGetMemoryData get_mem_data;
- RetroGetMemorySize get_mem_size;
- guint8 *data;
- gsize size;
+guint8 *
+retro_core_get_memory (RetroCore *self,
+ RetroMemoryType id,
+ gint *length)
+{
+ RetroGetMemoryData get_mem_data;
+ RetroGetMemorySize get_mem_size;
+ guint8 *data;
+ gsize size;
- g_return_val_if_fail (self != NULL, NULL);
- g_return_val_if_fail (length != NULL, NULL);
+ g_return_val_if_fail (self != NULL, NULL);
+ g_return_val_if_fail (length != NULL, NULL);
- get_mem_data = retro_module_get_get_memory_data (self->module);
- get_mem_size = retro_module_get_get_memory_size (self->module);
+ get_mem_data = retro_module_get_get_memory_data (self->module);
+ get_mem_size = retro_module_get_get_memory_size (self->module);
- retro_core_push_cb_data (self);
- data = get_mem_data (id);
- size = get_mem_size (id);
- retro_core_pop_cb_data ();
+ retro_core_push_cb_data (self);
+ data = get_mem_data (id);
+ size = get_mem_size (id);
+ retro_core_pop_cb_data ();
- data = g_memdup (data, size);
- *length = (gint) (data != NULL ? size : 0);
+ data = g_memdup (data, size);
+ *length = (gint) (data != NULL ? size : 0);
- return data;
+ return data;
}
-void retro_core_set_memory (RetroCore *self, RetroMemoryType id, guint8 *data, gint length) {
- RetroGetMemoryData get_mem_region;
- RetroGetMemorySize get_mem_region_size;
- guint8 *memory_region;
- gsize memory_region_size;
-
- g_return_if_fail (self != NULL);
- g_return_if_fail (data != NULL);
- g_return_if_fail (length > 0);
-
- get_mem_region = retro_module_get_get_memory_data (self->module);
- get_mem_region_size = retro_module_get_get_memory_size (self->module);
-
- retro_core_push_cb_data (self);
- memory_region = get_mem_region (id);
- memory_region_size = get_mem_region_size (id);
- retro_core_pop_cb_data ();
-
- g_return_if_fail (memory_region != NULL);
- g_return_if_fail (memory_region_size == length);
-
- memcpy (memory_region, data, length);
+void
+retro_core_set_memory (RetroCore *self,
+ RetroMemoryType id,
+ guint8 *data,
+ gint length)
+{
+ RetroGetMemoryData get_mem_region;
+ RetroGetMemorySize get_mem_region_size;
+ guint8 *memory_region;
+ gsize memory_region_size;
+
+ g_return_if_fail (self != NULL);
+ g_return_if_fail (data != NULL);
+ g_return_if_fail (length > 0);
+
+ get_mem_region = retro_module_get_get_memory_data (self->module);
+ get_mem_region_size = retro_module_get_get_memory_size (self->module);
+
+ retro_core_push_cb_data (self);
+ memory_region = get_mem_region (id);
+ memory_region_size = get_mem_region_size (id);
+ retro_core_pop_cb_data ();
+
+ g_return_if_fail (memory_region != NULL);
+ g_return_if_fail (memory_region_size == length);
+
+ memcpy (memory_region, data, length);
}
diff --git a/retro-gtk/retro-environment.c b/retro-gtk/retro-environment.c
index 40099f6..8429c5d 100644
--- a/retro-gtk/retro-environment.c
+++ b/retro-gtk/retro-environment.c
@@ -3,436 +3,557 @@
#include "retro-gtk-internal.h"
#include "libretro-environment.h"
-void retro_core_set_system_av_info (RetroCore *self, RetroSystemAvInfo *system_av_info);
+void retro_core_set_system_av_info (RetroCore *self,
+ RetroSystemAvInfo *system_av_info);
typedef struct {
- gpointer log;
+ gpointer log;
} RetroLogCallback;
typedef struct {
- const gchar *msg;
- guint frames;
+ const gchar *msg;
+ guint frames;
} RetroMessage;
typedef struct {
- gpointer set_rumble_state;
+ gpointer set_rumble_state;
} RetroRumbleCallback;
-static gboolean rumble_callback_set_rumble_state (guint port, RetroRumbleEffect effect, guint16 strength) {
- RetroCore *cb_data = retro_core_get_cb_data ();
- if (!cb_data)
- g_return_val_if_reached (FALSE);
+static gboolean
+rumble_callback_set_rumble_state (guint port,
+ RetroRumbleEffect effect,
+ guint16 strength)
+{
+ RetroCore *cb_data;
+ RetroRumble *interface;
- RetroRumble *interface = retro_core_get_rumble_interface (cb_data);
- if (!interface)
- g_return_val_if_reached (FALSE);
+ cb_data = retro_core_get_cb_data ();
+ if (!cb_data)
+ g_return_val_if_reached (FALSE);
- return RETRO_RUMBLE_GET_INTERFACE (interface)->set_rumble_state (interface, port, effect, strength);
+ interface = retro_core_get_rumble_interface (cb_data);
+ if (!interface)
+ g_return_val_if_reached (FALSE);
+
+ return RETRO_RUMBLE_GET_INTERFACE (interface)->set_rumble_state (interface,
+ port,
+ effect,
+ strength);
}
-static void on_log (guint level, const gchar *format, ...) {
- gchar *message;
+static void
+on_log (guint level, const gchar *format, ...)
+{
+ gchar *message;
+ va_list args;
- // Get the arguments, set up the formatted message,
- // pass it to the logging method and free it.
- va_list args;
- va_start (args, format);
- message = g_strdup_vprintf (format, args);
+ // Get the arguments, set up the formatted message,
+ // pass it to the logging method and free it.
+ va_start (args, format);
+ message = g_strdup_vprintf (format, args);
- switch (level) {
- case RETRO_LOG_LEVEL_DEBUG:
- g_debug ("%s", message);
+ switch (level) {
+ case RETRO_LOG_LEVEL_DEBUG:
+ g_debug ("%s", message);
- break;
- case RETRO_LOG_LEVEL_INFO:
- g_info ("%s", message);
+ break;
+ case RETRO_LOG_LEVEL_INFO:
+ g_info ("%s", message);
- break;
- case RETRO_LOG_LEVEL_WARN:
- g_warning ("%s", message);
+ break;
+ case RETRO_LOG_LEVEL_WARN:
+ g_warning ("%s", message);
- break;
- case RETRO_LOG_LEVEL_ERROR:
- g_critical ("%s", message);
+ break;
+ case RETRO_LOG_LEVEL_ERROR:
+ g_critical ("%s", message);
- break;
- }
+ break;
+ }
- g_free (message);
+ g_free (message);
}
-static gboolean get_can_dupe (RetroCore *self, gboolean *can_dupe) {
- *can_dupe = TRUE;
+/* Environment commands */
+
+static gboolean
+get_can_dupe (RetroCore *self,
+ gboolean *can_dupe)
+{
+ *can_dupe = TRUE;
- return TRUE;
+ return TRUE;
}
-static gboolean get_content_directory (RetroCore *self, const gchar* *content_directory) {
- *(content_directory) = retro_core_get_content_directory (self);
+static gboolean
+get_content_directory (RetroCore *self,
+ const gchar **content_directory)
+{
+ *(content_directory) = retro_core_get_content_directory (self);
- return TRUE;
+ return TRUE;
}
-static gboolean get_input_device_capabilities (RetroCore *self, guint64 *capabilities) {
- RetroInput *input;
+static gboolean
+get_input_device_capabilities (RetroCore *self,
+ guint64 *capabilities)
+{
+ RetroInput *input;
- input = retro_core_get_input_interface (self);
+ input = retro_core_get_input_interface (self);
- g_return_val_if_fail (input != NULL, FALSE);
+ g_return_val_if_fail (input != NULL, FALSE);
- *capabilities = retro_input_get_device_capabilities (input);
+ *capabilities = retro_input_get_device_capabilities (input);
- return TRUE;
+ return TRUE;
}
-static gboolean get_libretro_path (RetroCore *self, const gchar* *libretro_directory) {
- *(libretro_directory) = retro_core_get_libretro_path (self);
+static gboolean
+get_libretro_path (RetroCore *self,
+ const gchar **libretro_directory)
+{
+ *(libretro_directory) = retro_core_get_libretro_path (self);
- return TRUE;
+ return TRUE;
}
-static gboolean get_log_callback (RetroCore *self, RetroLogCallback *cb) {
- cb->log = on_log;
+static gboolean
+get_log_callback (RetroCore *self,
+ RetroLogCallback *cb)
+{
+ cb->log = on_log;
- return TRUE;
+ return TRUE;
}
-static gboolean get_overscan (RetroCore *self, gboolean *overscan) {
- *overscan = FALSE;
+static gboolean
+get_overscan (RetroCore *self,
+ gboolean *overscan)
+{
+ *overscan = FALSE;
- return TRUE;
+ return TRUE;
}
-static gboolean get_rumble_callback (RetroCore *self, RetroRumbleCallback *cb) {
- void *interface_exists = retro_core_get_rumble_interface (self);
- if (!interface_exists)
- return FALSE;
+static gboolean
+get_rumble_callback (RetroCore *self,
+ RetroRumbleCallback *cb)
+{
+ gpointer interface_exists = retro_core_get_rumble_interface (self);
+ if (!interface_exists)
+ return FALSE;
- cb->set_rumble_state = rumble_callback_set_rumble_state;
+ cb->set_rumble_state = rumble_callback_set_rumble_state;
- return TRUE;
+ return TRUE;
}
-static gboolean get_save_directory (RetroCore *self, const gchar* *save_directory) {
- *(save_directory) = retro_core_get_save_directory (self);
+static gboolean
+get_save_directory (RetroCore *self,
+ const gchar **save_directory)
+{
+ *(save_directory) = retro_core_get_save_directory (self);
- return TRUE;
+ return TRUE;
}
-static gboolean get_system_directory (RetroCore *self, const gchar* *system_directory) {
- *(system_directory) = retro_core_get_system_directory (self);
+static gboolean
+get_system_directory (RetroCore *self,
+ const gchar **system_directory)
+{
+ *(system_directory) = retro_core_get_system_directory (self);
- return TRUE;
+ return TRUE;
}
-static gboolean get_variable (RetroCore *self, RetroVariable *variable) {
- gchar *result;
+static gboolean
+get_variable (RetroCore *self,
+ RetroVariable *variable)
+{
+ gchar *result;
- result = retro_variables_get_variable (self->variables_interface, variable->key);
- variable->value = result ? result : "";
+ result = retro_variables_get_variable (self->variables_interface,
+ variable->key);
+ variable->value = result ? result : "";
- return !!result;
+ return !!result;
}
-static gboolean get_variable_update (RetroCore *self, gboolean *update) {
- *update = retro_variables_get_variable_update (self->variables_interface);
+static gboolean
+get_variable_update (RetroCore *self,
+ gboolean *update)
+{
+ *update = retro_variables_get_variable_update (self->variables_interface);
- return TRUE;
+ return TRUE;
}
-static gboolean set_disk_control_interface (RetroCore *self, RetroDiskControlCallback *callback) {
- retro_core_set_disk_control_interface (self, RETRO_DISK_CONTROL (retro_disk_control_new (self,
callback)));
+static gboolean
+set_disk_control_interface (RetroCore *self,
+ RetroDiskControlCallback *callback)
+{
+ // TODO Split this in two lines.
+ retro_core_set_disk_control_interface (self, RETRO_DISK_CONTROL (retro_disk_control_new (self, callback)));
- return TRUE;
+ return TRUE;
}
-static gboolean set_input_descriptors (RetroCore *self, RetroInputDescriptor *descriptors) {
- RetroInput *input;
- int length;
+static gboolean
+set_input_descriptors (RetroCore *self,
+ RetroInputDescriptor *descriptors)
+{
+ RetroInput *input;
+ int length;
- input = retro_core_get_input_interface (self);
+ input = retro_core_get_input_interface (self);
- g_return_val_if_fail (input != NULL, FALSE);
+ g_return_val_if_fail (input != NULL, FALSE);
- for (length = 0 ; descriptors[length].description ; length++);
- retro_input_set_descriptors (input, descriptors, length);
+ for (length = 0 ; descriptors[length].description ; length++);
+ retro_input_set_descriptors (input, descriptors, length);
- return TRUE;
+ return TRUE;
}
-static gboolean set_message (RetroCore *self, const RetroMessage *message) {
- gboolean result = FALSE;
- g_signal_emit_by_name (self, "message", message->msg, message->frames, &result);
+static gboolean
+set_message (RetroCore *self,
+ const RetroMessage *message)
+{
+ gboolean result = FALSE;
+ g_signal_emit_by_name (self, "message", message->msg, message->frames, &result);
- return result;
+ return result;
}
-static gboolean set_pixel_format (RetroCore *self, const RetroPixelFormat *pixel_format) {
- self->pixel_format = *pixel_format;
+static gboolean
+set_pixel_format (RetroCore *self,
+ const RetroPixelFormat *pixel_format)
+{
+ self->pixel_format = *pixel_format;
- return TRUE;
+ return TRUE;
}
-static gboolean set_rotation (RetroCore *self, const RetroRotation *rotation) {
- self->rotation = *rotation;
+static gboolean
+set_rotation (RetroCore *self,
+ const RetroRotation *rotation)
+{
+ self->rotation = *rotation;
- return TRUE;
+ return TRUE;
}
-static gboolean set_support_no_game (RetroCore *self, gboolean *support_no_game) {
- retro_core_set_support_no_game (self, *support_no_game);
+static gboolean
+set_support_no_game (RetroCore *self,
+ gboolean *support_no_game)
+{
+ retro_core_set_support_no_game (self, *support_no_game);
- return TRUE;
+ return TRUE;
}
-static gboolean set_system_av_info (RetroCore *self, RetroSystemAvInfo *system_av_info) {
- retro_core_set_system_av_info (self, system_av_info);
+static gboolean
+set_system_av_info (RetroCore *self,
+ RetroSystemAvInfo *system_av_info)
+{
+ retro_core_set_system_av_info (self, system_av_info);
- return TRUE;
+ return TRUE;
}
-static gboolean set_variables (RetroCore *self, RetroVariable *variable_array) {
- int length;
+static gboolean
+set_variables (RetroCore *self,
+ RetroVariable *variable_array)
+{
+ int length;
- for (length = 0 ; variable_array[length].key && variable_array[length].value ; length++);
- retro_variables_set_variable (self->variables_interface, variable_array, length);
+ for (length = 0 ;
+ variable_array[length].key && variable_array[length].value ;
+ length++);
+ retro_variables_set_variable (self->variables_interface,
+ variable_array, length);
- return TRUE;
+ return TRUE;
}
-static gboolean shutdown (RetroCore *self) {
- gboolean result = FALSE;
- g_signal_emit_by_name (self, "shutdown", &result);
+static gboolean
+shutdown (RetroCore *self)
+{
+ gboolean result = FALSE;
+ g_signal_emit_by_name (self, "shutdown", &result);
- return result;
+ return result;
}
-static gboolean environment_core_command (RetroCore *self, unsigned cmd, gpointer data) {
- if (!self)
- return FALSE;
+static gboolean
+environment_core_command (RetroCore *self,
+ unsigned cmd,
+ gpointer data)
+{
+ if (!self)
+ return FALSE;
- switch (cmd) {
- case RETRO_ENVIRONMENT_GET_CAN_DUPE:
- return get_can_dupe (self, (gboolean *) data);
+ switch (cmd) {
+ case RETRO_ENVIRONMENT_GET_CAN_DUPE:
+ return get_can_dupe (self, (gboolean *) data);
- case RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY:
- return get_content_directory (self, (const gchar* *) data);
+ case RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY:
+ return get_content_directory (self, (const gchar **) data);
- case RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES:
- return get_input_device_capabilities (self, (guint64 *) data);
+ case RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES:
+ return get_input_device_capabilities (self, (guint64 *) data);
- case RETRO_ENVIRONMENT_GET_LIBRETRO_PATH:
- return get_libretro_path (self, (const gchar* *) data);
+ case RETRO_ENVIRONMENT_GET_LIBRETRO_PATH:
+ return get_libretro_path (self, (const gchar **) data);
- case RETRO_ENVIRONMENT_GET_LOG_INTERFACE:
- return get_log_callback (self, (RetroLogCallback *) data);
+ case RETRO_ENVIRONMENT_GET_LOG_INTERFACE:
+ return get_log_callback (self, (RetroLogCallback *) data);
- case RETRO_ENVIRONMENT_GET_OVERSCAN:
- return get_overscan (self, (gboolean *) data);
+ case RETRO_ENVIRONMENT_GET_OVERSCAN:
+ return get_overscan (self, (gboolean *) data);
- case RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE:
- return get_rumble_callback (self, (RetroRumbleCallback *) data);
+ case RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE:
+ return get_rumble_callback (self, (RetroRumbleCallback *) data);
- case RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY:
- return get_save_directory (self, (const gchar* *) data);
+ case RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY:
+ return get_save_directory (self, (const gchar **) data);
- case RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY:
- return get_system_directory (self, (const gchar* *) data);
+ case RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY:
+ return get_system_directory (self, (const gchar **) data);
- case RETRO_ENVIRONMENT_GET_VARIABLE:
- return get_variable (self, (RetroVariable *) data);
+ case RETRO_ENVIRONMENT_GET_VARIABLE:
+ return get_variable (self, (RetroVariable *) data);
- case RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE:
- return get_variable_update (self, (gboolean *) data);
+ case RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE:
+ return get_variable_update (self, (gboolean *) data);
- case RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE:
- set_disk_control_interface (self, (RetroDiskControlCallback *) data);
+ case RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE:
+ set_disk_control_interface (self, (RetroDiskControlCallback *) data);
- case RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS:
- return set_input_descriptors (self, (RetroInputDescriptor *) data);
+ case RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS:
+ return set_input_descriptors (self, (RetroInputDescriptor *) data);
- case RETRO_ENVIRONMENT_SET_MESSAGE:
- return set_message (self, (RetroMessage *) data);
+ case RETRO_ENVIRONMENT_SET_MESSAGE:
+ return set_message (self, (RetroMessage *) data);
- case RETRO_ENVIRONMENT_SET_PIXEL_FORMAT:
- return set_pixel_format (self, (RetroPixelFormat *) data);
+ case RETRO_ENVIRONMENT_SET_PIXEL_FORMAT:
+ return set_pixel_format (self, (RetroPixelFormat *) data);
- case RETRO_ENVIRONMENT_SET_ROTATION:
- return set_rotation (self, (RetroRotation *) data);
+ case RETRO_ENVIRONMENT_SET_ROTATION:
+ return set_rotation (self, (RetroRotation *) data);
- case RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME:
- return set_support_no_game (self, (gboolean *) data);
+ case RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME:
+ return set_support_no_game (self, (gboolean *) data);
- case RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO:
- return set_system_av_info (self, (RetroSystemAvInfo *) data);
+ case RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO:
+ return set_system_av_info (self, (RetroSystemAvInfo *) data);
- case RETRO_ENVIRONMENT_SET_VARIABLES:
- return set_variables (self, (RetroVariable *) data);
+ case RETRO_ENVIRONMENT_SET_VARIABLES:
+ return set_variables (self, (RetroVariable *) data);
- case RETRO_ENVIRONMENT_SHUTDOWN:
- return shutdown (self);
+ case RETRO_ENVIRONMENT_SHUTDOWN:
+ return shutdown (self);
- case RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE:
- case RETRO_ENVIRONMENT_GET_LANGUAGE:
- case RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE:
- case RETRO_ENVIRONMENT_GET_PERF_INTERFACE:
- case RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE:
- case RETRO_ENVIRONMENT_GET_USERNAME:
- case RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK:
- case RETRO_ENVIRONMENT_SET_CONTROLLER_INFO:
- case RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK:
- case RETRO_ENVIRONMENT_SET_GEOMETRY:
- case RETRO_ENVIRONMENT_SET_HW_RENDER:
- case RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK:
- case RETRO_ENVIRONMENT_SET_MEMORY_MAPS:
- case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL:
- case RETRO_ENVIRONMENT_SET_PROC_ADDRESS_CALLBACK:
- case RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO:
- default:
- return FALSE;
- }
+ case RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE:
+ case RETRO_ENVIRONMENT_GET_LANGUAGE:
+ case RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE:
+ case RETRO_ENVIRONMENT_GET_PERF_INTERFACE:
+ case RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE:
+ case RETRO_ENVIRONMENT_GET_USERNAME:
+ case RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK:
+ case RETRO_ENVIRONMENT_SET_CONTROLLER_INFO:
+ case RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK:
+ case RETRO_ENVIRONMENT_SET_GEOMETRY:
+ case RETRO_ENVIRONMENT_SET_HW_RENDER:
+ case RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK:
+ case RETRO_ENVIRONMENT_SET_MEMORY_MAPS:
+ case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL:
+ case RETRO_ENVIRONMENT_SET_PROC_ADDRESS_CALLBACK:
+ case RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO:
+ default:
+ return FALSE;
+ }
}
-static gboolean on_environment_interface (unsigned cmd, gpointer data) {
- RetroCore *self;
+/* Core callbacks */
- self = retro_core_get_cb_data ();
+static gboolean
+on_environment_interface (unsigned cmd,
+ gpointer data)
+{
+ RetroCore *self;
- if (self == NULL)
- g_assert_not_reached ();
+ self = retro_core_get_cb_data ();
- return environment_core_command (self, cmd, data);
+ if (self == NULL)
+ g_assert_not_reached ();
+
+ return environment_core_command (self, cmd, data);
}
-static void on_video_refresh (guint8* data, guint width, guint height, gsize pitch) {
- RetroCore *self;
+static void
+on_video_refresh (guint8 *data,
+ guint width,
+ guint height,
+ gsize pitch)
+{
+ RetroCore *self;
- if (data == NULL)
- return;
+ if (data == NULL)
+ return;
- self = retro_core_get_cb_data ();
+ self = retro_core_get_cb_data ();
- if (self == NULL)
- g_return_if_reached ();
+ if (self == NULL)
+ g_return_if_reached ();
- g_signal_emit_by_name (self, "video_output", data, pitch * height, width, height, pitch,
self->pixel_format, self->aspect_ratio);
+ g_signal_emit_by_name (self, "video_output", data, pitch * height,
+ width, height, pitch, self->pixel_format,
+ self->aspect_ratio);
}
-gpointer retro_core_get_module_video_refresh_cb (RetroCore *self) {
- return on_video_refresh;
+// TODO This is internal, make it private as soon as possible.
+gpointer
+retro_core_get_module_video_refresh_cb (RetroCore *self)
+{
+ return on_video_refresh;
}
-static void on_audio_sample (gint16 left, gint16 right) {
- RetroCore *self;
- gint16 samples[] = { left, right };
+static void
+on_audio_sample (gint16 left,
+ gint16 right)
+{
+ RetroCore *self;
+ gint16 samples[] = { left, right };
- self = retro_core_get_cb_data ();
+ self = retro_core_get_cb_data ();
- if (self == NULL)
- g_return_if_reached ();
+ if (self == NULL)
+ g_return_if_reached ();
- if (self->sample_rate <= 0.0)
- return;
+ if (self->sample_rate <= 0.0)
+ return;
- g_signal_emit_by_name (self, "audio_output", samples, 2, self->sample_rate);
+ g_signal_emit_by_name (self, "audio_output", samples, 2, self->sample_rate);
}
-static gsize on_audio_sample_batch (gint16* data, int frames) {
- RetroCore *self;
+static gsize
+on_audio_sample_batch (gint16 *data,
+ int frames)
+{
+ RetroCore *self;
- self = retro_core_get_cb_data ();
+ self = retro_core_get_cb_data ();
- if (self == NULL)
- g_return_val_if_reached (0);
+ if (self == NULL)
+ g_return_val_if_reached (0);
- if (self->sample_rate <= 0.0)
- return 0;
+ if (self->sample_rate <= 0.0)
+ return 0;
- g_signal_emit_by_name (self, "audio_output", data, frames * 2, self->sample_rate);
+ g_signal_emit_by_name (self, "audio_output", data, frames * 2, self->sample_rate);
- // FIXME What should be returned?
- return 0;
+ // FIXME What should be returned?
+ return 0;
}
-static void on_input_poll () {
- RetroCore *self;
- RetroInput *input;
+static void
+on_input_poll ()
+{
+ RetroCore *self;
+ RetroInput *input;
- self = retro_core_get_cb_data ();
+ self = retro_core_get_cb_data ();
- if (self == NULL)
- g_return_if_reached ();
+ if (self == NULL)
+ g_return_if_reached ();
- input = retro_core_get_input_interface (self);
+ input = retro_core_get_input_interface (self);
- if (input == NULL)
- g_return_if_reached ();
+ if (input == NULL)
+ g_return_if_reached ();
- retro_input_poll (input);
+ retro_input_poll (input);
}
-static gint16 on_input_state (guint port, guint device, guint index, guint id) {
- RetroCore *self;
- RetroInput *input;
+static gint16
+on_input_state (guint port,
+ guint device,
+ guint index,
+ guint id)
+{
+ RetroCore *self;
+ RetroInput *input;
- self = retro_core_get_cb_data ();
+ self = retro_core_get_cb_data ();
- if (self == NULL)
- g_return_val_if_reached (0);
+ if (self == NULL)
+ g_return_val_if_reached (0);
- input = retro_core_get_input_interface (self);
+ input = retro_core_get_input_interface (self);
- if (input == NULL)
- g_return_val_if_reached (0);
+ if (input == NULL)
+ g_return_val_if_reached (0);
- return retro_input_get_state (input, port, device, index, id);
+ return retro_input_get_state (input, port, device, index, id);
}
-void retro_core_set_environment_interface (RetroCore *self) {
- RetroModule *module;
- RetroCallbackSetter set_environment;
+// TODO This is internal, make it private as soon as possible.
+void
+retro_core_set_environment_interface (RetroCore *self)
+{
+ RetroModule *module;
+ RetroCallbackSetter set_environment;
- module = self->module;
- set_environment = retro_module_get_set_environment (module);
+ module = self->module;
+ set_environment = retro_module_get_set_environment (module);
- retro_core_push_cb_data (self);
- set_environment (on_environment_interface);
- retro_core_pop_cb_data ();
+ retro_core_push_cb_data (self);
+ set_environment (on_environment_interface);
+ retro_core_pop_cb_data ();
}
-void retro_core_set_callbacks (RetroCore *self) {
- RetroModule *module;
- RetroCallbackSetter set_video_refresh;
- RetroCallbackSetter set_audio_sample;
- RetroCallbackSetter set_audio_sample_batch;
- RetroCallbackSetter set_input_poll;
- RetroCallbackSetter set_input_state;
+// TODO This is internal, make it private as soon as possible.
+void
+retro_core_set_callbacks (RetroCore *self)
+{
+ RetroModule *module;
+ RetroCallbackSetter set_video_refresh;
+ RetroCallbackSetter set_audio_sample;
+ RetroCallbackSetter set_audio_sample_batch;
+ RetroCallbackSetter set_input_poll;
+ RetroCallbackSetter set_input_state;
- module = self->module;
- set_video_refresh = retro_module_get_set_video_refresh (module);
- set_audio_sample = retro_module_get_set_audio_sample (module);
- set_audio_sample_batch = retro_module_get_set_audio_sample_batch (module);
- set_input_poll = retro_module_get_set_input_poll (module);
- set_input_state = retro_module_get_set_input_state (module);
+ module = self->module;
+ set_video_refresh = retro_module_get_set_video_refresh (module);
+ set_audio_sample = retro_module_get_set_audio_sample (module);
+ set_audio_sample_batch = retro_module_get_set_audio_sample_batch (module);
+ set_input_poll = retro_module_get_set_input_poll (module);
+ set_input_state = retro_module_get_set_input_state (module);
- retro_core_push_cb_data (self);
- set_video_refresh (on_video_refresh);
- set_audio_sample (on_audio_sample);
- set_audio_sample_batch (on_audio_sample_batch);
- set_input_poll (on_input_poll);
- set_input_state (on_input_state);
- retro_core_pop_cb_data ();
+ retro_core_push_cb_data (self);
+ set_video_refresh (on_video_refresh);
+ set_audio_sample (on_audio_sample);
+ set_audio_sample_batch (on_audio_sample_batch);
+ set_input_poll (on_input_poll);
+ set_input_state (on_input_state);
+ retro_core_pop_cb_data ();
}
-void retro_core_set_system_av_info (RetroCore *self, RetroSystemAvInfo *system_av_info) {
- if (self->_frames_per_second != system_av_info->timing.fps) {
- self->_frames_per_second = system_av_info->timing.fps;
- g_object_notify (G_OBJECT (self), "frames-per-second");
- }
- if (system_av_info->geometry.aspect_ratio > 0.f)
- self->aspect_ratio = system_av_info->geometry.aspect_ratio;
- else
- self->aspect_ratio = (float) system_av_info->geometry.base_width / (float)
system_av_info->geometry.base_height;
- self->sample_rate = system_av_info->timing.sample_rate;
+// TODO This is internal, make it private as soon as possible.
+void
+retro_core_set_system_av_info (RetroCore *self,
+ RetroSystemAvInfo *system_av_info)
+{
+ if (self->_frames_per_second != system_av_info->timing.fps) {
+ self->_frames_per_second = system_av_info->timing.fps;
+ g_object_notify (G_OBJECT (self), "frames-per-second");
+ }
+ if (system_av_info->geometry.aspect_ratio > 0.f)
+ self->aspect_ratio = system_av_info->geometry.aspect_ratio;
+ else
+ self->aspect_ratio = (float) system_av_info->geometry.base_width /
+ (float) system_av_info->geometry.base_height;
+ self->sample_rate = system_av_info->timing.sample_rate;
}
-
diff --git a/retro-gtk/video/retro-video-converter.c b/retro-gtk/video/retro-video-converter.c
index b5d605d..31495b5 100644
--- a/retro-gtk/video/retro-video-converter.c
+++ b/retro-gtk/video/retro-video-converter.c
@@ -4,61 +4,72 @@
#include "retro-gtk-internal.h"
-typedef struct _xrgb1555 xrgb1555;
-struct _xrgb1555 {
+typedef struct _xrgb1555 {
guint16 b: 5;
guint16 g: 5;
guint16 r: 5;
guint16 x: 1;
-};
+} xrgb1555;
-typedef struct _xrgb8888 xrgb8888;
-struct _xrgb8888 {
+typedef struct _xrgb8888 {
guint32 b: 8;
guint32 g: 8;
guint32 r: 8;
guint32 x: 8;
-};
+} xrgb8888;
-typedef struct _rgb565 rgb565;
-struct _rgb565 {
+typedef struct _rgb565 {
guint16 b: 5;
guint16 g: 6;
guint16 r: 5;
-};
+} rgb565;
-typedef struct _rgba8888 rgba8888;
-struct _rgba8888 {
+typedef struct _rgba8888 {
guint32 a: 8;
guint32 b: 8;
guint32 g: 8;
guint32 r: 8;
-};
+} rgba8888;
-typedef rgba8888 (*GetRGBA8888) (const gpointer pixel);
+typedef rgba8888 (*GetRGBA8888) (gconstpointer pixel);
static rgba8888
-rgba8888_from_xrgb1555 (const gpointer data)
+rgba8888_from_xrgb1555 (gconstpointer data)
{
xrgb1555 pixel = *(const xrgb1555 *) data;
- return (rgba8888) { pixel.r << 3 | pixel.r >> 2, pixel.g << 3 | pixel.g >> 2, pixel.b << 3 | pixel.b >> 2,
0xff };
+ return (rgba8888) {
+ pixel.r << 3 | pixel.r >> 2,
+ pixel.g << 3 | pixel.g >> 2,
+ pixel.b << 3 | pixel.b >> 2,
+ 0xff,
+ };
}
static rgba8888
-rgba8888_from_xrgb8888 (const gpointer data)
+rgba8888_from_xrgb8888 (gconstpointer data)
{
xrgb8888 pixel = *(const xrgb8888 *) data;
- return (rgba8888) { pixel.r, pixel.g, pixel.b, 0xff };
+ return (rgba8888) {
+ pixel.r,
+ pixel.g,
+ pixel.b,
+ 0xff,
+ };
}
static rgba8888
-rgba8888_from_rgb565 (const gpointer data)
+rgba8888_from_rgb565 (gconstpointer data)
{
rgb565 pixel = *(const rgb565 *) data;
- return (rgba8888) { pixel.r << 3 | pixel.r >> 2, pixel.g << 2 | pixel.g >> 4, pixel.b << 3 | pixel.b >> 2,
0xff };
+ return (rgba8888) {
+ pixel.r << 3 | pixel.r >> 2,
+ pixel.g << 2 | pixel.g >> 4,
+ pixel.b << 3 | pixel.b >> 2,
+ 0xff,
+ };
}
static gboolean
@@ -88,16 +99,17 @@ get_interface_for_pixel_format (gint pixel_format,
}
/**
- * The destination buffer must be at least 'height * width * sizeof (rgba8888)' bytes long.
+ * The destination buffer must be at least `height * width * sizeof (rgba8888)`
+ * bytes long.
*/
static void
-rgba8888_from_video (const gpointer src,
- rgba8888 *dst,
- size_t pixel_size,
- guint width,
- guint height,
- gsize pitch,
- GetRGBA8888 get_pixel)
+rgba8888_from_video (gconstpointer src,
+ rgba8888 *dst,
+ size_t pixel_size,
+ guint width,
+ guint height,
+ gsize pitch,
+ GetRGBA8888 get_pixel)
{
gsize row, src_row, dst_row, col, src_col;
@@ -114,11 +126,11 @@ rgba8888_from_video (const gpointer src,
}
static rgba8888 *
-new_rgba8888_from_video (const gpointer src,
- guint width,
- guint height,
- gsize pitch,
- gint pixel_format)
+new_rgba8888_from_video (gconstpointer src,
+ guint width,
+ guint height,
+ gsize pitch,
+ gint pixel_format)
{
GetRGBA8888 get_pixel;
gsize pixel_size;
@@ -134,29 +146,30 @@ new_rgba8888_from_video (const gpointer src,
}
static void
-pixels_free (guchar *pixels, gpointer data) {
+pixels_free (guchar *pixels,
+ gpointer data)
+{
g_free (pixels);
}
GdkPixbuf *
-gdk_pixbuf_new_from_video (const gpointer src,
- guint width,
- guint height,
- gsize pitch,
- gint pixel_format)
+gdk_pixbuf_new_from_video (gconstpointer src,
+ guint width,
+ guint height,
+ gsize pitch,
+ gint pixel_format)
{
rgba8888 *dst;
+ GdkPixbuf *pixbuf;
dst = new_rgba8888_from_video (src, width, height, pitch, pixel_format);
if (dst == NULL)
return NULL;
- GdkColorspace colorspace = GDK_COLORSPACE_RGB;
- gboolean has_alpha = TRUE;
- gint bits_per_sample = 8;
- gint rowstride = width * sizeof (rgba8888);
-
- GdkPixbuf *pb = gdk_pixbuf_new_from_data ((guchar *) dst, colorspace, has_alpha, bits_per_sample, width,
height, rowstride, pixels_free, NULL);
+ pixbuf = gdk_pixbuf_new_from_data ((guchar *) dst,
+ GDK_COLORSPACE_RGB, TRUE, 8,
+ width, height, width * sizeof (rgba8888),
+ pixels_free, NULL);
- return pb;
+ return pixbuf;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
