mirror of https://github.com/snes9xgit/snes9x.git
GTK+: Style: Remove voids from parameter list.
This commit is contained in:
Brandon Wright
parent
4536194e32
commit
a04ccfc02c
|
|
@ -11,7 +11,7 @@
|
|||
#include "gtk_s9x.h"
|
||||
#include "gtk_binding.h"
|
||||
|
||||
Binding::Binding (void)
|
||||
Binding::Binding ()
|
||||
{
|
||||
value = 0;
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ Binding::matches (Binding &binding)
|
|||
}
|
||||
|
||||
void
|
||||
Binding::clear (void)
|
||||
Binding::clear ()
|
||||
{
|
||||
value = 0;
|
||||
|
||||
|
|
@ -102,55 +102,55 @@ Binding::clear (void)
|
|||
}
|
||||
|
||||
unsigned int
|
||||
Binding::hex (void)
|
||||
Binding::hex ()
|
||||
{
|
||||
return value;
|
||||
}
|
||||
|
||||
unsigned int
|
||||
Binding::base_hex (void)
|
||||
Binding::base_hex ()
|
||||
{
|
||||
return (value & ~BINDING_THRESHOLD_MASK);
|
||||
}
|
||||
|
||||
bool
|
||||
Binding::is_joy (void)
|
||||
Binding::is_joy ()
|
||||
{
|
||||
return (value & BINDING_JOY);
|
||||
}
|
||||
|
||||
bool
|
||||
Binding::is_key (void)
|
||||
Binding::is_key ()
|
||||
{
|
||||
return (value & BINDING_KEY);
|
||||
}
|
||||
|
||||
unsigned int
|
||||
Binding::get_key (void)
|
||||
Binding::get_key ()
|
||||
{
|
||||
return (value & BINDING_KEY_MASK);
|
||||
}
|
||||
|
||||
unsigned int
|
||||
Binding::get_device (void)
|
||||
Binding::get_device ()
|
||||
{
|
||||
return JOY_DEVICE_UNMASK (value);
|
||||
}
|
||||
|
||||
unsigned int
|
||||
Binding::get_threshold (void)
|
||||
Binding::get_threshold ()
|
||||
{
|
||||
return THRESHOLD_UNMASK (value);
|
||||
}
|
||||
|
||||
unsigned int
|
||||
Binding::get_axis (void)
|
||||
Binding::get_axis ()
|
||||
{
|
||||
return JOY_AXIS_UNMASK (value);
|
||||
}
|
||||
|
||||
GdkModifierType
|
||||
Binding::get_gdk_modifiers (void)
|
||||
Binding::get_gdk_modifiers ()
|
||||
{
|
||||
return (GdkModifierType) (((BINDING_CTRL & value) ? GDK_CONTROL_MASK : 0) |
|
||||
((BINDING_ALT & value) ? GDK_MOD1_MASK : 0) |
|
||||
|
|
@ -158,13 +158,13 @@ Binding::get_gdk_modifiers (void)
|
|||
}
|
||||
|
||||
bool
|
||||
Binding::is_positive (void)
|
||||
Binding::is_positive ()
|
||||
{
|
||||
return JOY_DIRECTION_UNMASK (value) == AXIS_POS;
|
||||
}
|
||||
|
||||
bool
|
||||
Binding::is_negative (void)
|
||||
Binding::is_negative ()
|
||||
{
|
||||
return JOY_DIRECTION_UNMASK (value) == AXIS_NEG;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,23 +33,23 @@ class Binding
|
|||
Binding (const Binding &binding);
|
||||
Binding (GdkEventKey *event);
|
||||
Binding (unsigned int);
|
||||
Binding (void);
|
||||
Binding ();
|
||||
Binding (const char *str);
|
||||
void to_string (char *str);
|
||||
unsigned int hex (void);
|
||||
unsigned int base_hex (void);
|
||||
unsigned int hex ();
|
||||
unsigned int base_hex ();
|
||||
bool matches (Binding &binding);
|
||||
void clear (void);
|
||||
bool is_joy (void);
|
||||
bool is_key (void);
|
||||
bool is_mouse (void);
|
||||
bool is_positive (void);
|
||||
bool is_negative (void);
|
||||
unsigned int get_key (void);
|
||||
unsigned int get_device (void);
|
||||
unsigned int get_threshold (void);
|
||||
unsigned int get_axis (void);
|
||||
GdkModifierType get_gdk_modifiers (void);
|
||||
void clear ();
|
||||
bool is_joy ();
|
||||
bool is_key ();
|
||||
bool is_mouse ();
|
||||
bool is_positive ();
|
||||
bool is_negative ();
|
||||
unsigned int get_key ();
|
||||
unsigned int get_device ();
|
||||
unsigned int get_threshold ();
|
||||
unsigned int get_axis ();
|
||||
GdkModifierType get_gdk_modifiers ();
|
||||
|
||||
private:
|
||||
unsigned int value;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ GtkBuilderWindow::GtkBuilderWindow (const char *root)
|
|||
return;
|
||||
}
|
||||
|
||||
GtkBuilderWindow::~GtkBuilderWindow (void)
|
||||
GtkBuilderWindow::~GtkBuilderWindow ()
|
||||
{
|
||||
gtk_widget_destroy (window);
|
||||
g_object_unref (builder);
|
||||
|
|
@ -115,7 +115,7 @@ GtkBuilderWindow::resize (int width, int height)
|
|||
}
|
||||
|
||||
void
|
||||
GtkBuilderWindow::refresh (void)
|
||||
GtkBuilderWindow::refresh ()
|
||||
{
|
||||
gtk_widget_queue_draw (GTK_WIDGET (window));
|
||||
|
||||
|
|
@ -123,7 +123,7 @@ GtkBuilderWindow::refresh (void)
|
|||
}
|
||||
|
||||
int
|
||||
GtkBuilderWindow::get_width (void)
|
||||
GtkBuilderWindow::get_width ()
|
||||
{
|
||||
int width, height;
|
||||
|
||||
|
|
@ -133,7 +133,7 @@ GtkBuilderWindow::get_width (void)
|
|||
}
|
||||
|
||||
int
|
||||
GtkBuilderWindow::get_height (void)
|
||||
GtkBuilderWindow::get_height ()
|
||||
{
|
||||
int width, height;
|
||||
|
||||
|
|
@ -255,7 +255,7 @@ GtkBuilderWindow::combo_box_append (GtkComboBox *combo, const char *value)
|
|||
}
|
||||
|
||||
GtkWindow *
|
||||
GtkBuilderWindow::get_window (void)
|
||||
GtkBuilderWindow::get_window ()
|
||||
{
|
||||
return GTK_WINDOW (window);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ class GtkBuilderWindow
|
|||
~GtkBuilderWindow ();
|
||||
GtkWidget *get_widget (const char *name);
|
||||
void resize (int width, int height);
|
||||
GtkWindow *get_window (void);
|
||||
void refresh (void);
|
||||
int get_width (void);
|
||||
int get_height (void);
|
||||
GtkWindow *get_window ();
|
||||
void refresh ();
|
||||
int get_width ();
|
||||
int get_height ();
|
||||
|
||||
void signal_connect (GtkBuilderWindowCallbacks *callbacks);
|
||||
void enable_widget (const char *name, unsigned char state);
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ event_enabled_column_clicked (GtkTreeViewColumn *treeviewcolumn,
|
|||
((Snes9xCheats *) data)->sort_cheats ();
|
||||
}
|
||||
|
||||
Snes9xCheats::Snes9xCheats (void)
|
||||
Snes9xCheats::Snes9xCheats ()
|
||||
: GtkBuilderWindow ("cheat_window")
|
||||
{
|
||||
GtkTreeView *view;
|
||||
|
|
@ -197,7 +197,7 @@ Snes9xCheats::Snes9xCheats (void)
|
|||
return;
|
||||
}
|
||||
|
||||
Snes9xCheats::~Snes9xCheats (void)
|
||||
Snes9xCheats::~Snes9xCheats ()
|
||||
{
|
||||
gtk_widget_destroy (window);
|
||||
|
||||
|
|
@ -222,7 +222,7 @@ Snes9xCheats::enable_dnd (bool enable)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xCheats::show (void)
|
||||
Snes9xCheats::show ()
|
||||
{
|
||||
top_level->pause_from_focus_change ();
|
||||
|
||||
|
|
@ -247,7 +247,7 @@ static void cheat_move (int src, int dst)
|
|||
Cheat.g.erase (Cheat.g.begin() + src);
|
||||
}
|
||||
|
||||
static void cheat_gather_enabled (void)
|
||||
static void cheat_gather_enabled ()
|
||||
{
|
||||
unsigned int enabled = 0;
|
||||
|
||||
|
|
@ -281,7 +281,7 @@ Snes9xCheats::row_inserted (int new_row)
|
|||
}
|
||||
|
||||
int
|
||||
Snes9xCheats::get_selected_index (void)
|
||||
Snes9xCheats::get_selected_index ()
|
||||
{
|
||||
GtkTreeSelection *selection;
|
||||
GList *rows;
|
||||
|
|
@ -325,7 +325,7 @@ Snes9xCheats::get_index_from_path (const gchar *path)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xCheats::refresh_tree_view (void)
|
||||
Snes9xCheats::refresh_tree_view ()
|
||||
{
|
||||
GtkTreeIter iter;
|
||||
unsigned int list_size;
|
||||
|
|
@ -364,7 +364,7 @@ Snes9xCheats::refresh_tree_view (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xCheats::add_code (void)
|
||||
Snes9xCheats::add_code ()
|
||||
{
|
||||
const char *description;
|
||||
const gchar *code = get_entry_text ("code_entry");
|
||||
|
|
@ -403,7 +403,7 @@ Snes9xCheats::add_code (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xCheats::remove_code (void)
|
||||
Snes9xCheats::remove_code ()
|
||||
{
|
||||
int index = get_selected_index ();
|
||||
GtkTreeIter iter;
|
||||
|
|
@ -422,7 +422,7 @@ Snes9xCheats::remove_code (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xCheats::delete_all_cheats (void)
|
||||
Snes9xCheats::delete_all_cheats ()
|
||||
{
|
||||
enable_dnd (false);
|
||||
S9xDeleteCheats ();
|
||||
|
|
@ -433,7 +433,7 @@ Snes9xCheats::delete_all_cheats (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xCheats::search_database (void)
|
||||
Snes9xCheats::search_database ()
|
||||
{
|
||||
std::string filename;
|
||||
int result;
|
||||
|
|
@ -544,7 +544,7 @@ Snes9xCheats::toggle_code (const gchar *path, int enabled)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xCheats::update_code (void)
|
||||
Snes9xCheats::update_code ()
|
||||
{
|
||||
int index = get_selected_index ();
|
||||
|
||||
|
|
@ -577,7 +577,7 @@ Snes9xCheats::update_code (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xCheats::disable_all (void)
|
||||
Snes9xCheats::disable_all ()
|
||||
{
|
||||
for (unsigned int i = 0; i < Cheat.g.size(); i++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,25 +13,25 @@ enum
|
|||
class Snes9xCheats : public GtkBuilderWindow
|
||||
{
|
||||
public:
|
||||
Snes9xCheats (void);
|
||||
~Snes9xCheats (void);
|
||||
void show (void);
|
||||
void add_code (void);
|
||||
void remove_code (void);
|
||||
void search_database (void);
|
||||
void delete_all_cheats (void);
|
||||
Snes9xCheats ();
|
||||
~Snes9xCheats ();
|
||||
void show ();
|
||||
void add_code ();
|
||||
void remove_code ();
|
||||
void search_database ();
|
||||
void delete_all_cheats ();
|
||||
void toggle_code (const gchar *path, int enabled);
|
||||
void row_activated (GtkTreePath *path);
|
||||
void row_deleted (int src_row);
|
||||
void row_inserted (int row);
|
||||
void enable_dnd (bool);
|
||||
void sort_cheats (void);
|
||||
void update_code (void);
|
||||
void disable_all (void);
|
||||
void sort_cheats ();
|
||||
void update_code ();
|
||||
void disable_all ();
|
||||
|
||||
private:
|
||||
void refresh_tree_view (void);
|
||||
int get_selected_index (void);
|
||||
void refresh_tree_view ();
|
||||
int get_selected_index ();
|
||||
int get_index_from_path (const gchar *path);
|
||||
|
||||
unsigned long insert_id;
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ class Snes9xConfig
|
|||
|
||||
};
|
||||
|
||||
char *get_config_dir (void);
|
||||
char *get_config_file_name (void);
|
||||
char *get_config_dir ();
|
||||
char *get_config_file_name ();
|
||||
|
||||
#endif /* __GTK_CONFIG_H */
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class JoyDevice
|
|||
|
||||
|
||||
private:
|
||||
void poll_events (void);
|
||||
void poll_events ();
|
||||
void add_event (unsigned int parameter, unsigned int state);
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ S9xSetEndianess (int type)
|
|||
}
|
||||
|
||||
double
|
||||
S9xGetAspect (void)
|
||||
S9xGetAspect ()
|
||||
{
|
||||
double native_aspect = 256.0 / (gui_config->overscan ? 239.0 : 224.0);
|
||||
double aspect;
|
||||
|
|
@ -1223,7 +1223,7 @@ thread_worker (gpointer data,
|
|||
}
|
||||
|
||||
static void
|
||||
create_thread_pool (void)
|
||||
create_thread_pool ()
|
||||
{
|
||||
if (pool == NULL)
|
||||
{
|
||||
|
|
@ -1554,7 +1554,7 @@ S9xDisplayRefresh (int width, int height)
|
|||
}
|
||||
|
||||
static void
|
||||
ntsc_filter_init (void)
|
||||
ntsc_filter_init ()
|
||||
{
|
||||
scanline_offset = scanline_offsets [gui_config->ntsc_scanline_intensity];
|
||||
scanline_mask = scanline_masks [gui_config->ntsc_scanline_intensity];
|
||||
|
|
@ -1565,7 +1565,7 @@ ntsc_filter_init (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xDisplayReconfigure (void)
|
||||
S9xDisplayReconfigure ()
|
||||
{
|
||||
ntsc_filter_init ();
|
||||
|
||||
|
|
@ -1578,7 +1578,7 @@ S9xDisplayReconfigure (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xQueryDrivers (void)
|
||||
S9xQueryDrivers ()
|
||||
{
|
||||
GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (top_level->get_window()));
|
||||
|
||||
|
|
@ -1705,7 +1705,7 @@ S9xRealDeinitUpdate (int width, int height)
|
|||
}
|
||||
|
||||
static void
|
||||
S9xInitDriver (void)
|
||||
S9xInitDriver ()
|
||||
{
|
||||
switch (gui_config->hw_accel)
|
||||
{
|
||||
|
|
@ -1752,7 +1752,7 @@ S9xInitDriver (void)
|
|||
}
|
||||
|
||||
S9xDisplayDriver *
|
||||
S9xDisplayGetDriver (void)
|
||||
S9xDisplayGetDriver ()
|
||||
{
|
||||
return driver;
|
||||
}
|
||||
|
|
@ -1774,7 +1774,7 @@ S9xInitDisplay (int argc, char **argv)
|
|||
}
|
||||
|
||||
void
|
||||
S9xDisplayClearBuffers (void)
|
||||
S9xDisplayClearBuffers ()
|
||||
{
|
||||
driver->clear_buffers ();
|
||||
|
||||
|
|
@ -1782,7 +1782,7 @@ S9xDisplayClearBuffers (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xDeinitDisplay (void)
|
||||
S9xDeinitDisplay ()
|
||||
{
|
||||
driver->deinit ();
|
||||
delete driver;
|
||||
|
|
@ -1797,7 +1797,7 @@ S9xDeinitDisplay (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xReinitDisplay (void)
|
||||
S9xReinitDisplay ()
|
||||
{
|
||||
uint16 *buffer = NULL;
|
||||
int width, height;
|
||||
|
|
@ -1832,25 +1832,25 @@ S9xContinueUpdate (int width, int height)
|
|||
}
|
||||
|
||||
bool8
|
||||
S9xInitUpdate (void)
|
||||
S9xInitUpdate ()
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
S9xSetPalette (void)
|
||||
S9xSetPalette ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xTextMode (void)
|
||||
S9xTextMode ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xGraphicsMode (void)
|
||||
S9xGraphicsMode ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ thread_job_t;
|
|||
|
||||
void S9xRegisterYUVTables (uint8 *y, uint8 *u, uint8 *v);
|
||||
void S9xSetEndianess (int type);
|
||||
double S9xGetAspect (void);
|
||||
double S9xGetAspect ();
|
||||
void S9xApplyAspect (int&, int&, int&, int&);
|
||||
|
||||
void S9xConvertYUV (void *src_buffer,
|
||||
|
|
@ -119,12 +119,12 @@ void S9xFilter (uint8 *src_buffer,
|
|||
void get_filter_scale (int& width, int& height);
|
||||
|
||||
void S9xDisplayRefresh (int width, int height);
|
||||
void S9xDisplayClearBuffers (void);
|
||||
void S9xReinitDisplay (void);
|
||||
void S9xDisplayReconfigure (void);
|
||||
void S9xQueryDrivers (void);
|
||||
void S9xDisplayClearBuffers ();
|
||||
void S9xReinitDisplay ();
|
||||
void S9xDisplayReconfigure ();
|
||||
void S9xQueryDrivers ();
|
||||
bool8 S9xRealDeinitUpdate (int width, int height);
|
||||
|
||||
S9xDisplayDriver *S9xDisplayGetDriver (void);
|
||||
S9xDisplayDriver *S9xDisplayGetDriver ();
|
||||
|
||||
#endif /* __GTK_DISPLAY_H */
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ class S9xDisplayDriver
|
|||
public:
|
||||
virtual ~S9xDisplayDriver() {}
|
||||
virtual void refresh (int width, int height) = 0;
|
||||
virtual int init (void) = 0;
|
||||
virtual void deinit (void) = 0;
|
||||
virtual void clear_buffers (void) = 0;
|
||||
virtual int init () = 0;
|
||||
virtual void deinit () = 0;
|
||||
virtual void clear_buffers () = 0;
|
||||
virtual void update (int width, int height, int yoffset) = 0;
|
||||
virtual uint16 *get_next_buffer (void) = 0;
|
||||
virtual uint16 *get_current_buffer (void) = 0;
|
||||
virtual uint16 *get_next_buffer () = 0;
|
||||
virtual uint16 *get_current_buffer () = 0;
|
||||
virtual void push_buffer (uint16 *src) = 0;
|
||||
virtual void *get_parameters (void) = 0;
|
||||
virtual void *get_parameters () = 0;
|
||||
virtual void save (const char *filename) = 0;
|
||||
|
||||
/* Namespaced sizing constants */
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ S9xGTKDisplayDriver::output (void *src,
|
|||
}
|
||||
|
||||
int
|
||||
S9xGTKDisplayDriver::init (void)
|
||||
S9xGTKDisplayDriver::init ()
|
||||
{
|
||||
buffer[0] = malloc (image_padded_size);
|
||||
buffer[1] = malloc (scaled_padded_size);
|
||||
|
|
@ -136,7 +136,7 @@ S9xGTKDisplayDriver::init (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xGTKDisplayDriver::deinit (void)
|
||||
S9xGTKDisplayDriver::deinit ()
|
||||
{
|
||||
padded_buffer[0] = NULL;
|
||||
padded_buffer[1] = NULL;
|
||||
|
|
@ -148,7 +148,7 @@ S9xGTKDisplayDriver::deinit (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xGTKDisplayDriver::clear (void)
|
||||
S9xGTKDisplayDriver::clear ()
|
||||
{
|
||||
int x, y, w, h;
|
||||
int width, height;
|
||||
|
|
@ -210,13 +210,13 @@ S9xGTKDisplayDriver::refresh (int width, int height)
|
|||
}
|
||||
|
||||
uint16 *
|
||||
S9xGTKDisplayDriver::get_next_buffer (void)
|
||||
S9xGTKDisplayDriver::get_next_buffer ()
|
||||
{
|
||||
return (uint16 *) padded_buffer[0];
|
||||
}
|
||||
|
||||
uint16 *
|
||||
S9xGTKDisplayDriver::get_current_buffer (void)
|
||||
S9xGTKDisplayDriver::get_current_buffer ()
|
||||
{
|
||||
return (uint16 *) padded_buffer[0];
|
||||
}
|
||||
|
|
@ -230,7 +230,7 @@ S9xGTKDisplayDriver::push_buffer (uint16 *src)
|
|||
}
|
||||
|
||||
void
|
||||
S9xGTKDisplayDriver::clear_buffers (void)
|
||||
S9xGTKDisplayDriver::clear_buffers ()
|
||||
{
|
||||
memset (buffer[0], 0, image_padded_size);
|
||||
memset (buffer[1], 0, scaled_padded_size);
|
||||
|
|
|
|||
|
|
@ -9,18 +9,18 @@ class S9xGTKDisplayDriver : public S9xDisplayDriver
|
|||
public:
|
||||
S9xGTKDisplayDriver (Snes9xWindow *window, Snes9xConfig *config);
|
||||
void refresh (int width, int height);
|
||||
int init (void);
|
||||
void deinit (void);
|
||||
void clear_buffers (void);
|
||||
int init ();
|
||||
void deinit ();
|
||||
void clear_buffers ();
|
||||
void update (int width, int height, int yoffset);
|
||||
uint16 *get_next_buffer (void);
|
||||
uint16 *get_current_buffer (void);
|
||||
uint16 *get_next_buffer ();
|
||||
uint16 *get_current_buffer ();
|
||||
void push_buffer (uint16 *src);
|
||||
void *get_parameters (void) { return NULL; }
|
||||
void *get_parameters () { return NULL; }
|
||||
void save (const char *filename) { }
|
||||
|
||||
private:
|
||||
void clear (void);
|
||||
void clear ();
|
||||
void output (void *src,
|
||||
int src_pitch,
|
||||
int x,
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ S9xXVDisplayDriver::update_image_size (int width, int height)
|
|||
}
|
||||
|
||||
int
|
||||
S9xXVDisplayDriver::init (void)
|
||||
S9xXVDisplayDriver::init ()
|
||||
{
|
||||
int depth = 0, num_formats, num_attrs, highest_formats = 0;
|
||||
XvImageFormatValues *formats = NULL;
|
||||
|
|
@ -473,7 +473,7 @@ S9xXVDisplayDriver::init (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xXVDisplayDriver::deinit (void)
|
||||
S9xXVDisplayDriver::deinit ()
|
||||
{
|
||||
gdk_window_destroy (gdk_window);
|
||||
|
||||
|
|
@ -496,7 +496,7 @@ S9xXVDisplayDriver::deinit (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xXVDisplayDriver::clear (void)
|
||||
S9xXVDisplayDriver::clear ()
|
||||
{
|
||||
int x, y, w, h;
|
||||
int width, height;
|
||||
|
|
@ -559,13 +559,13 @@ S9xXVDisplayDriver::refresh (int width, int height)
|
|||
}
|
||||
|
||||
uint16 *
|
||||
S9xXVDisplayDriver::get_next_buffer (void)
|
||||
S9xXVDisplayDriver::get_next_buffer ()
|
||||
{
|
||||
return (uint16 *) padded_buffer[0];
|
||||
}
|
||||
|
||||
uint16 *
|
||||
S9xXVDisplayDriver::get_current_buffer (void)
|
||||
S9xXVDisplayDriver::get_current_buffer ()
|
||||
{
|
||||
return get_next_buffer ();
|
||||
}
|
||||
|
|
@ -579,7 +579,7 @@ S9xXVDisplayDriver::push_buffer (uint16 *src)
|
|||
}
|
||||
|
||||
void
|
||||
S9xXVDisplayDriver::clear_buffers (void)
|
||||
S9xXVDisplayDriver::clear_buffers ()
|
||||
{
|
||||
uint32 black;
|
||||
uint8 *color;
|
||||
|
|
@ -610,7 +610,7 @@ S9xXVDisplayDriver::clear_buffers (void)
|
|||
}
|
||||
|
||||
int
|
||||
S9xXVDisplayDriver::query_availability (void)
|
||||
S9xXVDisplayDriver::query_availability ()
|
||||
{
|
||||
unsigned int p_version,
|
||||
p_release,
|
||||
|
|
|
|||
|
|
@ -16,19 +16,19 @@ class S9xXVDisplayDriver : public S9xDisplayDriver
|
|||
public:
|
||||
S9xXVDisplayDriver (Snes9xWindow *window, Snes9xConfig *config);
|
||||
void refresh (int width, int height);
|
||||
int init (void);
|
||||
void deinit (void);
|
||||
void clear_buffers (void);
|
||||
int init ();
|
||||
void deinit ();
|
||||
void clear_buffers ();
|
||||
void update (int width, int height, int yoffset);
|
||||
uint16 *get_next_buffer (void);
|
||||
uint16 *get_current_buffer (void);
|
||||
uint16 *get_next_buffer ();
|
||||
uint16 *get_current_buffer ();
|
||||
void push_buffer (uint16 *src);
|
||||
void *get_parameters (void) { return NULL; }
|
||||
void *get_parameters () { return NULL; }
|
||||
void save (const char *filename) { }
|
||||
static int query_availability (void);
|
||||
static int query_availability ();
|
||||
|
||||
private:
|
||||
void clear (void);
|
||||
void clear ();
|
||||
void update_image_size (int width, int height);
|
||||
void resize_window (int width, int height);
|
||||
void create_window (int width, int height);
|
||||
|
|
|
|||
|
|
@ -363,19 +363,19 @@ extern "C"
|
|||
uint8 snes9x_clear_change_log = 0;
|
||||
}
|
||||
|
||||
extern "C" char *osd_GetPackDir (void)
|
||||
extern "C" char *osd_GetPackDir ()
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void
|
||||
S9xLoadSDD1Data (void)
|
||||
S9xLoadSDD1Data ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xAutoSaveSRAM (void)
|
||||
S9xAutoSaveSRAM ()
|
||||
{
|
||||
Memory.SaveSRAM (S9xGetFilename (".srm", SRAM_DIR));
|
||||
S9xSaveCheatFile (S9xGetFilename (".cht", CHEAT_DIR));
|
||||
|
|
@ -417,7 +417,7 @@ S9xSaveState (const char *filename)
|
|||
}
|
||||
|
||||
char *
|
||||
S9xOpenROMDialog (void)
|
||||
S9xOpenROMDialog ()
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
GtkFileFilter *filter;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __GTK_FILE_H
|
||||
#define __GTK_FILE_H
|
||||
|
||||
char *S9xOpenROMDialog (void);
|
||||
char *S9xOpenROMDialog ();
|
||||
const char *S9xBasenameNoExt (const char *);
|
||||
|
||||
void S9xLoadState (const char *filename);
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ static GThread *npthread;
|
|||
extern SNPServer NPServer;
|
||||
|
||||
static void
|
||||
S9xNetplayPreconnect (void)
|
||||
S9xNetplayPreconnect ()
|
||||
{
|
||||
S9xNetplayDisconnect ();
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ S9xNetplayPreconnect (void)
|
|||
}
|
||||
|
||||
static void
|
||||
S9xNetplayConnect (void)
|
||||
S9xNetplayConnect ()
|
||||
{
|
||||
GtkWidget *msg;
|
||||
|
||||
|
|
@ -80,7 +80,7 @@ S9xNetplayConnect (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xNetplaySyncClients (void)
|
||||
S9xNetplaySyncClients ()
|
||||
{
|
||||
if (Settings.NetPlay && Settings.NetPlayServer)
|
||||
S9xNPServerQueueSyncAll ();
|
||||
|
|
@ -89,7 +89,7 @@ S9xNetplaySyncClients (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xNetplayStopServer (void)
|
||||
S9xNetplayStopServer ()
|
||||
{
|
||||
S9xNPStopServer ();
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ S9xNetplayStopServer (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xNetplayDisconnect (void)
|
||||
S9xNetplayDisconnect ()
|
||||
{
|
||||
if (Settings.NetPlay)
|
||||
{
|
||||
|
|
@ -131,7 +131,7 @@ S9xNetplayServerThread (gpointer)
|
|||
}
|
||||
|
||||
void
|
||||
S9xNetplayStartServer (void)
|
||||
S9xNetplayStartServer ()
|
||||
{
|
||||
uint32 flags;
|
||||
|
||||
|
|
@ -173,7 +173,7 @@ S9xNetplayStartServer (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xNetplayDialogOpen (void)
|
||||
S9xNetplayDialogOpen ()
|
||||
{
|
||||
Snes9xNetplayDialog *np_dialog;
|
||||
|
||||
|
|
@ -206,7 +206,7 @@ S9xNetplayDialogOpen (void)
|
|||
}
|
||||
|
||||
int
|
||||
S9xNetplaySyncSpeed (void)
|
||||
S9xNetplaySyncSpeed ()
|
||||
{
|
||||
if (!Settings.NetPlay || !NetPlay.Connected)
|
||||
return 0;
|
||||
|
|
@ -275,7 +275,7 @@ S9xNetplaySyncSpeed (void)
|
|||
}
|
||||
|
||||
int
|
||||
S9xNetplayPush (void)
|
||||
S9xNetplayPush ()
|
||||
{
|
||||
static int statusbar_state = FALSE;
|
||||
|
||||
|
|
@ -331,7 +331,7 @@ S9xNetplayPush (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xNetplayPop (void)
|
||||
S9xNetplayPop ()
|
||||
{
|
||||
if (!Settings.NetPlay)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#ifndef __GTK_NETPLAY_H
|
||||
#define __GTK_NETPLAY_H
|
||||
|
||||
void S9xNetplayDialogOpen (void);
|
||||
int S9xNetplayPush (void);
|
||||
void S9xNetplayPop (void);
|
||||
int S9xNetplaySyncSpeed (void);
|
||||
void S9xNetplaySyncClients (void);
|
||||
void S9xNetplayDisconnect (void);
|
||||
void S9xNetplayDialogOpen ();
|
||||
int S9xNetplayPush ();
|
||||
void S9xNetplayPop ();
|
||||
int S9xNetplaySyncSpeed ();
|
||||
void S9xNetplaySyncClients ();
|
||||
void S9xNetplayDisconnect ();
|
||||
|
||||
#endif /* __GTK_NETPLAY_H */
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ Snes9xNetplayDialog::Snes9xNetplayDialog (Snes9xConfig *config) :
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xNetplayDialog::update_state (void)
|
||||
Snes9xNetplayDialog::update_state ()
|
||||
{
|
||||
if (get_check ("host_radio"))
|
||||
{
|
||||
|
|
@ -80,7 +80,7 @@ Snes9xNetplayDialog::update_state (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xNetplayDialog::settings_to_dialog (void)
|
||||
Snes9xNetplayDialog::settings_to_dialog ()
|
||||
{
|
||||
set_entry_text ("rom_image", config->netplay_last_rom);
|
||||
set_entry_text ("ip_entry", config->netplay_last_host);
|
||||
|
|
@ -98,7 +98,7 @@ Snes9xNetplayDialog::settings_to_dialog (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xNetplayDialog::settings_from_dialog (void)
|
||||
Snes9xNetplayDialog::settings_from_dialog ()
|
||||
{
|
||||
strncpy (config->netplay_last_rom, get_entry_text ("rom_image"), PATH_MAX);
|
||||
strncpy (config->netplay_last_host, get_entry_text ("ip_entry"), PATH_MAX);
|
||||
|
|
@ -115,7 +115,7 @@ Snes9xNetplayDialog::settings_from_dialog (void)
|
|||
}
|
||||
|
||||
int
|
||||
Snes9xNetplayDialog::show (void)
|
||||
Snes9xNetplayDialog::show ()
|
||||
{
|
||||
int result;
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ Snes9xNetplayDialog::show (void)
|
|||
|
||||
}
|
||||
|
||||
Snes9xNetplayDialog::~Snes9xNetplayDialog (void)
|
||||
Snes9xNetplayDialog::~Snes9xNetplayDialog ()
|
||||
{
|
||||
gtk_widget_destroy (window);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ class Snes9xNetplayDialog : public GtkBuilderWindow
|
|||
{
|
||||
public:
|
||||
Snes9xNetplayDialog (Snes9xConfig *config);
|
||||
~Snes9xNetplayDialog (void);
|
||||
int show (void);
|
||||
void update_state (void);
|
||||
~Snes9xNetplayDialog ();
|
||||
int show ();
|
||||
void update_state ();
|
||||
|
||||
private:
|
||||
Snes9xConfig *config;
|
||||
void settings_to_dialog (void);
|
||||
void settings_from_dialog (void);
|
||||
void settings_to_dialog ();
|
||||
void settings_from_dialog ();
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -454,7 +454,7 @@ poll_joystick (gpointer data)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::calibration_dialog (void)
|
||||
Snes9xPreferences::calibration_dialog ()
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
|
||||
|
|
@ -627,7 +627,7 @@ Snes9xPreferences::Snes9xPreferences (Snes9xConfig *config) :
|
|||
return;
|
||||
}
|
||||
|
||||
Snes9xPreferences::~Snes9xPreferences (void)
|
||||
Snes9xPreferences::~Snes9xPreferences ()
|
||||
{
|
||||
delete[] mode_indices;
|
||||
|
||||
|
|
@ -635,7 +635,7 @@ Snes9xPreferences::~Snes9xPreferences (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::load_ntsc_settings (void)
|
||||
Snes9xPreferences::load_ntsc_settings ()
|
||||
{
|
||||
set_slider ("ntsc_artifacts", config->ntsc_setup.artifacts);
|
||||
set_slider ("ntsc_bleed", config->ntsc_setup.bleed);
|
||||
|
|
@ -653,7 +653,7 @@ Snes9xPreferences::load_ntsc_settings (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::store_ntsc_settings (void)
|
||||
Snes9xPreferences::store_ntsc_settings ()
|
||||
{
|
||||
config->ntsc_setup.artifacts = get_slider ("ntsc_artifacts");
|
||||
config->ntsc_setup.bleed = get_slider ("ntsc_bleed");
|
||||
|
|
@ -671,7 +671,7 @@ Snes9xPreferences::store_ntsc_settings (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::move_settings_to_dialog (void)
|
||||
Snes9xPreferences::move_settings_to_dialog ()
|
||||
{
|
||||
set_check ("full_screen_on_open", config->full_screen_on_open);
|
||||
set_check ("show_frame_rate", Settings.DisplayFrameRate);
|
||||
|
|
@ -820,7 +820,7 @@ Snes9xPreferences::move_settings_to_dialog (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::get_settings_from_dialog (void)
|
||||
Snes9xPreferences::get_settings_from_dialog ()
|
||||
{
|
||||
int sound_needs_restart = 0;
|
||||
int gfx_needs_restart = 0;
|
||||
|
|
@ -1064,7 +1064,7 @@ Snes9xPreferences::combo_value (int hw_accel)
|
|||
|
||||
|
||||
void
|
||||
Snes9xPreferences::browse_folder_dialog (void)
|
||||
Snes9xPreferences::browse_folder_dialog ()
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
char *filename;
|
||||
|
|
@ -1103,7 +1103,7 @@ Snes9xPreferences::browse_folder_dialog (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::show (void)
|
||||
Snes9xPreferences::show ()
|
||||
{
|
||||
gint result;
|
||||
GtkWidget *combo;
|
||||
|
|
@ -1253,7 +1253,7 @@ Snes9xPreferences::show (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::focus_next (void)
|
||||
Snes9xPreferences::focus_next ()
|
||||
{
|
||||
int next = get_focused_binding () + 1;
|
||||
|
||||
|
|
@ -1272,7 +1272,7 @@ Snes9xPreferences::focus_next (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::swap_with (void)
|
||||
Snes9xPreferences::swap_with ()
|
||||
{
|
||||
JoypadBinding mediator;
|
||||
int source_joypad = get_combo ("control_combo");
|
||||
|
|
@ -1288,7 +1288,7 @@ Snes9xPreferences::swap_with (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xPreferences::reset_current_joypad (void)
|
||||
Snes9xPreferences::reset_current_joypad ()
|
||||
{
|
||||
int joypad = get_combo ("control_combo");
|
||||
|
||||
|
|
@ -1346,7 +1346,7 @@ Snes9xPreferences::store_binding (const char *string, Binding binding)
|
|||
}
|
||||
|
||||
int
|
||||
Snes9xPreferences::get_focused_binding (void)
|
||||
Snes9xPreferences::get_focused_binding ()
|
||||
{
|
||||
for (int i = 0; b_links[i].button_name; i++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,22 +12,22 @@ class Snes9xPreferences : public GtkBuilderWindow
|
|||
{
|
||||
public:
|
||||
Snes9xPreferences (Snes9xConfig *config);
|
||||
~Snes9xPreferences (void);
|
||||
void show (void);
|
||||
~Snes9xPreferences ();
|
||||
void show ();
|
||||
void bindings_to_dialog (int joypad);
|
||||
int get_focused_binding (void);
|
||||
int get_focused_binding ();
|
||||
void store_binding (const char *string, Binding binding);
|
||||
void browse_folder_dialog (void);
|
||||
void browse_folder_dialog ();
|
||||
int hw_accel_value (int combo_value);
|
||||
int combo_value (int hw_accel);
|
||||
void focus_next (void);
|
||||
void swap_with (void);
|
||||
void reset_current_joypad (void);
|
||||
void load_ntsc_settings (void);
|
||||
void store_ntsc_settings (void);
|
||||
void focus_next ();
|
||||
void swap_with ();
|
||||
void reset_current_joypad ();
|
||||
void load_ntsc_settings ();
|
||||
void store_ntsc_settings ();
|
||||
|
||||
#ifdef USE_JOYSTICK
|
||||
void calibration_dialog (void);
|
||||
void calibration_dialog ();
|
||||
#endif
|
||||
|
||||
Snes9xConfig *config;
|
||||
|
|
@ -38,8 +38,8 @@ class Snes9xPreferences : public GtkBuilderWindow
|
|||
Binding shortcut[NUM_EMU_LINKS];
|
||||
|
||||
private:
|
||||
void get_settings_from_dialog (void);
|
||||
void move_settings_to_dialog (void);
|
||||
void get_settings_from_dialog ();
|
||||
void move_settings_to_dialog ();
|
||||
|
||||
unsigned int *mode_indices;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -621,7 +621,7 @@ void S9xExit ()
|
|||
}
|
||||
|
||||
void
|
||||
S9xPostRomInit (void)
|
||||
S9xPostRomInit ()
|
||||
{
|
||||
if (!strncmp ((const char *) Memory.NSRTHeader + 24, "NSRT", 4))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -727,7 +727,7 @@ Snes9xWindow::Snes9xWindow (Snes9xConfig *config) :
|
|||
extern const gtk_splash_t gtk_splash;
|
||||
|
||||
void
|
||||
Snes9xWindow::expose (void)
|
||||
Snes9xWindow::expose ()
|
||||
{
|
||||
if (last_width < 0)
|
||||
{
|
||||
|
|
@ -816,7 +816,7 @@ Snes9xWindow::focus_notify (int state)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::open_multicart_dialog (void)
|
||||
Snes9xWindow::open_multicart_dialog ()
|
||||
{
|
||||
int result;
|
||||
GtkBuilderWindow *dialog = new GtkBuilderWindow ("multicart_dialog");
|
||||
|
|
@ -1114,7 +1114,7 @@ Snes9xWindow::load_state_dialog ()
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::movie_seek_dialog (void)
|
||||
Snes9xWindow::movie_seek_dialog ()
|
||||
{
|
||||
char str[1024];
|
||||
gint result;
|
||||
|
|
@ -1358,7 +1358,7 @@ Snes9xWindow::show_status_message (const char *message)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::update_statusbar (void)
|
||||
Snes9xWindow::update_statusbar ()
|
||||
{
|
||||
GtkStatusbar *bar = GTK_STATUSBAR (get_widget ("statusbar"));
|
||||
char status_string[256];
|
||||
|
|
@ -1416,7 +1416,7 @@ Snes9xWindow::update_statusbar (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::show_rom_info (void)
|
||||
Snes9xWindow::show_rom_info ()
|
||||
{
|
||||
GtkWidget *msg;
|
||||
|
||||
|
|
@ -1478,7 +1478,7 @@ Snes9xWindow::show_rom_info (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::configure_widgets (void)
|
||||
Snes9xWindow::configure_widgets ()
|
||||
{
|
||||
enable_widget ("continue_item", config->rom_loaded);
|
||||
enable_widget ("pause_item", config->rom_loaded);
|
||||
|
|
@ -1568,7 +1568,7 @@ Snes9xWindow::set_mouseable_area (int x, int y, int width, int height)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::reset_screensaver (void)
|
||||
Snes9xWindow::reset_screensaver ()
|
||||
{
|
||||
if (!focused)
|
||||
return;
|
||||
|
|
@ -1592,7 +1592,7 @@ Snes9xWindow::reset_screensaver (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::toggle_fullscreen_mode (void)
|
||||
Snes9xWindow::toggle_fullscreen_mode ()
|
||||
{
|
||||
if (config->fullscreen)
|
||||
leave_fullscreen_mode ();
|
||||
|
|
@ -1645,7 +1645,7 @@ static double XRRGetExactRefreshRate (Display *dpy, Window window)
|
|||
}
|
||||
|
||||
double
|
||||
Snes9xWindow::get_refresh_rate (void)
|
||||
Snes9xWindow::get_refresh_rate ()
|
||||
{
|
||||
double refresh_rate = 0.0;
|
||||
GdkDisplay *display = gtk_widget_get_display (window);
|
||||
|
|
@ -1678,7 +1678,7 @@ Snes9xWindow::get_refresh_rate (void)
|
|||
}
|
||||
|
||||
int
|
||||
Snes9xWindow::get_auto_input_rate (void)
|
||||
Snes9xWindow::get_auto_input_rate ()
|
||||
{
|
||||
double refresh_rate = get_refresh_rate ();
|
||||
|
||||
|
|
@ -1711,7 +1711,7 @@ static void set_bypass_compositor (Display *dpy, Window window, unsigned char by
|
|||
#endif
|
||||
|
||||
void
|
||||
Snes9xWindow::enter_fullscreen_mode (void)
|
||||
Snes9xWindow::enter_fullscreen_mode ()
|
||||
{
|
||||
int rom_loaded = config->rom_loaded;
|
||||
|
||||
|
|
@ -1779,7 +1779,7 @@ Snes9xWindow::enter_fullscreen_mode (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::leave_fullscreen_mode (void)
|
||||
Snes9xWindow::leave_fullscreen_mode ()
|
||||
{
|
||||
int rom_loaded = config->rom_loaded;
|
||||
|
||||
|
|
@ -1839,7 +1839,7 @@ Snes9xWindow::leave_fullscreen_mode (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::toggle_statusbar (void)
|
||||
Snes9xWindow::toggle_statusbar ()
|
||||
{
|
||||
GtkWidget *item;
|
||||
GtkAllocation allocation;
|
||||
|
|
@ -1888,7 +1888,7 @@ Snes9xWindow::resize_viewport (int width, int height)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::hide_mouse_cursor (void)
|
||||
Snes9xWindow::hide_mouse_cursor ()
|
||||
{
|
||||
if (!empty_cursor)
|
||||
{
|
||||
|
|
@ -1903,7 +1903,7 @@ Snes9xWindow::hide_mouse_cursor (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::show_mouse_cursor (void)
|
||||
Snes9xWindow::show_mouse_cursor ()
|
||||
{
|
||||
gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (drawing_area)),
|
||||
NULL);
|
||||
|
|
@ -1913,7 +1913,7 @@ Snes9xWindow::show_mouse_cursor (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::show (void)
|
||||
Snes9xWindow::show ()
|
||||
{
|
||||
gtk_widget_show (window);
|
||||
|
||||
|
|
@ -1948,7 +1948,7 @@ Snes9xWindow::show (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::propagate_pause_state (void)
|
||||
Snes9xWindow::propagate_pause_state ()
|
||||
{
|
||||
int oldpause = Settings.Paused;
|
||||
|
||||
|
|
@ -1979,7 +1979,7 @@ Snes9xWindow::propagate_pause_state (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::toggle_ui (void)
|
||||
Snes9xWindow::toggle_ui ()
|
||||
{
|
||||
config->ui_visible = !config->ui_visible;
|
||||
|
||||
|
|
@ -1990,7 +1990,7 @@ Snes9xWindow::toggle_ui (void)
|
|||
|
||||
/* gui_[un]pause Handles when system needs to pause the emulator */
|
||||
void
|
||||
Snes9xWindow::pause_from_focus_change (void)
|
||||
Snes9xWindow::pause_from_focus_change ()
|
||||
{
|
||||
sys_pause += config->modal_dialogs;
|
||||
|
||||
|
|
@ -2000,7 +2000,7 @@ Snes9xWindow::pause_from_focus_change (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::unpause_from_focus_change (void)
|
||||
Snes9xWindow::unpause_from_focus_change ()
|
||||
{
|
||||
if (--sys_pause < 0)
|
||||
sys_pause = 0;
|
||||
|
|
@ -2011,7 +2011,7 @@ Snes9xWindow::unpause_from_focus_change (void)
|
|||
|
||||
/* client_[un]pause Handles when user manually chooses to pause */
|
||||
void
|
||||
Snes9xWindow::pause_from_user (void)
|
||||
Snes9xWindow::pause_from_user ()
|
||||
{
|
||||
user_pause = TRUE;
|
||||
propagate_pause_state ();
|
||||
|
|
@ -2020,7 +2020,7 @@ Snes9xWindow::pause_from_user (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::unpause_from_user (void)
|
||||
Snes9xWindow::unpause_from_user ()
|
||||
{
|
||||
user_pause = FALSE;
|
||||
propagate_pause_state ();
|
||||
|
|
@ -2029,7 +2029,7 @@ Snes9xWindow::unpause_from_user (void)
|
|||
}
|
||||
|
||||
unsigned char
|
||||
Snes9xWindow::is_paused (void)
|
||||
Snes9xWindow::is_paused ()
|
||||
{
|
||||
if (user_pause || sys_pause || Settings.Paused || !(config->rom_loaded))
|
||||
return TRUE;
|
||||
|
|
@ -2097,7 +2097,7 @@ Snes9xWindow::set_menu_item_accel_to_binding (const char *name,
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::update_accels (void)
|
||||
Snes9xWindow::update_accels ()
|
||||
{
|
||||
set_menu_item_accel_to_binding ("fullscreen_item", "GTK_fullscreen");
|
||||
set_menu_item_accel_to_binding ("reset_item", "SoftReset");
|
||||
|
|
@ -2150,7 +2150,7 @@ Snes9xWindow::resize_to_multiple (int factor)
|
|||
}
|
||||
|
||||
cairo_t *
|
||||
Snes9xWindow::get_cairo (void)
|
||||
Snes9xWindow::get_cairo ()
|
||||
{
|
||||
if (cr)
|
||||
return cr;
|
||||
|
|
@ -2175,7 +2175,7 @@ Snes9xWindow::get_cairo (void)
|
|||
}
|
||||
|
||||
void
|
||||
Snes9xWindow::release_cairo (void)
|
||||
Snes9xWindow::release_cairo ()
|
||||
{
|
||||
if (cairo_owned)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,56 +13,56 @@ class Snes9xWindow : public GtkBuilderWindow
|
|||
Snes9xWindow (Snes9xConfig *config);
|
||||
|
||||
/* Pause related functions */
|
||||
void pause_from_focus_change (void);
|
||||
void unpause_from_focus_change (void);
|
||||
void pause_from_focus_change ();
|
||||
void unpause_from_focus_change ();
|
||||
void focus_notify (int state);
|
||||
void pause_from_user (void);
|
||||
void unpause_from_user (void);
|
||||
unsigned char is_paused (void);
|
||||
void propagate_pause_state (void);
|
||||
void pause_from_user ();
|
||||
void unpause_from_user ();
|
||||
unsigned char is_paused ();
|
||||
void propagate_pause_state ();
|
||||
|
||||
/* Fullscreen functions */
|
||||
void enter_fullscreen_mode (void);
|
||||
void leave_fullscreen_mode (void);
|
||||
void toggle_fullscreen_mode (void);
|
||||
void finish_fullscreen (void);
|
||||
void enter_fullscreen_mode ();
|
||||
void leave_fullscreen_mode ();
|
||||
void toggle_fullscreen_mode ();
|
||||
void finish_fullscreen ();
|
||||
|
||||
/* Cursor modifying functions */
|
||||
void show_mouse_cursor (void);
|
||||
void hide_mouse_cursor (void);
|
||||
void show_mouse_cursor ();
|
||||
void hide_mouse_cursor ();
|
||||
|
||||
/* Rom-related functions */
|
||||
void open_rom_dialog (void);
|
||||
void save_state_dialog (void);
|
||||
void load_state_dialog (void);
|
||||
void configure_widgets (void);
|
||||
void save_spc_dialog (void);
|
||||
void open_rom_dialog ();
|
||||
void save_state_dialog ();
|
||||
void load_state_dialog ();
|
||||
void configure_widgets ();
|
||||
void save_spc_dialog ();
|
||||
int try_open_rom (const char *filename);
|
||||
const char *open_movie_dialog (bool readonly);
|
||||
void movie_seek_dialog (void);
|
||||
void open_multicart_dialog (void);
|
||||
void show_rom_info (void);
|
||||
void movie_seek_dialog ();
|
||||
void open_multicart_dialog ();
|
||||
void show_rom_info ();
|
||||
|
||||
/* GTK-base-related functions */
|
||||
void show (void);
|
||||
void show ();
|
||||
void show_status_message (const char *message);
|
||||
void update_statusbar (void);
|
||||
void toggle_statusbar (void);
|
||||
void update_statusbar ();
|
||||
void toggle_statusbar ();
|
||||
void set_menu_item_selected (const char *name);
|
||||
void set_mouseable_area (int x, int y, int width, int height);
|
||||
void set_menu_item_accel_to_binding (const char *name,
|
||||
const char *binding);
|
||||
void reset_screensaver (void);
|
||||
void update_accels (void);
|
||||
void toggle_ui (void);
|
||||
void reset_screensaver ();
|
||||
void update_accels ();
|
||||
void toggle_ui ();
|
||||
void resize_to_multiple (int factor);
|
||||
void resize_viewport (int width, int height);
|
||||
void expose (void);
|
||||
double get_refresh_rate (void);
|
||||
int get_auto_input_rate (void);
|
||||
void expose ();
|
||||
double get_refresh_rate ();
|
||||
int get_auto_input_rate ();
|
||||
|
||||
cairo_t *get_cairo (void);
|
||||
void release_cairo (void);
|
||||
cairo_t *get_cairo ();
|
||||
void release_cairo ();
|
||||
|
||||
Snes9xConfig *config;
|
||||
int user_pause, sys_pause;
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ static void dialog_response (GtkDialog *pdialog, gint response_id, gpointer user
|
|||
}
|
||||
}
|
||||
|
||||
void gtk_shader_parameters_dialog_close (void)
|
||||
void gtk_shader_parameters_dialog_close ()
|
||||
{
|
||||
if (dialog)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
#include <gtk/gtk.h>
|
||||
|
||||
bool gtk_shader_parameters_dialog (GtkWindow *parent);
|
||||
void gtk_shader_parameters_dialog_close (void);
|
||||
void gtk_shader_parameters_dialog_close ();
|
||||
|
||||
#endif // __GTK_SHADER_PARAMETERS_H
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ S9xSoundPowerof2 (int num)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPortSoundInit (void)
|
||||
S9xPortSoundInit ()
|
||||
{
|
||||
int pao_driver = 0;
|
||||
int sdl_driver = 0;
|
||||
|
|
@ -156,7 +156,7 @@ S9xPortSoundInit (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPortSoundReinit (void)
|
||||
S9xPortSoundReinit ()
|
||||
{
|
||||
S9xPortSoundDeinit ();
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ S9xPortSoundReinit (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPortSoundDeinit (void)
|
||||
S9xPortSoundDeinit ()
|
||||
{
|
||||
S9xSoundStop ();
|
||||
|
||||
|
|
@ -179,7 +179,7 @@ S9xPortSoundDeinit (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xSoundStart (void)
|
||||
S9xSoundStart ()
|
||||
{
|
||||
driver->start ();
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ S9xSoundStart (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xSoundStop (void)
|
||||
S9xSoundStop ()
|
||||
{
|
||||
driver->stop ();
|
||||
|
||||
|
|
@ -195,7 +195,7 @@ S9xSoundStop (void)
|
|||
}
|
||||
|
||||
bool8
|
||||
S9xOpenSoundDevice (void)
|
||||
S9xOpenSoundDevice ()
|
||||
{
|
||||
if (gui_config->mute_sound)
|
||||
return FALSE;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#ifndef __GTK_SOUND_H
|
||||
#define __GTK_SOUND_H
|
||||
|
||||
void S9xPortSoundInit (void);
|
||||
void S9xPortSoundDeinit (void);
|
||||
void S9xPortSoundReinit (void);
|
||||
void S9xSoundStart (void);
|
||||
void S9xSoundStop (void);
|
||||
void S9xPortSoundInit ();
|
||||
void S9xPortSoundDeinit ();
|
||||
void S9xPortSoundReinit ();
|
||||
void S9xSoundStart ();
|
||||
void S9xSoundStop ();
|
||||
|
||||
int S9xSoundBase2log (int num);
|
||||
int S9xSoundPowerof2 (int num);
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ class S9xSoundDriver
|
|||
{
|
||||
public:
|
||||
virtual ~S9xSoundDriver () {}
|
||||
virtual void init (void) = 0;
|
||||
virtual void terminate (void) = 0;
|
||||
virtual bool8 open_device (void) = 0;
|
||||
virtual void start (void) = 0;
|
||||
virtual void stop (void) = 0;
|
||||
virtual void init () = 0;
|
||||
virtual void terminate () = 0;
|
||||
virtual bool8 open_device () = 0;
|
||||
virtual void start () = 0;
|
||||
virtual void stop () = 0;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ alsa_samples_available (void *data)
|
|||
((S9xAlsaSoundDriver *) data)->samples_available ();
|
||||
}
|
||||
|
||||
S9xAlsaSoundDriver::S9xAlsaSoundDriver (void)
|
||||
S9xAlsaSoundDriver::S9xAlsaSoundDriver ()
|
||||
{
|
||||
pcm = NULL;
|
||||
sound_buffer = NULL;
|
||||
|
|
@ -21,13 +21,13 @@ S9xAlsaSoundDriver::S9xAlsaSoundDriver (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xAlsaSoundDriver::init (void)
|
||||
S9xAlsaSoundDriver::init ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xAlsaSoundDriver::terminate (void)
|
||||
S9xAlsaSoundDriver::terminate ()
|
||||
{
|
||||
stop ();
|
||||
|
||||
|
|
@ -50,19 +50,19 @@ S9xAlsaSoundDriver::terminate (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xAlsaSoundDriver::start (void)
|
||||
S9xAlsaSoundDriver::start ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xAlsaSoundDriver::stop (void)
|
||||
S9xAlsaSoundDriver::stop ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
bool8
|
||||
S9xAlsaSoundDriver::open_device (void)
|
||||
S9xAlsaSoundDriver::open_device ()
|
||||
{
|
||||
int err;
|
||||
unsigned int periods = 8;
|
||||
|
|
@ -167,7 +167,7 @@ fail:
|
|||
}
|
||||
|
||||
void
|
||||
S9xAlsaSoundDriver::samples_available (void)
|
||||
S9xAlsaSoundDriver::samples_available ()
|
||||
{
|
||||
snd_pcm_sframes_t frames_written, frames;
|
||||
int bytes;
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
class S9xAlsaSoundDriver : public S9xSoundDriver
|
||||
{
|
||||
public:
|
||||
S9xAlsaSoundDriver (void);
|
||||
void init (void);
|
||||
void terminate (void);
|
||||
bool8 open_device (void);
|
||||
void start (void);
|
||||
void stop (void);
|
||||
void samples_available (void);
|
||||
S9xAlsaSoundDriver ();
|
||||
void init ();
|
||||
void terminate ();
|
||||
bool8 open_device ();
|
||||
void start ();
|
||||
void stop ();
|
||||
void samples_available ();
|
||||
|
||||
private:
|
||||
snd_pcm_t *pcm;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ oss_samples_available (void *data)
|
|||
((S9xOSSSoundDriver *) data)->samples_available ();
|
||||
}
|
||||
|
||||
S9xOSSSoundDriver::S9xOSSSoundDriver (void)
|
||||
S9xOSSSoundDriver::S9xOSSSoundDriver ()
|
||||
{
|
||||
filedes = -1;
|
||||
sound_buffer = NULL;
|
||||
|
|
@ -22,13 +22,13 @@ S9xOSSSoundDriver::S9xOSSSoundDriver (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xOSSSoundDriver::init (void)
|
||||
S9xOSSSoundDriver::init ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xOSSSoundDriver::terminate (void)
|
||||
S9xOSSSoundDriver::terminate ()
|
||||
{
|
||||
stop ();
|
||||
|
||||
|
|
@ -49,19 +49,19 @@ S9xOSSSoundDriver::terminate (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xOSSSoundDriver::start (void)
|
||||
S9xOSSSoundDriver::start ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xOSSSoundDriver::stop (void)
|
||||
S9xOSSSoundDriver::stop ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
bool8
|
||||
S9xOSSSoundDriver::open_device (void)
|
||||
S9xOSSSoundDriver::open_device ()
|
||||
{
|
||||
int temp;
|
||||
audio_buf_info info;
|
||||
|
|
@ -168,7 +168,7 @@ fail:
|
|||
}
|
||||
|
||||
void
|
||||
S9xOSSSoundDriver::samples_available (void)
|
||||
S9xOSSSoundDriver::samples_available ()
|
||||
{
|
||||
audio_buf_info info;
|
||||
int samples_to_write;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
class S9xOSSSoundDriver : public S9xSoundDriver
|
||||
{
|
||||
public:
|
||||
S9xOSSSoundDriver (void);
|
||||
void init (void);
|
||||
void terminate (void);
|
||||
bool8 open_device (void);
|
||||
void start (void);
|
||||
void stop (void);
|
||||
void samples_available (void);
|
||||
S9xOSSSoundDriver ();
|
||||
void init ();
|
||||
void terminate ();
|
||||
bool8 open_device ();
|
||||
void start ();
|
||||
void stop ();
|
||||
void samples_available ();
|
||||
|
||||
private:
|
||||
int filedes;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ port_audio_samples_available_callback (void *data)
|
|||
return;
|
||||
}
|
||||
|
||||
S9xPortAudioSoundDriver::S9xPortAudioSoundDriver(void)
|
||||
S9xPortAudioSoundDriver::S9xPortAudioSoundDriver()
|
||||
{
|
||||
audio_stream = NULL;
|
||||
sound_buffer = NULL;
|
||||
|
|
@ -25,7 +25,7 @@ S9xPortAudioSoundDriver::S9xPortAudioSoundDriver(void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPortAudioSoundDriver::init (void)
|
||||
S9xPortAudioSoundDriver::init ()
|
||||
{
|
||||
PaError err;
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ S9xPortAudioSoundDriver::init (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPortAudioSoundDriver::terminate (void)
|
||||
S9xPortAudioSoundDriver::terminate ()
|
||||
{
|
||||
stop ();
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ S9xPortAudioSoundDriver::terminate (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPortAudioSoundDriver::start (void)
|
||||
S9xPortAudioSoundDriver::start ()
|
||||
{
|
||||
PaError err;
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ S9xPortAudioSoundDriver::start (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPortAudioSoundDriver::stop (void)
|
||||
S9xPortAudioSoundDriver::stop ()
|
||||
{
|
||||
if (audio_stream != NULL)
|
||||
{
|
||||
|
|
@ -90,7 +90,7 @@ S9xPortAudioSoundDriver::stop (void)
|
|||
}
|
||||
|
||||
bool8
|
||||
S9xPortAudioSoundDriver::open_device (void)
|
||||
S9xPortAudioSoundDriver::open_device ()
|
||||
{
|
||||
PaStreamParameters param;
|
||||
const PaDeviceInfo *device_info;
|
||||
|
|
@ -189,7 +189,7 @@ S9xPortAudioSoundDriver::open_device (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPortAudioSoundDriver::samples_available (void)
|
||||
S9xPortAudioSoundDriver::samples_available ()
|
||||
{
|
||||
int frames;
|
||||
int bytes;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
class S9xPortAudioSoundDriver : public S9xSoundDriver
|
||||
{
|
||||
public:
|
||||
S9xPortAudioSoundDriver (void);
|
||||
void init (void);
|
||||
void terminate (void);
|
||||
bool8 open_device (void);
|
||||
void start (void);
|
||||
void stop (void);
|
||||
void samples_available (void);
|
||||
S9xPortAudioSoundDriver ();
|
||||
void init ();
|
||||
void terminate ();
|
||||
bool8 open_device ();
|
||||
void start ();
|
||||
void stop ();
|
||||
void samples_available ();
|
||||
|
||||
private:
|
||||
PaStream *audio_stream;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ pulse_samples_available (void *data)
|
|||
((S9xPulseSoundDriver *) data)->samples_available ();
|
||||
}
|
||||
|
||||
S9xPulseSoundDriver::S9xPulseSoundDriver (void)
|
||||
S9xPulseSoundDriver::S9xPulseSoundDriver ()
|
||||
{
|
||||
mainloop = NULL;
|
||||
context = NULL;
|
||||
|
|
@ -22,13 +22,13 @@ S9xPulseSoundDriver::S9xPulseSoundDriver (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPulseSoundDriver::init (void)
|
||||
S9xPulseSoundDriver::init ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xPulseSoundDriver::terminate (void)
|
||||
S9xPulseSoundDriver::terminate ()
|
||||
{
|
||||
S9xSetSamplesAvailableCallback (NULL, NULL);
|
||||
|
||||
|
|
@ -56,19 +56,19 @@ S9xPulseSoundDriver::terminate (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPulseSoundDriver::start (void)
|
||||
S9xPulseSoundDriver::start ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xPulseSoundDriver::stop (void)
|
||||
S9xPulseSoundDriver::stop ()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
S9xPulseSoundDriver::lock (void)
|
||||
S9xPulseSoundDriver::lock ()
|
||||
{
|
||||
pa_threaded_mainloop_lock (mainloop);
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ S9xPulseSoundDriver::lock (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPulseSoundDriver::unlock (void)
|
||||
S9xPulseSoundDriver::unlock ()
|
||||
{
|
||||
pa_threaded_mainloop_unlock (mainloop);
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ S9xPulseSoundDriver::unlock (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xPulseSoundDriver::wait (void)
|
||||
S9xPulseSoundDriver::wait ()
|
||||
{
|
||||
pa_threaded_mainloop_wait (mainloop);
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ stream_state_callback (pa_stream *p, void *userdata)
|
|||
}
|
||||
|
||||
bool8
|
||||
S9xPulseSoundDriver::open_device (void)
|
||||
S9xPulseSoundDriver::open_device ()
|
||||
{
|
||||
int err = PA_ERR_UNKNOWN;
|
||||
pa_sample_spec ss;
|
||||
|
|
@ -230,7 +230,7 @@ error0:
|
|||
}
|
||||
|
||||
void
|
||||
S9xPulseSoundDriver::samples_available (void)
|
||||
S9xPulseSoundDriver::samples_available ()
|
||||
{
|
||||
size_t bytes;
|
||||
int samples;
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
class S9xPulseSoundDriver : public S9xSoundDriver
|
||||
{
|
||||
public:
|
||||
S9xPulseSoundDriver (void);
|
||||
void init (void);
|
||||
void terminate (void);
|
||||
bool8 open_device (void);
|
||||
void start (void);
|
||||
void stop (void);
|
||||
void samples_available (void);
|
||||
void lock (void);
|
||||
void unlock (void);
|
||||
void wait (void);
|
||||
S9xPulseSoundDriver ();
|
||||
void init ();
|
||||
void terminate ();
|
||||
bool8 open_device ();
|
||||
void start ();
|
||||
void stop ();
|
||||
void samples_available ();
|
||||
void lock ();
|
||||
void unlock ();
|
||||
void wait ();
|
||||
|
||||
pa_threaded_mainloop *mainloop;
|
||||
pa_context *context;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ S9xSDLSoundDriver::mix (unsigned char *output, int bytes)
|
|||
return;
|
||||
}
|
||||
|
||||
S9xSDLSoundDriver::S9xSDLSoundDriver (void)
|
||||
S9xSDLSoundDriver::S9xSDLSoundDriver ()
|
||||
{
|
||||
audiospec = NULL;
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ S9xSDLSoundDriver::S9xSDLSoundDriver (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xSDLSoundDriver::init (void)
|
||||
S9xSDLSoundDriver::init ()
|
||||
{
|
||||
SDL_InitSubSystem (SDL_INIT_AUDIO);
|
||||
stop ();
|
||||
|
|
@ -46,7 +46,7 @@ S9xSDLSoundDriver::init (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xSDLSoundDriver::terminate (void)
|
||||
S9xSDLSoundDriver::terminate ()
|
||||
{
|
||||
stop ();
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ S9xSDLSoundDriver::terminate (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xSDLSoundDriver::start (void)
|
||||
S9xSDLSoundDriver::start ()
|
||||
{
|
||||
if (!gui_config->mute_sound)
|
||||
{
|
||||
|
|
@ -77,7 +77,7 @@ S9xSDLSoundDriver::start (void)
|
|||
}
|
||||
|
||||
void
|
||||
S9xSDLSoundDriver::stop (void)
|
||||
S9xSDLSoundDriver::stop ()
|
||||
{
|
||||
if (audiospec)
|
||||
{
|
||||
|
|
@ -88,7 +88,7 @@ S9xSDLSoundDriver::stop (void)
|
|||
}
|
||||
|
||||
bool8
|
||||
S9xSDLSoundDriver::open_device (void)
|
||||
S9xSDLSoundDriver::open_device ()
|
||||
{
|
||||
audiospec = (SDL_AudioSpec *) malloc (sizeof (SDL_AudioSpec));
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
class S9xSDLSoundDriver : public S9xSoundDriver
|
||||
{
|
||||
public:
|
||||
S9xSDLSoundDriver (void);
|
||||
void init (void);
|
||||
void terminate (void);
|
||||
bool8 open_device (void);
|
||||
void start (void);
|
||||
void stop (void);
|
||||
S9xSDLSoundDriver ();
|
||||
void init ();
|
||||
void terminate ();
|
||||
bool8 open_device ();
|
||||
void start ();
|
||||
void stop ();
|
||||
void mix (unsigned char *output, int bytes);
|
||||
|
||||
private:
|
||||
|
|
|
|||
Loading…
Reference in New Issue