From 84066e1a5dc71cb3adb298d8cb59154fbb7f99a3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 8 Jul 2015 20:12:20 +0200 Subject: [PATCH] Move all sorts of structs over to task_file_transfer.c --- runloop_data.h | 49 -------------------------------------- tasks/task_file_transfer.c | 49 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/runloop_data.h b/runloop_data.h index 66bf57cbce..707eb9a3f9 100644 --- a/runloop_data.h +++ b/runloop_data.h @@ -71,55 +71,6 @@ typedef struct http_handle } http_handle_t; #endif -typedef struct nbio_image_handle -{ - struct texture_image ti; - bool is_blocking; - bool is_blocking_on_processing; - bool is_finished; - transfer_cb_t cb; -#ifdef HAVE_RPNG - struct rpng_t *handle; -#endif - unsigned processing_pos_increment; - unsigned pos_increment; - uint64_t frame_count; - uint64_t processing_frame_count; - int processing_final_state; - msg_queue_t *msg_queue; - unsigned status; -} nbio_image_handle_t; - -enum nbio_image_status_enum -{ - NBIO_IMAGE_STATUS_POLL = 0, - NBIO_IMAGE_STATUS_TRANSFER, - NBIO_IMAGE_STATUS_TRANSFER_PARSE, - NBIO_IMAGE_STATUS_PROCESS_TRANSFER, - NBIO_IMAGE_STATUS_PROCESS_TRANSFER_PARSE, - NBIO_IMAGE_STATUS_TRANSFER_PARSE_FREE -}; - -enum nbio_status_enum -{ - NBIO_STATUS_POLL = 0, - NBIO_STATUS_TRANSFER, - NBIO_STATUS_TRANSFER_PARSE, - NBIO_STATUS_TRANSFER_PARSE_FREE -}; - -typedef struct nbio_handle -{ - nbio_image_handle_t image; - bool is_finished; - transfer_cb_t cb; - struct nbio_t *handle; - unsigned pos_increment; - uint64_t frame_count; - msg_queue_t *msg_queue; - unsigned status; -} nbio_handle_t; - #ifdef HAVE_LIBRETRODB typedef struct database_state_handle { diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c index dac08946e1..175ffdccc6 100644 --- a/tasks/task_file_transfer.c +++ b/tasks/task_file_transfer.c @@ -26,6 +26,55 @@ #define CB_MENU_WALLPAPER 0xb476e505U #define CB_MENU_BOXART 0x68b307cdU +enum nbio_image_status_enum +{ + NBIO_IMAGE_STATUS_POLL = 0, + NBIO_IMAGE_STATUS_TRANSFER, + NBIO_IMAGE_STATUS_TRANSFER_PARSE, + NBIO_IMAGE_STATUS_PROCESS_TRANSFER, + NBIO_IMAGE_STATUS_PROCESS_TRANSFER_PARSE, + NBIO_IMAGE_STATUS_TRANSFER_PARSE_FREE +}; + +enum nbio_status_enum +{ + NBIO_STATUS_POLL = 0, + NBIO_STATUS_TRANSFER, + NBIO_STATUS_TRANSFER_PARSE, + NBIO_STATUS_TRANSFER_PARSE_FREE +}; + +typedef struct nbio_image_handle +{ + struct texture_image ti; + bool is_blocking; + bool is_blocking_on_processing; + bool is_finished; + transfer_cb_t cb; +#ifdef HAVE_RPNG + struct rpng_t *handle; +#endif + unsigned processing_pos_increment; + unsigned pos_increment; + uint64_t frame_count; + uint64_t processing_frame_count; + int processing_final_state; + msg_queue_t *msg_queue; + unsigned status; +} nbio_image_handle_t; + +typedef struct nbio_handle +{ + nbio_image_handle_t image; + bool is_finished; + transfer_cb_t cb; + struct nbio_t *handle; + unsigned pos_increment; + uint64_t frame_count; + msg_queue_t *msg_queue; + unsigned status; +} nbio_handle_t; + static nbio_handle_t *nbio_ptr; void *rarch_main_data_nbio_get_ptr(void)