anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

ocarina: Use new play and pause functions 

Eventually the global functions are going away, so I convert to using
the functions as part of the Libsaria instance.
This commit is contained in:
Bryan Schumaker 2011-08-21 18:11:17 -04:00
parent ec2c848a90
commit c716f62aaa
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/button.cpp
View File

@ -3,10 +3,10 @@
#include <libsaria/audio.h> #include <libsaria/audio.h>
#include <libsaria/libsaria.h> #include <libsaria/libsaria.h>
#define reg_on_click(func) \ #define ls_on_click(func) \
static void on_click_##func(GtkWidget *button, GdkEvent *event, gpointer data)\ static void on_click_##func(GtkWidget *button, GdkEvent *event, gpointer data)\
{ \ { \
func(); \ libsaria_get()->func(); \
} }
#define on_click(func) \ #define on_click(func) \
@ -23,18 +23,18 @@ GtkWidget *make_button(const gchar *stockid, GtkIconSize size)
return button; return button;
} }
reg_on_click(gst_play); ls_on_click(play);
GtkWidget *make_play_button(GtkIconSize size) GtkWidget *make_play_button(GtkIconSize size)
{ {
GtkWidget *button = make_button(GTK_STOCK_MEDIA_PLAY, size); GtkWidget *button = make_button(GTK_STOCK_MEDIA_PLAY, size);
GTK_CONNECT(button, "clicked", on_click(gst_play), NULL); GTK_CONNECT(button, "clicked", on_click(play), NULL);
return button; return button;
} }
reg_on_click(gst_pause); ls_on_click(pause);
GtkWidget *make_pause_button(GtkIconSize size) GtkWidget *make_pause_button(GtkIconSize size)
{ {
GtkWidget *button = make_button(GTK_STOCK_MEDIA_PAUSE, size); GtkWidget *button = make_button(GTK_STOCK_MEDIA_PAUSE, size);
GTK_CONNECT(button, "clicked", on_click(gst_pause), NULL); GTK_CONNECT(button, "clicked", on_click(pause), NULL);
return button; return button;
} }

2
gui/ocarina.cpp
View File

@ -11,7 +11,6 @@ void ocarina_init(int argc, char **argv)
GtkWidget *pause; GtkWidget *pause;
GtkWidget *hbox; GtkWidget *hbox;
gtk_init(&argc, &argv);
window_init(); window_init();
window_title("Ocarina " + vers_str()); window_title("Ocarina " + vers_str());
window_icon("images/ocarina.png"); window_icon("images/ocarina.png");
@ -36,6 +35,7 @@ int main(int argc, char **argv)
{ {
print("Ocarina 5.0"); print("Ocarina 5.0");
libsaria_init(argc, argv); libsaria_init(argc, argv);
gtk_init(&argc, &argv);
ocarina_init(argc, argv); ocarina_init(argc, argv);
libsaria_quit(); libsaria_quit();
return 0; return 0;