gui/gst: Completely define the next button in glade
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker
parent
f31a67f644
commit
6680cdbd0e
|
|
@ -1,5 +1,9 @@
|
|||
#!/usr/bin/python
|
||||
Import("env")
|
||||
|
||||
res = Glob("*.c")
|
||||
res += SConscript("tags/Sconscript")
|
||||
res += SConscript("containers/Sconscript")
|
||||
|
||||
env.UsePackage("gstreamer-1.0")
|
||||
Return("res")
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Import("env")
|
||||
|
||||
env.UsePackage("gtkmm-3.0")
|
||||
env.UsePackage("gstreamer-1.0")
|
||||
env.UsePackage("gmodule-export-2.0")
|
||||
|
||||
res = Glob("*.c") + Glob("*.cpp") + SConscript("queue/Sconscript")
|
||||
Return("res")
|
||||
|
|
|
|||
|
|
@ -12,10 +12,8 @@ extern "C" {
|
|||
#include <gui/builder.h>
|
||||
}
|
||||
#include <gui/ocarina.h>
|
||||
#include <gst/gst.h>
|
||||
|
||||
|
||||
static GtkButton *o_next;
|
||||
static GtkButton *o_pause;
|
||||
static GtkButton *o_play;
|
||||
static GtkButton *o_prev;
|
||||
|
|
@ -130,7 +128,6 @@ static bool on_timeout()
|
|||
void gst :: play() { audio_play(); }
|
||||
void gst :: pause() { audio_pause(); }
|
||||
void gst :: stop() { audio_stop(); }
|
||||
void gst :: next() { audio_next(); }
|
||||
void gst :: prev() { audio_prev(); }
|
||||
|
||||
void gst :: toggle()
|
||||
|
|
@ -143,7 +140,6 @@ void gst :: toggle()
|
|||
|
||||
void gst :: init_pre()
|
||||
{
|
||||
o_next = GTK_BUTTON(gui_builder_widget("o_next"));
|
||||
o_pause = GTK_BUTTON(gui_builder_widget("o_pause"));
|
||||
o_play = GTK_BUTTON(gui_builder_widget("o_play"));
|
||||
o_prev = GTK_BUTTON(gui_builder_widget("o_prev"));
|
||||
|
|
@ -160,7 +156,6 @@ void gst :: init_pre()
|
|||
o_title = GTK_LABEL(gui_builder_widget("o_title"));
|
||||
o_progress = GTK_ADJUSTMENT(gui_builder_object("o_progress"));
|
||||
|
||||
g_signal_connect(o_next, "clicked", gst :: next, NULL);
|
||||
g_signal_connect(o_pause, "clicked", gst :: pause, NULL);
|
||||
g_signal_connect(o_play, "clicked", gst :: play, NULL);
|
||||
g_signal_connect(o_prev, "clicked", gst :: prev, NULL);
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ static bool on_window_key_pressed(GdkEventKey *event)
|
|||
else if (key == "m")
|
||||
notebook->set_current_page(tempq_count() + 3);
|
||||
else if (key == "n")
|
||||
gst :: next();
|
||||
audio_next();
|
||||
else if (key == "N")
|
||||
audio_prev();
|
||||
else if (key == "p")
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ namespace gst
|
|||
void play();
|
||||
void pause();
|
||||
void stop();
|
||||
void next();
|
||||
void prev();
|
||||
void toggle();
|
||||
void init_pre();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Generated with glade 3.18.3 -->
|
||||
<!-- Generated with glade 3.19.0 -->
|
||||
<interface>
|
||||
<requires lib="gtk+" version="3.10"/>
|
||||
<object class="GtkAdjustment" id="adjustment1">
|
||||
|
|
@ -63,6 +63,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="image">image12</property>
|
||||
<property name="use_stock">False</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -71,6 +72,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="image">image13</property>
|
||||
<property name="use_stock">False</property>
|
||||
<child type="submenu">
|
||||
<object class="GtkMenu" id="menu1">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -165,6 +167,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="image">image18</property>
|
||||
<property name="use_stock">False</property>
|
||||
<child type="submenu">
|
||||
<object class="GtkMenu" id="menu2">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -175,6 +178,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="image">image20</property>
|
||||
<property name="use_stock">False</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -183,6 +187,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="image">image19</property>
|
||||
<property name="use_stock">False</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
|
@ -617,6 +622,7 @@ Manager</property>
|
|||
<property name="can_focus">False</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="focus_on_click">False</property>
|
||||
<signal name="clicked" handler="audio_next" swapped="no"/>
|
||||
<child>
|
||||
<object class="GtkImage" id="image5">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -700,6 +706,7 @@ Manager</property>
|
|||
<property name="can_focus">False</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="focus_on_click">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
|
|
|
|||
Loading…
Reference in New Issue