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

gui: Remove gui.cpp 

This file doesn't do anything anymore, so move the init functions into
main.cpp and remove the file.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-01-15 09:39:52 -05:00
parent 4643a5ff22
commit ea49b374ee
3 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gui/gui.cpp
View File

@ -1,32 +0,0 @@
/*
* Copyright 2014 (c) Anna Schumaker.
*/
#include <core/audio.h>
#include <core/deck.h>
#include <core/playlist.h>
#include <core/print.h>
#include <lib/colmgr.h>
#include <lib/lib.h>
#include <gui/ocarina.h>
#include <gui/tabs.h>
/*
* Ocarina functions
*/
void connect_button(const std::string &name, void (*func)())
{
lib :: get_widget<Gtk::Button>(name)->signal_clicked().connect(sigc::ptr_fun(func));
}
Gtk::Window *setup_gui()
{
if (audio :: current_track())
on_track_loaded(audio :: current_track());
/* Set up other tabs */
collection_mgr_init();
init_tabs();
return window_init();
}

11
gui/main.cpp
View File

@ -7,8 +7,15 @@
#include <gui/ocarina.h>
#include <gui/tabs.h>
void connect_button(const std::string &name, void (*func)())
{
lib :: get_widget<Gtk::Button>(name)->signal_clicked().connect(sigc::ptr_fun(func));
}
Gtk::Window *ocarina_init(int *argc, char ***argv)
{
Gtk::Window *window;
lib :: init(argc, argv, "ocarina6.glade");
init_gst(argc, argv);
@ -16,7 +23,9 @@ Gtk::Window *ocarina_init(int *argc, char ***argv)
core :: init();
Gtk::Window *window = setup_gui();
collection_mgr_init();
init_tabs();
window = window_init();
post_init_tabs();
return window;
}

5
include/gui/ocarina.h
View File

@ -14,11 +14,8 @@ void collection_mgr_init();
/* main.cpp */
Gtk::Window *ocarina_init(int *, char ***);
/* gui.cpp */
void connect_button(const std::string &, void (*func)());
Gtk::Window *setup_gui();
void on_pq_created(Queue *, unsigned int);
void on_track_loaded(Track *);